diff --git a/src/hb-ot-cmap-table.hh b/src/hb-ot-cmap-table.hh index 7c5d8d3f9..7593bf585 100644 --- a/src/hb-ot-cmap-table.hh +++ b/src/hb-ot-cmap-table.hh @@ -49,6 +49,12 @@ struct CmapSubtableFormat0 *glyph = gid; return true; } + + unsigned get_language () const + { + return language; + } + void collect_unicodes (hb_set_t *out) const { for (unsigned int i = 0; i < 256; i++) @@ -287,6 +293,11 @@ struct CmapSubtableFormat4 : 0; } + unsigned get_language () const + { + return language; + } + struct accelerator_t { accelerator_t () {} @@ -549,6 +560,12 @@ struct CmapSubtableTrimmed *glyph = gid; return true; } + + unsigned get_language () const + { + return language; + } + void collect_unicodes (hb_set_t *out) const { hb_codepoint_t start = startCharCode; @@ -608,6 +625,11 @@ struct CmapSubtableLongSegmented return true; } + unsigned get_language () const + { + return language; + } + void collect_unicodes (hb_set_t *out, unsigned int num_glyphs) const { for (unsigned int i = 0; i < this->groups.len; i++) @@ -1238,6 +1260,20 @@ struct CmapSubtable } } + unsigned get_language () const + { + switch (u.format) { + case 0: return u.format0 .get_language (); + case 4: return u.format4 .get_language (); + case 6: return u.format6 .get_language (); + case 10: return u.format10.get_language (); + case 12: return u.format12.get_language (); + case 13: return u.format13.get_language (); + case 14: + default: return 0; + } + } + template void serialize (hb_serialize_context_t *c, @@ -1373,7 +1409,11 @@ struct cmap (base+_.subtable).collect_unicodes (&unicodes_set); if (format == 4) c->copy (_, + it | hb_filter (unicodes_set, hb_first), 4u, base, plan, &format4objidx); - else if (format == 12) c->copy (_, + it | hb_filter (unicodes_set, hb_first), 12u, base, plan, &format12objidx); + else if (format == 12) + { + if (_can_drop (_, unicodes_set, base, + it | hb_map (hb_first), encodingrec_iter)) continue; + c->copy (_, + it | hb_filter (unicodes_set, hb_first), 12u, base, plan, &format12objidx); + } else if (format == 14) c->copy (_, it, 14u, base, plan, &format14objidx); } @@ -1382,6 +1422,60 @@ struct cmap HB_SERIALIZE_ERROR_INT_OVERFLOW); } + template + bool _can_drop (const EncodingRecord& cmap12, + const hb_set_t& cmap12_unicodes, + const void* base, + Iterator subset_unicodes, + EncodingRecordIterator encoding_records) + { + for (auto cp : + subset_unicodes | hb_filter (cmap12_unicodes)) + { + if (cp >= 0x10000) return false; + } + + unsigned target_platform; + unsigned target_encoding; + unsigned target_language = (base+cmap12.subtable).get_language (); + + if (cmap12.platformID == 0 && cmap12.encodingID == 4) + { + target_platform = 0; + target_encoding = 3; + } else if (cmap12.platformID == 3 && cmap12.encodingID == 10) { + target_platform = 3; + target_encoding = 1; + } else { + return false; + } + + for (const auto& _ : encoding_records) + { + if (_.platformID != target_platform + || _.encodingID != target_encoding + || (base+_.subtable).get_language() != target_language) + continue; + + hb_set_t sibling_unicodes; + (base+_.subtable).collect_unicodes (&sibling_unicodes); + + auto cmap12 = + subset_unicodes | hb_filter (cmap12_unicodes); + auto sibling = + subset_unicodes | hb_filter (sibling_unicodes); + for (; cmap12 && sibling; cmap12++, sibling++) + { + unsigned a = *cmap12; + unsigned b = *sibling; + if (a != b) return false; + } + + return !cmap12 && !sibling; + } + + return false; + } + void closure_glyphs (const hb_set_t *unicodes, hb_set_t *glyphset) const { diff --git a/test/api/fonts/Roboto-Regular.D7,D8,D9,DA,DE.ttf b/test/api/fonts/Roboto-Regular.D7,D8,D9,DA,DE.ttf index 7860f2f1b..073d461e1 100644 Binary files a/test/api/fonts/Roboto-Regular.D7,D8,D9,DA,DE.ttf and b/test/api/fonts/Roboto-Regular.D7,D8,D9,DA,DE.ttf differ diff --git a/test/api/fonts/Roboto-Regular.abc.ttf b/test/api/fonts/Roboto-Regular.abc.ttf index 705ec6965..3d481e7d0 100644 Binary files a/test/api/fonts/Roboto-Regular.abc.ttf and b/test/api/fonts/Roboto-Regular.abc.ttf differ diff --git a/test/api/fonts/Roboto-Regular.ac.ttf b/test/api/fonts/Roboto-Regular.ac.ttf index 5a5e68ed8..b735a4601 100644 Binary files a/test/api/fonts/Roboto-Regular.ac.ttf and b/test/api/fonts/Roboto-Regular.ac.ttf differ diff --git a/test/subset/data/Makefile.am b/test/subset/data/Makefile.am index 311708809..9a7d7a29c 100644 --- a/test/subset/data/Makefile.am +++ b/test/subset/data/Makefile.am @@ -38,14 +38,16 @@ EXTRA_DIST += \ expected/sbix \ expected/colr \ expected/colr_with_components \ - expected/colrv1.notoemoji \ - expected/colrv1 \ expected/cbdt \ expected/variable \ fonts \ profiles \ $(NULL) +# TODO: re-able once colrv1 subsetting is stabilized. +# expected/colrv1 +# expected/colrv1.notoemoji + # Convenience targets: lib: @$(MAKE) $(AM_MAKEFLAGS) -C $(top_builddir)/src lib 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 ccd47a040..deac4173f 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 734dff791..1e100ea6b 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 c338dface..4eceb86cd 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 a57037303..b01c09dfa 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 5b29833e9..a4c5f8ad1 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 ccd47a040..deac4173f 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 2afff63b8..7ea09479e 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 e6663ba75..bbe794576 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 668e22891..3093254d5 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 537b51351..8be3e4e66 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 aafcd2966..f99b2b430 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 2afff63b8..7ea09479e 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 2afff63b8..7ea09479e 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 6478c431b..c1f96a5af 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 668e22891..3093254d5 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 091730b70..04ab80083 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 354ea4868..0e9187892 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 2afff63b8..7ea09479e 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 ccd47a040..deac4173f 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 ccd47a040..deac4173f 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 ccd47a040..deac4173f 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 ccd47a040..deac4173f 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 ccd47a040..deac4173f 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 ccd47a040..deac4173f 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.glyph-names.61,62,63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.glyph-names.61,62,63.ttf index ccd47a040..deac4173f 100644 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.glyph-names.61,62,63.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.glyph-names.61,62,63.ttf differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.glyph-names.61,63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.glyph-names.61,63.ttf index 734dff791..1e100ea6b 100644 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.glyph-names.61,63.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.glyph-names.61,63.ttf differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.glyph-names.61.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.glyph-names.61.ttf index c338dface..4eceb86cd 100644 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.glyph-names.61.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.glyph-names.61.ttf differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.glyph-names.62.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.glyph-names.62.ttf index a57037303..b01c09dfa 100644 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.glyph-names.62.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.glyph-names.62.ttf differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.glyph-names.63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.glyph-names.63.ttf index 5b29833e9..a4c5f8ad1 100644 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.glyph-names.63.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.glyph-names.63.ttf differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.glyph-names.retain-all-codepoint.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.glyph-names.retain-all-codepoint.ttf index ccd47a040..deac4173f 100644 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.glyph-names.retain-all-codepoint.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.glyph-names.retain-all-codepoint.ttf differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.keep-all-layout-features.61,62,63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.keep-all-layout-features.61,62,63.ttf index ccd47a040..deac4173f 100644 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.keep-all-layout-features.61,62,63.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.keep-all-layout-features.61,62,63.ttf differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.keep-all-layout-features.61,63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.keep-all-layout-features.61,63.ttf index 734dff791..1e100ea6b 100644 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.keep-all-layout-features.61,63.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.keep-all-layout-features.61,63.ttf differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.keep-all-layout-features.61.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.keep-all-layout-features.61.ttf index c338dface..4eceb86cd 100644 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.keep-all-layout-features.61.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.keep-all-layout-features.61.ttf differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.keep-all-layout-features.62.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.keep-all-layout-features.62.ttf index a57037303..b01c09dfa 100644 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.keep-all-layout-features.62.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.keep-all-layout-features.62.ttf differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.keep-all-layout-features.63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.keep-all-layout-features.63.ttf index 5b29833e9..a4c5f8ad1 100644 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.keep-all-layout-features.63.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.keep-all-layout-features.63.ttf differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.keep-all-layout-features.retain-all-codepoint.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.keep-all-layout-features.retain-all-codepoint.ttf index ccd47a040..deac4173f 100644 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.keep-all-layout-features.retain-all-codepoint.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.keep-all-layout-features.retain-all-codepoint.ttf differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.layout-features.61,62,63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.layout-features.61,62,63.ttf index ccd47a040..deac4173f 100644 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.layout-features.61,62,63.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.layout-features.61,62,63.ttf differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.layout-features.61,63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.layout-features.61,63.ttf index 734dff791..1e100ea6b 100644 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.layout-features.61,63.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.layout-features.61,63.ttf differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.layout-features.61.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.layout-features.61.ttf index c338dface..4eceb86cd 100644 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.layout-features.61.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.layout-features.61.ttf differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.layout-features.62.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.layout-features.62.ttf index a57037303..b01c09dfa 100644 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.layout-features.62.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.layout-features.62.ttf differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.layout-features.63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.layout-features.63.ttf index 5b29833e9..a4c5f8ad1 100644 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.layout-features.63.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.layout-features.63.ttf differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.layout-features.retain-all-codepoint.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.layout-features.retain-all-codepoint.ttf index ccd47a040..deac4173f 100644 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.layout-features.retain-all-codepoint.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.layout-features.retain-all-codepoint.ttf 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 ccd47a040..deac4173f 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 734dff791..1e100ea6b 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 c338dface..4eceb86cd 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 a57037303..b01c09dfa 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 5b29833e9..a4c5f8ad1 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 ccd47a040..deac4173f 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 ccd47a040..deac4173f 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 734dff791..1e100ea6b 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 c338dface..4eceb86cd 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 a57037303..b01c09dfa 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 5b29833e9..a4c5f8ad1 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 ccd47a040..deac4173f 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 ccd47a040..deac4173f 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 734dff791..1e100ea6b 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 c338dface..4eceb86cd 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 a57037303..b01c09dfa 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 5b29833e9..a4c5f8ad1 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 ccd47a040..deac4173f 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.no-prune-unicode-ranges.61,62,63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.no-prune-unicode-ranges.61,62,63.ttf index ccd47a040..deac4173f 100644 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.no-prune-unicode-ranges.61,62,63.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.no-prune-unicode-ranges.61,62,63.ttf differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.no-prune-unicode-ranges.61,63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.no-prune-unicode-ranges.61,63.ttf index 734dff791..1e100ea6b 100644 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.no-prune-unicode-ranges.61,63.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.no-prune-unicode-ranges.61,63.ttf differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.no-prune-unicode-ranges.61.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.no-prune-unicode-ranges.61.ttf index abf6b1023..a24ce311c 100644 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.no-prune-unicode-ranges.61.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.no-prune-unicode-ranges.61.ttf differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.no-prune-unicode-ranges.62.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.no-prune-unicode-ranges.62.ttf index e4ab123d8..9e7490a3c 100644 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.no-prune-unicode-ranges.62.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.no-prune-unicode-ranges.62.ttf differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.no-prune-unicode-ranges.63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.no-prune-unicode-ranges.63.ttf index d1acd4ca4..b59546b8d 100644 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.no-prune-unicode-ranges.63.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.no-prune-unicode-ranges.63.ttf differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.no-prune-unicode-ranges.retain-all-codepoint.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.no-prune-unicode-ranges.retain-all-codepoint.ttf index ccd47a040..deac4173f 100644 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.no-prune-unicode-ranges.retain-all-codepoint.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.no-prune-unicode-ranges.retain-all-codepoint.ttf differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.notdef-outline.61,62,63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.notdef-outline.61,62,63.ttf index ccd47a040..deac4173f 100644 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.notdef-outline.61,62,63.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.notdef-outline.61,62,63.ttf differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.notdef-outline.61,63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.notdef-outline.61,63.ttf index 734dff791..1e100ea6b 100644 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.notdef-outline.61,63.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.notdef-outline.61,63.ttf differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.notdef-outline.61.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.notdef-outline.61.ttf index c338dface..4eceb86cd 100644 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.notdef-outline.61.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.notdef-outline.61.ttf differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.notdef-outline.62.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.notdef-outline.62.ttf index a57037303..b01c09dfa 100644 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.notdef-outline.62.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.notdef-outline.62.ttf differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.notdef-outline.63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.notdef-outline.63.ttf index 5b29833e9..a4c5f8ad1 100644 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.notdef-outline.63.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.notdef-outline.63.ttf differ diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.notdef-outline.retain-all-codepoint.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.notdef-outline.retain-all-codepoint.ttf index ccd47a040..deac4173f 100644 Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.notdef-outline.retain-all-codepoint.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.notdef-outline.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 ccd47a040..deac4173f 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 b5adb409d..c939b002b 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 c338dface..4eceb86cd 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 78efd559a..61118f7f2 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 6317102c5..cd0ae5f39 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 ccd47a040..deac4173f 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/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 deleted file mode 100644 index c5cda7ab2..000000000 Binary files a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-desubroutinize.61,62,63.otf and /dev/null 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.notdef-outline-desubroutinize-retain-gids.1FC,21,41,20,62,63.otf similarity index 98% rename from test/subset/data/expected/cff-full-font/SourceSansPro-Regular.desubroutinize-retain-gids.1FC,21,41,20,62,63.otf rename to test/subset/data/expected/cff-full-font/SourceSansPro-Regular.notdef-outline-desubroutinize-retain-gids.1FC,21,41,20,62,63.otf index 09bad7af8..af76b6f66 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.notdef-outline-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.notdef-outline-desubroutinize-retain-gids.61,62,63.otf similarity index 54% rename from test/subset/data/expected/cff-full-font/SourceSansPro-Regular.desubroutinize-retain-gids.61,62,63.otf rename to test/subset/data/expected/cff-full-font/SourceSansPro-Regular.notdef-outline-desubroutinize-retain-gids.61,62,63.otf index 82f254bb6..794b7310e 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.notdef-outline-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.notdef-outline-desubroutinize-retain-gids.D7,D8,D9,DA,DE.otf similarity index 95% rename from test/subset/data/expected/cff-full-font/SourceSansPro-Regular.desubroutinize-retain-gids.D7,D8,D9,DA,DE.otf rename to test/subset/data/expected/cff-full-font/SourceSansPro-Regular.notdef-outline-desubroutinize-retain-gids.D7,D8,D9,DA,DE.otf index 1ce652fe3..12620417a 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.notdef-outline-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.notdef-outline-desubroutinize.1FC,21,41,20,62,63.otf similarity index 83% rename from test/subset/data/expected/cff-full-font/SourceSansPro-Regular.desubroutinize.1FC,21,41,20,62,63.otf rename to test/subset/data/expected/cff-full-font/SourceSansPro-Regular.notdef-outline-desubroutinize.1FC,21,41,20,62,63.otf index 60c25cd17..e1d98906a 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.notdef-outline-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.notdef-outline-desubroutinize.61,62,63.otf similarity index 52% rename from test/subset/data/expected/cff-full-font/SourceSansPro-Regular.desubroutinize.61,62,63.otf rename to test/subset/data/expected/cff-full-font/SourceSansPro-Regular.notdef-outline-desubroutinize.61,62,63.otf index 8ae2b7a1a..87d9c2e0c 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.notdef-outline-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.notdef-outline-desubroutinize.D7,D8,D9,DA,DE.otf similarity index 54% rename from test/subset/data/expected/cff-full-font/SourceSansPro-Regular.desubroutinize.D7,D8,D9,DA,DE.otf rename to test/subset/data/expected/cff-full-font/SourceSansPro-Regular.notdef-outline-desubroutinize.D7,D8,D9,DA,DE.otf index 328423121..d151f3032 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.notdef-outline-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.notdef-outline-drop-hints-desubroutinize-retain-gids.1FC,21,41,20,62,63.otf similarity index 97% rename from test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-desubroutinize-retain-gids.1FC,21,41,20,62,63.otf rename to test/subset/data/expected/cff-full-font/SourceSansPro-Regular.notdef-outline-drop-hints-desubroutinize-retain-gids.1FC,21,41,20,62,63.otf index ddf5bec8f..46c9b9a8b 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.notdef-outline-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.notdef-outline-drop-hints-desubroutinize-retain-gids.61,62,63.otf similarity index 51% rename from test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-desubroutinize-retain-gids.61,62,63.otf rename to test/subset/data/expected/cff-full-font/SourceSansPro-Regular.notdef-outline-drop-hints-desubroutinize-retain-gids.61,62,63.otf index a3eedd646..70a201b21 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.notdef-outline-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.notdef-outline-drop-hints-desubroutinize-retain-gids.D7,D8,D9,DA,DE.otf similarity index 95% rename from test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-desubroutinize-retain-gids.D7,D8,D9,DA,DE.otf rename to test/subset/data/expected/cff-full-font/SourceSansPro-Regular.notdef-outline-drop-hints-desubroutinize-retain-gids.D7,D8,D9,DA,DE.otf index 0c87d1938..a8fda90a3 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.notdef-outline-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.notdef-outline-drop-hints-desubroutinize.1FC,21,41,20,62,63.otf similarity index 82% rename from test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-desubroutinize.1FC,21,41,20,62,63.otf rename to test/subset/data/expected/cff-full-font/SourceSansPro-Regular.notdef-outline-drop-hints-desubroutinize.1FC,21,41,20,62,63.otf index 987cb50e2..d164e8983 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.notdef-outline-drop-hints-desubroutinize.1FC,21,41,20,62,63.otf differ diff --git a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.notdef-outline-drop-hints-desubroutinize.61,62,63.otf b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.notdef-outline-drop-hints-desubroutinize.61,62,63.otf new file mode 100644 index 000000000..5e6888b98 Binary files /dev/null and b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.notdef-outline-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.notdef-outline-drop-hints-desubroutinize.D7,D8,D9,DA,DE.otf similarity index 50% rename from test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-desubroutinize.D7,D8,D9,DA,DE.otf rename to test/subset/data/expected/cff-full-font/SourceSansPro-Regular.notdef-outline-drop-hints-desubroutinize.D7,D8,D9,DA,DE.otf index da5abf400..ae442ac4c 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.notdef-outline-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.notdef-outline-drop-hints-retain-gids.1FC,21,41,20,62,63.otf similarity index 97% rename from test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-retain-gids.1FC,21,41,20,62,63.otf rename to test/subset/data/expected/cff-full-font/SourceSansPro-Regular.notdef-outline-drop-hints-retain-gids.1FC,21,41,20,62,63.otf index 49f3dd0a8..158e58dfe 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.notdef-outline-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.notdef-outline-drop-hints-retain-gids.61,62,63.otf similarity index 52% rename from test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-retain-gids.61,62,63.otf rename to test/subset/data/expected/cff-full-font/SourceSansPro-Regular.notdef-outline-drop-hints-retain-gids.61,62,63.otf index 70b0e8853..7db40e886 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.notdef-outline-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.notdef-outline-drop-hints-retain-gids.D7,D8,D9,DA,DE.otf similarity index 95% rename from test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-retain-gids.D7,D8,D9,DA,DE.otf rename to test/subset/data/expected/cff-full-font/SourceSansPro-Regular.notdef-outline-drop-hints-retain-gids.D7,D8,D9,DA,DE.otf index 71989f775..15926ddad 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.notdef-outline-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.notdef-outline-drop-hints.1FC,21,41,20,62,63.otf similarity index 82% rename from test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints.1FC,21,41,20,62,63.otf rename to test/subset/data/expected/cff-full-font/SourceSansPro-Regular.notdef-outline-drop-hints.1FC,21,41,20,62,63.otf index 1ec2e4a85..090597dcf 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.notdef-outline-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.notdef-outline-drop-hints.61,62,63.otf similarity index 50% rename from test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints.61,62,63.otf rename to test/subset/data/expected/cff-full-font/SourceSansPro-Regular.notdef-outline-drop-hints.61,62,63.otf index 8a5bf13a6..63c59d5c1 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.notdef-outline-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.notdef-outline-drop-hints.D7,D8,D9,DA,DE.otf similarity index 51% rename from test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints.D7,D8,D9,DA,DE.otf rename to test/subset/data/expected/cff-full-font/SourceSansPro-Regular.notdef-outline-drop-hints.D7,D8,D9,DA,DE.otf index e5ffbbfe8..fb3c86010 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.notdef-outline-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.notdef-outline-retain-gids.1FC,21,41,20,62,63.otf similarity index 98% rename from test/subset/data/expected/cff-full-font/SourceSansPro-Regular.retain-gids.1FC,21,41,20,62,63.otf rename to test/subset/data/expected/cff-full-font/SourceSansPro-Regular.notdef-outline-retain-gids.1FC,21,41,20,62,63.otf index 9e041fab0..fb8b6a741 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.notdef-outline-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.notdef-outline-retain-gids.61,62,63.otf similarity index 55% rename from test/subset/data/expected/cff-full-font/SourceSansPro-Regular.retain-gids.61,62,63.otf rename to test/subset/data/expected/cff-full-font/SourceSansPro-Regular.notdef-outline-retain-gids.61,62,63.otf index 6c1dd9458..150138214 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.notdef-outline-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.notdef-outline-retain-gids.D7,D8,D9,DA,DE.otf similarity index 95% rename from test/subset/data/expected/cff-full-font/SourceSansPro-Regular.retain-gids.D7,D8,D9,DA,DE.otf rename to test/subset/data/expected/cff-full-font/SourceSansPro-Regular.notdef-outline-retain-gids.D7,D8,D9,DA,DE.otf index 91667a4ab..25a5f8b27 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.notdef-outline-retain-gids.D7,D8,D9,DA,DE.otf 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.notdef-outline.1FC,21,41,20,62,63.otf similarity index 70% rename from test/subset/data/expected/cff-full-font/SourceSansPro-Regular.default.1FC,21,41,20,62,63.otf rename to test/subset/data/expected/cff-full-font/SourceSansPro-Regular.notdef-outline.1FC,21,41,20,62,63.otf index 151facbea..c2236258f 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.notdef-outline.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.notdef-outline.61,62,63.otf similarity index 54% rename from test/subset/data/expected/cff-full-font/SourceSansPro-Regular.default.61,62,63.otf rename to test/subset/data/expected/cff-full-font/SourceSansPro-Regular.notdef-outline.61,62,63.otf index c3e8be275..a77143071 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.notdef-outline.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.notdef-outline.D7,D8,D9,DA,DE.otf similarity index 54% rename from test/subset/data/expected/cff-full-font/SourceSansPro-Regular.default.D7,D8,D9,DA,DE.otf rename to test/subset/data/expected/cff-full-font/SourceSansPro-Regular.notdef-outline.D7,D8,D9,DA,DE.otf index 01eda174d..32dfc0b3c 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.notdef-outline.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 d663fa140..10ceb5dfe 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 e44dcc3e2..91a78cb6a 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 a80cb0f09..9dac19c90 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 2df3d1783..21907fb17 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 0924a5963..2d1410e7b 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 c833d640b..5b2bc0016 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 75a59c078..ceb6e8274 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 07068fc54..c9e742c84 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 814374caa..522c56bd9 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 320359466..a7759499c 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 f7a94c805..a802370a2 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 56cab7325..16f898c98 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 9c4db1d0e..34dc2644c 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 ba044c2d4..e72bfbe8f 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 ee47ef562..d44479df7 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 93a08afd7..2e96e50d8 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 db5737df6..f1bd1e64b 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 ce4961622..4f984f765 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 f7045177c..99a6a542c 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 608687544..b0f53b1fe 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 14bf663e7..f5703d172 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 7a8d0661c..44fcce8ff 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 2d891f48e..a793d332c 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 ef649bf66..8e7b7e8f0 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 b85fb233b..cb320f5be 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 84fdc5433..338387d84 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 75cfc2d17..778bb30fa 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 69a81c36d..2550d7b69 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 dda6119a3..5eb58baf3 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 68dddb63e..a46ea0a7a 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 f1e35df2b..2e4e40b2d 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 28b1aab91..cb06d8287 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 8414d1a3a..f32e92706 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 2c72a587e..551eb5314 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 46c69ce1d..2001adf9d 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 a50f30ba8..a289005d2 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 fa5dd13b7..37e537f08 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 c43bc94c2..c60422d1b 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 c3718a90c..4c51ae1c9 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 b3a5caee3..95a69df76 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/cff.notoserifmyanmar/NotoSerifMyanmar-Regular.notdef-outline.1005,1000,103A,1015,1005,1039,1005,100A,103A,1038,1010,103D,1031,104A.otf b/test/subset/data/expected/cff.notoserifmyanmar/NotoSerifMyanmar-Regular.notdef-outline.1005,1000,103A,1015,1005,1039,1005,100A,103A,1038,1010,103D,1031,104A.otf deleted file mode 100644 index b661334ab..000000000 Binary files a/test/subset/data/expected/cff.notoserifmyanmar/NotoSerifMyanmar-Regular.notdef-outline.1005,1000,103A,1015,1005,1039,1005,100A,103A,1038,1010,103D,1031,104A.otf and /dev/null differ diff --git a/test/subset/data/expected/cmap/AdobeBlank-Regular.default.61,62.ttf b/test/subset/data/expected/cmap/AdobeBlank-Regular.default.61,62.ttf index 0fcc5e48a..f2a225d14 100644 Binary files a/test/subset/data/expected/cmap/AdobeBlank-Regular.default.61,62.ttf and b/test/subset/data/expected/cmap/AdobeBlank-Regular.default.61,62.ttf differ diff --git a/test/subset/data/expected/cmap/AdobeBlank-Regular.drop-hints-retain-gids.61,62.ttf b/test/subset/data/expected/cmap/AdobeBlank-Regular.drop-hints-retain-gids.61,62.ttf index 05258220a..fc5caf03f 100644 Binary files a/test/subset/data/expected/cmap/AdobeBlank-Regular.drop-hints-retain-gids.61,62.ttf and b/test/subset/data/expected/cmap/AdobeBlank-Regular.drop-hints-retain-gids.61,62.ttf differ diff --git a/test/subset/data/expected/cmap/AdobeBlank-Regular.drop-hints.61,62.ttf b/test/subset/data/expected/cmap/AdobeBlank-Regular.drop-hints.61,62.ttf index 6b65c18f8..743138d40 100644 Binary files a/test/subset/data/expected/cmap/AdobeBlank-Regular.drop-hints.61,62.ttf and b/test/subset/data/expected/cmap/AdobeBlank-Regular.drop-hints.61,62.ttf differ diff --git a/test/subset/data/expected/cmap/AdobeBlank-Regular.name-ids.61,62.ttf b/test/subset/data/expected/cmap/AdobeBlank-Regular.name-ids.61,62.ttf index 62061569b..4772702c4 100644 Binary files a/test/subset/data/expected/cmap/AdobeBlank-Regular.name-ids.61,62.ttf and b/test/subset/data/expected/cmap/AdobeBlank-Regular.name-ids.61,62.ttf differ diff --git a/test/subset/data/expected/cmap/AdobeBlank-Regular.retain-gids.61,62.ttf b/test/subset/data/expected/cmap/AdobeBlank-Regular.retain-gids.61,62.ttf index dab579330..12c371b95 100644 Binary files a/test/subset/data/expected/cmap/AdobeBlank-Regular.retain-gids.61,62.ttf and b/test/subset/data/expected/cmap/AdobeBlank-Regular.retain-gids.61,62.ttf differ diff --git a/test/subset/data/expected/cmap14/cmap14_font1.drop-hints-retain-gids.4E00,4E02,4E03.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints-retain-gids.4E00,4E02,4E03.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font1.drop-hints-retain-gids.4E00,4E02,4E03.otf rename to test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints-retain-gids.4E00,4E02,4E03.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font1.drop-hints-retain-gids.4E00,4E03.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints-retain-gids.4E00,4E03.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font1.drop-hints-retain-gids.4E00,4E03.otf rename to test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints-retain-gids.4E00,4E03.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font1.drop-hints-retain-gids.4E00,4E05,4E07.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints-retain-gids.4E00,4E05,4E07.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font1.drop-hints-retain-gids.4E00,4E05,4E07.otf rename to test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints-retain-gids.4E00,4E05,4E07.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font1.drop-hints-retain-gids.4E02,4E03,4E08.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints-retain-gids.4E02,4E03,4E08.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font1.drop-hints-retain-gids.4E02,4E03,4E08.otf rename to test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints-retain-gids.4E02,4E03,4E08.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font1.drop-hints-retain-gids.4E02.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints-retain-gids.4E02.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font1.drop-hints-retain-gids.4E02.otf rename to test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints-retain-gids.4E02.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font1.drop-hints-retain-gids.4E03.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints-retain-gids.4E03.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font1.drop-hints-retain-gids.4E03.otf rename to test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints-retain-gids.4E03.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font1.drop-hints-retain-gids.4E05,4E07,4E08,4E09.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints-retain-gids.4E05,4E07,4E08,4E09.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font1.drop-hints-retain-gids.4E05,4E07,4E08,4E09.otf rename to test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints-retain-gids.4E05,4E07,4E08,4E09.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font1.drop-hints-retain-gids.4E08,4E09.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints-retain-gids.4E08,4E09.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font1.drop-hints-retain-gids.4E08,4E09.otf rename to test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints-retain-gids.4E08,4E09.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font1.drop-hints-retain-gids.4E08.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints-retain-gids.4E08.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font1.drop-hints-retain-gids.4E08.otf rename to test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints-retain-gids.4E08.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font1.drop-hints-retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints-retain-gids.retain-all-codepoint.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font1.drop-hints-retain-gids.retain-all-codepoint.otf rename to test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints-retain-gids.retain-all-codepoint.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font1.drop-hints.4E00,4E02,4E03.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints.4E00,4E02,4E03.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font1.drop-hints.4E00,4E02,4E03.otf rename to test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints.4E00,4E02,4E03.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font1.drop-hints.4E00,4E03.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints.4E00,4E03.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font1.drop-hints.4E00,4E03.otf rename to test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints.4E00,4E03.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font1.drop-hints.4E00,4E05,4E07.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints.4E00,4E05,4E07.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font1.drop-hints.4E00,4E05,4E07.otf rename to test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints.4E00,4E05,4E07.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font1.drop-hints.4E02,4E03,4E08.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints.4E02,4E03,4E08.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font1.drop-hints.4E02,4E03,4E08.otf rename to test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints.4E02,4E03,4E08.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font1.drop-hints.4E02.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints.4E02.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font1.drop-hints.4E02.otf rename to test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints.4E02.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font1.drop-hints.4E03.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints.4E03.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font1.drop-hints.4E03.otf rename to test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints.4E03.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font1.drop-hints.4E05,4E07,4E08,4E09.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints.4E05,4E07,4E08,4E09.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font1.drop-hints.4E05,4E07,4E08,4E09.otf rename to test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints.4E05,4E07,4E08,4E09.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font1.drop-hints.4E08,4E09.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints.4E08,4E09.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font1.drop-hints.4E08,4E09.otf rename to test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints.4E08,4E09.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font1.drop-hints.4E08.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints.4E08.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font1.drop-hints.4E08.otf rename to test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints.4E08.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font1.drop-hints.retain-all-codepoint.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints.retain-all-codepoint.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font1.drop-hints.retain-all-codepoint.otf rename to test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints.retain-all-codepoint.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font1.gids.4E00,4E02,4E03.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-gids.4E00,4E02,4E03.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font1.gids.4E00,4E02,4E03.otf rename to test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-gids.4E00,4E02,4E03.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font1.gids.4E00,4E03.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-gids.4E00,4E03.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font1.gids.4E00,4E03.otf rename to test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-gids.4E00,4E03.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font1.gids.4E00,4E05,4E07.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-gids.4E00,4E05,4E07.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font1.gids.4E00,4E05,4E07.otf rename to test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-gids.4E00,4E05,4E07.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font1.gids.4E02,4E03,4E08.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-gids.4E02,4E03,4E08.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font1.gids.4E02,4E03,4E08.otf rename to test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-gids.4E02,4E03,4E08.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font1.gids.4E02.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-gids.4E02.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font1.gids.4E02.otf rename to test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-gids.4E02.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font1.gids.4E03.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-gids.4E03.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font1.gids.4E03.otf rename to test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-gids.4E03.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font1.gids.4E05,4E07,4E08,4E09.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-gids.4E05,4E07,4E08,4E09.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font1.gids.4E05,4E07,4E08,4E09.otf rename to test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-gids.4E05,4E07,4E08,4E09.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font1.gids.4E08,4E09.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-gids.4E08,4E09.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font1.gids.4E08,4E09.otf rename to test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-gids.4E08,4E09.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font1.gids.4E08.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-gids.4E08.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font1.gids.4E08.otf rename to test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-gids.4E08.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font1.gids.retain-all-codepoint.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-gids.retain-all-codepoint.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font1.gids.retain-all-codepoint.otf rename to test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-gids.retain-all-codepoint.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font1.name-ids.4E00,4E02,4E03.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-name-ids.4E00,4E02,4E03.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font1.name-ids.4E00,4E02,4E03.otf rename to test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-name-ids.4E00,4E02,4E03.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font1.name-ids.4E00,4E03.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-name-ids.4E00,4E03.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font1.name-ids.4E00,4E03.otf rename to test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-name-ids.4E00,4E03.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font1.name-ids.4E00,4E05,4E07.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-name-ids.4E00,4E05,4E07.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font1.name-ids.4E00,4E05,4E07.otf rename to test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-name-ids.4E00,4E05,4E07.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font1.name-ids.4E02,4E03,4E08.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-name-ids.4E02,4E03,4E08.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font1.name-ids.4E02,4E03,4E08.otf rename to test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-name-ids.4E02,4E03,4E08.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font1.name-ids.4E02.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-name-ids.4E02.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font1.name-ids.4E02.otf rename to test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-name-ids.4E02.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font1.name-ids.4E03.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-name-ids.4E03.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font1.name-ids.4E03.otf rename to test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-name-ids.4E03.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font1.name-ids.4E05,4E07,4E08,4E09.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-name-ids.4E05,4E07,4E08,4E09.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font1.name-ids.4E05,4E07,4E08,4E09.otf rename to test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-name-ids.4E05,4E07,4E08,4E09.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font1.name-ids.4E08,4E09.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-name-ids.4E08,4E09.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font1.name-ids.4E08,4E09.otf rename to test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-name-ids.4E08,4E09.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font1.name-ids.4E08.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-name-ids.4E08.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font1.name-ids.4E08.otf rename to test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-name-ids.4E08.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font1.name-ids.retain-all-codepoint.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-name-ids.retain-all-codepoint.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font1.name-ids.retain-all-codepoint.otf rename to test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-name-ids.retain-all-codepoint.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font1.retain-gids.4E00,4E02,4E03.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-retain-gids.4E00,4E02,4E03.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font1.retain-gids.4E00,4E02,4E03.otf rename to test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-retain-gids.4E00,4E02,4E03.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font1.retain-gids.4E00,4E03.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-retain-gids.4E00,4E03.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font1.retain-gids.4E00,4E03.otf rename to test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-retain-gids.4E00,4E03.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font1.retain-gids.4E00,4E05,4E07.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-retain-gids.4E00,4E05,4E07.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font1.retain-gids.4E00,4E05,4E07.otf rename to test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-retain-gids.4E00,4E05,4E07.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font1.retain-gids.4E02,4E03,4E08.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-retain-gids.4E02,4E03,4E08.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font1.retain-gids.4E02,4E03,4E08.otf rename to test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-retain-gids.4E02,4E03,4E08.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font1.retain-gids.4E02.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-retain-gids.4E02.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font1.retain-gids.4E02.otf rename to test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-retain-gids.4E02.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font1.retain-gids.4E03.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-retain-gids.4E03.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font1.retain-gids.4E03.otf rename to test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-retain-gids.4E03.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font1.retain-gids.4E05,4E07,4E08,4E09.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-retain-gids.4E05,4E07,4E08,4E09.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font1.retain-gids.4E05,4E07,4E08,4E09.otf rename to test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-retain-gids.4E05,4E07,4E08,4E09.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font1.retain-gids.4E08,4E09.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-retain-gids.4E08,4E09.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font1.retain-gids.4E08,4E09.otf rename to test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-retain-gids.4E08,4E09.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font1.retain-gids.4E08.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-retain-gids.4E08.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font1.retain-gids.4E08.otf rename to test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-retain-gids.4E08.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font1.retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-retain-gids.retain-all-codepoint.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font1.retain-gids.retain-all-codepoint.otf rename to test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-retain-gids.retain-all-codepoint.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font1.default.4E00,4E02,4E03.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline.4E00,4E02,4E03.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font1.default.4E00,4E02,4E03.otf rename to test/subset/data/expected/cmap14/cmap14_font1.notdef-outline.4E00,4E02,4E03.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font1.default.4E00,4E03.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline.4E00,4E03.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font1.default.4E00,4E03.otf rename to test/subset/data/expected/cmap14/cmap14_font1.notdef-outline.4E00,4E03.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font1.default.4E00,4E05,4E07.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline.4E00,4E05,4E07.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font1.default.4E00,4E05,4E07.otf rename to test/subset/data/expected/cmap14/cmap14_font1.notdef-outline.4E00,4E05,4E07.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font1.default.4E02,4E03,4E08.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline.4E02,4E03,4E08.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font1.default.4E02,4E03,4E08.otf rename to test/subset/data/expected/cmap14/cmap14_font1.notdef-outline.4E02,4E03,4E08.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font1.default.4E02.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline.4E02.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font1.default.4E02.otf rename to test/subset/data/expected/cmap14/cmap14_font1.notdef-outline.4E02.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font1.default.4E03.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline.4E03.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font1.default.4E03.otf rename to test/subset/data/expected/cmap14/cmap14_font1.notdef-outline.4E03.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font1.default.4E05,4E07,4E08,4E09.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline.4E05,4E07,4E08,4E09.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font1.default.4E05,4E07,4E08,4E09.otf rename to test/subset/data/expected/cmap14/cmap14_font1.notdef-outline.4E05,4E07,4E08,4E09.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font1.default.4E08,4E09.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline.4E08,4E09.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font1.default.4E08,4E09.otf rename to test/subset/data/expected/cmap14/cmap14_font1.notdef-outline.4E08,4E09.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font1.default.4E08.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline.4E08.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font1.default.4E08.otf rename to test/subset/data/expected/cmap14/cmap14_font1.notdef-outline.4E08.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font1.default.retain-all-codepoint.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline.retain-all-codepoint.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font1.default.retain-all-codepoint.otf rename to test/subset/data/expected/cmap14/cmap14_font1.notdef-outline.retain-all-codepoint.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.4E00,4E02,4E03.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints-retain-gids.4E00,4E02,4E03.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.4E00,4E02,4E03.otf rename to test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints-retain-gids.4E00,4E02,4E03.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.4E00,4E03.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints-retain-gids.4E00,4E03.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.4E00,4E03.otf rename to test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints-retain-gids.4E00,4E03.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.4E00,4E05,4E07.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints-retain-gids.4E00,4E05,4E07.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.4E00,4E05,4E07.otf rename to test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints-retain-gids.4E00,4E05,4E07.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.4E02,4E03,4E08.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints-retain-gids.4E02,4E03,4E08.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.4E02,4E03,4E08.otf rename to test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints-retain-gids.4E02,4E03,4E08.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.4E02.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints-retain-gids.4E02.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.4E02.otf rename to test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints-retain-gids.4E02.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.4E03.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints-retain-gids.4E03.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.4E03.otf rename to test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints-retain-gids.4E03.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.4E05,4E07,4E08,4E09.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints-retain-gids.4E05,4E07,4E08,4E09.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.4E05,4E07,4E08,4E09.otf rename to test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints-retain-gids.4E05,4E07,4E08,4E09.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.4E08,4E09.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints-retain-gids.4E08,4E09.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.4E08,4E09.otf rename to test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints-retain-gids.4E08,4E09.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.4E08.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints-retain-gids.4E08.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.4E08.otf rename to test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints-retain-gids.4E08.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints-retain-gids.retain-all-codepoint.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.retain-all-codepoint.otf rename to test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints-retain-gids.retain-all-codepoint.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font2.drop-hints.4E00,4E02,4E03.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints.4E00,4E02,4E03.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font2.drop-hints.4E00,4E02,4E03.otf rename to test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints.4E00,4E02,4E03.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font2.drop-hints.4E00,4E03.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints.4E00,4E03.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font2.drop-hints.4E00,4E03.otf rename to test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints.4E00,4E03.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font2.drop-hints.4E00,4E05,4E07.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints.4E00,4E05,4E07.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font2.drop-hints.4E00,4E05,4E07.otf rename to test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints.4E00,4E05,4E07.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font2.drop-hints.4E02,4E03,4E08.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints.4E02,4E03,4E08.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font2.drop-hints.4E02,4E03,4E08.otf rename to test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints.4E02,4E03,4E08.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font2.drop-hints.4E02.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints.4E02.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font2.drop-hints.4E02.otf rename to test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints.4E02.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font2.drop-hints.4E03.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints.4E03.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font2.drop-hints.4E03.otf rename to test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints.4E03.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font2.drop-hints.4E05,4E07,4E08,4E09.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints.4E05,4E07,4E08,4E09.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font2.drop-hints.4E05,4E07,4E08,4E09.otf rename to test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints.4E05,4E07,4E08,4E09.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font2.drop-hints.4E08,4E09.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints.4E08,4E09.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font2.drop-hints.4E08,4E09.otf rename to test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints.4E08,4E09.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font2.drop-hints.4E08.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints.4E08.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font2.drop-hints.4E08.otf rename to test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints.4E08.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font2.drop-hints.retain-all-codepoint.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints.retain-all-codepoint.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font2.drop-hints.retain-all-codepoint.otf rename to test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints.retain-all-codepoint.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font2.gids.4E00,4E02,4E03.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-gids.4E00,4E02,4E03.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font2.gids.4E00,4E02,4E03.otf rename to test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-gids.4E00,4E02,4E03.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font2.gids.4E00,4E03.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-gids.4E00,4E03.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font2.gids.4E00,4E03.otf rename to test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-gids.4E00,4E03.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font2.gids.4E00,4E05,4E07.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-gids.4E00,4E05,4E07.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font2.gids.4E00,4E05,4E07.otf rename to test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-gids.4E00,4E05,4E07.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font2.gids.4E02,4E03,4E08.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-gids.4E02,4E03,4E08.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font2.gids.4E02,4E03,4E08.otf rename to test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-gids.4E02,4E03,4E08.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font2.gids.4E02.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-gids.4E02.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font2.gids.4E02.otf rename to test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-gids.4E02.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font2.gids.4E03.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-gids.4E03.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font2.gids.4E03.otf rename to test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-gids.4E03.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font2.gids.4E05,4E07,4E08,4E09.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-gids.4E05,4E07,4E08,4E09.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font2.gids.4E05,4E07,4E08,4E09.otf rename to test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-gids.4E05,4E07,4E08,4E09.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font2.gids.4E08,4E09.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-gids.4E08,4E09.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font2.gids.4E08,4E09.otf rename to test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-gids.4E08,4E09.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font2.gids.4E08.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-gids.4E08.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font2.gids.4E08.otf rename to test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-gids.4E08.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font2.gids.retain-all-codepoint.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-gids.retain-all-codepoint.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font2.gids.retain-all-codepoint.otf rename to test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-gids.retain-all-codepoint.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font2.name-ids.4E00,4E02,4E03.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-name-ids.4E00,4E02,4E03.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font2.name-ids.4E00,4E02,4E03.otf rename to test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-name-ids.4E00,4E02,4E03.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font2.name-ids.4E00,4E03.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-name-ids.4E00,4E03.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font2.name-ids.4E00,4E03.otf rename to test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-name-ids.4E00,4E03.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font2.name-ids.4E00,4E05,4E07.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-name-ids.4E00,4E05,4E07.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font2.name-ids.4E00,4E05,4E07.otf rename to test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-name-ids.4E00,4E05,4E07.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font2.name-ids.4E02,4E03,4E08.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-name-ids.4E02,4E03,4E08.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font2.name-ids.4E02,4E03,4E08.otf rename to test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-name-ids.4E02,4E03,4E08.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font2.name-ids.4E02.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-name-ids.4E02.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font2.name-ids.4E02.otf rename to test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-name-ids.4E02.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font2.name-ids.4E03.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-name-ids.4E03.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font2.name-ids.4E03.otf rename to test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-name-ids.4E03.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font2.name-ids.4E05,4E07,4E08,4E09.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-name-ids.4E05,4E07,4E08,4E09.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font2.name-ids.4E05,4E07,4E08,4E09.otf rename to test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-name-ids.4E05,4E07,4E08,4E09.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font2.name-ids.4E08,4E09.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-name-ids.4E08,4E09.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font2.name-ids.4E08,4E09.otf rename to test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-name-ids.4E08,4E09.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font2.name-ids.4E08.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-name-ids.4E08.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font2.name-ids.4E08.otf rename to test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-name-ids.4E08.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font2.name-ids.retain-all-codepoint.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-name-ids.retain-all-codepoint.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font2.name-ids.retain-all-codepoint.otf rename to test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-name-ids.retain-all-codepoint.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font2.retain-gids.4E00,4E02,4E03.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-retain-gids.4E00,4E02,4E03.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font2.retain-gids.4E00,4E02,4E03.otf rename to test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-retain-gids.4E00,4E02,4E03.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font2.retain-gids.4E00,4E03.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-retain-gids.4E00,4E03.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font2.retain-gids.4E00,4E03.otf rename to test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-retain-gids.4E00,4E03.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font2.retain-gids.4E00,4E05,4E07.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-retain-gids.4E00,4E05,4E07.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font2.retain-gids.4E00,4E05,4E07.otf rename to test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-retain-gids.4E00,4E05,4E07.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font2.retain-gids.4E02,4E03,4E08.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-retain-gids.4E02,4E03,4E08.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font2.retain-gids.4E02,4E03,4E08.otf rename to test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-retain-gids.4E02,4E03,4E08.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font2.retain-gids.4E02.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-retain-gids.4E02.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font2.retain-gids.4E02.otf rename to test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-retain-gids.4E02.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font2.retain-gids.4E03.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-retain-gids.4E03.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font2.retain-gids.4E03.otf rename to test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-retain-gids.4E03.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font2.retain-gids.4E05,4E07,4E08,4E09.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-retain-gids.4E05,4E07,4E08,4E09.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font2.retain-gids.4E05,4E07,4E08,4E09.otf rename to test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-retain-gids.4E05,4E07,4E08,4E09.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font2.retain-gids.4E08,4E09.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-retain-gids.4E08,4E09.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font2.retain-gids.4E08,4E09.otf rename to test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-retain-gids.4E08,4E09.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font2.retain-gids.4E08.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-retain-gids.4E08.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font2.retain-gids.4E08.otf rename to test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-retain-gids.4E08.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font2.retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-retain-gids.retain-all-codepoint.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font2.retain-gids.retain-all-codepoint.otf rename to test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-retain-gids.retain-all-codepoint.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font2.default.4E00,4E02,4E03.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline.4E00,4E02,4E03.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font2.default.4E00,4E02,4E03.otf rename to test/subset/data/expected/cmap14/cmap14_font2.notdef-outline.4E00,4E02,4E03.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font2.default.4E00,4E03.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline.4E00,4E03.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font2.default.4E00,4E03.otf rename to test/subset/data/expected/cmap14/cmap14_font2.notdef-outline.4E00,4E03.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font2.default.4E00,4E05,4E07.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline.4E00,4E05,4E07.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font2.default.4E00,4E05,4E07.otf rename to test/subset/data/expected/cmap14/cmap14_font2.notdef-outline.4E00,4E05,4E07.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font2.default.4E02,4E03,4E08.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline.4E02,4E03,4E08.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font2.default.4E02,4E03,4E08.otf rename to test/subset/data/expected/cmap14/cmap14_font2.notdef-outline.4E02,4E03,4E08.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font2.default.4E02.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline.4E02.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font2.default.4E02.otf rename to test/subset/data/expected/cmap14/cmap14_font2.notdef-outline.4E02.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font2.default.4E03.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline.4E03.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font2.default.4E03.otf rename to test/subset/data/expected/cmap14/cmap14_font2.notdef-outline.4E03.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font2.default.4E05,4E07,4E08,4E09.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline.4E05,4E07,4E08,4E09.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font2.default.4E05,4E07,4E08,4E09.otf rename to test/subset/data/expected/cmap14/cmap14_font2.notdef-outline.4E05,4E07,4E08,4E09.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font2.default.4E08,4E09.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline.4E08,4E09.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font2.default.4E08,4E09.otf rename to test/subset/data/expected/cmap14/cmap14_font2.notdef-outline.4E08,4E09.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font2.default.4E08.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline.4E08.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font2.default.4E08.otf rename to test/subset/data/expected/cmap14/cmap14_font2.notdef-outline.4E08.otf diff --git a/test/subset/data/expected/cmap14/cmap14_font2.default.retain-all-codepoint.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline.retain-all-codepoint.otf similarity index 100% rename from test/subset/data/expected/cmap14/cmap14_font2.default.retain-all-codepoint.otf rename to test/subset/data/expected/cmap14/cmap14_font2.notdef-outline.retain-all-codepoint.otf 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 7d09649f1..52ff26ed8 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 a909415c0..4cf120498 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 2f1a11a1d..82646990d 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 d77db7873..73bf72807 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 c48998601..a58462f7a 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 50281106c..a2d55b1f2 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 ad6511e05..40fa0f668 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 353218b60..cf282028f 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 138251f71..65fb46838 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 5a5a3d4c7..1a82c2d90 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 19c12c3e3..d98cb8601 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 14616ce5f..a8cb0ca56 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 58b3df96d..ef4c1e79c 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 64aa0d7f6..6153060ef 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 353218b60..cf282028f 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 918d8270d..4036ac813 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 aa67ab508..a1f9c0c03 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 19c12c3e3..d98cb8601 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 2bac4ba2d..473095af4 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 b2e34de13..064ec09b0 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 a55b0aab6..cd2a509eb 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 7d09649f1..52ff26ed8 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 c32947562..0e4444b47 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 c28ad2fc7..c96562e30 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 d77db7873..73bf72807 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 90d13221e..93c97250c 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 7077ac40f..e28189400 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 d7e90b4f1..03c0b2539 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/colrv1.notoemoji/NotoColrEmojiGlyf-Regular.subset.default.1f35e.ttf b/test/subset/data/expected/colrv1.notoemoji/NotoColrEmojiGlyf-Regular.subset.default.1f35e.ttf deleted file mode 100644 index 2c470be12..000000000 Binary files a/test/subset/data/expected/colrv1.notoemoji/NotoColrEmojiGlyf-Regular.subset.default.1f35e.ttf and /dev/null differ diff --git a/test/subset/data/expected/colrv1.notoemoji/NotoColrEmojiGlyf-Regular.subset.default.1f696.ttf b/test/subset/data/expected/colrv1.notoemoji/NotoColrEmojiGlyf-Regular.subset.default.1f696.ttf deleted file mode 100644 index 5ba3a0f9c..000000000 Binary files a/test/subset/data/expected/colrv1.notoemoji/NotoColrEmojiGlyf-Regular.subset.default.1f696.ttf and /dev/null differ diff --git a/test/subset/data/expected/colrv1.notoemoji/NotoColrEmojiGlyf-Regular.subset.drop-hints-retain-gids.1f35e.ttf b/test/subset/data/expected/colrv1.notoemoji/NotoColrEmojiGlyf-Regular.subset.drop-hints-retain-gids.1f35e.ttf deleted file mode 100644 index a70156ff5..000000000 Binary files a/test/subset/data/expected/colrv1.notoemoji/NotoColrEmojiGlyf-Regular.subset.drop-hints-retain-gids.1f35e.ttf and /dev/null differ diff --git a/test/subset/data/expected/colrv1.notoemoji/NotoColrEmojiGlyf-Regular.subset.drop-hints-retain-gids.1f696.ttf b/test/subset/data/expected/colrv1.notoemoji/NotoColrEmojiGlyf-Regular.subset.drop-hints-retain-gids.1f696.ttf deleted file mode 100644 index 96db2f918..000000000 Binary files a/test/subset/data/expected/colrv1.notoemoji/NotoColrEmojiGlyf-Regular.subset.drop-hints-retain-gids.1f696.ttf and /dev/null differ diff --git a/test/subset/data/expected/colrv1.notoemoji/NotoColrEmojiGlyf-Regular.subset.drop-hints.1f35e.ttf b/test/subset/data/expected/colrv1.notoemoji/NotoColrEmojiGlyf-Regular.subset.drop-hints.1f35e.ttf deleted file mode 100644 index 2c470be12..000000000 Binary files a/test/subset/data/expected/colrv1.notoemoji/NotoColrEmojiGlyf-Regular.subset.drop-hints.1f35e.ttf and /dev/null differ diff --git a/test/subset/data/expected/colrv1.notoemoji/NotoColrEmojiGlyf-Regular.subset.drop-hints.1f696.ttf b/test/subset/data/expected/colrv1.notoemoji/NotoColrEmojiGlyf-Regular.subset.drop-hints.1f696.ttf deleted file mode 100644 index 5ba3a0f9c..000000000 Binary files a/test/subset/data/expected/colrv1.notoemoji/NotoColrEmojiGlyf-Regular.subset.drop-hints.1f696.ttf and /dev/null differ diff --git a/test/subset/data/expected/colrv1.notoemoji/NotoColrEmojiGlyf-Regular.subset.retain-gids.1f35e.ttf b/test/subset/data/expected/colrv1.notoemoji/NotoColrEmojiGlyf-Regular.subset.retain-gids.1f35e.ttf deleted file mode 100644 index a70156ff5..000000000 Binary files a/test/subset/data/expected/colrv1.notoemoji/NotoColrEmojiGlyf-Regular.subset.retain-gids.1f35e.ttf and /dev/null differ diff --git a/test/subset/data/expected/colrv1.notoemoji/NotoColrEmojiGlyf-Regular.subset.retain-gids.1f696.ttf b/test/subset/data/expected/colrv1.notoemoji/NotoColrEmojiGlyf-Regular.subset.retain-gids.1f696.ttf deleted file mode 100644 index 96db2f918..000000000 Binary files a/test/subset/data/expected/colrv1.notoemoji/NotoColrEmojiGlyf-Regular.subset.retain-gids.1f696.ttf and /dev/null differ diff --git a/test/subset/data/expected/colrv1/TestCOLRv1.default.E000,E004.ttf b/test/subset/data/expected/colrv1/TestCOLRv1.default.E000,E004.ttf deleted file mode 100644 index 424c6ba65..000000000 Binary files a/test/subset/data/expected/colrv1/TestCOLRv1.default.E000,E004.ttf and /dev/null differ diff --git a/test/subset/data/expected/colrv1/TestCOLRv1.default.E003,E004.ttf b/test/subset/data/expected/colrv1/TestCOLRv1.default.E003,E004.ttf deleted file mode 100644 index d2778a29e..000000000 Binary files a/test/subset/data/expected/colrv1/TestCOLRv1.default.E003,E004.ttf and /dev/null differ diff --git a/test/subset/data/expected/colrv1/TestCOLRv1.default.E004.ttf b/test/subset/data/expected/colrv1/TestCOLRv1.default.E004.ttf deleted file mode 100644 index ef769c7c0..000000000 Binary files a/test/subset/data/expected/colrv1/TestCOLRv1.default.E004.ttf and /dev/null differ diff --git a/test/subset/data/expected/colrv1/TestCOLRv1.default.retain-all-codepoint.ttf b/test/subset/data/expected/colrv1/TestCOLRv1.default.retain-all-codepoint.ttf deleted file mode 100644 index 7cd14c4d3..000000000 Binary files a/test/subset/data/expected/colrv1/TestCOLRv1.default.retain-all-codepoint.ttf and /dev/null differ diff --git a/test/subset/data/expected/colrv1/TestCOLRv1.drop-hints-retain-gids.E000,E004.ttf b/test/subset/data/expected/colrv1/TestCOLRv1.drop-hints-retain-gids.E000,E004.ttf deleted file mode 100644 index 819335b3a..000000000 Binary files a/test/subset/data/expected/colrv1/TestCOLRv1.drop-hints-retain-gids.E000,E004.ttf and /dev/null differ diff --git a/test/subset/data/expected/colrv1/TestCOLRv1.drop-hints-retain-gids.E003,E004.ttf b/test/subset/data/expected/colrv1/TestCOLRv1.drop-hints-retain-gids.E003,E004.ttf deleted file mode 100644 index 7d1f333f0..000000000 Binary files a/test/subset/data/expected/colrv1/TestCOLRv1.drop-hints-retain-gids.E003,E004.ttf and /dev/null differ diff --git a/test/subset/data/expected/colrv1/TestCOLRv1.drop-hints-retain-gids.E004.ttf b/test/subset/data/expected/colrv1/TestCOLRv1.drop-hints-retain-gids.E004.ttf deleted file mode 100644 index 451d66522..000000000 Binary files a/test/subset/data/expected/colrv1/TestCOLRv1.drop-hints-retain-gids.E004.ttf and /dev/null differ diff --git a/test/subset/data/expected/colrv1/TestCOLRv1.drop-hints-retain-gids.retain-all-codepoint.ttf b/test/subset/data/expected/colrv1/TestCOLRv1.drop-hints-retain-gids.retain-all-codepoint.ttf deleted file mode 100644 index 9bb3da5d1..000000000 Binary files a/test/subset/data/expected/colrv1/TestCOLRv1.drop-hints-retain-gids.retain-all-codepoint.ttf and /dev/null differ diff --git a/test/subset/data/expected/colrv1/TestCOLRv1.drop-hints.E000,E004.ttf b/test/subset/data/expected/colrv1/TestCOLRv1.drop-hints.E000,E004.ttf deleted file mode 100644 index eef68d72a..000000000 Binary files a/test/subset/data/expected/colrv1/TestCOLRv1.drop-hints.E000,E004.ttf and /dev/null differ diff --git a/test/subset/data/expected/colrv1/TestCOLRv1.drop-hints.E003,E004.ttf b/test/subset/data/expected/colrv1/TestCOLRv1.drop-hints.E003,E004.ttf deleted file mode 100644 index e3cd3984a..000000000 Binary files a/test/subset/data/expected/colrv1/TestCOLRv1.drop-hints.E003,E004.ttf and /dev/null differ diff --git a/test/subset/data/expected/colrv1/TestCOLRv1.drop-hints.E004.ttf b/test/subset/data/expected/colrv1/TestCOLRv1.drop-hints.E004.ttf deleted file mode 100644 index e8dfae625..000000000 Binary files a/test/subset/data/expected/colrv1/TestCOLRv1.drop-hints.E004.ttf and /dev/null differ diff --git a/test/subset/data/expected/colrv1/TestCOLRv1.drop-hints.retain-all-codepoint.ttf b/test/subset/data/expected/colrv1/TestCOLRv1.drop-hints.retain-all-codepoint.ttf deleted file mode 100644 index 9bb3da5d1..000000000 Binary files a/test/subset/data/expected/colrv1/TestCOLRv1.drop-hints.retain-all-codepoint.ttf and /dev/null differ diff --git a/test/subset/data/expected/colrv1/TestCOLRv1.retain-gids.E000,E004.ttf b/test/subset/data/expected/colrv1/TestCOLRv1.retain-gids.E000,E004.ttf deleted file mode 100644 index 6e3f5fbe3..000000000 Binary files a/test/subset/data/expected/colrv1/TestCOLRv1.retain-gids.E000,E004.ttf and /dev/null differ diff --git a/test/subset/data/expected/colrv1/TestCOLRv1.retain-gids.E003,E004.ttf b/test/subset/data/expected/colrv1/TestCOLRv1.retain-gids.E003,E004.ttf deleted file mode 100644 index ee803135d..000000000 Binary files a/test/subset/data/expected/colrv1/TestCOLRv1.retain-gids.E003,E004.ttf and /dev/null differ diff --git a/test/subset/data/expected/colrv1/TestCOLRv1.retain-gids.E004.ttf b/test/subset/data/expected/colrv1/TestCOLRv1.retain-gids.E004.ttf deleted file mode 100644 index 32d69dc2d..000000000 Binary files a/test/subset/data/expected/colrv1/TestCOLRv1.retain-gids.E004.ttf and /dev/null differ diff --git a/test/subset/data/expected/colrv1/TestCOLRv1.retain-gids.retain-all-codepoint.ttf b/test/subset/data/expected/colrv1/TestCOLRv1.retain-gids.retain-all-codepoint.ttf deleted file mode 100644 index 7cd14c4d3..000000000 Binary files a/test/subset/data/expected/colrv1/TestCOLRv1.retain-gids.retain-all-codepoint.ttf and /dev/null 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 f2773a6ef..4559b763b 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 e09202471..8b1e5ee9a 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 74bc0f28b..075f1e986 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 ed6667318..0fb8b6891 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 fb2d0a419..3ff6d2231 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 a99f248f1..137ce7d0a 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 f19c7f97e..d51bddaa0 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 0872ad89a..a72633e39 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 66ac44649..7223e129e 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 473125ae3..a31c2d1b5 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 0872ad89a..a72633e39 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 66ac44649..7223e129e 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.3042,3044,3046,3048,304A,304B.ttf b/test/subset/data/expected/japanese/Mplus1p-Regular.default.3042,3044,3046,3048,304A,304B.ttf index 6dba53a09..5de1a625f 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 1ca0702cd..98612bf92 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 1591ed059..e0c1ee343 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 7a8b916df..cc62ad0a1 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 fec3d6fb3..8da41d380 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.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 b55dd9077..79cb13b54 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 4c9ce65ab..1a6cc8251 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 ed75c7e73..0c0e7eb55 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 87e178550..0742e08fb 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 b00a52311..172c9a314 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.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 6dba53a09..5de1a625f 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 1ca0702cd..98612bf92 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 1591ed059..e0c1ee343 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 7a8b916df..cc62ad0a1 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 fec3d6fb3..8da41d380 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_context2_multiple_subrules_f1.retain-gids.41,42,43.otf b/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.notdef-outline-retain-gids.41,42,43.otf similarity index 68% rename from test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.retain-gids.41,42,43.otf rename to test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.notdef-outline-retain-gids.41,42,43.otf index 4b9d2c3c9..b7f5d253f 100644 Binary files a/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.retain-gids.41,42,43.otf and b/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.notdef-outline-retain-gids.41,42,43.otf differ diff --git a/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.retain-gids.41,42.otf b/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.notdef-outline-retain-gids.41,42.otf similarity index 66% rename from test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.retain-gids.41,42.otf rename to test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.notdef-outline-retain-gids.41,42.otf index 99cad62ac..38074b639 100644 Binary files a/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.retain-gids.41,42.otf and b/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.notdef-outline-retain-gids.41,42.otf differ diff --git a/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.retain-gids.41,43.otf b/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.notdef-outline-retain-gids.41,43.otf similarity index 67% rename from test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.retain-gids.41,43.otf rename to test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.notdef-outline-retain-gids.41,43.otf index 8cb8d7fa7..a151e582c 100644 Binary files a/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.retain-gids.41,43.otf and b/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.notdef-outline-retain-gids.41,43.otf differ diff --git a/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.retain-gids.41.otf b/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.notdef-outline-retain-gids.41.otf similarity index 66% rename from test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.retain-gids.41.otf rename to test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.notdef-outline-retain-gids.41.otf index 9b7aa2397..293aa5dbc 100644 Binary files a/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.retain-gids.41.otf and b/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.notdef-outline-retain-gids.41.otf differ diff --git a/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.notdef-outline-retain-gids.retain-all-codepoint.otf similarity index 91% rename from test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.retain-gids.retain-all-codepoint.otf rename to test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.notdef-outline-retain-gids.retain-all-codepoint.otf index cea93383a..f10ea9801 100644 Binary files a/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.retain-gids.retain-all-codepoint.otf and b/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.notdef-outline-retain-gids.retain-all-codepoint.otf differ diff --git a/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.default.41,42,43.otf b/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.notdef-outline.41,42,43.otf similarity index 57% rename from test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.default.41,42,43.otf rename to test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.notdef-outline.41,42,43.otf index 07c369f19..1cb2e5a80 100644 Binary files a/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.default.41,42,43.otf and b/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.notdef-outline.41,42,43.otf differ diff --git a/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.default.41,42.otf b/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.notdef-outline.41,42.otf similarity index 53% rename from test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.default.41,42.otf rename to test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.notdef-outline.41,42.otf index b842bf660..579f5b406 100644 Binary files a/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.default.41,42.otf and b/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.notdef-outline.41,42.otf differ diff --git a/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.default.41,43.otf b/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.notdef-outline.41,43.otf similarity index 56% rename from test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.default.41,43.otf rename to test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.notdef-outline.41,43.otf index 3efeddbf4..dc701051f 100644 Binary files a/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.default.41,43.otf and b/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.notdef-outline.41,43.otf differ diff --git a/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.default.41.otf b/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.notdef-outline.41.otf similarity index 73% rename from test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.default.41.otf rename to test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.notdef-outline.41.otf index a2015f484..d7dd3c6f9 100644 Binary files a/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.default.41.otf and b/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.notdef-outline.41.otf differ diff --git a/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.default.retain-all-codepoint.otf b/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.notdef-outline.retain-all-codepoint.otf similarity index 91% rename from test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.default.retain-all-codepoint.otf rename to test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.notdef-outline.retain-all-codepoint.otf index cea93383a..f10ea9801 100644 Binary files a/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.default.retain-all-codepoint.otf and b/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.notdef-outline.retain-all-codepoint.otf differ diff --git a/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.retain-gids.41,42,43.otf b/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.notdef-outline-retain-gids.41,42,43.otf similarity index 68% rename from test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.retain-gids.41,42,43.otf rename to test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.notdef-outline-retain-gids.41,42,43.otf index aefea2d85..02b086c47 100644 Binary files a/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.retain-gids.41,42,43.otf and b/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.notdef-outline-retain-gids.41,42,43.otf differ diff --git a/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.retain-gids.41,42.otf b/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.notdef-outline-retain-gids.41,42.otf similarity index 66% rename from test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.retain-gids.41,42.otf rename to test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.notdef-outline-retain-gids.41,42.otf index de726bba2..82b5d443c 100644 Binary files a/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.retain-gids.41,42.otf and b/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.notdef-outline-retain-gids.41,42.otf differ diff --git a/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.retain-gids.41,43.otf b/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.notdef-outline-retain-gids.41,43.otf similarity index 67% rename from test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.retain-gids.41,43.otf rename to test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.notdef-outline-retain-gids.41,43.otf index fc5c462d8..fc13f4190 100644 Binary files a/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.retain-gids.41,43.otf and b/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.notdef-outline-retain-gids.41,43.otf differ diff --git a/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.retain-gids.41.otf b/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.notdef-outline-retain-gids.41.otf similarity index 66% rename from test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.retain-gids.41.otf rename to test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.notdef-outline-retain-gids.41.otf index 9aa438a89..0d0d2fae0 100644 Binary files a/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.retain-gids.41.otf and b/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.notdef-outline-retain-gids.41.otf differ diff --git a/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.notdef-outline-retain-gids.retain-all-codepoint.otf similarity index 91% rename from test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.retain-gids.retain-all-codepoint.otf rename to test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.notdef-outline-retain-gids.retain-all-codepoint.otf index 9b69f2fea..0c0b40e01 100644 Binary files a/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.retain-gids.retain-all-codepoint.otf and b/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.notdef-outline-retain-gids.retain-all-codepoint.otf differ diff --git a/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.default.41,42,43.otf b/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.notdef-outline.41,42,43.otf similarity index 57% rename from test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.default.41,42,43.otf rename to test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.notdef-outline.41,42,43.otf index 112bfaf1e..8f6a33d5c 100644 Binary files a/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.default.41,42,43.otf and b/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.notdef-outline.41,42,43.otf differ diff --git a/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.default.41,42.otf b/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.notdef-outline.41,42.otf similarity index 53% rename from test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.default.41,42.otf rename to test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.notdef-outline.41,42.otf index aaa5f8d25..e8c6354bf 100644 Binary files a/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.default.41,42.otf and b/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.notdef-outline.41,42.otf differ diff --git a/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.default.41,43.otf b/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.notdef-outline.41,43.otf similarity index 56% rename from test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.default.41,43.otf rename to test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.notdef-outline.41,43.otf index 07918f0ff..89007876b 100644 Binary files a/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.default.41,43.otf and b/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.notdef-outline.41,43.otf differ diff --git a/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.default.41.otf b/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.notdef-outline.41.otf similarity index 73% rename from test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.default.41.otf rename to test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.notdef-outline.41.otf index cca7a3a37..753a81e24 100644 Binary files a/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.default.41.otf and b/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.notdef-outline.41.otf differ diff --git a/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.default.retain-all-codepoint.otf b/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.notdef-outline.retain-all-codepoint.otf similarity index 91% rename from test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.default.retain-all-codepoint.otf rename to test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.notdef-outline.retain-all-codepoint.otf index 9b69f2fea..0c0b40e01 100644 Binary files a/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.default.retain-all-codepoint.otf and b/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.notdef-outline.retain-all-codepoint.otf differ diff --git a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.default.41,42,43.otf b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.default.41,42,43.otf deleted file mode 100644 index 3e789a239..000000000 Binary files a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.default.41,42,43.otf and /dev/null differ diff --git a/test/subset/data/expected/layout.gpos3/gpos3_font3.retain-gids.41,42,43.otf b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.notdef-outline-retain-gids.41,42,43.otf similarity index 70% rename from test/subset/data/expected/layout.gpos3/gpos3_font3.retain-gids.41,42,43.otf rename to test/subset/data/expected/layout.context/gpos_context3_simple_f1.notdef-outline-retain-gids.41,42,43.otf index 35ddbeaa6..9656a3af7 100644 Binary files a/test/subset/data/expected/layout.gpos3/gpos3_font3.retain-gids.41,42,43.otf and b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.notdef-outline-retain-gids.41,42,43.otf differ diff --git a/test/subset/data/expected/layout.gpos9/gpos9_font2.retain-gids.41,42.otf b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.notdef-outline-retain-gids.41,42.otf similarity index 71% rename from test/subset/data/expected/layout.gpos9/gpos9_font2.retain-gids.41,42.otf rename to test/subset/data/expected/layout.context/gpos_context3_simple_f1.notdef-outline-retain-gids.41,42.otf index 7ca90da43..8e85d0263 100644 Binary files a/test/subset/data/expected/layout.gpos9/gpos9_font2.retain-gids.41,42.otf and b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.notdef-outline-retain-gids.41,42.otf differ diff --git a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.notdef-outline-retain-gids.41,43.otf b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.notdef-outline-retain-gids.41,43.otf new file mode 100644 index 000000000..69ad58288 Binary files /dev/null and b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.notdef-outline-retain-gids.41,43.otf differ diff --git a/test/subset/data/expected/layout.gpos9/gpos9_font2.retain-gids.41.otf b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.notdef-outline-retain-gids.41.otf similarity index 68% rename from test/subset/data/expected/layout.gpos9/gpos9_font2.retain-gids.41.otf rename to test/subset/data/expected/layout.context/gpos_context3_simple_f1.notdef-outline-retain-gids.41.otf index 924b7db82..bca36a000 100644 Binary files a/test/subset/data/expected/layout.gpos9/gpos9_font2.retain-gids.41.otf and b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.notdef-outline-retain-gids.41.otf differ diff --git a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.default.retain-all-codepoint.otf b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.notdef-outline-retain-gids.retain-all-codepoint.otf similarity index 72% rename from test/subset/data/expected/layout.context/gpos_context3_simple_f1.default.retain-all-codepoint.otf rename to test/subset/data/expected/layout.context/gpos_context3_simple_f1.notdef-outline-retain-gids.retain-all-codepoint.otf index 8ff6c80e3..1a91ae8ae 100644 Binary files a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.default.retain-all-codepoint.otf and b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.notdef-outline-retain-gids.retain-all-codepoint.otf differ diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,42,43.otf b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.notdef-outline.41,42,43.otf similarity index 62% rename from test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,42,43.otf rename to test/subset/data/expected/layout.context/gpos_context3_simple_f1.notdef-outline.41,42,43.otf index 6b0b43a4d..3604e3b83 100644 Binary files a/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,42,43.otf and b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.notdef-outline.41,42,43.otf differ diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,42.otf b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.notdef-outline.41,42.otf similarity index 54% rename from test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,42.otf rename to test/subset/data/expected/layout.context/gpos_context3_simple_f1.notdef-outline.41,42.otf index da9998d28..5546988f3 100644 Binary files a/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,42.otf and b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.notdef-outline.41,42.otf differ diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,43.otf b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.notdef-outline.41,43.otf similarity index 56% rename from test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,43.otf rename to test/subset/data/expected/layout.context/gpos_context3_simple_f1.notdef-outline.41,43.otf index 953369849..39dd5c44d 100644 Binary files a/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,43.otf and b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.notdef-outline.41,43.otf differ diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41.otf b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.notdef-outline.41.otf similarity index 53% rename from test/subset/data/expected/layout.gpos6/gpos6_font1.default.41.otf rename to test/subset/data/expected/layout.context/gpos_context3_simple_f1.notdef-outline.41.otf index 6785e68b3..802fe581e 100644 Binary files a/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41.otf and b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.notdef-outline.41.otf differ diff --git a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.notdef-outline.retain-all-codepoint.otf similarity index 72% rename from test/subset/data/expected/layout.context/gpos_context3_simple_f1.retain-gids.retain-all-codepoint.otf rename to test/subset/data/expected/layout.context/gpos_context3_simple_f1.notdef-outline.retain-all-codepoint.otf index 8ff6c80e3..1a91ae8ae 100644 Binary files a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.retain-gids.retain-all-codepoint.otf and b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.notdef-outline.retain-all-codepoint.otf differ diff --git a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.retain-gids.41,42,43.otf b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.retain-gids.41,42,43.otf deleted file mode 100644 index 94928e2b4..000000000 Binary files a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.retain-gids.41,42,43.otf and /dev/null differ diff --git a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.retain-gids.41,43.otf b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.retain-gids.41,43.otf deleted file mode 100644 index cc5e4d655..000000000 Binary files a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.retain-gids.41,43.otf and /dev/null 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 deleted file mode 100644 index 14c975bbe..000000000 Binary files a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.keep-gdef-gpos.41,42,43,57.otf and /dev/null 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 deleted file mode 100644 index b6b4ee5e8..000000000 Binary files a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.keep-gdef-gpos.41,42,43.otf and /dev/null 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 deleted file mode 100644 index 8ca15692c..000000000 Binary files a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.keep-gdef-gpos.41,42.otf and /dev/null 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 deleted file mode 100644 index 0092ebfec..000000000 Binary files a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.keep-gdef-gpos.41,56,57.otf and /dev/null 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 deleted file mode 100644 index d34bfee12..000000000 Binary files a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.keep-gdef-gpos.41.otf and /dev/null 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 deleted file mode 100644 index 0077291ad..000000000 Binary files a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.keep-gdef-gpos.42,57.otf and /dev/null 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.notdef-outline-drop-hints.41,42,43,57.otf similarity index 100% rename from test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.drop-hints.41,42,43,57.otf rename to test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.notdef-outline-drop-hints.41,42,43,57.otf 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.notdef-outline-drop-hints.41,42,43.otf similarity index 100% rename from test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.drop-hints.41,42,43.otf rename to test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.notdef-outline-drop-hints.41,42,43.otf 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.notdef-outline-drop-hints.41,42.otf similarity index 100% rename from test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.drop-hints.41,42.otf rename to test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.notdef-outline-drop-hints.41,42.otf 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.notdef-outline-drop-hints.41,56,57.otf similarity index 100% rename from test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.drop-hints.41,56,57.otf rename to test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.notdef-outline-drop-hints.41,56,57.otf diff --git a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.drop-hints.41.otf b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.notdef-outline-drop-hints.41.otf similarity index 100% rename from test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.drop-hints.41.otf rename to test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.notdef-outline-drop-hints.41.otf 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.notdef-outline-drop-hints.42,57.otf similarity index 100% rename from test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.drop-hints.42,57.otf rename to test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.notdef-outline-drop-hints.42,57.otf 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.notdef-outline.41,42,43,57.otf similarity index 100% rename from test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.default.41,42,43,57.otf rename to test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.notdef-outline.41,42,43,57.otf 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.notdef-outline.41,42,43.otf similarity index 100% rename from test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.default.41,42,43.otf rename to test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.notdef-outline.41,42,43.otf diff --git a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.default.41,42.otf b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.notdef-outline.41,42.otf similarity index 100% rename from test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.default.41,42.otf rename to test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.notdef-outline.41,42.otf 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.notdef-outline.41,56,57.otf similarity index 100% rename from test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.default.41,56,57.otf rename to test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.notdef-outline.41,56,57.otf diff --git a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.default.41.otf b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.notdef-outline.41.otf similarity index 100% rename from test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.default.41.otf rename to test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.notdef-outline.41.otf diff --git a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.default.42,57.otf b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.notdef-outline.42,57.otf similarity index 100% rename from test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.default.42,57.otf rename to test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.notdef-outline.42,57.otf 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 137ae2002..61a6dc74c 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 9e47f4302..7518ffe8a 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 7938c3e0b..92a40143c 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 b30d68e7c..19293e8cc 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 c63169a6c..39a333aeb 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 422fda9a1..9b3f8d534 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 aee5b21da..014c0e305 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 14f345bb0..32b5f839d 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 67f68938e..b25ce0fe2 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 6ca653a10..130912d9a 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 137ae2002..61a6dc74c 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 9e47f4302..7518ffe8a 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 7938c3e0b..92a40143c 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 b30d68e7c..19293e8cc 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 c63169a6c..39a333aeb 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.notdef-outline-retain-gids.41,43.otf b/test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline-retain-gids.41,43.otf new file mode 100644 index 000000000..63352551b Binary files /dev/null and b/test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline-retain-gids.41,43.otf differ diff --git a/test/subset/data/expected/layout.gpos/gpos1_2_font.retain-gids.41,46.otf b/test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline-retain-gids.41,46.otf similarity index 69% rename from test/subset/data/expected/layout.gpos/gpos1_2_font.retain-gids.41,46.otf rename to test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline-retain-gids.41,46.otf index 3d851963d..9c850813e 100644 Binary files a/test/subset/data/expected/layout.gpos/gpos1_2_font.retain-gids.41,46.otf and b/test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline-retain-gids.41,46.otf differ diff --git a/test/subset/data/expected/layout.gpos/gpos1_2_font.retain-gids.41.otf b/test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline-retain-gids.41.otf similarity index 67% rename from test/subset/data/expected/layout.gpos/gpos1_2_font.retain-gids.41.otf rename to test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline-retain-gids.41.otf index 479133ba7..d3d6134ce 100644 Binary files a/test/subset/data/expected/layout.gpos/gpos1_2_font.retain-gids.41.otf and b/test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline-retain-gids.41.otf differ diff --git a/test/subset/data/expected/layout.gpos/gpos1_2_font.retain-gids.42,44.otf b/test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline-retain-gids.42,44.otf similarity index 67% rename from test/subset/data/expected/layout.gpos/gpos1_2_font.retain-gids.42,44.otf rename to test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline-retain-gids.42,44.otf index 142145479..69ea2e6cf 100644 Binary files a/test/subset/data/expected/layout.gpos/gpos1_2_font.retain-gids.42,44.otf and b/test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline-retain-gids.42,44.otf differ diff --git a/test/subset/data/expected/layout.gpos/gpos1_2_font.retain-gids.43,46.otf b/test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline-retain-gids.43,46.otf similarity index 67% rename from test/subset/data/expected/layout.gpos/gpos1_2_font.retain-gids.43,46.otf rename to test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline-retain-gids.43,46.otf index 03f29a91d..7af14ce52 100644 Binary files a/test/subset/data/expected/layout.gpos/gpos1_2_font.retain-gids.43,46.otf and b/test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline-retain-gids.43,46.otf differ diff --git a/test/subset/data/expected/layout.gpos/gpos1_2_font.default.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline-retain-gids.retain-all-codepoint.otf similarity index 71% rename from test/subset/data/expected/layout.gpos/gpos1_2_font.default.retain-all-codepoint.otf rename to test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline-retain-gids.retain-all-codepoint.otf index 5ab69ffc3..0a1f63bf7 100644 Binary files a/test/subset/data/expected/layout.gpos/gpos1_2_font.default.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline-retain-gids.retain-all-codepoint.otf differ diff --git a/test/subset/data/expected/layout.gpos/gpos1_2_font.default.41,43.otf b/test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline.41,43.otf similarity index 56% rename from test/subset/data/expected/layout.gpos/gpos1_2_font.default.41,43.otf rename to test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline.41,43.otf index 7cca91a28..df4eea52b 100644 Binary files a/test/subset/data/expected/layout.gpos/gpos1_2_font.default.41,43.otf and b/test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline.41,43.otf differ diff --git a/test/subset/data/expected/layout.gpos/gpos1_2_font.default.41,46.otf b/test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline.41,46.otf similarity index 60% rename from test/subset/data/expected/layout.gpos/gpos1_2_font.default.41,46.otf rename to test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline.41,46.otf index 83fa931d4..a4e9e14c6 100644 Binary files a/test/subset/data/expected/layout.gpos/gpos1_2_font.default.41,46.otf and b/test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline.41,46.otf differ diff --git a/test/subset/data/expected/layout.gpos9/gpos9_font2.default.41.otf b/test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline.41.otf similarity index 54% rename from test/subset/data/expected/layout.gpos9/gpos9_font2.default.41.otf rename to test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline.41.otf index e1f256baf..95f5a2490 100644 Binary files a/test/subset/data/expected/layout.gpos9/gpos9_font2.default.41.otf and b/test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline.41.otf differ diff --git a/test/subset/data/expected/layout.gpos/gpos1_2_font.default.42,44.otf b/test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline.42,44.otf similarity index 55% rename from test/subset/data/expected/layout.gpos/gpos1_2_font.default.42,44.otf rename to test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline.42,44.otf index 22d78d816..faeea8fa6 100644 Binary files a/test/subset/data/expected/layout.gpos/gpos1_2_font.default.42,44.otf and b/test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline.42,44.otf differ diff --git a/test/subset/data/expected/layout.gpos/gpos1_2_font.default.43,46.otf b/test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline.43,46.otf similarity index 56% rename from test/subset/data/expected/layout.gpos/gpos1_2_font.default.43,46.otf rename to test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline.43,46.otf index 45154135d..8068d6e49 100644 Binary files a/test/subset/data/expected/layout.gpos/gpos1_2_font.default.43,46.otf and b/test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline.43,46.otf differ diff --git a/test/subset/data/expected/layout.gpos/gpos1_2_font.retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline.retain-all-codepoint.otf similarity index 71% rename from test/subset/data/expected/layout.gpos/gpos1_2_font.retain-gids.retain-all-codepoint.otf rename to test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline.retain-all-codepoint.otf index 5ab69ffc3..0a1f63bf7 100644 Binary files a/test/subset/data/expected/layout.gpos/gpos1_2_font.retain-gids.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline.retain-all-codepoint.otf differ diff --git a/test/subset/data/expected/layout.gpos/gpos1_2_font.retain-gids.41,43.otf b/test/subset/data/expected/layout.gpos/gpos1_2_font.retain-gids.41,43.otf deleted file mode 100644 index 2d70e40ee..000000000 Binary files a/test/subset/data/expected/layout.gpos/gpos1_2_font.retain-gids.41,43.otf and /dev/null differ diff --git a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.retain-gids.21,23,25.otf b/test/subset/data/expected/layout.gpos2/gpos2_1_font7.notdef-outline-retain-gids.21,23,25.otf similarity index 60% rename from test/subset/data/expected/layout.gpos2/gpos2_1_font7.retain-gids.21,23,25.otf rename to test/subset/data/expected/layout.gpos2/gpos2_1_font7.notdef-outline-retain-gids.21,23,25.otf index d13a1f9bc..7ccd2b04b 100644 Binary files a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.retain-gids.21,23,25.otf and b/test/subset/data/expected/layout.gpos2/gpos2_1_font7.notdef-outline-retain-gids.21,23,25.otf differ diff --git a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.retain-gids.21,23.otf b/test/subset/data/expected/layout.gpos2/gpos2_1_font7.notdef-outline-retain-gids.21,23.otf similarity index 59% rename from test/subset/data/expected/layout.gpos2/gpos2_1_font7.retain-gids.21,23.otf rename to test/subset/data/expected/layout.gpos2/gpos2_1_font7.notdef-outline-retain-gids.21,23.otf index 9859f61d4..8e31a7c05 100644 Binary files a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.retain-gids.21,23.otf and b/test/subset/data/expected/layout.gpos2/gpos2_1_font7.notdef-outline-retain-gids.21,23.otf differ diff --git a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.retain-gids.2E,23.otf b/test/subset/data/expected/layout.gpos2/gpos2_1_font7.notdef-outline-retain-gids.2E,23.otf similarity index 64% rename from test/subset/data/expected/layout.gpos2/gpos2_1_font7.retain-gids.2E,23.otf rename to test/subset/data/expected/layout.gpos2/gpos2_1_font7.notdef-outline-retain-gids.2E,23.otf index 84ae8113f..813257e93 100644 Binary files a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.retain-gids.2E,23.otf and b/test/subset/data/expected/layout.gpos2/gpos2_1_font7.notdef-outline-retain-gids.2E,23.otf differ diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,42,43.otf b/test/subset/data/expected/layout.gpos2/gpos2_1_font7.notdef-outline-retain-gids.41,42,43.otf similarity index 69% rename from test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,42,43.otf rename to test/subset/data/expected/layout.gpos2/gpos2_1_font7.notdef-outline-retain-gids.41,42,43.otf index 333f7894e..4a14a05a3 100644 Binary files a/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,42,43.otf and b/test/subset/data/expected/layout.gpos2/gpos2_1_font7.notdef-outline-retain-gids.41,42,43.otf differ diff --git a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.default.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos2/gpos2_1_font7.notdef-outline-retain-gids.retain-all-codepoint.otf similarity index 71% rename from test/subset/data/expected/layout.gpos2/gpos2_1_font7.default.retain-all-codepoint.otf rename to test/subset/data/expected/layout.gpos2/gpos2_1_font7.notdef-outline-retain-gids.retain-all-codepoint.otf index 021fd2071..a879e07cb 100644 Binary files a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.default.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gpos2/gpos2_1_font7.notdef-outline-retain-gids.retain-all-codepoint.otf differ diff --git a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.default.21,23,25.otf b/test/subset/data/expected/layout.gpos2/gpos2_1_font7.notdef-outline.21,23,25.otf similarity index 59% rename from test/subset/data/expected/layout.gpos2/gpos2_2_font5.default.21,23,25.otf rename to test/subset/data/expected/layout.gpos2/gpos2_1_font7.notdef-outline.21,23,25.otf index 36c09fea4..e77122726 100644 Binary files a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.default.21,23,25.otf and b/test/subset/data/expected/layout.gpos2/gpos2_1_font7.notdef-outline.21,23,25.otf differ diff --git a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.default.21,23.otf b/test/subset/data/expected/layout.gpos2/gpos2_1_font7.notdef-outline.21,23.otf similarity index 54% rename from test/subset/data/expected/layout.gpos2/gpos2_2_font5.default.21,23.otf rename to test/subset/data/expected/layout.gpos2/gpos2_1_font7.notdef-outline.21,23.otf index 98de06f88..192c187c9 100644 Binary files a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.default.21,23.otf and b/test/subset/data/expected/layout.gpos2/gpos2_1_font7.notdef-outline.21,23.otf differ diff --git a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.default.2E,23.otf b/test/subset/data/expected/layout.gpos2/gpos2_1_font7.notdef-outline.2E,23.otf similarity index 62% rename from test/subset/data/expected/layout.gpos2/gpos2_1_font7.default.2E,23.otf rename to test/subset/data/expected/layout.gpos2/gpos2_1_font7.notdef-outline.2E,23.otf index 3145da00f..a0ca104ac 100644 Binary files a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.default.2E,23.otf and b/test/subset/data/expected/layout.gpos2/gpos2_1_font7.notdef-outline.2E,23.otf differ diff --git a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.default.41,42,43.otf b/test/subset/data/expected/layout.gpos2/gpos2_1_font7.notdef-outline.41,42,43.otf similarity index 60% rename from test/subset/data/expected/layout.gpos2/gpos2_2_font5.default.41,42,43.otf rename to test/subset/data/expected/layout.gpos2/gpos2_1_font7.notdef-outline.41,42,43.otf index e4ce9a865..624274a12 100644 Binary files a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.default.41,42,43.otf and b/test/subset/data/expected/layout.gpos2/gpos2_1_font7.notdef-outline.41,42,43.otf differ diff --git a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos2/gpos2_1_font7.notdef-outline.retain-all-codepoint.otf similarity index 71% rename from test/subset/data/expected/layout.gpos2/gpos2_1_font7.retain-gids.retain-all-codepoint.otf rename to test/subset/data/expected/layout.gpos2/gpos2_1_font7.notdef-outline.retain-all-codepoint.otf index 021fd2071..a879e07cb 100644 Binary files a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.retain-gids.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gpos2/gpos2_1_font7.notdef-outline.retain-all-codepoint.otf differ diff --git a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.retain-gids.21,23,25.otf b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.notdef-outline-retain-gids.21,23,25.otf similarity index 60% rename from test/subset/data/expected/layout.gpos2/gpos2_2_font5.retain-gids.21,23,25.otf rename to test/subset/data/expected/layout.gpos2/gpos2_2_font5.notdef-outline-retain-gids.21,23,25.otf index e50dd2e25..6273f8324 100644 Binary files a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.retain-gids.21,23,25.otf and b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.notdef-outline-retain-gids.21,23,25.otf differ diff --git a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.retain-gids.21,23.otf b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.notdef-outline-retain-gids.21,23.otf similarity index 59% rename from test/subset/data/expected/layout.gpos2/gpos2_2_font5.retain-gids.21,23.otf rename to test/subset/data/expected/layout.gpos2/gpos2_2_font5.notdef-outline-retain-gids.21,23.otf index 4febba43a..a09c28bfb 100644 Binary files a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.retain-gids.21,23.otf and b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.notdef-outline-retain-gids.21,23.otf differ diff --git a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.retain-gids.2E,23.otf b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.notdef-outline-retain-gids.2E,23.otf similarity index 64% rename from test/subset/data/expected/layout.gpos2/gpos2_2_font5.retain-gids.2E,23.otf rename to test/subset/data/expected/layout.gpos2/gpos2_2_font5.notdef-outline-retain-gids.2E,23.otf index abb24a405..c27424638 100644 Binary files a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.retain-gids.2E,23.otf and b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.notdef-outline-retain-gids.2E,23.otf differ diff --git a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.retain-gids.41,42,43.otf b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.notdef-outline-retain-gids.41,42,43.otf similarity index 68% rename from test/subset/data/expected/layout.gpos2/gpos2_1_font7.retain-gids.41,42,43.otf rename to test/subset/data/expected/layout.gpos2/gpos2_2_font5.notdef-outline-retain-gids.41,42,43.otf index 5f79056d8..a3511fbe0 100644 Binary files a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.retain-gids.41,42,43.otf and b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.notdef-outline-retain-gids.41,42,43.otf differ diff --git a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.default.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.notdef-outline-retain-gids.retain-all-codepoint.otf similarity index 71% rename from test/subset/data/expected/layout.gpos2/gpos2_2_font5.default.retain-all-codepoint.otf rename to test/subset/data/expected/layout.gpos2/gpos2_2_font5.notdef-outline-retain-gids.retain-all-codepoint.otf index 4f5bb492d..1f8138db7 100644 Binary files a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.default.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.notdef-outline-retain-gids.retain-all-codepoint.otf differ diff --git a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.default.21,23,25.otf b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.notdef-outline.21,23,25.otf similarity index 59% rename from test/subset/data/expected/layout.gpos2/gpos2_1_font7.default.21,23,25.otf rename to test/subset/data/expected/layout.gpos2/gpos2_2_font5.notdef-outline.21,23,25.otf index 3466f9e3c..676810ae9 100644 Binary files a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.default.21,23,25.otf and b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.notdef-outline.21,23,25.otf differ diff --git a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.default.21,23.otf b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.notdef-outline.21,23.otf similarity index 54% rename from test/subset/data/expected/layout.gpos2/gpos2_1_font7.default.21,23.otf rename to test/subset/data/expected/layout.gpos2/gpos2_2_font5.notdef-outline.21,23.otf index edd10bf37..646c880a4 100644 Binary files a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.default.21,23.otf and b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.notdef-outline.21,23.otf differ diff --git a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.default.2E,23.otf b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.notdef-outline.2E,23.otf similarity index 62% rename from test/subset/data/expected/layout.gpos2/gpos2_2_font5.default.2E,23.otf rename to test/subset/data/expected/layout.gpos2/gpos2_2_font5.notdef-outline.2E,23.otf index 8bf70b7c4..3c528b0f9 100644 Binary files a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.default.2E,23.otf and b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.notdef-outline.2E,23.otf differ diff --git a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.default.41,42,43.otf b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.notdef-outline.41,42,43.otf similarity index 60% rename from test/subset/data/expected/layout.gpos2/gpos2_1_font7.default.41,42,43.otf rename to test/subset/data/expected/layout.gpos2/gpos2_2_font5.notdef-outline.41,42,43.otf index bbce3c32d..fbfc69012 100644 Binary files a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.default.41,42,43.otf and b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.notdef-outline.41,42,43.otf differ diff --git a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.notdef-outline.retain-all-codepoint.otf similarity index 71% rename from test/subset/data/expected/layout.gpos2/gpos2_2_font5.retain-gids.retain-all-codepoint.otf rename to test/subset/data/expected/layout.gpos2/gpos2_2_font5.notdef-outline.retain-all-codepoint.otf index 4f5bb492d..1f8138db7 100644 Binary files a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.retain-gids.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.notdef-outline.retain-all-codepoint.otf differ diff --git a/test/subset/data/expected/layout.gpos3/gpos3_font3.retain-gids.28,29.otf b/test/subset/data/expected/layout.gpos3/gpos3_font3.notdef-outline-retain-gids.28,29.otf similarity index 60% rename from test/subset/data/expected/layout.gpos3/gpos3_font3.retain-gids.28,29.otf rename to test/subset/data/expected/layout.gpos3/gpos3_font3.notdef-outline-retain-gids.28,29.otf index 86efd189b..f6b65bcd8 100644 Binary files a/test/subset/data/expected/layout.gpos3/gpos3_font3.retain-gids.28,29.otf and b/test/subset/data/expected/layout.gpos3/gpos3_font3.notdef-outline-retain-gids.28,29.otf differ diff --git a/test/subset/data/expected/layout.gpos3/gpos3_font3.retain-gids.28,2B.otf b/test/subset/data/expected/layout.gpos3/gpos3_font3.notdef-outline-retain-gids.28,2B.otf similarity index 62% rename from test/subset/data/expected/layout.gpos3/gpos3_font3.retain-gids.28,2B.otf rename to test/subset/data/expected/layout.gpos3/gpos3_font3.notdef-outline-retain-gids.28,2B.otf index 82233401f..0046eae58 100644 Binary files a/test/subset/data/expected/layout.gpos3/gpos3_font3.retain-gids.28,2B.otf and b/test/subset/data/expected/layout.gpos3/gpos3_font3.notdef-outline-retain-gids.28,2B.otf differ diff --git a/test/subset/data/expected/layout.gpos3/gpos3_font3.retain-gids.29,2B.otf b/test/subset/data/expected/layout.gpos3/gpos3_font3.notdef-outline-retain-gids.29,2B.otf similarity index 60% rename from test/subset/data/expected/layout.gpos3/gpos3_font3.retain-gids.29,2B.otf rename to test/subset/data/expected/layout.gpos3/gpos3_font3.notdef-outline-retain-gids.29,2B.otf index 752ef8889..43861c8b0 100644 Binary files a/test/subset/data/expected/layout.gpos3/gpos3_font3.retain-gids.29,2B.otf and b/test/subset/data/expected/layout.gpos3/gpos3_font3.notdef-outline-retain-gids.29,2B.otf differ diff --git a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.retain-gids.41,42,43.otf b/test/subset/data/expected/layout.gpos3/gpos3_font3.notdef-outline-retain-gids.41,42,43.otf similarity index 68% rename from test/subset/data/expected/layout.gpos2/gpos2_2_font5.retain-gids.41,42,43.otf rename to test/subset/data/expected/layout.gpos3/gpos3_font3.notdef-outline-retain-gids.41,42,43.otf index 589fc9d3a..5b19740ff 100644 Binary files a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.retain-gids.41,42,43.otf and b/test/subset/data/expected/layout.gpos3/gpos3_font3.notdef-outline-retain-gids.41,42,43.otf differ diff --git a/test/subset/data/expected/layout.gpos3/gpos3_font3.default.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos3/gpos3_font3.notdef-outline-retain-gids.retain-all-codepoint.otf similarity index 72% rename from test/subset/data/expected/layout.gpos3/gpos3_font3.default.retain-all-codepoint.otf rename to test/subset/data/expected/layout.gpos3/gpos3_font3.notdef-outline-retain-gids.retain-all-codepoint.otf index 07a2c0202..964d7aca2 100644 Binary files a/test/subset/data/expected/layout.gpos3/gpos3_font3.default.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gpos3/gpos3_font3.notdef-outline-retain-gids.retain-all-codepoint.otf differ diff --git a/test/subset/data/expected/layout.gpos3/gpos3_font3.default.28,29.otf b/test/subset/data/expected/layout.gpos3/gpos3_font3.notdef-outline.28,29.otf similarity index 56% rename from test/subset/data/expected/layout.gpos3/gpos3_font3.default.28,29.otf rename to test/subset/data/expected/layout.gpos3/gpos3_font3.notdef-outline.28,29.otf index ce5077ab6..9524feee8 100644 Binary files a/test/subset/data/expected/layout.gpos3/gpos3_font3.default.28,29.otf and b/test/subset/data/expected/layout.gpos3/gpos3_font3.notdef-outline.28,29.otf differ diff --git a/test/subset/data/expected/layout.gpos3/gpos3_font3.default.28,2B.otf b/test/subset/data/expected/layout.gpos3/gpos3_font3.notdef-outline.28,2B.otf similarity index 59% rename from test/subset/data/expected/layout.gpos3/gpos3_font3.default.28,2B.otf rename to test/subset/data/expected/layout.gpos3/gpos3_font3.notdef-outline.28,2B.otf index 2c49c552f..3e14ed219 100644 Binary files a/test/subset/data/expected/layout.gpos3/gpos3_font3.default.28,2B.otf and b/test/subset/data/expected/layout.gpos3/gpos3_font3.notdef-outline.28,2B.otf differ diff --git a/test/subset/data/expected/layout.gpos3/gpos3_font3.default.29,2B.otf b/test/subset/data/expected/layout.gpos3/gpos3_font3.notdef-outline.29,2B.otf similarity index 56% rename from test/subset/data/expected/layout.gpos3/gpos3_font3.default.29,2B.otf rename to test/subset/data/expected/layout.gpos3/gpos3_font3.notdef-outline.29,2B.otf index aba9f431c..81b7311d8 100644 Binary files a/test/subset/data/expected/layout.gpos3/gpos3_font3.default.29,2B.otf and b/test/subset/data/expected/layout.gpos3/gpos3_font3.notdef-outline.29,2B.otf differ diff --git a/test/subset/data/expected/layout.gpos3/gpos3_font3.notdef-outline.41,42,43.otf b/test/subset/data/expected/layout.gpos3/gpos3_font3.notdef-outline.41,42,43.otf new file mode 100644 index 000000000..f50d8f323 Binary files /dev/null and b/test/subset/data/expected/layout.gpos3/gpos3_font3.notdef-outline.41,42,43.otf differ diff --git a/test/subset/data/expected/layout.gpos3/gpos3_font3.retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos3/gpos3_font3.notdef-outline.retain-all-codepoint.otf similarity index 72% rename from test/subset/data/expected/layout.gpos3/gpos3_font3.retain-gids.retain-all-codepoint.otf rename to test/subset/data/expected/layout.gpos3/gpos3_font3.notdef-outline.retain-all-codepoint.otf index 07a2c0202..964d7aca2 100644 Binary files a/test/subset/data/expected/layout.gpos3/gpos3_font3.retain-gids.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gpos3/gpos3_font3.notdef-outline.retain-all-codepoint.otf differ diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41,42,43.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41,42,43.otf deleted file mode 100644 index 3fee4ba98..000000000 Binary files a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41,42,43.otf and /dev/null differ diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41.otf deleted file mode 100644 index ab494c58d..000000000 Binary files a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41.otf and /dev/null differ diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,42,43,44.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline-retain-gids.41,42,43,44.otf similarity index 71% rename from test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,42,43,44.otf rename to test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline-retain-gids.41,42,43,44.otf index e8120edf9..7b6600204 100644 Binary files a/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,42,43,44.otf and b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline-retain-gids.41,42,43,44.otf differ diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41,42,43,45.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline-retain-gids.41,42,43,45.otf similarity index 84% rename from test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41,42,43,45.otf rename to test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline-retain-gids.41,42,43,45.otf index 8bbc09b84..b8d94c853 100644 Binary files a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41,42,43,45.otf and b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline-retain-gids.41,42,43,45.otf differ diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline-retain-gids.41,42,43.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline-retain-gids.41,42,43.otf new file mode 100644 index 000000000..ef395482c Binary files /dev/null and b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline-retain-gids.41,42,43.otf differ diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,42.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline-retain-gids.41,42.otf similarity index 71% rename from test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,42.otf rename to test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline-retain-gids.41,42.otf index fd8b8dff8..2f3356677 100644 Binary files a/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,42.otf and b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline-retain-gids.41,42.otf differ diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,43,44,45,46.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline-retain-gids.41,43,44,45,46.otf similarity index 74% rename from test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,43,44,45,46.otf rename to test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline-retain-gids.41,43,44,45,46.otf index cbc942fd8..3b67d7e4c 100644 Binary files a/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,43,44,45,46.otf and b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline-retain-gids.41,43,44,45,46.otf differ diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,43,44.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline-retain-gids.41,43,44.otf similarity index 70% rename from test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,43,44.otf rename to test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline-retain-gids.41,43,44.otf index 050d42a44..253719020 100644 Binary files a/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,43,44.otf and b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline-retain-gids.41,43,44.otf differ diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,43,45.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline-retain-gids.41,43,45.otf similarity index 70% rename from test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,43,45.otf rename to test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline-retain-gids.41,43,45.otf index c084e407f..1ebf76c24 100644 Binary files a/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,43,45.otf and b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline-retain-gids.41,43,45.otf differ diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline-retain-gids.41,43.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline-retain-gids.41,43.otf new file mode 100644 index 000000000..e06fa77d2 Binary files /dev/null and b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline-retain-gids.41,43.otf differ diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline-retain-gids.41.otf similarity index 68% rename from test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41.otf rename to test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline-retain-gids.41.otf index ad52c4636..6f27cec16 100644 Binary files a/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41.otf and b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline-retain-gids.41.otf differ diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline-retain-gids.retain-all-codepoint.otf similarity index 72% rename from test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.retain-all-codepoint.otf rename to test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline-retain-gids.retain-all-codepoint.otf index 471158800..427a26c13 100644 Binary files a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline-retain-gids.retain-all-codepoint.otf differ diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,42,43,44.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline.41,42,43,44.otf similarity index 65% rename from test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,42,43,44.otf rename to test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline.41,42,43,44.otf index f0f6cb51f..3ca55c4f7 100644 Binary files a/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,42,43,44.otf and b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline.41,42,43,44.otf differ diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,42,43,45.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline.41,42,43,45.otf similarity index 52% rename from test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,42,43,45.otf rename to test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline.41,42,43,45.otf index cbf669c77..e84bb48dd 100644 Binary files a/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,42,43,45.otf and b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline.41,42,43,45.otf differ diff --git a/test/subset/data/expected/layout.gpos3/gpos3_font3.default.41,42,43.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline.41,42,43.otf similarity index 62% rename from test/subset/data/expected/layout.gpos3/gpos3_font3.default.41,42,43.otf rename to test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline.41,42,43.otf index 85da4e839..45c30e622 100644 Binary files a/test/subset/data/expected/layout.gpos3/gpos3_font3.default.41,42,43.otf and b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline.41,42,43.otf differ diff --git a/test/subset/data/expected/layout.gpos9/gpos9_font2.default.41,42.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline.41,42.otf similarity index 54% rename from test/subset/data/expected/layout.gpos9/gpos9_font2.default.41,42.otf rename to test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline.41,42.otf index 005f5d68a..3f8f1d0fd 100644 Binary files a/test/subset/data/expected/layout.gpos9/gpos9_font2.default.41,42.otf and b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline.41,42.otf differ diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,43,44,45,46.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline.41,43,44,45,46.otf similarity index 69% rename from test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,43,44,45,46.otf rename to test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline.41,43,44,45,46.otf index e724a7c2d..47787d88b 100644 Binary files a/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,43,44,45,46.otf and b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline.41,43,44,45,46.otf differ diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,43,44.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline.41,43,44.otf similarity index 65% rename from test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,43,44.otf rename to test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline.41,43,44.otf index 4bb966473..964784eb7 100644 Binary files a/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,43,44.otf and b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline.41,43,44.otf differ diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41,43,45.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline.41,43,45.otf similarity index 62% rename from test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41,43,45.otf rename to test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline.41,43,45.otf index 704a18bdd..9499c0138 100644 Binary files a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41,43,45.otf and b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline.41,43,45.otf differ diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41,43.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline.41,43.otf similarity index 55% rename from test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41,43.otf rename to test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline.41,43.otf index 1ae460fd6..437d0a0ce 100644 Binary files a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41,43.otf and b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline.41,43.otf differ diff --git a/test/subset/data/expected/layout.gpos/gpos1_2_font.default.41.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline.41.otf similarity index 53% rename from test/subset/data/expected/layout.gpos/gpos1_2_font.default.41.otf rename to test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline.41.otf index 747420518..f56aff0d8 100644 Binary files a/test/subset/data/expected/layout.gpos/gpos1_2_font.default.41.otf and b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline.41.otf differ diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline.retain-all-codepoint.otf similarity index 72% rename from test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.retain-all-codepoint.otf rename to test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline.retain-all-codepoint.otf index 471158800..427a26c13 100644 Binary files a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline.retain-all-codepoint.otf differ diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41,42,43.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41,42,43.otf deleted file mode 100644 index 3e7a75a54..000000000 Binary files a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41,42,43.otf and /dev/null differ diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41,43.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41,43.otf deleted file mode 100644 index d9e4a43e7..000000000 Binary files a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41,43.otf and /dev/null differ diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41.otf deleted file mode 100644 index c6b0867e9..000000000 Binary files a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41.otf and /dev/null differ diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.default.42.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.default.42.otf deleted file mode 100644 index 89265a878..000000000 Binary files a/test/subset/data/expected/layout.gpos5/gpos5_font1.default.42.otf and /dev/null differ diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.41,42,43,44.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline-retain-gids.41,42,43,44.otf similarity index 72% rename from test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.41,42,43,44.otf rename to test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline-retain-gids.41,42,43,44.otf index 7e90f5f29..9c9960db4 100644 Binary files a/test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.41,42,43,44.otf and b/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline-retain-gids.41,42,43,44.otf differ diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.41,42,43,45.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline-retain-gids.41,42,43,45.otf similarity index 84% rename from test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.41,42,43,45.otf rename to test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline-retain-gids.41,42,43,45.otf index 978928cb0..25cf8ebc1 100644 Binary files a/test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.41,42,43,45.otf and b/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline-retain-gids.41,42,43,45.otf differ diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.41,42,43.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline-retain-gids.41,42,43.otf similarity index 69% rename from test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.41,42,43.otf rename to test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline-retain-gids.41,42,43.otf index a719416a5..b2fdae437 100644 Binary files a/test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.41,42,43.otf and b/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline-retain-gids.41,42,43.otf differ diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.41,42,44.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline-retain-gids.41,42,44.otf similarity index 70% rename from test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.41,42,44.otf rename to test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline-retain-gids.41,42,44.otf index 9a7a94ac6..ab4813a25 100644 Binary files a/test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.41,42,44.otf and b/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline-retain-gids.41,42,44.otf differ diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.41,42,45.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline-retain-gids.41,42,45.otf similarity index 70% rename from test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.41,42,45.otf rename to test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline-retain-gids.41,42,45.otf index 75af4bec3..7fa369135 100644 Binary files a/test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.41,42,45.otf and b/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline-retain-gids.41,42,45.otf differ diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.41,42.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline-retain-gids.41,42.otf similarity index 69% rename from test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.41,42.otf rename to test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline-retain-gids.41,42.otf index fa1ab9350..2e0de5d4a 100644 Binary files a/test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.41,42.otf and b/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline-retain-gids.41,42.otf differ diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline-retain-gids.41,43.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline-retain-gids.41,43.otf new file mode 100644 index 000000000..a672a8169 Binary files /dev/null and b/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline-retain-gids.41,43.otf differ diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.41.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline-retain-gids.41.otf similarity index 68% rename from test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.41.otf rename to test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline-retain-gids.41.otf index 772503950..7e4c1b007 100644 Binary files a/test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.41.otf and b/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline-retain-gids.41.otf differ diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.42.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline-retain-gids.42.otf similarity index 80% rename from test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.42.otf rename to test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline-retain-gids.42.otf index 5b03ee6ef..6633603a1 100644 Binary files a/test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.42.otf and b/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline-retain-gids.42.otf differ diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.default.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline-retain-gids.retain-all-codepoint.otf similarity index 72% rename from test/subset/data/expected/layout.gpos5/gpos5_font1.default.retain-all-codepoint.otf rename to test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline-retain-gids.retain-all-codepoint.otf index 3ccdb1175..e0ddb1961 100644 Binary files a/test/subset/data/expected/layout.gpos5/gpos5_font1.default.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline-retain-gids.retain-all-codepoint.otf differ diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.default.41,42,43,44.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline.41,42,43,44.otf similarity index 64% rename from test/subset/data/expected/layout.gpos5/gpos5_font1.default.41,42,43,44.otf rename to test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline.41,42,43,44.otf index bf6e9d9ea..ed4636bfb 100644 Binary files a/test/subset/data/expected/layout.gpos5/gpos5_font1.default.41,42,43,44.otf and b/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline.41,42,43,44.otf differ diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.default.41,42,43,45.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline.41,42,43,45.otf similarity index 52% rename from test/subset/data/expected/layout.gpos5/gpos5_font1.default.41,42,43,45.otf rename to test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline.41,42,43,45.otf index 4928a45cb..567939623 100644 Binary files a/test/subset/data/expected/layout.gpos5/gpos5_font1.default.41,42,43,45.otf and b/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline.41,42,43,45.otf differ diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.default.41,42,43.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline.41,42,43.otf similarity index 60% rename from test/subset/data/expected/layout.gpos5/gpos5_font1.default.41,42,43.otf rename to test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline.41,42,43.otf index dd16e1d6f..597677f3b 100644 Binary files a/test/subset/data/expected/layout.gpos5/gpos5_font1.default.41,42,43.otf and b/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline.41,42,43.otf differ diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.default.41,42,44.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline.41,42,44.otf similarity index 62% rename from test/subset/data/expected/layout.gpos5/gpos5_font1.default.41,42,44.otf rename to test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline.41,42,44.otf index 0a0bfa9f5..a543ea192 100644 Binary files a/test/subset/data/expected/layout.gpos5/gpos5_font1.default.41,42,44.otf and b/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline.41,42,44.otf differ diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.default.41,42,45.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline.41,42,45.otf similarity index 62% rename from test/subset/data/expected/layout.gpos5/gpos5_font1.default.41,42,45.otf rename to test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline.41,42,45.otf index 29926a1a1..09cc36557 100644 Binary files a/test/subset/data/expected/layout.gpos5/gpos5_font1.default.41,42,45.otf and b/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline.41,42,45.otf differ diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.default.41,42.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline.41,42.otf similarity index 55% rename from test/subset/data/expected/layout.gpos5/gpos5_font1.default.41,42.otf rename to test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline.41,42.otf index f2ae28f1d..e41f406f3 100644 Binary files a/test/subset/data/expected/layout.gpos5/gpos5_font1.default.41,42.otf and b/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline.41,42.otf differ diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.default.41,43.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline.41,43.otf similarity index 57% rename from test/subset/data/expected/layout.gpos5/gpos5_font1.default.41,43.otf rename to test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline.41,43.otf index ab910d212..eacd14060 100644 Binary files a/test/subset/data/expected/layout.gpos5/gpos5_font1.default.41,43.otf and b/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline.41,43.otf differ diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.default.41.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline.41.otf similarity index 55% rename from test/subset/data/expected/layout.gpos5/gpos5_font1.default.41.otf rename to test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline.41.otf index a55367476..75b255b18 100644 Binary files a/test/subset/data/expected/layout.gpos5/gpos5_font1.default.41.otf and b/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline.41.otf differ diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline.42.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline.42.otf new file mode 100644 index 000000000..46f59f570 Binary files /dev/null and b/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline.42.otf differ diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline.retain-all-codepoint.otf similarity index 72% rename from test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.retain-all-codepoint.otf rename to test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline.retain-all-codepoint.otf index 3ccdb1175..e0ddb1961 100644 Binary files a/test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline.retain-all-codepoint.otf differ diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.41,43.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.41,43.otf deleted file mode 100644 index bbf99a6f7..000000000 Binary files a/test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.41,43.otf and /dev/null differ diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41,42,43,44.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline-retain-gids.41,42,43,44.otf similarity index 71% rename from test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41,42,43,44.otf rename to test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline-retain-gids.41,42,43,44.otf index 6989f923f..3d40cc8ad 100644 Binary files a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41,42,43,44.otf and b/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline-retain-gids.41,42,43,44.otf differ diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,42,43,45.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline-retain-gids.41,42,43,45.otf similarity index 84% rename from test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,42,43,45.otf rename to test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline-retain-gids.41,42,43,45.otf index 4dfae0c23..7a5ec3282 100644 Binary files a/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,42,43,45.otf and b/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline-retain-gids.41,42,43,45.otf differ diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline-retain-gids.41,42,43.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline-retain-gids.41,42,43.otf new file mode 100644 index 000000000..2e01bc71c Binary files /dev/null and b/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline-retain-gids.41,42,43.otf differ diff --git a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.retain-gids.41,42.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline-retain-gids.41,42.otf similarity index 68% rename from test/subset/data/expected/layout.context/gpos_context3_simple_f1.retain-gids.41,42.otf rename to test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline-retain-gids.41,42.otf index 44a67f99e..0dbdfebde 100644 Binary files a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.retain-gids.41,42.otf and b/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline-retain-gids.41,42.otf differ diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41,43,44,45,46.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline-retain-gids.41,43,44,45,46.otf similarity index 55% rename from test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41,43,44,45,46.otf rename to test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline-retain-gids.41,43,44,45,46.otf index d14c3ac71..e18c27c94 100644 Binary files a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41,43,44,45,46.otf and b/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline-retain-gids.41,43,44,45,46.otf differ diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41,43,44.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline-retain-gids.41,43,44.otf similarity index 70% rename from test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41,43,44.otf rename to test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline-retain-gids.41,43,44.otf index 6d17cb1f3..dd1762bab 100644 Binary files a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41,43,44.otf and b/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline-retain-gids.41,43,44.otf differ diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41,43,45.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline-retain-gids.41,43,45.otf similarity index 69% rename from test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41,43,45.otf rename to test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline-retain-gids.41,43,45.otf index 2cd9693c9..4935b4384 100644 Binary files a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41,43,45.otf and b/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline-retain-gids.41,43,45.otf differ diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline-retain-gids.41,43.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline-retain-gids.41,43.otf new file mode 100644 index 000000000..55d577063 Binary files /dev/null and b/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline-retain-gids.41,43.otf differ diff --git a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.retain-gids.41.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline-retain-gids.41.otf similarity index 66% rename from test/subset/data/expected/layout.context/gpos_context3_simple_f1.retain-gids.41.otf rename to test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline-retain-gids.41.otf index a9e37c5d0..07e1b6131 100644 Binary files a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.retain-gids.41.otf and b/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline-retain-gids.41.otf differ diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.default.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline-retain-gids.retain-all-codepoint.otf similarity index 72% rename from test/subset/data/expected/layout.gpos6/gpos6_font1.default.retain-all-codepoint.otf rename to test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline-retain-gids.retain-all-codepoint.otf index 4221ffd83..8969b7b79 100644 Binary files a/test/subset/data/expected/layout.gpos6/gpos6_font1.default.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline-retain-gids.retain-all-codepoint.otf differ diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41,42,43,44.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline.41,42,43,44.otf similarity index 62% rename from test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41,42,43,44.otf rename to test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline.41,42,43,44.otf index 86d04fa6d..c672d91b8 100644 Binary files a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41,42,43,44.otf and b/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline.41,42,43,44.otf differ diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41,42,43,45.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline.41,42,43,45.otf similarity index 52% rename from test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41,42,43,45.otf rename to test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline.41,42,43,45.otf index 2aeb49a96..90dfc64c0 100644 Binary files a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41,42,43,45.otf and b/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline.41,42,43,45.otf differ diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline.41,42,43.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline.41,42,43.otf new file mode 100644 index 000000000..0802284a3 Binary files /dev/null and b/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline.41,42,43.otf differ diff --git a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.default.41,42.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline.41,42.otf similarity index 53% rename from test/subset/data/expected/layout.context/gpos_context3_simple_f1.default.41,42.otf rename to test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline.41,42.otf index f8230092d..ff5a7774c 100644 Binary files a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.default.41,42.otf and b/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline.41,42.otf differ diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41,43,44,45,46.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline.41,43,44,45,46.otf similarity index 68% rename from test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41,43,44,45,46.otf rename to test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline.41,43,44,45,46.otf index 68e7adece..de08a4721 100644 Binary files a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41,43,44,45,46.otf and b/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline.41,43,44,45,46.otf differ diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41,43,44.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline.41,43,44.otf similarity index 64% rename from test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41,43,44.otf rename to test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline.41,43,44.otf index 33f81927b..17838ee16 100644 Binary files a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41,43,44.otf and b/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline.41,43,44.otf differ diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,43,45.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline.41,43,45.otf similarity index 64% rename from test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,43,45.otf rename to test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline.41,43,45.otf index b2e632418..83f13b217 100644 Binary files a/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,43,45.otf and b/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline.41,43,45.otf differ diff --git a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.default.41,43.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline.41,43.otf similarity index 55% rename from test/subset/data/expected/layout.context/gpos_context3_simple_f1.default.41,43.otf rename to test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline.41,43.otf index affaf31b2..0653efd6c 100644 Binary files a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.default.41,43.otf and b/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline.41,43.otf differ diff --git a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.default.41.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline.41.otf similarity index 52% rename from test/subset/data/expected/layout.context/gpos_context3_simple_f1.default.41.otf rename to test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline.41.otf index fcd244267..624e73163 100644 Binary files a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.default.41.otf and b/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline.41.otf differ diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline.retain-all-codepoint.otf similarity index 72% rename from test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.retain-all-codepoint.otf rename to test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline.retain-all-codepoint.otf index 4221ffd83..8969b7b79 100644 Binary files a/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline.retain-all-codepoint.otf differ diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,43.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,43.otf deleted file mode 100644 index da1e55d3a..000000000 Binary files a/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,43.otf and /dev/null differ diff --git a/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.default.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 index aa833dc79..b00ee9b2a 100644 Binary files a/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.default.627,644,623,62D,644,627,645,2E.ttf and b/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.default.627,644,623,62D,644,627,645,2E.ttf differ diff --git a/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.default.627,644,62D,628.ttf b/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.default.627,644,62D,628.ttf index 49b29d566..87738c768 100644 Binary files a/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.default.627,644,62D,628.ttf and b/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.default.627,644,62D,628.ttf differ diff --git a/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.default.627,644.ttf b/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.default.627,644.ttf index 520f51425..f18296ef7 100644 Binary files a/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.default.627,644.ttf and b/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.default.627,644.ttf differ diff --git a/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.default.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 index 41c919af0..f381efce2 100644 Binary files a/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.default.633,645,627,621,20,644,627.ttf and b/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.default.633,645,627,621,20,644,627.ttf differ diff --git a/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.default.63A,64A,631.ttf b/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.default.63A,64A,631.ttf index b131cafba..1fd8f448a 100644 Binary files a/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.default.63A,64A,631.ttf and b/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.default.63A,64A,631.ttf differ diff --git a/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.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 index 8a30af19a..3c3f9c39b 100644 Binary files a/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.retain-gids.627,644,623,62D,644,627,645,2E.ttf and b/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.retain-gids.627,644,623,62D,644,627,645,2E.ttf differ diff --git a/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.retain-gids.627,644,62D,628.ttf b/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.retain-gids.627,644,62D,628.ttf index dab693fea..9e84a9c77 100644 Binary files a/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.retain-gids.627,644,62D,628.ttf and b/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.retain-gids.627,644,62D,628.ttf differ diff --git a/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.retain-gids.627,644.ttf b/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.retain-gids.627,644.ttf index d00779b29..bdfb3e899 100644 Binary files a/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.retain-gids.627,644.ttf and b/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.retain-gids.627,644.ttf differ diff --git a/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.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 index 83c27dc9c..f948350ac 100644 Binary files a/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.retain-gids.633,645,627,621,20,644,627.ttf and b/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.retain-gids.633,645,627,621,20,644,627.ttf differ diff --git a/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.retain-gids.63A,64A,631.ttf b/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.retain-gids.63A,64A,631.ttf index a6e3ca048..491748bd9 100644 Binary files a/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.retain-gids.63A,64A,631.ttf and b/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.retain-gids.63A,64A,631.ttf differ diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.default.41,42,43.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.default.41,42,43.otf deleted file mode 100644 index 70ab671fd..000000000 Binary files a/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.default.41,42,43.otf and /dev/null differ diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.retain-gids.30,31,32,33.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.notdef-outline-retain-gids.30,31,32,33.otf similarity index 71% rename from test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.retain-gids.30,31,32,33.otf rename to test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.notdef-outline-retain-gids.30,31,32,33.otf index 2981800bf..1fa96ae0a 100644 Binary files a/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.retain-gids.30,31,32,33.otf and b/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.notdef-outline-retain-gids.30,31,32,33.otf differ diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.notdef-outline-retain-gids.41,42,43.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.notdef-outline-retain-gids.41,42,43.otf new file mode 100644 index 000000000..49215be18 Binary files /dev/null and b/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.notdef-outline-retain-gids.41,42,43.otf differ diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.default.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.notdef-outline-retain-gids.retain-all-codepoint.otf similarity index 72% rename from test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.default.retain-all-codepoint.otf rename to test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.notdef-outline-retain-gids.retain-all-codepoint.otf index b2873ca5e..e87e12902 100644 Binary files a/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.default.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.notdef-outline-retain-gids.retain-all-codepoint.otf differ diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.default.30,31,32,33.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.notdef-outline.30,31,32,33.otf similarity index 68% rename from test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.default.30,31,32,33.otf rename to test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.notdef-outline.30,31,32,33.otf index 060a95149..18f1a2e83 100644 Binary files a/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.default.30,31,32,33.otf and b/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.notdef-outline.30,31,32,33.otf differ diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.notdef-outline.41,42,43.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.notdef-outline.41,42,43.otf new file mode 100644 index 000000000..02a4c7bae Binary files /dev/null and b/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.notdef-outline.41,42,43.otf differ diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.notdef-outline.retain-all-codepoint.otf similarity index 72% rename from test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.retain-gids.retain-all-codepoint.otf rename to test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.notdef-outline.retain-all-codepoint.otf index b2873ca5e..e87e12902 100644 Binary files a/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.retain-gids.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.notdef-outline.retain-all-codepoint.otf differ diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.retain-gids.41,42,43.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.retain-gids.41,42,43.otf deleted file mode 100644 index 1cfcbf37d..000000000 Binary files a/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.retain-gids.41,42,43.otf and /dev/null differ diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.default.41,42,43.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.default.41,42,43.otf deleted file mode 100644 index 51717d5b5..000000000 Binary files a/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.default.41,42,43.otf and /dev/null differ diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.retain-gids.30,31,32,33.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.notdef-outline-retain-gids.30,31,32,33.otf similarity index 71% rename from test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.retain-gids.30,31,32,33.otf rename to test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.notdef-outline-retain-gids.30,31,32,33.otf index e80620c01..56758573f 100644 Binary files a/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.retain-gids.30,31,32,33.otf and b/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.notdef-outline-retain-gids.30,31,32,33.otf differ diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.notdef-outline-retain-gids.41,42,43.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.notdef-outline-retain-gids.41,42,43.otf new file mode 100644 index 000000000..a818c734a Binary files /dev/null and b/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.notdef-outline-retain-gids.41,42,43.otf differ diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.default.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.notdef-outline-retain-gids.retain-all-codepoint.otf similarity index 72% rename from test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.default.retain-all-codepoint.otf rename to test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.notdef-outline-retain-gids.retain-all-codepoint.otf index 8a1ea2b20..bd0900f0f 100644 Binary files a/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.default.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.notdef-outline-retain-gids.retain-all-codepoint.otf differ diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.default.30,31,32,33.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.notdef-outline.30,31,32,33.otf similarity index 67% rename from test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.default.30,31,32,33.otf rename to test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.notdef-outline.30,31,32,33.otf index 6fdfef5a4..70f2963f6 100644 Binary files a/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.default.30,31,32,33.otf and b/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.notdef-outline.30,31,32,33.otf differ diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.notdef-outline.41,42,43.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.notdef-outline.41,42,43.otf new file mode 100644 index 000000000..180b0f66f Binary files /dev/null and b/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.notdef-outline.41,42,43.otf differ diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.notdef-outline.retain-all-codepoint.otf similarity index 72% rename from test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.retain-gids.retain-all-codepoint.otf rename to test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.notdef-outline.retain-all-codepoint.otf index 8a1ea2b20..bd0900f0f 100644 Binary files a/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.retain-gids.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.notdef-outline.retain-all-codepoint.otf differ diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.retain-gids.41,42,43.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.retain-gids.41,42,43.otf deleted file mode 100644 index 96339dedb..000000000 Binary files a/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.retain-gids.41,42,43.otf and /dev/null differ diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.default.41,42,43.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.default.41,42,43.otf deleted file mode 100644 index f7e62975a..000000000 Binary files a/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.default.41,42,43.otf and /dev/null differ diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.retain-gids.30,31,32,33.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.notdef-outline-retain-gids.30,31,32,33.otf similarity index 71% rename from test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.retain-gids.30,31,32,33.otf rename to test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.notdef-outline-retain-gids.30,31,32,33.otf index 4990e8c5e..76e39f8d1 100644 Binary files a/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.retain-gids.30,31,32,33.otf and b/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.notdef-outline-retain-gids.30,31,32,33.otf differ diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.notdef-outline-retain-gids.41,42,43.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.notdef-outline-retain-gids.41,42,43.otf new file mode 100644 index 000000000..e731c2f8a Binary files /dev/null and b/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.notdef-outline-retain-gids.41,42,43.otf differ diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.default.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.notdef-outline-retain-gids.retain-all-codepoint.otf similarity index 72% rename from test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.default.retain-all-codepoint.otf rename to test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.notdef-outline-retain-gids.retain-all-codepoint.otf index 323714911..4ed39304c 100644 Binary files a/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.default.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.notdef-outline-retain-gids.retain-all-codepoint.otf differ diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.default.30,31,32,33.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.notdef-outline.30,31,32,33.otf similarity index 67% rename from test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.default.30,31,32,33.otf rename to test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.notdef-outline.30,31,32,33.otf index a6b373e9c..acc47925c 100644 Binary files a/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.default.30,31,32,33.otf and b/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.notdef-outline.30,31,32,33.otf differ diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.notdef-outline.41,42,43.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.notdef-outline.41,42,43.otf new file mode 100644 index 000000000..74eb7ba1d Binary files /dev/null and b/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.notdef-outline.41,42,43.otf differ diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.notdef-outline.retain-all-codepoint.otf similarity index 72% rename from test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.retain-gids.retain-all-codepoint.otf rename to test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.notdef-outline.retain-all-codepoint.otf index 323714911..4ed39304c 100644 Binary files a/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.retain-gids.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.notdef-outline.retain-all-codepoint.otf differ diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.retain-gids.41,42,43.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.retain-gids.41,42,43.otf deleted file mode 100644 index 49967c294..000000000 Binary files a/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.retain-gids.41,42,43.otf and /dev/null differ diff --git a/test/subset/data/expected/layout.gpos9/gpos9_font2.default.42.otf b/test/subset/data/expected/layout.gpos9/gpos9_font2.default.42.otf deleted file mode 100644 index 597824f21..000000000 Binary files a/test/subset/data/expected/layout.gpos9/gpos9_font2.default.42.otf and /dev/null differ diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41,42.otf b/test/subset/data/expected/layout.gpos9/gpos9_font2.notdef-outline-retain-gids.41,42.otf similarity index 68% rename from test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41,42.otf rename to test/subset/data/expected/layout.gpos9/gpos9_font2.notdef-outline-retain-gids.41,42.otf index 1d2bd049d..af0f615db 100644 Binary files a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41,42.otf and b/test/subset/data/expected/layout.gpos9/gpos9_font2.notdef-outline-retain-gids.41,42.otf differ diff --git a/test/subset/data/expected/layout.gpos9/gpos9_font2.notdef-outline-retain-gids.41.otf b/test/subset/data/expected/layout.gpos9/gpos9_font2.notdef-outline-retain-gids.41.otf new file mode 100644 index 000000000..c96513d5a Binary files /dev/null and b/test/subset/data/expected/layout.gpos9/gpos9_font2.notdef-outline-retain-gids.41.otf differ diff --git a/test/subset/data/expected/layout.gpos9/gpos9_font2.retain-gids.42.otf b/test/subset/data/expected/layout.gpos9/gpos9_font2.notdef-outline-retain-gids.42.otf similarity index 64% rename from test/subset/data/expected/layout.gpos9/gpos9_font2.retain-gids.42.otf rename to test/subset/data/expected/layout.gpos9/gpos9_font2.notdef-outline-retain-gids.42.otf index c655d44be..d9eabdcf7 100644 Binary files a/test/subset/data/expected/layout.gpos9/gpos9_font2.retain-gids.42.otf and b/test/subset/data/expected/layout.gpos9/gpos9_font2.notdef-outline-retain-gids.42.otf differ diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41,42.otf b/test/subset/data/expected/layout.gpos9/gpos9_font2.notdef-outline.41,42.otf similarity index 53% rename from test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41,42.otf rename to test/subset/data/expected/layout.gpos9/gpos9_font2.notdef-outline.41,42.otf index 6e08e2f83..3554efdea 100644 Binary files a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41,42.otf and b/test/subset/data/expected/layout.gpos9/gpos9_font2.notdef-outline.41,42.otf differ diff --git a/test/subset/data/expected/layout.gpos9/gpos9_font2.notdef-outline.41.otf b/test/subset/data/expected/layout.gpos9/gpos9_font2.notdef-outline.41.otf new file mode 100644 index 000000000..7ceafb524 Binary files /dev/null and b/test/subset/data/expected/layout.gpos9/gpos9_font2.notdef-outline.41.otf differ diff --git a/test/subset/data/expected/layout.gpos9/gpos9_font2.notdef-outline.42.otf b/test/subset/data/expected/layout.gpos9/gpos9_font2.notdef-outline.42.otf new file mode 100644 index 000000000..c9a5505f4 Binary files /dev/null and b/test/subset/data/expected/layout.gpos9/gpos9_font2.notdef-outline.42.otf differ diff --git a/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.default.53A9,53F1.otf b/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.default.53A9,53F1.otf index 4d3a745bc..656dbc4b3 100644 Binary files a/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.default.53A9,53F1.otf and b/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.default.53A9,53F1.otf differ diff --git a/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.default.53A9.otf b/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.default.53A9.otf index 27bc9bfaf..f8d2c8428 100644 Binary files a/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.default.53A9.otf and b/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.default.53A9.otf differ diff --git a/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.default.53F1.otf b/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.default.53F1.otf index 0ae56f34c..99fb5e150 100644 Binary files a/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.default.53F1.otf and b/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.default.53F1.otf differ diff --git a/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.default.retain-all-codepoint.otf b/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.default.retain-all-codepoint.otf index d2d74b2b5..f520f0c50 100644 Binary files a/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.default.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.default.retain-all-codepoint.otf differ diff --git a/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.retain-gids.53A9,53F1.otf b/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.retain-gids.53A9,53F1.otf index ab270b2ce..42f094f14 100644 Binary files a/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.retain-gids.53A9,53F1.otf and b/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.retain-gids.53A9,53F1.otf differ diff --git a/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.retain-gids.53A9.otf b/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.retain-gids.53A9.otf index c73e4c474..97b4f544b 100644 Binary files a/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.retain-gids.53A9.otf and b/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.retain-gids.53A9.otf differ diff --git a/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.retain-gids.53F1.otf b/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.retain-gids.53F1.otf index 99d39d53a..77c1200a4 100644 Binary files a/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.retain-gids.53F1.otf and b/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.retain-gids.53F1.otf differ diff --git a/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.retain-gids.retain-all-codepoint.otf index ecfe0865d..a352c7344 100644 Binary files a/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.retain-gids.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.retain-gids.retain-all-codepoint.otf differ diff --git a/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.retain-gids.41,42,43.otf b/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.notdef-outline-retain-gids.41,42,43.otf similarity index 70% rename from test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.retain-gids.41,42,43.otf rename to test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.notdef-outline-retain-gids.41,42,43.otf index 2f7bca939..8cee19b27 100644 Binary files a/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.retain-gids.41,42,43.otf and b/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.notdef-outline-retain-gids.41,42,43.otf differ diff --git a/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.retain-gids.41,42.otf b/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.notdef-outline-retain-gids.41,42.otf similarity index 65% rename from test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.retain-gids.41,42.otf rename to test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.notdef-outline-retain-gids.41,42.otf index ddbcb489b..b4a374e84 100644 Binary files a/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.retain-gids.41,42.otf and b/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.notdef-outline-retain-gids.41,42.otf differ diff --git a/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.retain-gids.41,43.otf b/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.notdef-outline-retain-gids.41,43.otf similarity index 66% rename from test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.retain-gids.41,43.otf rename to test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.notdef-outline-retain-gids.41,43.otf index e3c8aac54..026f59621 100644 Binary files a/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.retain-gids.41,43.otf and b/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.notdef-outline-retain-gids.41,43.otf differ diff --git a/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.retain-gids.41.otf b/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.notdef-outline-retain-gids.41.otf similarity index 65% rename from test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.retain-gids.41.otf rename to test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.notdef-outline-retain-gids.41.otf index 57e53b07a..81b6bea27 100644 Binary files a/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.retain-gids.41.otf and b/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.notdef-outline-retain-gids.41.otf differ diff --git a/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.default.retain-all-codepoint.otf b/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.notdef-outline-retain-gids.retain-all-codepoint.otf similarity index 90% rename from test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.default.retain-all-codepoint.otf rename to test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.notdef-outline-retain-gids.retain-all-codepoint.otf index 571a3daaf..d357ae920 100644 Binary files a/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.default.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.notdef-outline-retain-gids.retain-all-codepoint.otf differ diff --git a/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.default.41,42,43.otf b/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.notdef-outline.41,42,43.otf similarity index 55% rename from test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.default.41,42,43.otf rename to test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.notdef-outline.41,42,43.otf index 1a539d5e2..692a89c06 100644 Binary files a/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.default.41,42,43.otf and b/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.notdef-outline.41,42,43.otf differ diff --git a/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.default.41,42.otf b/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.notdef-outline.41,42.otf similarity index 51% rename from test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.default.41,42.otf rename to test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.notdef-outline.41,42.otf index 18bfef9b9..994bcfe08 100644 Binary files a/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.default.41,42.otf and b/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.notdef-outline.41,42.otf differ diff --git a/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.default.41,43.otf b/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.notdef-outline.41,43.otf similarity index 54% rename from test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.default.41,43.otf rename to test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.notdef-outline.41,43.otf index d3e56bca7..e5d821e3b 100644 Binary files a/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.default.41,43.otf and b/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.notdef-outline.41,43.otf differ diff --git a/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.default.41.otf b/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.notdef-outline.41.otf similarity index 51% rename from test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.default.41.otf rename to test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.notdef-outline.41.otf index 34b906fb2..44420e7ca 100644 Binary files a/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.default.41.otf and b/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.notdef-outline.41.otf differ diff --git a/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.notdef-outline.retain-all-codepoint.otf similarity index 90% rename from test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.retain-gids.retain-all-codepoint.otf rename to test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.notdef-outline.retain-all-codepoint.otf index 571a3daaf..d357ae920 100644 Binary files a/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.retain-gids.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.notdef-outline.retain-all-codepoint.otf differ diff --git a/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.retain-gids.41,42,43.otf b/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.notdef-outline-retain-gids.41,42,43.otf similarity index 67% rename from test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.retain-gids.41,42,43.otf rename to test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.notdef-outline-retain-gids.41,42,43.otf index 7a55e20aa..d5da5c44e 100644 Binary files a/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.retain-gids.41,42,43.otf and b/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.notdef-outline-retain-gids.41,42,43.otf differ diff --git a/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.retain-gids.41,42.otf b/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.notdef-outline-retain-gids.41,42.otf similarity index 65% rename from test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.retain-gids.41,42.otf rename to test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.notdef-outline-retain-gids.41,42.otf index a5ff8a5f4..167d241a7 100644 Binary files a/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.retain-gids.41,42.otf and b/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.notdef-outline-retain-gids.41,42.otf differ diff --git a/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.retain-gids.41,43.otf b/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.notdef-outline-retain-gids.41,43.otf similarity index 66% rename from test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.retain-gids.41,43.otf rename to test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.notdef-outline-retain-gids.41,43.otf index 6bada6807..5d1ec221b 100644 Binary files a/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.retain-gids.41,43.otf and b/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.notdef-outline-retain-gids.41,43.otf differ diff --git a/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.retain-gids.41.otf b/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.notdef-outline-retain-gids.41.otf similarity index 65% rename from test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.retain-gids.41.otf rename to test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.notdef-outline-retain-gids.41.otf index c77f6f10a..351e7c47a 100644 Binary files a/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.retain-gids.41.otf and b/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.notdef-outline-retain-gids.41.otf differ diff --git a/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.default.retain-all-codepoint.otf b/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.notdef-outline-retain-gids.retain-all-codepoint.otf similarity index 90% rename from test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.default.retain-all-codepoint.otf rename to test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.notdef-outline-retain-gids.retain-all-codepoint.otf index 570a9265e..e9c5c3155 100644 Binary files a/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.default.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.notdef-outline-retain-gids.retain-all-codepoint.otf differ diff --git a/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.default.41,42,43.otf b/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.notdef-outline.41,42,43.otf similarity index 55% rename from test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.default.41,42,43.otf rename to test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.notdef-outline.41,42,43.otf index 3a1502531..4cdb523dc 100644 Binary files a/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.default.41,42,43.otf and b/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.notdef-outline.41,42,43.otf differ diff --git a/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.default.41,42.otf b/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.notdef-outline.41,42.otf similarity index 51% rename from test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.default.41,42.otf rename to test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.notdef-outline.41,42.otf index 6d9cd2d98..577fff89d 100644 Binary files a/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.default.41,42.otf and b/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.notdef-outline.41,42.otf differ diff --git a/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.default.41,43.otf b/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.notdef-outline.41,43.otf similarity index 54% rename from test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.default.41,43.otf rename to test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.notdef-outline.41,43.otf index 0ed150bbd..70082e7fd 100644 Binary files a/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.default.41,43.otf and b/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.notdef-outline.41,43.otf differ diff --git a/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.default.41.otf b/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.notdef-outline.41.otf similarity index 51% rename from test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.default.41.otf rename to test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.notdef-outline.41.otf index e27ebffca..9e7676657 100644 Binary files a/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.default.41.otf and b/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.notdef-outline.41.otf differ diff --git a/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.notdef-outline.retain-all-codepoint.otf similarity index 90% rename from test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.retain-gids.retain-all-codepoint.otf rename to test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.notdef-outline.retain-all-codepoint.otf index 570a9265e..e9c5c3155 100644 Binary files a/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.retain-gids.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.notdef-outline.retain-all-codepoint.otf differ diff --git a/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.retain-gids.41,42,43.otf b/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.notdef-outline-retain-gids.41,42,43.otf similarity index 68% rename from test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.retain-gids.41,42,43.otf rename to test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.notdef-outline-retain-gids.41,42,43.otf index ab9b97efd..02a479c8a 100644 Binary files a/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.retain-gids.41,42,43.otf and b/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.notdef-outline-retain-gids.41,42,43.otf differ diff --git a/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.retain-gids.41,42.otf b/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.notdef-outline-retain-gids.41,42.otf similarity index 67% rename from test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.retain-gids.41,42.otf rename to test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.notdef-outline-retain-gids.41,42.otf index e22bfdea8..622091a0d 100644 Binary files a/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.retain-gids.41,42.otf and b/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.notdef-outline-retain-gids.41,42.otf differ diff --git a/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.notdef-outline-retain-gids.41,43.otf b/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.notdef-outline-retain-gids.41,43.otf new file mode 100644 index 000000000..4e9524ebe Binary files /dev/null and b/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.notdef-outline-retain-gids.41,43.otf differ diff --git a/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.retain-gids.41.otf b/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.notdef-outline-retain-gids.41.otf similarity index 66% rename from test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.retain-gids.41.otf rename to test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.notdef-outline-retain-gids.41.otf index 072bd50a4..e3d1f746b 100644 Binary files a/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.retain-gids.41.otf and b/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.notdef-outline-retain-gids.41.otf differ diff --git a/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.default.retain-all-codepoint.otf b/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.notdef-outline-retain-gids.retain-all-codepoint.otf similarity index 73% rename from test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.default.retain-all-codepoint.otf rename to test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.notdef-outline-retain-gids.retain-all-codepoint.otf index 1a5cc4e5e..182a5c49b 100644 Binary files a/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.default.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.notdef-outline-retain-gids.retain-all-codepoint.otf differ diff --git a/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.default.41,42,43.otf b/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.notdef-outline.41,42,43.otf similarity index 57% rename from test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.default.41,42,43.otf rename to test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.notdef-outline.41,42,43.otf index 03e0eabab..b2580ee63 100644 Binary files a/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.default.41,42,43.otf and b/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.notdef-outline.41,42,43.otf differ diff --git a/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.default.41,42.otf b/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.notdef-outline.41,42.otf similarity index 53% rename from test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.default.41,42.otf rename to test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.notdef-outline.41,42.otf index 2593dd56c..5b890f9c0 100644 Binary files a/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.default.41,42.otf and b/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.notdef-outline.41,42.otf differ diff --git a/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.default.41,43.otf b/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.notdef-outline.41,43.otf similarity index 55% rename from test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.default.41,43.otf rename to test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.notdef-outline.41,43.otf index 1137b142c..fc08fcb15 100644 Binary files a/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.default.41,43.otf and b/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.notdef-outline.41,43.otf differ diff --git a/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.default.41.otf b/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.notdef-outline.41.otf similarity index 52% rename from test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.default.41.otf rename to test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.notdef-outline.41.otf index 896e146fb..425282b1b 100644 Binary files a/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.default.41.otf and b/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.notdef-outline.41.otf differ diff --git a/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.notdef-outline.retain-all-codepoint.otf similarity index 73% rename from test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.retain-gids.retain-all-codepoint.otf rename to test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.notdef-outline.retain-all-codepoint.otf index 1a5cc4e5e..182a5c49b 100644 Binary files a/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.retain-gids.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.notdef-outline.retain-all-codepoint.otf differ diff --git a/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.retain-gids.41,43.otf b/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.retain-gids.41,43.otf deleted file mode 100644 index 586284dd0..000000000 Binary files a/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.retain-gids.41,43.otf and /dev/null differ diff --git a/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.default.41,42,43.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.default.41,42,43.otf deleted file mode 100644 index afb2d7bf3..000000000 Binary files a/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.default.41,42,43.otf and /dev/null differ diff --git a/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.retain-gids.30,31,32,33.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.notdef-outline-retain-gids.30,31,32,33.otf similarity index 72% rename from test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.retain-gids.30,31,32,33.otf rename to test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.notdef-outline-retain-gids.30,31,32,33.otf index dee436465..497c4ae21 100644 Binary files a/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.retain-gids.30,31,32,33.otf and b/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.notdef-outline-retain-gids.30,31,32,33.otf differ diff --git a/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.retain-gids.41,42,43.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.notdef-outline-retain-gids.41,42,43.otf similarity index 68% rename from test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.retain-gids.41,42,43.otf rename to test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.notdef-outline-retain-gids.41,42,43.otf index 284499daa..6a15b0324 100644 Binary files a/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.retain-gids.41,42,43.otf and b/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.notdef-outline-retain-gids.41,42,43.otf differ diff --git a/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.default.retain-all-codepoint.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.notdef-outline-retain-gids.retain-all-codepoint.otf similarity index 73% rename from test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.default.retain-all-codepoint.otf rename to test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.notdef-outline-retain-gids.retain-all-codepoint.otf index fe7f23845..4cb774da8 100644 Binary files a/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.default.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.notdef-outline-retain-gids.retain-all-codepoint.otf differ diff --git a/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.default.30,31,32,33.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.notdef-outline.30,31,32,33.otf similarity index 68% rename from test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.default.30,31,32,33.otf rename to test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.notdef-outline.30,31,32,33.otf index 2cc882d56..422e3c957 100644 Binary files a/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.default.30,31,32,33.otf and b/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.notdef-outline.30,31,32,33.otf differ diff --git a/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.default.41,42,43.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.notdef-outline.41,42,43.otf similarity index 57% rename from test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.default.41,42,43.otf rename to test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.notdef-outline.41,42,43.otf index bd6848425..7d6948a53 100644 Binary files a/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.default.41,42,43.otf and b/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.notdef-outline.41,42,43.otf differ diff --git a/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.notdef-outline.retain-all-codepoint.otf similarity index 73% rename from test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.retain-gids.retain-all-codepoint.otf rename to test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.notdef-outline.retain-all-codepoint.otf index fe7f23845..4cb774da8 100644 Binary files a/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.retain-gids.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.notdef-outline.retain-all-codepoint.otf differ diff --git a/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.retain-gids.30,31,32,33.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.notdef-outline-retain-gids.30,31,32,33.otf similarity index 71% rename from test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.retain-gids.30,31,32,33.otf rename to test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.notdef-outline-retain-gids.30,31,32,33.otf index 5c02f5814..72df444e4 100644 Binary files a/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.retain-gids.30,31,32,33.otf and b/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.notdef-outline-retain-gids.30,31,32,33.otf differ diff --git a/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.retain-gids.41,42,43.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.notdef-outline-retain-gids.41,42,43.otf similarity index 67% rename from test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.retain-gids.41,42,43.otf rename to test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.notdef-outline-retain-gids.41,42,43.otf index cd7cc2fc2..d2441abd3 100644 Binary files a/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.retain-gids.41,42,43.otf and b/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.notdef-outline-retain-gids.41,42,43.otf differ diff --git a/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.default.retain-all-codepoint.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.notdef-outline-retain-gids.retain-all-codepoint.otf similarity index 73% rename from test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.default.retain-all-codepoint.otf rename to test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.notdef-outline-retain-gids.retain-all-codepoint.otf index 4052aabbb..17b578d45 100644 Binary files a/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.default.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.notdef-outline-retain-gids.retain-all-codepoint.otf differ diff --git a/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.default.30,31,32,33.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.notdef-outline.30,31,32,33.otf similarity index 67% rename from test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.default.30,31,32,33.otf rename to test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.notdef-outline.30,31,32,33.otf index 83a2b636a..99eb272f9 100644 Binary files a/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.default.30,31,32,33.otf and b/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.notdef-outline.30,31,32,33.otf differ diff --git a/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.default.41,42,43.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.notdef-outline.41,42,43.otf similarity index 56% rename from test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.default.41,42,43.otf rename to test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.notdef-outline.41,42,43.otf index 9463f2924..a0e2cca25 100644 Binary files a/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.default.41,42,43.otf and b/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.notdef-outline.41,42,43.otf differ diff --git a/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.notdef-outline.retain-all-codepoint.otf similarity index 73% rename from test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.retain-gids.retain-all-codepoint.otf rename to test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.notdef-outline.retain-all-codepoint.otf index 4052aabbb..17b578d45 100644 Binary files a/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.retain-gids.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.notdef-outline.retain-all-codepoint.otf differ diff --git a/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.retain-gids.30,31,32,33.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.notdef-outline-retain-gids.30,31,32,33.otf similarity index 71% rename from test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.retain-gids.30,31,32,33.otf rename to test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.notdef-outline-retain-gids.30,31,32,33.otf index 7a6b267b7..9c93f91dd 100644 Binary files a/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.retain-gids.30,31,32,33.otf and b/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.notdef-outline-retain-gids.30,31,32,33.otf differ diff --git a/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.retain-gids.41,42,43.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.notdef-outline-retain-gids.41,42,43.otf similarity index 67% rename from test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.retain-gids.41,42,43.otf rename to test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.notdef-outline-retain-gids.41,42,43.otf index 378d90103..12a1582ef 100644 Binary files a/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.retain-gids.41,42,43.otf and b/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.notdef-outline-retain-gids.41,42,43.otf differ diff --git a/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.default.retain-all-codepoint.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.notdef-outline-retain-gids.retain-all-codepoint.otf similarity index 73% rename from test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.default.retain-all-codepoint.otf rename to test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.notdef-outline-retain-gids.retain-all-codepoint.otf index 62f074d0d..c60f4004d 100644 Binary files a/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.default.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.notdef-outline-retain-gids.retain-all-codepoint.otf differ diff --git a/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.default.30,31,32,33.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.notdef-outline.30,31,32,33.otf similarity index 67% rename from test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.default.30,31,32,33.otf rename to test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.notdef-outline.30,31,32,33.otf index fb145798c..b3aa75398 100644 Binary files a/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.default.30,31,32,33.otf and b/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.notdef-outline.30,31,32,33.otf differ diff --git a/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.notdef-outline.41,42,43.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.notdef-outline.41,42,43.otf new file mode 100644 index 000000000..bd5d4f0da Binary files /dev/null and b/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.notdef-outline.41,42,43.otf differ diff --git a/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.notdef-outline.retain-all-codepoint.otf similarity index 73% rename from test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.retain-gids.retain-all-codepoint.otf rename to test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.notdef-outline.retain-all-codepoint.otf index 62f074d0d..c60f4004d 100644 Binary files a/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.retain-gids.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.notdef-outline.retain-all-codepoint.otf differ diff --git a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.retain-gids.41,42,43,44,45,46,47,48,49.otf b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline-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.retain-gids.41,42,43,44,45,46,47,48,49.otf rename to test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline-retain-gids.41,42,43,44,45,46,47,48,49.otf diff --git a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.retain-gids.41,42,43,44,45,46,47.otf b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline-retain-gids.41,42,43,44,45,46,47.otf similarity index 100% rename from test/subset/data/expected/layout.gsub8/gsub8_manually_created.retain-gids.41,42,43,44,45,46,47.otf rename to test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline-retain-gids.41,42,43,44,45,46,47.otf diff --git a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.retain-gids.41,42,43,44,45,46,4D.otf b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline-retain-gids.41,42,43,44,45,46,4D.otf similarity index 100% rename from test/subset/data/expected/layout.gsub8/gsub8_manually_created.retain-gids.41,42,43,44,45,46,4D.otf rename to test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline-retain-gids.41,42,43,44,45,46,4D.otf diff --git a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.retain-gids.41,42,43,44,45,46,51.otf b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline-retain-gids.41,42,43,44,45,46,51.otf similarity index 100% rename from test/subset/data/expected/layout.gsub8/gsub8_manually_created.retain-gids.41,42,43,44,45,46,51.otf rename to test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline-retain-gids.41,42,43,44,45,46,51.otf diff --git a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.retain-gids.41,42,43,44,45,46.otf b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline-retain-gids.41,42,43,44,45,46.otf similarity index 100% rename from test/subset/data/expected/layout.gsub8/gsub8_manually_created.retain-gids.41,42,43,44,45,46.otf rename to test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline-retain-gids.41,42,43,44,45,46.otf diff --git a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.retain-gids.41,42,43.otf b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline-retain-gids.41,42,43.otf similarity index 100% rename from test/subset/data/expected/layout.gsub8/gsub8_manually_created.retain-gids.41,42,43.otf rename to test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline-retain-gids.41,42,43.otf diff --git a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.retain-gids.41.otf b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline-retain-gids.41.otf similarity index 100% rename from test/subset/data/expected/layout.gsub8/gsub8_manually_created.retain-gids.41.otf rename to test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline-retain-gids.41.otf diff --git a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.retain-gids.61.otf b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline-retain-gids.61.otf similarity index 100% rename from test/subset/data/expected/layout.gsub8/gsub8_manually_created.retain-gids.61.otf rename to test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline-retain-gids.61.otf diff --git a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.default.retain-all-codepoint.otf b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline-retain-gids.retain-all-codepoint.otf similarity index 100% rename from test/subset/data/expected/layout.gsub8/gsub8_manually_created.default.retain-all-codepoint.otf rename to test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline-retain-gids.retain-all-codepoint.otf diff --git a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.default.41,42,43,44,45,46,47,48,49.otf b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline.41,42,43,44,45,46,47,48,49.otf similarity index 100% rename from test/subset/data/expected/layout.gsub8/gsub8_manually_created.default.41,42,43,44,45,46,47,48,49.otf rename to test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline.41,42,43,44,45,46,47,48,49.otf diff --git a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.default.41,42,43,44,45,46,47.otf b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline.41,42,43,44,45,46,47.otf similarity index 100% rename from test/subset/data/expected/layout.gsub8/gsub8_manually_created.default.41,42,43,44,45,46,47.otf rename to test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline.41,42,43,44,45,46,47.otf diff --git a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.default.41,42,43,44,45,46,4D.otf b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline.41,42,43,44,45,46,4D.otf similarity index 100% rename from test/subset/data/expected/layout.gsub8/gsub8_manually_created.default.41,42,43,44,45,46,4D.otf rename to test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline.41,42,43,44,45,46,4D.otf diff --git a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.default.41,42,43,44,45,46,51.otf b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline.41,42,43,44,45,46,51.otf similarity index 100% rename from test/subset/data/expected/layout.gsub8/gsub8_manually_created.default.41,42,43,44,45,46,51.otf rename to test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline.41,42,43,44,45,46,51.otf diff --git a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.default.41,42,43,44,45,46.otf b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline.41,42,43,44,45,46.otf similarity index 100% rename from test/subset/data/expected/layout.gsub8/gsub8_manually_created.default.41,42,43,44,45,46.otf rename to test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline.41,42,43,44,45,46.otf diff --git a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.default.41,42,43.otf b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline.41,42,43.otf similarity index 100% rename from test/subset/data/expected/layout.gsub8/gsub8_manually_created.default.41,42,43.otf rename to test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline.41,42,43.otf diff --git a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.default.41.otf b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline.41.otf similarity index 100% rename from test/subset/data/expected/layout.gsub8/gsub8_manually_created.default.41.otf rename to test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline.41.otf diff --git a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.default.61.otf b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline.61.otf similarity index 100% rename from test/subset/data/expected/layout.gsub8/gsub8_manually_created.default.61.otf rename to test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline.61.otf diff --git a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline.retain-all-codepoint.otf similarity index 100% rename from test/subset/data/expected/layout.gsub8/gsub8_manually_created.retain-gids.retain-all-codepoint.otf rename to test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline.retain-all-codepoint.otf diff --git a/test/subset/data/expected/layout/Roboto-Regular.smallcaps.default.41,42,43.ttf b/test/subset/data/expected/layout/Roboto-Regular.smallcaps.default.41,42,43.ttf index 3e60a5860..99571a585 100644 Binary files a/test/subset/data/expected/layout/Roboto-Regular.smallcaps.default.41,42,43.ttf and b/test/subset/data/expected/layout/Roboto-Regular.smallcaps.default.41,42,43.ttf differ diff --git a/test/subset/data/expected/layout/Roboto-Regular.smallcaps.default.41,43.ttf b/test/subset/data/expected/layout/Roboto-Regular.smallcaps.default.41,43.ttf index 02c5b87f4..f961bd4b2 100644 Binary files a/test/subset/data/expected/layout/Roboto-Regular.smallcaps.default.41,43.ttf and b/test/subset/data/expected/layout/Roboto-Regular.smallcaps.default.41,43.ttf differ diff --git a/test/subset/data/expected/layout/Roboto-Regular.smallcaps.default.41.ttf b/test/subset/data/expected/layout/Roboto-Regular.smallcaps.default.41.ttf index 437d9b46a..e14133047 100644 Binary files a/test/subset/data/expected/layout/Roboto-Regular.smallcaps.default.41.ttf and b/test/subset/data/expected/layout/Roboto-Regular.smallcaps.default.41.ttf differ diff --git a/test/subset/data/expected/layout/Roboto-Regular.smallcaps.default.43.ttf b/test/subset/data/expected/layout/Roboto-Regular.smallcaps.default.43.ttf index 52c1bd1e2..3a53e252c 100644 Binary files a/test/subset/data/expected/layout/Roboto-Regular.smallcaps.default.43.ttf and b/test/subset/data/expected/layout/Roboto-Regular.smallcaps.default.43.ttf differ diff --git a/test/subset/data/expected/layout/Roboto-Regular.smallcaps.default.CA,CB.ttf b/test/subset/data/expected/layout/Roboto-Regular.smallcaps.default.CA,CB.ttf index 0bbac8d35..eccf07054 100644 Binary files a/test/subset/data/expected/layout/Roboto-Regular.smallcaps.default.CA,CB.ttf and b/test/subset/data/expected/layout/Roboto-Regular.smallcaps.default.CA,CB.ttf differ diff --git a/test/subset/data/expected/layout/Roboto-Regular.smallcaps.retain-gids.41,42,43.ttf b/test/subset/data/expected/layout/Roboto-Regular.smallcaps.retain-gids.41,42,43.ttf index 5f84010ad..1d75edf0a 100644 Binary files a/test/subset/data/expected/layout/Roboto-Regular.smallcaps.retain-gids.41,42,43.ttf and b/test/subset/data/expected/layout/Roboto-Regular.smallcaps.retain-gids.41,42,43.ttf differ diff --git a/test/subset/data/expected/layout/Roboto-Regular.smallcaps.retain-gids.41,43.ttf b/test/subset/data/expected/layout/Roboto-Regular.smallcaps.retain-gids.41,43.ttf index 889112281..9b3c91a04 100644 Binary files a/test/subset/data/expected/layout/Roboto-Regular.smallcaps.retain-gids.41,43.ttf and b/test/subset/data/expected/layout/Roboto-Regular.smallcaps.retain-gids.41,43.ttf differ diff --git a/test/subset/data/expected/layout/Roboto-Regular.smallcaps.retain-gids.41.ttf b/test/subset/data/expected/layout/Roboto-Regular.smallcaps.retain-gids.41.ttf index b76cfea33..31d612151 100644 Binary files a/test/subset/data/expected/layout/Roboto-Regular.smallcaps.retain-gids.41.ttf and b/test/subset/data/expected/layout/Roboto-Regular.smallcaps.retain-gids.41.ttf differ diff --git a/test/subset/data/expected/layout/Roboto-Regular.smallcaps.retain-gids.43.ttf b/test/subset/data/expected/layout/Roboto-Regular.smallcaps.retain-gids.43.ttf index af4fb3f27..116333418 100644 Binary files a/test/subset/data/expected/layout/Roboto-Regular.smallcaps.retain-gids.43.ttf and b/test/subset/data/expected/layout/Roboto-Regular.smallcaps.retain-gids.43.ttf differ diff --git a/test/subset/data/expected/layout/Roboto-Regular.smallcaps.retain-gids.CA,CB.ttf b/test/subset/data/expected/layout/Roboto-Regular.smallcaps.retain-gids.CA,CB.ttf index 3b68ba5a9..8cc0c8a32 100644 Binary files a/test/subset/data/expected/layout/Roboto-Regular.smallcaps.retain-gids.CA,CB.ttf and b/test/subset/data/expected/layout/Roboto-Regular.smallcaps.retain-gids.CA,CB.ttf differ diff --git a/test/subset/data/profiles/notdef-outline-desubroutinize-retain-gids.txt b/test/subset/data/profiles/notdef-outline-desubroutinize-retain-gids.txt new file mode 100644 index 000000000..864870592 --- /dev/null +++ b/test/subset/data/profiles/notdef-outline-desubroutinize-retain-gids.txt @@ -0,0 +1,3 @@ +--notdef-outline +--desubroutinize +--retain-gids diff --git a/test/subset/data/profiles/notdef-outline-desubroutinize.txt b/test/subset/data/profiles/notdef-outline-desubroutinize.txt new file mode 100644 index 000000000..c5f0ac5f4 --- /dev/null +++ b/test/subset/data/profiles/notdef-outline-desubroutinize.txt @@ -0,0 +1,2 @@ +--notdef-outline +--desubroutinize diff --git a/test/subset/data/profiles/notdef-outline-drop-hints-desubroutinize-retain-gids.txt b/test/subset/data/profiles/notdef-outline-drop-hints-desubroutinize-retain-gids.txt new file mode 100644 index 000000000..22236beb2 --- /dev/null +++ b/test/subset/data/profiles/notdef-outline-drop-hints-desubroutinize-retain-gids.txt @@ -0,0 +1,4 @@ +--notdef-outline +--no-hinting +--desubroutinize +--retain-gids diff --git a/test/subset/data/profiles/notdef-outline-drop-hints-desubroutinize.txt b/test/subset/data/profiles/notdef-outline-drop-hints-desubroutinize.txt new file mode 100644 index 000000000..a1fd78381 --- /dev/null +++ b/test/subset/data/profiles/notdef-outline-drop-hints-desubroutinize.txt @@ -0,0 +1,3 @@ +--notdef-outline +--no-hinting +--desubroutinize diff --git a/test/subset/data/profiles/notdef-outline-drop-hints-retain-gids.txt b/test/subset/data/profiles/notdef-outline-drop-hints-retain-gids.txt new file mode 100644 index 000000000..1f985912d --- /dev/null +++ b/test/subset/data/profiles/notdef-outline-drop-hints-retain-gids.txt @@ -0,0 +1,3 @@ +--notdef-outline +--no-hinting +--retain-gids diff --git a/test/subset/data/profiles/notdef-outline-drop-hints.txt b/test/subset/data/profiles/notdef-outline-drop-hints.txt new file mode 100644 index 000000000..10fb10cc1 --- /dev/null +++ b/test/subset/data/profiles/notdef-outline-drop-hints.txt @@ -0,0 +1,2 @@ +--notdef-outline +--no-hinting diff --git a/test/subset/data/profiles/notdef-outline-gids.txt b/test/subset/data/profiles/notdef-outline-gids.txt new file mode 100644 index 000000000..ab9c86a33 --- /dev/null +++ b/test/subset/data/profiles/notdef-outline-gids.txt @@ -0,0 +1,2 @@ +--notdef-outline +--gids=1,2,3 diff --git a/test/subset/data/profiles/notdef-outline-name-ids.txt b/test/subset/data/profiles/notdef-outline-name-ids.txt new file mode 100644 index 000000000..8f66494e7 --- /dev/null +++ b/test/subset/data/profiles/notdef-outline-name-ids.txt @@ -0,0 +1,2 @@ +--notdef-outline +--name-IDs=0,1,2 diff --git a/test/subset/data/profiles/notdef-outline-retain-gids.txt b/test/subset/data/profiles/notdef-outline-retain-gids.txt new file mode 100644 index 000000000..277308e9b --- /dev/null +++ b/test/subset/data/profiles/notdef-outline-retain-gids.txt @@ -0,0 +1,2 @@ +--notdef-outline +--retain-gids diff --git a/test/subset/data/tests/cff-full-font.tests b/test/subset/data/tests/cff-full-font.tests index 61d2ee915..babcacd34 100644 --- a/test/subset/data/tests/cff-full-font.tests +++ b/test/subset/data/tests/cff-full-font.tests @@ -2,14 +2,14 @@ FONTS: SourceSansPro-Regular.otf PROFILES: -default.txt -drop-hints.txt -drop-hints-retain-gids.txt -retain-gids.txt -desubroutinize.txt -desubroutinize-retain-gids.txt -drop-hints-desubroutinize.txt -drop-hints-desubroutinize-retain-gids.txt +notdef-outline.txt +notdef-outline-drop-hints.txt +notdef-outline-drop-hints-retain-gids.txt +notdef-outline-retain-gids.txt +notdef-outline-desubroutinize.txt +notdef-outline-desubroutinize-retain-gids.txt +notdef-outline-drop-hints-desubroutinize.txt +notdef-outline-drop-hints-desubroutinize-retain-gids.txt SUBSETS: abc diff --git a/test/subset/data/tests/cmap14.tests b/test/subset/data/tests/cmap14.tests index 0ed4fb878..abfec32d9 100644 --- a/test/subset/data/tests/cmap14.tests +++ b/test/subset/data/tests/cmap14.tests @@ -3,12 +3,12 @@ cmap14_font1.otf cmap14_font2.otf PROFILES: -default.txt -drop-hints.txt -drop-hints-retain-gids.txt -retain-gids.txt -name-ids.txt -gids.txt +notdef-outline.txt +notdef-outline-drop-hints.txt +notdef-outline-drop-hints-retain-gids.txt +notdef-outline-retain-gids.txt +notdef-outline-name-ids.txt +notdef-outline-gids.txt SUBSETS: 一丂七 diff --git a/test/subset/data/tests/layout.context.tests b/test/subset/data/tests/layout.context.tests index 5dab14af5..673bba734 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: -default.txt -retain-gids.txt +notdef-outline.txt +notdef-outline-retain-gids.txt SUBSETS: A diff --git a/test/subset/data/tests/layout.gdef-varstore.tests b/test/subset/data/tests/layout.gdef-varstore.tests index a3d7d9cb3..b3b7c03fc 100644 --- a/test/subset/data/tests/layout.gdef-varstore.tests +++ b/test/subset/data/tests/layout.gdef-varstore.tests @@ -2,9 +2,8 @@ FONTS: AdobeVFPrototype.otf PROFILES: -default.txt -drop-hints.txt -keep-gdef-gpos.txt +notdef-outline.txt +notdef-outline-drop-hints.txt SUBSETS: A diff --git a/test/subset/data/tests/layout.gpos.tests b/test/subset/data/tests/layout.gpos.tests index 6bbef228c..ef2384b12 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: -default.txt -retain-gids.txt +notdef-outline.txt +notdef-outline-retain-gids.txt SUBSETS: A diff --git a/test/subset/data/tests/layout.gpos2.tests b/test/subset/data/tests/layout.gpos2.tests index 0b333d115..6a07db9e4 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: -default.txt -retain-gids.txt +notdef-outline.txt +notdef-outline-retain-gids.txt SUBSETS: !# diff --git a/test/subset/data/tests/layout.gpos3.tests b/test/subset/data/tests/layout.gpos3.tests index 58436586b..9322b58df 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: -default.txt -retain-gids.txt +notdef-outline.txt +notdef-outline-retain-gids.txt SUBSETS: () diff --git a/test/subset/data/tests/layout.gpos4.tests b/test/subset/data/tests/layout.gpos4.tests index 49acd4a44..eace6c252 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: -default.txt -retain-gids.txt +notdef-outline.txt +notdef-outline-retain-gids.txt SUBSETS: A diff --git a/test/subset/data/tests/layout.gpos5.tests b/test/subset/data/tests/layout.gpos5.tests index 5d1cb5d87..12caf6abe 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: -default.txt -retain-gids.txt +notdef-outline.txt +notdef-outline-retain-gids.txt SUBSETS: A diff --git a/test/subset/data/tests/layout.gpos6.tests b/test/subset/data/tests/layout.gpos6.tests index fa3812dad..94cf8105f 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: -default.txt -retain-gids.txt +notdef-outline.txt +notdef-outline-retain-gids.txt SUBSETS: A diff --git a/test/subset/data/tests/layout.gpos8.tests b/test/subset/data/tests/layout.gpos8.tests index 988055411..7367ce3eb 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: -default.txt -retain-gids.txt +notdef-outline.txt +notdef-outline-retain-gids.txt SUBSETS: 0123 diff --git a/test/subset/data/tests/layout.gpos9.tests b/test/subset/data/tests/layout.gpos9.tests index e5f1fdc0b..0750ca079 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: -default.txt -retain-gids.txt +notdef-outline.txt +notdef-outline-retain-gids.txt SUBSETS: A diff --git a/test/subset/data/tests/layout.gsub5.tests b/test/subset/data/tests/layout.gsub5.tests index a08436598..f5610c4bf 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: -default.txt -retain-gids.txt +notdef-outline.txt +notdef-outline-retain-gids.txt SUBSETS: A diff --git a/test/subset/data/tests/layout.gsub6.tests b/test/subset/data/tests/layout.gsub6.tests index 344349b92..afd078193 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: -default.txt -retain-gids.txt +notdef-outline.txt +notdef-outline-retain-gids.txt SUBSETS: 0123 diff --git a/test/subset/data/tests/layout.gsub8.tests b/test/subset/data/tests/layout.gsub8.tests index 6bfc02a9a..f70d307ea 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: -default.txt -retain-gids.txt +notdef-outline.txt +notdef-outline-retain-gids.txt SUBSETS: a