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

instancer: unpack axis (start, peak, end) tuple instead of indexing at PEAK_COORD_INDEX

Browse Source 
Makes it more readable
This commit is contained in:
Cosimo Lupo 2019-03-25 13:41:41 +00:00
parent 012d80db6d
commit 2b746d6e50
No known key found for this signature in database
GPG Key ID: 179A8F0895A02F4F
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Lib/fontTools/varLib/instancer.py
View File

@ -28,8 +28,6 @@ import re
log = logging.getLogger("fontTools.varlib.instancer")
PEAK_COORD_INDEX = 1
def instantiateTupleVariationStore(variations, location):
newVariations = []
@ -175,11 +173,11 @@ def instantiateItemVariationStore(varfont, tableName, location):
regionInfluenceMap = {}
pinnedAxes = set(location.keys())
for regionIndex, region in enumerate(table.VarStore.VarRegionList.Region):
# collect set of axisTags which have influence: peakCoord != 0
# collect set of axisTags which have influence: peak != 0
regionAxes = set(
key
for key, value in region.get_support(fvar.axes).items()
if value[PEAK_COORD_INDEX] != 0
axis
for axis, (start, peak, end) in region.get_support(fvar.axes).items()
if peak != 0
)
pinnedRegionAxes = regionAxes & pinnedAxes
if not pinnedRegionAxes:
@ -193,9 +191,9 @@ def instantiateItemVariationStore(varfont, tableName, location):
else:
# This region will be retained but the deltas have to be adjusted.
pinnedSupport = {
key: value
for key, value in region.get_support(fvar.axes).items()
if key in pinnedRegionAxes
axis: support
for axis, support in region.get_support(fvar.axes).items()
if axis in pinnedRegionAxes
}
pinnedScalar = supportScalar(location, pinnedSupport)
regionInfluenceMap.update({regionIndex: pinnedScalar})

4
Tests/varLib/instancer_test.py
View File

@ -165,9 +165,9 @@ class InstantiateMvarTest(object):
pinned_axes = location.keys()
fvar = varfont["fvar"]
assert all(
support[instancer.PEAK_COORD_INDEX] == 0
peak == 0
for region in mvar.VarStore.VarRegionList.Region
for axis, support in region.get_support(fvar.axes).items()
for axis, (start, peak, end) in region.get_support(fvar.axes).items()
if axis in pinned_axes
)