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

Merge pull request #1271 from anthrotype/pr/1211

Browse Source 
rebase #1211
This commit is contained in:
Cosimo Lupo 2018-06-11 12:33:40 +01:00 committed by GitHub
commit 2e797a902d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Lib/fontTools/cffLib/__init__.py
View File

@ -244,7 +244,7 @@ class CFFFontSet(object):
if key in topDict.rawDict: if key in topDict.rawDict:
del topDict.rawDict[key] del topDict.rawDict[key]
if hasattr(topDict, key): if hasattr(topDict, key):
exec("del topDict.%s" % (key)) delattr(topDict, key)
if not hasattr(topDict, "FDArray"): if not hasattr(topDict, "FDArray"):
fdArray = topDict.FDArray = FDArrayIndex() fdArray = topDict.FDArray = FDArrayIndex()
@ -257,6 +257,7 @@ class CFFFontSet(object):
else: else:
charStrings.fdArray = fdArray charStrings.fdArray = fdArray
fontDict = FontDict() fontDict = FontDict()
fontDict.setCFF2(True)
fdArray.append(fontDict) fdArray.append(fontDict)
fontDict.Private = privateDict fontDict.Private = privateDict
privateOpOrder = buildOrder(privateDictOperators2) privateOpOrder = buildOrder(privateDictOperators2)
@ -267,12 +268,20 @@ class CFFFontSet(object):
# print "Removing private dict", key # print "Removing private dict", key
del privateDict.rawDict[key] del privateDict.rawDict[key]
if hasattr(privateDict, key): if hasattr(privateDict, key):
exec("del privateDict.%s" % (key)) delattr(privateDict, key)
# print "Removing privateDict attr", key # print "Removing privateDict attr", key
else: else:
# clean up the PrivateDicts in the fdArray # clean up the PrivateDicts in the fdArray
fdArray = topDict.FDArray
privateOpOrder = buildOrder(privateDictOperators2) privateOpOrder = buildOrder(privateDictOperators2)
for fontDict in fdArray: for fontDict in fdArray:
fontDict.setCFF2(True)
for key in fontDict.rawDict.keys():
if key not in fontDict.order:
del fontDict.rawDict[key]
if hasattr(fontDict, key):
delattr(fontDict, key)
privateDict = fontDict.Private privateDict = fontDict.Private
for entry in privateDictOperators: for entry in privateDictOperators:
key = entry[1] key = entry[1]
@ -281,7 +290,7 @@ class CFFFontSet(object):
# print "Removing private dict", key # print "Removing private dict", key
del privateDict.rawDict[key] del privateDict.rawDict[key]
if hasattr(privateDict, key): if hasattr(privateDict, key):
exec("del privateDict.%s" % (key)) delattr(privateDict, key)
# print "Removing privateDict attr", key # print "Removing privateDict attr", key
# At this point, the Subrs and Charstrings are all still T2Charstring class # At this point, the Subrs and Charstrings are all still T2Charstring class
# easiest to fix this by compiling, then decompiling again # easiest to fix this by compiling, then decompiling again
@ -2381,13 +2390,24 @@ class FontDict(BaseDict):
defaults = {} defaults = {}
converters = buildConverters(topDictOperators) converters = buildConverters(topDictOperators)
compilerClass = FontDictCompiler compilerClass = FontDictCompiler
order = ['FontName', 'FontMatrix', 'Weight', 'Private'] orderCFF = ['FontName', 'FontMatrix', 'Weight', 'Private']
orderCFF2 = ['Private']
decompilerClass = TopDictDecompiler decompilerClass = TopDictDecompiler
def __init__(self, strings=None, file=None, offset=None, def __init__(self, strings=None, file=None, offset=None,
GlobalSubrs=None, isCFF2=None, vstore=None): GlobalSubrs=None, isCFF2=None, vstore=None):
super(FontDict, self).__init__(strings, file, offset, isCFF2=isCFF2) super(FontDict, self).__init__(strings, file, offset, isCFF2=isCFF2)
self.vstore = vstore self.vstore = vstore
self.setCFF2(isCFF2)
def setCFF2(self, isCFF2):
# isCFF2 may be None.
if isCFF2:
self.order = self.orderCFF2
self._isCFF2 = True
else:
self.order = self.orderCFF
self._isCFF2 = False
class PrivateDict(BaseDict): class PrivateDict(BaseDict):