[config] Disable more legacy kerning

Part of https://github.com/harfbuzz/harfbuzz/issues/1652
This commit is contained in:
Behdad Esfahbod 2019-06-19 17:04:16 -07:00
parent 43d7048d59
commit d8bf6723a1
2 changed files with 11 additions and 1 deletions

View File

@ -111,13 +111,15 @@ hb_ot_shape_planner_t::compile (hb_ot_shape_plan_t &plan,
plan.rtlm_mask = plan.map.get_1_mask (HB_TAG ('r','t','l','m'));
hb_tag_t kern_tag = HB_DIRECTION_IS_HORIZONTAL (props.direction) ?
HB_TAG ('k','e','r','n') : HB_TAG ('v','k','r','n');
#ifndef HB_NO_OT_KERN
plan.kern_mask = plan.map.get_mask (kern_tag);
plan.requested_kerning = !!plan.kern_mask;
#endif
#ifndef HB_NO_SHAPE_AAT
plan.trak_mask = plan.map.get_mask (HB_TAG ('t','r','a','k'));
plan.requested_tracking = !!plan.trak_mask;
#endif
plan.requested_kerning = !!plan.kern_mask;
bool has_gpos_kern = plan.map.get_feature_index (1, kern_tag) != HB_OT_LAYOUT_NO_FEATURE_INDEX;
bool disable_gpos = plan.shaper->gpos_tag &&
plan.shaper->gpos_tag != plan.map.chosen_script[1];

View File

@ -73,14 +73,22 @@ struct hb_ot_shape_plan_t
static constexpr hb_mask_t dnom_mask = 0;
#endif
hb_mask_t rtlm_mask;
#ifndef HB_NO_OT_KERN
hb_mask_t kern_mask;
#else
static constexpr hb_mask_t kern_mask = 0;
#endif
#ifndef HB_NO_SHAPE_AAT
hb_mask_t trak_mask;
#else
static constexpr hb_mask_t trak_mask = 0;
#endif
#ifndef HB_NO_OT_KERN
bool requested_kerning : 1;
#else
static constexpr bool requested_kerning = false;
#endif
#ifndef HB_NO_SHAPE_AAT
bool requested_tracking : 1;
#else