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

[Tests] Fix most test expectations for ClassDef[12] .Format removal

Browse Source
This commit is contained in:
Behdad Esfahbod 2021-03-23 11:27:26 -07:00
parent 9ac1f39045
commit 6b2b2f4949
29 changed files with 58 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Tests/mtiLib/data/mti/gposkernset.ttx.GPOS
View File

@ -44,7 +44,7 @@
</Coverage> </Coverage>
<ValueFormat1 value="4"/> <ValueFormat1 value="4"/>
<ValueFormat2 value="0"/> <ValueFormat2 value="0"/>
<ClassDef1 Format="2"> <ClassDef1>
<ClassDef glyph="A" class="1"/> <ClassDef glyph="A" class="1"/>
<ClassDef glyph="Aacute" class="1"/> <ClassDef glyph="Aacute" class="1"/>
<ClassDef glyph="Acircumflex" class="1"/> <ClassDef glyph="Acircumflex" class="1"/>
@ -55,7 +55,7 @@
<ClassDef glyph="Ograve" class="2"/> <ClassDef glyph="Ograve" class="2"/>
<ClassDef glyph="T" class="3"/> <ClassDef glyph="T" class="3"/>
</ClassDef1> </ClassDef1>
<ClassDef2 Format="2"> <ClassDef2>
<ClassDef glyph="V" class="1"/> <ClassDef glyph="V" class="1"/>
<ClassDef glyph="a" class="2"/> <ClassDef glyph="a" class="2"/>
<ClassDef glyph="aacute" class="2"/> <ClassDef glyph="aacute" class="2"/>

4
Tests/mtiLib/data/mti/gpospairclass.ttx.GPOS
View File

@ -21,7 +21,7 @@
</Coverage> </Coverage>
<ValueFormat1 value="4"/> <ValueFormat1 value="4"/>
<ValueFormat2 value="0"/> <ValueFormat2 value="0"/>
<ClassDef1 Format="2"> <ClassDef1>
<ClassDef glyph="A" class="1"/> <ClassDef glyph="A" class="1"/>
<ClassDef glyph="Aacute" class="1"/> <ClassDef glyph="Aacute" class="1"/>
<ClassDef glyph="Acircumflex" class="1"/> <ClassDef glyph="Acircumflex" class="1"/>
@ -32,7 +32,7 @@
<ClassDef glyph="Ograve" class="2"/> <ClassDef glyph="Ograve" class="2"/>
<ClassDef glyph="T" class="3"/> <ClassDef glyph="T" class="3"/>
</ClassDef1> </ClassDef1>
<ClassDef2 Format="2"> <ClassDef2>
<ClassDef glyph="V" class="1"/> <ClassDef glyph="V" class="1"/>
<ClassDef glyph="a" class="2"/> <ClassDef glyph="a" class="2"/>
<ClassDef glyph="aacute" class="2"/> <ClassDef glyph="aacute" class="2"/>

4
Tests/subset/data/test_cntrmask_CFF.ttx
View File

@ -340,10 +340,10 @@
</Coverage> </Coverage>
<ValueFormat1 value="4"/> <ValueFormat1 value="4"/>
<ValueFormat2 value="0"/> <ValueFormat2 value="0"/>
<ClassDef1 Format="1"> <ClassDef1>
<ClassDef glyph="Idieresis" class="1"/> <ClassDef glyph="Idieresis" class="1"/>
</ClassDef1> </ClassDef1>
<ClassDef2 Format="2"> <ClassDef2>
</ClassDef2> </ClassDef2>
<!-- Class1Count=2 --> <!-- Class1Count=2 -->
<!-- Class2Count=1 --> <!-- Class2Count=1 -->

4
Tests/ttLib/tables/data/aots/gpos2_2_font1.ttx.GPOS
View File

@ -39,10 +39,10 @@
</Coverage> </Coverage>
<ValueFormat1 value="1"/> <ValueFormat1 value="1"/>
<ValueFormat2 value="2"/> <ValueFormat2 value="2"/>
<ClassDef1 Format="2"> <ClassDef1>
<ClassDef glyph="g18" class="1"/> <ClassDef glyph="g18" class="1"/>
</ClassDef1> </ClassDef1>
<ClassDef2 Format="2"> <ClassDef2>
<ClassDef glyph="g19" class="1"/> <ClassDef glyph="g19" class="1"/>
</ClassDef2> </ClassDef2>
<!-- Class1Count=2 --> <!-- Class1Count=2 -->

