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

Restructure code

Browse Source
This commit is contained in:
Nyshadh Reddy Rachamallu 2018-11-16 14:12:26 -05:00
parent dbfba397e0
commit e756d3eb52
1 changed files with 33 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
Lib/fontTools/varLib/mutator.py
View File

@ -122,40 +122,48 @@ def instantiateVariableFont(varfont, location, inplace=False):
log.info("Building interpolated tables")
merger.instantiate()
addidef = False
for glyph in glyf.glyphs.values():
if addidef:
break
if hasattr(glyph, "program"):
instructions = glyph.program.getAssembly()
# If GETVARIATION opcode is used in bytecode of any glyph add IDEF
addidef = False
for instruction in instructions:
if instruction.startswith("GETVARIATION"):
addidef = True
break
if addidef:
asm = []
if varfont.has_key('fpgm'):
fpgm = varfont['fpgm']
asm = fpgm.program.getAssembly()
else:
fpgm = newTable('fpgm')
fpgm.program = ttProgram.Program()
varfont['fpgm'] = fpgm
log.info("Adding IDEF to fpgm table for GETVARIATION opcode")
asm.append("PUSHB[000] 145")
asm.append("IDEF[ ]")
args = [str(len(loc))]
for val in loc.values():
args.append(str(floatToFixed(val, 14)))
asm.append("NPUSHW[ ] " + ' '.join(args))
asm.append("ENDF[ ]")
fpgm.program.fromAssembly(asm)
if varfont.has_key('maxp'):
if hasattr(varfont['maxp'], "maxInstructionDefs"):
varfont['maxp'].maxInstructionDefs += 1
if hasattr(varfont['maxp'], "maxStackElements"):
varfont['maxp'].maxStackElements += len(loc)
break
if addidef:
log.info("Adding IDEF to fpgm table for GETVARIATION opcode")
asm = []
if varfont.has_key('fpgm'):
fpgm = varfont['fpgm']
asm = fpgm.program.getAssembly()
else:
fpgm = newTable('fpgm')
fpgm.program = ttProgram.Program()
varfont['fpgm'] = fpgm
asm.append("PUSHB[000] 145")
asm.append("IDEF[ ]")
args = [str(len(loc))]
for val in loc.values():
args.append(str(floatToFixed(val, 14)))
asm.append("NPUSHW[ ] " + ' '.join(args))
asm.append("ENDF[ ]")
fpgm.program.fromAssembly(asm)
# Change maxp attributes as IDEF is added
if varfont.has_key('maxp'):
maxp = varfont['maxp']
if hasattr(maxp, "maxInstructionDefs"):
maxp.maxInstructionDefs += 1
else:
setattr(maxp, "maxInstructionDefs", 1)
if hasattr(maxp, "maxStackElements"):
maxp.maxStackElements += len(loc)
else:
setattr(maxp, "maxInstructionDefs", len(loc))
if 'name' in varfont:
log.info("Pruning name table")