varLib. Use designspace <axes> element to define the axisMap and order. #857
Conversation
…he axis map, and preserve the axis order.
Lib/fontTools/varLib/__init__.py
Outdated
| @@ -59,7 +60,9 @@ def _add_fvar(font, axes, instances, axis_map): | |||
| font['fvar'] = fvar = newTable('fvar') | |||
| nameTable = font['name'] | |||
|
|
|||
| for iden in sorted(axes.keys(), key=lambda k: axis_map[k][0]): | |||
| for iden in axis_map.keys(): | |||
| if not axes.has_key(iden): | |||
There was a problem hiding this comment.
You need to use in instead of has_key, as that no longer exists in py3
| @@ -29,6 +29,7 @@ | |||
| from fontTools.ttLib.tables import otTables as ot | |||
| from fontTools.varLib import builder, designspace, models | |||
| from fontTools.varLib.merger import VariationMerger | |||
| import collections | |||
There was a problem hiding this comment.
This is not used downstream
| @@ -1,5 +1,6 @@ | |||
| """Rudimentary support for loading MutatorMath .designspace files.""" | |||
| from __future__ import print_function, division, absolute_import | |||
| import collections | |||
There was a problem hiding this comment.
Wouldn't it be better to do from collections import OrderedDict ?
There was a problem hiding this comment.
I don't think it would make any difference.
The designspace_test.py also needs to be modified (that's why CI are failing).
There was a problem hiding this comment.
I guess if you use OrderedDict more than once, you can spare an extra attribute lookup if you import from, as Miguel suggested.
|
@behdad ok then you can merge it. The CI will still fail as the tests needs to be adjusted. |
|
@anthrotype I can take care of the fixes |
|
Thanks Read and Miguel. |
Here is a method to use the designspace element to define the axis map, and preserve the axis order. If the element does not exist, still uses the standard_map, but with the order preserved.