diff --git a/test/subset/data/expected/full_instance/Roboto-Variable.default.retain-all-codepoint.wght=150,wdth=80.ttf b/test/subset/data/expected/full_instance/Roboto-Variable.default.retain-all-codepoint.wght=150,wdth=80.ttf index 49ee6f990..ca2aeeff6 100644 Binary files a/test/subset/data/expected/full_instance/Roboto-Variable.default.retain-all-codepoint.wght=150,wdth=80.ttf and b/test/subset/data/expected/full_instance/Roboto-Variable.default.retain-all-codepoint.wght=150,wdth=80.ttf differ diff --git a/test/subset/data/expected/full_instance/Roboto-Variable.default.retain-all-codepoint.wght=300,wdth=90.ttf b/test/subset/data/expected/full_instance/Roboto-Variable.default.retain-all-codepoint.wght=300,wdth=90.ttf index 3fc881b33..04be94efe 100644 Binary files a/test/subset/data/expected/full_instance/Roboto-Variable.default.retain-all-codepoint.wght=300,wdth=90.ttf and b/test/subset/data/expected/full_instance/Roboto-Variable.default.retain-all-codepoint.wght=300,wdth=90.ttf differ diff --git a/test/subset/data/expected/instance_feature_variations/MPLUS1-Variable.default.retain-all-codepoint.wght=400.ttf b/test/subset/data/expected/instance_feature_variations/MPLUS1-Variable.default.retain-all-codepoint.wght=400.ttf new file mode 100644 index 000000000..6a76402e7 Binary files /dev/null and b/test/subset/data/expected/instance_feature_variations/MPLUS1-Variable.default.retain-all-codepoint.wght=400.ttf differ diff --git a/test/subset/data/expected/instance_feature_variations/MPLUS1-Variable.notdef-outline.retain-all-codepoint.wght=400.ttf b/test/subset/data/expected/instance_feature_variations/MPLUS1-Variable.notdef-outline.retain-all-codepoint.wght=400.ttf new file mode 100644 index 000000000..3214a7781 Binary files /dev/null and b/test/subset/data/expected/instance_feature_variations/MPLUS1-Variable.notdef-outline.retain-all-codepoint.wght=400.ttf differ diff --git a/test/subset/data/fonts/Roboto-Variable.ttf b/test/subset/data/fonts/Roboto-Variable.ttf new file mode 100644 index 000000000..175c7b7e6 Binary files /dev/null and b/test/subset/data/fonts/Roboto-Variable.ttf differ diff --git a/test/subset/data/tests/instance_feature_variations.tests b/test/subset/data/tests/instance_feature_variations.tests new file mode 100644 index 000000000..4166b13ca --- /dev/null +++ b/test/subset/data/tests/instance_feature_variations.tests @@ -0,0 +1,12 @@ +FONTS: +MPLUS1-Variable.ttf + +PROFILES: +default.txt +notdef-outline.txt + +SUBSETS: +* + +INSTANCES: +wght=400 diff --git a/test/subset/generate-expected-outputs.py b/test/subset/generate-expected-outputs.py index a1917b777..48b2f913c 100755 --- a/test/subset/generate-expected-outputs.py +++ b/test/subset/generate-expected-outputs.py @@ -28,15 +28,7 @@ def strip_check_sum (ttx_string): def generate_expected_output(input_file, unicodes, profile_flags, instance_flags, output_directory, font_name): - fonttools_path = os.path.join(tempfile.mkdtemp (), font_name) - args = ["fonttools", "subset", input_file] - args.extend(["--drop-tables+=DSIG", - "--drop-tables-=sbix", - "--unicodes=%s" % unicodes, - "--output-file=%s" % fonttools_path]) - args.extend(profile_flags) - check_call(args) - + input_path = input_file if instance_flags: instance_path = os.path.join(tempfile.mkdtemp (), font_name) args = ["fonttools", "varLib.instancer", @@ -44,10 +36,19 @@ def generate_expected_output(input_file, unicodes, profile_flags, instance_flags "--no-recalc-bounds", "--no-recalc-timestamp", "--output=%s" % instance_path, - fonttools_path] + input_file] args.extend(instance_flags) check_call(args) - fonttools_path = instance_path + input_path = instance_path + + fonttools_path = os.path.join(tempfile.mkdtemp (), font_name) + args = ["fonttools", "subset", input_path] + args.extend(["--drop-tables+=DSIG", + "--drop-tables-=sbix", + "--unicodes=%s" % unicodes, + "--output-file=%s" % fonttools_path]) + args.extend(profile_flags) + check_call(args) with io.StringIO () as fp: with TTFont (fonttools_path) as font: diff --git a/test/subset/meson.build b/test/subset/meson.build index 3c62640ab..5510ebf4a 100644 --- a/test/subset/meson.build +++ b/test/subset/meson.build @@ -54,6 +54,7 @@ tests = [ # 'pin_all_at_default', # 'instantiate_glyf', # 'full_instance', +# 'instance_feature_variations', ] repack_tests = [