#104548# Added de-facto standard characters to JIS X 0208 row 13.

3 files changed, 119 insertions, 21 deletions

diff --git a/sal/textenc/tcvtjp3.tab b/sal/textenc/tcvtjp3.tab
index 2bcdf7dcbcb6..5a79d1aa732d 100644
--- a/sal/textenc/tcvtjp3.tab
+++ b/sal/textenc/tcvtjp3.tab
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tcvtjp3.tab,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 15:17:28 $
+ *  last change: $Author: sb $ $Date: 2002-11-08 14:53:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -64,6 +64,13 @@
 /* This file contain the DBCS to UniCode tables for the following */
 /* japanese charsets: JIS201, JIS208, JIS212 */
 
+/* For compatibility reasons, the Shift-JIS row 8740--879E as defined in
+   http://www.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/WINDOWS/CP932.TXT
+   ("Table version: 2.01," "Date: 04/15/98") is used as the 13th row (i.e.,
+   ISO-2022-JP 2D21--2D7E) of JIS X 0208 (officially, that 13th row contains no
+   characters).
+ */
+
 /* ======================================================================= */
 
 static sal_uInt16 const aImplDBCSToUniTab_JIS0208_21[] =
@@ -214,6 +221,26 @@ static sal_uInt16 const aImplDBCSToUniTab_JIS0208_28[] =
 
 /* ----------------------------------------------------------------------- */
 
