Remove residual allowVID stuff

Part of https://github.com/fonttools/fonttools/pull/2398
This commit is contained in:
Behdad Esfahbod 2021-08-25 15:55:17 -06:00
parent 3eef446efe
commit d867397532
3 changed files with 2 additions and 14 deletions

View File

@ -2912,13 +2912,11 @@ class Subsetter(object):
@timer("load font") @timer("load font")
def load_font(fontFile, def load_font(fontFile,
options, options,
allowVID=False,
checkChecksums=0, checkChecksums=0,
dontLoadGlyphNames=False, dontLoadGlyphNames=False,
lazy=True): lazy=True):
font = ttLib.TTFont(fontFile, font = ttLib.TTFont(fontFile,
allowVID=allowVID,
checkChecksums=checkChecksums, checkChecksums=checkChecksums,
recalcBBoxes=options.recalc_bounds, recalcBBoxes=options.recalc_bounds,
recalcTimestamp=options.recalc_timestamp, recalcTimestamp=options.recalc_timestamp,

View File

@ -118,7 +118,6 @@ class Options(object):
disassembleInstructions = True disassembleInstructions = True
mergeFile = None mergeFile = None
recalcBBoxes = True recalcBBoxes = True
allowVID = False
ignoreDecompileErrors = True ignoreDecompileErrors = True
bitmapGlyphDataFormat = 'raw' bitmapGlyphDataFormat = 'raw'
unicodedata = None unicodedata = None
@ -184,8 +183,6 @@ class Options(object):
self.mergeFile = value self.mergeFile = value
elif option == "-b": elif option == "-b":
self.recalcBBoxes = False self.recalcBBoxes = False
elif option == "-a":
self.allowVID = True
elif option == "-e": elif option == "-e":
self.ignoreDecompileErrors = False self.ignoreDecompileErrors = False
elif option == "--unicodedata": elif option == "--unicodedata":
@ -258,7 +255,7 @@ def ttDump(input, output, options):
log.info('Dumping "%s" to "%s"...', input, output) log.info('Dumping "%s" to "%s"...', input, output)
if options.unicodedata: if options.unicodedata:
setUnicodeData(options.unicodedata) setUnicodeData(options.unicodedata)
ttf = TTFont(input, 0, allowVID=options.allowVID, ttf = TTFont(input, 0,
ignoreDecompileErrors=options.ignoreDecompileErrors, ignoreDecompileErrors=options.ignoreDecompileErrors,
fontNumber=options.fontNumber) fontNumber=options.fontNumber)
ttf.saveXML(output, ttf.saveXML(output,
@ -280,8 +277,7 @@ def ttCompile(input, output, options):
sfnt.USE_ZOPFLI = True sfnt.USE_ZOPFLI = True
ttf = TTFont(options.mergeFile, flavor=options.flavor, ttf = TTFont(options.mergeFile, flavor=options.flavor,
recalcBBoxes=options.recalcBBoxes, recalcBBoxes=options.recalcBBoxes,
recalcTimestamp=options.recalcTimestamp, recalcTimestamp=options.recalcTimestamp)
allowVID=options.allowVID)
ttf.importXML(input) ttf.importXML(input)
if options.recalcTimestamp is None and 'head' in ttf: if options.recalcTimestamp is None and 'head' in ttf:

View File

@ -436,12 +436,6 @@ def test_options_b():
tto = ttx.Options([("-b", "")], 1) tto = ttx.Options([("-b", "")], 1)
assert tto.recalcBBoxes is False assert tto.recalcBBoxes is False
def test_options_a():
tto = ttx.Options([("-a", "")], 1)
assert tto.allowVID is True
def test_options_e(): def test_options_e():
tto = ttx.Options([("-e", "")], 1) tto = ttx.Options([("-e", "")], 1)
assert tto.ignoreDecompileErrors is False assert tto.ignoreDecompileErrors is False