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

[varLib] Move code around

Browse Source
This commit is contained in:
Behdad Esfahbod 2016-08-15 16:29:21 -07:00
parent c5ad2cb267
commit 4fc2a3e5e1
2 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -136,21 +136,6 @@ def _SetCoordinates(font, glyphName, coord):
font["hmtx"].metrics[glyphName] = int(round(horizontalAdvanceWidth)), int(round(leftSideBearing)) font["hmtx"].metrics[glyphName] = int(round(horizontalAdvanceWidth)), int(round(leftSideBearing))
def _build_model(axes, master_locs, base_idx):
master_locs = [models.normalizeLocation(m, axes) for m in master_locs]
print("Normalized master positions:")
print(master_locs)
# Assume single-model for now.
model = models.VariationModel(master_locs)
model_base_idx = model.mapping[base_idx]
assert 0 == model_base_idx
return model
def _add_gvar(font, model, master_ttfs): def _add_gvar(font, model, master_ttfs):
print("Generating gvar") print("Generating gvar")
@ -279,8 +264,8 @@ def _merge_OTL(font, model, master_ttfs, axes, base_idx):
def main(args=None): def main(args=None):
import sys
if args is None: if args is None:
import sys
args = sys.argv[1:] args = sys.argv[1:]
(designspace_filename,) = args (designspace_filename,) = args
@ -372,7 +357,14 @@ def main(args=None):
_add_fvar(gx, axes, axis_names, instance_list) _add_fvar(gx, axes, axis_names, instance_list)
model = _build_model(axes, master_locs, base_idx) # Normalize master locations
master_locs = [models.normalizeLocation(m, axes) for m in master_locs]
print("Normalized master positions:")
print(master_locs)
# Assume single-model for now.
model = models.VariationModel(master_locs)
assert 0 == model.mapping[base_idx]
print("Building variations tables") print("Building variations tables")
_add_gvar(gx, model, master_fonts) _add_gvar(gx, model, master_fonts)

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

@ -13,8 +13,8 @@ import os.path
def main(args=None): def main(args=None):
import sys
if args is None: if args is None:
import sys
args = sys.argv[1:] args = sys.argv[1:]
varfilename = args[0] varfilename = args[0]