diff options
Diffstat (limited to 'Tests/otlLib')
-rw-r--r-- | Tests/otlLib/builder_test.py | 29 | ||||
-rw-r--r-- | Tests/otlLib/data/gpos_91.ttx | 2 | ||||
-rw-r--r-- | Tests/otlLib/data/gsub_51.ttx | 10 | ||||
-rw-r--r-- | Tests/otlLib/data/gsub_52.ttx | 12 | ||||
-rw-r--r-- | Tests/otlLib/data/gsub_71.ttx | 2 |
5 files changed, 33 insertions, 22 deletions
diff --git a/Tests/otlLib/builder_test.py b/Tests/otlLib/builder_test.py index 3ea5a745..1c2c324d 100644 --- a/Tests/otlLib/builder_test.py +++ b/Tests/otlLib/builder_test.py @@ -839,8 +839,12 @@ class BuilderTest(object): " <!-- Class2Count=3 -->", ' <Class1Record index="0">', ' <Class2Record index="0">', + ' <Value1 XPlacement="0" YPlacement="0"/>', + ' <Value2 XPlacement="0"/>', " </Class2Record>", ' <Class2Record index="1">', + ' <Value1 XPlacement="0" YPlacement="0"/>', + ' <Value2 XPlacement="0"/>', " </Class2Record>", ' <Class2Record index="2">', ' <Value1 XPlacement="-80" YPlacement="-20"/>', @@ -849,12 +853,15 @@ class BuilderTest(object): " </Class1Record>", ' <Class1Record index="1">', ' <Class2Record index="0">', + ' <Value1 XPlacement="0" YPlacement="0"/>', + ' <Value2 XPlacement="0"/>', " </Class2Record>", ' <Class2Record index="1">', + ' <Value1 XPlacement="0" YPlacement="0"/>', ' <Value2 XPlacement="-20"/>', " </Class2Record>", ' <Class2Record index="2">', - " <Value1/>", + ' <Value1 XPlacement="0" YPlacement="0"/>', ' <Value2 XPlacement="-50"/>', " </Class2Record>", " </Class1Record>", @@ -911,9 +918,11 @@ class BuilderTest(object): ("A", "zero"): (d0, d50), ("A", "one"): (None, d20), ("B", "five"): (d8020, d50), + }, self.GLYPHMAP, ) + assert getXML(subtable.toXML) == [ '<PairPos Format="1">', " <Coverage>", @@ -927,10 +936,12 @@ class BuilderTest(object): " <!-- PairValueCount=2 -->", ' <PairValueRecord index="0">', ' <SecondGlyph value="zero"/>', + ' <Value1 XPlacement="0" YPlacement="0"/>', ' <Value2 XPlacement="-50"/>', " </PairValueRecord>", ' <PairValueRecord index="1">', ' <SecondGlyph value="one"/>', + ' <Value1 XPlacement="0" YPlacement="0"/>', ' <Value2 XPlacement="-20"/>', " </PairValueRecord>", " </PairSet>", @@ -1031,8 +1042,8 @@ class BuilderTest(object): " </Coverage>", ' <ValueFormat value="3"/>', " <!-- ValueCount=2 -->", - ' <Value index="0" XPlacement="777"/>', - ' <Value index="1" YPlacement="-888"/>', + ' <Value index="0" XPlacement="777" YPlacement="0"/>', + ' <Value index="1" XPlacement="0" YPlacement="-888"/>', "</SinglePos>", ] @@ -1138,7 +1149,7 @@ buildStatTable_test_data = [ ' </AxisValue>', ' <AxisValue index="1" Format="1">', ' <AxisIndex value="0"/>', - ' <Flags value="2"/>', + ' <Flags value="2"/> <!-- ElidableAxisValueName -->', ' <ValueNameID value="256"/> <!-- Regular -->', ' <Value value="400.0"/>', ' </AxisValue>', @@ -1193,7 +1204,7 @@ buildStatTable_test_data = [ ' </AxisValue>', ' <AxisValue index="1" Format="1">', ' <AxisIndex value="0"/>', - ' <Flags value="2"/>', + ' <Flags value="2"/> <!-- ElidableAxisValueName -->', ' <ValueNameID value="258"/> <!-- Regular -->', ' <Value value="400.0"/>', ' </AxisValue>', @@ -1211,7 +1222,7 @@ buildStatTable_test_data = [ ' </AxisValue>', ' <AxisValue index="4" Format="1">', ' <AxisIndex value="1"/>', - ' <Flags value="2"/>', + ' <Flags value="2"/> <!-- ElidableAxisValueName -->', ' <ValueNameID value="258"/> <!-- Regular -->', ' <Value value="100.0"/>', ' </AxisValue>', @@ -1246,7 +1257,7 @@ buildStatTable_test_data = [ ' <AxisValueArray>', ' <AxisValue index="0" Format="1">', ' <AxisIndex value="0"/>', - ' <Flags value="2"/>', + ' <Flags value="2"/> <!-- ElidableAxisValueName -->', ' <ValueNameID value="257"/> <!-- Regular -->', ' <Value value="400.0"/>', ' </AxisValue>', @@ -1291,7 +1302,7 @@ buildStatTable_test_data = [ ' </AxisValue>', ' <AxisValue index="1" Format="2">', ' <AxisIndex value="0"/>', - ' <Flags value="2"/>', + ' <Flags value="2"/> <!-- ElidableAxisValueName -->', ' <ValueNameID value="258"/> <!-- Text -->', ' <NominalValue value="14.0"/>', ' <RangeMinValue value="10.0"/>', @@ -1354,7 +1365,7 @@ buildStatTable_test_data = [ ' </AxisValue>', ' <AxisValue index="1" Format="1">', ' <AxisIndex value="1"/>', - ' <Flags value="2"/>', + ' <Flags value="2"/> <!-- ElidableAxisValueName -->', ' <ValueNameID value="258"/> <!-- Regular -->', ' <Value value="100.0"/>', ' </AxisValue>', diff --git a/Tests/otlLib/data/gpos_91.ttx b/Tests/otlLib/data/gpos_91.ttx index ee7bf7c2..7befe7b2 100644 --- a/Tests/otlLib/data/gpos_91.ttx +++ b/Tests/otlLib/data/gpos_91.ttx @@ -85,7 +85,7 @@ <ExtensionPos index="0" Format="1"> <ExtensionLookupType value="1"/> <SinglePos Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="A"/> </Coverage> <ValueFormat value="4"/> diff --git a/Tests/otlLib/data/gsub_51.ttx b/Tests/otlLib/data/gsub_51.ttx index f0aba65a..0e6a4133 100644 --- a/Tests/otlLib/data/gsub_51.ttx +++ b/Tests/otlLib/data/gsub_51.ttx @@ -88,7 +88,7 @@ <LookupType value="1"/> <LookupFlag value="0"/> <!-- SubTableCount=1 --> - <SingleSubst index="0" Format="1"> + <SingleSubst index="0"> <Substitution in="g20" out="g60"/> <Substitution in="g21" out="g61"/> </SingleSubst> @@ -97,7 +97,7 @@ <LookupType value="4"/> <LookupFlag value="0"/> <!-- SubTableCount=1 --> - <LigatureSubst index="0" Format="1"> + <LigatureSubst index="0"> <LigatureSet glyph="g21"> <Ligature components="g22" glyph="g61"/> </LigatureSet> @@ -107,7 +107,7 @@ <LookupType value="4"/> <LookupFlag value="8"/><!-- ignoreMarks --> <!-- SubTableCount=1 --> - <LigatureSubst index="0" Format="1"> + <LigatureSubst index="0"> <LigatureSet glyph="g21"> <Ligature components="g22" glyph="g61"/> </LigatureSet> @@ -117,7 +117,7 @@ <LookupType value="2"/> <LookupFlag value="0"/> <!-- SubTableCount=1 --> - <MultipleSubst index="0" Format="1"> + <MultipleSubst index="0"> <Substitution in="g21" out="g61,g62,g63"/> </MultipleSubst> </Lookup> @@ -126,7 +126,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <ContextSubst index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> </Coverage> <!-- SubRuleSetCount=1 --> diff --git a/Tests/otlLib/data/gsub_52.ttx b/Tests/otlLib/data/gsub_52.ttx index 03bd9ee5..4e83b96d 100644 --- a/Tests/otlLib/data/gsub_52.ttx +++ b/Tests/otlLib/data/gsub_52.ttx @@ -88,7 +88,7 @@ <LookupType value="1"/> <LookupFlag value="0"/> <!-- SubTableCount=1 --> - <SingleSubst index="0" Format="1"> + <SingleSubst index="0"> <Substitution in="g20" out="g60"/> <Substitution in="g21" out="g61"/> </SingleSubst> @@ -97,7 +97,7 @@ <LookupType value="4"/> <LookupFlag value="0"/> <!-- SubTableCount=1 --> - <LigatureSubst index="0" Format="1"> + <LigatureSubst index="0"> <LigatureSet glyph="g21"> <Ligature components="g22" glyph="g61"/> </LigatureSet> @@ -107,7 +107,7 @@ <LookupType value="4"/> <LookupFlag value="8"/><!-- ignoreMarks --> <!-- SubTableCount=1 --> - <LigatureSubst index="0" Format="1"> + <LigatureSubst index="0"> <LigatureSet glyph="g21"> <Ligature components="g22" glyph="g61"/> </LigatureSet> @@ -117,7 +117,7 @@ <LookupType value="2"/> <LookupFlag value="0"/> <!-- SubTableCount=1 --> - <MultipleSubst index="0" Format="1"> + <MultipleSubst index="0"> <Substitution in="g21" out="g61,g62,g63"/> </MultipleSubst> </Lookup> @@ -126,10 +126,10 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <ContextSubst index="0" Format="2"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> </Coverage> - <ClassDef Format="2"> + <ClassDef> <ClassDef glyph="g20" class="1"/> </ClassDef> <!-- SubClassSetCount=2 --> diff --git a/Tests/otlLib/data/gsub_71.ttx b/Tests/otlLib/data/gsub_71.ttx index 201de4cb..acf6cdb6 100644 --- a/Tests/otlLib/data/gsub_71.ttx +++ b/Tests/otlLib/data/gsub_71.ttx @@ -87,7 +87,7 @@ <!-- SubTableCount=1 --> <ExtensionSubst index="0" Format="1"> <ExtensionLookupType value="1"/> - <SingleSubst Format="1"> + <SingleSubst> <Substitution in="g18" out="g23"/> <Substitution in="g19" out="g24"/> </SingleSubst> |