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

Merge pull request #1644 from fonttools/Fix-CFF2-PrivateDict_bug

Browse Source 
[varLib.cff] Fix important bug in merging CFF2 PrivateDicts.
This commit is contained in:
Cosimo Lupo 2019-06-14 16:18:12 +01:00 committed by GitHub
commit 6777145f5b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Lib/fontTools/varLib/cff.py
View File

@ -270,7 +270,9 @@ def getfd_map(varFont, fonts_list):
num_regions = len(region_fonts) num_regions = len(region_fonts)
topDict = default_font['CFF '].cff.topDictIndex[0] topDict = default_font['CFF '].cff.topDictIndex[0]
if not hasattr(topDict, 'FDSelect'): if not hasattr(topDict, 'FDSelect'):
fd_map[0] = [0]*num_regions # All glyphs reference only one FontDict.
# Map the FD index for regions to index 0.
fd_map[0] = {ri:0 for ri in range(num_regions)}
return fd_map return fd_map
gname_mapping = {} gname_mapping = {}

18
Tests/varLib/data/test_results/BuildTestCFF2.ttx
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ttFont sfntVersion="OTTO" ttLibVersion="3.38"> <ttFont sfntVersion="OTTO" ttLibVersion="3.42">
<fvar> <fvar>
@ -67,29 +67,29 @@
<BlueValues> <BlueValues>
<blend value="-12 0 0"/> <blend value="-12 0 0"/>
<blend value="0 0 0"/> <blend value="0 0 0"/>
<blend value="486 -8 -8"/> <blend value="486 -8 14"/>
<blend value="498 0 0"/> <blend value="498 0 0"/>
<blend value="574 4 4"/> <blend value="574 4 -8"/>
<blend value="586 0 0"/> <blend value="586 0 0"/>
<blend value="638 6 6"/> <blend value="638 6 -10"/>
<blend value="650 0 0"/> <blend value="650 0 0"/>
<blend value="656 2 2"/> <blend value="656 2 -2"/>
<blend value="668 0 0"/> <blend value="668 0 0"/>
<blend value="712 6 6"/> <blend value="712 6 -10"/>
<blend value="724 0 0"/> <blend value="724 0 0"/>
</BlueValues> </BlueValues>
<OtherBlues> <OtherBlues>
<blend value="-217 -17 -17"/> <blend value="-217 -17 29"/>
<blend value="-205 0 0"/> <blend value="-205 0 0"/>
</OtherBlues> </OtherBlues>
<BlueScale value="0.0625"/> <BlueScale value="0.0625"/>
<BlueShift value="7"/> <BlueShift value="7"/>
<BlueFuzz value="0"/> <BlueFuzz value="0"/>
<StdHW> <StdHW>
<blend value="67 -39.0 -39.0"/> <blend value="67 -39.0 67.0"/>
</StdHW> </StdHW>
<StdVW> <StdVW>
<blend value="85 -51.0 -51.0"/> <blend value="85 -51.0 87.0"/>
</StdVW> </StdVW>
</Private> </Private>
</FontDict> </FontDict>