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

[avarPlanner] Move code around

Browse Source 
Towards more refactoring.
This commit is contained in:
Behdad Esfahbod 2023-07-24 14:22:35 -06:00
parent ca7267330b
commit c95a0f916f
1 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
Lib/fontTools/varLib/avarPlanner.py
View File

@ -759,23 +759,6 @@ def main(args=None):
elif axis.axisTag == "opsz": elif axis.axisTag == "opsz":
opszAxis = axis opszAxis = axis
wghtExistingMapping = (
wdthExistingMapping
) = slntExistingMapping = opszExistingMapping = None
if "avar" in font:
if wghtAxis:
wghtExistingMapping = font["avar"].segments["wght"]
font["avar"].segments["wght"] = {}
if wdthAxis:
wdthExistingMapping = font["avar"].segments["wdth"]
font["avar"].segments["wdth"] = {}
if slntAxis:
slntExistingMapping = font["avar"].segments["slnt"]
font["avar"].segments["slnt"] = {}
if opszAxis:
opszExistingMapping = font["avar"].segments["opsz"]
font["avar"].segments["opsz"] = {}
if options.glyphs is not None: if options.glyphs is not None:
glyphs = options.glyphs.split() glyphs = options.glyphs.split()
if ":" in options.glyphs: if ":" in options.glyphs:
@ -792,6 +775,12 @@ def main(args=None):
if wghtAxis: if wghtAxis:
log.info("Planning weight axis.") log.info("Planning weight axis.")
if "avar" in font:
wghtExistingMapping = font["avar"].segments["wght"]
font["avar"].segments["wght"] = {}
else:
wghtExistingMapping = None
if options.weights is not None: if options.weights is not None:
weights = [float(w) for w in options.weights.split()] weights = [float(w) for w in options.weights.split()]
else: else:
@ -840,6 +829,12 @@ def main(args=None):
if wdthAxis: if wdthAxis:
log.info("Planning width axis.") log.info("Planning width axis.")
if "avar" in font:
wdthExistingMapping = font["avar"].segments["wdth"]
font["avar"].segments["wdth"] = {}
else:
wdthExistingMapping = None
if options.widths is not None: if options.widths is not None:
widths = [float(w) for w in options.widths.split()] widths = [float(w) for w in options.widths.split()]
else: else:
@ -888,6 +883,12 @@ def main(args=None):
if slntAxis: if slntAxis:
log.info("Planning slant axis.") log.info("Planning slant axis.")
if "avar" in font:
slntExistingMapping = font["avar"].segments["slnt"]
font["avar"].segments["slnt"] = {}
else:
slntExistingMapping = None
if options.slants is not None: if options.slants is not None:
slants = [float(w) for w in options.slants.split()] slants = [float(w) for w in options.slants.split()]
else: else:
@ -936,6 +937,12 @@ def main(args=None):
if opszAxis: if opszAxis:
log.info("Planning optical-size axis.") log.info("Planning optical-size axis.")
if "avar" in font:
opszExistingMapping = font["avar"].segments["opsz"]
font["avar"].segments["opsz"] = {}
else:
opszExistingMapping = None
if options.sizes is not None: if options.sizes is not None:
sizes = [float(w) for w in options.sizes.split()] sizes = [float(w) for w in options.sizes.split()]
else: else: