summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@behdad.org>2009-11-22 18:24:54 -0500
committerBehdad Esfahbod <behdad@behdad.org>2009-11-22 18:24:54 -0500
commitb685d25141ba069d2494b17fada2ecedd6dd0df5 (patch)
tree417a40b8a1d1b80d4e6f65c90fca91dae0f9dede
parent40bade07f999a0535e0cbc8c2afe45d44e92a663 (diff)
downloadpango-b685d25141ba069d2494b17fada2ecedd6dd0df5.tar.gz
[GSUB] More ligature/component fixing
We can only reuse the ligid if it belongs to a previous ligature, not a component! Cherry-picked from harfbuzz-ng repo.
-rw-r--r--pango/opentype/hb-ot-layout-gsub-private.hh4
1 files changed, 2 insertions, 2 deletions
diff --git a/pango/opentype/hb-ot-layout-gsub-private.hh b/pango/opentype/hb-ot-layout-gsub-private.hh
index 75ca150b..d35aaff1 100644
--- a/pango/opentype/hb-ot-layout-gsub-private.hh
+++ b/pango/opentype/hb-ot-layout-gsub-private.hh
@@ -388,8 +388,8 @@ struct Ligature
glyphs and the ligature already has an ID. */
_hb_buffer_add_output_glyphs (buffer, i,
1, (const uint16_t *) &ligGlyph,
- 0xFFFF,
- IN_LIGID (buffer->in_pos) ?
+ 0,
+ IN_LIGID (buffer->in_pos) && !IN_COMPONENT (buffer->in_pos) ?
0xFFFF : _hb_buffer_allocate_lig_id (buffer));
else
{