shadowfacts/fonttools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[GX] Test round-trip decompile/compile for glyph variations

Browse Source 
Also, implement an __eq__ method on GlyphVariation so we can verify
whether the result of round-tripping actually equals the original input.
This commit is contained in:
Sascha Brawer 2015-05-06 08:43:11 +02:00
parent 5c58ba221a
commit 513458f558
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Lib/fontTools/ttLib/tables/_g_v_a_r.py
View File

@ -364,6 +364,9 @@ class GlyphVariation:
axes = ",".join(sorted(["%s=%s" % (name, value) for (name, value) in self.axes.items()])) axes = ",".join(sorted(["%s=%s" % (name, value) for (name, value) in self.axes.items()]))
return "<GlyphVariation %s %s>" % (axes, self.coordinates) return "<GlyphVariation %s %s>" % (axes, self.coordinates)
def __eq__(self, other):
return self.coordinates == other.coordinates and self.axes == other.axes
def getUsedPoints(self): def getUsedPoints(self):
result = set() result = set()
for p in range(len(self.coordinates)): for p in range(len(self.coordinates)):

17
Lib/fontTools/ttLib/tables/_g_v_a_r_test.py
View File

@ -90,7 +90,7 @@ class GlyphVariationTableTest(unittest.TestCase):
gvar2 = GlyphVariation({"wght": (1.0, 1.0, 1.0), "wdth": (1.0, 1.0, 1.0)}, glyphCoords) gvar2 = GlyphVariation({"wght": (1.0, 1.0, 1.0), "wdth": (1.0, 1.0, 1.0)}, glyphCoords)
table.variations = {"oslash": [gvar1, gvar2]} table.variations = {"oslash": [gvar1, gvar2]}
data = table.compileGlyph_("oslash", numPoints, axisTags, {}) data = table.compileGlyph_("oslash", numPoints, axisTags, {})
print(table.decompileGlyph_(numPoints, {}, axisTags, data)) self.assertEqual([gvar1, gvar2], table.decompileGlyph_(numPoints, {}, axisTags, data))
def test_compileSharedCoords(self): def test_compileSharedCoords(self):
class FakeFont: class FakeFont:
@ -163,6 +163,21 @@ class GlyphVariationTableTest(unittest.TestCase):
self.assertEqual({"wght": 0.0, "wdth": 0.7}, maxCoord) self.assertEqual({"wght": 0.0, "wdth": 0.7}, maxCoord)
class GlyphVariationTest(unittest.TestCase): class GlyphVariationTest(unittest.TestCase):
def test_equal(self):
gvar1 = GlyphVariation({"wght":(0.0, 1.0, 1.0)}, GlyphCoordinates([(0,0), (9,8), (7,6)]))
gvar2 = GlyphVariation({"wght":(0.0, 1.0, 1.0)}, GlyphCoordinates([(0,0), (9,8), (7,6)]))
self.assertEqual(gvar1, gvar2)
def test_equal_differentAxes(self):
gvar1 = GlyphVariation({"wght":(0.0, 1.0, 1.0)}, GlyphCoordinates([(0,0), (9,8), (7,6)]))
gvar2 = GlyphVariation({"wght":(0.7, 0.8, 0.9)}, GlyphCoordinates([(0,0), (9,8), (7,6)]))
self.assertNotEqual(gvar1, gvar2)
def test_equal_differentCoordinates(self):
gvar1 = GlyphVariation({"wght":(0.0, 1.0, 1.0)}, GlyphCoordinates([(0,0), (9,8), (7,6)]))
gvar2 = GlyphVariation({"wght":(0.0, 1.0, 1.0)}, GlyphCoordinates([(0,0), (9,8)]))
self.assertNotEqual(gvar1, gvar2)
def test_hasImpact_someDeltasNotZero(self): def test_hasImpact_someDeltasNotZero(self):
axes = {"wght":(0.0, 1.0, 1.0)} axes = {"wght":(0.0, 1.0, 1.0)}
gvar = GlyphVariation(axes, GlyphCoordinates([(0,0), (9,8), (7,6)])) gvar = GlyphVariation(axes, GlyphCoordinates([(0,0), (9,8), (7,6)]))