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

[ot-shape] Tweak table order some more; apply GPOS with morx 

During 5bc05ba155 accidentally GPOS was disabled when morx was
enabled. Fix that.

Fixes https://github.com/harfbuzz/harfbuzz/issues/2757#issuecomment-933531978
This commit is contained in:
Behdad Esfahbod 2021-10-04 08:40:24 -06:00
parent f8ebb8a657
commit d58f1685ce
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -150,23 +150,25 @@ hb_ot_shape_planner_t::compile (hb_ot_shape_plan_t &plan,
*/ */
#ifndef HB_NO_AAT_SHAPE #ifndef HB_NO_AAT_SHAPE
bool has_gsub = hb_ot_layout_has_substitution (face); bool has_kerx = hb_aat_layout_has_positioning (face);
bool has_gsub = !apply_morx && hb_ot_layout_has_substitution (face);
#endif #endif
bool has_gpos = !disable_gpos && hb_ot_layout_has_positioning (face); bool has_gpos = !disable_gpos && hb_ot_layout_has_positioning (face);
if (false) if (false)
; ;
#ifndef HB_NO_AAT_SHAPE #ifndef HB_NO_AAT_SHAPE
else if (hb_aat_layout_has_positioning (face) && !(has_gsub && has_gpos)) /* Prefer GPOS over kerx if GSUB is present;
* https://github.com/harfbuzz/harfbuzz/issues/3008 */
else if (has_kerx && !(has_gsub && has_gpos))
plan.apply_kerx = true; plan.apply_kerx = true;
#endif #endif
else if (!apply_morx && has_gpos) else if (has_gpos)
plan.apply_gpos = true; plan.apply_gpos = true;
if (!plan.apply_kerx && (!has_gpos_kern || !plan.apply_gpos)) if (!plan.apply_kerx && (!has_gpos_kern || !plan.apply_gpos))
{ {
/* Apparently Apple applies kerx if GPOS kern was not applied. */
#ifndef HB_NO_AAT_SHAPE #ifndef HB_NO_AAT_SHAPE
if (hb_aat_layout_has_positioning (face)) if (has_kerx)
plan.apply_kerx = true; plan.apply_kerx = true;
else else
#endif #endif