+static sal_uInt16 const aImplDBCSToUniTab_JIS0208_2D[] =
+{
+/*       0       1       2       3       4       5       6       7 */
+/*       8       9       A       B       C       D       E       F */
+            0x2460, 0x2461, 0x2462, 0x2463, 0x2464, 0x2465, 0x2466, /* 0x20 */
+    0x2467, 0x2468, 0x2469, 0x246A, 0x246B, 0x246C, 0x246D, 0x246E, /* 0x20 */
+    0x246F, 0x2470, 0x2471, 0x2472, 0x2473, 0x2160, 0x2161, 0x2162, /* 0x30 */
+    0x2163, 0x2164, 0x2165, 0x2166, 0x2167, 0x2168, 0x2169,      0, /* 0x30 */
+    0x3349, 0x3314, 0x3322, 0x334D, 0x3318, 0x3327, 0x3303, 0x3336, /* 0x40 */
+    0x3351, 0x3357, 0x330D, 0x3326, 0x3323, 0x332B, 0x334A, 0x333B, /* 0x40 */
+    0x339C, 0x339D, 0x339E, 0x338E, 0x338F, 0x33C4, 0x33A1,      0, /* 0x50 */
+         0,      0,      0,      0,      0,      0,      0, 0x337B, /* 0x50 */
+         0, 0x301D, 0x301F, 0x2116, 0x33CD, 0x2121, 0x32A4, 0x32A5, /* 0x60 */
+    0x32A6, 0x32A7, 0x32A8, 0x3231, 0x3232, 0x3239, 0x337E, 0x337D, /* 0x60 */
+    0x337C, 0x2252, 0x2261, 0x222B, 0x222E, 0x2211, 0x221A, 0x22A5, /* 0x70 */
+    0x2220, 0x221F, 0x22BF, 0x2235, 0x2229, 0x222A                  /* 0x70 */
+};
+
+/* ----------------------------------------------------------------------- */
+
 static sal_uInt16 const aImplDBCSToUniTab_JIS0208_30[] =
 {
 /*       0       1       2       3       4       5       6       7 */
diff --git a/sal/textenc/tcvtjp4.tab b/sal/textenc/tcvtjp4.tab
index ce1cdd813952..e91ca0ac1203 100644
--- a/sal/textenc/tcvtjp4.tab
+++ b/sal/textenc/tcvtjp4.tab
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tcvtjp4.tab,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 15:17:28 $
+ *  last change: $Author: sb $ $Date: 2002-11-08 14:53:21 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -142,9 +142,9 @@ static sal_uInt16 const aImplUniToDBCSTab_JIS0208_21[] =
 /*       8       9       A       B       C       D       E       F */
                             0x216E,      0,      0,      0,      0, /* 0x00 */
          0,      0,      0,      0,      0,      0,      0,      0, /* 0x00 */
+         0,      0,      0,      0,      0,      0, 0x2D63,      0, /* 0x10 */
          0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
+         0, 0x2D65,      0,      0,      0,      0,      0,      0, /* 0x20 */
          0,      0,      0, 0x2272,      0,      0,      0,      0, /* 0x20 */
          0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
          0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
@@ -152,8 +152,8 @@ static sal_uInt16 const aImplUniToDBCSTab_JIS0208_21[] =
          0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
          0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
          0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
-         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
+    0x2D35, 0x2D36, 0x2D37, 0x2D38, 0x2D39, 0x2D3A, 0x2D3B, 0x2D3C, /* 0x60 */
+    0x2D3D, 0x2D3E,      0,      0,      0,      0,      0,      0, /* 0x60 */
          0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
          0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
          0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
@@ -178,10 +178,10 @@ static sal_uInt16 const aImplUniToDBCSTab_JIS0208_22[] =
 /*       8       9       A       B       C       D       E       F */
     0x224F,      0, 0x225F, 0x2250,      0,      0,      0, 0x2260, /* 0x00 */
     0x223A,      0,      0, 0x223B,      0,      0,      0,      0, /* 0x00 */
-         0,      0, 0x215D,      0,      0,      0,      0,      0, /* 0x10 */
-         0,      0, 0x2265,      0,      0, 0x2267, 0x2167,      0, /* 0x10 */
+         0, 0x2D75, 0x215D,      0,      0,      0,      0,      0, /* 0x10 */
+         0,      0, 0x2265,      0,      0, 0x2267, 0x2167, 0x2D79, /* 0x10 */
     0x225C,      0,      0,      0,      0,      0,      0, 0x224A, /* 0x20 */
-    0x224B, 0x2241, 0x2240, 0x2269, 0x226A,      0,      0,      0, /* 0x20 */
+    0x224B, 0x2241, 0x2240, 0x2269, 0x226A,      0, 0x2D74,      0, /* 0x20 */
          0,      0,      0,      0, 0x2168, 0x2268,      0,      0, /* 0x30 */
          0,      0,      0,      0,      0, 0x2266,      0,      0, /* 0x30 */
          0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
@@ -196,8 +196,10 @@ static sal_uInt16 const aImplUniToDBCSTab_JIS0208_22[] =
          0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
          0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
          0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
-         0,      0,      0,      0,      0, 0x225D                  /* 0xA0 */
-                                                                    /* 0xA0 */
+         0,      0,      0,      0,      0, 0x225D,      0,      0, /* 0xA0 */
+         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
+         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
+         0,      0,      0,      0,      0,      0,      0, 0x2D7A  /* 0xB0 */
 };
 
 /* ----------------------------------------------------------------------- */
@@ -212,6 +214,17 @@ static sal_uInt16 const aImplUniToDBCSTab_JIS0208_23[] =
 
 /* ----------------------------------------------------------------------- */
 
