[HarfBuzz] harfbuzz-ng: Branch 'master'

[Behdad Esfahbod]

 src/hb-ot-layout-gsub-private.hh |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit aa196d6026b496ec70be3d3588cc8cd2b8ccdb36
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Fri Nov 6 17:23:31 2009 -0500

    [GSUB] More ligature/component fixing
    
    We can only reuse the ligid if it belongs to a previous ligature, not a
    component!

diff --git a/src/hb-ot-layout-gsub-private.hh b/src/hb-ot-layout-gsub-private.hh
index fd161c0..d0cec7b 100644
--- a/src/hb-ot-layout-gsub-private.hh
+++ b/src/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_be16 (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
     {