INTEGRATION: CWS sb69 (1.7.202); FILE MERGED

2007/01/26 13:06:36 sb 1.7.202.2: #i73103# Made code warning-free on unxlngi6.pro.
2007/01/24 16:36:58 sb 1.7.202.1: #i73103# Support mappings from Unicode characters to MS1258 base + combining characters.

1 files changed, 158 insertions, 51 deletions

diff --git a/sal/textenc/tcvteas1.tab b/sal/textenc/tcvteas1.tab
index d35ac296735d..e14489173e19 100644
--- a/sal/textenc/tcvteas1.tab
+++ b/sal/textenc/tcvteas1.tab
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: tcvteas1.tab,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-08 16:36:33 $
+ *  last change: $Author: obo $ $Date: 2007-03-14 08:30:13 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -99,16 +99,16 @@ static sal_uChar const aImplMS874ToCharTab[MS874CHAR_END - MS874CHAR_START + 1]
 #define MS874TOCHARTABEX_COUNT          10
 static ImplUniCharTabData const aImplMS874ToCharTabEx[MS874TOCHARTABEX_COUNT] =
 {
-  { 0x00A0, 0xA0 },
-  { 0x2013, 0x96 },
-  { 0x2014, 0x97 },
-  { 0x2018, 0x91 },
-  { 0x2019, 0x92 },
-  { 0x201C, 0x93 },
-  { 0x201D, 0x94 },
-  { 0x2022, 0x95 },
-  { 0x2026, 0x85 },
-  { 0x20AC, 0x80 }
+  { 0x00A0, 0xA0, 0 },
+  { 0x2013, 0x96, 0 },
+  { 0x2014, 0x97, 0 },
+  { 0x2018, 0x91, 0 },
+  { 0x2019, 0x92, 0 },
+  { 0x201C, 0x93, 0 },
+  { 0x201D, 0x94, 0 },
+  { 0x2022, 0x95, 0 },
+  { 0x2026, 0x85, 0 },
+  { 0x20AC, 0x80, 0 }
 };
 
 /* ----------------------------------------------------------------------- */
