From f4df4079fb7d283f62c79c2a17c026ba09c91b93 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Wed, 18 Dec 2013 10:39:30 +0100 Subject: [PATCH] [autofit] s/gscripts/gstyles/. --- ChangeLog | 4 ++++ src/autofit/afglobal.c | 24 ++++++++++++------------ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index f04b4881e..2c667a8b7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-12-18 Werner Lemberg + + [autofit] s/gscripts/gstyles/. + 2013-12-18 Werner Lemberg [autofit] s/glyph_scripts/glyph_styles/. diff --git a/src/autofit/afglobal.c b/src/autofit/afglobal.c index bb3cd122a..673571197 100644 --- a/src/autofit/afglobal.c +++ b/src/autofit/afglobal.c @@ -83,7 +83,7 @@ FT_Error error; FT_Face face = globals->face; FT_CharMap old_charmap = face->charmap; - FT_Byte* gscripts = globals->glyph_styles; + FT_Byte* gstyles = globals->glyph_styles; FT_UInt ss; FT_UInt i; @@ -128,10 +128,10 @@ gindex = FT_Get_Char_Index( face, charcode ); - if ( gindex != 0 && - gindex < (FT_ULong)globals->glyph_count && - gscripts[gindex] == AF_SCRIPT_UNASSIGNED ) - gscripts[gindex] = (FT_Byte)ss; + if ( gindex != 0 && + gindex < (FT_ULong)globals->glyph_count && + gstyles[gindex] == AF_SCRIPT_UNASSIGNED ) + gstyles[gindex] = (FT_Byte)ss; for (;;) { @@ -140,9 +140,9 @@ if ( gindex == 0 || charcode > range->last ) break; - if ( gindex < (FT_ULong)globals->glyph_count && - gscripts[gindex] == AF_SCRIPT_UNASSIGNED ) - gscripts[gindex] = (FT_Byte)ss; + if ( gindex < (FT_ULong)globals->glyph_count && + gstyles[gindex] == AF_SCRIPT_UNASSIGNED ) + gstyles[gindex] = (FT_Byte)ss; } } } @@ -154,7 +154,7 @@ if ( gindex != 0 && gindex < (FT_ULong)globals->glyph_count ) - gscripts[gindex] |= AF_DIGIT; + gstyles[gindex] |= AF_DIGIT; } Exit: @@ -169,10 +169,10 @@ for ( nn = 0; nn < globals->glyph_count; nn++ ) { - if ( ( gscripts[nn] & ~AF_DIGIT ) == AF_SCRIPT_UNASSIGNED ) + if ( ( gstyles[nn] & ~AF_DIGIT ) == AF_SCRIPT_UNASSIGNED ) { - gscripts[nn] &= ~AF_SCRIPT_UNASSIGNED; - gscripts[nn] |= globals->module->fallback_script; + gstyles[nn] &= ~AF_SCRIPT_UNASSIGNED; + gstyles[nn] |= globals->module->fallback_script; } } }