[subset] delete empty SubrsIndex after subsetting
Fixes https://github.com/fonttools/fonttools/issues/994
This commit is contained in:
parent
e51293f3f0
commit
42d11cfd3e
@ -2407,12 +2407,27 @@ def prune_post_subset(self, options):
|
|||||||
for subr in subrs.items:
|
for subr in subrs.items:
|
||||||
subr.subset_subroutines (local_subrs, font.GlobalSubrs)
|
subr.subset_subroutines (local_subrs, font.GlobalSubrs)
|
||||||
|
|
||||||
|
# Delete local SubrsIndex if empty
|
||||||
|
if hasattr(font, 'FDSelect'):
|
||||||
|
for fd in font.FDArray:
|
||||||
|
_delete_empty_subrs(fd)
|
||||||
|
else:
|
||||||
|
_delete_empty_subrs(font)
|
||||||
|
|
||||||
# Cleanup
|
# Cleanup
|
||||||
for subrs in all_subrs:
|
for subrs in all_subrs:
|
||||||
del subrs._used, subrs._old_bias, subrs._new_bias
|
del subrs._used, subrs._old_bias, subrs._new_bias
|
||||||
|
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
|
||||||
|
def _delete_empty_subrs(font):
|
||||||
|
if hasattr(font.Private, 'Subrs') and not font.Private.Subrs:
|
||||||
|
if 'Subrs' in font.Private.rawDict:
|
||||||
|
del font.Private.rawDict['Subrs']
|
||||||
|
delattr(font.Private, 'Subrs')
|
||||||
|
|
||||||
|
|
||||||
@_add_method(ttLib.getTableClass('cmap'))
|
@_add_method(ttLib.getTableClass('cmap'))
|
||||||
def closure_glyphs(self, s):
|
def closure_glyphs(self, s):
|
||||||
tables = [t for t in self.tables if t.isUnicode()]
|
tables = [t for t in self.tables if t.isUnicode()]
|
||||||
|
Loading…
x
Reference in New Issue
Block a user