otTables_test: mixed tabs and spaces

This commit is contained in:
Cosimo Lupo 2021-05-20 19:22:16 +01:00
parent d1e2e0e381
commit adbe4c3de7

View File

@ -512,8 +512,11 @@ class InsertionMorphActionTest(unittest.TestCase):
for name, attrs, content in parseXML(self.MORPH_ACTION_XML): for name, attrs, content in parseXML(self.MORPH_ACTION_XML):
a.fromXML(name, attrs, content, self.font) a.fromXML(name, attrs, content, self.font)
writer = OTTableWriter() writer = OTTableWriter()
a.compile(writer, self.font, a.compile(
actionIndex={('B', 'C'): 9, ('B', 'A', 'D'): 7}) writer,
self.font,
actionIndex={('B', 'C'): 9, ('B', 'A', 'D'): 7},
)
self.assertEqual(hexStr(writer.getAllData()), "1234fc4300090007") self.assertEqual(hexStr(writer.getAllData()), "1234fc4300090007")
def testCompileActions_empty(self): def testCompileActions_empty(self):
@ -575,113 +578,113 @@ class SplitMultipleSubstTest:
def test_splitMarkBasePos(): def test_splitMarkBasePos():
from fontTools.otlLib.builder import buildAnchor, buildMarkBasePosSubtable from fontTools.otlLib.builder import buildAnchor, buildMarkBasePosSubtable
marks = { marks = {
"acutecomb": (0, buildAnchor(0, 600)), "acutecomb": (0, buildAnchor(0, 600)),
"gravecomb": (0, buildAnchor(0, 590)), "gravecomb": (0, buildAnchor(0, 590)),
"cedillacomb": (1, buildAnchor(0, 0)), "cedillacomb": (1, buildAnchor(0, 0)),
} }
bases = { bases = {
"a": { "a": {
0: buildAnchor(350, 500), 0: buildAnchor(350, 500),
1: None, 1: None,
}, },
"c": { "c": {
0: buildAnchor(300, 700), 0: buildAnchor(300, 700),
1: buildAnchor(300, 0), 1: buildAnchor(300, 0),
}, },
} }
glyphOrder = ["a", "c", "acutecomb", "gravecomb", "cedillacomb"] glyphOrder = ["a", "c", "acutecomb", "gravecomb", "cedillacomb"]
glyphMap = {g: i for i, g in enumerate(glyphOrder)} glyphMap = {g: i for i, g in enumerate(glyphOrder)}
oldSubTable = buildMarkBasePosSubtable(marks, bases, glyphMap) oldSubTable = buildMarkBasePosSubtable(marks, bases, glyphMap)
newSubTable = otTables.MarkBasePos() newSubTable = otTables.MarkBasePos()
ok = otTables.splitMarkBasePos(oldSubTable, newSubTable, overflowRecord=None) ok = otTables.splitMarkBasePos(oldSubTable, newSubTable, overflowRecord=None)
assert ok assert ok
assert getXML(oldSubTable.toXML) == [ assert getXML(oldSubTable.toXML) == [
'<MarkBasePos Format="1">', '<MarkBasePos Format="1">',
' <MarkCoverage>', ' <MarkCoverage>',
' <Glyph value="acutecomb"/>', ' <Glyph value="acutecomb"/>',
' <Glyph value="gravecomb"/>', ' <Glyph value="gravecomb"/>',
' </MarkCoverage>', ' </MarkCoverage>',
' <BaseCoverage>', ' <BaseCoverage>',
' <Glyph value="a"/>', ' <Glyph value="a"/>',
' <Glyph value="c"/>', ' <Glyph value="c"/>',
' </BaseCoverage>', ' </BaseCoverage>',
' <!-- ClassCount=1 -->', ' <!-- ClassCount=1 -->',
' <MarkArray>', ' <MarkArray>',
' <!-- MarkCount=2 -->', ' <!-- MarkCount=2 -->',
' <MarkRecord index="0">', ' <MarkRecord index="0">',
' <Class value="0"/>', ' <Class value="0"/>',
' <MarkAnchor Format="1">', ' <MarkAnchor Format="1">',
' <XCoordinate value="0"/>', ' <XCoordinate value="0"/>',
' <YCoordinate value="600"/>', ' <YCoordinate value="600"/>',
' </MarkAnchor>', ' </MarkAnchor>',
' </MarkRecord>', ' </MarkRecord>',
' <MarkRecord index="1">', ' <MarkRecord index="1">',
' <Class value="0"/>', ' <Class value="0"/>',
' <MarkAnchor Format="1">', ' <MarkAnchor Format="1">',
' <XCoordinate value="0"/>', ' <XCoordinate value="0"/>',
' <YCoordinate value="590"/>', ' <YCoordinate value="590"/>',
' </MarkAnchor>', ' </MarkAnchor>',
' </MarkRecord>', ' </MarkRecord>',
' </MarkArray>', ' </MarkArray>',
' <BaseArray>', ' <BaseArray>',
' <!-- BaseCount=2 -->', ' <!-- BaseCount=2 -->',
' <BaseRecord index="0">', ' <BaseRecord index="0">',
' <BaseAnchor index="0" Format="1">', ' <BaseAnchor index="0" Format="1">',
' <XCoordinate value="350"/>', ' <XCoordinate value="350"/>',
' <YCoordinate value="500"/>', ' <YCoordinate value="500"/>',
' </BaseAnchor>', ' </BaseAnchor>',
' </BaseRecord>', ' </BaseRecord>',
' <BaseRecord index="1">', ' <BaseRecord index="1">',
' <BaseAnchor index="0" Format="1">', ' <BaseAnchor index="0" Format="1">',
' <XCoordinate value="300"/>', ' <XCoordinate value="300"/>',
' <YCoordinate value="700"/>', ' <YCoordinate value="700"/>',
' </BaseAnchor>', ' </BaseAnchor>',
' </BaseRecord>', ' </BaseRecord>',
' </BaseArray>', ' </BaseArray>',
'</MarkBasePos>', '</MarkBasePos>',
] ]
assert getXML(newSubTable.toXML) == [ assert getXML(newSubTable.toXML) == [
'<MarkBasePos Format="1">', '<MarkBasePos Format="1">',
' <MarkCoverage>', ' <MarkCoverage>',
' <Glyph value="cedillacomb"/>', ' <Glyph value="cedillacomb"/>',
' </MarkCoverage>', ' </MarkCoverage>',
' <BaseCoverage>', ' <BaseCoverage>',
' <Glyph value="a"/>', ' <Glyph value="a"/>',
' <Glyph value="c"/>', ' <Glyph value="c"/>',
' </BaseCoverage>', ' </BaseCoverage>',
' <!-- ClassCount=1 -->', ' <!-- ClassCount=1 -->',
' <MarkArray>', ' <MarkArray>',
' <!-- MarkCount=1 -->', ' <!-- MarkCount=1 -->',
' <MarkRecord index="0">', ' <MarkRecord index="0">',
' <Class value="0"/>', ' <Class value="0"/>',
' <MarkAnchor Format="1">', ' <MarkAnchor Format="1">',
' <XCoordinate value="0"/>', ' <XCoordinate value="0"/>',
' <YCoordinate value="0"/>', ' <YCoordinate value="0"/>',
' </MarkAnchor>', ' </MarkAnchor>',
' </MarkRecord>', ' </MarkRecord>',
' </MarkArray>', ' </MarkArray>',
' <BaseArray>', ' <BaseArray>',
' <!-- BaseCount=2 -->', ' <!-- BaseCount=2 -->',
' <BaseRecord index="0">', ' <BaseRecord index="0">',
' <BaseAnchor index="0" empty="1"/>', ' <BaseAnchor index="0" empty="1"/>',
' </BaseRecord>', ' </BaseRecord>',
' <BaseRecord index="1">', ' <BaseRecord index="1">',
' <BaseAnchor index="0" Format="1">', ' <BaseAnchor index="0" Format="1">',
' <XCoordinate value="300"/>', ' <XCoordinate value="300"/>',
' <YCoordinate value="0"/>', ' <YCoordinate value="0"/>',
' </BaseAnchor>', ' </BaseAnchor>',
' </BaseRecord>', ' </BaseRecord>',
' </BaseArray>', ' </BaseArray>',
'</MarkBasePos>', '</MarkBasePos>',
] ]
if __name__ == "__main__": if __name__ == "__main__":