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

[GPOS] Fix mark matching

This commit is contained in:
Behdad Esfahbod 2009-05-26 17:58:37 -04:00
parent 4189b92aaa
commit 80ea5bd10e
1 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/hb-ot-layout-gpos-private.h
View File

@ -778,19 +778,16 @@ struct MarkBasePosFormat1
/* now we search backwards for a non-mark glyph */ /* now we search backwards for a non-mark glyph */
unsigned int count = buffer->in_pos; unsigned int count = buffer->in_pos;
unsigned int i = 1, j = count - 1; unsigned int i = 1, j = count - 1;
while (i <= count) while (_hb_ot_layout_skip_mark (layout, IN_INFO (j), LookupFlag::IgnoreMarks, NULL))
{ {
property = _hb_ot_layout_get_glyph_property (layout, IN_GLYPH (j)); if (HB_UNLIKELY (i == count))
if (!(property & HB_OT_LAYOUT_GLYPH_CLASS_MARK)) return false;
break;
i++, j--; i++, j--;
} }
if (HB_UNLIKELY (i > buffer->in_pos))
return false;
/* The following assertion is too strong -- at least for mangal.ttf. */
#if 0 #if 0
if (property != HB_OT_LAYOUT_GLYPH_CLASS_BASE_GLYPH) /* The following assertion is too strong. */
if (!(property & HB_OT_LAYOUT_GLYPH_CLASS_BASE_GLYPH))
return false; return false;
#endif #endif
@ -900,19 +897,16 @@ struct MarkLigPosFormat1
/* now we search backwards for a non-mark glyph */ /* now we search backwards for a non-mark glyph */
unsigned int count = buffer->in_pos; unsigned int count = buffer->in_pos;
unsigned int i = 1, j = count - 1; unsigned int i = 1, j = count - 1;
while (i <= count) while (_hb_ot_layout_skip_mark (layout, IN_INFO (j), LookupFlag::IgnoreMarks, NULL))
{ {
property = _hb_ot_layout_get_glyph_property (layout, IN_GLYPH (j)); if (HB_UNLIKELY (i == count))
if (!(property & HB_OT_LAYOUT_GLYPH_CLASS_MARK)) return false;
break;
i++, j--; i++, j--;
} }
if (HB_UNLIKELY (i > buffer->in_pos))
return false;
/* The following assertion is too strong -- at least for mangal.ttf. */
#if 0 #if 0
if (property != HB_OT_LAYOUT_GLYPH_CLASS_LIGATURE) /* The following assertion is too strong. */
if (!(property & HB_OT_LAYOUT_GLYPH_CLASS_LIGATURE))
return false; return false;
#endif #endif
@ -1035,17 +1029,19 @@ struct MarkMarkPosFormat1
/* now we search backwards for a suitable mark glyph until a non-mark glyph */ /* now we search backwards for a suitable mark glyph until a non-mark glyph */
unsigned int count = buffer->in_pos; unsigned int count = buffer->in_pos;
unsigned int i = 1, j = count - 1; unsigned int i = 1, j = count - 1;
while (i <= count) while (_hb_ot_layout_skip_mark (layout, IN_INFO (j), lookup_flag, NULL))
{ {
property = _hb_ot_layout_get_glyph_property (layout, IN_GLYPH (j)); if (HB_UNLIKELY (i == count))
if (!(property & HB_OT_LAYOUT_GLYPH_CLASS_MARK)) return false;
return false;
if (!(lookup_flag & LookupFlag::MarkAttachmentType) ||
(lookup_flag & LookupFlag::MarkAttachmentType) == property)
break;
i++, j--; i++, j--;
} }
if (HB_UNLIKELY (i > buffer->in_pos)) if (!(property & HB_OT_LAYOUT_GLYPH_CLASS_MARK))
return false;
/* Two marks match only if they belong to the same base, or same component
* of the same ligature. */
if (IN_LIGID (j) != IN_LIGID (buffer->in_pos) ||
IN_COMPONENT (j) != IN_COMPONENT (buffer->in_pos))
return false; return false;
unsigned int mark2_index = (this+mark2Coverage) (IN_GLYPH (j)); unsigned int mark2_index = (this+mark2Coverage) (IN_GLYPH (j));