4
Tests/ttLib/tables/data/aots/gpos2_2_font2.ttx.GPOS
View File

@ -39,10 +39,10 @@
</Coverage> </Coverage>
<ValueFormat1 value="1"/> <ValueFormat1 value="1"/>
<ValueFormat2 value="2"/> <ValueFormat2 value="2"/>
<ClassDef1 Format="2"> <ClassDef1>
<ClassDef glyph="g19" class="1"/> <ClassDef glyph="g19" class="1"/>
</ClassDef1> </ClassDef1>
<ClassDef2 Format="2"> <ClassDef2>
<ClassDef glyph="g20" class="1"/> <ClassDef glyph="g20" class="1"/>
</ClassDef2> </ClassDef2>
<!-- Class1Count=2 --> <!-- Class1Count=2 -->

4
Tests/ttLib/tables/data/aots/gpos2_2_font3.ttx.GPOS
View File

@ -39,10 +39,10 @@
</Coverage> </Coverage>
<ValueFormat1 value="4"/> <ValueFormat1 value="4"/>
<ValueFormat2 value="2"/> <ValueFormat2 value="2"/>
<ClassDef1 Format="2"> <ClassDef1>
<ClassDef glyph="g19" class="1"/> <ClassDef glyph="g19" class="1"/>
</ClassDef1> </ClassDef1>
<ClassDef2 Format="2"> <ClassDef2>
<ClassDef glyph="g20" class="1"/> <ClassDef glyph="g20" class="1"/>
</ClassDef2> </ClassDef2>
<!-- Class1Count=2 --> <!-- Class1Count=2 -->

4
Tests/ttLib/tables/data/aots/gpos2_2_font4.ttx.GPOS
View File

@ -39,10 +39,10 @@
</Coverage> </Coverage>
<ValueFormat1 value="1"/> <ValueFormat1 value="1"/>
<ValueFormat2 value="2"/> <ValueFormat2 value="2"/>
<ClassDef1 Format="2"> <ClassDef1>
<ClassDef glyph="g18" class="1"/> <ClassDef glyph="g18" class="1"/>
</ClassDef1> </ClassDef1>
<ClassDef2 Format="2"> <ClassDef2>
<ClassDef glyph="g18" class="1"/> <ClassDef glyph="g18" class="1"/>
</ClassDef2> </ClassDef2>
<!-- Class1Count=2 --> <!-- Class1Count=2 -->

4
Tests/ttLib/tables/data/aots/gpos2_2_font5.ttx.GPOS
View File

@ -39,10 +39,10 @@
</Coverage> </Coverage>
<ValueFormat1 value="1"/> <ValueFormat1 value="1"/>
<ValueFormat2 value="0"/> <ValueFormat2 value="0"/>
<ClassDef1 Format="2"> <ClassDef1>
<ClassDef glyph="g18" class="1"/> <ClassDef glyph="g18" class="1"/>
</ClassDef1> </ClassDef1>
<ClassDef2 Format="2"> <ClassDef2>
<ClassDef glyph="g18" class="1"/> <ClassDef glyph="g18" class="1"/>
</ClassDef2> </ClassDef2>
<!-- Class1Count=2 --> <!-- Class1Count=2 -->

4
Tests/varLib/data/master_kerning_merging/0.ttx
View File

@ -272,10 +272,10 @@
</Coverage> </Coverage>
<ValueFormat1 value="4"/> <ValueFormat1 value="4"/>
<ValueFormat2 value="0"/> <ValueFormat2 value="0"/>
<ClassDef1 Format="1"> <ClassDef1>
<ClassDef glyph="A" class="1"/> <ClassDef glyph="A" class="1"/>
</ClassDef1> </ClassDef1>
<ClassDef2 Format="1"> <ClassDef2>
<ClassDef glyph="C" class="1"/> <ClassDef glyph="C" class="1"/>
</ClassDef2> </ClassDef2>
<!-- Class1Count=2 --> <!-- Class1Count=2 -->

