https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f054844f33a9d8927ea716a2a17d90c2c7e7c521
commit f054844f33a9d8927ea716a2a17d90c2c7e7c521 Author: Katayama Hirofumi MZ <[email protected]> AuthorDate: Tue Jul 30 22:05:11 2019 +0900 Commit: GitHub <[email protected]> CommitDate: Tue Jul 30 22:05:11 2019 +0900 [SETUP] Sort font substitutes (#1770) Sort the font substitute setting lists in base/setup/lib/muifonts.h . --- base/setup/lib/muifonts.h | 104 +++++++++++++++++++++++----------------------- 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/base/setup/lib/muifonts.h b/base/setup/lib/muifonts.h index 1cdb78ecece..150dee0e61b 100644 --- a/base/setup/lib/muifonts.h +++ b/base/setup/lib/muifonts.h @@ -8,21 +8,21 @@ MUI_SUBFONT LatinFonts[] = { L"Courier New", L"FreeMono" }, { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, { L"Franklin Gothic Medium", L"Libre Franklin Bold" }, + { L"Georgia", L"FreeSerif" }, { L"Helv", L"Tahoma" }, { L"Helvetica", L"Liberation Sans" }, { L"Lucida Console", L"DejaVu Sans Mono" }, { L"MS Sans Serif", L"Tahoma" }, { L"MS Shell Dlg", L"Tahoma" }, { L"MS Shell Dlg 2", L"Tahoma" }, + { L"Palatino Linotype", L"DejaVu Serif" }, + { L"System", L"FreeSans" }, { L"Tahoma", L"Tahoma" }, { L"Terminal", L"DejaVu Sans Mono" }, { L"Times", L"Liberation Serif" }, { L"Times New Roman", L"Liberation Serif" }, { L"Tms Rmn", L"Liberation Serif" }, { L"Trebuchet MS", L"Open Sans" }, - { L"System", L"FreeSans" }, - { L"Georgia", L"FreeSerif" }, - { L"Palatino Linotype", L"DejaVu Serif" }, { NULL, NULL } }; @@ -33,21 +33,21 @@ MUI_SUBFONT CyrillicFonts[] = { L"Courier New", L"FreeMono" }, { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, { L"Franklin Gothic Medium", L"Libre Franklin" }, + { L"Georgia", L"FreeSerif" }, { L"Helv", L"Tahoma" }, { L"Helvetica", L"Liberation Sans" }, { L"Lucida Console", L"DejaVu Sans Mono" }, { L"MS Sans Serif", L"Tahoma" }, { L"MS Shell Dlg", L"Tahoma" }, { L"MS Shell Dlg 2", L"Tahoma" }, + { L"Palatino Linotype", L"DejaVu Serif" }, + { L"System", L"FreeSans" }, { L"Tahoma", L"Tahoma" }, { L"Terminal", L"DejaVu Sans Mono" }, { L"Times", L"Liberation Serif" }, { L"Times New Roman", L"Liberation Serif" }, { L"Tms Rmn", L"Liberation Serif" }, { L"Trebuchet MS", L"Open Sans" }, - { L"System", L"FreeSans" }, - { L"Georgia", L"FreeSerif" }, - { L"Palatino Linotype", L"DejaVu Serif" }, { NULL, NULL } }; @@ -58,21 +58,21 @@ MUI_SUBFONT GreekFonts[] = { L"Courier New", L"FreeMono" }, { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, { L"Franklin Gothic Medium", L"Libre Franklin" }, + { L"Georgia", L"FreeSerif" }, { L"Helv", L"DejaVu Sans" }, { L"Helvetica", L"Liberation Sans" }, { L"Lucida Console", L"DejaVu Sans Mono" }, { L"MS Sans Serif", L"DejaVu Sans" }, { L"MS Shell Dlg", L"DejaVu Sans" }, { L"MS Shell Dlg 2", L"DejaVu Sans" }, + { L"Palatino Linotype", L"DejaVu Serif" }, + { L"System", L"FreeSans" }, { L"Tahoma", L"DejaVu Sans" }, { L"Terminal", L"DejaVu Sans Mono" }, { L"Times", L"Liberation Serif" }, { L"Times New Roman", L"Liberation Serif" }, { L"Tms Rmn", L"Liberation Serif" }, { L"Trebuchet MS", L"Open Sans" }, - { L"System", L"FreeSans" }, - { L"Georgia", L"FreeSerif" }, - { L"Palatino Linotype", L"DejaVu Serif" }, { NULL, NULL } }; @@ -83,21 +83,21 @@ MUI_SUBFONT HebrewFonts[] = { L"Courier New", L"FreeMono" }, { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, { L"Franklin Gothic Medium", L"Libre Franklin" }, + { L"Georgia", L"FreeSerif" }, { L"Helv", L"Tahoma" }, { L"Helvetica", L"Tahoma" }, { L"Lucida Console", L"DejaVu Sans Mono" }, { L"MS Sans Serif", L"Tahoma" }, { L"MS Shell Dlg", L"Tahoma" }, { L"MS Shell Dlg 2", L"Tahoma" }, + { L"Palatino Linotype", L"DejaVu Serif" }, + { L"System", L"FreeSans" }, { L"Tahoma", L"Tahoma" }, { L"Terminal", L"DejaVu Sans Mono" }, { L"Times", L"DejaVu Serif" }, { L"Times New Roman", L"DejaVu Serif" }, { L"Tms Rmn", L"DejaVu Serif" }, { L"Trebuchet MS", L"Open Sans" }, - { L"System", L"FreeSans" }, - { L"Georgia", L"FreeSerif" }, - { L"Palatino Linotype", L"DejaVu Serif" }, { L"Ubuntu", L"Tahoma" }, { NULL, NULL } }; @@ -114,27 +114,27 @@ MUI_SUBFONT ChineseSimplifiedFonts[] = { L"Courier New", L"FreeMono" }, { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, { L"Franklin Gothic Medium", L"Droid Sans Fallback" }, + { L"Georgia", L"FreeSerif" }, { L"Helv", L"Droid Sans Fallback" }, { L"Helvetica", L"Liberation Sans" }, { L"Lucida Console", L"DejaVu Sans Mono" }, { L"MS Sans Serif", L"Droid Sans Fallback" }, { L"MS Shell Dlg", L"Droid Sans Fallback" }, { L"MS Shell Dlg 2", L"Droid Sans Fallback" }, + { L"MS Song", L"Droid Sans Fallback" }, { L"MS UI Gothic", L"Droid Sans Fallback" }, { L"MS UI Gothic 2", L"Droid Sans Fallback" }, + { L"NSimSun", L"Droid Sans Fallback" }, + { L"Palatino Linotype", L"DejaVu Serif" }, + { L"SimHei", L"Droid Sans Fallback" }, + { 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"Times", L"Liberation Serif" }, { L"Times New Roman", L"Liberation Serif" }, { L"Tms Rmn", L"Liberation Serif" }, { L"Trebuchet MS", L"Droid Sans Fallback" }, - { L"SimSun", L"Droid Sans Fallback" }, - { L"NSimSun", L"Droid Sans Fallback" }, - { L"SimHei", L"Droid Sans Fallback" }, - { L"MS Song", L"Droid Sans Fallback" }, - { L"System", L"Droid Sans Fallback" }, - { L"Georgia", L"FreeSerif" }, - { L"Palatino Linotype", L"DejaVu Serif" }, { L"Ubuntu", L"Droid Sans Fallback" }, /* localized names */ { CSF_LocalName0, L"Droid Sans Fallback" }, @@ -154,7 +154,11 @@ MUI_SUBFONT ChineseTraditionalFonts[] = { L"Arial", L"Liberation Sans" }, { L"Courier", L"FreeMono" }, { L"Courier New", L"FreeMono" }, + { L"DLCMingBold", L"Droid Sans Fallback" }, + { L"DLCMingMedium", L"Droid Sans Fallback" }, { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, + { L"Franklin Gothic Medium", L"Droid Sans Fallback" }, + { L"Georgia", L"FreeSerif" }, { L"Helv", L"Droid Sans Fallback" }, { L"Helvetica", L"Liberation Sans" }, { L"Lucida Console", L"DejaVu Sans Mono" }, @@ -163,21 +167,17 @@ MUI_SUBFONT ChineseTraditionalFonts[] = { L"MS Shell Dlg 2", L"Droid Sans Fallback" }, { L"MS UI Gothic", L"Droid Sans Fallback" }, { L"MS UI Gothic 2", L"Droid Sans Fallback" }, + { L"Ming Light", L"Droid Sans Fallback" }, + { L"MingLiU", L"Droid Sans Fallback" }, + { L"PMingLiU", L"Droid Sans Fallback" }, + { L"Palatino Linotype", L"DejaVu Serif" }, + { L"System", L"Droid Sans Fallback" }, { L"Tahoma", L"Droid Sans Fallback" }, { L"Terminal", L"DejaVu Sans Mono" }, { L"Times", L"Liberation Serif" }, { L"Times New Roman", L"Liberation Serif" }, { L"Tms Rmn", L"Liberation Serif" }, { L"Trebuchet MS", L"Droid Sans Fallback" }, - { L"Ming Light", L"Droid Sans Fallback" }, - { L"MingLiU", L"Droid Sans Fallback" }, - { L"PMingLiU", L"Droid Sans Fallback" }, - { L"DLCMingMedium", L"Droid Sans Fallback" }, - { L"DLCMingBold", L"Droid Sans Fallback" }, - { L"System", L"Droid Sans Fallback" }, - { L"Franklin Gothic Medium", L"Droid Sans Fallback" }, - { L"Georgia", L"FreeSerif" }, - { L"Palatino Linotype", L"DejaVu Serif" }, { L"Ubuntu", L"Droid Sans Fallback" }, /* localized names */ { CTF_LocalName0, L"Droid Sans Fallback" }, @@ -197,28 +197,28 @@ MUI_SUBFONT JapaneseFonts[] = { L"Courier", L"FreeMono" }, { L"Courier New", L"FreeMono" }, { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, + { L"Franklin Gothic Medium", L"Droid Sans Fallback" }, + { L"Georgia", L"FreeSerif" }, { L"Helv", L"Droid Sans Fallback" }, { L"Helvetica", L"Liberation Sans" }, { L"Lucida Console", L"DejaVu Sans Mono" }, + { L"MS Gothic", L"Droid Sans Fallback" }, + { L"MS Mincho", L"Droid Sans Fallback" }, + { L"MS PGothic", L"Droid Sans Fallback" }, + { L"MS PMincho", L"Droid Sans Fallback" }, { L"MS Sans Serif", L"Droid Sans Fallback" }, { L"MS Shell Dlg", L"Droid Sans Fallback" }, { L"MS Shell Dlg 2", L"Droid Sans Fallback" }, { L"MS UI Gothic", L"Droid Sans Fallback" }, { L"MS UI Gothic 2", L"Droid Sans Fallback" }, + { L"Palatino Linotype", L"DejaVu Serif" }, + { L"System", L"Droid Sans Fallback" }, { L"Tahoma", L"Droid Sans Fallback" }, { L"Terminal", L"DejaVu Sans Mono" }, { L"Times", L"Liberation Serif" }, { L"Times New Roman", L"Liberation Serif" }, { L"Tms Rmn", L"Liberation Serif" }, { L"Trebuchet MS", L"Droid Sans Fallback" }, - { L"MS Mincho", L"Droid Sans Fallback" }, - { L"MS PMincho", L"Droid Sans Fallback" }, - { L"MS Gothic", L"Droid Sans Fallback" }, - { L"MS PGothic", L"Droid Sans Fallback" }, - { L"System", L"Droid Sans Fallback" }, - { L"Franklin Gothic Medium", L"Droid Sans Fallback" }, - { L"Georgia", L"FreeSerif" }, - { L"Palatino Linotype", L"DejaVu Serif" }, { L"Ubuntu", L"Droid Sans Fallback" }, /* localized names */ { JF_LocalName0, L"Droid Sans Fallback" }, @@ -237,9 +237,17 @@ WCHAR KF_LocalName5[] = {0xAD74, 0xB9BC, 0xCCB4, 0}; /* GulimChe */ MUI_SUBFONT KoreanFonts[] = { { L"Arial", L"Liberation Sans" }, + { L"Batang", L"Droid Sans Fallback" }, + { L"BatangChe", L"Droid Sans Fallback" }, { L"Courier", L"FreeMono" }, { L"Courier New", L"FreeMono" }, { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, + { L"Franklin Gothic Medium", L"Droid Sans Fallback" }, + { L"Georgia", L"FreeSerif" }, + { L"Gulim", L"Droid Sans Fallback" }, + { L"GulimChe", L"Droid Sans Fallback" }, + { L"Gungsuh", L"Droid Sans Fallback" }, + { L"GungsuhChe", L"Droid Sans Fallback" }, { L"Helv", L"Droid Sans Fallback" }, { L"Helvetica", L"Liberation Sans" }, { L"Lucida Console", L"DejaVu Sans Mono" }, @@ -248,22 +256,14 @@ MUI_SUBFONT KoreanFonts[] = { L"MS Shell Dlg 2", L"Droid Sans Fallback" }, { L"MS UI Gothic", L"Droid Sans Fallback" }, { L"MS UI Gothic 2", L"Droid Sans Fallback" }, + { L"Palatino Linotype", L"DejaVu Serif" }, + { L"System", L"Droid Sans Fallback" }, { L"Tahoma", L"Droid Sans Fallback" }, { L"Terminal", L"DejaVu Sans Mono" }, { L"Times", L"Liberation Serif" }, { L"Times New Roman", L"Liberation Serif" }, { L"Tms Rmn", L"Liberation Serif" }, { L"Trebuchet MS", L"Droid Sans Fallback" }, - { L"Batang", L"Droid Sans Fallback" }, - { L"BatangChe", L"Droid Sans Fallback" }, - { L"Gungsuh", L"Droid Sans Fallback" }, - { L"GungsuhChe", L"Droid Sans Fallback" }, - { L"Gulim", L"Droid Sans Fallback" }, - { L"GulimChe", L"Droid Sans Fallback" }, - { L"System", L"Droid Sans Fallback" }, - { L"Franklin Gothic Medium", L"Droid Sans Fallback" }, - { L"Georgia", L"FreeSerif" }, - { L"Palatino Linotype", L"DejaVu Serif" }, { L"Ubuntu", L"Droid Sans Fallback" }, /* localized names */ { KF_LocalName0, L"Droid Sans Fallback" }, @@ -282,21 +282,21 @@ MUI_SUBFONT UnicodeFonts[] = { L"Courier New", L"DejaVu Sans Mono" }, { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, { L"Franklin Gothic Medium", L"Libre Franklin Bold" }, + { L"Georgia", L"FreeSerif" }, { L"Helv", L"DejaVu Sans" }, { L"Helvetica", L"DejaVu Sans" }, { L"Lucida Console", L"DejaVu Sans Mono" }, { L"MS Sans Serif", L"DejaVu Sans" }, { L"MS Shell Dlg", L"DejaVu Sans" }, { L"MS Shell Dlg 2", L"DejaVu Sans" }, + { L"Palatino Linotype", L"DejaVu Serif" }, + { L"System", L"FreeSans" }, { L"Tahoma", L"DejaVu Sans" }, { L"Terminal", L"DejaVu Sans Mono" }, { L"Times", L"DejaVu Serif" }, { L"Times New Roman", L"DejaVu Serif" }, { L"Tms Rmn", L"DejaVu Serif" }, { L"Trebuchet MS", L"Open Sans" }, - { L"System", L"FreeSans" }, - { L"Georgia", L"FreeSerif" }, - { L"Palatino Linotype", L"DejaVu Serif" }, { NULL, NULL } }; @@ -308,20 +308,20 @@ MUI_SUBFONT HindiFonts[] = { L"Courier New", L"FreeMono" }, { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, { L"Franklin Gothic Medium", L"Libre Franklin Bold" }, + { L"Georgia", L"FreeSerif" }, { L"Helv", L"Tahoma" }, { L"Helvetica", L"Liberation Sans" }, { L"Lucida Console", L"DejaVu Sans Mono" }, { L"MS Sans Serif", L"FreeSans" }, { L"MS Shell Dlg", L"FreeSans" }, { L"MS Shell Dlg 2", L"FreeSans" }, + { L"Palatino Linotype", L"FreeSans" }, + { L"System", L"FreeSans" }, { L"Tahoma", L"FreeSans" }, { L"Terminal", L"DejaVu Sans Mono" }, { L"Times", L"Liberation Serif" }, { L"Times New Roman", L"Liberation Serif" }, { L"Tms Rmn", L"Liberation Serif" }, { L"Trebuchet MS", L"Open Sans" }, - { L"System", L"FreeSans" }, - { L"Georgia", L"FreeSerif" }, - { L"Palatino Linotype", L"FreeSans" }, { NULL, NULL } };
