From 4cfe7f84bbc85cd303a72d7aecd302d46014128f Mon Sep 17 00:00:00 2001 From: Katayama Hirofumi MZ Date: Wed, 31 Jul 2019 17:43:08 +0900 Subject: [PATCH] [SETUP] Add codepage-specific font substitutes (#1772) Add codepage-specific font substitutes for i18n. CORE-16266 --- base/setup/lib/muifonts.h | 150 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 150 insertions(+) diff --git a/base/setup/lib/muifonts.h b/base/setup/lib/muifonts.h index 150dee0e61b..a01176ac088 100644 --- a/base/setup/lib/muifonts.h +++ b/base/setup/lib/muifonts.h @@ -4,8 +4,18 @@ MUI_SUBFONT LatinFonts[] = { /*Font Substitute */ { L"Arial", L"Liberation 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 New", 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"Franklin Gothic Medium", L"Libre Franklin Bold" }, { L"Georgia", L"FreeSerif" }, @@ -21,6 +31,11 @@ MUI_SUBFONT LatinFonts[] = { L"Terminal", L"DejaVu Sans Mono" }, { L"Times", L"Liberation Serif" }, { L"Times New Roman", L"Liberation Serif" }, + { 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"Liberation Serif" }, { L"Trebuchet MS", L"Open Sans" }, { NULL, NULL } @@ -29,8 +44,18 @@ MUI_SUBFONT LatinFonts[] = MUI_SUBFONT CyrillicFonts[] = { { L"Arial", L"Liberation 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 New", 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"Franklin Gothic Medium", L"Libre Franklin" }, { L"Georgia", L"FreeSerif" }, @@ -46,6 +71,11 @@ MUI_SUBFONT CyrillicFonts[] = { L"Terminal", L"DejaVu Sans Mono" }, { L"Times", L"Liberation Serif" }, { L"Times New Roman", L"Liberation Serif" }, + { 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"Liberation Serif" }, { L"Trebuchet MS", L"Open Sans" }, { NULL, NULL } @@ -54,8 +84,18 @@ MUI_SUBFONT CyrillicFonts[] = MUI_SUBFONT GreekFonts[] = { { L"Arial", L"Liberation 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 New", 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"Franklin Gothic Medium", L"Libre Franklin" }, { L"Georgia", L"FreeSerif" }, @@ -71,6 +111,11 @@ MUI_SUBFONT GreekFonts[] = { L"Terminal", L"DejaVu Sans Mono" }, { L"Times", L"Liberation Serif" }, { L"Times New Roman", L"Liberation Serif" }, + { 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"Liberation Serif" }, { L"Trebuchet MS", L"Open Sans" }, { NULL, NULL } @@ -79,8 +124,18 @@ MUI_SUBFONT GreekFonts[] = 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 New", 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"Franklin Gothic Medium", L"Libre Franklin" }, { L"Georgia", L"FreeSerif" }, @@ -96,6 +151,11 @@ MUI_SUBFONT HebrewFonts[] = { L"Terminal", L"DejaVu Sans Mono" }, { L"Times", L"DejaVu Serif" }, { L"Times New Roman", L"DejaVu Serif" }, + { 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"DejaVu Serif" }, { L"Trebuchet MS", L"Open Sans" }, { L"Ubuntu", L"Tahoma" }, @@ -110,8 +170,18 @@ WCHAR CSF_LocalName4[] = {'M', 'S', 0x5B8B, 0x4F53, 0}; /* MS Song */ MUI_SUBFONT ChineseSimplifiedFonts[] = { { L"Arial", L"Liberation 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 New", 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"Franklin Gothic Medium", L"Droid Sans Fallback" }, { L"Georgia", L"FreeSerif" }, @@ -133,6 +203,11 @@ MUI_SUBFONT ChineseSimplifiedFonts[] = { L"Terminal", L"DejaVu Sans Mono" }, { L"Times", L"Liberation Serif" }, { L"Times New Roman", L"Liberation Serif" }, + { 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"Liberation Serif" }, { L"Trebuchet MS", L"Droid Sans Fallback" }, { L"Ubuntu", L"Droid Sans Fallback" }, @@ -152,8 +227,18 @@ WCHAR CTF_LocalName3[] = {0x83EF, 0x5EB7, 0x7C97, 0x660E, 0x9AD4, 0}; /* D MUI_SUBFONT ChineseTraditionalFonts[] = { { L"Arial", L"Liberation 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 New", 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"DLCMingBold", L"Droid Sans Fallback" }, { L"DLCMingMedium", L"Droid Sans Fallback" }, { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, @@ -176,6 +261,11 @@ MUI_SUBFONT ChineseTraditionalFonts[] = { L"Terminal", L"DejaVu Sans Mono" }, { L"Times", L"Liberation Serif" }, { L"Times New Roman", L"Liberation Serif" }, + { 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"Liberation Serif" }, { L"Trebuchet MS", L"Droid Sans Fallback" }, { L"Ubuntu", L"Droid Sans Fallback" }, @@ -194,8 +284,18 @@ WCHAR JF_LocalName3[] = {0xFF2D, 0xFF33, ' ', 0xFF30, 0x30B4, 0x30B7, 0x30C3, 0x MUI_SUBFONT JapaneseFonts[] = { { L"Arial", L"Liberation 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 New", 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"Franklin Gothic Medium", L"Droid Sans Fallback" }, { L"Georgia", L"FreeSerif" }, @@ -217,6 +317,11 @@ MUI_SUBFONT JapaneseFonts[] = { L"Terminal", L"DejaVu Sans Mono" }, { L"Times", L"Liberation Serif" }, { L"Times New Roman", L"Liberation Serif" }, + { 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"Liberation Serif" }, { L"Trebuchet MS", L"Droid Sans Fallback" }, { L"Ubuntu", L"Droid Sans Fallback" }, @@ -237,10 +342,20 @@ WCHAR KF_LocalName5[] = {0xAD74, 0xB9BC, 0xCCB4, 0}; /* GulimChe */ MUI_SUBFONT KoreanFonts[] = { { L"Arial", L"Liberation 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"Batang", L"Droid Sans Fallback" }, { L"BatangChe", L"Droid Sans Fallback" }, { L"Courier", L"FreeMono" }, { L"Courier New", 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"Franklin Gothic Medium", L"Droid Sans Fallback" }, { L"Georgia", L"FreeSerif" }, @@ -262,6 +377,11 @@ MUI_SUBFONT KoreanFonts[] = { L"Terminal", L"DejaVu Sans Mono" }, { L"Times", L"Liberation Serif" }, { L"Times New Roman", L"Liberation Serif" }, + { 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"Liberation Serif" }, { L"Trebuchet MS", L"Droid Sans Fallback" }, { L"Ubuntu", L"Droid Sans Fallback" }, @@ -278,8 +398,18 @@ 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 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"Franklin Gothic Medium", L"Libre Franklin Bold" }, { L"Georgia", L"FreeSerif" }, @@ -295,6 +425,11 @@ MUI_SUBFONT UnicodeFonts[] = { L"Terminal", L"DejaVu Sans Mono" }, { L"Times", L"DejaVu Serif" }, { L"Times New Roman", L"DejaVu Serif" }, + { 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"DejaVu Serif" }, { L"Trebuchet MS", L"Open Sans" }, { NULL, NULL } @@ -304,8 +439,18 @@ MUI_SUBFONT HindiFonts[] = { /*Font Substitute */ { L"Arial", L"Liberation 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 New", 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"Franklin Gothic Medium", L"Libre Franklin Bold" }, { L"Georgia", L"FreeSerif" }, @@ -321,6 +466,11 @@ MUI_SUBFONT HindiFonts[] = { L"Terminal", L"DejaVu Sans Mono" }, { L"Times", L"Liberation Serif" }, { L"Times New Roman", L"Liberation Serif" }, + { 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"Liberation Serif" }, { L"Trebuchet MS", L"Open Sans" }, { NULL, NULL }