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

[varLib] Add VariationModel.getDeltasAndSupports()

Browse Source 
which automatically fetches submodel.  Needs docstrings...

Part of https://github.com/googlei18n/fontmake/issues/88
Part of https://github.com/fonttools/fonttools/issues/1355
This commit is contained in:
Behdad Esfahbod 2018-11-08 10:05:18 -05:00
parent 6886075a23
commit fba530a548
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -411,9 +411,7 @@ def _merge_TTHinting(font, masterModel, master_ttfs, tolerance=0.5):
cvar.version = 1 cvar.version = 1
cvar.variations = [] cvar.variations = []
model, all_cvs = masterModel.getSubModel(all_cvs) deltas, supports = masterModel.getDeltasAndSupports(all_cvs)
deltas = model.getDeltas(all_cvs)
supports = model.supports
for i,(delta,support) in enumerate(zip(deltas[1:], supports[1:])): for i,(delta,support) in enumerate(zip(deltas[1:], supports[1:])):
delta = [otRound(d) for d in delta] delta = [otRound(d) for d in delta]
if all(abs(v) <= tolerance for v in delta): if all(abs(v) <= tolerance for v in delta):

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

@ -338,6 +338,10 @@ class VariationModel(object):
out.append(delta) out.append(delta)
return out return out
def getDeltasAndSupports(self, items):
model, items = getSubModel(items)
return model.getDeltas(items), model.supports
def getScalars(self, loc): def getScalars(self, loc):
return [supportScalar(loc, support) for support in self.supports] return [supportScalar(loc, support) for support in self.supports]