diff --git a/Tests/ttLib/tables/C_O_L_R_test.py b/Tests/ttLib/tables/C_O_L_R_test.py index 71789a4de..43ad70496 100644 --- a/Tests/ttLib/tables/C_O_L_R_test.py +++ b/Tests/ttLib/tables/C_O_L_R_test.py @@ -116,7 +116,7 @@ COLR_V1_SAMPLE = ( (b"\x00\x03", "LayerRecordCount (3)"), (b"\x00\x00\x00\x34", "Offset to BaseGlyphList from beginning of table (52)"), (b"\x00\x00\x00\x9f", "Offset to LayerList from beginning of table (159)"), - (b"\x00\x00\x01\x62", "Offset to ClipList (354)"), + (b"\x00\x00\x01\x66", "Offset to ClipList (358)"), (b"\x00\x00\x00\x00", "Offset to DeltaSetIndexMap (NULL)"), (b"\x00\x00\x00\x00", "Offset to VarStore (NULL)"), (b"\x00\x06", "BaseGlyphRecord[0].BaseGlyph (6)"), @@ -187,22 +187,26 @@ COLR_V1_SAMPLE = ( (b"\x00\x05", "ColorLine.ColorStop[1].PaletteIndex (5)"), (b"@\x00", "ColorLine.ColorStop[1].Alpha (1.0)"), # LayerList - (b"\x00\x00\x00\x04", "LayerList.LayerCount (4)"), + (b"\x00\x00\x00\x05", "LayerList.LayerCount (5)"), ( - b"\x00\x00\x00\x14", - "First Offset to Paint table from beginning of LayerList (20)", + b"\x00\x00\x00\x18", + "First Offset to Paint table from beginning of LayerList (24)", ), ( - b"\x00\x00\x00\x23", - "Second Offset to Paint table from beginning of LayerList (35)", + b"\x00\x00\x00\x27", + "Second Offset to Paint table from beginning of LayerList (39)", ), ( - b"\x00\x00\x00\x4e", - "Third Offset to Paint table from beginning of LayerList (78)", + b"\x00\x00\x00\x52", + "Third Offset to Paint table from beginning of LayerList (82)", ), ( - b"\x00\x00\x00\x9e", - "Fourth Offset to Paint table from beginning of LayerList (158)", + b"\x00\x00\x00\xa2", + "Fourth Offset to Paint table from beginning of LayerList (162)", + ), + ( + b"\x00\x00\x00\xbc", + "Fifth Offset to Paint table from beginning of LayerList (188)", ), # BaseGlyphPaintRecord[2] (b"\x0a", "BaseGlyphPaintRecord[2].Paint.Format (10)"), @@ -296,7 +300,7 @@ COLR_V1_SAMPLE = ( ), (b"\xfc\x17", "xSkewAngle (-0.0611)"), (b"\x01\xc7", "ySkewAngle (0.0278)"), - # PaintGlyph + # PaintGlyph glyph00011 (pointed to by both PaintSkew above and by LayerList[4] offset) (b"\x0a", "LayerList.Paint[3].Paint.Paint.Paint.Format (10)"), (b"\x00\x00\x06", "Offset to Paint subtable from beginning of PaintGlyph (6)"), (b"\x00\x0b", "LayerList.Paint[2].Glyph (11)"), @@ -413,7 +417,7 @@ COLR_V1_XML = [ " ", "", "", - " ", + " ", ' ', ' ', ' ', @@ -510,6 +514,13 @@ COLR_V1_XML = [ ' ', ' ', " ", + ' ', + ' ', + ' ', + ' ', + " ", + ' ', + " ", "", '', " ",