diff --git a/bin/scripts/name_parser/FontnameTools.py b/bin/scripts/name_parser/FontnameTools.py index 8b85287..1806856 100644 --- a/bin/scripts/name_parser/FontnameTools.py +++ b/bin/scripts/name_parser/FontnameTools.py @@ -195,6 +195,7 @@ class FontnameTools: ( 'IBM[- ]?plex', r'Blex' ), # We do not keep the case here ( '(i)ntel( ?)(o)ne', r'\1ntone' ), ( '(l)iberation', r'\1iteration' ), + ( '(m)onaspace', r'\1onaspice' ), ( '(m)( ?)plus', r'\1+'), # Added this, because they use a plus symbol :-> ( '(s)hare', r'\1hure' ), ( '(s)ource', r'\1auce' ), @@ -211,6 +212,11 @@ class FontnameTools: ( '(overpass ?m)ono', r'\1'), # Overpass Mono -> Overpass M ( '(proggyclean) ?tt', r'\1'), # Remove TT from ProggyClean ( '(terminess) ?\(ttf\)', r'\1'), # Remove TTF from Terminus (after renamed to Terminess) + ( '(.*ne)on', r'\1'), # Monaspace shorten face name + ( '(.*ar)gon', r'\1'), # Monaspace shorten face name + ( '(.*kr)ypton', r'\1'), # Monaspace shorten face name + ( '(.*xe)non', r'\1'), # Monaspace shorten face name + ( '(.*r)adon', r'\1n'), # Monaspace shorten face name ( '(im ?writing ?q)uattro', r'\1uat'), # Rename iM Writing Quattro to Quat ( '(im ?writing ?(mono|duo|quat)) ?s', r'\1'), # Remove S from all iM Writing styles ] diff --git a/font-patcher b/font-patcher index 27032a6..386d1e8 100755 --- a/font-patcher +++ b/font-patcher @@ -1,14 +1,14 @@ #!/usr/bin/env python # coding=utf8 -# Nerd Fonts Version: 3.0.2 +# Nerd Fonts Version: 3.1.0 # Script version is further down from __future__ import absolute_import, print_function, unicode_literals # Change the script version when you edit this script: -script_version = "4.7.1" +script_version = "4.8.1" -version = "3.0.2" +version = "3.1.0" projectName = "Nerd Fonts" projectNameAbbreviation = "NF" projectNameSingular = projectName[:-1] @@ -858,9 +858,9 @@ class font_patcher: 'default': {'align': 'c', 'valign': 'c', 'stretch': 'pa', 'params': {}}, # Arrow tips - 0xe0b0: {'align': 'l', 'valign': 'c', 'stretch': 'xy', 'params': {'overlap': 0.02, 'xy-ratio': 0.7}}, + 0xe0b0: {'align': 'l', 'valign': 'c', 'stretch': 'xy', 'params': {'overlap': 0.06, 'xy-ratio': 0.7}}, 0xe0b1: {'align': 'l', 'valign': 'c', 'stretch': 'xy', 'params': {'xy-ratio': 0.7}}, - 0xe0b2: {'align': 'r', 'valign': 'c', 'stretch': 'xy', 'params': {'overlap': 0.02, 'xy-ratio': 0.7}}, + 0xe0b2: {'align': 'r', 'valign': 'c', 'stretch': 'xy', 'params': {'overlap': 0.06, 'xy-ratio': 0.7}}, 0xe0b3: {'align': 'r', 'valign': 'c', 'stretch': 'xy', 'params': {'xy-ratio': 0.7}}, # Rounded arcs @@ -1080,7 +1080,7 @@ class font_patcher: {'Enabled': False , 'Name': "Material legacy", 'Filename': "materialdesignicons-webfont.ttf", 'Exact': False, 'SymStart': 0xF001, 'SymEnd': 0xF847, 'SrcStart': 0xF500, 'ScaleRules': None, 'Attributes': SYM_ATTR_DEFAULT}, {'Enabled': self.args.material, 'Name': "Material", 'Filename': "materialdesign/MaterialDesignIconsDesktop.ttf", 'Exact': True, 'SymStart': 0xF0001,'SymEnd': 0xF1AF0,'SrcStart': None, 'ScaleRules': MDI_SCALE_LIST, 'Attributes': SYM_ATTR_DEFAULT}, {'Enabled': self.args.weather, 'Name': "Weather Icons", 'Filename': "weather-icons/weathericons-regular-webfont.ttf", 'Exact': False, 'SymStart': 0xF000, 'SymEnd': 0xF0EB, 'SrcStart': 0xE300, 'ScaleRules': WEATH_SCALE_LIST, 'Attributes': SYM_ATTR_DEFAULT}, - {'Enabled': self.args.fontlogos, 'Name': "Font Logos", 'Filename': "font-logos.ttf", 'Exact': True, 'SymStart': 0xF300, 'SymEnd': 0xF32F, 'SrcStart': None, 'ScaleRules': None, 'Attributes': SYM_ATTR_DEFAULT}, + {'Enabled': self.args.fontlogos, 'Name': "Font Logos", 'Filename': "font-logos.ttf", 'Exact': True, 'SymStart': 0xF300, 'SymEnd': 0xF372, 'SrcStart': None, 'ScaleRules': None, 'Attributes': SYM_ATTR_DEFAULT}, {'Enabled': self.args.octicons, 'Name': "Octicons", 'Filename': "octicons/octicons.ttf", 'Exact': False, 'SymStart': 0xF000, 'SymEnd': 0xF105, 'SrcStart': 0xF400, 'ScaleRules': OCTI_SCALE_LIST, 'Attributes': SYM_ATTR_DEFAULT}, # Magnifying glass {'Enabled': self.args.octicons, 'Name': "Octicons", 'Filename': "octicons/octicons.ttf", 'Exact': True, 'SymStart': 0x2665, 'SymEnd': 0x2665, 'SrcStart': None, 'ScaleRules': OCTI_SCALE_LIST, 'Attributes': SYM_ATTR_DEFAULT}, # Heart {'Enabled': self.args.octicons, 'Name': "Octicons", 'Filename': "octicons/octicons.ttf", 'Exact': True, 'SymStart': 0X26A1, 'SymEnd': 0X26A1, 'SrcStart': None, 'ScaleRules': OCTI_SCALE_LIST, 'Attributes': SYM_ATTR_DEFAULT}, # Zap diff --git a/src/glyphs/PowerlineExtraSymbols.otf b/src/glyphs/PowerlineExtraSymbols.otf index ef60f81..a1c51c9 100644 Binary files a/src/glyphs/PowerlineExtraSymbols.otf and b/src/glyphs/PowerlineExtraSymbols.otf differ diff --git a/src/glyphs/font-logos.ttf b/src/glyphs/font-logos.ttf index 242e083..5ba82f0 100644 Binary files a/src/glyphs/font-logos.ttf and b/src/glyphs/font-logos.ttf differ diff --git a/src/glyphs/original-source.otf b/src/glyphs/original-source.otf index 529c89a..422fc3d 100644 Binary files a/src/glyphs/original-source.otf and b/src/glyphs/original-source.otf differ diff --git a/src/glyphs/powerline-symbols/PowerlineSymbols.otf b/src/glyphs/powerline-symbols/PowerlineSymbols.otf index b1582af..bdc6934 100644 Binary files a/src/glyphs/powerline-symbols/PowerlineSymbols.otf and b/src/glyphs/powerline-symbols/PowerlineSymbols.otf differ