diff options
Diffstat (limited to 'Tests/ttLib/tables/data')
337 files changed, 1011 insertions, 1009 deletions
diff --git a/Tests/ttLib/tables/data/C_F_F__2.bin b/Tests/ttLib/tables/data/C_F_F__2.bin Binary files differindex faa0e919..52b0177e 100644 --- a/Tests/ttLib/tables/data/C_F_F__2.bin +++ b/Tests/ttLib/tables/data/C_F_F__2.bin diff --git a/Tests/ttLib/tables/data/C_F_F__2.ttx b/Tests/ttLib/tables/data/C_F_F__2.ttx index c86252bb..95f840f6 100644 --- a/Tests/ttLib/tables/data/C_F_F__2.ttx +++ b/Tests/ttLib/tables/data/C_F_F__2.ttx @@ -21,7 +21,7 @@ <xMin value="51"/> <yMin value="-115"/> <xMax value="560"/> - <yMax value="762"/> + <yMax value="731"/> <macStyle value="00000000 00000000"/> <lowestRecPPEM value="3"/> <fontDirectionHint value="2"/> @@ -106,6 +106,8 @@ <blend value="190 -110 -162 0 -110 -162"/> <blend value="200 0 -6 0 0 -6"/> </StemSnapV> + <LanguageGroup value="0"/> + <ExpansionFactor value="0.06"/> </Private> </FontDict> </FDArray> diff --git a/Tests/ttLib/tables/data/aots/classdef1_font1.ttx.GSUB b/Tests/ttLib/tables/data/aots/classdef1_font1.ttx.GSUB index 21f1ab19..7a8f5109 100644 --- a/Tests/ttLib/tables/data/aots/classdef1_font1.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/classdef1_font1.ttx.GSUB @@ -33,7 +33,7 @@ <LookupType value="1"/> <LookupFlag value="0"/> <!-- SubTableCount=1 --> - <SingleSubst index="0" Format="1"> + <SingleSubst index="0"> <Substitution in=".notdef" out="g3"/> <Substitution in="g1" out="g4"/> <Substitution in="g10" out="g13"/> @@ -140,7 +140,7 @@ <LookupType value="1"/> <LookupFlag value="0"/> <!-- SubTableCount=1 --> - <SingleSubst index="0" Format="1"> + <SingleSubst index="0"> <Substitution in=".notdef" out="g4"/> <Substitution in="g1" out="g5"/> <Substitution in="g10" out="g14"/> @@ -247,7 +247,7 @@ <LookupType value="1"/> <LookupFlag value="0"/> <!-- SubTableCount=1 --> - <SingleSubst index="0" Format="1"> + <SingleSubst index="0"> <Substitution in=".notdef" out="g5"/> <Substitution in="g1" out="g6"/> <Substitution in="g10" out="g15"/> @@ -355,7 +355,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <ContextSubst index="0" Format="2"> - <Coverage Format="1"> + <Coverage> <Glyph value=".notdef"/> <Glyph value="g1"/> <Glyph value="g2"/> @@ -457,7 +457,7 @@ <Glyph value="g98"/> <Glyph value="g99"/> </Coverage> - <ClassDef Format="1"> + <ClassDef> <ClassDef glyph="g18" class="1"/> <ClassDef glyph="g19" class="1"/> <ClassDef glyph="g20" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/classdef1_font2.ttx.GSUB b/Tests/ttLib/tables/data/aots/classdef1_font2.ttx.GSUB index ec7278e2..563d6b67 100644 --- a/Tests/ttLib/tables/data/aots/classdef1_font2.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/classdef1_font2.ttx.GSUB @@ -33,7 +33,7 @@ <LookupType value="1"/> <LookupFlag value="0"/> <!-- SubTableCount=1 --> - <SingleSubst index="0" Format="1"> + <SingleSubst index="0"> <Substitution in=".notdef" out="g3"/> <Substitution in="g1" out="g4"/> <Substitution in="g10" out="g13"/> @@ -140,7 +140,7 @@ <LookupType value="1"/> <LookupFlag value="0"/> <!-- SubTableCount=1 --> - <SingleSubst index="0" Format="1"> + <SingleSubst index="0"> <Substitution in=".notdef" out="g4"/> <Substitution in="g1" out="g5"/> <Substitution in="g10" out="g14"/> @@ -247,7 +247,7 @@ <LookupType value="1"/> <LookupFlag value="0"/> <!-- SubTableCount=1 --> - <SingleSubst index="0" Format="1"> + <SingleSubst index="0"> <Substitution in=".notdef" out="g5"/> <Substitution in="g1" out="g6"/> <Substitution in="g10" out="g15"/> @@ -355,7 +355,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <ContextSubst index="0" Format="2"> - <Coverage Format="1"> + <Coverage> <Glyph value=".notdef"/> <Glyph value="g1"/> <Glyph value="g2"/> @@ -457,7 +457,7 @@ <Glyph value="g98"/> <Glyph value="g99"/> </Coverage> - <ClassDef Format="1"> + <ClassDef> <ClassDef glyph="g18" class="2"/> <ClassDef glyph="g19" class="2"/> <ClassDef glyph="g20" class="2"/> diff --git a/Tests/ttLib/tables/data/aots/classdef1_font3.ttx.GSUB b/Tests/ttLib/tables/data/aots/classdef1_font3.ttx.GSUB index 9bc1e435..0bcbc728 100644 --- a/Tests/ttLib/tables/data/aots/classdef1_font3.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/classdef1_font3.ttx.GSUB @@ -33,7 +33,7 @@ <LookupType value="1"/> <LookupFlag value="0"/> <!-- SubTableCount=1 --> - <SingleSubst index="0" Format="1"> + <SingleSubst index="0"> <Substitution in=".notdef" out="g3"/> <Substitution in="g1" out="g4"/> <Substitution in="g10" out="g13"/> @@ -140,7 +140,7 @@ <LookupType value="1"/> <LookupFlag value="0"/> <!-- SubTableCount=1 --> - <SingleSubst index="0" Format="1"> + <SingleSubst index="0"> <Substitution in=".notdef" out="g4"/> <Substitution in="g1" out="g5"/> <Substitution in="g10" out="g14"/> @@ -247,7 +247,7 @@ <LookupType value="1"/> <LookupFlag value="0"/> <!-- SubTableCount=1 --> - <SingleSubst index="0" Format="1"> + <SingleSubst index="0"> <Substitution in=".notdef" out="g5"/> <Substitution in="g1" out="g6"/> <Substitution in="g10" out="g15"/> @@ -355,7 +355,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <ContextSubst index="0" Format="2"> - <Coverage Format="1"> + <Coverage> <Glyph value=".notdef"/> <Glyph value="g1"/> <Glyph value="g2"/> @@ -457,7 +457,7 @@ <Glyph value="g98"/> <Glyph value="g99"/> </Coverage> - <ClassDef Format="1"> + <ClassDef> <ClassDef glyph="g18" class="2"/> <ClassDef glyph="g19" class="2"/> <ClassDef glyph="g20" class="2"/> diff --git a/Tests/ttLib/tables/data/aots/classdef1_font4.ttx.GSUB b/Tests/ttLib/tables/data/aots/classdef1_font4.ttx.GSUB index 681240da..dce27066 100644 --- a/Tests/ttLib/tables/data/aots/classdef1_font4.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/classdef1_font4.ttx.GSUB @@ -33,7 +33,7 @@ <LookupType value="1"/> <LookupFlag value="0"/> <!-- SubTableCount=1 --> - <SingleSubst index="0" Format="1"> + <SingleSubst index="0"> <Substitution in=".notdef" out="g3"/> <Substitution in="g1" out="g4"/> <Substitution in="g10" out="g13"/> @@ -140,7 +140,7 @@ <LookupType value="1"/> <LookupFlag value="0"/> <!-- SubTableCount=1 --> - <SingleSubst index="0" Format="1"> + <SingleSubst index="0"> <Substitution in=".notdef" out="g4"/> <Substitution in="g1" out="g5"/> <Substitution in="g10" out="g14"/> @@ -247,7 +247,7 @@ <LookupType value="1"/> <LookupFlag value="0"/> <!-- SubTableCount=1 --> - <SingleSubst index="0" Format="1"> + <SingleSubst index="0"> <Substitution in=".notdef" out="g5"/> <Substitution in="g1" out="g6"/> <Substitution in="g10" out="g15"/> @@ -355,7 +355,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <ContextSubst index="0" Format="2"> - <Coverage Format="1"> + <Coverage> <Glyph value=".notdef"/> <Glyph value="g1"/> <Glyph value="g2"/> @@ -457,7 +457,7 @@ <Glyph value="g98"/> <Glyph value="g99"/> </Coverage> - <ClassDef Format="1"> + <ClassDef> </ClassDef> <!-- SubClassSetCount=1 --> <SubClassSet index="0" empty="1"/> diff --git a/Tests/ttLib/tables/data/aots/classdef2_font1.ttx.GSUB b/Tests/ttLib/tables/data/aots/classdef2_font1.ttx.GSUB index f602354d..7a8f5109 100644 --- a/Tests/ttLib/tables/data/aots/classdef2_font1.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/classdef2_font1.ttx.GSUB @@ -33,7 +33,7 @@ <LookupType value="1"/> <LookupFlag value="0"/> <!-- SubTableCount=1 --> - <SingleSubst index="0" Format="1"> + <SingleSubst index="0"> <Substitution in=".notdef" out="g3"/> <Substitution in="g1" out="g4"/> <Substitution in="g10" out="g13"/> @@ -140,7 +140,7 @@ <LookupType value="1"/> <LookupFlag value="0"/> <!-- SubTableCount=1 --> - <SingleSubst index="0" Format="1"> + <SingleSubst index="0"> <Substitution in=".notdef" out="g4"/> <Substitution in="g1" out="g5"/> <Substitution in="g10" out="g14"/> @@ -247,7 +247,7 @@ <LookupType value="1"/> <LookupFlag value="0"/> <!-- SubTableCount=1 --> - <SingleSubst index="0" Format="1"> + <SingleSubst index="0"> <Substitution in=".notdef" out="g5"/> <Substitution in="g1" out="g6"/> <Substitution in="g10" out="g15"/> @@ -355,7 +355,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <ContextSubst index="0" Format="2"> - <Coverage Format="1"> + <Coverage> <Glyph value=".notdef"/> <Glyph value="g1"/> <Glyph value="g2"/> @@ -457,7 +457,7 @@ <Glyph value="g98"/> <Glyph value="g99"/> </Coverage> - <ClassDef Format="2"> + <ClassDef> <ClassDef glyph="g18" class="1"/> <ClassDef glyph="g19" class="1"/> <ClassDef glyph="g20" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/classdef2_font2.ttx.GSUB b/Tests/ttLib/tables/data/aots/classdef2_font2.ttx.GSUB index d4650bd7..563d6b67 100644 --- a/Tests/ttLib/tables/data/aots/classdef2_font2.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/classdef2_font2.ttx.GSUB @@ -33,7 +33,7 @@ <LookupType value="1"/> <LookupFlag value="0"/> <!-- SubTableCount=1 --> - <SingleSubst index="0" Format="1"> + <SingleSubst index="0"> <Substitution in=".notdef" out="g3"/> <Substitution in="g1" out="g4"/> <Substitution in="g10" out="g13"/> @@ -140,7 +140,7 @@ <LookupType value="1"/> <LookupFlag value="0"/> <!-- SubTableCount=1 --> - <SingleSubst index="0" Format="1"> + <SingleSubst index="0"> <Substitution in=".notdef" out="g4"/> <Substitution in="g1" out="g5"/> <Substitution in="g10" out="g14"/> @@ -247,7 +247,7 @@ <LookupType value="1"/> <LookupFlag value="0"/> <!-- SubTableCount=1 --> - <SingleSubst index="0" Format="1"> + <SingleSubst index="0"> <Substitution in=".notdef" out="g5"/> <Substitution in="g1" out="g6"/> <Substitution in="g10" out="g15"/> @@ -355,7 +355,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <ContextSubst index="0" Format="2"> - <Coverage Format="1"> + <Coverage> <Glyph value=".notdef"/> <Glyph value="g1"/> <Glyph value="g2"/> @@ -457,7 +457,7 @@ <Glyph value="g98"/> <Glyph value="g99"/> </Coverage> - <ClassDef Format="2"> + <ClassDef> <ClassDef glyph="g18" class="2"/> <ClassDef glyph="g19" class="2"/> <ClassDef glyph="g20" class="2"/> diff --git a/Tests/ttLib/tables/data/aots/classdef2_font3.ttx.GSUB b/Tests/ttLib/tables/data/aots/classdef2_font3.ttx.GSUB index 7cb045f8..0bcbc728 100644 --- a/Tests/ttLib/tables/data/aots/classdef2_font3.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/classdef2_font3.ttx.GSUB @@ -33,7 +33,7 @@ <LookupType value="1"/> <LookupFlag value="0"/> <!-- SubTableCount=1 --> - <SingleSubst index="0" Format="1"> + <SingleSubst index="0"> <Substitution in=".notdef" out="g3"/> <Substitution in="g1" out="g4"/> <Substitution in="g10" out="g13"/> @@ -140,7 +140,7 @@ <LookupType value="1"/> <LookupFlag value="0"/> <!-- SubTableCount=1 --> - <SingleSubst index="0" Format="1"> + <SingleSubst index="0"> <Substitution in=".notdef" out="g4"/> <Substitution in="g1" out="g5"/> <Substitution in="g10" out="g14"/> @@ -247,7 +247,7 @@ <LookupType value="1"/> <LookupFlag value="0"/> <!-- SubTableCount=1 --> - <SingleSubst index="0" Format="1"> + <SingleSubst index="0"> <Substitution in=".notdef" out="g5"/> <Substitution in="g1" out="g6"/> <Substitution in="g10" out="g15"/> @@ -355,7 +355,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <ContextSubst index="0" Format="2"> - <Coverage Format="1"> + <Coverage> <Glyph value=".notdef"/> <Glyph value="g1"/> <Glyph value="g2"/> @@ -457,7 +457,7 @@ <Glyph value="g98"/> <Glyph value="g99"/> </Coverage> - <ClassDef Format="2"> + <ClassDef> <ClassDef glyph="g18" class="2"/> <ClassDef glyph="g19" class="2"/> <ClassDef glyph="g20" class="2"/> diff --git a/Tests/ttLib/tables/data/aots/classdef2_font4.ttx.GSUB b/Tests/ttLib/tables/data/aots/classdef2_font4.ttx.GSUB index 90f0b93f..dce27066 100644 --- a/Tests/ttLib/tables/data/aots/classdef2_font4.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/classdef2_font4.ttx.GSUB @@ -33,7 +33,7 @@ <LookupType value="1"/> <LookupFlag value="0"/> <!-- SubTableCount=1 --> - <SingleSubst index="0" Format="1"> + <SingleSubst index="0"> <Substitution in=".notdef" out="g3"/> <Substitution in="g1" out="g4"/> <Substitution in="g10" out="g13"/> @@ -140,7 +140,7 @@ <LookupType value="1"/> <LookupFlag value="0"/> <!-- SubTableCount=1 --> - <SingleSubst index="0" Format="1"> + <SingleSubst index="0"> <Substitution in=".notdef" out="g4"/> <Substitution in="g1" out="g5"/> <Substitution in="g10" out="g14"/> @@ -247,7 +247,7 @@ <LookupType value="1"/> <LookupFlag value="0"/> <!-- SubTableCount=1 --> - <SingleSubst index="0" Format="1"> + <SingleSubst index="0"> <Substitution in=".notdef" out="g5"/> <Substitution in="g1" out="g6"/> <Substitution in="g10" out="g15"/> @@ -355,7 +355,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <ContextSubst index="0" Format="2"> - <Coverage Format="1"> + <Coverage> <Glyph value=".notdef"/> <Glyph value="g1"/> <Glyph value="g2"/> @@ -457,7 +457,7 @@ <Glyph value="g98"/> <Glyph value="g99"/> </Coverage> - <ClassDef Format="2"> + <ClassDef> </ClassDef> <!-- SubClassSetCount=1 --> <SubClassSet index="0" empty="1"/> diff --git a/Tests/ttLib/tables/data/aots/gpos1_1_lookupflag_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gpos1_1_lookupflag_f1.ttx.GDEF index 971a3f19..08e65de0 100644 --- a/Tests/ttLib/tables/data/aots/gpos1_1_lookupflag_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gpos1_1_lookupflag_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g18" class="1"/> </GlyphClassDef> </GDEF> diff --git a/Tests/ttLib/tables/data/aots/gpos1_1_lookupflag_f1.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos1_1_lookupflag_f1.ttx.GPOS index 0ed7d633..3ab19a64 100644 --- a/Tests/ttLib/tables/data/aots/gpos1_1_lookupflag_f1.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos1_1_lookupflag_f1.ttx.GPOS @@ -34,7 +34,7 @@ <LookupFlag value="2"/><!-- ignoreBaseGlyphs --> <!-- SubTableCount=1 --> <SinglePos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g18"/> <Glyph value="g20"/> </Coverage> diff --git a/Tests/ttLib/tables/data/aots/gpos1_1_simple_f1.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos1_1_simple_f1.ttx.GPOS index 00eacc3e..508d14e3 100644 --- a/Tests/ttLib/tables/data/aots/gpos1_1_simple_f1.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos1_1_simple_f1.ttx.GPOS @@ -34,7 +34,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <SinglePos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g18"/> <Glyph value="g20"/> </Coverage> diff --git a/Tests/ttLib/tables/data/aots/gpos1_1_simple_f2.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos1_1_simple_f2.ttx.GPOS index 1eff0218..ef78ecef 100644 --- a/Tests/ttLib/tables/data/aots/gpos1_1_simple_f2.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos1_1_simple_f2.ttx.GPOS @@ -34,7 +34,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <SinglePos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g18"/> <Glyph value="g20"/> </Coverage> diff --git a/Tests/ttLib/tables/data/aots/gpos1_1_simple_f3.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos1_1_simple_f3.ttx.GPOS index c3850df4..523b139b 100644 --- a/Tests/ttLib/tables/data/aots/gpos1_1_simple_f3.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos1_1_simple_f3.ttx.GPOS @@ -34,7 +34,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <SinglePos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g18"/> <Glyph value="g20"/> </Coverage> diff --git a/Tests/ttLib/tables/data/aots/gpos1_1_simple_f4.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos1_1_simple_f4.ttx.GPOS index f80286c2..027d687c 100644 --- a/Tests/ttLib/tables/data/aots/gpos1_1_simple_f4.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos1_1_simple_f4.ttx.GPOS @@ -34,7 +34,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <SinglePos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g18"/> <Glyph value="g20"/> </Coverage> diff --git a/Tests/ttLib/tables/data/aots/gpos1_2_font1.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos1_2_font1.ttx.GPOS index 11351a6f..058c302f 100644 --- a/Tests/ttLib/tables/data/aots/gpos1_2_font1.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos1_2_font1.ttx.GPOS @@ -34,7 +34,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <SinglePos index="0" Format="2"> - <Coverage Format="1"> + <Coverage> <Glyph value="g18"/> <Glyph value="g20"/> </Coverage> diff --git a/Tests/ttLib/tables/data/aots/gpos1_2_font2.ttx.GDEF b/Tests/ttLib/tables/data/aots/gpos1_2_font2.ttx.GDEF index 971a3f19..08e65de0 100644 --- a/Tests/ttLib/tables/data/aots/gpos1_2_font2.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gpos1_2_font2.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g18" class="1"/> </GlyphClassDef> </GDEF> diff --git a/Tests/ttLib/tables/data/aots/gpos1_2_font2.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos1_2_font2.ttx.GPOS index ecd96b0d..2b557f7e 100644 --- a/Tests/ttLib/tables/data/aots/gpos1_2_font2.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos1_2_font2.ttx.GPOS @@ -34,7 +34,7 @@ <LookupFlag value="2"/><!-- ignoreBaseGlyphs --> <!-- SubTableCount=1 --> <SinglePos index="0" Format="2"> - <Coverage Format="1"> + <Coverage> <Glyph value="g18"/> <Glyph value="g20"/> </Coverage> diff --git a/Tests/ttLib/tables/data/aots/gpos2_1_font6.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos2_1_font6.ttx.GPOS index db1315b1..e27e72bb 100644 --- a/Tests/ttLib/tables/data/aots/gpos2_1_font6.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos2_1_font6.ttx.GPOS @@ -34,7 +34,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g18"/> </Coverage> <ValueFormat1 value="1"/> diff --git a/Tests/ttLib/tables/data/aots/gpos2_1_font7.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos2_1_font7.ttx.GPOS index 8b22294c..01f6b453 100644 --- a/Tests/ttLib/tables/data/aots/gpos2_1_font7.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos2_1_font7.ttx.GPOS @@ -34,7 +34,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g18"/> <Glyph value="g21"/> </Coverage> diff --git a/Tests/ttLib/tables/data/aots/gpos2_1_lookupflag_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gpos2_1_lookupflag_f1.ttx.GDEF index 971a3f19..08e65de0 100644 --- a/Tests/ttLib/tables/data/aots/gpos2_1_lookupflag_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gpos2_1_lookupflag_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g18" class="1"/> </GlyphClassDef> </GDEF> diff --git a/Tests/ttLib/tables/data/aots/gpos2_1_lookupflag_f1.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos2_1_lookupflag_f1.ttx.GPOS index 4924787b..329315c8 100644 --- a/Tests/ttLib/tables/data/aots/gpos2_1_lookupflag_f1.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos2_1_lookupflag_f1.ttx.GPOS @@ -34,7 +34,7 @@ <LookupFlag value="2"/><!-- ignoreBaseGlyphs --> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g19"/> </Coverage> <ValueFormat1 value="1"/> diff --git a/Tests/ttLib/tables/data/aots/gpos2_1_lookupflag_f2.ttx.GDEF b/Tests/ttLib/tables/data/aots/gpos2_1_lookupflag_f2.ttx.GDEF index 971a3f19..08e65de0 100644 --- a/Tests/ttLib/tables/data/aots/gpos2_1_lookupflag_f2.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gpos2_1_lookupflag_f2.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g18" class="1"/> </GlyphClassDef> </GDEF> diff --git a/Tests/ttLib/tables/data/aots/gpos2_1_lookupflag_f2.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos2_1_lookupflag_f2.ttx.GPOS index 97f64ab4..56506160 100644 --- a/Tests/ttLib/tables/data/aots/gpos2_1_lookupflag_f2.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos2_1_lookupflag_f2.ttx.GPOS @@ -34,7 +34,7 @@ <LookupFlag value="2"/><!-- ignoreBaseGlyphs --> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g19"/> </Coverage> <ValueFormat1 value="4"/> diff --git a/Tests/ttLib/tables/data/aots/gpos2_1_next_glyph_f1.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos2_1_next_glyph_f1.ttx.GPOS index d8b4e83c..e5f8cc7c 100644 --- a/Tests/ttLib/tables/data/aots/gpos2_1_next_glyph_f1.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos2_1_next_glyph_f1.ttx.GPOS @@ -34,7 +34,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g18"/> </Coverage> <ValueFormat1 value="1"/> diff --git a/Tests/ttLib/tables/data/aots/gpos2_1_next_glyph_f2.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos2_1_next_glyph_f2.ttx.GPOS index cf71f475..820bea63 100644 --- a/Tests/ttLib/tables/data/aots/gpos2_1_next_glyph_f2.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos2_1_next_glyph_f2.ttx.GPOS @@ -34,7 +34,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g18"/> </Coverage> <ValueFormat1 value="1"/> diff --git a/Tests/ttLib/tables/data/aots/gpos2_1_simple_f1.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos2_1_simple_f1.ttx.GPOS index 81b17204..55b84024 100644 --- a/Tests/ttLib/tables/data/aots/gpos2_1_simple_f1.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos2_1_simple_f1.ttx.GPOS @@ -34,7 +34,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g18"/> </Coverage> <ValueFormat1 value="1"/> diff --git a/Tests/ttLib/tables/data/aots/gpos2_2_font1.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos2_2_font1.ttx.GPOS index 5595b999..d41d02dd 100644 --- a/Tests/ttLib/tables/data/aots/gpos2_2_font1.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos2_2_font1.ttx.GPOS @@ -34,15 +34,15 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <PairPos index="0" Format="2"> - <Coverage Format="1"> + <Coverage> <Glyph value="g18"/> </Coverage> <ValueFormat1 value="1"/> <ValueFormat2 value="2"/> - <ClassDef1 Format="2"> + <ClassDef1> <ClassDef glyph="g18" class="1"/> </ClassDef1> - <ClassDef2 Format="2"> + <ClassDef2> <ClassDef glyph="g19" class="1"/> </ClassDef2> <!-- Class1Count=2 --> diff --git a/Tests/ttLib/tables/data/aots/gpos2_2_font2.ttx.GDEF b/Tests/ttLib/tables/data/aots/gpos2_2_font2.ttx.GDEF index 971a3f19..08e65de0 100644 --- a/Tests/ttLib/tables/data/aots/gpos2_2_font2.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gpos2_2_font2.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g18" class="1"/> </GlyphClassDef> </GDEF> diff --git a/Tests/ttLib/tables/data/aots/gpos2_2_font2.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos2_2_font2.ttx.GPOS index 69abe30d..c7f3f328 100644 --- a/Tests/ttLib/tables/data/aots/gpos2_2_font2.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos2_2_font2.ttx.GPOS @@ -34,15 +34,15 @@ <LookupFlag value="2"/><!-- ignoreBaseGlyphs --> <!-- SubTableCount=1 --> <PairPos index="0" Format="2"> - <Coverage Format="1"> + <Coverage> <Glyph value="g19"/> </Coverage> <ValueFormat1 value="1"/> <ValueFormat2 value="2"/> - <ClassDef1 Format="2"> + <ClassDef1> <ClassDef glyph="g19" class="1"/> </ClassDef1> - <ClassDef2 Format="2"> + <ClassDef2> <ClassDef glyph="g20" class="1"/> </ClassDef2> <!-- Class1Count=2 --> diff --git a/Tests/ttLib/tables/data/aots/gpos2_2_font3.ttx.GDEF b/Tests/ttLib/tables/data/aots/gpos2_2_font3.ttx.GDEF index 971a3f19..08e65de0 100644 --- a/Tests/ttLib/tables/data/aots/gpos2_2_font3.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gpos2_2_font3.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g18" class="1"/> </GlyphClassDef> </GDEF> diff --git a/Tests/ttLib/tables/data/aots/gpos2_2_font3.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos2_2_font3.ttx.GPOS index 90771d37..25ac07ca 100644 --- a/Tests/ttLib/tables/data/aots/gpos2_2_font3.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos2_2_font3.ttx.GPOS @@ -34,15 +34,15 @@ <LookupFlag value="2"/><!-- ignoreBaseGlyphs --> <!-- SubTableCount=1 --> <PairPos index="0" Format="2"> - <Coverage Format="1"> + <Coverage> <Glyph value="g19"/> </Coverage> <ValueFormat1 value="4"/> <ValueFormat2 value="2"/> - <ClassDef1 Format="2"> + <ClassDef1> <ClassDef glyph="g19" class="1"/> </ClassDef1> - <ClassDef2 Format="2"> + <ClassDef2> <ClassDef glyph="g20" class="1"/> </ClassDef2> <!-- Class1Count=2 --> diff --git a/Tests/ttLib/tables/data/aots/gpos2_2_font4.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos2_2_font4.ttx.GPOS index a2e6017c..46f3e6ee 100644 --- a/Tests/ttLib/tables/data/aots/gpos2_2_font4.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos2_2_font4.ttx.GPOS @@ -34,15 +34,15 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <PairPos index="0" Format="2"> - <Coverage Format="1"> + <Coverage> <Glyph value="g18"/> </Coverage> <ValueFormat1 value="1"/> <ValueFormat2 value="2"/> - <ClassDef1 Format="2"> + <ClassDef1> <ClassDef glyph="g18" class="1"/> </ClassDef1> - <ClassDef2 Format="2"> + <ClassDef2> <ClassDef glyph="g18" class="1"/> </ClassDef2> <!-- Class1Count=2 --> diff --git a/Tests/ttLib/tables/data/aots/gpos2_2_font5.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos2_2_font5.ttx.GPOS index d2697352..1d589ca2 100644 --- a/Tests/ttLib/tables/data/aots/gpos2_2_font5.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos2_2_font5.ttx.GPOS @@ -34,15 +34,15 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <PairPos index="0" Format="2"> - <Coverage Format="1"> + <Coverage> <Glyph value="g18"/> </Coverage> <ValueFormat1 value="1"/> <ValueFormat2 value="0"/> - <ClassDef1 Format="2"> + <ClassDef1> <ClassDef glyph="g18" class="1"/> </ClassDef1> - <ClassDef2 Format="2"> + <ClassDef2> <ClassDef glyph="g18" class="1"/> </ClassDef2> <!-- Class1Count=2 --> diff --git a/Tests/ttLib/tables/data/aots/gpos3_font1.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos3_font1.ttx.GPOS index 8cbdbc7c..8babfbf4 100644 --- a/Tests/ttLib/tables/data/aots/gpos3_font1.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos3_font1.ttx.GPOS @@ -34,7 +34,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <CursivePos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g18"/> <Glyph value="g19"/> </Coverage> diff --git a/Tests/ttLib/tables/data/aots/gpos3_font2.ttx.GDEF b/Tests/ttLib/tables/data/aots/gpos3_font2.ttx.GDEF index b5ca1ed7..d2981b43 100644 --- a/Tests/ttLib/tables/data/aots/gpos3_font2.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gpos3_font2.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g21" class="1"/> </GlyphClassDef> </GDEF> diff --git a/Tests/ttLib/tables/data/aots/gpos3_font2.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos3_font2.ttx.GPOS index 0f944957..378af379 100644 --- a/Tests/ttLib/tables/data/aots/gpos3_font2.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos3_font2.ttx.GPOS @@ -34,7 +34,7 @@ <LookupFlag value="2"/><!-- ignoreBaseGlyphs --> <!-- SubTableCount=1 --> <CursivePos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g18"/> <Glyph value="g19"/> </Coverage> diff --git a/Tests/ttLib/tables/data/aots/gpos3_font3.ttx.GDEF b/Tests/ttLib/tables/data/aots/gpos3_font3.ttx.GDEF index b5ca1ed7..d2981b43 100644 --- a/Tests/ttLib/tables/data/aots/gpos3_font3.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gpos3_font3.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g21" class="1"/> </GlyphClassDef> </GDEF> diff --git a/Tests/ttLib/tables/data/aots/gpos3_font3.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos3_font3.ttx.GPOS index b3beb5cb..7da5f5e8 100644 --- a/Tests/ttLib/tables/data/aots/gpos3_font3.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos3_font3.ttx.GPOS @@ -34,7 +34,7 @@ <LookupFlag value="2"/><!-- ignoreBaseGlyphs --> <!-- SubTableCount=1 --> <CursivePos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g18"/> <Glyph value="g19"/> <Glyph value="g20"/> diff --git a/Tests/ttLib/tables/data/aots/gpos4_lookupflag_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gpos4_lookupflag_f1.ttx.GDEF index 5118ad8d..e6b39464 100644 --- a/Tests/ttLib/tables/data/aots/gpos4_lookupflag_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gpos4_lookupflag_f1.ttx.GDEF @@ -3,13 +3,13 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g17" class="1"/> <ClassDef glyph="g18" class="1"/> <ClassDef glyph="g19" class="3"/> <ClassDef glyph="g20" class="3"/> </GlyphClassDef> - <MarkAttachClassDef Format="2"> + <MarkAttachClassDef> <ClassDef glyph="g19" class="1"/> <ClassDef glyph="g20" class="2"/> </MarkAttachClassDef> diff --git a/Tests/ttLib/tables/data/aots/gpos4_lookupflag_f1.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos4_lookupflag_f1.ttx.GPOS index f86f1d23..d7526b5e 100644 --- a/Tests/ttLib/tables/data/aots/gpos4_lookupflag_f1.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos4_lookupflag_f1.ttx.GPOS @@ -34,10 +34,10 @@ <LookupFlag value="2"/><!-- ignoreBaseGlyphs --> <!-- SubTableCount=1 --> <MarkBasePos index="0" Format="1"> - <MarkCoverage Format="1"> + <MarkCoverage> <Glyph value="g19"/> </MarkCoverage> - <BaseCoverage Format="1"> + <BaseCoverage> <Glyph value="g18"/> </BaseCoverage> <!-- ClassCount=1 --> diff --git a/Tests/ttLib/tables/data/aots/gpos4_lookupflag_f2.ttx.GDEF b/Tests/ttLib/tables/data/aots/gpos4_lookupflag_f2.ttx.GDEF index 2627f21d..8184af27 100644 --- a/Tests/ttLib/tables/data/aots/gpos4_lookupflag_f2.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gpos4_lookupflag_f2.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g17" class="1"/> <ClassDef glyph="g18" class="1"/> <ClassDef glyph="g19" class="3"/> diff --git a/Tests/ttLib/tables/data/aots/gpos4_lookupflag_f2.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos4_lookupflag_f2.ttx.GPOS index 9f1be150..3efed829 100644 --- a/Tests/ttLib/tables/data/aots/gpos4_lookupflag_f2.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos4_lookupflag_f2.ttx.GPOS @@ -34,10 +34,10 @@ <LookupFlag value="8"/><!-- ignoreMarks --> <!-- SubTableCount=1 --> <MarkBasePos index="0" Format="1"> - <MarkCoverage Format="1"> + <MarkCoverage> <Glyph value="g19"/> </MarkCoverage> - <BaseCoverage Format="1"> + <BaseCoverage> <Glyph value="g18"/> </BaseCoverage> <!-- ClassCount=1 --> diff --git a/Tests/ttLib/tables/data/aots/gpos4_multiple_anchors_1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gpos4_multiple_anchors_1.ttx.GDEF index 4f9f64a6..a8df0fd3 100644 --- a/Tests/ttLib/tables/data/aots/gpos4_multiple_anchors_1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gpos4_multiple_anchors_1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g17" class="1"/> <ClassDef glyph="g18" class="1"/> <ClassDef glyph="g19" class="3"/> diff --git a/Tests/ttLib/tables/data/aots/gpos4_multiple_anchors_1.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos4_multiple_anchors_1.ttx.GPOS index afe7e6a4..cfd3ddb1 100644 --- a/Tests/ttLib/tables/data/aots/gpos4_multiple_anchors_1.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos4_multiple_anchors_1.ttx.GPOS @@ -34,13 +34,13 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <MarkBasePos index="0" Format="1"> - <MarkCoverage Format="1"> + <MarkCoverage> <Glyph value="g19"/> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> </MarkCoverage> - <BaseCoverage Format="1"> + <BaseCoverage> <Glyph value="g17"/> <Glyph value="g18"/> </BaseCoverage> diff --git a/Tests/ttLib/tables/data/aots/gpos4_simple_1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gpos4_simple_1.ttx.GDEF index 2627f21d..8184af27 100644 --- a/Tests/ttLib/tables/data/aots/gpos4_simple_1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gpos4_simple_1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g17" class="1"/> <ClassDef glyph="g18" class="1"/> <ClassDef glyph="g19" class="3"/> diff --git a/Tests/ttLib/tables/data/aots/gpos4_simple_1.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos4_simple_1.ttx.GPOS index 3a2e6234..ccbc7844 100644 --- a/Tests/ttLib/tables/data/aots/gpos4_simple_1.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos4_simple_1.ttx.GPOS @@ -34,10 +34,10 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <MarkBasePos index="0" Format="1"> - <MarkCoverage Format="1"> + <MarkCoverage> <Glyph value="g19"/> </MarkCoverage> - <BaseCoverage Format="1"> + <BaseCoverage> <Glyph value="g18"/> </BaseCoverage> <!-- ClassCount=1 --> diff --git a/Tests/ttLib/tables/data/aots/gpos5_font1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gpos5_font1.ttx.GDEF index ff2dc980..461a9822 100644 --- a/Tests/ttLib/tables/data/aots/gpos5_font1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gpos5_font1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g17" class="1"/> <ClassDef glyph="g18" class="2"/> <ClassDef glyph="g19" class="3"/> diff --git a/Tests/ttLib/tables/data/aots/gpos5_font1.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos5_font1.ttx.GPOS index b5017b31..d5abadce 100644 --- a/Tests/ttLib/tables/data/aots/gpos5_font1.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos5_font1.ttx.GPOS @@ -34,10 +34,10 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <MarkLigPos index="0" Format="1"> - <MarkCoverage Format="1"> + <MarkCoverage> <Glyph value="g19"/> </MarkCoverage> - <LigatureCoverage Format="1"> + <LigatureCoverage> <Glyph value="g18"/> </LigatureCoverage> <!-- ClassCount=1 --> diff --git a/Tests/ttLib/tables/data/aots/gpos5_font1.ttx.GSUB b/Tests/ttLib/tables/data/aots/gpos5_font1.ttx.GSUB index 88d3f243..f81552a8 100644 --- a/Tests/ttLib/tables/data/aots/gpos5_font1.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/gpos5_font1.ttx.GSUB @@ -33,7 +33,7 @@ <LookupType value="4"/> <LookupFlag value="8"/><!-- ignoreMarks --> <!-- SubTableCount=1 --> - <LigatureSubst index="0" Format="1"> + <LigatureSubst index="0"> <LigatureSet glyph="g30"> <Ligature components="g31" glyph="g18"/> </LigatureSet> diff --git a/Tests/ttLib/tables/data/aots/gpos6_font1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gpos6_font1.ttx.GDEF index 640f3ebf..f07a29b4 100644 --- a/Tests/ttLib/tables/data/aots/gpos6_font1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gpos6_font1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g17" class="1"/> <ClassDef glyph="g18" class="3"/> <ClassDef glyph="g19" class="3"/> diff --git a/Tests/ttLib/tables/data/aots/gpos6_font1.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos6_font1.ttx.GPOS index d4c4da50..f2fd253d 100644 --- a/Tests/ttLib/tables/data/aots/gpos6_font1.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos6_font1.ttx.GPOS @@ -34,10 +34,10 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <MarkMarkPos index="0" Format="1"> - <Mark1Coverage Format="1"> + <Mark1Coverage> <Glyph value="g19"/> </Mark1Coverage> - <Mark2Coverage Format="1"> + <Mark2Coverage> <Glyph value="g18"/> </Mark2Coverage> <!-- ClassCount=1 --> diff --git a/Tests/ttLib/tables/data/aots/gpos7_1_font1.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos7_1_font1.ttx.GPOS index 3d82e684..db3b76ed 100644 --- a/Tests/ttLib/tables/data/aots/gpos7_1_font1.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos7_1_font1.ttx.GPOS @@ -34,7 +34,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <SinglePos index="0" Format="2"> - <Coverage Format="1"> + <Coverage> <Glyph value="g18"/> <Glyph value="g19"/> <Glyph value="g20"/> @@ -51,7 +51,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <ContextPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g18"/> </Coverage> <!-- PosRuleSetCount=1 --> diff --git a/Tests/ttLib/tables/data/aots/gpos9_font1.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos9_font1.ttx.GPOS index bbc1c386..9bcef946 100644 --- a/Tests/ttLib/tables/data/aots/gpos9_font1.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos9_font1.ttx.GPOS @@ -36,7 +36,7 @@ <ExtensionPos index="0" Format="1"> <ExtensionLookupType value="1"/> <SinglePos Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g18"/> <Glyph value="g20"/> </Coverage> diff --git a/Tests/ttLib/tables/data/aots/gpos9_font2.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos9_font2.ttx.GPOS index ac6d6afd..ffb993b2 100644 --- a/Tests/ttLib/tables/data/aots/gpos9_font2.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos9_font2.ttx.GPOS @@ -36,7 +36,7 @@ <ExtensionPos index="0" Format="1"> <ExtensionLookupType value="1"/> <SinglePos Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g18"/> <Glyph value="g20"/> </Coverage> @@ -47,7 +47,7 @@ <ExtensionPos index="1" Format="1"> <ExtensionLookupType value="1"/> <SinglePos Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g19"/> <Glyph value="g21"/> </Coverage> diff --git a/Tests/ttLib/tables/data/aots/gpos_chaining1_boundary_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gpos_chaining1_boundary_f1.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gpos_chaining1_boundary_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gpos_chaining1_boundary_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gpos_chaining1_boundary_f1.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos_chaining1_boundary_f1.ttx.GPOS index 28832e40..a701d037 100644 --- a/Tests/ttLib/tables/data/aots/gpos_chaining1_boundary_f1.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos_chaining1_boundary_f1.ttx.GPOS @@ -34,7 +34,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <SinglePos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -55,7 +55,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -75,7 +75,7 @@ <LookupFlag value="8"/><!-- ignoreMarks --> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -100,7 +100,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <ChainContextPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <!-- ChainPosRuleSetCount=1 --> diff --git a/Tests/ttLib/tables/data/aots/gpos_chaining1_boundary_f2.ttx.GDEF b/Tests/ttLib/tables/data/aots/gpos_chaining1_boundary_f2.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gpos_chaining1_boundary_f2.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gpos_chaining1_boundary_f2.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gpos_chaining1_boundary_f2.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos_chaining1_boundary_f2.ttx.GPOS index 80ae0c72..865a69bc 100644 --- a/Tests/ttLib/tables/data/aots/gpos_chaining1_boundary_f2.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos_chaining1_boundary_f2.ttx.GPOS @@ -34,7 +34,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <SinglePos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -55,7 +55,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -75,7 +75,7 @@ <LookupFlag value="8"/><!-- ignoreMarks --> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -100,7 +100,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <ChainContextPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <!-- ChainPosRuleSetCount=1 --> diff --git a/Tests/ttLib/tables/data/aots/gpos_chaining1_boundary_f3.ttx.GDEF b/Tests/ttLib/tables/data/aots/gpos_chaining1_boundary_f3.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gpos_chaining1_boundary_f3.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gpos_chaining1_boundary_f3.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gpos_chaining1_boundary_f3.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos_chaining1_boundary_f3.ttx.GPOS index 0958edff..f36b48af 100644 --- a/Tests/ttLib/tables/data/aots/gpos_chaining1_boundary_f3.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos_chaining1_boundary_f3.ttx.GPOS @@ -34,7 +34,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <SinglePos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -55,7 +55,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -75,7 +75,7 @@ <LookupFlag value="8"/><!-- ignoreMarks --> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -100,7 +100,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <ChainContextPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <!-- ChainPosRuleSetCount=1 --> diff --git a/Tests/ttLib/tables/data/aots/gpos_chaining1_boundary_f4.ttx.GDEF b/Tests/ttLib/tables/data/aots/gpos_chaining1_boundary_f4.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gpos_chaining1_boundary_f4.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gpos_chaining1_boundary_f4.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gpos_chaining1_boundary_f4.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos_chaining1_boundary_f4.ttx.GPOS index 8dc3f30e..d497f587 100644 --- a/Tests/ttLib/tables/data/aots/gpos_chaining1_boundary_f4.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos_chaining1_boundary_f4.ttx.GPOS @@ -34,7 +34,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <SinglePos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -55,7 +55,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -75,7 +75,7 @@ <LookupFlag value="8"/><!-- ignoreMarks --> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -100,7 +100,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <ChainContextPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g22"/> </Coverage> <!-- ChainPosRuleSetCount=1 --> diff --git a/Tests/ttLib/tables/data/aots/gpos_chaining1_lookupflag_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gpos_chaining1_lookupflag_f1.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gpos_chaining1_lookupflag_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gpos_chaining1_lookupflag_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gpos_chaining1_lookupflag_f1.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos_chaining1_lookupflag_f1.ttx.GPOS index dfde657d..540a00e9 100644 --- a/Tests/ttLib/tables/data/aots/gpos_chaining1_lookupflag_f1.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos_chaining1_lookupflag_f1.ttx.GPOS @@ -34,7 +34,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <SinglePos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -55,7 +55,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -75,7 +75,7 @@ <LookupFlag value="8"/><!-- ignoreMarks --> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -100,7 +100,7 @@ <LookupFlag value="8"/><!-- ignoreMarks --> <!-- SubTableCount=1 --> <ChainContextPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g22"/> </Coverage> <!-- ChainPosRuleSetCount=1 --> diff --git a/Tests/ttLib/tables/data/aots/gpos_chaining1_multiple_subrules_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gpos_chaining1_multiple_subrules_f1.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gpos_chaining1_multiple_subrules_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gpos_chaining1_multiple_subrules_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gpos_chaining1_multiple_subrules_f1.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos_chaining1_multiple_subrules_f1.ttx.GPOS index 3a838086..81374bce 100644 --- a/Tests/ttLib/tables/data/aots/gpos_chaining1_multiple_subrules_f1.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos_chaining1_multiple_subrules_f1.ttx.GPOS @@ -34,7 +34,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <SinglePos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -55,7 +55,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -75,7 +75,7 @@ <LookupFlag value="8"/><!-- ignoreMarks --> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -100,7 +100,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <ChainContextPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <!-- ChainPosRuleSetCount=1 --> diff --git a/Tests/ttLib/tables/data/aots/gpos_chaining1_multiple_subrules_f2.ttx.GDEF b/Tests/ttLib/tables/data/aots/gpos_chaining1_multiple_subrules_f2.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gpos_chaining1_multiple_subrules_f2.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gpos_chaining1_multiple_subrules_f2.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gpos_chaining1_multiple_subrules_f2.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos_chaining1_multiple_subrules_f2.ttx.GPOS index 7eaf23e8..404e9299 100644 --- a/Tests/ttLib/tables/data/aots/gpos_chaining1_multiple_subrules_f2.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos_chaining1_multiple_subrules_f2.ttx.GPOS @@ -34,7 +34,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <SinglePos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -55,7 +55,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -75,7 +75,7 @@ <LookupFlag value="8"/><!-- ignoreMarks --> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -100,7 +100,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <ChainContextPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <!-- ChainPosRuleSetCount=1 --> diff --git a/Tests/ttLib/tables/data/aots/gpos_chaining1_next_glyph_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gpos_chaining1_next_glyph_f1.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gpos_chaining1_next_glyph_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gpos_chaining1_next_glyph_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gpos_chaining1_next_glyph_f1.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos_chaining1_next_glyph_f1.ttx.GPOS index 597baba5..87be738a 100644 --- a/Tests/ttLib/tables/data/aots/gpos_chaining1_next_glyph_f1.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos_chaining1_next_glyph_f1.ttx.GPOS @@ -34,7 +34,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <SinglePos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -55,7 +55,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -75,7 +75,7 @@ <LookupFlag value="8"/><!-- ignoreMarks --> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -100,7 +100,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <ChainContextPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> <Glyph value="g23"/> </Coverage> diff --git a/Tests/ttLib/tables/data/aots/gpos_chaining1_simple_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gpos_chaining1_simple_f1.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gpos_chaining1_simple_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gpos_chaining1_simple_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gpos_chaining1_simple_f1.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos_chaining1_simple_f1.ttx.GPOS index 7f9b1c41..c755f87b 100644 --- a/Tests/ttLib/tables/data/aots/gpos_chaining1_simple_f1.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos_chaining1_simple_f1.ttx.GPOS @@ -34,7 +34,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <SinglePos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -55,7 +55,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -75,7 +75,7 @@ <LookupFlag value="8"/><!-- ignoreMarks --> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -100,7 +100,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <ChainContextPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <!-- ChainPosRuleSetCount=1 --> diff --git a/Tests/ttLib/tables/data/aots/gpos_chaining1_simple_f2.ttx.GDEF b/Tests/ttLib/tables/data/aots/gpos_chaining1_simple_f2.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gpos_chaining1_simple_f2.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gpos_chaining1_simple_f2.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gpos_chaining1_simple_f2.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos_chaining1_simple_f2.ttx.GPOS index 70e0167a..e211d85f 100644 --- a/Tests/ttLib/tables/data/aots/gpos_chaining1_simple_f2.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos_chaining1_simple_f2.ttx.GPOS @@ -34,7 +34,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <SinglePos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -55,7 +55,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -75,7 +75,7 @@ <LookupFlag value="8"/><!-- ignoreMarks --> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -100,7 +100,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <ChainContextPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g22"/> </Coverage> <!-- ChainPosRuleSetCount=1 --> diff --git a/Tests/ttLib/tables/data/aots/gpos_chaining1_successive_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gpos_chaining1_successive_f1.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gpos_chaining1_successive_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gpos_chaining1_successive_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gpos_chaining1_successive_f1.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos_chaining1_successive_f1.ttx.GPOS index eadac064..a2da259e 100644 --- a/Tests/ttLib/tables/data/aots/gpos_chaining1_successive_f1.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos_chaining1_successive_f1.ttx.GPOS @@ -34,7 +34,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <SinglePos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -55,7 +55,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -75,7 +75,7 @@ <LookupFlag value="8"/><!-- ignoreMarks --> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -100,7 +100,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <ChainContextPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> </Coverage> <!-- ChainPosRuleSetCount=1 --> diff --git a/Tests/ttLib/tables/data/aots/gpos_chaining2_boundary_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gpos_chaining2_boundary_f1.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gpos_chaining2_boundary_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gpos_chaining2_boundary_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gpos_chaining2_boundary_f1.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos_chaining2_boundary_f1.ttx.GPOS index adcca5ce..f8b5eacc 100644 --- a/Tests/ttLib/tables/data/aots/gpos_chaining2_boundary_f1.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos_chaining2_boundary_f1.ttx.GPOS @@ -34,7 +34,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <SinglePos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -55,7 +55,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -75,7 +75,7 @@ <LookupFlag value="8"/><!-- ignoreMarks --> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -100,7 +100,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <ChainContextPos index="0" Format="2"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -109,7 +109,7 @@ <Glyph value="g25"/> <Glyph value="g26"/> </Coverage> - <BacktrackClassDef Format="2"> + <BacktrackClassDef> <ClassDef glyph="g20" class="20"/> <ClassDef glyph="g21" class="21"/> <ClassDef glyph="g22" class="22"/> @@ -118,7 +118,7 @@ <ClassDef glyph="g25" class="25"/> <ClassDef glyph="g26" class="26"/> </BacktrackClassDef> - <InputClassDef Format="2"> + <InputClassDef> <ClassDef glyph="g20" class="20"/> <ClassDef glyph="g21" class="21"/> <ClassDef glyph="g22" class="22"/> @@ -127,7 +127,7 @@ <ClassDef glyph="g25" class="25"/> <ClassDef glyph="g26" class="26"/> </InputClassDef> - <LookAheadClassDef Format="2"> + <LookAheadClassDef> <ClassDef glyph="g20" class="20"/> <ClassDef glyph="g21" class="21"/> <ClassDef glyph="g22" class="22"/> diff --git a/Tests/ttLib/tables/data/aots/gpos_chaining2_boundary_f2.ttx.GDEF b/Tests/ttLib/tables/data/aots/gpos_chaining2_boundary_f2.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gpos_chaining2_boundary_f2.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gpos_chaining2_boundary_f2.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gpos_chaining2_boundary_f2.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos_chaining2_boundary_f2.ttx.GPOS index 5108ddcb..aa832de6 100644 --- a/Tests/ttLib/tables/data/aots/gpos_chaining2_boundary_f2.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos_chaining2_boundary_f2.ttx.GPOS @@ -34,7 +34,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <SinglePos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -55,7 +55,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -75,7 +75,7 @@ <LookupFlag value="8"/><!-- ignoreMarks --> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -100,7 +100,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <ChainContextPos index="0" Format="2"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -109,7 +109,7 @@ <Glyph value="g25"/> <Glyph value="g26"/> </Coverage> - <BacktrackClassDef Format="2"> + <BacktrackClassDef> <ClassDef glyph="g20" class="20"/> <ClassDef glyph="g21" class="21"/> <ClassDef glyph="g22" class="22"/> @@ -118,7 +118,7 @@ <ClassDef glyph="g25" class="25"/> <ClassDef glyph="g26" class="26"/> </BacktrackClassDef> - <InputClassDef Format="2"> + <InputClassDef> <ClassDef glyph="g20" class="20"/> <ClassDef glyph="g21" class="21"/> <ClassDef glyph="g22" class="22"/> @@ -127,7 +127,7 @@ <ClassDef glyph="g25" class="25"/> <ClassDef glyph="g26" class="26"/> </InputClassDef> - <LookAheadClassDef Format="2"> + <LookAheadClassDef> <ClassDef glyph="g20" class="20"/> <ClassDef glyph="g21" class="21"/> <ClassDef glyph="g22" class="22"/> diff --git a/Tests/ttLib/tables/data/aots/gpos_chaining2_boundary_f3.ttx.GDEF b/Tests/ttLib/tables/data/aots/gpos_chaining2_boundary_f3.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gpos_chaining2_boundary_f3.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gpos_chaining2_boundary_f3.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gpos_chaining2_boundary_f3.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos_chaining2_boundary_f3.ttx.GPOS index de44a354..6ee0bc91 100644 --- a/Tests/ttLib/tables/data/aots/gpos_chaining2_boundary_f3.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos_chaining2_boundary_f3.ttx.GPOS @@ -34,7 +34,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <SinglePos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -55,7 +55,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -75,7 +75,7 @@ <LookupFlag value="8"/><!-- ignoreMarks --> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -100,7 +100,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <ChainContextPos index="0" Format="2"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -109,7 +109,7 @@ <Glyph value="g25"/> <Glyph value="g26"/> </Coverage> - <BacktrackClassDef Format="2"> + <BacktrackClassDef> <ClassDef glyph="g20" class="20"/> <ClassDef glyph="g21" class="21"/> <ClassDef glyph="g22" class="22"/> @@ -118,7 +118,7 @@ <ClassDef glyph="g25" class="25"/> <ClassDef glyph="g26" class="26"/> </BacktrackClassDef> - <InputClassDef Format="2"> + <InputClassDef> <ClassDef glyph="g20" class="20"/> <ClassDef glyph="g21" class="21"/> <ClassDef glyph="g22" class="22"/> @@ -127,7 +127,7 @@ <ClassDef glyph="g25" class="25"/> <ClassDef glyph="g26" class="26"/> </InputClassDef> - <LookAheadClassDef Format="2"> + <LookAheadClassDef> <ClassDef glyph="g20" class="20"/> <ClassDef glyph="g21" class="21"/> <ClassDef glyph="g22" class="22"/> diff --git a/Tests/ttLib/tables/data/aots/gpos_chaining2_boundary_f4.ttx.GDEF b/Tests/ttLib/tables/data/aots/gpos_chaining2_boundary_f4.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gpos_chaining2_boundary_f4.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gpos_chaining2_boundary_f4.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gpos_chaining2_boundary_f4.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos_chaining2_boundary_f4.ttx.GPOS index c1e21514..1acf6c4e 100644 --- a/Tests/ttLib/tables/data/aots/gpos_chaining2_boundary_f4.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos_chaining2_boundary_f4.ttx.GPOS @@ -34,7 +34,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <SinglePos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -55,7 +55,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -75,7 +75,7 @@ <LookupFlag value="8"/><!-- ignoreMarks --> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -100,7 +100,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <ChainContextPos index="0" Format="2"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -109,7 +109,7 @@ <Glyph value="g25"/> <Glyph value="g26"/> </Coverage> - <BacktrackClassDef Format="2"> + <BacktrackClassDef> <ClassDef glyph="g20" class="20"/> <ClassDef glyph="g21" class="21"/> <ClassDef glyph="g22" class="22"/> @@ -118,7 +118,7 @@ <ClassDef glyph="g25" class="25"/> <ClassDef glyph="g26" class="26"/> </BacktrackClassDef> - <InputClassDef Format="2"> + <InputClassDef> <ClassDef glyph="g20" class="20"/> <ClassDef glyph="g21" class="21"/> <ClassDef glyph="g22" class="22"/> @@ -127,7 +127,7 @@ <ClassDef glyph="g25" class="25"/> <ClassDef glyph="g26" class="26"/> </InputClassDef> - <LookAheadClassDef Format="2"> + <LookAheadClassDef> <ClassDef glyph="g20" class="20"/> <ClassDef glyph="g21" class="21"/> <ClassDef glyph="g22" class="22"/> diff --git a/Tests/ttLib/tables/data/aots/gpos_chaining2_lookupflag_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gpos_chaining2_lookupflag_f1.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gpos_chaining2_lookupflag_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gpos_chaining2_lookupflag_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gpos_chaining2_lookupflag_f1.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos_chaining2_lookupflag_f1.ttx.GPOS index 7c2bbae7..a5b4dec6 100644 --- a/Tests/ttLib/tables/data/aots/gpos_chaining2_lookupflag_f1.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos_chaining2_lookupflag_f1.ttx.GPOS @@ -34,7 +34,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <SinglePos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -55,7 +55,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -75,7 +75,7 @@ <LookupFlag value="8"/><!-- ignoreMarks --> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -100,7 +100,7 @@ <LookupFlag value="8"/><!-- ignoreMarks --> <!-- SubTableCount=1 --> <ChainContextPos index="0" Format="2"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -109,7 +109,7 @@ <Glyph value="g25"/> <Glyph value="g26"/> </Coverage> - <BacktrackClassDef Format="2"> + <BacktrackClassDef> <ClassDef glyph="g20" class="20"/> <ClassDef glyph="g21" class="21"/> <ClassDef glyph="g22" class="22"/> @@ -118,7 +118,7 @@ <ClassDef glyph="g25" class="25"/> <ClassDef glyph="g26" class="26"/> </BacktrackClassDef> - <InputClassDef Format="2"> + <InputClassDef> <ClassDef glyph="g20" class="20"/> <ClassDef glyph="g21" class="21"/> <ClassDef glyph="g22" class="22"/> @@ -127,7 +127,7 @@ <ClassDef glyph="g25" class="25"/> <ClassDef glyph="g26" class="26"/> </InputClassDef> - <LookAheadClassDef Format="2"> + <LookAheadClassDef> <ClassDef glyph="g20" class="20"/> <ClassDef glyph="g21" class="21"/> <ClassDef glyph="g22" class="22"/> diff --git a/Tests/ttLib/tables/data/aots/gpos_chaining2_multiple_subrules_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gpos_chaining2_multiple_subrules_f1.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gpos_chaining2_multiple_subrules_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gpos_chaining2_multiple_subrules_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gpos_chaining2_multiple_subrules_f1.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos_chaining2_multiple_subrules_f1.ttx.GPOS index b1c77b51..c5b52534 100644 --- a/Tests/ttLib/tables/data/aots/gpos_chaining2_multiple_subrules_f1.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos_chaining2_multiple_subrules_f1.ttx.GPOS @@ -34,7 +34,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <SinglePos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -55,7 +55,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -75,7 +75,7 @@ <LookupFlag value="8"/><!-- ignoreMarks --> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -100,7 +100,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <ChainContextPos index="0" Format="2"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -109,7 +109,7 @@ <Glyph value="g25"/> <Glyph value="g26"/> </Coverage> - <BacktrackClassDef Format="2"> + <BacktrackClassDef> <ClassDef glyph="g20" class="20"/> <ClassDef glyph="g21" class="21"/> <ClassDef glyph="g22" class="22"/> @@ -118,7 +118,7 @@ <ClassDef glyph="g25" class="25"/> <ClassDef glyph="g26" class="26"/> </BacktrackClassDef> - <InputClassDef Format="2"> + <InputClassDef> <ClassDef glyph="g20" class="20"/> <ClassDef glyph="g21" class="21"/> <ClassDef glyph="g22" class="22"/> @@ -127,7 +127,7 @@ <ClassDef glyph="g25" class="25"/> <ClassDef glyph="g26" class="26"/> </InputClassDef> - <LookAheadClassDef Format="2"> + <LookAheadClassDef> <ClassDef glyph="g20" class="20"/> <ClassDef glyph="g21" class="21"/> <ClassDef glyph="g22" class="22"/> diff --git a/Tests/ttLib/tables/data/aots/gpos_chaining2_multiple_subrules_f2.ttx.GDEF b/Tests/ttLib/tables/data/aots/gpos_chaining2_multiple_subrules_f2.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gpos_chaining2_multiple_subrules_f2.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gpos_chaining2_multiple_subrules_f2.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gpos_chaining2_multiple_subrules_f2.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos_chaining2_multiple_subrules_f2.ttx.GPOS index d098bafa..b9512fad 100644 --- a/Tests/ttLib/tables/data/aots/gpos_chaining2_multiple_subrules_f2.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos_chaining2_multiple_subrules_f2.ttx.GPOS @@ -34,7 +34,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <SinglePos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -55,7 +55,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -75,7 +75,7 @@ <LookupFlag value="8"/><!-- ignoreMarks --> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -100,7 +100,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <ChainContextPos index="0" Format="2"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -109,7 +109,7 @@ <Glyph value="g25"/> <Glyph value="g26"/> </Coverage> - <BacktrackClassDef Format="2"> + <BacktrackClassDef> <ClassDef glyph="g20" class="20"/> <ClassDef glyph="g21" class="21"/> <ClassDef glyph="g22" class="22"/> @@ -118,7 +118,7 @@ <ClassDef glyph="g25" class="25"/> <ClassDef glyph="g26" class="26"/> </BacktrackClassDef> - <InputClassDef Format="2"> + <InputClassDef> <ClassDef glyph="g20" class="20"/> <ClassDef glyph="g21" class="21"/> <ClassDef glyph="g22" class="22"/> @@ -127,7 +127,7 @@ <ClassDef glyph="g25" class="25"/> <ClassDef glyph="g26" class="26"/> </InputClassDef> - <LookAheadClassDef Format="2"> + <LookAheadClassDef> <ClassDef glyph="g20" class="20"/> <ClassDef glyph="g21" class="21"/> <ClassDef glyph="g22" class="22"/> diff --git a/Tests/ttLib/tables/data/aots/gpos_chaining2_next_glyph_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gpos_chaining2_next_glyph_f1.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gpos_chaining2_next_glyph_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gpos_chaining2_next_glyph_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gpos_chaining2_next_glyph_f1.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos_chaining2_next_glyph_f1.ttx.GPOS index 2bf7df51..b9e864df 100644 --- a/Tests/ttLib/tables/data/aots/gpos_chaining2_next_glyph_f1.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos_chaining2_next_glyph_f1.ttx.GPOS @@ -34,7 +34,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <SinglePos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -55,7 +55,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -75,7 +75,7 @@ <LookupFlag value="8"/><!-- ignoreMarks --> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -100,7 +100,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <ChainContextPos index="0" Format="2"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -109,7 +109,7 @@ <Glyph value="g25"/> <Glyph value="g26"/> </Coverage> - <BacktrackClassDef Format="2"> + <BacktrackClassDef> <ClassDef glyph="g20" class="20"/> <ClassDef glyph="g21" class="21"/> <ClassDef glyph="g22" class="22"/> @@ -118,7 +118,7 @@ <ClassDef glyph="g25" class="25"/> <ClassDef glyph="g26" class="26"/> </BacktrackClassDef> - <InputClassDef Format="2"> + <InputClassDef> <ClassDef glyph="g20" class="20"/> <ClassDef glyph="g21" class="21"/> <ClassDef glyph="g22" class="22"/> @@ -127,7 +127,7 @@ <ClassDef glyph="g25" class="25"/> <ClassDef glyph="g26" class="26"/> </InputClassDef> - <LookAheadClassDef Format="2"> + <LookAheadClassDef> <ClassDef glyph="g20" class="20"/> <ClassDef glyph="g21" class="21"/> <ClassDef glyph="g22" class="22"/> diff --git a/Tests/ttLib/tables/data/aots/gpos_chaining2_simple_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gpos_chaining2_simple_f1.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gpos_chaining2_simple_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gpos_chaining2_simple_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gpos_chaining2_simple_f1.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos_chaining2_simple_f1.ttx.GPOS index feb38f24..3fddfb2c 100644 --- a/Tests/ttLib/tables/data/aots/gpos_chaining2_simple_f1.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos_chaining2_simple_f1.ttx.GPOS @@ -34,7 +34,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <SinglePos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -55,7 +55,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -75,7 +75,7 @@ <LookupFlag value="8"/><!-- ignoreMarks --> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -100,7 +100,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <ChainContextPos index="0" Format="2"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -109,7 +109,7 @@ <Glyph value="g25"/> <Glyph value="g26"/> </Coverage> - <BacktrackClassDef Format="2"> + <BacktrackClassDef> <ClassDef glyph="g20" class="20"/> <ClassDef glyph="g21" class="21"/> <ClassDef glyph="g22" class="22"/> @@ -118,7 +118,7 @@ <ClassDef glyph="g25" class="25"/> <ClassDef glyph="g26" class="26"/> </BacktrackClassDef> - <InputClassDef Format="2"> + <InputClassDef> <ClassDef glyph="g20" class="20"/> <ClassDef glyph="g21" class="21"/> <ClassDef glyph="g22" class="22"/> @@ -127,7 +127,7 @@ <ClassDef glyph="g25" class="25"/> <ClassDef glyph="g26" class="26"/> </InputClassDef> - <LookAheadClassDef Format="2"> + <LookAheadClassDef> <ClassDef glyph="g20" class="20"/> <ClassDef glyph="g21" class="21"/> <ClassDef glyph="g22" class="22"/> diff --git a/Tests/ttLib/tables/data/aots/gpos_chaining2_simple_f2.ttx.GDEF b/Tests/ttLib/tables/data/aots/gpos_chaining2_simple_f2.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gpos_chaining2_simple_f2.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gpos_chaining2_simple_f2.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gpos_chaining2_simple_f2.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos_chaining2_simple_f2.ttx.GPOS index a4d3497d..248c52a8 100644 --- a/Tests/ttLib/tables/data/aots/gpos_chaining2_simple_f2.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos_chaining2_simple_f2.ttx.GPOS @@ -34,7 +34,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <SinglePos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -55,7 +55,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -75,7 +75,7 @@ <LookupFlag value="8"/><!-- ignoreMarks --> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -100,7 +100,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <ChainContextPos index="0" Format="2"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -109,7 +109,7 @@ <Glyph value="g25"/> <Glyph value="g26"/> </Coverage> - <BacktrackClassDef Format="2"> + <BacktrackClassDef> <ClassDef glyph="g20" class="20"/> <ClassDef glyph="g21" class="21"/> <ClassDef glyph="g22" class="22"/> @@ -118,7 +118,7 @@ <ClassDef glyph="g25" class="25"/> <ClassDef glyph="g26" class="26"/> </BacktrackClassDef> - <InputClassDef Format="2"> + <InputClassDef> <ClassDef glyph="g20" class="20"/> <ClassDef glyph="g21" class="21"/> <ClassDef glyph="g22" class="22"/> @@ -127,7 +127,7 @@ <ClassDef glyph="g25" class="25"/> <ClassDef glyph="g26" class="26"/> </InputClassDef> - <LookAheadClassDef Format="2"> + <LookAheadClassDef> <ClassDef glyph="g20" class="20"/> <ClassDef glyph="g21" class="21"/> <ClassDef glyph="g22" class="22"/> diff --git a/Tests/ttLib/tables/data/aots/gpos_chaining2_successive_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gpos_chaining2_successive_f1.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gpos_chaining2_successive_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gpos_chaining2_successive_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gpos_chaining2_successive_f1.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos_chaining2_successive_f1.ttx.GPOS index 1b64d378..49145520 100644 --- a/Tests/ttLib/tables/data/aots/gpos_chaining2_successive_f1.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos_chaining2_successive_f1.ttx.GPOS @@ -34,7 +34,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <SinglePos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -55,7 +55,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -75,7 +75,7 @@ <LookupFlag value="8"/><!-- ignoreMarks --> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -100,7 +100,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <ChainContextPos index="0" Format="2"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -109,7 +109,7 @@ <Glyph value="g25"/> <Glyph value="g26"/> </Coverage> - <BacktrackClassDef Format="2"> + <BacktrackClassDef> <ClassDef glyph="g20" class="20"/> <ClassDef glyph="g21" class="21"/> <ClassDef glyph="g22" class="22"/> @@ -118,7 +118,7 @@ <ClassDef glyph="g25" class="25"/> <ClassDef glyph="g26" class="26"/> </BacktrackClassDef> - <InputClassDef Format="2"> + <InputClassDef> <ClassDef glyph="g20" class="20"/> <ClassDef glyph="g21" class="21"/> <ClassDef glyph="g22" class="22"/> @@ -127,7 +127,7 @@ <ClassDef glyph="g25" class="25"/> <ClassDef glyph="g26" class="26"/> </InputClassDef> - <LookAheadClassDef Format="2"> + <LookAheadClassDef> <ClassDef glyph="g20" class="20"/> <ClassDef glyph="g21" class="21"/> <ClassDef glyph="g22" class="22"/> diff --git a/Tests/ttLib/tables/data/aots/gpos_chaining3_boundary_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gpos_chaining3_boundary_f1.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gpos_chaining3_boundary_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gpos_chaining3_boundary_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gpos_chaining3_boundary_f1.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos_chaining3_boundary_f1.ttx.GPOS index 0c5a58f8..4a4f076d 100644 --- a/Tests/ttLib/tables/data/aots/gpos_chaining3_boundary_f1.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos_chaining3_boundary_f1.ttx.GPOS @@ -34,7 +34,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <SinglePos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -55,7 +55,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -75,7 +75,7 @@ <LookupFlag value="8"/><!-- ignoreMarks --> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -101,18 +101,18 @@ <!-- SubTableCount=1 --> <ChainContextPos index="0" Format="3"> <!-- BacktrackGlyphCount=1 --> - <BacktrackCoverage index="0" Format="1"> + <BacktrackCoverage index="0"> <Glyph value="g20"/> </BacktrackCoverage> <!-- InputGlyphCount=2 --> - <InputCoverage index="0" Format="1"> + <InputCoverage index="0"> <Glyph value="g21"/> </InputCoverage> - <InputCoverage index="1" Format="1"> + <InputCoverage index="1"> <Glyph value="g22"/> </InputCoverage> <!-- LookAheadGlyphCount=1 --> - <LookAheadCoverage index="0" Format="1"> + <LookAheadCoverage index="0"> <Glyph value="g23"/> </LookAheadCoverage> <!-- PosCount=0 --> diff --git a/Tests/ttLib/tables/data/aots/gpos_chaining3_boundary_f2.ttx.GDEF b/Tests/ttLib/tables/data/aots/gpos_chaining3_boundary_f2.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gpos_chaining3_boundary_f2.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gpos_chaining3_boundary_f2.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gpos_chaining3_boundary_f2.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos_chaining3_boundary_f2.ttx.GPOS index 064ceb72..4f38aec0 100644 --- a/Tests/ttLib/tables/data/aots/gpos_chaining3_boundary_f2.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos_chaining3_boundary_f2.ttx.GPOS @@ -34,7 +34,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <SinglePos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -55,7 +55,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -75,7 +75,7 @@ <LookupFlag value="8"/><!-- ignoreMarks --> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -101,18 +101,18 @@ <!-- SubTableCount=1 --> <ChainContextPos index="0" Format="3"> <!-- BacktrackGlyphCount=1 --> - <BacktrackCoverage index="0" Format="1"> + <BacktrackCoverage index="0"> <Glyph value="g20"/> </BacktrackCoverage> <!-- InputGlyphCount=1 --> - <InputCoverage index="0" Format="1"> + <InputCoverage index="0"> <Glyph value="g21"/> </InputCoverage> <!-- LookAheadGlyphCount=2 --> - <LookAheadCoverage index="0" Format="1"> + <LookAheadCoverage index="0"> <Glyph value="g22"/> </LookAheadCoverage> - <LookAheadCoverage index="1" Format="1"> + <LookAheadCoverage index="1"> <Glyph value="g23"/> </LookAheadCoverage> <!-- PosCount=1 --> diff --git a/Tests/ttLib/tables/data/aots/gpos_chaining3_boundary_f3.ttx.GDEF b/Tests/ttLib/tables/data/aots/gpos_chaining3_boundary_f3.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gpos_chaining3_boundary_f3.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gpos_chaining3_boundary_f3.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gpos_chaining3_boundary_f3.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos_chaining3_boundary_f3.ttx.GPOS index 297f1825..4cde2283 100644 --- a/Tests/ttLib/tables/data/aots/gpos_chaining3_boundary_f3.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos_chaining3_boundary_f3.ttx.GPOS @@ -34,7 +34,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <SinglePos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -55,7 +55,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -75,7 +75,7 @@ <LookupFlag value="8"/><!-- ignoreMarks --> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -102,14 +102,14 @@ <ChainContextPos index="0" Format="3"> <!-- BacktrackGlyphCount=0 --> <!-- InputGlyphCount=1 --> - <InputCoverage index="0" Format="1"> + <InputCoverage index="0"> <Glyph value="g21"/> </InputCoverage> <!-- LookAheadGlyphCount=2 --> - <LookAheadCoverage index="0" Format="1"> + <LookAheadCoverage index="0"> <Glyph value="g22"/> </LookAheadCoverage> - <LookAheadCoverage index="1" Format="1"> + <LookAheadCoverage index="1"> <Glyph value="g23"/> </LookAheadCoverage> <!-- PosCount=1 --> diff --git a/Tests/ttLib/tables/data/aots/gpos_chaining3_boundary_f4.ttx.GDEF b/Tests/ttLib/tables/data/aots/gpos_chaining3_boundary_f4.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gpos_chaining3_boundary_f4.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gpos_chaining3_boundary_f4.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gpos_chaining3_boundary_f4.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos_chaining3_boundary_f4.ttx.GPOS index bafd2d39..ab46ecbc 100644 --- a/Tests/ttLib/tables/data/aots/gpos_chaining3_boundary_f4.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos_chaining3_boundary_f4.ttx.GPOS @@ -34,7 +34,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <SinglePos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -55,7 +55,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -75,7 +75,7 @@ <LookupFlag value="8"/><!-- ignoreMarks --> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -101,14 +101,14 @@ <!-- SubTableCount=1 --> <ChainContextPos index="0" Format="3"> <!-- BacktrackGlyphCount=2 --> - <BacktrackCoverage index="0" Format="1"> + <BacktrackCoverage index="0"> <Glyph value="g21"/> </BacktrackCoverage> - <BacktrackCoverage index="1" Format="1"> + <BacktrackCoverage index="1"> <Glyph value="g20"/> </BacktrackCoverage> <!-- InputGlyphCount=1 --> - <InputCoverage index="0" Format="1"> + <InputCoverage index="0"> <Glyph value="g22"/> </InputCoverage> <!-- LookAheadGlyphCount=0 --> diff --git a/Tests/ttLib/tables/data/aots/gpos_chaining3_lookupflag_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gpos_chaining3_lookupflag_f1.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gpos_chaining3_lookupflag_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gpos_chaining3_lookupflag_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gpos_chaining3_lookupflag_f1.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos_chaining3_lookupflag_f1.ttx.GPOS index 8f33742b..2bc6f6b9 100644 --- a/Tests/ttLib/tables/data/aots/gpos_chaining3_lookupflag_f1.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos_chaining3_lookupflag_f1.ttx.GPOS @@ -34,7 +34,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <SinglePos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -55,7 +55,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -75,7 +75,7 @@ <LookupFlag value="8"/><!-- ignoreMarks --> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -101,27 +101,27 @@ <!-- SubTableCount=1 --> <ChainContextPos index="0" Format="3"> <!-- BacktrackGlyphCount=2 --> - <BacktrackCoverage index="0" Format="1"> + <BacktrackCoverage index="0"> <Glyph value="g21"/> </BacktrackCoverage> - <BacktrackCoverage index="1" Format="1"> + <BacktrackCoverage index="1"> <Glyph value="g20"/> </BacktrackCoverage> <!-- InputGlyphCount=3 --> - <InputCoverage index="0" Format="1"> + <InputCoverage index="0"> <Glyph value="g22"/> </InputCoverage> - <InputCoverage index="1" Format="1"> + <InputCoverage index="1"> <Glyph value="g23"/> </InputCoverage> - <InputCoverage index="2" Format="1"> + <InputCoverage index="2"> <Glyph value="g24"/> </InputCoverage> <!-- LookAheadGlyphCount=2 --> - <LookAheadCoverage index="0" Format="1"> + <LookAheadCoverage index="0"> <Glyph value="g25"/> </LookAheadCoverage> - <LookAheadCoverage index="1" Format="1"> + <LookAheadCoverage index="1"> <Glyph value="g26"/> </LookAheadCoverage> <!-- PosCount=1 --> diff --git a/Tests/ttLib/tables/data/aots/gpos_chaining3_next_glyph_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gpos_chaining3_next_glyph_f1.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gpos_chaining3_next_glyph_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gpos_chaining3_next_glyph_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gpos_chaining3_next_glyph_f1.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos_chaining3_next_glyph_f1.ttx.GPOS index ebb9f42f..76be0caf 100644 --- a/Tests/ttLib/tables/data/aots/gpos_chaining3_next_glyph_f1.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos_chaining3_next_glyph_f1.ttx.GPOS @@ -34,7 +34,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <SinglePos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -55,7 +55,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -75,7 +75,7 @@ <LookupFlag value="8"/><!-- ignoreMarks --> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -101,18 +101,18 @@ <!-- SubTableCount=1 --> <ChainContextPos index="0" Format="3"> <!-- BacktrackGlyphCount=1 --> - <BacktrackCoverage index="0" Format="1"> + <BacktrackCoverage index="0"> <Glyph value="g22"/> </BacktrackCoverage> <!-- InputGlyphCount=2 --> - <InputCoverage index="0" Format="1"> + <InputCoverage index="0"> <Glyph value="g21"/> </InputCoverage> - <InputCoverage index="1" Format="1"> + <InputCoverage index="1"> <Glyph value="g22"/> </InputCoverage> <!-- LookAheadGlyphCount=1 --> - <LookAheadCoverage index="0" Format="1"> + <LookAheadCoverage index="0"> <Glyph value="g21"/> </LookAheadCoverage> <!-- PosCount=1 --> diff --git a/Tests/ttLib/tables/data/aots/gpos_chaining3_simple_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gpos_chaining3_simple_f1.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gpos_chaining3_simple_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gpos_chaining3_simple_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gpos_chaining3_simple_f1.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos_chaining3_simple_f1.ttx.GPOS index a610025e..4a3d10a0 100644 --- a/Tests/ttLib/tables/data/aots/gpos_chaining3_simple_f1.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos_chaining3_simple_f1.ttx.GPOS @@ -34,7 +34,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <SinglePos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -55,7 +55,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -75,7 +75,7 @@ <LookupFlag value="8"/><!-- ignoreMarks --> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -101,18 +101,18 @@ <!-- SubTableCount=1 --> <ChainContextPos index="0" Format="3"> <!-- BacktrackGlyphCount=1 --> - <BacktrackCoverage index="0" Format="1"> + <BacktrackCoverage index="0"> <Glyph value="g20"/> </BacktrackCoverage> <!-- InputGlyphCount=2 --> - <InputCoverage index="0" Format="1"> + <InputCoverage index="0"> <Glyph value="g21"/> </InputCoverage> - <InputCoverage index="1" Format="1"> + <InputCoverage index="1"> <Glyph value="g22"/> </InputCoverage> <!-- LookAheadGlyphCount=1 --> - <LookAheadCoverage index="0" Format="1"> + <LookAheadCoverage index="0"> <Glyph value="g23"/> </LookAheadCoverage> <!-- PosCount=2 --> diff --git a/Tests/ttLib/tables/data/aots/gpos_chaining3_simple_f2.ttx.GDEF b/Tests/ttLib/tables/data/aots/gpos_chaining3_simple_f2.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gpos_chaining3_simple_f2.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gpos_chaining3_simple_f2.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gpos_chaining3_simple_f2.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos_chaining3_simple_f2.ttx.GPOS index 8d4ab5b5..1a1f57b6 100644 --- a/Tests/ttLib/tables/data/aots/gpos_chaining3_simple_f2.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos_chaining3_simple_f2.ttx.GPOS @@ -34,7 +34,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <SinglePos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -55,7 +55,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -75,7 +75,7 @@ <LookupFlag value="8"/><!-- ignoreMarks --> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -101,27 +101,27 @@ <!-- SubTableCount=1 --> <ChainContextPos index="0" Format="3"> <!-- BacktrackGlyphCount=2 --> - <BacktrackCoverage index="0" Format="1"> + <BacktrackCoverage index="0"> <Glyph value="g21"/> </BacktrackCoverage> - <BacktrackCoverage index="1" Format="1"> + <BacktrackCoverage index="1"> <Glyph value="g20"/> </BacktrackCoverage> <!-- InputGlyphCount=3 --> - <InputCoverage index="0" Format="1"> + <InputCoverage index="0"> <Glyph value="g22"/> </InputCoverage> - <InputCoverage index="1" Format="1"> + <InputCoverage index="1"> <Glyph value="g23"/> </InputCoverage> - <InputCoverage index="2" Format="1"> + <InputCoverage index="2"> <Glyph value="g24"/> </InputCoverage> <!-- LookAheadGlyphCount=2 --> - <LookAheadCoverage index="0" Format="1"> + <LookAheadCoverage index="0"> <Glyph value="g25"/> </LookAheadCoverage> - <LookAheadCoverage index="1" Format="1"> + <LookAheadCoverage index="1"> <Glyph value="g26"/> </LookAheadCoverage> <!-- PosCount=1 --> diff --git a/Tests/ttLib/tables/data/aots/gpos_chaining3_successive_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gpos_chaining3_successive_f1.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gpos_chaining3_successive_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gpos_chaining3_successive_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gpos_chaining3_successive_f1.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos_chaining3_successive_f1.ttx.GPOS index d0e10097..2c6ebb6e 100644 --- a/Tests/ttLib/tables/data/aots/gpos_chaining3_successive_f1.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos_chaining3_successive_f1.ttx.GPOS @@ -34,7 +34,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <SinglePos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -55,7 +55,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -75,7 +75,7 @@ <LookupFlag value="8"/><!-- ignoreMarks --> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -101,24 +101,24 @@ <!-- SubTableCount=1 --> <ChainContextPos index="0" Format="3"> <!-- BacktrackGlyphCount=1 --> - <BacktrackCoverage index="0" Format="1"> + <BacktrackCoverage index="0"> <Glyph value="g25"/> </BacktrackCoverage> <!-- InputGlyphCount=4 --> - <InputCoverage index="0" Format="1"> + <InputCoverage index="0"> <Glyph value="g20"/> </InputCoverage> - <InputCoverage index="1" Format="1"> + <InputCoverage index="1"> <Glyph value="g21"/> </InputCoverage> - <InputCoverage index="2" Format="1"> + <InputCoverage index="2"> <Glyph value="g22"/> </InputCoverage> - <InputCoverage index="3" Format="1"> + <InputCoverage index="3"> <Glyph value="g23"/> </InputCoverage> <!-- LookAheadGlyphCount=1 --> - <LookAheadCoverage index="0" Format="1"> + <LookAheadCoverage index="0"> <Glyph value="g24"/> </LookAheadCoverage> <!-- PosCount=2 --> diff --git a/Tests/ttLib/tables/data/aots/gpos_context1_boundary_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gpos_context1_boundary_f1.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gpos_context1_boundary_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gpos_context1_boundary_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gpos_context1_boundary_f1.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos_context1_boundary_f1.ttx.GPOS index b0850052..e61cc4ee 100644 --- a/Tests/ttLib/tables/data/aots/gpos_context1_boundary_f1.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos_context1_boundary_f1.ttx.GPOS @@ -34,7 +34,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <SinglePos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -55,7 +55,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -75,7 +75,7 @@ <LookupFlag value="8"/><!-- ignoreMarks --> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -100,7 +100,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <ContextPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> </Coverage> <!-- PosRuleSetCount=1 --> diff --git a/Tests/ttLib/tables/data/aots/gpos_context1_boundary_f2.ttx.GDEF b/Tests/ttLib/tables/data/aots/gpos_context1_boundary_f2.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gpos_context1_boundary_f2.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gpos_context1_boundary_f2.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gpos_context1_boundary_f2.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos_context1_boundary_f2.ttx.GPOS index c397c075..70c9250e 100644 --- a/Tests/ttLib/tables/data/aots/gpos_context1_boundary_f2.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos_context1_boundary_f2.ttx.GPOS @@ -34,7 +34,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <SinglePos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -55,7 +55,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -75,7 +75,7 @@ <LookupFlag value="8"/><!-- ignoreMarks --> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -100,7 +100,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <ContextPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> </Coverage> <!-- PosRuleSetCount=1 --> diff --git a/Tests/ttLib/tables/data/aots/gpos_context1_expansion_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gpos_context1_expansion_f1.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gpos_context1_expansion_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gpos_context1_expansion_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gpos_context1_expansion_f1.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos_context1_expansion_f1.ttx.GPOS index cb054491..ba6c1461 100644 --- a/Tests/ttLib/tables/data/aots/gpos_context1_expansion_f1.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos_context1_expansion_f1.ttx.GPOS @@ -34,7 +34,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <SinglePos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -55,7 +55,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -75,7 +75,7 @@ <LookupFlag value="8"/><!-- ignoreMarks --> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -100,7 +100,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <ContextPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> </Coverage> <!-- PosRuleSetCount=1 --> diff --git a/Tests/ttLib/tables/data/aots/gpos_context1_lookupflag_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gpos_context1_lookupflag_f1.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gpos_context1_lookupflag_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gpos_context1_lookupflag_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gpos_context1_lookupflag_f1.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos_context1_lookupflag_f1.ttx.GPOS index ac299e5f..8688a394 100644 --- a/Tests/ttLib/tables/data/aots/gpos_context1_lookupflag_f1.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos_context1_lookupflag_f1.ttx.GPOS @@ -34,7 +34,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <SinglePos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -55,7 +55,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -75,7 +75,7 @@ <LookupFlag value="8"/><!-- ignoreMarks --> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -100,7 +100,7 @@ <LookupFlag value="8"/><!-- ignoreMarks --> <!-- SubTableCount=1 --> <ContextPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> </Coverage> <!-- PosRuleSetCount=1 --> diff --git a/Tests/ttLib/tables/data/aots/gpos_context1_lookupflag_f2.ttx.GDEF b/Tests/ttLib/tables/data/aots/gpos_context1_lookupflag_f2.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gpos_context1_lookupflag_f2.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gpos_context1_lookupflag_f2.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gpos_context1_lookupflag_f2.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos_context1_lookupflag_f2.ttx.GPOS index 2571ad4d..8e2621fe 100644 --- a/Tests/ttLib/tables/data/aots/gpos_context1_lookupflag_f2.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos_context1_lookupflag_f2.ttx.GPOS @@ -34,7 +34,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <SinglePos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -55,7 +55,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -75,7 +75,7 @@ <LookupFlag value="8"/><!-- ignoreMarks --> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -100,7 +100,7 @@ <LookupFlag value="8"/><!-- ignoreMarks --> <!-- SubTableCount=1 --> <ContextPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> </Coverage> <!-- PosRuleSetCount=1 --> diff --git a/Tests/ttLib/tables/data/aots/gpos_context1_multiple_subrules_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gpos_context1_multiple_subrules_f1.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gpos_context1_multiple_subrules_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gpos_context1_multiple_subrules_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gpos_context1_multiple_subrules_f1.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos_context1_multiple_subrules_f1.ttx.GPOS index cad6cd67..03cec900 100644 --- a/Tests/ttLib/tables/data/aots/gpos_context1_multiple_subrules_f1.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos_context1_multiple_subrules_f1.ttx.GPOS @@ -34,7 +34,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <SinglePos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -55,7 +55,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -75,7 +75,7 @@ <LookupFlag value="8"/><!-- ignoreMarks --> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -100,7 +100,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <ContextPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> </Coverage> <!-- PosRuleSetCount=1 --> diff --git a/Tests/ttLib/tables/data/aots/gpos_context1_multiple_subrules_f2.ttx.GDEF b/Tests/ttLib/tables/data/aots/gpos_context1_multiple_subrules_f2.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gpos_context1_multiple_subrules_f2.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gpos_context1_multiple_subrules_f2.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gpos_context1_multiple_subrules_f2.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos_context1_multiple_subrules_f2.ttx.GPOS index 7fcedc9e..652850fd 100644 --- a/Tests/ttLib/tables/data/aots/gpos_context1_multiple_subrules_f2.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos_context1_multiple_subrules_f2.ttx.GPOS @@ -34,7 +34,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <SinglePos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -55,7 +55,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -75,7 +75,7 @@ <LookupFlag value="8"/><!-- ignoreMarks --> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -100,7 +100,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <ContextPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> </Coverage> <!-- PosRuleSetCount=1 --> diff --git a/Tests/ttLib/tables/data/aots/gpos_context1_next_glyph_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gpos_context1_next_glyph_f1.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gpos_context1_next_glyph_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gpos_context1_next_glyph_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gpos_context1_next_glyph_f1.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos_context1_next_glyph_f1.ttx.GPOS index 47c6d6c1..6ad207d0 100644 --- a/Tests/ttLib/tables/data/aots/gpos_context1_next_glyph_f1.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos_context1_next_glyph_f1.ttx.GPOS @@ -34,7 +34,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <SinglePos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -55,7 +55,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -75,7 +75,7 @@ <LookupFlag value="8"/><!-- ignoreMarks --> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -100,7 +100,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <ContextPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> </Coverage> <!-- PosRuleSetCount=1 --> diff --git a/Tests/ttLib/tables/data/aots/gpos_context1_simple_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gpos_context1_simple_f1.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gpos_context1_simple_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gpos_context1_simple_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gpos_context1_simple_f1.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos_context1_simple_f1.ttx.GPOS index 14b2e956..a4c824fc 100644 --- a/Tests/ttLib/tables/data/aots/gpos_context1_simple_f1.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos_context1_simple_f1.ttx.GPOS @@ -34,7 +34,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <SinglePos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -55,7 +55,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -75,7 +75,7 @@ <LookupFlag value="8"/><!-- ignoreMarks --> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -100,7 +100,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <ContextPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> </Coverage> <!-- PosRuleSetCount=1 --> diff --git a/Tests/ttLib/tables/data/aots/gpos_context1_simple_f2.ttx.GDEF b/Tests/ttLib/tables/data/aots/gpos_context1_simple_f2.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gpos_context1_simple_f2.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gpos_context1_simple_f2.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gpos_context1_simple_f2.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos_context1_simple_f2.ttx.GPOS index 33523f5b..15faa222 100644 --- a/Tests/ttLib/tables/data/aots/gpos_context1_simple_f2.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos_context1_simple_f2.ttx.GPOS @@ -34,7 +34,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <SinglePos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -55,7 +55,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -75,7 +75,7 @@ <LookupFlag value="8"/><!-- ignoreMarks --> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -100,7 +100,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <ContextPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> </Coverage> <!-- PosRuleSetCount=1 --> diff --git a/Tests/ttLib/tables/data/aots/gpos_context1_successive_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gpos_context1_successive_f1.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gpos_context1_successive_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gpos_context1_successive_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gpos_context1_successive_f1.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos_context1_successive_f1.ttx.GPOS index 8188bdf5..11ae1c78 100644 --- a/Tests/ttLib/tables/data/aots/gpos_context1_successive_f1.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos_context1_successive_f1.ttx.GPOS @@ -34,7 +34,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <SinglePos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -55,7 +55,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -75,7 +75,7 @@ <LookupFlag value="8"/><!-- ignoreMarks --> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -100,7 +100,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <ContextPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> </Coverage> <!-- PosRuleSetCount=1 --> diff --git a/Tests/ttLib/tables/data/aots/gpos_context2_boundary_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gpos_context2_boundary_f1.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gpos_context2_boundary_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gpos_context2_boundary_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gpos_context2_boundary_f1.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos_context2_boundary_f1.ttx.GPOS index ea71d017..08af7f3b 100644 --- a/Tests/ttLib/tables/data/aots/gpos_context2_boundary_f1.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos_context2_boundary_f1.ttx.GPOS @@ -34,7 +34,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <SinglePos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -55,7 +55,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -75,7 +75,7 @@ <LookupFlag value="8"/><!-- ignoreMarks --> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -100,10 +100,10 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <ContextPos index="0" Format="2"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> </Coverage> - <ClassDef Format="2"> + <ClassDef> <ClassDef glyph="g20" class="1"/> </ClassDef> <!-- PosClassSetCount=2 --> diff --git a/Tests/ttLib/tables/data/aots/gpos_context2_boundary_f2.ttx.GDEF b/Tests/ttLib/tables/data/aots/gpos_context2_boundary_f2.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gpos_context2_boundary_f2.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gpos_context2_boundary_f2.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gpos_context2_boundary_f2.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos_context2_boundary_f2.ttx.GPOS index c8067b05..832e37bf 100644 --- a/Tests/ttLib/tables/data/aots/gpos_context2_boundary_f2.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos_context2_boundary_f2.ttx.GPOS @@ -34,7 +34,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <SinglePos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -55,7 +55,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -75,7 +75,7 @@ <LookupFlag value="8"/><!-- ignoreMarks --> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -100,10 +100,10 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <ContextPos index="0" Format="2"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> </Coverage> - <ClassDef Format="2"> + <ClassDef> <ClassDef glyph="g20" class="1"/> </ClassDef> <!-- PosClassSetCount=2 --> diff --git a/Tests/ttLib/tables/data/aots/gpos_context2_classes_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gpos_context2_classes_f1.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gpos_context2_classes_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gpos_context2_classes_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gpos_context2_classes_f1.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos_context2_classes_f1.ttx.GPOS index 64f8092b..b06382dd 100644 --- a/Tests/ttLib/tables/data/aots/gpos_context2_classes_f1.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos_context2_classes_f1.ttx.GPOS @@ -34,7 +34,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <SinglePos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -55,7 +55,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -75,7 +75,7 @@ <LookupFlag value="8"/><!-- ignoreMarks --> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -100,11 +100,11 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <ContextPos index="0" Format="2"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> </Coverage> - <ClassDef Format="2"> + <ClassDef> <ClassDef glyph="g20" class="1"/> <ClassDef glyph="g21" class="1"/> <ClassDef glyph="g22" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gpos_context2_classes_f2.ttx.GDEF b/Tests/ttLib/tables/data/aots/gpos_context2_classes_f2.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gpos_context2_classes_f2.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gpos_context2_classes_f2.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gpos_context2_classes_f2.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos_context2_classes_f2.ttx.GPOS index 216ce469..a266ada4 100644 --- a/Tests/ttLib/tables/data/aots/gpos_context2_classes_f2.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos_context2_classes_f2.ttx.GPOS @@ -34,7 +34,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <SinglePos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -55,7 +55,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -75,7 +75,7 @@ <LookupFlag value="8"/><!-- ignoreMarks --> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -100,13 +100,13 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <ContextPos index="0" Format="2"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> <Glyph value="g24"/> </Coverage> - <ClassDef Format="2"> + <ClassDef> <ClassDef glyph="g20" class="1"/> <ClassDef glyph="g21" class="1"/> <ClassDef glyph="g22" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gpos_context2_expansion_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gpos_context2_expansion_f1.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gpos_context2_expansion_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gpos_context2_expansion_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gpos_context2_expansion_f1.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos_context2_expansion_f1.ttx.GPOS index 6b3b5d06..48833f75 100644 --- a/Tests/ttLib/tables/data/aots/gpos_context2_expansion_f1.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos_context2_expansion_f1.ttx.GPOS @@ -34,7 +34,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <SinglePos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -55,7 +55,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -75,7 +75,7 @@ <LookupFlag value="8"/><!-- ignoreMarks --> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -100,10 +100,10 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <ContextPos index="0" Format="2"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> </Coverage> - <ClassDef Format="2"> + <ClassDef> <ClassDef glyph="g20" class="1"/> <ClassDef glyph="g21" class="2"/> <ClassDef glyph="g22" class="3"/> diff --git a/Tests/ttLib/tables/data/aots/gpos_context2_lookupflag_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gpos_context2_lookupflag_f1.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gpos_context2_lookupflag_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gpos_context2_lookupflag_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gpos_context2_lookupflag_f1.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos_context2_lookupflag_f1.ttx.GPOS index bf9cfba3..d45c2804 100644 --- a/Tests/ttLib/tables/data/aots/gpos_context2_lookupflag_f1.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos_context2_lookupflag_f1.ttx.GPOS @@ -34,7 +34,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <SinglePos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -55,7 +55,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -75,7 +75,7 @@ <LookupFlag value="8"/><!-- ignoreMarks --> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -100,10 +100,10 @@ <LookupFlag value="8"/><!-- ignoreMarks --> <!-- SubTableCount=1 --> <ContextPos index="0" Format="2"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> </Coverage> - <ClassDef Format="2"> + <ClassDef> <ClassDef glyph="g20" class="1"/> <ClassDef glyph="g21" class="2"/> <ClassDef glyph="g22" class="3"/> diff --git a/Tests/ttLib/tables/data/aots/gpos_context2_lookupflag_f2.ttx.GDEF b/Tests/ttLib/tables/data/aots/gpos_context2_lookupflag_f2.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gpos_context2_lookupflag_f2.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gpos_context2_lookupflag_f2.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gpos_context2_lookupflag_f2.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos_context2_lookupflag_f2.ttx.GPOS index 810bab3d..6f3c016c 100644 --- a/Tests/ttLib/tables/data/aots/gpos_context2_lookupflag_f2.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos_context2_lookupflag_f2.ttx.GPOS @@ -34,7 +34,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <SinglePos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -55,7 +55,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -75,7 +75,7 @@ <LookupFlag value="8"/><!-- ignoreMarks --> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -100,10 +100,10 @@ <LookupFlag value="8"/><!-- ignoreMarks --> <!-- SubTableCount=1 --> <ContextPos index="0" Format="2"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> </Coverage> - <ClassDef Format="2"> + <ClassDef> <ClassDef glyph="g20" class="1"/> <ClassDef glyph="g21" class="2"/> <ClassDef glyph="g22" class="3"/> diff --git a/Tests/ttLib/tables/data/aots/gpos_context2_multiple_subrules_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gpos_context2_multiple_subrules_f1.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gpos_context2_multiple_subrules_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gpos_context2_multiple_subrules_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gpos_context2_multiple_subrules_f1.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos_context2_multiple_subrules_f1.ttx.GPOS index c906fe60..1a9b1e2c 100644 --- a/Tests/ttLib/tables/data/aots/gpos_context2_multiple_subrules_f1.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos_context2_multiple_subrules_f1.ttx.GPOS @@ -34,7 +34,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <SinglePos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -55,7 +55,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -75,7 +75,7 @@ <LookupFlag value="8"/><!-- ignoreMarks --> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -100,10 +100,10 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <ContextPos index="0" Format="2"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> </Coverage> - <ClassDef Format="2"> + <ClassDef> <ClassDef glyph="g20" class="1"/> <ClassDef glyph="g21" class="2"/> <ClassDef glyph="g22" class="3"/> diff --git a/Tests/ttLib/tables/data/aots/gpos_context2_multiple_subrules_f2.ttx.GDEF b/Tests/ttLib/tables/data/aots/gpos_context2_multiple_subrules_f2.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gpos_context2_multiple_subrules_f2.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gpos_context2_multiple_subrules_f2.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gpos_context2_multiple_subrules_f2.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos_context2_multiple_subrules_f2.ttx.GPOS index 50f77436..f3f9d9d1 100644 --- a/Tests/ttLib/tables/data/aots/gpos_context2_multiple_subrules_f2.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos_context2_multiple_subrules_f2.ttx.GPOS @@ -34,7 +34,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <SinglePos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -55,7 +55,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -75,7 +75,7 @@ <LookupFlag value="8"/><!-- ignoreMarks --> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -100,10 +100,10 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <ContextPos index="0" Format="2"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> </Coverage> - <ClassDef Format="2"> + <ClassDef> <ClassDef glyph="g20" class="1"/> <ClassDef glyph="g21" class="2"/> <ClassDef glyph="g22" class="3"/> diff --git a/Tests/ttLib/tables/data/aots/gpos_context2_next_glyph_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gpos_context2_next_glyph_f1.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gpos_context2_next_glyph_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gpos_context2_next_glyph_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gpos_context2_next_glyph_f1.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos_context2_next_glyph_f1.ttx.GPOS index 57e6c41c..655d1d3f 100644 --- a/Tests/ttLib/tables/data/aots/gpos_context2_next_glyph_f1.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos_context2_next_glyph_f1.ttx.GPOS @@ -34,7 +34,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <SinglePos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -55,7 +55,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -75,7 +75,7 @@ <LookupFlag value="8"/><!-- ignoreMarks --> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -100,10 +100,10 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <ContextPos index="0" Format="2"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> </Coverage> - <ClassDef Format="2"> + <ClassDef> <ClassDef glyph="g20" class="1"/> </ClassDef> <!-- PosClassSetCount=2 --> diff --git a/Tests/ttLib/tables/data/aots/gpos_context2_simple_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gpos_context2_simple_f1.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gpos_context2_simple_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gpos_context2_simple_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gpos_context2_simple_f1.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos_context2_simple_f1.ttx.GPOS index b38575d2..bc06db56 100644 --- a/Tests/ttLib/tables/data/aots/gpos_context2_simple_f1.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos_context2_simple_f1.ttx.GPOS @@ -34,7 +34,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <SinglePos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -55,7 +55,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -75,7 +75,7 @@ <LookupFlag value="8"/><!-- ignoreMarks --> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -100,10 +100,10 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <ContextPos index="0" Format="2"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> </Coverage> - <ClassDef Format="2"> + <ClassDef> <ClassDef glyph="g20" class="1"/> <ClassDef glyph="g21" class="2"/> <ClassDef glyph="g22" class="3"/> diff --git a/Tests/ttLib/tables/data/aots/gpos_context2_simple_f2.ttx.GDEF b/Tests/ttLib/tables/data/aots/gpos_context2_simple_f2.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gpos_context2_simple_f2.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gpos_context2_simple_f2.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gpos_context2_simple_f2.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos_context2_simple_f2.ttx.GPOS index b2f467d8..c2964bbc 100644 --- a/Tests/ttLib/tables/data/aots/gpos_context2_simple_f2.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos_context2_simple_f2.ttx.GPOS @@ -34,7 +34,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <SinglePos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -55,7 +55,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -75,7 +75,7 @@ <LookupFlag value="8"/><!-- ignoreMarks --> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -100,10 +100,10 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <ContextPos index="0" Format="2"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> </Coverage> - <ClassDef Format="2"> + <ClassDef> <ClassDef glyph="g20" class="1"/> </ClassDef> <!-- PosClassSetCount=2 --> diff --git a/Tests/ttLib/tables/data/aots/gpos_context2_successive_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gpos_context2_successive_f1.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gpos_context2_successive_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gpos_context2_successive_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gpos_context2_successive_f1.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos_context2_successive_f1.ttx.GPOS index b5f70e2e..797b37b1 100644 --- a/Tests/ttLib/tables/data/aots/gpos_context2_successive_f1.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos_context2_successive_f1.ttx.GPOS @@ -34,7 +34,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <SinglePos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -55,7 +55,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -75,7 +75,7 @@ <LookupFlag value="8"/><!-- ignoreMarks --> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -100,10 +100,10 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <ContextPos index="0" Format="2"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> </Coverage> - <ClassDef Format="2"> + <ClassDef> <ClassDef glyph="g20" class="1"/> <ClassDef glyph="g21" class="2"/> <ClassDef glyph="g22" class="3"/> diff --git a/Tests/ttLib/tables/data/aots/gpos_context3_boundary_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gpos_context3_boundary_f1.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gpos_context3_boundary_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gpos_context3_boundary_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gpos_context3_boundary_f1.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos_context3_boundary_f1.ttx.GPOS index 19b685ac..f709b3b3 100644 --- a/Tests/ttLib/tables/data/aots/gpos_context3_boundary_f1.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos_context3_boundary_f1.ttx.GPOS @@ -34,7 +34,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <SinglePos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -55,7 +55,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -75,7 +75,7 @@ <LookupFlag value="8"/><!-- ignoreMarks --> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -102,10 +102,10 @@ <ContextPos index="0" Format="3"> <!-- GlyphCount=2 --> <!-- PosCount=0 --> - <Coverage index="0" Format="1"> + <Coverage index="0"> <Glyph value="g20"/> </Coverage> - <Coverage index="1" Format="1"> + <Coverage index="1"> <Glyph value="g20"/> </Coverage> </ContextPos> diff --git a/Tests/ttLib/tables/data/aots/gpos_context3_boundary_f2.ttx.GDEF b/Tests/ttLib/tables/data/aots/gpos_context3_boundary_f2.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gpos_context3_boundary_f2.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gpos_context3_boundary_f2.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gpos_context3_boundary_f2.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos_context3_boundary_f2.ttx.GPOS index bffcccb0..a885d1a6 100644 --- a/Tests/ttLib/tables/data/aots/gpos_context3_boundary_f2.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos_context3_boundary_f2.ttx.GPOS @@ -34,7 +34,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <SinglePos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -55,7 +55,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -75,7 +75,7 @@ <LookupFlag value="8"/><!-- ignoreMarks --> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -102,7 +102,7 @@ <ContextPos index="0" Format="3"> <!-- GlyphCount=1 --> <!-- PosCount=1 --> - <Coverage index="0" Format="1"> + <Coverage index="0"> <Glyph value="g20"/> </Coverage> <PosLookupRecord index="0"> diff --git a/Tests/ttLib/tables/data/aots/gpos_context3_lookupflag_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gpos_context3_lookupflag_f1.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gpos_context3_lookupflag_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gpos_context3_lookupflag_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gpos_context3_lookupflag_f1.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos_context3_lookupflag_f1.ttx.GPOS index 3cf82eb9..286a2000 100644 --- a/Tests/ttLib/tables/data/aots/gpos_context3_lookupflag_f1.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos_context3_lookupflag_f1.ttx.GPOS @@ -34,7 +34,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <SinglePos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -55,7 +55,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -75,7 +75,7 @@ <LookupFlag value="8"/><!-- ignoreMarks --> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -102,13 +102,13 @@ <ContextPos index="0" Format="3"> <!-- GlyphCount=3 --> <!-- PosCount=3 --> - <Coverage index="0" Format="1"> + <Coverage index="0"> <Glyph value="g20"/> </Coverage> - <Coverage index="1" Format="1"> + <Coverage index="1"> <Glyph value="g21"/> </Coverage> - <Coverage index="2" Format="1"> + <Coverage index="2"> <Glyph value="g22"/> </Coverage> <PosLookupRecord index="0"> diff --git a/Tests/ttLib/tables/data/aots/gpos_context3_lookupflag_f2.ttx.GDEF b/Tests/ttLib/tables/data/aots/gpos_context3_lookupflag_f2.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gpos_context3_lookupflag_f2.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gpos_context3_lookupflag_f2.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gpos_context3_lookupflag_f2.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos_context3_lookupflag_f2.ttx.GPOS index e96abacc..ea697fc1 100644 --- a/Tests/ttLib/tables/data/aots/gpos_context3_lookupflag_f2.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos_context3_lookupflag_f2.ttx.GPOS @@ -34,7 +34,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <SinglePos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -55,7 +55,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -75,7 +75,7 @@ <LookupFlag value="8"/><!-- ignoreMarks --> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -102,13 +102,13 @@ <ContextPos index="0" Format="3"> <!-- GlyphCount=3 --> <!-- PosCount=1 --> - <Coverage index="0" Format="1"> + <Coverage index="0"> <Glyph value="g20"/> </Coverage> - <Coverage index="1" Format="1"> + <Coverage index="1"> <Glyph value="g21"/> </Coverage> - <Coverage index="2" Format="1"> + <Coverage index="2"> <Glyph value="g22"/> </Coverage> <PosLookupRecord index="0"> diff --git a/Tests/ttLib/tables/data/aots/gpos_context3_next_glyph_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gpos_context3_next_glyph_f1.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gpos_context3_next_glyph_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gpos_context3_next_glyph_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gpos_context3_next_glyph_f1.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos_context3_next_glyph_f1.ttx.GPOS index 049ea85b..c4b9d8a6 100644 --- a/Tests/ttLib/tables/data/aots/gpos_context3_next_glyph_f1.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos_context3_next_glyph_f1.ttx.GPOS @@ -34,7 +34,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <SinglePos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -55,7 +55,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -75,7 +75,7 @@ <LookupFlag value="8"/><!-- ignoreMarks --> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -102,10 +102,10 @@ <ContextPos index="0" Format="3"> <!-- GlyphCount=2 --> <!-- PosCount=1 --> - <Coverage index="0" Format="1"> + <Coverage index="0"> <Glyph value="g20"/> </Coverage> - <Coverage index="1" Format="1"> + <Coverage index="1"> <Glyph value="g20"/> </Coverage> <PosLookupRecord index="0"> diff --git a/Tests/ttLib/tables/data/aots/gpos_context3_simple_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gpos_context3_simple_f1.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gpos_context3_simple_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gpos_context3_simple_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gpos_context3_simple_f1.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos_context3_simple_f1.ttx.GPOS index b565dd38..7804fb8a 100644 --- a/Tests/ttLib/tables/data/aots/gpos_context3_simple_f1.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos_context3_simple_f1.ttx.GPOS @@ -34,7 +34,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <SinglePos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -55,7 +55,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -75,7 +75,7 @@ <LookupFlag value="8"/><!-- ignoreMarks --> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -102,13 +102,13 @@ <ContextPos index="0" Format="3"> <!-- GlyphCount=3 --> <!-- PosCount=3 --> - <Coverage index="0" Format="1"> + <Coverage index="0"> <Glyph value="g20"/> </Coverage> - <Coverage index="1" Format="1"> + <Coverage index="1"> <Glyph value="g21"/> </Coverage> - <Coverage index="2" Format="1"> + <Coverage index="2"> <Glyph value="g22"/> </Coverage> <PosLookupRecord index="0"> diff --git a/Tests/ttLib/tables/data/aots/gpos_context3_successive_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gpos_context3_successive_f1.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gpos_context3_successive_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gpos_context3_successive_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gpos_context3_successive_f1.ttx.GPOS b/Tests/ttLib/tables/data/aots/gpos_context3_successive_f1.ttx.GPOS index 201052d8..17b5ed27 100644 --- a/Tests/ttLib/tables/data/aots/gpos_context3_successive_f1.ttx.GPOS +++ b/Tests/ttLib/tables/data/aots/gpos_context3_successive_f1.ttx.GPOS @@ -34,7 +34,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <SinglePos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -55,7 +55,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -75,7 +75,7 @@ <LookupFlag value="8"/><!-- ignoreMarks --> <!-- SubTableCount=1 --> <PairPos index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <ValueFormat1 value="1"/> @@ -102,16 +102,16 @@ <ContextPos index="0" Format="3"> <!-- GlyphCount=4 --> <!-- PosCount=2 --> - <Coverage index="0" Format="1"> + <Coverage index="0"> <Glyph value="g20"/> </Coverage> - <Coverage index="1" Format="1"> + <Coverage index="1"> <Glyph value="g21"/> </Coverage> - <Coverage index="2" Format="1"> + <Coverage index="2"> <Glyph value="g22"/> </Coverage> - <Coverage index="3" Format="1"> + <Coverage index="3"> <Glyph value="g23"/> </Coverage> <PosLookupRecord index="0"> diff --git a/Tests/ttLib/tables/data/aots/gsub1_1_lookupflag_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gsub1_1_lookupflag_f1.ttx.GDEF index 971a3f19..08e65de0 100644 --- a/Tests/ttLib/tables/data/aots/gsub1_1_lookupflag_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gsub1_1_lookupflag_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g18" class="1"/> </GlyphClassDef> </GDEF> diff --git a/Tests/ttLib/tables/data/aots/gsub1_1_lookupflag_f1.ttx.GSUB b/Tests/ttLib/tables/data/aots/gsub1_1_lookupflag_f1.ttx.GSUB index 8b4839d9..d5e0bf72 100644 --- a/Tests/ttLib/tables/data/aots/gsub1_1_lookupflag_f1.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/gsub1_1_lookupflag_f1.ttx.GSUB @@ -33,7 +33,7 @@ <LookupType value="1"/> <LookupFlag value="2"/><!-- ignoreBaseGlyphs --> <!-- SubTableCount=1 --> - <SingleSubst index="0" Format="1"> + <SingleSubst index="0"> <Substitution in="g18" out="g23"/> <Substitution in="g19" out="g24"/> </SingleSubst> diff --git a/Tests/ttLib/tables/data/aots/gsub1_1_modulo_f1.ttx.GSUB b/Tests/ttLib/tables/data/aots/gsub1_1_modulo_f1.ttx.GSUB index b9923da9..f145dd37 100644 --- a/Tests/ttLib/tables/data/aots/gsub1_1_modulo_f1.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/gsub1_1_modulo_f1.ttx.GSUB @@ -34,11 +34,11 @@ <LookupType value="1"/> <LookupFlag value="0"/> <!-- SubTableCount=2 --> - <SingleSubst index="0" Format="1"> + <SingleSubst index="0"> <Substitution in="g21" out="glyph32787"/> <Substitution in="g22" out="glyph32788"/> </SingleSubst> - <SingleSubst index="1" Format="1"> + <SingleSubst index="1"> <Substitution in="g19" out="glyph32789"/> <Substitution in="g20" out="glyph32790"/> </SingleSubst> @@ -47,16 +47,16 @@ <LookupType value="1"/> <LookupFlag value="0"/> <!-- SubTableCount=4 --> - <SingleSubst index="0" Format="1"> + <SingleSubst index="0"> <Substitution in="glyph32787" out="g23"/> </SingleSubst> - <SingleSubst index="1" Format="1"> + <SingleSubst index="1"> <Substitution in="glyph32788" out="g18"/> </SingleSubst> - <SingleSubst index="2" Format="1"> + <SingleSubst index="2"> <Substitution in="glyph32789" out="g17"/> </SingleSubst> - <SingleSubst index="3" Format="1"> + <SingleSubst index="3"> <Substitution in="glyph32790" out="g24"/> </SingleSubst> </Lookup> diff --git a/Tests/ttLib/tables/data/aots/gsub1_1_simple_f1.ttx.GSUB b/Tests/ttLib/tables/data/aots/gsub1_1_simple_f1.ttx.GSUB index e76ba74e..7de19b00 100644 --- a/Tests/ttLib/tables/data/aots/gsub1_1_simple_f1.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/gsub1_1_simple_f1.ttx.GSUB @@ -33,7 +33,7 @@ <LookupType value="1"/> <LookupFlag value="0"/> <!-- SubTableCount=1 --> - <SingleSubst index="0" Format="1"> + <SingleSubst index="0"> <Substitution in="g18" out="g23"/> <Substitution in="g19" out="g24"/> </SingleSubst> diff --git a/Tests/ttLib/tables/data/aots/gsub1_2_lookupflag_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gsub1_2_lookupflag_f1.ttx.GDEF index 971a3f19..08e65de0 100644 --- a/Tests/ttLib/tables/data/aots/gsub1_2_lookupflag_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gsub1_2_lookupflag_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g18" class="1"/> </GlyphClassDef> </GDEF> diff --git a/Tests/ttLib/tables/data/aots/gsub1_2_lookupflag_f1.ttx.GSUB b/Tests/ttLib/tables/data/aots/gsub1_2_lookupflag_f1.ttx.GSUB index bc4d20e0..a518afbf 100644 --- a/Tests/ttLib/tables/data/aots/gsub1_2_lookupflag_f1.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/gsub1_2_lookupflag_f1.ttx.GSUB @@ -33,7 +33,7 @@ <LookupType value="1"/> <LookupFlag value="2"/><!-- ignoreBaseGlyphs --> <!-- SubTableCount=1 --> - <SingleSubst index="0" Format="2"> + <SingleSubst index="0"> <Substitution in="g18" out="g22"/> <Substitution in="g20" out="g25"/> </SingleSubst> diff --git a/Tests/ttLib/tables/data/aots/gsub1_2_simple_f1.ttx.GSUB b/Tests/ttLib/tables/data/aots/gsub1_2_simple_f1.ttx.GSUB index 55649d29..392ff3c4 100644 --- a/Tests/ttLib/tables/data/aots/gsub1_2_simple_f1.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/gsub1_2_simple_f1.ttx.GSUB @@ -33,7 +33,7 @@ <LookupType value="1"/> <LookupFlag value="0"/> <!-- SubTableCount=1 --> - <SingleSubst index="0" Format="2"> + <SingleSubst index="0"> <Substitution in="g18" out="g22"/> <Substitution in="g20" out="g25"/> </SingleSubst> diff --git a/Tests/ttLib/tables/data/aots/gsub2_1_lookupflag_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gsub2_1_lookupflag_f1.ttx.GDEF index 971a3f19..08e65de0 100644 --- a/Tests/ttLib/tables/data/aots/gsub2_1_lookupflag_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gsub2_1_lookupflag_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g18" class="1"/> </GlyphClassDef> </GDEF> diff --git a/Tests/ttLib/tables/data/aots/gsub2_1_lookupflag_f1.ttx.GSUB b/Tests/ttLib/tables/data/aots/gsub2_1_lookupflag_f1.ttx.GSUB index d3f65be1..d3c37dca 100644 --- a/Tests/ttLib/tables/data/aots/gsub2_1_lookupflag_f1.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/gsub2_1_lookupflag_f1.ttx.GSUB @@ -33,7 +33,7 @@ <LookupType value="2"/> <LookupFlag value="2"/><!-- ignoreBaseGlyphs --> <!-- SubTableCount=1 --> - <MultipleSubst index="0" Format="1"> + <MultipleSubst index="0"> <Substitution in="g18" out="g20,g21"/> <Substitution in="g19" out="g22,g23"/> </MultipleSubst> diff --git a/Tests/ttLib/tables/data/aots/gsub2_1_multiple_sequences_f1.ttx.GSUB b/Tests/ttLib/tables/data/aots/gsub2_1_multiple_sequences_f1.ttx.GSUB index 5ec800e5..1c4cd4ca 100644 --- a/Tests/ttLib/tables/data/aots/gsub2_1_multiple_sequences_f1.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/gsub2_1_multiple_sequences_f1.ttx.GSUB @@ -33,7 +33,7 @@ <LookupType value="2"/> <LookupFlag value="0"/> <!-- SubTableCount=1 --> - <MultipleSubst index="0" Format="1"> + <MultipleSubst index="0"> <Substitution in="g18" out="g20,g21"/> <Substitution in="g19" out="g22,g23"/> </MultipleSubst> diff --git a/Tests/ttLib/tables/data/aots/gsub2_1_simple_f1.ttx.GSUB b/Tests/ttLib/tables/data/aots/gsub2_1_simple_f1.ttx.GSUB index cae4f663..b2453ecd 100644 --- a/Tests/ttLib/tables/data/aots/gsub2_1_simple_f1.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/gsub2_1_simple_f1.ttx.GSUB @@ -33,7 +33,7 @@ <LookupType value="2"/> <LookupFlag value="0"/> <!-- SubTableCount=1 --> - <MultipleSubst index="0" Format="1"> + <MultipleSubst index="0"> <Substitution in="g18" out="g20,g21,g22"/> </MultipleSubst> </Lookup> diff --git a/Tests/ttLib/tables/data/aots/gsub3_1_lookupflag_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gsub3_1_lookupflag_f1.ttx.GDEF index 971a3f19..08e65de0 100644 --- a/Tests/ttLib/tables/data/aots/gsub3_1_lookupflag_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gsub3_1_lookupflag_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g18" class="1"/> </GlyphClassDef> </GDEF> diff --git a/Tests/ttLib/tables/data/aots/gsub3_1_lookupflag_f1.ttx.GSUB b/Tests/ttLib/tables/data/aots/gsub3_1_lookupflag_f1.ttx.GSUB index 43a5e85b..531c608b 100644 --- a/Tests/ttLib/tables/data/aots/gsub3_1_lookupflag_f1.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/gsub3_1_lookupflag_f1.ttx.GSUB @@ -33,7 +33,7 @@ <LookupType value="3"/> <LookupFlag value="2"/><!-- ignoreBaseGlyphs --> <!-- SubTableCount=1 --> - <AlternateSubst index="0" Format="1"> + <AlternateSubst index="0"> <AlternateSet glyph="g18"> <Alternate glyph="g20"/> <Alternate glyph="g21"/> diff --git a/Tests/ttLib/tables/data/aots/gsub3_1_multiple_f1.ttx.GSUB b/Tests/ttLib/tables/data/aots/gsub3_1_multiple_f1.ttx.GSUB index 1eae117d..54a52192 100644 --- a/Tests/ttLib/tables/data/aots/gsub3_1_multiple_f1.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/gsub3_1_multiple_f1.ttx.GSUB @@ -33,7 +33,7 @@ <LookupType value="3"/> <LookupFlag value="0"/> <!-- SubTableCount=1 --> - <AlternateSubst index="0" Format="1"> + <AlternateSubst index="0"> <AlternateSet glyph="g18"> <Alternate glyph="g20"/> <Alternate glyph="g21"/> diff --git a/Tests/ttLib/tables/data/aots/gsub3_1_simple_f1.ttx.GSUB b/Tests/ttLib/tables/data/aots/gsub3_1_simple_f1.ttx.GSUB index 7372cd05..9a516b27 100644 --- a/Tests/ttLib/tables/data/aots/gsub3_1_simple_f1.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/gsub3_1_simple_f1.ttx.GSUB @@ -33,7 +33,7 @@ <LookupType value="3"/> <LookupFlag value="0"/> <!-- SubTableCount=1 --> - <AlternateSubst index="0" Format="1"> + <AlternateSubst index="0"> <AlternateSet glyph="g18"> <Alternate glyph="g20"/> <Alternate glyph="g21"/> diff --git a/Tests/ttLib/tables/data/aots/gsub4_1_lookupflag_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gsub4_1_lookupflag_f1.ttx.GDEF index ffcc7a16..269092d2 100644 --- a/Tests/ttLib/tables/data/aots/gsub4_1_lookupflag_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gsub4_1_lookupflag_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g24" class="1"/> </GlyphClassDef> </GDEF> diff --git a/Tests/ttLib/tables/data/aots/gsub4_1_lookupflag_f1.ttx.GSUB b/Tests/ttLib/tables/data/aots/gsub4_1_lookupflag_f1.ttx.GSUB index f485610c..7dc3472e 100644 --- a/Tests/ttLib/tables/data/aots/gsub4_1_lookupflag_f1.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/gsub4_1_lookupflag_f1.ttx.GSUB @@ -33,7 +33,7 @@ <LookupType value="4"/> <LookupFlag value="2"/><!-- ignoreBaseGlyphs --> <!-- SubTableCount=1 --> - <LigatureSubst index="0" Format="1"> + <LigatureSubst index="0"> <LigatureSet glyph="g18"> <Ligature components="g19,g20" glyph="g23"/> </LigatureSet> diff --git a/Tests/ttLib/tables/data/aots/gsub4_1_multiple_ligatures_f1.ttx.GSUB b/Tests/ttLib/tables/data/aots/gsub4_1_multiple_ligatures_f1.ttx.GSUB index 9466f916..e9eb9eab 100644 --- a/Tests/ttLib/tables/data/aots/gsub4_1_multiple_ligatures_f1.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/gsub4_1_multiple_ligatures_f1.ttx.GSUB @@ -33,7 +33,7 @@ <LookupType value="4"/> <LookupFlag value="0"/> <!-- SubTableCount=1 --> - <LigatureSubst index="0" Format="1"> + <LigatureSubst index="0"> <LigatureSet glyph="g18"> <Ligature components="g19,g20" glyph="g23"/> <Ligature components="g19" glyph="g24"/> diff --git a/Tests/ttLib/tables/data/aots/gsub4_1_multiple_ligatures_f2.ttx.GSUB b/Tests/ttLib/tables/data/aots/gsub4_1_multiple_ligatures_f2.ttx.GSUB index bc25e840..6756dfd1 100644 --- a/Tests/ttLib/tables/data/aots/gsub4_1_multiple_ligatures_f2.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/gsub4_1_multiple_ligatures_f2.ttx.GSUB @@ -33,7 +33,7 @@ <LookupType value="4"/> <LookupFlag value="0"/> <!-- SubTableCount=1 --> - <LigatureSubst index="0" Format="1"> + <LigatureSubst index="0"> <LigatureSet glyph="g18"> <Ligature components="g19" glyph="g24"/> <Ligature components="g19,g20" glyph="g23"/> diff --git a/Tests/ttLib/tables/data/aots/gsub4_1_multiple_ligsets_f1.ttx.GSUB b/Tests/ttLib/tables/data/aots/gsub4_1_multiple_ligsets_f1.ttx.GSUB index 0ea6495c..ab043680 100644 --- a/Tests/ttLib/tables/data/aots/gsub4_1_multiple_ligsets_f1.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/gsub4_1_multiple_ligsets_f1.ttx.GSUB @@ -33,7 +33,7 @@ <LookupType value="4"/> <LookupFlag value="0"/> <!-- SubTableCount=1 --> - <LigatureSubst index="0" Format="1"> + <LigatureSubst index="0"> <LigatureSet glyph="g18"> <Ligature components="g19" glyph="g23"/> </LigatureSet> diff --git a/Tests/ttLib/tables/data/aots/gsub4_1_simple_f1.ttx.GSUB b/Tests/ttLib/tables/data/aots/gsub4_1_simple_f1.ttx.GSUB index ecc8fa68..7f3012aa 100644 --- a/Tests/ttLib/tables/data/aots/gsub4_1_simple_f1.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/gsub4_1_simple_f1.ttx.GSUB @@ -33,7 +33,7 @@ <LookupType value="4"/> <LookupFlag value="0"/> <!-- SubTableCount=1 --> - <LigatureSubst index="0" Format="1"> + <LigatureSubst index="0"> <LigatureSet glyph="g18"> <Ligature components="g19,g20" glyph="g23"/> </LigatureSet> diff --git a/Tests/ttLib/tables/data/aots/gsub7_font1.ttx.GSUB b/Tests/ttLib/tables/data/aots/gsub7_font1.ttx.GSUB index 3f65d93a..cf43ec63 100644 --- a/Tests/ttLib/tables/data/aots/gsub7_font1.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/gsub7_font1.ttx.GSUB @@ -35,7 +35,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> diff --git a/Tests/ttLib/tables/data/aots/gsub7_font2.ttx.GSUB b/Tests/ttLib/tables/data/aots/gsub7_font2.ttx.GSUB index 98338ed5..1f488f31 100644 --- a/Tests/ttLib/tables/data/aots/gsub7_font2.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/gsub7_font2.ttx.GSUB @@ -35,13 +35,13 @@ <!-- SubTableCount=2 --> <ExtensionSubst index="0" Format="1"> <ExtensionLookupType value="1"/> - <SingleSubst Format="1"> + <SingleSubst> <Substitution in="g18" out="g23"/> </SingleSubst> </ExtensionSubst> <ExtensionSubst index="1" Format="1"> <ExtensionLookupType value="1"/> - <SingleSubst Format="1"> + <SingleSubst> <Substitution in="g19" out="g29"/> </SingleSubst> </ExtensionSubst> diff --git a/Tests/ttLib/tables/data/aots/gsub_chaining1_boundary_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gsub_chaining1_boundary_f1.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gsub_chaining1_boundary_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gsub_chaining1_boundary_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gsub_chaining1_boundary_f1.ttx.GSUB b/Tests/ttLib/tables/data/aots/gsub_chaining1_boundary_f1.ttx.GSUB index 1c808ab6..897946e9 100644 --- a/Tests/ttLib/tables/data/aots/gsub_chaining1_boundary_f1.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/gsub_chaining1_boundary_f1.ttx.GSUB @@ -33,7 +33,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"/> <Substitution in="g22" out="g62"/> @@ -50,7 +50,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> @@ -60,7 +60,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> @@ -70,7 +70,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> @@ -79,7 +79,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <ChainContextSubst index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <!-- ChainSubRuleSetCount=1 --> diff --git a/Tests/ttLib/tables/data/aots/gsub_chaining1_boundary_f2.ttx.GDEF b/Tests/ttLib/tables/data/aots/gsub_chaining1_boundary_f2.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gsub_chaining1_boundary_f2.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gsub_chaining1_boundary_f2.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gsub_chaining1_boundary_f2.ttx.GSUB b/Tests/ttLib/tables/data/aots/gsub_chaining1_boundary_f2.ttx.GSUB index de223abe..896736c2 100644 --- a/Tests/ttLib/tables/data/aots/gsub_chaining1_boundary_f2.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/gsub_chaining1_boundary_f2.ttx.GSUB @@ -33,7 +33,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"/> <Substitution in="g22" out="g62"/> @@ -50,7 +50,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> @@ -60,7 +60,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> @@ -70,7 +70,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> @@ -79,7 +79,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <ChainContextSubst index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <!-- ChainSubRuleSetCount=1 --> diff --git a/Tests/ttLib/tables/data/aots/gsub_chaining1_boundary_f3.ttx.GDEF b/Tests/ttLib/tables/data/aots/gsub_chaining1_boundary_f3.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gsub_chaining1_boundary_f3.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gsub_chaining1_boundary_f3.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gsub_chaining1_boundary_f3.ttx.GSUB b/Tests/ttLib/tables/data/aots/gsub_chaining1_boundary_f3.ttx.GSUB index 3b7ea53a..43a59147 100644 --- a/Tests/ttLib/tables/data/aots/gsub_chaining1_boundary_f3.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/gsub_chaining1_boundary_f3.ttx.GSUB @@ -33,7 +33,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"/> <Substitution in="g22" out="g62"/> @@ -50,7 +50,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> @@ -60,7 +60,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> @@ -70,7 +70,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> @@ -79,7 +79,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <ChainContextSubst index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <!-- ChainSubRuleSetCount=1 --> diff --git a/Tests/ttLib/tables/data/aots/gsub_chaining1_boundary_f4.ttx.GDEF b/Tests/ttLib/tables/data/aots/gsub_chaining1_boundary_f4.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gsub_chaining1_boundary_f4.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gsub_chaining1_boundary_f4.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gsub_chaining1_boundary_f4.ttx.GSUB b/Tests/ttLib/tables/data/aots/gsub_chaining1_boundary_f4.ttx.GSUB index e98f40fb..d649b637 100644 --- a/Tests/ttLib/tables/data/aots/gsub_chaining1_boundary_f4.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/gsub_chaining1_boundary_f4.ttx.GSUB @@ -33,7 +33,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"/> <Substitution in="g22" out="g62"/> @@ -50,7 +50,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> @@ -60,7 +60,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> @@ -70,7 +70,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> @@ -79,7 +79,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <ChainContextSubst index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g22"/> </Coverage> <!-- ChainSubRuleSetCount=1 --> diff --git a/Tests/ttLib/tables/data/aots/gsub_chaining1_lookupflag_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gsub_chaining1_lookupflag_f1.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gsub_chaining1_lookupflag_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gsub_chaining1_lookupflag_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gsub_chaining1_lookupflag_f1.ttx.GSUB b/Tests/ttLib/tables/data/aots/gsub_chaining1_lookupflag_f1.ttx.GSUB index 6b31555a..dd83bd7e 100644 --- a/Tests/ttLib/tables/data/aots/gsub_chaining1_lookupflag_f1.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/gsub_chaining1_lookupflag_f1.ttx.GSUB @@ -33,7 +33,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"/> <Substitution in="g22" out="g62"/> @@ -50,7 +50,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> @@ -60,7 +60,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> @@ -70,7 +70,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> @@ -79,7 +79,7 @@ <LookupFlag value="8"/><!-- ignoreMarks --> <!-- SubTableCount=1 --> <ChainContextSubst index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g22"/> </Coverage> <!-- ChainSubRuleSetCount=1 --> diff --git a/Tests/ttLib/tables/data/aots/gsub_chaining1_multiple_subrules_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gsub_chaining1_multiple_subrules_f1.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gsub_chaining1_multiple_subrules_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gsub_chaining1_multiple_subrules_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gsub_chaining1_multiple_subrules_f1.ttx.GSUB b/Tests/ttLib/tables/data/aots/gsub_chaining1_multiple_subrules_f1.ttx.GSUB index fe8935d2..b446f626 100644 --- a/Tests/ttLib/tables/data/aots/gsub_chaining1_multiple_subrules_f1.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/gsub_chaining1_multiple_subrules_f1.ttx.GSUB @@ -33,7 +33,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"/> <Substitution in="g22" out="g62"/> @@ -50,7 +50,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> @@ -60,7 +60,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> @@ -70,7 +70,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> @@ -79,7 +79,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <ChainContextSubst index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <!-- ChainSubRuleSetCount=1 --> diff --git a/Tests/ttLib/tables/data/aots/gsub_chaining1_multiple_subrules_f2.ttx.GDEF b/Tests/ttLib/tables/data/aots/gsub_chaining1_multiple_subrules_f2.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gsub_chaining1_multiple_subrules_f2.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gsub_chaining1_multiple_subrules_f2.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gsub_chaining1_multiple_subrules_f2.ttx.GSUB b/Tests/ttLib/tables/data/aots/gsub_chaining1_multiple_subrules_f2.ttx.GSUB index 623534f6..9b6b835b 100644 --- a/Tests/ttLib/tables/data/aots/gsub_chaining1_multiple_subrules_f2.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/gsub_chaining1_multiple_subrules_f2.ttx.GSUB @@ -33,7 +33,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"/> <Substitution in="g22" out="g62"/> @@ -50,7 +50,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> @@ -60,7 +60,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> @@ -70,7 +70,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> @@ -79,7 +79,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <ChainContextSubst index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <!-- ChainSubRuleSetCount=1 --> diff --git a/Tests/ttLib/tables/data/aots/gsub_chaining1_next_glyph_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gsub_chaining1_next_glyph_f1.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gsub_chaining1_next_glyph_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gsub_chaining1_next_glyph_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gsub_chaining1_next_glyph_f1.ttx.GSUB b/Tests/ttLib/tables/data/aots/gsub_chaining1_next_glyph_f1.ttx.GSUB index b50bb4c7..8b554abd 100644 --- a/Tests/ttLib/tables/data/aots/gsub_chaining1_next_glyph_f1.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/gsub_chaining1_next_glyph_f1.ttx.GSUB @@ -33,7 +33,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"/> <Substitution in="g22" out="g62"/> @@ -50,7 +50,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> @@ -60,7 +60,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> @@ -70,7 +70,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> @@ -79,7 +79,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <ChainContextSubst index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> <Glyph value="g23"/> </Coverage> diff --git a/Tests/ttLib/tables/data/aots/gsub_chaining1_simple_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gsub_chaining1_simple_f1.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gsub_chaining1_simple_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gsub_chaining1_simple_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gsub_chaining1_simple_f1.ttx.GSUB b/Tests/ttLib/tables/data/aots/gsub_chaining1_simple_f1.ttx.GSUB index 62e93a85..f7dbe588 100644 --- a/Tests/ttLib/tables/data/aots/gsub_chaining1_simple_f1.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/gsub_chaining1_simple_f1.ttx.GSUB @@ -33,7 +33,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"/> <Substitution in="g22" out="g62"/> @@ -50,7 +50,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> @@ -60,7 +60,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> @@ -70,7 +70,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> @@ -79,7 +79,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <ChainContextSubst index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g21"/> </Coverage> <!-- ChainSubRuleSetCount=1 --> diff --git a/Tests/ttLib/tables/data/aots/gsub_chaining1_simple_f2.ttx.GDEF b/Tests/ttLib/tables/data/aots/gsub_chaining1_simple_f2.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gsub_chaining1_simple_f2.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gsub_chaining1_simple_f2.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gsub_chaining1_simple_f2.ttx.GSUB b/Tests/ttLib/tables/data/aots/gsub_chaining1_simple_f2.ttx.GSUB index fc4e2b56..a8894e53 100644 --- a/Tests/ttLib/tables/data/aots/gsub_chaining1_simple_f2.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/gsub_chaining1_simple_f2.ttx.GSUB @@ -33,7 +33,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"/> <Substitution in="g22" out="g62"/> @@ -50,7 +50,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> @@ -60,7 +60,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> @@ -70,7 +70,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> @@ -79,7 +79,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <ChainContextSubst index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g22"/> </Coverage> <!-- ChainSubRuleSetCount=1 --> diff --git a/Tests/ttLib/tables/data/aots/gsub_chaining1_successive_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gsub_chaining1_successive_f1.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gsub_chaining1_successive_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gsub_chaining1_successive_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gsub_chaining1_successive_f1.ttx.GSUB b/Tests/ttLib/tables/data/aots/gsub_chaining1_successive_f1.ttx.GSUB index 6b416df8..52cf963a 100644 --- a/Tests/ttLib/tables/data/aots/gsub_chaining1_successive_f1.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/gsub_chaining1_successive_f1.ttx.GSUB @@ -33,7 +33,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"/> <Substitution in="g22" out="g62"/> @@ -50,7 +50,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> @@ -60,7 +60,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> @@ -70,7 +70,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> @@ -79,7 +79,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <ChainContextSubst index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> </Coverage> <!-- ChainSubRuleSetCount=1 --> diff --git a/Tests/ttLib/tables/data/aots/gsub_chaining2_boundary_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gsub_chaining2_boundary_f1.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gsub_chaining2_boundary_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gsub_chaining2_boundary_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gsub_chaining2_boundary_f1.ttx.GSUB b/Tests/ttLib/tables/data/aots/gsub_chaining2_boundary_f1.ttx.GSUB index 36f37421..9109e596 100644 --- a/Tests/ttLib/tables/data/aots/gsub_chaining2_boundary_f1.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/gsub_chaining2_boundary_f1.ttx.GSUB @@ -33,7 +33,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"/> <Substitution in="g22" out="g62"/> @@ -50,7 +50,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> @@ -60,7 +60,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> @@ -70,7 +70,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> @@ -79,7 +79,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <ChainContextSubst index="0" Format="2"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -88,7 +88,7 @@ <Glyph value="g25"/> <Glyph value="g26"/> </Coverage> - <BacktrackClassDef Format="2"> + <BacktrackClassDef> <ClassDef glyph="g20" class="20"/> <ClassDef glyph="g21" class="21"/> <ClassDef glyph="g22" class="22"/> @@ -97,7 +97,7 @@ <ClassDef glyph="g25" class="25"/> <ClassDef glyph="g26" class="26"/> </BacktrackClassDef> - <InputClassDef Format="2"> + <InputClassDef> <ClassDef glyph="g20" class="20"/> <ClassDef glyph="g21" class="21"/> <ClassDef glyph="g22" class="22"/> @@ -106,7 +106,7 @@ <ClassDef glyph="g25" class="25"/> <ClassDef glyph="g26" class="26"/> </InputClassDef> - <LookAheadClassDef Format="2"> + <LookAheadClassDef> <ClassDef glyph="g20" class="20"/> <ClassDef glyph="g21" class="21"/> <ClassDef glyph="g22" class="22"/> diff --git a/Tests/ttLib/tables/data/aots/gsub_chaining2_boundary_f2.ttx.GDEF b/Tests/ttLib/tables/data/aots/gsub_chaining2_boundary_f2.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gsub_chaining2_boundary_f2.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gsub_chaining2_boundary_f2.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gsub_chaining2_boundary_f2.ttx.GSUB b/Tests/ttLib/tables/data/aots/gsub_chaining2_boundary_f2.ttx.GSUB index ebaaa628..ead59dc9 100644 --- a/Tests/ttLib/tables/data/aots/gsub_chaining2_boundary_f2.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/gsub_chaining2_boundary_f2.ttx.GSUB @@ -33,7 +33,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"/> <Substitution in="g22" out="g62"/> @@ -50,7 +50,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> @@ -60,7 +60,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> @@ -70,7 +70,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> @@ -79,7 +79,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <ChainContextSubst index="0" Format="2"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -88,7 +88,7 @@ <Glyph value="g25"/> <Glyph value="g26"/> </Coverage> - <BacktrackClassDef Format="2"> + <BacktrackClassDef> <ClassDef glyph="g20" class="20"/> <ClassDef glyph="g21" class="21"/> <ClassDef glyph="g22" class="22"/> @@ -97,7 +97,7 @@ <ClassDef glyph="g25" class="25"/> <ClassDef glyph="g26" class="26"/> </BacktrackClassDef> - <InputClassDef Format="2"> + <InputClassDef> <ClassDef glyph="g20" class="20"/> <ClassDef glyph="g21" class="21"/> <ClassDef glyph="g22" class="22"/> @@ -106,7 +106,7 @@ <ClassDef glyph="g25" class="25"/> <ClassDef glyph="g26" class="26"/> </InputClassDef> - <LookAheadClassDef Format="2"> + <LookAheadClassDef> <ClassDef glyph="g20" class="20"/> <ClassDef glyph="g21" class="21"/> <ClassDef glyph="g22" class="22"/> diff --git a/Tests/ttLib/tables/data/aots/gsub_chaining2_boundary_f3.ttx.GDEF b/Tests/ttLib/tables/data/aots/gsub_chaining2_boundary_f3.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gsub_chaining2_boundary_f3.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gsub_chaining2_boundary_f3.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gsub_chaining2_boundary_f3.ttx.GSUB b/Tests/ttLib/tables/data/aots/gsub_chaining2_boundary_f3.ttx.GSUB index ad5efd55..8163db11 100644 --- a/Tests/ttLib/tables/data/aots/gsub_chaining2_boundary_f3.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/gsub_chaining2_boundary_f3.ttx.GSUB @@ -33,7 +33,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"/> <Substitution in="g22" out="g62"/> @@ -50,7 +50,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> @@ -60,7 +60,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> @@ -70,7 +70,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> @@ -79,7 +79,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <ChainContextSubst index="0" Format="2"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -88,7 +88,7 @@ <Glyph value="g25"/> <Glyph value="g26"/> </Coverage> - <BacktrackClassDef Format="2"> + <BacktrackClassDef> <ClassDef glyph="g20" class="20"/> <ClassDef glyph="g21" class="21"/> <ClassDef glyph="g22" class="22"/> @@ -97,7 +97,7 @@ <ClassDef glyph="g25" class="25"/> <ClassDef glyph="g26" class="26"/> </BacktrackClassDef> - <InputClassDef Format="2"> + <InputClassDef> <ClassDef glyph="g20" class="20"/> <ClassDef glyph="g21" class="21"/> <ClassDef glyph="g22" class="22"/> @@ -106,7 +106,7 @@ <ClassDef glyph="g25" class="25"/> <ClassDef glyph="g26" class="26"/> </InputClassDef> - <LookAheadClassDef Format="2"> + <LookAheadClassDef> <ClassDef glyph="g20" class="20"/> <ClassDef glyph="g21" class="21"/> <ClassDef glyph="g22" class="22"/> diff --git a/Tests/ttLib/tables/data/aots/gsub_chaining2_boundary_f4.ttx.GDEF b/Tests/ttLib/tables/data/aots/gsub_chaining2_boundary_f4.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gsub_chaining2_boundary_f4.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gsub_chaining2_boundary_f4.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gsub_chaining2_boundary_f4.ttx.GSUB b/Tests/ttLib/tables/data/aots/gsub_chaining2_boundary_f4.ttx.GSUB index 5ef2c8d7..48f94836 100644 --- a/Tests/ttLib/tables/data/aots/gsub_chaining2_boundary_f4.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/gsub_chaining2_boundary_f4.ttx.GSUB @@ -33,7 +33,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"/> <Substitution in="g22" out="g62"/> @@ -50,7 +50,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> @@ -60,7 +60,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> @@ -70,7 +70,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> @@ -79,7 +79,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <ChainContextSubst index="0" Format="2"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -88,7 +88,7 @@ <Glyph value="g25"/> <Glyph value="g26"/> </Coverage> - <BacktrackClassDef Format="2"> + <BacktrackClassDef> <ClassDef glyph="g20" class="20"/> <ClassDef glyph="g21" class="21"/> <ClassDef glyph="g22" class="22"/> @@ -97,7 +97,7 @@ <ClassDef glyph="g25" class="25"/> <ClassDef glyph="g26" class="26"/> </BacktrackClassDef> - <InputClassDef Format="2"> + <InputClassDef> <ClassDef glyph="g20" class="20"/> <ClassDef glyph="g21" class="21"/> <ClassDef glyph="g22" class="22"/> @@ -106,7 +106,7 @@ <ClassDef glyph="g25" class="25"/> <ClassDef glyph="g26" class="26"/> </InputClassDef> - <LookAheadClassDef Format="2"> + <LookAheadClassDef> <ClassDef glyph="g20" class="20"/> <ClassDef glyph="g21" class="21"/> <ClassDef glyph="g22" class="22"/> diff --git a/Tests/ttLib/tables/data/aots/gsub_chaining2_lookupflag_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gsub_chaining2_lookupflag_f1.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gsub_chaining2_lookupflag_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gsub_chaining2_lookupflag_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gsub_chaining2_lookupflag_f1.ttx.GSUB b/Tests/ttLib/tables/data/aots/gsub_chaining2_lookupflag_f1.ttx.GSUB index f54d484e..a7f4ce6c 100644 --- a/Tests/ttLib/tables/data/aots/gsub_chaining2_lookupflag_f1.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/gsub_chaining2_lookupflag_f1.ttx.GSUB @@ -33,7 +33,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"/> <Substitution in="g22" out="g62"/> @@ -50,7 +50,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> @@ -60,7 +60,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> @@ -70,7 +70,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> @@ -79,7 +79,7 @@ <LookupFlag value="8"/><!-- ignoreMarks --> <!-- SubTableCount=1 --> <ChainContextSubst index="0" Format="2"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -88,7 +88,7 @@ <Glyph value="g25"/> <Glyph value="g26"/> </Coverage> - <BacktrackClassDef Format="2"> + <BacktrackClassDef> <ClassDef glyph="g20" class="20"/> <ClassDef glyph="g21" class="21"/> <ClassDef glyph="g22" class="22"/> @@ -97,7 +97,7 @@ <ClassDef glyph="g25" class="25"/> <ClassDef glyph="g26" class="26"/> </BacktrackClassDef> - <InputClassDef Format="2"> + <InputClassDef> <ClassDef glyph="g20" class="20"/> <ClassDef glyph="g21" class="21"/> <ClassDef glyph="g22" class="22"/> @@ -106,7 +106,7 @@ <ClassDef glyph="g25" class="25"/> <ClassDef glyph="g26" class="26"/> </InputClassDef> - <LookAheadClassDef Format="2"> + <LookAheadClassDef> <ClassDef glyph="g20" class="20"/> <ClassDef glyph="g21" class="21"/> <ClassDef glyph="g22" class="22"/> diff --git a/Tests/ttLib/tables/data/aots/gsub_chaining2_multiple_subrules_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gsub_chaining2_multiple_subrules_f1.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gsub_chaining2_multiple_subrules_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gsub_chaining2_multiple_subrules_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gsub_chaining2_multiple_subrules_f1.ttx.GSUB b/Tests/ttLib/tables/data/aots/gsub_chaining2_multiple_subrules_f1.ttx.GSUB index b972275c..34cea465 100644 --- a/Tests/ttLib/tables/data/aots/gsub_chaining2_multiple_subrules_f1.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/gsub_chaining2_multiple_subrules_f1.ttx.GSUB @@ -33,7 +33,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"/> <Substitution in="g22" out="g62"/> @@ -50,7 +50,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> @@ -60,7 +60,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> @@ -70,7 +70,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> @@ -79,7 +79,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <ChainContextSubst index="0" Format="2"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -88,7 +88,7 @@ <Glyph value="g25"/> <Glyph value="g26"/> </Coverage> - <BacktrackClassDef Format="2"> + <BacktrackClassDef> <ClassDef glyph="g20" class="20"/> <ClassDef glyph="g21" class="21"/> <ClassDef glyph="g22" class="22"/> @@ -97,7 +97,7 @@ <ClassDef glyph="g25" class="25"/> <ClassDef glyph="g26" class="26"/> </BacktrackClassDef> - <InputClassDef Format="2"> + <InputClassDef> <ClassDef glyph="g20" class="20"/> <ClassDef glyph="g21" class="21"/> <ClassDef glyph="g22" class="22"/> @@ -106,7 +106,7 @@ <ClassDef glyph="g25" class="25"/> <ClassDef glyph="g26" class="26"/> </InputClassDef> - <LookAheadClassDef Format="2"> + <LookAheadClassDef> <ClassDef glyph="g20" class="20"/> <ClassDef glyph="g21" class="21"/> <ClassDef glyph="g22" class="22"/> diff --git a/Tests/ttLib/tables/data/aots/gsub_chaining2_multiple_subrules_f2.ttx.GDEF b/Tests/ttLib/tables/data/aots/gsub_chaining2_multiple_subrules_f2.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gsub_chaining2_multiple_subrules_f2.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gsub_chaining2_multiple_subrules_f2.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gsub_chaining2_multiple_subrules_f2.ttx.GSUB b/Tests/ttLib/tables/data/aots/gsub_chaining2_multiple_subrules_f2.ttx.GSUB index 790b3127..21cbe2a9 100644 --- a/Tests/ttLib/tables/data/aots/gsub_chaining2_multiple_subrules_f2.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/gsub_chaining2_multiple_subrules_f2.ttx.GSUB @@ -33,7 +33,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"/> <Substitution in="g22" out="g62"/> @@ -50,7 +50,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> @@ -60,7 +60,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> @@ -70,7 +70,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> @@ -79,7 +79,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <ChainContextSubst index="0" Format="2"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -88,7 +88,7 @@ <Glyph value="g25"/> <Glyph value="g26"/> </Coverage> - <BacktrackClassDef Format="2"> + <BacktrackClassDef> <ClassDef glyph="g20" class="20"/> <ClassDef glyph="g21" class="21"/> <ClassDef glyph="g22" class="22"/> @@ -97,7 +97,7 @@ <ClassDef glyph="g25" class="25"/> <ClassDef glyph="g26" class="26"/> </BacktrackClassDef> - <InputClassDef Format="2"> + <InputClassDef> <ClassDef glyph="g20" class="20"/> <ClassDef glyph="g21" class="21"/> <ClassDef glyph="g22" class="22"/> @@ -106,7 +106,7 @@ <ClassDef glyph="g25" class="25"/> <ClassDef glyph="g26" class="26"/> </InputClassDef> - <LookAheadClassDef Format="2"> + <LookAheadClassDef> <ClassDef glyph="g20" class="20"/> <ClassDef glyph="g21" class="21"/> <ClassDef glyph="g22" class="22"/> diff --git a/Tests/ttLib/tables/data/aots/gsub_chaining2_next_glyph_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gsub_chaining2_next_glyph_f1.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gsub_chaining2_next_glyph_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gsub_chaining2_next_glyph_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gsub_chaining2_next_glyph_f1.ttx.GSUB b/Tests/ttLib/tables/data/aots/gsub_chaining2_next_glyph_f1.ttx.GSUB index 7743df54..d14ac1b9 100644 --- a/Tests/ttLib/tables/data/aots/gsub_chaining2_next_glyph_f1.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/gsub_chaining2_next_glyph_f1.ttx.GSUB @@ -33,7 +33,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"/> <Substitution in="g22" out="g62"/> @@ -50,7 +50,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> @@ -60,7 +60,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> @@ -70,7 +70,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> @@ -79,7 +79,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <ChainContextSubst index="0" Format="2"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -88,7 +88,7 @@ <Glyph value="g25"/> <Glyph value="g26"/> </Coverage> - <BacktrackClassDef Format="2"> + <BacktrackClassDef> <ClassDef glyph="g20" class="20"/> <ClassDef glyph="g21" class="21"/> <ClassDef glyph="g22" class="22"/> @@ -97,7 +97,7 @@ <ClassDef glyph="g25" class="25"/> <ClassDef glyph="g26" class="26"/> </BacktrackClassDef> - <InputClassDef Format="2"> + <InputClassDef> <ClassDef glyph="g20" class="20"/> <ClassDef glyph="g21" class="21"/> <ClassDef glyph="g22" class="22"/> @@ -106,7 +106,7 @@ <ClassDef glyph="g25" class="25"/> <ClassDef glyph="g26" class="26"/> </InputClassDef> - <LookAheadClassDef Format="2"> + <LookAheadClassDef> <ClassDef glyph="g20" class="20"/> <ClassDef glyph="g21" class="21"/> <ClassDef glyph="g22" class="22"/> diff --git a/Tests/ttLib/tables/data/aots/gsub_chaining2_simple_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gsub_chaining2_simple_f1.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gsub_chaining2_simple_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gsub_chaining2_simple_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gsub_chaining2_simple_f1.ttx.GSUB b/Tests/ttLib/tables/data/aots/gsub_chaining2_simple_f1.ttx.GSUB index 7ba2ad68..da6a915c 100644 --- a/Tests/ttLib/tables/data/aots/gsub_chaining2_simple_f1.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/gsub_chaining2_simple_f1.ttx.GSUB @@ -33,7 +33,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"/> <Substitution in="g22" out="g62"/> @@ -50,7 +50,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> @@ -60,7 +60,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> @@ -70,7 +70,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> @@ -79,7 +79,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <ChainContextSubst index="0" Format="2"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -88,7 +88,7 @@ <Glyph value="g25"/> <Glyph value="g26"/> </Coverage> - <BacktrackClassDef Format="2"> + <BacktrackClassDef> <ClassDef glyph="g20" class="20"/> <ClassDef glyph="g21" class="21"/> <ClassDef glyph="g22" class="22"/> @@ -97,7 +97,7 @@ <ClassDef glyph="g25" class="25"/> <ClassDef glyph="g26" class="26"/> </BacktrackClassDef> - <InputClassDef Format="2"> + <InputClassDef> <ClassDef glyph="g20" class="20"/> <ClassDef glyph="g21" class="21"/> <ClassDef glyph="g22" class="22"/> @@ -106,7 +106,7 @@ <ClassDef glyph="g25" class="25"/> <ClassDef glyph="g26" class="26"/> </InputClassDef> - <LookAheadClassDef Format="2"> + <LookAheadClassDef> <ClassDef glyph="g20" class="20"/> <ClassDef glyph="g21" class="21"/> <ClassDef glyph="g22" class="22"/> diff --git a/Tests/ttLib/tables/data/aots/gsub_chaining2_simple_f2.ttx.GDEF b/Tests/ttLib/tables/data/aots/gsub_chaining2_simple_f2.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gsub_chaining2_simple_f2.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gsub_chaining2_simple_f2.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gsub_chaining2_simple_f2.ttx.GSUB b/Tests/ttLib/tables/data/aots/gsub_chaining2_simple_f2.ttx.GSUB index 02c2e016..94f62173 100644 --- a/Tests/ttLib/tables/data/aots/gsub_chaining2_simple_f2.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/gsub_chaining2_simple_f2.ttx.GSUB @@ -33,7 +33,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"/> <Substitution in="g22" out="g62"/> @@ -50,7 +50,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> @@ -60,7 +60,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> @@ -70,7 +70,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> @@ -79,7 +79,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <ChainContextSubst index="0" Format="2"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -88,7 +88,7 @@ <Glyph value="g25"/> <Glyph value="g26"/> </Coverage> - <BacktrackClassDef Format="2"> + <BacktrackClassDef> <ClassDef glyph="g20" class="20"/> <ClassDef glyph="g21" class="21"/> <ClassDef glyph="g22" class="22"/> @@ -97,7 +97,7 @@ <ClassDef glyph="g25" class="25"/> <ClassDef glyph="g26" class="26"/> </BacktrackClassDef> - <InputClassDef Format="2"> + <InputClassDef> <ClassDef glyph="g20" class="20"/> <ClassDef glyph="g21" class="21"/> <ClassDef glyph="g22" class="22"/> @@ -106,7 +106,7 @@ <ClassDef glyph="g25" class="25"/> <ClassDef glyph="g26" class="26"/> </InputClassDef> - <LookAheadClassDef Format="2"> + <LookAheadClassDef> <ClassDef glyph="g20" class="20"/> <ClassDef glyph="g21" class="21"/> <ClassDef glyph="g22" class="22"/> diff --git a/Tests/ttLib/tables/data/aots/gsub_chaining2_successive_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gsub_chaining2_successive_f1.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gsub_chaining2_successive_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gsub_chaining2_successive_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gsub_chaining2_successive_f1.ttx.GSUB b/Tests/ttLib/tables/data/aots/gsub_chaining2_successive_f1.ttx.GSUB index 8bf87f65..7dbc5e03 100644 --- a/Tests/ttLib/tables/data/aots/gsub_chaining2_successive_f1.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/gsub_chaining2_successive_f1.ttx.GSUB @@ -33,7 +33,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"/> <Substitution in="g22" out="g62"/> @@ -50,7 +50,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> @@ -60,7 +60,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> @@ -70,7 +70,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> @@ -79,7 +79,7 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <ChainContextSubst index="0" Format="2"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> @@ -88,7 +88,7 @@ <Glyph value="g25"/> <Glyph value="g26"/> </Coverage> - <BacktrackClassDef Format="2"> + <BacktrackClassDef> <ClassDef glyph="g20" class="20"/> <ClassDef glyph="g21" class="21"/> <ClassDef glyph="g22" class="22"/> @@ -97,7 +97,7 @@ <ClassDef glyph="g25" class="25"/> <ClassDef glyph="g26" class="26"/> </BacktrackClassDef> - <InputClassDef Format="2"> + <InputClassDef> <ClassDef glyph="g20" class="20"/> <ClassDef glyph="g21" class="21"/> <ClassDef glyph="g22" class="22"/> @@ -106,7 +106,7 @@ <ClassDef glyph="g25" class="25"/> <ClassDef glyph="g26" class="26"/> </InputClassDef> - <LookAheadClassDef Format="2"> + <LookAheadClassDef> <ClassDef glyph="g20" class="20"/> <ClassDef glyph="g21" class="21"/> <ClassDef glyph="g22" class="22"/> diff --git a/Tests/ttLib/tables/data/aots/gsub_chaining3_boundary_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gsub_chaining3_boundary_f1.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gsub_chaining3_boundary_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gsub_chaining3_boundary_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gsub_chaining3_boundary_f1.ttx.GSUB b/Tests/ttLib/tables/data/aots/gsub_chaining3_boundary_f1.ttx.GSUB index b1dcebd5..82eb1331 100644 --- a/Tests/ttLib/tables/data/aots/gsub_chaining3_boundary_f1.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/gsub_chaining3_boundary_f1.ttx.GSUB @@ -33,7 +33,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"/> <Substitution in="g22" out="g62"/> @@ -50,7 +50,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> @@ -60,7 +60,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> @@ -70,7 +70,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> @@ -80,18 +80,18 @@ <!-- SubTableCount=1 --> <ChainContextSubst index="0" Format="3"> <!-- BacktrackGlyphCount=1 --> - <BacktrackCoverage index="0" Format="1"> + <BacktrackCoverage index="0"> <Glyph value="g20"/> </BacktrackCoverage> <!-- InputGlyphCount=2 --> - <InputCoverage index="0" Format="1"> + <InputCoverage index="0"> <Glyph value="g21"/> </InputCoverage> - <InputCoverage index="1" Format="1"> + <InputCoverage index="1"> <Glyph value="g22"/> </InputCoverage> <!-- LookAheadGlyphCount=1 --> - <LookAheadCoverage index="0" Format="1"> + <LookAheadCoverage index="0"> <Glyph value="g23"/> </LookAheadCoverage> <!-- SubstCount=0 --> diff --git a/Tests/ttLib/tables/data/aots/gsub_chaining3_boundary_f2.ttx.GDEF b/Tests/ttLib/tables/data/aots/gsub_chaining3_boundary_f2.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gsub_chaining3_boundary_f2.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gsub_chaining3_boundary_f2.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gsub_chaining3_boundary_f2.ttx.GSUB b/Tests/ttLib/tables/data/aots/gsub_chaining3_boundary_f2.ttx.GSUB index 82502fd0..b5c16361 100644 --- a/Tests/ttLib/tables/data/aots/gsub_chaining3_boundary_f2.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/gsub_chaining3_boundary_f2.ttx.GSUB @@ -33,7 +33,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"/> <Substitution in="g22" out="g62"/> @@ -50,7 +50,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> @@ -60,7 +60,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> @@ -70,7 +70,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> @@ -80,18 +80,18 @@ <!-- SubTableCount=1 --> <ChainContextSubst index="0" Format="3"> <!-- BacktrackGlyphCount=1 --> - <BacktrackCoverage index="0" Format="1"> + <BacktrackCoverage index="0"> <Glyph value="g20"/> </BacktrackCoverage> <!-- InputGlyphCount=1 --> - <InputCoverage index="0" Format="1"> + <InputCoverage index="0"> <Glyph value="g21"/> </InputCoverage> <!-- LookAheadGlyphCount=2 --> - <LookAheadCoverage index="0" Format="1"> + <LookAheadCoverage index="0"> <Glyph value="g22"/> </LookAheadCoverage> - <LookAheadCoverage index="1" Format="1"> + <LookAheadCoverage index="1"> <Glyph value="g23"/> </LookAheadCoverage> <!-- SubstCount=1 --> diff --git a/Tests/ttLib/tables/data/aots/gsub_chaining3_boundary_f3.ttx.GDEF b/Tests/ttLib/tables/data/aots/gsub_chaining3_boundary_f3.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gsub_chaining3_boundary_f3.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gsub_chaining3_boundary_f3.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gsub_chaining3_boundary_f3.ttx.GSUB b/Tests/ttLib/tables/data/aots/gsub_chaining3_boundary_f3.ttx.GSUB index bc188566..76d5a462 100644 --- a/Tests/ttLib/tables/data/aots/gsub_chaining3_boundary_f3.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/gsub_chaining3_boundary_f3.ttx.GSUB @@ -33,7 +33,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"/> <Substitution in="g22" out="g62"/> @@ -50,7 +50,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> @@ -60,7 +60,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> @@ -70,7 +70,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> @@ -81,14 +81,14 @@ <ChainContextSubst index="0" Format="3"> <!-- BacktrackGlyphCount=0 --> <!-- InputGlyphCount=1 --> - <InputCoverage index="0" Format="1"> + <InputCoverage index="0"> <Glyph value="g21"/> </InputCoverage> <!-- LookAheadGlyphCount=2 --> - <LookAheadCoverage index="0" Format="1"> + <LookAheadCoverage index="0"> <Glyph value="g22"/> </LookAheadCoverage> - <LookAheadCoverage index="1" Format="1"> + <LookAheadCoverage index="1"> <Glyph value="g23"/> </LookAheadCoverage> <!-- SubstCount=1 --> diff --git a/Tests/ttLib/tables/data/aots/gsub_chaining3_boundary_f4.ttx.GDEF b/Tests/ttLib/tables/data/aots/gsub_chaining3_boundary_f4.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gsub_chaining3_boundary_f4.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gsub_chaining3_boundary_f4.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gsub_chaining3_boundary_f4.ttx.GSUB b/Tests/ttLib/tables/data/aots/gsub_chaining3_boundary_f4.ttx.GSUB index 40090e68..9346d47b 100644 --- a/Tests/ttLib/tables/data/aots/gsub_chaining3_boundary_f4.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/gsub_chaining3_boundary_f4.ttx.GSUB @@ -33,7 +33,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"/> <Substitution in="g22" out="g62"/> @@ -50,7 +50,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> @@ -60,7 +60,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> @@ -70,7 +70,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> @@ -80,14 +80,14 @@ <!-- SubTableCount=1 --> <ChainContextSubst index="0" Format="3"> <!-- BacktrackGlyphCount=2 --> - <BacktrackCoverage index="0" Format="1"> + <BacktrackCoverage index="0"> <Glyph value="g21"/> </BacktrackCoverage> - <BacktrackCoverage index="1" Format="1"> + <BacktrackCoverage index="1"> <Glyph value="g20"/> </BacktrackCoverage> <!-- InputGlyphCount=1 --> - <InputCoverage index="0" Format="1"> + <InputCoverage index="0"> <Glyph value="g22"/> </InputCoverage> <!-- LookAheadGlyphCount=0 --> diff --git a/Tests/ttLib/tables/data/aots/gsub_chaining3_lookupflag_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gsub_chaining3_lookupflag_f1.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gsub_chaining3_lookupflag_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gsub_chaining3_lookupflag_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gsub_chaining3_lookupflag_f1.ttx.GSUB b/Tests/ttLib/tables/data/aots/gsub_chaining3_lookupflag_f1.ttx.GSUB index 78957e44..c329936e 100644 --- a/Tests/ttLib/tables/data/aots/gsub_chaining3_lookupflag_f1.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/gsub_chaining3_lookupflag_f1.ttx.GSUB @@ -33,7 +33,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"/> <Substitution in="g22" out="g62"/> @@ -50,7 +50,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> @@ -60,7 +60,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> @@ -70,7 +70,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> @@ -80,27 +80,27 @@ <!-- SubTableCount=1 --> <ChainContextSubst index="0" Format="3"> <!-- BacktrackGlyphCount=2 --> - <BacktrackCoverage index="0" Format="1"> + <BacktrackCoverage index="0"> <Glyph value="g21"/> </BacktrackCoverage> - <BacktrackCoverage index="1" Format="1"> + <BacktrackCoverage index="1"> <Glyph value="g20"/> </BacktrackCoverage> <!-- InputGlyphCount=3 --> - <InputCoverage index="0" Format="1"> + <InputCoverage index="0"> <Glyph value="g22"/> </InputCoverage> - <InputCoverage index="1" Format="1"> + <InputCoverage index="1"> <Glyph value="g23"/> </InputCoverage> - <InputCoverage index="2" Format="1"> + <InputCoverage index="2"> <Glyph value="g24"/> </InputCoverage> <!-- LookAheadGlyphCount=2 --> - <LookAheadCoverage index="0" Format="1"> + <LookAheadCoverage index="0"> <Glyph value="g25"/> </LookAheadCoverage> - <LookAheadCoverage index="1" Format="1"> + <LookAheadCoverage index="1"> <Glyph value="g26"/> </LookAheadCoverage> <!-- SubstCount=1 --> diff --git a/Tests/ttLib/tables/data/aots/gsub_chaining3_next_glyph_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gsub_chaining3_next_glyph_f1.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gsub_chaining3_next_glyph_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gsub_chaining3_next_glyph_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gsub_chaining3_next_glyph_f1.ttx.GSUB b/Tests/ttLib/tables/data/aots/gsub_chaining3_next_glyph_f1.ttx.GSUB index eba78cec..46d1f859 100644 --- a/Tests/ttLib/tables/data/aots/gsub_chaining3_next_glyph_f1.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/gsub_chaining3_next_glyph_f1.ttx.GSUB @@ -33,7 +33,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"/> <Substitution in="g22" out="g62"/> @@ -50,7 +50,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> @@ -60,7 +60,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> @@ -70,7 +70,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> @@ -80,18 +80,18 @@ <!-- SubTableCount=1 --> <ChainContextSubst index="0" Format="3"> <!-- BacktrackGlyphCount=1 --> - <BacktrackCoverage index="0" Format="1"> + <BacktrackCoverage index="0"> <Glyph value="g22"/> </BacktrackCoverage> <!-- InputGlyphCount=2 --> - <InputCoverage index="0" Format="1"> + <InputCoverage index="0"> <Glyph value="g21"/> </InputCoverage> - <InputCoverage index="1" Format="1"> + <InputCoverage index="1"> <Glyph value="g22"/> </InputCoverage> <!-- LookAheadGlyphCount=1 --> - <LookAheadCoverage index="0" Format="1"> + <LookAheadCoverage index="0"> <Glyph value="g21"/> </LookAheadCoverage> <!-- SubstCount=1 --> diff --git a/Tests/ttLib/tables/data/aots/gsub_chaining3_simple_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gsub_chaining3_simple_f1.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gsub_chaining3_simple_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gsub_chaining3_simple_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gsub_chaining3_simple_f1.ttx.GSUB b/Tests/ttLib/tables/data/aots/gsub_chaining3_simple_f1.ttx.GSUB index d40f71b6..722dcadb 100644 --- a/Tests/ttLib/tables/data/aots/gsub_chaining3_simple_f1.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/gsub_chaining3_simple_f1.ttx.GSUB @@ -33,7 +33,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"/> <Substitution in="g22" out="g62"/> @@ -50,7 +50,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> @@ -60,7 +60,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> @@ -70,7 +70,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> @@ -80,18 +80,18 @@ <!-- SubTableCount=1 --> <ChainContextSubst index="0" Format="3"> <!-- BacktrackGlyphCount=1 --> - <BacktrackCoverage index="0" Format="1"> + <BacktrackCoverage index="0"> <Glyph value="g20"/> </BacktrackCoverage> <!-- InputGlyphCount=2 --> - <InputCoverage index="0" Format="1"> + <InputCoverage index="0"> <Glyph value="g21"/> </InputCoverage> - <InputCoverage index="1" Format="1"> + <InputCoverage index="1"> <Glyph value="g22"/> </InputCoverage> <!-- LookAheadGlyphCount=1 --> - <LookAheadCoverage index="0" Format="1"> + <LookAheadCoverage index="0"> <Glyph value="g23"/> </LookAheadCoverage> <!-- SubstCount=2 --> diff --git a/Tests/ttLib/tables/data/aots/gsub_chaining3_simple_f2.ttx.GDEF b/Tests/ttLib/tables/data/aots/gsub_chaining3_simple_f2.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gsub_chaining3_simple_f2.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gsub_chaining3_simple_f2.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gsub_chaining3_simple_f2.ttx.GSUB b/Tests/ttLib/tables/data/aots/gsub_chaining3_simple_f2.ttx.GSUB index 9fe4e1d9..5842c554 100644 --- a/Tests/ttLib/tables/data/aots/gsub_chaining3_simple_f2.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/gsub_chaining3_simple_f2.ttx.GSUB @@ -33,7 +33,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"/> <Substitution in="g22" out="g62"/> @@ -50,7 +50,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> @@ -60,7 +60,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> @@ -70,7 +70,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> @@ -80,27 +80,27 @@ <!-- SubTableCount=1 --> <ChainContextSubst index="0" Format="3"> <!-- BacktrackGlyphCount=2 --> - <BacktrackCoverage index="0" Format="1"> + <BacktrackCoverage index="0"> <Glyph value="g21"/> </BacktrackCoverage> - <BacktrackCoverage index="1" Format="1"> + <BacktrackCoverage index="1"> <Glyph value="g20"/> </BacktrackCoverage> <!-- InputGlyphCount=3 --> - <InputCoverage index="0" Format="1"> + <InputCoverage index="0"> <Glyph value="g22"/> </InputCoverage> - <InputCoverage index="1" Format="1"> + <InputCoverage index="1"> <Glyph value="g23"/> </InputCoverage> - <InputCoverage index="2" Format="1"> + <InputCoverage index="2"> <Glyph value="g24"/> </InputCoverage> <!-- LookAheadGlyphCount=2 --> - <LookAheadCoverage index="0" Format="1"> + <LookAheadCoverage index="0"> <Glyph value="g25"/> </LookAheadCoverage> - <LookAheadCoverage index="1" Format="1"> + <LookAheadCoverage index="1"> <Glyph value="g26"/> </LookAheadCoverage> <!-- SubstCount=1 --> diff --git a/Tests/ttLib/tables/data/aots/gsub_chaining3_successive_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gsub_chaining3_successive_f1.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gsub_chaining3_successive_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gsub_chaining3_successive_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gsub_chaining3_successive_f1.ttx.GSUB b/Tests/ttLib/tables/data/aots/gsub_chaining3_successive_f1.ttx.GSUB index 4b7e83ca..610ea565 100644 --- a/Tests/ttLib/tables/data/aots/gsub_chaining3_successive_f1.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/gsub_chaining3_successive_f1.ttx.GSUB @@ -33,7 +33,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"/> <Substitution in="g22" out="g62"/> @@ -50,7 +50,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> @@ -60,7 +60,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> @@ -70,7 +70,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> @@ -80,24 +80,24 @@ <!-- SubTableCount=1 --> <ChainContextSubst index="0" Format="3"> <!-- BacktrackGlyphCount=1 --> - <BacktrackCoverage index="0" Format="1"> + <BacktrackCoverage index="0"> <Glyph value="g25"/> </BacktrackCoverage> <!-- InputGlyphCount=4 --> - <InputCoverage index="0" Format="1"> + <InputCoverage index="0"> <Glyph value="g20"/> </InputCoverage> - <InputCoverage index="1" Format="1"> + <InputCoverage index="1"> <Glyph value="g21"/> </InputCoverage> - <InputCoverage index="2" Format="1"> + <InputCoverage index="2"> <Glyph value="g22"/> </InputCoverage> - <InputCoverage index="3" Format="1"> + <InputCoverage index="3"> <Glyph value="g23"/> </InputCoverage> <!-- LookAheadGlyphCount=1 --> - <LookAheadCoverage index="0" Format="1"> + <LookAheadCoverage index="0"> <Glyph value="g24"/> </LookAheadCoverage> <!-- SubstCount=2 --> diff --git a/Tests/ttLib/tables/data/aots/gsub_context1_boundary_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gsub_context1_boundary_f1.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gsub_context1_boundary_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gsub_context1_boundary_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gsub_context1_boundary_f1.ttx.GSUB b/Tests/ttLib/tables/data/aots/gsub_context1_boundary_f1.ttx.GSUB index 21ae346f..6de65066 100644 --- a/Tests/ttLib/tables/data/aots/gsub_context1_boundary_f1.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/gsub_context1_boundary_f1.ttx.GSUB @@ -33,7 +33,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"/> <Substitution in="g22" out="g62"/> @@ -50,7 +50,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> @@ -60,7 +60,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> @@ -70,7 +70,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> @@ -79,7 +79,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/ttLib/tables/data/aots/gsub_context1_boundary_f2.ttx.GDEF b/Tests/ttLib/tables/data/aots/gsub_context1_boundary_f2.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gsub_context1_boundary_f2.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gsub_context1_boundary_f2.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gsub_context1_boundary_f2.ttx.GSUB b/Tests/ttLib/tables/data/aots/gsub_context1_boundary_f2.ttx.GSUB index 12fbc547..7d5772c3 100644 --- a/Tests/ttLib/tables/data/aots/gsub_context1_boundary_f2.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/gsub_context1_boundary_f2.ttx.GSUB @@ -33,7 +33,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"/> <Substitution in="g22" out="g62"/> @@ -50,7 +50,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> @@ -60,7 +60,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> @@ -70,7 +70,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> @@ -79,7 +79,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/ttLib/tables/data/aots/gsub_context1_expansion_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gsub_context1_expansion_f1.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gsub_context1_expansion_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gsub_context1_expansion_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gsub_context1_expansion_f1.ttx.GSUB b/Tests/ttLib/tables/data/aots/gsub_context1_expansion_f1.ttx.GSUB index be117290..e8dca8a8 100644 --- a/Tests/ttLib/tables/data/aots/gsub_context1_expansion_f1.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/gsub_context1_expansion_f1.ttx.GSUB @@ -33,7 +33,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"/> <Substitution in="g22" out="g62"/> @@ -50,7 +50,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> @@ -60,7 +60,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> @@ -70,7 +70,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> @@ -79,7 +79,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/ttLib/tables/data/aots/gsub_context1_lookupflag_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gsub_context1_lookupflag_f1.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gsub_context1_lookupflag_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gsub_context1_lookupflag_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gsub_context1_lookupflag_f1.ttx.GSUB b/Tests/ttLib/tables/data/aots/gsub_context1_lookupflag_f1.ttx.GSUB index 5f11e62e..579294fb 100644 --- a/Tests/ttLib/tables/data/aots/gsub_context1_lookupflag_f1.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/gsub_context1_lookupflag_f1.ttx.GSUB @@ -33,7 +33,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"/> <Substitution in="g22" out="g62"/> @@ -50,7 +50,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> @@ -60,7 +60,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> @@ -70,7 +70,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> @@ -79,7 +79,7 @@ <LookupFlag value="8"/><!-- ignoreMarks --> <!-- SubTableCount=1 --> <ContextSubst index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> </Coverage> <!-- SubRuleSetCount=1 --> diff --git a/Tests/ttLib/tables/data/aots/gsub_context1_lookupflag_f2.ttx.GDEF b/Tests/ttLib/tables/data/aots/gsub_context1_lookupflag_f2.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gsub_context1_lookupflag_f2.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gsub_context1_lookupflag_f2.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gsub_context1_lookupflag_f2.ttx.GSUB b/Tests/ttLib/tables/data/aots/gsub_context1_lookupflag_f2.ttx.GSUB index 6982c7d7..e583f6a1 100644 --- a/Tests/ttLib/tables/data/aots/gsub_context1_lookupflag_f2.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/gsub_context1_lookupflag_f2.ttx.GSUB @@ -33,7 +33,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"/> <Substitution in="g22" out="g62"/> @@ -50,7 +50,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> @@ -60,7 +60,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> @@ -70,7 +70,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> @@ -79,7 +79,7 @@ <LookupFlag value="8"/><!-- ignoreMarks --> <!-- SubTableCount=1 --> <ContextSubst index="0" Format="1"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> </Coverage> <!-- SubRuleSetCount=1 --> diff --git a/Tests/ttLib/tables/data/aots/gsub_context1_multiple_subrules_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gsub_context1_multiple_subrules_f1.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gsub_context1_multiple_subrules_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gsub_context1_multiple_subrules_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gsub_context1_multiple_subrules_f1.ttx.GSUB b/Tests/ttLib/tables/data/aots/gsub_context1_multiple_subrules_f1.ttx.GSUB index 324d2cfb..22023208 100644 --- a/Tests/ttLib/tables/data/aots/gsub_context1_multiple_subrules_f1.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/gsub_context1_multiple_subrules_f1.ttx.GSUB @@ -33,7 +33,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"/> <Substitution in="g22" out="g62"/> @@ -50,7 +50,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> @@ -60,7 +60,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> @@ -70,7 +70,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> @@ -79,7 +79,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/ttLib/tables/data/aots/gsub_context1_multiple_subrules_f2.ttx.GDEF b/Tests/ttLib/tables/data/aots/gsub_context1_multiple_subrules_f2.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gsub_context1_multiple_subrules_f2.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gsub_context1_multiple_subrules_f2.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gsub_context1_multiple_subrules_f2.ttx.GSUB b/Tests/ttLib/tables/data/aots/gsub_context1_multiple_subrules_f2.ttx.GSUB index 02b04f64..df568c31 100644 --- a/Tests/ttLib/tables/data/aots/gsub_context1_multiple_subrules_f2.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/gsub_context1_multiple_subrules_f2.ttx.GSUB @@ -33,7 +33,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"/> <Substitution in="g22" out="g62"/> @@ -50,7 +50,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> @@ -60,7 +60,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> @@ -70,7 +70,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> @@ -79,7 +79,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/ttLib/tables/data/aots/gsub_context1_next_glyph_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gsub_context1_next_glyph_f1.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gsub_context1_next_glyph_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gsub_context1_next_glyph_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gsub_context1_next_glyph_f1.ttx.GSUB b/Tests/ttLib/tables/data/aots/gsub_context1_next_glyph_f1.ttx.GSUB index 28a264f7..518e7549 100644 --- a/Tests/ttLib/tables/data/aots/gsub_context1_next_glyph_f1.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/gsub_context1_next_glyph_f1.ttx.GSUB @@ -33,7 +33,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"/> <Substitution in="g22" out="g62"/> @@ -50,7 +50,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> @@ -60,7 +60,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> @@ -70,7 +70,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> @@ -79,7 +79,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/ttLib/tables/data/aots/gsub_context1_simple_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gsub_context1_simple_f1.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gsub_context1_simple_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gsub_context1_simple_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gsub_context1_simple_f1.ttx.GSUB b/Tests/ttLib/tables/data/aots/gsub_context1_simple_f1.ttx.GSUB index 902fdb86..2906b061 100644 --- a/Tests/ttLib/tables/data/aots/gsub_context1_simple_f1.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/gsub_context1_simple_f1.ttx.GSUB @@ -33,7 +33,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"/> <Substitution in="g22" out="g62"/> @@ -50,7 +50,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> @@ -60,7 +60,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> @@ -70,7 +70,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> @@ -79,7 +79,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/ttLib/tables/data/aots/gsub_context1_simple_f2.ttx.GDEF b/Tests/ttLib/tables/data/aots/gsub_context1_simple_f2.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gsub_context1_simple_f2.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gsub_context1_simple_f2.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gsub_context1_simple_f2.ttx.GSUB b/Tests/ttLib/tables/data/aots/gsub_context1_simple_f2.ttx.GSUB index 20b5f8ff..554168b9 100644 --- a/Tests/ttLib/tables/data/aots/gsub_context1_simple_f2.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/gsub_context1_simple_f2.ttx.GSUB @@ -33,7 +33,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"/> <Substitution in="g22" out="g62"/> @@ -50,7 +50,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> @@ -60,7 +60,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> @@ -70,7 +70,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> @@ -79,7 +79,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/ttLib/tables/data/aots/gsub_context1_successive_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gsub_context1_successive_f1.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gsub_context1_successive_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gsub_context1_successive_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gsub_context1_successive_f1.ttx.GSUB b/Tests/ttLib/tables/data/aots/gsub_context1_successive_f1.ttx.GSUB index fae8018e..fc66abd5 100644 --- a/Tests/ttLib/tables/data/aots/gsub_context1_successive_f1.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/gsub_context1_successive_f1.ttx.GSUB @@ -33,7 +33,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"/> <Substitution in="g22" out="g62"/> @@ -50,7 +50,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> @@ -60,7 +60,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> @@ -70,7 +70,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> @@ -79,7 +79,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/ttLib/tables/data/aots/gsub_context2_boundary_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gsub_context2_boundary_f1.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gsub_context2_boundary_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gsub_context2_boundary_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gsub_context2_boundary_f1.ttx.GSUB b/Tests/ttLib/tables/data/aots/gsub_context2_boundary_f1.ttx.GSUB index f56bb802..e1e12f8d 100644 --- a/Tests/ttLib/tables/data/aots/gsub_context2_boundary_f1.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/gsub_context2_boundary_f1.ttx.GSUB @@ -33,7 +33,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"/> <Substitution in="g22" out="g62"/> @@ -50,7 +50,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> @@ -60,7 +60,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> @@ -70,7 +70,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> @@ -79,10 +79,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/ttLib/tables/data/aots/gsub_context2_boundary_f2.ttx.GDEF b/Tests/ttLib/tables/data/aots/gsub_context2_boundary_f2.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gsub_context2_boundary_f2.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gsub_context2_boundary_f2.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gsub_context2_boundary_f2.ttx.GSUB b/Tests/ttLib/tables/data/aots/gsub_context2_boundary_f2.ttx.GSUB index 450df064..d2598d95 100644 --- a/Tests/ttLib/tables/data/aots/gsub_context2_boundary_f2.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/gsub_context2_boundary_f2.ttx.GSUB @@ -33,7 +33,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"/> <Substitution in="g22" out="g62"/> @@ -50,7 +50,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> @@ -60,7 +60,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> @@ -70,7 +70,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> @@ -79,10 +79,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/ttLib/tables/data/aots/gsub_context2_classes_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gsub_context2_classes_f1.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gsub_context2_classes_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gsub_context2_classes_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gsub_context2_classes_f1.ttx.GSUB b/Tests/ttLib/tables/data/aots/gsub_context2_classes_f1.ttx.GSUB index aa906e69..394df78a 100644 --- a/Tests/ttLib/tables/data/aots/gsub_context2_classes_f1.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/gsub_context2_classes_f1.ttx.GSUB @@ -33,7 +33,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"/> <Substitution in="g22" out="g62"/> @@ -50,7 +50,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> @@ -60,7 +60,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> @@ -70,7 +70,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> @@ -79,11 +79,11 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <ContextSubst index="0" Format="2"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> </Coverage> - <ClassDef Format="2"> + <ClassDef> <ClassDef glyph="g20" class="1"/> <ClassDef glyph="g21" class="1"/> <ClassDef glyph="g22" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gsub_context2_classes_f2.ttx.GDEF b/Tests/ttLib/tables/data/aots/gsub_context2_classes_f2.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gsub_context2_classes_f2.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gsub_context2_classes_f2.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gsub_context2_classes_f2.ttx.GSUB b/Tests/ttLib/tables/data/aots/gsub_context2_classes_f2.ttx.GSUB index 067e839e..4de5bc62 100644 --- a/Tests/ttLib/tables/data/aots/gsub_context2_classes_f2.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/gsub_context2_classes_f2.ttx.GSUB @@ -33,7 +33,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"/> <Substitution in="g22" out="g62"/> @@ -50,7 +50,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> @@ -60,7 +60,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> @@ -70,7 +70,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> @@ -79,13 +79,13 @@ <LookupFlag value="0"/> <!-- SubTableCount=1 --> <ContextSubst index="0" Format="2"> - <Coverage Format="1"> + <Coverage> <Glyph value="g20"/> <Glyph value="g21"/> <Glyph value="g22"/> <Glyph value="g24"/> </Coverage> - <ClassDef Format="2"> + <ClassDef> <ClassDef glyph="g20" class="1"/> <ClassDef glyph="g21" class="1"/> <ClassDef glyph="g22" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gsub_context2_expansion_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gsub_context2_expansion_f1.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gsub_context2_expansion_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gsub_context2_expansion_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gsub_context2_expansion_f1.ttx.GSUB b/Tests/ttLib/tables/data/aots/gsub_context2_expansion_f1.ttx.GSUB index 04afe57a..5ab7d08e 100644 --- a/Tests/ttLib/tables/data/aots/gsub_context2_expansion_f1.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/gsub_context2_expansion_f1.ttx.GSUB @@ -33,7 +33,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"/> <Substitution in="g22" out="g62"/> @@ -50,7 +50,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> @@ -60,7 +60,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> @@ -70,7 +70,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> @@ -79,10 +79,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 glyph="g21" class="2"/> <ClassDef glyph="g22" class="3"/> diff --git a/Tests/ttLib/tables/data/aots/gsub_context2_lookupflag_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gsub_context2_lookupflag_f1.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gsub_context2_lookupflag_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gsub_context2_lookupflag_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gsub_context2_lookupflag_f1.ttx.GSUB b/Tests/ttLib/tables/data/aots/gsub_context2_lookupflag_f1.ttx.GSUB index 48a8ec1a..4a8d7493 100644 --- a/Tests/ttLib/tables/data/aots/gsub_context2_lookupflag_f1.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/gsub_context2_lookupflag_f1.ttx.GSUB @@ -33,7 +33,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"/> <Substitution in="g22" out="g62"/> @@ -50,7 +50,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> @@ -60,7 +60,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> @@ -70,7 +70,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> @@ -79,10 +79,10 @@ <LookupFlag value="8"/><!-- ignoreMarks --> <!-- 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 glyph="g21" class="2"/> <ClassDef glyph="g22" class="3"/> diff --git a/Tests/ttLib/tables/data/aots/gsub_context2_lookupflag_f2.ttx.GDEF b/Tests/ttLib/tables/data/aots/gsub_context2_lookupflag_f2.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gsub_context2_lookupflag_f2.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gsub_context2_lookupflag_f2.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gsub_context2_lookupflag_f2.ttx.GSUB b/Tests/ttLib/tables/data/aots/gsub_context2_lookupflag_f2.ttx.GSUB index 3d1fad8a..a672edf1 100644 --- a/Tests/ttLib/tables/data/aots/gsub_context2_lookupflag_f2.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/gsub_context2_lookupflag_f2.ttx.GSUB @@ -33,7 +33,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"/> <Substitution in="g22" out="g62"/> @@ -50,7 +50,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> @@ -60,7 +60,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> @@ -70,7 +70,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> @@ -79,10 +79,10 @@ <LookupFlag value="8"/><!-- ignoreMarks --> <!-- 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 glyph="g21" class="2"/> <ClassDef glyph="g22" class="3"/> diff --git a/Tests/ttLib/tables/data/aots/gsub_context2_multiple_subrules_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gsub_context2_multiple_subrules_f1.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gsub_context2_multiple_subrules_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gsub_context2_multiple_subrules_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gsub_context2_multiple_subrules_f1.ttx.GSUB b/Tests/ttLib/tables/data/aots/gsub_context2_multiple_subrules_f1.ttx.GSUB index 60cb81c2..07b5f5eb 100644 --- a/Tests/ttLib/tables/data/aots/gsub_context2_multiple_subrules_f1.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/gsub_context2_multiple_subrules_f1.ttx.GSUB @@ -33,7 +33,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"/> <Substitution in="g22" out="g62"/> @@ -50,7 +50,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> @@ -60,7 +60,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> @@ -70,7 +70,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> @@ -79,10 +79,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 glyph="g21" class="2"/> <ClassDef glyph="g22" class="3"/> diff --git a/Tests/ttLib/tables/data/aots/gsub_context2_multiple_subrules_f2.ttx.GDEF b/Tests/ttLib/tables/data/aots/gsub_context2_multiple_subrules_f2.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gsub_context2_multiple_subrules_f2.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gsub_context2_multiple_subrules_f2.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gsub_context2_multiple_subrules_f2.ttx.GSUB b/Tests/ttLib/tables/data/aots/gsub_context2_multiple_subrules_f2.ttx.GSUB index 3e0965cc..22527617 100644 --- a/Tests/ttLib/tables/data/aots/gsub_context2_multiple_subrules_f2.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/gsub_context2_multiple_subrules_f2.ttx.GSUB @@ -33,7 +33,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"/> <Substitution in="g22" out="g62"/> @@ -50,7 +50,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> @@ -60,7 +60,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> @@ -70,7 +70,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> @@ -79,10 +79,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 glyph="g21" class="2"/> <ClassDef glyph="g22" class="3"/> diff --git a/Tests/ttLib/tables/data/aots/gsub_context2_next_glyph_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gsub_context2_next_glyph_f1.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gsub_context2_next_glyph_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gsub_context2_next_glyph_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gsub_context2_next_glyph_f1.ttx.GSUB b/Tests/ttLib/tables/data/aots/gsub_context2_next_glyph_f1.ttx.GSUB index 79227dcf..b78220bd 100644 --- a/Tests/ttLib/tables/data/aots/gsub_context2_next_glyph_f1.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/gsub_context2_next_glyph_f1.ttx.GSUB @@ -33,7 +33,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"/> <Substitution in="g22" out="g62"/> @@ -50,7 +50,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> @@ -60,7 +60,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> @@ -70,7 +70,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> @@ -79,10 +79,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/ttLib/tables/data/aots/gsub_context2_simple_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gsub_context2_simple_f1.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gsub_context2_simple_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gsub_context2_simple_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gsub_context2_simple_f1.ttx.GSUB b/Tests/ttLib/tables/data/aots/gsub_context2_simple_f1.ttx.GSUB index e188ea97..35fff94c 100644 --- a/Tests/ttLib/tables/data/aots/gsub_context2_simple_f1.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/gsub_context2_simple_f1.ttx.GSUB @@ -33,7 +33,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"/> <Substitution in="g22" out="g62"/> @@ -50,7 +50,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> @@ -60,7 +60,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> @@ -70,7 +70,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> @@ -79,10 +79,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 glyph="g21" class="2"/> <ClassDef glyph="g22" class="3"/> diff --git a/Tests/ttLib/tables/data/aots/gsub_context2_simple_f2.ttx.GDEF b/Tests/ttLib/tables/data/aots/gsub_context2_simple_f2.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gsub_context2_simple_f2.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gsub_context2_simple_f2.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gsub_context2_simple_f2.ttx.GSUB b/Tests/ttLib/tables/data/aots/gsub_context2_simple_f2.ttx.GSUB index 1eeef694..28ab11ee 100644 --- a/Tests/ttLib/tables/data/aots/gsub_context2_simple_f2.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/gsub_context2_simple_f2.ttx.GSUB @@ -33,7 +33,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"/> <Substitution in="g22" out="g62"/> @@ -50,7 +50,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> @@ -60,7 +60,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> @@ -70,7 +70,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> @@ -79,10 +79,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/ttLib/tables/data/aots/gsub_context2_successive_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gsub_context2_successive_f1.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gsub_context2_successive_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gsub_context2_successive_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gsub_context2_successive_f1.ttx.GSUB b/Tests/ttLib/tables/data/aots/gsub_context2_successive_f1.ttx.GSUB index fb3a2f0d..a3642077 100644 --- a/Tests/ttLib/tables/data/aots/gsub_context2_successive_f1.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/gsub_context2_successive_f1.ttx.GSUB @@ -33,7 +33,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"/> <Substitution in="g22" out="g62"/> @@ -50,7 +50,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> @@ -60,7 +60,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> @@ -70,7 +70,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> @@ -79,10 +79,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 glyph="g21" class="2"/> <ClassDef glyph="g22" class="3"/> diff --git a/Tests/ttLib/tables/data/aots/gsub_context3_boundary_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gsub_context3_boundary_f1.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gsub_context3_boundary_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gsub_context3_boundary_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gsub_context3_boundary_f1.ttx.GSUB b/Tests/ttLib/tables/data/aots/gsub_context3_boundary_f1.ttx.GSUB index 4b5bedda..9a73fac0 100644 --- a/Tests/ttLib/tables/data/aots/gsub_context3_boundary_f1.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/gsub_context3_boundary_f1.ttx.GSUB @@ -33,7 +33,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"/> <Substitution in="g22" out="g62"/> @@ -50,7 +50,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> @@ -60,7 +60,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> @@ -70,7 +70,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> @@ -81,10 +81,10 @@ <ContextSubst index="0" Format="3"> <!-- GlyphCount=2 --> <!-- SubstCount=0 --> - <Coverage index="0" Format="1"> + <Coverage index="0"> <Glyph value="g20"/> </Coverage> - <Coverage index="1" Format="1"> + <Coverage index="1"> <Glyph value="g20"/> </Coverage> </ContextSubst> diff --git a/Tests/ttLib/tables/data/aots/gsub_context3_boundary_f2.ttx.GDEF b/Tests/ttLib/tables/data/aots/gsub_context3_boundary_f2.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gsub_context3_boundary_f2.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gsub_context3_boundary_f2.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gsub_context3_boundary_f2.ttx.GSUB b/Tests/ttLib/tables/data/aots/gsub_context3_boundary_f2.ttx.GSUB index ecc88ad9..d45e67b9 100644 --- a/Tests/ttLib/tables/data/aots/gsub_context3_boundary_f2.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/gsub_context3_boundary_f2.ttx.GSUB @@ -33,7 +33,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"/> <Substitution in="g22" out="g62"/> @@ -50,7 +50,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> @@ -60,7 +60,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> @@ -70,7 +70,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> @@ -81,7 +81,7 @@ <ContextSubst index="0" Format="3"> <!-- GlyphCount=1 --> <!-- SubstCount=1 --> - <Coverage index="0" Format="1"> + <Coverage index="0"> <Glyph value="g20"/> </Coverage> <SubstLookupRecord index="0"> diff --git a/Tests/ttLib/tables/data/aots/gsub_context3_lookupflag_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gsub_context3_lookupflag_f1.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gsub_context3_lookupflag_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gsub_context3_lookupflag_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gsub_context3_lookupflag_f1.ttx.GSUB b/Tests/ttLib/tables/data/aots/gsub_context3_lookupflag_f1.ttx.GSUB index 4882e5e1..90b53f45 100644 --- a/Tests/ttLib/tables/data/aots/gsub_context3_lookupflag_f1.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/gsub_context3_lookupflag_f1.ttx.GSUB @@ -33,7 +33,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"/> <Substitution in="g22" out="g62"/> @@ -50,7 +50,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> @@ -60,7 +60,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> @@ -70,7 +70,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> @@ -81,13 +81,13 @@ <ContextSubst index="0" Format="3"> <!-- GlyphCount=3 --> <!-- SubstCount=3 --> - <Coverage index="0" Format="1"> + <Coverage index="0"> <Glyph value="g20"/> </Coverage> - <Coverage index="1" Format="1"> + <Coverage index="1"> <Glyph value="g21"/> </Coverage> - <Coverage index="2" Format="1"> + <Coverage index="2"> <Glyph value="g22"/> </Coverage> <SubstLookupRecord index="0"> diff --git a/Tests/ttLib/tables/data/aots/gsub_context3_lookupflag_f2.ttx.GDEF b/Tests/ttLib/tables/data/aots/gsub_context3_lookupflag_f2.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gsub_context3_lookupflag_f2.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gsub_context3_lookupflag_f2.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gsub_context3_lookupflag_f2.ttx.GSUB b/Tests/ttLib/tables/data/aots/gsub_context3_lookupflag_f2.ttx.GSUB index ff671b0f..a82c3c0d 100644 --- a/Tests/ttLib/tables/data/aots/gsub_context3_lookupflag_f2.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/gsub_context3_lookupflag_f2.ttx.GSUB @@ -33,7 +33,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"/> <Substitution in="g22" out="g62"/> @@ -50,7 +50,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> @@ -60,7 +60,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> @@ -70,7 +70,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> @@ -81,13 +81,13 @@ <ContextSubst index="0" Format="3"> <!-- GlyphCount=3 --> <!-- SubstCount=1 --> - <Coverage index="0" Format="1"> + <Coverage index="0"> <Glyph value="g20"/> </Coverage> - <Coverage index="1" Format="1"> + <Coverage index="1"> <Glyph value="g21"/> </Coverage> - <Coverage index="2" Format="1"> + <Coverage index="2"> <Glyph value="g22"/> </Coverage> <SubstLookupRecord index="0"> diff --git a/Tests/ttLib/tables/data/aots/gsub_context3_next_glyph_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gsub_context3_next_glyph_f1.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gsub_context3_next_glyph_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gsub_context3_next_glyph_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gsub_context3_next_glyph_f1.ttx.GSUB b/Tests/ttLib/tables/data/aots/gsub_context3_next_glyph_f1.ttx.GSUB index 5c7943d9..a4f5addc 100644 --- a/Tests/ttLib/tables/data/aots/gsub_context3_next_glyph_f1.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/gsub_context3_next_glyph_f1.ttx.GSUB @@ -33,7 +33,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"/> <Substitution in="g22" out="g62"/> @@ -50,7 +50,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> @@ -60,7 +60,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> @@ -70,7 +70,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> @@ -81,10 +81,10 @@ <ContextSubst index="0" Format="3"> <!-- GlyphCount=2 --> <!-- SubstCount=1 --> - <Coverage index="0" Format="1"> + <Coverage index="0"> <Glyph value="g20"/> </Coverage> - <Coverage index="1" Format="1"> + <Coverage index="1"> <Glyph value="g20"/> </Coverage> <SubstLookupRecord index="0"> diff --git a/Tests/ttLib/tables/data/aots/gsub_context3_simple_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gsub_context3_simple_f1.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gsub_context3_simple_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gsub_context3_simple_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gsub_context3_simple_f1.ttx.GSUB b/Tests/ttLib/tables/data/aots/gsub_context3_simple_f1.ttx.GSUB index 3008fffa..15d6c087 100644 --- a/Tests/ttLib/tables/data/aots/gsub_context3_simple_f1.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/gsub_context3_simple_f1.ttx.GSUB @@ -33,7 +33,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"/> <Substitution in="g22" out="g62"/> @@ -50,7 +50,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> @@ -60,7 +60,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> @@ -70,7 +70,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> @@ -81,13 +81,13 @@ <ContextSubst index="0" Format="3"> <!-- GlyphCount=3 --> <!-- SubstCount=3 --> - <Coverage index="0" Format="1"> + <Coverage index="0"> <Glyph value="g20"/> </Coverage> - <Coverage index="1" Format="1"> + <Coverage index="1"> <Glyph value="g21"/> </Coverage> - <Coverage index="2" Format="1"> + <Coverage index="2"> <Glyph value="g22"/> </Coverage> <SubstLookupRecord index="0"> diff --git a/Tests/ttLib/tables/data/aots/gsub_context3_successive_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/gsub_context3_successive_f1.ttx.GDEF index dba55502..b5c2ac3a 100644 --- a/Tests/ttLib/tables/data/aots/gsub_context3_successive_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/gsub_context3_successive_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g80" class="1"/> <ClassDef glyph="g81" class="1"/> <ClassDef glyph="g82" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/gsub_context3_successive_f1.ttx.GSUB b/Tests/ttLib/tables/data/aots/gsub_context3_successive_f1.ttx.GSUB index b5c336a2..6558c692 100644 --- a/Tests/ttLib/tables/data/aots/gsub_context3_successive_f1.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/gsub_context3_successive_f1.ttx.GSUB @@ -33,7 +33,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"/> <Substitution in="g22" out="g62"/> @@ -50,7 +50,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> @@ -60,7 +60,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> @@ -70,7 +70,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> @@ -81,16 +81,16 @@ <ContextSubst index="0" Format="3"> <!-- GlyphCount=4 --> <!-- SubstCount=2 --> - <Coverage index="0" Format="1"> + <Coverage index="0"> <Glyph value="g20"/> </Coverage> - <Coverage index="1" Format="1"> + <Coverage index="1"> <Glyph value="g21"/> </Coverage> - <Coverage index="2" Format="1"> + <Coverage index="2"> <Glyph value="g22"/> </Coverage> - <Coverage index="3" Format="1"> + <Coverage index="3"> <Glyph value="g23"/> </Coverage> <SubstLookupRecord index="0"> diff --git a/Tests/ttLib/tables/data/aots/lookupflag_ignore_attach_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/lookupflag_ignore_attach_f1.ttx.GDEF index 802351a4..736e2d8e 100644 --- a/Tests/ttLib/tables/data/aots/lookupflag_ignore_attach_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/lookupflag_ignore_attach_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g10" class="1"/> <ClassDef glyph="g11" class="1"/> <ClassDef glyph="g12" class="1"/> @@ -21,7 +21,7 @@ <ClassDef glyph="g28" class="3"/> <ClassDef glyph="g29" class="3"/> </GlyphClassDef> - <MarkAttachClassDef Format="2"> + <MarkAttachClassDef> <ClassDef glyph="g20" class="1"/> <ClassDef glyph="g21" class="1"/> <ClassDef glyph="g22" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/lookupflag_ignore_attach_f1.ttx.GSUB b/Tests/ttLib/tables/data/aots/lookupflag_ignore_attach_f1.ttx.GSUB index 874ba00b..42876ead 100644 --- a/Tests/ttLib/tables/data/aots/lookupflag_ignore_attach_f1.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/lookupflag_ignore_attach_f1.ttx.GSUB @@ -33,7 +33,7 @@ <LookupType value="4"/> <LookupFlag value="512"/><!-- markAttachmentType[2] --> <!-- SubTableCount=1 --> - <LigatureSubst index="0" Format="1"> + <LigatureSubst index="0"> <LigatureSet glyph="g11"> <Ligature components="g13,g26" glyph="g15"/> </LigatureSet> diff --git a/Tests/ttLib/tables/data/aots/lookupflag_ignore_base_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/lookupflag_ignore_base_f1.ttx.GDEF index 2b0a6861..c6abc878 100644 --- a/Tests/ttLib/tables/data/aots/lookupflag_ignore_base_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/lookupflag_ignore_base_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g24" class="1"/> <ClassDef glyph="g25" class="1"/> </GlyphClassDef> diff --git a/Tests/ttLib/tables/data/aots/lookupflag_ignore_base_f1.ttx.GSUB b/Tests/ttLib/tables/data/aots/lookupflag_ignore_base_f1.ttx.GSUB index f485610c..7dc3472e 100644 --- a/Tests/ttLib/tables/data/aots/lookupflag_ignore_base_f1.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/lookupflag_ignore_base_f1.ttx.GSUB @@ -33,7 +33,7 @@ <LookupType value="4"/> <LookupFlag value="2"/><!-- ignoreBaseGlyphs --> <!-- SubTableCount=1 --> - <LigatureSubst index="0" Format="1"> + <LigatureSubst index="0"> <LigatureSet glyph="g18"> <Ligature components="g19,g20" glyph="g23"/> </LigatureSet> diff --git a/Tests/ttLib/tables/data/aots/lookupflag_ignore_combination_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/lookupflag_ignore_combination_f1.ttx.GDEF index b67d75e7..e81490b5 100644 --- a/Tests/ttLib/tables/data/aots/lookupflag_ignore_combination_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/lookupflag_ignore_combination_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g24" class="1"/> <ClassDef glyph="g25" class="1"/> <ClassDef glyph="g26" class="1"/> @@ -14,7 +14,7 @@ <ClassDef glyph="g31" class="3"/> <ClassDef glyph="g32" class="3"/> </GlyphClassDef> - <MarkAttachClassDef Format="2"> + <MarkAttachClassDef> <ClassDef glyph="g25" class="1"/> <ClassDef glyph="g26" class="2"/> <ClassDef glyph="g28" class="1"/> diff --git a/Tests/ttLib/tables/data/aots/lookupflag_ignore_combination_f1.ttx.GSUB b/Tests/ttLib/tables/data/aots/lookupflag_ignore_combination_f1.ttx.GSUB index e257bd76..ffdc2aea 100644 --- a/Tests/ttLib/tables/data/aots/lookupflag_ignore_combination_f1.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/lookupflag_ignore_combination_f1.ttx.GSUB @@ -33,7 +33,7 @@ <LookupType value="4"/> <LookupFlag value="514"/><!-- ignoreBaseGlyphs markAttachmentType[2] --> <!-- SubTableCount=1 --> - <LigatureSubst index="0" Format="1"> + <LigatureSubst index="0"> <LigatureSet glyph="g18"> <Ligature components="g19,g20" glyph="g23"/> </LigatureSet> diff --git a/Tests/ttLib/tables/data/aots/lookupflag_ignore_ligatures_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/lookupflag_ignore_ligatures_f1.ttx.GDEF index 19aa7aa0..b9144314 100644 --- a/Tests/ttLib/tables/data/aots/lookupflag_ignore_ligatures_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/lookupflag_ignore_ligatures_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g24" class="1"/> <ClassDef glyph="g25" class="1"/> <ClassDef glyph="g26" class="2"/> diff --git a/Tests/ttLib/tables/data/aots/lookupflag_ignore_ligatures_f1.ttx.GSUB b/Tests/ttLib/tables/data/aots/lookupflag_ignore_ligatures_f1.ttx.GSUB index d270f3c6..db7fcc0c 100644 --- a/Tests/ttLib/tables/data/aots/lookupflag_ignore_ligatures_f1.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/lookupflag_ignore_ligatures_f1.ttx.GSUB @@ -33,7 +33,7 @@ <LookupType value="4"/> <LookupFlag value="4"/><!-- ignoreLigatures --> <!-- SubTableCount=1 --> - <LigatureSubst index="0" Format="1"> + <LigatureSubst index="0"> <LigatureSet glyph="g18"> <Ligature components="g19,g20" glyph="g23"/> </LigatureSet> diff --git a/Tests/ttLib/tables/data/aots/lookupflag_ignore_marks_f1.ttx.GDEF b/Tests/ttLib/tables/data/aots/lookupflag_ignore_marks_f1.ttx.GDEF index 19aa7aa0..b9144314 100644 --- a/Tests/ttLib/tables/data/aots/lookupflag_ignore_marks_f1.ttx.GDEF +++ b/Tests/ttLib/tables/data/aots/lookupflag_ignore_marks_f1.ttx.GDEF @@ -3,7 +3,7 @@ <GDEF> <Version value="0x00010000"/> - <GlyphClassDef Format="2"> + <GlyphClassDef> <ClassDef glyph="g24" class="1"/> <ClassDef glyph="g25" class="1"/> <ClassDef glyph="g26" class="2"/> diff --git a/Tests/ttLib/tables/data/aots/lookupflag_ignore_marks_f1.ttx.GSUB b/Tests/ttLib/tables/data/aots/lookupflag_ignore_marks_f1.ttx.GSUB index 3712c066..b3fd500a 100644 --- a/Tests/ttLib/tables/data/aots/lookupflag_ignore_marks_f1.ttx.GSUB +++ b/Tests/ttLib/tables/data/aots/lookupflag_ignore_marks_f1.ttx.GSUB @@ -33,7 +33,7 @@ <LookupType value="4"/> <LookupFlag value="8"/><!-- ignoreMarks --> <!-- SubTableCount=1 --> - <LigatureSubst index="0" Format="1"> + <LigatureSubst index="0"> <LigatureSet glyph="g18"> <Ligature components="g19,g20" glyph="g23"/> </LigatureSet> |