4
Tests/varLib/data/master_kerning_merging/1.ttx
View File

@ -265,9 +265,9 @@
</Coverage> </Coverage>
<ValueFormat1 value="4"/> <ValueFormat1 value="4"/>
<ValueFormat2 value="0"/> <ValueFormat2 value="0"/>
<ClassDef1 Format="2"> <ClassDef1>
</ClassDef1> </ClassDef1>
<ClassDef2 Format="1"> <ClassDef2>
<ClassDef glyph="B" class="2"/> <ClassDef glyph="B" class="2"/>
<ClassDef glyph="D" class="1"/> <ClassDef glyph="D" class="1"/>
</ClassDef2> </ClassDef2>

4
Tests/varLib/data/master_kerning_merging/2.ttx
View File

@ -272,10 +272,10 @@
</Coverage> </Coverage>
<ValueFormat1 value="4"/> <ValueFormat1 value="4"/>
<ValueFormat2 value="0"/> <ValueFormat2 value="0"/>
<ClassDef1 Format="1"> <ClassDef1>
<ClassDef glyph="A" class="1"/> <ClassDef glyph="A" class="1"/>
</ClassDef1> </ClassDef1>
<ClassDef2 Format="1"> <ClassDef2>
<ClassDef glyph="D" class="1"/> <ClassDef glyph="D" class="1"/>
</ClassDef2> </ClassDef2>
<!-- Class1Count=2 --> <!-- Class1Count=2 -->

4
Tests/varLib/data/master_ttx_interpolatable_ttf/TestFamily3-Bold.ttx
View File

@ -485,9 +485,9 @@
</Coverage> </Coverage>
<ValueFormat1 value="4"/> <ValueFormat1 value="4"/>
<ValueFormat2 value="0"/> <ValueFormat2 value="0"/>
<ClassDef1 Format="2"> <ClassDef1>
</ClassDef1> </ClassDef1>
<ClassDef2 Format="1"> <ClassDef2>
<ClassDef glyph="T" class="4"/> <ClassDef glyph="T" class="4"/>
<ClassDef glyph="n" class="3"/> <ClassDef glyph="n" class="3"/>
<ClassDef glyph="o" class="2"/> <ClassDef glyph="o" class="2"/>

4
Tests/varLib/data/master_ttx_interpolatable_ttf/TestFamily3-Condensed.ttx
View File

@ -491,9 +491,9 @@
</Coverage> </Coverage>
<ValueFormat1 value="4"/> <ValueFormat1 value="4"/>
<ValueFormat2 value="0"/> <ValueFormat2 value="0"/>
<ClassDef1 Format="2"> <ClassDef1>
</ClassDef1> </ClassDef1>
<ClassDef2 Format="1"> <ClassDef2>
<ClassDef glyph="T" class="4"/> <ClassDef glyph="T" class="4"/>
<ClassDef glyph="n" class="3"/> <ClassDef glyph="n" class="3"/>
<ClassDef glyph="o" class="2"/> <ClassDef glyph="o" class="2"/>

4
Tests/varLib/data/master_ttx_interpolatable_ttf/TestFamily3-CondensedBold.ttx
View File

@ -491,9 +491,9 @@
</Coverage> </Coverage>
<ValueFormat1 value="4"/> <ValueFormat1 value="4"/>
<ValueFormat2 value="0"/> <ValueFormat2 value="0"/>
<ClassDef1 Format="2"> <ClassDef1>
</ClassDef1> </ClassDef1>
<ClassDef2 Format="1"> <ClassDef2>
<ClassDef glyph="T" class="4"/> <ClassDef glyph="T" class="4"/>
<ClassDef glyph="n" class="3"/> <ClassDef glyph="n" class="3"/>
<ClassDef glyph="o" class="2"/> <ClassDef glyph="o" class="2"/>

4
Tests/varLib/data/master_ttx_interpolatable_ttf/TestFamily3-CondensedLight.ttx
View File

