#81658# - correct Conversion Tables

3 files changed, 195 insertions, 150 deletions

diff --git a/sal/textenc/tcvtjp6.tab b/sal/textenc/tcvtjp6.tab
index e0565a5aa291..4fa806787f5d 100644
--- a/sal/textenc/tcvtjp6.tab
+++ b/sal/textenc/tcvtjp6.tab
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tcvtjp6.tab,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: th $ $Date: 2000-12-01 10:56:11 $
+ *  last change: $Author: th $ $Date: 2000-12-13 22:22:57 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,7 +62,7 @@
 /* ======================================================================= */
 
 /* This file contain the information tables for all japanese charsets: */
-/* SJIS, MS932, APPLE_JAPANESE, EUC_JP */
+/* SJIS, MS932, APPLE_JAPANESE, EUC_JP, JIS-X-201, JIS-X-208, JIS-X-212 */
 
 /* ======================================================================= */
 
@@ -308,16 +308,16 @@ static ImplDBCSToUniLeadTab const aSJISUniLeadTab[256] =
     {      0, 0x40, 0xFC, aImplDBCSToUniTab_MS932_ED },         /* 0xED */ /* We use the MS table for better MS compatibility */
     {      0, 0x40, 0xFC, aImplDBCSToUniTab_MS932_EE },         /* 0xEE */ /* We use the MS table for better MS compatibility */
     {      0,    1,    0, aImplDoubleByteIdentifierTab },       /* 0xEF */ /* We convert this as double byte */
-    {      0,    1,    0, aImplDoubleByteIdentifierTab },       /* 0xF0 */ /* EUC Range */
-    {      0,    1,    0, aImplDoubleByteIdentifierTab },       /* 0xF1 */ /* EUC Range */
-    {      0,    1,    0, aImplDoubleByteIdentifierTab },       /* 0xF2 */ /* EUC Range */
-    {      0,    1,    0, aImplDoubleByteIdentifierTab },       /* 0xF3 */ /* EUC Range */
-    {      0,    1,    0, aImplDoubleByteIdentifierTab },       /* 0xF4 */ /* EUC Range */
-    {      0,    1,    0, aImplDoubleByteIdentifierTab },       /* 0xF5 */ /* EUC Range */
-    {      0,    1,    0, aImplDoubleByteIdentifierTab },       /* 0xF6 */ /* EUC Range */
-    {      0,    1,    0, aImplDoubleByteIdentifierTab },       /* 0xF7 */ /* EUC Range */
-    {      0,    1,    0, aImplDoubleByteIdentifierTab },       /* 0xF8 */ /* EUC Range */
-    {      0,    1,    0, aImplDoubleByteIdentifierTab },       /* 0xF9 */ /* EUC Range */
+    {      0,    1,    0, aImplDoubleByteIdentifierTab },       /* 0xF0 */ /* EUDC Range */
+    {      0,    1,    0, aImplDoubleByteIdentifierTab },       /* 0xF1 */ /* EUDC Range */
+    {      0,    1,    0, aImplDoubleByteIdentifierTab },       /* 0xF2 */ /* EUDC Range */
+    {      0,    1,    0, aImplDoubleByteIdentifierTab },       /* 0xF3 */ /* EUDC Range */
+    {      0,    1,    0, aImplDoubleByteIdentifierTab },       /* 0xF4 */ /* EUDC Range */
+    {      0,    1,    0, aImplDoubleByteIdentifierTab },       /* 0xF5 */ /* EUDC Range */
+    {      0,    1,    0, aImplDoubleByteIdentifierTab },       /* 0xF6 */ /* EUDC Range */
+    {      0,    1,    0, aImplDoubleByteIdentifierTab },       /* 0xF7 */ /* EUDC Range */
+    {      0,    1,    0, aImplDoubleByteIdentifierTab },       /* 0xF8 */ /* EUDC Range */
+    {      0,    1,    0, aImplDoubleByteIdentifierTab },       /* 0xF9 */ /* EUDC Range */
     {      0, 0x40, 0xFC, aImplDBCSToUniTab_MS932_FA },         /* 0xFA */ /* We use the MS table for better MS compatibility */
     {      0, 0x40, 0xFC, aImplDBCSToUniTab_MS932_FB },         /* 0xFB */ /* We use the MS table for better MS compatibility */
     {      0, 0x40, 0x4B, aImplDBCSToUniTab_MS932_FC },         /* 0xFC */ /* We use the MS table for better MS compatibility */
