diff --git a/Lib/fontTools/ttLib/tables/TupleVariation.py b/Lib/fontTools/ttLib/tables/TupleVariation.py index 92d07a11b..e2ceba4d1 100644 --- a/Lib/fontTools/ttLib/tables/TupleVariation.py +++ b/Lib/fontTools/ttLib/tables/TupleVariation.py @@ -71,7 +71,13 @@ class TupleVariation(object): if minValue == defaultMinValue and maxValue == defaultMaxValue: writer.simpletag("coord", axis=axis, value=value) else: - writer.simpletag("coord", axis=axis, value=value, min=minValue, max=maxValue) + attrs = [ + ("axis", axis), + ("min", minValue), + ("value", value), + ("max", maxValue), + ] + writer.simpletag("coord", attrs) writer.newline() wrote_any_deltas = False for i, delta in enumerate(self.coordinates): diff --git a/Tests/ttLib/tables/TupleVariation_test.py b/Tests/ttLib/tables/TupleVariation_test.py index 6986d5b6e..a9d09b2e4 100644 --- a/Tests/ttLib/tables/TupleVariation_test.py +++ b/Tests/ttLib/tables/TupleVariation_test.py @@ -107,7 +107,7 @@ class TupleVariationTest(unittest.TestCase): self.assertIn("bad delta format", [r.msg for r in captor.records]) self.assertEqual([ '', - '', + '', '', '', ], TupleVariationTest.xml_lines(writer)) @@ -118,7 +118,7 @@ class TupleVariationTest(unittest.TestCase): g.toXML(writer, ["wdth", "wght", "opsz"]) self.assertEqual([ '', - '', + '', '', '', '', @@ -134,7 +134,7 @@ class TupleVariationTest(unittest.TestCase): g.toXML(writer, ["wdth", "wght", "opsz"]) self.assertEqual([ '', - '', + '', '', '', '', diff --git a/Tests/ttLib/tables/_g_v_a_r_test.py b/Tests/ttLib/tables/_g_v_a_r_test.py index 64adbb612..ebae5806e 100644 --- a/Tests/ttLib/tables/_g_v_a_r_test.py +++ b/Tests/ttLib/tables/_g_v_a_r_test.py @@ -93,7 +93,7 @@ GVAR_XML = [ '', '', ' ', - ' ', + ' ', ' ', ' ', ' ', diff --git a/Tests/varLib/data/test_results/SparseMasters.ttx b/Tests/varLib/data/test_results/SparseMasters.ttx index 99a80bfb5..4ee03c114 100644 --- a/Tests/varLib/data/test_results/SparseMasters.ttx +++ b/Tests/varLib/data/test_results/SparseMasters.ttx @@ -574,7 +574,7 @@ - + @@ -594,7 +594,7 @@ - +