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

instancer: call optimize() after instantiateItemVariationStore, not inside

Browse Source 
for HVAR/VVAR without indirect mappings, we can skip calling VarStore.optimize() and
keep a direct mapping from GID to VarIdx
This commit is contained in:
Cosimo Lupo 2019-04-20 12:25:25 +01:00
parent 349417d57e
commit 1b5393acdd
No known key found for this signature in database
GPG Key ID: 179A8F0895A02F4F
2 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Lib/fontTools/varLib/instancer.py
View File

@ -163,16 +163,15 @@ def instantiateMVAR(varfont, location):
mvar = varfont["MVAR"].table mvar = varfont["MVAR"].table
fvarAxes = varfont["fvar"].axes fvarAxes = varfont["fvar"].axes
defaultDeltas, varIndexMapping = instantiateItemVariationStore( varStore = mvar.VarStore
mvar.VarStore, fvarAxes, location defaultDeltas = instantiateItemVariationStore(varStore, fvarAxes, location)
)
setMvarDeltas(varfont, defaultDeltas) setMvarDeltas(varfont, defaultDeltas)
if varIndexMapping: if varStore.VarRegionList.Region:
varIndexMapping = varStore.optimize()
for rec in mvar.ValueRecord: for rec in mvar.ValueRecord:
rec.VarIdx = varIndexMapping[rec.VarIdx] rec.VarIdx = varIndexMapping[rec.VarIdx]
else: else:
# Delete table if no more regions left.
del varfont["MVAR"] del varfont["MVAR"]
@ -258,6 +257,10 @@ def instantiateItemVariationStore(itemVarStore, fvarAxes, location):
Remove regions in which all axes were instanced, and scale the deltas of Remove regions in which all axes were instanced, and scale the deltas of
the remaining regions where only some of the axes were instanced. the remaining regions where only some of the axes were instanced.
The number of VarData subtables, and the number of items within each, are
not modified, in order to keep the existing VariationIndex valid.
One may call VarStore.optimize() method after this to further optimize those.
Args: Args:
varStore: An otTables.VarStore object (Item Variation Store) varStore: An otTables.VarStore object (Item Variation Store)
fvarAxes: list of fvar's Axis objects fvarAxes: list of fvar's Axis objects
@ -267,8 +270,6 @@ def instantiateItemVariationStore(itemVarStore, fvarAxes, location):
Returns: Returns:
defaultDeltas: to be added to the default instance, of type dict of ints keyed defaultDeltas: to be added to the default instance, of type dict of ints keyed
by VariationIndex compound values: i.e. (outer << 16) + inner. by VariationIndex compound values: i.e. (outer << 16) + inner.
varIndexMapping: a mapping from old to new VarIdx after optimization (None if
varStore was fully instanced thus left empty).
""" """
tupleVarStore = _TupleVarStoreAdapter.fromItemVarStore(itemVarStore, fvarAxes) tupleVarStore = _TupleVarStoreAdapter.fromItemVarStore(itemVarStore, fvarAxes)
defaultDeltaArray = tupleVarStore.instantiate(location) defaultDeltaArray = tupleVarStore.instantiate(location)
@ -278,18 +279,12 @@ def instantiateItemVariationStore(itemVarStore, fvarAxes, location):
assert itemVarStore.VarDataCount == newItemVarStore.VarDataCount assert itemVarStore.VarDataCount == newItemVarStore.VarDataCount
itemVarStore.VarData = newItemVarStore.VarData itemVarStore.VarData = newItemVarStore.VarData
if itemVarStore.VarRegionList.Region:
# optimize VarStore, and get a map from old to new VarIdx after optimization
varIndexMapping = itemVarStore.optimize()
else:
varIndexMapping = None # VarStore is empty
defaultDeltas = { defaultDeltas = {
((major << 16) + minor): delta ((major << 16) + minor): delta
for major, deltas in enumerate(defaultDeltaArray) for major, deltas in enumerate(defaultDeltaArray)
for minor, delta in enumerate(deltas) for minor, delta in enumerate(deltas)
} }
return defaultDeltas, varIndexMapping return defaultDeltas
def instantiateOTL(varfont, location): def instantiateOTL(varfont, location):
@ -305,11 +300,10 @@ def instantiateOTL(varfont, location):
log.info(msg) log.info(msg)
gdef = varfont["GDEF"].table gdef = varfont["GDEF"].table
varStore = gdef.VarStore
fvarAxes = varfont["fvar"].axes fvarAxes = varfont["fvar"].axes
defaultDeltas, varIndexMapping = instantiateItemVariationStore( defaultDeltas = instantiateItemVariationStore(varStore, fvarAxes, location)
gdef.VarStore, fvarAxes, location
)
# When VF are built, big lookups may overflow and be broken into multiple # When VF are built, big lookups may overflow and be broken into multiple
# subtables. MutatorMerger (which inherits from AligningMerger) reattaches # subtables. MutatorMerger (which inherits from AligningMerger) reattaches
@ -321,11 +315,12 @@ def instantiateOTL(varfont, location):
# LigatureCarets, and optionally deletes all VariationIndex tables if the # LigatureCarets, and optionally deletes all VariationIndex tables if the
# VarStore is fully instanced. # VarStore is fully instanced.
merger = MutatorMerger( merger = MutatorMerger(
varfont, defaultDeltas, deleteVariations=(varIndexMapping is None) varfont, defaultDeltas, deleteVariations=(not varStore.VarRegionList.Region)
) )
merger.mergeTables(varfont, [varfont], ["GDEF", "GPOS"]) merger.mergeTables(varfont, [varfont], ["GDEF", "GPOS"])
if varIndexMapping: if varStore.VarRegionList.Region:
varIndexMapping = varStore.optimize()
gdef.remap_device_varidxes(varIndexMapping) gdef.remap_device_varidxes(varIndexMapping)
if "GPOS" in varfont: if "GPOS" in varfont:
varfont["GPOS"].table.remap_device_varidxes(varIndexMapping) varfont["GPOS"].table.remap_device_varidxes(varIndexMapping)

2
Tests/varLib/instancer_test.py
View File

@ -328,7 +328,7 @@ class InstantiateItemVariationStoreTest(object):
def test_instantiate_default_deltas( def test_instantiate_default_deltas(
self, varStore, fvarAxes, location, expected_deltas, num_regions self, varStore, fvarAxes, location, expected_deltas, num_regions
): ):
defaultDeltas, _ = instancer.instantiateItemVariationStore( defaultDeltas = instancer.instantiateItemVariationStore(
varStore, fvarAxes, location varStore, fvarAxes, location
) )