[MVAR] Update for OT 1.8.1 rename

fonttools · Jan 10, 2017 · 0cc1721 · 0cc1721
1 parent 84c584c
commit 0cc1721
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/Lib/fontTools/ttLib/tables/M_V_A_R_test.py b/Lib/fontTools/ttLib/tables/M_V_A_R_test.py
@@ -9,7 +9,7 @@
 
 MVAR_DATA = deHexStr(
     '0001 0000 '  # 0:   version=1.0
-    '0001 0008 '  # 4:   axisCount=1, valueRecordSize=8
+    '0000 0008 '  # 4:   reserved=0, valueRecordSize=8
     '0007 '       # 8:   valueRecordCount=7
     '0044 '       # 10:  offsetToItemVariationStore=68
     '6861 7363 '  # 12:  ValueRecord.valueTag="hasc"
@@ -54,7 +54,7 @@
 
 MVAR_XML = [
     '<Version value="0x00010000"/>',
-    '<!-- AxisCount=1 -->',
+    '<Reserved value="0"/>',
     '<ValueRecordSize value="8"/>',
     '<!-- ValueRecordCount=7 -->',
     '<VarStore Format="1">',
@@ -130,10 +130,7 @@ def test_compile_fromXML(self):
         font = TTFont()
         for name, attrs, content in parseXML(MVAR_XML):
             mvar.fromXML(name, attrs, content, font=font)
-        # Ignore AxisCount
-        # see https://github.com/fonttools/fonttools/issues/689
         data = MVAR_DATA
-        data = data[:5] + b'\x00' + data[6:]
         self.assertEqual(hexStr(mvar.compile(font)), hexStr(data))
 
 

diff --git a/Lib/fontTools/ttLib/tables/otData.py b/Lib/fontTools/ttLib/tables/otData.py
@@ -1004,7 +1004,7 @@
 
 	('MVAR', [
 		('Version', 'Version', None, None, 'Version of the MVAR table-initially = 0x00010000'),
-		('uint16', 'AxisCount', None, None, ''),
+		('uint16', 'Reserved', None, None, 'Set to 0'),
 		('uint16', 'ValueRecordSize', None, None, ''),
 		('uint16', 'ValueRecordCount', None, None, ''),
 		('Offset', 'VarStore', None, None, ''),