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

colorLib: in buildColorStop accept color tuple as parameter

Browse Source 
and use Sequence instead of List for input params type hints
This commit is contained in:
Cosimo Lupo 2020-03-10 11:38:29 +00:00
parent be3265f136
commit 44d729ad3c
No known key found for this signature in database
GPG Key ID: 20D4A261E4A0E642
2 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Lib/fontTools/colorLib/builder.py
View File

@ -1,7 +1,7 @@
import copy
import enum
from functools import partial
from typing import Dict, List, Optional, Tuple, Union
from typing import Dict, Iterable, List, Mapping, Optional, Sequence, Tuple, Union
from fontTools.ttLib.tables import C_O_L_R_
from fontTools.ttLib.tables import C_P_A_L_
from fontTools.ttLib.tables import _n_a_m_e
@ -16,13 +16,14 @@ from .errors import ColorLibError
# TODO move type aliases to colorLib.types?
_LayersList = List[Tuple[str, Union[int, ot.Paint]]]
_LayersList = Sequence[Tuple[str, Union[int, ot.Paint]]]
_ColorGlyphsDict = Dict[str, _LayersList]
_ColorGlyphsV0Dict = Dict[str, List[Tuple[str, int]]]
_ColorGlyphsV0Dict = Dict[str, Sequence[Tuple[str, int]]]
_Number = Union[int, float]
_VariableScalar = Union[_Number, VariableValue, Tuple[_Number, int]]
_ColorStopTuple = Tuple[_VariableScalar, Union[int, ot.Color]]
_ColorStopsList = List[Union[_ColorStopTuple, ot.ColorStop]]
_ColorTuple = Tuple[int, VariableValue]
_ColorStopTuple = Tuple[_VariableScalar, Union[int, _ColorTuple, ot.Color]]
_ColorStopsList = Sequence[Union[_ColorStopTuple, ot.ColorStop]]
_PointTuple = Tuple[_VariableScalar, _VariableScalar]
_AffineTuple = Tuple[_VariableScalar, _VariableScalar, _VariableScalar, _VariableScalar]
@ -152,7 +153,7 @@ _OptionalLocalizedString = Union[None, str, Dict[str, str]]
def buildPaletteLabels(
labels: List[_OptionalLocalizedString], nameTable: _n_a_m_e.table__n_a_m_e
labels: Iterable[_OptionalLocalizedString], nameTable: _n_a_m_e.table__n_a_m_e
) -> List[Optional[int]]:
return [
nameTable.addMultilingualName(l, mac=False)
@ -165,10 +166,10 @@ def buildPaletteLabels(
def buildCPAL(
palettes: List[List[Tuple[float, float, float, float]]],
paletteTypes: Optional[List[ColorPaletteType]] = None,
paletteLabels: Optional[List[_OptionalLocalizedString]] = None,
paletteEntryLabels: Optional[List[_OptionalLocalizedString]] = None,
palettes: Sequence[Sequence[Tuple[float, float, float, float]]],
paletteTypes: Optional[Sequence[ColorPaletteType]] = None,
paletteLabels: Optional[Sequence[_OptionalLocalizedString]] = None,
paletteEntryLabels: Optional[Sequence[_OptionalLocalizedString]] = None,
nameTable: Optional[_n_a_m_e.table__n_a_m_e] = None,
) -> C_P_A_L_.table_C_P_A_L_:
"""Build CPAL table from list of color palettes.
@ -333,13 +334,15 @@ def buildSolidColorPaint(
def buildColorStop(
offset: _VariableScalar, color: Union[int, ot.Color]
offset: _VariableScalar, color: Union[int, _ColorTuple, ot.Color]
) -> ot.ColorStop:
self = ot.ColorStop()
self.StopOffset = _to_variable_float(offset)
if not isinstance(color, ot.Color):
if isinstance(color, int):
color = buildColor(paletteIndex=color)
elif not isinstance(color, ot.Color):
color = buildColor(*color)
self.Color = color
return self

7
Tests/colorLib/builder_test.py
View File

@ -270,6 +270,13 @@ def test_buildColorLine():
(cs.StopOffset.value, cs.Color.PaletteIndex) for cs in cline.ColorStop
] == stops
stops = [((0.0, 1), (0, (0.5, 2))), ((1.0, 3), (1, (0.3, 4)))]
cline = builder.buildColorLine(stops)
assert [
(tuple(cs.StopOffset), (cs.Color.PaletteIndex, tuple(cs.Color.Transparency)))
for cs in cline.ColorStop
] == stops
def test_buildPoint():
pt = builder.buildPoint(0, 1)