@@ -592,11 +592,13 @@ static ImplUniToDBCSHighTab const aSJISDBCSHighTab[256] =
 
 /* ----------------------------------------------------------------------- */
 
-#define DBCS_EUC_SJIS_COUNT     1
-static ImplDBCSEUCData const aImplSJISDBCSEUCTab[DBCS_EUC_SJIS_COUNT] =
+/* F040-F9FC    --> E000-E757 */
+
+#define DBCS_EUDC_SJIS_COUNT        1
+static ImplDBCSEUDCData const aImplSJISDBCSEUDCTab[DBCS_EUDC_SJIS_COUNT] =
 {
-    /* EUC-Range */
-    /* Lead:    F0-FC */
+    /* EUDC-Range */
+    /* Lead:    F0-F9 */
     /* Trail:   40-7E, 80-FC */
     { 0xF0, 0xF9, 0x40, 0x7E, 0x7F, 0xFC, 0, 0, 2, 0xBC, 0xE000, 0xE757 }
 };
@@ -608,8 +610,8 @@ static ImplDBCSConvertData const aImplSJISDBCSCvtData =
     aSJISUniLeadTab,
     aSJISDBCSHighTab,
     0x40, 0xFC,
-    aImplSJISDBCSEUCTab,
-    DBCS_EUC_SJIS_COUNT
+    aImplSJISDBCSEUDCTab,
+    DBCS_EUDC_SJIS_COUNT
 };
 
 /* ----------------------------------------------------------------------- */
@@ -646,7 +648,7 @@ static ImplTextEncodingData const aImplSJISTextEncodingData =
     128,
     932,
     1,
-    (const sal_Char*)"euc-jp",          /* ??? JISX0208.1990-0 */
+    (const sal_Char*)"euc-jp",
     (const sal_Char*)"shift_jis",
     RTL_TEXTENCODING_INFO_ASCII |
     RTL_TEXTENCODING_INFO_MULTIBYTE |
@@ -898,16 +900,16 @@ static ImplDBCSToUniLeadTab const aMS932UniLeadTab[256] =
     {      0, 0x40, 0xFC, aImplDBCSToUniTab_MS932_ED },         /* 0xED */
     {      0, 0x40, 0xFC, aImplDBCSToUniTab_MS932_EE },         /* 0xEE */
     {      0,    1,    0, aImplDoubleByteIdentifierTab },       /* 0xEF */ /* We convert this as double byte */
-    {      0,    1,    0, aImplDoubleByteIdentifierTab },       /* 0xF0 */ /* EUC Range */
-    {      0,    1,    0, aImplDoubleByteIdentifierTab },       /* 0xF1 */ /* EUC Range */
-    {      0,    1,    0, aImplDoubleByteIdentifierTab },       /* 0xF2 */ /* EUC Range */
-    {      0,    1,    0, aImplDoubleByteIdentifierTab },       /* 0xF3 */ /* EUC Range */
-    {      0,    1,    0, aImplDoubleByteIdentifierTab },       /* 0xF4 */ /* EUC Range */
-    {      0,    1,    0, aImplDoubleByteIdentifierTab },       /* 0xF5 */ /* EUC Range */
-    {      0,    1,    0, aImplDoubleByteIdentifierTab },       /* 0xF6 */ /* EUC Range */
-    {      0,    1,    0, aImplDoubleByteIdentifierTab },       /* 0xF7 */ /* EUC Range */
-    {      0,    1,    0, aImplDoubleByteIdentifierTab },       /* 0xF8 */ /* EUC Range */
-    {      0,    1,    0, aImplDoubleByteIdentifierTab },       /* 0xF9 */ /* EUC Range */
+    {      0,    1,    0, aImplDoubleByteIdentifierTab },       /* 0xF0 */ /* EUDC Range */
+    {      0,    1,    0, aImplDoubleByteIdentifierTab },       /* 0xF1 */ /* EUDC Range */
+    {      0,    1,    0, aImplDoubleByteIdentifierTab },       /* 0xF2 */ /* EUDC Range */
+    {      0,    1,    0, aImplDoubleByteIdentifierTab },       /* 0xF3 */ /* EUDC Range */
+    {      0,    1,    0, aImplDoubleByteIdentifierTab },       /* 0xF4 */ /* EUDC Range */
+    {      0,    1,    0, aImplDoubleByteIdentifierTab },       /* 0xF5 */ /* EUDC Range */
+    {      0,    1,    0, aImplDoubleByteIdentifierTab },       /* 0xF6 */ /* EUDC Range */
+    {      0,    1,    0, aImplDoubleByteIdentifierTab },       /* 0xF7 */ /* EUDC Range */
+    {      0,    1,    0, aImplDoubleByteIdentifierTab },       /* 0xF8 */ /* EUDC Range */
+    {      0,    1,    0, aImplDoubleByteIdentifierTab },       /* 0xF9 */ /* EUDC Range */
     {      0, 0x40, 0xFC, aImplDBCSToUniTab_MS932_FA },         /* 0xFA */
     {      0, 0x40, 0xFC, aImplDBCSToUniTab_MS932_FB },         /* 0xFB */
     {      0, 0x40, 0x4B, aImplDBCSToUniTab_MS932_FC },         /* 0xFC */