@@ -257,46 +257,153 @@ static sal_uChar const aImplMS1258ToCharTab[MS1258CHAR_END - MS1258CHAR_START +
 
 /* ----------------------------------------------------------------------- */
 
-#define MS1258TOCHARTABEX_COUNT         37
+/* The list of Vietnamese-relevant precomposed Unicode characters that map to
+   MS1258 base + combining modifier are derived from the information present at
+   <http://vietunicode.sourceforge.net/charset/>: */
+#define MS1258TOCHARTABEX_COUNT         141
 static ImplUniCharTabData const aImplMS1258ToCharTabEx[MS1258TOCHARTABEX_COUNT] =
 {
-  { 0x0102, 0xC3 },
-  { 0x0103, 0xE3 },
-  { 0x0110, 0xD0 },
-  { 0x0111, 0xF0 },
-  { 0x0152, 0x8C },
-  { 0x0153, 0x9C },
-  { 0x0178, 0x9F },
-  { 0x0192, 0x83 },
-  { 0x01A0, 0xD5 },
-  { 0x01A1, 0xF5 },
-  { 0x01AF, 0xDD },
-  { 0x01B0, 0xFD },
-  { 0x02C6, 0x88 },
-  { 0x02DC, 0x98 },
-  { 0x0300, 0xCC },
-  { 0x0301, 0xEC },
-  { 0x0303, 0xDE },
-  { 0x0309, 0xD2 },
-  { 0x0323, 0xF2 },
-  { 0x2013, 0x96 },
-  { 0x2014, 0x97 },
-  { 0x2018, 0x91 },
-  { 0x2019, 0x92 },
-  { 0x201A, 0x82 },
-  { 0x201C, 0x93 },
-  { 0x201D, 0x94 },
-  { 0x201E, 0x84 },
-  { 0x2020, 0x86 },
-  { 0x2021, 0x87 },
-  { 0x2022, 0x95 },
-  { 0x2026, 0x85 },
-  { 0x2030, 0x89 },
-  { 0x2039, 0x8B },
-  { 0x203A, 0x9B },
-  { 0x20AB, 0xFE },
-  { 0x20AC, 0x80 },
-  { 0x2122, 0x99 },
+  { 0x00C3, 0x41, 0xDE },
+  { 0x00CC, 0x49, 0xCC },
+  { 0x00D2, 0x4F, 0xCC },
+  { 0x00D5, 0x4F, 0xDE },
+  { 0x00DD, 0x59, 0xEC },
+  { 0x00E3, 0x61, 0xDE },
+  { 0x00EC, 0x69, 0xCC },
+  { 0x00F2, 0x6F, 0xCC },
+  { 0x00F5, 0x6F, 0xDE },
+  { 0x00FD, 0x79, 0xCC },
+  { 0x0102, 0xC3, 0 },
+  { 0x0103, 0xE3, 0 },
+  { 0x0110, 0xD0, 0 },
+  { 0x0111, 0xF0, 0 },
+  { 0x0128, 0x49, 0xDE },
+  { 0x0129, 0x69, 0xDE },
+  { 0x0152, 0x8C, 0 },
+  { 0x0153, 0x9C, 0 },
+  { 0x0168, 0x55, 0xDE },
+  { 0x0169, 0x75, 0xDE },
+  { 0x0178, 0x9F, 0 },
+  { 0x0192, 0x83, 0 },
+  { 0x01A0, 0xD5, 0 },
+  { 0x01A1, 0xF5, 0 },
+  { 0x01AF, 0xDD, 0 },
+  { 0x01B0, 0xFD, 0 },
+  { 0x02C6, 0x88, 0 },
+  { 0x02DC, 0x98, 0 },
+  { 0x0300, 0xCC, 0 },
+  { 0x0301, 0xEC, 0 },
+  { 0x0303, 0xDE, 0 },
+  { 0x0309, 0xD2, 0 },
+  { 0x0323, 0xF2, 0 },
+  { 0x1EA0, 0x41, 0xF2 },
+  { 0x1EA1, 0x61, 0xF2 },
+  { 0x1EA2, 0x41, 0xD2 },
+  { 0x1EA3, 0x61, 0xD2 },
+  { 0x1EA4, 0xC2, 0xEC },
+  { 0x1EA5, 0xE2, 0xEC },
+  { 0x1EA6, 0xC2, 0xCC },
+  { 0x1EA7, 0xE2, 0xCC },
+  { 0x1EA8, 0xC2, 0xD2 },
+  { 0x1EA9, 0xE2, 0xD2 },
+  { 0x1EAA, 0xC2, 0xDE },
+  { 0x1EAB, 0xE2, 0xDE },
+  { 0x1EAC, 0xC2, 0xF2 },
+  { 0x1EAD, 0xE2, 0xF2 },
+  { 0x1EAE, 0xC3, 0xEC },
+  { 0x1EAF, 0xE3, 0xEC },
+  { 0x1EB0, 0xC3, 0xCC },
+  { 0x1EB1, 0xE3, 0xCC },
+  { 0x1EB2, 0xC3, 0xD2 },
+  { 0x1EB3, 0xE3, 0xD2 },
+  { 0x1EB4, 0xC3, 0xDE },
+  { 0x1EB5, 0xE3, 0xDE },
+  { 0x1EB6, 0xC3, 0xF2 },
+  { 0x1EB7, 0xE3, 0xF2 },
+  { 0x1EB8, 0x45, 0xF2 },
+  { 0x1EB9, 0x65, 0xF2 },
+  { 0x1EBA, 0x45, 0xD2 },
+  { 0x1EBB, 0x65, 0xD2 },
+  { 0x1EBC, 0x45, 0xDE },
+  { 0x1EBD, 0x65, 0xDE },
+  { 0x1EBE, 0xCA, 0xEC },
+  { 0x1EBF, 0xEA, 0xEC },
+  { 0x1EC0, 0xCA, 0xCC },
+  { 0x1EC1, 0xEA, 0xCC },
+  { 0x1EC2, 0xCA, 0xD2 },
+  { 0x1EC3, 0xEA, 0xD2 },
+  { 0x1EC4, 0xCA, 0xDE },
+  { 0x1EC5, 0xEA, 0xDE },
+  { 0x1EC6, 0xCA, 0xF2 },
+  { 0x1EC7, 0xEA, 0xF2 },
+  { 0x1EC8, 0x49, 0xD2 },
+  { 0x1EC9, 0x69, 0xD2 },
+  { 0x1ECA, 0x49, 0xF2 },
+  { 0x1ECB, 0x69, 0xF2 },
+  { 0x1ECC, 0x4F, 0xF2 },
+  { 0x1ECD, 0x6F, 0xF2 },
+  { 0x1ECE, 0x4F, 0xD2 },
+  { 0x1ECF, 0x6F, 0xD2 },
+  { 0x1ED0, 0xD4, 0xEC },
+  { 0x1ED1, 0xF4, 0xEC },
+  { 0x1ED2, 0xD4, 0xCC },
+  { 0x1ED3, 0xF4, 0xCC },
+  { 0x1ED4, 0xD4, 0xD2 },
+  { 0x1ED5, 0xF4, 0xD2 },
+  { 0x1ED6, 0xD4, 0xDE },
+  { 0x1ED7, 0xF4, 0xDE },
+  { 0x1ED8, 0xD4, 0xF2 },
+  { 0x1ED9, 0xF4, 0xF2 },
+  { 0x1EDA, 0xD5, 0xEC },
+  { 0x1EDB, 0xF5, 0xEC },
+  { 0x1EDC, 0xD5, 0xCC },
+  { 0x1EDD, 0xF5, 0xCC },
+  { 0x1EDE, 0xD5, 0xD2 },
+  { 0x1EDF, 0xF5, 0xD2 },
+  { 0x1EE0, 0xD5, 0xDE },
+  { 0x1EE1, 0xF5, 0xDE },
+  { 0x1EE2, 0xD5, 0xF2 },
+  { 0x1EE3, 0xF5, 0xF2 },
+  { 0x1EE4, 0x55, 0xF2 },
+  { 0x1EE5, 0x75, 0xF2 },
+  { 0x1EE6, 0x55, 0xD2 },
+  { 0x1EE7, 0x75, 0xD2 },
+  { 0x1EE8, 0xDD, 0xEC },
+  { 0x1EE9, 0xFD, 0xEC },
+  { 0x1EEA, 0xDD, 0xCC },
+  { 0x1EEB, 0xFD, 0xCC },
+  { 0x1EEC, 0xDD, 0xD2 },
+  { 0x1EED, 0xFD, 0xD2 },
+  { 0x1EEE, 0xDD, 0xDE },
+  { 0x1EEF, 0xFD, 0xDE },
+  { 0x1EF0, 0xDD, 0xF2 },
+  { 0x1EF1, 0xFD, 0xF2 },
+  { 0x1EF2, 0x59, 0xCC },
+  { 0x1EF3, 0x79, 0xCC },
+  { 0x1EF4, 0x59, 0xF2 },
+  { 0x1EF5, 0x79, 0xF2 },
+  { 0x1EF6, 0x59, 0xD2 },
+  { 0x1EF7, 0x79, 0xD2 },
+  { 0x1EF8, 0x59, 0xDE },
+  { 0x1EF9, 0x79, 0xDE },
+  { 0x2013, 0x96, 0 },
+  { 0x2014, 0x97, 0 },
+  { 0x2018, 0x91, 0 },
+  { 0x2019, 0x92, 0 },
+  { 0x201A, 0x82, 0 },
+  { 0x201C, 0x93, 0 },
+  { 0x201D, 0x94, 0 },
+  { 0x201E, 0x84, 0 },
+  { 0x2020, 0x86, 0 },
+  { 0x2021, 0x87, 0 },
+  { 0x2022, 0x95, 0 },
+  { 0x2026, 0x85, 0 },
+  { 0x2030, 0x89, 0 },
+  { 0x2039, 0x8B, 0 },
+  { 0x203A, 0x9B, 0 },
+  { 0x20AB, 0xFE, 0 },
+  { 0x20AC, 0x80, 0 },
+  { 0x2122, 0x99, 0 }
 };
 
 /* ----------------------------------------------------------------------- */
@@ -328,7 +435,7 @@ static ImplTextEncodingData const aImplMS1258TextEncodingData
           NULL,
           NULL },
         1,
-        1,
+        2,
         1,
         163,
         "iso8859-1", /* TODO! correct? */