Commit f4df4079fb7d283f62c79c2a17c026ba09c91b93
2013-12-18T10:39:30
[autofit] s/gscripts/gstyles/.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78
diff --git a/ChangeLog b/ChangeLog
index f04b488..2c667a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2013-12-18 Werner Lemberg <wl@gnu.org>
+ [autofit] s/gscripts/gstyles/.
+
+2013-12-18 Werner Lemberg <wl@gnu.org>
+
[autofit] s/glyph_scripts/glyph_styles/.
This is the first commit of a series to create a new top-level
diff --git a/src/autofit/afglobal.c b/src/autofit/afglobal.c
index bb3cd12..6735711 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;
}
}
}