diff --git a/test/subset/data/Makefile.am b/test/subset/data/Makefile.am index 2a419920a..c060ac9f0 100644 --- a/test/subset/data/Makefile.am +++ b/test/subset/data/Makefile.am @@ -51,7 +51,7 @@ EXTRA_DIST += \ expected/colr \ expected/colr_glyphs \ expected/colrv1 \ - expected/colrv1_copy_varstore \ + expected/colrv1_subset_varstore \ expected/colr_with_components \ expected/cbdt \ expected/variable \ diff --git a/test/subset/data/Makefile.sources b/test/subset/data/Makefile.sources index b5d14ff20..a2c3e0625 100644 --- a/test/subset/data/Makefile.sources +++ b/test/subset/data/Makefile.sources @@ -11,7 +11,7 @@ TESTS = \ tests/colr.tests \ tests/colr_glyphs.tests \ tests/colrv1.tests \ - tests/colrv1_copy_varstore.tests \ + tests/colrv1_subset_varstore.tests \ tests/colr_with_components.tests \ tests/full-font.tests \ tests/glyf_bug_3131.tests \ diff --git a/test/subset/data/expected/colrv1/TestCOLRv1.default.E000,E004.ttf b/test/subset/data/expected/colrv1/TestCOLRv1.default.E000,E004.ttf index bab0b4fb9..6d11c9a7f 100644 Binary files a/test/subset/data/expected/colrv1/TestCOLRv1.default.E000,E004.ttf and b/test/subset/data/expected/colrv1/TestCOLRv1.default.E000,E004.ttf differ diff --git a/test/subset/data/expected/colrv1/TestCOLRv1.default.E002,E003,E004.ttf b/test/subset/data/expected/colrv1/TestCOLRv1.default.E002,E003,E004.ttf index 7d094e074..25e2705c8 100644 Binary files a/test/subset/data/expected/colrv1/TestCOLRv1.default.E002,E003,E004.ttf and b/test/subset/data/expected/colrv1/TestCOLRv1.default.E002,E003,E004.ttf 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 index af8c79b47..47f6bb0ea 100644 Binary files a/test/subset/data/expected/colrv1/TestCOLRv1.default.E003,E004.ttf and b/test/subset/data/expected/colrv1/TestCOLRv1.default.E003,E004.ttf 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 index b0e98658e..292799b8b 100644 Binary files a/test/subset/data/expected/colrv1/TestCOLRv1.default.retain-all-codepoint.ttf and b/test/subset/data/expected/colrv1/TestCOLRv1.default.retain-all-codepoint.ttf 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 index 3e9abacec..36a6e7575 100644 Binary files a/test/subset/data/expected/colrv1/TestCOLRv1.drop-hints-retain-gids.E000,E004.ttf and b/test/subset/data/expected/colrv1/TestCOLRv1.drop-hints-retain-gids.E000,E004.ttf differ diff --git a/test/subset/data/expected/colrv1/TestCOLRv1.drop-hints-retain-gids.E002,E003,E004.ttf b/test/subset/data/expected/colrv1/TestCOLRv1.drop-hints-retain-gids.E002,E003,E004.ttf index 25b5aeddb..97b032f99 100644 Binary files a/test/subset/data/expected/colrv1/TestCOLRv1.drop-hints-retain-gids.E002,E003,E004.ttf and b/test/subset/data/expected/colrv1/TestCOLRv1.drop-hints-retain-gids.E002,E003,E004.ttf 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 index f983408cd..e780c6e7b 100644 Binary files a/test/subset/data/expected/colrv1/TestCOLRv1.drop-hints-retain-gids.E003,E004.ttf and b/test/subset/data/expected/colrv1/TestCOLRv1.drop-hints-retain-gids.E003,E004.ttf 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 index ec3ddece6..c7545bb3a 100644 Binary files a/test/subset/data/expected/colrv1/TestCOLRv1.drop-hints-retain-gids.retain-all-codepoint.ttf and b/test/subset/data/expected/colrv1/TestCOLRv1.drop-hints-retain-gids.retain-all-codepoint.ttf 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 index 2c87b3d3e..3cdcea30a 100644 Binary files a/test/subset/data/expected/colrv1/TestCOLRv1.drop-hints.E000,E004.ttf and b/test/subset/data/expected/colrv1/TestCOLRv1.drop-hints.E000,E004.ttf differ diff --git a/test/subset/data/expected/colrv1/TestCOLRv1.drop-hints.E002,E003,E004.ttf b/test/subset/data/expected/colrv1/TestCOLRv1.drop-hints.E002,E003,E004.ttf index dde87f791..c16fe7e2f 100644 Binary files a/test/subset/data/expected/colrv1/TestCOLRv1.drop-hints.E002,E003,E004.ttf and b/test/subset/data/expected/colrv1/TestCOLRv1.drop-hints.E002,E003,E004.ttf 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 index 50be5616b..8122b36e9 100644 Binary files a/test/subset/data/expected/colrv1/TestCOLRv1.drop-hints.E003,E004.ttf and b/test/subset/data/expected/colrv1/TestCOLRv1.drop-hints.E003,E004.ttf 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 index ec3ddece6..c7545bb3a 100644 Binary files a/test/subset/data/expected/colrv1/TestCOLRv1.drop-hints.retain-all-codepoint.ttf and b/test/subset/data/expected/colrv1/TestCOLRv1.drop-hints.retain-all-codepoint.ttf 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 index 5d72345f5..cbe3f088f 100644 Binary files a/test/subset/data/expected/colrv1/TestCOLRv1.retain-gids.E000,E004.ttf and b/test/subset/data/expected/colrv1/TestCOLRv1.retain-gids.E000,E004.ttf differ diff --git a/test/subset/data/expected/colrv1/TestCOLRv1.retain-gids.E002,E003,E004.ttf b/test/subset/data/expected/colrv1/TestCOLRv1.retain-gids.E002,E003,E004.ttf index 549b52dd3..3ea9ae916 100644 Binary files a/test/subset/data/expected/colrv1/TestCOLRv1.retain-gids.E002,E003,E004.ttf and b/test/subset/data/expected/colrv1/TestCOLRv1.retain-gids.E002,E003,E004.ttf 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 index ec2538913..d871c77a0 100644 Binary files a/test/subset/data/expected/colrv1/TestCOLRv1.retain-gids.E003,E004.ttf and b/test/subset/data/expected/colrv1/TestCOLRv1.retain-gids.E003,E004.ttf 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 index b0e98658e..292799b8b 100644 Binary files a/test/subset/data/expected/colrv1/TestCOLRv1.retain-gids.retain-all-codepoint.ttf and b/test/subset/data/expected/colrv1/TestCOLRv1.retain-gids.retain-all-codepoint.ttf differ diff --git a/test/subset/data/expected/colrv1_copy_varstore/Foldit.default.41,42.ttf b/test/subset/data/expected/colrv1_copy_varstore/Foldit.default.41,42.ttf deleted file mode 100644 index 9138703f1..000000000 Binary files a/test/subset/data/expected/colrv1_copy_varstore/Foldit.default.41,42.ttf and /dev/null differ diff --git a/test/subset/data/expected/colrv1_copy_varstore/Foldit.default.41.ttf b/test/subset/data/expected/colrv1_copy_varstore/Foldit.default.41.ttf deleted file mode 100644 index 4482f7a6e..000000000 Binary files a/test/subset/data/expected/colrv1_copy_varstore/Foldit.default.41.ttf and /dev/null differ diff --git a/test/subset/data/expected/colrv1_copy_varstore/Foldit.default.retain-all-codepoint.ttf b/test/subset/data/expected/colrv1_copy_varstore/Foldit.default.retain-all-codepoint.ttf deleted file mode 100644 index fe803d765..000000000 Binary files a/test/subset/data/expected/colrv1_copy_varstore/Foldit.default.retain-all-codepoint.ttf and /dev/null differ diff --git a/test/subset/data/expected/colrv1_copy_varstore/Foldit.drop-hints-retain-gids.41,42.ttf b/test/subset/data/expected/colrv1_copy_varstore/Foldit.drop-hints-retain-gids.41,42.ttf deleted file mode 100644 index b7f21e867..000000000 Binary files a/test/subset/data/expected/colrv1_copy_varstore/Foldit.drop-hints-retain-gids.41,42.ttf and /dev/null differ diff --git a/test/subset/data/expected/colrv1_copy_varstore/Foldit.drop-hints-retain-gids.41.ttf b/test/subset/data/expected/colrv1_copy_varstore/Foldit.drop-hints-retain-gids.41.ttf deleted file mode 100644 index 12d7e0303..000000000 Binary files a/test/subset/data/expected/colrv1_copy_varstore/Foldit.drop-hints-retain-gids.41.ttf and /dev/null differ diff --git a/test/subset/data/expected/colrv1_copy_varstore/Foldit.drop-hints-retain-gids.retain-all-codepoint.ttf b/test/subset/data/expected/colrv1_copy_varstore/Foldit.drop-hints-retain-gids.retain-all-codepoint.ttf deleted file mode 100644 index 28a7e1a21..000000000 Binary files a/test/subset/data/expected/colrv1_copy_varstore/Foldit.drop-hints-retain-gids.retain-all-codepoint.ttf and /dev/null differ diff --git a/test/subset/data/expected/colrv1_copy_varstore/Foldit.drop-hints.41,42.ttf b/test/subset/data/expected/colrv1_copy_varstore/Foldit.drop-hints.41,42.ttf deleted file mode 100644 index d53d73cdd..000000000 Binary files a/test/subset/data/expected/colrv1_copy_varstore/Foldit.drop-hints.41,42.ttf and /dev/null differ diff --git a/test/subset/data/expected/colrv1_copy_varstore/Foldit.drop-hints.41.ttf b/test/subset/data/expected/colrv1_copy_varstore/Foldit.drop-hints.41.ttf deleted file mode 100644 index 36d72b73e..000000000 Binary files a/test/subset/data/expected/colrv1_copy_varstore/Foldit.drop-hints.41.ttf and /dev/null differ diff --git a/test/subset/data/expected/colrv1_copy_varstore/Foldit.drop-hints.retain-all-codepoint.ttf b/test/subset/data/expected/colrv1_copy_varstore/Foldit.drop-hints.retain-all-codepoint.ttf deleted file mode 100644 index 28a7e1a21..000000000 Binary files a/test/subset/data/expected/colrv1_copy_varstore/Foldit.drop-hints.retain-all-codepoint.ttf and /dev/null differ diff --git a/test/subset/data/expected/colrv1_copy_varstore/Foldit.retain-gids.41,42.ttf b/test/subset/data/expected/colrv1_copy_varstore/Foldit.retain-gids.41,42.ttf deleted file mode 100644 index 818f710cf..000000000 Binary files a/test/subset/data/expected/colrv1_copy_varstore/Foldit.retain-gids.41,42.ttf and /dev/null differ diff --git a/test/subset/data/expected/colrv1_copy_varstore/Foldit.retain-gids.41.ttf b/test/subset/data/expected/colrv1_copy_varstore/Foldit.retain-gids.41.ttf deleted file mode 100644 index d0e4551f9..000000000 Binary files a/test/subset/data/expected/colrv1_copy_varstore/Foldit.retain-gids.41.ttf and /dev/null differ diff --git a/test/subset/data/expected/colrv1_copy_varstore/Foldit.retain-gids.retain-all-codepoint.ttf b/test/subset/data/expected/colrv1_copy_varstore/Foldit.retain-gids.retain-all-codepoint.ttf deleted file mode 100644 index fe803d765..000000000 Binary files a/test/subset/data/expected/colrv1_copy_varstore/Foldit.retain-gids.retain-all-codepoint.ttf and /dev/null differ diff --git a/test/subset/data/expected/colrv1_subset_varstore/Foldit.default.41,42.ttf b/test/subset/data/expected/colrv1_subset_varstore/Foldit.default.41,42.ttf new file mode 100644 index 000000000..b3493a74e Binary files /dev/null and b/test/subset/data/expected/colrv1_subset_varstore/Foldit.default.41,42.ttf differ diff --git a/test/subset/data/expected/colrv1_subset_varstore/Foldit.default.41.ttf b/test/subset/data/expected/colrv1_subset_varstore/Foldit.default.41.ttf new file mode 100644 index 000000000..ffc47f377 Binary files /dev/null and b/test/subset/data/expected/colrv1_subset_varstore/Foldit.default.41.ttf differ diff --git a/test/subset/data/expected/colrv1_subset_varstore/Foldit.default.retain-all-codepoint.ttf b/test/subset/data/expected/colrv1_subset_varstore/Foldit.default.retain-all-codepoint.ttf new file mode 100644 index 000000000..80b97a4d3 Binary files /dev/null and b/test/subset/data/expected/colrv1_subset_varstore/Foldit.default.retain-all-codepoint.ttf differ diff --git a/test/subset/data/expected/colrv1_subset_varstore/Foldit.drop-hints-retain-gids.41,42.ttf b/test/subset/data/expected/colrv1_subset_varstore/Foldit.drop-hints-retain-gids.41,42.ttf new file mode 100644 index 000000000..e96bd4d4f Binary files /dev/null and b/test/subset/data/expected/colrv1_subset_varstore/Foldit.drop-hints-retain-gids.41,42.ttf differ diff --git a/test/subset/data/expected/colrv1_subset_varstore/Foldit.drop-hints-retain-gids.41.ttf b/test/subset/data/expected/colrv1_subset_varstore/Foldit.drop-hints-retain-gids.41.ttf new file mode 100644 index 000000000..87250b364 Binary files /dev/null and b/test/subset/data/expected/colrv1_subset_varstore/Foldit.drop-hints-retain-gids.41.ttf differ diff --git a/test/subset/data/expected/colrv1_subset_varstore/Foldit.drop-hints-retain-gids.retain-all-codepoint.ttf b/test/subset/data/expected/colrv1_subset_varstore/Foldit.drop-hints-retain-gids.retain-all-codepoint.ttf new file mode 100644 index 000000000..a29ff15fe Binary files /dev/null and b/test/subset/data/expected/colrv1_subset_varstore/Foldit.drop-hints-retain-gids.retain-all-codepoint.ttf differ diff --git a/test/subset/data/expected/colrv1_subset_varstore/Foldit.drop-hints.41,42.ttf b/test/subset/data/expected/colrv1_subset_varstore/Foldit.drop-hints.41,42.ttf new file mode 100644 index 000000000..c501dce2c Binary files /dev/null and b/test/subset/data/expected/colrv1_subset_varstore/Foldit.drop-hints.41,42.ttf differ diff --git a/test/subset/data/expected/colrv1_subset_varstore/Foldit.drop-hints.41.ttf b/test/subset/data/expected/colrv1_subset_varstore/Foldit.drop-hints.41.ttf new file mode 100644 index 000000000..b091a54a6 Binary files /dev/null and b/test/subset/data/expected/colrv1_subset_varstore/Foldit.drop-hints.41.ttf differ diff --git a/test/subset/data/expected/colrv1_subset_varstore/Foldit.drop-hints.retain-all-codepoint.ttf b/test/subset/data/expected/colrv1_subset_varstore/Foldit.drop-hints.retain-all-codepoint.ttf new file mode 100644 index 000000000..a29ff15fe Binary files /dev/null and b/test/subset/data/expected/colrv1_subset_varstore/Foldit.drop-hints.retain-all-codepoint.ttf differ diff --git a/test/subset/data/expected/colrv1_subset_varstore/Foldit.retain-gids.41,42.ttf b/test/subset/data/expected/colrv1_subset_varstore/Foldit.retain-gids.41,42.ttf new file mode 100644 index 000000000..d398cd1d9 Binary files /dev/null and b/test/subset/data/expected/colrv1_subset_varstore/Foldit.retain-gids.41,42.ttf differ diff --git a/test/subset/data/expected/colrv1_subset_varstore/Foldit.retain-gids.41.ttf b/test/subset/data/expected/colrv1_subset_varstore/Foldit.retain-gids.41.ttf new file mode 100644 index 000000000..5abaf0917 Binary files /dev/null and b/test/subset/data/expected/colrv1_subset_varstore/Foldit.retain-gids.41.ttf differ diff --git a/test/subset/data/expected/colrv1_subset_varstore/Foldit.retain-gids.retain-all-codepoint.ttf b/test/subset/data/expected/colrv1_subset_varstore/Foldit.retain-gids.retain-all-codepoint.ttf new file mode 100644 index 000000000..80b97a4d3 Binary files /dev/null and b/test/subset/data/expected/colrv1_subset_varstore/Foldit.retain-gids.retain-all-codepoint.ttf differ diff --git a/test/subset/data/expected/instantiate_colrv1/Foldit.default.retain-all-codepoint.wght=300-600.ttf b/test/subset/data/expected/instantiate_colrv1/Foldit.default.retain-all-codepoint.wght=300-600.ttf new file mode 100644 index 000000000..d3ccfdfcc Binary files /dev/null and b/test/subset/data/expected/instantiate_colrv1/Foldit.default.retain-all-codepoint.wght=300-600.ttf differ diff --git a/test/subset/data/tests/colrv1_copy_varstore.tests b/test/subset/data/tests/colrv1_subset_varstore.tests similarity index 83% rename from test/subset/data/tests/colrv1_copy_varstore.tests rename to test/subset/data/tests/colrv1_subset_varstore.tests index c698ece08..70ea9891b 100644 --- a/test/subset/data/tests/colrv1_copy_varstore.tests +++ b/test/subset/data/tests/colrv1_subset_varstore.tests @@ -11,3 +11,6 @@ SUBSETS: A AB * + +OPTIONS: +no_fonttools diff --git a/test/subset/data/tests/instantiate_colrv1.tests b/test/subset/data/tests/instantiate_colrv1.tests index fae81b321..eeb5716d7 100644 --- a/test/subset/data/tests/instantiate_colrv1.tests +++ b/test/subset/data/tests/instantiate_colrv1.tests @@ -9,6 +9,7 @@ SUBSETS: INSTANCES: wght=900 +wght=300:600 OPTIONS: no_fonttools diff --git a/test/subset/meson.build b/test/subset/meson.build index deeccf50a..c644af159 100644 --- a/test/subset/meson.build +++ b/test/subset/meson.build @@ -46,7 +46,7 @@ tests = [ # TODO: re-enable once colrv1 subsetting is stabilized. # 'colrv1.notoemoji', 'colrv1', - 'colrv1_copy_varstore', + 'colrv1_subset_varstore', 'colr_with_components', 'cbdt', 'variable',