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

[varLib] Minor

Browse Source
This commit is contained in:
Behdad Esfahbod 2018-11-08 17:57:51 -05:00
parent c2f0cdc31b
commit 881023c700
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Lib/fontTools/varLib/__init__.py
View File

@ -32,7 +32,7 @@ from fontTools.ttLib.tables.TupleVariation import TupleVariation
from fontTools.ttLib.tables import otTables as ot
from fontTools.ttLib.tables.otBase import OTTableWriter
from fontTools.varLib import builder, models, varStore
from fontTools.varLib.merger import VariationMerger, _all_equal
from fontTools.varLib.merger import VariationMerger
from fontTools.varLib.mvar import MVAR_ENTRIES
from fontTools.varLib.iup import iup_delta_optimize
from fontTools.varLib.featureVars import addFeatureVariations
@ -512,7 +512,7 @@ def _add_MVAR(font, model, master_ttfs, axisTags):
# TODO support gasp entries
master_values = [getattr(table, itemName) for table in tables]
if _all_equal(master_values):
if models.allSame(master_values):
base, varIdx = master_values[0], None
else:
base, varIdx = store_builder.storeMasters(master_values)

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

@ -8,7 +8,7 @@ from fontTools.misc import classifyTools
from fontTools.ttLib.tables import otTables as ot
from fontTools.ttLib.tables import otBase as otBase
from fontTools.ttLib.tables.DefaultTable import DefaultTable
from fontTools.varLib import builder, varStore
from fontTools.varLib import builder, models, varStore
from fontTools.varLib.varStore import VarStoreInstancer
from functools import reduce
@ -820,15 +820,7 @@ class VariationMerger(AligningMerger):
self.store_builder = varStore.OnlineVarStoreBuilder(axisTags)
self.store_builder.setModel(model)
def _all_equal(lst):
if not lst:
return True
it = iter(lst)
v0 = next(it)
for v in it:
if v0 != v:
return False
return True
_all_equal = models.allSame
def buildVarDevTable(store_builder, master_values):
if _all_equal(master_values):