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

Based on feedback: undo name table changes.

Browse Source
This commit is contained in:
Olli Meier 2022-02-10 15:13:04 +01:00
parent 2a4b4a594a
commit b8792fc9f5
1 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Lib/fontTools/ttLib/tables/_n_a_m_e.py
View File

@ -329,7 +329,7 @@ class table__n_a_m_e(DefaultTable.DefaultTable):
self.names.append(macName) self.names.append(macName)
return nameID return nameID
def addName(self, string, platforms=((1, 0, 0), (3, 1, 0x409)), minNameID=255, force=True): def addName(self, string, platforms=((1, 0, 0), (3, 1, 0x409)), minNameID=255):
""" Add a new name record containing 'string' for each (platformID, platEncID, """ Add a new name record containing 'string' for each (platformID, platEncID,
langID) tuple specified in the 'platforms' list. langID) tuple specified in the 'platforms' list.
@ -350,18 +350,6 @@ class table__n_a_m_e(DefaultTable.DefaultTable):
if not isinstance(string, str): if not isinstance(string, str):
raise TypeError( raise TypeError(
"expected str, found %s: %r" % (type(string).__name__, string)) "expected str, found %s: %r" % (type(string).__name__, string))
if not force:
for platform in platforms:
for name_rec in self.names:
name_rec_platform = (name_rec.platformID, name_rec.platEncID, name_rec.langID)
if name_rec_platform != platform:
continue
if name_rec.string == string:
# if name ID exists already, don't create a new one.
# Instead return the name ID of the existing one.
return name_rec.nameID
nameID = self._findUnusedNameID(minNameID + 1) nameID = self._findUnusedNameID(minNameID + 1)
for platformID, platEncID, langID in platforms: for platformID, platEncID, langID in platforms:
self.names.append(makeName(string, nameID, platformID, platEncID, langID)) self.names.append(makeName(string, nameID, platformID, platEncID, langID))