| Index: third_party/harfbuzz-ng/src/hb-ot-shape-complex-private.hh
|
| diff --git a/third_party/harfbuzz-ng/src/hb-ot-shape-complex-private.hh b/third_party/harfbuzz-ng/src/hb-ot-shape-complex-private.hh
|
| index ac0072ba565cfc8fc72ce9a82733ab9d414dcfb0..104726e8af57ef4dfe3cadef1300c6ff2416848e 100644
|
| --- a/third_party/harfbuzz-ng/src/hb-ot-shape-complex-private.hh
|
| +++ b/third_party/harfbuzz-ng/src/hb-ot-shape-complex-private.hh
|
| @@ -44,7 +44,9 @@ enum hb_ot_shape_zero_width_marks_type_t {
|
| // HB_OT_SHAPE_ZERO_WIDTH_MARKS_BY_UNICODE_EARLY,
|
| HB_OT_SHAPE_ZERO_WIDTH_MARKS_BY_UNICODE_LATE,
|
| HB_OT_SHAPE_ZERO_WIDTH_MARKS_BY_GDEF_EARLY,
|
| - HB_OT_SHAPE_ZERO_WIDTH_MARKS_BY_GDEF_LATE
|
| + HB_OT_SHAPE_ZERO_WIDTH_MARKS_BY_GDEF_LATE,
|
| +
|
| + HB_OT_SHAPE_ZERO_WIDTH_MARKS_DEFAULT = HB_OT_SHAPE_ZERO_WIDTH_MARKS_BY_UNICODE_LATE
|
| };
|
|
|
|
|
| @@ -52,10 +54,13 @@ enum hb_ot_shape_zero_width_marks_type_t {
|
| #define HB_COMPLEX_SHAPERS_IMPLEMENT_SHAPERS \
|
| HB_COMPLEX_SHAPER_IMPLEMENT (default) /* should be first */ \
|
| HB_COMPLEX_SHAPER_IMPLEMENT (arabic) \
|
| + HB_COMPLEX_SHAPER_IMPLEMENT (hangul) \
|
| + HB_COMPLEX_SHAPER_IMPLEMENT (hebrew) \
|
| HB_COMPLEX_SHAPER_IMPLEMENT (indic) \
|
| HB_COMPLEX_SHAPER_IMPLEMENT (myanmar) \
|
| HB_COMPLEX_SHAPER_IMPLEMENT (sea) \
|
| HB_COMPLEX_SHAPER_IMPLEMENT (thai) \
|
| + HB_COMPLEX_SHAPER_IMPLEMENT (tibetan) \
|
| /* ^--- Add new shapers here */
|
|
|
|
|
| @@ -105,12 +110,7 @@ struct hb_ot_complex_shaper_t
|
| hb_font_t *font);
|
|
|
|
|
| - /* normalization_preference()
|
| - * Called during shape().
|
| - * May be NULL.
|
| - */
|
| - hb_ot_shape_normalization_mode_t
|
| - (*normalization_preference) (const hb_segment_properties_t *props);
|
| + hb_ot_shape_normalization_mode_t normalization_preference;
|
|
|
| /* decompose()
|
| * Called during shape()'s normalization.
|
| @@ -189,19 +189,22 @@ hb_ot_shape_complex_categorize (const hb_ot_shape_planner_t *planner)
|
| return &_hb_ot_complex_shaper_thai;
|
|
|
|
|
| -#if 0
|
| - /* Note:
|
| - * Currently we don't have a separate Hangul shaper. The default shaper handles
|
| - * Hangul by enabling jamo features. We may want to implement a separate shaper
|
| - * in the future. See this thread for details of what such a shaper would do:
|
| - *
|
| - * http://lists.freedesktop.org/archives/harfbuzz/2013-April/003070.html
|
| - */
|
| /* Unicode-1.1 additions */
|
| case HB_SCRIPT_HANGUL:
|
|
|
| return &_hb_ot_complex_shaper_hangul;
|
| -#endif
|
| +
|
| +
|
| + /* Unicode-2.0 additions */
|
| + case HB_SCRIPT_TIBETAN:
|
| +
|
| + return &_hb_ot_complex_shaper_tibetan;
|
| +
|
| +
|
| + /* Unicode-1.1 additions */
|
| + case HB_SCRIPT_HEBREW:
|
| +
|
| + return &_hb_ot_complex_shaper_hebrew;
|
|
|
|
|
| /* ^--- Add new shapers here */
|
| @@ -241,9 +244,6 @@ hb_ot_shape_complex_categorize (const hb_ot_shape_planner_t *planner)
|
| case HB_SCRIPT_LAO:
|
| case HB_SCRIPT_THAI:
|
|
|
| - /* Unicode-2.0 additions */
|
| - case HB_SCRIPT_TIBETAN:
|
| -
|
| /* Unicode-3.2 additions */
|
| case HB_SCRIPT_TAGALOG:
|
| case HB_SCRIPT_TAGBANWA:
|
|
|