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

[ttGlyphPen] further simplify

Browse Source
This commit is contained in:
Cosimo Lupo 2018-03-01 19:08:23 +00:00
parent ede35d72c8
commit 4377185e29
No known key found for this signature in database
GPG Key ID: 59D54DB0C9976482
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -87,19 +87,11 @@ class TTGlyphPen(AbstractPen):
def glyph(self, componentFlags=0x4): def glyph(self, componentFlags=0x4):
assert self._isClosed(), "Didn't close last contour." assert self._isClosed(), "Didn't close last contour."
overflowing = False # we can't encode transform values > 2 or < -2 in F2Dot14,
for i, (glyphName, transformation) in enumerate(self.components): # so we must decompose the glyph if any transform exceeds these
if any(s > 2 or s < -2 for s in transformation[:4]): overflowing = any(s > 2 or s < -2
# can't encode transform values > 2 or < -2 in F2Dot14, for (glyphName, transformation) in self.components
# so we must decompose the component for s in transformation[:4])
overflowing = True
break
elif any(MAX_F2DOT14 < s <= 2 for s in transformation[:4]):
# clamp values ~= +2.0 so we can keep the component
clamped = [MAX_F2DOT14 if MAX_F2DOT14 < s <= 2 else s
for s in transformation[:4]]
clamped.extend(transformation[4:])
self.components[i] = (glyphName, tuple(clamped))
components = [] components = []
for glyphName, transformation in self.components: for glyphName, transformation in self.components:
@ -111,9 +103,14 @@ class TTGlyphPen(AbstractPen):
component = GlyphComponent() component = GlyphComponent()
component.glyphName = glyphName component.glyphName = glyphName
if transformation[:4] != (1, 0, 0, 1):
component.transform = (transformation[:2], transformation[2:4])
component.x, component.y = transformation[4:] component.x, component.y = transformation[4:]
transformation = transformation[:4]
if transformation != (1, 0, 0, 1):
if any(MAX_F2DOT14 < s <= 2 for s in transformation):
# clamp values ~= +2.0 so we can keep the component
transformation = tuple(MAX_F2DOT14 if MAX_F2DOT14 < s <= 2
else s for s in transformation)
component.transform = (transformation[:2], transformation[2:])
component.flags = componentFlags component.flags = componentFlags
components.append(component) components.append(component)