@@ -1185,8 +1187,8 @@ static ImplDBCSConvertData const aImplMS932DBCSCvtData =
     aMS932UniLeadTab,
     aMS932DBCSHighTab,
     0x40, 0xFC,
-    aImplSJISDBCSEUCTab,
-    DBCS_EUC_SJIS_COUNT
+    aImplSJISDBCSEUDCTab,
+    DBCS_EUDC_SJIS_COUNT
 };
 
 /* ----------------------------------------------------------------------- */
@@ -1223,7 +1225,7 @@ static ImplTextEncodingData const aImplMS932TextEncodingData =
     128,
     932,
     1,
-    (const sal_Char*)"euc-jp",          /* ??? JISX0208.1990-0 */
+    (const sal_Char*)"euc-jp",
     (const sal_Char*)"shift_jis",
     RTL_TEXTENCODING_INFO_ASCII |
     RTL_TEXTENCODING_INFO_MULTIBYTE |
@@ -1476,16 +1478,16 @@ static ImplDBCSToUniLeadTab const aAPPLEJAPANESEUniLeadTab[256] =
     {      0,    1,    0, aImplDoubleByteIdentifierTab },       /* 0xED */ /* We convert this as double byte */
     {      0,    1,    0, aImplDoubleByteIdentifierTab },       /* 0xEE */ /* We convert this as double byte */
     {      0,    1,    0, aImplDoubleByteIdentifierTab },       /* 0xEF */ /* We convert this as double byte */
-    {      0,    1,    0, aImplDoubleByteIdentifierTab },       /* 0xF0 */ /* EUC Range */
-    {      0,    1,    0, aImplDoubleByteIdentifierTab },       /* 0xF1 */ /* EUC Range */
-    {      0,    1,    0, aImplDoubleByteIdentifierTab },       /* 0xF2 */ /* EUC Range */
-    {      0,    1,    0, aImplDoubleByteIdentifierTab },       /* 0xF3 */ /* EUC Range */
-    {      0,    1,    0, aImplDoubleByteIdentifierTab },       /* 0xF4 */ /* EUC Range */
-    {      0,    1,    0, aImplDoubleByteIdentifierTab },       /* 0xF5 */ /* EUC Range */
-    {      0,    1,    0, aImplDoubleByteIdentifierTab },       /* 0xF6 */ /* EUC Range */
-    {      0,    1,    0, aImplDoubleByteIdentifierTab },       /* 0xF7 */ /* EUC Range */
-    {      0,    1,    0, aImplDoubleByteIdentifierTab },       /* 0xF8 */ /* EUC Range */
-    {      0,    1,    0, aImplDoubleByteIdentifierTab },       /* 0xF9 */ /* EUC Range */
+    {      0,    1,    0, aImplDoubleByteIdentifierTab },       /* 0xF0 */ /* EUDC Range */
+    {      0,    1,    0, aImplDoubleByteIdentifierTab },       /* 0xF1 */ /* EUDC Range */
+    {      0,    1,    0, aImplDoubleByteIdentifierTab },       /* 0xF2 */ /* EUDC Range */
+    {      0,    1,    0, aImplDoubleByteIdentifierTab },       /* 0xF3 */ /* EUDC Range */
+    {      0,    1,    0, aImplDoubleByteIdentifierTab },       /* 0xF4 */ /* EUDC Range */
+    {      0,    1,    0, aImplDoubleByteIdentifierTab },       /* 0xF5 */ /* EUDC Range */
+    {      0,    1,    0, aImplDoubleByteIdentifierTab },       /* 0xF6 */ /* EUDC Range */
+    {      0,    1,    0, aImplDoubleByteIdentifierTab },       /* 0xF7 */ /* EUDC Range */
+    {      0,    1,    0, aImplDoubleByteIdentifierTab },       /* 0xF8 */ /* EUDC Range */
+    {      0,    1,    0, aImplDoubleByteIdentifierTab },       /* 0xF9 */ /* EUDC Range */
     {      0, 0x40, 0xFC, aImplDBCSToUniTab_MS932_FA },         /* 0xFA */ /* We use the MS table for better MS compatibility */
     {      0, 0x40, 0xFC, aImplDBCSToUniTab_MS932_FB },         /* 0xFB */ /* We use the MS table for better MS compatibility */
     {      0, 0x40, 0x4B, aImplDBCSToUniTab_MS932_FC },         /* 0xFC */ /* We use the MS table for better MS compatibility */
