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

use designspace.rulesProcessingLast flag to determine whether we should use 'rvrn' or 'rclt'

Browse Source
This commit is contained in:
justvanrossum 2019-10-18 13:21:06 +02:00
parent d42b7d74ca
commit 0ee3f01f0c
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -613,7 +613,7 @@ def _merge_OTL(font, model, master_fonts, axisTags):
font['GPOS'].table.remap_device_varidxes(varidx_map)
def _add_GSUB_feature_variations(font, axes, internal_axis_supports, rules):
def _add_GSUB_feature_variations(font, axes, internal_axis_supports, rules, rulesProcessingLast):
def normalize(name, value):
return models.normalizeLocation(
@ -648,7 +648,11 @@ def _add_GSUB_feature_variations(font, axes, internal_axis_supports, rules):
conditional_subs.append((region, subs))
addFeatureVariations(font, conditional_subs)
if rulesProcessingLast:
featureTag = 'rclt'
else:
featureTag = 'rvrn'
addFeatureVariations(font, conditional_subs, featureTag)
_DesignSpaceData = namedtuple(
@ -661,6 +665,7 @@ _DesignSpaceData = namedtuple(
"masters",
"instances",
"rules",
"rulesProcessingLast",
],
)
@ -761,6 +766,7 @@ def load_designspace(designspace):
masters,
instances,
ds.rules,
getattr(ds, "rulesProcessingLast", False),
)
@ -865,7 +871,7 @@ def build(designspace, master_finder=lambda s:s, exclude=[], optimize=True):
if 'cvar' not in exclude and 'glyf' in vf:
_merge_TTHinting(vf, model, master_fonts)
if 'GSUB' not in exclude and ds.rules:
_add_GSUB_feature_variations(vf, ds.axes, ds.internal_axis_supports, ds.rules)
_add_GSUB_feature_variations(vf, ds.axes, ds.internal_axis_supports, ds.rules, ds.rulesProcessingLast)
if 'CFF2' not in exclude and 'CFF ' in vf:
_add_CFF2(vf, model, master_fonts)
if "post" in vf: