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

Merge pull request #1614 from khaledhosny/varlib-gdef-glyphclass

Browse Source 
[varLib] Fix merging GDEF.GlyphClassDef in mutator
This commit is contained in:
Khaled Hosny 2019-05-18 04:52:37 +02:00 committed by GitHub
commit 83db5ed132
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 91 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/fontTools/varLib/merger.py
View File

@ -119,10 +119,10 @@ def merge(merger, self, lst):
assert allNone(lst), (lst) assert allNone(lst), (lst)
return return
lst = [l.classDefs for l in lst]
self.classDefs = {} self.classDefs = {}
# We only care about the .classDefs # We only care about the .classDefs
self = self.classDefs self = self.classDefs
lst = [l.classDefs for l in lst]
allKeys = set() allKeys = set()
allKeys.update(*[l.keys() for l in lst]) allKeys.update(*[l.keys() for l in lst])

10
Tests/varLib/data/master_ttx_interpolatable_ttf/TestFamily-Master0.ttx
View File

@ -517,4 +517,14 @@
</extraNames> </extraNames>
</post> </post>
<GDEF>
<Version value="0x00010003"/>
<GlyphClassDef Format="2">
<ClassDef glyph="uni0024" class="1"/>
<ClassDef glyph="uni0024.nostroke" class="1"/>
<ClassDef glyph="uni0041" class="1"/>
<ClassDef glyph="uni0061" class="1"/>
</GlyphClassDef>
</GDEF>
</ttFont> </ttFont>

10
Tests/varLib/data/master_ttx_interpolatable_ttf/TestFamily-Master1.ttx
View File

@ -517,4 +517,14 @@
</extraNames> </extraNames>
</post> </post>
<GDEF>
<Version value="0x00010003"/>
<GlyphClassDef Format="2">
<ClassDef glyph="uni0024" class="1"/>
<ClassDef glyph="uni0024.nostroke" class="1"/>
<ClassDef glyph="uni0041" class="1"/>
<ClassDef glyph="uni0061" class="1"/>
</GlyphClassDef>
</GDEF>
</ttFont> </ttFont>

10
Tests/varLib/data/master_ttx_interpolatable_ttf/TestFamily-Master2.ttx
View File

@ -501,4 +501,14 @@
</extraNames> </extraNames>
</post> </post>
<GDEF>
<Version value="0x00010003"/>
<GlyphClassDef Format="2">
<ClassDef glyph="uni0024" class="1"/>
<ClassDef glyph="uni0024.nostroke" class="1"/>
<ClassDef glyph="uni0041" class="1"/>
<ClassDef glyph="uni0061" class="1"/>
</GlyphClassDef>
</GDEF>
</ttFont> </ttFont>

10
Tests/varLib/data/master_ttx_interpolatable_ttf/TestFamily-Master3.ttx
View File

@ -501,4 +501,14 @@
</extraNames> </extraNames>
</post> </post>
<GDEF>
<Version value="0x00010003"/>
<GlyphClassDef Format="2">
<ClassDef glyph="uni0024" class="1"/>
<ClassDef glyph="uni0024.nostroke" class="1"/>
<ClassDef glyph="uni0041" class="1"/>
<ClassDef glyph="uni0061" class="1"/>
</GlyphClassDef>
</GDEF>
</ttFont> </ttFont>

10
Tests/varLib/data/master_ttx_interpolatable_ttf/TestFamily-Master4.ttx
View File

@ -501,4 +501,14 @@
</extraNames> </extraNames>
</post> </post>
<GDEF>
<Version value="0x00010003"/>
<GlyphClassDef Format="2">
<ClassDef glyph="uni0024" class="1"/>
<ClassDef glyph="uni0024.nostroke" class="1"/>
<ClassDef glyph="uni0041" class="1"/>
<ClassDef glyph="uni0061" class="1"/>
</GlyphClassDef>
</GDEF>
</ttFont> </ttFont>

10
Tests/varLib/data/test_results/Build.ttx
View File

@ -1,6 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ttFont sfntVersion="\x00\x01\x00\x00" ttLibVersion="3.17"> <ttFont sfntVersion="\x00\x01\x00\x00" ttLibVersion="3.17">
<GDEF>
<Version value="0x00010003"/>
<GlyphClassDef Format="2">
<ClassDef glyph="uni0024" class="1"/>
<ClassDef glyph="uni0024.nostroke" class="1"/>
<ClassDef glyph="uni0041" class="1"/>
<ClassDef glyph="uni0061" class="1"/>
</GlyphClassDef>
</GDEF>
<HVAR> <HVAR>
<Version value="0x00010000"/> <Version value="0x00010000"/>
<VarStore Format="1"> <VarStore Format="1">

10
Tests/varLib/data/test_results/BuildMain.ttx
View File

@ -613,6 +613,16 @@
</extraNames> </extraNames>
</post> </post>
<GDEF>
<Version value="0x00010003"/>
<GlyphClassDef Format="2">
<ClassDef glyph="uni0024" class="1"/>
<ClassDef glyph="uni0024.nostroke" class="1"/>
<ClassDef glyph="uni0041" class="1"/>
<ClassDef glyph="uni0061" class="1"/>
</GlyphClassDef>
</GDEF>
<HVAR> <HVAR>
<Version value="0x00010000"/> <Version value="0x00010000"/>
<VarStore Format="1"> <VarStore Format="1">

10
Tests/varLib/data/test_results/InterpolateLayoutMain.ttx
View File

@ -496,4 +496,14 @@
</extraNames> </extraNames>
</post> </post>
<GDEF>
<Version value="0x00010003"/>
<GlyphClassDef Format="2">
<ClassDef glyph="uni0024" class="1"/>
<ClassDef glyph="uni0024.nostroke" class="1"/>
<ClassDef glyph="uni0041" class="1"/>
<ClassDef glyph="uni0061" class="1"/>
</GlyphClassDef>
</GDEF>
</ttFont> </ttFont>

10
Tests/varLib/data/test_results/Mutator.ttx
View File

@ -496,4 +496,14 @@
</extraNames> </extraNames>
</post> </post>
<GDEF>
<Version value="0x00010000"/>
<GlyphClassDef Format="2">
<ClassDef glyph="uni0024" class="1"/>
<ClassDef glyph="uni0024.nostroke" class="1"/>
<ClassDef glyph="uni0041" class="1"/>
<ClassDef glyph="uni0061" class="1"/>
</GlyphClassDef>
</GDEF>
</ttFont> </ttFont>