@@ -1763,8 +1765,8 @@ static ImplDBCSConvertData const aImplAPPLEJAPANESEDBCSCvtData =
     aAPPLEJAPANESEUniLeadTab,
     aAPPLEJAPANESEDBCSHighTab,
     0x40, 0xFC,
-    aImplSJISDBCSEUCTab,
-    DBCS_EUC_SJIS_COUNT
+    aImplSJISDBCSEUDCTab,
+    DBCS_EUDC_SJIS_COUNT
 };
 
 /* ----------------------------------------------------------------------- */
@@ -1801,7 +1803,7 @@ static ImplTextEncodingData const aImplAPPLEJAPANESETextEncodingData =
     128,
     932,
     1,
-    (const sal_Char*)"euc-jp",          /* ??? JISX0208.1990-0 */
+    (const sal_Char*)"euc-jp",
     (const sal_Char*)"shift_jis",
     RTL_TEXTENCODING_INFO_ASCII |
     RTL_TEXTENCODING_INFO_MULTIBYTE |
@@ -2645,7 +2647,7 @@ static ImplTextEncodingData const aImplEUCJPTextEncodingData =
     128,
     932,
     1,
-    (const sal_Char*)"euc-jp",          /* ??? JISX0208.1990-0 */
+    (const sal_Char*)"euc-jp",
     (const sal_Char*)"euc-jp",
     RTL_TEXTENCODING_INFO_ASCII |
     RTL_TEXTENCODING_INFO_MULTIBYTE |
@@ -2657,42 +2659,6 @@ static ImplTextEncodingData const aImplEUCJPTextEncodingData =
 
 /* !!! JIS - X Encodings not complete !!! */
 
-static ImplTextConverterData aImplJISX0208TextConverterData =
-{
-    aJIS0208DBCSHighTab,
-    NULL,
-    RTL_UNICODE_CHAR_DEFAULT,
-};
-
-static ImplTextConverter aImplJISX0208TextConverter =
-{
-    &aImplJISX0208TextConverterData,
-    NULL,
-    ImplUnicodeToJISX0208,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL
-};
-
-static ImplTextEncodingData aImplJISX0208TextEncodingData =
-{
-    &aImplJISX0208TextConverter,
-    RTL_TEXTENCODING_JIS_X_0208,
-    2, 2, 2,
-    128,
-    932,
-    1,
-    (const sal_Char*)"euc-jp",          /* ??? JISX0208.1990-0 */
-    (const sal_Char*)"euc-jp",
-    RTL_TEXTENCODING_INFO_MULTIBYTE,
-    SCRIPT_JAPANESE,
-};
-
-/* ======================================================================= */
-
 #define HALFWIDTHKANA_START 0xFF61
 #define HALFWIDTHKANA_END   0xFF9F
 
@@ -2704,6 +2670,8 @@ static sal_uChar aImplJISX0201Tab[HALFWIDTHKANA_END - HALFWIDTHKANA_START + 1] =
     0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0xD5, 0xD6, 0xD7, 0xD8, 0xD9, 0xDA, 0xDB, 0xDC, 0xDD, 0xDE, 0xDF,
 };
 
+/* ----------------------------------------------------------------------- */
+
 static ImplByteConvertData aImplJISX0201ByteCvtData =
 {
     NULL,
@@ -2718,6 +2686,8 @@ static ImplByteConvertData aImplJISX0201ByteCvtData =
     0
 };
 
