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

ttGlyphPen: always skip non-existing components

Browse Source 
It doesn't make sense to add components that reference non-existing base glyphs
(ie. glyphs not in the input glyphSet, hence missing from the generated glyf table).
Even if we let them in here, it will fail immediately as soon as we attempt to
compile this glyf table containing 'dangling' component references.
Better to warn and skip.
This commit is contained in:
Cosimo Lupo 2018-06-11 19:24:53 +01:00
parent ae69133924
commit 79449bc2d4
No known key found for this signature in database
GPG Key ID: 59D54DB0C9976482
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Lib/fontTools/pens/ttGlyphPen.py
View File

@ -100,33 +100,26 @@ class TTGlyphPen(LoggingPen):
def addComponent(self, glyphName, transformation):
self.components.append((glyphName, transformation))
def glyph(self, componentFlags=0x4):
assert self._isClosed(), "Didn't close last contour."
def _buildComponents(self, componentFlags):
if self.handleOverflowingTransforms:
# we can't encode transform values > 2 or < -2 in F2Dot14,
# so we must decompose the glyph if any transform exceeds these
overflowing = any(s > 2 or s < -2
for (glyphName, transformation) in self.components
for s in transformation[:4])
components = []
for glyphName, transformation in self.components:
if glyphName not in self.glyphSet:
self.log.warning(
"skipped non-existing component '%s'", glyphName
)
continue
if (self.points or
(self.handleOverflowingTransforms and overflowing)):
# can't have both coordinates and components, so decompose
try:
baseGlyph = self.glyphSet[glyphName]
except KeyError:
self.log.debug(
"can't decompose non-existing component '%s'; skipped",
glyphName
)
continue
else:
tpen = TransformPen(self, transformation)
baseGlyph.draw(tpen)
continue
tpen = TransformPen(self, transformation)
self.glyphSet[glyphName].draw(tpen)
continue
component = GlyphComponent()
component.glyphName = glyphName
@ -141,6 +134,12 @@ class TTGlyphPen(LoggingPen):
component.transform = (transformation[:2], transformation[2:])
component.flags = componentFlags
components.append(component)
return components
def glyph(self, componentFlags=0x4):
assert self._isClosed(), "Didn't close last contour."
components = self._buildComponents(componentFlags)
glyph = Glyph()
glyph.coordinates = GlyphCoordinates(self.points)