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

[varLib.featureVars] Fix region-merging code on Py3

Browse Source 
We should clean up all the various "convert dict to tuple" duplicated
code, but this fixes it for now.  doctest updated.

Fixes https://github.com/fonttools/fonttools/issues/1659
This commit is contained in:
Behdad Esfahbod 2019-07-09 16:14:01 -07:00
parent e1f0d1ae09
commit 84b9e9c387
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Lib/fontTools/varLib/featureVars.py
View File

@ -71,7 +71,7 @@ def overlayFeatureVariations(conditionalSubstitutions):
and rules with the same Box merged. The more specific rules appear earlier and rules with the same Box merged. The more specific rules appear earlier
in the resulting list. Moreover, instead of just a dictionary of substitutions, in the resulting list. Moreover, instead of just a dictionary of substitutions,
a list of dictionaries is returned for substitutions corresponding to each a list of dictionaries is returned for substitutions corresponding to each
uniq space, with each dictionary being identical to one of the input unique space, with each dictionary being identical to one of the input
substitution dictionaries. These dictionaries are not merged to allow data substitution dictionaries. These dictionaries are not merged to allow data
sharing when they are converted into font tables. sharing when they are converted into font tables.
@ -79,6 +79,7 @@ def overlayFeatureVariations(conditionalSubstitutions):
>>> condSubst = [ >>> condSubst = [
... # A list of (Region, Substitution) tuples. ... # A list of (Region, Substitution) tuples.
... ([{"wght": (0.5, 1.0)}], {"dollar": "dollar.rvrn"}), ... ([{"wght": (0.5, 1.0)}], {"dollar": "dollar.rvrn"}),
... ([{"wght": (0.5, 1.0)}], {"dollar": "dollar.rvrn"}),
... ([{"wdth": (0.5, 1.0)}], {"cent": "cent.rvrn"}), ... ([{"wdth": (0.5, 1.0)}], {"cent": "cent.rvrn"}),
... ] ... ]
>>> from pprint import pprint >>> from pprint import pprint
@ -107,7 +108,8 @@ def overlayFeatureVariations(conditionalSubstitutions):
# rules for the same region. # rules for the same region.
merged = OrderedDict() merged = OrderedDict()
for key,value in reversed(conditionalSubstitutions): for key,value in reversed(conditionalSubstitutions):
key = tuple(sorted(hashdict(cleanupBox(k)) for k in key)) key = tuple(sorted((hashdict(cleanupBox(k)) for k in key),
key=lambda d: tuple(sorted(d.items()))))
if key in merged: if key in merged:
merged[key].update(value) merged[key].update(value)
else: else: