mirror of
https://github.com/rsms/inter.git
synced 2024-09-11 10:55:24 +03:00
fix version property in misc/tools/fontinfo.py
This commit is contained in:
parent
77fd0e96d1
commit
37508ff34a
@ -275,13 +275,17 @@ def genFontInfo(fontpath, outputType, withGlyphs=True):
|
|||||||
# print('table', tableName)
|
# print('table', tableName)
|
||||||
|
|
||||||
nameDict = {}
|
nameDict = {}
|
||||||
|
version = None
|
||||||
if 'name' in tt:
|
if 'name' in tt:
|
||||||
nameDict = {}
|
nameDict = {}
|
||||||
for rec in tt['name'].names:
|
for rec in tt['name'].names:
|
||||||
k = '#%d' % rec.nameID
|
k = '#%d' % rec.nameID
|
||||||
|
value = rec.toUnicode()
|
||||||
if rec.nameID in _NAME_IDS:
|
if rec.nameID in _NAME_IDS:
|
||||||
|
if _NAME_IDS[rec.nameID] == 'version':
|
||||||
|
version = value
|
||||||
k += ' ' + _NAME_IDS[rec.nameID]
|
k += ' ' + _NAME_IDS[rec.nameID]
|
||||||
nameDict[k] = rec.toUnicode()
|
nameDict[k] = value
|
||||||
if 'fontId' in nameDict:
|
if 'fontId' in nameDict:
|
||||||
info['id'] = nameDict['fontId']
|
info['id'] = nameDict['fontId']
|
||||||
|
|
||||||
@ -292,8 +296,7 @@ def genFontInfo(fontpath, outputType, withGlyphs=True):
|
|||||||
if 'subfamilyName' in nameDict:
|
if 'subfamilyName' in nameDict:
|
||||||
info['name'] += '-' + nameDict['subfamilyName'].replace(' ', '')
|
info['name'] += '-' + nameDict['subfamilyName'].replace(' ', '')
|
||||||
|
|
||||||
if 'version' in nameDict:
|
if version:
|
||||||
version = nameDict['version']
|
|
||||||
v = re.split(r'[\s;]+', version)
|
v = re.split(r'[\s;]+', version)
|
||||||
if v and len(v) > 0:
|
if v and len(v) > 0:
|
||||||
version = v[0]
|
version = v[0]
|
||||||
|
Loading…
Reference in New Issue
Block a user