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

Handle implicit CFF2 closePath within T2OutlineExtractor

Browse Source
This commit is contained in:
Skef Iterum 2022-04-14 07:19:44 -07:00
parent 169731c7f5
commit 520ee0236d
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Lib/fontTools/misc/psCharStrings.py
View File

@ -502,11 +502,20 @@ class T2OutlineExtractor(T2WidthExtractor):
T2WidthExtractor.__init__( T2WidthExtractor.__init__(
self, localSubrs, globalSubrs, nominalWidthX, defaultWidthX, private) self, localSubrs, globalSubrs, nominalWidthX, defaultWidthX, private)
self.pen = pen self.pen = pen
self.subrLevel = 0
def reset(self): def reset(self):
T2WidthExtractor.reset(self) T2WidthExtractor.reset(self)
self.currentPoint = (0, 0) self.currentPoint = (0, 0)
self.sawMoveTo = 0 self.sawMoveTo = 0
self.subrLevel = 0
def execute(self, charString):
self.subrLevel += 1
super().execute(charString)
self.subrLevel -= 1
if self.subrLevel == 0:
self.endPath()
def _nextPoint(self, point): def _nextPoint(self, point):
x, y = self.currentPoint x, y = self.currentPoint
@ -536,8 +545,11 @@ class T2OutlineExtractor(T2WidthExtractor):
def endPath(self): def endPath(self):
# In T2 there are no open paths, so always do a closePath when # In T2 there are no open paths, so always do a closePath when
# finishing a sub path. # finishing a sub path. We avoid spurious calls to closePath()
self.closePath() # because its a real T1 op we're emulating in T2 whereas
# endPath() is just a means to that emulation
if self.sawMoveTo:
self.closePath()
# #
# hint operators # hint operators
@ -980,7 +992,6 @@ class T2CharString(object):
self.private.nominalWidthX, self.private.defaultWidthX, self.private.nominalWidthX, self.private.defaultWidthX,
self.private) self.private)
extractor.execute(self) extractor.execute(self)
extractor.endPath()
self.width = extractor.width self.width = extractor.width
def calcBounds(self, glyphSet): def calcBounds(self, glyphSet):