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

Bug 336153 – Mark to mark positioning (Lookup Type 6) isn't correct when 

2006-05-31  Behdad Esfahbod  <behdad@gnome.org>

        Bug 336153 – Mark to mark positioning (Lookup Type 6) isn't correct
        when using MarkAttchmentType
        Patch from Tin Myo Htet.

        * pango/opentype/harfbuzz-gpos.c (Lookup_MarkMarkPos): Ignore marks
        of non-matchin attachment type.
This commit is contained in:
Behdad Esfahbod 2006-05-31 07:23:02 +00:00 committed by Behdad Esfahbod
parent d2a613187c
commit f8f7bd2451
1 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/harfbuzz-gpos.c
View File

@ -3006,7 +3006,7 @@ static FT_Error Lookup_MarkMarkPos( GPOS_Instance* gpi,
FT_UShort context_length, FT_UShort context_length,
int nesting_level ) int nesting_level )
{ {
FT_UShort j, mark1_index, mark2_index, property, class; FT_UShort i, j, mark1_index, mark2_index, property, class;
FT_Pos x_mark1_value, y_mark1_value, FT_Pos x_mark1_value, y_mark1_value,
x_mark2_value, y_mark2_value; x_mark2_value, y_mark2_value;
FT_Error error; FT_Error error;
@ -3038,27 +3038,34 @@ static FT_Error Lookup_MarkMarkPos( GPOS_Instance* gpi,
if ( error ) if ( error )
return error; return error;
/* now we check the preceding glyph whether it is a suitable /* now we search backwards for a suitable mark glyph until a non-mark
mark glyph */ glyph */
if ( buffer->in_pos == 0 ) if ( buffer->in_pos == 0 )
return HB_Err_Not_Covered; return HB_Err_Not_Covered;
i = 1;
j = buffer->in_pos - 1; j = buffer->in_pos - 1;
error = HB_GDEF_Get_Glyph_Property( gpos->gdef, IN_GLYPH( j ), while ( i <= buffer->in_pos )
&property ); {
if ( error ) error = HB_GDEF_Get_Glyph_Property( gpos->gdef, IN_GLYPH( j ),
return error; &property );
if ( error )
return error;
if ( flags & HB_LOOKUP_FLAG_IGNORE_SPECIAL_MARKS ) if ( !( property == HB_GDEF_MARK || property & HB_LOOKUP_FLAG_IGNORE_SPECIAL_MARKS ) )
{
if ( property != (flags & 0xFF00) )
return HB_Err_Not_Covered;
}
else
{
if ( property != HB_GDEF_MARK )
return HB_Err_Not_Covered; return HB_Err_Not_Covered;
if ( flags & HB_LOOKUP_FLAG_IGNORE_SPECIAL_MARKS )
{
if ( property == (flags & 0xFF00) )
break;
}
else
break;
i++;
j--;
} }
error = _HB_OPEN_Coverage_Index( &mmp->Mark2Coverage, IN_GLYPH( j ), error = _HB_OPEN_Coverage_Index( &mmp->Mark2Coverage, IN_GLYPH( j ),