Refactor some code common to GSUB and GPOS
diff --git a/src/hb-ot-map-private.hh b/src/hb-ot-map-private.hh
index 9a44bd5..a66049f 100644
--- a/src/hb-ot-map-private.hh
+++ b/src/hb-ot-map-private.hh
@@ -60,8 +60,10 @@
return map ? map->_1_mask : 0;
}
- HB_INTERNAL void substitute (hb_face_t *face, hb_buffer_t *buffer) const;
- HB_INTERNAL void position (hb_font_t *font, hb_buffer_t *buffer) const;
+ inline void substitute (hb_face_t *face, hb_buffer_t *buffer) const
+ { apply (0, (hb_ot_map_t::apply_lookup_func_t) hb_ot_layout_substitute_lookup, face, buffer); }
+ inline void position (hb_font_t *font, hb_buffer_t *buffer) const
+ { apply (1, (hb_ot_map_t::apply_lookup_func_t) hb_ot_layout_position_lookup, font, buffer); }
inline void finish (void) {
features.finish ();
@@ -93,11 +95,7 @@
{ return a->index < b->index ? -1 : a->index > b->index ? 1 : 0; }
};
- typedef union {
- void *p;
- gsub_pause_func_t gsub;
- gpos_pause_func_t gpos;
- } pause_func_t;
+ typedef void (*pause_func_t) (const hb_ot_map_t *map, void *face_or_font, hb_buffer_t *buffer, void *user_data);
typedef struct {
pause_func_t func;
void *user_data;
@@ -108,11 +106,20 @@
pause_callback_t callback;
};
+ typedef hb_bool_t (*apply_lookup_func_t) (void *face_or_font,
+ hb_buffer_t *buffer,
+ unsigned int lookup_index,
+ hb_mask_t mask);
+
HB_INTERNAL void add_lookups (hb_face_t *face,
unsigned int table_index,
unsigned int feature_index,
hb_mask_t mask);
+ HB_INTERNAL void apply (unsigned int table_index,
+ hb_ot_map_t::apply_lookup_func_t apply_lookup_func,
+ void *face_or_font,
+ hb_buffer_t *buffer) const;
hb_mask_t global_mask;
@@ -131,8 +138,10 @@
inline void add_bool_feature (hb_tag_t tag, bool global = true)
{ add_feature (tag, 1, global); }
- HB_INTERNAL void add_gsub_pause (hb_ot_map_t::gsub_pause_func_t pause_func, void *user_data);
- HB_INTERNAL void add_gpos_pause (hb_ot_map_t::gpos_pause_func_t pause_func, void *user_data);
+ inline void add_gsub_pause (hb_ot_map_t::gsub_pause_func_t pause_func, void *user_data)
+ { add_pause (0, (hb_ot_map_t::pause_func_t) pause_func, user_data); }
+ inline void add_gpos_pause (hb_ot_map_t::gpos_pause_func_t pause_func, void *user_data)
+ { add_pause (1, (hb_ot_map_t::pause_func_t) pause_func, user_data); }
HB_INTERNAL void compile (hb_face_t *face,
const hb_segment_properties_t *props,
@@ -163,6 +172,8 @@
hb_ot_map_t::pause_callback_t callback;
};
+ HB_INTERNAL void add_pause (unsigned int table_index, hb_ot_map_t::pause_func_t pause_func, void *user_data);
+
unsigned int current_stage[2]; /* GSUB/GPOS */
hb_prealloced_array_t<feature_info_t,16> feature_infos;
hb_prealloced_array_t<pause_info_t, 1> pauses[2]; /* GSUB/GPOS */
diff --git a/src/hb-ot-map.cc b/src/hb-ot-map.cc
index 782c496..9bd4e0f 100644
--- a/src/hb-ot-map.cc
+++ b/src/hb-ot-map.cc
@@ -77,67 +77,33 @@
info->stage[1] = current_stage[1];
}
-
-void hb_ot_map_t::substitute (hb_face_t *face, hb_buffer_t *buffer) const {
- unsigned int table_index = 0;
+void hb_ot_map_t::apply (unsigned int table_index,
+ hb_ot_map_t::apply_lookup_func_t apply_lookup_func,
+ void *face_or_font,
+ hb_buffer_t *buffer) const
+{
unsigned int i = 0;
for (unsigned int pause_index = 0; pause_index < pauses[table_index].len; pause_index++) {
const pause_map_t *pause = &pauses[table_index][pause_index];
for (; i < pause->num_lookups; i++)
- hb_ot_layout_substitute_lookup (face, buffer, lookups[table_index][i].index, lookups[table_index][i].mask);
+ apply_lookup_func (face_or_font, buffer, lookups[table_index][i].index, lookups[table_index][i].mask);
- pause->callback.func.gsub (this, face, buffer, pause->callback.user_data);
+ pause->callback.func (this, face_or_font, buffer, pause->callback.user_data);
}
for (; i < lookups[table_index].len; i++)
- hb_ot_layout_substitute_lookup (face, buffer, lookups[table_index][i].index, lookups[table_index][i].mask);
-}
-
-void hb_ot_map_t::position (hb_font_t *font, hb_buffer_t *buffer) const {
- unsigned int table_index = 1;
- unsigned int i = 0;
-
- for (unsigned int pause_index = 0; pause_index < pauses[table_index].len; pause_index++) {
- const pause_map_t *pause = &pauses[table_index][pause_index];
- for (; i < pause->num_lookups; i++)
- hb_ot_layout_position_lookup (font, buffer, lookups[table_index][i].index, lookups[table_index][i].mask);
-
- pause->callback.func.gpos (this, font, buffer, pause->callback.user_data);
- }
-
- for (; i < lookups[table_index].len; i++)
- hb_ot_layout_position_lookup (font, buffer, lookups[table_index][i].index, lookups[table_index][i].mask);
+ apply_lookup_func (face_or_font, buffer, lookups[table_index][i].index, lookups[table_index][i].mask);
}
-/* TODO refactor the following two functions */
-
-void hb_ot_map_builder_t::add_gsub_pause (hb_ot_map_t::gsub_pause_func_t pause_func, void *user_data)
+void hb_ot_map_builder_t::add_pause (unsigned int table_index, hb_ot_map_t::pause_func_t pause_func, void *user_data)
{
- unsigned int table_index = 0;
-
if (pause_func) {
pause_info_t *p = pauses[table_index].push ();
if (likely (p)) {
p->stage = current_stage[table_index];
- p->callback.func.gsub = pause_func;
- p->callback.user_data = user_data;
- }
- }
-
- current_stage[table_index]++;
-}
-
-void hb_ot_map_builder_t::add_gpos_pause (hb_ot_map_t::gpos_pause_func_t pause_func, void *user_data)
-{
- unsigned int table_index = 1;
-
- if (pause_func) {
- pause_info_t *p = pauses[table_index].push ();
- if (likely (p)) {
- p->stage = current_stage[table_index];
- p->callback.func.gpos = pause_func;
+ p->callback.func = pause_func;
p->callback.user_data = user_data;
}
}
