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

Revert "return self so one can do font=TTFont(file).ensureDecompiled()"

Browse Source 
This reverts commit 61e7b294483cbe729b1437804406b4571ae57cfb.
This commit is contained in:
Cosimo Lupo 2022-03-17 15:55:20 +00:00
parent 61e7b29448
commit 43d2ee2822
4 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/fontTools/ttLib/tables/_c_m_a_p.py
View File

@ -162,7 +162,6 @@ class table__c_m_a_p(DefaultTable.DefaultTable):
def ensureDecompiled(self): def ensureDecompiled(self):
for st in self.tables: for st in self.tables:
st.ensureDecompiled() st.ensureDecompiled()
return self
def compile(self, ttFont): def compile(self, ttFont):
self.tables.sort() # sort according to the spec; see CmapSubtable.__lt__() self.tables.sort() # sort according to the spec; see CmapSubtable.__lt__()
@ -246,7 +245,6 @@ class CmapSubtable(object):
self.data = None # Once this table has been decompiled, make sure we don't self.data = None # Once this table has been decompiled, make sure we don't
# just return the original data. Also avoids recursion when # just return the original data. Also avoids recursion when
# called with an attribute that the cmap subtable doesn't have. # called with an attribute that the cmap subtable doesn't have.
return self
def __getattr__(self, attr): def __getattr__(self, attr):
# allow lazy decompilation of subtables. # allow lazy decompilation of subtables.

1
Lib/fontTools/ttLib/tables/_g_l_y_f.py
View File

@ -115,7 +115,6 @@ class table__g_l_y_f(DefaultTable.DefaultTable):
def ensureDecompiled(self): def ensureDecompiled(self):
for glyph in self.glyphs.values(): for glyph in self.glyphs.values():
glyph.expand(self) glyph.expand(self)
return self
def compile(self, ttFont): def compile(self, ttFont):
if not hasattr(self, "glyphOrder"): if not hasattr(self, "glyphOrder"):

2
Lib/fontTools/ttLib/tables/otBase.py
View File

@ -110,7 +110,6 @@ class BaseTTXConverter(DefaultTable):
def ensureDecompiled(self): def ensureDecompiled(self):
self.table.ensureDecompiled(recurse=True) self.table.ensureDecompiled(recurse=True)
return self
# https://github.com/fonttools/fonttools/pull/2285#issuecomment-834652928 # https://github.com/fonttools/fonttools/pull/2285#issuecomment-834652928
@ -610,7 +609,6 @@ class BaseTable(object):
if recurse: if recurse:
for subtable in self.iterSubTables(): for subtable in self.iterSubTables():
subtable.ensureDecompiled(recurse) subtable.ensureDecompiled(recurse)
return self
@classmethod @classmethod
def getRecordSize(cls, reader): def getRecordSize(cls, reader):

6
Lib/fontTools/ttLib/ttFont.py
View File

@ -379,16 +379,12 @@ class TTFont(object):
return ["GlyphOrder"] + keys return ["GlyphOrder"] + keys
def ensureDecompiled(self): def ensureDecompiled(self):
"""Decompile all the tables, even if a TTFont was opened in 'lazy' mode. """Decompile all the tables, even if a TTFont was opened in 'lazy' mode."""
Returns the same TTFont instance, fully decompiled.
"""
for tag in self.keys(): for tag in self.keys():
table = self[tag] table = self[tag]
if self.lazy is not False and hasattr(table, "ensureDecompiled"): if self.lazy is not False and hasattr(table, "ensureDecompiled"):
table.ensureDecompiled() table.ensureDecompiled()
self.lazy = False self.lazy = False
return self
def __len__(self): def __len__(self):
return len(list(self.keys())) return len(list(self.keys()))