walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Simplify mark skipping logic

This commit is contained in:
Behdad Esfahbod 2010-10-27 22:11:32 -04:00
parent 8c69e65abe
commit 6334658fe7
1 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/hb-ot-layout.cc
View File

@ -184,22 +184,11 @@ _hb_ot_layout_skip_mark (hb_face_t *face,
if (property_out) if (property_out)
*property_out = property; *property_out = property;
/* If it's a mark, skip it we don't accept it. */
if (property & HB_OT_LAYOUT_GLYPH_CLASS_MARK) if (property & HB_OT_LAYOUT_GLYPH_CLASS_MARK)
{ return !_hb_ot_layout_check_glyph_property (face, ginfo, lookup_props, NULL);
/* Skip mark if lookup_props includes LookupFlags::IgnoreMarks */
if (lookup_props & LookupFlag::IgnoreMarks)
return true;
/* If using mark filtering sets, the high short of lookup_props has the set index. */
if (lookup_props & LookupFlag::UseMarkFilteringSet)
return !_get_gdef (face).mark_set_covers (lookup_props >> 16, ginfo->codepoint);
/* The second byte of lookup_props has the meaning "ignore marks of attachment type
* different than the attachment type specified." */
if (lookup_props & LookupFlag::MarkAttachmentType && property & LookupFlag::MarkAttachmentType)
return (lookup_props & LookupFlag::MarkAttachmentType) != (property & LookupFlag::MarkAttachmentType);
}
/* If not a mark, don't skip. */
return false; return false;
} }