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

Merge pull request #1402 from fonttools/clean-cff2vf-2

Browse Source 
cff2 vf fixes. Make calc_bounds work, fix subsetting bug.
This commit is contained in:
Behdad Esfahbod 2018-12-11 20:31:11 -05:00 committed by GitHub
commit 03ad219493
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -407,7 +407,7 @@ class SimpleT2Decompiler(object):
numBlends = self.pop() numBlends = self.pop()
numOps = numBlends * (self.numRegions + 1) numOps = numBlends * (self.numRegions + 1)
blendArgs = self.operandStack[-numOps:] blendArgs = self.operandStack[-numOps:]
del self.operandStack[:-(numOps-numBlends)] # Leave the default operands on the stack. del self.operandStack[-(numOps-numBlends):] # Leave the default operands on the stack.
def op_vsindex(self, index): def op_vsindex(self, index):
vi = self.pop() vi = self.pop()
@ -446,8 +446,8 @@ t1Operators = [
class T2WidthExtractor(SimpleT2Decompiler): class T2WidthExtractor(SimpleT2Decompiler):
def __init__(self, localSubrs, globalSubrs, nominalWidthX, defaultWidthX): def __init__(self, localSubrs, globalSubrs, nominalWidthX, defaultWidthX, private=None):
SimpleT2Decompiler.__init__(self, localSubrs, globalSubrs) SimpleT2Decompiler.__init__(self, localSubrs, globalSubrs, private)
self.nominalWidthX = nominalWidthX self.nominalWidthX = nominalWidthX
self.defaultWidthX = defaultWidthX self.defaultWidthX = defaultWidthX
@ -488,9 +488,9 @@ class T2WidthExtractor(SimpleT2Decompiler):
class T2OutlineExtractor(T2WidthExtractor): class T2OutlineExtractor(T2WidthExtractor):
def __init__(self, pen, localSubrs, globalSubrs, nominalWidthX, defaultWidthX): def __init__(self, pen, localSubrs, globalSubrs, nominalWidthX, defaultWidthX, private=None):
T2WidthExtractor.__init__( T2WidthExtractor.__init__(
self, localSubrs, globalSubrs, nominalWidthX, defaultWidthX) self, localSubrs, globalSubrs, nominalWidthX, defaultWidthX, private)
self.pen = pen self.pen = pen
def reset(self): def reset(self):
@ -690,12 +690,6 @@ class T2OutlineExtractor(T2WidthExtractor):
self.rCurveTo((dx1, dy1), (dx2, dy2), (dx3, dy3)) self.rCurveTo((dx1, dy1), (dx2, dy2), (dx3, dy3))
self.rCurveTo((dx4, dy4), (dx5, dy5), (dx6, dy6)) self.rCurveTo((dx4, dy4), (dx5, dy5), (dx6, dy6))
#
# MultipleMaster. Well...
#
def op_blend(self, index):
self.popall()
# misc # misc
def op_and(self, index): def op_and(self, index):
raise NotImplementedError raise NotImplementedError
@ -963,7 +957,8 @@ class T2CharString(object):
def draw(self, pen): def draw(self, pen):
subrs = getattr(self.private, "Subrs", []) subrs = getattr(self.private, "Subrs", [])
extractor = self.outlineExtractor(pen, subrs, self.globalSubrs, extractor = self.outlineExtractor(pen, subrs, self.globalSubrs,
self.private.nominalWidthX, self.private.defaultWidthX) self.private.nominalWidthX, self.private.defaultWidthX,
self.private)
extractor.execute(self) extractor.execute(self)
self.width = extractor.width self.width = extractor.width

1
Lib/fontTools/subset/cff.py
View File

@ -141,7 +141,6 @@ def subset_glyphs(self, s):
@_add_method(psCharStrings.T2CharString) @_add_method(psCharStrings.T2CharString)
def subset_subroutines(self, subrs, gsubrs): def subset_subroutines(self, subrs, gsubrs):
p = self.program p = self.program
assert len(p)
for i in range(1, len(p)): for i in range(1, len(p)):
if p[i] == 'callsubr': if p[i] == 'callsubr':
assert isinstance(p[i-1], int) assert isinstance(p[i-1], int)