ryanoasis · Finii · Nov 11, 2023 · Sep 26, 2023
diff --git a/bin/scripts/name_parser/FontnameTools.py b/bin/scripts/name_parser/FontnameTools.py
@@ -203,7 +203,6 @@ def postscript_char_filter(name):
         ( 'IBM 3270',                   r'3270'), # for historical reasons and 'IBM' is a TM or something
         # Some name parts that are too long for us
         ( '(.*sans ?m)ono',             r'\1'), # Various SomenameSansMono fonts
-        ( '(.*code ?lat)in Expanded',   r'\1X'), # for 'M PLUS Code Latin Expanded'
         ( '(.*code ?lat)in',            r'\1'), # for 'M PLUS Code Latin'
         ( '(b)ig( ?)(b)lue( ?)(t)erminal', r'\1ig\3lue\5erm'), # Shorten BigBlueTerminal
         ( '(.*)437TT',                  r'\g<1>437'), # Shorten BigBlueTerminal 437 TT even further

diff --git a/src/unpatched-fonts/MPlus/M_Plus_1/MPLUS1-Black.ttf b/src/unpatched-fonts/MPlus/M_Plus_1/MPLUS1-Black.ttf
diff --git a/src/unpatched-fonts/MPlus/M_Plus_1/MPLUS1-Bold.ttf b/src/unpatched-fonts/MPlus/M_Plus_1/MPLUS1-Bold.ttf
diff --git a/src/unpatched-fonts/MPlus/M_Plus_1/MPLUS1-ExtraBold.ttf b/src/unpatched-fonts/MPlus/M_Plus_1/MPLUS1-ExtraBold.ttf
diff --git a/src/unpatched-fonts/MPlus/M_Plus_1/MPLUS1-ExtraLight.ttf b/src/unpatched-fonts/MPlus/M_Plus_1/MPLUS1-ExtraLight.ttf
diff --git a/src/unpatched-fonts/MPlus/M_Plus_1/MPLUS1-Light.ttf b/src/unpatched-fonts/MPlus/M_Plus_1/MPLUS1-Light.ttf
diff --git a/src/unpatched-fonts/MPlus/M_Plus_1/MPLUS1-Medium.ttf b/src/unpatched-fonts/MPlus/M_Plus_1/MPLUS1-Medium.ttf
diff --git a/src/unpatched-fonts/MPlus/M_Plus_1/MPLUS1-Regular.ttf b/src/unpatched-fonts/MPlus/M_Plus_1/MPLUS1-Regular.ttf
diff --git a/src/unpatched-fonts/MPlus/M_Plus_1/MPLUS1-SemiBold.ttf b/src/unpatched-fonts/MPlus/M_Plus_1/MPLUS1-SemiBold.ttf
diff --git a/src/unpatched-fonts/MPlus/M_Plus_1/MPLUS1-Thin.ttf b/src/unpatched-fonts/MPlus/M_Plus_1/MPLUS1-Thin.ttf
diff --git a/src/unpatched-fonts/MPlus/M_Plus_1/Mplus1-Black.ttf b/src/unpatched-fonts/MPlus/M_Plus_1/Mplus1-Black.ttf
diff --git a/src/unpatched-fonts/MPlus/M_Plus_1/Mplus1-Bold.ttf b/src/unpatched-fonts/MPlus/M_Plus_1/Mplus1-Bold.ttf
diff --git a/src/unpatched-fonts/MPlus/M_Plus_1/Mplus1-ExtraBold.ttf b/src/unpatched-fonts/MPlus/M_Plus_1/Mplus1-ExtraBold.ttf
diff --git a/src/unpatched-fonts/MPlus/M_Plus_1/Mplus1-ExtraLight.ttf b/src/unpatched-fonts/MPlus/M_Plus_1/Mplus1-ExtraLight.ttf
diff --git a/src/unpatched-fonts/MPlus/M_Plus_1/Mplus1-Light.ttf b/src/unpatched-fonts/MPlus/M_Plus_1/Mplus1-Light.ttf
diff --git a/src/unpatched-fonts/MPlus/M_Plus_1/Mplus1-Medium.ttf b/src/unpatched-fonts/MPlus/M_Plus_1/Mplus1-Medium.ttf
diff --git a/src/unpatched-fonts/MPlus/M_Plus_1/Mplus1-Regular.ttf b/src/unpatched-fonts/MPlus/M_Plus_1/Mplus1-Regular.ttf
diff --git a/src/unpatched-fonts/MPlus/M_Plus_1/Mplus1-SemiBold.ttf b/src/unpatched-fonts/MPlus/M_Plus_1/Mplus1-SemiBold.ttf
diff --git a/src/unpatched-fonts/MPlus/M_Plus_1/Mplus1-Thin.ttf b/src/unpatched-fonts/MPlus/M_Plus_1/Mplus1-Thin.ttf
diff --git a/src/unpatched-fonts/MPlus/M_Plus_1_code/MPLUS1Code-Bold.ttf b/src/unpatched-fonts/MPlus/M_Plus_1_code/MPLUS1Code-Bold.ttf
diff --git a/src/unpatched-fonts/MPlus/M_Plus_1_code/MPLUS1Code-ExtraLight.ttf b/src/unpatched-fonts/MPlus/M_Plus_1_code/MPLUS1Code-ExtraLight.ttf
diff --git a/src/unpatched-fonts/MPlus/M_Plus_1_code/MPLUS1Code-Light.ttf b/src/unpatched-fonts/MPlus/M_Plus_1_code/MPLUS1Code-Light.ttf
diff --git a/src/unpatched-fonts/MPlus/M_Plus_1_code/MPLUS1Code-Medium.ttf b/src/unpatched-fonts/MPlus/M_Plus_1_code/MPLUS1Code-Medium.ttf
diff --git a/src/unpatched-fonts/MPlus/M_Plus_1_code/MPLUS1Code-Regular.ttf b/src/unpatched-fonts/MPlus/M_Plus_1_code/MPLUS1Code-Regular.ttf
diff --git a/src/unpatched-fonts/MPlus/M_Plus_1_code/MPLUS1Code-SemiBold.ttf b/src/unpatched-fonts/MPlus/M_Plus_1_code/MPLUS1Code-SemiBold.ttf
diff --git a/src/unpatched-fonts/MPlus/M_Plus_1_code/MPLUS1Code-Thin.ttf b/src/unpatched-fonts/MPlus/M_Plus_1_code/MPLUS1Code-Thin.ttf
diff --git a/src/unpatched-fonts/MPlus/M_Plus_1_code/Mplus1Code-Bold.ttf b/src/unpatched-fonts/MPlus/M_Plus_1_code/Mplus1Code-Bold.ttf
diff --git a/src/unpatched-fonts/MPlus/M_Plus_1_code/Mplus1Code-ExtraLight.ttf b/src/unpatched-fonts/MPlus/M_Plus_1_code/Mplus1Code-ExtraLight.ttf
diff --git a/src/unpatched-fonts/MPlus/M_Plus_1_code/Mplus1Code-Light.ttf b/src/unpatched-fonts/MPlus/M_Plus_1_code/Mplus1Code-Light.ttf
diff --git a/src/unpatched-fonts/MPlus/M_Plus_1_code/Mplus1Code-Medium.ttf b/src/unpatched-fonts/MPlus/M_Plus_1_code/Mplus1Code-Medium.ttf
diff --git a/src/unpatched-fonts/MPlus/M_Plus_1_code/Mplus1Code-Regular.ttf b/src/unpatched-fonts/MPlus/M_Plus_1_code/Mplus1Code-Regular.ttf
diff --git a/src/unpatched-fonts/MPlus/M_Plus_1_code/Mplus1Code-SemiBold.ttf b/src/unpatched-fonts/MPlus/M_Plus_1_code/Mplus1Code-SemiBold.ttf
diff --git a/src/unpatched-fonts/MPlus/M_Plus_1_code/Mplus1Code-Thin.ttf b/src/unpatched-fonts/MPlus/M_Plus_1_code/Mplus1Code-Thin.ttf
diff --git a/src/unpatched-fonts/MPlus/M_Plus_2/MPLUS2-Black.ttf b/src/unpatched-fonts/MPlus/M_Plus_2/MPLUS2-Black.ttf
diff --git a/src/unpatched-fonts/MPlus/M_Plus_2/MPLUS2-Bold.ttf b/src/unpatched-fonts/MPlus/M_Plus_2/MPLUS2-Bold.ttf
diff --git a/src/unpatched-fonts/MPlus/M_Plus_2/MPLUS2-ExtraBold.ttf b/src/unpatched-fonts/MPlus/M_Plus_2/MPLUS2-ExtraBold.ttf
diff --git a/src/unpatched-fonts/MPlus/M_Plus_2/MPLUS2-ExtraLight.ttf b/src/unpatched-fonts/MPlus/M_Plus_2/MPLUS2-ExtraLight.ttf
diff --git a/src/unpatched-fonts/MPlus/M_Plus_2/MPLUS2-Light.ttf b/src/unpatched-fonts/MPlus/M_Plus_2/MPLUS2-Light.ttf
diff --git a/src/unpatched-fonts/MPlus/M_Plus_2/MPLUS2-Medium.ttf b/src/unpatched-fonts/MPlus/M_Plus_2/MPLUS2-Medium.ttf
diff --git a/src/unpatched-fonts/MPlus/M_Plus_2/MPLUS2-Regular.ttf b/src/unpatched-fonts/MPlus/M_Plus_2/MPLUS2-Regular.ttf
diff --git a/src/unpatched-fonts/MPlus/M_Plus_2/MPLUS2-SemiBold.ttf b/src/unpatched-fonts/MPlus/M_Plus_2/MPLUS2-SemiBold.ttf
diff --git a/src/unpatched-fonts/MPlus/M_Plus_2/MPLUS2-Thin.ttf b/src/unpatched-fonts/MPlus/M_Plus_2/MPLUS2-Thin.ttf
diff --git a/src/unpatched-fonts/MPlus/M_Plus_2/Mplus2-Black.ttf b/src/unpatched-fonts/MPlus/M_Plus_2/Mplus2-Black.ttf
diff --git a/src/unpatched-fonts/MPlus/M_Plus_2/Mplus2-Bold.ttf b/src/unpatched-fonts/MPlus/M_Plus_2/Mplus2-Bold.ttf
diff --git a/src/unpatched-fonts/MPlus/M_Plus_2/Mplus2-ExtraBold.ttf b/src/unpatched-fonts/MPlus/M_Plus_2/Mplus2-ExtraBold.ttf
diff --git a/src/unpatched-fonts/MPlus/M_Plus_2/Mplus2-ExtraLight.ttf b/src/unpatched-fonts/MPlus/M_Plus_2/Mplus2-ExtraLight.ttf
diff --git a/src/unpatched-fonts/MPlus/M_Plus_2/Mplus2-Light.ttf b/src/unpatched-fonts/MPlus/M_Plus_2/Mplus2-Light.ttf
diff --git a/src/unpatched-fonts/MPlus/M_Plus_2/Mplus2-Medium.ttf b/src/unpatched-fonts/MPlus/M_Plus_2/Mplus2-Medium.ttf
diff --git a/src/unpatched-fonts/MPlus/M_Plus_2/Mplus2-Regular.ttf b/src/unpatched-fonts/MPlus/M_Plus_2/Mplus2-Regular.ttf
diff --git a/src/unpatched-fonts/MPlus/M_Plus_2/Mplus2-SemiBold.ttf b/src/unpatched-fonts/MPlus/M_Plus_2/Mplus2-SemiBold.ttf
diff --git a/src/unpatched-fonts/MPlus/M_Plus_2/Mplus2-Thin.ttf b/src/unpatched-fonts/MPlus/M_Plus_2/Mplus2-Thin.ttf
diff --git a/src/unpatched-fonts/MPlus/M_Plus_code_latin/MPLUSCodeLatin-Bold.ttf b/src/unpatched-fonts/MPlus/M_Plus_code_latin/MPLUSCodeLatin-Bold.ttf
diff --git a/src/unpatched-fonts/MPlus/M_Plus_code_latin/MPLUSCodeLatin-ExtraLight.ttf b/src/unpatched-fonts/MPlus/M_Plus_code_latin/MPLUSCodeLatin-ExtraLight.ttf
diff --git a/src/unpatched-fonts/MPlus/M_Plus_code_latin/MPLUSCodeLatin-Light.ttf b/src/unpatched-fonts/MPlus/M_Plus_code_latin/MPLUSCodeLatin-Light.ttf
diff --git a/src/unpatched-fonts/MPlus/M_Plus_code_latin/MPLUSCodeLatin-Medium.ttf b/src/unpatched-fonts/MPlus/M_Plus_code_latin/MPLUSCodeLatin-Medium.ttf
diff --git a/src/unpatched-fonts/MPlus/M_Plus_code_latin/MPLUSCodeLatin-Regular.ttf b/src/unpatched-fonts/MPlus/M_Plus_code_latin/MPLUSCodeLatin-Regular.ttf
diff --git a/src/unpatched-fonts/MPlus/M_Plus_code_latin/MPLUSCodeLatin-SemiBold.ttf b/src/unpatched-fonts/MPlus/M_Plus_code_latin/MPLUSCodeLatin-SemiBold.ttf
diff --git a/src/unpatched-fonts/MPlus/M_Plus_code_latin/MPLUSCodeLatin-Thin.ttf b/src/unpatched-fonts/MPlus/M_Plus_code_latin/MPLUSCodeLatin-Thin.ttf
diff --git a/src/unpatched-fonts/MPlus/M_Plus_code_latin50/MplusCodeLatin50-Bold.ttf b/src/unpatched-fonts/MPlus/M_Plus_code_latin50/MplusCodeLatin50-Bold.ttf
diff --git a/src/unpatched-fonts/MPlus/M_Plus_code_latin50/MplusCodeLatin50-ExtraLight.ttf b/src/unpatched-fonts/MPlus/M_Plus_code_latin50/MplusCodeLatin50-ExtraLight.ttf
diff --git a/src/unpatched-fonts/MPlus/M_Plus_code_latin50/MplusCodeLatin50-Light.ttf b/src/unpatched-fonts/MPlus/M_Plus_code_latin50/MplusCodeLatin50-Light.ttf
diff --git a/src/unpatched-fonts/MPlus/M_Plus_code_latin50/MplusCodeLatin50-Medium.ttf b/src/unpatched-fonts/MPlus/M_Plus_code_latin50/MplusCodeLatin50-Medium.ttf
diff --git a/src/unpatched-fonts/MPlus/M_Plus_code_latin50/MplusCodeLatin50-Regular.ttf b/src/unpatched-fonts/MPlus/M_Plus_code_latin50/MplusCodeLatin50-Regular.ttf
diff --git a/src/unpatched-fonts/MPlus/M_Plus_code_latin50/MplusCodeLatin50-SemiBold.ttf b/src/unpatched-fonts/MPlus/M_Plus_code_latin50/MplusCodeLatin50-SemiBold.ttf
diff --git a/src/unpatched-fonts/MPlus/M_Plus_code_latin50/MplusCodeLatin50-Thin.ttf b/src/unpatched-fonts/MPlus/M_Plus_code_latin50/MplusCodeLatin50-Thin.ttf
diff --git a/src/unpatched-fonts/MPlus/M_Plus_code_latin60/MplusCodeLatin60-Bold.ttf b/src/unpatched-fonts/MPlus/M_Plus_code_latin60/MplusCodeLatin60-Bold.ttf
diff --git a/src/unpatched-fonts/MPlus/M_Plus_code_latin60/MplusCodeLatin60-ExtraLight.ttf b/src/unpatched-fonts/MPlus/M_Plus_code_latin60/MplusCodeLatin60-ExtraLight.ttf
diff --git a/src/unpatched-fonts/MPlus/M_Plus_code_latin60/MplusCodeLatin60-Light.ttf b/src/unpatched-fonts/MPlus/M_Plus_code_latin60/MplusCodeLatin60-Light.ttf
diff --git a/src/unpatched-fonts/MPlus/M_Plus_code_latin60/MplusCodeLatin60-Medium.ttf b/src/unpatched-fonts/MPlus/M_Plus_code_latin60/MplusCodeLatin60-Medium.ttf
diff --git a/src/unpatched-fonts/MPlus/M_Plus_code_latin60/MplusCodeLatin60-Regular.ttf b/src/unpatched-fonts/MPlus/M_Plus_code_latin60/MplusCodeLatin60-Regular.ttf
diff --git a/src/unpatched-fonts/MPlus/M_Plus_code_latin60/MplusCodeLatin60-SemiBold.ttf b/src/unpatched-fonts/MPlus/M_Plus_code_latin60/MplusCodeLatin60-SemiBold.ttf
diff --git a/src/unpatched-fonts/MPlus/M_Plus_code_latin60/MplusCodeLatin60-Thin.ttf b/src/unpatched-fonts/MPlus/M_Plus_code_latin60/MplusCodeLatin60-Thin.ttf
diff --git a/src/unpatched-fonts/MPlus/M_Plus_code_latin_expanded/MPLUSCodeLatin_Expanded-Bold.ttf b/src/unpatched-fonts/MPlus/M_Plus_code_latin_expanded/MPLUSCodeLatin_Expanded-Bold.ttf
diff --git a/src/unpatched-fonts/MPlus/M_Plus_code_latin_expanded/MPLUSCodeLatin_Expanded-ExtraLight.ttf b/src/unpatched-fonts/MPlus/M_Plus_code_latin_expanded/MPLUSCodeLatin_Expanded-ExtraLight.ttf
diff --git a/src/unpatched-fonts/MPlus/M_Plus_code_latin_expanded/MPLUSCodeLatin_Expanded-Light.ttf b/src/unpatched-fonts/MPlus/M_Plus_code_latin_expanded/MPLUSCodeLatin_Expanded-Light.ttf
diff --git a/src/unpatched-fonts/MPlus/M_Plus_code_latin_expanded/MPLUSCodeLatin_Expanded-Medium.ttf b/src/unpatched-fonts/MPlus/M_Plus_code_latin_expanded/MPLUSCodeLatin_Expanded-Medium.ttf
diff --git a/src/unpatched-fonts/MPlus/M_Plus_code_latin_expanded/MPLUSCodeLatin_Expanded-Regular.ttf b/src/unpatched-fonts/MPlus/M_Plus_code_latin_expanded/MPLUSCodeLatin_Expanded-Regular.ttf
diff --git a/src/unpatched-fonts/MPlus/M_Plus_code_latin_expanded/MPLUSCodeLatin_Expanded-SemiBold.ttf b/src/unpatched-fonts/MPlus/M_Plus_code_latin_expanded/MPLUSCodeLatin_Expanded-SemiBold.ttf
diff --git a/src/unpatched-fonts/MPlus/M_Plus_code_latin_expanded/MPLUSCodeLatin_Expanded-Thin.ttf b/src/unpatched-fonts/MPlus/M_Plus_code_latin_expanded/MPLUSCodeLatin_Expanded-Thin.ttf
diff --git a/src/unpatched-fonts/MPlus/M_Plus_code_latin_expanded/config.cfg b/src/unpatched-fonts/MPlus/M_Plus_code_latin_expanded/config.cfg
diff --git a/src/unpatched-fonts/MPlus/README.md b/src/unpatched-fonts/MPlus/README.md
@@ -4,4 +4,4 @@
 
 For more information have a look at the upstream website: https://github.com/coz-m/MPLUS_FONTS
 
-Version: 1.001 (as of March 2023)
+Version: 1.001 / 1.005 (M+code\_latin) / 1.006 (M+1\_code) (as of September 2023)