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

Rename: Var* types: Scalar->Fixed, NormalizedScalar->F2Dot14, etc.

Browse Source 
VariablePosition -> VarInt16
VariableDistance -> VarUInt16

cf. https://github.com/googlefonts/colr-gradients-spec/issues/17
This commit is contained in:
Cosimo Lupo 2020-07-01 20:13:14 +01:00
parent 690080b14d
commit ff7dc9a1c5
No known key found for this signature in database
GPG Key ID: 179A8F0895A02F4F
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Lib/fontTools/ttLib/tables/otConverters.py
View File

@ -1686,22 +1686,22 @@ class _NamedTupleConverter(BaseConverter):
return self.tupleClass(**kwargs)
class VariableScalar(_NamedTupleConverter):
class VarFixed(_NamedTupleConverter):
tupleClass = VariableFloat
converterClasses = [Fixed, ULong]
class VariableNormalizedScalar(_NamedTupleConverter):
class VarF2Dot14(_NamedTupleConverter):
tupleClass = VariableFloat
converterClasses = [F2Dot14, ULong]
class VariablePosition(_NamedTupleConverter):
class VarInt16(_NamedTupleConverter):
tupleClass = VariableInt
converterClasses = [Short, ULong]
class VariableDistance(_NamedTupleConverter):
class VarUInt16(_NamedTupleConverter):
tupleClass = VariableInt
converterClasses = [UShort, ULong]
@ -1762,8 +1762,8 @@ converterMapping = {
"LOffsetTo": lambda C: partial(LTable, tableClass=C),
# Variable types
"VariableScalar": VariableScalar,
"VariableNormalizedScalar": VariableNormalizedScalar,
"VariablePosition": VariablePosition,
"VariableDistance": VariableDistance,
"VarFixed": VarFixed,
"VarF2Dot14": VarF2Dot14,
"VarInt16": VarInt16,
"VarUInt16": VarUInt16,
}

20
Lib/fontTools/ttLib/tables/otData.py
View File

@ -1593,24 +1593,24 @@ otData = [
]),
('Affine2x2', [
('VariableScalar', 'xx', None, None, ''),
('VariableScalar', 'xy', None, None, ''),
('VariableScalar', 'yx', None, None, ''),
('VariableScalar', 'yy', None, None, ''),
('VarFixed', 'xx', None, None, ''),
('VarFixed', 'xy', None, None, ''),
('VarFixed', 'yx', None, None, ''),
('VarFixed', 'yy', None, None, ''),
]),
('Point', [
('VariablePosition', 'x', None, None, ''),
('VariablePosition', 'y', None, None, ''),
('VarInt16', 'x', None, None, ''),
('VarInt16', 'y', None, None, ''),
]),
('Color', [
('uint16', 'PaletteIndex', None, None, 'Index value to use with a selected color palette.'),
('VariableNormalizedScalar', 'Transparency', None, None, 'Values outsided [0.,1.] reserved'),
('VarF2Dot14', 'Transparency', None, None, 'Values outsided [0.,1.] reserved'),
]),
('ColorStop', [
('VariableNormalizedScalar', 'StopOffset', None, None, ''),
('VarF2Dot14', 'StopOffset', None, None, ''),
('Color', 'Color', None, None, ''),
]),
@ -1638,8 +1638,8 @@ otData = [
('LOffset', 'ColorLine', None, None, 'Offset (from beginning of Paint table) to ColorLine subtable.'),
('Point', 'c0', None, None, ''),
('Point', 'c1', None, None, ''),
('VariableDistance', 'r0', None, None, ''),
('VariableDistance', 'r1', None, None, ''),
('VarUInt16', 'r0', None, None, ''),
('VarUInt16', 'r1', None, None, ''),
('LOffsetTo(Affine2x2)', 'Affine', None, None, 'Offset (from beginning of Paint table) to Affine2x2 subtable.'),
]),
]