(get_composition_id): Handle xoff and yoff in a

composition rule.

diff --git a/src/composite.c b/src/composite.c
index ea85e2fa50665ab900a933d5622fd46dbac35982..e27221c59fb30a3628d4e7185e08d19bf71c5984 100644 (file)
--- a/src/composite.c
+++ b/src/composite.c
@@ -336,7 +336,7 @@ get_composition_id (charpos, bytepos, nchars, prop, string)
 
       for (i = 1; i < glyph_len; i += 2)
        {
-         int rule, gref, nref;
+         int rule, gref, nref, xoff, yoff;
          int this_width;
          float this_left;
 
@@ -358,7 +358,7 @@ get_composition_id (charpos, bytepos, nchars, prop, string)
                |       |
                6---7---8 -- descent
          */
-         COMPOSITION_DECODE_RULE (rule, gref, nref);
+         COMPOSITION_DECODE_RULE (rule, gref, nref, xoff, yoff);
          this_left = (leftmost
                       + (gref % 3) * (rightmost - leftmost) / 2.0
                       - (nref % 3) * this_width / 2.0);