Merge pull request #2238 from fonttools/no-unused-Format

Remove .Format from Coverage, ClassDef, SingleSubst, LigatureSubst, AlternateSubst
2021-03-24 07:59:13 -07:00 · 2021-03-24 07:59:13 -07:00 · 7297659c0b
commit 7297659c0b
parent 2089d05126 6243a24a09
457 changed files with 1382 additions and 1389 deletions
--- a/Lib/fontTools/ttLib/tables/otBase.py
+++ b/Lib/fontTools/ttLib/tables/otBase.py
@ -654,9 +654,15 @@ class BaseTable(object):

 	def compile(self, writer, font):
 		self.ensureDecompiled()
+		# TODO Following hack to be removed by rewriting how FormatSwitching tables
+		# are handled.
+		# https://github.com/fonttools/fonttools/pull/2238#issuecomment-805192631
 		if hasattr(self, 'preWrite'):
+			deleteFormat = not hasattr(self, 'Format')
 			table = self.preWrite(font)
+			deleteFormat = deleteFormat and hasattr(self, 'Format')
 		else:
+			deleteFormat = False
 			table = self.__dict__.copy()

 		# some count references may have been initialized in a custom preWrite; we set
@ -740,6 +746,9 @@ class BaseTable(object):
 				if conv.isPropagated:
 					writer[conv.name] = value

+		if deleteFormat:
+			del self.Format
+
 	def readFormat(self, reader):
 		pass

--- a/Lib/fontTools/ttLib/tables/otTables.py
+++ b/Lib/fontTools/ttLib/tables/otTables.py
@ -558,6 +558,7 @@ class Coverage(FormatSwitchingBaseTable):
 		else:
 			self.glyphs = []
 			log.warning("Unknown Coverage format: %s", self.Format)
+		del self.Format # Don't need this anymore

 	def preWrite(self, font):
 		glyphs = getattr(self, "glyphs", None)
@ -739,6 +740,7 @@ class SingleSubst(FormatSwitchingBaseTable):
 		else:
 			assert 0, "unknown format: %s" % self.Format
 		self.mapping = mapping
+		del self.Format # Don't need this anymore

 	def preWrite(self, font):
 		mapping = getattr(self, "mapping", None)
@ -809,6 +811,7 @@ class MultipleSubst(FormatSwitchingBaseTable):
 		else:
 			assert 0, "unknown format: %s" % self.Format
 		self.mapping = mapping
+		del self.Format # Don't need this anymore

 	def preWrite(self, font):
 		mapping = getattr(self, "mapping", None)
@ -927,6 +930,7 @@ class ClassDef(FormatSwitchingBaseTable):
 		else:
 			log.warning("Unknown ClassDef format: %s", self.Format)
 		self.classDefs = classDefs
+		del self.Format # Don't need this anymore

 	def _getClassRanges(self, font):
 		classDefs = getattr(self, "classDefs", None)
@ -1015,6 +1019,7 @@ class AlternateSubst(FormatSwitchingBaseTable):
 		else:
 			assert 0, "unknown format: %s" % self.Format
 		self.alternates = alternates
+		del self.Format # Don't need this anymore

 	def preWrite(self, font):
 		self.Format = 1
@ -1085,6 +1090,7 @@ class LigatureSubst(FormatSwitchingBaseTable):
 		else:
 			assert 0, "unknown format: %s" % self.Format
 		self.ligatures = ligatures
+		del self.Format # Don't need this anymore

 	def preWrite(self, font):
 		self.Format = 1
@ -1681,7 +1687,6 @@ def splitMarkBasePos(oldSubTable, newSubTable, overflowRecord):

 	oldSubTable.MarkCoverage.glyphs = oldMarkCoverage
 	newSubTable.MarkCoverage = oldSubTable.MarkCoverage.__class__()
-	newSubTable.MarkCoverage.Format = oldSubTable.MarkCoverage.Format
 	newSubTable.MarkCoverage.glyphs = newMarkCoverage

 	# share the same BaseCoverage in both halves
--- a/Lib/fontTools/varLib/merger.py
+++ b/Lib/fontTools/varLib/merger.py
@ -409,28 +409,12 @@ def _ClassDef_merge_classify(lst, allGlyphses=None):

 	return self, classes

-# It's stupid that we need to do this here.  Just need to, to match test
-# expecatation results, since ttx prints out format of ClassDef (and Coverage)
-# even though it should not.
-def _ClassDef_calculate_Format(self, font):
-	fmt = 2
-	ranges = self._getClassRanges(font)
-	if ranges:
-		startGlyph = ranges[0][1]
-		endGlyph = ranges[-1][3]
-		glyphCount = endGlyph - startGlyph + 1
-		if len(ranges) * 3 >= glyphCount + 1:
-			# Format 1 is more compact
-			fmt = 1
-	self.Format = fmt
-
 def _PairPosFormat2_align_matrices(self, lst, font, transparent=False):

 	matrices = [l.Class1Record for l in lst]

 	# Align first classes
 	self.ClassDef1, classes = _ClassDef_merge_classify([l.ClassDef1 for l in lst], [l.Coverage.glyphs for l in lst])
-	_ClassDef_calculate_Format(self.ClassDef1, font)
 	self.Class1Count = len(classes)
 	new_matrices = []
 	for l,matrix in zip(lst, matrices):
@ -469,7 +453,6 @@ def _PairPosFormat2_align_matrices(self, lst, font, transparent=False):

 	# Align second classes
 	self.ClassDef2, classes = _ClassDef_merge_classify([l.ClassDef2 for l in lst])
-	_ClassDef_calculate_Format(self.ClassDef2, font)
 	self.Class2Count = len(classes)
 	new_matrices = []
 	for l,matrix in zip(lst, matrices):
@ -676,7 +659,6 @@ def merge(merger, self, lst):
 def _PairSet_flatten(lst, font):
 	self = ot.PairSet()
 	self.Coverage = ot.Coverage()
