[subset] prune redundant cmap12 subtables.
If the post subset cmap12 table is equivalent to another cmap subtable don't include the 12 table in the final subset. Matches change https://github.com/fonttools/fonttools/pull/2146 from fontTools.
diff --git a/src/hb-ot-cmap-table.hh b/src/hb-ot-cmap-table.hh
index 7c5d8d3..7593bf5 100644
--- a/src/hb-ot-cmap-table.hh
+++ b/src/hb-ot-cmap-table.hh
@@ -49,6 +49,12 @@
*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 @@
: 0;
}
+ unsigned get_language () const
+ {
+ return language;
+ }
+
struct accelerator_t
{
accelerator_t () {}
@@ -549,6 +560,12 @@
*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 @@
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 @@
}
}
+ 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<typename Iterator,
hb_requires (hb_is_iterator (Iterator))>
void serialize (hb_serialize_context_t *c,
@@ -1373,7 +1409,11 @@
(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 @@
HB_SERIALIZE_ERROR_INT_OVERFLOW);
}
+ template<typename Iterator, typename EncodingRecordIterator,
+ hb_requires (hb_is_iterator (Iterator)),
+ hb_requires (hb_is_iterator (EncodingRecordIterator))>
+ 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 7860f2f..073d461 100644
--- a/test/api/fonts/Roboto-Regular.D7,D8,D9,DA,DE.ttf
+++ b/test/api/fonts/Roboto-Regular.D7,D8,D9,DA,DE.ttf
Binary files differ
diff --git a/test/api/fonts/Roboto-Regular.abc.ttf b/test/api/fonts/Roboto-Regular.abc.ttf
index 705ec69..3d481e7 100644
--- a/test/api/fonts/Roboto-Regular.abc.ttf
+++ b/test/api/fonts/Roboto-Regular.abc.ttf
Binary files differ
diff --git a/test/api/fonts/Roboto-Regular.ac.ttf b/test/api/fonts/Roboto-Regular.ac.ttf
index 5a5e68e..b735a46 100644
--- a/test/api/fonts/Roboto-Regular.ac.ttf
+++ b/test/api/fonts/Roboto-Regular.ac.ttf
Binary files differ
diff --git a/test/subset/data/Makefile.am b/test/subset/data/Makefile.am
index 3117088..9a7d7a2 100644
--- a/test/subset/data/Makefile.am
+++ b/test/subset/data/Makefile.am
@@ -38,14 +38,16 @@
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 ccd47a0..deac417 100644
--- 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
Binary files 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 734dff7..1e100ea 100644
--- 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
Binary files 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 c338dfa..4eceb86 100644
--- a/test/subset/data/expected/basics/Roboto-Regular.abc.default.61.ttf
+++ b/test/subset/data/expected/basics/Roboto-Regular.abc.default.61.ttf
Binary files 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 a570373..b01c09d 100644
--- a/test/subset/data/expected/basics/Roboto-Regular.abc.default.62.ttf
+++ b/test/subset/data/expected/basics/Roboto-Regular.abc.default.62.ttf
Binary files 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 5b29833..a4c5f8a 100644
--- a/test/subset/data/expected/basics/Roboto-Regular.abc.default.63.ttf
+++ b/test/subset/data/expected/basics/Roboto-Regular.abc.default.63.ttf
Binary files 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 ccd47a0..deac417 100644
--- 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
Binary files 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 2afff63..7ea0947 100644
--- 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
Binary files 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 e6663ba..bbe7945 100644
--- 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
Binary files 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 668e228..3093254 100644
--- 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
Binary files 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 537b513..8be3e4e 100644
--- 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
Binary files 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 aafcd29..f99b2b4 100644
--- 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
Binary files 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 2afff63..7ea0947 100644
--- 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
Binary files 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 2afff63..7ea0947 100644
--- 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
Binary files 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 6478c43..c1f96a5 100644
--- 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
Binary files 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 668e228..3093254 100644
--- 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
Binary files 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 091730b..04ab800 100644
--- 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
Binary files 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 354ea48..0e91878 100644
--- 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
Binary files 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 2afff63..7ea0947 100644
--- 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
Binary files 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 ccd47a0..deac417 100644
--- 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
Binary files 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 ccd47a0..deac417 100644
--- 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
Binary files 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 ccd47a0..deac417 100644
--- a/test/subset/data/expected/basics/Roboto-Regular.abc.gids.61.ttf
+++ b/test/subset/data/expected/basics/Roboto-Regular.abc.gids.61.ttf
Binary files 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 ccd47a0..deac417 100644
--- a/test/subset/data/expected/basics/Roboto-Regular.abc.gids.62.ttf
+++ b/test/subset/data/expected/basics/Roboto-Regular.abc.gids.62.ttf
Binary files 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 ccd47a0..deac417 100644
--- a/test/subset/data/expected/basics/Roboto-Regular.abc.gids.63.ttf
+++ b/test/subset/data/expected/basics/Roboto-Regular.abc.gids.63.ttf
Binary files 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 ccd47a0..deac417 100644
--- 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
Binary files 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 ccd47a0..deac417 100644
--- 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
Binary files 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 734dff7..1e100ea 100644
--- 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
Binary files 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 c338dfa..4eceb86 100644
--- 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
Binary files 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 a570373..b01c09d 100644
--- 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
Binary files 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 5b29833..a4c5f8a 100644
--- 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
Binary files 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 ccd47a0..deac417 100644
--- 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
Binary files 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 ccd47a0..deac417 100644
--- 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
Binary files 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 734dff7..1e100ea 100644
--- 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
Binary files 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 c338dfa..4eceb86 100644
--- 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
Binary files 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 a570373..b01c09d 100644
--- 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
Binary files 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 5b29833..a4c5f8a 100644
--- 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
Binary files 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 ccd47a0..deac417 100644
--- 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
Binary files 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 ccd47a0..deac417 100644
--- 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
Binary files 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 734dff7..1e100ea 100644
--- 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
Binary files 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 c338dfa..4eceb86 100644
--- 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
Binary files 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 a570373..b01c09d 100644
--- 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
Binary files 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 5b29833..a4c5f8a 100644
--- 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
Binary files 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 ccd47a0..deac417 100644
--- 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
Binary files 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 ccd47a0..deac417 100644
--- 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
Binary files 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 734dff7..1e100ea 100644
--- 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
Binary files 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 c338dfa..4eceb86 100644
--- 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
Binary files 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 a570373..b01c09d 100644
--- 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
Binary files 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 5b29833..a4c5f8a 100644
--- 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
Binary files 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 ccd47a0..deac417 100644
--- 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
Binary files 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 ccd47a0..deac417 100644
--- 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
Binary files 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 734dff7..1e100ea 100644
--- 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
Binary files 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 c338dfa..4eceb86 100644
--- 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
Binary files 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 a570373..b01c09d 100644
--- 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
Binary files 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 5b29833..a4c5f8a 100644
--- 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
Binary files 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 ccd47a0..deac417 100644
--- 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
Binary files 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 ccd47a0..deac417 100644
--- 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
Binary files 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 734dff7..1e100ea 100644
--- 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
Binary files 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 c338dfa..4eceb86 100644
--- 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
Binary files 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 a570373..b01c09d 100644
--- 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
Binary files 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 5b29833..a4c5f8a 100644
--- 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
Binary files 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 ccd47a0..deac417 100644
--- 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
Binary files 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 ccd47a0..deac417 100644
--- 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
Binary files 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 734dff7..1e100ea 100644
--- 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
Binary files 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 abf6b10..a24ce31 100644
--- 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
Binary files 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 e4ab123..9e7490a 100644
--- 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
Binary files 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 d1acd4c..b59546b 100644
--- 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
Binary files 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 ccd47a0..deac417 100644
--- 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
Binary files 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 ccd47a0..deac417 100644
--- 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
Binary files 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 734dff7..1e100ea 100644
--- 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
Binary files 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 c338dfa..4eceb86 100644
--- 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
Binary files 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 a570373..b01c09d 100644
--- 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
Binary files 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 5b29833..a4c5f8a 100644
--- 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
Binary files 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 ccd47a0..deac417 100644
--- 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
Binary files 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 ccd47a0..deac417 100644
--- 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
Binary files 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 b5adb40..c939b00 100644
--- 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
Binary files 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 c338dfa..4eceb86 100644
--- 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
Binary files 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 78efd55..61118f7 100644
--- 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
Binary files 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 6317102..cd0ae5f 100644
--- 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
Binary files 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 ccd47a0..deac417 100644
--- 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
Binary files differ
diff --git a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.default.61,62,63.otf b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.default.61,62,63.otf
deleted file mode 100644
index c3e8be2..0000000
--- a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.default.61,62,63.otf
+++ /dev/null
Binary files differ
diff --git a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.default.D7,D8,D9,DA,DE.otf b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.default.D7,D8,D9,DA,DE.otf
deleted file mode 100644
index 01eda17..0000000
--- a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.default.D7,D8,D9,DA,DE.otf
+++ /dev/null
Binary files differ
diff --git a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.desubroutinize-retain-gids.61,62,63.otf b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.desubroutinize-retain-gids.61,62,63.otf
deleted file mode 100644
index 82f254b..0000000
--- a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.desubroutinize-retain-gids.61,62,63.otf
+++ /dev/null
Binary files differ
diff --git a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.desubroutinize.61,62,63.otf b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.desubroutinize.61,62,63.otf
deleted file mode 100644
index 8ae2b7a..0000000
--- a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.desubroutinize.61,62,63.otf
+++ /dev/null
Binary files differ
diff --git a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.desubroutinize.D7,D8,D9,DA,DE.otf b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.desubroutinize.D7,D8,D9,DA,DE.otf
deleted file mode 100644
index 3284231..0000000
--- a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.desubroutinize.D7,D8,D9,DA,DE.otf
+++ /dev/null
Binary files differ
diff --git a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-desubroutinize-retain-gids.61,62,63.otf b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-desubroutinize-retain-gids.61,62,63.otf
deleted file mode 100644
index a3eedd6..0000000
--- a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-desubroutinize-retain-gids.61,62,63.otf
+++ /dev/null
Binary files 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 c5cda7a..0000000
--- a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-desubroutinize.61,62,63.otf
+++ /dev/null
Binary files differ
diff --git a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-desubroutinize.D7,D8,D9,DA,DE.otf b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-desubroutinize.D7,D8,D9,DA,DE.otf
deleted file mode 100644
index da5abf4..0000000
--- a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-desubroutinize.D7,D8,D9,DA,DE.otf
+++ /dev/null
Binary files differ
diff --git a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-retain-gids.61,62,63.otf b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-retain-gids.61,62,63.otf
deleted file mode 100644
index 70b0e88..0000000
--- a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-retain-gids.61,62,63.otf
+++ /dev/null
Binary files differ
diff --git a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints.61,62,63.otf b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints.61,62,63.otf
deleted file mode 100644
index 8a5bf13..0000000
--- a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints.61,62,63.otf
+++ /dev/null
Binary files differ
diff --git a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints.D7,D8,D9,DA,DE.otf b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints.D7,D8,D9,DA,DE.otf
deleted file mode 100644
index e5ffbbf..0000000
--- a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints.D7,D8,D9,DA,DE.otf
+++ /dev/null
Binary files 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 97%
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 09bad7a..af76b6f 100644
--- 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
Binary files differ
diff --git a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.notdef-outline-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
new file mode 100644
index 0000000..794b731
--- /dev/null
+++ b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.notdef-outline-desubroutinize-retain-gids.61,62,63.otf
Binary files 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 1ce652f..1262041 100644
--- 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
Binary files 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 60c25cd..e1d9890 100644
--- 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
Binary files differ
diff --git a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.notdef-outline-desubroutinize.61,62,63.otf b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.notdef-outline-desubroutinize.61,62,63.otf
new file mode 100644
index 0000000..87d9c2e
--- /dev/null
+++ b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.notdef-outline-desubroutinize.61,62,63.otf
Binary files differ
diff --git a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.notdef-outline-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
new file mode 100644
index 0000000..d151f30
--- /dev/null
+++ b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.notdef-outline-desubroutinize.D7,D8,D9,DA,DE.otf
Binary files 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 ddf5bec..46c9b9a 100644
--- 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
Binary files differ
diff --git a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.notdef-outline-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
new file mode 100644
index 0000000..70a201b
--- /dev/null
+++ b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.notdef-outline-drop-hints-desubroutinize-retain-gids.61,62,63.otf
Binary files 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 0c87d19..a8fda90 100644
--- 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
Binary files 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 987cb50..d164e89 100644
--- 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
Binary files 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 0000000..5e6888b
--- /dev/null
+++ b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.notdef-outline-drop-hints-desubroutinize.61,62,63.otf
Binary files differ
diff --git a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.notdef-outline-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
new file mode 100644
index 0000000..ae442ac
--- /dev/null
+++ b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.notdef-outline-drop-hints-desubroutinize.D7,D8,D9,DA,DE.otf
Binary files 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 49f3dd0..158e58d 100644
--- 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
Binary files differ
diff --git a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.notdef-outline-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
new file mode 100644
index 0000000..7db40e8
--- /dev/null
+++ b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.notdef-outline-drop-hints-retain-gids.61,62,63.otf
Binary files 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 71989f7..15926dd 100644
--- 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
Binary files 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 1ec2e4a..090597d 100644
--- 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
Binary files differ
diff --git a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.notdef-outline-drop-hints.61,62,63.otf b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.notdef-outline-drop-hints.61,62,63.otf
new file mode 100644
index 0000000..63c59d5
--- /dev/null
+++ b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.notdef-outline-drop-hints.61,62,63.otf
Binary files differ
diff --git a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.notdef-outline-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
new file mode 100644
index 0000000..fb3c860
--- /dev/null
+++ b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.notdef-outline-drop-hints.D7,D8,D9,DA,DE.otf
Binary files 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 97%
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 9e041fa..fb8b6a7 100644
--- 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
Binary files differ
diff --git a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.notdef-outline-retain-gids.61,62,63.otf b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.notdef-outline-retain-gids.61,62,63.otf
new file mode 100644
index 0000000..1501382
--- /dev/null
+++ b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.notdef-outline-retain-gids.61,62,63.otf
Binary files 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 91667a4..25a5f8b 100644
--- 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
Binary files 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 151facb..c223625 100644
--- 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
Binary files differ
diff --git a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.notdef-outline.61,62,63.otf b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.notdef-outline.61,62,63.otf
new file mode 100644
index 0000000..a771430
--- /dev/null
+++ b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.notdef-outline.61,62,63.otf
Binary files differ
diff --git a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.notdef-outline.D7,D8,D9,DA,DE.otf b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.notdef-outline.D7,D8,D9,DA,DE.otf
new file mode 100644
index 0000000..32dfc0b
--- /dev/null
+++ b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.notdef-outline.D7,D8,D9,DA,DE.otf
Binary files differ
diff --git a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.retain-gids.61,62,63.otf b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.retain-gids.61,62,63.otf
deleted file mode 100644
index 6c1dd94..0000000
--- a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.retain-gids.61,62,63.otf
+++ /dev/null
Binary files 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 d663fa1..10ceb5d 100644
--- 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
Binary files 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 e44dcc3..91a78cb 100644
--- 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
Binary files 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 a80cb0f..9dac19c 100644
--- 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
Binary files 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 2df3d17..21907fb 100644
--- 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
Binary files 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 0924a59..2d1410e 100644
--- 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
Binary files 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 c833d64..5b2bc00 100644
--- 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
Binary files 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 75a59c0..ceb6e82 100644
--- 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
Binary files 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 07068fc..c9e742c 100644
--- 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
Binary files 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 814374c..522c56b 100644
--- 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
Binary files 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 3203594..a775949 100644
--- 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
Binary files 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 f7a94c8..a802370 100644
--- 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
Binary files 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 56cab73..16f898c 100644
--- 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
Binary files 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 9c4db1d..34dc264 100644
--- 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
Binary files 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 ba044c2..e72bfbe 100644
--- 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
Binary files 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 ee47ef5..d44479d 100644
--- 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
Binary files 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 93a08af..2e96e50 100644
--- 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
Binary files 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 db5737d..f1bd1e6 100644
--- 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
Binary files 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 ce49616..4f984f7 100644
--- 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
Binary files 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 f704517..99a6a54 100644
--- 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
Binary files 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 6086875..b0f53b1 100644
--- 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
Binary files 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 14bf663..f5703d1 100644
--- 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
Binary files 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 7a8d066..44fcce8 100644
--- 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
Binary files 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 2d891f4..a793d33 100644
--- 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
Binary files 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 ef649bf..8e7b7e8 100644
--- 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
Binary files 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 b85fb23..cb320f5 100644
--- 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
Binary files 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 84fdc54..338387d 100644
--- 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
Binary files 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 75cfc2d..778bb30 100644
--- 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
Binary files 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 69a81c3..2550d7b 100644
--- 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
Binary files 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 dda6119..5eb58ba 100644
--- 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
Binary files 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 68dddb6..a46ea0a 100644
--- 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
Binary files 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 f1e35df..2e4e40b 100644
--- 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
Binary files 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 28b1aab..cb06d82 100644
--- 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
Binary files 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 8414d1a..f32e927 100644
--- 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
Binary files 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 2c72a58..551eb53 100644
--- 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
Binary files 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 46c69ce..2001adf 100644
--- 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
Binary files 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 a50f30b..a289005 100644
--- 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
Binary files 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 fa5dd13..37e537f 100644
--- 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
Binary files 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 c43bc94..c60422d 100644
--- 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
Binary files 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 c3718a9..4c51ae1 100644
--- 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
Binary files 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 b3a5cae..95a69df 100644
--- 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
Binary files 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 b661334..0000000
--- 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
+++ /dev/null
Binary files 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 0fcc5e4..f2a225d 100644
--- a/test/subset/data/expected/cmap/AdobeBlank-Regular.default.61,62.ttf
+++ b/test/subset/data/expected/cmap/AdobeBlank-Regular.default.61,62.ttf
Binary files 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 0525822..fc5caf0 100644
--- 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
Binary files 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 6b65c18..743138d 100644
--- 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
Binary files 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 6206156..4772702 100644
--- 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
Binary files 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 dab5793..12c371b 100644
--- 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
Binary files 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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
diff --git a/test/subset/data/expected/colr/TwemojiMozilla.subset.default.32,3297,3299.ttf b/test/subset/data/expected/colr/TwemojiMozilla.subset.default.32,3297,3299.ttf
index 7d09649..52ff26e 100644
--- 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
Binary files 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 a909415..4cf1204 100644
--- a/test/subset/data/expected/colr/TwemojiMozilla.subset.default.32,3297.ttf
+++ b/test/subset/data/expected/colr/TwemojiMozilla.subset.default.32,3297.ttf
Binary files 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 2f1a11a..8264699 100644
--- a/test/subset/data/expected/colr/TwemojiMozilla.subset.default.32,3299.ttf
+++ b/test/subset/data/expected/colr/TwemojiMozilla.subset.default.32,3299.ttf
Binary files 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 d77db78..73bf728 100644
--- a/test/subset/data/expected/colr/TwemojiMozilla.subset.default.32.ttf
+++ b/test/subset/data/expected/colr/TwemojiMozilla.subset.default.32.ttf
Binary files 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 c489986..a58462f 100644
--- a/test/subset/data/expected/colr/TwemojiMozilla.subset.default.3297,3299.ttf
+++ b/test/subset/data/expected/colr/TwemojiMozilla.subset.default.3297,3299.ttf
Binary files 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 5028110..a2d55b1 100644
--- a/test/subset/data/expected/colr/TwemojiMozilla.subset.default.3297.ttf
+++ b/test/subset/data/expected/colr/TwemojiMozilla.subset.default.3297.ttf
Binary files 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 ad6511e..40fa0f6 100644
--- a/test/subset/data/expected/colr/TwemojiMozilla.subset.default.3299.ttf
+++ b/test/subset/data/expected/colr/TwemojiMozilla.subset.default.3299.ttf
Binary files 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 353218b..cf28202 100644
--- 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
Binary files 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 138251f..65fb468 100644
--- 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
Binary files 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 5a5a3d4..1a82c2d 100644
--- 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
Binary files 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 19c12c3..d98cb86 100644
--- 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
Binary files 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 14616ce..a8cb0ca 100644
--- 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
Binary files 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 58b3df9..ef4c1e7 100644
--- 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
Binary files 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 64aa0d7..6153060 100644
--- 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
Binary files 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 353218b..cf28202 100644
--- 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
Binary files 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 918d827..4036ac8 100644
--- 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
Binary files 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 aa67ab5..a1f9c0c 100644
--- 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
Binary files 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 19c12c3..d98cb86 100644
--- a/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints.32.ttf
+++ b/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints.32.ttf
Binary files 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 2bac4ba..473095a 100644
--- 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
Binary files 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 b2e34de..064ec09 100644
--- a/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints.3297.ttf
+++ b/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints.3297.ttf
Binary files 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 a55b0aa..cd2a509 100644
--- a/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints.3299.ttf
+++ b/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints.3299.ttf
Binary files 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 7d09649..52ff26e 100644
--- 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
Binary files 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 c329475..0e4444b 100644
--- 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
Binary files 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 c28ad2f..c96562e 100644
--- 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
Binary files 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 d77db78..73bf728 100644
--- a/test/subset/data/expected/colr/TwemojiMozilla.subset.retain-gids.32.ttf
+++ b/test/subset/data/expected/colr/TwemojiMozilla.subset.retain-gids.32.ttf
Binary files 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 90d1322..93c9725 100644
--- 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
Binary files 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 7077ac4..e281894 100644
--- a/test/subset/data/expected/colr/TwemojiMozilla.subset.retain-gids.3297.ttf
+++ b/test/subset/data/expected/colr/TwemojiMozilla.subset.retain-gids.3297.ttf
Binary files 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 d7e90b4..03c0b25 100644
--- a/test/subset/data/expected/colr/TwemojiMozilla.subset.retain-gids.3299.ttf
+++ b/test/subset/data/expected/colr/TwemojiMozilla.subset.retain-gids.3299.ttf
Binary files 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 2c470be..0000000
--- a/test/subset/data/expected/colrv1.notoemoji/NotoColrEmojiGlyf-Regular.subset.default.1f35e.ttf
+++ /dev/null
Binary files 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 5ba3a0f..0000000
--- a/test/subset/data/expected/colrv1.notoemoji/NotoColrEmojiGlyf-Regular.subset.default.1f696.ttf
+++ /dev/null
Binary files 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 a70156f..0000000
--- a/test/subset/data/expected/colrv1.notoemoji/NotoColrEmojiGlyf-Regular.subset.drop-hints-retain-gids.1f35e.ttf
+++ /dev/null
Binary files 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 96db2f9..0000000
--- a/test/subset/data/expected/colrv1.notoemoji/NotoColrEmojiGlyf-Regular.subset.drop-hints-retain-gids.1f696.ttf
+++ /dev/null
Binary files 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 2c470be..0000000
--- a/test/subset/data/expected/colrv1.notoemoji/NotoColrEmojiGlyf-Regular.subset.drop-hints.1f35e.ttf
+++ /dev/null
Binary files 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 5ba3a0f..0000000
--- a/test/subset/data/expected/colrv1.notoemoji/NotoColrEmojiGlyf-Regular.subset.drop-hints.1f696.ttf
+++ /dev/null
Binary files 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 a70156f..0000000
--- a/test/subset/data/expected/colrv1.notoemoji/NotoColrEmojiGlyf-Regular.subset.retain-gids.1f35e.ttf
+++ /dev/null
Binary files 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 96db2f9..0000000
--- a/test/subset/data/expected/colrv1.notoemoji/NotoColrEmojiGlyf-Regular.subset.retain-gids.1f696.ttf
+++ /dev/null
Binary files 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 424c6ba..0000000
--- a/test/subset/data/expected/colrv1/TestCOLRv1.default.E000,E004.ttf
+++ /dev/null
Binary files 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 d2778a2..0000000
--- a/test/subset/data/expected/colrv1/TestCOLRv1.default.E003,E004.ttf
+++ /dev/null
Binary files 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 ef769c7..0000000
--- a/test/subset/data/expected/colrv1/TestCOLRv1.default.E004.ttf
+++ /dev/null
Binary files 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 7cd14c4..0000000
--- a/test/subset/data/expected/colrv1/TestCOLRv1.default.retain-all-codepoint.ttf
+++ /dev/null
Binary files 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 819335b..0000000
--- a/test/subset/data/expected/colrv1/TestCOLRv1.drop-hints-retain-gids.E000,E004.ttf
+++ /dev/null
Binary files 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 7d1f333..0000000
--- a/test/subset/data/expected/colrv1/TestCOLRv1.drop-hints-retain-gids.E003,E004.ttf
+++ /dev/null
Binary files 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 451d665..0000000
--- a/test/subset/data/expected/colrv1/TestCOLRv1.drop-hints-retain-gids.E004.ttf
+++ /dev/null
Binary files 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 9bb3da5..0000000
--- a/test/subset/data/expected/colrv1/TestCOLRv1.drop-hints-retain-gids.retain-all-codepoint.ttf
+++ /dev/null
Binary files 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 eef68d7..0000000
--- a/test/subset/data/expected/colrv1/TestCOLRv1.drop-hints.E000,E004.ttf
+++ /dev/null
Binary files 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 e3cd398..0000000
--- a/test/subset/data/expected/colrv1/TestCOLRv1.drop-hints.E003,E004.ttf
+++ /dev/null
Binary files 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 e8dfae6..0000000
--- a/test/subset/data/expected/colrv1/TestCOLRv1.drop-hints.E004.ttf
+++ /dev/null
Binary files 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 9bb3da5..0000000
--- a/test/subset/data/expected/colrv1/TestCOLRv1.drop-hints.retain-all-codepoint.ttf
+++ /dev/null
Binary files 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 6e3f5fb..0000000
--- a/test/subset/data/expected/colrv1/TestCOLRv1.retain-gids.E000,E004.ttf
+++ /dev/null
Binary files 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 ee80313..0000000
--- a/test/subset/data/expected/colrv1/TestCOLRv1.retain-gids.E003,E004.ttf
+++ /dev/null
Binary files 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 32d69dc..0000000
--- a/test/subset/data/expected/colrv1/TestCOLRv1.retain-gids.E004.ttf
+++ /dev/null
Binary files 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 7cd14c4..0000000
--- a/test/subset/data/expected/colrv1/TestCOLRv1.retain-gids.retain-all-codepoint.ttf
+++ /dev/null
Binary files 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 f2773a6..4559b76 100644
--- 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
Binary files 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 e092024..8b1e5ee 100644
--- 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
Binary files 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 74bc0f2..075f1e9 100644
--- 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
Binary files 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 ed66673..0fb8b68 100644
--- 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
Binary files 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 fb2d0a4..3ff6d22 100644
--- 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
Binary files 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 a99f248..137ce7d 100644
--- 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
Binary files 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 f19c7f9..d51bdda 100644
--- 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
Binary files 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 0872ad8..a72633e 100644
--- 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
Binary files 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 66ac446..7223e12 100644
--- 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
Binary files 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 473125a..a31c2d1 100644
--- 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
Binary files 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 0872ad8..a72633e 100644
--- 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
Binary files 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 66ac446..7223e12 100644
--- 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
Binary files 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 6dba53a..5de1a62 100644
--- 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
Binary files 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 1ca0702..98612bf 100644
--- 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
Binary files 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 1591ed0..e0c1ee3 100644
--- 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
Binary files 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 7a8b916..cc62ad0 100644
--- 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
Binary files 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 fec3d6f..8da41d3 100644
--- a/test/subset/data/expected/japanese/Mplus1p-Regular.default.660E.ttf
+++ b/test/subset/data/expected/japanese/Mplus1p-Regular.default.660E.ttf
Binary files 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 b55dd90..79cb13b 100644
--- 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
Binary files 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 4c9ce65..1a6cc82 100644
--- 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
Binary files 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 ed75c7e..0c0e7eb 100644
--- 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
Binary files 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 87e1785..0742e08 100644
--- 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
Binary files 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 b00a523..172c9a3 100644
--- a/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.660E.ttf
+++ b/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.660E.ttf
Binary files 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 6dba53a..5de1a62 100644
--- 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
Binary files 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 1ca0702..98612bf 100644
--- 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
Binary files 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 1591ed0..e0c1ee3 100644
--- 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
Binary files 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 7a8b916..cc62ad0 100644
--- 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
Binary files 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 fec3d6f..8da41d3 100644
--- a/test/subset/data/expected/japanese/Mplus1p-Regular.keep-gdef.660E.ttf
+++ b/test/subset/data/expected/japanese/Mplus1p-Regular.keep-gdef.660E.ttf
Binary files 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.default.41,42,43.otf
deleted file mode 100644
index 07c369f..0000000
--- a/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.default.41,42,43.otf
+++ /dev/null
Binary files 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_context1_multiple_subrules_f1.default.41,42.otf
deleted file mode 100644
index aaa5f8d..0000000
--- a/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.default.41,42.otf
+++ /dev/null
Binary files 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.default.41,43.otf
deleted file mode 100644
index 3efeddb..0000000
--- a/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.default.41,43.otf
+++ /dev/null
Binary files 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_context1_multiple_subrules_f1.notdef-outline-retain-gids.41,42,43.otf
similarity index 68%
copy from test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.retain-gids.41,42,43.otf
copy to test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.notdef-outline-retain-gids.41,42,43.otf
index aefea2d..b7f5d25 100644
--- 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_context1_multiple_subrules_f1.notdef-outline-retain-gids.41,42,43.otf
Binary files 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_context1_multiple_subrules_f1.notdef-outline-retain-gids.41,42.otf
similarity index 66%
copy from test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.retain-gids.41,42.otf
copy to test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.notdef-outline-retain-gids.41,42.otf
index de726bb..38074b6 100644
--- 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_context1_multiple_subrules_f1.notdef-outline-retain-gids.41,42.otf
Binary files 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_context1_multiple_subrules_f1.notdef-outline-retain-gids.41,43.otf
similarity index 67%
copy from test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.retain-gids.41,43.otf
copy to test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.notdef-outline-retain-gids.41,43.otf
index fc5c462..a151e58 100644
--- 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_context1_multiple_subrules_f1.notdef-outline-retain-gids.41,43.otf
Binary files 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_context1_multiple_subrules_f1.notdef-outline-retain-gids.41.otf
similarity index 66%
copy from test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.retain-gids.41.otf
copy to test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.notdef-outline-retain-gids.41.otf
index 9aa438a..293aa5d 100644
--- a/test/subset/data/expected/layout.context/gpos_context1_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
Binary files 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-gids.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-gids.retain-all-codepoint.otf
index cea9338..f10ea98 100644
--- 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-gids.retain-all-codepoint.otf
Binary files differ
diff --git a/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.notdef-outline.41,42,43.otf b/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.notdef-outline.41,42,43.otf
new file mode 100644
index 0000000..1cb2e5a
--- /dev/null
+++ b/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.notdef-outline.41,42,43.otf
Binary files differ
diff --git a/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.notdef-outline.41,42.otf b/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.notdef-outline.41,42.otf
new file mode 100644
index 0000000..579f5b4
--- /dev/null
+++ b/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.notdef-outline.41,42.otf
Binary files differ
diff --git a/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.notdef-outline.41,43.otf b/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.notdef-outline.41,43.otf
new file mode 100644
index 0000000..dc70105
--- /dev/null
+++ b/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.notdef-outline.41,43.otf
Binary files 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 a2015f4..d7dd3c6 100644
--- 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
Binary files 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%
copy from test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.default.retain-all-codepoint.otf
copy to test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.notdef-outline.retain-all-codepoint.otf
index cea9338..f10ea98 100644
--- 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
Binary files 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.retain-gids.41,43.otf
deleted file mode 100644
index 8cb8d7f..0000000
--- a/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.retain-gids.41,43.otf
+++ /dev/null
Binary files 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.retain-gids.retain-all-codepoint.otf
deleted file mode 100644
index cea9338..0000000
--- a/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.retain-gids.retain-all-codepoint.otf
+++ /dev/null
Binary files 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.default.41,42,43.otf
deleted file mode 100644
index 112bfaf..0000000
--- a/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.default.41,42,43.otf
+++ /dev/null
Binary files 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_context2_multiple_subrules_f1.default.41,42.otf
deleted file mode 100644
index b842bf6..0000000
--- a/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.default.41,42.otf
+++ /dev/null
Binary files 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.default.41,43.otf
deleted file mode 100644
index 07918f0..0000000
--- a/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.default.41,43.otf
+++ /dev/null
Binary files 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 aefea2d..02b086c 100644
--- 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
Binary files 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 de726bb..82b5d44 100644
--- 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
Binary files 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 fc5c462..fc13f41 100644
--- 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
Binary files 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 9aa438a..0d0d2fa 100644
--- 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
Binary files 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-gids.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-gids.retain-all-codepoint.otf
index 9b69f2f..0c0b40e 100644
--- 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-gids.retain-all-codepoint.otf
Binary files differ
diff --git a/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.notdef-outline.41,42,43.otf b/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.notdef-outline.41,42,43.otf
new file mode 100644
index 0000000..8f6a33d
--- /dev/null
+++ b/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.notdef-outline.41,42,43.otf
Binary files differ
diff --git a/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.notdef-outline.41,42.otf b/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.notdef-outline.41,42.otf
new file mode 100644
index 0000000..e8c6354
--- /dev/null
+++ b/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.notdef-outline.41,42.otf
Binary files differ
diff --git a/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.notdef-outline.41,43.otf b/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.notdef-outline.41,43.otf
new file mode 100644
index 0000000..8900787
--- /dev/null
+++ b/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.notdef-outline.41,43.otf
Binary files 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 cca7a3a..753a81e 100644
--- 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
Binary files 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%
copy from test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.default.retain-all-codepoint.otf
copy to test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.notdef-outline.retain-all-codepoint.otf
index 9b69f2f..0c0b40e 100644
--- 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
Binary files 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_context2_multiple_subrules_f1.retain-gids.41,42,43.otf
deleted file mode 100644
index 4b9d2c3..0000000
--- a/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.retain-gids.41,42,43.otf
+++ /dev/null
Binary files 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_context2_multiple_subrules_f1.retain-gids.41,42.otf
deleted file mode 100644
index 99cad62..0000000
--- a/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.retain-gids.41,42.otf
+++ /dev/null
Binary files 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_context2_multiple_subrules_f1.retain-gids.41.otf
deleted file mode 100644
index 9b7aa23..0000000
--- a/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.retain-gids.41.otf
+++ /dev/null
Binary files 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.retain-gids.retain-all-codepoint.otf
deleted file mode 100644
index 9b69f2f..0000000
--- a/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.retain-gids.retain-all-codepoint.otf
+++ /dev/null
Binary files 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 3e789a2..0000000
--- a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.default.41,42,43.otf
+++ /dev/null
Binary files differ
diff --git a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.default.41,42.otf b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.default.41,42.otf
deleted file mode 100644
index f823009..0000000
--- a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.default.41,42.otf
+++ /dev/null
Binary files differ
diff --git a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.default.41,43.otf b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.default.41,43.otf
deleted file mode 100644
index affaf31..0000000
--- a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.default.41,43.otf
+++ /dev/null
Binary files differ
diff --git a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.default.41.otf b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.default.41.otf
deleted file mode 100644
index fcd2442..0000000
--- a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.default.41.otf
+++ /dev/null
Binary files 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.context/gpos_context3_simple_f1.notdef-outline-retain-gids.41,42,43.otf
similarity index 68%
copy from test/subset/data/expected/layout.gpos2/gpos2_1_font7.retain-gids.41,42,43.otf
copy to test/subset/data/expected/layout.context/gpos_context3_simple_f1.notdef-outline-retain-gids.41,42,43.otf
index 5f79056..9656a3a 100644
--- a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.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
Binary files differ
diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.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 69%
copy from test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,42.otf
copy to test/subset/data/expected/layout.context/gpos_context3_simple_f1.notdef-outline-retain-gids.41,42.otf
index fd8b8df..8e85d02 100644
--- a/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,42.otf
+++ b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.notdef-outline-retain-gids.41,42.otf
Binary files 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 0000000..69ad582
--- /dev/null
+++ b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.notdef-outline-retain-gids.41,43.otf
Binary files differ
diff --git a/test/subset/data/expected/layout.gpos/gpos1_2_font.retain-gids.41.otf b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.notdef-outline-retain-gids.41.otf
similarity index 67%
copy from test/subset/data/expected/layout.gpos/gpos1_2_font.retain-gids.41.otf
copy to test/subset/data/expected/layout.context/gpos_context3_simple_f1.notdef-outline-retain-gids.41.otf
index 479133b..bca36a0 100644
--- a/test/subset/data/expected/layout.gpos/gpos1_2_font.retain-gids.41.otf
+++ b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.notdef-outline-retain-gids.41.otf
Binary files 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 8ff6c80..1a91ae8 100644
--- 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
Binary files differ
diff --git a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.default.41,42,43.otf b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.notdef-outline.41,42,43.otf
similarity index 60%
copy from test/subset/data/expected/layout.gpos2/gpos2_2_font5.default.41,42,43.otf
copy to test/subset/data/expected/layout.context/gpos_context3_simple_f1.notdef-outline.41,42,43.otf
index e4ce9a8..3604e3b 100644
--- a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.default.41,42,43.otf
+++ b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.notdef-outline.41,42,43.otf
Binary files differ
diff --git a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.notdef-outline.41,42.otf b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.notdef-outline.41,42.otf
new file mode 100644
index 0000000..5546988
--- /dev/null
+++ b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.notdef-outline.41,42.otf
Binary files differ
diff --git a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.notdef-outline.41,43.otf b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.notdef-outline.41,43.otf
new file mode 100644
index 0000000..39dd5c4
--- /dev/null
+++ b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.notdef-outline.41,43.otf
Binary files differ
diff --git a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.notdef-outline.41.otf b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.notdef-outline.41.otf
new file mode 100644
index 0000000..802fe58
--- /dev/null
+++ b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.notdef-outline.41.otf
Binary files 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-all-codepoint.otf
similarity index 72%
copy from test/subset/data/expected/layout.context/gpos_context3_simple_f1.default.retain-all-codepoint.otf
copy to test/subset/data/expected/layout.context/gpos_context3_simple_f1.notdef-outline.retain-all-codepoint.otf
index 8ff6c80..1a91ae8 100644
--- 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-all-codepoint.otf
Binary files 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 94928e2..0000000
--- a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.retain-gids.41,42,43.otf
+++ /dev/null
Binary files 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.context/gpos_context3_simple_f1.retain-gids.41,42.otf
deleted file mode 100644
index 44a67f9..0000000
--- a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.retain-gids.41,42.otf
+++ /dev/null
Binary files 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 cc5e4d6..0000000
--- a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.retain-gids.41,43.otf
+++ /dev/null
Binary files differ
diff --git a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.retain-gids.41.otf b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.retain-gids.41.otf
deleted file mode 100644
index a9e37c5..0000000
--- a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.retain-gids.41.otf
+++ /dev/null
Binary files 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.retain-gids.retain-all-codepoint.otf
deleted file mode 100644
index 8ff6c80..0000000
--- a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.retain-gids.retain-all-codepoint.otf
+++ /dev/null
Binary files 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 14c975b..0000000
--- a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.keep-gdef-gpos.41,42,43,57.otf
+++ /dev/null
Binary files 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 b6b4ee5..0000000
--- a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.keep-gdef-gpos.41,42,43.otf
+++ /dev/null
Binary files 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 8ca1569..0000000
--- a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.keep-gdef-gpos.41,42.otf
+++ /dev/null
Binary files 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 0092ebf..0000000
--- a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.keep-gdef-gpos.41,56,57.otf
+++ /dev/null
Binary files 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 d34bfee..0000000
--- a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.keep-gdef-gpos.41.otf
+++ /dev/null
Binary files 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 0077291..0000000
--- a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.keep-gdef-gpos.42,57.otf
+++ /dev/null
Binary files 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
Binary files differ
diff --git a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.drop-hints.41,42,43.otf b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.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
Binary files differ
diff --git a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.drop-hints.41,42.otf b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.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
Binary files differ
diff --git a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.drop-hints.41,56,57.otf b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.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
Binary files differ
diff --git a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.drop-hints.41.otf b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.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
Binary files differ
diff --git a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.drop-hints.42,57.otf b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.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
Binary files differ
diff --git a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.default.41,42,43,57.otf b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.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
Binary files differ
diff --git a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.default.41,42,43.otf b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.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
Binary files differ
diff --git a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.default.41,42.otf b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.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
Binary files differ
diff --git a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.default.41,56,57.otf b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.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
Binary files differ
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
Binary files differ
diff --git a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.default.42,57.otf b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.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
Binary files differ
diff --git a/test/subset/data/expected/layout.gdef/Roboto-Regular.default.1E00,303.ttf b/test/subset/data/expected/layout.gdef/Roboto-Regular.default.1E00,303.ttf
index 137ae20..61a6dc7 100644
--- 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
Binary files 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 9e47f43..7518ffe 100644
--- a/test/subset/data/expected/layout.gdef/Roboto-Regular.default.303.ttf
+++ b/test/subset/data/expected/layout.gdef/Roboto-Regular.default.303.ttf
Binary files 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 7938c3e..92a4014 100644
--- 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
Binary files 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 b30d68e..19293e8 100644
--- a/test/subset/data/expected/layout.gdef/Roboto-Regular.default.323.ttf
+++ b/test/subset/data/expected/layout.gdef/Roboto-Regular.default.323.ttf
Binary files 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 c63169a..39a333a 100644
--- 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
Binary files 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 422fda9..9b3f8d5 100644
--- 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
Binary files 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 aee5b21..014c0e3 100644
--- 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
Binary files 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 14f345b..32b5f83 100644
--- 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
Binary files 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 67f6893..b25ce0f 100644
--- 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
Binary files 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 6ca653a..130912d 100644
--- 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
Binary files 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 137ae20..61a6dc7 100644
--- 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
Binary files 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 9e47f43..7518ffe 100644
--- 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
Binary files 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 7938c3e..92a4014 100644
--- 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
Binary files 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 b30d68e..19293e8 100644
--- 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
Binary files 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 c63169a..39a333a 100644
--- 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
Binary files 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.default.41,43.otf
deleted file mode 100644
index 7cca91a..0000000
--- a/test/subset/data/expected/layout.gpos/gpos1_2_font.default.41,43.otf
+++ /dev/null
Binary files differ
diff --git a/test/subset/data/expected/layout.gpos/gpos1_2_font.default.41.otf b/test/subset/data/expected/layout.gpos/gpos1_2_font.default.41.otf
deleted file mode 100644
index 7474205..0000000
--- a/test/subset/data/expected/layout.gpos/gpos1_2_font.default.41.otf
+++ /dev/null
Binary files 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.default.42,44.otf
deleted file mode 100644
index 22d78d8..0000000
--- a/test/subset/data/expected/layout.gpos/gpos1_2_font.default.42,44.otf
+++ /dev/null
Binary files 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.default.43,46.otf
deleted file mode 100644
index 4515413..0000000
--- a/test/subset/data/expected/layout.gpos/gpos1_2_font.default.43,46.otf
+++ /dev/null
Binary files 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 0000000..6335255
--- /dev/null
+++ b/test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline-retain-gids.41,43.otf
Binary files 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 3d85196..9c85081 100644
--- 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
Binary files 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 479133b..d3d6134 100644
--- 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
Binary files 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 1421454..69ea2e6 100644
--- 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
Binary files 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 03f29a9..7af14ce 100644
--- 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
Binary files 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 5ab69ff..0a1f63b 100644
--- 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
Binary files differ
diff --git a/test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline.41,43.otf b/test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline.41,43.otf
new file mode 100644
index 0000000..df4eea5
--- /dev/null
+++ b/test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline.41,43.otf
Binary files 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 83fa931..a4e9e14 100644
--- 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
Binary files differ
diff --git a/test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline.41.otf b/test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline.41.otf
new file mode 100644
index 0000000..95f5a24
--- /dev/null
+++ b/test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline.41.otf
Binary files differ
diff --git a/test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline.42,44.otf b/test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline.42,44.otf
new file mode 100644
index 0000000..faeea8f
--- /dev/null
+++ b/test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline.42,44.otf
Binary files differ
diff --git a/test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline.43,46.otf b/test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline.43,46.otf
new file mode 100644
index 0000000..8068d6e49
--- /dev/null
+++ b/test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline.43,46.otf
Binary files 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-all-codepoint.otf
similarity index 71%
copy from test/subset/data/expected/layout.gpos/gpos1_2_font.default.retain-all-codepoint.otf
copy to test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline.retain-all-codepoint.otf
index 5ab69ff..0a1f63b 100644
--- 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-all-codepoint.otf
Binary files 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 2d70e40..0000000
--- a/test/subset/data/expected/layout.gpos/gpos1_2_font.retain-gids.41,43.otf
+++ /dev/null
Binary files 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.retain-gids.retain-all-codepoint.otf
deleted file mode 100644
index 5ab69ff..0000000
--- a/test/subset/data/expected/layout.gpos/gpos1_2_font.retain-gids.retain-all-codepoint.otf
+++ /dev/null
Binary files 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_1_font7.default.21,23,25.otf
deleted file mode 100644
index 3466f9e..0000000
--- a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.default.21,23,25.otf
+++ /dev/null
Binary files 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_1_font7.default.21,23.otf
deleted file mode 100644
index edd10bf..0000000
--- a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.default.21,23.otf
+++ /dev/null
Binary files 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.default.2E,23.otf
deleted file mode 100644
index 3145da0..0000000
--- a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.default.2E,23.otf
+++ /dev/null
Binary files 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_1_font7.default.41,42,43.otf
deleted file mode 100644
index bbce3c3..0000000
--- a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.default.41,42,43.otf
+++ /dev/null
Binary files 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%
copy from test/subset/data/expected/layout.gpos2/gpos2_1_font7.retain-gids.21,23,25.otf
copy to test/subset/data/expected/layout.gpos2/gpos2_1_font7.notdef-outline-retain-gids.21,23,25.otf
index d13a1f9..7ccd2b0 100644
--- 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
Binary files differ
diff --git a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.notdef-outline-retain-gids.21,23.otf b/test/subset/data/expected/layout.gpos2/gpos2_1_font7.notdef-outline-retain-gids.21,23.otf
new file mode 100644
index 0000000..8e31a7c
--- /dev/null
+++ b/test/subset/data/expected/layout.gpos2/gpos2_1_font7.notdef-outline-retain-gids.21,23.otf
Binary files 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%
copy from test/subset/data/expected/layout.gpos2/gpos2_1_font7.retain-gids.2E,23.otf
copy to test/subset/data/expected/layout.gpos2/gpos2_1_font7.notdef-outline-retain-gids.2E,23.otf
index 84ae811..813257e 100644
--- 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
Binary files 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_1_font7.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_1_font7.notdef-outline-retain-gids.41,42,43.otf
index 5f79056..4a14a05 100644
--- a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.retain-gids.41,42,43.otf
+++ b/test/subset/data/expected/layout.gpos2/gpos2_1_font7.notdef-outline-retain-gids.41,42,43.otf
Binary files 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 021fd20..a879e07 100644
--- 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
Binary files differ
diff --git a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.notdef-outline.21,23,25.otf b/test/subset/data/expected/layout.gpos2/gpos2_1_font7.notdef-outline.21,23,25.otf
new file mode 100644
index 0000000..e771227
--- /dev/null
+++ b/test/subset/data/expected/layout.gpos2/gpos2_1_font7.notdef-outline.21,23,25.otf
Binary files differ
diff --git a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.notdef-outline.21,23.otf b/test/subset/data/expected/layout.gpos2/gpos2_1_font7.notdef-outline.21,23.otf
new file mode 100644
index 0000000..192c187
--- /dev/null
+++ b/test/subset/data/expected/layout.gpos2/gpos2_1_font7.notdef-outline.21,23.otf
Binary files 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_1_font7.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_1_font7.notdef-outline.2E,23.otf
index 8bf70b7..a0ca104 100644
--- a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.default.2E,23.otf
+++ b/test/subset/data/expected/layout.gpos2/gpos2_1_font7.notdef-outline.2E,23.otf
Binary files 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%
copy from test/subset/data/expected/layout.gpos2/gpos2_2_font5.default.41,42,43.otf
copy to test/subset/data/expected/layout.gpos2/gpos2_1_font7.notdef-outline.41,42,43.otf
index e4ce9a8..624274a 100644
--- 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
Binary files 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-all-codepoint.otf
similarity index 71%
copy from test/subset/data/expected/layout.gpos2/gpos2_1_font7.default.retain-all-codepoint.otf
copy to test/subset/data/expected/layout.gpos2/gpos2_1_font7.notdef-outline.retain-all-codepoint.otf
index 021fd20..a879e07 100644
--- 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-all-codepoint.otf
Binary files 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.retain-gids.21,23.otf
deleted file mode 100644
index 9859f61..0000000
--- a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.retain-gids.21,23.otf
+++ /dev/null
Binary files 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.retain-gids.retain-all-codepoint.otf
deleted file mode 100644
index 021fd20..0000000
--- a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.retain-gids.retain-all-codepoint.otf
+++ /dev/null
Binary files 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_2_font5.default.21,23,25.otf
deleted file mode 100644
index 36c09fe..0000000
--- a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.default.21,23,25.otf
+++ /dev/null
Binary files 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_2_font5.default.21,23.otf
deleted file mode 100644
index 98de06f..0000000
--- a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.default.21,23.otf
+++ /dev/null
Binary files 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_2_font5.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_2_font5.notdef-outline-retain-gids.21,23,25.otf
index d13a1f9..6273f83 100644
--- a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.retain-gids.21,23,25.otf
+++ b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.notdef-outline-retain-gids.21,23,25.otf
Binary files differ
diff --git a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.notdef-outline-retain-gids.21,23.otf b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.notdef-outline-retain-gids.21,23.otf
new file mode 100644
index 0000000..a09c28b
--- /dev/null
+++ b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.notdef-outline-retain-gids.21,23.otf
Binary files 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_2_font5.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_2_font5.notdef-outline-retain-gids.2E,23.otf
index 84ae811..c274246 100644
--- a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.retain-gids.2E,23.otf
+++ b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.notdef-outline-retain-gids.2E,23.otf
Binary files 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%
copy from test/subset/data/expected/layout.gpos2/gpos2_1_font7.retain-gids.41,42,43.otf
copy to test/subset/data/expected/layout.gpos2/gpos2_2_font5.notdef-outline-retain-gids.41,42,43.otf
index 5f79056..a3511fb 100644
--- 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
Binary files 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 4f5bb49..1f8138d 100644
--- 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
Binary files differ
diff --git a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.notdef-outline.21,23,25.otf b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.notdef-outline.21,23,25.otf
new file mode 100644
index 0000000..676810a
--- /dev/null
+++ b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.notdef-outline.21,23,25.otf
Binary files differ
diff --git a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.notdef-outline.21,23.otf b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.notdef-outline.21,23.otf
new file mode 100644
index 0000000..646c880
--- /dev/null
+++ b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.notdef-outline.21,23.otf
Binary files 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%
copy from test/subset/data/expected/layout.gpos2/gpos2_2_font5.default.2E,23.otf
copy to test/subset/data/expected/layout.gpos2/gpos2_2_font5.notdef-outline.2E,23.otf
index 8bf70b7..3c528b0 100644
--- 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
Binary files 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_2_font5.notdef-outline.41,42,43.otf
similarity index 60%
copy from test/subset/data/expected/layout.gpos2/gpos2_2_font5.default.41,42,43.otf
copy to test/subset/data/expected/layout.gpos2/gpos2_2_font5.notdef-outline.41,42,43.otf
index e4ce9a8..fbfc690 100644
--- a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.default.41,42,43.otf
+++ b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.notdef-outline.41,42,43.otf
Binary files 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-all-codepoint.otf
similarity index 71%
copy from test/subset/data/expected/layout.gpos2/gpos2_2_font5.default.retain-all-codepoint.otf
copy to test/subset/data/expected/layout.gpos2/gpos2_2_font5.notdef-outline.retain-all-codepoint.otf
index 4f5bb49..1f8138d 100644
--- 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-all-codepoint.otf
Binary files 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.retain-gids.21,23,25.otf
deleted file mode 100644
index e50dd2e..0000000
--- a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.retain-gids.21,23,25.otf
+++ /dev/null
Binary files 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.retain-gids.21,23.otf
deleted file mode 100644
index 4febba4..0000000
--- a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.retain-gids.21,23.otf
+++ /dev/null
Binary files 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.retain-gids.2E,23.otf
deleted file mode 100644
index abb24a4..0000000
--- a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.retain-gids.2E,23.otf
+++ /dev/null
Binary files 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.gpos2/gpos2_2_font5.retain-gids.41,42,43.otf
deleted file mode 100644
index 589fc9d..0000000
--- a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.retain-gids.41,42,43.otf
+++ /dev/null
Binary files 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.retain-gids.retain-all-codepoint.otf
deleted file mode 100644
index 4f5bb49..0000000
--- a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.retain-gids.retain-all-codepoint.otf
+++ /dev/null
Binary files 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.default.28,29.otf
deleted file mode 100644
index ce5077a..0000000
--- a/test/subset/data/expected/layout.gpos3/gpos3_font3.default.28,29.otf
+++ /dev/null
Binary files 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.default.28,2B.otf
deleted file mode 100644
index 2c49c55..0000000
--- a/test/subset/data/expected/layout.gpos3/gpos3_font3.default.28,2B.otf
+++ /dev/null
Binary files 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.default.29,2B.otf
deleted file mode 100644
index aba9f43..0000000
--- a/test/subset/data/expected/layout.gpos3/gpos3_font3.default.29,2B.otf
+++ /dev/null
Binary files differ
diff --git a/test/subset/data/expected/layout.gpos3/gpos3_font3.default.41,42,43.otf b/test/subset/data/expected/layout.gpos3/gpos3_font3.default.41,42,43.otf
deleted file mode 100644
index 85da4e8..0000000
--- a/test/subset/data/expected/layout.gpos3/gpos3_font3.default.41,42,43.otf
+++ /dev/null
Binary files 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 86efd18..f6b65bc 100644
--- 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
Binary files 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 8223340..0046eae 100644
--- 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
Binary files 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 752ef88..43861c8 100644
--- 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
Binary files differ
diff --git a/test/subset/data/expected/layout.gpos3/gpos3_font3.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 69%
rename from test/subset/data/expected/layout.gpos3/gpos3_font3.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 35ddbea..5b19740 100644
--- a/test/subset/data/expected/layout.gpos3/gpos3_font3.retain-gids.41,42,43.otf
+++ b/test/subset/data/expected/layout.gpos3/gpos3_font3.notdef-outline-retain-gids.41,42,43.otf
Binary files 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 07a2c02..964d7ac 100644
--- 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
Binary files differ
diff --git a/test/subset/data/expected/layout.gpos3/gpos3_font3.notdef-outline.28,29.otf b/test/subset/data/expected/layout.gpos3/gpos3_font3.notdef-outline.28,29.otf
new file mode 100644
index 0000000..9524fee
--- /dev/null
+++ b/test/subset/data/expected/layout.gpos3/gpos3_font3.notdef-outline.28,29.otf
Binary files differ
diff --git a/test/subset/data/expected/layout.gpos3/gpos3_font3.notdef-outline.28,2B.otf b/test/subset/data/expected/layout.gpos3/gpos3_font3.notdef-outline.28,2B.otf
new file mode 100644
index 0000000..3e14ed2
--- /dev/null
+++ b/test/subset/data/expected/layout.gpos3/gpos3_font3.notdef-outline.28,2B.otf
Binary files differ
diff --git a/test/subset/data/expected/layout.gpos3/gpos3_font3.notdef-outline.29,2B.otf b/test/subset/data/expected/layout.gpos3/gpos3_font3.notdef-outline.29,2B.otf
new file mode 100644
index 0000000..81b7311
--- /dev/null
+++ b/test/subset/data/expected/layout.gpos3/gpos3_font3.notdef-outline.29,2B.otf
Binary files differ
diff --git a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.default.41,42,43.otf b/test/subset/data/expected/layout.gpos3/gpos3_font3.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.gpos3/gpos3_font3.notdef-outline.41,42,43.otf
index e4ce9a8..f50d8f3 100644
--- a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.default.41,42,43.otf
+++ b/test/subset/data/expected/layout.gpos3/gpos3_font3.notdef-outline.41,42,43.otf
Binary files 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-all-codepoint.otf
similarity index 72%
copy from test/subset/data/expected/layout.gpos3/gpos3_font3.default.retain-all-codepoint.otf
copy to test/subset/data/expected/layout.gpos3/gpos3_font3.notdef-outline.retain-all-codepoint.otf
index 07a2c02..964d7ac 100644
--- 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-all-codepoint.otf
Binary files 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.retain-gids.retain-all-codepoint.otf
deleted file mode 100644
index 07a2c02..0000000
--- a/test/subset/data/expected/layout.gpos3/gpos3_font3.retain-gids.retain-all-codepoint.otf
+++ /dev/null
Binary files 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.gpos4/gpos4_multiple_anchors_1.default.41,42,43,44.otf
deleted file mode 100644
index 86d04fa..0000000
--- a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41,42,43,44.otf
+++ /dev/null
Binary files 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.gpos4/gpos4_multiple_anchors_1.default.41,42,43,45.otf
deleted file mode 100644
index 2aeb49a..0000000
--- a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41,42,43,45.otf
+++ /dev/null
Binary files 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 3fee4ba..0000000
--- a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41,42,43.otf
+++ /dev/null
Binary files differ
diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41,42.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41,42.otf
deleted file mode 100644
index 6e08e2f..0000000
--- a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41,42.otf
+++ /dev/null
Binary files 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.gpos4/gpos4_multiple_anchors_1.default.41,43,44,45,46.otf
deleted file mode 100644
index 68e7ade..0000000
--- a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41,43,44,45,46.otf
+++ /dev/null
Binary files 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.gpos4/gpos4_multiple_anchors_1.default.41,43,44.otf
deleted file mode 100644
index 33f8192..0000000
--- a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41,43,44.otf
+++ /dev/null
Binary files 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.default.41,43,45.otf
deleted file mode 100644
index 704a18b..0000000
--- a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41,43,45.otf
+++ /dev/null
Binary files 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.default.41,43.otf
deleted file mode 100644
index 1ae460f..0000000
--- a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41,43.otf
+++ /dev/null
Binary files 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 ab494c5..0000000
--- a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41.otf
+++ /dev/null
Binary files 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.gpos4/gpos4_multiple_anchors_1.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.gpos4/gpos4_multiple_anchors_1.notdef-outline-retain-gids.41,42,43,44.otf
index 6989f92..7b66002 100644
--- a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.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
Binary files 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 8bbc09b..b8d94c8 100644
--- 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
Binary files 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.gpos4/gpos4_multiple_anchors_1.notdef-outline-retain-gids.41,42,43.otf
similarity index 68%
copy from test/subset/data/expected/layout.gpos2/gpos2_1_font7.retain-gids.41,42,43.otf
copy to test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline-retain-gids.41,42,43.otf
index 5f79056..ef39548 100644
--- a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.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
Binary files 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 69%
copy from test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,42.otf
copy to test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline-retain-gids.41,42.otf
index fd8b8df..2f33566 100644
--- 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
Binary files 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%
copy from test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,43,44,45,46.otf
copy to test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline-retain-gids.41,43,44,45,46.otf
index cbc942f..3b67d7e 100644
--- 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
Binary files 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.gpos4/gpos4_multiple_anchors_1.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.gpos4/gpos4_multiple_anchors_1.notdef-outline-retain-gids.41,43,44.otf
index 6d17cb1..2537190 100644
--- a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.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
Binary files 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 69%
copy from test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,43,45.otf
copy to test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline-retain-gids.41,43,45.otf
index c084e40..1ebf76c 100644
--- 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
Binary files 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 0000000..e06fa77
--- /dev/null
+++ b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline-retain-gids.41,43.otf
Binary files differ
diff --git a/test/subset/data/expected/layout.gpos/gpos1_2_font.retain-gids.41.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline-retain-gids.41.otf
similarity index 67%
copy from test/subset/data/expected/layout.gpos/gpos1_2_font.retain-gids.41.otf
copy to test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline-retain-gids.41.otf
index 479133b..6f27cec 100644
--- a/test/subset/data/expected/layout.gpos/gpos1_2_font.retain-gids.41.otf
+++ b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline-retain-gids.41.otf
Binary files 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 4711588..427a26c 100644
--- 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
Binary files 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 63%
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 f0f6cb5..3ca55c4 100644
--- 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
Binary files differ
diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline.41,42,43,45.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline.41,42,43,45.otf
new file mode 100644
index 0000000..e84bb48
--- /dev/null
+++ b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline.41,42,43,45.otf
Binary files differ
diff --git a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.default.41,42,43.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline.41,42,43.otf
similarity index 60%
copy from test/subset/data/expected/layout.gpos2/gpos2_2_font5.default.41,42,43.otf
copy to test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline.41,42,43.otf
index e4ce9a8..45c30e6 100644
--- a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.default.41,42,43.otf
+++ b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline.41,42,43.otf
Binary files differ
diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline.41,42.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline.41,42.otf
new file mode 100644
index 0000000..3f8f1d0
--- /dev/null
+++ b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline.41,42.otf
Binary files 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 68%
copy from test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,43,44,45,46.otf
copy to test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline.41,43,44,45,46.otf
index e724a7c..47787d8 100644
--- 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
Binary files 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 64%
copy from test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,43,44.otf
copy to test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline.41,43,44.otf
index 4bb9664..964784e 100644
--- 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
Binary files differ
diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,43,45.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline.41,43,45.otf
similarity index 63%
rename from test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,43,45.otf
rename to test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline.41,43,45.otf
index b2e6324..9499c01 100644
--- a/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,43,45.otf
+++ b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline.41,43,45.otf
Binary files differ
diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline.41,43.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline.41,43.otf
new file mode 100644
index 0000000..437d0a0
--- /dev/null
+++ b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline.41,43.otf
Binary files differ
diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline.41.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline.41.otf
new file mode 100644
index 0000000..f56aff0
--- /dev/null
+++ b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline.41.otf
Binary files 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-all-codepoint.otf
similarity index 72%
copy from test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.retain-all-codepoint.otf
copy to test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline.retain-all-codepoint.otf
index 4711588..427a26c 100644
--- 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-all-codepoint.otf
Binary files 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 3e7a75a..0000000
--- a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41,42,43.otf
+++ /dev/null
Binary files 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.gpos4/gpos4_multiple_anchors_1.retain-gids.41,42.otf
deleted file mode 100644
index 1d2bd04..0000000
--- a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41,42.otf
+++ /dev/null
Binary files 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.gpos4/gpos4_multiple_anchors_1.retain-gids.41,43,44,45,46.otf
deleted file mode 100644
index d14c3ac..0000000
--- a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41,43,44,45,46.otf
+++ /dev/null
Binary files 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.gpos4/gpos4_multiple_anchors_1.retain-gids.41,43,45.otf
deleted file mode 100644
index 2cd9693..0000000
--- a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41,43,45.otf
+++ /dev/null
Binary files 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 d9e4a43..0000000
--- a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41,43.otf
+++ /dev/null
Binary files 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 c6b0867..0000000
--- a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41.otf
+++ /dev/null
Binary files 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.retain-gids.retain-all-codepoint.otf
deleted file mode 100644
index 4711588..0000000
--- a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.retain-all-codepoint.otf
+++ /dev/null
Binary files 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.default.41,42,43,45.otf
deleted file mode 100644
index 4928a45..0000000
--- a/test/subset/data/expected/layout.gpos5/gpos5_font1.default.41,42,43,45.otf
+++ /dev/null
Binary files 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.default.41,42.otf
deleted file mode 100644
index f2ae28f..0000000
--- a/test/subset/data/expected/layout.gpos5/gpos5_font1.default.41,42.otf
+++ /dev/null
Binary files 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.default.41,43.otf
deleted file mode 100644
index ab910d2..0000000
--- a/test/subset/data/expected/layout.gpos5/gpos5_font1.default.41,43.otf
+++ /dev/null
Binary files differ
diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.default.41.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.default.41.otf
deleted file mode 100644
index a553674..0000000
--- a/test/subset/data/expected/layout.gpos5/gpos5_font1.default.41.otf
+++ /dev/null
Binary files 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 89265a8..0000000
--- a/test/subset/data/expected/layout.gpos5/gpos5_font1.default.42.otf
+++ /dev/null
Binary files 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 7e90f5f..9c9960d 100644
--- 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
Binary files 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 978928c..25cf8eb 100644
--- 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
Binary files 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 a719416..b2fdae4 100644
--- 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
Binary files 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 9a7a94a..ab4813a 100644
--- 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
Binary files 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 75af4be..7fa3691 100644
--- 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
Binary files 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 fa1ab93..2e0de5d 100644
--- 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
Binary files 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 0000000..a672a81
--- /dev/null
+++ b/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline-retain-gids.41,43.otf
Binary files 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 7725039..7e4c1b0 100644
--- 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
Binary files 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 5b03ee6..6633603 100644
--- 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
Binary files 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-gids.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-gids.retain-all-codepoint.otf
index 3ccdb11..e0ddb19 100644
--- 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-gids.retain-all-codepoint.otf
Binary files 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 bf6e9d9..ed4636b 100644
--- 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
Binary files differ
diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline.41,42,43,45.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline.41,42,43,45.otf
new file mode 100644
index 0000000..5679396
--- /dev/null
+++ b/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline.41,42,43,45.otf
Binary files 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 dd16e1d..597677f 100644
--- 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
Binary files 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 0a0bfa9..a543ea1 100644
--- 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
Binary files 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 29926a1..09cc365 100644
--- 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
Binary files differ
diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline.41,42.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline.41,42.otf
new file mode 100644
index 0000000..e41f406
--- /dev/null
+++ b/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline.41,42.otf
Binary files differ
diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline.41,43.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline.41,43.otf
new file mode 100644
index 0000000..eacd140
--- /dev/null
+++ b/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline.41,43.otf
Binary files differ
diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline.41.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline.41.otf
new file mode 100644
index 0000000..75b255b
--- /dev/null
+++ b/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline.41.otf
Binary files 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 0000000..46f59f5
--- /dev/null
+++ b/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline.42.otf
Binary files 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-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-all-codepoint.otf
index 3ccdb11..e0ddb19 100644
--- 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-all-codepoint.otf
Binary files 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 bbf99a6..0000000
--- a/test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.41,43.otf
+++ /dev/null
Binary files differ
diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,42,43,45.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,42,43,45.otf
deleted file mode 100644
index cbf669c..0000000
--- a/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,42,43,45.otf
+++ /dev/null
Binary files differ
diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,42,43.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,42,43.otf
deleted file mode 100644
index 6b0b43a..0000000
--- a/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,42,43.otf
+++ /dev/null
Binary files differ
diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,42.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,42.otf
deleted file mode 100644
index da9998d..0000000
--- a/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,42.otf
+++ /dev/null
Binary files differ
diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,43.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,43.otf
deleted file mode 100644
index 9533698..0000000
--- a/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,43.otf
+++ /dev/null
Binary files differ
diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41.otf
deleted file mode 100644
index 6785e68..0000000
--- a/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41.otf
+++ /dev/null
Binary files 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.gpos6/gpos6_font1.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.gpos6/gpos6_font1.notdef-outline-retain-gids.41,42,43,44.otf
index e8120ed..3d40cc8 100644
--- a/test/subset/data/expected/layout.gpos6/gpos6_font1.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
Binary files 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 4dfae0c..7a5ec32 100644
--- 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
Binary files differ
diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,42,43.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.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.gpos6/gpos6_font1.notdef-outline-retain-gids.41,42,43.otf
index 333f789..2e01bc7 100644
--- a/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,42,43.otf
+++ b/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline-retain-gids.41,42,43.otf
Binary files differ
diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,42.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline-retain-gids.41,42.otf
similarity index 69%
copy from test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,42.otf
copy to test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline-retain-gids.41,42.otf
index fd8b8df..0dbdfeb 100644
--- a/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,42.otf
+++ b/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline-retain-gids.41,42.otf
Binary files 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.gpos6/gpos6_font1.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.gpos6/gpos6_font1.notdef-outline-retain-gids.41,43,44,45,46.otf
index cbc942f..e18c27c 100644
--- a/test/subset/data/expected/layout.gpos6/gpos6_font1.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
Binary files differ
diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.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 71%
rename from test/subset/data/expected/layout.gpos6/gpos6_font1.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 050d42a..dd1762b 100644
--- a/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,43,44.otf
+++ b/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline-retain-gids.41,43,44.otf
Binary files differ
diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.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 70%
rename from test/subset/data/expected/layout.gpos6/gpos6_font1.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 c084e40..4935b43 100644
--- a/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,43,45.otf
+++ b/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline-retain-gids.41,43,45.otf
Binary files 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 0000000..55d5770
--- /dev/null
+++ b/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline-retain-gids.41,43.otf
Binary files differ
diff --git a/test/subset/data/expected/layout.gpos/gpos1_2_font.retain-gids.41.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline-retain-gids.41.otf
similarity index 67%
copy from test/subset/data/expected/layout.gpos/gpos1_2_font.retain-gids.41.otf
copy to test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline-retain-gids.41.otf
index 479133b..07e1b61 100644
--- a/test/subset/data/expected/layout.gpos/gpos1_2_font.retain-gids.41.otf
+++ b/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline-retain-gids.41.otf
Binary files 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 4221ffd..8969b7b 100644
--- 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
Binary files differ
diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,42,43,44.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline.41,42,43,44.otf
similarity index 63%
copy from test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,42,43,44.otf
copy to test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline.41,42,43,44.otf
index f0f6cb5..c672d91 100644
--- a/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,42,43,44.otf
+++ b/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline.41,42,43,44.otf
Binary files differ
diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline.41,42,43,45.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline.41,42,43,45.otf
new file mode 100644
index 0000000..90dfc64
--- /dev/null
+++ b/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline.41,42,43,45.otf
Binary files differ
diff --git a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.default.41,42,43.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline.41,42,43.otf
similarity index 60%
copy from test/subset/data/expected/layout.gpos2/gpos2_2_font5.default.41,42,43.otf
copy to test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline.41,42,43.otf
index e4ce9a8..0802284 100644
--- a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.default.41,42,43.otf
+++ b/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline.41,42,43.otf
Binary files differ
diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline.41,42.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline.41,42.otf
new file mode 100644
index 0000000..ff5a777
--- /dev/null
+++ b/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline.41,42.otf
Binary files 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.gpos6/gpos6_font1.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.gpos6/gpos6_font1.notdef-outline.41,43,44,45,46.otf
index e724a7c..de08a47 100644
--- a/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,43,44,45,46.otf
+++ b/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline.41,43,44,45,46.otf
Binary files differ
diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,43,44.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.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.gpos6/gpos6_font1.notdef-outline.41,43,44.otf
index 4bb9664..17838ee 100644
--- a/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,43,44.otf
+++ b/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline.41,43,44.otf
Binary files 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 63%
copy from test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,43,45.otf
copy to test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline.41,43,45.otf
index b2e6324..83f13b2 100644
--- 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
Binary files differ
diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline.41,43.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline.41,43.otf
new file mode 100644
index 0000000..0653efd
--- /dev/null
+++ b/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline.41,43.otf
Binary files differ
diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline.41.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline.41.otf
new file mode 100644
index 0000000..624e731
--- /dev/null
+++ b/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline.41.otf
Binary files 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-all-codepoint.otf
similarity index 72%
copy from test/subset/data/expected/layout.gpos6/gpos6_font1.default.retain-all-codepoint.otf
copy to test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline.retain-all-codepoint.otf
index 4221ffd..8969b7b 100644
--- 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-all-codepoint.otf
Binary files 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 da1e55d..0000000
--- a/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,43.otf
+++ /dev/null
Binary files differ
diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41.otf
deleted file mode 100644
index ad52c46..0000000
--- a/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41.otf
+++ /dev/null
Binary files 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.retain-gids.retain-all-codepoint.otf
deleted file mode 100644
index 4221ffd..0000000
--- a/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.retain-all-codepoint.otf
+++ /dev/null
Binary files 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 aa833dc..b00ee9b 100644
--- 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
Binary files 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 49b29d5..87738c7 100644
--- 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
Binary files 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 520f514..f18296e 100644
--- 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
Binary files 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 41c919a..f381efc 100644
--- 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
Binary files 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 b131caf..1fd8f44 100644
--- 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
Binary files 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 8a30af1..3c3f9c3 100644
--- 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
Binary files 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 dab693f..9e84a9c 100644
--- 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
Binary files 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 d00779b..bdfb3e8 100644
--- 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
Binary files 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 83c27dc..f948350 100644
--- 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
Binary files 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 a6e3ca0..491748b 100644
--- 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
Binary files 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_chaining1_multiple_subrules_f1.default.30,31,32,33.otf
deleted file mode 100644
index 6fdfef5..0000000
--- a/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.default.30,31,32,33.otf
+++ /dev/null
Binary files 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 70ab671..0000000
--- a/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.default.41,42,43.otf
+++ /dev/null
Binary files 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_chaining1_multiple_subrules_f1.notdef-outline-retain-gids.30,31,32,33.otf
similarity index 71%
copy from test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.retain-gids.30,31,32,33.otf
copy to test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.notdef-outline-retain-gids.30,31,32,33.otf
index e80620c..1fa96ae 100644
--- 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_chaining1_multiple_subrules_f1.notdef-outline-retain-gids.30,31,32,33.otf
Binary files 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.gpos8/gpos_chaining1_multiple_subrules_f1.notdef-outline-retain-gids.41,42,43.otf
similarity index 68%
copy from test/subset/data/expected/layout.gpos2/gpos2_1_font7.retain-gids.41,42,43.otf
copy to test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.notdef-outline-retain-gids.41,42,43.otf
index 5f79056..49215be 100644
--- a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.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
Binary files 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 b2873ca..e87e129 100644
--- 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
Binary files 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 060a951..18f1a2e 100644
--- 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
Binary files 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 0000000..02a4c7b
--- /dev/null
+++ b/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.notdef-outline.41,42,43.otf
Binary files 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-all-codepoint.otf
similarity index 72%
copy from test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.default.retain-all-codepoint.otf
copy to test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.notdef-outline.retain-all-codepoint.otf
index b2873ca..e87e129 100644
--- 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-all-codepoint.otf
Binary files 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 1cfcbf3..0000000
--- a/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.retain-gids.41,42,43.otf
+++ /dev/null
Binary files 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.retain-gids.retain-all-codepoint.otf
deleted file mode 100644
index b2873ca..0000000
--- a/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.retain-gids.retain-all-codepoint.otf
+++ /dev/null
Binary files 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_chaining2_multiple_subrules_f1.default.30,31,32,33.otf
deleted file mode 100644
index a6b373e..0000000
--- a/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.default.30,31,32,33.otf
+++ /dev/null
Binary files 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 51717d5..0000000
--- a/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.default.41,42,43.otf
+++ /dev/null
Binary files 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 e80620c..5675857 100644
--- 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
Binary files 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.gpos8/gpos_chaining2_multiple_subrules_f1.notdef-outline-retain-gids.41,42,43.otf
similarity index 68%
copy from test/subset/data/expected/layout.gpos2/gpos2_1_font7.retain-gids.41,42,43.otf
copy to test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.notdef-outline-retain-gids.41,42,43.otf
index 5f79056..a818c73 100644
--- a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.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
Binary files 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 8a1ea2b..bd0900f 100644
--- 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
Binary files 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_chaining2_multiple_subrules_f1.notdef-outline.30,31,32,33.otf
similarity index 68%
copy from test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.default.30,31,32,33.otf
copy to test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.notdef-outline.30,31,32,33.otf
index 060a951..70f2963 100644
--- 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_chaining2_multiple_subrules_f1.notdef-outline.30,31,32,33.otf
Binary files 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 0000000..180b0f6
--- /dev/null
+++ b/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.notdef-outline.41,42,43.otf
Binary files 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-all-codepoint.otf
similarity index 72%
copy from test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.default.retain-all-codepoint.otf
copy to test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.notdef-outline.retain-all-codepoint.otf
index 8a1ea2b..bd0900f 100644
--- 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-all-codepoint.otf
Binary files 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_chaining2_multiple_subrules_f1.retain-gids.30,31,32,33.otf
deleted file mode 100644
index 4990e8c..0000000
--- a/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.retain-gids.30,31,32,33.otf
+++ /dev/null
Binary files 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 96339de..0000000
--- a/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.retain-gids.41,42,43.otf
+++ /dev/null
Binary files 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.retain-gids.retain-all-codepoint.otf
deleted file mode 100644
index 8a1ea2b..0000000
--- a/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.retain-gids.retain-all-codepoint.otf
+++ /dev/null
Binary files 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 f7e6297..0000000
--- a/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.default.41,42,43.otf
+++ /dev/null
Binary files 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_chaining3_simple_f1.notdef-outline-retain-gids.30,31,32,33.otf
similarity index 71%
copy from test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.retain-gids.30,31,32,33.otf
copy to test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.notdef-outline-retain-gids.30,31,32,33.otf
index e80620c..76e39f8 100644
--- 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_chaining3_simple_f1.notdef-outline-retain-gids.30,31,32,33.otf
Binary files 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.gpos8/gpos_chaining3_simple_f1.notdef-outline-retain-gids.41,42,43.otf
similarity index 68%
copy from test/subset/data/expected/layout.gpos2/gpos2_1_font7.retain-gids.41,42,43.otf
copy to test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.notdef-outline-retain-gids.41,42,43.otf
index 5f79056..e731c2f 100644
--- a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.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
Binary files 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 3237149..4ed3930 100644
--- 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
Binary files 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_chaining3_simple_f1.notdef-outline.30,31,32,33.otf
similarity index 68%
copy from test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.default.30,31,32,33.otf
copy to test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.notdef-outline.30,31,32,33.otf
index 060a951..acc4792 100644
--- 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_chaining3_simple_f1.notdef-outline.30,31,32,33.otf
Binary files differ
diff --git a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.default.41,42,43.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.notdef-outline.41,42,43.otf
similarity index 60%
copy from test/subset/data/expected/layout.gpos2/gpos2_2_font5.default.41,42,43.otf
copy to test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.notdef-outline.41,42,43.otf
index e4ce9a8..74eb7ba 100644
--- a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.default.41,42,43.otf
+++ b/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.notdef-outline.41,42,43.otf
Binary files 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-all-codepoint.otf
similarity index 72%
copy from test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.default.retain-all-codepoint.otf
copy to test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.notdef-outline.retain-all-codepoint.otf
index 3237149..4ed3930 100644
--- 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-all-codepoint.otf
Binary files 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_chaining3_simple_f1.retain-gids.30,31,32,33.otf
deleted file mode 100644
index 2981800..0000000
--- a/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.retain-gids.30,31,32,33.otf
+++ /dev/null
Binary files 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 49967c2..0000000
--- a/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.retain-gids.41,42,43.otf
+++ /dev/null
Binary files 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.retain-gids.retain-all-codepoint.otf
deleted file mode 100644
index 3237149..0000000
--- a/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.retain-gids.retain-all-codepoint.otf
+++ /dev/null
Binary files differ
diff --git a/test/subset/data/expected/layout.gpos9/gpos9_font2.default.41,42.otf b/test/subset/data/expected/layout.gpos9/gpos9_font2.default.41,42.otf
deleted file mode 100644
index 005f5d6..0000000
--- a/test/subset/data/expected/layout.gpos9/gpos9_font2.default.41,42.otf
+++ /dev/null
Binary files differ
diff --git a/test/subset/data/expected/layout.gpos9/gpos9_font2.default.41.otf b/test/subset/data/expected/layout.gpos9/gpos9_font2.default.41.otf
deleted file mode 100644
index e1f256b..0000000
--- a/test/subset/data/expected/layout.gpos9/gpos9_font2.default.41.otf
+++ /dev/null
Binary files 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 597824f..0000000
--- a/test/subset/data/expected/layout.gpos9/gpos9_font2.default.42.otf
+++ /dev/null
Binary files differ
diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,42.otf b/test/subset/data/expected/layout.gpos9/gpos9_font2.notdef-outline-retain-gids.41,42.otf
similarity index 69%
rename from test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,42.otf
rename to test/subset/data/expected/layout.gpos9/gpos9_font2.notdef-outline-retain-gids.41,42.otf
index fd8b8df..af0f615 100644
--- a/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,42.otf
+++ b/test/subset/data/expected/layout.gpos9/gpos9_font2.notdef-outline-retain-gids.41,42.otf
Binary files differ
diff --git a/test/subset/data/expected/layout.gpos/gpos1_2_font.retain-gids.41.otf b/test/subset/data/expected/layout.gpos9/gpos9_font2.notdef-outline-retain-gids.41.otf
similarity index 67%
copy from test/subset/data/expected/layout.gpos/gpos1_2_font.retain-gids.41.otf
copy to test/subset/data/expected/layout.gpos9/gpos9_font2.notdef-outline-retain-gids.41.otf
index 479133b..c96513d 100644
--- a/test/subset/data/expected/layout.gpos/gpos1_2_font.retain-gids.41.otf
+++ b/test/subset/data/expected/layout.gpos9/gpos9_font2.notdef-outline-retain-gids.41.otf
Binary files 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 c655d44..d9eabdc 100644
--- 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
Binary files differ
diff --git a/test/subset/data/expected/layout.gpos9/gpos9_font2.notdef-outline.41,42.otf b/test/subset/data/expected/layout.gpos9/gpos9_font2.notdef-outline.41,42.otf
new file mode 100644
index 0000000..3554efd
--- /dev/null
+++ b/test/subset/data/expected/layout.gpos9/gpos9_font2.notdef-outline.41,42.otf
Binary files 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 0000000..7ceafb5
--- /dev/null
+++ b/test/subset/data/expected/layout.gpos9/gpos9_font2.notdef-outline.41.otf
Binary files 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 0000000..c9a5505
--- /dev/null
+++ b/test/subset/data/expected/layout.gpos9/gpos9_font2.notdef-outline.42.otf
Binary files differ
diff --git a/test/subset/data/expected/layout.gpos9/gpos9_font2.retain-gids.41,42.otf b/test/subset/data/expected/layout.gpos9/gpos9_font2.retain-gids.41,42.otf
deleted file mode 100644
index 7ca90da..0000000
--- a/test/subset/data/expected/layout.gpos9/gpos9_font2.retain-gids.41,42.otf
+++ /dev/null
Binary files differ
diff --git a/test/subset/data/expected/layout.gpos9/gpos9_font2.retain-gids.41.otf b/test/subset/data/expected/layout.gpos9/gpos9_font2.retain-gids.41.otf
deleted file mode 100644
index 924b7db..0000000
--- a/test/subset/data/expected/layout.gpos9/gpos9_font2.retain-gids.41.otf
+++ /dev/null
Binary files 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 4d3a745..656dbc4 100644
--- 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
Binary files 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 27bc9bf..f8d2c84 100644
--- 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
Binary files 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 0ae56f3..99fb5e1 100644
--- 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
Binary files 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 d2d74b2..f520f0c 100644
--- 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
Binary files 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 ab270b2..42f094f 100644
--- 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
Binary files 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 c73e4c4..97b4f54 100644
--- 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
Binary files 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 99d39d5..77c1200 100644
--- 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
Binary files 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 ecfe086..a352c73 100644
--- 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
Binary files 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_context1_multiple_subrules_f2.default.41,42,43.otf
deleted file mode 100644
index 3a15025..0000000
--- a/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.default.41,42,43.otf
+++ /dev/null
Binary files 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_context1_multiple_subrules_f2.default.41,42.otf
deleted file mode 100644
index 6d9cd2d..0000000
--- a/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.default.41,42.otf
+++ /dev/null
Binary files 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.default.41,43.otf
deleted file mode 100644
index d3e56bc..0000000
--- a/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.default.41,43.otf
+++ /dev/null
Binary files 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.default.41.otf
deleted file mode 100644
index 34b906f..0000000
--- a/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.default.41.otf
+++ /dev/null
Binary files 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_context1_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_context1_multiple_subrules_f2.notdef-outline-retain-gids.41,42,43.otf
index 7a55e20..8cee19b 100644
--- 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_context1_multiple_subrules_f2.notdef-outline-retain-gids.41,42,43.otf
Binary files 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 ddbcb48..b4a374e 100644
--- 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
Binary files 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 e3c8aac..026f596 100644
--- 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
Binary files 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_context1_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_context1_multiple_subrules_f2.notdef-outline-retain-gids.41.otf
index c77f6f1..81b6bea 100644
--- a/test/subset/data/expected/layout.gsub5/gsub_context1_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
Binary files 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 571a3da..d357ae9 100644
--- 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
Binary files differ
diff --git a/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.notdef-outline.41,42,43.otf b/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.notdef-outline.41,42,43.otf
new file mode 100644
index 0000000..692a89c
--- /dev/null
+++ b/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.notdef-outline.41,42,43.otf
Binary files differ
diff --git a/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.notdef-outline.41,42.otf b/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.notdef-outline.41,42.otf
new file mode 100644
index 0000000..994bcfe
--- /dev/null
+++ b/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.notdef-outline.41,42.otf
Binary files differ
diff --git a/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.notdef-outline.41,43.otf b/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.notdef-outline.41,43.otf
new file mode 100644
index 0000000..e5d821e
--- /dev/null
+++ b/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.notdef-outline.41,43.otf
Binary files differ
diff --git a/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.notdef-outline.41.otf b/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.notdef-outline.41.otf
new file mode 100644
index 0000000..44420e7
--- /dev/null
+++ b/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.notdef-outline.41.otf
Binary files 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-all-codepoint.otf
similarity index 90%
copy from test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.default.retain-all-codepoint.otf
copy to test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.notdef-outline.retain-all-codepoint.otf
index 571a3da..d357ae9 100644
--- 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-all-codepoint.otf
Binary files 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_context1_multiple_subrules_f2.retain-gids.41,42.otf
deleted file mode 100644
index a5ff8a5..0000000
--- a/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.retain-gids.41,42.otf
+++ /dev/null
Binary files 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_context1_multiple_subrules_f2.retain-gids.41,43.otf
deleted file mode 100644
index 6bada68..0000000
--- a/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.retain-gids.41,43.otf
+++ /dev/null
Binary files 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.retain-gids.retain-all-codepoint.otf
deleted file mode 100644
index 571a3da..0000000
--- a/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.retain-gids.retain-all-codepoint.otf
+++ /dev/null
Binary files 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_context2_multiple_subrules_f2.default.41,42,43.otf
deleted file mode 100644
index 1a539d5..0000000
--- a/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.default.41,42,43.otf
+++ /dev/null
Binary files 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_context2_multiple_subrules_f2.default.41,42.otf
deleted file mode 100644
index 18bfef9..0000000
--- a/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.default.41,42.otf
+++ /dev/null
Binary files 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.default.41,43.otf
deleted file mode 100644
index 0ed150b..0000000
--- a/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.default.41,43.otf
+++ /dev/null
Binary files 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.default.41.otf
deleted file mode 100644
index e27ebff..0000000
--- a/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.default.41.otf
+++ /dev/null
Binary files 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%
copy from test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.retain-gids.41,42,43.otf
copy to test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.notdef-outline-retain-gids.41,42,43.otf
index 7a55e20..d5da5c4 100644
--- 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
Binary files 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_context2_multiple_subrules_f2.notdef-outline-retain-gids.41,42.otf
similarity index 65%
copy from test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.retain-gids.41,42.otf
copy to test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.notdef-outline-retain-gids.41,42.otf
index ddbcb48..167d241 100644
--- 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_context2_multiple_subrules_f2.notdef-outline-retain-gids.41,42.otf
Binary files 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_context2_multiple_subrules_f2.notdef-outline-retain-gids.41,43.otf
similarity index 66%
copy from test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.retain-gids.41,43.otf
copy to test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.notdef-outline-retain-gids.41,43.otf
index e3c8aac..5d1ec22 100644
--- 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_context2_multiple_subrules_f2.notdef-outline-retain-gids.41,43.otf
Binary files 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%
copy from test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.retain-gids.41.otf
copy to test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.notdef-outline-retain-gids.41.otf
index c77f6f1..351e7c4 100644
--- 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
Binary files 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 570a926..e9c5c31 100644
--- 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
Binary files differ
diff --git a/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.notdef-outline.41,42,43.otf b/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.notdef-outline.41,42,43.otf
new file mode 100644
index 0000000..4cdb523
--- /dev/null
+++ b/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.notdef-outline.41,42,43.otf
Binary files differ
diff --git a/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.notdef-outline.41,42.otf b/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.notdef-outline.41,42.otf
new file mode 100644
index 0000000..577fff8
--- /dev/null
+++ b/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.notdef-outline.41,42.otf
Binary files differ
diff --git a/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.notdef-outline.41,43.otf b/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.notdef-outline.41,43.otf
new file mode 100644
index 0000000..70082e7
--- /dev/null
+++ b/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.notdef-outline.41,43.otf
Binary files differ
diff --git a/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.notdef-outline.41.otf b/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.notdef-outline.41.otf
new file mode 100644
index 0000000..9e76766
--- /dev/null
+++ b/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.notdef-outline.41.otf
Binary files 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-all-codepoint.otf
similarity index 90%
copy from test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.default.retain-all-codepoint.otf
copy to test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.notdef-outline.retain-all-codepoint.otf
index 570a926..e9c5c31 100644
--- 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-all-codepoint.otf
Binary files 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_context2_multiple_subrules_f2.retain-gids.41,42,43.otf
deleted file mode 100644
index 2f7bca9..0000000
--- a/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.retain-gids.41,42,43.otf
+++ /dev/null
Binary files 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_context2_multiple_subrules_f2.retain-gids.41.otf
deleted file mode 100644
index 57e53b0..0000000
--- a/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.retain-gids.41.otf
+++ /dev/null
Binary files 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.retain-gids.retain-all-codepoint.otf
deleted file mode 100644
index 570a926..0000000
--- a/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.retain-gids.retain-all-codepoint.otf
+++ /dev/null
Binary files 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.gsub5/gsub_context3_successive_f1.default.41,42,43.otf
deleted file mode 100644
index bd68484..0000000
--- a/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.default.41,42,43.otf
+++ /dev/null
Binary files 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.default.41,42.otf
deleted file mode 100644
index 2593dd5..0000000
--- a/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.default.41,42.otf
+++ /dev/null
Binary files 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.default.41,43.otf
deleted file mode 100644
index 1137b14..0000000
--- a/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.default.41,43.otf
+++ /dev/null
Binary files 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.default.41.otf
deleted file mode 100644
index 896e146..0000000
--- a/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.default.41.otf
+++ /dev/null
Binary files 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%
copy from test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.retain-gids.41,42,43.otf
copy to test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.notdef-outline-retain-gids.41,42,43.otf
index ab9b97e..02a479c 100644
--- 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
Binary files 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 e22bfde..622091a 100644
--- 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
Binary files 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 0000000..4e9524e
--- /dev/null
+++ b/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.notdef-outline-retain-gids.41,43.otf
Binary files 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 072bd50..e3d1f74 100644
--- 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
Binary files 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 71%
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 1a5cc4e..182a5c4 100644
--- 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
Binary files differ
diff --git a/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.notdef-outline.41,42,43.otf b/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.notdef-outline.41,42,43.otf
new file mode 100644
index 0000000..b2580ee
--- /dev/null
+++ b/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.notdef-outline.41,42,43.otf
Binary files differ
diff --git a/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.notdef-outline.41,42.otf b/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.notdef-outline.41,42.otf
new file mode 100644
index 0000000..5b890f9
--- /dev/null
+++ b/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.notdef-outline.41,42.otf
Binary files differ
diff --git a/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.notdef-outline.41,43.otf b/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.notdef-outline.41,43.otf
new file mode 100644
index 0000000..fc08fcb
--- /dev/null
+++ b/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.notdef-outline.41,43.otf
Binary files differ
diff --git a/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.notdef-outline.41.otf b/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.notdef-outline.41.otf
new file mode 100644
index 0000000..425282b
--- /dev/null
+++ b/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.notdef-outline.41.otf
Binary files 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-all-codepoint.otf
similarity index 71%
copy from test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.default.retain-all-codepoint.otf
copy to test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.notdef-outline.retain-all-codepoint.otf
index 1a5cc4e..182a5c4 100644
--- 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-all-codepoint.otf
Binary files 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.gsub5/gsub_context3_successive_f1.retain-gids.41,42,43.otf
deleted file mode 100644
index 284499d..0000000
--- a/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.retain-gids.41,42,43.otf
+++ /dev/null
Binary files 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 586284d..0000000
--- a/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.retain-gids.41,43.otf
+++ /dev/null
Binary files 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.retain-gids.retain-all-codepoint.otf
deleted file mode 100644
index 1a5cc4e..0000000
--- a/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.retain-gids.retain-all-codepoint.otf
+++ /dev/null
Binary files 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_chaining1_multiple_subrules_f1.default.30,31,32,33.otf
deleted file mode 100644
index fb14579..0000000
--- a/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.default.30,31,32,33.otf
+++ /dev/null
Binary files 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 afb2d7b..0000000
--- a/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.default.41,42,43.otf
+++ /dev/null
Binary files 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%
copy from test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.retain-gids.30,31,32,33.otf
copy to test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.notdef-outline-retain-gids.30,31,32,33.otf
index dee4364..497c4ae 100644
--- 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
Binary files 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.gsub6/gsub_chaining1_multiple_subrules_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.gsub6/gsub_chaining1_multiple_subrules_f1.notdef-outline-retain-gids.41,42,43.otf
index ab9b97e..6a15b03 100644
--- a/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.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
Binary files 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 71%
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 fe7f238..4cb774d 100644
--- 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
Binary files 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%
copy from test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.default.30,31,32,33.otf
copy to test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.notdef-outline.30,31,32,33.otf
index 2cc882d..422e3c9 100644
--- 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
Binary files differ
diff --git a/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.notdef-outline.41,42,43.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.notdef-outline.41,42,43.otf
new file mode 100644
index 0000000..7d6948a
--- /dev/null
+++ b/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.notdef-outline.41,42,43.otf
Binary files 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-all-codepoint.otf
similarity index 71%
copy from test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.default.retain-all-codepoint.otf
copy to test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.notdef-outline.retain-all-codepoint.otf
index fe7f238..4cb774d 100644
--- 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-all-codepoint.otf
Binary files 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_chaining1_multiple_subrules_f1.retain-gids.30,31,32,33.otf
deleted file mode 100644
index 7a6b267..0000000
--- a/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.retain-gids.30,31,32,33.otf
+++ /dev/null
Binary files 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_chaining1_multiple_subrules_f1.retain-gids.41,42,43.otf
deleted file mode 100644
index 378d901..0000000
--- a/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.retain-gids.41,42,43.otf
+++ /dev/null
Binary files 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.retain-gids.retain-all-codepoint.otf
deleted file mode 100644
index fe7f238..0000000
--- a/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.retain-gids.retain-all-codepoint.otf
+++ /dev/null
Binary files 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.default.30,31,32,33.otf
deleted file mode 100644
index 83a2b63..0000000
--- a/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.default.30,31,32,33.otf
+++ /dev/null
Binary files 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.default.41,42,43.otf
deleted file mode 100644
index 9463f29..0000000
--- a/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.default.41,42,43.otf
+++ /dev/null
Binary files 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_chaining2_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_chaining2_multiple_subrules_f1.notdef-outline-retain-gids.30,31,32,33.otf
index dee4364..72df444 100644
--- 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_chaining2_multiple_subrules_f1.notdef-outline-retain-gids.30,31,32,33.otf
Binary files 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.gsub6/gsub_chaining2_multiple_subrules_f1.notdef-outline-retain-gids.41,42,43.otf
similarity index 68%
copy from test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.retain-gids.41,42,43.otf
copy to test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.notdef-outline-retain-gids.41,42,43.otf
index ab9b97e..d2441ab 100644
--- a/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.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
Binary files 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 71%
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 4052aab..17b578d 100644
--- 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
Binary files 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_chaining2_multiple_subrules_f1.notdef-outline.30,31,32,33.otf
similarity index 68%
copy from test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.default.30,31,32,33.otf
copy to test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.notdef-outline.30,31,32,33.otf
index 2cc882d..99eb272 100644
--- 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_chaining2_multiple_subrules_f1.notdef-outline.30,31,32,33.otf
Binary files differ
diff --git a/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.notdef-outline.41,42,43.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.notdef-outline.41,42,43.otf
new file mode 100644
index 0000000..a0e2cca
--- /dev/null
+++ b/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.notdef-outline.41,42,43.otf
Binary files 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-all-codepoint.otf
similarity index 71%
copy from test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.default.retain-all-codepoint.otf
copy to test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.notdef-outline.retain-all-codepoint.otf
index 4052aab..17b578d 100644
--- 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-all-codepoint.otf
Binary files 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.retain-gids.30,31,32,33.otf
deleted file mode 100644
index 5c02f58..0000000
--- a/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.retain-gids.30,31,32,33.otf
+++ /dev/null
Binary files 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.retain-gids.41,42,43.otf
deleted file mode 100644
index cd7cc2f..0000000
--- a/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.retain-gids.41,42,43.otf
+++ /dev/null
Binary files 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.retain-gids.retain-all-codepoint.otf
deleted file mode 100644
index 4052aab..0000000
--- a/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.retain-gids.retain-all-codepoint.otf
+++ /dev/null
Binary files 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.gsub6/gsub_chaining3_simple_f2.default.41,42,43.otf
deleted file mode 100644
index 03e0eab..0000000
--- a/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.default.41,42,43.otf
+++ /dev/null
Binary files 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_chaining3_simple_f2.notdef-outline-retain-gids.30,31,32,33.otf
similarity index 72%
copy from test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.retain-gids.30,31,32,33.otf
copy to test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.notdef-outline-retain-gids.30,31,32,33.otf
index dee4364..9c93f91 100644
--- 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_chaining3_simple_f2.notdef-outline-retain-gids.30,31,32,33.otf
Binary files 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.gsub6/gsub_chaining3_simple_f2.notdef-outline-retain-gids.41,42,43.otf
similarity index 68%
copy from test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.retain-gids.41,42,43.otf
copy to test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.notdef-outline-retain-gids.41,42,43.otf
index ab9b97e..12a1582 100644
--- a/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.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
Binary files 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 71%
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 62f074d..c60f400 100644
--- 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
Binary files 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_chaining3_simple_f2.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_chaining3_simple_f2.notdef-outline.30,31,32,33.otf
index 2cc882d..b3aa753 100644
--- 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_chaining3_simple_f2.notdef-outline.30,31,32,33.otf
Binary files 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 0000000..bd5d4f0
--- /dev/null
+++ b/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.notdef-outline.41,42,43.otf
Binary files 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-all-codepoint.otf
similarity index 71%
copy from test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.default.retain-all-codepoint.otf
copy to test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.notdef-outline.retain-all-codepoint.otf
index 62f074d..c60f400 100644
--- 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-all-codepoint.otf
Binary files 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.retain-gids.retain-all-codepoint.otf
deleted file mode 100644
index 62f074d..0000000
--- a/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.retain-gids.retain-all-codepoint.otf
+++ /dev/null
Binary files 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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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-gids.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-gids.retain-all-codepoint.otf
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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-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-all-codepoint.otf
Binary files differ
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 3e60a58..99571a5 100644
--- 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
Binary files 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 02c5b87..f961bd4 100644
--- 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
Binary files 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 437d9b4..e141330 100644
--- a/test/subset/data/expected/layout/Roboto-Regular.smallcaps.default.41.ttf
+++ b/test/subset/data/expected/layout/Roboto-Regular.smallcaps.default.41.ttf
Binary files 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 52c1bd1..3a53e25 100644
--- a/test/subset/data/expected/layout/Roboto-Regular.smallcaps.default.43.ttf
+++ b/test/subset/data/expected/layout/Roboto-Regular.smallcaps.default.43.ttf
Binary files 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 0bbac8d..eccf070 100644
--- 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
Binary files 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 5f84010..1d75edf 100644
--- 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
Binary files 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 8891122..9b3c91a 100644
--- 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
Binary files 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 b76cfea..31d6121 100644
--- 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
Binary files 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 af4fb3f..1163334 100644
--- 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
Binary files 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 3b68ba5..8cc0c8a 100644
--- 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
Binary files 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 0000000..8648705
--- /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 0000000..c5f0ac5
--- /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 0000000..22236be
--- /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 0000000..a1fd783
--- /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 0000000..1f98591
--- /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 0000000..10fb10c
--- /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 0000000..ab9c86a
--- /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 0000000..8f66494
--- /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 0000000..277308e
--- /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 61d2ee9..babcacd 100644
--- a/test/subset/data/tests/cff-full-font.tests
+++ b/test/subset/data/tests/cff-full-font.tests
@@ -2,14 +2,14 @@
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 0ed4fb8..abfec32 100644
--- a/test/subset/data/tests/cmap14.tests
+++ b/test/subset/data/tests/cmap14.tests
@@ -3,12 +3,12 @@
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 5dab14a..673bba7 100644
--- a/test/subset/data/tests/layout.context.tests
+++ b/test/subset/data/tests/layout.context.tests
@@ -4,8 +4,8 @@
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 a3d7d9c..b3b7c03 100644
--- a/test/subset/data/tests/layout.gdef-varstore.tests
+++ b/test/subset/data/tests/layout.gdef-varstore.tests
@@ -2,9 +2,8 @@
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 6bbef22..ef2384b 100644
--- a/test/subset/data/tests/layout.gpos.tests
+++ b/test/subset/data/tests/layout.gpos.tests
@@ -2,8 +2,8 @@
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 0b333d1..6a07db9 100644
--- a/test/subset/data/tests/layout.gpos2.tests
+++ b/test/subset/data/tests/layout.gpos2.tests
@@ -3,8 +3,8 @@
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 5843658..9322b58 100644
--- a/test/subset/data/tests/layout.gpos3.tests
+++ b/test/subset/data/tests/layout.gpos3.tests
@@ -2,8 +2,8 @@
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 49acd4a..eace6c2 100644
--- a/test/subset/data/tests/layout.gpos4.tests
+++ b/test/subset/data/tests/layout.gpos4.tests
@@ -2,8 +2,8 @@
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 5d1cb5d..12caf6a 100644
--- a/test/subset/data/tests/layout.gpos5.tests
+++ b/test/subset/data/tests/layout.gpos5.tests
@@ -2,8 +2,8 @@
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 fa3812d..94cf810 100644
--- a/test/subset/data/tests/layout.gpos6.tests
+++ b/test/subset/data/tests/layout.gpos6.tests
@@ -2,8 +2,8 @@
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 9880554..7367ce3 100644
--- a/test/subset/data/tests/layout.gpos8.tests
+++ b/test/subset/data/tests/layout.gpos8.tests
@@ -4,8 +4,8 @@
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 e5f1fdc..0750ca0 100644
--- a/test/subset/data/tests/layout.gpos9.tests
+++ b/test/subset/data/tests/layout.gpos9.tests
@@ -2,8 +2,8 @@
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 a084365..f5610c4 100644
--- a/test/subset/data/tests/layout.gsub5.tests
+++ b/test/subset/data/tests/layout.gsub5.tests
@@ -4,8 +4,8 @@
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 344349b..afd0781 100644
--- a/test/subset/data/tests/layout.gsub6.tests
+++ b/test/subset/data/tests/layout.gsub6.tests
@@ -4,8 +4,8 @@
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 6bfc02a..f70d307 100644
--- a/test/subset/data/tests/layout.gsub8.tests
+++ b/test/subset/data/tests/layout.gsub8.tests
@@ -2,8 +2,8 @@
gsub8_manually_created.otf
PROFILES:
-default.txt
-retain-gids.txt
+notdef-outline.txt
+notdef-outline-retain-gids.txt
SUBSETS:
a
