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

cleanup _updateUniqueIdNameRecord

Browse Source
This commit is contained in:
Marc Foley 2020-10-16 13:12:36 +01:00
parent 0bcbbfdbb5
commit 11f0ade44c
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Lib/fontTools/varLib/instancer.py
View File

@ -1309,9 +1309,9 @@ def _updateStyleRecords(
def _updateUniqueIdNameRecord(varfont, nameIDs, platEncLang): def _updateUniqueIdNameRecord(varfont, nameIDs, platEncLang):
name = varfont["name"] nametable = varfont["name"]
record = name.getName(NameID.UNIQUE_FONT_IDENTIFIER, *platEncLang) currentRecord = nametable.getName(NameID.UNIQUE_FONT_IDENTIFIER, *platEncLang)
if not record: if not currentRecord:
return None return None
def isSubString(string1, string2): def isSubString(string1, string2):
@ -1319,13 +1319,13 @@ def _updateUniqueIdNameRecord(varfont, nameIDs, platEncLang):
return True return True
return False return False
# Check if full name and postscript name are a substring # Check if full name and postscript name are a substring of currentRecord
for nameID in (4, 6): for nameID in (4, 6):
nameRecord = name.getName(nameID, *platEncLang) nameRecord = nametable.getName(nameID, *platEncLang)
if not nameRecord: if not nameRecord:
continue continue
if isSubString(record.toUnicode(), nameRecord.toUnicode()): if isSubString(currentRecord.toUnicode(), nameRecord.toUnicode()):
return record.toUnicode().replace( return currentRecord.toUnicode().replace(
nameRecord.toUnicode(), nameIDs[nameRecord.nameID] nameRecord.toUnicode(), nameIDs[nameRecord.nameID]
) )
# TODO (M Foley) Construct new uniqueID if full name or postscript names are not subsets # TODO (M Foley) Construct new uniqueID if full name or postscript names are not subsets