From: Mark Jansen Date: Sat, 18 Mar 2017 13:28:57 +0000 (+0000) Subject: [USETUP] Split font substitution settings for CJK languages. Patch by Katayama Hirofu... X-Git-Tag: ReactOS-0.4.5~245 X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=6261af59453db8e7dd0d3f6d8fd8fc8bb3d5d152 [USETUP] Split font substitution settings for CJK languages. Patch by Katayama Hirofumi MZ. CORE-9615 svn path=/trunk/; revision=74188 --- diff --git a/reactos/base/setup/usetup/muifonts.h b/reactos/base/setup/usetup/muifonts.h index dbb5868b9c6..692dffd7042 100644 --- a/reactos/base/setup/usetup/muifonts.h +++ b/reactos/base/setup/usetup/muifonts.h @@ -2,8 +2,7 @@ MUI_SUBFONT LatinFonts[] = { - /*Font Substitute */ - + /*Font Substitute */ { L"Arial", L"Liberation Sans" }, { L"Courier", L"FreeMono" }, { L"Courier New", L"FreeMono" }, @@ -82,7 +81,11 @@ MUI_SUBFONT HebrewFonts[] = { NULL, NULL } }; -MUI_SUBFONT CJKFonts[] = +WCHAR CSF_LocalName0[] = {0x5B8B, 0x4F53, 0}; +WCHAR CSF_LocalName1[] = {0x65B0, 0x5B8B, 0x4F53, 0}; +WCHAR CSF_LocalName2[] = {0x4E2D, 0x6613, 0x5B8B, 0x4F53, 0}; +WCHAR CSF_LocalName3[] = {'M', 'S', 0x5B8B, 0x4F53, 0}; +MUI_SUBFONT ChineseSimplifiedFonts[] = { { L"Arial", L"Liberation Sans" }, { L"Courier", L"FreeMono" }, @@ -101,6 +104,109 @@ MUI_SUBFONT CJKFonts[] = { L"Terminal", L"DejaVu Sans Mono" }, { L"Times New Roman", L"Liberation Serif" }, { L"Trebuchet MS", L"Open Sans" }, + { L"SimSun", L"Droid Sans Fallback" }, + { L"NSimSun", L"Droid Sans Fallback" }, + { L"MS Song", L"Droid Sans Fallback" }, + /* localized names */ + { CSF_LocalName0, L"Droid Sans Fallback" }, + { CSF_LocalName1, L"Droid Sans Fallback" }, + { CSF_LocalName2, L"Droid Sans Fallback" }, + { CSF_LocalName3, L"Droid Sans Fallback" }, + { NULL, NULL } +}; + +WCHAR CTF_LocalName0[] = {0x7D30, 0x660E, 0x9AD4, 0}; +WCHAR CTF_LocalName1[] = {0x65B0, 0x7D30, 0x660E, 0x9AD4, 0}; +WCHAR CTF_LocalName2[] = {0x83EF, 0x5EB7, 0x4E2D, 0x660E, 0x9AD4, 0}; +WCHAR CTF_LocalName3[] = {0x83EF, 0x5EB7, 0x7C97, 0x660E, 0x9AD4, 0}; +MUI_SUBFONT ChineseTraditionalFonts[] = +{ + { L"Arial", L"Liberation Sans" }, + { L"Courier", L"FreeMono" }, + { L"Courier New", L"FreeMono" }, + { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, + { 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 UI Gothic", L"Droid Sans Fallback" }, + { L"MS UI Gothic 2", L"Droid Sans Fallback" }, + { L"Tahoma", L"Droid Sans Fallback" }, + { L"Terminal", L"DejaVu Sans Mono" }, + { L"Times New Roman", L"Liberation Serif" }, + { L"Ming Light", L"Droid Sans Fallback" }, + { L"PMingLiU", L"Droid Sans Fallback" }, + { L"DLCMingMedium", L"Droid Sans Fallback" }, + { L"DLCMingBold", L"Droid Sans Fallback" }, + /* localized names */ + { CTF_LocalName0, L"Droid Sans Fallback" }, + { CTF_LocalName1, L"Droid Sans Fallback" }, + { CTF_LocalName2, L"Droid Sans Fallback" }, + { CTF_LocalName3, L"Droid Sans Fallback" }, + { NULL, NULL } +}; + +WCHAR JF_LocalName0[] = {0xFF2D, 0xFF33, ' ', 0x660E, 0x671D, 0}; +WCHAR JF_LocalName1[] = {0xFF2D, 0xFF33, ' ', 0xFF30, 0x660E, 0x671D, 0}; +WCHAR JF_LocalName2[] = {0xFF2D, 0xFF33, ' ', 0x30B4, 0x30B7, 0x30C3, 0x30AF, 0}; +WCHAR JF_LocalName3[] = {0xFF2D, 0xFF33, ' ', 0xFF30, 0x30B4, 0x30B7, 0x30C3, 0x30AF, 0}; +MUI_SUBFONT JapaneseFonts[] = +{ + { L"Arial", L"Liberation Sans" }, + { L"Courier", L"FreeMono" }, + { L"Courier New", L"FreeMono" }, + { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, + { 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 UI Gothic", L"Droid Sans Fallback" }, + { L"MS UI Gothic 2", L"Droid Sans Fallback" }, + { L"Tahoma", L"Droid Sans Fallback" }, + { L"Terminal", L"DejaVu Sans Mono" }, + { L"Times New Roman", L"Liberation Serif" }, + /* localized names */ + { JF_LocalName0, L"Droid Sans Fallback" }, + { JF_LocalName1, L"Droid Sans Fallback" }, + { JF_LocalName2, L"Droid Sans Fallback" }, + { JF_LocalName3, L"Droid Sans Fallback" }, + { NULL, NULL } +}; + +WCHAR KF_LocalName0[] = {0xBC14, 0xD0D5, 0}; +WCHAR KF_LocalName1[] = {0xBC14, 0xD0D5, 0xCCB4, 0}; +WCHAR KF_LocalName2[] = {0xAD81, 0xC11C, 0}; +WCHAR KF_LocalName3[] = {0xAD81, 0xC11C, 0xCCB4, 0}; +MUI_SUBFONT KoreanFonts[] = +{ + { L"Arial", L"Liberation Sans" }, + { L"Courier", L"FreeMono" }, + { L"Courier New", L"FreeMono" }, + { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, + { 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 UI Gothic", L"Droid Sans Fallback" }, + { L"MS UI Gothic 2", L"Droid Sans Fallback" }, + { L"Tahoma", L"Droid Sans Fallback" }, + { L"Terminal", L"DejaVu Sans Mono" }, + { L"Times New Roman", L"Liberation Serif" }, + { L"Batang", L"Droid Sans Fallback" }, + { L"BatangChe", L"Droid Sans Fallback" }, + { L"Gungsuh", L"Droid Sans Fallback" }, + { L"GungsuhChe", L"Droid Sans Fallback" }, + /* localized names */ + { KF_LocalName0, L"Droid Sans Fallback" }, + { KF_LocalName1, L"Droid Sans Fallback" }, + { KF_LocalName2, L"Droid Sans Fallback" }, + { KF_LocalName3, L"Droid Sans Fallback" }, { NULL, NULL } }; diff --git a/reactos/base/setup/usetup/muilanguages.h b/reactos/base/setup/usetup/muilanguages.h index e0e17574e49..d0505caeab6 100644 --- a/reactos/base/setup/usetup/muilanguages.h +++ b/reactos/base/setup/usetup/muilanguages.h @@ -499,19 +499,19 @@ const MUI_LANGUAGE LanguageList[] = {L"00000403", L"1252", L"850", L"10000", L"Catalan", L"217", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, caESLayouts }, #endif #ifdef LANGUAGE_ZH_TW - {L"00000404", L"950", L"950", L"10008", L"Chinese (Taiwan)", L"237", enUSPages, enUSErrorEntries, enUSStrings, CJKFonts, zhTWLayouts }, + {L"00000404", L"950", L"950", L"10008", L"Chinese (Taiwan)", L"237", enUSPages, enUSErrorEntries, enUSStrings, ChineseTraditionalFonts, zhTWLayouts }, #endif #ifdef LANGUAGE_ZH_CN - {L"00000804", L"936", L"936", L"10008", L"Chinese (PRC)", L"45", enUSPages, enUSErrorEntries, enUSStrings, CJKFonts, zhCNLayouts }, + {L"00000804", L"936", L"936", L"10008", L"Chinese (PRC)", L"45", enUSPages, enUSErrorEntries, enUSStrings, ChineseSimplifiedFonts, zhCNLayouts }, #endif #ifdef LANGUAGE_ZH_HK - {L"00000C04", L"950", L"950", L"10008", L"Chinese (Hong Kong S.A.R.)", L"104", enUSPages, enUSErrorEntries, enUSStrings, CJKFonts, zhHKLayouts }, + {L"00000C04", L"950", L"950", L"10008", L"Chinese (Hong Kong S.A.R.)", L"104", enUSPages, enUSErrorEntries, enUSStrings, ChineseTraditionalFonts, zhHKLayouts }, #endif #ifdef LANGUAGE_ZH_SG - {L"00001004", L"936", L"936", L"10008", L"Chinese (Singapore)", L"215", enUSPages, enUSErrorEntries, enUSStrings, CJKFonts, zhSGLayouts }, + {L"00001004", L"936", L"936", L"10008", L"Chinese (Singapore)", L"215", enUSPages, enUSErrorEntries, enUSStrings, ChineseSimplifiedFonts, zhSGLayouts }, #endif #ifdef LANGUAGE_ZH_MO - {L"00001404", L"950", L"950", L"10002", L"Chinese (Macau S.A.R.)", L"151", enUSPages, enUSErrorEntries, enUSStrings, CJKFonts, zhMOLayouts }, + {L"00001404", L"950", L"950", L"10002", L"Chinese (Macau S.A.R.)", L"151", enUSPages, enUSErrorEntries, enUSStrings, ChineseSimplifiedFonts, zhMOLayouts }, #endif #ifdef LANGUAGE_HR_HR {L"0000041A", L"1250", L"852", L"10029", L"Croatian", L"108", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, hrHRLayouts }, @@ -652,7 +652,7 @@ const MUI_LANGUAGE LanguageList[] = {L"00000810", L"1252", L"850", L"10000", L"Italian (Switzerland)", L"223", itITPages, itITErrorEntries, itITStrings, LatinFonts, itCHLayouts }, #endif #ifdef LANGUAGE_JA_JP - {L"00000411", L"932", L"932", L"10001", L"Japanese", L"122", jaJPPages, jaJPErrorEntries, jaJPStrings, CJKFonts, jaJPLayouts }, + {L"00000411", L"932", L"932", L"10001", L"Japanese", L"122", jaJPPages, jaJPErrorEntries, jaJPStrings, JapaneseFonts, jaJPLayouts }, #endif #ifdef LANGUAGE_KN_IN {L"0000044B", L"1252", L"437", L"10079", L"Kannada (India)", L"113", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, knINLayouts }, @@ -664,7 +664,7 @@ const MUI_LANGUAGE LanguageList[] = {L"00000457", L"0", L"437", L"2", L"Konkani", L"113", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, kokINLayouts}, #endif #ifdef LANGUAGE_KO_KR - {L"00000412", L"949", L"949", L"10003", L"Korean", L"134", enUSPages, enUSErrorEntries, enUSStrings, CJKFonts, koKRLayouts }, + {L"00000412", L"949", L"949", L"10003", L"Korean", L"134", enUSPages, enUSErrorEntries, enUSStrings, KoreanFonts, koKRLayouts }, #endif #ifdef LANGUAGE_KY_KG {L"00000440", L"1251", L"866", L"10007", L"Kyrgyz (Kyrgyzstan)", L"130", enUSPages, enUSErrorEntries, enUSStrings, CyrillicFonts, kyKGLayouts },