+/* ----------------------------------------------------------------------- */
+
 static ImplTextConverterData aImplJISX0201TextConverterData =
 {
     &aImplJISX0201ByteCvtData,
@@ -2725,6 +2695,8 @@ static ImplTextConverterData aImplJISX0201TextConverterData =
     RTL_UNICODE_CHAR_DEFAULT
 };
 
+/* ----------------------------------------------------------------------- */
+
 static ImplTextConverter aImplJISX0201TextConverter =
 {
     &aImplJISX0201TextConverterData,
@@ -2738,6 +2710,8 @@ static ImplTextConverter aImplJISX0201TextConverter =
     NULL
 };
 
+/* ----------------------------------------------------------------------- */
+
 static ImplTextEncodingData aImplJISX0201TextEncodingData =
 {
     &aImplJISX0201TextConverter,
@@ -2746,7 +2720,7 @@ static ImplTextEncodingData aImplJISX0201TextEncodingData =
     128,
     923,
     1,
-    (const sal_Char*)"euc-jp",          /* ??? JISX0208.1990-0 */
+    (const sal_Char*)"euc-jp",
     (const sal_Char*)"euc-jp",
     RTL_TEXTENCODING_INFO_MULTIBYTE,
     SCRIPT_JAPANESE,
@@ -2754,18 +2728,82 @@ static ImplTextEncodingData aImplJISX0201TextEncodingData =
 
 /* ======================================================================= */
 
-static ImplTextConverterData aImplJISX0212TextConverterData =
+static ImplDBCSConvertData const aImplJISX0208DBCSCvtData =
 {
+    NULL,
+    aJIS0208DBCSHighTab,
+    0x21, 0x7E,
+    NULL,
+    0
+};
+
+/* ----------------------------------------------------------------------- */
+
+static ImplTextConverterData aImplJISX0208TextConverterData =
+{
+    &aImplJISX0208DBCSCvtData,
+    NULL,
+    RTL_UNICODE_CHAR_DEFAULT,
+};
+
+/* ----------------------------------------------------------------------- */
+
+static ImplTextConverter aImplJISX0208TextConverter =
+{
+    &aImplJISX0208TextConverterData,
+    NULL,
+    ImplUnicodeToDBCS,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL
+};
+
+/* ----------------------------------------------------------------------- */
+
+static ImplTextEncodingData aImplJISX0208TextEncodingData =
+{
+    &aImplJISX0208TextConverter,
+    RTL_TEXTENCODING_JIS_X_0208,
+    2, 2, 2,
+    128,
+    932,
+    1,
+    (const sal_Char*)"euc-jp",
+    (const sal_Char*)"euc-jp",
+    RTL_TEXTENCODING_INFO_MULTIBYTE,
+    SCRIPT_JAPANESE,
+};
+
+/* ======================================================================= */
+
+static ImplDBCSConvertData const aImplJISX0212DBCSCvtData =
+{
+    NULL,
     aJIS0212DBCSHighTab,
+    0x21, 0x7E,
+    NULL,
+    0
+};
+
+/* ----------------------------------------------------------------------- */
+
+static ImplTextConverterData aImplJISX0212TextConverterData =
+{
+    &aImplJISX0212DBCSCvtData,
     NULL,
     RTL_UNICODE_CHAR_DEFAULT,
 };
 
+/* ----------------------------------------------------------------------- */
+
 static ImplTextConverter aImplJISX0212TextConverter =
 {
     &aImplJISX0212TextConverterData,
     NULL,
-    ImplUnicodeToJISX0208,  // can use same routine with JISX0208
+    ImplUnicodeToDBCS,
     NULL,
     NULL,
     NULL,
@@ -2774,6 +2812,8 @@ static ImplTextConverter aImplJISX0212TextConverter =
     NULL
 };
 
+/* ----------------------------------------------------------------------- */
+
 static ImplTextEncodingData aImplJISX0212TextEncodingData =
 {
     &aImplJISX0212TextConverter,
@@ -2782,9 +2822,8 @@ static ImplTextEncodingData aImplJISX0212TextEncodingData =
     128,
     923,
     1,
-    (const sal_Char*)"euc-jp",          /* ??? JISX0208.1990-0 */
+    (const sal_Char*)"euc-jp",
     (const sal_Char*)"euc-jp",
     RTL_TEXTENCODING_INFO_MULTIBYTE,
     SCRIPT_JAPANESE,
 };
-
diff --git a/sal/textenc/tcvtscn6.tab b/sal/textenc/tcvtscn6.tab
index ea7d5ec657e3..8692252f5e56 100644
--- a/sal/textenc/tcvtscn6.tab
+++ b/sal/textenc/tcvtscn6.tab
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tcvtscn6.tab,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 15:17:29 $
+ *  last change: $Author: th $ $Date: 2000-12-13 22:23:24 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -76,22 +76,6 @@
 
 /* ======================================================================= */
 
-/* We use this EUC range also for GB, GBT and GBK */
-#define DBCS_EUC_MS936_COUNT    2
-static ImplDBCSEUCData const aImplMS936DBCSEUCTab[DBCS_EUC_MS936_COUNT] =
-{
-    /* EUC-Range (the mapping defined by ms is A0-FF, because the */
-    /* unicode range is E000-E29F and E2A0-E4DF) */
-    /* Lead:    F8-FE */
-    /* Trail:   A1-FE */
-    { 0xF8, 0xFE, 0xA0, 0xFF, 0, 0, 0, 0, 1, 0x60, 0xE000, 0xE29F },
-    /* Lead:    AA-AF */
-    /* Trail:   A1-FE */
-    { 0xAA, 0xAF, 0xA0, 0xFF, 0, 0, 0, 0, 1, 0x60, 0xE2A0, 0xE4DF }
-};
-
-/* ----------------------------------------------------------------------- */
-
 static ImplDBCSToUniLeadTab const aGB2312UniLeadTab[256] =
 {
     { 0x0000,    0,    0, NULL },                               /* 0x00 */
@@ -616,13 +600,31 @@ static ImplUniToDBCSHighTab const aGB2312DBCSHighTab[256] =
 
 /* ----------------------------------------------------------------------- */
 
+/* F8A1-FEFE    --> E000-E29F */
+/* AAA1-AFFE    --> E2A0-E4DF */
+
+#define DBCS_EUDC_MS936_COUNT       2
+static ImplDBCSEUDCData const aImplMS936DBCSEUDCTab[DBCS_EUDC_MS936_COUNT] =
+{
+    /* EUDC-Range (the mapping defined by MS is A0-FF, because the */
+    /* unicode range is E000-E29F and E2A0-E4DF) */
+    /* Lead:    F8-FE */
+    /* Trail:   A1-FE */
+    { 0xF8, 0xFE, 0xA0, 0xFF, 0, 0, 0, 0, 1, 0x60, 0xE000, 0xE29F },
+    /* Lead:    AA-AF */
+    /* Trail:   A1-FE */
+    { 0xAA, 0xAF, 0xA0, 0xFF, 0, 0, 0, 0, 1, 0x60, 0xE2A0, 0xE4DF }
+};
+
+/* ----------------------------------------------------------------------- */
+
 static ImplDBCSConvertData const aImplGB2312DBCSCvtData =
 {
     aGB2312UniLeadTab,
     aGB2312DBCSHighTab,
     0xA1, 0xFE,
-    aImplMS936DBCSEUCTab,
-    DBCS_EUC_MS936_COUNT
+    aImplMS936DBCSEUDCTab,
+    DBCS_EUDC_MS936_COUNT
 };
 
 /* ----------------------------------------------------------------------- */
@@ -659,7 +661,7 @@ static ImplTextEncodingData const aImplGB2312TextEncodingData =
     134,
     936,
     25,
-    (const sal_Char*)"euc-cn",          /* ??? */
+    (const sal_Char*)"euc-cn",
     (const sal_Char*)"gb2312",
     RTL_TEXTENCODING_INFO_ASCII |
     RTL_TEXTENCODING_INFO_MULTIBYTE |
@@ -677,7 +679,7 @@ static ImplTextEncodingData aImplEUCCNTextEncodingData =
     134,
     936,
     25,
-    (const sal_Char*)"euc-cn",          /* ??? */
+    (const sal_Char*)"euc-cn",
     (const sal_Char*)"gb2312",
     RTL_TEXTENCODING_INFO_ASCII |
     RTL_TEXTENCODING_INFO_MULTIBYTE,
@@ -1215,8 +1217,8 @@ static ImplDBCSConvertData const aImplGBT12345DBCSCvtData =
     aGBT12345UniLeadTab,
     aGBT12345DBCSHighTab,
     0xA1, 0xFE,
-    aImplMS936DBCSEUCTab,
-    DBCS_EUC_MS936_COUNT
+    aImplMS936DBCSEUDCTab,
+    DBCS_EUDC_MS936_COUNT
 };
 
 /* ----------------------------------------------------------------------- */
@@ -1253,7 +1255,7 @@ static ImplTextEncodingData const aImplGBT12345TextEncodingData =
     134,
     936,
     25,
-    (const sal_Char*)"euc-cn",          /* ??? */
+    (const sal_Char*)"euc-cn",
     (const sal_Char*)"cn-gb-12345",
     RTL_TEXTENCODING_INFO_ASCII |
     RTL_TEXTENCODING_INFO_MULTIBYTE |
@@ -1792,8 +1794,8 @@ static ImplDBCSConvertData const aImplGBKDBCSCvtData =
     aGBKUniLeadTab,
     aGBKDBCSHighTab,
     0x40, 0xFE,
-    aImplMS936DBCSEUCTab,
-    DBCS_EUC_MS936_COUNT
+    aImplMS936DBCSEUDCTab,
+    DBCS_EUDC_MS936_COUNT
 };
 
 /* ----------------------------------------------------------------------- */
