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

[khmer] Revert previous change, and remove pauses 

This makes test suite happy again (at 44) while fixing the sequences
we were fixing, which were the following with KhmerUI.ttf:

  U+1789,U+17BC
  U+1789,U+17D2,U+1789
  U+1789,U+17D2,U+1789,U+17BC

Fixes rest of https://github.com/harfbuzz/harfbuzz/issues/974
This commit is contained in:
Behdad Esfahbod 2018-07-31 13:35:10 -07:00
parent 7c658ea2f2
commit 8eef1964a7
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/hb-ot-shape-complex-khmer.cc
View File

@ -107,18 +107,9 @@ collect_features_khmer (hb_ot_shape_planner_t *plan)
map->add_gsub_pause (setup_syllables); map->add_gsub_pause (setup_syllables);
map->add_gsub_pause (reorder); map->add_gsub_pause (reorder);
map->add_global_bool_feature (HB_TAG('l','o','c','l')); /* Testing suggests that Uniscribe does NOT before between basic
map->add_gsub_pause (nullptr); * features. Test with KhmerUI.ttf and the following three
* sequences:
unsigned int i = 0;
for (; i < KHMER_BASIC_FEATURES; i++) {
map->add_feature (khmer_features[i].tag, 1, khmer_features[i].flags | F_MANUAL_ZWJ | F_MANUAL_ZWNJ);
map->add_gsub_pause (nullptr);
}
/* Testing suggests that Uniscribe applies 'ccmp' here, NOT before
* the basic features. Test with KhmerUI.ttf and the following
* three sequences:
* *
* U+1789,U+17BC * U+1789,U+17BC
* U+1789,U+17D2,U+1789 * U+1789,U+17D2,U+1789
@ -126,14 +117,20 @@ collect_features_khmer (hb_ot_shape_planner_t *plan)
* *
* https://github.com/harfbuzz/harfbuzz/issues/974 * https://github.com/harfbuzz/harfbuzz/issues/974
*/ */
map->add_global_bool_feature (HB_TAG('l','o','c','l'));
map->add_global_bool_feature (HB_TAG('c','c','m','p')); map->add_global_bool_feature (HB_TAG('c','c','m','p'));
unsigned int i = 0;
for (; i < KHMER_BASIC_FEATURES; i++) {
map->add_feature (khmer_features[i].tag, 1, khmer_features[i].flags | F_MANUAL_ZWJ | F_MANUAL_ZWNJ);
}
map->add_gsub_pause (nullptr); map->add_gsub_pause (nullptr);
for (; i < KHMER_NUM_FEATURES; i++) { for (; i < KHMER_NUM_FEATURES; i++) {
map->add_feature (khmer_features[i].tag, 1, khmer_features[i].flags | F_MANUAL_ZWJ | F_MANUAL_ZWNJ); map->add_feature (khmer_features[i].tag, 1, khmer_features[i].flags | F_MANUAL_ZWJ | F_MANUAL_ZWNJ);
} }
map->add_global_bool_feature (HB_TAG('c','a','l','t')); map->add_global_bool_feature (HB_TAG('c','a','l','t'));
map->add_global_bool_feature (HB_TAG('c','l','i','g')); map->add_global_bool_feature (HB_TAG('c','l','i','g'));