diff options
| author | Kenichi Handa | 2004-01-23 08:49:11 +0000 |
|---|---|---|
| committer | Kenichi Handa | 2004-01-23 08:49:11 +0000 |
| commit | 464f8566d330d4f3d3952f37c9e9bfcd43361bf2 (patch) | |
| tree | fac33acc1cbf6de841542de67553aa6da0a7f726 | |
| parent | 28d0edc75d24e83ceb395ffe7b028ff01f480e04 (diff) | |
| download | emacs-464f8566d330d4f3d3952f37c9e9bfcd43361bf2.tar.gz emacs-464f8566d330d4f3d3952f37c9e9bfcd43361bf2.zip | |
(get_composition_id): Handle xoff and yoff in a
composition rule.
| -rw-r--r-- | src/composite.c | 4 |
1 files changed, 2 insertions, 2 deletions
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) | |||
| 336 | 336 | ||
| 337 | for (i = 1; i < glyph_len; i += 2) | 337 | for (i = 1; i < glyph_len; i += 2) |
| 338 | { | 338 | { |
| 339 | int rule, gref, nref; | 339 | int rule, gref, nref, xoff, yoff; |
| 340 | int this_width; | 340 | int this_width; |
| 341 | float this_left; | 341 | float this_left; |
| 342 | 342 | ||
| @@ -358,7 +358,7 @@ get_composition_id (charpos, bytepos, nchars, prop, string) | |||
| 358 | | | | 358 | | | |
| 359 | 6---7---8 -- descent | 359 | 6---7---8 -- descent |
| 360 | */ | 360 | */ |
| 361 | COMPOSITION_DECODE_RULE (rule, gref, nref); | 361 | COMPOSITION_DECODE_RULE (rule, gref, nref, xoff, yoff); |
| 362 | this_left = (leftmost | 362 | this_left = (leftmost |
| 363 | + (gref % 3) * (rightmost - leftmost) / 2.0 | 363 | + (gref % 3) * (rightmost - leftmost) / 2.0 |
| 364 | - (nref % 3) * this_width / 2.0); | 364 | - (nref % 3) * this_width / 2.0); |