@@ -1830,7 +1832,7 @@ static ImplTextEncodingData const aImplGBKTextEncodingData =
     134,
     936,
     25,
-    (const sal_Char*)"euc-cn",          /* ??? */
+    (const sal_Char*)"euc-cn",
     (const sal_Char*)"gb2312",
     RTL_TEXTENCODING_INFO_ASCII |
     RTL_TEXTENCODING_INFO_MULTIBYTE |
@@ -2369,8 +2371,8 @@ static ImplDBCSConvertData const aImplMS936DBCSCvtData =
     aMS936UniLeadTab,
     aMS936DBCSHighTab,
     0x40, 0xFE,
-    aImplMS936DBCSEUCTab,
-    DBCS_EUC_MS936_COUNT
+    aImplMS936DBCSEUDCTab,
+    DBCS_EUDC_MS936_COUNT
 };
 
 /* ----------------------------------------------------------------------- */
@@ -2407,7 +2409,7 @@ static ImplTextEncodingData const aImplMS936TextEncodingData =
     134,
     936,
     25,
-    (const sal_Char*)"euc-cn",          /* ??? */
+    (const sal_Char*)"euc-cn",
     (const sal_Char*)"gb2312",
     RTL_TEXTENCODING_INFO_ASCII |
     RTL_TEXTENCODING_INFO_MULTIBYTE |
