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

[transform] Rename VarTransform to DecomposedTransform

Browse Source
This commit is contained in:
Behdad Esfahbod 2023-02-03 09:05:55 -07:00
parent 96f602cf3c
commit 2e20e47473
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/fontTools/misc/transform.py
View File

@ -401,7 +401,7 @@ def Scale(x, y=None):
@dataclass @dataclass
class VarTransform: class DecomposedTransform:
translateX: float = (0,) translateX: float = (0,)
translateY: float = (0,) translateY: float = (0,)
rotation: float = (0,) # in degrees, counter-clockwise rotation: float = (0,) # in degrees, counter-clockwise

6
Lib/fontTools/pens/basePen.py
View File

@ -39,7 +39,7 @@ sequence of length 2 will do.
from typing import Tuple, Dict from typing import Tuple, Dict
from fontTools.misc.loggingTools import LogMixin from fontTools.misc.loggingTools import LogMixin
from fontTools.misc.transform import VarTransform from fontTools.misc.transform import DecomposedTransform
__all__ = [ __all__ = [
"AbstractPen", "AbstractPen",
@ -135,11 +135,11 @@ class AbstractPen:
def addVarComponent( def addVarComponent(
self, self,
glyphName: str, glyphName: str,
transformation: VarTransform, transformation: DecomposedTransform,
location: Dict[str, float], location: Dict[str, float],
) -> None: ) -> None:
"""Add a VarComponent sub glyph. The 'transformation' argument """Add a VarComponent sub glyph. The 'transformation' argument
must be a VarTransform from the fontTools.misc.transform module, must be a DecomposedTransform from the fontTools.misc.transform module,
and the 'location' argument must be a dictionary mapping axis tags and the 'location' argument must be a dictionary mapping axis tags
to their locations. to their locations.
""" """

6
Lib/fontTools/pens/pointPen.py
View File

@ -16,7 +16,7 @@ import math
from typing import Any, Optional, Tuple, Dict from typing import Any, Optional, Tuple, Dict
from fontTools.pens.basePen import AbstractPen, PenError from fontTools.pens.basePen import AbstractPen, PenError
from fontTools.misc.transform import VarTransform from fontTools.misc.transform import DecomposedTransform
__all__ = [ __all__ = [
"AbstractPointPen", "AbstractPointPen",
@ -64,13 +64,13 @@ class AbstractPointPen:
def addVarComponent( def addVarComponent(
self, self,
glyphName: str, glyphName: str,
transformation: VarTransform, transformation: DecomposedTransform,
location: Dict[str, float], location: Dict[str, float],
identifier: Optional[str] = None, identifier: Optional[str] = None,
**kwargs: Any, **kwargs: Any,
) -> None: ) -> None:
"""Add a VarComponent sub glyph. The 'transformation' argument """Add a VarComponent sub glyph. The 'transformation' argument
must be a VarTransform from the fontTools.misc.transform module, must be a DecomposedTransform from the fontTools.misc.transform module,
and the 'location' argument must be a dictionary mapping axis tags and the 'location' argument must be a dictionary mapping axis tags
to their locations. to their locations.
""" """

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

@ -4,7 +4,7 @@ from collections import namedtuple
from fontTools.misc import sstruct from fontTools.misc import sstruct
from fontTools import ttLib from fontTools import ttLib
from fontTools import version from fontTools import version
from fontTools.misc.transform import VarTransform from fontTools.misc.transform import DecomposedTransform
from fontTools.misc.textTools import tostr, safeEval, pad from fontTools.misc.textTools import tostr, safeEval, pad
from fontTools.misc.arrayTools import calcIntBounds, pointInRect from fontTools.misc.arrayTools import calcIntBounds, pointInRect
from fontTools.misc.bezierTools import calcQuadraticBounds from fontTools.misc.bezierTools import calcQuadraticBounds
@ -1751,7 +1751,7 @@ VAR_COMPONENT_TRANSFORM_MAPPING = {
class GlyphVarComponent(object): class GlyphVarComponent(object):
def __init__(self): def __init__(self):
self.location = {} self.location = {}
self.transform = VarTransform() self.transform = DecomposedTransform()
def decompile(self, data, glyfTable): def decompile(self, data, glyfTable):
flags = struct.unpack(">H", data[:2])[0] flags = struct.unpack(">H", data[:2])[0]

6
Tests/ttLib/ttGlyphSet_test.py
View File

@ -2,7 +2,7 @@ from fontTools.ttLib import TTFont
from fontTools.ttLib import ttGlyphSet from fontTools.ttLib import ttGlyphSet
from fontTools.pens.recordingPen import RecordingPen, DecomposingRecordingPen from fontTools.pens.recordingPen import RecordingPen, DecomposingRecordingPen
from fontTools.misc.roundTools import otRound from fontTools.misc.roundTools import otRound
from fontTools.misc.transform import VarTransform from fontTools.misc.transform import DecomposedTransform
import os import os
import pytest import pytest
@ -174,7 +174,7 @@ class TTGlyphSetTest(object):
"addVarComponent", "addVarComponent",
( (
"glyph00003", "glyph00003",
VarTransform(460.0, 676.0, 0, 1, 1, 0, 0, 0, 0), DecomposedTransform(460.0, 676.0, 0, 1, 1, 0, 0, 0, 0),
{ {
"0000": 0.84661865234375, "0000": 0.84661865234375,
"0001": 0.98944091796875, "0001": 0.98944091796875,
@ -187,7 +187,7 @@ class TTGlyphSetTest(object):
"addVarComponent", "addVarComponent",
( (
"glyph00004", "glyph00004",
VarTransform(932.0, 382.0, 0, 1, 1, 0, 0, 0, 0), DecomposedTransform(932.0, 382.0, 0, 1, 1, 0, 0, 0, 0),
{ {
"0000": 0.93359375, "0000": 0.93359375,
"0001": 0.916015625, "0001": 0.916015625,