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

tweaks reflecting review

Browse Source
This commit is contained in:
Michiharu Ariza 2019-04-24 09:26:17 -07:00
parent f028c75d2a
commit 6ca384fecd
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Lib/fontTools/subset/__init__.py
View File

@ -1790,11 +1790,14 @@ def subset_glyphs(self, s):
return bool(self.variations)
def _remap_index_map(s, varidx_map, table_map):
map = {k:varidx_map[v] for k,v in table_map.mapping.items()}
map_ = {k:varidx_map[v] for k,v in table_map.mapping.items()}
# Emptied glyphs are remapped to:
# if GID <= last retained GID, 0/0: delta set for 0/0 is expected to exist & zeros compress well
# if GID > last retained GID, major/minor of the last retained glyph: will be optimized out by table compiler
last_idx = varidx_map[table_map.mapping[s.last_retained_glyph]]
for g,i in s.reverseEmptiedGlyphMap.items():
map[g] = last_idx if i > s.last_retained_order else 0
return map
map_[g] = last_idx if i > s.last_retained_order else 0
return map_
@_add_method(ttLib.getTableClass('HVAR'))
def subset_glyphs(self, s):

3
Lib/fontTools/varLib/varStore.py
View File

@ -218,9 +218,8 @@ def VarStore_subset_varidxes(self, varIdxes, optimize=True, retainFirstMap=False
items = data.Item
newItems = []
if major == 0 and retainFirstMap:
zeros = [0] * len(items[0])
for minor in range(len(items)):
newItems.append(items[minor] if minor in usedMinors else zeros)
newItems.append(items[minor] if minor in usedMinors else [0] * len(items[minor]))
varDataMap[minor] = minor
else:
for minor in sorted(usedMinors):