@@ -2985,7 +2987,7 @@ static ImplTextEncodingData const aImplAPPLECHINSIMPTextEncodingData =
     134,
     936,
     25,
-    (const sal_Char*)"euc-cn",          /* ??? */
+    (const sal_Char*)"euc-cn",
     (const sal_Char*)"gb2312",
     RTL_TEXTENCODING_INFO_ASCII |
     RTL_TEXTENCODING_INFO_MULTIBYTE |
diff --git a/sal/textenc/tcvttcn6.tab b/sal/textenc/tcvttcn6.tab
index eeeef67e46d9..3fec9200f685 100644
--- a/sal/textenc/tcvttcn6.tab
+++ b/sal/textenc/tcvttcn6.tab
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tcvttcn6.tab,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 15:17:30 $
+ *  last change: $Author: th $ $Date: 2000-12-13 22:23:46 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -67,27 +67,6 @@
 
 /* ======================================================================= */
 
-/* We use this EUC range also for BIG5 */
-/* !!! because I don't know how the ms mapping works, I use my own mapping !!! */
-/* tables like MS doku: */
-/* FA40-FEFE --> E000-E310      5*9D = 311 - E310-E000 = 311 */
-/* 8E40-A0FE --> E311-EEB7      3*9D = 1D7 - EEB7-E311 = BA7 */
-/* 8140-8DFE --> EEB8-F6B0     13*9D = BA7 - F6B=-EEB8 = 7F9 */
-/* C6A1-C8FE --> F6B1-F8FF      3*5E = 11A - F8FF-F6B1 = 24F */
-#define DBCS_EUC_MS950_COUNT    2
-static ImplDBCSEUCData const aImplMS950DBCSEUCTab[DBCS_EUC_MS950_COUNT] =
-{
-    /* EUC-Range */
-    /* Lead:    FA-FE */
-    /* Trail:   40-7E, A1-FE */
-    { 0xFA, 0xFE, 0x40, 0x7E, 0xA1, 0xFE, 0, 0, 2, 0x9D, 0xE000, 0xE310 },
-    /* Lead:    81-8D */
-    /* Trail:   40-7E, A1-FE */
-    { 0x81, 0x8D, 0x40, 0x7E, 0xA1, 0xFE, 0, 0, 2, 0x9D, 0xE311, 0xEEB7 }
-};
-
-/* ----------------------------------------------------------------------- */
-
 static ImplDBCSToUniLeadTab const aBIG5UniLeadTab[256] =
 {
     { 0x0000,    0,    0, NULL },                               /* 0x00 */
@@ -612,13 +591,38 @@ static ImplUniToDBCSHighTab const aBIG5DBCSHighTab[256] =
 
 /* ----------------------------------------------------------------------- */
 
+/* FA40-FEFE --> E000-E310 */
+/* 8E40-A0FE --> E311-EEB7 */
+/* 8140-8DFE --> EEB8-F6B0 */
+/* C6A1-C8FE --> F6B1-F8FF      3*5E = 11A --> F6B1+11A-1 = F7CA ??? */
+
+#define DBCS_EUDC_MS950_COUNT       4
+static ImplDBCSEUDCData const aImplMS950DBCSEUDCTab[DBCS_EUDC_MS950_COUNT] =
+{
+    /* EUDC-Range */
+    /* Lead:    FA-FE */
+    /* Trail:   40-7E, A1-FE */
+    { 0xFA, 0xFE, 0x40, 0x7E, 0xA1, 0xFE, 0, 0, 2, 0x9D, 0xE000, 0xE310 },
+    /* Lead:    8E-A0 */
+    /* Trail:   40-7E, A1-FE */
+    { 0x8E, 0xA0, 0x40, 0x7E, 0xA1, 0xFE, 0, 0, 2, 0x9D, 0xE311, 0xEEB7 },
+    /* Lead:    81-8D */
+    /* Trail:   40-7E, A1-FE */
+    { 0x81, 0x8D, 0x40, 0x7E, 0xA1, 0xFE, 0, 0, 2, 0x9D, 0xEEB8, 0xF6B0 },
+    /* Lead:    C6-C8 */
+    /* Trail:   A1-FE */
+    { 0xC6, 0xC8, 0xA1, 0xFE, 0, 0, 0, 0, 1, 0x5E, 0xF6B1, 0xF7CA }
+};
+
+/* ----------------------------------------------------------------------- */
+
 static ImplDBCSConvertData const aImplBIG5DBCSCvtData =
 {
     aBIG5UniLeadTab,
     aBIG5DBCSHighTab,
     0x40, 0xFE,
-    aImplMS950DBCSEUCTab,
-    DBCS_EUC_MS950_COUNT
+    aImplMS950DBCSEUDCTab,
+    DBCS_EUDC_MS950_COUNT
 };
 
 /* ----------------------------------------------------------------------- */
@@ -655,7 +659,7 @@ static ImplTextEncodingData const aImplBIG5TextEncodingData =
     136,
     950,
     2,
-    (const sal_Char*)"euc-tw",              /* ??? */
+    (const sal_Char*)"euc-tw",
     (const sal_Char*)"big5",
     RTL_TEXTENCODING_INFO_ASCII |
     RTL_TEXTENCODING_INFO_MULTIBYTE |
@@ -1194,8 +1198,8 @@ static ImplDBCSConvertData const aImplMS950DBCSCvtData =
     aMS950UniLeadTab,
     aMS950DBCSHighTab,
     0x40, 0xFE,
-    aImplMS950DBCSEUCTab,
-    DBCS_EUC_MS950_COUNT
+    aImplMS950DBCSEUDCTab,
+    DBCS_EUDC_MS950_COUNT
 };
 
 /* ----------------------------------------------------------------------- */
@@ -1232,7 +1236,7 @@ static ImplTextEncodingData const aImplMS950TextEncodingData =
     136,
     950,
     2,
-    (const sal_Char*)"euc-tw",              /* ??? */
+    (const sal_Char*)"euc-tw",
     (const sal_Char*)"big5",
     RTL_TEXTENCODING_INFO_ASCII |
     RTL_TEXTENCODING_INFO_MULTIBYTE |
@@ -1810,7 +1814,7 @@ static ImplTextEncodingData const aImplAPPLECHINTRADTextEncodingData =
     136,
     950,
     2,
-    (const sal_Char*)"euc-tw",              /* ??? */
+    (const sal_Char*)"euc-tw",
     (const sal_Char*)"big5",
     RTL_TEXTENCODING_INFO_ASCII |
     RTL_TEXTENCODING_INFO_MULTIBYTE |