From 362a990b2246f5448ecb9d600761f710aea7d42d Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Thu, 15 Nov 2012 14:57:31 -0800 Subject: [PATCH] Rename hb_ot_layout_would_substitute_lookup() and hb_ot_layout_substitute_closure_lookup() To match upcoming API. --- src/hb-ot-layout-private.hh | 2 +- src/hb-ot-layout.cc | 8 ++++---- src/hb-ot-layout.h | 4 ++-- src/hb-ot-map.cc | 2 +- src/hb-ot-shape-complex-indic.cc | 2 +- src/test-would-substitute.cc | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/hb-ot-layout-private.hh b/src/hb-ot-layout-private.hh index 70fda8ead..16b460dec 100644 --- a/src/hb-ot-layout-private.hh +++ b/src/hb-ot-layout-private.hh @@ -138,7 +138,7 @@ static inline uint8_t allocate_lig_id (hb_buffer_t *buffer) { HB_INTERNAL hb_bool_t -hb_ot_layout_would_substitute_lookup_fast (hb_face_t *face, +hb_ot_layout_lookup_would_substitute_fast (hb_face_t *face, unsigned int lookup_index, const hb_codepoint_t *glyphs, unsigned int glyphs_length, diff --git a/src/hb-ot-layout.cc b/src/hb-ot-layout.cc index e241e3326..0b85dc523 100644 --- a/src/hb-ot-layout.cc +++ b/src/hb-ot-layout.cc @@ -399,18 +399,18 @@ hb_ot_layout_has_substitution (hb_face_t *face) } hb_bool_t -hb_ot_layout_would_substitute_lookup (hb_face_t *face, +hb_ot_layout_lookup_would_substitute (hb_face_t *face, unsigned int lookup_index, const hb_codepoint_t *glyphs, unsigned int glyphs_length, hb_bool_t zero_context) { if (unlikely (!hb_ot_shaper_face_data_ensure (face))) return false; - return hb_ot_layout_would_substitute_lookup_fast (face, lookup_index, glyphs, glyphs_length, zero_context); + return hb_ot_layout_lookup_would_substitute_fast (face, lookup_index, glyphs, glyphs_length, zero_context); } hb_bool_t -hb_ot_layout_would_substitute_lookup_fast (hb_face_t *face, +hb_ot_layout_lookup_would_substitute_fast (hb_face_t *face, unsigned int lookup_index, const hb_codepoint_t *glyphs, unsigned int glyphs_length, @@ -452,7 +452,7 @@ hb_ot_layout_substitute_finish (hb_font_t *font, hb_buffer_t *buffer) } void -hb_ot_layout_substitute_closure_lookup (hb_face_t *face, +hb_ot_layout_lookup_substitute_closure (hb_face_t *face, unsigned int lookup_index, hb_set_t *glyphs) { diff --git a/src/hb-ot-layout.h b/src/hb-ot-layout.h index d431a3801..ac086c922 100644 --- a/src/hb-ot-layout.h +++ b/src/hb-ot-layout.h @@ -170,14 +170,14 @@ hb_bool_t hb_ot_layout_has_substitution (hb_face_t *face); hb_bool_t -hb_ot_layout_would_substitute_lookup (hb_face_t *face, +hb_ot_layout_lookup_would_substitute (hb_face_t *face, unsigned int lookup_index, const hb_codepoint_t *glyphs, unsigned int glyphs_length, hb_bool_t zero_context); void -hb_ot_layout_substitute_closure_lookup (hb_face_t *face, +hb_ot_layout_lookup_substitute_closure (hb_face_t *face, unsigned int lookup_index, hb_set_t *glyphs); diff --git a/src/hb-ot-map.cc b/src/hb-ot-map.cc index 024b7dfc4..26ca1a3f6 100644 --- a/src/hb-ot-map.cc +++ b/src/hb-ot-map.cc @@ -142,7 +142,7 @@ void hb_ot_map_t::substitute_closure (const hb_ot_shape_plan_t *plan, hb_face_t { unsigned int table_index = 0; for (unsigned int i = 0; i < lookups[table_index].len; i++) - hb_ot_layout_substitute_closure_lookup (face, lookups[table_index][i].index, glyphs); + hb_ot_layout_lookup_substitute_closure (face, lookups[table_index][i].index, glyphs); } void hb_ot_map_builder_t::add_pause (unsigned int table_index, hb_ot_map_t::pause_func_t pause_func) diff --git a/src/hb-ot-shape-complex-indic.cc b/src/hb-ot-shape-complex-indic.cc index c5a23b60e..eaa77b797 100644 --- a/src/hb-ot-shape-complex-indic.cc +++ b/src/hb-ot-shape-complex-indic.cc @@ -269,7 +269,7 @@ struct would_substitute_feature_t hb_face_t *face) const { for (unsigned int i = 0; i < count; i++) - if (hb_ot_layout_would_substitute_lookup_fast (face, lookups[i].index, glyphs, glyphs_count, zero_context)) + if (hb_ot_layout_lookup_would_substitute_fast (face, lookups[i].index, glyphs, glyphs_count, zero_context)) return true; return false; } diff --git a/src/test-would-substitute.cc b/src/test-would-substitute.cc index d15aec48f..4731e2656 100644 --- a/src/test-would-substitute.cc +++ b/src/test-would-substitute.cc @@ -99,5 +99,5 @@ main (int argc, char **argv) (argc > 4 && !hb_font_glyph_from_string (font, argv[4], -1, &glyphs[1]))) return 2; - return !hb_ot_layout_would_substitute_lookup (face, strtol (argv[2], NULL, 0), glyphs, len, false); + return !hb_ot_layout_lookup_would_substitute (face, strtol (argv[2], NULL, 0), glyphs, len, false); }