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

[varLib] Remove unused build(..., axisMap) argument

Browse Source 
Axis map should be specified in designspace file now.
This commit is contained in:
Behdad Esfahbod 2017-04-12 15:43:13 -07:00
parent c922962056
commit 242faa798a
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -351,16 +351,13 @@ def _merge_OTL(font, model, master_fonts, axisTags, base_idx):
GDEF.VarStore = store GDEF.VarStore = store
def build(designspace_filename, master_finder=lambda s:s, axisMap=None): def build(designspace_filename, master_finder=lambda s:s):
""" """
Build variation font from a designspace file. Build variation font from a designspace file.
If master_finder is set, it should be a callable that takes master If master_finder is set, it should be a callable that takes master
filename as found in designspace file and map it to master font filename as found in designspace file and map it to master font
binary as to be opened (eg. .ttf or .otf). binary as to be opened (eg. .ttf or .otf).
If axisMap is set, it should be an ordered dictionary mapping axis-id to
(axis-tag, axis-name).
""" """
ds = designspace.load(designspace_filename) ds = designspace.load(designspace_filename)
@ -393,11 +390,7 @@ def build(designspace_filename, master_finder=lambda s:s, axisMap=None):
('custom', ('xxxx', 'Custom')) ('custom', ('xxxx', 'Custom'))
]) ])
if axisMap: if axes is not None:
# a dictionary mapping axis-id to (axis-tag, axis-name) was provided
axis_map = standard_axis_map.copy()
axis_map.update(axisMap)
elif axes is not None:
# the designspace file loaded had an <axes> element. # the designspace file loaded had an <axes> element.
# honor the order of the axes # honor the order of the axes
axis_map = OrderedDict() axis_map = OrderedDict()
@ -414,8 +407,6 @@ def build(designspace_filename, master_finder=lambda s:s, axisMap=None):
axis_map = standard_axis_map axis_map = standard_axis_map
# TODO: For weight & width, use OS/2 values and setup 'avar' mapping.
master_locs = [o['location'] for o in masters] master_locs = [o['location'] for o in masters]
axis_names = set(master_locs[0].keys()) axis_names = set(master_locs[0].keys())