1
0
mirror of https://github.com/ryanoasis/nerd-fonts.git synced 2025-01-13 03:03:33 +02:00

Resolves conflicts

This commit is contained in:
Ryan L McIntyre 2019-07-05 12:32:06 -07:00
parent e3710e3875
commit f49b92cb6c

View File

@ -305,40 +305,25 @@ class font_patcher:
# the same name as the same font, even if subFamily is different. # the same name as the same font, even if subFamily is different.
fontname += '-' + subFamily fontname += '-' + subFamily
# rename font # rename font
#
def replace_all(text, dic): # comply with SIL Open Font License (OFL)
for i, j in dic.items(): reservedFontNameReplacements = {
text = text.replace(i, j) 'source' : 'sauce',
return text 'Source' : 'Sauce',
'hermit' : 'hurmit',
'Hermit' : 'Hurmit',
def make_sure_path_exists(path): 'hasklig' : 'hasklug',
try: 'Hasklig' : 'Hasklug',
os.makedirs(path) 'Share' : 'Shure',
except OSError as exception: 'share' : 'shure',
if exception.errno != errno.EEXIST: 'IBMPlex' : 'Blex',
raise 'ibmplex' : 'blex',
'IBM-Plex': 'Blex',
make_sure_path_exists(args.outputdir) 'IBM Plex': 'Blex',
'terminus': 'terminess',
# comply with SIL Open Font License (OFL) 'Terminus': 'Terminess'
reservedFontNameReplacements = { }
'source' : 'sauce',
'Source' : 'Sauce',
'hermit' : 'hurmit',
'Hermit' : 'Hurmit',
'hasklig' : 'hasklug',
'Hasklig' : 'Hasklug',
'Share' : 'Shure',
'share' : 'shure',
'IBMPlex' : 'Blex',
'ibmplex' : 'blex',
'IBM-Plex': 'Blex',
'IBM Plex': 'Blex',
'terminus': 'terminess',
'Terminus': 'Terminess'
}
# remove overly verbose font names # remove overly verbose font names
# particularly regarding Powerline sourced Fonts (https://github.com/powerline/fonts) # particularly regarding Powerline sourced Fonts (https://github.com/powerline/fonts)