[ros-diffs] [dgorbachev] 44330: Apply font changes from r44305 to mainline.

Author: dgorbachev
Date: Mon Nov 30 18:00:12 2009
New Revision: 44330

URL: http://svn.reactos.org/svn/reactos?rev=44330&view=rev
Log:
Apply font changes from r44305 to mainline.

Modified:
    trunk/reactos/base/setup/usetup/muifonts.h
    trunk/reactos/base/setup/usetup/muilanguages.h
    trunk/reactos/boot/bootdata/packages/reactos.dff
    trunk/reactos/media/inf/font.inf

Modified: trunk/reactos/base/setup/usetup/muifonts.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/muifonts…
==============================================================================
--- trunk/reactos/base/setup/usetup/muifonts.h [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/muifonts.h [iso-8859-1] Mon Nov 30 18:00:12 2009
@@ -59,18 +59,18 @@
     { 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 }
 };

Modified: trunk/reactos/base/setup/usetup/muilanguages.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/muilangu…
==============================================================================
--- trunk/reactos/base/setup/usetup/muilanguages.h [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/muilanguages.h [iso-8859-1] Mon Nov 30 18:00:12 2009
@@ -165,11 +165,11 @@
   {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 @@
   {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 },

Modified: trunk/reactos/boot/bootdata/packages/reactos.dff
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea…
==============================================================================
--- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original)
+++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Mon Nov 30 18:00:12
2009
@@ -667,6 +667,8 @@
 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\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

Modified: trunk/reactos/media/inf/font.inf
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/font.inf?rev=443…
==============================================================================
Binary files - no diff available.