diff --git a/src/hb-subset-input.cc b/src/hb-subset-input.cc index fe9be3ce0..1f64bc99a 100644 --- a/src/hb-subset-input.cc +++ b/src/hb-subset-input.cc @@ -56,9 +56,6 @@ hb_subset_input_create_or_fail () hb_tag_t default_drop_tables[] = { // Layout disabled by default - HB_TAG ('G', 'S', 'U', 'B'), - HB_TAG ('G', 'P', 'O', 'S'), - HB_TAG ('G', 'D', 'E', 'F'), HB_TAG ('m', 'o', 'r', 'x'), HB_TAG ('m', 'o', 'r', 't'), HB_TAG ('k', 'e', 'r', 'x'), diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.default.61,62,63.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.default.61,62,63.ttf index 31a409360..40bf05ac9 100644 Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.default.61,62,63.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.default.61,62,63.ttf differ diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.default.61,63.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.default.61,63.ttf index 31b8d9a3f..177704080 100644 Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.default.61,63.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.default.61,63.ttf differ diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.default.61.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.default.61.ttf index 9411e4629..843c8e930 100644 Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.default.61.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.default.61.ttf differ diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.default.62.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.default.62.ttf index 8d561d596..a3bebd8ff 100644 Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.default.62.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.default.62.ttf differ diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.default.63.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.default.63.ttf index 88ab0e119..23a8777d6 100644 Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.default.63.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.default.63.ttf differ diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.default.retain-all-codepoint.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.default.retain-all-codepoint.ttf index a29c7086f..d326ca1d8 100644 Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.default.retain-all-codepoint.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.default.retain-all-codepoint.ttf differ diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints-retain-gids.61,62,63.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints-retain-gids.61,62,63.ttf index 758299569..710423151 100644 Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints-retain-gids.61,62,63.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints-retain-gids.61,62,63.ttf differ diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints-retain-gids.61,63.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints-retain-gids.61,63.ttf index 1f8379624..6fdf9cfd8 100644 Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints-retain-gids.61,63.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints-retain-gids.61,63.ttf differ diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints-retain-gids.61.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints-retain-gids.61.ttf index 354ee0718..ac7027910 100644 Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints-retain-gids.61.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints-retain-gids.61.ttf differ diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints-retain-gids.62.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints-retain-gids.62.ttf index 68c21bf04..e1491a71e 100644 Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints-retain-gids.62.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints-retain-gids.62.ttf differ diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints-retain-gids.63.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints-retain-gids.63.ttf index c2d90fc1a..46c3e11c2 100644 Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints-retain-gids.63.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints-retain-gids.63.ttf differ diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints-retain-gids.retain-all-codepoint.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints-retain-gids.retain-all-codepoint.ttf index 41a6bee1f..318fb5cee 100644 Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints-retain-gids.retain-all-codepoint.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints-retain-gids.retain-all-codepoint.ttf differ diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints.61,62,63.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints.61,62,63.ttf index 345b9c9b5..737e4a699 100644 Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints.61,62,63.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints.61,62,63.ttf differ diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints.61,63.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints.61,63.ttf index d6fab9b57..8682d3f20 100644 Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints.61,63.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints.61,63.ttf differ diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints.61.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints.61.ttf index 84313ca01..13b531a3e 100644 Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints.61.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints.61.ttf differ diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints.62.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints.62.ttf index c41f61b8e..3e1c61c98 100644 Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints.62.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints.62.ttf differ diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints.63.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints.63.ttf index 01482f0b2..d26f383ed 100644 Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints.63.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints.63.ttf differ diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints.retain-all-codepoint.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints.retain-all-codepoint.ttf index eaadf2587..93deb826c 100644 Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints.retain-all-codepoint.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints.retain-all-codepoint.ttf differ diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.gids.61,62,63.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.gids.61,62,63.ttf index f720295f0..10f03ba77 100644 Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.gids.61,62,63.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.gids.61,62,63.ttf differ diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.gids.61,63.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.gids.61,63.ttf index e711246a3..2bba31db4 100644 Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.gids.61,63.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.gids.61,63.ttf differ diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.gids.61.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.gids.61.ttf index 8936629f8..5a9ed5934 100644 Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.gids.61.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.gids.61.ttf differ diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.gids.62.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.gids.62.ttf index a8b6914ac..d04e60dc5 100644 Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.gids.62.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.gids.62.ttf differ diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.gids.63.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.gids.63.ttf index 4a53bb27a..4bd56f1a6 100644 Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.gids.63.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.gids.63.ttf differ diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.gids.retain-all-codepoint.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.gids.retain-all-codepoint.ttf index a29c7086f..d326ca1d8 100644 Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.gids.retain-all-codepoint.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.gids.retain-all-codepoint.ttf differ diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.keep-layout-drop-hints.61,62,63.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.keep-layout-drop-hints.61,62,63.ttf deleted file mode 100644 index 737e4a699..000000000 Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.keep-layout-drop-hints.61,62,63.ttf and /dev/null differ diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.keep-layout-drop-hints.61,63.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.keep-layout-drop-hints.61,63.ttf deleted file mode 100644 index 8682d3f20..000000000 Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.keep-layout-drop-hints.61,63.ttf and /dev/null differ diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.keep-layout-drop-hints.61.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.keep-layout-drop-hints.61.ttf deleted file mode 100644 index 13b531a3e..000000000 Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.keep-layout-drop-hints.61.ttf and /dev/null differ diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.keep-layout-drop-hints.62.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.keep-layout-drop-hints.62.ttf deleted file mode 100644 index 3e1c61c98..000000000 Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.keep-layout-drop-hints.62.ttf and /dev/null differ diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.keep-layout-drop-hints.63.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.keep-layout-drop-hints.63.ttf deleted file mode 100644 index d26f383ed..000000000 Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.keep-layout-drop-hints.63.ttf and /dev/null differ diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.keep-layout-drop-hints.retain-all-codepoint.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.keep-layout-drop-hints.retain-all-codepoint.ttf deleted file mode 100644 index 93deb826c..000000000 Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.keep-layout-drop-hints.retain-all-codepoint.ttf and /dev/null differ diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.keep-layout.61,62,63.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.keep-layout.61,62,63.ttf deleted file mode 100644 index 40bf05ac9..000000000 Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.keep-layout.61,62,63.ttf and /dev/null differ diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.keep-layout.61,63.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.keep-layout.61,63.ttf deleted file mode 100644 index 177704080..000000000 Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.keep-layout.61,63.ttf and /dev/null differ diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.keep-layout.61.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.keep-layout.61.ttf deleted file mode 100644 index 843c8e930..000000000 Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.keep-layout.61.ttf and /dev/null differ diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.keep-layout.62.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.keep-layout.62.ttf deleted file mode 100644 index a3bebd8ff..000000000 Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.keep-layout.62.ttf and /dev/null differ diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.keep-layout.63.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.keep-layout.63.ttf deleted file mode 100644 index 23a8777d6..000000000 Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.keep-layout.63.ttf and /dev/null differ diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.keep-layout.retain-all-codepoint.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.keep-layout.retain-all-codepoint.ttf deleted file mode 100644 index d326ca1d8..000000000 Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.keep-layout.retain-all-codepoint.ttf and /dev/null differ diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.name-ids.61,62,63.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.name-ids.61,62,63.ttf index 748b6d9f8..efb836e4e 100644 Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.name-ids.61,62,63.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.name-ids.61,62,63.ttf differ diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.name-ids.61,63.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.name-ids.61,63.ttf index c639e4d4c..91b6cfa7f 100644 Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.name-ids.61,63.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.name-ids.61,63.ttf differ diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.name-ids.61.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.name-ids.61.ttf index 2cf7df702..2da8cc080 100644 Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.name-ids.61.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.name-ids.61.ttf differ diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.name-ids.62.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.name-ids.62.ttf index 4890c3ba0..7cb31a020 100644 Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.name-ids.62.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.name-ids.62.ttf differ diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.name-ids.63.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.name-ids.63.ttf index 13fc238cb..0c828d2ba 100644 Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.name-ids.63.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.name-ids.63.ttf differ diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.name-ids.retain-all-codepoint.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.name-ids.retain-all-codepoint.ttf index 412898988..df3fc8c5c 100644 Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.name-ids.retain-all-codepoint.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.name-ids.retain-all-codepoint.ttf differ diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.name-languages.61,62,63.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.name-languages.61,62,63.ttf index 31a409360..40bf05ac9 100644 Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.name-languages.61,62,63.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.name-languages.61,62,63.ttf differ diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.name-languages.61,63.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.name-languages.61,63.ttf index 31b8d9a3f..177704080 100644 Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.name-languages.61,63.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.name-languages.61,63.ttf differ diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.name-languages.61.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.name-languages.61.ttf index 9411e4629..843c8e930 100644 Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.name-languages.61.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.name-languages.61.ttf differ diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.name-languages.62.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.name-languages.62.ttf index 8d561d596..a3bebd8ff 100644 Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.name-languages.62.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.name-languages.62.ttf differ diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.name-languages.63.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.name-languages.63.ttf index 88ab0e119..23a8777d6 100644 Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.name-languages.63.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.name-languages.63.ttf differ diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.name-languages.retain-all-codepoint.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.name-languages.retain-all-codepoint.ttf index a29c7086f..d326ca1d8 100644 Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.name-languages.retain-all-codepoint.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.name-languages.retain-all-codepoint.ttf differ diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.name-legacy.61,62,63.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.name-legacy.61,62,63.ttf index 31a409360..40bf05ac9 100644 Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.name-legacy.61,62,63.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.name-legacy.61,62,63.ttf differ diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.name-legacy.61,63.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.name-legacy.61,63.ttf index 31b8d9a3f..177704080 100644 Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.name-legacy.61,63.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.name-legacy.61,63.ttf differ diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.name-legacy.61.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.name-legacy.61.ttf index 9411e4629..843c8e930 100644 Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.name-legacy.61.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.name-legacy.61.ttf differ diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.name-legacy.62.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.name-legacy.62.ttf index 8d561d596..a3bebd8ff 100644 Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.name-legacy.62.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.name-legacy.62.ttf differ diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.name-legacy.63.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.name-legacy.63.ttf index 88ab0e119..23a8777d6 100644 Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.name-legacy.63.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.name-legacy.63.ttf differ diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.name-legacy.retain-all-codepoint.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.name-legacy.retain-all-codepoint.ttf index a29c7086f..d326ca1d8 100644 Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.name-legacy.retain-all-codepoint.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.name-legacy.retain-all-codepoint.ttf differ diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.retain-gids.61,62,63.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.retain-gids.61,62,63.ttf index fbe8501cb..61231afd7 100644 Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.retain-gids.61,62,63.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.retain-gids.61,62,63.ttf differ diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.retain-gids.61,63.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.retain-gids.61,63.ttf index be4e5b432..32e770025 100644 Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.retain-gids.61,63.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.retain-gids.61,63.ttf differ diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.retain-gids.61.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.retain-gids.61.ttf index 89f37bf74..1879a473a 100644 Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.retain-gids.61.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.retain-gids.61.ttf differ diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.retain-gids.62.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.retain-gids.62.ttf index e29948384..037c29d99 100644 Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.retain-gids.62.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.retain-gids.62.ttf differ diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.retain-gids.63.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.retain-gids.63.ttf index 5787e505b..3735a53d7 100644 Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.retain-gids.63.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.retain-gids.63.ttf differ diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.retain-gids.retain-all-codepoint.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.retain-gids.retain-all-codepoint.ttf index 75f48031d..ed342d124 100644 Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.retain-gids.retain-all-codepoint.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.retain-gids.retain-all-codepoint.ttf differ diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.keep-layout-drop-hints.61,62,63.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.keep-layout-drop-hints.61,62,63.ttf deleted file mode 100644 index bf8264b44..000000000 Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.keep-layout-drop-hints.61,62,63.ttf and /dev/null differ diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.keep-layout-drop-hints.61,63.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.keep-layout-drop-hints.61,63.ttf deleted file mode 100644 index bc54940a3..000000000 Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.keep-layout-drop-hints.61,63.ttf and /dev/null differ diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.keep-layout-drop-hints.61.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.keep-layout-drop-hints.61.ttf deleted file mode 100644 index 9b261449d..000000000 Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.keep-layout-drop-hints.61.ttf and /dev/null differ diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.keep-layout-drop-hints.62.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.keep-layout-drop-hints.62.ttf deleted file mode 100644 index 32cf9f7da..000000000 Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.keep-layout-drop-hints.62.ttf and /dev/null differ diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.keep-layout-drop-hints.63.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.keep-layout-drop-hints.63.ttf deleted file mode 100644 index 776e758f0..000000000 Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.keep-layout-drop-hints.63.ttf and /dev/null differ diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.keep-layout-drop-hints.retain-all-codepoint.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.keep-layout-drop-hints.retain-all-codepoint.ttf deleted file mode 100644 index 892ccb8ea..000000000 Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.keep-layout-drop-hints.retain-all-codepoint.ttf and /dev/null differ diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.keep-layout.61,62,63.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.keep-layout.61,62,63.ttf deleted file mode 100644 index dbed582fb..000000000 Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.keep-layout.61,62,63.ttf and /dev/null differ diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.keep-layout.61,63.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.keep-layout.61,63.ttf deleted file mode 100644 index 5913420e3..000000000 Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.keep-layout.61,63.ttf and /dev/null differ diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.keep-layout.61.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.keep-layout.61.ttf deleted file mode 100644 index 3635f68be..000000000 Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.keep-layout.61.ttf and /dev/null differ diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.keep-layout.62.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.keep-layout.62.ttf deleted file mode 100644 index 91fcad84a..000000000 Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.keep-layout.62.ttf and /dev/null differ diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.keep-layout.63.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.keep-layout.63.ttf deleted file mode 100644 index 737cbdc7e..000000000 Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.keep-layout.63.ttf and /dev/null differ diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.keep-layout.retain-all-codepoint.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.keep-layout.retain-all-codepoint.ttf deleted file mode 100644 index 9744bc31d..000000000 Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.keep-layout.retain-all-codepoint.ttf and /dev/null differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.default.61,62,63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.default.61,62,63.ttf index 12d92081b..712674fa2 100644 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.default.61,62,63.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.default.61,62,63.ttf differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.default.61,63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.default.61,63.ttf index 1af233f48..f4b4a0852 100644 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.default.61,63.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.default.61,63.ttf differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.default.61.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.default.61.ttf index a699eea0b..60e3c5cbb 100644 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.default.61.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.default.61.ttf differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.default.62.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.default.62.ttf index 52706dc90..a2916f82b 100644 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.default.62.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.default.62.ttf differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.default.63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.default.63.ttf index 3de7c7734..e3964f8e9 100644 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.default.63.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.default.63.ttf differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.default.retain-all-codepoint.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.default.retain-all-codepoint.ttf index 12d92081b..712674fa2 100644 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.default.retain-all-codepoint.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.default.retain-all-codepoint.ttf differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints-retain-gids.61,62,63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints-retain-gids.61,62,63.ttf index 52dc47457..e329f2544 100644 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints-retain-gids.61,62,63.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints-retain-gids.61,62,63.ttf differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints-retain-gids.61,63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints-retain-gids.61,63.ttf index d6c516eec..11a40cddb 100644 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints-retain-gids.61,63.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints-retain-gids.61,63.ttf differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints-retain-gids.61.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints-retain-gids.61.ttf index 128eae016..71407314e 100644 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints-retain-gids.61.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints-retain-gids.61.ttf differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints-retain-gids.62.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints-retain-gids.62.ttf index 2d2b65b0d..d2c5b79b4 100644 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints-retain-gids.62.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints-retain-gids.62.ttf differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints-retain-gids.63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints-retain-gids.63.ttf index ac735b3cb..d71fcf642 100644 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints-retain-gids.63.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints-retain-gids.63.ttf differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints-retain-gids.retain-all-codepoint.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints-retain-gids.retain-all-codepoint.ttf index 52dc47457..e329f2544 100644 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints-retain-gids.retain-all-codepoint.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints-retain-gids.retain-all-codepoint.ttf differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints.61,62,63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints.61,62,63.ttf index 52dc47457..e329f2544 100644 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints.61,62,63.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints.61,62,63.ttf differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints.61,63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints.61,63.ttf index 1873672bf..726d076b6 100644 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints.61,63.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints.61,63.ttf differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints.61.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints.61.ttf index 128eae016..71407314e 100644 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints.61.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints.61.ttf differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints.62.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints.62.ttf index 122b10976..27a579fa9 100644 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints.62.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints.62.ttf differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints.63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints.63.ttf index 381e97e93..494fd3d5f 100644 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints.63.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints.63.ttf differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints.retain-all-codepoint.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints.retain-all-codepoint.ttf index 52dc47457..e329f2544 100644 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints.retain-all-codepoint.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints.retain-all-codepoint.ttf differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.gids.61,62,63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.gids.61,62,63.ttf index 12d92081b..712674fa2 100644 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.gids.61,62,63.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.gids.61,62,63.ttf differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.gids.61,63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.gids.61,63.ttf index 12d92081b..712674fa2 100644 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.gids.61,63.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.gids.61,63.ttf differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.gids.61.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.gids.61.ttf index 12d92081b..712674fa2 100644 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.gids.61.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.gids.61.ttf differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.gids.62.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.gids.62.ttf index 12d92081b..712674fa2 100644 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.gids.62.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.gids.62.ttf differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.gids.63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.gids.63.ttf index 12d92081b..712674fa2 100644 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.gids.63.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.gids.63.ttf differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.gids.retain-all-codepoint.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.gids.retain-all-codepoint.ttf index 12d92081b..712674fa2 100644 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.gids.retain-all-codepoint.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.gids.retain-all-codepoint.ttf differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.keep-layout-drop-hints.61,62,63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.keep-layout-drop-hints.61,62,63.ttf deleted file mode 100644 index e329f2544..000000000 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.keep-layout-drop-hints.61,62,63.ttf and /dev/null differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.keep-layout-drop-hints.61,63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.keep-layout-drop-hints.61,63.ttf deleted file mode 100644 index 726d076b6..000000000 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.keep-layout-drop-hints.61,63.ttf and /dev/null differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.keep-layout-drop-hints.61.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.keep-layout-drop-hints.61.ttf deleted file mode 100644 index 71407314e..000000000 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.keep-layout-drop-hints.61.ttf and /dev/null differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.keep-layout-drop-hints.62.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.keep-layout-drop-hints.62.ttf deleted file mode 100644 index 27a579fa9..000000000 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.keep-layout-drop-hints.62.ttf and /dev/null differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.keep-layout-drop-hints.63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.keep-layout-drop-hints.63.ttf deleted file mode 100644 index 494fd3d5f..000000000 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.keep-layout-drop-hints.63.ttf and /dev/null differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.keep-layout-drop-hints.retain-all-codepoint.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.keep-layout-drop-hints.retain-all-codepoint.ttf deleted file mode 100644 index e329f2544..000000000 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.keep-layout-drop-hints.retain-all-codepoint.ttf and /dev/null differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.keep-layout.61,62,63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.keep-layout.61,62,63.ttf deleted file mode 100644 index 712674fa2..000000000 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.keep-layout.61,62,63.ttf and /dev/null differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.keep-layout.61,63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.keep-layout.61,63.ttf deleted file mode 100644 index f4b4a0852..000000000 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.keep-layout.61,63.ttf and /dev/null differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.keep-layout.61.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.keep-layout.61.ttf deleted file mode 100644 index 60e3c5cbb..000000000 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.keep-layout.61.ttf and /dev/null differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.keep-layout.62.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.keep-layout.62.ttf deleted file mode 100644 index a2916f82b..000000000 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.keep-layout.62.ttf and /dev/null differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.keep-layout.63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.keep-layout.63.ttf deleted file mode 100644 index e3964f8e9..000000000 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.keep-layout.63.ttf and /dev/null differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.keep-layout.retain-all-codepoint.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.keep-layout.retain-all-codepoint.ttf deleted file mode 100644 index 712674fa2..000000000 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.keep-layout.retain-all-codepoint.ttf and /dev/null differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.name-ids.61,62,63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.name-ids.61,62,63.ttf index 12d92081b..712674fa2 100644 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.name-ids.61,62,63.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.name-ids.61,62,63.ttf differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.name-ids.61,63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.name-ids.61,63.ttf index 1af233f48..f4b4a0852 100644 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.name-ids.61,63.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.name-ids.61,63.ttf differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.name-ids.61.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.name-ids.61.ttf index a699eea0b..60e3c5cbb 100644 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.name-ids.61.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.name-ids.61.ttf differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.name-ids.62.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.name-ids.62.ttf index 52706dc90..a2916f82b 100644 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.name-ids.62.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.name-ids.62.ttf differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.name-ids.63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.name-ids.63.ttf index 3de7c7734..e3964f8e9 100644 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.name-ids.63.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.name-ids.63.ttf differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.name-ids.retain-all-codepoint.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.name-ids.retain-all-codepoint.ttf index 12d92081b..712674fa2 100644 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.name-ids.retain-all-codepoint.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.name-ids.retain-all-codepoint.ttf differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.name-languages.61,62,63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.name-languages.61,62,63.ttf index 12d92081b..712674fa2 100644 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.name-languages.61,62,63.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.name-languages.61,62,63.ttf differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.name-languages.61,63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.name-languages.61,63.ttf index 1af233f48..f4b4a0852 100644 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.name-languages.61,63.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.name-languages.61,63.ttf differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.name-languages.61.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.name-languages.61.ttf index a699eea0b..60e3c5cbb 100644 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.name-languages.61.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.name-languages.61.ttf differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.name-languages.62.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.name-languages.62.ttf index 52706dc90..a2916f82b 100644 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.name-languages.62.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.name-languages.62.ttf differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.name-languages.63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.name-languages.63.ttf index 3de7c7734..e3964f8e9 100644 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.name-languages.63.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.name-languages.63.ttf differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.name-languages.retain-all-codepoint.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.name-languages.retain-all-codepoint.ttf index 12d92081b..712674fa2 100644 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.name-languages.retain-all-codepoint.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.name-languages.retain-all-codepoint.ttf differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.name-legacy.61,62,63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.name-legacy.61,62,63.ttf index 12d92081b..712674fa2 100644 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.name-legacy.61,62,63.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.name-legacy.61,62,63.ttf differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.name-legacy.61,63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.name-legacy.61,63.ttf index 1af233f48..f4b4a0852 100644 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.name-legacy.61,63.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.name-legacy.61,63.ttf differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.name-legacy.61.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.name-legacy.61.ttf index a699eea0b..60e3c5cbb 100644 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.name-legacy.61.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.name-legacy.61.ttf differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.name-legacy.62.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.name-legacy.62.ttf index 52706dc90..a2916f82b 100644 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.name-legacy.62.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.name-legacy.62.ttf differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.name-legacy.63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.name-legacy.63.ttf index 3de7c7734..e3964f8e9 100644 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.name-legacy.63.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.name-legacy.63.ttf differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.name-legacy.retain-all-codepoint.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.name-legacy.retain-all-codepoint.ttf index 12d92081b..712674fa2 100644 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.name-legacy.retain-all-codepoint.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.name-legacy.retain-all-codepoint.ttf differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.retain-gids.61,62,63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.retain-gids.61,62,63.ttf index 12d92081b..712674fa2 100644 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.retain-gids.61,62,63.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.retain-gids.61,62,63.ttf differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.retain-gids.61,63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.retain-gids.61,63.ttf index f54537565..89abe99f2 100644 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.retain-gids.61,63.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.retain-gids.61,63.ttf differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.retain-gids.61.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.retain-gids.61.ttf index a699eea0b..60e3c5cbb 100644 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.retain-gids.61.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.retain-gids.61.ttf differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.retain-gids.62.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.retain-gids.62.ttf index eb84f9c9f..aab73fd8c 100644 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.retain-gids.62.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.retain-gids.62.ttf differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.retain-gids.63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.retain-gids.63.ttf index efd7c16fb..0946e02c3 100644 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.retain-gids.63.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.retain-gids.63.ttf differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.retain-gids.retain-all-codepoint.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.retain-gids.retain-all-codepoint.ttf index 12d92081b..712674fa2 100644 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.retain-gids.retain-all-codepoint.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.retain-gids.retain-all-codepoint.ttf differ diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.default.2049.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.default.2049.ttf index 5d8b04f7e..6b82a2903 100644 Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.default.2049.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.default.2049.ttf differ diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.default.38,2049.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.default.38,2049.ttf index 058cc2acd..9dd4d2efb 100644 Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.default.38,2049.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.default.38,2049.ttf differ diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.default.38,20E3.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.default.38,20E3.ttf index 11e4412b3..a8034f7a8 100644 Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.default.38,20E3.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.default.38,20E3.ttf differ diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.default.38,39,AE,2049,38,20E3.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.default.38,39,AE,2049,38,20E3.ttf index a53a3c634..c800f406f 100644 Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.default.38,39,AE,2049,38,20E3.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.default.38,39,AE,2049,38,20E3.ttf differ diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.default.38,AE,2049.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.default.38,AE,2049.ttf index a6be21400..3792ec5f9 100644 Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.default.38,AE,2049.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.default.38,AE,2049.ttf differ diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.default.39.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.default.39.ttf index b3d80000e..9570f7a76 100644 Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.default.39.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.default.39.ttf differ diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.default.AE.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.default.AE.ttf index 6eda40d05..54a914bc8 100644 Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.default.AE.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.default.AE.ttf differ diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints-retain-gids.2049.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints-retain-gids.2049.ttf index 516edf2ce..b2241cdcf 100644 Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints-retain-gids.2049.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints-retain-gids.2049.ttf differ diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints-retain-gids.38,2049.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints-retain-gids.38,2049.ttf index 75307b593..8068d6e4b 100644 Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints-retain-gids.38,2049.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints-retain-gids.38,2049.ttf differ diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints-retain-gids.38,20E3.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints-retain-gids.38,20E3.ttf index 232d48a5a..2386fec10 100644 Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints-retain-gids.38,20E3.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints-retain-gids.38,20E3.ttf differ diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints-retain-gids.38,39,AE,2049,38,20E3.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints-retain-gids.38,39,AE,2049,38,20E3.ttf index cafcec2c8..5b13eaf1b 100644 Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints-retain-gids.38,39,AE,2049,38,20E3.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints-retain-gids.38,39,AE,2049,38,20E3.ttf differ diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints-retain-gids.38,AE,2049.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints-retain-gids.38,AE,2049.ttf index 13bebcbdf..b56305601 100644 Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints-retain-gids.38,AE,2049.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints-retain-gids.38,AE,2049.ttf differ diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints-retain-gids.39.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints-retain-gids.39.ttf index 681723c3b..7e55cf5f7 100644 Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints-retain-gids.39.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints-retain-gids.39.ttf differ diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints-retain-gids.AE.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints-retain-gids.AE.ttf index b2f3346d9..246e09970 100644 Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints-retain-gids.AE.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints-retain-gids.AE.ttf differ diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints.2049.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints.2049.ttf index 1974057be..57414b33f 100644 Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints.2049.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints.2049.ttf differ diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints.38,2049.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints.38,2049.ttf index 346df6176..4dd5622a9 100644 Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints.38,2049.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints.38,2049.ttf differ diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints.38,20E3.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints.38,20E3.ttf index d01e7e0a3..69d9ade24 100644 Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints.38,20E3.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints.38,20E3.ttf differ diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints.38,39,AE,2049,38,20E3.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints.38,39,AE,2049,38,20E3.ttf index cafcec2c8..5b13eaf1b 100644 Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints.38,39,AE,2049,38,20E3.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints.38,39,AE,2049,38,20E3.ttf differ diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints.38,AE,2049.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints.38,AE,2049.ttf index 967397c2c..a7834d353 100644 Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints.38,AE,2049.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints.38,AE,2049.ttf differ diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints.39.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints.39.ttf index 07faf3d08..362463c07 100644 Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints.39.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints.39.ttf differ diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints.AE.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints.AE.ttf index b23af824f..e19a549ae 100644 Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints.AE.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints.AE.ttf differ diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.retain-gids.2049.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.retain-gids.2049.ttf index 76911a54a..f44eb7209 100644 Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.retain-gids.2049.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.retain-gids.2049.ttf differ diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.retain-gids.38,2049.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.retain-gids.38,2049.ttf index 77422d0a8..96ea0acee 100644 Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.retain-gids.38,2049.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.retain-gids.38,2049.ttf differ diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.retain-gids.38,20E3.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.retain-gids.38,20E3.ttf index 60a94b87d..3e749ea0e 100644 Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.retain-gids.38,20E3.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.retain-gids.38,20E3.ttf differ diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.retain-gids.38,39,AE,2049,38,20E3.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.retain-gids.38,39,AE,2049,38,20E3.ttf index a53a3c634..c800f406f 100644 Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.retain-gids.38,39,AE,2049,38,20E3.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.retain-gids.38,39,AE,2049,38,20E3.ttf differ diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.retain-gids.38,AE,2049.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.retain-gids.38,AE,2049.ttf index ee3d5cf48..ea9f7977d 100644 Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.retain-gids.38,AE,2049.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.retain-gids.38,AE,2049.ttf differ diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.retain-gids.39.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.retain-gids.39.ttf index 40208c0fe..c463b6488 100644 Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.retain-gids.39.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.retain-gids.39.ttf differ diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.retain-gids.AE.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.retain-gids.AE.ttf index f9b5d53b0..d9d73af26 100644 Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.retain-gids.AE.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.retain-gids.AE.ttf differ diff --git a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.default.1FC,21,41,20,62,63.otf b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.default.1FC,21,41,20,62,63.otf index 780b2787c..36b2980a9 100644 Binary files a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.default.1FC,21,41,20,62,63.otf and b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.default.1FC,21,41,20,62,63.otf differ diff --git a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.default.61,62,63.otf b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.default.61,62,63.otf index 655f8c27d..c4c49ad04 100644 Binary files a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.default.61,62,63.otf and b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.default.61,62,63.otf differ diff --git a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.default.D7,D8,D9,DA,DE.otf b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.default.D7,D8,D9,DA,DE.otf index bbc29edf4..be1e1d765 100644 Binary files a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.default.D7,D8,D9,DA,DE.otf and b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.default.D7,D8,D9,DA,DE.otf differ diff --git a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.desubroutinize-retain-gids.1FC,21,41,20,62,63.otf b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.desubroutinize-retain-gids.1FC,21,41,20,62,63.otf index 012e84362..f6d90c169 100644 Binary files a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.desubroutinize-retain-gids.1FC,21,41,20,62,63.otf and b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.desubroutinize-retain-gids.1FC,21,41,20,62,63.otf differ diff --git a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.desubroutinize-retain-gids.61,62,63.otf b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.desubroutinize-retain-gids.61,62,63.otf index eaafafee8..dd41df16b 100644 Binary files a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.desubroutinize-retain-gids.61,62,63.otf and b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.desubroutinize-retain-gids.61,62,63.otf differ diff --git a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.desubroutinize-retain-gids.D7,D8,D9,DA,DE.otf b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.desubroutinize-retain-gids.D7,D8,D9,DA,DE.otf index 4449e0e27..0f59d858e 100644 Binary files a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.desubroutinize-retain-gids.D7,D8,D9,DA,DE.otf and b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.desubroutinize-retain-gids.D7,D8,D9,DA,DE.otf differ diff --git a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.desubroutinize.1FC,21,41,20,62,63.otf b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.desubroutinize.1FC,21,41,20,62,63.otf index de556b5fe..da612a06c 100644 Binary files a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.desubroutinize.1FC,21,41,20,62,63.otf and b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.desubroutinize.1FC,21,41,20,62,63.otf differ diff --git a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.desubroutinize.61,62,63.otf b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.desubroutinize.61,62,63.otf index 85e2711a8..f65ae3133 100644 Binary files a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.desubroutinize.61,62,63.otf and b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.desubroutinize.61,62,63.otf differ diff --git a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.desubroutinize.D7,D8,D9,DA,DE.otf b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.desubroutinize.D7,D8,D9,DA,DE.otf index 98a856e53..41ea5309d 100644 Binary files a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.desubroutinize.D7,D8,D9,DA,DE.otf and b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.desubroutinize.D7,D8,D9,DA,DE.otf differ diff --git a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-desubroutinize-retain-gids.1FC,21,41,20,62,63.otf b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-desubroutinize-retain-gids.1FC,21,41,20,62,63.otf index 86b849ab1..6d85f68ef 100644 Binary files a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-desubroutinize-retain-gids.1FC,21,41,20,62,63.otf and b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-desubroutinize-retain-gids.1FC,21,41,20,62,63.otf differ diff --git a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-desubroutinize-retain-gids.61,62,63.otf b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-desubroutinize-retain-gids.61,62,63.otf index 08b023c54..d57a8f065 100644 Binary files a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-desubroutinize-retain-gids.61,62,63.otf and b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-desubroutinize-retain-gids.61,62,63.otf differ diff --git a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-desubroutinize-retain-gids.D7,D8,D9,DA,DE.otf b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-desubroutinize-retain-gids.D7,D8,D9,DA,DE.otf index 1c246c1b9..3d645389c 100644 Binary files a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-desubroutinize-retain-gids.D7,D8,D9,DA,DE.otf and b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-desubroutinize-retain-gids.D7,D8,D9,DA,DE.otf differ diff --git a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-desubroutinize.1FC,21,41,20,62,63.otf b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-desubroutinize.1FC,21,41,20,62,63.otf index d409eab92..3445faf66 100644 Binary files a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-desubroutinize.1FC,21,41,20,62,63.otf and b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-desubroutinize.1FC,21,41,20,62,63.otf differ diff --git a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-desubroutinize.61,62,63.otf b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-desubroutinize.61,62,63.otf index 910216e6f..baaae1d66 100644 Binary files a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-desubroutinize.61,62,63.otf and b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-desubroutinize.61,62,63.otf differ diff --git a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-desubroutinize.D7,D8,D9,DA,DE.otf b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-desubroutinize.D7,D8,D9,DA,DE.otf index c1d8776cd..4dbbaa3d2 100644 Binary files a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-desubroutinize.D7,D8,D9,DA,DE.otf and b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-desubroutinize.D7,D8,D9,DA,DE.otf differ diff --git a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-retain-gids.1FC,21,41,20,62,63.otf b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-retain-gids.1FC,21,41,20,62,63.otf index 76505a030..da8361ad4 100644 Binary files a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-retain-gids.1FC,21,41,20,62,63.otf and b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-retain-gids.1FC,21,41,20,62,63.otf differ diff --git a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-retain-gids.61,62,63.otf b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-retain-gids.61,62,63.otf index 87a279f5e..054f32ff0 100644 Binary files a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-retain-gids.61,62,63.otf and b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-retain-gids.61,62,63.otf differ diff --git a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-retain-gids.D7,D8,D9,DA,DE.otf b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-retain-gids.D7,D8,D9,DA,DE.otf index edb013ef3..cd7fbc012 100644 Binary files a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-retain-gids.D7,D8,D9,DA,DE.otf and b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-retain-gids.D7,D8,D9,DA,DE.otf differ diff --git a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints.1FC,21,41,20,62,63.otf b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints.1FC,21,41,20,62,63.otf index 2cf6200c2..8dfc3c742 100644 Binary files a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints.1FC,21,41,20,62,63.otf and b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints.1FC,21,41,20,62,63.otf differ diff --git a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints.61,62,63.otf b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints.61,62,63.otf index 3e500abf1..6900288ba 100644 Binary files a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints.61,62,63.otf and b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints.61,62,63.otf differ diff --git a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints.D7,D8,D9,DA,DE.otf b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints.D7,D8,D9,DA,DE.otf index 02edb9578..03785e1f4 100644 Binary files a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints.D7,D8,D9,DA,DE.otf and b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints.D7,D8,D9,DA,DE.otf differ diff --git a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.retain-gids.1FC,21,41,20,62,63.otf b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.retain-gids.1FC,21,41,20,62,63.otf index def021f67..cfbe2efba 100644 Binary files a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.retain-gids.1FC,21,41,20,62,63.otf and b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.retain-gids.1FC,21,41,20,62,63.otf differ diff --git a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.retain-gids.61,62,63.otf b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.retain-gids.61,62,63.otf index 8ca505554..b5111f138 100644 Binary files a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.retain-gids.61,62,63.otf and b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.retain-gids.61,62,63.otf differ diff --git a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.retain-gids.D7,D8,D9,DA,DE.otf b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.retain-gids.D7,D8,D9,DA,DE.otf index 0529b72a9..fc3438937 100644 Binary files a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.retain-gids.D7,D8,D9,DA,DE.otf and b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.retain-gids.D7,D8,D9,DA,DE.otf differ diff --git a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.default.3042,3044,3046,3048,304A,304B.otf b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.default.3042,3044,3046,3048,304A,304B.otf index 6065be461..571a0f10a 100644 Binary files a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.default.3042,3044,3046,3048,304A,304B.otf and b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.default.3042,3044,3046,3048,304A,304B.otf differ diff --git a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.default.3042,3044,3046,73E0,5EA6,8F38.otf b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.default.3042,3044,3046,73E0,5EA6,8F38.otf index cee758499..2556452f4 100644 Binary files a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.default.3042,3044,3046,73E0,5EA6,8F38.otf and b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.default.3042,3044,3046,73E0,5EA6,8F38.otf differ diff --git a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.default.61,63,65,6B.otf b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.default.61,63,65,6B.otf index 0f13fa512..47344b859 100644 Binary files a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.default.61,63,65,6B.otf and b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.default.61,63,65,6B.otf differ diff --git a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.default.660E,6975,73E0,5EA6,8F38,6E05.otf b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.default.660E,6975,73E0,5EA6,8F38,6E05.otf index 6db56f42d..24b830257 100644 Binary files a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.default.660E,6975,73E0,5EA6,8F38,6E05.otf and b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.default.660E,6975,73E0,5EA6,8F38,6E05.otf differ diff --git a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.default.660E.otf b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.default.660E.otf index 1b216ccb8..37c9aa3c2 100644 Binary files a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.default.660E.otf and b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.default.660E.otf differ diff --git a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.desubroutinize-retain-gids.3042,3044,3046,3048,304A,304B.otf b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.desubroutinize-retain-gids.3042,3044,3046,3048,304A,304B.otf index 690fe90f4..e899c9d9b 100644 Binary files a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.desubroutinize-retain-gids.3042,3044,3046,3048,304A,304B.otf and b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.desubroutinize-retain-gids.3042,3044,3046,3048,304A,304B.otf differ diff --git a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.desubroutinize-retain-gids.3042,3044,3046,73E0,5EA6,8F38.otf b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.desubroutinize-retain-gids.3042,3044,3046,73E0,5EA6,8F38.otf index f1f0cb1be..1c5006844 100644 Binary files a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.desubroutinize-retain-gids.3042,3044,3046,73E0,5EA6,8F38.otf and b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.desubroutinize-retain-gids.3042,3044,3046,73E0,5EA6,8F38.otf differ diff --git a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.desubroutinize-retain-gids.61,63,65,6B.otf b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.desubroutinize-retain-gids.61,63,65,6B.otf index b353d4346..19691e321 100644 Binary files a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.desubroutinize-retain-gids.61,63,65,6B.otf and b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.desubroutinize-retain-gids.61,63,65,6B.otf differ diff --git a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.desubroutinize-retain-gids.660E,6975,73E0,5EA6,8F38,6E05.otf b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.desubroutinize-retain-gids.660E,6975,73E0,5EA6,8F38,6E05.otf index 7d966674c..ecc6e8685 100644 Binary files a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.desubroutinize-retain-gids.660E,6975,73E0,5EA6,8F38,6E05.otf and b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.desubroutinize-retain-gids.660E,6975,73E0,5EA6,8F38,6E05.otf differ diff --git a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.desubroutinize-retain-gids.660E.otf b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.desubroutinize-retain-gids.660E.otf index afd9c3363..3c9ef2d0c 100644 Binary files a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.desubroutinize-retain-gids.660E.otf and b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.desubroutinize-retain-gids.660E.otf differ diff --git a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.desubroutinize.3042,3044,3046,3048,304A,304B.otf b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.desubroutinize.3042,3044,3046,3048,304A,304B.otf index 1a47c85a6..d70016f34 100644 Binary files a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.desubroutinize.3042,3044,3046,3048,304A,304B.otf and b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.desubroutinize.3042,3044,3046,3048,304A,304B.otf differ diff --git a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.desubroutinize.3042,3044,3046,73E0,5EA6,8F38.otf b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.desubroutinize.3042,3044,3046,73E0,5EA6,8F38.otf index b69448b5e..cc89e9fd6 100644 Binary files a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.desubroutinize.3042,3044,3046,73E0,5EA6,8F38.otf and b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.desubroutinize.3042,3044,3046,73E0,5EA6,8F38.otf differ diff --git a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.desubroutinize.61,63,65,6B.otf b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.desubroutinize.61,63,65,6B.otf index 3682a0d46..f7031f91a 100644 Binary files a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.desubroutinize.61,63,65,6B.otf and b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.desubroutinize.61,63,65,6B.otf differ diff --git a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.desubroutinize.660E,6975,73E0,5EA6,8F38,6E05.otf b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.desubroutinize.660E,6975,73E0,5EA6,8F38,6E05.otf index 6f98c8fb5..eecc3a8e8 100644 Binary files a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.desubroutinize.660E,6975,73E0,5EA6,8F38,6E05.otf and b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.desubroutinize.660E,6975,73E0,5EA6,8F38,6E05.otf differ diff --git a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.desubroutinize.660E.otf b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.desubroutinize.660E.otf index 1497979a3..49665316c 100644 Binary files a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.desubroutinize.660E.otf and b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.desubroutinize.660E.otf differ diff --git a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-desubroutinize-retain-gids.3042,3044,3046,3048,304A,304B.otf b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-desubroutinize-retain-gids.3042,3044,3046,3048,304A,304B.otf index c728315ba..48e7f87d9 100644 Binary files a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-desubroutinize-retain-gids.3042,3044,3046,3048,304A,304B.otf and b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-desubroutinize-retain-gids.3042,3044,3046,3048,304A,304B.otf differ diff --git a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-desubroutinize-retain-gids.3042,3044,3046,73E0,5EA6,8F38.otf b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-desubroutinize-retain-gids.3042,3044,3046,73E0,5EA6,8F38.otf index 9a0e72600..cc1d0b95f 100644 Binary files a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-desubroutinize-retain-gids.3042,3044,3046,73E0,5EA6,8F38.otf and b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-desubroutinize-retain-gids.3042,3044,3046,73E0,5EA6,8F38.otf differ diff --git a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-desubroutinize-retain-gids.61,63,65,6B.otf b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-desubroutinize-retain-gids.61,63,65,6B.otf index 513d47ee9..5b4340c15 100644 Binary files a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-desubroutinize-retain-gids.61,63,65,6B.otf and b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-desubroutinize-retain-gids.61,63,65,6B.otf differ diff --git a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-desubroutinize-retain-gids.660E,6975,73E0,5EA6,8F38,6E05.otf b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-desubroutinize-retain-gids.660E,6975,73E0,5EA6,8F38,6E05.otf index b10526d71..d2228cb94 100644 Binary files a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-desubroutinize-retain-gids.660E,6975,73E0,5EA6,8F38,6E05.otf and b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-desubroutinize-retain-gids.660E,6975,73E0,5EA6,8F38,6E05.otf differ diff --git a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-desubroutinize-retain-gids.660E.otf b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-desubroutinize-retain-gids.660E.otf index 2684381c9..d56cbb5e7 100644 Binary files a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-desubroutinize-retain-gids.660E.otf and b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-desubroutinize-retain-gids.660E.otf differ diff --git a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-desubroutinize.3042,3044,3046,3048,304A,304B.otf b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-desubroutinize.3042,3044,3046,3048,304A,304B.otf index 68a254ee1..1889e5946 100644 Binary files a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-desubroutinize.3042,3044,3046,3048,304A,304B.otf and b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-desubroutinize.3042,3044,3046,3048,304A,304B.otf differ diff --git a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-desubroutinize.3042,3044,3046,73E0,5EA6,8F38.otf b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-desubroutinize.3042,3044,3046,73E0,5EA6,8F38.otf index b900d92a8..defc18ec5 100644 Binary files a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-desubroutinize.3042,3044,3046,73E0,5EA6,8F38.otf and b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-desubroutinize.3042,3044,3046,73E0,5EA6,8F38.otf differ diff --git a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-desubroutinize.61,63,65,6B.otf b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-desubroutinize.61,63,65,6B.otf index 6b7cc2efe..a57076771 100644 Binary files a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-desubroutinize.61,63,65,6B.otf and b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-desubroutinize.61,63,65,6B.otf differ diff --git a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-desubroutinize.660E,6975,73E0,5EA6,8F38,6E05.otf b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-desubroutinize.660E,6975,73E0,5EA6,8F38,6E05.otf index 69b6b2e74..55dc279ad 100644 Binary files a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-desubroutinize.660E,6975,73E0,5EA6,8F38,6E05.otf and b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-desubroutinize.660E,6975,73E0,5EA6,8F38,6E05.otf differ diff --git a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-desubroutinize.660E.otf b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-desubroutinize.660E.otf index 460baced3..c6e6b0925 100644 Binary files a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-desubroutinize.660E.otf and b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-desubroutinize.660E.otf differ diff --git a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-retain-gids.3042,3044,3046,3048,304A,304B.otf b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-retain-gids.3042,3044,3046,3048,304A,304B.otf index ecdd5d64a..095b62f51 100644 Binary files a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-retain-gids.3042,3044,3046,3048,304A,304B.otf and b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-retain-gids.3042,3044,3046,3048,304A,304B.otf differ diff --git a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-retain-gids.3042,3044,3046,73E0,5EA6,8F38.otf b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-retain-gids.3042,3044,3046,73E0,5EA6,8F38.otf index 77b1f95a3..e02b0e406 100644 Binary files a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-retain-gids.3042,3044,3046,73E0,5EA6,8F38.otf and b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-retain-gids.3042,3044,3046,73E0,5EA6,8F38.otf differ diff --git a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-retain-gids.61,63,65,6B.otf b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-retain-gids.61,63,65,6B.otf index 8a1bc968a..683df5f3b 100644 Binary files a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-retain-gids.61,63,65,6B.otf and b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-retain-gids.61,63,65,6B.otf differ diff --git a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-retain-gids.660E,6975,73E0,5EA6,8F38,6E05.otf b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-retain-gids.660E,6975,73E0,5EA6,8F38,6E05.otf index 7d943fd24..10e1a8d9c 100644 Binary files a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-retain-gids.660E,6975,73E0,5EA6,8F38,6E05.otf and b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-retain-gids.660E,6975,73E0,5EA6,8F38,6E05.otf differ diff --git a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-retain-gids.660E.otf b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-retain-gids.660E.otf index eb01e55a3..e3cec520d 100644 Binary files a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-retain-gids.660E.otf and b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-retain-gids.660E.otf differ diff --git a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints.3042,3044,3046,3048,304A,304B.otf b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints.3042,3044,3046,3048,304A,304B.otf index 19c8ed86e..252f8c424 100644 Binary files a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints.3042,3044,3046,3048,304A,304B.otf and b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints.3042,3044,3046,3048,304A,304B.otf differ diff --git a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints.3042,3044,3046,73E0,5EA6,8F38.otf b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints.3042,3044,3046,73E0,5EA6,8F38.otf index 5c7ac1ac3..78be9b0a8 100644 Binary files a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints.3042,3044,3046,73E0,5EA6,8F38.otf and b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints.3042,3044,3046,73E0,5EA6,8F38.otf differ diff --git a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints.61,63,65,6B.otf b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints.61,63,65,6B.otf index abac3dd75..0825d1bc1 100644 Binary files a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints.61,63,65,6B.otf and b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints.61,63,65,6B.otf differ diff --git a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints.660E,6975,73E0,5EA6,8F38,6E05.otf b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints.660E,6975,73E0,5EA6,8F38,6E05.otf index e593d6df2..05484a3ca 100644 Binary files a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints.660E,6975,73E0,5EA6,8F38,6E05.otf and b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints.660E,6975,73E0,5EA6,8F38,6E05.otf differ diff --git a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints.660E.otf b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints.660E.otf index e586904fe..5edf7d238 100644 Binary files a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints.660E.otf and b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints.660E.otf differ diff --git a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.retain-gids.3042,3044,3046,3048,304A,304B.otf b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.retain-gids.3042,3044,3046,3048,304A,304B.otf index 75f161310..52aa46b78 100644 Binary files a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.retain-gids.3042,3044,3046,3048,304A,304B.otf and b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.retain-gids.3042,3044,3046,3048,304A,304B.otf differ diff --git a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.retain-gids.3042,3044,3046,73E0,5EA6,8F38.otf b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.retain-gids.3042,3044,3046,73E0,5EA6,8F38.otf index 6f3794c34..2c4cd8165 100644 Binary files a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.retain-gids.3042,3044,3046,73E0,5EA6,8F38.otf and b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.retain-gids.3042,3044,3046,73E0,5EA6,8F38.otf differ diff --git a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.retain-gids.61,63,65,6B.otf b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.retain-gids.61,63,65,6B.otf index 7c5f648c3..8495146e8 100644 Binary files a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.retain-gids.61,63,65,6B.otf and b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.retain-gids.61,63,65,6B.otf differ diff --git a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.retain-gids.660E,6975,73E0,5EA6,8F38,6E05.otf b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.retain-gids.660E,6975,73E0,5EA6,8F38,6E05.otf index 2dcd75b77..804df21a9 100644 Binary files a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.retain-gids.660E,6975,73E0,5EA6,8F38,6E05.otf and b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.retain-gids.660E,6975,73E0,5EA6,8F38,6E05.otf differ diff --git a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.retain-gids.660E.otf b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.retain-gids.660E.otf index a5d40d000..e42e2c495 100644 Binary files a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.retain-gids.660E.otf and b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.retain-gids.660E.otf differ diff --git a/test/subset/data/expected/colr/TwemojiMozilla.subset.default.32,3297,3299.ttf b/test/subset/data/expected/colr/TwemojiMozilla.subset.default.32,3297,3299.ttf index d8165b390..357dda3b9 100644 Binary files a/test/subset/data/expected/colr/TwemojiMozilla.subset.default.32,3297,3299.ttf and b/test/subset/data/expected/colr/TwemojiMozilla.subset.default.32,3297,3299.ttf differ diff --git a/test/subset/data/expected/colr/TwemojiMozilla.subset.default.32,3297.ttf b/test/subset/data/expected/colr/TwemojiMozilla.subset.default.32,3297.ttf index a1c29deab..adedf7a98 100644 Binary files a/test/subset/data/expected/colr/TwemojiMozilla.subset.default.32,3297.ttf and b/test/subset/data/expected/colr/TwemojiMozilla.subset.default.32,3297.ttf differ diff --git a/test/subset/data/expected/colr/TwemojiMozilla.subset.default.32,3299.ttf b/test/subset/data/expected/colr/TwemojiMozilla.subset.default.32,3299.ttf index be3a53d6d..1fbce419b 100644 Binary files a/test/subset/data/expected/colr/TwemojiMozilla.subset.default.32,3299.ttf and b/test/subset/data/expected/colr/TwemojiMozilla.subset.default.32,3299.ttf differ diff --git a/test/subset/data/expected/colr/TwemojiMozilla.subset.default.32.ttf b/test/subset/data/expected/colr/TwemojiMozilla.subset.default.32.ttf index 136e15db8..34ea33608 100644 Binary files a/test/subset/data/expected/colr/TwemojiMozilla.subset.default.32.ttf and b/test/subset/data/expected/colr/TwemojiMozilla.subset.default.32.ttf differ diff --git a/test/subset/data/expected/colr/TwemojiMozilla.subset.default.3297,3299.ttf b/test/subset/data/expected/colr/TwemojiMozilla.subset.default.3297,3299.ttf index 3ebe1c961..3d021a245 100644 Binary files a/test/subset/data/expected/colr/TwemojiMozilla.subset.default.3297,3299.ttf and b/test/subset/data/expected/colr/TwemojiMozilla.subset.default.3297,3299.ttf differ diff --git a/test/subset/data/expected/colr/TwemojiMozilla.subset.default.3297.ttf b/test/subset/data/expected/colr/TwemojiMozilla.subset.default.3297.ttf index 09e5056f7..b8c6e6be4 100644 Binary files a/test/subset/data/expected/colr/TwemojiMozilla.subset.default.3297.ttf and b/test/subset/data/expected/colr/TwemojiMozilla.subset.default.3297.ttf differ diff --git a/test/subset/data/expected/colr/TwemojiMozilla.subset.default.3299.ttf b/test/subset/data/expected/colr/TwemojiMozilla.subset.default.3299.ttf index f11b8c3b3..d2abf386c 100644 Binary files a/test/subset/data/expected/colr/TwemojiMozilla.subset.default.3299.ttf and b/test/subset/data/expected/colr/TwemojiMozilla.subset.default.3299.ttf differ diff --git a/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints-retain-gids.32,3297,3299.ttf b/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints-retain-gids.32,3297,3299.ttf index 07968d044..3644ec01f 100644 Binary files a/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints-retain-gids.32,3297,3299.ttf and b/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints-retain-gids.32,3297,3299.ttf differ diff --git a/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints-retain-gids.32,3297.ttf b/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints-retain-gids.32,3297.ttf index add6a0932..81c92b499 100644 Binary files a/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints-retain-gids.32,3297.ttf and b/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints-retain-gids.32,3297.ttf differ diff --git a/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints-retain-gids.32,3299.ttf b/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints-retain-gids.32,3299.ttf index f9b9c7d02..37ab302b4 100644 Binary files a/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints-retain-gids.32,3299.ttf and b/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints-retain-gids.32,3299.ttf differ diff --git a/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints-retain-gids.32.ttf b/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints-retain-gids.32.ttf index f69b0c5d4..c84776dd0 100644 Binary files a/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints-retain-gids.32.ttf and b/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints-retain-gids.32.ttf differ diff --git a/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints-retain-gids.3297,3299.ttf b/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints-retain-gids.3297,3299.ttf index 78ae5ce3a..4f7f8ef51 100644 Binary files a/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints-retain-gids.3297,3299.ttf and b/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints-retain-gids.3297,3299.ttf differ diff --git a/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints-retain-gids.3297.ttf b/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints-retain-gids.3297.ttf index cce38b5da..271c6b412 100644 Binary files a/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints-retain-gids.3297.ttf and b/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints-retain-gids.3297.ttf differ diff --git a/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints-retain-gids.3299.ttf b/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints-retain-gids.3299.ttf index 0abccaef5..88b4ec94c 100644 Binary files a/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints-retain-gids.3299.ttf and b/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints-retain-gids.3299.ttf differ diff --git a/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints.32,3297,3299.ttf b/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints.32,3297,3299.ttf index 07968d044..3644ec01f 100644 Binary files a/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints.32,3297,3299.ttf and b/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints.32,3297,3299.ttf differ diff --git a/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints.32,3297.ttf b/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints.32,3297.ttf index a3c6c8996..12040a129 100644 Binary files a/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints.32,3297.ttf and b/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints.32,3297.ttf differ diff --git a/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints.32,3299.ttf b/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints.32,3299.ttf index 378c04af1..ab4b9e24f 100644 Binary files a/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints.32,3299.ttf and b/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints.32,3299.ttf differ diff --git a/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints.32.ttf b/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints.32.ttf index f69b0c5d4..c84776dd0 100644 Binary files a/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints.32.ttf and b/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints.32.ttf differ diff --git a/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints.3297,3299.ttf b/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints.3297,3299.ttf index bde72d8b8..7707dcc33 100644 Binary files a/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints.3297,3299.ttf and b/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints.3297,3299.ttf differ diff --git a/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints.3297.ttf b/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints.3297.ttf index f41218911..dd0e1a9bd 100644 Binary files a/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints.3297.ttf and b/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints.3297.ttf differ diff --git a/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints.3299.ttf b/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints.3299.ttf index 3e92ac244..e59928b57 100644 Binary files a/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints.3299.ttf and b/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints.3299.ttf differ diff --git a/test/subset/data/expected/colr/TwemojiMozilla.subset.retain-gids.32,3297,3299.ttf b/test/subset/data/expected/colr/TwemojiMozilla.subset.retain-gids.32,3297,3299.ttf index d8165b390..357dda3b9 100644 Binary files a/test/subset/data/expected/colr/TwemojiMozilla.subset.retain-gids.32,3297,3299.ttf and b/test/subset/data/expected/colr/TwemojiMozilla.subset.retain-gids.32,3297,3299.ttf differ diff --git a/test/subset/data/expected/colr/TwemojiMozilla.subset.retain-gids.32,3297.ttf b/test/subset/data/expected/colr/TwemojiMozilla.subset.retain-gids.32,3297.ttf index ab9f5d312..d04142da7 100644 Binary files a/test/subset/data/expected/colr/TwemojiMozilla.subset.retain-gids.32,3297.ttf and b/test/subset/data/expected/colr/TwemojiMozilla.subset.retain-gids.32,3297.ttf differ diff --git a/test/subset/data/expected/colr/TwemojiMozilla.subset.retain-gids.32,3299.ttf b/test/subset/data/expected/colr/TwemojiMozilla.subset.retain-gids.32,3299.ttf index 4e7fdba38..983eb7576 100644 Binary files a/test/subset/data/expected/colr/TwemojiMozilla.subset.retain-gids.32,3299.ttf and b/test/subset/data/expected/colr/TwemojiMozilla.subset.retain-gids.32,3299.ttf differ diff --git a/test/subset/data/expected/colr/TwemojiMozilla.subset.retain-gids.32.ttf b/test/subset/data/expected/colr/TwemojiMozilla.subset.retain-gids.32.ttf index 136e15db8..34ea33608 100644 Binary files a/test/subset/data/expected/colr/TwemojiMozilla.subset.retain-gids.32.ttf and b/test/subset/data/expected/colr/TwemojiMozilla.subset.retain-gids.32.ttf differ diff --git a/test/subset/data/expected/colr/TwemojiMozilla.subset.retain-gids.3297,3299.ttf b/test/subset/data/expected/colr/TwemojiMozilla.subset.retain-gids.3297,3299.ttf index dd7831506..ed602762d 100644 Binary files a/test/subset/data/expected/colr/TwemojiMozilla.subset.retain-gids.3297,3299.ttf and b/test/subset/data/expected/colr/TwemojiMozilla.subset.retain-gids.3297,3299.ttf differ diff --git a/test/subset/data/expected/colr/TwemojiMozilla.subset.retain-gids.3297.ttf b/test/subset/data/expected/colr/TwemojiMozilla.subset.retain-gids.3297.ttf index d440ba0cc..60a5a3aa5 100644 Binary files a/test/subset/data/expected/colr/TwemojiMozilla.subset.retain-gids.3297.ttf and b/test/subset/data/expected/colr/TwemojiMozilla.subset.retain-gids.3297.ttf differ diff --git a/test/subset/data/expected/colr/TwemojiMozilla.subset.retain-gids.3299.ttf b/test/subset/data/expected/colr/TwemojiMozilla.subset.retain-gids.3299.ttf index 7f256e003..803af3f49 100644 Binary files a/test/subset/data/expected/colr/TwemojiMozilla.subset.retain-gids.3299.ttf and b/test/subset/data/expected/colr/TwemojiMozilla.subset.retain-gids.3299.ttf differ diff --git a/test/subset/data/expected/full-font/Roboto-Regular.default.1FC,21,41,20,62,63.ttf b/test/subset/data/expected/full-font/Roboto-Regular.default.1FC,21,41,20,62,63.ttf index cf126cec6..e644241ac 100644 Binary files a/test/subset/data/expected/full-font/Roboto-Regular.default.1FC,21,41,20,62,63.ttf and b/test/subset/data/expected/full-font/Roboto-Regular.default.1FC,21,41,20,62,63.ttf differ diff --git a/test/subset/data/expected/full-font/Roboto-Regular.default.61,62,63.ttf b/test/subset/data/expected/full-font/Roboto-Regular.default.61,62,63.ttf index 0bc7d80a9..32340c4fa 100644 Binary files a/test/subset/data/expected/full-font/Roboto-Regular.default.61,62,63.ttf and b/test/subset/data/expected/full-font/Roboto-Regular.default.61,62,63.ttf differ diff --git a/test/subset/data/expected/full-font/Roboto-Regular.default.D7,D8,D9,DA,DE.ttf b/test/subset/data/expected/full-font/Roboto-Regular.default.D7,D8,D9,DA,DE.ttf index 1dae8e5d9..97863b6c8 100644 Binary files a/test/subset/data/expected/full-font/Roboto-Regular.default.D7,D8,D9,DA,DE.ttf and b/test/subset/data/expected/full-font/Roboto-Regular.default.D7,D8,D9,DA,DE.ttf differ diff --git a/test/subset/data/expected/full-font/Roboto-Regular.drop-hints.1FC,21,41,20,62,63.ttf b/test/subset/data/expected/full-font/Roboto-Regular.drop-hints.1FC,21,41,20,62,63.ttf index 03459bc7a..c51a5e4cc 100644 Binary files a/test/subset/data/expected/full-font/Roboto-Regular.drop-hints.1FC,21,41,20,62,63.ttf and b/test/subset/data/expected/full-font/Roboto-Regular.drop-hints.1FC,21,41,20,62,63.ttf differ diff --git a/test/subset/data/expected/full-font/Roboto-Regular.drop-hints.61,62,63.ttf b/test/subset/data/expected/full-font/Roboto-Regular.drop-hints.61,62,63.ttf index 46d88cf5e..38cb8f7ad 100644 Binary files a/test/subset/data/expected/full-font/Roboto-Regular.drop-hints.61,62,63.ttf and b/test/subset/data/expected/full-font/Roboto-Regular.drop-hints.61,62,63.ttf differ diff --git a/test/subset/data/expected/full-font/Roboto-Regular.drop-hints.D7,D8,D9,DA,DE.ttf b/test/subset/data/expected/full-font/Roboto-Regular.drop-hints.D7,D8,D9,DA,DE.ttf index 91f468268..ac75a773a 100644 Binary files a/test/subset/data/expected/full-font/Roboto-Regular.drop-hints.D7,D8,D9,DA,DE.ttf and b/test/subset/data/expected/full-font/Roboto-Regular.drop-hints.D7,D8,D9,DA,DE.ttf differ diff --git a/test/subset/data/expected/full-font/SourceSerifVariable-Roman.default.1FC,21,41,20,62,63.ttf b/test/subset/data/expected/full-font/SourceSerifVariable-Roman.default.1FC,21,41,20,62,63.ttf index 91da5ddbf..ab435ca9d 100644 Binary files a/test/subset/data/expected/full-font/SourceSerifVariable-Roman.default.1FC,21,41,20,62,63.ttf and b/test/subset/data/expected/full-font/SourceSerifVariable-Roman.default.1FC,21,41,20,62,63.ttf differ diff --git a/test/subset/data/expected/full-font/SourceSerifVariable-Roman.default.61,62,63.ttf b/test/subset/data/expected/full-font/SourceSerifVariable-Roman.default.61,62,63.ttf index 175e8567d..37fed48ad 100644 Binary files a/test/subset/data/expected/full-font/SourceSerifVariable-Roman.default.61,62,63.ttf and b/test/subset/data/expected/full-font/SourceSerifVariable-Roman.default.61,62,63.ttf differ diff --git a/test/subset/data/expected/full-font/SourceSerifVariable-Roman.default.D7,D8,D9,DA,DE.ttf b/test/subset/data/expected/full-font/SourceSerifVariable-Roman.default.D7,D8,D9,DA,DE.ttf index b966f04af..34cb87aed 100644 Binary files a/test/subset/data/expected/full-font/SourceSerifVariable-Roman.default.D7,D8,D9,DA,DE.ttf and b/test/subset/data/expected/full-font/SourceSerifVariable-Roman.default.D7,D8,D9,DA,DE.ttf differ diff --git a/test/subset/data/expected/full-font/SourceSerifVariable-Roman.drop-hints.1FC,21,41,20,62,63.ttf b/test/subset/data/expected/full-font/SourceSerifVariable-Roman.drop-hints.1FC,21,41,20,62,63.ttf index 91da5ddbf..f9037297c 100644 Binary files a/test/subset/data/expected/full-font/SourceSerifVariable-Roman.drop-hints.1FC,21,41,20,62,63.ttf and b/test/subset/data/expected/full-font/SourceSerifVariable-Roman.drop-hints.1FC,21,41,20,62,63.ttf differ diff --git a/test/subset/data/expected/full-font/SourceSerifVariable-Roman.drop-hints.61,62,63.ttf b/test/subset/data/expected/full-font/SourceSerifVariable-Roman.drop-hints.61,62,63.ttf index 175e8567d..c9f29753a 100644 Binary files a/test/subset/data/expected/full-font/SourceSerifVariable-Roman.drop-hints.61,62,63.ttf and b/test/subset/data/expected/full-font/SourceSerifVariable-Roman.drop-hints.61,62,63.ttf differ diff --git a/test/subset/data/expected/full-font/SourceSerifVariable-Roman.drop-hints.D7,D8,D9,DA,DE.ttf b/test/subset/data/expected/full-font/SourceSerifVariable-Roman.drop-hints.D7,D8,D9,DA,DE.ttf index b966f04af..001a860ed 100644 Binary files a/test/subset/data/expected/full-font/SourceSerifVariable-Roman.drop-hints.D7,D8,D9,DA,DE.ttf and b/test/subset/data/expected/full-font/SourceSerifVariable-Roman.drop-hints.D7,D8,D9,DA,DE.ttf differ diff --git a/test/subset/data/expected/japanese/Mplus1p-Regular.default.1D715,1D7D8,41,42.ttf b/test/subset/data/expected/japanese/Mplus1p-Regular.default.1D715,1D7D8,41,42.ttf index 72320049d..f4b0f011e 100644 Binary files a/test/subset/data/expected/japanese/Mplus1p-Regular.default.1D715,1D7D8,41,42.ttf and b/test/subset/data/expected/japanese/Mplus1p-Regular.default.1D715,1D7D8,41,42.ttf differ diff --git a/test/subset/data/expected/japanese/Mplus1p-Regular.default.25771.ttf b/test/subset/data/expected/japanese/Mplus1p-Regular.default.25771.ttf index 1dcfeeccd..0e0f8be07 100644 Binary files a/test/subset/data/expected/japanese/Mplus1p-Regular.default.25771.ttf and b/test/subset/data/expected/japanese/Mplus1p-Regular.default.25771.ttf differ diff --git a/test/subset/data/expected/japanese/Mplus1p-Regular.default.3042,3044,3046,3048,304A,304B.ttf b/test/subset/data/expected/japanese/Mplus1p-Regular.default.3042,3044,3046,3048,304A,304B.ttf index 92e2feb06..32097ab5d 100644 Binary files a/test/subset/data/expected/japanese/Mplus1p-Regular.default.3042,3044,3046,3048,304A,304B.ttf and b/test/subset/data/expected/japanese/Mplus1p-Regular.default.3042,3044,3046,3048,304A,304B.ttf differ diff --git a/test/subset/data/expected/japanese/Mplus1p-Regular.default.3042,3044,3046,73E0,5EA6,8F38.ttf b/test/subset/data/expected/japanese/Mplus1p-Regular.default.3042,3044,3046,73E0,5EA6,8F38.ttf index 8b9ec3106..c08c3e579 100644 Binary files a/test/subset/data/expected/japanese/Mplus1p-Regular.default.3042,3044,3046,73E0,5EA6,8F38.ttf and b/test/subset/data/expected/japanese/Mplus1p-Regular.default.3042,3044,3046,73E0,5EA6,8F38.ttf differ diff --git a/test/subset/data/expected/japanese/Mplus1p-Regular.default.61,63,65,6B.ttf b/test/subset/data/expected/japanese/Mplus1p-Regular.default.61,63,65,6B.ttf index a02fec655..cfe6cff8f 100644 Binary files a/test/subset/data/expected/japanese/Mplus1p-Regular.default.61,63,65,6B.ttf and b/test/subset/data/expected/japanese/Mplus1p-Regular.default.61,63,65,6B.ttf differ diff --git a/test/subset/data/expected/japanese/Mplus1p-Regular.default.660E,6975,73E0,5EA6,8F38,6E05.ttf b/test/subset/data/expected/japanese/Mplus1p-Regular.default.660E,6975,73E0,5EA6,8F38,6E05.ttf index fb20dc76d..28ecfc8cc 100644 Binary files a/test/subset/data/expected/japanese/Mplus1p-Regular.default.660E,6975,73E0,5EA6,8F38,6E05.ttf and b/test/subset/data/expected/japanese/Mplus1p-Regular.default.660E,6975,73E0,5EA6,8F38,6E05.ttf differ diff --git a/test/subset/data/expected/japanese/Mplus1p-Regular.default.660E.ttf b/test/subset/data/expected/japanese/Mplus1p-Regular.default.660E.ttf index c1c2f5177..770b034c4 100644 Binary files a/test/subset/data/expected/japanese/Mplus1p-Regular.default.660E.ttf and b/test/subset/data/expected/japanese/Mplus1p-Regular.default.660E.ttf differ diff --git a/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.1D715,1D7D8,41,42.ttf b/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.1D715,1D7D8,41,42.ttf index f98c02983..6da7d3094 100644 Binary files a/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.1D715,1D7D8,41,42.ttf and b/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.1D715,1D7D8,41,42.ttf differ diff --git a/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.25771.ttf b/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.25771.ttf index 5bdc97b3c..6d8aa5d80 100644 Binary files a/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.25771.ttf and b/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.25771.ttf differ diff --git a/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.3042,3044,3046,3048,304A,304B.ttf b/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.3042,3044,3046,3048,304A,304B.ttf index cf97a833c..8edadb54d 100644 Binary files a/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.3042,3044,3046,3048,304A,304B.ttf and b/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.3042,3044,3046,3048,304A,304B.ttf differ diff --git a/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.3042,3044,3046,73E0,5EA6,8F38.ttf b/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.3042,3044,3046,73E0,5EA6,8F38.ttf index b3dba2e44..78b7199ef 100644 Binary files a/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.3042,3044,3046,73E0,5EA6,8F38.ttf and b/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.3042,3044,3046,73E0,5EA6,8F38.ttf differ diff --git a/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.61,63,65,6B.ttf b/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.61,63,65,6B.ttf index 1ba361a62..76a5151f3 100644 Binary files a/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.61,63,65,6B.ttf and b/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.61,63,65,6B.ttf differ diff --git a/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.660E,6975,73E0,5EA6,8F38,6E05.ttf b/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.660E,6975,73E0,5EA6,8F38,6E05.ttf index 6c54f62ad..b4abab925 100644 Binary files a/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.660E,6975,73E0,5EA6,8F38,6E05.ttf and b/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.660E,6975,73E0,5EA6,8F38,6E05.ttf differ diff --git a/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.660E.ttf b/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.660E.ttf index 08bbbdc06..4f7b482fa 100644 Binary files a/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.660E.ttf and b/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.660E.ttf differ diff --git a/test/subset/data/expected/japanese/Mplus1p-Regular.keep-gdef.1D715,1D7D8,41,42.ttf b/test/subset/data/expected/japanese/Mplus1p-Regular.keep-gdef.1D715,1D7D8,41,42.ttf index 8b6ddd8f6..f4b0f011e 100644 Binary files a/test/subset/data/expected/japanese/Mplus1p-Regular.keep-gdef.1D715,1D7D8,41,42.ttf and b/test/subset/data/expected/japanese/Mplus1p-Regular.keep-gdef.1D715,1D7D8,41,42.ttf differ diff --git a/test/subset/data/expected/japanese/Mplus1p-Regular.keep-gdef.25771.ttf b/test/subset/data/expected/japanese/Mplus1p-Regular.keep-gdef.25771.ttf index cce2d3660..0e0f8be07 100644 Binary files a/test/subset/data/expected/japanese/Mplus1p-Regular.keep-gdef.25771.ttf and b/test/subset/data/expected/japanese/Mplus1p-Regular.keep-gdef.25771.ttf differ diff --git a/test/subset/data/expected/japanese/Mplus1p-Regular.keep-gdef.3042,3044,3046,3048,304A,304B.ttf b/test/subset/data/expected/japanese/Mplus1p-Regular.keep-gdef.3042,3044,3046,3048,304A,304B.ttf index beb4e5233..32097ab5d 100644 Binary files a/test/subset/data/expected/japanese/Mplus1p-Regular.keep-gdef.3042,3044,3046,3048,304A,304B.ttf and b/test/subset/data/expected/japanese/Mplus1p-Regular.keep-gdef.3042,3044,3046,3048,304A,304B.ttf differ diff --git a/test/subset/data/expected/japanese/Mplus1p-Regular.keep-gdef.3042,3044,3046,73E0,5EA6,8F38.ttf b/test/subset/data/expected/japanese/Mplus1p-Regular.keep-gdef.3042,3044,3046,73E0,5EA6,8F38.ttf index 178989adb..c08c3e579 100644 Binary files a/test/subset/data/expected/japanese/Mplus1p-Regular.keep-gdef.3042,3044,3046,73E0,5EA6,8F38.ttf and b/test/subset/data/expected/japanese/Mplus1p-Regular.keep-gdef.3042,3044,3046,73E0,5EA6,8F38.ttf differ diff --git a/test/subset/data/expected/japanese/Mplus1p-Regular.keep-gdef.61,63,65,6B.ttf b/test/subset/data/expected/japanese/Mplus1p-Regular.keep-gdef.61,63,65,6B.ttf index 5fa32f37d..cfe6cff8f 100644 Binary files a/test/subset/data/expected/japanese/Mplus1p-Regular.keep-gdef.61,63,65,6B.ttf and b/test/subset/data/expected/japanese/Mplus1p-Regular.keep-gdef.61,63,65,6B.ttf differ diff --git a/test/subset/data/expected/japanese/Mplus1p-Regular.keep-gdef.660E,6975,73E0,5EA6,8F38,6E05.ttf b/test/subset/data/expected/japanese/Mplus1p-Regular.keep-gdef.660E,6975,73E0,5EA6,8F38,6E05.ttf index 17d4d07ac..28ecfc8cc 100644 Binary files a/test/subset/data/expected/japanese/Mplus1p-Regular.keep-gdef.660E,6975,73E0,5EA6,8F38,6E05.ttf and b/test/subset/data/expected/japanese/Mplus1p-Regular.keep-gdef.660E,6975,73E0,5EA6,8F38,6E05.ttf differ diff --git a/test/subset/data/expected/japanese/Mplus1p-Regular.keep-gdef.660E.ttf b/test/subset/data/expected/japanese/Mplus1p-Regular.keep-gdef.660E.ttf index b715f2691..770b034c4 100644 Binary files a/test/subset/data/expected/japanese/Mplus1p-Regular.keep-gdef.660E.ttf and b/test/subset/data/expected/japanese/Mplus1p-Regular.keep-gdef.660E.ttf differ diff --git a/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.keep-layout.41,42,43.otf b/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.default.41,42,43.otf similarity index 100% rename from test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.keep-layout.41,42,43.otf rename to test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.default.41,42,43.otf diff --git a/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.keep-layout.41,42.otf b/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.default.41,42.otf similarity index 100% rename from test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.keep-layout.41,42.otf rename to test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.default.41,42.otf diff --git a/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.keep-layout.41,43.otf b/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.default.41,43.otf similarity index 100% rename from test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.keep-layout.41,43.otf rename to test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.default.41,43.otf diff --git a/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.keep-layout.41.otf b/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.default.41.otf similarity index 100% rename from test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.keep-layout.41.otf rename to test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.default.41.otf diff --git a/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.keep-layout-retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.default.retain-all-codepoint.otf similarity index 100% rename from test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.keep-layout-retain-gids.retain-all-codepoint.otf rename to test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.default.retain-all-codepoint.otf diff --git a/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.keep-layout-retain-gids.41,42,43.otf b/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.retain-gids.41,42,43.otf similarity index 100% rename from test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.keep-layout-retain-gids.41,42,43.otf rename to test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.retain-gids.41,42,43.otf diff --git a/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.keep-layout-retain-gids.41,42.otf b/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.retain-gids.41,42.otf similarity index 100% rename from test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.keep-layout-retain-gids.41,42.otf rename to test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.retain-gids.41,42.otf diff --git a/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.keep-layout-retain-gids.41,43.otf b/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.retain-gids.41,43.otf similarity index 100% rename from test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.keep-layout-retain-gids.41,43.otf rename to test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.retain-gids.41,43.otf diff --git a/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.keep-layout-retain-gids.41.otf b/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.retain-gids.41.otf similarity index 100% rename from test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.keep-layout-retain-gids.41.otf rename to test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.retain-gids.41.otf diff --git a/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.keep-layout.retain-all-codepoint.otf b/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.retain-gids.retain-all-codepoint.otf similarity index 100% rename from test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.keep-layout.retain-all-codepoint.otf rename to test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.retain-gids.retain-all-codepoint.otf diff --git a/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.keep-layout.41,42,43.otf b/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.default.41,42,43.otf similarity index 100% rename from test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.keep-layout.41,42,43.otf rename to test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.default.41,42,43.otf diff --git a/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.keep-layout.41,42.otf b/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.default.41,42.otf similarity index 100% rename from test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.keep-layout.41,42.otf rename to test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.default.41,42.otf diff --git a/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.keep-layout.41,43.otf b/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.default.41,43.otf similarity index 100% rename from test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.keep-layout.41,43.otf rename to test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.default.41,43.otf diff --git a/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.keep-layout.41.otf b/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.default.41.otf similarity index 100% rename from test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.keep-layout.41.otf rename to test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.default.41.otf diff --git a/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.keep-layout-retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.default.retain-all-codepoint.otf similarity index 100% rename from test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.keep-layout-retain-gids.retain-all-codepoint.otf rename to test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.default.retain-all-codepoint.otf diff --git a/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.keep-layout-retain-gids.41,42,43.otf b/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.retain-gids.41,42,43.otf similarity index 100% rename from test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.keep-layout-retain-gids.41,42,43.otf rename to test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.retain-gids.41,42,43.otf diff --git a/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.keep-layout-retain-gids.41,42.otf b/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.retain-gids.41,42.otf similarity index 100% rename from test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.keep-layout-retain-gids.41,42.otf rename to test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.retain-gids.41,42.otf diff --git a/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.keep-layout-retain-gids.41,43.otf b/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.retain-gids.41,43.otf similarity index 100% rename from test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.keep-layout-retain-gids.41,43.otf rename to test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.retain-gids.41,43.otf diff --git a/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.keep-layout-retain-gids.41.otf b/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.retain-gids.41.otf similarity index 100% rename from test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.keep-layout-retain-gids.41.otf rename to test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.retain-gids.41.otf diff --git a/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.keep-layout.retain-all-codepoint.otf b/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.retain-gids.retain-all-codepoint.otf similarity index 100% rename from test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.keep-layout.retain-all-codepoint.otf rename to test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.retain-gids.retain-all-codepoint.otf diff --git a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.keep-layout.41,42,43.otf b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.default.41,42,43.otf similarity index 100% rename from test/subset/data/expected/layout.context/gpos_context3_simple_f1.keep-layout.41,42,43.otf rename to test/subset/data/expected/layout.context/gpos_context3_simple_f1.default.41,42,43.otf diff --git a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.keep-layout.41,42.otf b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.default.41,42.otf similarity index 100% rename from test/subset/data/expected/layout.context/gpos_context3_simple_f1.keep-layout.41,42.otf rename to test/subset/data/expected/layout.context/gpos_context3_simple_f1.default.41,42.otf diff --git a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.keep-layout.41,43.otf b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.default.41,43.otf similarity index 100% rename from test/subset/data/expected/layout.context/gpos_context3_simple_f1.keep-layout.41,43.otf rename to test/subset/data/expected/layout.context/gpos_context3_simple_f1.default.41,43.otf diff --git a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.keep-layout.41.otf b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.default.41.otf similarity index 100% rename from test/subset/data/expected/layout.context/gpos_context3_simple_f1.keep-layout.41.otf rename to test/subset/data/expected/layout.context/gpos_context3_simple_f1.default.41.otf diff --git a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.keep-layout-retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.default.retain-all-codepoint.otf similarity index 100% rename from test/subset/data/expected/layout.context/gpos_context3_simple_f1.keep-layout-retain-gids.retain-all-codepoint.otf rename to test/subset/data/expected/layout.context/gpos_context3_simple_f1.default.retain-all-codepoint.otf diff --git a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.keep-layout-retain-gids.41,42,43.otf b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.retain-gids.41,42,43.otf similarity index 100% rename from test/subset/data/expected/layout.context/gpos_context3_simple_f1.keep-layout-retain-gids.41,42,43.otf rename to test/subset/data/expected/layout.context/gpos_context3_simple_f1.retain-gids.41,42,43.otf diff --git a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.keep-layout-retain-gids.41,42.otf b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.retain-gids.41,42.otf similarity index 100% rename from test/subset/data/expected/layout.context/gpos_context3_simple_f1.keep-layout-retain-gids.41,42.otf rename to test/subset/data/expected/layout.context/gpos_context3_simple_f1.retain-gids.41,42.otf diff --git a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.keep-layout-retain-gids.41,43.otf b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.retain-gids.41,43.otf similarity index 100% rename from test/subset/data/expected/layout.context/gpos_context3_simple_f1.keep-layout-retain-gids.41,43.otf rename to test/subset/data/expected/layout.context/gpos_context3_simple_f1.retain-gids.41,43.otf diff --git a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.keep-layout-retain-gids.41.otf b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.retain-gids.41.otf similarity index 100% rename from test/subset/data/expected/layout.context/gpos_context3_simple_f1.keep-layout-retain-gids.41.otf rename to test/subset/data/expected/layout.context/gpos_context3_simple_f1.retain-gids.41.otf diff --git a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.keep-layout.retain-all-codepoint.otf b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.retain-gids.retain-all-codepoint.otf similarity index 100% rename from test/subset/data/expected/layout.context/gpos_context3_simple_f1.keep-layout.retain-all-codepoint.otf rename to test/subset/data/expected/layout.context/gpos_context3_simple_f1.retain-gids.retain-all-codepoint.otf diff --git a/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.default.A01.ttf b/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.default.A01.ttf index 598a10502..38b6f4107 100644 Binary files a/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.default.A01.ttf and b/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.default.A01.ttf differ diff --git a/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.default.A05,A06.ttf b/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.default.A05,A06.ttf index ccb6de8dc..97a197a2d 100644 Binary files a/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.default.A05,A06.ttf and b/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.default.A05,A06.ttf differ diff --git a/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.default.A07,A1B.ttf b/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.default.A07,A1B.ttf index 92548f489..539dc1674 100644 Binary files a/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.default.A07,A1B.ttf and b/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.default.A07,A1B.ttf differ diff --git a/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.default.retain-all-codepoint.ttf b/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.default.retain-all-codepoint.ttf index bba2499b7..72b23dddf 100644 Binary files a/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.default.retain-all-codepoint.ttf and b/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.default.retain-all-codepoint.ttf differ diff --git a/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.drop-hints.A01.ttf b/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.drop-hints.A01.ttf index 2caaad7c9..dbf36e544 100644 Binary files a/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.drop-hints.A01.ttf and b/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.drop-hints.A01.ttf differ diff --git a/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.drop-hints.A05,A06.ttf b/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.drop-hints.A05,A06.ttf index a8b8b8b1a..4f01a346b 100644 Binary files a/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.drop-hints.A05,A06.ttf and b/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.drop-hints.A05,A06.ttf differ diff --git a/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.drop-hints.A07,A1B.ttf b/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.drop-hints.A07,A1B.ttf index 33ce18b51..a76c4f75e 100644 Binary files a/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.drop-hints.A07,A1B.ttf and b/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.drop-hints.A07,A1B.ttf differ diff --git a/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.drop-hints.retain-all-codepoint.ttf b/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.drop-hints.retain-all-codepoint.ttf index 6e6bca51a..75a510f7c 100644 Binary files a/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.drop-hints.retain-all-codepoint.ttf and b/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.drop-hints.retain-all-codepoint.ttf differ diff --git a/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.keep-gdef.A01.ttf b/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.keep-gdef.A01.ttf index c298dec3a..38b6f4107 100644 Binary files a/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.keep-gdef.A01.ttf and b/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.keep-gdef.A01.ttf differ diff --git a/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.keep-gdef.A05,A06.ttf b/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.keep-gdef.A05,A06.ttf index cc4b51484..97a197a2d 100644 Binary files a/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.keep-gdef.A05,A06.ttf and b/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.keep-gdef.A05,A06.ttf differ diff --git a/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.keep-gdef.A07,A1B.ttf b/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.keep-gdef.A07,A1B.ttf index a47466a5f..539dc1674 100644 Binary files a/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.keep-gdef.A07,A1B.ttf and b/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.keep-gdef.A07,A1B.ttf differ diff --git a/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.keep-gdef.retain-all-codepoint.ttf b/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.keep-gdef.retain-all-codepoint.ttf index ae02f3f8e..72b23dddf 100644 Binary files a/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.keep-gdef.retain-all-codepoint.ttf and b/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.keep-gdef.retain-all-codepoint.ttf differ diff --git a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.default.41,42,43,57.otf b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.default.41,42,43,57.otf index 745b740bc..574824a5f 100644 Binary files a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.default.41,42,43,57.otf and b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.default.41,42,43,57.otf differ diff --git a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.default.41,42,43.otf b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.default.41,42,43.otf index 729b23c24..d946c63e6 100644 Binary files a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.default.41,42,43.otf and b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.default.41,42,43.otf differ diff --git a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.default.41,42.otf b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.default.41,42.otf index 0689b4eeb..aa13f114a 100644 Binary files a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.default.41,42.otf and b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.default.41,42.otf differ diff --git a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.default.41,56,57.otf b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.default.41,56,57.otf index 8263d7843..eb57e403b 100644 Binary files a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.default.41,56,57.otf and b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.default.41,56,57.otf differ diff --git a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.default.41.otf b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.default.41.otf index 2396fc44f..8c351f721 100644 Binary files a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.default.41.otf and b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.default.41.otf differ diff --git a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.default.42,57.otf b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.default.42,57.otf index 2315ed9b9..7cc801ab6 100644 Binary files a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.default.42,57.otf and b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.default.42,57.otf differ diff --git a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.drop-hints.41,42,43,57.otf b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.drop-hints.41,42,43,57.otf index 1e691e376..7be26fd4c 100644 Binary files a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.drop-hints.41,42,43,57.otf and b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.drop-hints.41,42,43,57.otf differ diff --git a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.drop-hints.41,42,43.otf b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.drop-hints.41,42,43.otf index cc1f15d8f..67185cf4e 100644 Binary files a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.drop-hints.41,42,43.otf and b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.drop-hints.41,42,43.otf differ diff --git a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.drop-hints.41,42.otf b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.drop-hints.41,42.otf index 965dc9784..1a0a2cf91 100644 Binary files a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.drop-hints.41,42.otf and b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.drop-hints.41,42.otf differ diff --git a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.drop-hints.41,56,57.otf b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.drop-hints.41,56,57.otf index 6b2063d2d..e5191fb36 100644 Binary files a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.drop-hints.41,56,57.otf and b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.drop-hints.41,56,57.otf differ diff --git a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.drop-hints.41.otf b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.drop-hints.41.otf index c828aca00..19a6b6dac 100644 Binary files a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.drop-hints.41.otf and b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.drop-hints.41.otf differ diff --git a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.drop-hints.42,57.otf b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.drop-hints.42,57.otf index 0a31696a6..f6c30dfc1 100644 Binary files a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.drop-hints.42,57.otf and b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.drop-hints.42,57.otf differ diff --git a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.keep-gdef-gpos.41,42,43,57.otf b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.keep-gdef-gpos.41,42,43,57.otf index f46824945..574824a5f 100644 Binary files a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.keep-gdef-gpos.41,42,43,57.otf and b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.keep-gdef-gpos.41,42,43,57.otf differ diff --git a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.keep-gdef-gpos.41,42,43.otf b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.keep-gdef-gpos.41,42,43.otf index ff8afb9a7..d946c63e6 100644 Binary files a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.keep-gdef-gpos.41,42,43.otf and b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.keep-gdef-gpos.41,42,43.otf differ diff --git a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.keep-gdef-gpos.41,42.otf b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.keep-gdef-gpos.41,42.otf index 5e81cb486..aa13f114a 100644 Binary files a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.keep-gdef-gpos.41,42.otf and b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.keep-gdef-gpos.41,42.otf differ diff --git a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.keep-gdef-gpos.41,56,57.otf b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.keep-gdef-gpos.41,56,57.otf index 04dfad564..eb57e403b 100644 Binary files a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.keep-gdef-gpos.41,56,57.otf and b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.keep-gdef-gpos.41,56,57.otf differ diff --git a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.keep-gdef-gpos.41.otf b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.keep-gdef-gpos.41.otf index 5c166ed64..8c351f721 100644 Binary files a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.keep-gdef-gpos.41.otf and b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.keep-gdef-gpos.41.otf differ diff --git a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.keep-gdef-gpos.42,57.otf b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.keep-gdef-gpos.42,57.otf index 43a416592..7cc801ab6 100644 Binary files a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.keep-gdef-gpos.42,57.otf and b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.keep-gdef-gpos.42,57.otf differ diff --git a/test/subset/data/expected/layout.gdef/Roboto-Regular.default.1E00,303.ttf b/test/subset/data/expected/layout.gdef/Roboto-Regular.default.1E00,303.ttf index d50552402..d39d65450 100644 Binary files a/test/subset/data/expected/layout.gdef/Roboto-Regular.default.1E00,303.ttf and b/test/subset/data/expected/layout.gdef/Roboto-Regular.default.1E00,303.ttf differ diff --git a/test/subset/data/expected/layout.gdef/Roboto-Regular.default.303.ttf b/test/subset/data/expected/layout.gdef/Roboto-Regular.default.303.ttf index c710e19c9..9534fbc9a 100644 Binary files a/test/subset/data/expected/layout.gdef/Roboto-Regular.default.303.ttf and b/test/subset/data/expected/layout.gdef/Roboto-Regular.default.303.ttf differ diff --git a/test/subset/data/expected/layout.gdef/Roboto-Regular.default.309,20,30F.ttf b/test/subset/data/expected/layout.gdef/Roboto-Regular.default.309,20,30F.ttf index c4f5e0250..64d53dfda 100644 Binary files a/test/subset/data/expected/layout.gdef/Roboto-Regular.default.309,20,30F.ttf and b/test/subset/data/expected/layout.gdef/Roboto-Regular.default.309,20,30F.ttf differ diff --git a/test/subset/data/expected/layout.gdef/Roboto-Regular.default.323.ttf b/test/subset/data/expected/layout.gdef/Roboto-Regular.default.323.ttf index 134a7dd03..d8cb70096 100644 Binary files a/test/subset/data/expected/layout.gdef/Roboto-Regular.default.323.ttf and b/test/subset/data/expected/layout.gdef/Roboto-Regular.default.323.ttf differ diff --git a/test/subset/data/expected/layout.gdef/Roboto-Regular.default.41,42,43.ttf b/test/subset/data/expected/layout.gdef/Roboto-Regular.default.41,42,43.ttf index b03784033..a4a5df187 100644 Binary files a/test/subset/data/expected/layout.gdef/Roboto-Regular.default.41,42,43.ttf and b/test/subset/data/expected/layout.gdef/Roboto-Regular.default.41,42,43.ttf differ diff --git a/test/subset/data/expected/layout.gdef/Roboto-Regular.drop-hints.1E00,303.ttf b/test/subset/data/expected/layout.gdef/Roboto-Regular.drop-hints.1E00,303.ttf index 5b1077fdb..58e94fd42 100644 Binary files a/test/subset/data/expected/layout.gdef/Roboto-Regular.drop-hints.1E00,303.ttf and b/test/subset/data/expected/layout.gdef/Roboto-Regular.drop-hints.1E00,303.ttf differ diff --git a/test/subset/data/expected/layout.gdef/Roboto-Regular.drop-hints.303.ttf b/test/subset/data/expected/layout.gdef/Roboto-Regular.drop-hints.303.ttf index 665a3ec71..c463e546f 100644 Binary files a/test/subset/data/expected/layout.gdef/Roboto-Regular.drop-hints.303.ttf and b/test/subset/data/expected/layout.gdef/Roboto-Regular.drop-hints.303.ttf differ diff --git a/test/subset/data/expected/layout.gdef/Roboto-Regular.drop-hints.309,20,30F.ttf b/test/subset/data/expected/layout.gdef/Roboto-Regular.drop-hints.309,20,30F.ttf index cb041bdbc..f721be6c5 100644 Binary files a/test/subset/data/expected/layout.gdef/Roboto-Regular.drop-hints.309,20,30F.ttf and b/test/subset/data/expected/layout.gdef/Roboto-Regular.drop-hints.309,20,30F.ttf differ diff --git a/test/subset/data/expected/layout.gdef/Roboto-Regular.drop-hints.323.ttf b/test/subset/data/expected/layout.gdef/Roboto-Regular.drop-hints.323.ttf index eea77c116..73100d59e 100644 Binary files a/test/subset/data/expected/layout.gdef/Roboto-Regular.drop-hints.323.ttf and b/test/subset/data/expected/layout.gdef/Roboto-Regular.drop-hints.323.ttf differ diff --git a/test/subset/data/expected/layout.gdef/Roboto-Regular.drop-hints.41,42,43.ttf b/test/subset/data/expected/layout.gdef/Roboto-Regular.drop-hints.41,42,43.ttf index dcf56535a..762edc70d 100644 Binary files a/test/subset/data/expected/layout.gdef/Roboto-Regular.drop-hints.41,42,43.ttf and b/test/subset/data/expected/layout.gdef/Roboto-Regular.drop-hints.41,42,43.ttf differ diff --git a/test/subset/data/expected/layout.gdef/Roboto-Regular.keep-gdef-gpos.1E00,303.ttf b/test/subset/data/expected/layout.gdef/Roboto-Regular.keep-gdef-gpos.1E00,303.ttf index a398c6f96..d39d65450 100644 Binary files a/test/subset/data/expected/layout.gdef/Roboto-Regular.keep-gdef-gpos.1E00,303.ttf and b/test/subset/data/expected/layout.gdef/Roboto-Regular.keep-gdef-gpos.1E00,303.ttf differ diff --git a/test/subset/data/expected/layout.gdef/Roboto-Regular.keep-gdef-gpos.303.ttf b/test/subset/data/expected/layout.gdef/Roboto-Regular.keep-gdef-gpos.303.ttf index 1f5cb5ce4..9534fbc9a 100644 Binary files a/test/subset/data/expected/layout.gdef/Roboto-Regular.keep-gdef-gpos.303.ttf and b/test/subset/data/expected/layout.gdef/Roboto-Regular.keep-gdef-gpos.303.ttf differ diff --git a/test/subset/data/expected/layout.gdef/Roboto-Regular.keep-gdef-gpos.309,20,30F.ttf b/test/subset/data/expected/layout.gdef/Roboto-Regular.keep-gdef-gpos.309,20,30F.ttf index 5f103998f..64d53dfda 100644 Binary files a/test/subset/data/expected/layout.gdef/Roboto-Regular.keep-gdef-gpos.309,20,30F.ttf and b/test/subset/data/expected/layout.gdef/Roboto-Regular.keep-gdef-gpos.309,20,30F.ttf differ diff --git a/test/subset/data/expected/layout.gdef/Roboto-Regular.keep-gdef-gpos.323.ttf b/test/subset/data/expected/layout.gdef/Roboto-Regular.keep-gdef-gpos.323.ttf index 9562cc33a..d8cb70096 100644 Binary files a/test/subset/data/expected/layout.gdef/Roboto-Regular.keep-gdef-gpos.323.ttf and b/test/subset/data/expected/layout.gdef/Roboto-Regular.keep-gdef-gpos.323.ttf differ diff --git a/test/subset/data/expected/layout.gdef/Roboto-Regular.keep-gdef-gpos.41,42,43.ttf b/test/subset/data/expected/layout.gdef/Roboto-Regular.keep-gdef-gpos.41,42,43.ttf index fcfc584b7..a4a5df187 100644 Binary files a/test/subset/data/expected/layout.gdef/Roboto-Regular.keep-gdef-gpos.41,42,43.ttf and b/test/subset/data/expected/layout.gdef/Roboto-Regular.keep-gdef-gpos.41,42,43.ttf differ diff --git a/test/subset/data/expected/layout.gpos/gpos1_2_font.keep-layout.41,43.otf b/test/subset/data/expected/layout.gpos/gpos1_2_font.default.41,43.otf similarity index 100% rename from test/subset/data/expected/layout.gpos/gpos1_2_font.keep-layout.41,43.otf rename to test/subset/data/expected/layout.gpos/gpos1_2_font.default.41,43.otf diff --git a/test/subset/data/expected/layout.gpos/gpos1_2_font.keep-layout.41,46.otf b/test/subset/data/expected/layout.gpos/gpos1_2_font.default.41,46.otf similarity index 100% rename from test/subset/data/expected/layout.gpos/gpos1_2_font.keep-layout.41,46.otf rename to test/subset/data/expected/layout.gpos/gpos1_2_font.default.41,46.otf diff --git a/test/subset/data/expected/layout.gpos/gpos1_2_font.keep-layout.41.otf b/test/subset/data/expected/layout.gpos/gpos1_2_font.default.41.otf similarity index 100% rename from test/subset/data/expected/layout.gpos/gpos1_2_font.keep-layout.41.otf rename to test/subset/data/expected/layout.gpos/gpos1_2_font.default.41.otf diff --git a/test/subset/data/expected/layout.gpos/gpos1_2_font.keep-layout.42,44.otf b/test/subset/data/expected/layout.gpos/gpos1_2_font.default.42,44.otf similarity index 100% rename from test/subset/data/expected/layout.gpos/gpos1_2_font.keep-layout.42,44.otf rename to test/subset/data/expected/layout.gpos/gpos1_2_font.default.42,44.otf diff --git a/test/subset/data/expected/layout.gpos/gpos1_2_font.keep-layout.43,46.otf b/test/subset/data/expected/layout.gpos/gpos1_2_font.default.43,46.otf similarity index 100% rename from test/subset/data/expected/layout.gpos/gpos1_2_font.keep-layout.43,46.otf rename to test/subset/data/expected/layout.gpos/gpos1_2_font.default.43,46.otf diff --git a/test/subset/data/expected/layout.gpos/gpos1_2_font.keep-layout-retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos/gpos1_2_font.default.retain-all-codepoint.otf similarity index 100% rename from test/subset/data/expected/layout.gpos/gpos1_2_font.keep-layout-retain-gids.retain-all-codepoint.otf rename to test/subset/data/expected/layout.gpos/gpos1_2_font.default.retain-all-codepoint.otf diff --git a/test/subset/data/expected/layout.gpos/gpos1_2_font.keep-layout-retain-gids.41,43.otf b/test/subset/data/expected/layout.gpos/gpos1_2_font.retain-gids.41,43.otf similarity index 100% rename from test/subset/data/expected/layout.gpos/gpos1_2_font.keep-layout-retain-gids.41,43.otf rename to test/subset/data/expected/layout.gpos/gpos1_2_font.retain-gids.41,43.otf diff --git a/test/subset/data/expected/layout.gpos/gpos1_2_font.keep-layout-retain-gids.41,46.otf b/test/subset/data/expected/layout.gpos/gpos1_2_font.retain-gids.41,46.otf similarity index 100% rename from test/subset/data/expected/layout.gpos/gpos1_2_font.keep-layout-retain-gids.41,46.otf rename to test/subset/data/expected/layout.gpos/gpos1_2_font.retain-gids.41,46.otf diff --git a/test/subset/data/expected/layout.gpos/gpos1_2_font.keep-layout-retain-gids.41.otf b/test/subset/data/expected/layout.gpos/gpos1_2_font.retain-gids.41.otf similarity index 100% rename from test/subset/data/expected/layout.gpos/gpos1_2_font.keep-layout-retain-gids.41.otf rename to test/subset/data/expected/layout.gpos/gpos1_2_font.retain-gids.41.otf diff --git a/test/subset/data/expected/layout.gpos/gpos1_2_font.keep-layout-retain-gids.42,44.otf b/test/subset/data/expected/layout.gpos/gpos1_2_font.retain-gids.42,44.otf similarity index 100% rename from test/subset/data/expected/layout.gpos/gpos1_2_font.keep-layout-retain-gids.42,44.otf rename to test/subset/data/expected/layout.gpos/gpos1_2_font.retain-gids.42,44.otf diff --git a/test/subset/data/expected/layout.gpos/gpos1_2_font.keep-layout-retain-gids.43,46.otf b/test/subset/data/expected/layout.gpos/gpos1_2_font.retain-gids.43,46.otf similarity index 100% rename from test/subset/data/expected/layout.gpos/gpos1_2_font.keep-layout-retain-gids.43,46.otf rename to test/subset/data/expected/layout.gpos/gpos1_2_font.retain-gids.43,46.otf diff --git a/test/subset/data/expected/layout.gpos/gpos1_2_font.keep-layout.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos/gpos1_2_font.retain-gids.retain-all-codepoint.otf similarity index 100% rename from test/subset/data/expected/layout.gpos/gpos1_2_font.keep-layout.retain-all-codepoint.otf rename to test/subset/data/expected/layout.gpos/gpos1_2_font.retain-gids.retain-all-codepoint.otf diff --git a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.keep-layout.21,23,25.otf b/test/subset/data/expected/layout.gpos2/gpos2_1_font7.default.21,23,25.otf similarity index 100% rename from test/subset/data/expected/layout.gpos2/gpos2_1_font7.keep-layout.21,23,25.otf rename to test/subset/data/expected/layout.gpos2/gpos2_1_font7.default.21,23,25.otf diff --git a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.keep-layout.21,23.otf b/test/subset/data/expected/layout.gpos2/gpos2_1_font7.default.21,23.otf similarity index 100% rename from test/subset/data/expected/layout.gpos2/gpos2_1_font7.keep-layout.21,23.otf rename to test/subset/data/expected/layout.gpos2/gpos2_1_font7.default.21,23.otf diff --git a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.keep-layout.2E,23.otf b/test/subset/data/expected/layout.gpos2/gpos2_1_font7.default.2E,23.otf similarity index 100% rename from test/subset/data/expected/layout.gpos2/gpos2_1_font7.keep-layout.2E,23.otf rename to test/subset/data/expected/layout.gpos2/gpos2_1_font7.default.2E,23.otf diff --git a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.keep-layout.41,42,43.otf b/test/subset/data/expected/layout.gpos2/gpos2_1_font7.default.41,42,43.otf similarity index 100% rename from test/subset/data/expected/layout.gpos2/gpos2_1_font7.keep-layout.41,42,43.otf rename to test/subset/data/expected/layout.gpos2/gpos2_1_font7.default.41,42,43.otf diff --git a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.keep-layout-retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos2/gpos2_1_font7.default.retain-all-codepoint.otf similarity index 100% rename from test/subset/data/expected/layout.gpos2/gpos2_1_font7.keep-layout-retain-gids.retain-all-codepoint.otf rename to test/subset/data/expected/layout.gpos2/gpos2_1_font7.default.retain-all-codepoint.otf diff --git a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.keep-layout-retain-gids.21,23,25.otf b/test/subset/data/expected/layout.gpos2/gpos2_1_font7.retain-gids.21,23,25.otf similarity index 100% rename from test/subset/data/expected/layout.gpos2/gpos2_1_font7.keep-layout-retain-gids.21,23,25.otf rename to test/subset/data/expected/layout.gpos2/gpos2_1_font7.retain-gids.21,23,25.otf diff --git a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.keep-layout-retain-gids.21,23.otf b/test/subset/data/expected/layout.gpos2/gpos2_1_font7.retain-gids.21,23.otf similarity index 100% rename from test/subset/data/expected/layout.gpos2/gpos2_1_font7.keep-layout-retain-gids.21,23.otf rename to test/subset/data/expected/layout.gpos2/gpos2_1_font7.retain-gids.21,23.otf diff --git a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.keep-layout-retain-gids.2E,23.otf b/test/subset/data/expected/layout.gpos2/gpos2_1_font7.retain-gids.2E,23.otf similarity index 100% rename from test/subset/data/expected/layout.gpos2/gpos2_1_font7.keep-layout-retain-gids.2E,23.otf rename to test/subset/data/expected/layout.gpos2/gpos2_1_font7.retain-gids.2E,23.otf diff --git a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.keep-layout-retain-gids.41,42,43.otf b/test/subset/data/expected/layout.gpos2/gpos2_1_font7.retain-gids.41,42,43.otf similarity index 100% rename from test/subset/data/expected/layout.gpos2/gpos2_1_font7.keep-layout-retain-gids.41,42,43.otf rename to test/subset/data/expected/layout.gpos2/gpos2_1_font7.retain-gids.41,42,43.otf diff --git a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.keep-layout.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos2/gpos2_1_font7.retain-gids.retain-all-codepoint.otf similarity index 100% rename from test/subset/data/expected/layout.gpos2/gpos2_1_font7.keep-layout.retain-all-codepoint.otf rename to test/subset/data/expected/layout.gpos2/gpos2_1_font7.retain-gids.retain-all-codepoint.otf diff --git a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.keep-layout.21,23,25.otf b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.default.21,23,25.otf similarity index 100% rename from test/subset/data/expected/layout.gpos2/gpos2_2_font5.keep-layout.21,23,25.otf rename to test/subset/data/expected/layout.gpos2/gpos2_2_font5.default.21,23,25.otf diff --git a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.keep-layout.21,23.otf b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.default.21,23.otf similarity index 100% rename from test/subset/data/expected/layout.gpos2/gpos2_2_font5.keep-layout.21,23.otf rename to test/subset/data/expected/layout.gpos2/gpos2_2_font5.default.21,23.otf diff --git a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.keep-layout.2E,23.otf b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.default.2E,23.otf similarity index 100% rename from test/subset/data/expected/layout.gpos2/gpos2_2_font5.keep-layout.2E,23.otf rename to test/subset/data/expected/layout.gpos2/gpos2_2_font5.default.2E,23.otf diff --git a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.keep-layout.41,42,43.otf b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.default.41,42,43.otf similarity index 100% rename from test/subset/data/expected/layout.gpos2/gpos2_2_font5.keep-layout.41,42,43.otf rename to test/subset/data/expected/layout.gpos2/gpos2_2_font5.default.41,42,43.otf diff --git a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.keep-layout-retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.default.retain-all-codepoint.otf similarity index 100% rename from test/subset/data/expected/layout.gpos2/gpos2_2_font5.keep-layout-retain-gids.retain-all-codepoint.otf rename to test/subset/data/expected/layout.gpos2/gpos2_2_font5.default.retain-all-codepoint.otf diff --git a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.keep-layout-retain-gids.21,23,25.otf b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.retain-gids.21,23,25.otf similarity index 100% rename from test/subset/data/expected/layout.gpos2/gpos2_2_font5.keep-layout-retain-gids.21,23,25.otf rename to test/subset/data/expected/layout.gpos2/gpos2_2_font5.retain-gids.21,23,25.otf diff --git a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.keep-layout-retain-gids.21,23.otf b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.retain-gids.21,23.otf similarity index 100% rename from test/subset/data/expected/layout.gpos2/gpos2_2_font5.keep-layout-retain-gids.21,23.otf rename to test/subset/data/expected/layout.gpos2/gpos2_2_font5.retain-gids.21,23.otf diff --git a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.keep-layout-retain-gids.2E,23.otf b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.retain-gids.2E,23.otf similarity index 100% rename from test/subset/data/expected/layout.gpos2/gpos2_2_font5.keep-layout-retain-gids.2E,23.otf rename to test/subset/data/expected/layout.gpos2/gpos2_2_font5.retain-gids.2E,23.otf diff --git a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.keep-layout-retain-gids.41,42,43.otf b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.retain-gids.41,42,43.otf similarity index 100% rename from test/subset/data/expected/layout.gpos2/gpos2_2_font5.keep-layout-retain-gids.41,42,43.otf rename to test/subset/data/expected/layout.gpos2/gpos2_2_font5.retain-gids.41,42,43.otf diff --git a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.keep-layout.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.retain-gids.retain-all-codepoint.otf similarity index 100% rename from test/subset/data/expected/layout.gpos2/gpos2_2_font5.keep-layout.retain-all-codepoint.otf rename to test/subset/data/expected/layout.gpos2/gpos2_2_font5.retain-gids.retain-all-codepoint.otf diff --git a/test/subset/data/expected/layout.gpos3/gpos3_font3.keep-layout.28,29.otf b/test/subset/data/expected/layout.gpos3/gpos3_font3.default.28,29.otf similarity index 100% rename from test/subset/data/expected/layout.gpos3/gpos3_font3.keep-layout.28,29.otf rename to test/subset/data/expected/layout.gpos3/gpos3_font3.default.28,29.otf diff --git a/test/subset/data/expected/layout.gpos3/gpos3_font3.keep-layout.28,2B.otf b/test/subset/data/expected/layout.gpos3/gpos3_font3.default.28,2B.otf similarity index 100% rename from test/subset/data/expected/layout.gpos3/gpos3_font3.keep-layout.28,2B.otf rename to test/subset/data/expected/layout.gpos3/gpos3_font3.default.28,2B.otf diff --git a/test/subset/data/expected/layout.gpos3/gpos3_font3.keep-layout.29,2B.otf b/test/subset/data/expected/layout.gpos3/gpos3_font3.default.29,2B.otf similarity index 100% rename from test/subset/data/expected/layout.gpos3/gpos3_font3.keep-layout.29,2B.otf rename to test/subset/data/expected/layout.gpos3/gpos3_font3.default.29,2B.otf diff --git a/test/subset/data/expected/layout.gpos3/gpos3_font3.keep-layout.41,42,43.otf b/test/subset/data/expected/layout.gpos3/gpos3_font3.default.41,42,43.otf similarity index 100% rename from test/subset/data/expected/layout.gpos3/gpos3_font3.keep-layout.41,42,43.otf rename to test/subset/data/expected/layout.gpos3/gpos3_font3.default.41,42,43.otf diff --git a/test/subset/data/expected/layout.gpos3/gpos3_font3.keep-layout-retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos3/gpos3_font3.default.retain-all-codepoint.otf similarity index 100% rename from test/subset/data/expected/layout.gpos3/gpos3_font3.keep-layout-retain-gids.retain-all-codepoint.otf rename to test/subset/data/expected/layout.gpos3/gpos3_font3.default.retain-all-codepoint.otf diff --git a/test/subset/data/expected/layout.gpos3/gpos3_font3.keep-layout-retain-gids.28,29.otf b/test/subset/data/expected/layout.gpos3/gpos3_font3.retain-gids.28,29.otf similarity index 100% rename from test/subset/data/expected/layout.gpos3/gpos3_font3.keep-layout-retain-gids.28,29.otf rename to test/subset/data/expected/layout.gpos3/gpos3_font3.retain-gids.28,29.otf diff --git a/test/subset/data/expected/layout.gpos3/gpos3_font3.keep-layout-retain-gids.28,2B.otf b/test/subset/data/expected/layout.gpos3/gpos3_font3.retain-gids.28,2B.otf similarity index 100% rename from test/subset/data/expected/layout.gpos3/gpos3_font3.keep-layout-retain-gids.28,2B.otf rename to test/subset/data/expected/layout.gpos3/gpos3_font3.retain-gids.28,2B.otf diff --git a/test/subset/data/expected/layout.gpos3/gpos3_font3.keep-layout-retain-gids.29,2B.otf b/test/subset/data/expected/layout.gpos3/gpos3_font3.retain-gids.29,2B.otf similarity index 100% rename from test/subset/data/expected/layout.gpos3/gpos3_font3.keep-layout-retain-gids.29,2B.otf rename to test/subset/data/expected/layout.gpos3/gpos3_font3.retain-gids.29,2B.otf diff --git a/test/subset/data/expected/layout.gpos3/gpos3_font3.keep-layout-retain-gids.41,42,43.otf b/test/subset/data/expected/layout.gpos3/gpos3_font3.retain-gids.41,42,43.otf similarity index 100% rename from test/subset/data/expected/layout.gpos3/gpos3_font3.keep-layout-retain-gids.41,42,43.otf rename to test/subset/data/expected/layout.gpos3/gpos3_font3.retain-gids.41,42,43.otf diff --git a/test/subset/data/expected/layout.gpos3/gpos3_font3.keep-layout.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos3/gpos3_font3.retain-gids.retain-all-codepoint.otf similarity index 100% rename from test/subset/data/expected/layout.gpos3/gpos3_font3.keep-layout.retain-all-codepoint.otf rename to test/subset/data/expected/layout.gpos3/gpos3_font3.retain-gids.retain-all-codepoint.otf diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.keep-layout.41,42,43,44.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41,42,43,44.otf similarity index 100% rename from test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.keep-layout.41,42,43,44.otf rename to test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41,42,43,44.otf diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.keep-layout.41,42,43,45.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41,42,43,45.otf similarity index 100% rename from test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.keep-layout.41,42,43,45.otf rename to test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41,42,43,45.otf diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.keep-layout.41,42,43.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41,42,43.otf similarity index 100% rename from test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.keep-layout.41,42,43.otf rename to test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41,42,43.otf diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.keep-layout.41,42.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41,42.otf similarity index 100% rename from test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.keep-layout.41,42.otf rename to test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41,42.otf diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.keep-layout.41,43,44,45,46.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41,43,44,45,46.otf similarity index 100% rename from test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.keep-layout.41,43,44,45,46.otf rename to test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41,43,44,45,46.otf diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.keep-layout.41,43,44.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41,43,44.otf similarity index 100% rename from test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.keep-layout.41,43,44.otf rename to test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41,43,44.otf diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.keep-layout.41,43,45.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41,43,45.otf similarity index 100% rename from test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.keep-layout.41,43,45.otf rename to test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41,43,45.otf diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.keep-layout.41,43.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41,43.otf similarity index 100% rename from test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.keep-layout.41,43.otf rename to test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41,43.otf diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.keep-layout.41.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41.otf similarity index 100% rename from test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.keep-layout.41.otf rename to test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41.otf diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.keep-layout-retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.retain-all-codepoint.otf similarity index 100% rename from test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.keep-layout-retain-gids.retain-all-codepoint.otf rename to test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.retain-all-codepoint.otf diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.keep-layout-retain-gids.41,42,43,44.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41,42,43,44.otf similarity index 100% rename from test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.keep-layout-retain-gids.41,42,43,44.otf rename to test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41,42,43,44.otf diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.keep-layout-retain-gids.41,42,43,45.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41,42,43,45.otf similarity index 100% rename from test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.keep-layout-retain-gids.41,42,43,45.otf rename to test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41,42,43,45.otf diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.keep-layout-retain-gids.41,42,43.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41,42,43.otf similarity index 100% rename from test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.keep-layout-retain-gids.41,42,43.otf rename to test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41,42,43.otf diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.keep-layout-retain-gids.41,42.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41,42.otf similarity index 100% rename from test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.keep-layout-retain-gids.41,42.otf rename to test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41,42.otf diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.keep-layout-retain-gids.41,43,44,45,46.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41,43,44,45,46.otf similarity index 100% rename from test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.keep-layout-retain-gids.41,43,44,45,46.otf rename to test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41,43,44,45,46.otf diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.keep-layout-retain-gids.41,43,44.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41,43,44.otf similarity index 100% rename from test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.keep-layout-retain-gids.41,43,44.otf rename to test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41,43,44.otf diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.keep-layout-retain-gids.41,43,45.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41,43,45.otf similarity index 100% rename from test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.keep-layout-retain-gids.41,43,45.otf rename to test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41,43,45.otf diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.keep-layout-retain-gids.41,43.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41,43.otf similarity index 100% rename from test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.keep-layout-retain-gids.41,43.otf rename to test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41,43.otf diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.keep-layout-retain-gids.41.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41.otf similarity index 100% rename from test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.keep-layout-retain-gids.41.otf rename to test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41.otf diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.keep-layout.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.retain-all-codepoint.otf similarity index 100% rename from test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.keep-layout.retain-all-codepoint.otf rename to test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.retain-all-codepoint.otf diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.keep-layout.41,42,43,44.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.default.41,42,43,44.otf similarity index 100% rename from test/subset/data/expected/layout.gpos5/gpos5_font1.keep-layout.41,42,43,44.otf rename to test/subset/data/expected/layout.gpos5/gpos5_font1.default.41,42,43,44.otf diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.keep-layout.41,42,43,45.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.default.41,42,43,45.otf similarity index 100% rename from test/subset/data/expected/layout.gpos5/gpos5_font1.keep-layout.41,42,43,45.otf rename to test/subset/data/expected/layout.gpos5/gpos5_font1.default.41,42,43,45.otf diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.keep-layout.41,42,43.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.default.41,42,43.otf similarity index 100% rename from test/subset/data/expected/layout.gpos5/gpos5_font1.keep-layout.41,42,43.otf rename to test/subset/data/expected/layout.gpos5/gpos5_font1.default.41,42,43.otf diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.keep-layout.41,42,44.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.default.41,42,44.otf similarity index 100% rename from test/subset/data/expected/layout.gpos5/gpos5_font1.keep-layout.41,42,44.otf rename to test/subset/data/expected/layout.gpos5/gpos5_font1.default.41,42,44.otf diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.keep-layout.41,42,45.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.default.41,42,45.otf similarity index 100% rename from test/subset/data/expected/layout.gpos5/gpos5_font1.keep-layout.41,42,45.otf rename to test/subset/data/expected/layout.gpos5/gpos5_font1.default.41,42,45.otf diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.keep-layout.41,42.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.default.41,42.otf similarity index 100% rename from test/subset/data/expected/layout.gpos5/gpos5_font1.keep-layout.41,42.otf rename to test/subset/data/expected/layout.gpos5/gpos5_font1.default.41,42.otf diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.keep-layout.41,43.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.default.41,43.otf similarity index 100% rename from test/subset/data/expected/layout.gpos5/gpos5_font1.keep-layout.41,43.otf rename to test/subset/data/expected/layout.gpos5/gpos5_font1.default.41,43.otf diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.keep-layout.41.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.default.41.otf similarity index 100% rename from test/subset/data/expected/layout.gpos5/gpos5_font1.keep-layout.41.otf rename to test/subset/data/expected/layout.gpos5/gpos5_font1.default.41.otf diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.keep-layout.42.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.default.42.otf similarity index 100% rename from test/subset/data/expected/layout.gpos5/gpos5_font1.keep-layout.42.otf rename to test/subset/data/expected/layout.gpos5/gpos5_font1.default.42.otf diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.keep-layout-retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.default.retain-all-codepoint.otf similarity index 100% rename from test/subset/data/expected/layout.gpos5/gpos5_font1.keep-layout-retain-gids.retain-all-codepoint.otf rename to test/subset/data/expected/layout.gpos5/gpos5_font1.default.retain-all-codepoint.otf diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.keep-layout-retain-gids.41,42,43,44.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.41,42,43,44.otf similarity index 100% rename from test/subset/data/expected/layout.gpos5/gpos5_font1.keep-layout-retain-gids.41,42,43,44.otf rename to test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.41,42,43,44.otf diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.keep-layout-retain-gids.41,42,43,45.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.41,42,43,45.otf similarity index 100% rename from test/subset/data/expected/layout.gpos5/gpos5_font1.keep-layout-retain-gids.41,42,43,45.otf rename to test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.41,42,43,45.otf diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.keep-layout-retain-gids.41,42,43.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.41,42,43.otf similarity index 100% rename from test/subset/data/expected/layout.gpos5/gpos5_font1.keep-layout-retain-gids.41,42,43.otf rename to test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.41,42,43.otf diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.keep-layout-retain-gids.41,42,44.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.41,42,44.otf similarity index 100% rename from test/subset/data/expected/layout.gpos5/gpos5_font1.keep-layout-retain-gids.41,42,44.otf rename to test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.41,42,44.otf diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.keep-layout-retain-gids.41,42,45.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.41,42,45.otf similarity index 100% rename from test/subset/data/expected/layout.gpos5/gpos5_font1.keep-layout-retain-gids.41,42,45.otf rename to test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.41,42,45.otf diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.keep-layout-retain-gids.41,42.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.41,42.otf similarity index 100% rename from test/subset/data/expected/layout.gpos5/gpos5_font1.keep-layout-retain-gids.41,42.otf rename to test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.41,42.otf diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.keep-layout-retain-gids.41,43.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.41,43.otf similarity index 100% rename from test/subset/data/expected/layout.gpos5/gpos5_font1.keep-layout-retain-gids.41,43.otf rename to test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.41,43.otf diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.keep-layout-retain-gids.41.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.41.otf similarity index 100% rename from test/subset/data/expected/layout.gpos5/gpos5_font1.keep-layout-retain-gids.41.otf rename to test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.41.otf diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.keep-layout-retain-gids.42.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.42.otf similarity index 100% rename from test/subset/data/expected/layout.gpos5/gpos5_font1.keep-layout-retain-gids.42.otf rename to test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.42.otf diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.keep-layout.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.retain-all-codepoint.otf similarity index 100% rename from test/subset/data/expected/layout.gpos5/gpos5_font1.keep-layout.retain-all-codepoint.otf rename to test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.retain-all-codepoint.otf diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.keep-layout.41,42,43,44.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,42,43,44.otf similarity index 100% rename from test/subset/data/expected/layout.gpos6/gpos6_font1.keep-layout.41,42,43,44.otf rename to test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,42,43,44.otf diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.keep-layout.41,42,43,45.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,42,43,45.otf similarity index 100% rename from test/subset/data/expected/layout.gpos6/gpos6_font1.keep-layout.41,42,43,45.otf rename to test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,42,43,45.otf diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.keep-layout.41,42,43.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,42,43.otf similarity index 100% rename from test/subset/data/expected/layout.gpos6/gpos6_font1.keep-layout.41,42,43.otf rename to test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,42,43.otf diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.keep-layout.41,42.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,42.otf similarity index 100% rename from test/subset/data/expected/layout.gpos6/gpos6_font1.keep-layout.41,42.otf rename to test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,42.otf diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.keep-layout.41,43,44,45,46.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,43,44,45,46.otf similarity index 100% rename from test/subset/data/expected/layout.gpos6/gpos6_font1.keep-layout.41,43,44,45,46.otf rename to test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,43,44,45,46.otf diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.keep-layout.41,43,44.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,43,44.otf similarity index 100% rename from test/subset/data/expected/layout.gpos6/gpos6_font1.keep-layout.41,43,44.otf rename to test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,43,44.otf diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.keep-layout.41,43,45.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,43,45.otf similarity index 100% rename from test/subset/data/expected/layout.gpos6/gpos6_font1.keep-layout.41,43,45.otf rename to test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,43,45.otf diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.keep-layout.41,43.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,43.otf similarity index 100% rename from test/subset/data/expected/layout.gpos6/gpos6_font1.keep-layout.41,43.otf rename to test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,43.otf diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.keep-layout.41.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41.otf similarity index 100% rename from test/subset/data/expected/layout.gpos6/gpos6_font1.keep-layout.41.otf rename to test/subset/data/expected/layout.gpos6/gpos6_font1.default.41.otf diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.keep-layout-retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.default.retain-all-codepoint.otf similarity index 100% rename from test/subset/data/expected/layout.gpos6/gpos6_font1.keep-layout-retain-gids.retain-all-codepoint.otf rename to test/subset/data/expected/layout.gpos6/gpos6_font1.default.retain-all-codepoint.otf diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.keep-layout-retain-gids.41,42,43,44.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,42,43,44.otf similarity index 100% rename from test/subset/data/expected/layout.gpos6/gpos6_font1.keep-layout-retain-gids.41,42,43,44.otf rename to test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,42,43,44.otf diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.keep-layout-retain-gids.41,42,43,45.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,42,43,45.otf similarity index 100% rename from test/subset/data/expected/layout.gpos6/gpos6_font1.keep-layout-retain-gids.41,42,43,45.otf rename to test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,42,43,45.otf diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.keep-layout-retain-gids.41,42,43.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,42,43.otf similarity index 100% rename from test/subset/data/expected/layout.gpos6/gpos6_font1.keep-layout-retain-gids.41,42,43.otf rename to test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,42,43.otf diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.keep-layout-retain-gids.41,42.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,42.otf similarity index 100% rename from test/subset/data/expected/layout.gpos6/gpos6_font1.keep-layout-retain-gids.41,42.otf rename to test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,42.otf diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.keep-layout-retain-gids.41,43,44,45,46.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,43,44,45,46.otf similarity index 100% rename from test/subset/data/expected/layout.gpos6/gpos6_font1.keep-layout-retain-gids.41,43,44,45,46.otf rename to test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,43,44,45,46.otf diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.keep-layout-retain-gids.41,43,44.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,43,44.otf similarity index 100% rename from test/subset/data/expected/layout.gpos6/gpos6_font1.keep-layout-retain-gids.41,43,44.otf rename to test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,43,44.otf diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.keep-layout-retain-gids.41,43,45.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,43,45.otf similarity index 100% rename from test/subset/data/expected/layout.gpos6/gpos6_font1.keep-layout-retain-gids.41,43,45.otf rename to test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,43,45.otf diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.keep-layout-retain-gids.41,43.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,43.otf similarity index 100% rename from test/subset/data/expected/layout.gpos6/gpos6_font1.keep-layout-retain-gids.41,43.otf rename to test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,43.otf diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.keep-layout-retain-gids.41.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41.otf similarity index 100% rename from test/subset/data/expected/layout.gpos6/gpos6_font1.keep-layout-retain-gids.41.otf rename to test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41.otf diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.keep-layout.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.retain-all-codepoint.otf similarity index 100% rename from test/subset/data/expected/layout.gpos6/gpos6_font1.keep-layout.retain-all-codepoint.otf rename to test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.retain-all-codepoint.otf diff --git a/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.keep-layout.627,644,623,62D,644,627,645,2E.ttf b/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.default.627,644,623,62D,644,627,645,2E.ttf similarity index 100% rename from test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.keep-layout.627,644,623,62D,644,627,645,2E.ttf rename to test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.default.627,644,623,62D,644,627,645,2E.ttf diff --git a/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.keep-layout.627,644,62D,628.ttf b/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.default.627,644,62D,628.ttf similarity index 100% rename from test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.keep-layout.627,644,62D,628.ttf rename to test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.default.627,644,62D,628.ttf diff --git a/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.keep-layout.627,644.ttf b/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.default.627,644.ttf similarity index 100% rename from test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.keep-layout.627,644.ttf rename to test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.default.627,644.ttf diff --git a/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.keep-layout.633,645,627,621,20,644,627.ttf b/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.default.633,645,627,621,20,644,627.ttf similarity index 100% rename from test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.keep-layout.633,645,627,621,20,644,627.ttf rename to test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.default.633,645,627,621,20,644,627.ttf diff --git a/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.keep-layout.63A,64A,631.ttf b/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.default.63A,64A,631.ttf similarity index 100% rename from test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.keep-layout.63A,64A,631.ttf rename to test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.default.63A,64A,631.ttf diff --git a/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.keep-layout-retain-gids.627,644,623,62D,644,627,645,2E.ttf b/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.retain-gids.627,644,623,62D,644,627,645,2E.ttf similarity index 100% rename from test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.keep-layout-retain-gids.627,644,623,62D,644,627,645,2E.ttf rename to test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.retain-gids.627,644,623,62D,644,627,645,2E.ttf diff --git a/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.keep-layout-retain-gids.627,644,62D,628.ttf b/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.retain-gids.627,644,62D,628.ttf similarity index 100% rename from test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.keep-layout-retain-gids.627,644,62D,628.ttf rename to test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.retain-gids.627,644,62D,628.ttf diff --git a/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.keep-layout-retain-gids.627,644.ttf b/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.retain-gids.627,644.ttf similarity index 100% rename from test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.keep-layout-retain-gids.627,644.ttf rename to test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.retain-gids.627,644.ttf diff --git a/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.keep-layout-retain-gids.633,645,627,621,20,644,627.ttf b/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.retain-gids.633,645,627,621,20,644,627.ttf similarity index 100% rename from test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.keep-layout-retain-gids.633,645,627,621,20,644,627.ttf rename to test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.retain-gids.633,645,627,621,20,644,627.ttf diff --git a/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.keep-layout-retain-gids.63A,64A,631.ttf b/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.retain-gids.63A,64A,631.ttf similarity index 100% rename from test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.keep-layout-retain-gids.63A,64A,631.ttf rename to test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.retain-gids.63A,64A,631.ttf diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.keep-layout.30,31,32,33.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.default.30,31,32,33.otf similarity index 100% rename from test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.keep-layout.30,31,32,33.otf rename to test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.default.30,31,32,33.otf diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.keep-layout.41,42,43.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.default.41,42,43.otf similarity index 100% rename from test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.keep-layout.41,42,43.otf rename to test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.default.41,42,43.otf diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.keep-layout-retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.default.retain-all-codepoint.otf similarity index 100% rename from test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.keep-layout-retain-gids.retain-all-codepoint.otf rename to test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.default.retain-all-codepoint.otf diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.keep-layout-retain-gids.30,31,32,33.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.retain-gids.30,31,32,33.otf similarity index 100% rename from test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.keep-layout-retain-gids.30,31,32,33.otf rename to test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.retain-gids.30,31,32,33.otf diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.keep-layout-retain-gids.41,42,43.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.retain-gids.41,42,43.otf similarity index 100% rename from test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.keep-layout-retain-gids.41,42,43.otf rename to test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.retain-gids.41,42,43.otf diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.keep-layout.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.retain-gids.retain-all-codepoint.otf similarity index 100% rename from test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.keep-layout.retain-all-codepoint.otf rename to test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.retain-gids.retain-all-codepoint.otf diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.keep-layout.30,31,32,33.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.default.30,31,32,33.otf similarity index 100% rename from test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.keep-layout.30,31,32,33.otf rename to test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.default.30,31,32,33.otf diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.keep-layout.41,42,43.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.default.41,42,43.otf similarity index 100% rename from test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.keep-layout.41,42,43.otf rename to test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.default.41,42,43.otf diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.keep-layout-retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.default.retain-all-codepoint.otf similarity index 100% rename from test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.keep-layout-retain-gids.retain-all-codepoint.otf rename to test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.default.retain-all-codepoint.otf diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.keep-layout-retain-gids.30,31,32,33.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.retain-gids.30,31,32,33.otf similarity index 100% rename from test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.keep-layout-retain-gids.30,31,32,33.otf rename to test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.retain-gids.30,31,32,33.otf diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.keep-layout-retain-gids.41,42,43.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.retain-gids.41,42,43.otf similarity index 100% rename from test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.keep-layout-retain-gids.41,42,43.otf rename to test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.retain-gids.41,42,43.otf diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.keep-layout.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.retain-gids.retain-all-codepoint.otf similarity index 100% rename from test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.keep-layout.retain-all-codepoint.otf rename to test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.retain-gids.retain-all-codepoint.otf diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.keep-layout.30,31,32,33.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.default.30,31,32,33.otf similarity index 100% rename from test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.keep-layout.30,31,32,33.otf rename to test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.default.30,31,32,33.otf diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.keep-layout.41,42,43.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.default.41,42,43.otf similarity index 100% rename from test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.keep-layout.41,42,43.otf rename to test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.default.41,42,43.otf diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.keep-layout-retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.default.retain-all-codepoint.otf similarity index 100% rename from test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.keep-layout-retain-gids.retain-all-codepoint.otf rename to test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.default.retain-all-codepoint.otf diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.keep-layout-retain-gids.30,31,32,33.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.retain-gids.30,31,32,33.otf similarity index 100% rename from test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.keep-layout-retain-gids.30,31,32,33.otf rename to test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.retain-gids.30,31,32,33.otf diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.keep-layout-retain-gids.41,42,43.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.retain-gids.41,42,43.otf similarity index 100% rename from test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.keep-layout-retain-gids.41,42,43.otf rename to test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.retain-gids.41,42,43.otf diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.keep-layout.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.retain-gids.retain-all-codepoint.otf similarity index 100% rename from test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.keep-layout.retain-all-codepoint.otf rename to test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.retain-gids.retain-all-codepoint.otf diff --git a/test/subset/data/expected/layout.gpos9/gpos9_font2.keep-layout.41,42.otf b/test/subset/data/expected/layout.gpos9/gpos9_font2.default.41,42.otf similarity index 100% rename from test/subset/data/expected/layout.gpos9/gpos9_font2.keep-layout.41,42.otf rename to test/subset/data/expected/layout.gpos9/gpos9_font2.default.41,42.otf diff --git a/test/subset/data/expected/layout.gpos9/gpos9_font2.keep-layout.41.otf b/test/subset/data/expected/layout.gpos9/gpos9_font2.default.41.otf similarity index 100% rename from test/subset/data/expected/layout.gpos9/gpos9_font2.keep-layout.41.otf rename to test/subset/data/expected/layout.gpos9/gpos9_font2.default.41.otf diff --git a/test/subset/data/expected/layout.gpos9/gpos9_font2.keep-layout.42.otf b/test/subset/data/expected/layout.gpos9/gpos9_font2.default.42.otf similarity index 100% rename from test/subset/data/expected/layout.gpos9/gpos9_font2.keep-layout.42.otf rename to test/subset/data/expected/layout.gpos9/gpos9_font2.default.42.otf diff --git a/test/subset/data/expected/layout.gpos9/gpos9_font2.keep-layout-retain-gids.41,42.otf b/test/subset/data/expected/layout.gpos9/gpos9_font2.retain-gids.41,42.otf similarity index 100% rename from test/subset/data/expected/layout.gpos9/gpos9_font2.keep-layout-retain-gids.41,42.otf rename to test/subset/data/expected/layout.gpos9/gpos9_font2.retain-gids.41,42.otf diff --git a/test/subset/data/expected/layout.gpos9/gpos9_font2.keep-layout-retain-gids.41.otf b/test/subset/data/expected/layout.gpos9/gpos9_font2.retain-gids.41.otf similarity index 100% rename from test/subset/data/expected/layout.gpos9/gpos9_font2.keep-layout-retain-gids.41.otf rename to test/subset/data/expected/layout.gpos9/gpos9_font2.retain-gids.41.otf diff --git a/test/subset/data/expected/layout.gpos9/gpos9_font2.keep-layout-retain-gids.42.otf b/test/subset/data/expected/layout.gpos9/gpos9_font2.retain-gids.42.otf similarity index 100% rename from test/subset/data/expected/layout.gpos9/gpos9_font2.keep-layout-retain-gids.42.otf rename to test/subset/data/expected/layout.gpos9/gpos9_font2.retain-gids.42.otf diff --git a/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.keep-layout.53A9,53F1.otf b/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.default.53A9,53F1.otf similarity index 100% rename from test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.keep-layout.53A9,53F1.otf rename to test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.default.53A9,53F1.otf diff --git a/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.keep-layout.53A9.otf b/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.default.53A9.otf similarity index 100% rename from test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.keep-layout.53A9.otf rename to test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.default.53A9.otf diff --git a/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.keep-layout.53F1.otf b/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.default.53F1.otf similarity index 100% rename from test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.keep-layout.53F1.otf rename to test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.default.53F1.otf diff --git a/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.keep-layout.retain-all-codepoint.otf b/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.default.retain-all-codepoint.otf similarity index 100% rename from test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.keep-layout.retain-all-codepoint.otf rename to test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.default.retain-all-codepoint.otf diff --git a/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.keep-layout-retain-gids.53A9,53F1.otf b/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.retain-gids.53A9,53F1.otf similarity index 100% rename from test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.keep-layout-retain-gids.53A9,53F1.otf rename to test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.retain-gids.53A9,53F1.otf diff --git a/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.keep-layout-retain-gids.53A9.otf b/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.retain-gids.53A9.otf similarity index 100% rename from test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.keep-layout-retain-gids.53A9.otf rename to test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.retain-gids.53A9.otf diff --git a/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.keep-layout-retain-gids.53F1.otf b/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.retain-gids.53F1.otf similarity index 100% rename from test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.keep-layout-retain-gids.53F1.otf rename to test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.retain-gids.53F1.otf diff --git a/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.keep-layout-retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.retain-gids.retain-all-codepoint.otf similarity index 100% rename from test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.keep-layout-retain-gids.retain-all-codepoint.otf rename to test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.retain-gids.retain-all-codepoint.otf diff --git a/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.keep-layout.41,42,43.otf b/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.default.41,42,43.otf similarity index 100% rename from test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.keep-layout.41,42,43.otf rename to test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.default.41,42,43.otf diff --git a/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.keep-layout.41,42.otf b/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.default.41,42.otf similarity index 100% rename from test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.keep-layout.41,42.otf rename to test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.default.41,42.otf diff --git a/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.keep-layout.41,43.otf b/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.default.41,43.otf similarity index 100% rename from test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.keep-layout.41,43.otf rename to test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.default.41,43.otf diff --git a/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.keep-layout.41.otf b/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.default.41.otf similarity index 100% rename from test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.keep-layout.41.otf rename to test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.default.41.otf diff --git a/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.keep-layout-retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.default.retain-all-codepoint.otf similarity index 100% rename from test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.keep-layout-retain-gids.retain-all-codepoint.otf rename to test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.default.retain-all-codepoint.otf diff --git a/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.keep-layout-retain-gids.41,42,43.otf b/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.retain-gids.41,42,43.otf similarity index 100% rename from test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.keep-layout-retain-gids.41,42,43.otf rename to test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.retain-gids.41,42,43.otf diff --git a/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.keep-layout-retain-gids.41,42.otf b/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.retain-gids.41,42.otf similarity index 100% rename from test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.keep-layout-retain-gids.41,42.otf rename to test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.retain-gids.41,42.otf diff --git a/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.keep-layout-retain-gids.41,43.otf b/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.retain-gids.41,43.otf similarity index 100% rename from test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.keep-layout-retain-gids.41,43.otf rename to test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.retain-gids.41,43.otf diff --git a/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.keep-layout-retain-gids.41.otf b/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.retain-gids.41.otf similarity index 100% rename from test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.keep-layout-retain-gids.41.otf rename to test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.retain-gids.41.otf diff --git a/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.keep-layout.retain-all-codepoint.otf b/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.retain-gids.retain-all-codepoint.otf similarity index 100% rename from test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.keep-layout.retain-all-codepoint.otf rename to test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.retain-gids.retain-all-codepoint.otf diff --git a/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.keep-layout.41,42,43.otf b/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.default.41,42,43.otf similarity index 100% rename from test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.keep-layout.41,42,43.otf rename to test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.default.41,42,43.otf diff --git a/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.keep-layout.41,42.otf b/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.default.41,42.otf similarity index 100% rename from test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.keep-layout.41,42.otf rename to test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.default.41,42.otf diff --git a/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.keep-layout.41,43.otf b/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.default.41,43.otf similarity index 100% rename from test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.keep-layout.41,43.otf rename to test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.default.41,43.otf diff --git a/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.keep-layout.41.otf b/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.default.41.otf similarity index 100% rename from test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.keep-layout.41.otf rename to test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.default.41.otf diff --git a/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.keep-layout-retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.default.retain-all-codepoint.otf similarity index 100% rename from test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.keep-layout-retain-gids.retain-all-codepoint.otf rename to test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.default.retain-all-codepoint.otf diff --git a/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.keep-layout-retain-gids.41,42,43.otf b/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.retain-gids.41,42,43.otf similarity index 100% rename from test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.keep-layout-retain-gids.41,42,43.otf rename to test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.retain-gids.41,42,43.otf diff --git a/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.keep-layout-retain-gids.41,42.otf b/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.retain-gids.41,42.otf similarity index 100% rename from test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.keep-layout-retain-gids.41,42.otf rename to test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.retain-gids.41,42.otf diff --git a/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.keep-layout-retain-gids.41,43.otf b/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.retain-gids.41,43.otf similarity index 100% rename from test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.keep-layout-retain-gids.41,43.otf rename to test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.retain-gids.41,43.otf diff --git a/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.keep-layout-retain-gids.41.otf b/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.retain-gids.41.otf similarity index 100% rename from test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.keep-layout-retain-gids.41.otf rename to test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.retain-gids.41.otf diff --git a/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.keep-layout.retain-all-codepoint.otf b/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.retain-gids.retain-all-codepoint.otf similarity index 100% rename from test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.keep-layout.retain-all-codepoint.otf rename to test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.retain-gids.retain-all-codepoint.otf diff --git a/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.keep-layout.41,42,43.otf b/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.default.41,42,43.otf similarity index 100% rename from test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.keep-layout.41,42,43.otf rename to test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.default.41,42,43.otf diff --git a/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.keep-layout.41,42.otf b/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.default.41,42.otf similarity index 100% rename from test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.keep-layout.41,42.otf rename to test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.default.41,42.otf diff --git a/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.keep-layout.41,43.otf b/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.default.41,43.otf similarity index 100% rename from test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.keep-layout.41,43.otf rename to test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.default.41,43.otf diff --git a/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.keep-layout.41.otf b/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.default.41.otf similarity index 100% rename from test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.keep-layout.41.otf rename to test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.default.41.otf diff --git a/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.keep-layout-retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.default.retain-all-codepoint.otf similarity index 100% rename from test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.keep-layout-retain-gids.retain-all-codepoint.otf rename to test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.default.retain-all-codepoint.otf diff --git a/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.keep-layout-retain-gids.41,42,43.otf b/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.retain-gids.41,42,43.otf similarity index 100% rename from test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.keep-layout-retain-gids.41,42,43.otf rename to test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.retain-gids.41,42,43.otf diff --git a/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.keep-layout-retain-gids.41,42.otf b/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.retain-gids.41,42.otf similarity index 100% rename from test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.keep-layout-retain-gids.41,42.otf rename to test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.retain-gids.41,42.otf diff --git a/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.keep-layout-retain-gids.41,43.otf b/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.retain-gids.41,43.otf similarity index 100% rename from test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.keep-layout-retain-gids.41,43.otf rename to test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.retain-gids.41,43.otf diff --git a/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.keep-layout-retain-gids.41.otf b/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.retain-gids.41.otf similarity index 100% rename from test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.keep-layout-retain-gids.41.otf rename to test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.retain-gids.41.otf diff --git a/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.keep-layout.retain-all-codepoint.otf b/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.retain-gids.retain-all-codepoint.otf similarity index 100% rename from test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.keep-layout.retain-all-codepoint.otf rename to test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.retain-gids.retain-all-codepoint.otf diff --git a/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.keep-layout.30,31,32,33.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.default.30,31,32,33.otf similarity index 100% rename from test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.keep-layout.30,31,32,33.otf rename to test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.default.30,31,32,33.otf diff --git a/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.keep-layout.41,42,43.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.default.41,42,43.otf similarity index 100% rename from test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.keep-layout.41,42,43.otf rename to test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.default.41,42,43.otf diff --git a/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.keep-layout-retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.default.retain-all-codepoint.otf similarity index 100% rename from test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.keep-layout-retain-gids.retain-all-codepoint.otf rename to test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.default.retain-all-codepoint.otf diff --git a/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.keep-layout-retain-gids.30,31,32,33.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.retain-gids.30,31,32,33.otf similarity index 100% rename from test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.keep-layout-retain-gids.30,31,32,33.otf rename to test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.retain-gids.30,31,32,33.otf diff --git a/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.keep-layout-retain-gids.41,42,43.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.retain-gids.41,42,43.otf similarity index 100% rename from test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.keep-layout-retain-gids.41,42,43.otf rename to test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.retain-gids.41,42,43.otf diff --git a/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.keep-layout.retain-all-codepoint.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.retain-gids.retain-all-codepoint.otf similarity index 100% rename from test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.keep-layout.retain-all-codepoint.otf rename to test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.retain-gids.retain-all-codepoint.otf diff --git a/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.keep-layout.30,31,32,33.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.default.30,31,32,33.otf similarity index 100% rename from test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.keep-layout.30,31,32,33.otf rename to test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.default.30,31,32,33.otf diff --git a/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.keep-layout.41,42,43.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.default.41,42,43.otf similarity index 100% rename from test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.keep-layout.41,42,43.otf rename to test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.default.41,42,43.otf diff --git a/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.keep-layout-retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.default.retain-all-codepoint.otf similarity index 100% rename from test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.keep-layout-retain-gids.retain-all-codepoint.otf rename to test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.default.retain-all-codepoint.otf diff --git a/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.keep-layout-retain-gids.30,31,32,33.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.retain-gids.30,31,32,33.otf similarity index 100% rename from test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.keep-layout-retain-gids.30,31,32,33.otf rename to test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.retain-gids.30,31,32,33.otf diff --git a/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.keep-layout-retain-gids.41,42,43.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.retain-gids.41,42,43.otf similarity index 100% rename from test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.keep-layout-retain-gids.41,42,43.otf rename to test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.retain-gids.41,42,43.otf diff --git a/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.keep-layout.retain-all-codepoint.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.retain-gids.retain-all-codepoint.otf similarity index 100% rename from test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.keep-layout.retain-all-codepoint.otf rename to test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.retain-gids.retain-all-codepoint.otf diff --git a/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.keep-layout.30,31,32,33.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.default.30,31,32,33.otf similarity index 100% rename from test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.keep-layout.30,31,32,33.otf rename to test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.default.30,31,32,33.otf diff --git a/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.keep-layout.41,42,43.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.default.41,42,43.otf similarity index 100% rename from test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.keep-layout.41,42,43.otf rename to test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.default.41,42,43.otf diff --git a/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.keep-layout-retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.default.retain-all-codepoint.otf similarity index 100% rename from test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.keep-layout-retain-gids.retain-all-codepoint.otf rename to test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.default.retain-all-codepoint.otf diff --git a/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.keep-layout-retain-gids.30,31,32,33.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.retain-gids.30,31,32,33.otf similarity index 100% rename from test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.keep-layout-retain-gids.30,31,32,33.otf rename to test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.retain-gids.30,31,32,33.otf diff --git a/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.keep-layout-retain-gids.41,42,43.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.retain-gids.41,42,43.otf similarity index 100% rename from test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.keep-layout-retain-gids.41,42,43.otf rename to test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.retain-gids.41,42,43.otf diff --git a/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.keep-layout.retain-all-codepoint.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.retain-gids.retain-all-codepoint.otf similarity index 100% rename from test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.keep-layout.retain-all-codepoint.otf rename to test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.retain-gids.retain-all-codepoint.otf diff --git a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.keep-layout.41,42,43,44,45,46,47,48,49.otf b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.default.41,42,43,44,45,46,47,48,49.otf similarity index 100% rename from test/subset/data/expected/layout.gsub8/gsub8_manually_created.keep-layout.41,42,43,44,45,46,47,48,49.otf rename to test/subset/data/expected/layout.gsub8/gsub8_manually_created.default.41,42,43,44,45,46,47,48,49.otf diff --git a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.keep-layout.41,42,43,44,45,46,47.otf b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.default.41,42,43,44,45,46,47.otf similarity index 100% rename from test/subset/data/expected/layout.gsub8/gsub8_manually_created.keep-layout.41,42,43,44,45,46,47.otf rename to test/subset/data/expected/layout.gsub8/gsub8_manually_created.default.41,42,43,44,45,46,47.otf diff --git a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.keep-layout.41,42,43,44,45,46,4D.otf b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.default.41,42,43,44,45,46,4D.otf similarity index 100% rename from test/subset/data/expected/layout.gsub8/gsub8_manually_created.keep-layout.41,42,43,44,45,46,4D.otf rename to test/subset/data/expected/layout.gsub8/gsub8_manually_created.default.41,42,43,44,45,46,4D.otf diff --git a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.keep-layout.41,42,43,44,45,46,51.otf b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.default.41,42,43,44,45,46,51.otf similarity index 100% rename from test/subset/data/expected/layout.gsub8/gsub8_manually_created.keep-layout.41,42,43,44,45,46,51.otf rename to test/subset/data/expected/layout.gsub8/gsub8_manually_created.default.41,42,43,44,45,46,51.otf diff --git a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.keep-layout.41,42,43,44,45,46.otf b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.default.41,42,43,44,45,46.otf similarity index 100% rename from test/subset/data/expected/layout.gsub8/gsub8_manually_created.keep-layout.41,42,43,44,45,46.otf rename to test/subset/data/expected/layout.gsub8/gsub8_manually_created.default.41,42,43,44,45,46.otf diff --git a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.keep-layout.41,42,43.otf b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.default.41,42,43.otf similarity index 100% rename from test/subset/data/expected/layout.gsub8/gsub8_manually_created.keep-layout.41,42,43.otf rename to test/subset/data/expected/layout.gsub8/gsub8_manually_created.default.41,42,43.otf diff --git a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.keep-layout.41.otf b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.default.41.otf similarity index 100% rename from test/subset/data/expected/layout.gsub8/gsub8_manually_created.keep-layout.41.otf rename to test/subset/data/expected/layout.gsub8/gsub8_manually_created.default.41.otf diff --git a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.keep-layout.61.otf b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.default.61.otf similarity index 100% rename from test/subset/data/expected/layout.gsub8/gsub8_manually_created.keep-layout.61.otf rename to test/subset/data/expected/layout.gsub8/gsub8_manually_created.default.61.otf diff --git a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.keep-layout-retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.default.retain-all-codepoint.otf similarity index 100% rename from test/subset/data/expected/layout.gsub8/gsub8_manually_created.keep-layout-retain-gids.retain-all-codepoint.otf rename to test/subset/data/expected/layout.gsub8/gsub8_manually_created.default.retain-all-codepoint.otf diff --git a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.keep-layout-retain-gids.41,42,43,44,45,46,47,48,49.otf b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.retain-gids.41,42,43,44,45,46,47,48,49.otf similarity index 100% rename from test/subset/data/expected/layout.gsub8/gsub8_manually_created.keep-layout-retain-gids.41,42,43,44,45,46,47,48,49.otf rename to test/subset/data/expected/layout.gsub8/gsub8_manually_created.retain-gids.41,42,43,44,45,46,47,48,49.otf diff --git a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.keep-layout-retain-gids.41,42,43,44,45,46,47.otf b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.retain-gids.41,42,43,44,45,46,47.otf similarity index 100% rename from test/subset/data/expected/layout.gsub8/gsub8_manually_created.keep-layout-retain-gids.41,42,43,44,45,46,47.otf rename to test/subset/data/expected/layout.gsub8/gsub8_manually_created.retain-gids.41,42,43,44,45,46,47.otf diff --git a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.keep-layout-retain-gids.41,42,43,44,45,46,4D.otf b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.retain-gids.41,42,43,44,45,46,4D.otf similarity index 100% rename from test/subset/data/expected/layout.gsub8/gsub8_manually_created.keep-layout-retain-gids.41,42,43,44,45,46,4D.otf rename to test/subset/data/expected/layout.gsub8/gsub8_manually_created.retain-gids.41,42,43,44,45,46,4D.otf diff --git a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.keep-layout-retain-gids.41,42,43,44,45,46,51.otf b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.retain-gids.41,42,43,44,45,46,51.otf similarity index 100% rename from test/subset/data/expected/layout.gsub8/gsub8_manually_created.keep-layout-retain-gids.41,42,43,44,45,46,51.otf rename to test/subset/data/expected/layout.gsub8/gsub8_manually_created.retain-gids.41,42,43,44,45,46,51.otf diff --git a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.keep-layout-retain-gids.41,42,43,44,45,46.otf b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.retain-gids.41,42,43,44,45,46.otf similarity index 100% rename from test/subset/data/expected/layout.gsub8/gsub8_manually_created.keep-layout-retain-gids.41,42,43,44,45,46.otf rename to test/subset/data/expected/layout.gsub8/gsub8_manually_created.retain-gids.41,42,43,44,45,46.otf diff --git a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.keep-layout-retain-gids.41,42,43.otf b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.retain-gids.41,42,43.otf similarity index 100% rename from test/subset/data/expected/layout.gsub8/gsub8_manually_created.keep-layout-retain-gids.41,42,43.otf rename to test/subset/data/expected/layout.gsub8/gsub8_manually_created.retain-gids.41,42,43.otf diff --git a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.keep-layout-retain-gids.41.otf b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.retain-gids.41.otf similarity index 100% rename from test/subset/data/expected/layout.gsub8/gsub8_manually_created.keep-layout-retain-gids.41.otf rename to test/subset/data/expected/layout.gsub8/gsub8_manually_created.retain-gids.41.otf diff --git a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.keep-layout-retain-gids.61.otf b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.retain-gids.61.otf similarity index 100% rename from test/subset/data/expected/layout.gsub8/gsub8_manually_created.keep-layout-retain-gids.61.otf rename to test/subset/data/expected/layout.gsub8/gsub8_manually_created.retain-gids.61.otf diff --git a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.keep-layout.retain-all-codepoint.otf b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.retain-gids.retain-all-codepoint.otf similarity index 100% rename from test/subset/data/expected/layout.gsub8/gsub8_manually_created.keep-layout.retain-all-codepoint.otf rename to test/subset/data/expected/layout.gsub8/gsub8_manually_created.retain-gids.retain-all-codepoint.otf diff --git a/test/subset/data/expected/layout.khmer/Khmer.keep-layout-retain-gids.1780.ttf b/test/subset/data/expected/layout.khmer/Khmer.keep-layout-retain-gids.1780.ttf deleted file mode 100644 index 6f5e78906..000000000 Binary files a/test/subset/data/expected/layout.khmer/Khmer.keep-layout-retain-gids.1780.ttf and /dev/null differ diff --git a/test/subset/data/expected/layout.khmer/Khmer.keep-layout-retain-gids.1789,17BB,17C6,1794,17B6,1793,1798,17BE.ttf b/test/subset/data/expected/layout.khmer/Khmer.keep-layout-retain-gids.1789,17BB,17C6,1794,17B6,1793,1798,17BE.ttf deleted file mode 100644 index 572c41feb..000000000 Binary files a/test/subset/data/expected/layout.khmer/Khmer.keep-layout-retain-gids.1789,17BB,17C6,1794,17B6,1793,1798,17BE.ttf and /dev/null differ diff --git a/test/subset/data/expected/layout.khmer/Khmer.keep-layout-retain-gids.31.ttf b/test/subset/data/expected/layout.khmer/Khmer.keep-layout-retain-gids.31.ttf deleted file mode 100644 index 31a6c1a69..000000000 Binary files a/test/subset/data/expected/layout.khmer/Khmer.keep-layout-retain-gids.31.ttf and /dev/null differ diff --git a/test/subset/data/expected/layout.khmer/Khmer.keep-layout.1780.ttf b/test/subset/data/expected/layout.khmer/Khmer.keep-layout.1780.ttf deleted file mode 100644 index e3d9c8f87..000000000 Binary files a/test/subset/data/expected/layout.khmer/Khmer.keep-layout.1780.ttf and /dev/null differ diff --git a/test/subset/data/expected/layout.khmer/Khmer.keep-layout.1789,17BB,17C6,1794,17B6,1793,1798,17BE.ttf b/test/subset/data/expected/layout.khmer/Khmer.keep-layout.1789,17BB,17C6,1794,17B6,1793,1798,17BE.ttf deleted file mode 100644 index 9c122b553..000000000 Binary files a/test/subset/data/expected/layout.khmer/Khmer.keep-layout.1789,17BB,17C6,1794,17B6,1793,1798,17BE.ttf and /dev/null differ diff --git a/test/subset/data/expected/layout.khmer/Khmer.keep-layout.31.ttf b/test/subset/data/expected/layout.khmer/Khmer.keep-layout.31.ttf deleted file mode 100644 index fb54e5ba8..000000000 Binary files a/test/subset/data/expected/layout.khmer/Khmer.keep-layout.31.ttf and /dev/null differ diff --git a/test/subset/data/expected/layout.notonastaliqurdu/NotoNastaliqUrdu-Bold.keep-layout-retain-gids.627,644,62D.ttf b/test/subset/data/expected/layout.notonastaliqurdu/NotoNastaliqUrdu-Bold.retain-gids.627,644,62D.ttf similarity index 100% rename from test/subset/data/expected/layout.notonastaliqurdu/NotoNastaliqUrdu-Bold.keep-layout-retain-gids.627,644,62D.ttf rename to test/subset/data/expected/layout.notonastaliqurdu/NotoNastaliqUrdu-Bold.retain-gids.627,644,62D.ttf diff --git a/test/subset/data/expected/layout/Roboto-Regular.smallcaps.keep-layout.41,42,43.ttf b/test/subset/data/expected/layout/Roboto-Regular.smallcaps.default.41,42,43.ttf similarity index 100% rename from test/subset/data/expected/layout/Roboto-Regular.smallcaps.keep-layout.41,42,43.ttf rename to test/subset/data/expected/layout/Roboto-Regular.smallcaps.default.41,42,43.ttf diff --git a/test/subset/data/expected/layout/Roboto-Regular.smallcaps.keep-layout.41,43.ttf b/test/subset/data/expected/layout/Roboto-Regular.smallcaps.default.41,43.ttf similarity index 100% rename from test/subset/data/expected/layout/Roboto-Regular.smallcaps.keep-layout.41,43.ttf rename to test/subset/data/expected/layout/Roboto-Regular.smallcaps.default.41,43.ttf diff --git a/test/subset/data/expected/layout/Roboto-Regular.smallcaps.keep-layout.41.ttf b/test/subset/data/expected/layout/Roboto-Regular.smallcaps.default.41.ttf similarity index 100% rename from test/subset/data/expected/layout/Roboto-Regular.smallcaps.keep-layout.41.ttf rename to test/subset/data/expected/layout/Roboto-Regular.smallcaps.default.41.ttf diff --git a/test/subset/data/expected/layout/Roboto-Regular.smallcaps.keep-layout.43.ttf b/test/subset/data/expected/layout/Roboto-Regular.smallcaps.default.43.ttf similarity index 100% rename from test/subset/data/expected/layout/Roboto-Regular.smallcaps.keep-layout.43.ttf rename to test/subset/data/expected/layout/Roboto-Regular.smallcaps.default.43.ttf diff --git a/test/subset/data/expected/layout/Roboto-Regular.smallcaps.keep-layout.CA,CB.ttf b/test/subset/data/expected/layout/Roboto-Regular.smallcaps.default.CA,CB.ttf similarity index 100% rename from test/subset/data/expected/layout/Roboto-Regular.smallcaps.keep-layout.CA,CB.ttf rename to test/subset/data/expected/layout/Roboto-Regular.smallcaps.default.CA,CB.ttf diff --git a/test/subset/data/expected/layout/Roboto-Regular.smallcaps.keep-layout-retain-gids.41,42,43.ttf b/test/subset/data/expected/layout/Roboto-Regular.smallcaps.retain-gids.41,42,43.ttf similarity index 100% rename from test/subset/data/expected/layout/Roboto-Regular.smallcaps.keep-layout-retain-gids.41,42,43.ttf rename to test/subset/data/expected/layout/Roboto-Regular.smallcaps.retain-gids.41,42,43.ttf diff --git a/test/subset/data/expected/layout/Roboto-Regular.smallcaps.keep-layout-retain-gids.41,43.ttf b/test/subset/data/expected/layout/Roboto-Regular.smallcaps.retain-gids.41,43.ttf similarity index 100% rename from test/subset/data/expected/layout/Roboto-Regular.smallcaps.keep-layout-retain-gids.41,43.ttf rename to test/subset/data/expected/layout/Roboto-Regular.smallcaps.retain-gids.41,43.ttf diff --git a/test/subset/data/expected/layout/Roboto-Regular.smallcaps.keep-layout-retain-gids.41.ttf b/test/subset/data/expected/layout/Roboto-Regular.smallcaps.retain-gids.41.ttf similarity index 100% rename from test/subset/data/expected/layout/Roboto-Regular.smallcaps.keep-layout-retain-gids.41.ttf rename to test/subset/data/expected/layout/Roboto-Regular.smallcaps.retain-gids.41.ttf diff --git a/test/subset/data/expected/layout/Roboto-Regular.smallcaps.keep-layout-retain-gids.43.ttf b/test/subset/data/expected/layout/Roboto-Regular.smallcaps.retain-gids.43.ttf similarity index 100% rename from test/subset/data/expected/layout/Roboto-Regular.smallcaps.keep-layout-retain-gids.43.ttf rename to test/subset/data/expected/layout/Roboto-Regular.smallcaps.retain-gids.43.ttf diff --git a/test/subset/data/expected/layout/Roboto-Regular.smallcaps.keep-layout-retain-gids.CA,CB.ttf b/test/subset/data/expected/layout/Roboto-Regular.smallcaps.retain-gids.CA,CB.ttf similarity index 100% rename from test/subset/data/expected/layout/Roboto-Regular.smallcaps.keep-layout-retain-gids.CA,CB.ttf rename to test/subset/data/expected/layout/Roboto-Regular.smallcaps.retain-gids.CA,CB.ttf diff --git a/test/subset/data/expected/variable/Fraunces.keep-layout.26,66,69,124,125.ttf b/test/subset/data/expected/variable/Fraunces.keep-layout.26,66,69,124,125.ttf deleted file mode 100644 index b0d7f4f6f..000000000 Binary files a/test/subset/data/expected/variable/Fraunces.keep-layout.26,66,69,124,125.ttf and /dev/null differ diff --git a/test/subset/data/expected/variable/Fraunces.keep-layout.61.ttf b/test/subset/data/expected/variable/Fraunces.keep-layout.61.ttf deleted file mode 100644 index a80eed226..000000000 Binary files a/test/subset/data/expected/variable/Fraunces.keep-layout.61.ttf and /dev/null differ diff --git a/test/subset/data/profiles/keep-layout-drop-hints.txt b/test/subset/data/profiles/keep-layout-drop-hints.txt deleted file mode 100644 index 57bd14dcf..000000000 --- a/test/subset/data/profiles/keep-layout-drop-hints.txt +++ /dev/null @@ -1,2 +0,0 @@ ---drop-tables-=GSUB,GPOS,GDEF ---no-hinting diff --git a/test/subset/data/profiles/keep-layout-retain-gids.txt b/test/subset/data/profiles/keep-layout-retain-gids.txt deleted file mode 100644 index 9248ef68e..000000000 --- a/test/subset/data/profiles/keep-layout-retain-gids.txt +++ /dev/null @@ -1,2 +0,0 @@ ---drop-tables-=GSUB,GPOS,GDEF ---retain-gids diff --git a/test/subset/data/profiles/keep-layout.txt b/test/subset/data/profiles/keep-layout.txt deleted file mode 100644 index 969e34a9b..000000000 --- a/test/subset/data/profiles/keep-layout.txt +++ /dev/null @@ -1 +0,0 @@ ---drop-tables-=GSUB,GPOS,GDEF diff --git a/test/subset/data/tests/basics.tests b/test/subset/data/tests/basics.tests index 03aa4364b..c5aa136ea 100644 --- a/test/subset/data/tests/basics.tests +++ b/test/subset/data/tests/basics.tests @@ -12,8 +12,6 @@ name-ids.txt name-languages.txt name-legacy.txt gids.txt -keep-layout.txt -keep-layout-drop-hints.txt SUBSETS: abc diff --git a/test/subset/data/tests/layout.context.tests b/test/subset/data/tests/layout.context.tests index 98333958b..5dab14af5 100644 --- a/test/subset/data/tests/layout.context.tests +++ b/test/subset/data/tests/layout.context.tests @@ -4,8 +4,8 @@ gpos_context2_multiple_subrules_f1.otf gpos_context3_simple_f1.otf PROFILES: -keep-layout.txt -keep-layout-retain-gids.txt +default.txt +retain-gids.txt SUBSETS: A diff --git a/test/subset/data/tests/layout.gpos.tests b/test/subset/data/tests/layout.gpos.tests index db6017f6f..6bbef228c 100644 --- a/test/subset/data/tests/layout.gpos.tests +++ b/test/subset/data/tests/layout.gpos.tests @@ -2,8 +2,8 @@ FONTS: gpos1_2_font.otf PROFILES: -keep-layout.txt -keep-layout-retain-gids.txt +default.txt +retain-gids.txt SUBSETS: A diff --git a/test/subset/data/tests/layout.gpos2.tests b/test/subset/data/tests/layout.gpos2.tests index 08799946b..0b333d115 100644 --- a/test/subset/data/tests/layout.gpos2.tests +++ b/test/subset/data/tests/layout.gpos2.tests @@ -3,8 +3,8 @@ gpos2_1_font7.otf gpos2_2_font5.otf PROFILES: -keep-layout.txt -keep-layout-retain-gids.txt +default.txt +retain-gids.txt SUBSETS: !# diff --git a/test/subset/data/tests/layout.gpos3.tests b/test/subset/data/tests/layout.gpos3.tests index 0064fa09b..58436586b 100644 --- a/test/subset/data/tests/layout.gpos3.tests +++ b/test/subset/data/tests/layout.gpos3.tests @@ -2,8 +2,8 @@ FONTS: gpos3_font3.otf PROFILES: -keep-layout.txt -keep-layout-retain-gids.txt +default.txt +retain-gids.txt SUBSETS: () diff --git a/test/subset/data/tests/layout.gpos4.tests b/test/subset/data/tests/layout.gpos4.tests index fd2b68851..49acd4a44 100644 --- a/test/subset/data/tests/layout.gpos4.tests +++ b/test/subset/data/tests/layout.gpos4.tests @@ -2,8 +2,8 @@ FONTS: gpos4_multiple_anchors_1.otf PROFILES: -keep-layout.txt -keep-layout-retain-gids.txt +default.txt +retain-gids.txt SUBSETS: A diff --git a/test/subset/data/tests/layout.gpos5.tests b/test/subset/data/tests/layout.gpos5.tests index 3f5ef0c41..5d1cb5d87 100644 --- a/test/subset/data/tests/layout.gpos5.tests +++ b/test/subset/data/tests/layout.gpos5.tests @@ -2,8 +2,8 @@ FONTS: gpos5_font1.otf PROFILES: -keep-layout.txt -keep-layout-retain-gids.txt +default.txt +retain-gids.txt SUBSETS: A diff --git a/test/subset/data/tests/layout.gpos6.tests b/test/subset/data/tests/layout.gpos6.tests index d31e0d474..fa3812dad 100644 --- a/test/subset/data/tests/layout.gpos6.tests +++ b/test/subset/data/tests/layout.gpos6.tests @@ -2,8 +2,8 @@ FONTS: gpos6_font1.otf PROFILES: -keep-layout.txt -keep-layout-retain-gids.txt +default.txt +retain-gids.txt SUBSETS: A diff --git a/test/subset/data/tests/layout.gpos8.amiri.tests b/test/subset/data/tests/layout.gpos8.amiri.tests index a885cb4d1..183d8a973 100644 --- a/test/subset/data/tests/layout.gpos8.amiri.tests +++ b/test/subset/data/tests/layout.gpos8.amiri.tests @@ -2,8 +2,8 @@ FONTS: Amiri-Regular.ttf PROFILES: -keep-layout.txt -keep-layout-retain-gids.txt +default.txt +retain-gids.txt SUBSETS: ال diff --git a/test/subset/data/tests/layout.gpos8.tests b/test/subset/data/tests/layout.gpos8.tests index 1e0579177..988055411 100644 --- a/test/subset/data/tests/layout.gpos8.tests +++ b/test/subset/data/tests/layout.gpos8.tests @@ -4,8 +4,8 @@ gpos_chaining2_multiple_subrules_f1.otf gpos_chaining3_simple_f1.otf PROFILES: -keep-layout.txt -keep-layout-retain-gids.txt +default.txt +retain-gids.txt SUBSETS: 0123 diff --git a/test/subset/data/tests/layout.gpos9.tests b/test/subset/data/tests/layout.gpos9.tests index c95069ff5..e5f1fdc0b 100644 --- a/test/subset/data/tests/layout.gpos9.tests +++ b/test/subset/data/tests/layout.gpos9.tests @@ -2,8 +2,8 @@ FONTS: gpos9_font2.otf PROFILES: -keep-layout.txt -keep-layout-retain-gids.txt +default.txt +retain-gids.txt SUBSETS: A diff --git a/test/subset/data/tests/layout.gsub3.tests b/test/subset/data/tests/layout.gsub3.tests index 45b85f5b1..8f98f63b7 100644 --- a/test/subset/data/tests/layout.gsub3.tests +++ b/test/subset/data/tests/layout.gsub3.tests @@ -2,8 +2,8 @@ FONTS: gsub_alternate_substitution.otf PROFILES: -keep-layout.txt -keep-layout-retain-gids.txt +default.txt +retain-gids.txt SUBSETS: 厩 diff --git a/test/subset/data/tests/layout.gsub5.tests b/test/subset/data/tests/layout.gsub5.tests index d168cc20b..a08436598 100644 --- a/test/subset/data/tests/layout.gsub5.tests +++ b/test/subset/data/tests/layout.gsub5.tests @@ -4,8 +4,8 @@ gsub_context2_multiple_subrules_f2.otf gsub_context3_successive_f1.otf PROFILES: -keep-layout.txt -keep-layout-retain-gids.txt +default.txt +retain-gids.txt SUBSETS: A diff --git a/test/subset/data/tests/layout.gsub6.tests b/test/subset/data/tests/layout.gsub6.tests index 56f6bc460..344349b92 100644 --- a/test/subset/data/tests/layout.gsub6.tests +++ b/test/subset/data/tests/layout.gsub6.tests @@ -4,8 +4,8 @@ gsub_chaining2_multiple_subrules_f1.otf gsub_chaining3_simple_f2.otf PROFILES: -keep-layout.txt -keep-layout-retain-gids.txt +default.txt +retain-gids.txt SUBSETS: 0123 diff --git a/test/subset/data/tests/layout.gsub8.tests b/test/subset/data/tests/layout.gsub8.tests index fdff43f8a..6bfc02a9a 100644 --- a/test/subset/data/tests/layout.gsub8.tests +++ b/test/subset/data/tests/layout.gsub8.tests @@ -2,8 +2,8 @@ FONTS: gsub8_manually_created.otf PROFILES: -keep-layout.txt -keep-layout-retain-gids.txt +default.txt +retain-gids.txt SUBSETS: a diff --git a/test/subset/data/tests/layout.khmer.tests b/test/subset/data/tests/layout.khmer.tests index 9e8a37653..8c9448212 100644 --- a/test/subset/data/tests/layout.khmer.tests +++ b/test/subset/data/tests/layout.khmer.tests @@ -2,8 +2,8 @@ FONTS: Khmer.ttf PROFILES: -keep-layout.txt -keep-layout-retain-gids.txt +default.txt +retain-gids.txt SUBSETS: 1 diff --git a/test/subset/data/tests/layout.notonastaliqurdu.tests b/test/subset/data/tests/layout.notonastaliqurdu.tests index a353a1536..a34845681 100644 --- a/test/subset/data/tests/layout.notonastaliqurdu.tests +++ b/test/subset/data/tests/layout.notonastaliqurdu.tests @@ -2,7 +2,7 @@ FONTS: NotoNastaliqUrdu-Bold.ttf PROFILES: -keep-layout-retain-gids.txt +retain-gids.txt SUBSETS: الح diff --git a/test/subset/data/tests/layout.tests b/test/subset/data/tests/layout.tests index dd1c26ee9..20e6152f1 100644 --- a/test/subset/data/tests/layout.tests +++ b/test/subset/data/tests/layout.tests @@ -2,8 +2,8 @@ FONTS: Roboto-Regular.smallcaps.ttf PROFILES: -keep-layout.txt -keep-layout-retain-gids.txt +default.txt +retain-gids.txt SUBSETS: ABC diff --git a/test/subset/data/tests/variable.tests b/test/subset/data/tests/variable.tests index 57e13b18d..bda5875ce 100644 --- a/test/subset/data/tests/variable.tests +++ b/test/subset/data/tests/variable.tests @@ -2,7 +2,7 @@ FONTS: Fraunces.ttf PROFILES: -keep-layout.txt +default.txt SUBSETS: a diff --git a/test/subset/generate-expected-outputs.py b/test/subset/generate-expected-outputs.py index 2e94e4e78..ec69bb616 100755 --- a/test/subset/generate-expected-outputs.py +++ b/test/subset/generate-expected-outputs.py @@ -18,7 +18,7 @@ def generate_expected_output(input_file, unicodes, profile_flags, output_path): args = ["fonttools", "subset", input_file] args.extend(["--notdef-outline", "--layout-features=*", - "--drop-tables+=DSIG,GPOS,GSUB,GDEF", + "--drop-tables+=DSIG", "--drop-tables-=sbix", "--unicodes=%s" % unicodes, "--output-file=%s" % output_path]) diff --git a/test/subset/run-tests.py b/test/subset/run-tests.py index 89937668f..0e01c3fd6 100755 --- a/test/subset/run-tests.py +++ b/test/subset/run-tests.py @@ -47,7 +47,7 @@ def run_test (test, should_check_ots): "--font-file=" + test.font_path, "--output-file=" + out_file, "--unicodes=%s" % test.unicodes (), - "--drop-tables+=DSIG,GPOS,GSUB,GDEF", + "--drop-tables+=DSIG", "--drop-tables-=sbix"] cli_args.extend (test.get_profile_flags ()) print (' '.join (cli_args))