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

[VarComposite] Rename as per review

Browse Source
This commit is contained in:
Behdad Esfahbod 2023-02-02 11:00:45 -07:00
parent 700a8b36f6
commit aa2e29f05f
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Lib/fontTools/ttLib/tables/_g_l_y_f.py
View File

@ -1719,7 +1719,7 @@ VarComponentTransformMappingValues = namedtuple(
["flag", "fractionalBits", "scale", "defaultValue"], ["flag", "fractionalBits", "scale", "defaultValue"],
) )
var_component_transform_mapping = { VAR_COMPONENT_TRANSFORM_MAPPING = {
"translateX": VarComponentTransformMappingValues( "translateX": VarComponentTransformMappingValues(
VarComponentFlags.HAVE_TRANSLATE_X, 0, 1, 0 VarComponentFlags.HAVE_TRANSLATE_X, 0, 1, 0
), ),
@ -1804,7 +1804,7 @@ class GlyphVarComponent(object):
else: else:
return data, values.defaultValue return data, values.defaultValue
for attr_name, mapping_values in var_component_transform_mapping.items(): for attr_name, mapping_values in VAR_COMPONENT_TRANSFORM_MAPPING.items():
data, value = read_transform_component(data, mapping_values) data, value = read_transform_component(data, mapping_values)
setattr(self, attr_name, value) setattr(self, attr_name, value)
@ -1824,7 +1824,7 @@ class GlyphVarComponent(object):
if not hasattr(self, "flags"): if not hasattr(self, "flags"):
flags = 0 flags = 0
# Calculate optimal transform component flags # Calculate optimal transform component flags
for attr_name, mapping in var_component_transform_mapping.items(): for attr_name, mapping in VAR_COMPONENT_TRANSFORM_MAPPING.items():
value = getattr(self, attr_name, mapping.defaultValue) value = getattr(self, attr_name, mapping.defaultValue)
if fl2fi(value / mapping.scale, mapping.fractionalBits) != fl2fi( if fl2fi(value / mapping.scale, mapping.fractionalBits) != fl2fi(
mapping.defaultValue / mapping.scale, mapping.fractionalBits mapping.defaultValue / mapping.scale, mapping.fractionalBits
@ -1876,7 +1876,7 @@ class GlyphVarComponent(object):
else: else:
return data return data
for attr_name, mapping_values in var_component_transform_mapping.items(): for attr_name, mapping_values in VAR_COMPONENT_TRANSFORM_MAPPING.items():
value = getattr(self, attr_name, mapping_values.defaultValue) value = getattr(self, attr_name, mapping_values.defaultValue)
data = write_transform_component(data, value, mapping_values) data = write_transform_component(data, value, mapping_values)
@ -1888,7 +1888,7 @@ class GlyphVarComponent(object):
if hasattr(self, "flags"): if hasattr(self, "flags"):
attrs = attrs + [("flags", hex(self.flags))] attrs = attrs + [("flags", hex(self.flags))]
for attr_name, mapping in var_component_transform_mapping.items(): for attr_name, mapping in VAR_COMPONENT_TRANSFORM_MAPPING.items():
v = getattr(self, attr_name, mapping.defaultValue) v = getattr(self, attr_name, mapping.defaultValue)
if v != mapping.defaultValue: if v != mapping.defaultValue:
attrs.append((attr_name, fl2str(v, mapping.fractionalBits))) attrs.append((attr_name, fl2str(v, mapping.fractionalBits)))
@ -1913,7 +1913,7 @@ class GlyphVarComponent(object):
if "flags" in attrs: if "flags" in attrs:
self.flags = safeEval(attrs["flags"]) self.flags = safeEval(attrs["flags"])
for attr_name, mapping in var_component_transform_mapping.items(): for attr_name, mapping in VAR_COMPONENT_TRANSFORM_MAPPING.items():
v = ( v = (
str2fl(safeEval(attrs[attr_name]), mapping.fractionalBits) str2fl(safeEval(attrs[attr_name]), mapping.fractionalBits)
if attr_name in attrs if attr_name in attrs