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

instancer: rename parameters to more generic 'axisLimits'

Browse Source 
I use the term 'location' for map of {axis_tag: float} coordinates, 'axisRanges'
for a map of {axis_tag: Tuple[float, float]} ranges, and 'axisLimits' to include
either single-float coordinates or range tuples.
This commit is contained in:
Cosimo Lupo 2019-11-15 19:36:57 +00:00
parent 12e1a6de37
commit 0b9404d7a4
No known key found for this signature in database
GPG Key ID: 20D4A261E4A0E642
1 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -315,7 +315,7 @@ def limitTupleVariationAxisRange(var, axisTag, axisRange):
return [var, newVar] return [var, newVar]
def instantiateGvarGlyph(varfont, glyphname, location, optimize=True): def instantiateGvarGlyph(varfont, glyphname, axisLimits, optimize=True):
glyf = varfont["glyf"] glyf = varfont["glyf"]
coordinates, ctrl = glyf.getCoordinatesAndControls(glyphname, varfont) coordinates, ctrl = glyf.getCoordinatesAndControls(glyphname, varfont)
endPts = ctrl.endPts endPts = ctrl.endPts
@ -327,7 +327,7 @@ def instantiateGvarGlyph(varfont, glyphname, location, optimize=True):
if tupleVarStore: if tupleVarStore:
defaultDeltas = instantiateTupleVariationStore( defaultDeltas = instantiateTupleVariationStore(
tupleVarStore, location, coordinates, endPts tupleVarStore, axisLimits, coordinates, endPts
) )
if defaultDeltas: if defaultDeltas:
@ -355,7 +355,7 @@ def instantiateGvarGlyph(varfont, glyphname, location, optimize=True):
var.optimize(coordinates, endPts, isComposite) var.optimize(coordinates, endPts, isComposite)
def instantiateGvar(varfont, location, optimize=True): def instantiateGvar(varfont, axisLimits, optimize=True):
log.info("Instantiating glyf/gvar tables") log.info("Instantiating glyf/gvar tables")
gvar = varfont["gvar"] gvar = varfont["gvar"]
@ -374,7 +374,7 @@ def instantiateGvar(varfont, location, optimize=True):
), ),
) )
for glyphname in glyphnames: for glyphname in glyphnames:
instantiateGvarGlyph(varfont, glyphname, location, optimize=optimize) instantiateGvarGlyph(varfont, glyphname, axisLimits, optimize=optimize)
if not gvar.variations: if not gvar.variations:
del varfont["gvar"] del varfont["gvar"]
@ -386,12 +386,12 @@ def setCvarDeltas(cvt, deltas):
cvt[i] += otRound(delta) cvt[i] += otRound(delta)
def instantiateCvar(varfont, location): def instantiateCvar(varfont, axisLimits):
log.info("Instantiating cvt/cvar tables") log.info("Instantiating cvt/cvar tables")
cvar = varfont["cvar"] cvar = varfont["cvar"]
defaultDeltas = instantiateTupleVariationStore(cvar.variations, location) defaultDeltas = instantiateTupleVariationStore(cvar.variations, axisLimits)
if defaultDeltas: if defaultDeltas:
setCvarDeltas(varfont["cvt "], defaultDeltas) setCvarDeltas(varfont["cvt "], defaultDeltas)
@ -417,13 +417,13 @@ def setMvarDeltas(varfont, deltas):
) )
def instantiateMVAR(varfont, location): def instantiateMVAR(varfont, axisLimits):
log.info("Instantiating MVAR table") log.info("Instantiating MVAR table")
mvar = varfont["MVAR"].table mvar = varfont["MVAR"].table
fvarAxes = varfont["fvar"].axes fvarAxes = varfont["fvar"].axes
varStore = mvar.VarStore varStore = mvar.VarStore
defaultDeltas = instantiateItemVariationStore(varStore, fvarAxes, location) defaultDeltas = instantiateItemVariationStore(varStore, fvarAxes, axisLimits)
setMvarDeltas(varfont, defaultDeltas) setMvarDeltas(varfont, defaultDeltas)
if varStore.VarRegionList.Region: if varStore.VarRegionList.Region:
@ -477,12 +477,12 @@ def _instantiateVHVAR(varfont, axisLimits, tableFields):
) )
def instantiateHVAR(varfont, location): def instantiateHVAR(varfont, axisLimits):
return _instantiateVHVAR(varfont, location, varLib.HVAR_FIELDS) return _instantiateVHVAR(varfont, axisLimits, varLib.HVAR_FIELDS)
def instantiateVVAR(varfont, location): def instantiateVVAR(varfont, axisLimits):
return _instantiateVHVAR(varfont, location, varLib.VVAR_FIELDS) return _instantiateVHVAR(varfont, axisLimits, varLib.VVAR_FIELDS)
class _TupleVarStoreAdapter(object): class _TupleVarStoreAdapter(object):
@ -580,8 +580,9 @@ class _TupleVarStoreAdapter(object):
def instantiateItemVariationStore(itemVarStore, fvarAxes, axisLimits): def instantiateItemVariationStore(itemVarStore, fvarAxes, axisLimits):
""" Compute deltas at partial location, and update varStore in-place. """ Compute deltas at partial location, and update varStore in-place.
Remove regions in which all axes were instanced, and scale the deltas of Remove regions in which all axes were instanced, or fall outside the new axis
the remaining regions where only some of the axes were instanced. limits. Scale the deltas of the remaining regions where only some of the axes
were instanced.
The number of VarData subtables, and the number of items within each, are The number of VarData subtables, and the number of items within each, are
not modified, in order to keep the existing VariationIndex valid. not modified, in order to keep the existing VariationIndex valid.
@ -590,8 +591,9 @@ def instantiateItemVariationStore(itemVarStore, fvarAxes, axisLimits):
Args: Args:
varStore: An otTables.VarStore object (Item Variation Store) varStore: An otTables.VarStore object (Item Variation Store)
fvarAxes: list of fvar's Axis objects fvarAxes: list of fvar's Axis objects
location: Dict[str, float] mapping axis tags to normalized axis coordinates. axisLimits: Dict[str, float] mapping axis tags to normalized axis coordinates
May not specify coordinates for all the fvar axes. (float) or ranges for restricting an axis' min/max (NormalizedAxisRange).
May not specify coordinates/ranges for all the fvar axes.
Returns: Returns:
defaultDeltas: to be added to the default instance, of type dict of floats defaultDeltas: to be added to the default instance, of type dict of floats
@ -613,7 +615,7 @@ def instantiateItemVariationStore(itemVarStore, fvarAxes, axisLimits):
return defaultDeltas return defaultDeltas
def instantiateOTL(varfont, location): def instantiateOTL(varfont, axisLimits):
# TODO(anthrotype) Support partial instancing of JSTF and BASE tables # TODO(anthrotype) Support partial instancing of JSTF and BASE tables
if ( if (
@ -633,7 +635,7 @@ def instantiateOTL(varfont, location):
varStore = gdef.VarStore varStore = gdef.VarStore
fvarAxes = varfont["fvar"].axes fvarAxes = varfont["fvar"].axes
defaultDeltas = instantiateItemVariationStore(varStore, fvarAxes, location) defaultDeltas = instantiateItemVariationStore(varStore, fvarAxes, axisLimits)
# When VF are built, big lookups may overflow and be broken into multiple # When VF are built, big lookups may overflow and be broken into multiple
# subtables. MutatorMerger (which inherits from AligningMerger) reattaches # subtables. MutatorMerger (which inherits from AligningMerger) reattaches