| Index: third_party/harfbuzz-ng/src/hb-ot-layout.cc
|
| diff --git a/third_party/harfbuzz-ng/src/hb-ot-layout.cc b/third_party/harfbuzz-ng/src/hb-ot-layout.cc
|
| index 66aa35ad73675150b53949926b7dedee286cd600..9fc88f6c86220d70e1cca25e39de51bb3c602d57 100644
|
| --- a/third_party/harfbuzz-ng/src/hb-ot-layout.cc
|
| +++ b/third_party/harfbuzz-ng/src/hb-ot-layout.cc
|
| @@ -130,6 +130,8 @@ hb_ot_layout_has_glyph_classes (hb_face_t *face)
|
| }
|
|
|
| /**
|
| + * hb_ot_layout_get_glyph_class:
|
| + *
|
| * Since: 0.9.7
|
| **/
|
| hb_ot_layout_glyph_class_t
|
| @@ -140,6 +142,8 @@ hb_ot_layout_get_glyph_class (hb_face_t *face,
|
| }
|
|
|
| /**
|
| + * hb_ot_layout_get_glyphs_in_class:
|
| + *
|
| * Since: 0.9.7
|
| **/
|
| void
|
| @@ -365,6 +369,8 @@ hb_ot_layout_language_get_required_feature_index (hb_face_t *face,
|
| }
|
|
|
| /**
|
| + * hb_ot_layout_language_get_required_feature:
|
| + *
|
| * Since: 0.9.30
|
| **/
|
| hb_bool_t
|
| @@ -452,6 +458,8 @@ hb_ot_layout_language_find_feature (hb_face_t *face,
|
| }
|
|
|
| /**
|
| + * hb_ot_layout_feature_get_lookups:
|
| + *
|
| * Since: 0.9.7
|
| **/
|
| unsigned int
|
| @@ -469,6 +477,8 @@ hb_ot_layout_feature_get_lookups (hb_face_t *face,
|
| }
|
|
|
| /**
|
| + * hb_ot_layout_table_get_lookup_count:
|
| + *
|
| * Since: 0.9.22
|
| **/
|
| unsigned int
|
| @@ -629,6 +639,8 @@ _hb_ot_layout_collect_lookups_languages (hb_face_t *face,
|
| }
|
|
|
| /**
|
| + * hb_ot_layout_collect_lookups:
|
| + *
|
| * Since: 0.9.8
|
| **/
|
| void
|
| @@ -673,6 +685,8 @@ hb_ot_layout_collect_lookups (hb_face_t *face,
|
| }
|
|
|
| /**
|
| + * hb_ot_layout_lookup_collect_glyphs:
|
| + *
|
| * Since: 0.9.7
|
| **/
|
| void
|
| @@ -721,6 +735,8 @@ hb_ot_layout_has_substitution (hb_face_t *face)
|
| }
|
|
|
| /**
|
| + * hb_ot_layout_lookup_would_substitute:
|
| + *
|
| * Since: 0.9.7
|
| **/
|
| hb_bool_t
|
| @@ -742,7 +758,7 @@ hb_ot_layout_lookup_would_substitute_fast (hb_face_t *face,
|
| hb_bool_t zero_context)
|
| {
|
| if (unlikely (lookup_index >= hb_ot_layout_from_face (face)->gsub_lookup_count)) return false;
|
| - OT::hb_would_apply_context_t c (face, glyphs, glyphs_length, zero_context);
|
| + OT::hb_would_apply_context_t c (face, glyphs, glyphs_length, (bool) zero_context);
|
|
|
| const OT::SubstLookup& l = hb_ot_layout_from_face (face)->gsub->get_lookup (lookup_index);
|
|
|
| @@ -762,6 +778,8 @@ hb_ot_layout_substitute_finish (hb_font_t *font, hb_buffer_t *buffer)
|
| }
|
|
|
| /**
|
| + * hb_ot_layout_lookup_substitute_closure:
|
| + *
|
| * Since: 0.9.7
|
| **/
|
| void
|
| @@ -799,6 +817,8 @@ hb_ot_layout_position_finish (hb_font_t *font, hb_buffer_t *buffer)
|
| }
|
|
|
| /**
|
| + * hb_ot_layout_get_size_params:
|
| + *
|
| * Since: 0.9.10
|
| **/
|
| hb_bool_t
|
| @@ -1008,25 +1028,15 @@ inline void hb_ot_map_t::apply (const Proxy &proxy,
|
| const stage_map_t *stage = &stages[table_index][stage_index];
|
| for (; i < stage->last_lookup; i++)
|
| {
|
| -#if 0
|
| - char buf[4096];
|
| - hb_buffer_serialize_glyphs (buffer, 0, buffer->len,
|
| - buf, sizeof (buf), NULL,
|
| - font,
|
| - HB_BUFFER_SERIALIZE_FORMAT_TEXT,
|
| - Proxy::table_index == 0 ?
|
| - HB_BUFFER_SERIALIZE_FLAG_NO_POSITIONS :
|
| - HB_BUFFER_SERIALIZE_FLAG_DEFAULT);
|
| - printf ("buf: [%s]\n", buf);
|
| -#endif
|
| -
|
| unsigned int lookup_index = lookups[table_index][i].index;
|
| + if (!buffer->message (font, "start lookup %d", lookup_index)) continue;
|
| c.set_lookup_index (lookup_index);
|
| c.set_lookup_mask (lookups[table_index][i].mask);
|
| c.set_auto_zwj (lookups[table_index][i].auto_zwj);
|
| apply_string<Proxy> (&c,
|
| proxy.table.get_lookup (lookup_index),
|
| proxy.accels[lookup_index]);
|
| + (void) buffer->message (font, "end lookup %d", lookup_index);
|
| }
|
|
|
| if (stage->pause_func)
|
|
|