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

[otlLib] Ensure built PairPos2 ValueRecords are padded with 0s

Browse Source 
Like when they are decompiled.

Part of https://github.com/fonttools/fonttools/pull/2237
This commit is contained in:
Behdad Esfahbod 2021-03-24 09:08:47 -07:00
parent b1ca16738c
commit d961ef5e52
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Lib/fontTools/otlLib/builder.py
View File

@ -2089,9 +2089,9 @@ def buildPairPosClassesSubtable(pairs, glyphMap, valueFormat1=None, valueFormat2
self.Class1Record.append(rec1) self.Class1Record.append(rec1)
for c2 in classes2: for c2 in classes2:
rec2 = ot.Class2Record() rec2 = ot.Class2Record()
rec2.Value1, rec2.Value2 = pairs.get((c1, c2), (None, None)) val1, val2 = pairs.get((c1, c2), (None, None))
if valueFormat1 and rec2.Value1 is None: rec2.Value1 = ValueRecord(valueFormat1) rec2.Value1 = ValueRecord(src=val1, valueFormat=valueFormat1) if valueFormat1 else None
if valueFormat2 and rec2.Value2 is None: rec2.Value2 = ValueRecord(valueFormat2) rec2.Value2 = ValueRecord(src=val2, valueFormat=valueFormat2) if valueFormat2 else None
rec1.Class2Record.append(rec2) rec1.Class2Record.append(rec2)
self.Class1Count = len(self.Class1Record) self.Class1Count = len(self.Class1Record)
self.Class2Count = len(classes2) self.Class2Count = len(classes2)

2
Tests/otlLib/builder_test.py
View File

@ -861,7 +861,7 @@ class BuilderTest(object):
' <Value2 XPlacement="-20"/>', ' <Value2 XPlacement="-20"/>',
" </Class2Record>", " </Class2Record>",
' <Class2Record index="2">', ' <Class2Record index="2">',
" <Value1/>", ' <Value1 XPlacement="0" YPlacement="0"/>',
' <Value2 XPlacement="-50"/>', ' <Value2 XPlacement="-50"/>',
" </Class2Record>", " </Class2Record>",
" </Class1Record>", " </Class1Record>",