@ -491,9 +491,9 @@
</Coverage> </Coverage>
<ValueFormat1 value="4"/> <ValueFormat1 value="4"/>
<ValueFormat2 value="0"/> <ValueFormat2 value="0"/>
<ClassDef1 Format="2"> <ClassDef1>
</ClassDef1> </ClassDef1>
<ClassDef2 Format="1"> <ClassDef2>
<ClassDef glyph="T" class="4"/> <ClassDef glyph="T" class="4"/>
<ClassDef glyph="n" class="3"/> <ClassDef glyph="n" class="3"/>
<ClassDef glyph="o" class="2"/> <ClassDef glyph="o" class="2"/>

4
Tests/varLib/data/master_ttx_interpolatable_ttf/TestFamily3-CondensedSemiBold.ttx
View File

@ -491,9 +491,9 @@
</Coverage> </Coverage>
<ValueFormat1 value="4"/> <ValueFormat1 value="4"/>
<ValueFormat2 value="0"/> <ValueFormat2 value="0"/>
<ClassDef1 Format="2"> <ClassDef1>
</ClassDef1> </ClassDef1>
<ClassDef2 Format="1"> <ClassDef2>
<ClassDef glyph="T" class="4"/> <ClassDef glyph="T" class="4"/>
<ClassDef glyph="n" class="3"/> <ClassDef glyph="n" class="3"/>
<ClassDef glyph="o" class="2"/> <ClassDef glyph="o" class="2"/>

4
Tests/varLib/data/master_ttx_interpolatable_ttf/TestFamily3-Light.ttx
View File

@ -491,9 +491,9 @@
</Coverage> </Coverage>
<ValueFormat1 value="4"/> <ValueFormat1 value="4"/>
<ValueFormat2 value="0"/> <ValueFormat2 value="0"/>
<ClassDef1 Format="2"> <ClassDef1>
</ClassDef1> </ClassDef1>
<ClassDef2 Format="1"> <ClassDef2>
<ClassDef glyph="T" class="4"/> <ClassDef glyph="T" class="4"/>
<ClassDef glyph="n" class="3"/> <ClassDef glyph="n" class="3"/>
<ClassDef glyph="o" class="2"/> <ClassDef glyph="o" class="2"/>

4
Tests/varLib/data/master_ttx_interpolatable_ttf/TestFamily3-Regular.ttx
View File

@ -485,9 +485,9 @@
</Coverage> </Coverage>
<ValueFormat1 value="4"/> <ValueFormat1 value="4"/>
<ValueFormat2 value="0"/> <ValueFormat2 value="0"/>
<ClassDef1 Format="2"> <ClassDef1>
</ClassDef1> </ClassDef1>
<ClassDef2 Format="1"> <ClassDef2>
<ClassDef glyph="T" class="4"/> <ClassDef glyph="T" class="4"/>
<ClassDef glyph="n" class="3"/> <ClassDef glyph="n" class="3"/>
<ClassDef glyph="o" class="2"/> <ClassDef glyph="o" class="2"/>

4
Tests/varLib/data/master_ttx_interpolatable_ttf/TestFamily3-SemiBold.ttx
View File

@ -491,9 +491,9 @@
</Coverage> </Coverage>
<ValueFormat1 value="4"/> <ValueFormat1 value="4"/>
<ValueFormat2 value="0"/> <ValueFormat2 value="0"/>
<ClassDef1 Format="2"> <ClassDef1>
</ClassDef1> </ClassDef1>
<ClassDef2 Format="1"> <ClassDef2>
<ClassDef glyph="T" class="4"/> <ClassDef glyph="T" class="4"/>
<ClassDef glyph="n" class="3"/> <ClassDef glyph="n" class="3"/>
<ClassDef glyph="o" class="2"/> <ClassDef glyph="o" class="2"/>

4
Tests/varLib/data/test_results/InterpolateLayoutGPOS_2_class_diff.ttx
View File

