From 45f9551d73424f9073fe9eb2254e384cca1bf41b Mon Sep 17 00:00:00 2001 From: Fini Jastrow Date: Fri, 31 Mar 2023 11:54:18 +0200 Subject: [PATCH] font-patcher: Unify naming variants [why] The short form of 'Nerd Font Mono' is 'NFM'. The PS names have a mixture 'NerdFontM'. Signed-off-by: Fini Jastrow --- font-patcher | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/font-patcher b/font-patcher index 82c138389..11dee717c 100755 --- a/font-patcher +++ b/font-patcher @@ -523,18 +523,21 @@ class font_patcher: # add mono signifier to beginning of name suffix if self.args.single: - additionalFontNameSuffix = " M" + additionalFontNameSuffix - verboseAdditionalFontNameSuffix = " Mono" + verboseAdditionalFontNameSuffix + variant_abbrev = "M" + variant_full = " Mono" elif self.args.nonmono and not self.symbolsonly: - additionalFontNameSuffix = " P" + additionalFontNameSuffix - verboseAdditionalFontNameSuffix = " Propo" + verboseAdditionalFontNameSuffix + variant_abbrev = "P" + variant_full = " Propo" + else: + variant_abbrev = "" + variant_full = "" # add 'Nerd Font' to beginning of name suffix - verboseAdditionalFontNameSuffix = " " + projectNameSingular + verboseAdditionalFontNameSuffix + verboseAdditionalFontNameSuffix = " " + projectNameSingular + variant_full + verboseAdditionalFontNameSuffix if self.args.windows: # attempt to shorten here on the additional name BEFORE trimming later - additionalFontNameSuffix = " " + projectNameAbbreviation + additionalFontNameSuffix + additionalFontNameSuffix = " " + projectNameAbbreviation + variant_abbrev + additionalFontNameSuffix else: - additionalFontNameSuffix = " " + projectNameSingular + additionalFontNameSuffix + additionalFontNameSuffix = " " + projectNameSingular + variant_full + additionalFontNameSuffix if FontnameParserOK and self.args.makegroups: use_fullname = isinstance(font.fullname, str) # Usually the fullname is better to parse