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

add ClipList.Format so we can bump when we finally get >16bit GIDs

Browse Source 
https://github.com/googlefonts/colr-gradients-spec/issues/346
This commit is contained in:
Cosimo Lupo 2021-07-29 15:35:08 +02:00
parent 9876f3c5c0
commit 800bf85b2f
5 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -252,6 +252,7 @@ def buildCOLR(
def buildClipList(clipBoxes: Dict[str, _ClipBoxInput]) -> ot.ClipList: def buildClipList(clipBoxes: Dict[str, _ClipBoxInput]) -> ot.ClipList:
clipList = ot.ClipList() clipList = ot.ClipList()
clipList.Format = 0
clipList.clips = {name: buildClipBox(box) for name, box in clipBoxes.items()} clipList.clips = {name: buildClipBox(box) for name, box in clipBoxes.items()}
return clipList return clipList

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

@ -1601,7 +1601,8 @@ otData = [
('LOffset', 'Paint', 'LayerCount', 0, 'Array of offsets to Paint tables, from the start of the LayerList table.'), ('LOffset', 'Paint', 'LayerCount', 0, 'Array of offsets to Paint tables, from the start of the LayerList table.'),
]), ]),
('ClipList', [ ('ClipListFormat0', [
('uint8', 'Format', None, None, 'Format for ClipList with 16bit glyph IDs: 0'),
('uint32', 'ClipCount', None, None, 'Number of Clip records.'), ('uint32', 'ClipCount', None, None, 'Number of Clip records.'),
('struct', 'ClipRecord', 'ClipCount', 0, 'Array of Clip records sorted by glyph ID.'), ('struct', 'ClipRecord', 'ClipCount', 0, 'Array of Clip records sorted by glyph ID.'),
]), ]),

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

@ -1307,7 +1307,7 @@ class ClipBox(getFormatSwitchingBaseTableClass("uint8")):
return f"{self.__class__.__name__}{self.as_tuple()}" return f"{self.__class__.__name__}{self.as_tuple()}"
class ClipList(BaseTable): class ClipList(getFormatSwitchingBaseTableClass("uint8")):
def populateDefaults(self, propagator=None): def populateDefaults(self, propagator=None):
if not hasattr(self, "clips"): if not hasattr(self, "clips"):
@ -1410,6 +1410,8 @@ class ClipList(BaseTable):
tableName = name if name else self.__class__.__name__ tableName = name if name else self.__class__.__name__
if attrs is None: if attrs is None:
attrs = [] attrs = []
if hasattr(self, "Format"):
attrs.append(("Format", self.Format))
xmlWriter.begintag(tableName, attrs) xmlWriter.begintag(tableName, attrs)
xmlWriter.newline() xmlWriter.newline()
# sort clips alphabetically to ensure deterministic XML dump # sort clips alphabetically to ensure deterministic XML dump

1
Tests/colorLib/builder_test.py
View File

@ -1681,6 +1681,7 @@ class BuildCOLRTest(object):
}, },
) )
assert colr.table.ClipList.Format == 0
clipBoxes = colr.table.ClipList.clips clipBoxes = colr.table.ClipList.clips
assert [ assert [
(baseGlyph, clipBox.as_tuple()) for baseGlyph, clipBox in clipBoxes.items() (baseGlyph, clipBox.as_tuple()) for baseGlyph, clipBox in clipBoxes.items()

7
Tests/ttLib/tables/C_O_L_R_test.py
View File

@ -298,13 +298,14 @@ COLR_V1_SAMPLE = (
(b" \x00", "Paint.Alpha (0.5)"), (b" \x00", "Paint.Alpha (0.5)"),
# ClipList # ClipList
(b'\x00', "ClipList.Format (0)"),
(b'\x00\x00\x00\x02', "ClipList.ClipCount (2)"), (b'\x00\x00\x00\x02', "ClipList.ClipCount (2)"),
(b'\x00\x0a', "ClipRecord[0].StartGlyphID (10)"), (b'\x00\x0a', "ClipRecord[0].StartGlyphID (10)"),
(b'\x00\x0a', "ClipRecord[0].EndGlyphID (10)"), (b'\x00\x0a', "ClipRecord[0].EndGlyphID (10)"),
(b'\x00\x00\x12', "Offset to ClipBox subtable from beginning of ClipList (18)"), (b'\x00\x00\x13', "Offset to ClipBox subtable from beginning of ClipList (19)"),
(b'\x00\x0e', "ClipRecord[1].StartGlyphID (14)"), (b'\x00\x0e', "ClipRecord[1].StartGlyphID (14)"),
(b'\x00\x0f', "ClipRecord[1].EndGlyphID (15)"), (b'\x00\x0f', "ClipRecord[1].EndGlyphID (15)"),
(b'\x00\x00\x1f', "Offset to ClipBox subtable from beginning of ClipList (31)"), (b'\x00\x00\x20', "Offset to ClipBox subtable from beginning of ClipList (32)"),
(b'\x01', "ClipBox.Format (1)"), (b'\x01', "ClipBox.Format (1)"),
(b'\x00\x00', "ClipBox.xMin (0)"), (b'\x00\x00', "ClipBox.xMin (0)"),
@ -505,7 +506,7 @@ COLR_V1_XML = [
' <dy value="258"/>', ' <dy value="258"/>',
" </Paint>", " </Paint>",
"</LayerList>", "</LayerList>",
"<ClipList>", '<ClipList Format="0">',
" <Clip>", " <Clip>",
' <Glyph value="glyph00010"/>', ' <Glyph value="glyph00010"/>',
' <ClipBox Format="1">', ' <ClipBox Format="1">',