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

- Properly support the pen protocol for open sub paths in Type 1

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/fonttools/code/trunk@452 4cde692c-a291-49d1-8350-778aa11640f8
This commit is contained in:
jvr 2003-09-16 09:48:28 +00:00
parent cc580ac0f8
commit d3ee2d4319
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -579,6 +579,11 @@ class T2OutlineExtractor(SimpleT2Decompiler):
self.pen.closePath() self.pen.closePath()
self.sawMoveTo = 0 self.sawMoveTo = 0
def endPath(self):
# In T2 there are no open paths, so always do a closePath when
# finishing a sub path.
self.closePath()
def popallWidth(self, evenOdd=0): def popallWidth(self, evenOdd=0):
args = self.popall() args = self.popall()
if not self.gotWidth: if not self.gotWidth:
@ -614,16 +619,16 @@ class T2OutlineExtractor(SimpleT2Decompiler):
# path constructors, moveto # path constructors, moveto
# #
def op_rmoveto(self, index): def op_rmoveto(self, index):
self.closePath() self.endPath()
self.rMoveTo(self.popallWidth()) self.rMoveTo(self.popallWidth())
def op_hmoveto(self, index): def op_hmoveto(self, index):
self.closePath() self.endPath()
self.rMoveTo((self.popallWidth(1)[0], 0)) self.rMoveTo((self.popallWidth(1)[0], 0))
def op_vmoveto(self, index): def op_vmoveto(self, index):
self.closePath() self.endPath()
self.rMoveTo((0, self.popallWidth(1)[0])) self.rMoveTo((0, self.popallWidth(1)[0]))
def op_endchar(self, index): def op_endchar(self, index):
self.closePath() self.endPath()
args = self.popallWidth() args = self.popallWidth()
if args: if args:
from fontTools.encodings.StandardEncoding import StandardEncoding from fontTools.encodings.StandardEncoding import StandardEncoding
@ -842,6 +847,11 @@ class T1OutlineExtractor(T2OutlineExtractor):
self.sbx = 0 self.sbx = 0
T2OutlineExtractor.reset(self) T2OutlineExtractor.reset(self)
def endPath(self):
if self.sawMoveTo:
self.pen.endPath()
self.sawMoveTo = 0
def popallWidth(self, evenOdd=0): def popallWidth(self, evenOdd=0):
return self.popall() return self.popall()
@ -853,6 +863,7 @@ class T1OutlineExtractor(T2OutlineExtractor):
# path constructors # path constructors
# #
def op_rmoveto(self, index): def op_rmoveto(self, index):
self.endPath()
if self.flexing: if self.flexing:
return return
self.rMoveTo(self.popall()) self.rMoveTo(self.popall())
@ -861,6 +872,7 @@ class T1OutlineExtractor(T2OutlineExtractor):
# We must add a parameter to the stack if we are flexing # We must add a parameter to the stack if we are flexing
self.push(0) self.push(0)
return return
self.endPath()
self.rMoveTo((self.popall()[0], 0)) self.rMoveTo((self.popall()[0], 0))
def op_vmoveto(self, index): def op_vmoveto(self, index):
if self.flexing: if self.flexing:
@ -868,6 +880,7 @@ class T1OutlineExtractor(T2OutlineExtractor):
self.push(0) self.push(0)
self.exch() self.exch()
return return
self.endPath()
self.rMoveTo((0, self.popall()[0])) self.rMoveTo((0, self.popall()[0]))
def op_closepath(self, index): def op_closepath(self, index):
self.closePath() self.closePath()
@ -877,7 +890,7 @@ class T1OutlineExtractor(T2OutlineExtractor):
self.currentPoint = x, y self.currentPoint = x, y
def op_endchar(self, index): def op_endchar(self, index):
self.closePath() self.endPath()
def op_hsbw(self, index): def op_hsbw(self, index):
sbx, wx = self.popall() sbx, wx = self.popall()