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

Merge pull request #1302 from moyogo/fix-subtable-break

Browse Source 
Fix subtable break
This commit is contained in:
Cosimo Lupo 2018-07-26 11:16:58 +01:00 committed by GitHub
commit 83f9156f8d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Lib/fontTools/feaLib/builder.py
View File

@ -1503,6 +1503,7 @@ class ClassPairPosSubtableBuilder(object):
st = otl.buildPairPosClassesSubtable(self.values_, st = otl.buildPairPosClassesSubtable(self.values_,
self.builder_.glyphMap) self.builder_.glyphMap)
self.subtables_.append(st) self.subtables_.append(st)
self.forceSubtableBreak_ = False
class PairPosBuilder(LookupBuilder): class PairPosBuilder(LookupBuilder):

1
Tests/feaLib/data/PairPosSubtable.fea
View File

@ -10,6 +10,7 @@ lookup kernlookup {
subtable; subtable;
pos @group1 @group2 -12; pos @group1 @group2 -12;
subtable; subtable;
pos @group1 @group3 -10;
pos @group3 @group2 -20; pos @group3 @group2 -20;
} kernlookup; } kernlookup;

25
Tests/feaLib/data/PairPosSubtable.ttx
View File

@ -84,26 +84,43 @@
</PairPos> </PairPos>
<PairPos index="2" Format="2"> <PairPos index="2" Format="2">
<Coverage> <Coverage>
<Glyph value="b"/>
<Glyph value="o"/>
<Glyph value="v"/> <Glyph value="v"/>
<Glyph value="w"/> <Glyph value="w"/>
</Coverage> </Coverage>
<ValueFormat1 value="4"/> <ValueFormat1 value="4"/>
<ValueFormat2 value="0"/> <ValueFormat2 value="0"/>
<ClassDef1> <ClassDef1>
<ClassDef glyph="b" class="1"/>
<ClassDef glyph="o" class="1"/>
</ClassDef1> </ClassDef1>
<ClassDef2> <ClassDef2>
<ClassDef glyph="c" class="1"/> <ClassDef glyph="c" class="2"/>
<ClassDef glyph="d" class="1"/> <ClassDef glyph="d" class="2"/>
<ClassDef glyph="v" class="1"/>
<ClassDef glyph="w" class="1"/>
</ClassDef2> </ClassDef2>
<!-- Class1Count=1 --> <!-- Class1Count=2 -->
<!-- Class2Count=2 --> <!-- Class2Count=3 -->
<Class1Record index="0"> <Class1Record index="0">
<Class2Record index="0"> <Class2Record index="0">
</Class2Record> </Class2Record>
<Class2Record index="1"> <Class2Record index="1">
</Class2Record>
<Class2Record index="2">
<Value1 XAdvance="-20"/> <Value1 XAdvance="-20"/>
</Class2Record> </Class2Record>
</Class1Record> </Class1Record>
<Class1Record index="1">
<Class2Record index="0">
</Class2Record>
<Class2Record index="1">
<Value1 XAdvance="-10"/>
</Class2Record>
<Class2Record index="2">
</Class2Record>
</Class1Record>
</PairPos> </PairPos>
</Lookup> </Lookup>
</LookupList> </LookupList>