@ -39,9 +39,9 @@
</Coverage> </Coverage>
<ValueFormat1 value="4"/> <ValueFormat1 value="4"/>
<ValueFormat2 value="0"/> <ValueFormat2 value="0"/>
<ClassDef1 Format="2"> <ClassDef1>
</ClassDef1> </ClassDef1>
<ClassDef2 Format="1"> <ClassDef2>
<ClassDef glyph="a" class="1"/> <ClassDef glyph="a" class="1"/>
</ClassDef2> </ClassDef2>
<!-- Class1Count=1 --> <!-- Class1Count=1 -->

4
Tests/varLib/data/test_results/InterpolateLayoutGPOS_2_class_diff2.ttx
View File

@ -40,10 +40,10 @@
</Coverage> </Coverage>
<ValueFormat1 value="4"/> <ValueFormat1 value="4"/>
<ValueFormat2 value="0"/> <ValueFormat2 value="0"/>
<ClassDef1 Format="1"> <ClassDef1>
<ClassDef glyph="a" class="1"/> <ClassDef glyph="a" class="1"/>
</ClassDef1> </ClassDef1>
<ClassDef2 Format="1"> <ClassDef2>
<ClassDef glyph="a" class="1"/> <ClassDef glyph="a" class="1"/>
</ClassDef2> </ClassDef2>
<!-- Class1Count=2 --> <!-- Class1Count=2 -->

4
Tests/varLib/data/test_results/InterpolateLayoutGPOS_2_class_same.ttx
View File

@ -39,9 +39,9 @@
</Coverage> </Coverage>
<ValueFormat1 value="4"/> <ValueFormat1 value="4"/>
<ValueFormat2 value="0"/> <ValueFormat2 value="0"/>
<ClassDef1 Format="2"> <ClassDef1>
</ClassDef1> </ClassDef1>
<ClassDef2 Format="1"> <ClassDef2>
<ClassDef glyph="a" class="1"/> <ClassDef glyph="a" class="1"/>
</ClassDef2> </ClassDef2>
<!-- Class1Count=1 --> <!-- Class1Count=1 -->

4
Tests/varLib/instancer/data/PartialInstancerTest2-VF.ttx
View File

@ -659,12 +659,12 @@
</Coverage> </Coverage>
<ValueFormat1 value="68"/> <ValueFormat1 value="68"/>
<ValueFormat2 value="0"/> <ValueFormat2 value="0"/>
<ClassDef1 Format="1"> <ClassDef1>
<ClassDef glyph="A" class="1"/> <ClassDef glyph="A" class="1"/>
<ClassDef glyph="Agrave" class="1"/> <ClassDef glyph="Agrave" class="1"/>
<ClassDef glyph="T" class="2"/> <ClassDef glyph="T" class="2"/>
</ClassDef1> </ClassDef1>
<ClassDef2 Format="1"> <ClassDef2>
<ClassDef glyph="A" class="1"/> <ClassDef glyph="A" class="1"/>
<ClassDef glyph="Agrave" class="1"/> <ClassDef glyph="Agrave" class="1"/>
<ClassDef glyph="T" class="2"/> <ClassDef glyph="T" class="2"/>

4
Tests/varLib/instancer/data/test_results/PartialInstancerTest2-VF-instance-100,100.ttx
View File

@ -427,10 +427,10 @@
</Coverage> </Coverage>
<ValueFormat1 value="4"/> <ValueFormat1 value="4"/>
<ValueFormat2 value="0"/> <ValueFormat2 value="0"/>
<ClassDef1 Format="1"> <ClassDef1>
<ClassDef glyph="T" class="1"/> <ClassDef glyph="T" class="1"/>
</ClassDef1> </ClassDef1>
<ClassDef2 Format="1"> <ClassDef2>
<ClassDef glyph="A" class="1"/> <ClassDef glyph="A" class="1"/>
<ClassDef glyph="Agrave" class="1"/> <ClassDef glyph="Agrave" class="1"/>
<ClassDef glyph="T" class="2"/> <ClassDef glyph="T" class="2"/>

4
Tests/varLib/instancer/data/test_results/PartialInstancerTest2-VF-instance-100,62.5.ttx
View File

