diff options
Diffstat (limited to 'pango')
| -rw-r--r-- | pango/opentype/ftxgdef.c | 37 | ||||
| -rw-r--r-- | pango/opentype/ftxgsub.c | 31 |
2 files changed, 31 insertions, 37 deletions
diff --git a/pango/opentype/ftxgdef.c b/pango/opentype/ftxgdef.c index e7e02f13..c1d5b797 100644 --- a/pango/opentype/ftxgdef.c +++ b/pango/opentype/ftxgdef.c @@ -1166,20 +1166,39 @@ if ( gdef ) { + FT_UShort basic_glyph_class; + FT_UShort desired_attachment_class; + error = TT_GDEF_Get_Glyph_Property( gdef, index, property ); if ( error ) return error; - if ( flags & IGNORE_SPECIAL_MARKS ) + /* If the glyph was found in the MarkAttachmentClass table, + * then that class value is the high byte of the result, + * otherwise the low byte contains the basic type of the glyph + * as defined by the GlyphClassDef table. + */ + if ( *property & IGNORE_SPECIAL_MARKS ) + basic_glyph_class = TTO_MARK; + else + basic_glyph_class = *property; + + /* Return Not_Covered, if, for example, basic_glyph_class + * is TTO_LIGATURE and LookFlags includes IGNORE_LIGATURES + */ + if ( flags & basic_glyph_class ) + return TTO_Err_Not_Covered; + + /* The high byte of LookupFlags has the meaning + * "ignore marks of attachment type different than + * the attachment type specified." + */ + desired_attachment_class = flags & IGNORE_SPECIAL_MARKS; + if ( desired_attachment_class ) { - /* This is OpenType 1.2 */ - - if ( (flags & 0xFF00) != *property ) - return TTO_Err_Not_Covered; - } - else { - if ( flags & *property ) - return TTO_Err_Not_Covered; + if ( basic_glyph_class == TTO_MARK && + *property != desired_attachment_class ) + return TTO_Err_Not_Covered; } } diff --git a/pango/opentype/ftxgsub.c b/pango/opentype/ftxgsub.c index e473ca95..d5850f31 100644 --- a/pango/opentype/ftxgsub.c +++ b/pango/opentype/ftxgsub.c @@ -1194,8 +1194,7 @@ FT_UShort index, property; FT_Error error; FT_UShort numlig, i, j, is_mark, first_is_mark = FALSE; - FT_UShort first_ligID, first_comp; - FT_UShort *s_in, *lig_in, *comp_in; + FT_UShort* s_in; FT_UShort* c; TTO_Ligature* lig; @@ -1223,12 +1222,8 @@ if ( in->pos + lig->ComponentCount > in->length ) continue; /* Not enough glyphs in input */ - s_in = &in->string[in->pos]; - lig_in = &in->ligIDs[in->pos]; - comp_in = &in->components[in->pos]; - first_ligID = *lig_in; - first_comp = *comp_in; - c = lig->Component; + s_in = &in->string[in->pos]; + c = lig->Component; is_mark = first_is_mark; @@ -1248,26 +1243,6 @@ break; } - /* don't apply a ligature lookup to glyphs with different - ligature IDs. Example: - - ' - ^' ' ^ - f ^ l ' -> fl ^ ' -> fl but not fl ^ -> fl */ - - if ( first_ligID != lig_in[j] ) - break; - - /* don't apply a ligature lookup to glyphs with different - component values. Example: - - ' - ^' ' ^ - f ^ f ' l -> ffl ^ ' -> ffl but not ffl ^ -> ffl */ - - if ( first_comp != comp_in[j] ) - break; - if ( !( property == TTO_MARK || property & IGNORE_SPECIAL_MARKS ) ) is_mark = FALSE; |