+static sal_uInt16 const aImplUniToDBCSTab_JIS0208_24[] =
+{
+/*       0       1       2       3       4       5       6       7 */
+/*       8       9       A       B       C       D       E       F */
+    0x2D21, 0x2D22, 0x2D23, 0x2D24, 0x2D25, 0x2D26, 0x2D27, 0x2D28, /* 0x60 */
+    0x2D29, 0x2D2A, 0x2D2B, 0x2D2C, 0x2D2D, 0x2D2E, 0x2D2F, 0x2D30, /* 0x60 */
+    0x2D31, 0x2D32, 0x2D33, 0x2D34                                  /* 0x70 */
+};
+
+/* ----------------------------------------------------------------------- */
+
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_25[] =
 {
 /*       0       1       2       3       4       5       6       7 */
@@ -279,7 +292,7 @@ static sal_uInt16 const aImplUniToDBCSTab_JIS0208_30[] =
     0x2121, 0x2122, 0x2123, 0x2137,      0, 0x2139, 0x213A, 0x213B, /* 0x00 */
     0x2152, 0x2153, 0x2154, 0x2155, 0x2156, 0x2157, 0x2158, 0x2159, /* 0x00 */
     0x215A, 0x215B, 0x2229, 0x222E, 0x214C, 0x214D,      0,      0, /* 0x10 */
-         0,      0,      0,      0, 0x2141,      0,      0,      0, /* 0x10 */
+         0,      0,      0,      0, 0x2141, 0x2D61,      0, 0x2D62, /* 0x10 */
          0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
          0,      0,      0,      0,      0,      0,      0,      0, /* 0x20 */
          0,      0,      0,      0,      0,      0,      0,      0, /* 0x30 */
@@ -312,6 +325,64 @@ static sal_uInt16 const aImplUniToDBCSTab_JIS0208_30[] =
 
 /* ----------------------------------------------------------------------- */
 
+static sal_uInt16 const aImplUniToDBCSTab_JIS0208_32[] =
+{
+/*       0       1       2       3       4       5       6       7 */
+/*       8       9       A       B       C       D       E       F */
+            0x2D6B, 0x2D6C,      0,      0,      0,      0,      0, /* 0x30 */
+         0, 0x2D6D,      0,      0,      0,      0,      0,      0, /* 0x30 */
+         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
+         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
+         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
+         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
+         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
+         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
+         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
+         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
+         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
+         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
+         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+         0,      0,      0,      0, 0x2D66, 0x2D67, 0x2D68, 0x2D69, /* 0xA0 */
+    0x2D6A                                                          /* 0xA0 */
+};
+
+/* ----------------------------------------------------------------------- */
+
+static sal_uInt16 const aImplUniToDBCSTab_JIS0208_33[] =
+{
+/*       0       1       2       3       4       5       6       7 */
+/*       8       9       A       B       C       D       E       F */
+                            0x2D46,      0,      0,      0,      0, /* 0x00 */
+         0,      0,      0,      0,      0, 0x2D4A,      0,      0, /* 0x00 */
+         0,      0,      0,      0, 0x2D41,      0,      0,      0, /* 0x10 */
+    0x2D44,      0,      0,      0,      0,      0,      0,      0, /* 0x10 */
+         0,      0, 0x2D42, 0x2D4C,      0,      0, 0x2D4B, 0x2D45, /* 0x20 */
+         0,      0,      0, 0x2D4D,      0,      0,      0,      0, /* 0x20 */
+         0,      0,      0,      0,      0,      0, 0x2D47,      0, /* 0x30 */
+         0,      0,      0, 0x2D4F,      0,      0,      0,      0, /* 0x30 */
+         0,      0,      0,      0,      0,      0,      0,      0, /* 0x40 */
+         0, 0x2D40, 0x2D4E,      0,      0, 0x2D43,      0,      0, /* 0x40 */
+         0, 0x2D48,      0,      0,      0,      0,      0, 0x2D49, /* 0x50 */
+         0,      0,      0,      0,      0,      0,      0,      0, /* 0x50 */
+         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
+         0,      0,      0,      0,      0,      0,      0,      0, /* 0x60 */
+         0,      0,      0,      0,      0,      0,      0,      0, /* 0x70 */
+         0,      0,      0, 0x2D5F, 0x2D70, 0x2D6F, 0x2D6E,      0, /* 0x70 */
+         0,      0,      0,      0,      0,      0,      0,      0, /* 0x80 */
+         0,      0,      0,      0,      0,      0, 0x2D53, 0x2D54, /* 0x80 */
+         0,      0,      0,      0,      0,      0,      0,      0, /* 0x90 */
+         0,      0,      0,      0, 0x2D50, 0x2D51, 0x2D52,      0, /* 0x90 */
+         0, 0x2D56,      0,      0,      0,      0,      0,      0, /* 0xA0 */
+         0,      0,      0,      0,      0,      0,      0,      0, /* 0xA0 */
+         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
+         0,      0,      0,      0,      0,      0,      0,      0, /* 0xB0 */
+         0,      0,      0,      0, 0x2D55,      0,      0,      0, /* 0xC0 */
+         0,      0,      0,      0,      0, 0x2D64                  /* 0xC0 */
+};
+
+/* ----------------------------------------------------------------------- */
+
 static sal_uInt16 const aImplUniToDBCSTab_JIS0208_4E[] =
 {
 /*       0       1       2       3       4       5       6       7 */
diff --git a/sal/textenc/tcvtjp6.tab b/sal/textenc/tcvtjp6.tab
index 616caf524eb3..1927eecaf312 100644
--- a/sal/textenc/tcvtjp6.tab
+++ b/sal/textenc/tcvtjp6.tab
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tcvtjp6.tab,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: sb $ $Date: 2002-10-04 13:37:04 $
+ *  last change: $Author: sb $ $Date: 2002-11-08 14:53:22 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1798,7 +1798,7 @@ static ImplDBCSToUniLeadTab const aJIS0208UniLeadTab[128] =
     {      0,    1,    0, aImplDoubleByteIdentifierTab },       /* 0x2A */ /* We convert this as double byte */
     {      0,    1,    0, aImplDoubleByteIdentifierTab },       /* 0x2B */ /* We convert this as double byte */
     {      0,    1,    0, aImplDoubleByteIdentifierTab },       /* 0x2C */ /* We convert this as double byte */
-    {      0,    1,    0, aImplDoubleByteIdentifierTab },       /* 0x2D */ /* We convert this as double byte */
+    {      0, 0x21, 0x7D, aImplDBCSToUniTab_JIS0208_2D },       /* 0x2D */
     {      0,    1,    0, aImplDoubleByteIdentifierTab },       /* 0x2E */ /* We convert this as double byte */
     {      0,    1,    0, aImplDoubleByteIdentifierTab },       /* 0x2F */ /* We convert this as double byte */
     {      0, 0x21, 0x7E, aImplDBCSToUniTab_JIS0208_30 },       /* 0x30 */
@@ -1921,9 +1921,9 @@ static ImplUniToDBCSHighTab const aJIS0208DBCSHighTab[256] =
     {    1,    0, NULL },                                       /* 0x1F */
     { 0x10, 0x3B, aImplUniToDBCSTab_JIS0208_20 },               /* 0x20 */
     { 0x03, 0xD4, aImplUniToDBCSTab_JIS0208_21 },               /* 0x21 */
-    { 0x00, 0xA5, aImplUniToDBCSTab_JIS0208_22 },               /* 0x22 */
+    { 0x00, 0xBF, aImplUniToDBCSTab_JIS0208_22 },               /* 0x22 */
     { 0x12, 0x12, aImplUniToDBCSTab_JIS0208_23 },               /* 0x23 */
-    {    1,    0, NULL },                                       /* 0x24 */
+    { 0x60, 0x73, aImplUniToDBCSTab_JIS0208_24 },               /* 0x24 */
     { 0x00, 0xEF, aImplUniToDBCSTab_JIS0208_25 },               /* 0x25 */
     { 0x05, 0x6F, aImplUniToDBCSTab_JIS0208_26 },               /* 0x26 */
     {    1,    0, NULL },                                       /* 0x27 */
@@ -1937,8 +1937,8 @@ static ImplUniToDBCSHighTab const aJIS0208DBCSHighTab[256] =
     {    1,    0, NULL },                                       /* 0x2F */
     { 0x00, 0xFE, aImplUniToDBCSTab_JIS0208_30 },               /* 0x30 */
     {    1,    0, NULL },                                       /* 0x31 */
-    {    1,    0, NULL },                                       /* 0x32 */
-    {    1,    0, NULL },                                       /* 0x33 */
+    { 0x31, 0xA8, aImplUniToDBCSTab_JIS0208_32 },               /* 0x32 */
+    { 0x03, 0xCD, aImplUniToDBCSTab_JIS0208_33 },               /* 0x33 */
     {    1,    0, NULL },                                       /* 0x34 */
     {    1,    0, NULL },                                       /* 0x35 */
     {    1,    0, NULL },                                       /* 0x36 */