Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-06 15:13:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

[0.4.14][SETUP][BOOTDATA][FONTS][INF][MEDIA][ROSTESTS] Monospaced fonts and substitution

Browse source 
Switches from "FreeMono" and "Dejavu Sans Mono" to "Courier New" and "Lucida Console"
and therefore brings us closer to 2k3sp2 stock fonts. Saves some RAM also.
Deletes some "Ubuntu" font left-overs in some Themes.

CORE-18605 (and partially CORE-16264)

By porting back the following commits:
0.4.15-dev-5362-g c47758b102 [SETUP][INF][MEDIA] Get rid of the last Ubuntu references CORE-18607 (#4871)
0.4.15-dev-5336-g bd40c13f6f [SETUP][BOOTDATA][FONTS][INF] Delete DejaVu Sans Mono and re-map (#4856)
0.4.15-dev-5335-g a4193ade03 [SETUP][FONTS][INF][GDI32_APITEST] Delete FreeMono and re-map (#4852)
0.4.15-dev-5324-g d035452148 [SETUP][INF][ROSTESTS] Delete font substitutions and tests for "DejaVu Sans" (#4829)
This commit is contained in:
Joachim Henze 2023-01-06 09:38:59 +01:00
parent 5dfa141eb6
commit fe85357afe
32 changed files with 380 additions and 9907 deletions
Download patch file Download diff file Expand all files Collapse all files

114
base/setup/lib/muifonts.h
View file

@ -8,7 +8,7 @@ MUI_SUBFONT LatinFonts[] =
{ L"Arial CYR,204", L"Arial,204" },
{ L"Arial Greek,161", L"Arial,161" },
{ L"Arial TUR,162", L"Arial,162" },
{ L"Courier", L"FreeMono" },
{ L"Courier", L"Courier New" },
{ L"Courier New Baltic,186", L"Courier New,186" },
{ L"Courier New CE,238", L"Courier New,238" },
{ L"Courier New CYR,204", L"Courier New,204" },
@ -21,7 +21,7 @@ MUI_SUBFONT LatinFonts[] =
{ L"MS Shell Dlg", L"Tahoma" },
{ L"MS Shell Dlg 2", L"Tahoma" },
{ L"System", L"FreeSans" },
{ L"Terminal", L"DejaVu Sans Mono" },
{ L"Terminal", L"Lucida Console" },
{ L"Times", L"Times New Roman" },
{ L"Times New Roman Baltic,186", L"Times New Roman,186" },
{ L"Times New Roman CE,238", L"Times New Roman,238" },
@ -39,7 +39,7 @@ MUI_SUBFONT CyrillicFonts[] =
{ L"Arial CYR,204", L"Arial,204" },
{ L"Arial Greek,161", L"Arial,161" },
{ L"Arial TUR,162", L"Arial,162" },
{ L"Courier", L"FreeMono" },
{ L"Courier", L"Courier New" },
{ L"Courier New Baltic,186", L"Courier New,186" },
{ L"Courier New CE,238", L"Courier New,238" },
{ L"Courier New CYR,204", L"Courier New,204" },
@ -52,7 +52,7 @@ MUI_SUBFONT CyrillicFonts[] =
{ L"MS Shell Dlg", L"Tahoma" },
{ L"MS Shell Dlg 2", L"Tahoma" },
{ L"System", L"FreeSans" },
{ L"Terminal", L"DejaVu Sans Mono" },
{ L"Terminal", L"Lucida Console" },
{ L"Times", L"Times New Roman" },
{ L"Times New Roman Baltic,186", L"Times New Roman,186" },
{ L"Times New Roman CE,238", L"Times New Roman,238" },
@ -70,40 +70,7 @@ MUI_SUBFONT GreekFonts[] =
{ L"Arial CYR,204", L"Arial,204" },
{ L"Arial Greek,161", L"Arial,161" },
{ L"Arial TUR,162", L"Arial,162" },
{ L"Courier", L"FreeMono" },
{ L"Courier New Baltic,186", L"Courier New,186" },
{ L"Courier New CE,238", L"Courier New,238" },
{ L"Courier New CYR,204", L"Courier New,204" },
{ L"Courier New Greek,161", L"Courier New,161" },
{ L"Courier New TUR,162", L"Courier New,162" },
{ L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" },
{ L"Helv", L"DejaVu Sans" },
{ L"Helvetica", L"Arial" },
{ L"MS Sans Serif", L"DejaVu Sans" },
{ L"MS Shell Dlg", L"DejaVu Sans" },
{ L"MS Shell Dlg 2", L"DejaVu Sans" },
{ L"System", L"FreeSans" },
{ L"Tahoma", L"DejaVu Sans" },
{ L"Terminal", L"DejaVu Sans Mono" },
{ L"Times", L"Times New Roman" },
{ L"Times New Roman Baltic,186", L"Times New Roman,186" },
{ L"Times New Roman CE,238", L"Times New Roman,238" },
{ L"Times New Roman CYR,204", L"Times New Roman,204" },
{ L"Times New Roman Greek,161", L"Times New Roman,161" },
{ L"Times New Roman TUR,162", L"Times New Roman,162" },
{ L"Tms Rmn", L"Times New Roman" },
{ NULL, NULL }
};
MUI_SUBFONT HebrewFonts[] =
{
{ L"Arial", L"DejaVu Sans" },
{ L"Arial Baltic,186", L"Arial,186" },
{ L"Arial CE,238", L"Arial,238" },
{ L"Arial CYR,204", L"Arial,204" },
{ L"Arial Greek,161", L"Arial,161" },
{ L"Arial TUR,162", L"Arial,162" },
{ L"Courier", L"FreeMono" },
{ L"Courier", L"Courier New" },
{ L"Courier New Baltic,186", L"Courier New,186" },
{ L"Courier New CE,238", L"Courier New,238" },
{ L"Courier New CYR,204", L"Courier New,204" },
@ -116,7 +83,38 @@ MUI_SUBFONT HebrewFonts[] =
{ L"MS Shell Dlg", L"Tahoma" },
{ L"MS Shell Dlg 2", L"Tahoma" },
{ L"System", L"FreeSans" },
{ L"Terminal", L"DejaVu Sans Mono" },
{ L"Terminal", L"Lucida Console" },
{ L"Times", L"Times New Roman" },
{ L"Times New Roman Baltic,186", L"Times New Roman,186" },
{ L"Times New Roman CE,238", L"Times New Roman,238" },
{ L"Times New Roman CYR,204", L"Times New Roman,204" },
{ L"Times New Roman Greek,161", L"Times New Roman,161" },
{ L"Times New Roman TUR,162", L"Times New Roman,162" },
{ L"Tms Rmn", L"Times New Roman" },
{ NULL, NULL }
};
MUI_SUBFONT HebrewFonts[] =
{
{ L"Arial Baltic,186", L"Arial,186" },
{ L"Arial CE,238", L"Arial,238" },
{ L"Arial CYR,204", L"Arial,204" },
{ L"Arial Greek,161", L"Arial,161" },
{ L"Arial TUR,162", L"Arial,162" },
{ L"Courier", L"Courier New" },
{ L"Courier New Baltic,186", L"Courier New,186" },
{ L"Courier New CE,238", L"Courier New,238" },
{ L"Courier New CYR,204", L"Courier New,204" },
{ L"Courier New Greek,161", L"Courier New,161" },
{ L"Courier New TUR,162", L"Courier New,162" },
{ L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" },
{ L"Helv", L"Tahoma" },
{ L"Helvetica", L"Arial" },
{ L"MS Sans Serif", L"Tahoma" },
{ L"MS Shell Dlg", L"Tahoma" },
{ L"MS Shell Dlg 2", L"Tahoma" },
{ L"System", L"FreeSans" },
{ L"Terminal", L"Courier New" },
{ L"Times", L"Times New Roman" },
{ L"Times New Roman Baltic,186", L"Times New Roman,186" },
{ L"Times New Roman CE,238", L"Times New Roman,238" },
@ -124,7 +122,6 @@ MUI_SUBFONT HebrewFonts[] =
{ L"Times New Roman Greek,161", L"Times New Roman,161" },
{ L"Times New Roman TUR,162", L"Times New Roman,162" },
{ L"Tms Rmn", L"Times New Roman" },
{ L"Ubuntu", L"Tahoma" },
{ NULL, NULL }
};
@ -140,7 +137,7 @@ MUI_SUBFONT ChineseSimplifiedFonts[] =
{ L"Arial CYR,204", L"Arial,204" },
{ L"Arial Greek,161", L"Arial,161" },
{ L"Arial TUR,162", L"Arial,162" },
{ L"Courier", L"FreeMono" },
{ L"Courier", L"Courier New" },
{ L"Courier New Baltic,186", L"Courier New,186" },
{ L"Courier New CE,238", L"Courier New,238" },
{ L"Courier New CYR,204", L"Courier New,204" },
@ -161,7 +158,7 @@ MUI_SUBFONT ChineseSimplifiedFonts[] =
{ L"SimSun", L"Droid Sans Fallback" },
{ L"System", L"Droid Sans Fallback" },
{ L"Tahoma", L"Droid Sans Fallback" },
{ L"Terminal", L"DejaVu Sans Mono" },
{ L"Terminal", L"Lucida Console" },
{ L"Times", L"Times New Roman" },
{ L"Times New Roman Baltic,186", L"Times New Roman,186" },
{ L"Times New Roman CE,238", L"Times New Roman,238" },
@ -170,7 +167,6 @@ MUI_SUBFONT ChineseSimplifiedFonts[] =
{ L"Times New Roman TUR,162", L"Times New Roman,162" },
{ L"Tms Rmn", L"Times New Roman" },
{ L"Trebuchet MS", L"Droid Sans Fallback" },
{ L"Ubuntu", L"Droid Sans Fallback" },
/* localized names */
{ CSF_LocalName0, L"Droid Sans Fallback" },
{ CSF_LocalName1, L"Droid Sans Fallback" },
@ -191,7 +187,7 @@ MUI_SUBFONT ChineseTraditionalFonts[] =
{ L"Arial CYR,204", L"Arial,204" },
{ L"Arial Greek,161", L"Arial,161" },
{ L"Arial TUR,162", L"Arial,162" },
{ L"Courier", L"FreeMono" },
{ L"Courier", L"Courier New" },
{ L"Courier New Baltic,186", L"Courier New,186" },
{ L"Courier New CE,238", L"Courier New,238" },
{ L"Courier New CYR,204", L"Courier New,204" },
@ -213,7 +209,7 @@ MUI_SUBFONT ChineseTraditionalFonts[] =
{ L"PMingLiU", L"Droid Sans Fallback" },
{ L"System", L"Droid Sans Fallback" },
{ L"Tahoma", L"Droid Sans Fallback" },
{ L"Terminal", L"DejaVu Sans Mono" },
{ L"Terminal", L"Lucida Console" },
{ L"Times", L"Times New Roman" },
{ L"Times New Roman Baltic,186", L"Times New Roman,186" },
{ L"Times New Roman CE,238", L"Times New Roman,238" },
@ -222,7 +218,6 @@ MUI_SUBFONT ChineseTraditionalFonts[] =
{ L"Times New Roman TUR,162", L"Times New Roman,162" },
{ L"Tms Rmn", L"Times New Roman" },
{ L"Trebuchet MS", L"Droid Sans Fallback" },
{ L"Ubuntu", L"Droid Sans Fallback" },
/* localized names */
{ CTF_LocalName0, L"Droid Sans Fallback" },
{ CTF_LocalName1, L"Droid Sans Fallback" },
@ -242,7 +237,7 @@ MUI_SUBFONT JapaneseFonts[] =
{ L"Arial CYR,204", L"Arial,204" },
{ L"Arial Greek,161", L"Arial,161" },
{ L"Arial TUR,162", L"Arial,162" },
{ L"Courier", L"FreeMono" },
{ L"Courier", L"Courier New" },
{ L"Courier New Baltic,186", L"Courier New,186" },
{ L"Courier New CE,238", L"Courier New,238" },
{ L"Courier New CYR,204", L"Courier New,204" },
@ -263,7 +258,7 @@ MUI_SUBFONT JapaneseFonts[] =
{ L"MS UI Gothic 2", L"Droid Sans Fallback" },
{ L"System", L"Droid Sans Fallback" },
{ L"Tahoma", L"Droid Sans Fallback" },
{ L"Terminal", L"DejaVu Sans Mono" },
{ L"Terminal", L"Lucida Console" },
{ L"Times", L"Times New Roman" },
{ L"Times New Roman Baltic,186", L"Times New Roman,186" },
{ L"Times New Roman CE,238", L"Times New Roman,238" },
@ -272,7 +267,6 @@ MUI_SUBFONT JapaneseFonts[] =
{ L"Times New Roman TUR,162", L"Times New Roman,162" },
{ L"Tms Rmn", L"Times New Roman" },
{ L"Trebuchet MS", L"Droid Sans Fallback" },
{ L"Ubuntu", L"Droid Sans Fallback" },
/* localized names */
{ JF_LocalName0, L"Droid Sans Fallback" },
{ JF_LocalName1, L"Droid Sans Fallback" },
@ -296,7 +290,7 @@ MUI_SUBFONT KoreanFonts[] =
{ L"Arial TUR,162", L"Arial,162" },
{ L"Batang", L"Droid Sans Fallback" },
{ L"BatangChe", L"Droid Sans Fallback" },
{ L"Courier", L"FreeMono" },
{ L"Courier", L"Courier New" },
{ L"Courier New Baltic,186", L"Courier New,186" },
{ L"Courier New CE,238", L"Courier New,238" },
{ L"Courier New CYR,204", L"Courier New,204" },
@ -317,7 +311,7 @@ MUI_SUBFONT KoreanFonts[] =
{ L"MS UI Gothic 2", L"Droid Sans Fallback" },
{ L"System", L"Droid Sans Fallback" },
{ L"Tahoma", L"Droid Sans Fallback" },
{ L"Terminal", L"DejaVu Sans Mono" },
{ L"Terminal", L"Lucida Console" },
{ L"Times", L"Times New Roman" },
{ L"Times New Roman Baltic,186", L"Times New Roman,186" },
{ L"Times New Roman CE,238", L"Times New Roman,238" },
@ -326,7 +320,6 @@ MUI_SUBFONT KoreanFonts[] =
{ L"Times New Roman TUR,162", L"Times New Roman,162" },
{ L"Tms Rmn", L"Times New Roman" },
{ L"Trebuchet MS", L"Droid Sans Fallback" },
{ L"Ubuntu", L"Droid Sans Fallback" },
/* localized names */
{ KF_LocalName0, L"Droid Sans Fallback" },
{ KF_LocalName1, L"Droid Sans Fallback" },
@ -339,28 +332,21 @@ MUI_SUBFONT KoreanFonts[] =
MUI_SUBFONT UnicodeFonts[] =
{
{ L"Arial", L"DejaVu Sans" },
{ L"Arial Baltic,186", L"Arial,186" },
{ L"Arial CE,238", L"Arial,238" },
{ L"Arial CYR,204", L"Arial,204" },
{ L"Arial Greek,161", L"Arial,161" },
{ L"Arial TUR,162", L"Arial,162" },
{ L"Courier", L"DejaVu Sans Mono" },
{ L"Courier New", L"DejaVu Sans Mono" },
{ L"Courier", L"Courier New" },
{ L"Courier New Baltic,186", L"Courier New,186" },
{ L"Courier New CE,238", L"Courier New,238" },
{ L"Courier New CYR,204", L"Courier New,204" },
{ L"Courier New Greek,161", L"Courier New,161" },
{ L"Courier New TUR,162", L"Courier New,162" },
{ L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" },
{ L"Helv", L"DejaVu Sans" },
{ L"Helvetica", L"Arial" },
{ L"MS Sans Serif", L"DejaVu Sans" },
{ L"MS Shell Dlg", L"DejaVu Sans" },
{ L"MS Shell Dlg 2", L"DejaVu Sans" },
{ L"System", L"FreeSans" },
{ L"Tahoma", L"DejaVu Sans" },
{ L"Terminal", L"DejaVu Sans Mono" },
{ L"Terminal", L"Courier New" },
{ L"Times", L"Times New Roman" },
{ L"Times New Roman Baltic,186", L"Times New Roman,186" },
{ L"Times New Roman CE,238", L"Times New Roman,238" },
@ -379,14 +365,14 @@ MUI_SUBFONT HindiFonts[] =
{ L"Arial CYR,204", L"Arial,204" },
{ L"Arial Greek,161", L"Arial,161" },
{ L"Arial TUR,162", L"Arial,162" },
{ L"Courier", L"FreeMono" },
{ L"Courier", L"Courier New" },
{ L"Courier New Baltic,186", L"Courier New,186" },
{ L"Courier New CE,238", L"Courier New,238" },
{ L"Courier New CYR,204", L"Courier New,204" },
{ L"Courier New Greek,161", L"Courier New,161" },
{ L"Courier New TUR,162", L"Courier New,162" },
{ L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" },
{ L"Helv", L"Tahoma" },
{ L"Helv", L"FreeSans" },
{ L"Helvetica", L"Arial" },
{ L"MS Sans Serif", L"FreeSans" },
{ L"MS Shell Dlg", L"FreeSans" },
@ -394,7 +380,7 @@ MUI_SUBFONT HindiFonts[] =
{ L"Palatino Linotype", L"FreeSans" },
{ L"System", L"FreeSans" },
{ L"Tahoma", L"FreeSans" },
{ L"Terminal", L"DejaVu Sans Mono" },
{ L"Terminal", L"Lucida Console" },
{ L"Times", L"Times New Roman" },
{ L"Times New Roman Baltic,186", L"Times New Roman,186" },
{ L"Times New Roman CE,238", L"Times New Roman,238" },