From 447fbc2669d42263ef361647287cae34ca20232e Mon Sep 17 00:00:00 2001 From: Fini Jastrow Date: Fri, 10 Nov 2023 20:37:39 +0100 Subject: [PATCH] Monaspace: Follow RFN rule (WIP) [why] Monaspace has an RFN that individually protects 'Monaspace' and all the face names of noble gases 'Xenon' etc. Both must not be used on patched fonts. [how] Just add the rule(s). The concrete naming is not decided yet. Signed-off-by: Fini Jastrow --- bin/scripts/lib/fonts.json | 4 ++-- bin/scripts/name_parser/FontnameTools.py | 6 ++++++ readme.md | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/bin/scripts/lib/fonts.json b/bin/scripts/lib/fonts.json index baf406960..9bf9aaafa 100644 --- a/bin/scripts/lib/fonts.json +++ b/bin/scripts/lib/fonts.json @@ -410,9 +410,9 @@ { "unpatchedName": "Monaspace", "RFN": true, - "patchedName": "Monaspace", + "patchedName": "Monispace", "folderName": "Monaspace", - "imagePreviewFont": "MonaspaceNeon Nerd Font", + "imagePreviewFont": "MonispaceNe Nerd Font", "linkPreviewFont": false, "caskName": "monaspace", "repoRelease": false, diff --git a/bin/scripts/name_parser/FontnameTools.py b/bin/scripts/name_parser/FontnameTools.py index 2e848eed6..e7614bd4f 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'\1onispace' ), ( '(m)( ?)plus', r'\1+'), # Added this, because they use a plus symbol :-> ( '(s)hare', r'\1hure' ), ( '(s)ource', r'\1auce' ), @@ -212,6 +213,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'\1d'), # 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/readme.md b/readme.md index d43035762..8707b5a0d 100644 --- a/readme.md +++ b/readme.md @@ -149,7 +149,7 @@ See [Wiki: Icon names in shell][wiki-icon-names-in-shell] | [Literation Mono Nerd Font][p-liberation] | [Liberation][f-liberation] | 2.1.5 | YES | ![w] ![m2] ![l] | | [Lilex Nerd Font][p-lilex] | [Lilex][f-lilex] | 2.000 | NO | ![w2] ![m2] ![l] | | [Meslo Nerd Font][p-meslo] | [Meslo][f-meslo] | 1.21 | NO | ![w] ![m2] ![l] | -| [Monaspace Nerd Font][p-monaspace] | [Monaspace][f-monaspace] | 1.0.0 | YES | ![w] ![m2] ![l] | +| [Monispace Nerd Font][p-monaspace] | [Monaspace][f-monaspace] | 1.0.0 | YES | ![w] ![m2] ![l] | | [Monofur Nerd Font][p-monofur] | Tobias B Koehler | 1.0 | NO | ![w] ![m2] ![l] | | [Monoid Nerd Font][p-monoid] | [Monoid][f-monoid] | 0.61 | NO | ![w] ![m2] ![l] | | [Mononoki Nerd Font][p-mononoki] | [Mononoki][f-mononoki] | 1.6 | YES | ![w] ![m2] ![l] |