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

Fix missing composite instructions in ttx (#3092)

Browse Source 
* Fix calculation of haveInstructions
* Add test
This commit is contained in:
Jens Kutilek 2023-04-25 16:21:24 +02:00 committed by GitHub
parent 2e1eda2695
commit 85c80be6b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 96 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/fontTools/ttLib/tables/_g_l_y_f.py
View File

@ -746,7 +746,7 @@ class Glyph(object):
for compo in self.components: for compo in self.components:
compo.toXML(writer, ttFont) compo.toXML(writer, ttFont)
haveInstructions = hasattr(self, "program") haveInstructions = hasattr(self, "program")
if self.isVarComposite(): elif self.isVarComposite():
for compo in self.components: for compo in self.components:
compo.toXML(writer, ttFont) compo.toXML(writer, ttFont)
haveInstructions = False haveInstructions = False

13
Tests/ttLib/tables/_g_l_y_f_test.py
View File

@ -186,6 +186,7 @@ GLYF_BIN = os.path.join(DATA_DIR, "_g_l_y_f_outline_flag_bit6.glyf.bin")
HEAD_BIN = os.path.join(DATA_DIR, "_g_l_y_f_outline_flag_bit6.head.bin") HEAD_BIN = os.path.join(DATA_DIR, "_g_l_y_f_outline_flag_bit6.head.bin")
LOCA_BIN = os.path.join(DATA_DIR, "_g_l_y_f_outline_flag_bit6.loca.bin") LOCA_BIN = os.path.join(DATA_DIR, "_g_l_y_f_outline_flag_bit6.loca.bin")
MAXP_BIN = os.path.join(DATA_DIR, "_g_l_y_f_outline_flag_bit6.maxp.bin") MAXP_BIN = os.path.join(DATA_DIR, "_g_l_y_f_outline_flag_bit6.maxp.bin")
INST_TTX = os.path.join(DATA_DIR, "_g_l_y_f_instructions.ttx")
def strip_ttLibVersion(string): def strip_ttLibVersion(string):
@ -235,6 +236,18 @@ class GlyfTableTest(unittest.TestCase):
glyfData = glyfTable.compile(font) glyfData = glyfTable.compile(font)
self.assertEqual(glyfData, self.glyfData) self.assertEqual(glyfData, self.glyfData)
def test_instructions_roundtrip(self):
font = TTFont(sfntVersion="\x00\x01\x00\x00")
font.importXML(INST_TTX)
glyfTable = font["glyf"]
self.glyfData = glyfTable.compile(font)
out = StringIO()
font.saveXML(out)
glyfXML = strip_ttLibVersion(out.getvalue()).splitlines()
with open(INST_TTX, "r") as f:
origXML = strip_ttLibVersion(f.read()).splitlines()
self.assertEqual(glyfXML, origXML)
def test_recursiveComponent(self): def test_recursiveComponent(self):
glyphSet = {} glyphSet = {}
pen_dummy = TTGlyphPen(glyphSet) pen_dummy = TTGlyphPen(glyphSet)

82
Tests/ttLib/tables/data/_g_l_y_f_instructions.ttx Normal file
View File

@ -0,0 +1,82 @@
<?xml version="1.0" encoding="UTF-8"?>
<ttFont sfntVersion="\x00\x01\x00\x00" ttLibVersion="4.39">
<GlyphOrder>
<!-- The 'id' attribute is only for humans; it is ignored when parsed. -->
<GlyphID id="0" name=".notdef"/>
<GlyphID id="1" name="NULL"/>
<GlyphID id="2" name="nonmarkingreturn"/>
<GlyphID id="3" name="A"/>
<GlyphID id="4" name="B"/>
</GlyphOrder>
<maxp>
<!-- Most of this table will be recalculated by the compiler -->
<tableVersion value="0x10000"/>
<numGlyphs value="5"/>
<maxPoints value="4"/>
<maxContours value="1"/>
<maxCompositePoints value="4"/>
<maxCompositeContours value="1"/>
<maxZones value="1"/>
<maxTwilightPoints value="0"/>
<maxStorage value="0"/>
<maxFunctionDefs value="10"/>
<maxInstructionDefs value="0"/>
<maxStackElements value="512"/>
<maxSizeOfInstructions value="371"/>
<maxComponentElements value="1"/>
<maxComponentDepth value="1"/>
</maxp>
<loca>
<!-- The 'loca' table will be calculated by the compiler -->
</loca>
<glyf>
<!-- The xMin, yMin, xMax and yMax values
will be recalculated by the compiler. -->
<TTGlyph name=".notdef"/><!-- contains no outline data -->
<TTGlyph name="A" xMin="100" yMin="0" xMax="477" yMax="700">
<contour>
<pt x="100" y="700" on="1"/>
<pt x="477" y="700" on="1"/>
<pt x="477" y="0" on="1"/>
<pt x="100" y="0" on="1"/>
</contour>
<instructions>
<assembly>
SVTCA[0] /* SetFPVectorToAxis */
PUSHW[ ] /* 1 value pushed */
3
MDAP[1] /* MoveDirectAbsPt */
IUP[0] /* InterpolateUntPts */
IUP[1] /* InterpolateUntPts */
</assembly>
</instructions>
</TTGlyph>
<TTGlyph name="B" xMin="100" yMin="0" xMax="477" yMax="700">
<component glyphName="A" x="0" y="0" flags="0x204"/>
<instructions>
<assembly>
SVTCA[0] /* SetFPVectorToAxis */
PUSHW[ ] /* 1 value pushed */
1
MDAP[1] /* MoveDirectAbsPt */
IUP[0] /* InterpolateUntPts */
IUP[1] /* InterpolateUntPts */
</assembly>
</instructions>
</TTGlyph>
<TTGlyph name="NULL"/><!-- contains no outline data -->
<TTGlyph name="nonmarkingreturn"/><!-- contains no outline data -->
</glyf>
</ttFont>