walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[config] More trak disabling 

Part of https://github.com/harfbuzz/harfbuzz/issues/1652
This commit is contained in:
Behdad Esfahbod 2019-06-19 17:02:32 -07:00
parent d84932ba50
commit 43d7048d59
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/hb-ot-shape.cc
View File

@ -112,10 +112,12 @@ hb_ot_shape_planner_t::compile (hb_ot_shape_plan_t &plan,
hb_tag_t kern_tag = HB_DIRECTION_IS_HORIZONTAL (props.direction) ? hb_tag_t kern_tag = HB_DIRECTION_IS_HORIZONTAL (props.direction) ?
HB_TAG ('k','e','r','n') : HB_TAG ('v','k','r','n'); HB_TAG ('k','e','r','n') : HB_TAG ('v','k','r','n');
plan.kern_mask = plan.map.get_mask (kern_tag); plan.kern_mask = plan.map.get_mask (kern_tag);
#ifndef HB_NO_SHAPE_AAT
plan.trak_mask = plan.map.get_mask (HB_TAG ('t','r','a','k')); 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; plan.requested_kerning = !!plan.kern_mask;
plan.requested_tracking = !!plan.trak_mask;
bool has_gpos_kern = plan.map.get_feature_index (1, kern_tag) != HB_OT_LAYOUT_NO_FEATURE_INDEX; 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 && bool disable_gpos = plan.shaper->gpos_tag &&
plan.shaper->gpos_tag != plan.map.chosen_script[1]; plan.shaper->gpos_tag != plan.map.chosen_script[1];

8
src/hb-ot-shape.hh
View File

@ -74,10 +74,18 @@ struct hb_ot_shape_plan_t
#endif #endif
hb_mask_t rtlm_mask; hb_mask_t rtlm_mask;
hb_mask_t kern_mask; hb_mask_t kern_mask;
#ifndef HB_NO_SHAPE_AAT
hb_mask_t trak_mask; hb_mask_t trak_mask;
#else
static constexpr hb_mask_t trak_mask = 0;
#endif
bool requested_kerning : 1; bool requested_kerning : 1;
#ifndef HB_NO_SHAPE_AAT
bool requested_tracking : 1; bool requested_tracking : 1;
#else
static constexpr bool requested_tracking = false;
#endif
#ifndef HB_NO_OT_SHAPE_FRACTIONS #ifndef HB_NO_OT_SHAPE_FRACTIONS
bool has_frac : 1; bool has_frac : 1;
#else #else