-	self.Coverage.Format = 1

 	# Align them
 	glyphs, padded = _merge_GlyphOrders(font,
@ -702,7 +684,6 @@ def _Lookup_PairPosFormat1_subtables_flatten(lst, font):
 	self = ot.PairPos()
 	self.Format = 1
 	self.Coverage = ot.Coverage()
-	self.Coverage.Format = 1
 	self.ValueFormat1 = reduce(int.__or__, [l.ValueFormat1 for l in lst], 0)
 	self.ValueFormat2 = reduce(int.__or__, [l.ValueFormat2 for l in lst], 0)

@ -723,7 +704,6 @@ def _Lookup_PairPosFormat2_subtables_flatten(lst, font):
 	self = ot.PairPos()
 	self.Format = 2
 	self.Coverage = ot.Coverage()
-	self.Coverage.Format = 1
 	self.ValueFormat1 = reduce(int.__or__, [l.ValueFormat1 for l in lst], 0)
 	self.ValueFormat2 = reduce(int.__or__, [l.ValueFormat2 for l in lst], 0)

--- a/Tests/cffLib/data/TestCFF2Widths.ttx
+++ b/Tests/cffLib/data/TestCFF2Widths.ttx
@ -375,7 +375,7 @@

  <GDEF>
    <Version value="0x00010000"/>
-    <GlyphClassDef Format="1">
+    <GlyphClassDef>
      <ClassDef glyph="A" class="1"/>
      <ClassDef glyph="B" class="1"/>
    </GlyphClassDef>
--- a/Tests/fontBuilder/data/test.otf.ttx
+++ b/Tests/fontBuilder/data/test.otf.ttx
@ -266,7 +266,7 @@
        <LookupFlag value="0"/>
        <!-- SubTableCount=1 -->
        <PairPos index="0" Format="1">
-          <Coverage Format="1">
+          <Coverage>
            <Glyph value="A"/>
          </Coverage>
          <ValueFormat1 value="4"/>
--- a/Tests/fontBuilder/data/test.ttf.ttx
+++ b/Tests/fontBuilder/data/test.ttf.ttx
@ -289,7 +289,7 @@
        <LookupType value="1"/>
        <LookupFlag value="0"/>
        <!-- SubTableCount=1 -->
-        <SingleSubst index="0" Format="1">
+        <SingleSubst index="0">
          <Substitution in="A" out="a"/>
        </SingleSubst>
      </Lookup>
--- a/Tests/fontBuilder/data/test_var.ttf.ttx
+++ b/Tests/fontBuilder/data/test_var.ttf.ttx
@ -300,7 +300,7 @@
        <LookupType value="1"/>
        <LookupFlag value="0"/>
        <!-- SubTableCount=1 -->
-        <SingleSubst index="0" Format="1">
+        <SingleSubst index="0">
          <Substitution in="A" out="a"/>
        </SingleSubst>
      </Lookup>
--- a/Tests/mtiLib/data/featurename-backward.ttx.GSUB
+++ b/Tests/mtiLib/data/featurename-backward.ttx.GSUB
@ -51,7 +51,7 @@
      <LookupType value="1"/>
      <LookupFlag value="0"/>
      <!-- SubTableCount=1 -->
-      <SingleSubst index="0" Format="1">
+      <SingleSubst index="0">
        <Substitution in="a" out="b"/>
      </SingleSubst>
    </Lookup>
--- a/Tests/mtiLib/data/featurename-forward.ttx.GSUB
+++ b/Tests/mtiLib/data/featurename-forward.ttx.GSUB
@ -51,7 +51,7 @@
      <LookupType value="1"/>
      <LookupFlag value="0"/>
      <!-- SubTableCount=1 -->
-      <SingleSubst index="0" Format="1">
+      <SingleSubst index="0">
        <Substitution in="a" out="b"/>
      </SingleSubst>
    </Lookup>
--- a/Tests/mtiLib/data/lookupnames-backward.ttx.GSUB
+++ b/Tests/mtiLib/data/lookupnames-backward.ttx.GSUB
@ -39,7 +39,7 @@
      <LookupType value="1"/>
      <LookupFlag value="0"/>
      <!-- SubTableCount=1 -->
-      <SingleSubst index="0" Format="1">
+      <SingleSubst index="0">
        <Substitution in="uuvowelsignkannada" out="uuvowelsignaltkannada"/>
        <Substitution in="uvowelsignkannada" out="uvowelsignaltkannada"/>
      </SingleSubst>
@ -49,11 +49,11 @@
      <LookupFlag value="0"/>
      <!-- SubTableCount=1 -->
      <ChainContextSubst index="0" Format="2">
-        <Coverage Format="1">
+        <Coverage>
          <Glyph value="uvowelsignkannada"/>
          <Glyph value="uuvowelsignkannada"/>
        </Coverage>
-        <BacktrackClassDef Format="2">
+        <BacktrackClassDef>
          <ClassDef glyph="pakannada" class="1"/>
          <ClassDef glyph="pevowelkannada" class="1"/>
          <ClassDef glyph="phakannada" class="1"/>
@ -61,7 +61,7 @@
          <ClassDef glyph="vakannada" class="1"/>
          <ClassDef glyph="vevowelkannada" class="1"/>
        </BacktrackClassDef>
-        <InputClassDef Format="1">
+        <InputClassDef>
          <ClassDef glyph="uuvowelsignkannada" class="1"/>
          <ClassDef glyph="uvowelsignkannada" class="1"/>
        </InputClassDef>
--- a/Tests/mtiLib/data/lookupnames-forward.ttx.GSUB
+++ b/Tests/mtiLib/data/lookupnames-forward.ttx.GSUB
@ -40,11 +40,11 @@
      <LookupFlag value="0"/>
      <!-- SubTableCount=1 -->
      <ChainContextSubst index="0" Format="2">
-        <Coverage Format="1">
+        <Coverage>
          <Glyph value="uvowelsignkannada"/>
          <Glyph value="uuvowelsignkannada"/>
        </Coverage>
-        <BacktrackClassDef Format="2">
+        <BacktrackClassDef>
          <ClassDef glyph="pakannada" class="1"/>
          <ClassDef glyph="pevowelkannada" class="1"/>
          <ClassDef glyph="phakannada" class="1"/>
@ -52,7 +52,7 @@
          <ClassDef glyph="vakannada" class="1"/>
          <ClassDef glyph="vevowelkannada" class="1"/>
        </BacktrackClassDef>
-        <InputClassDef Format="1">
+        <InputClassDef>
          <ClassDef glyph="uuvowelsignkannada" class="1"/>
          <ClassDef glyph="uvowelsignkannada" class="1"/>
        </InputClassDef>
@ -78,7 +78,7 @@
      <LookupType value="1"/>
      <LookupFlag value="0"/>
      <!-- SubTableCount=1 -->
-      <SingleSubst index="0" Format="1">
+      <SingleSubst index="0">
        <Substitution in="uuvowelsignkannada" out="uuvowelsignaltkannada"/>
        <Substitution in="uvowelsignkannada" out="uvowelsignaltkannada"/>
      </SingleSubst>
--- a/Tests/mtiLib/data/mixed-toplevels.ttx.GSUB
+++ b/Tests/mtiLib/data/mixed-toplevels.ttx.GSUB
@ -40,11 +40,11 @@
      <LookupFlag value="0"/>
      <!-- SubTableCount=1 -->
      <ChainContextSubst index="0" Format="2">
-        <Coverage Format="1">
+        <Coverage>
          <Glyph value="uvowelsignkannada"/>
          <Glyph value="uuvowelsignkannada"/>
        </Coverage>
-        <BacktrackClassDef Format="2">
+        <BacktrackClassDef>
          <ClassDef glyph="pakannada" class="1"/>
          <ClassDef glyph="pevowelkannada" class="1"/>
          <ClassDef glyph="phakannada" class="1"/>
@ -52,7 +52,7 @@
          <ClassDef glyph="vakannada" class="1"/>
          <ClassDef glyph="vevowelkannada" class="1"/>
        </BacktrackClassDef>
-        <InputClassDef Format="1">
+        <InputClassDef>
          <ClassDef glyph="uuvowelsignkannada" class="1"/>
          <ClassDef glyph="uvowelsignkannada" class="1"/>
        </InputClassDef>
@ -78,7 +78,7 @@
      <LookupType value="1"/>
      <LookupFlag value="0"/>
      <!-- SubTableCount=1 -->
-      <SingleSubst index="0" Format="1">
+      <SingleSubst index="0">
        <Substitution in="uuvowelsignkannada" out="uuvowelsignaltkannada"/>
        <Substitution in="uvowelsignkannada" out="uvowelsignaltkannada"/>
      </SingleSubst>
--- a/Tests/mtiLib/data/mti/chained-glyph.ttx.GPOS
+++ b/Tests/mtiLib/data/mti/chained-glyph.ttx.GPOS
@ -8,7 +8,7 @@
      <LookupFlag value="512"/><!-- markAttachmentType[2] -->
      <!-- SubTableCount=1 -->
      <ChainContextPos index="0" Format="1">
-        <Coverage Format="1">
+        <Coverage>
          <Glyph value="uuvowelsignsinh"/>
          <Glyph value="uvowelsignsinh"/>
        </Coverage>
--- a/Tests/mtiLib/data/mti/chained-glyph.ttx.GSUB
+++ b/Tests/mtiLib/data/mti/chained-glyph.ttx.GSUB
@ -8,7 +8,7 @@
      <LookupFlag value="512"/><!-- markAttachmentType[2] -->
      <!-- SubTableCount=1 -->
      <ChainContextSubst index="0" Format="1">
-        <Coverage Format="1">
+        <Coverage>
          <Glyph value="uuvowelsignsinh"/>
          <Glyph value="uvowelsignsinh"/>
        </Coverage>
--- a/Tests/mtiLib/data/mti/chainedclass.ttx.GSUB
+++ b/Tests/mtiLib/data/mti/chainedclass.ttx.GSUB
@ -8,11 +8,11 @@
      <LookupFlag value="0"/>
      <!-- SubTableCount=1 -->
      <ChainContextSubst index="0" Format="2">
-        <Coverage Format="1">
+        <Coverage>
          <Glyph value="uvowelsignkannada"/>
          <Glyph value="uuvowelsignkannada"/>
        </Coverage>
-        <BacktrackClassDef Format="2">
+        <BacktrackClassDef>
          <ClassDef glyph="pakannada" class="1"/>
          <ClassDef glyph="pevowelkannada" class="1"/>
          <ClassDef glyph="phakannada" class="1"/>
@ -20,7 +20,7 @@
          <ClassDef glyph="vakannada" class="1"/>
          <ClassDef glyph="vevowelkannada" class="1"/>
        </BacktrackClassDef>
-        <InputClassDef Format="1">
+        <InputClassDef>
          <ClassDef glyph="uuvowelsignkannada" class="1"/>
          <ClassDef glyph="uvowelsignkannada" class="1"/>
        </InputClassDef>
@ -46,7 +46,7 @@
      <LookupType value="1"/>
      <LookupFlag value="0"/>
      <!-- SubTableCount=1 -->
-      <SingleSubst index="0" Format="1">
+      <SingleSubst index="0">
        <Substitution in="uuvowelsignkannada" out="uuvowelsignaltkannada"/>
        <Substitution in="uvowelsignkannada" out="uvowelsignaltkannada"/>
      </SingleSubst>
--- a/Tests/mtiLib/data/mti/chainedcoverage.ttx.GSUB
+++ b/Tests/mtiLib/data/mti/chainedcoverage.ttx.GSUB
@ -9,7 +9,7 @@
      <!-- SubTableCount=1 -->
      <ChainContextSubst index="0" Format="3">
        <!-- BacktrackGlyphCount=1 -->
-        <BacktrackCoverage index="0" Format="2">
+        <BacktrackCoverage index="0">
          <Glyph value="zero"/>
          <Glyph value="one"/>
          <Glyph value="two"/>
@ -22,11 +22,11 @@
          <Glyph value="nine"/>
        </BacktrackCoverage>
        <!-- InputGlyphCount=1 -->
-        <InputCoverage index="0" Format="1">
+        <InputCoverage index="0">
          <Glyph value="slash"/>
        </InputCoverage>
        <!-- LookAheadGlyphCount=1 -->
-        <LookAheadCoverage index="0" Format="2">
+        <LookAheadCoverage index="0">
          <Glyph value="zero"/>
          <Glyph value="one"/>
          <Glyph value="two"/>
@ -49,7 +49,7 @@
      <LookupType value="1"/>
      <LookupFlag value="0"/>
      <!-- SubTableCount=1 -->
-      <SingleSubst index="0" Format="1">
+      <SingleSubst index="0">
        <Substitution in="slash" out="fraction"/>
      </SingleSubst>
    </Lookup>
--- a/Tests/mtiLib/data/mti/gdefattach.ttx.GDEF
+++ b/Tests/mtiLib/data/mti/gdefattach.ttx.GDEF
@ -2,7 +2,7 @@
 <GDEF>
  <Version value="0x00010000"/>
  <AttachList>
-    <Coverage Format="1">
+    <Coverage>
      <Glyph value="A"/>
      <Glyph value="B"/>
    </Coverage>
--- a/Tests/mtiLib/data/mti/gdefclasses.ttx.GDEF
+++ b/Tests/mtiLib/data/mti/gdefclasses.ttx.GDEF
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <GDEF>
  <Version value="0x00010000"/>
-  <GlyphClassDef Format="1">
+  <GlyphClassDef>
    <ClassDef glyph="A" class="1"/>
    <ClassDef glyph="C" class="1"/>
    <ClassDef glyph="acute" class="3"/>
--- a/Tests/mtiLib/data/mti/gdefligcaret.ttx.GDEF
+++ b/Tests/mtiLib/data/mti/gdefligcaret.ttx.GDEF
@ -2,7 +2,7 @@
 <GDEF>
  <Version value="0x00010000"/>
  <LigCaretList>
-    <Coverage Format="1">
+    <Coverage>
      <Glyph value="uniFB01"/>
      <Glyph value="ffi"/>
    </Coverage>
--- a/Tests/mtiLib/data/mti/gdefmarkattach.ttx.GDEF
+++ b/Tests/mtiLib/data/mti/gdefmarkattach.ttx.GDEF
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <GDEF>
  <Version value="0x00010000"/>
-  <MarkAttachClassDef Format="1">
+  <MarkAttachClassDef>
    <ClassDef glyph="breve" class="1"/>
    <ClassDef glyph="commaacent" class="2"/>
    <ClassDef glyph="dotbelow" class="2"/>
--- a/Tests/mtiLib/data/mti/gdefmarkfilter.ttx.GDEF
+++ b/Tests/mtiLib/data/mti/gdefmarkfilter.ttx.GDEF
@ -5,17 +5,17 @@
    <MarkSetTableFormat value="1"/>
    <!-- MarkSetCount=4 -->
    <Coverage index="0" empty="1"/>
-    <Coverage index="1" Format="1">
+    <Coverage index="1">
      <Glyph value="breve"/>
      <Glyph value="acute"/>
      <Glyph value="dotabove"/>
    </Coverage>
-    <Coverage index="2" Format="1">
+    <Coverage index="2">
      <Glyph value="dotbelow"/>
      <Glyph value="cedilla"/>
      <Glyph value="commaaccent"/>
    </Coverage>
-    <Coverage index="3" Format="1">
+    <Coverage index="3">
      <Glyph value="dotbelow"/>
      <Glyph value="dotabove"/>
    </Coverage>
--- a/Tests/mtiLib/data/mti/gposcursive.ttx.GPOS
+++ b/Tests/mtiLib/data/mti/gposcursive.ttx.GPOS
@ -8,7 +8,7 @@
      <LookupFlag value="0"/>
      <!-- SubTableCount=1 -->
      <CursivePos index="0" Format="1">
-        <Coverage Format="1">
+        <Coverage>
          <Glyph value="A"/>
          <Glyph value="B"/>
        </Coverage>
--- a/Tests/mtiLib/data/mti/gposkernset.ttx.GPOS
+++ b/Tests/mtiLib/data/mti/gposkernset.ttx.GPOS
@ -8,7 +8,7 @@
      <LookupFlag value="0"/>
      <!-- SubTableCount=2 -->
      <PairPos index="0" Format="1">
-        <Coverage Format="1">
+        <Coverage>
          <Glyph value="Acircumflex"/>
          <Glyph value="T"/>
        </Coverage>
@ -31,7 +31,7 @@
        </PairSet>
      </PairPos>
      <PairPos index="1" Format="2">
-        <Coverage Format="1">
+        <Coverage>
          <Glyph value="A"/>
          <Glyph value="Acircumflex"/>
          <Glyph value="T"/>
@ -44,7 +44,7 @@
        </Coverage>
        <ValueFormat1 value="4"/>
        <ValueFormat2 value="0"/>
-        <ClassDef1 Format="2">
+        <ClassDef1>
          <ClassDef glyph="A" class="1"/>
          <ClassDef glyph="Aacute" class="1"/>
          <ClassDef glyph="Acircumflex" class="1"/>
@ -55,7 +55,7 @@
          <ClassDef glyph="Ograve" class="2"/>
          <ClassDef glyph="T" class="3"/>
        </ClassDef1>
-        <ClassDef2 Format="2">
+        <ClassDef2>
          <ClassDef glyph="V" class="1"/>
          <ClassDef glyph="a" class="2"/>
          <ClassDef glyph="aacute" class="2"/>
--- a/Tests/mtiLib/data/mti/gposmarktobase.ttx.GPOS
+++ b/Tests/mtiLib/data/mti/gposmarktobase.ttx.GPOS
@ -8,7 +8,7 @@
      <LookupFlag value="0"/>
      <!-- SubTableCount=1 -->
      <MarkBasePos index="0" Format="1">
-        <MarkCoverage Format="2">
+        <MarkCoverage>
          <Glyph value="aimatrabindigurmukhi"/>
          <Glyph value="aimatragurmukhi"/>
          <Glyph value="aimatratippigurmukhi"/>
@ -22,7 +22,7 @@
          <Glyph value="oomatragurmukhi"/>
          <Glyph value="oomatratippigurmukhi"/>
        </MarkCoverage>
-        <BaseCoverage Format="2">
+        <BaseCoverage>
          <Glyph value="lagurmukhi"/>
          <Glyph value="lanuktagurmukhi"/>
          <Glyph value="nagurmukhi"/>
--- a/Tests/mtiLib/data/mti/gpospairclass.ttx.GPOS
+++ b/Tests/mtiLib/data/mti/gpospairclass.ttx.GPOS
@ -8,7 +8,7 @@
      <LookupFlag value="0"/>
      <!-- SubTableCount=1 -->
      <PairPos index="0" Format="2">
-        <Coverage Format="1">
+        <Coverage>
          <Glyph value="A"/>
          <Glyph value="Acircumflex"/>
          <Glyph value="T"/>
@ -21,7 +21,7 @@
        </Coverage>
        <ValueFormat1 value="4"/>
        <ValueFormat2 value="0"/>
-        <ClassDef1 Format="2">
+        <ClassDef1>
          <ClassDef glyph="A" class="1"/>
          <ClassDef glyph="Aacute" class="1"/>
          <ClassDef glyph="Acircumflex" class="1"/>
@ -32,7 +32,7 @@
          <ClassDef glyph="Ograve" class="2"/>
          <ClassDef glyph="T" class="3"/>
        </ClassDef1>
-        <ClassDef2 Format="2">
+        <ClassDef2>
          <ClassDef glyph="V" class="1"/>
          <ClassDef glyph="a" class="2"/>
          <ClassDef glyph="aacute" class="2"/>
--- a/Tests/mtiLib/data/mti/gpospairglyph.ttx.GPOS
+++ b/Tests/mtiLib/data/mti/gpospairglyph.ttx.GPOS
@ -8,7 +8,7 @@
      <LookupFlag value="0"/>
      <!-- SubTableCount=1 -->
      <PairPos index="0" Format="1">
-        <Coverage Format="1">
+        <Coverage>
          <Glyph value="A"/>
          <Glyph value="Acircumflex"/>
          <Glyph value="T"/>
--- a/Tests/mtiLib/data/mti/gpossingle.ttx.GPOS
+++ b/Tests/mtiLib/data/mti/gpossingle.ttx.GPOS
@ -8,7 +8,7 @@
      <LookupFlag value="0"/>
      <!-- SubTableCount=1 -->
      <SinglePos index="0" Format="1">
-        <Coverage Format="2">
+        <Coverage>
          <Glyph value="bsuperior"/>
          <Glyph value="isuperior"/>
          <Glyph value="vsuperior"/>
--- a/Tests/mtiLib/data/mti/gsubalternate.ttx.GSUB
+++ b/Tests/mtiLib/data/mti/gsubalternate.ttx.GSUB
@ -7,7 +7,7 @@
      <LookupType value="3"/>
      <LookupFlag value="0"/>
      <!-- SubTableCount=1 -->
-      <AlternateSubst index="0" Format="1">
+      <AlternateSubst index="0">
        <AlternateSet glyph="eight">
          <Alternate glyph="uniF738"/>
          <Alternate glyph="uniE0C0"/>
--- a/Tests/mtiLib/data/mti/gsubligature.ttx.GSUB
+++ b/Tests/mtiLib/data/mti/gsubligature.ttx.GSUB
@ -7,7 +7,7 @@
      <LookupType value="4"/>
      <LookupFlag value="0"/>
      <!-- SubTableCount=1 -->
-      <LigatureSubst index="0" Format="1">
+      <LigatureSubst index="0">
        <LigatureSet glyph="I">
          <Ligature components="J" glyph="IJ"/>
        </LigatureSet>
--- a/Tests/mtiLib/data/mti/gsubmultiple.ttx.GSUB
+++ b/Tests/mtiLib/data/mti/gsubmultiple.ttx.GSUB
@ -7,7 +7,7 @@
      <LookupType value="2"/>
      <LookupFlag value="0"/>
      <!-- SubTableCount=1 -->
-      <MultipleSubst index="0" Format="1">
+      <MultipleSubst index="0">
        <Substitution in="janyevoweltelugu" out="jaivoweltelugu,nyasubscripttelugu"/>
        <Substitution in="kassevoweltelugu" out="kaivoweltelugu,ssasubscripttelugu"/>
      </MultipleSubst>
--- a/Tests/mtiLib/data/mti/gsubreversechanined.ttx.GSUB
+++ b/Tests/mtiLib/data/mti/gsubreversechanined.ttx.GSUB
@ -8,14 +8,14 @@
      <LookupFlag value="9"/><!-- rightToLeft ignoreMarks -->
      <!-- SubTableCount=3 -->
      <ReverseChainSingleSubst index="0" Format="1">
-        <Coverage Format="2">
+        <Coverage>
          <Glyph value="rayf2"/>
          <Glyph value="reyf2"/>
          <Glyph value="yayf2"/>
          <Glyph value="zayf2"/>
        </Coverage>
        <!-- BacktrackGlyphCount=1 -->
-        <BacktrackCoverage index="0" Format="2">
+        <BacktrackCoverage index="0">
          <Glyph value="bayi1"/>
          <Glyph value="jeemi1"/>
          <Glyph value="kafi1"/>
@ -33,14 +33,14 @@
        <Substitute index="3" value="zayf1"/>
      </ReverseChainSingleSubst>
      <ReverseChainSingleSubst index="1" Format="1">
-        <Coverage Format="2">
+        <Coverage>
          <Glyph value="ayehf2"/>
          <Glyph value="hamzayeharabf2"/>
          <Glyph value="hamzayehf2"/>
          <Glyph value="yehf2"/>
        </Coverage>
        <!-- BacktrackGlyphCount=1 -->
-        <BacktrackCoverage index="0" Format="1">
+        <BacktrackCoverage index="0">
          <Glyph value="bayi1"/>
          <Glyph value="kafi1"/>
          <Glyph value="ghafi1"/>
@ -58,14 +58,14 @@
        <Substitute index="3" value="yehf1"/>
      </ReverseChainSingleSubst>
      <ReverseChainSingleSubst index="2" Format="1">
-        <Coverage Format="1">
+        <Coverage>
          <Glyph value="dal"/>
          <Glyph value="del"/>
          <Glyph value="zal"/>
        </Coverage>
        <!-- BacktrackGlyphCount=0 -->
        <!-- LookAheadGlyphCount=1 -->
-        <LookAheadCoverage index="0" Format="2">
+        <LookAheadCoverage index="0">
          <Glyph value="ray"/>
          <Glyph value="rey"/>
          <Glyph value="zay"/>
--- a/Tests/mtiLib/data/mti/gsubsingle.ttx.GSUB
+++ b/Tests/mtiLib/data/mti/gsubsingle.ttx.GSUB
@ -7,7 +7,7 @@
      <LookupType value="1"/>
      <LookupFlag value="0"/>
      <!-- SubTableCount=1 -->
-      <SingleSubst index="0" Format="1">
+      <SingleSubst index="0">
        <Substitution in="onehalf" out="onehalf.alt"/>
        <Substitution in="onequarter" out="onequarter.alt"/>
        <Substitution in="threequarters" out="threequarters.alt"/>
--- a/Tests/mtiLib/data/mti/mark-to-ligature.ttx.GPOS
+++ b/Tests/mtiLib/data/mti/mark-to-ligature.ttx.GPOS
@ -8,7 +8,7 @@
      <LookupFlag value="0"/>
      <!-- SubTableCount=1 -->
      <MarkLigPos index="0" Format="1">
-        <MarkCoverage Format="2">
+        <MarkCoverage>
          <Glyph value="AlefSuperiorNS"/>
          <Glyph value="DammaNS"/>
          <Glyph value="DammaRflxNS"/>
@ -37,7 +37,7 @@
          <Glyph value="UltapeshNS"/>
          <Glyph value="WaslaNS"/>
        </MarkCoverage>
-        <LigatureCoverage Format="2">
+        <LigatureCoverage>
          <Glyph value="AinIni.12m_MeemFin.02"/>
          <Glyph value="AinIni_YehBarreeFin"/>
          <Glyph value="AinMed_YehBarreeFin"/>
--- a/Tests/otlLib/data/gpos_91.ttx
+++ b/Tests/otlLib/data/gpos_91.ttx
@ -85,7 +85,7 @@
        <ExtensionPos index="0" Format="1">
          <ExtensionLookupType value="1"/>
          <SinglePos Format="1">
-            <Coverage Format="1">
+            <Coverage>
              <Glyph value="A"/>
            </Coverage>
            <ValueFormat value="4"/>
--- a/Tests/otlLib/data/gsub_51.ttx
+++ b/Tests/otlLib/data/gsub_51.ttx
@ -88,7 +88,7 @@
        <LookupType value="1"/>
        <LookupFlag value="0"/>
        <!-- SubTableCount=1 -->
-        <SingleSubst index="0" Format="1">
+        <SingleSubst index="0">
          <Substitution in="g20" out="g60"/>
          <Substitution in="g21" out="g61"/>
        </SingleSubst>
@ -97,7 +97,7 @@
        <LookupType value="4"/>
        <LookupFlag value="0"/>
        <!-- SubTableCount=1 -->
-        <LigatureSubst index="0" Format="1">
+        <LigatureSubst index="0">
          <LigatureSet glyph="g21">
            <Ligature components="g22" glyph="g61"/>
          </LigatureSet>
@ -107,7 +107,7 @@
        <LookupType value="4"/>
        <LookupFlag value="8"/><!-- ignoreMarks -->
        <!-- SubTableCount=1 -->
-        <LigatureSubst index="0" Format="1">
+        <LigatureSubst index="0">
          <LigatureSet glyph="g21">
            <Ligature components="g22" glyph="g61"/>
          </LigatureSet>
@ -117,7 +117,7 @@
        <LookupType value="2"/>
        <LookupFlag value="0"/>
        <!-- SubTableCount=1 -->
-        <MultipleSubst index="0" Format="1">
+        <MultipleSubst index="0">
          <Substitution in="g21" out="g61,g62,g63"/>
        </MultipleSubst>
      </Lookup>
@ -126,7 +126,7 @@
        <LookupFlag value="0"/>
        <!-- SubTableCount=1 -->
        <ContextSubst index="0" Format="1">
-          <Coverage Format="1">
+          <Coverage>
            <Glyph value="g20"/>
          </Coverage>
          <!-- SubRuleSetCount=1 -->
--- a/Tests/otlLib/data/gsub_52.ttx
+++ b/Tests/otlLib/data/gsub_52.ttx
@ -88,7 +88,7 @@
        <LookupType value="1"/>
        <LookupFlag value="0"/>
        <!-- SubTableCount=1 -->
-        <SingleSubst index="0" Format="1">
+        <SingleSubst index="0">
          <Substitution in="g20" out="g60"/>
          <Substitution in="g21" out="g61"/>
        </SingleSubst>
@ -97,7 +97,7 @@
        <LookupType value="4"/>
        <LookupFlag value="0"/>
        <!-- SubTableCount=1 -->
-        <LigatureSubst index="0" Format="1">
+        <LigatureSubst index="0">
          <LigatureSet glyph="g21">
            <Ligature components="g22" glyph="g61"/>
          </LigatureSet>
@ -107,7 +107,7 @@
        <LookupType value="4"/>
        <LookupFlag value="8"/><!-- ignoreMarks -->
        <!-- SubTableCount=1 -->
-        <LigatureSubst index="0" Format="1">
+        <LigatureSubst index="0">
          <LigatureSet glyph="g21">
            <Ligature components="g22" glyph="g61"/>
          </LigatureSet>
@ -117,7 +117,7 @@
        <LookupType value="2"/>
        <LookupFlag value="0"/>
        <!-- SubTableCount=1 -->
-        <MultipleSubst index="0" Format="1">
+        <MultipleSubst index="0">
          <Substitution in="g21" out="g61,g62,g63"/>
        </MultipleSubst>
      </Lookup>
@ -126,10 +126,10 @@
        <LookupFlag value="0"/>
        <!-- SubTableCount=1 -->
        <ContextSubst index="0" Format="2">
-          <Coverage Format="1">
+          <Coverage>
            <Glyph value="g20"/>
          </Coverage>
-          <ClassDef Format="2">
+          <ClassDef>
            <ClassDef glyph="g20" class="1"/>
          </ClassDef>
          <!-- SubClassSetCount=2 -->
--- a/Tests/otlLib/data/gsub_71.ttx
+++ b/Tests/otlLib/data/gsub_71.ttx
@ -87,7 +87,7 @@
        <!-- SubTableCount=1 -->
        <ExtensionSubst index="0" Format="1">
          <ExtensionLookupType value="1"/>
-          <SingleSubst Format="1">
+          <SingleSubst>
            <Substitution in="g18" out="g23"/>
            <Substitution in="g19" out="g24"/>
          </SingleSubst>
--- a/Tests/subset/data/Lobster.subset.ttx
+++ b/Tests/subset/data/Lobster.subset.ttx
@ -490,7 +490,7 @@ This license is available with a FAQ at: http://scripts.sil.org/OFL
        <LookupFlag value="0"/>
        <!-- SubTableCount=1 -->
        <PairPos index="0" Format="1">
-          <Coverage Format="2">
+          <Coverage>
            <Glyph value="one"/>
            <Glyph value="three"/>
            <Glyph value="two"/>
@ -616,7 +616,7 @@ This license is available with a FAQ at: http://scripts.sil.org/OFL
        <LookupType value="1"/>
        <LookupFlag value="0"/>
        <!-- SubTableCount=1 -->
-        <SingleSubst index="0" Format="1">
+        <SingleSubst index="0">
          <Substitution in="A" out="A.salt"/>
          <Substitution in="B" out="B.salt"/>
        </SingleSubst>
@ -625,7 +625,7 @@ This license is available with a FAQ at: http://scripts.sil.org/OFL
        <LookupType value="4"/>
        <LookupFlag value="0"/>
        <!-- SubTableCount=1 -->
-        <LigatureSubst index="0" Format="1">
+        <LigatureSubst index="0">
          <LigatureSet glyph="I">
            <Ligature components="J" glyph="IJ"/>
          </LigatureSet>
@ -635,7 +635,7 @@ This license is available with a FAQ at: http://scripts.sil.org/OFL
        <LookupType value="1"/>
        <LookupFlag value="0"/>
        <!-- SubTableCount=1 -->
-        <SingleSubst index="0" Format="1">
+        <SingleSubst index="0">
          <Substitution in="A" out="A.salt"/>
          <Substitution in="B" out="B.salt"/>
        </SingleSubst>
--- a/Tests/subset/data/TestContextSubstFormat3.ttx
+++ b/Tests/subset/data/TestContextSubstFormat3.ttx
@ -328,7 +328,7 @@

  <GDEF>
    <Version value="0x00010000"/>
-    <GlyphClassDef Format="2">
+    <GlyphClassDef>
      <ClassDef glyph=".notdef" class="1"/>
      <ClassDef glyph="glyph00002" class="1"/>
      <ClassDef glyph="glyph00003" class="1"/>
@ -430,17 +430,17 @@
        <LookupFlag value="0"/>
        <!-- SubTableCount=1 -->
        <ChainContextSubst index="0" Format="2">
-          <Coverage Format="1">
+          <Coverage>
            <Glyph value="plus"/>
          </Coverage>
-          <BacktrackClassDef Format="1">
+          <BacktrackClassDef>
            <ClassDef glyph="glyph00005" class="1"/>
            <ClassDef glyph="glyph00007" class="1"/>
          </BacktrackClassDef>
-          <InputClassDef Format="1">
+          <InputClassDef>
            <ClassDef glyph="plus" class="1"/>
          </InputClassDef>
-          <LookAheadClassDef Format="2">
+          <LookAheadClassDef>
          </LookAheadClassDef>
          <!-- ChainSubClassSetCount=2 -->
          <ChainSubClassSet index="0" empty="1"/>
@ -527,13 +527,13 @@
        <ContextSubst index="0" Format="3">
          <!-- GlyphCount=3 -->
          <!-- SubstCount=2 -->
-          <Coverage index="0" Format="1">
+          <Coverage index="0">
            <Glyph value="glyph00002"/>
          </Coverage>
-          <Coverage index="1" Format="1">
+          <Coverage index="1">
            <Glyph value="glyph00004"/>
          </Coverage>
-          <Coverage index="2" Format="1">
+          <Coverage index="2">
            <Glyph value="glyph00005"/>
          </Coverage>
          <SubstLookupRecord index="0">
@ -548,10 +548,10 @@
        <ContextSubst index="1" Format="3">
          <!-- GlyphCount=2 -->
          <!-- SubstCount=2 -->
-          <Coverage index="0" Format="1">
+          <Coverage index="0">
            <Glyph value="glyph00002"/>
          </Coverage>
-          <Coverage index="1" Format="1">
+          <Coverage index="1">
            <Glyph value="glyph00005"/>
          </Coverage>
          <SubstLookupRecord index="0">
@ -568,7 +568,7 @@
        <LookupType value="1"/>
        <LookupFlag value="0"/>
        <!-- SubTableCount=1 -->
-        <SingleSubst index="0" Format="1">
+        <SingleSubst index="0">
          <Substitution in="plus" out="glyph00005"/>
        </SingleSubst>
      </Lookup>
@ -576,7 +576,7 @@
        <LookupType value="1"/>
        <LookupFlag value="0"/>
        <!-- SubTableCount=1 -->
-        <SingleSubst index="0" Format="1">
+        <SingleSubst index="0">
          <Substitution in="plus" out="glyph00004"/>
        </SingleSubst>
      </Lookup>
@ -584,7 +584,7 @@
        <LookupType value="1"/>
        <LookupFlag value="0"/>
        <!-- SubTableCount=1 -->
-        <SingleSubst index="0" Format="1">
+        <SingleSubst index="0">
          <Substitution in="plus" out="glyph00002"/>
        </SingleSubst>
      </Lookup>
@ -592,7 +592,7 @@
        <LookupType value="1"/>
        <LookupFlag value="0"/>
        <!-- SubTableCount=1 -->
-        <SingleSubst index="0" Format="2">
+        <SingleSubst index="0">
          <Substitution in="glyph00002" out="glyph00003"/>
          <Substitution in="glyph00005" out="glyph00006"/>
          <Substitution in="plus" out="glyph00007"/>
--- a/Tests/subset/data/expect_keep_math.ttx
+++ b/Tests/subset/data/expect_keep_math.ttx
@ -417,7 +417,7 @@
    </MathConstants>
    <MathGlyphInfo>
      <MathItalicsCorrectionInfo>
-        <Coverage Format="1">
+        <Coverage>
          <Glyph value="u1D435"/>
        </Coverage>
        <!-- ItalicsCorrectionCount=1 -->
@ -426,7 +426,7 @@
        </ItalicsCorrection>
      </MathItalicsCorrectionInfo>
      <MathTopAccentAttachment>
-        <TopAccentCoverage Format="1">
+        <TopAccentCoverage>
          <Glyph value="A"/>
          <Glyph value="uni0302"/>
          <Glyph value="u1D400"/>
@ -466,14 +466,14 @@
          <Value value="1164"/>
        </TopAccentAttachment>
      </MathTopAccentAttachment>
-      <ExtendedShapeCoverage Format="1">
+      <ExtendedShapeCoverage>
        <Glyph value="parenleft.size1"/>
        <Glyph value="parenleft.size2"/>
        <Glyph value="parenleft.size3"/>
        <Glyph value="parenleft.size4"/>
      </ExtendedShapeCoverage>
      <MathKernInfo>
-        <MathKernCoverage Format="1">
+        <MathKernCoverage>
          <Glyph value="A"/>
          <Glyph value="u1D400"/>
        </MathKernCoverage>
@ -522,10 +522,10 @@
    </MathGlyphInfo>
    <MathVariants>
      <MinConnectorOverlap value="50"/>
-      <VertGlyphCoverage Format="1">
+      <VertGlyphCoverage>
        <Glyph value="parenleft"/>
      </VertGlyphCoverage>
-      <HorizGlyphCoverage Format="1">
+      <HorizGlyphCoverage>
        <Glyph value="uni0302"/>
      </HorizGlyphCoverage>
      <!-- VertGlyphCount=1 -->
--- a/Tests/subset/data/expect_layout_scripts.ttx
+++ b/Tests/subset/data/expect_layout_scripts.ttx
@ -89,7 +89,7 @@
        <LookupType value="1"/>
        <LookupFlag value="0"/>
        <!-- SubTableCount=1 -->
-        <SingleSubst index="0" Format="2">
+        <SingleSubst index="0">
          <Substitution in="uni06F4" out="uni06F4.urd"/>
          <Substitution in="uni06F6" out="uni06F6.urd"/>
          <Substitution in="uni06F7" out="uni06F7.urd"/>
@ -99,7 +99,7 @@
        <LookupType value="1"/>
        <LookupFlag value="0"/>
        <!-- SubTableCount=1 -->
-        <SingleSubst index="0" Format="1">
+        <SingleSubst index="0">
          <Substitution in="uni06F0" out="uni06F0.numr"/>
          <Substitution in="uni06F1" out="uni06F1.numr"/>
          <Substitution in="uni06F2" out="uni06F2.numr"/>
@ -119,7 +119,7 @@
        <LookupType value="1"/>
        <LookupFlag value="0"/>
        <!-- SubTableCount=1 -->
-        <SingleSubst index="0" Format="1">
+        <SingleSubst index="0">
          <Substitution in="i" out="i.TRK"/>
        </SingleSubst>
      </Lookup>
--- a/Tests/subset/data/layout_scripts.ttx
+++ b/Tests/subset/data/layout_scripts.ttx
@ -733,7 +733,7 @@

  <GDEF>
    <Version value="0x00010000"/>
-    <GlyphClassDef Format="2">
+    <GlyphClassDef>
      <ClassDef glyph="i" class="1"/>
      <ClassDef glyph="i.TRK" class="1"/>
      <ClassDef glyph="uni06F0" class="1"/>
@ -906,7 +906,7 @@
        <LookupType value="1"/>
        <LookupFlag value="0"/>
        <!-- SubTableCount=1 -->
-        <SingleSubst index="0" Format="2">
+        <SingleSubst index="0">
          <Substitution in="uni06F4" out="uni06F4.urd"/>
          <Substitution in="uni06F6" out="uni06F6.urd"/>
          <Substitution in="uni06F7" out="uni06F7.urd"/>
@ -916,7 +916,7 @@
        <LookupType value="1"/>
        <LookupFlag value="0"/>
        <!-- SubTableCount=1 -->
-        <SingleSubst index="0" Format="2">
+        <SingleSubst index="0">
          <Substitution in="uni06F4" out="uni06F4.urd"/>
          <Substitution in="uni06F6" out="uni06F6.urd"/>
          <Substitution in="uni06F7" out="uni06F7.urd"/>
@ -926,7 +926,7 @@
        <LookupType value="1"/>
        <LookupFlag value="0"/>
        <!-- SubTableCount=1 -->
-        <SingleSubst index="0" Format="1">
+        <SingleSubst index="0">
          <Substitution in="uni06F6" out="uni06F6.urd"/>
          <Substitution in="uni06F7" out="uni06F7.urd"/>
        </SingleSubst>
@ -935,7 +935,7 @@
        <LookupType value="1"/>
        <LookupFlag value="0"/>
        <!-- SubTableCount=1 -->
-        <SingleSubst index="0" Format="1">
+        <SingleSubst index="0">
          <Substitution in="uni06F0" out="uni06F0.numr"/>
          <Substitution in="uni06F1" out="uni06F1.numr"/>
          <Substitution in="uni06F2" out="uni06F2.numr"/>
@ -955,7 +955,7 @@
        <LookupType value="1"/>
        <LookupFlag value="0"/>
        <!-- SubTableCount=1 -->
-        <SingleSubst index="0" Format="1">
+        <SingleSubst index="0">
          <Substitution in="i" out="i.TRK"/>
        </SingleSubst>
      </Lookup>
--- a/Tests/subset/data/test_cntrmask_CFF.ttx
+++ b/Tests/subset/data/test_cntrmask_CFF.ttx
@ -237,13 +237,13 @@

  <GDEF>
    <Version value="0x00010002"/>
-    <GlyphClassDef Format="1">
+    <GlyphClassDef>
      <ClassDef glyph="Idieresis" class="1"/>
    </GlyphClassDef>
    <MarkGlyphSetsDef>
      <MarkSetTableFormat value="1"/>
      <!-- MarkSetCount=1 -->
-      <Coverage index="0" Format="1">
+      <Coverage index="0">
      </Coverage>
    </MarkGlyphSetsDef>
  </GDEF>
@ -335,15 +335,15 @@
        <LookupFlag value="0"/>
        <!-- SubTableCount=1 -->
        <PairPos index="0" Format="2">
-          <Coverage Format="1">
+          <Coverage>
            <Glyph value="Idieresis"/>
          </Coverage>
          <ValueFormat1 value="4"/>
          <ValueFormat2 value="0"/>
-          <ClassDef1 Format="1">
+          <ClassDef1>
            <ClassDef glyph="Idieresis" class="1"/>
          </ClassDef1>
-          <ClassDef2 Format="2">
+          <ClassDef2>
          </ClassDef2>
          <!-- Class1Count=2 -->
          <!-- Class2Count=1 -->
--- a/Tests/subset/subset_test.py
+++ b/Tests/subset/subset_test.py
@ -859,7 +859,7 @@ def test_subset_single_pos_format():
        '  <LookupFlag value="0"/>',
        '  <!-- SubTableCount=1 -->',
        '  <SinglePos index="0" Format="2">',
-        '    <Coverage Format="1">',
+        '    <Coverage>',
        '      <Glyph value="a"/>',
        '      <Glyph value="b"/>',
        '      <Glyph value="c"/>',
@ -886,7 +886,7 @@ def test_subset_single_pos_format():
        '  <LookupFlag value="0"/>',
        '  <!-- SubTableCount=1 -->',
        '  <SinglePos index="0" Format="1">',
-        '    <Coverage Format="1">',
+        '    <Coverage>',
        '      <Glyph value="a"/>',
        '      <Glyph value="c"/>',
        '    </Coverage>',
--- 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"/>
--- 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"/>
--- 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"/>
--- 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"/>
--- 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"/>
--- 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"/>
--- 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"/>
--- 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"/>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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"/>
--- 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>
--- 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>
--- 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"/>
--- 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>
--- 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"/>
--- 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"/>
--- 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"/>
--- 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"/>
--- 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 -->
--- 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>
--- 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 -->
--- 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>
--- 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 -->
--- 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 -->
--- 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 -->
--- 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>
--- 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>
--- 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>
--- 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>
--- 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"/>
--- 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>
--- 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 -->
--- 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"/>
--- 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 -->
--- 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"/>
--- 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>
--- 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"/>
--- 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 -->
--- 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"/>
--- 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 -->
--- 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>
--- 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"/>
--- 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 -->
--- 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 -->
--- 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>
--- 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>
--- 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"/>
--- 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 -->
--- a/Show More
+++ b/Show More