diff --git a/src/hb-ot-layout-common.hh b/src/hb-ot-layout-common.hh index 53c186f5c..3bf0f8f82 100644 --- a/src/hb-ot-layout-common.hh +++ b/src/hb-ot-layout-common.hh @@ -1387,6 +1387,11 @@ struct Lookup { unsigned new_flag = lookupFlag; new_flag &= ~LookupFlag::UseMarkFilteringSet; + // https://github.com/harfbuzz/harfbuzz/issues/5499 + // If we remove UseMarkFilteringSet flag because the set is now empty, + // we need to add IgnoreMarks flag, otherwise the lookup will not + // ignore any marks, which changes the behavior. + new_flag |= LookupFlag::IgnoreMarks; out->lookupFlag = new_flag; } else diff --git a/test/subset/data/expected/layout.markfilteringset/AmiriQuran.layout-test.0649,064E,0647,0627.ttf b/test/subset/data/expected/layout.markfilteringset/AmiriQuran.layout-test.0649,064E,0647,0627.ttf new file mode 100644 index 000000000..181701ccf Binary files /dev/null and b/test/subset/data/expected/layout.markfilteringset/AmiriQuran.layout-test.0649,064E,0647,0627.ttf differ diff --git a/test/subset/data/fonts/AmiriQuran.ttf b/test/subset/data/fonts/AmiriQuran.ttf new file mode 100644 index 000000000..51571483a Binary files /dev/null and b/test/subset/data/fonts/AmiriQuran.ttf differ diff --git a/test/subset/data/tests/layout.markfilteringset.tests b/test/subset/data/tests/layout.markfilteringset.tests new file mode 100644 index 000000000..be232a0e3 --- /dev/null +++ b/test/subset/data/tests/layout.markfilteringset.tests @@ -0,0 +1,11 @@ +FONTS: +AmiriQuran.ttf + +PROFILES: +layout-test.txt + +SUBSETS: +U+0649,U+064E,U+0647,U+0627 + +OPTIONS: +no_fonttools diff --git a/test/subset/meson.build b/test/subset/meson.build index 5c88e16ce..1187e1560 100644 --- a/test/subset/meson.build +++ b/test/subset/meson.build @@ -33,6 +33,7 @@ tests = [ 'layout.context_format2', 'layout.gdef-varstore', 'layout.gdef-attachlist', + 'layout.markfilteringset', 'layout.notonastaliqurdu', 'layout.tinos', 'layout.duplicate_features',