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

[VARC] Fixups

Browse Source
This commit is contained in:
Behdad Esfahbod 2023-12-19 17:02:05 -07:00
parent 9cc3689fb1
commit f73d6f2a6f
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -186,7 +186,7 @@ class VarTransform:
v = str2fl(safeEval(attrs[attr_name]), mapping.fractionalBits) v = str2fl(safeEval(attrs[attr_name]), mapping.fractionalBits)
setattr(self.transform, attr_name, v) setattr(self.transform, attr_name, v)
def applyDeltas(deltas): def applyDeltas(self, deltas):
i = 0 i = 0
def read_transform_component_delta(data, values): def read_transform_component_delta(data, values):
@ -199,7 +199,7 @@ class VarTransform:
return 0 return 0
for attr_name, mapping_values in VAR_TRANSFORM_MAPPING.items(): for attr_name, mapping_values in VAR_TRANSFORM_MAPPING.items():
value = read_transform_component_delta(data, mapping_values) value = read_transform_component_delta(deltas, mapping_values)
setattr( setattr(
self.transform, attr_name, getattr(self.transform, attr_name) + value self.transform, attr_name, getattr(self.transform, attr_name) + value
) )

5
Lib/fontTools/ttLib/ttGlyphSet.py
View File

@ -6,7 +6,7 @@ from contextlib import contextmanager
from copy import copy from copy import copy
from types import SimpleNamespace from types import SimpleNamespace
from fontTools.misc.vector import Vector from fontTools.misc.vector import Vector
from fontTools.misc.fixedTools import otRound from fontTools.misc.fixedTools import otRound, fixedToFloat as fi2fl
from fontTools.misc.loggingTools import deprecateFunction from fontTools.misc.loggingTools import deprecateFunction
from fontTools.misc.transform import Transform, DecomposedTransform from fontTools.misc.transform import Transform, DecomposedTransform
from fontTools.pens.transformPen import TransformPen, TransformPointPen from fontTools.pens.transformPen import TransformPen, TransformPointPen
@ -312,8 +312,9 @@ class _TTGlyphVARC(_TTGlyph):
axisValues = ( axisValues = (
axisValues + instancer[varIdx] axisValues + instancer[varIdx]
) # TODO Implement __iadd__ for Vector ) # TODO Implement __iadd__ for Vector
assert len(axisIndices) == len(axisValues), (len(axisIndices), len(axisValues))
location = { location = {
fvarAxes[i].axisTag: v for i, v in zip(axisIndices, axisValues) fvarAxes[i].axisTag: fi2fl(v, 14) for i, v in zip(axisIndices, axisValues)
} }
transform = DecomposedTransform() transform = DecomposedTransform()