From: Behdad Esfahbod <behdad@behdad.org>
Date: Sun, 22 Nov 2009 23:24:54 +0000 (-0500)
Subject: [GSUB] More ligature/component fixing
X-Git-Tag: 1.26.2~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b685d25141ba069d2494b17fada2ecedd6dd0df5;p=platform%2Fupstream%2Fpango.git

[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.
---

diff --git a/pango/opentype/hb-ot-layout-gsub-private.hh b/pango/opentype/hb-ot-layout-gsub-private.hh
index 75ca150..d35aaff 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
     {