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

[VARC] Adjust XML output based on review feedback

Browse Source
This commit is contained in:
Behdad Esfahbod 2024-01-22 14:20:35 -08:00
parent 7d6df04d44
commit 40584ad489
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Lib/fontTools/ttLib/tables/otTables.py
View File

@ -279,18 +279,24 @@ class VarComponent:
writer.begintag("VarComponent", attrs)
writer.newline()
def write(name, value):
def write(name, value, attrs=()):
if value is not None:
writer.simpletag(name, value=value)
writer.simpletag(name, (("value", value),) + attrs)
writer.newline()
write("glyphName", self.glyphName)
if self.flags & VarComponentFlags.RESET_UNSPECIFIED_AXES:
write("resetUnspecifiedAxes", True)
if self.axisIndicesIndex is not None:
write("axisIndicesIndex", self.axisIndicesIndex)
write("axisValues", [float(fl2str(v, 14)) for v in self.axisValues])
if (
self.axisIndicesIndex is not None
or self.flags & VarComponentFlags.RESET_UNSPECIFIED_AXES
):
if self.flags & VarComponentFlags.RESET_UNSPECIFIED_AXES:
attrs = (("resetUnspecifiedAxes", 1),)
else:
attrs = ()
write("axisValues", [float(fl2str(v, 14)) for v in self.axisValues], attrs)
if self.axisValuesVarIndex != NO_VARIATION_INDEX:
write("axisValuesVarIndex", self.axisValuesVarIndex)
@ -319,14 +325,12 @@ class VarComponent:
if name == "glyphName":
self.glyphName = v
elif name == "resetUnspecifiedAxes":
self.flags = VarComponentFlags.RESET_UNSPECIFIED_AXES if v else 0
elif name == "flags":
self.flags = safeEval(v)
elif name == "axisIndicesIndex":
self.axisIndicesIndex = safeEval(v)
elif name == "axisValues":
self.axisValues = tuple(str2fl(v, 14) for v in safeEval(v))
if safeEval(attrs.get("resetUnspecifiedAxes", "0")):
self.flags |= VarComponentFlags.RESET_UNSPECIFIED_AXES
elif name == "axisValuesVarIndex":
self.axisValuesVarIndex = safeEval(v)
elif name == "transformVarIndex":