From: Colin Finck Date: Sat, 28 Nov 2009 15:04:15 +0000 (+0000) Subject: Dmitry Gorbachev: X-Git-Tag: ReactOS-0.3.11~6 X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=012770560668ad556d9fb54f2bd2d1f0aeda0d0e Dmitry Gorbachev: - Replace our Japanese "Systema" font added for releases by "Droid Sans Fallback" from the Android project. This font is licensed under Apache 2.0 license (notice included) and also offers us Chinese and Korean characters. You have to copy "DroidSansFallback.ttf" from http://android.git.kernel.org/?p=platform/frameworks/base.git;a=tree;f=data/fonts to "modules/optional". svn path=/branches/ros-branch-0_3_11/; revision=44305 --- diff --git a/reactos/base/setup/usetup/muifonts.h b/reactos/base/setup/usetup/muifonts.h index 1cbdd22eef9..399a7eb460d 100644 --- a/reactos/base/setup/usetup/muifonts.h +++ b/reactos/base/setup/usetup/muifonts.h @@ -59,18 +59,18 @@ MUI_SUBFONT HebrewFonts[] = { NULL, NULL } }; -MUI_SUBFONT JapaneseFonts[] = +MUI_SUBFONT CJKFonts[] = { { L"Arial", L"Liberation Sans" }, { L"Courier", L"FreeMono" }, { L"Courier New", L"FreeMono" }, { L"Times New Roman", L"Liberation Serif" }, - { L"Tahoma", L"Systema" }, + { L"Tahoma", L"Droid Sans Fallback" }, { L"MS Sans Serif", L"Tahoma" }, - { L"MS Shell Dlg", L"Systema" }, - { L"MS Shell Dlg 2", L"Systema" }, - { L"MS UI Gothic", L"Systema" }, - { L"MS UI Gothic 2", L"Systema" }, + { 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"Helv", L"Tahoma" }, { NULL, NULL } }; diff --git a/reactos/base/setup/usetup/muilanguages.h b/reactos/base/setup/usetup/muilanguages.h index 59b9fed42fd..59b11591397 100644 --- a/reactos/base/setup/usetup/muilanguages.h +++ b/reactos/base/setup/usetup/muilanguages.h @@ -165,11 +165,11 @@ const MUI_LANGUAGE LanguageList[] = {L"00000402", L"1251", L"866", L"10007", L"Bulgarian", L"359", bgBGPages, bgBGErrorEntries, bgBGStrings, CyrillicFonts, bgBGLayouts }, {L"00000455", L"0", L"1", L"2", L"Burmese", L"1", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, myMMLayouts }, {L"00000403", L"1252", L"850", L"10000", L"Catalan", L"1", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, caESLayouts }, - {L"00000404", L"950", L"950", L"10008", L"Chinese (Taiwan)", L"886", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, zhTWLayouts }, - {L"00000804", L"936", L"936", L"10008", L"Chinese (PRC)", L"86", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, zhCNLayouts }, - {L"00000C04", L"950", L"950", L"10008", L"Chinese (Hong Kong S.A.R.)", L"1", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, zhHKLayouts }, - {L"00001004", L"936", L"936", L"10008", L"Chinese (Singapore)", L"1", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, zhSGLayouts }, - {L"00001404", L"950", L"950", L"10002", L"Chinese (Macau S.A.R.)", L"1", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, zhMOLayouts }, + {L"00000404", L"950", L"950", L"10008", L"Chinese (Taiwan)", L"886", enUSPages, enUSErrorEntries, enUSStrings, CJKFonts, zhTWLayouts }, + {L"00000804", L"936", L"936", L"10008", L"Chinese (PRC)", L"86", enUSPages, enUSErrorEntries, enUSStrings, CJKFonts, zhCNLayouts }, + {L"00000C04", L"950", L"950", L"10008", L"Chinese (Hong Kong S.A.R.)", L"1", enUSPages, enUSErrorEntries, enUSStrings, CJKFonts, zhHKLayouts }, + {L"00001004", L"936", L"936", L"10008", L"Chinese (Singapore)", L"1", enUSPages, enUSErrorEntries, enUSStrings, CJKFonts, zhSGLayouts }, + {L"00001404", L"950", L"950", L"10002", L"Chinese (Macau S.A.R.)", L"1", enUSPages, enUSErrorEntries, enUSStrings, CJKFonts, zhMOLayouts }, {L"0000041A", L"1250", L"852", L"10029", L"Croatian", L"385", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, hrHRLayouts }, {L"00000405", L"1250", L"852", L"10029", L"Czech", L"420", csCZPages, csCZErrorEntries, csCZStrings, LatinFonts, csCZLayouts }, {L"00000406", L"1252", L"850", L"10000", L"Danish", L"45", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, daDKLayouts }, @@ -216,11 +216,11 @@ const MUI_LANGUAGE LanguageList[] = {L"00000421", L"1252", L"850", L"10079", L"Indonesian", L"62", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, idIDLayouts }, {L"00000410", L"1252", L"850", L"10000", L"Italian (Italy)", L"39", itITPages, itITErrorEntries, itITStrings, LatinFonts, itITLayouts }, {L"00000810", L"1252", L"850", L"10000", L"Italian (Switzerland)", L"41", itITPages, itITErrorEntries, itITStrings, LatinFonts, itCHLayouts }, - {L"00000411", L"932", L"932", L"10001", L"Japanese", L"81", jaJPPages, jaJPErrorEntries, jaJPStrings, JapaneseFonts, jaJPLayouts }, + {L"00000411", L"932", L"932", L"10001", L"Japanese", L"81", jaJPPages, jaJPErrorEntries, jaJPStrings, CJKFonts, jaJPLayouts }, {L"0000044B", L"1252", L"437", L"10079", L"Kannada (India)", L"91", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, knINLayouts }, {L"0000043F", L"1251", L"866", L"10007", L"Kazakh", L"705", enUSPages, enUSErrorEntries, enUSStrings, CyrillicFonts, kkKZLayouts }, {L"00000457", L"0", L"437", L"2", L"Konkani", L"1", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, kokINLayouts}, - {L"00000412", L"949", L"949", L"10003", L"Korean", L"1", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, koKRLayouts }, + {L"00000412", L"949", L"949", L"10003", L"Korean", L"1", enUSPages, enUSErrorEntries, enUSStrings, CJKFonts, koKRLayouts }, {L"00000440", L"1251", L"866", L"10007", L"Kyrgyz (Kyrgyzstan)", L"1", enUSPages, enUSErrorEntries, enUSStrings, CyrillicFonts, kyKGLayouts }, {L"00000426", L"1257", L"775", L"10029", L"Latvian", L"371", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, lvLVLayouts }, {L"00000427", L"1257", L"775", L"10029", L"Lithuanian", L"370", ltLTPages, ltLTErrorEntries, ltLTStrings, LatinFonts, ltLTLayouts }, diff --git a/reactos/boot/bootdata/packages/reactos.dff b/reactos/boot/bootdata/packages/reactos.dff index bf616387568..d9d690f9924 100644 --- a/reactos/boot/bootdata/packages/reactos.dff +++ b/reactos/boot/bootdata/packages/reactos.dff @@ -667,6 +667,8 @@ subsystems\ntvdm\ntvdm.exe 1 subsystems\win32\win32k\win32k.sys 1 ; Optional/proprietary files +modules\optional\DroidSansFallback.ttf 3 optional +modules\optional\NOTICE_for_Droid_Font.txt 4 optional modules\optional\netkvm2k.inf 6 optional modules\optional\netkvm2k.cat 6 optional modules\optional\netkvm.sys 2 optional @@ -681,7 +683,6 @@ modules\optional\msvbvm60.dll 1 optional modules\optional\msvcirt.dll 1 optional modules\optional\msvcp71.dll 1 optional modules\optional\msvcr71.dll 1 optional -modules\optional\Systema.ttf 3 optional modules\optional\vmx_fb.dll 1 optional modules\optional\vmx_mode.dll 1 optional modules\optional\vmx_svga.inf 6 optional diff --git a/reactos/media/inf/font.inf b/reactos/media/inf/font.inf index d22911404e7..99c8af93adf 100644 --- a/reactos/media/inf/font.inf +++ b/reactos/media/inf/font.inf @@ -67,6 +67,19 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","MS Shell HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","MS Shell Dlg 2",0x00000000,"DejaVu Sans" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Helv",0x00000000,"DejaVu Sans" +[Font.CJK.Reg] +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Arial",0x00000000,"Liberation Sans" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Courier",0x00000000,"FreeMono" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Courier New",0x00000000,"FreeMono" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Times New Roman",0x00000000,"Liberation Serif" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Tahoma",0x00000000,"Droid Sans Fallback" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","MS Sans Serif",0x00000000,"Tahoma" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","MS Shell Dlg",0x00000000,"Droid Sans Fallback" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","MS Shell Dlg 2",0x00000000,"Droid Sans Fallback" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","MS UI Gothic",0x00000000,"Droid Sans Fallback" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","MS UI Gothic 2",0x00000000,"Droid Sans Fallback" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Helv",0x00000000,"Tahoma" + [Font.Unicode.Reg] HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Arial",0x00000000,"DejaVu Sans" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Courier",0x00000000,"DejaVu Sans Mono" @@ -234,38 +247,38 @@ AddReg = Font.Unicode.Reg ; cp932/cp932 Japanese [Font.CP932.96] AddReg = Font.Reg.96 -AddReg = Font.Unicode.Reg +AddReg = Font.CJK.Reg [Font.CP932.120] AddReg = Font.Reg.120 -AddReg = Font.Unicode.Reg +AddReg = Font.CJK.Reg ; cp936/cp936 Simplified Chinese [Font.CP936.96] AddReg = Font.Reg.96 -AddReg = Font.Unicode.Reg +AddReg = Font.CJK.Reg [Font.CP936.120] AddReg = Font.Reg.120 -AddReg = Font.Unicode.Reg +AddReg = Font.CJK.Reg ; cp949/cp949 Korean [Font.CP949.96] AddReg = Font.Reg.96 -AddReg = Font.Unicode.Reg +AddReg = Font.CJK.Reg [Font.CP949.120] AddReg = Font.Reg.120 -AddReg = Font.Unicode.Reg +AddReg = Font.CJK.Reg ; cp950/cp950 Traditional Chinese [Font.CP950.96] AddReg = Font.Reg.96 -AddReg = Font.Unicode.Reg +AddReg = Font.CJK.Reg [Font.CP950.120] AddReg = Font.Reg.120 -AddReg = Font.Unicode.Reg +AddReg = Font.CJK.Reg [Font Sizes] Small Fonts = 96