Commit 0950f3a50e8a91dfb9d6b3f0dd7e12ac865a3bf8
2014-01-01T07:48:20
* src/autofit/hbshim.c: s/{lookups,glyphs}/gsub_{lookups,glyphs}/.
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 79 80 81 82 83 84 85 86 87 88 89 90
diff --git a/ChangeLog b/ChangeLog
index a6f3390..3ecde6e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2014-01-01 Werner Lemberg <wl@gnu.org>
+ * src/autofit/hbshim.c: s/{lookups,glyphs}/gsub_{lookups,glyphs}/.
+
+2014-01-01 Werner Lemberg <wl@gnu.org>
+
[autofit] Implement and use `af_get_char_index' with HarfBuzz.
* src/autofit/hbshim.c (COVERAGE) [FT_CONFIG_OPTION_USE_HARFBUZZ]:
diff --git a/src/autofit/hbshim.c b/src/autofit/hbshim.c
index 7dae08f..c8077ba 100644
--- a/src/autofit/hbshim.c
+++ b/src/autofit/hbshim.c
@@ -100,8 +100,8 @@
{
hb_face_t* face;
- hb_set_t* lookups; /* lookups for a given script */
- hb_set_t* glyphs; /* glyphs covered by lookups */
+ hb_set_t* gsub_lookups; /* GSUB lookups for a given script */
+ hb_set_t* gsub_glyphs; /* glyphs covered by GSUB lookups */
hb_tag_t script;
const hb_tag_t* coverage_tags;
@@ -121,8 +121,8 @@
face = hb_font_get_face( globals->hb_font );
- lookups = hb_set_create();
- glyphs = hb_set_create();
+ gsub_lookups = hb_set_create();
+ gsub_glyphs = hb_set_create();
coverage_tags = coverages[style_class->coverage];
script = scripts[style_class->script];
@@ -161,9 +161,9 @@
script_tags,
NULL,
coverage_tags,
- lookups );
+ gsub_lookups );
- FT_TRACE4(( "lookups (style `%s'):\n"
+ FT_TRACE4(( "GSUB lookups (style `%s'):\n"
" ",
af_style_names[style_class->style] ));
@@ -171,7 +171,7 @@
count = 0;
#endif
- for ( idx = -1; hb_set_next( lookups, &idx ); )
+ for ( idx = -1; hb_set_next( gsub_lookups, &idx ); )
{
#ifdef FT_DEBUG_LEVEL_TRACE
FT_TRACE4(( " %d", idx ));
@@ -184,7 +184,7 @@
NULL,
NULL,
NULL,
- glyphs );
+ gsub_glyphs );
}
#ifdef FT_DEBUG_LEVEL_TRACE
@@ -197,7 +197,7 @@
count = 0;
#endif
- for ( idx = -1; hb_set_next( glyphs, &idx ); )
+ for ( idx = -1; hb_set_next( gsub_glyphs, &idx ); )
{
#ifdef FT_DEBUG_LEVEL_TRACE
if ( !( count % 10 ) )
@@ -223,8 +223,8 @@
FT_TRACE4(( "\n\n" ));
#endif
- hb_set_destroy( lookups );
- hb_set_destroy( glyphs );
+ hb_set_destroy( gsub_lookups );
+ hb_set_destroy( gsub_glyphs );
return FT_Err_Ok;
}