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

psCharstrings.py. Fold CFF2CharString() logic into T2Charstring(). Working towards using one set of classes for both CFF2 and CFF data.

Browse Source
This commit is contained in:
ReadRoberts 2017-05-09 11:23:14 -07:00 committed by Miguel Sousa
parent dee5cfee2f
commit 88e72e2c56
1 changed files with 15 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -815,9 +815,6 @@ class T2OutlineExtractor(T2WidthExtractor):
self.rCurveTo((dxa, 0), (dxb, dyb), (dxc, dyc)) self.rCurveTo((dxa, 0), (dxb, dyb), (dxc, dyc))
return args return args
class CFF2OutlineExtractor(T2OutlineExtractor):
pass
class T1OutlineExtractor(T2OutlineExtractor): class T1OutlineExtractor(T2OutlineExtractor):
def __init__(self, pen, subrs): def __init__(self, pen, subrs):
@ -967,13 +964,14 @@ class T2CharString(ByteCodeBase):
decompilerClass = SimpleT2Decompiler decompilerClass = SimpleT2Decompiler
outlineExtractor = T2OutlineExtractor outlineExtractor = T2OutlineExtractor
def __init__(self, bytecode=None, program=None, private=None, globalSubrs=None): def __init__(self, bytecode=None, program=None, private=None, globalSubrs=None, isCFF2 = False):
if program is None: if program is None:
program = [] program = []
self.bytecode = bytecode self.bytecode = bytecode
self.program = program self.program = program
self.private = private self.private = private
self.globalSubrs = globalSubrs if globalSubrs is not None else [] self.globalSubrs = globalSubrs if globalSubrs is not None else []
self.isCFF2 = isCFF2
def __repr__(self): def __repr__(self):
if self.bytecode is None: if self.bytecode is None:
@ -991,7 +989,7 @@ class T2CharString(ByteCodeBase):
if not self.needsDecompilation(): if not self.needsDecompilation():
return return
subrs = getattr(self.private, "Subrs", []) subrs = getattr(self.private, "Subrs", [])
decompiler = self.decompilerClass(subrs, self.globalSubrs) decompiler = self.decompilerClass(subrs, self.globalSubrs, self.private)
decompiler.execute(self) decompiler.execute(self)
def draw(self, pen): def draw(self, pen):
@ -1002,9 +1000,12 @@ class T2CharString(ByteCodeBase):
self.width = extractor.width self.width = extractor.width
def check_program(self, program): def check_program(self, program):
if self.isCFF2:
if self.program:
assert self.program[-1] not in ("seac",), "illegal CFF2 CharString Termination"
else:
assert self.program, "illegal CharString: decompiled to empty program" assert self.program, "illegal CharString: decompiled to empty program"
assert self.program[-1] in ("endchar", "return", "callsubr", "callgsubr", assert self.program[-1] in ("endchar", "return", "callsubr", "callgsubr", "seac"), "illegal CharString"
"seac"), "illegal CharString"
def compile(self): def compile(self):
if self.bytecode is not None: if self.bytecode is not None:
@ -1042,6 +1043,10 @@ class T2CharString(ByteCodeBase):
raise raise
self.setBytecode(bytecode) self.setBytecode(bytecode)
if self.isCFF2:
if self.bytecode and (byteord(self.bytecode[-1]) in (11, 14)):
self.bytecode = self.bytecode[:-1]
def needsDecompilation(self): def needsDecompilation(self):
return self.bytecode is not None return self.bytecode is not None
@ -1151,27 +1156,9 @@ class CFF2CharString(T2CharString):
operandEncoding = t2OperandEncoding operandEncoding = t2OperandEncoding
operators, opcodes = buildOperatorDict(CFF2Operators) operators, opcodes = buildOperatorDict(CFF2Operators)
decompilerClass = SimpleCFF2Decompiler decompilerClass = SimpleCFF2Decompiler
outlineExtractor = CFF2OutlineExtractor
def check_program(self, program): def __init__(self, bytecode=None, program=None, private=None, globalSubrs=None, isCFF2 = True):
#assert self.program, "illegal CharString: decompiled to empty program" super(CFF2CharString, self).__init__(bytecode, program, private, globalSubrs, isCFF2)
# Empty program is OK for CFF2 Charstring - same a T2 with only an endchar.
if self.program:
assert self.program[-1] not in ("seac"), "illegal CFF2 CharString Termination"
def compile(self):
# Remove endchar, if there is one.
super(CFF2CharString, self).compile()
if self.bytecode and (byteord(self.bytecode[-1]) in (11, 14)):
self.bytecode = self.bytecode[:-1]
def decompile(self):
# Remove endchar, if there is one.
if not self.needsDecompilation():
return
subrs = getattr(self.private, "Subrs", [])
decompiler = self.decompilerClass(subrs, self.globalSubrs, self.private)
decompiler.execute(self)
class CFF2SubrCharString(CFF2CharString): class CFF2SubrCharString(CFF2CharString):
pass pass