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

varLib.merger: have MutatorMerger use pre-computed deltas and optionally keep VarIdx tables

Browse Source
This commit is contained in:
Cosimo Lupo 2019-04-17 19:18:55 +01:00
parent 994a710b75
commit 4db603be96
No known key found for this signature in database
GPG Key ID: 20D4A261E4A0E642
2 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Lib/fontTools/varLib/merger.py
View File

@ -833,17 +833,10 @@ class MutatorMerger(AligningMerger):
the operation can benefit from many operations that the
aligning merger does."""
def __init__(self, font, location):
def __init__(self, font, instancer, deleteVariations=True):
Merger.__init__(self, font)
self.location = location
store = None
if 'GDEF' in font:
gdef = font['GDEF'].table
if gdef.Version >= 0x00010003:
store = gdef.VarStore
self.instancer = VarStoreInstancer(store, font['fvar'].axes, location)
self.instancer = instancer
self.deleteVariations = deleteVariations
@MutatorMerger.merger(ot.CaretValue)
def merge(merger, self, lst):
@ -856,14 +849,16 @@ def merge(merger, self, lst):
instancer = merger.instancer
dev = self.DeviceTable
del self.DeviceTable
if merger.deleteVariations:
del self.DeviceTable
if dev:
assert dev.DeltaFormat == 0x8000
varidx = (dev.StartSize << 16) + dev.EndSize
delta = otRound(instancer[varidx])
self.Coordinate += delta
self.Coordinate += delta
self.Format = 1
if merger.deleteVariations:
self.Format = 1
@MutatorMerger.merger(ot.Anchor)
def merge(merger, self, lst):
@ -880,7 +875,8 @@ def merge(merger, self, lst):
if not hasattr(self, tableName):
continue
dev = getattr(self, tableName)
delattr(self, tableName)
if merger.deleteVariations:
delattr(self, tableName)
if dev is None:
continue
@ -891,7 +887,8 @@ def merge(merger, self, lst):
attr = v+'Coordinate'
setattr(self, attr, getattr(self, attr) + delta)
self.Format = 1
if merger.deleteVariations:
self.Format = 1
@MutatorMerger.merger(otBase.ValueRecord)
def merge(merger, self, lst):
@ -900,7 +897,6 @@ def merge(merger, self, lst):
self.__dict__ = lst[0].__dict__.copy()
instancer = merger.instancer
# TODO Handle differing valueformats
for name, tableName in [('XAdvance','XAdvDevice'),
('YAdvance','YAdvDevice'),
('XPlacement','XPlaDevice'),
@ -909,7 +905,8 @@ def merge(merger, self, lst):
if not hasattr(self, tableName):
continue
dev = getattr(self, tableName)
delattr(self, tableName)
if merger.deleteVariations:
delattr(self, tableName)
if dev is None:
continue

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

@ -284,7 +284,7 @@ def instantiateVariableFont(varfont, location, inplace=False, overlap=True):
gdef = varfont['GDEF'].table
instancer = VarStoreInstancer(gdef.VarStore, fvar.axes, loc)
merger = MutatorMerger(varfont, loc)
merger = MutatorMerger(varfont, instancer)
merger.mergeTables(varfont, [varfont], ['GDEF', 'GPOS'])
# Downgrade GDEF.