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

Merge pull request #2274 from googlefonts/mvar_fix

Browse Source 
Include record size adjustment.
This commit is contained in:
Behdad Esfahbod 2021-04-21 15:54:45 -06:00 committed by GitHub
commit ae982abf5c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 42 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/fontTools/ttLib/tables/otBase.py
View File

@ -571,7 +571,7 @@ class BaseTable(object):
countValue = 1 countValue = 1
if conv.repeat: if conv.repeat:
if conv.repeat in reader: if conv.repeat in reader:
countValue = reader[conv.repeat] countValue = reader[conv.repeat] + conv.aux
else: else:
return NotImplemented return NotImplemented
totalSize += size * countValue totalSize += size * countValue

61
Tests/ttLib/tables/M_V_A_R_test.py
View File

@ -8,8 +8,8 @@ import unittest
MVAR_DATA = deHexStr( MVAR_DATA = deHexStr(
'0001 0000 ' # 0: version=1.0 '0001 0000 ' # 0: version=1.0
'0000 0008 ' # 4: reserved=0, valueRecordSize=8 '0000 0008 ' # 4: reserved=0, valueRecordSize=8
'0007 ' # 8: valueRecordCount=7 '0009 ' # 8: valueRecordCount=9
'0044 ' # 10: offsetToItemVariationStore=68 '0054 ' # 10: offsetToItemVariationStore=84
'6861 7363 ' # 12: ValueRecord.valueTag="hasc" '6861 7363 ' # 12: ValueRecord.valueTag="hasc"
'0000 ' # 16: ValueRecord.deltaSetOuterIndex '0000 ' # 16: ValueRecord.deltaSetOuterIndex
'0003 ' # 18: ValueRecord.deltaSetInnerIndex '0003 ' # 18: ValueRecord.deltaSetInnerIndex
@ -31,30 +31,36 @@ MVAR_DATA = deHexStr(
'7370 796F ' # 60: ValueRecord.valueTag="spyo" '7370 796F ' # 60: ValueRecord.valueTag="spyo"
'0000 ' # 64: ValueRecord.deltaSetOuterIndex '0000 ' # 64: ValueRecord.deltaSetOuterIndex
'0002 ' # 66: ValueRecord.deltaSetInnerIndex '0002 ' # 66: ValueRecord.deltaSetInnerIndex
'0001 ' # 68: VarStore.format=1 '7465 7374 ' # 68: ValueRecord.valueTag="test"
'0000 000C ' # 70: VarStore.offsetToVariationRegionList=12 '0000 ' # 72: ValueRecord.deltaSetOuterIndex
'0001 ' # 74: VarStore.itemVariationDataCount=1 '0002 ' # 74: ValueRecord.deltaSetInnerIndex
'0000 0016 ' # 76: VarStore.itemVariationDataOffsets[0]=22 '7465 7332 ' # 76: ValueRecord.valueTag="tes2"
'0001 ' # 80: VarRegionList.axisCount=1 '0000 ' # 78: ValueRecord.deltaSetOuterIndex
'0001 ' # 82: VarRegionList.regionCount=1 '0002 ' # 82: ValueRecord.deltaSetInnerIndex
'0000 ' # 84: variationRegions[0].regionAxes[0].startCoord=0.0 '0001 ' # 84: VarStore.format=1
'4000 ' # 86: variationRegions[0].regionAxes[0].peakCoord=1.0 '0000 000C ' # 86: VarStore.offsetToVariationRegionList=12
'4000 ' # 88: variationRegions[0].regionAxes[0].endCoord=1.0 '0001 ' # 90: VarStore.itemVariationDataCount=1
'0004 ' # 90: VarData.ItemCount=4 '0000 0016 ' # 92: VarStore.itemVariationDataOffsets[0]=22
'0001 ' # 92: VarData.NumShorts=1 '0001 ' # 96: VarRegionList.axisCount=1
'0001 ' # 94: VarData.VarRegionCount=1 '0001 ' # 98: VarRegionList.regionCount=1
'0000 ' # 96: VarData.VarRegionIndex[0]=0 '0000 ' # 100: variationRegions[0].regionAxes[0].startCoord=0.0
'FF38 ' # 98: VarData.deltaSets[0]=-200 '4000 ' # 102: variationRegions[0].regionAxes[0].peakCoord=1.0
'FFCE ' # 100: VarData.deltaSets[0]=-50 '4000 ' # 104: variationRegions[0].regionAxes[0].endCoord=1.0
'0064 ' # 102: VarData.deltaSets[0]=100 '0004 ' # 106: VarData.ItemCount=4
'00C8 ' # 104: VarData.deltaSets[0]=200 '0001 ' # 108: VarData.NumShorts=1
'0001 ' # 110: VarData.VarRegionCount=1
'0000 ' # 112: VarData.VarRegionIndex[0]=0
'FF38 ' # 114: VarData.deltaSets[0]=-200
'FFCE ' # 116: VarData.deltaSets[0]=-50
'0064 ' # 118: VarData.deltaSets[0]=100
'00C8 ' # 120: VarData.deltaSets[0]=200
) )
MVAR_XML = [ MVAR_XML = [
'<Version value="0x00010000"/>', '<Version value="0x00010000"/>',
'<Reserved value="0"/>', '<Reserved value="0"/>',
'<ValueRecordSize value="8"/>', '<ValueRecordSize value="8"/>',
'<!-- ValueRecordCount=7 -->', '<!-- ValueRecordCount=9 -->',
'<VarStore Format="1">', '<VarStore Format="1">',
' <Format value="1"/>', ' <Format value="1"/>',
' <VarRegionList>', ' <VarRegionList>',
@ -108,6 +114,14 @@ MVAR_XML = [
' <ValueTag value="spyo"/>', ' <ValueTag value="spyo"/>',
' <VarIdx value="2"/>', ' <VarIdx value="2"/>',
'</ValueRecord>', '</ValueRecord>',
'<ValueRecord index="7">',
' <ValueTag value="test"/>',
' <VarIdx value="2"/>',
'</ValueRecord>',
'<ValueRecord index="8">',
' <ValueTag value="tes2"/>',
' <VarIdx value="2"/>',
'</ValueRecord>',
] ]
@ -123,6 +137,13 @@ class MVARTest(unittest.TestCase):
mvar.decompile(MVAR_DATA, font) mvar.decompile(MVAR_DATA, font)
self.assertEqual(getXML(mvar.toXML), MVAR_XML) self.assertEqual(getXML(mvar.toXML), MVAR_XML)
def test_decompile_toXML_lazy(self):
mvar = newTable('MVAR')
font = TTFont(lazy=True)
mvar.decompile(MVAR_DATA, font)
self.assertEqual(getXML(mvar.toXML), MVAR_XML)
def test_compile_fromXML(self): def test_compile_fromXML(self):
mvar = newTable('MVAR') mvar = newTable('MVAR')
font = TTFont() font = TTFont()