[ros-diffs] [dgorbachev] 39960: Add Japanese font to USetup.

[dgorbachev at svn.reactos.org]

Author: dgorbachev
Date: Wed Mar 11 23:35:23 2009
New Revision: 39960

URL: http://svn.reactos.org/svn/reactos?rev=39960&view=rev
Log:
Add Japanese font to USetup.

Modified:
    trunk/reactos/base/setup/usetup/muifonts.h
    trunk/reactos/base/setup/usetup/muilanguages.h

Modified: trunk/reactos/base/setup/usetup/muifonts.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/muifonts.h?rev=39960&r1=39959&r2=39960&view=diff
==============================================================================
--- trunk/reactos/base/setup/usetup/muifonts.h [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/muifonts.h [iso-8859-1] Wed Mar 11 23:35:23 2009
@@ -51,11 +51,27 @@
     { L"Courier",         L"FreeMono" },
     { L"Courier New",     L"FreeMono" },
     { L"Times New Roman", L"DejaVu Serif" },
-    { L"Tahoma",          L"DejaVu Sans"      },
-    { L"MS Sans Serif",   L"DejaVu Sans"      },
-    { L"MS Shell Dlg",    L"DejaVu Sans"      },
-    { L"MS Shell Dlg 2",  L"DejaVu Sans"      },
-    { L"Helv",            L"DejaVu Sans"  },
+    { L"Tahoma",          L"DejaVu Sans" },
+    { L"MS Sans Serif",   L"DejaVu Sans" },
+    { L"MS Shell Dlg",    L"DejaVu Sans" },
+    { L"MS Shell Dlg 2",  L"DejaVu Sans" },
+    { L"Helv",            L"DejaVu Sans" },
+    { NULL, NULL }
+};
+
+MUI_SUBFONT JapaneseFonts[] =
+{
+    { L"Arial",           L"Liberation Sans" },
+    { L"Courier",         L"FreeMono" },
+    { L"Courier New",     L"FreeMono" },
+    { L"Times New Roman", L"Liberation Serif" },
+    { L"Tahoma",          L"IPAMonaUIGothic" },
+    { L"MS Sans Serif",   L"Tahoma" },
+    { L"MS Shell Dlg",    L"IPAMonaUIGothic" },
+    { L"MS Shell Dlg 2",  L"IPAMonaUIGothic" },
+    { L"MS UI Gothic",    L"IPAMonaUIGothic" },
+    { L"MS UI Gothic 2",  L"IPAMonaUIGothic" },
+    { L"Helv",            L"Tahoma" },
     { NULL, NULL }
 };
 
@@ -65,11 +81,11 @@
     { L"Courier",         L"DejaVu Sans Mono" },
     { L"Courier New",     L"DejaVu Sans Mono" },
     { L"Times New Roman", L"DejaVu Serif" },
-    { L"Tahoma",          L"DejaVu Sans"      },
-    { L"MS Sans Serif",   L"DejaVu Sans"      },
-    { L"MS Shell Dlg",    L"DejaVu Sans"      },
-    { L"MS Shell Dlg 2",  L"DejaVu Sans"      },
-    { L"Helv",            L"DejaVu Sans"  },
+    { L"Tahoma",          L"DejaVu Sans" },
+    { L"MS Sans Serif",   L"DejaVu Sans" },
+    { L"MS Shell Dlg",    L"DejaVu Sans" },
+    { L"MS Shell Dlg 2",  L"DejaVu Sans" },
+    { L"Helv",            L"DejaVu Sans" },
     { NULL, NULL }
 };
 

Modified: trunk/reactos/base/setup/usetup/muilanguages.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/muilanguages.h?rev=39960&r1=39959&r2=39960&view=diff
==============================================================================
--- trunk/reactos/base/setup/usetup/muilanguages.h [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/muilanguages.h [iso-8859-1] Wed Mar 11 23:35:23 2009
@@ -216,7 +216,7 @@
   {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",  enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts,  jaJPLayouts },
+  {L"00000411", L"932",  L"932", L"10001", L"Japanese",                     L"81",  enUSPages, enUSErrorEntries, enUSStrings, JapaneseFonts, 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},