@ -427,10 +427,10 @@
</Coverage> </Coverage>
<ValueFormat1 value="4"/> <ValueFormat1 value="4"/>
<ValueFormat2 value="0"/> <ValueFormat2 value="0"/>
<ClassDef1 Format="1"> <ClassDef1>
<ClassDef glyph="T" class="1"/> <ClassDef glyph="T" class="1"/>
</ClassDef1> </ClassDef1>
<ClassDef2 Format="1"> <ClassDef2>
<ClassDef glyph="A" class="1"/> <ClassDef glyph="A" class="1"/>
<ClassDef glyph="Agrave" class="1"/> <ClassDef glyph="Agrave" class="1"/>
<ClassDef glyph="T" class="2"/> <ClassDef glyph="T" class="2"/>

4
Tests/varLib/instancer/data/test_results/PartialInstancerTest2-VF-instance-400,100.ttx
View File

@ -421,10 +421,10 @@
</Coverage> </Coverage>
<ValueFormat1 value="4"/> <ValueFormat1 value="4"/>
<ValueFormat2 value="0"/> <ValueFormat2 value="0"/>
<ClassDef1 Format="1"> <ClassDef1>
<ClassDef glyph="T" class="1"/> <ClassDef glyph="T" class="1"/>
</ClassDef1> </ClassDef1>
<ClassDef2 Format="1"> <ClassDef2>
<ClassDef glyph="A" class="1"/> <ClassDef glyph="A" class="1"/>
<ClassDef glyph="Agrave" class="1"/> <ClassDef glyph="Agrave" class="1"/>
<ClassDef glyph="T" class="2"/> <ClassDef glyph="T" class="2"/>

4
Tests/varLib/instancer/data/test_results/PartialInstancerTest2-VF-instance-400,62.5.ttx
View File

@ -427,10 +427,10 @@
</Coverage> </Coverage>
<ValueFormat1 value="4"/> <ValueFormat1 value="4"/>
<ValueFormat2 value="0"/> <ValueFormat2 value="0"/>
<ClassDef1 Format="1"> <ClassDef1>
<ClassDef glyph="T" class="1"/> <ClassDef glyph="T" class="1"/>
</ClassDef1> </ClassDef1>
<ClassDef2 Format="1"> <ClassDef2>
<ClassDef glyph="A" class="1"/> <ClassDef glyph="A" class="1"/>
<ClassDef glyph="Agrave" class="1"/> <ClassDef glyph="Agrave" class="1"/>
<ClassDef glyph="T" class="2"/> <ClassDef glyph="T" class="2"/>

4
Tests/varLib/instancer/data/test_results/PartialInstancerTest2-VF-instance-900,100.ttx
View File

@ -427,10 +427,10 @@
</Coverage> </Coverage>
<ValueFormat1 value="4"/> <ValueFormat1 value="4"/>
<ValueFormat2 value="0"/> <ValueFormat2 value="0"/>
<ClassDef1 Format="1"> <ClassDef1>
<ClassDef glyph="T" class="1"/> <ClassDef glyph="T" class="1"/>
</ClassDef1> </ClassDef1>
<ClassDef2 Format="1"> <ClassDef2>
<ClassDef glyph="A" class="1"/> <ClassDef glyph="A" class="1"/>
<ClassDef glyph="Agrave" class="1"/> <ClassDef glyph="Agrave" class="1"/>
<ClassDef glyph="T" class="2"/> <ClassDef glyph="T" class="2"/>

4
Tests/varLib/instancer/data/test_results/PartialInstancerTest2-VF-instance-900,62.5.ttx
View File

@ -427,10 +427,10 @@
</Coverage> </Coverage>
<ValueFormat1 value="4"/> <ValueFormat1 value="4"/>
<ValueFormat2 value="0"/> <ValueFormat2 value="0"/>
<ClassDef1 Format="1"> <ClassDef1>
<ClassDef glyph="T" class="1"/> <ClassDef glyph="T" class="1"/>
</ClassDef1> </ClassDef1>
<ClassDef2 Format="1"> <ClassDef2>
<ClassDef glyph="A" class="1"/> <ClassDef glyph="A" class="1"/>
<ClassDef glyph="Agrave" class="1"/> <ClassDef glyph="Agrave" class="1"/>
<ClassDef glyph="T" class="2"/> <ClassDef glyph="T" class="2"/>