From: Kenichi Handa <handa@m17n.org>
Date: Fri, 23 Jan 2004 08:49:11 +0000 (+0000)
Subject: (get_composition_id): Handle xoff and yoff in a
X-Git-Tag: emacs-pretest-23.0.90~8295^2~1622
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=464f8566d330d4f3d3952f37c9e9bfcd43361bf2;p=emacs.git

(get_composition_id): Handle xoff and yoff in a
composition rule.
---

diff --git a/src/composite.c b/src/composite.c
index ea85e2fa506..e27221c59fb 100644
--- 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);