Update.
authorUlrich Drepper <drepper@redhat.com>
Wed, 5 Dec 2001 10:11:07 +0000 (10:11 +0000)
committerUlrich Drepper <drepper@redhat.com>
Wed, 5 Dec 2001 10:11:07 +0000 (10:11 +0000)
2001-12-05  Ulrich Drepper  <drepper@redhat.com>

* iconvdata/Makefile (modules): Add TCVN5712-1.
* iconvdata/TESTS: Add TCVN5712-1.
* iconvdata/gconv-modules: Likewise.
* iconvdata/tcvn5712-1.c: New file.
* iconvdata/testdata/TCVN5712-1: New file.
* iconvdata/testdata/TCVN5712-1..UTF8: New file.

ChangeLog
iconvdata/Makefile
iconvdata/TESTS
iconvdata/cp1258.c
iconvdata/gconv-modules
iconvdata/tcvn5712-1.c [new file with mode: 0644]
iconvdata/testdata/TCVN5712-1 [new file with mode: 0644]
iconvdata/testdata/TCVN5712-1..UTF8 [new file with mode: 0644]
localedata/ChangeLog
localedata/charmaps/TCVN5712-1 [new file with mode: 0644]

index 6c9a902..9422586 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2001-12-05  Ulrich Drepper  <drepper@redhat.com>
+
+       * iconvdata/Makefile (modules): Add TCVN5712-1.
+       * iconvdata/TESTS: Add TCVN5712-1.
+       * iconvdata/gconv-modules: Likewise.
+       * iconvdata/tcvn5712-1.c: New file.
+       * iconvdata/testdata/TCVN5712-1: New file.
+       * iconvdata/testdata/TCVN5712-1..UTF8: New file.
+
 2001-12-04  Ulrich Drepper  <drepper@redhat.com>
 
        * iconvdata/cp1258.c: Optimize conversion from UCS4.
index 6f6efad..9817a63 100644 (file)
@@ -49,7 +49,8 @@ modules       := ISO8859-1 ISO8859-2 ISO8859-3 ISO8859-4 ISO8859-5             \
           SAMI-WS2 ISO-IR-197 TIS-620 KOI8-U GBK ISIRI-3342 GBGBK       \
           ISO-2022-CN libISOIR165 UTF-16 UNICODE UTF-32 UTF-7 BIG5HKSCS \
           GB18030 ISO-2022-CN-EXT VISCII GBBIG5 CP10007 KOI8-T          \
-          GEORGIAN-PS GEORGIAN-ACADEMY ISO-IR-209 MAC-SAMI ARMSCII-8
+          GEORGIAN-PS GEORGIAN-ACADEMY ISO-IR-209 MAC-SAMI ARMSCII-8    \
+          TCVN5712-1
 
 modules.so := $(addsuffix .so, $(modules))
 
index c2a7cff..1ae28ac 100644 (file)
@@ -111,3 +111,4 @@ IBM1133                     IBM1133                 Y       UTF8
 IBM1162                        IBM1162                 Y       UTF8
 IBM1163                        IBM1163                 Y       UTF8
 IBM1164                        IBM1164                 N       UTF8
+TCVN5712-1             TCVN5712-1              Y       UTF8
index 2dd47c8..8351f27 100644 (file)
 
 /* First define the conversion function from CP1258 to UCS4.  */
 
-static const uint16_t to_ucs4[128] = {
-  /* 0x80 */
-  0x20AC,      0, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021,
-  0x02C6, 0x2030,      0, 0x2039, 0x0152,      0,      0,      0,
-  /* 0x90 */
-       0, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
-  0x02DC, 0x2122,      0, 0x203A, 0x0153,      0,      0, 0x0178,
-  /* 0xA0 */
-  0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7,
-  0x00A8, 0x00A9, 0x00AA, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF,
-  /* 0xB0 */
-  0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7,
-  0x00B8, 0x00B9, 0x00BA, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00BF,
-  /* 0xC0 */
-  0x00C0, 0x00C1, 0x00C2, 0x0102, 0x00C4, 0x00C5, 0x00C6, 0x00C7,
-  0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x0300, 0x00CD, 0x00CE, 0x00CF,
-  /* 0xD0 */
-  0x0110, 0x00D1, 0x0309, 0x00D3, 0x00D4, 0x01A0, 0x00D6, 0x00D7,
-  0x00D8, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x01AF, 0x0303, 0x00DF,
-  /* 0xE0 */
-  0x00E0, 0x00E1, 0x00E2, 0x0103, 0x00E4, 0x00E5, 0x00E6, 0x00E7,
-  0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x0301, 0x00ED, 0x00EE, 0x00EF,
-  /* 0xF0 */
-  0x0111, 0x00F1, 0x0323, 0x00F3, 0x00F4, 0x01A1, 0x00F6, 0x00F7,
-  0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x01B0, 0x20AB, 0x00FF,
-};
+static const uint16_t to_ucs4[128] =
+  {
+    /* 0x80 */
+    0x20AC,      0, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021,
+    0x02C6, 0x2030,      0, 0x2039, 0x0152,      0,      0,      0,
+    /* 0x90 */
+         0, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
+    0x02DC, 0x2122,      0, 0x203A, 0x0153,      0,      0, 0x0178,
+    /* 0xA0 */
+    0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7,
+    0x00A8, 0x00A9, 0x00AA, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF,
+    /* 0xB0 */
+    0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7,
+    0x00B8, 0x00B9, 0x00BA, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00BF,
+    /* 0xC0 */
+    0x00C0, 0x00C1, 0x00C2, 0x0102, 0x00C4, 0x00C5, 0x00C6, 0x00C7,
+    0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x0300, 0x00CD, 0x00CE, 0x00CF,
+    /* 0xD0 */
+    0x0110, 0x00D1, 0x0309, 0x00D3, 0x00D4, 0x01A0, 0x00D6, 0x00D7,
+    0x00D8, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x01AF, 0x0303, 0x00DF,
+    /* 0xE0 */
+    0x00E0, 0x00E1, 0x00E2, 0x0103, 0x00E4, 0x00E5, 0x00E6, 0x00E7,
+    0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x0301, 0x00ED, 0x00EE, 0x00EF,
+    /* 0xF0 */
+    0x0111, 0x00F1, 0x0323, 0x00F3, 0x00F4, 0x01A1, 0x00F6, 0x00F7,
+    0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x01B0, 0x20AB, 0x00FF,
+  };
 
 /* CP1258 contains five combining characters:
    0x0300, 0x0301, 0x0303, 0x0309, 0x0323.  */
 
 /* Composition tables for each of the relevant combining characters.  */
-static const struct {
+static const struct
+{
   uint16_t base;
   uint16_t composed;
-} comp_table_data[] = {
+} comp_table_data[] =
+  {
 #define COMP_TABLE_IDX_0300 0
 #define COMP_TABLE_LEN_0300 31
-  { 0x0041, 0x00C0 },
-  { 0x0045, 0x00C8 },
-  { 0x0049, 0x00CC },
-  { 0x004E, 0x01F8 },
-  { 0x004F, 0x00D2 },
-  { 0x0055, 0x00D9 },
-  { 0x0057, 0x1E80 },
-  { 0x0059, 0x1EF2 },
-  { 0x0061, 0x00E0 },
-  { 0x0065, 0x00E8 },
-  { 0x0069, 0x00EC },
-  { 0x006E, 0x01F9 },
-  { 0x006F, 0x00F2 },
-  { 0x0075, 0x00F9 },
-  { 0x0077, 0x1E81 },
-  { 0x0079, 0x1EF3 },
-  { 0x00A8, 0x1FED },
-  { 0x00C2, 0x1EA6 },
-  { 0x00CA, 0x1EC0 },
-  { 0x00D4, 0x1ED2 },
-  { 0x00DC, 0x01DB },
-  { 0x00E2, 0x1EA7 },
-  { 0x00EA, 0x1EC1 },
-  { 0x00F4, 0x1ED3 },
-  { 0x00FC, 0x01DC },
-  { 0x0102, 0x1EB0 },
-  { 0x0103, 0x1EB1 },
-/*{ 0x0112, 0x1E14 },*/
-/*{ 0x0113, 0x1E15 },*/
-/*{ 0x014C, 0x1E50 },*/
-/*{ 0x014D, 0x1E51 },*/
-  { 0x01A0, 0x1EDC },
-  { 0x01A1, 0x1EDD },
-  { 0x01AF, 0x1EEA },
-  { 0x01B0, 0x1EEB },
+    { 0x0041, 0x00C0 },
+    { 0x0045, 0x00C8 },
+    { 0x0049, 0x00CC },
+    { 0x004E, 0x01F8 },
+    { 0x004F, 0x00D2 },
+    { 0x0055, 0x00D9 },
+    { 0x0057, 0x1E80 },
+    { 0x0059, 0x1EF2 },
+    { 0x0061, 0x00E0 },
+    { 0x0065, 0x00E8 },
+    { 0x0069, 0x00EC },
+    { 0x006E, 0x01F9 },
+    { 0x006F, 0x00F2 },
+    { 0x0075, 0x00F9 },
+    { 0x0077, 0x1E81 },
+    { 0x0079, 0x1EF3 },
+    { 0x00A8, 0x1FED },
+    { 0x00C2, 0x1EA6 },
+    { 0x00CA, 0x1EC0 },
+    { 0x00D4, 0x1ED2 },
+    { 0x00DC, 0x01DB },
+    { 0x00E2, 0x1EA7 },
+    { 0x00EA, 0x1EC1 },
+    { 0x00F4, 0x1ED3 },
+    { 0x00FC, 0x01DC },
+    { 0x0102, 0x1EB0 },
+    { 0x0103, 0x1EB1 },
+    /*{ 0x0112, 0x1E14 },*/
+    /*{ 0x0113, 0x1E15 },*/
+    /*{ 0x014C, 0x1E50 },*/
+    /*{ 0x014D, 0x1E51 },*/
+    { 0x01A0, 0x1EDC },
+    { 0x01A1, 0x1EDD },
+    { 0x01AF, 0x1EEA },
+    { 0x01B0, 0x1EEB },
 #define COMP_TABLE_IDX_0301 (COMP_TABLE_IDX_0300 + COMP_TABLE_LEN_0300)
 #define COMP_TABLE_LEN_0301 60
-  { 0x0041, 0x00C1 },
-  { 0x0043, 0x0106 },
-  { 0x0045, 0x00C9 },
-  { 0x0047, 0x01F4 },
-  { 0x0049, 0x00CD },
-  { 0x004B, 0x1E30 },
-  { 0x004C, 0x0139 },
-  { 0x004D, 0x1E3E },
-  { 0x004E, 0x0143 },
-  { 0x004F, 0x00D3 },
-  { 0x0050, 0x1E54 },
-  { 0x0052, 0x0154 },
-  { 0x0053, 0x015A },
-  { 0x0055, 0x00DA },
-  { 0x0057, 0x1E82 },
-  { 0x0059, 0x00DD },
-  { 0x005A, 0x0179 },
-  { 0x0061, 0x00E1 },
-  { 0x0063, 0x0107 },
-  { 0x0065, 0x00E9 },
-  { 0x0067, 0x01F5 },
-  { 0x0069, 0x00ED },
-  { 0x006B, 0x1E31 },
-  { 0x006C, 0x013A },
-  { 0x006D, 0x1E3F },
-  { 0x006E, 0x0144 },
-  { 0x006F, 0x00F3 },
-  { 0x0070, 0x1E55 },
-  { 0x0072, 0x0155 },
-  { 0x0073, 0x015B },
-  { 0x0075, 0x00FA },
-  { 0x0077, 0x1E83 },
-  { 0x0079, 0x00FD },
-  { 0x007A, 0x017A },
-  { 0x00A5, 0x0385 },
-  { 0x00A8, 0x1FEE },
-  { 0x00C2, 0x1EA4 },
-  { 0x00C5, 0x01FA },
-  { 0x00C6, 0x01FC },
-  { 0x00C7, 0x1E08 },
-  { 0x00CA, 0x1EBE },
-  { 0x00CF, 0x1E2E },
-  { 0x00D4, 0x1ED0 },
-/*{ 0x00D5, 0x1E4C },*/
-  { 0x00D8, 0x01FE },
-  { 0x00DC, 0x01D7 },
-  { 0x00E2, 0x1EA5 },
-  { 0x00E5, 0x01FB },
-  { 0x00E6, 0x01FD },
-  { 0x00E7, 0x1E09 },
-  { 0x00EA, 0x1EBF },
-  { 0x00EF, 0x1E2F },
-  { 0x00F4, 0x1ED1 },
-/*{ 0x00F5, 0x1E4D },*/
-  { 0x00F8, 0x01FF },
-  { 0x00FC, 0x01D8 },
-  { 0x0102, 0x1EAE },
-  { 0x0103, 0x1EAF },
-/*{ 0x0112, 0x1E16 },*/
-/*{ 0x0113, 0x1E17 },*/
-/*{ 0x014C, 0x1E52 },*/
-/*{ 0x014D, 0x1E53 },*/
-/*{ 0x0168, 0x1E78 },*/
-/*{ 0x0169, 0x1E79 },*/
-  { 0x01A0, 0x1EDA },
-  { 0x01A1, 0x1EDB },
-  { 0x01AF, 0x1EE8 },
-  { 0x01B0, 0x1EE9 },
+    { 0x0041, 0x00C1 },
+    { 0x0043, 0x0106 },
+    { 0x0045, 0x00C9 },
+    { 0x0047, 0x01F4 },
+    { 0x0049, 0x00CD },
+    { 0x004B, 0x1E30 },
+    { 0x004C, 0x0139 },
+    { 0x004D, 0x1E3E },
+    { 0x004E, 0x0143 },
+    { 0x004F, 0x00D3 },
+    { 0x0050, 0x1E54 },
+    { 0x0052, 0x0154 },
+    { 0x0053, 0x015A },
+    { 0x0055, 0x00DA },
+    { 0x0057, 0x1E82 },
+    { 0x0059, 0x00DD },
+    { 0x005A, 0x0179 },
+    { 0x0061, 0x00E1 },
+    { 0x0063, 0x0107 },
+    { 0x0065, 0x00E9 },
+    { 0x0067, 0x01F5 },
+    { 0x0069, 0x00ED },
+    { 0x006B, 0x1E31 },
+    { 0x006C, 0x013A },
+    { 0x006D, 0x1E3F },
+    { 0x006E, 0x0144 },
+    { 0x006F, 0x00F3 },
+    { 0x0070, 0x1E55 },
+    { 0x0072, 0x0155 },
+    { 0x0073, 0x015B },
+    { 0x0075, 0x00FA },
+    { 0x0077, 0x1E83 },
+    { 0x0079, 0x00FD },
+    { 0x007A, 0x017A },
+    { 0x00A5, 0x0385 },
+    { 0x00A8, 0x1FEE },
+    { 0x00C2, 0x1EA4 },
+    { 0x00C5, 0x01FA },
+    { 0x00C6, 0x01FC },
+    { 0x00C7, 0x1E08 },
+    { 0x00CA, 0x1EBE },
+    { 0x00CF, 0x1E2E },
+    { 0x00D4, 0x1ED0 },
+    /*{ 0x00D5, 0x1E4C },*/
+    { 0x00D8, 0x01FE },
+    { 0x00DC, 0x01D7 },
+    { 0x00E2, 0x1EA5 },
+    { 0x00E5, 0x01FB },
+    { 0x00E6, 0x01FD },
+    { 0x00E7, 0x1E09 },
+    { 0x00EA, 0x1EBF },
+    { 0x00EF, 0x1E2F },
+    { 0x00F4, 0x1ED1 },
+    /*{ 0x00F5, 0x1E4D },*/
+    { 0x00F8, 0x01FF },
+    { 0x00FC, 0x01D8 },
+    { 0x0102, 0x1EAE },
+    { 0x0103, 0x1EAF },
+    /*{ 0x0112, 0x1E16 },*/
+    /*{ 0x0113, 0x1E17 },*/
+    /*{ 0x014C, 0x1E52 },*/
+    /*{ 0x014D, 0x1E53 },*/
+    /*{ 0x0168, 0x1E78 },*/
+    /*{ 0x0169, 0x1E79 },*/
+    { 0x01A0, 0x1EDA },
+    { 0x01A1, 0x1EDB },
+    { 0x01AF, 0x1EE8 },
+    { 0x01B0, 0x1EE9 },
 #define COMP_TABLE_IDX_0303 (COMP_TABLE_IDX_0301 + COMP_TABLE_LEN_0301)
 #define COMP_TABLE_LEN_0303 34
-  { 0x0041, 0x00C3 },
-  { 0x0045, 0x1EBC },
-  { 0x0049, 0x0128 },
-  { 0x004E, 0x00D1 },
-  { 0x004F, 0x00D5 },
-  { 0x0055, 0x0168 },
-  { 0x0056, 0x1E7C },
-  { 0x0059, 0x1EF8 },
-  { 0x0061, 0x00E3 },
-  { 0x0065, 0x1EBD },
-  { 0x0069, 0x0129 },
-  { 0x006E, 0x00F1 },
-  { 0x006F, 0x00F5 },
-  { 0x0075, 0x0169 },
-  { 0x0076, 0x1E7D },
-  { 0x0079, 0x1EF9 },
-  { 0x00C2, 0x1EAA },
-  { 0x00CA, 0x1EC4 },
-  { 0x00D3, 0x1E4C },
-  { 0x00D4, 0x1ED6 },
-  { 0x00D6, 0x1E4E },
-  { 0x00DA, 0x1E78 },
-  { 0x00E2, 0x1EAB },
-  { 0x00EA, 0x1EC5 },
-  { 0x00F3, 0x1E4D },
-  { 0x00F4, 0x1ED7 },
-  { 0x00F6, 0x1E4F },
-  { 0x00FA, 0x1E79 },
-  { 0x0102, 0x1EB4 },
-  { 0x0103, 0x1EB5 },
-  { 0x01A0, 0x1EE0 },
-  { 0x01A1, 0x1EE1 },
-  { 0x01AF, 0x1EEE },
-  { 0x01B0, 0x1EEF },
+    { 0x0041, 0x00C3 },
+    { 0x0045, 0x1EBC },
+    { 0x0049, 0x0128 },
+    { 0x004E, 0x00D1 },
+    { 0x004F, 0x00D5 },
+    { 0x0055, 0x0168 },
+    { 0x0056, 0x1E7C },
+    { 0x0059, 0x1EF8 },
+    { 0x0061, 0x00E3 },
+    { 0x0065, 0x1EBD },
+    { 0x0069, 0x0129 },
+    { 0x006E, 0x00F1 },
+    { 0x006F, 0x00F5 },
+    { 0x0075, 0x0169 },
+    { 0x0076, 0x1E7D },
+    { 0x0079, 0x1EF9 },
+    { 0x00C2, 0x1EAA },
+    { 0x00CA, 0x1EC4 },
+    { 0x00D3, 0x1E4C },
+    { 0x00D4, 0x1ED6 },
+    { 0x00D6, 0x1E4E },
+    { 0x00DA, 0x1E78 },
+    { 0x00E2, 0x1EAB },
+    { 0x00EA, 0x1EC5 },
+    { 0x00F3, 0x1E4D },
+    { 0x00F4, 0x1ED7 },
+    { 0x00F6, 0x1E4F },
+    { 0x00FA, 0x1E79 },
+    { 0x0102, 0x1EB4 },
+    { 0x0103, 0x1EB5 },
+    { 0x01A0, 0x1EE0 },
+    { 0x01A1, 0x1EE1 },
+    { 0x01AF, 0x1EEE },
+    { 0x01B0, 0x1EEF },
 #define COMP_TABLE_IDX_0309 (COMP_TABLE_IDX_0303 + COMP_TABLE_LEN_0303)
 #define COMP_TABLE_LEN_0309 24
-  { 0x0041, 0x1EA2 },
-  { 0x0045, 0x1EBA },
-  { 0x0049, 0x1EC8 },
-  { 0x004F, 0x1ECE },
-  { 0x0055, 0x1EE6 },
-  { 0x0059, 0x1EF6 },
-  { 0x0061, 0x1EA3 },
-  { 0x0065, 0x1EBB },
-  { 0x0069, 0x1EC9 },
-  { 0x006F, 0x1ECF },
-  { 0x0075, 0x1EE7 },
-  { 0x0079, 0x1EF7 },
-  { 0x00C2, 0x1EA8 },
-  { 0x00CA, 0x1EC2 },
-  { 0x00D4, 0x1ED4 },
-  { 0x00E2, 0x1EA9 },
-  { 0x00EA, 0x1EC3 },
-  { 0x00F4, 0x1ED5 },
-  { 0x0102, 0x1EB2 },
-  { 0x0103, 0x1EB3 },
-  { 0x01A0, 0x1EDE },
-  { 0x01A1, 0x1EDF },
-  { 0x01AF, 0x1EEC },
-  { 0x01B0, 0x1EED },
+    { 0x0041, 0x1EA2 },
+    { 0x0045, 0x1EBA },
+    { 0x0049, 0x1EC8 },
+    { 0x004F, 0x1ECE },
+    { 0x0055, 0x1EE6 },
+    { 0x0059, 0x1EF6 },
+    { 0x0061, 0x1EA3 },
+    { 0x0065, 0x1EBB },
+    { 0x0069, 0x1EC9 },
+    { 0x006F, 0x1ECF },
+    { 0x0075, 0x1EE7 },
+    { 0x0079, 0x1EF7 },
+    { 0x00C2, 0x1EA8 },
+    { 0x00CA, 0x1EC2 },
+    { 0x00D4, 0x1ED4 },
+    { 0x00E2, 0x1EA9 },
+    { 0x00EA, 0x1EC3 },
+    { 0x00F4, 0x1ED5 },
+    { 0x0102, 0x1EB2 },
+    { 0x0103, 0x1EB3 },
+    { 0x01A0, 0x1EDE },
+    { 0x01A1, 0x1EDF },
+    { 0x01AF, 0x1EEC },
+    { 0x01B0, 0x1EED },
 #define COMP_TABLE_IDX_0323 (COMP_TABLE_IDX_0309 + COMP_TABLE_LEN_0309)
 #define COMP_TABLE_LEN_0323 50
-  { 0x0041, 0x1EA0 },
-  { 0x0042, 0x1E04 },
-  { 0x0044, 0x1E0C },
-  { 0x0045, 0x1EB8 },
-  { 0x0048, 0x1E24 },
-  { 0x0049, 0x1ECA },
-  { 0x004B, 0x1E32 },
-  { 0x004C, 0x1E36 },
-  { 0x004D, 0x1E42 },
-  { 0x004E, 0x1E46 },
-  { 0x004F, 0x1ECC },
-  { 0x0052, 0x1E5A },
-  { 0x0053, 0x1E62 },
-  { 0x0054, 0x1E6C },
-  { 0x0055, 0x1EE4 },
-  { 0x0056, 0x1E7E },
-  { 0x0057, 0x1E88 },
-  { 0x0059, 0x1EF4 },
-  { 0x005A, 0x1E92 },
-  { 0x0061, 0x1EA1 },
-  { 0x0062, 0x1E05 },
-  { 0x0064, 0x1E0D },
-  { 0x0065, 0x1EB9 },
-  { 0x0068, 0x1E25 },
-  { 0x0069, 0x1ECB },
-  { 0x006B, 0x1E33 },
-  { 0x006C, 0x1E37 },
-  { 0x006D, 0x1E43 },
-  { 0x006E, 0x1E47 },
-  { 0x006F, 0x1ECD },
-  { 0x0072, 0x1E5B },
-  { 0x0073, 0x1E63 },
-  { 0x0074, 0x1E6D },
-  { 0x0075, 0x1EE5 },
-  { 0x0076, 0x1E7F },
-  { 0x0077, 0x1E89 },
-  { 0x0079, 0x1EF5 },
-  { 0x007A, 0x1E93 },
-  { 0x00C2, 0x1EAC },
-  { 0x00CA, 0x1EC6 },
-  { 0x00D4, 0x1ED8 },
-  { 0x00E2, 0x1EAD },
-  { 0x00EA, 0x1EC7 },
-  { 0x00F4, 0x1ED9 },
-  { 0x0102, 0x1EB6 },
-  { 0x0103, 0x1EB7 },
-  { 0x01A0, 0x1EE2 },
-  { 0x01A1, 0x1EE3 },
-  { 0x01AF, 0x1EF0 },
-  { 0x01B0, 0x1EF1 },
+    { 0x0041, 0x1EA0 },
+    { 0x0042, 0x1E04 },
+    { 0x0044, 0x1E0C },
+    { 0x0045, 0x1EB8 },
+    { 0x0048, 0x1E24 },
+    { 0x0049, 0x1ECA },
+    { 0x004B, 0x1E32 },
+    { 0x004C, 0x1E36 },
+    { 0x004D, 0x1E42 },
+    { 0x004E, 0x1E46 },
+    { 0x004F, 0x1ECC },
+    { 0x0052, 0x1E5A },
+    { 0x0053, 0x1E62 },
+    { 0x0054, 0x1E6C },
+    { 0x0055, 0x1EE4 },
+    { 0x0056, 0x1E7E },
+    { 0x0057, 0x1E88 },
+    { 0x0059, 0x1EF4 },
+    { 0x005A, 0x1E92 },
+    { 0x0061, 0x1EA1 },
+    { 0x0062, 0x1E05 },
+    { 0x0064, 0x1E0D },
+    { 0x0065, 0x1EB9 },
+    { 0x0068, 0x1E25 },
+    { 0x0069, 0x1ECB },
+    { 0x006B, 0x1E33 },
+    { 0x006C, 0x1E37 },
+    { 0x006D, 0x1E43 },
+    { 0x006E, 0x1E47 },
+    { 0x006F, 0x1ECD },
+    { 0x0072, 0x1E5B },
+    { 0x0073, 0x1E63 },
+    { 0x0074, 0x1E6D },
+    { 0x0075, 0x1EE5 },
+    { 0x0076, 0x1E7F },
+    { 0x0077, 0x1E89 },
+    { 0x0079, 0x1EF5 },
+    { 0x007A, 0x1E93 },
+    { 0x00C2, 0x1EAC },
+    { 0x00CA, 0x1EC6 },
+    { 0x00D4, 0x1ED8 },
+    { 0x00E2, 0x1EAD },
+    { 0x00EA, 0x1EC7 },
+    { 0x00F4, 0x1ED9 },
+    { 0x0102, 0x1EB6 },
+    { 0x0103, 0x1EB7 },
+    { 0x01A0, 0x1EE2 },
+    { 0x01A1, 0x1EE3 },
+    { 0x01AF, 0x1EF0 },
+    { 0x01B0, 0x1EF1 },
 #define COMP_TABLE_IDX_END (COMP_TABLE_IDX_0323 + COMP_TABLE_LEN_0323)
-};
+  };
 /* Compile-time verification of table size.  */
 typedef int verify1[(NELEMS (comp_table_data) == COMP_TABLE_IDX_END) - 1];
 
-static const struct { unsigned int idx; unsigned int len; } comp_table[5] = {
-  { COMP_TABLE_IDX_0300, COMP_TABLE_LEN_0300 },
-  { COMP_TABLE_IDX_0301, COMP_TABLE_LEN_0301 },
-  { COMP_TABLE_IDX_0303, COMP_TABLE_LEN_0303 },
-  { COMP_TABLE_IDX_0309, COMP_TABLE_LEN_0309 },
-  { COMP_TABLE_IDX_0323, COMP_TABLE_LEN_0323 },
-};
+static const struct
+{
+  unsigned int idx;
+  unsigned int len;
+} comp_table[5] =
+  {
+    { COMP_TABLE_IDX_0300, COMP_TABLE_LEN_0300 },
+    { COMP_TABLE_IDX_0301, COMP_TABLE_LEN_0301 },
+    { COMP_TABLE_IDX_0303, COMP_TABLE_LEN_0303 },
+    { COMP_TABLE_IDX_0309, COMP_TABLE_LEN_0309 },
+    { COMP_TABLE_IDX_0323, COMP_TABLE_LEN_0323 }
+  };
 
 #define MIN_NEEDED_INPUT       MIN_NEEDED_FROM
 #define MIN_NEEDED_OUTPUT      MIN_NEEDED_TO
@@ -480,266 +488,265 @@ static const struct { unsigned int idx; unsigned int len; } comp_table[5] = {
 
 /* Next, define the conversion function from UCS4 to CP1258.  */
 
-static const unsigned char from_ucs4[] = {
+static const unsigned char from_ucs4[] =
+  {
 #define FROM_IDX_00 0
-                          0xc4, 0xc5, 0xc6, 0xc7, /* 0x00c4-0x00c7 */
-  0xc8, 0xc9, 0xca, 0xcb, 0x00, 0xcd, 0xce, 0xcf, /* 0x00c8-0x00cf */
-  0x00, 0xd1, 0x00, 0xd3, 0xd4, 0x00, 0xd6, 0xd7, /* 0x00d0-0x00d7 */
-  0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0x00, 0x00, 0xdf, /* 0x00d8-0x00df */
-  0xe0, 0xe1, 0xe2, 0x00, 0xe4, 0xe5, 0xe6, 0xe7, /* 0x00e0-0x00e7 */
-  0xe8, 0xe9, 0xea, 0xeb, 0x00, 0xed, 0xee, 0xef, /* 0x00e8-0x00ef */
-  0x00, 0xf1, 0x00, 0xf3, 0xf4, 0x00, 0xf6, 0xf7, /* 0x00f0-0x00f7 */
-  0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0x00, 0x00, 0xff, /* 0x00f8-0x00ff */
-  0x00, 0x00, 0xc3, 0xe3, 0x00, 0x00, 0x00, 0x00, /* 0x0100-0x0107 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0108-0x010f */
-  0xd0, 0xf0,                                     /* 0x0110-0x0111 */
+                            0xc4, 0xc5, 0xc6, 0xc7, /* 0x00c4-0x00c7 */
+    0xc8, 0xc9, 0xca, 0xcb, 0x00, 0xcd, 0xce, 0xcf, /* 0x00c8-0x00cf */
+    0x00, 0xd1, 0x00, 0xd3, 0xd4, 0x00, 0xd6, 0xd7, /* 0x00d0-0x00d7 */
+    0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0x00, 0x00, 0xdf, /* 0x00d8-0x00df */
+    0xe0, 0xe1, 0xe2, 0x00, 0xe4, 0xe5, 0xe6, 0xe7, /* 0x00e0-0x00e7 */
+    0xe8, 0xe9, 0xea, 0xeb, 0x00, 0xed, 0xee, 0xef, /* 0x00e8-0x00ef */
+    0x00, 0xf1, 0x00, 0xf3, 0xf4, 0x00, 0xf6, 0xf7, /* 0x00f0-0x00f7 */
+    0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0x00, 0x00, 0xff, /* 0x00f8-0x00ff */
+    0x00, 0x00, 0xc3, 0xe3, 0x00, 0x00, 0x00, 0x00, /* 0x0100-0x0107 */
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0108-0x010f */
+    0xd0, 0xf0,                                     /* 0x0110-0x0111 */
 #define FROM_IDX_01 (FROM_IDX_00 + 78)
-              0x8c, 0x9c, 0x00, 0x00, 0x00, 0x00, /* 0x0152-0x0157 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0158-0x015f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0160-0x0167 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0168-0x016f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0170-0x0177 */
-  0x9f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0178-0x017f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0180-0x0187 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0188-0x018f */
-  0x00, 0x00, 0x83, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0190-0x0197 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0198-0x019f */
-  0xd5, 0xf5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x01a0-0x01a7 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xdd, /* 0x01a8-0x01af */
-  0xfd,                                           /* 0x01b0-0x01b0 */
+                0x8c, 0x9c, 0x00, 0x00, 0x00, 0x00, /* 0x0152-0x0157 */
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0158-0x015f */
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0160-0x0167 */
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0168-0x016f */
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0170-0x0177 */
+    0x9f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0178-0x017f */
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0180-0x0187 */
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0188-0x018f */
+    0x00, 0x00, 0x83, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0190-0x0197 */
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0198-0x019f */
+    0xd5, 0xf5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x01a0-0x01a7 */
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xdd, /* 0x01a8-0x01af */
+    0xfd,                                           /* 0x01b0-0x01b0 */
 #define FROM_IDX_02 (FROM_IDX_01 + 95)
-                                      0x88, 0x00, /* 0x02c6-0x02c7 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x02c8-0x02cf */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x02d0-0x02d7 */
-  0x00, 0x00, 0x00, 0x00, 0x98,                   /* 0x02d8-0x02dc */
+                                        0x88, 0x00, /* 0x02c6-0x02c7 */
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x02c8-0x02cf */
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x02d0-0x02d7 */
+    0x00, 0x00, 0x00, 0x00, 0x98,                   /* 0x02d8-0x02dc */
 #define FROM_IDX_03 (FROM_IDX_02 + 23)
-  0xcc, 0xec, 0x00, 0xde, 0x00, 0x00, 0x00, 0x00, /* 0x0300-0x0307 */
-  0x00, 0xd2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0308-0x030f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0310-0x0317 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0318-0x031f */
-  0x00, 0x00, 0x00, 0xf2,                         /* 0x0320-0x0323 */
+    0xcc, 0xec, 0x00, 0xde, 0x00, 0x00, 0x00, 0x00, /* 0x0300-0x0307 */
+    0x00, 0xd2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0308-0x030f */
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0310-0x0317 */
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0318-0x031f */
+    0x00, 0x00, 0x00, 0xf2,                         /* 0x0320-0x0323 */
 #define FROM_IDX_20 (FROM_IDX_03 + 36)
-                    0x96, 0x97, 0x00, 0x00, 0x00, /* 0x2013-0x2017 */
-  0x91, 0x92, 0x82, 0x00, 0x93, 0x94, 0x84, 0x00, /* 0x2018-0x201f */
-  0x86, 0x87, 0x95, 0x00, 0x00, 0x00, 0x85, 0x00, /* 0x2020-0x2027 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2028-0x202f */
-  0x89, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2030-0x2037 */
-  0x00, 0x8b, 0x9b,                               /* 0x2038-0x203a */
+                      0x96, 0x97, 0x00, 0x00, 0x00, /* 0x2013-0x2017 */
+    0x91, 0x92, 0x82, 0x00, 0x93, 0x94, 0x84, 0x00, /* 0x2018-0x201f */
+    0x86, 0x87, 0x95, 0x00, 0x00, 0x00, 0x85, 0x00, /* 0x2020-0x2027 */
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2028-0x202f */
+    0x89, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2030-0x2037 */
+    0x00, 0x8b, 0x9b,                               /* 0x2038-0x203a */
 #define FROM_IDX_FF (FROM_IDX_20 + 40)
-};
+  };
 /* Compile-time verification of table size.  */
 typedef int verify2[(NELEMS (from_ucs4) == FROM_IDX_FF) - 1];
 
-static const unsigned char comb_table[5] = {
-  0xcc, 0xec, 0xde, 0xd2, 0xf2,
-};
-
 /* Decomposition table for the relevant Unicode characters. */
-static const struct {
+static const struct
+{
   uint16_t composed;
-  uint32_t base : 12;
-  uint32_t comb1 : 4;
-} decomp_table[] = {
-  { 0x00c0, 0x0041, 0 },
-  { 0x00c1, 0x0041, 1 },
-  { 0x00c3, 0x0041, 2 },
-  { 0x00c8, 0x0045, 0 },
-  { 0x00c9, 0x0045, 1 },
-  { 0x00cc, 0x0049, 0 },
-  { 0x00cd, 0x0049, 1 },
-  { 0x00d1, 0x004e, 2 },
-  { 0x00d2, 0x004f, 0 },
-  { 0x00d3, 0x004f, 1 },
-  { 0x00d5, 0x004f, 2 },
-  { 0x00d9, 0x0055, 0 },
-  { 0x00da, 0x0055, 1 },
-  { 0x00dd, 0x0059, 1 },
-  { 0x00e0, 0x0061, 0 },
-  { 0x00e1, 0x0061, 1 },
-  { 0x00e3, 0x0061, 2 },
-  { 0x00e8, 0x0065, 0 },
-  { 0x00e9, 0x0065, 1 },
-  { 0x00ec, 0x0069, 0 },
-  { 0x00ed, 0x0069, 1 },
-  { 0x00f1, 0x006e, 2 },
-  { 0x00f2, 0x006f, 0 },
-  { 0x00f3, 0x006f, 1 },
-  { 0x00f5, 0x006f, 2 },
-  { 0x00f9, 0x0075, 0 },
-  { 0x00fa, 0x0075, 1 },
-  { 0x00fd, 0x0079, 1 },
-  { 0x0106, 0x0043, 1 },
-  { 0x0107, 0x0063, 1 },
-  { 0x0128, 0x0049, 2 },
-  { 0x0129, 0x0069, 2 },
-  { 0x0139, 0x004c, 1 },
-  { 0x013a, 0x006c, 1 },
-  { 0x0143, 0x004e, 1 },
-  { 0x0144, 0x006e, 1 },
-  { 0x0154, 0x0052, 1 },
-  { 0x0155, 0x0072, 1 },
-  { 0x015a, 0x0053, 1 },
-  { 0x015b, 0x0073, 1 },
-  { 0x0168, 0x0055, 2 },
-  { 0x0169, 0x0075, 2 },
-  { 0x0179, 0x005a, 1 },
-  { 0x017a, 0x007a, 1 },
-  { 0x01d7, 0x00dc, 1 },
-  { 0x01d8, 0x00fc, 1 },
-  { 0x01db, 0x00dc, 0 },
-  { 0x01dc, 0x00fc, 0 },
-  { 0x01f4, 0x0047, 1 },
-  { 0x01f5, 0x0067, 1 },
-  { 0x01f8, 0x004e, 0 },
-  { 0x01f9, 0x006e, 0 },
-  { 0x01fa, 0x00c5, 1 },
-  { 0x01fb, 0x00e5, 1 },
-  { 0x01fc, 0x00c6, 1 },
-  { 0x01fd, 0x00e6, 1 },
-  { 0x01fe, 0x00d8, 1 },
-  { 0x01ff, 0x00f8, 1 },
-  { 0x0385, 0x00a5, 1 },
-  { 0x1e04, 0x0042, 4 },
-  { 0x1e05, 0x0062, 4 },
-  { 0x1e08, 0x00c7, 1 },
-  { 0x1e09, 0x00e7, 1 },
-  { 0x1e0c, 0x0044, 4 },
-  { 0x1e0d, 0x0064, 4 },
-  { 0x1e24, 0x0048, 4 },
-  { 0x1e25, 0x0068, 4 },
-  { 0x1e2e, 0x00cf, 1 },
-  { 0x1e2f, 0x00ef, 1 },
-  { 0x1e30, 0x004b, 1 },
-  { 0x1e31, 0x006b, 1 },
-  { 0x1e32, 0x004b, 4 },
-  { 0x1e33, 0x006b, 4 },
-  { 0x1e36, 0x004c, 4 },
-  { 0x1e37, 0x006c, 4 },
-  { 0x1e3e, 0x004d, 1 },
-  { 0x1e3f, 0x006d, 1 },
-  { 0x1e42, 0x004d, 4 },
-  { 0x1e43, 0x006d, 4 },
-  { 0x1e46, 0x004e, 4 },
-  { 0x1e47, 0x006e, 4 },
-  { 0x1e4c, 0x00d3, 2 }, /*{ 0x1e4c, 0x00d5, 1 }, { 0x1e4c, 0x004f, 1, 2 },*/
-  { 0x1e4d, 0x00f3, 2 }, /*{ 0x1e4d, 0x00f5, 1 }, { 0x1e4d, 0x006f, 1, 2 },*/
-  { 0x1e4e, 0x00d6, 2 },
-  { 0x1e4f, 0x00f6, 2 },
-  { 0x1e54, 0x0050, 1 },
-  { 0x1e55, 0x0070, 1 },
-  { 0x1e5a, 0x0052, 4 },
-  { 0x1e5b, 0x0072, 4 },
-  { 0x1e62, 0x0053, 4 },
-  { 0x1e63, 0x0073, 4 },
-  { 0x1e6c, 0x0054, 4 },
-  { 0x1e6d, 0x0074, 4 },
-  { 0x1e78, 0x00da, 2 }, /*{ 0x1e78, 0x0168, 1 }, { 0x1e78, 0x0055, 1, 2 },*/
-  { 0x1e79, 0x00fa, 2 }, /*{ 0x1e79, 0x0169, 1 }, { 0x1e79, 0x0075, 1, 2 },*/
-  { 0x1e7c, 0x0056, 2 },
-  { 0x1e7d, 0x0076, 2 },
-  { 0x1e7e, 0x0056, 4 },
-  { 0x1e7f, 0x0076, 4 },
-  { 0x1e80, 0x0057, 0 },
-  { 0x1e81, 0x0077, 0 },
-  { 0x1e82, 0x0057, 1 },
-  { 0x1e83, 0x0077, 1 },
-  { 0x1e88, 0x0057, 4 },
-  { 0x1e89, 0x0077, 4 },
-  { 0x1e92, 0x005a, 4 },
-  { 0x1e93, 0x007a, 4 },
-  { 0x1ea0, 0x0041, 4 },
-  { 0x1ea1, 0x0061, 4 },
-  { 0x1ea2, 0x0041, 3 },
-  { 0x1ea3, 0x0061, 3 },
-  { 0x1ea4, 0x00c2, 1 },
-  { 0x1ea5, 0x00e2, 1 },
-  { 0x1ea6, 0x00c2, 0 },
-  { 0x1ea7, 0x00e2, 0 },
-  { 0x1ea8, 0x00c2, 3 },
-  { 0x1ea9, 0x00e2, 3 },
-  { 0x1eaa, 0x00c2, 2 },
-  { 0x1eab, 0x00e2, 2 },
-  { 0x1eac, 0x00c2, 4 },
-  { 0x1ead, 0x00e2, 4 },
-  { 0x1eae, 0x00c3, 1 },
-  { 0x1eaf, 0x00e3, 1 },
-  { 0x1eb0, 0x00c3, 0 },
-  { 0x1eb1, 0x00e3, 0 },
-  { 0x1eb2, 0x00c3, 3 },
-  { 0x1eb3, 0x00e3, 3 },
-  { 0x1eb4, 0x00c3, 2 },
-  { 0x1eb5, 0x00e3, 2 },
-  { 0x1eb6, 0x00c3, 4 },
-  { 0x1eb7, 0x00e3, 4 },
-  { 0x1eb8, 0x0045, 4 },
-  { 0x1eb9, 0x0065, 4 },
-  { 0x1eba, 0x0045, 3 },
-  { 0x1ebb, 0x0065, 3 },
-  { 0x1ebc, 0x0045, 2 },
-  { 0x1ebd, 0x0065, 2 },
-  { 0x1ebe, 0x00ca, 1 },
-  { 0x1ebf, 0x00ea, 1 },
-  { 0x1ec0, 0x00ca, 0 },
-  { 0x1ec1, 0x00ea, 0 },
-  { 0x1ec2, 0x00ca, 3 },
-  { 0x1ec3, 0x00ea, 3 },
-  { 0x1ec4, 0x00ca, 2 },
-  { 0x1ec5, 0x00ea, 2 },
-  { 0x1ec6, 0x00ca, 4 },
-  { 0x1ec7, 0x00ea, 4 },
-  { 0x1ec8, 0x0049, 3 },
-  { 0x1ec9, 0x0069, 3 },
-  { 0x1eca, 0x0049, 4 },
-  { 0x1ecb, 0x0069, 4 },
-  { 0x1ecc, 0x004f, 4 },
-  { 0x1ecd, 0x006f, 4 },
-  { 0x1ece, 0x004f, 3 },
-  { 0x1ecf, 0x006f, 3 },
-  { 0x1ed0, 0x00d4, 1 },
-  { 0x1ed1, 0x00f4, 1 },
-  { 0x1ed2, 0x00d4, 0 },
-  { 0x1ed3, 0x00f4, 0 },
-  { 0x1ed4, 0x00d4, 3 },
-  { 0x1ed5, 0x00f4, 3 },
-  { 0x1ed6, 0x00d4, 2 },
-  { 0x1ed7, 0x00f4, 2 },
-  { 0x1ed8, 0x00d4, 4 },
-  { 0x1ed9, 0x00f4, 4 },
-  { 0x1eda, 0x00d5, 1 },
-  { 0x1edb, 0x00f5, 1 },
-  { 0x1edc, 0x00d5, 0 },
-  { 0x1edd, 0x00f5, 0 },
-  { 0x1ede, 0x00d5, 3 },
-  { 0x1edf, 0x00f5, 3 },
-  { 0x1ee0, 0x00d5, 2 },
-  { 0x1ee1, 0x00f5, 2 },
-  { 0x1ee2, 0x00d5, 4 },
-  { 0x1ee3, 0x00f5, 4 },
-  { 0x1ee4, 0x0055, 4 },
-  { 0x1ee5, 0x0075, 4 },
-  { 0x1ee6, 0x0055, 3 },
-  { 0x1ee7, 0x0075, 3 },
-  { 0x1ee8, 0x00dd, 1 },
-  { 0x1ee9, 0x00fd, 1 },
-  { 0x1eea, 0x00dd, 0 },
-  { 0x1eeb, 0x00fd, 0 },
-  { 0x1eec, 0x00dd, 3 },
-  { 0x1eed, 0x00fd, 3 },
-  { 0x1eee, 0x00dd, 2 },
-  { 0x1eef, 0x00fd, 2 },
-  { 0x1ef0, 0x00dd, 4 },
-  { 0x1ef1, 0x00fd, 4 },
-  { 0x1ef2, 0x0059, 0 },
-  { 0x1ef3, 0x0079, 0 },
-  { 0x1ef4, 0x0059, 4 },
-  { 0x1ef5, 0x0079, 4 },
-  { 0x1ef6, 0x0059, 3 },
-  { 0x1ef7, 0x0079, 3 },
-  { 0x1ef8, 0x0059, 2 },
-  { 0x1ef9, 0x0079, 2 },
-  { 0x1fed, 0x00a8, 0 },
-  { 0x1fee, 0x00a8, 1 },
-};
+  uint32_t base:8;
+  uint32_t comb1:8;
+} decomp_table[] =
+  {
+    { 0x00c0, 0x41, 0xcc },
+    { 0x00c1, 0x41, 0xec },
+    { 0x00c3, 0x41, 0xde },
+    { 0x00c8, 0x45, 0xcc },
+    { 0x00c9, 0x45, 0xec },
+    { 0x00cc, 0x49, 0xcc },
+    { 0x00cd, 0x49, 0xec },
+    { 0x00d1, 0x4e, 0xde },
+    { 0x00d2, 0x4f, 0xcc },
+    { 0x00d3, 0x4f, 0xec },
+    { 0x00d5, 0x4f, 0xde },
+    { 0x00d9, 0x55, 0xcc },
+    { 0x00da, 0x55, 0xec },
+    { 0x00dd, 0x59, 0xec },
+    { 0x00e0, 0x61, 0xcc },
+    { 0x00e1, 0x61, 0xec },
+    { 0x00e3, 0x61, 0xde },
+    { 0x00e8, 0x65, 0xcc },
+    { 0x00e9, 0x65, 0xec },
+    { 0x00ec, 0x69, 0xcc },
+    { 0x00ed, 0x69, 0xec },
+    { 0x00f1, 0x6e, 0xde },
+    { 0x00f2, 0x6f, 0xcc },
+    { 0x00f3, 0x6f, 0xec },
+    { 0x00f5, 0x6f, 0xde },
+    { 0x00f9, 0x75, 0xcc },
+    { 0x00fa, 0x75, 0xec },
+    { 0x00fd, 0x79, 0xec },
+    { 0x0106, 0x43, 0xec },
+    { 0x0107, 0x63, 0xec },
+    { 0x0128, 0x49, 0xde },
+    { 0x0129, 0x69, 0xde },
+    { 0x0139, 0x4c, 0xec },
+    { 0x013a, 0x6c, 0xec },
+    { 0x0143, 0x4e, 0xec },
+    { 0x0144, 0x6e, 0xec },
+    { 0x0154, 0x52, 0xec },
+    { 0x0155, 0x72, 0xec },
+    { 0x015a, 0x53, 0xec },
+    { 0x015b, 0x73, 0xec },
+    { 0x0168, 0x55, 0xde },
+    { 0x0169, 0x75, 0xde },
+    { 0x0179, 0x5a, 0xec },
+    { 0x017a, 0x7a, 0xec },
+    { 0x01d7, 0xdc, 0xec },
+    { 0x01d8, 0xfc, 0xec },
+    { 0x01db, 0xdc, 0xcc },
+    { 0x01dc, 0xfc, 0xcc },
+    { 0x01f4, 0x47, 0xec },
+    { 0x01f5, 0x67, 0xec },
+    { 0x01f8, 0x4e, 0xcc },
+    { 0x01f9, 0x6e, 0xcc },
+    { 0x01fa, 0xc5, 0xec },
+    { 0x01fb, 0xe5, 0xec },
+    { 0x01fc, 0xc6, 0xec },
+    { 0x01fd, 0xe6, 0xec },
+    { 0x01fe, 0xd8, 0xec },
+    { 0x01ff, 0xf8, 0xec },
+    { 0x0385, 0xa5, 0xec },
+    { 0x1e04, 0x42, 0xf2 },
+    { 0x1e05, 0x62, 0xf2 },
+    { 0x1e08, 0xc7, 0xec },
+    { 0x1e09, 0xe7, 0xec },
+    { 0x1e0c, 0x44, 0xf2 },
+    { 0x1e0d, 0x64, 0xf2 },
+    { 0x1e24, 0x48, 0xf2 },
+    { 0x1e25, 0x68, 0xf2 },
+    { 0x1e2e, 0xcf, 0xec },
+    { 0x1e2f, 0xef, 0xec },
+    { 0x1e30, 0x4b, 0xec },
+    { 0x1e31, 0x6b, 0xec },
+    { 0x1e32, 0x4b, 0xf2 },
+    { 0x1e33, 0x6b, 0xf2 },
+    { 0x1e36, 0x4c, 0xf2 },
+    { 0x1e37, 0x6c, 0xf2 },
+    { 0x1e3e, 0x4d, 0xec },
+    { 0x1e3f, 0x6d, 0xec },
+    { 0x1e42, 0x4d, 0xf2 },
+    { 0x1e43, 0x6d, 0xf2 },
+    { 0x1e46, 0x4e, 0xf2 },
+    { 0x1e47, 0x6e, 0xf2 },
+    { 0x1e4c, 0xd3, 0xde }, /*{ 0x1e4c, 0x00d5, 0xec }, { 0x1e4c, 0x004f, 1, 0xde },*/
+    { 0x1e4d, 0xf3, 0xde }, /*{ 0x1e4d, 0x00f5, 0xec }, { 0x1e4d, 0x006f, 1, 0xde },*/
+    { 0x1e4e, 0xd6, 0xde },
+    { 0x1e4f, 0xf6, 0xde },
+    { 0x1e54, 0x50, 0xec },
+    { 0x1e55, 0x70, 0xec },
+    { 0x1e5a, 0x52, 0xf2 },
+    { 0x1e5b, 0x72, 0xf2 },
+    { 0x1e62, 0x53, 0xf2 },
+    { 0x1e63, 0x73, 0xf2 },
+    { 0x1e6c, 0x54, 0xf2 },
+    { 0x1e6d, 0x74, 0xf2 },
+    { 0x1e78, 0xda, 0xde }, /*{ 0x1e78, 0x0168, 0xec }, { 0x1e78, 0x0055, 1, 0xde },*/
+    { 0x1e79, 0xfa, 0xde }, /*{ 0x1e79, 0x0169, 0xec }, { 0x1e79, 0x0075, 1, 0xde },*/
+    { 0x1e7c, 0x56, 0xde },
+    { 0x1e7d, 0x76, 0xde },
+    { 0x1e7e, 0x56, 0xf2 },
+    { 0x1e7f, 0x76, 0xf2 },
+    { 0x1e80, 0x57, 0xcc },
+    { 0x1e81, 0x77, 0xcc },
+    { 0x1e82, 0x57, 0xec },
+    { 0x1e83, 0x77, 0xec },
+    { 0x1e88, 0x57, 0xf2 },
+    { 0x1e89, 0x77, 0xf2 },
+    { 0x1e92, 0x5a, 0xf2 },
+    { 0x1e93, 0x7a, 0xf2 },
+    { 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 },
+    { 0x1fed, 0xa8, 0xcc },
+    { 0x1fee, 0xa8, 0xec },
+  };
 
 #define MIN_NEEDED_INPUT       MIN_NEEDED_TO
 #define MIN_NEEDED_OUTPUT      MIN_NEEDED_FROM
@@ -833,7 +840,7 @@ static const struct {
                                                                              \
                /* Found a canonical decomposition.  */                       \
                *outptr++ = decomp_table[i].base;                             \
-               *outptr++ = comb_table[decomp_table[i].comb1];                \
+               *outptr++ = decomp_table[i].comb1;                            \
                inptr += 4;                                                   \
                continue;                                                     \
              }                                                               \
index a5178e3..66bb473 100644 (file)
@@ -1,7 +1,6 @@
 # GNU libc iconv configuration.
 # Copyright (C) 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
-# Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 #
 
 # The GNU C Library is free software; you can redistribute it and/or
@@ -1503,3 +1502,10 @@ module   INTERNAL                MAC-SAMI//              MAC-SAMI        1
 #      from                    to                      module          cost
 module ARMSCII-8//             INTERNAL                ARMSCII-8       1
 module INTERNAL                ARMSCII-8//             ARMSCII-8       1
+
+#      from                    to                      module          cost
+alias  TCVN//                  TCVN5712-1//
+alias  TCVN-5712//             TCVN5712-1//
+alias  TCVN5712-1:1993//       TCVN5712-1//
+module TCVN5712-1//            INTERNAL                TCVN5712-1      1
+module INTERNAL                TCVN5712-1//            TCVN5712-1      1
diff --git a/iconvdata/tcvn5712-1.c b/iconvdata/tcvn5712-1.c
new file mode 100644 (file)
index 0000000..d093396
--- /dev/null
@@ -0,0 +1,703 @@
+/* Conversion to and from TCVN5712-1.
+   Copyright (C) 2001 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Ulrich Drepper <drepper@redhat.com>, 2001.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <dlfcn.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#define NELEMS(arr) (sizeof (arr) / sizeof (arr[0]))
+
+/* Definitions used in the body of the `gconv' function.  */
+#define CHARSET_NAME           "TCVN5712-1//"
+#define FROM_LOOP              from_tcvn5712_1
+#define TO_LOOP                        to_tcvn5712_1
+#define DEFINE_INIT            1
+#define DEFINE_FINI            1
+#define MIN_NEEDED_FROM                1
+#define MIN_NEEDED_TO          4
+#define PREPARE_LOOP \
+  int saved_state;                                                           \
+  int *statep = &data->__statep->__count;
+#define EXTRA_LOOP_ARGS                , statep
+
+
+/* Since we might have to reset input pointer we must be able to save
+   and restore the state.  */
+#define SAVE_RESET_STATE(Save) \
+  if (Save)                                                                  \
+    saved_state = *statep;                                                   \
+  else                                                                       \
+    *statep = saved_state
+
+
+/* During TCVN5712-1 to UCS4 conversion, the COUNT element of the state
+   contains the last UCS4 character, shifted by 3 bits.  */
+
+
+/* Since this is a stateful encoding we have to provide code which resets
+   the output state to the initial state.  This has to be done during the
+   flushing.  */
+#define EMIT_SHIFT_TO_INIT \
+  if (data->__statep->__count != 0)                                          \
+    {                                                                        \
+      if (FROM_DIRECTION)                                                    \
+       {                                                                     \
+         if (__builtin_expect (outbuf + 4 <= outend, 1))                     \
+           {                                                                 \
+             /* Write out the last character.  */                            \
+             *((uint32_t *) outbuf)++ = data->__statep->__count >> 3;        \
+             data->__statep->__count = 0;                                    \
+           }                                                                 \
+         else                                                                \
+           /* We don't have enough room in the output buffer.  */            \
+           status = __GCONV_FULL_OUTPUT;                                     \
+       }                                                                     \
+      else                                                                   \
+       /* We don't use shift states in the TO_DIRECTION.  */                 \
+       data->__statep->__count = 0;                                          \
+    }
+
+
+static const uint16_t map_from_tcvn_low[0x18] =
+  {
+    0x0000, 0x00da, 0x1ee4, 0x0003, 0x1eea, 0x1eec, 0x1eee, 0x0007,
+    0x0008, 0x0009, 0x000a, 0x000b, 0x000c, 0x000d, 0x000e, 0x000f,
+    0x0010, 0x1ee8, 0x1ef0, 0x1ef2, 0x1ef6, 0x1ef8, 0x00dd, 0x1ef4
+  };
+
+static const uint16_t map_from_tcvn_high[0x80] =
+  {
+    0x00c0, 0x1ea2, 0x00c3, 0x00c1, 0x1ea0, 0x1eb6, 0x1eac, 0x00c8,
+    0x1eba, 0x1ebc, 0x00c9, 0x1eb8, 0x1ec6, 0x00cc, 0x1ec8, 0x0128,
+    0x00cd, 0x1eca, 0x00d2, 0x1ece, 0x00d5, 0x00d3, 0x1ecc, 0x1ed8,
+    0x1edc, 0x1ede, 0x1ee0, 0x1eda, 0x1ee2, 0x00d9, 0x1ee6, 0x0168,
+    0x00a0, 0x0102, 0x00c2, 0x00ca, 0x00d4, 0x01a0, 0x01af, 0x0110,
+    0x0103, 0x00e2, 0x00ea, 0x00f4, 0x01a1, 0x01b0, 0x0111, 0x1eb0,
+    0x0300, 0x0309, 0x0303, 0x0301, 0x0323, 0x00e0, 0x1ea3, 0x00e3,
+    0x00e1, 0x1ea1, 0x1eb2, 0x1eb1, 0x1eb3, 0x1eb5, 0x1eaf, 0x1eb4,
+    0x1eae, 0x1ea6, 0x1ea8, 0x1eaa, 0x1ea4, 0x1ec0, 0x1eb7, 0x1ea7,
+    0x1ea9, 0x1eab, 0x1ea5, 0x1ead, 0x00e8, 0x1ec2, 0x1ebb, 0x1ebd,
+    0x00e9, 0x1eb9, 0x1ec1, 0x1ec3, 0x1ec5, 0x1ebf, 0x1ec7, 0x00ec,
+    0x1ec9, 0x1ec4, 0x1ebe, 0x1ed2, 0x0129, 0x00ed, 0x1ecb, 0x00f2,
+    0x1ed4, 0x1ecf, 0x00f5, 0x00f3, 0x1ecd, 0x1ed3, 0x1ed5, 0x1ed7,
+    0x1ed1, 0x1ed9, 0x1edd, 0x1edf, 0x1ee1, 0x1edb, 0x1ee3, 0x00f9,
+    0x1ed6, 0x1ee7, 0x0169, 0x00fa, 0x1ee5, 0x1eeb, 0x1eed, 0x1eef,
+    0x1ee9, 0x1ef1, 0x1ef3, 0x1ef7, 0x1ef9, 0x00fd, 0x1ef5, 0x1ed0
+  };
+
+
+/* TCVN5712-1 contains five combining characters:
+   0x0300, 0x0301, 0x0303, 0x0309, 0x0323.  */
+
+/* Composition tables for each of the relevant combining characters.  */
+static const struct
+{
+  uint16_t base;
+  uint16_t composed;
+} comp_table_data[] =
+  {
+#define COMP_TABLE_IDX_0300 0
+#define COMP_TABLE_LEN_0300 28
+    { 0x0041, 0x00C0 },
+    { 0x0045, 0x00C8 },
+    { 0x0049, 0x00CC },
+    { 0x004E, 0x01F8 },
+    { 0x004F, 0x00D2 },
+    { 0x0055, 0x00D9 },
+    { 0x0057, 0x1E80 },
+    { 0x0059, 0x1EF2 },
+    { 0x0061, 0x00E0 },
+    { 0x0065, 0x00E8 },
+    { 0x0069, 0x00EC },
+    { 0x006E, 0x01F9 },
+    { 0x006F, 0x00F2 },
+    { 0x0075, 0x00F9 },
+    { 0x0077, 0x1E81 },
+    { 0x0079, 0x1EF3 },
+  /*{ 0x00A8, 0x1FED },*/
+    { 0x00C2, 0x1EA6 },
+    { 0x00CA, 0x1EC0 },
+    { 0x00D4, 0x1ED2 },
+  /*{ 0x00DC, 0x01DB },*/
+    { 0x00E2, 0x1EA7 },
+    { 0x00EA, 0x1EC1 },
+    { 0x00F4, 0x1ED3 },
+  /*{ 0x00FC, 0x01DC },*/
+    { 0x0102, 0x1EB0 },
+    { 0x0103, 0x1EB1 },
+  /*{ 0x0112, 0x1E14 },*/
+  /*{ 0x0113, 0x1E15 },*/
+  /*{ 0x014C, 0x1E50 },*/
+  /*{ 0x014D, 0x1E51 },*/
+    { 0x01A0, 0x1EDC },
+    { 0x01A1, 0x1EDD },
+    { 0x01AF, 0x1EEA },
+    { 0x01B0, 0x1EEB },
+#define COMP_TABLE_IDX_0301 (COMP_TABLE_IDX_0300 + COMP_TABLE_LEN_0300)
+#define COMP_TABLE_LEN_0301 51
+    { 0x0041, 0x00C1 },
+    { 0x0043, 0x0106 },
+    { 0x0045, 0x00C9 },
+    { 0x0047, 0x01F4 },
+    { 0x0049, 0x00CD },
+    { 0x004B, 0x1E30 },
+    { 0x004C, 0x0139 },
+    { 0x004D, 0x1E3E },
+    { 0x004E, 0x0143 },
+    { 0x004F, 0x00D3 },
+    { 0x0050, 0x1E54 },
+    { 0x0052, 0x0154 },
+    { 0x0053, 0x015A },
+    { 0x0055, 0x00DA },
+    { 0x0057, 0x1E82 },
+    { 0x0059, 0x00DD },
+    { 0x005A, 0x0179 },
+    { 0x0061, 0x00E1 },
+    { 0x0063, 0x0107 },
+    { 0x0065, 0x00E9 },
+    { 0x0067, 0x01F5 },
+    { 0x0069, 0x00ED },
+    { 0x006B, 0x1E31 },
+    { 0x006C, 0x013A },
+    { 0x006D, 0x1E3F },
+    { 0x006E, 0x0144 },
+    { 0x006F, 0x00F3 },
+    { 0x0070, 0x1E55 },
+    { 0x0072, 0x0155 },
+    { 0x0073, 0x015B },
+    { 0x0075, 0x00FA },
+    { 0x0077, 0x1E83 },
+    { 0x0079, 0x00FD },
+    { 0x007A, 0x017A },
+    { 0x00A5, 0x0385 },
+  /*{ 0x00A8, 0x1FEE },*/
+    { 0x00C2, 0x1EA4 },
+  /*{ 0x00C5, 0x01FA },*/
+  /*{ 0x00C6, 0x01FC },*/
+  /*{ 0x00C7, 0x1E08 },*/
+    { 0x00CA, 0x1EBE },
+  /*{ 0x00CF, 0x1E2E },*/
+    { 0x00D4, 0x1ED0 },
+    { 0x00D5, 0x1E4C },
+  /*{ 0x00D8, 0x01FE },*/
+  /*{ 0x00DC, 0x01D7 },*/
+    { 0x00E2, 0x1EA5 },
+  /*{ 0x00E5, 0x01FB },*/
+  /*{ 0x00E6, 0x01FD },*/
+  /*{ 0x00E7, 0x1E09 },*/
+    { 0x00EA, 0x1EBF },
+  /*{ 0x00EF, 0x1E2F },*/
+    { 0x00F4, 0x1ED1 },
+    { 0x00F5, 0x1E4D },
+  /*{ 0x00F8, 0x01FF },*/
+  /*{ 0x00FC, 0x01D8 },*/
+    { 0x0102, 0x1EAE },
+    { 0x0103, 0x1EAF },
+  /*{ 0x0112, 0x1E16 },*/
+  /*{ 0x0113, 0x1E17 },*/
+  /*{ 0x014C, 0x1E52 },*/
+  /*{ 0x014D, 0x1E53 },*/
+    { 0x0168, 0x1E78 },
+    { 0x0169, 0x1E79 },
+    { 0x01A0, 0x1EDA },
+    { 0x01A1, 0x1EDB },
+    { 0x01AF, 0x1EE8 },
+    { 0x01B0, 0x1EE9 },
+#define COMP_TABLE_IDX_0303 (COMP_TABLE_IDX_0301 + COMP_TABLE_LEN_0301)
+#define COMP_TABLE_LEN_0303 34
+    { 0x0041, 0x00C3 },
+    { 0x0045, 0x1EBC },
+    { 0x0049, 0x0128 },
+    { 0x004E, 0x00D1 },
+    { 0x004F, 0x00D5 },
+    { 0x0055, 0x0168 },
+    { 0x0056, 0x1E7C },
+    { 0x0059, 0x1EF8 },
+    { 0x0061, 0x00E3 },
+    { 0x0065, 0x1EBD },
+    { 0x0069, 0x0129 },
+    { 0x006E, 0x00F1 },
+    { 0x006F, 0x00F5 },
+    { 0x0075, 0x0169 },
+    { 0x0076, 0x1E7D },
+    { 0x0079, 0x1EF9 },
+    { 0x00C2, 0x1EAA },
+    { 0x00CA, 0x1EC4 },
+    { 0x00D3, 0x1E4C },
+    { 0x00D4, 0x1ED6 },
+    { 0x00D6, 0x1E4E },
+    { 0x00DA, 0x1E78 },
+    { 0x00E2, 0x1EAB },
+    { 0x00EA, 0x1EC5 },
+    { 0x00F3, 0x1E4D },
+    { 0x00F4, 0x1ED7 },
+    { 0x00F6, 0x1E4F },
+    { 0x00FA, 0x1E79 },
+    { 0x0102, 0x1EB4 },
+    { 0x0103, 0x1EB5 },
+    { 0x01A0, 0x1EE0 },
+    { 0x01A1, 0x1EE1 },
+    { 0x01AF, 0x1EEE },
+    { 0x01B0, 0x1EEF },
+#define COMP_TABLE_IDX_0309 (COMP_TABLE_IDX_0303 + COMP_TABLE_LEN_0303)
+#define COMP_TABLE_LEN_0309 24
+    { 0x0041, 0x1EA2 },
+    { 0x0045, 0x1EBA },
+    { 0x0049, 0x1EC8 },
+    { 0x004F, 0x1ECE },
+    { 0x0055, 0x1EE6 },
+    { 0x0059, 0x1EF6 },
+    { 0x0061, 0x1EA3 },
+    { 0x0065, 0x1EBB },
+    { 0x0069, 0x1EC9 },
+    { 0x006F, 0x1ECF },
+    { 0x0075, 0x1EE7 },
+    { 0x0079, 0x1EF7 },
+    { 0x00C2, 0x1EA8 },
+    { 0x00CA, 0x1EC2 },
+    { 0x00D4, 0x1ED4 },
+    { 0x00E2, 0x1EA9 },
+    { 0x00EA, 0x1EC3 },
+    { 0x00F4, 0x1ED5 },
+    { 0x0102, 0x1EB2 },
+    { 0x0103, 0x1EB3 },
+    { 0x01A0, 0x1EDE },
+    { 0x01A1, 0x1EDF },
+    { 0x01AF, 0x1EEC },
+    { 0x01B0, 0x1EED },
+#define COMP_TABLE_IDX_0323 (COMP_TABLE_IDX_0309 + COMP_TABLE_LEN_0309)
+#define COMP_TABLE_LEN_0323 50
+    { 0x0041, 0x1EA0 },
+    { 0x0042, 0x1E04 },
+    { 0x0044, 0x1E0C },
+    { 0x0045, 0x1EB8 },
+    { 0x0048, 0x1E24 },
+    { 0x0049, 0x1ECA },
+    { 0x004B, 0x1E32 },
+    { 0x004C, 0x1E36 },
+    { 0x004D, 0x1E42 },
+    { 0x004E, 0x1E46 },
+    { 0x004F, 0x1ECC },
+    { 0x0052, 0x1E5A },
+    { 0x0053, 0x1E62 },
+    { 0x0054, 0x1E6C },
+    { 0x0055, 0x1EE4 },
+    { 0x0056, 0x1E7E },
+    { 0x0057, 0x1E88 },
+    { 0x0059, 0x1EF4 },
+    { 0x005A, 0x1E92 },
+    { 0x0061, 0x1EA1 },
+    { 0x0062, 0x1E05 },
+    { 0x0064, 0x1E0D },
+    { 0x0065, 0x1EB9 },
+    { 0x0068, 0x1E25 },
+    { 0x0069, 0x1ECB },
+    { 0x006B, 0x1E33 },
+    { 0x006C, 0x1E37 },
+    { 0x006D, 0x1E43 },
+    { 0x006E, 0x1E47 },
+    { 0x006F, 0x1ECD },
+    { 0x0072, 0x1E5B },
+    { 0x0073, 0x1E63 },
+    { 0x0074, 0x1E6D },
+    { 0x0075, 0x1EE5 },
+    { 0x0076, 0x1E7F },
+    { 0x0077, 0x1E89 },
+    { 0x0079, 0x1EF5 },
+    { 0x007A, 0x1E93 },
+    { 0x00C2, 0x1EAC },
+    { 0x00CA, 0x1EC6 },
+    { 0x00D4, 0x1ED8 },
+    { 0x00E2, 0x1EAD },
+    { 0x00EA, 0x1EC7 },
+    { 0x00F4, 0x1ED9 },
+    { 0x0102, 0x1EB6 },
+    { 0x0103, 0x1EB7 },
+    { 0x01A0, 0x1EE2 },
+    { 0x01A1, 0x1EE3 },
+    { 0x01AF, 0x1EF0 },
+    { 0x01B0, 0x1EF1 },
+#define COMP_TABLE_IDX_END (COMP_TABLE_IDX_0323 + COMP_TABLE_LEN_0323)
+  };
+/* Compile-time verification of table size.  */
+typedef int verify1[(NELEMS (comp_table_data) == COMP_TABLE_IDX_END) - 1];
+
+static const struct
+{
+  unsigned int idx;
+  unsigned int len;
+} comp_table[5] =
+  {
+    { COMP_TABLE_IDX_0300, COMP_TABLE_LEN_0300 },
+    { COMP_TABLE_IDX_0301, COMP_TABLE_LEN_0301 },
+    { COMP_TABLE_IDX_0303, COMP_TABLE_LEN_0303 },
+    { COMP_TABLE_IDX_0309, COMP_TABLE_LEN_0309 },
+    { COMP_TABLE_IDX_0323, COMP_TABLE_LEN_0323 },
+  };
+
+
+/* First define the conversion function from TCVN5712-1 to UCS4.  */
+#define MIN_NEEDED_INPUT       MIN_NEEDED_FROM
+#define MIN_NEEDED_OUTPUT      MIN_NEEDED_TO
+#define MAX_NEEDED_OUTPUT      8
+#define LOOPFCT                        FROM_LOOP
+#define BODY \
+  {                                                                          \
+    uint32_t ch = *inptr;                                                    \
+    uint32_t last_ch;                                                        \
+    int must_buffer_ch;                                                              \
+                                                                             \
+    if (ch < 0x18)                                                           \
+      ch = map_from_tcvn_low[ch];                                            \
+    else if (ch >= 0x80)                                                     \
+      ch = map_from_tcvn_high[ch - 0x80];                                    \
+                                                                             \
+    /* Determine whether there is a buffered character pending.  */          \
+    last_ch = *statep >> 3;                                                  \
+                                                                             \
+    /* We have to buffer ch if it is a possible match in comp_table_data.  */ \
+    must_buffer_ch = (ch >= 0x0041 && ch <= 0x01b0);                         \
+                                                                             \
+    if (last_ch)                                                             \
+      {                                                                              \
+       if (ch >= 0x0300 && ch < 0x0340)                                      \
+         {                                                                   \
+           /* See whether last_ch and ch can be combined.  */                \
+           unsigned int i;                                                   \
+           unsigned int i1;                                                  \
+           unsigned int i2;                                                  \
+                                                                             \
+           switch (ch)                                                       \
+             {                                                               \
+             case 0x0300:                                                    \
+               i = 0;                                                        \
+               break;                                                        \
+             case 0x0301:                                                    \
+               i = 1;                                                        \
+               break;                                                        \
+             case 0x0303:                                                    \
+               i = 2;                                                        \
+               break;                                                        \
+             case 0x0309:                                                    \
+               i = 3;                                                        \
+               break;                                                        \
+             case 0x0323:                                                    \
+               i = 4;                                                        \
+               break;                                                        \
+             default:                                                        \
+               abort ();                                                     \
+             }                                                               \
+                                                                             \
+           i1 = comp_table[i].idx;                                           \
+           i2 = i1 + comp_table[i].len - 1;                                  \
+                                                                             \
+           if (last_ch >= comp_table_data[i1].base                           \
+               && last_ch <= comp_table_data[i2].base)                       \
+             {                                                               \
+               for (;;)                                                      \
+                 {                                                           \
+                   i = (i1 + i2) >> 1;                                       \
+                   if (last_ch == comp_table_data[i].base)                   \
+                     break;                                                  \
+                   if (last_ch < comp_table_data[i].base)                    \
+                     {                                                       \
+                       if (i1 == i)                                          \
+                         goto not_combining;                                 \
+                       i2 = i;                                               \
+                     }                                                       \
+                   else                                                      \
+                     {                                                       \
+                       if (i1 != i)                                          \
+                         i1 = i;                                             \
+                       else                                                  \
+                         {                                                   \
+                           i = i2;                                           \
+                           if (last_ch == comp_table_data[i].base)           \
+                             break;                                          \
+                           goto not_combining;                               \
+                         }                                                   \
+                     }                                                       \
+                 }                                                           \
+               last_ch = comp_table_data[i].composed;                        \
+               /* Output the combined character.  */                         \
+               put32 (outptr, last_ch);                                      \
+               outptr += 4;                                                  \
+               *statep = 0;                                                  \
+               ++inptr;                                                      \
+               continue;                                                     \
+             }                                                               \
+         }                                                                   \
+                                                                             \
+      not_combining:                                                         \
+       /* Output the buffered character.  */                                 \
+       put32 (outptr, last_ch);                                              \
+       outptr += 4;                                                          \
+       *statep = 0;                                                          \
+                                                                             \
+       /* If we don't have enough room to output ch as well, then deal       \
+          with it in another round.  */                                      \
+       if (!must_buffer_ch && __builtin_expect (outptr + 4 > outend, 0))     \
+         continue;                                                           \
+      }                                                                              \
+                                                                             \
+    if (must_buffer_ch)                                                              \
+      *statep = ch << 3;                                                     \
+    else                                                                     \
+      {                                                                              \
+       put32 (outptr, ch);                                                   \
+       outptr += 4;                                                          \
+      }                                                                              \
+    ++inptr;                                                                 \
+  }
+#define EXTRA_LOOP_DECLS       , int *statep
+#include <iconv/loop.c>
+
+
+/* Next, define the conversion function from UCS4 to CP1258.  */
+
+static const unsigned char from_ucs4[] =
+  {
+#define FROM_IDX_00 0
+    0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x07, /* 0x0001-0x0007 */
+    0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, /* 0x0008-0x000f */
+    0x10,                                           /* 0x0010-0x0010 */
+
+#define FROM_IDX_01 (FROM_IDX_00 + 16)
+    0x80, 0x83, 0xa2, 0x82, 0x00, 0x00, 0x00, 0x00, /* 0x00c0-0x00c7 */
+    0x87, 0x8a, 0xa3, 0x00, 0x8d, 0x90, 0x00, 0x00, /* 0x00c8-0x00cf */
+    0x00, 0x00, 0x92, 0x95, 0xa4, 0x94, 0x00, 0x00, /* 0x00d0-0x00d7 */
+    0x00, 0x9d, 0x01, 0x00, 0x00, 0x16, 0x00, 0x00, /* 0x00d8-0x00df */
+    0xb5, 0xb8, 0xa9, 0xb7, 0x00, 0x00, 0x00, 0x00, /* 0x00e0-0x00e7 */
+    0xcc, 0xd0, 0xaa, 0x00, 0xd7, 0xdd, 0x00, 0x00, /* 0x00e8-0x00ef */
+    0x00, 0x00, 0xdf, 0xe3, 0xab, 0xe2, 0x00, 0x00, /* 0x00f0-0x00f7 */
+    0x00, 0xef, 0xf3, 0x00, 0x00, 0xfd, 0x00, 0x00, /* 0x00f8-0x00ff */
+    0x00, 0x00, 0xa1, 0xa8, 0x00, 0x00, 0x00, 0x00, /* 0x0100-0x0107 */
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0108-0x010f */
+    0xa7, 0xae, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0110-0x0117 */
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0118-0x011f */
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0120-0x0127 */
+    0x8f, 0xdc,                                     /* 0x0128-0x0129 */
+
+#define FROM_IDX_02 (FROM_IDX_01 + 106)
+    0x9f, 0xf2,                                     /* 0x0168-0x0169 */
+
+#define FROM_IDX_03 (FROM_IDX_02 + 2)
+    0xa5, 0xac, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x01a0-0x01a7 */
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa6, /* 0x01a8-0x01af */
+    0xad,                                           /* 0x01b0-0x01b0 */
+
+#define FROM_IDX_04 (FROM_IDX_03 + 17)
+    0xb0, 0xb3, 0x00, 0xb2, 0x00, 0x00, 0x00, 0x00, /* 0x0300-0x0307 */
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0308-0x030f */
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0310-0x0317 */
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0318-0x031f */
+    0x00, 0x00, 0x00, 0xb4,                         /* 0x0320-0x0323 */
+
+#define FROM_IDX_05 (FROM_IDX_04 + 36)
+    0x84, 0xb9, 0x81, 0xb6, 0xc4, 0xca, 0xc1, 0xc7, /* 0x1ea0-0x1ea7 */
+    0xc2, 0xc8, 0xc3, 0xc9, 0x86, 0xcb, 0xc0, 0xbe, /* 0x1ea8-0x1eaf */
+    0xaf, 0xbb, 0xba, 0xbc, 0xbf, 0xbd, 0x85, 0xc6, /* 0x1eb0-0x1eb7 */
+    0x8b, 0xd1, 0x88, 0xce, 0x89, 0xcf, 0xda, 0xd5, /* 0x1eb8-0x1ebf */
+    0xc5, 0xd2, 0xcd, 0xd3, 0xd9, 0xd4, 0x8c, 0xd6, /* 0x1ec0-0x1ec7 */
+    0x8e, 0xd8, 0x91, 0xde, 0x96, 0xe4, 0x93, 0xe1, /* 0x1ec8-0x1ecf */
+    0xff, 0xe8, 0xdb, 0xe5, 0xe0, 0xe6, 0xf0, 0xe7, /* 0x1ed0-0x1ed7 */
+    0x97, 0xe9, 0x9b, 0xed, 0x98, 0xea, 0x99, 0xeb, /* 0x1ed8-0x1edf */
+    0x9a, 0xec, 0x9c, 0xee, 0x02, 0xf4, 0x9e, 0xf1, /* 0x1ee0-0x1ee7 */
+    0x11, 0xf8, 0x04, 0xf5, 0x05, 0xf6, 0x06, 0xf7, /* 0x1ee8-0x1eef */
+    0x12, 0xf9, 0x13, 0xfa, 0x17, 0xfe, 0x14, 0xfb, /* 0x1ef0-0x1ef7 */
+    0x15, 0xfc                                      /* 0x1ef8-0x1ef9 */
+#define FROM_IDX_END (FROM_IDX_05 + 90)
+  };
+/* Compile-time verification of table size.  */
+typedef int verify2[(NELEMS (from_ucs4) == FROM_IDX_END) - 1];
+
+/* Decomposition table for the relevant Unicode characters. */
+static const struct
+{
+  uint16_t composed;
+  uint32_t base:8;
+  uint32_t comb1:8;
+} decomp_table[] =
+  {
+    { 0x00d1, 0x4e, 0xb2 },
+    { 0x00f1, 0x6e, 0xb2 },
+    { 0x0106, 0x43, 0xb3 },
+    { 0x0107, 0x63, 0xb3 },
+    { 0x0139, 0x4c, 0xb3 },
+    { 0x013a, 0x6c, 0xb3 },
+    { 0x0143, 0x4e, 0xb3 },
+    { 0x0144, 0x6e, 0xb3 },
+    { 0x0154, 0x52, 0xb3 },
+    { 0x0155, 0x72, 0xb3 },
+    { 0x015a, 0x53, 0xb3 },
+    { 0x015b, 0x73, 0xb3 },
+    { 0x0179, 0x5a, 0xb3 },
+    { 0x017a, 0x7a, 0xb3 },
+    { 0x01f4, 0x47, 0xb3 },
+    { 0x01f5, 0x67, 0xb3 },
+    { 0x01f8, 0x4e, 0xb0 },
+    { 0x01f9, 0x6e, 0xb0 },
+    { 0x1e04, 0x42, 0xb4 },
+    { 0x1e05, 0x62, 0xb4 },
+    { 0x1e0c, 0x44, 0xb4 },
+    { 0x1e0d, 0x64, 0xb4 },
+    { 0x1e24, 0x48, 0xb4 },
+    { 0x1e25, 0x68, 0xb4 },
+    { 0x1e30, 0x4b, 0xb3 },
+    { 0x1e31, 0x6b, 0xb3 },
+    { 0x1e32, 0x4b, 0xb4 },
+    { 0x1e33, 0x6b, 0xb4 },
+    { 0x1e36, 0x4c, 0xb4 },
+    { 0x1e37, 0x6c, 0xb4 },
+    { 0x1e3e, 0x4d, 0xb3 },
+    { 0x1e3f, 0x6d, 0xb3 },
+    { 0x1e42, 0x4d, 0xb4 },
+    { 0x1e43, 0x6d, 0xb4 },
+    { 0x1e46, 0x4e, 0xb4 },
+    { 0x1e47, 0x6e, 0xb4 },
+    { 0x1e54, 0x50, 0xb3 },
+    { 0x1e55, 0x70, 0xb3 },
+    { 0x1e5a, 0x52, 0xb4 },
+    { 0x1e5b, 0x72, 0xb4 },
+    { 0x1e62, 0x53, 0xb4 },
+    { 0x1e63, 0x73, 0xb4 },
+    { 0x1e6c, 0x54, 0xb4 },
+    { 0x1e6d, 0x74, 0xb4 },
+    { 0x1e7c, 0x56, 0xb2 },
+    { 0x1e7d, 0x76, 0xb2 },
+    { 0x1e7e, 0x56, 0xb4 },
+    { 0x1e7f, 0x76, 0xb4 },
+    { 0x1e80, 0x57, 0xb0 },
+    { 0x1e81, 0x77, 0xb0 },
+    { 0x1e82, 0x57, 0xb3 },
+    { 0x1e83, 0x77, 0xb3 },
+    { 0x1e88, 0x57, 0xb4 },
+    { 0x1e89, 0x77, 0xb4 },
+    { 0x1e92, 0x5a, 0xb4 },
+    { 0x1e93, 0x7a, 0xb4 },
+  };
+
+
+/* Next, define the other direction.  */
+#define MIN_NEEDED_INPUT       MIN_NEEDED_TO
+#define MIN_NEEDED_OUTPUT      MIN_NEEDED_FROM
+#define MAX_NEEDED_OUTPUT      2
+#define LOOPFCT                        TO_LOOP
+#define BODY \
+  {                                                                          \
+    uint32_t ch = get32 (inptr);                                             \
+                                                                             \
+    if (ch == 0x00 || (ch >= 0x18 && ch < 0x80) || ch == 0xa0)               \
+      {                                                                              \
+       *outptr++ = ch;                                                       \
+       inptr += 4;                                                           \
+      }                                                                              \
+    else                                                                     \
+      {                                                                              \
+       unsigned char res;                                                    \
+                                                                             \
+       if (ch <= 0x0010)                                                     \
+         res = from_ucs4[ch - 0x0001 + FROM_IDX_00];                         \
+       else if (ch >= 0x00c0 && ch <= 0x0129)                                \
+         res = from_ucs4[ch - 0x00c0 + FROM_IDX_01];                         \
+       else if (ch >= 0x0168 && ch <= 0x0169)                                \
+         res = from_ucs4[ch - 0x0168 + FROM_IDX_02];                         \
+       else if (ch >= 0x01a0 && ch <= 0x01b0)                                \
+         res = from_ucs4[ch - 0x01a0 + FROM_IDX_03];                         \
+       else if (ch >= 0x0300 && ch <= 0x0323)                                \
+         res = from_ucs4[ch - 0x0300 + FROM_IDX_04];                         \
+       else if (ch >= 0x1ea0 && ch <= 0x1ef9)                                \
+         res = from_ucs4[ch - 0x1ea0 + FROM_IDX_05];                         \
+       else                                                                  \
+         {                                                                   \
+           UNICODE_TAG_HANDLER (ch, 4);                                      \
+           res = 0;                                                          \
+         }                                                                   \
+                                                                             \
+       if (__builtin_expect (res != 0, 1))                                   \
+         {                                                                   \
+           *outptr++ = res;                                                  \
+           inptr += 4;                                                       \
+         }                                                                   \
+       else                                                                  \
+         {                                                                   \
+           /* Try canonical decomposition.  */                               \
+           unsigned int i1;                                                  \
+           unsigned int i2;                                                  \
+                                                                             \
+           i1 = 0;                                                           \
+           i2 = sizeof (decomp_table) / sizeof (decomp_table[0]) - 1;        \
+           if (ch >= decomp_table[i1].composed                               \
+               && ch <= decomp_table[i2].composed)                           \
+             {                                                               \
+               unsigned int i;                                               \
+                                                                             \
+               for (;;)                                                      \
+                 {                                                           \
+                   i = (i1 + i2) >> 1;                                       \
+                   if (ch == decomp_table[i].composed)                       \
+                     break;                                                  \
+                   if (ch < decomp_table[i].composed)                        \
+                     {                                                       \
+                       if (i1 == i)                                          \
+                         goto failed;                                        \
+                       i2 = i;                                               \
+                     }                                                       \
+                   else                                                      \
+                     {                                                       \
+                       if (i1 != i)                                          \
+                         i1 = i;                                             \
+                       else                                                  \
+                         {                                                   \
+                           i = i2;                                           \
+                           if (ch == decomp_table[i].composed)               \
+                             break;                                          \
+                           goto failed;                                      \
+                         }                                                   \
+                     }                                                       \
+                 }                                                           \
+                                                                             \
+               /* See whether we have room for two bytes.  */                \
+               if (__builtin_expect (outptr + 1 >= outend, 0))               \
+                 {                                                           \
+                   result = __GCONV_FULL_OUTPUT;                             \
+                   break;                                                    \
+                 }                                                           \
+                                                                             \
+               /* Found a canonical decomposition.  */                       \
+               *outptr++ = decomp_table[i].base;                             \
+               *outptr++ = decomp_table[i].comb1;                            \
+               inptr += 4;                                                   \
+               continue;                                                     \
+             }                                                               \
+                                                                             \
+         failed:                                                             \
+           /* This is an illegal character.  */                              \
+           STANDARD_ERR_HANDLER (4);                                         \
+         }                                                                   \
+      }                                                                              \
+  }
+#define LOOP_NEED_FLAGS
+#define EXTRA_LOOP_DECLS       , int *statep
+#include <iconv/loop.c>
+
+
+/* Now define the toplevel functions.  */
+#include <iconv/skeleton.c>
diff --git a/iconvdata/testdata/TCVN5712-1 b/iconvdata/testdata/TCVN5712-1
new file mode 100644 (file)
index 0000000..3e93a39
--- /dev/null
@@ -0,0 +1,22 @@
+   \ 1 \ 2 \ 3 \ 4 \ 5 \ 6 \a \b      
\v \f \r \ e \ f
\10 \11 \12 \13 \14 \15 \16 \17 \18 \19 \1a \e \1c \1d \1e \1f
+   ! " # $ % & ' ( ) * + , - . /
+ 0 1 2 3 4 5 6 7 8 9 : ; < = > ?
+ @ A B C D E F G H I J K L M N O
+ P Q R S T U V W X Y Z [ \ ] ^ _
+ ` a b c d e f g h i j k l m n o
+ p q r s t u v w x y z { | } ~ \7f
\80 \81 \82 \83 \84 \85 \86 \87 \88 \89 \8a \8b \8c \8d \8e \8f
\90 \91 \92 \93 \94 \95 \96 \97 \98 \99 \9a \9b \9c \9d \9e \9f
+   ¡ ¢ £ ¤ ¥ ¦ § ¨ © ª « ¬ ­ ® ¯
+           µ ¶ · ¸ ¹ º » ¼ ½ ¾ ¿
+ À Á Â Ã Ä Å Æ Ç È É Ê Ë Ì Í Î Ï
+ Ð Ñ Ò Ó Ô Õ Ö × Ø Ù Ú Û Ü Ý Þ ß
+ à á â ã ä å æ ç è é ê ë ì í î ï
+ ð ñ ò ó ô õ ö ÷ ø ù ú û ü ý þ ÿ
+
+ N² n² C³ c³ L³ l³ N³ n³ R³ r³ S³ s³ Z³ z³ G³ g³ N° n°
+ B´ b´ D´ d´ H´ h´ K³ k³ K´ k´ L´ l´ M³ m³ M´ m´ N´ n´
+ P³ p³ R´ r´ S´ s´ T´ t´ V² v² V´ v´ W° w° W³ w³ W´ w´
+ Z´ z´
diff --git a/iconvdata/testdata/TCVN5712-1..UTF8 b/iconvdata/testdata/TCVN5712-1..UTF8
new file mode 100644 (file)
index 0000000..9850aef
--- /dev/null
@@ -0,0 +1,22 @@
+   Ú Ụ \ 3 Ừ Ử Ữ \a \b     
\v \f \r \ e \ f
\10 Ứ Ự Ỳ Ỷ Ỹ Ý Ỵ \18 \19 \1a \e \1c \1d \1e \1f
+   ! " # $ % & ' ( ) * + , - . /
+ 0 1 2 3 4 5 6 7 8 9 : ; < = > ?
+ @ A B C D E F G H I J K L M N O
+ P Q R S T U V W X Y Z [ \ ] ^ _
+ ` a b c d e f g h i j k l m n o
+ p q r s t u v w x y z { | } ~ \7f
+ À Ả Ã Á Ạ Ặ Ậ È Ẻ Ẽ É Ẹ Ệ Ì Ỉ Ĩ
+ Í Ị Ò Ỏ Õ Ó Ọ Ộ Ờ Ở Ỡ Ớ Ợ Ù Ủ Ũ
+   Ă Â Ê Ô Ơ Ư Đ ă â ê ô ơ ư đ Ằ
+           à ả ã á ạ Ẳ ằ ẳ ẵ ắ Ẵ
+ Ắ Ầ Ẩ Ẫ Ấ Ề ặ ầ ẩ ẫ ấ ậ è Ể ẻ ẽ
+ é ẹ ề ể ễ ế ệ ì ỉ Ễ Ế Ồ ĩ í ị ò
+ Ổ ỏ õ ó ọ ồ ổ ỗ ố ộ ờ ở ỡ ớ ợ ù
+ Ỗ ủ ũ ú ụ ừ ử ữ ứ ự ỳ ỷ ỹ ý ỵ Ố
+
+ Ñ ñ Ć ć Ĺ ĺ Ń ń Ŕ ŕ Ś ś Ź ź Ǵ ǵ Ǹ ǹ
+ Ḅ ḅ Ḍ ḍ Ḥ ḥ Ḱ ḱ Ḳ ḳ Ḷ ḷ Ḿ ḿ Ṃ ṃ Ṇ ṇ
+ Ṕ ṕ Ṛ ṛ Ṣ ṣ Ṭ ṭ Ṽ ṽ Ṿ ṿ Ẁ ẁ Ẃ ẃ Ẉ ẉ
+ Ẓ ẓ
index 0051cf7..0866548 100644 (file)
@@ -1,3 +1,7 @@
+2001-12-05  Ulrich Drepper  <drepper@redhat.com>
+
+       * charmapsTCVN5712-1: New file.
+
 2001-12-03  Ulrich Drepper  <drepper@redhat.com>
 
        * locales/translit_neutral: Define transliteration for dong sign.
diff --git a/localedata/charmaps/TCVN5712-1 b/localedata/charmaps/TCVN5712-1
new file mode 100644 (file)
index 0000000..824a764
--- /dev/null
@@ -0,0 +1,265 @@
+<code_set_name> TCVN5712-1
+<comment_char> %
+<escape_char> /
+
+% alias TCVN
+% alias TCVN-5712
+% alias TCVN5712-1:1993
+CHARMAP
+<U0000>     /x00         NULL (NUL)
+<U00DA>     /x01         LATIN CAPITAL LETTER U WITH ACUTE
+<U1EE4>     /x02         LATIN CAPITAL LETTER U WITH DOT BELOW
+<U0003>     /x03         END OF TEXT
+<U1EEA>     /x04         LATIN CAPITAL LETTER U WITH HORN AND GRAVE
+<U1EEC>     /x05         LATIN CAPITAL LETTER U WITH HORN AND HOOK ABOVE
+<U1EEE>     /x06         LATIN CAPITAL LETTER U WITH HORN AND TILDE
+<U0007>     /x07         BELL (BEL)
+<U0008>     /x08         BACKSPACE (BS)
+<U0009>     /x09         CHARACTER TABULATION (HT)
+<U000A>     /x0a         LINE FEED (LF)
+<U000B>     /x0b         LINE TABULATION (VT)
+<U000C>     /x0c         FORM FEED (FF)
+<U000D>     /x0d         CARRIAGE RETURN (CR)
+<U000E>     /x0e         SHIFT OUT (SO)
+<U000F>     /x0f         SHIFT IN (SI)
+<U0010>     /x10         DATA LINK ESCAPE (DLE)
+<U1EE8>     /x11         LATIN CAPITAL LETTER U WITH HORN AND ACUTE
+<U1EF0>     /x12         LATIN CAPITAL LETTER U WITH HORN AND DOT BELOW
+<U1EF2>     /x13         LATIN CAPITAL LETTER Y WITH GRAVE
+<U1EF6>     /x14         LATIN CAPITAL LETTER Y WITH HOOK ABOVE
+<U1EF8>     /x15         LATIN CAPITAL LETTER Y WITH TILDE
+<U00DD>     /x16         LATIN CAPITAL LETTER Y WITH ACUTE
+<U1EF4>     /x17         LATIN CAPITAL LETTER Y WITH DOT BELOW
+<U0018>     /x18         CANCEL (CAN)
+<U0019>     /x19         END OF MEDIUM (EM)
+<U001A>     /x1a         SUBSTITUTE (SUB)
+<U001B>     /x1b         ESCAPE (ESC)
+<U001C>     /x1c         FILE SEPARATOR (IS4)
+<U001D>     /x1d         GROUP SEPARATOR (IS3)
+<U001E>     /x1e         RECORD SEPARATOR (IS2)
+<U001F>     /x1f         UNIT SEPARATOR (IS1)
+<U0020>     /x20         SPACE
+<U0021>     /x21         EXCLAMATION MARK
+<U0022>     /x22         QUOTATION MARK
+<U0023>     /x23         NUMBER SIGN
+<U0024>     /x24         DOLLAR SIGN
+<U0025>     /x25         PERCENT SIGN
+<U0026>     /x26         AMPERSAND
+<U0027>     /x27         APOSTROPHE
+<U0028>     /x28         LEFT PARENTHESIS
+<U0029>     /x29         RIGHT PARENTHESIS
+<U002A>     /x2a         ASTERISK
+<U002B>     /x2b         PLUS SIGN
+<U002C>     /x2c         COMMA
+<U002D>     /x2d         HYPHEN-MINUS
+<U002E>     /x2e         FULL STOP
+<U002F>     /x2f         SOLIDUS
+<U0030>     /x30         DIGIT ZERO
+<U0031>     /x31         DIGIT ONE
+<U0032>     /x32         DIGIT TWO
+<U0033>     /x33         DIGIT THREE
+<U0034>     /x34         DIGIT FOUR
+<U0035>     /x35         DIGIT FIVE
+<U0036>     /x36         DIGIT SIX
+<U0037>     /x37         DIGIT SEVEN
+<U0038>     /x38         DIGIT EIGHT
+<U0039>     /x39         DIGIT NINE
+<U003A>     /x3a         COLON
+<U003B>     /x3b         SEMICOLON
+<U003C>     /x3c         LESS-THAN SIGN
+<U003D>     /x3d         EQUALS SIGN
+<U003E>     /x3e         GREATER-THAN SIGN
+<U003F>     /x3f         QUESTION MARK
+<U0040>     /x40         COMMERCIAL AT
+<U0041>     /x41         LATIN CAPITAL LETTER A
+<U0042>     /x42         LATIN CAPITAL LETTER B
+<U0043>     /x43         LATIN CAPITAL LETTER C
+<U0044>     /x44         LATIN CAPITAL LETTER D
+<U0045>     /x45         LATIN CAPITAL LETTER E
+<U0046>     /x46         LATIN CAPITAL LETTER F
+<U0047>     /x47         LATIN CAPITAL LETTER G
+<U0048>     /x48         LATIN CAPITAL LETTER H
+<U0049>     /x49         LATIN CAPITAL LETTER I
+<U004A>     /x4a         LATIN CAPITAL LETTER J
+<U004B>     /x4b         LATIN CAPITAL LETTER K
+<U004C>     /x4c         LATIN CAPITAL LETTER L
+<U004D>     /x4d         LATIN CAPITAL LETTER M
+<U004E>     /x4e         LATIN CAPITAL LETTER N
+<U004F>     /x4f         LATIN CAPITAL LETTER O
+<U0050>     /x50         LATIN CAPITAL LETTER P
+<U0051>     /x51         LATIN CAPITAL LETTER Q
+<U0052>     /x52         LATIN CAPITAL LETTER R
+<U0053>     /x53         LATIN CAPITAL LETTER S
+<U0054>     /x54         LATIN CAPITAL LETTER T
+<U0055>     /x55         LATIN CAPITAL LETTER U
+<U0056>     /x56         LATIN CAPITAL LETTER V
+<U0057>     /x57         LATIN CAPITAL LETTER W
+<U0058>     /x58         LATIN CAPITAL LETTER X
+<U0059>     /x59         LATIN CAPITAL LETTER Y
+<U005A>     /x5a         LATIN CAPITAL LETTER Z
+<U005B>     /x5b         LEFT SQUARE BRACKET
+<U005C>     /x5c         REVERSE SOLIDUS
+<U005D>     /x5d         RIGHT SQUARE BRACKET
+<U005E>     /x5e         CIRCUMFLEX ACCENT
+<U005F>     /x5f         LOW LINE
+<U0060>     /x60         GRAVE ACCENT
+<U0061>     /x61         LATIN SMALL LETTER A
+<U0062>     /x62         LATIN SMALL LETTER B
+<U0063>     /x63         LATIN SMALL LETTER C
+<U0064>     /x64         LATIN SMALL LETTER D
+<U0065>     /x65         LATIN SMALL LETTER E
+<U0066>     /x66         LATIN SMALL LETTER F
+<U0067>     /x67         LATIN SMALL LETTER G
+<U0068>     /x68         LATIN SMALL LETTER H
+<U0069>     /x69         LATIN SMALL LETTER I
+<U006A>     /x6a         LATIN SMALL LETTER J
+<U006B>     /x6b         LATIN SMALL LETTER K
+<U006C>     /x6c         LATIN SMALL LETTER L
+<U006D>     /x6d         LATIN SMALL LETTER M
+<U006E>     /x6e         LATIN SMALL LETTER N
+<U006F>     /x6f         LATIN SMALL LETTER O
+<U0070>     /x70         LATIN SMALL LETTER P
+<U0071>     /x71         LATIN SMALL LETTER Q
+<U0072>     /x72         LATIN SMALL LETTER R
+<U0073>     /x73         LATIN SMALL LETTER S
+<U0074>     /x74         LATIN SMALL LETTER T
+<U0075>     /x75         LATIN SMALL LETTER U
+<U0076>     /x76         LATIN SMALL LETTER V
+<U0077>     /x77         LATIN SMALL LETTER W
+<U0078>     /x78         LATIN SMALL LETTER X
+<U0079>     /x79         LATIN SMALL LETTER Y
+<U007A>     /x7a         LATIN SMALL LETTER Z
+<U007B>     /x7b         LEFT CURLY BRACKET
+<U007C>     /x7c         VERTICAL LINE
+<U007D>     /x7d         RIGHT CURLY BRACKET
+<U007E>     /x7e         TILDE
+<U007F>     /x7f         DELETE (DEL)
+<U00C0>     /x80         LATIN CAPITAL LETTER A WITH GRAVE
+<U1EA2>     /x81         LATIN CAPITAL LETTER A WITH HOOK ABOVE
+<U00C3>     /x82         LATIN CAPITAL LETTER A WITH TILDE
+<U00C1>     /x83         LATIN CAPITAL LETTER A WITH ACUTE
+<U1EA0>     /x84         LATIN CAPITAL LETTER A WITH DOT BELOW
+<U1EB6>     /x85         LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW
+<U1EAC>     /x86         LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW
+<U00C8>     /x87         LATIN CAPITAL LETTER E WITH GRAVE
+<U1EBA>     /x88         LATIN CAPITAL LETTER E WITH HOOK ABOVE
+<U1EBC>     /x89         LATIN CAPITAL LETTER E WITH TILDE
+<U00C9>     /x8a         LATIN CAPITAL LETTER E WITH ACUTE
+<U1EB8>     /x8b         LATIN CAPITAL LETTER E WITH DOT BELOW
+<U1EC6>     /x8c         LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND DOT BELOW
+<U00CC>     /x8d         LATIN CAPITAL LETTER I WITH GRAVE
+<U1EC8>     /x8e         LATIN CAPITAL LETTER I WITH HOOK ABOVE
+<U0128>     /x8f         LATIN CAPITAL LETTER I WITH TILDE
+<U00CD>     /x90         LATIN CAPITAL LETTER I WITH ACUTE
+<U1ECA>     /x91         LATIN CAPITAL LETTER I WITH DOT BELOW
+<U00D2>     /x92         LATIN CAPITAL LETTER O WITH GRAVE
+<U1ECE>     /x93         LATIN CAPITAL LETTER O WITH HOOK ABOVE
+<U00D5>     /x94         LATIN CAPITAL LETTER O WITH TILDE
+<U00D3>     /x95         LATIN CAPITAL LETTER O WITH ACUTE
+<U1ECC>     /x96         LATIN CAPITAL LETTER O WITH DOT BELOW
+<U1ED8>     /x97         LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND DOT BELOW
+<U1EDC>     /x98         LATIN CAPITAL LETTER O WITH HORN AND GRAVE
+<U1EDE>     /x99         LATIN CAPITAL LETTER O WITH HORN AND HOOK ABOVE
+<U1EE0>     /x9a         LATIN CAPITAL LETTER O WITH HORN AND TILDE
+<U1EDA>     /x9b         LATIN CAPITAL LETTER O WITH HORN AND ACUTE
+<U1EE2>     /x9c         LATIN CAPITAL LETTER O WITH HORN AND DOT BELOW
+<U00D9>     /x9d         LATIN CAPITAL LETTER U WITH GRAVE
+<U1EE6>     /x9e         LATIN CAPITAL LETTER U WITH HOOK ABOVE
+<U0168>     /x9f         LATIN CAPITAL LETTER U WITH TILDE
+<U00A0>     /xa0         NO-BREAK SPACE
+<U0102>     /xa1         LATIN CAPITAL LETTER A WITH BREVE
+<U00C2>     /xa2         LATIN CAPITAL LETTER A WITH CIRCUMFLEX
+<U00CA>     /xa3         LATIN CAPITAL LETTER E WITH CIRCUMFLEX
+<U00D4>     /xa4         LATIN CAPITAL LETTER O WITH CIRCUMFLEX
+<U01A0>     /xa5         LATIN CAPITAL LETTER O WITH HORN
+<U01AF>     /xa6         LATIN CAPITAL LETTER U WITH HORN
+<U0110>     /xa7         LATIN CAPITAL LETTER D WITH STROKE
+<U0103>     /xa8         LATIN SMALL LETTER A WITH BREVE
+<U00E2>     /xa9         LATIN SMALL LETTER A WITH CIRCUMFLEX
+<U00EA>     /xaa         LATIN SMALL LETTER E WITH CIRCUMFLEX
+<U00F4>     /xab         LATIN SMALL LETTER O WITH CIRCUMFLEX
+<U01A1>     /xac         LATIN SMALL LETTER O WITH HORN
+<U01B0>     /xad         LATIN SMALL LETTER U WITH HORN
+<U0111>     /xae         LATIN SMALL LETTER D WITH STROKE
+<U1EB0>     /xaf         LATIN CAPITAL LETTER A WITH BREVE AND GRAVE
+<U0300>     /xb0         COMBINING GRAVE ACCENT
+<U0309>     /xb1         COMBINING HOOK ABOVE
+<U0303>     /xb2         COMBINING TILDE
+<U0301>     /xb3         COMBINING ACUTE ACCENT
+<U0323>     /xb4         COMBINING DOT BELOW
+<U00E0>     /xb5         LATIN SMALL LETTER A WITH GRAVE
+<U1EA3>     /xb6         LATIN SMALL LETTER A WITH HOOK ABOVE
+<U00E3>     /xb7         LATIN SMALL LETTER A WITH TILDE
+<U00E1>     /xb8         LATIN SMALL LETTER A WITH ACUTE
+<U1EA1>     /xb9         LATIN SMALL LETTER A WITH DOT BELOW
+<U1EB2>     /xba         LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE
+<U1EB1>     /xbb         LATIN SMALL LETTER A WITH BREVE AND GRAVE
+<U1EB3>     /xbc         LATIN SMALL LETTER A WITH BREVE AND HOOK ABOVE
+<U1EB5>     /xbd         LATIN SMALL LETTER A WITH BREVE AND TILDE
+<U1EAF>     /xbe         LATIN SMALL LETTER A WITH BREVE AND ACUTE
+<U1EB4>     /xbf         LATIN CAPITAL LETTER A WITH BREVE AND TILDE
+<U1EAE>     /xc0         LATIN CAPITAL LETTER A WITH BREVE AND ACUTE
+<U1EA6>     /xc1         LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE
+<U1EA8>     /xc2         LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE
+<U1EAA>     /xc3         LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND TILDE
+<U1EA4>     /xc4         LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE
+<U1EC0>     /xc5         LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND GRAVE
+<U1EB7>     /xc6         LATIN SMALL LETTER A WITH BREVE AND DOT BELOW
+<U1EA7>     /xc7         LATIN SMALL LETTER A WITH CIRCUMFLEX AND GRAVE
+<U1EA9>     /xc8         LATIN SMALL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE
+<U1EAB>     /xc9         LATIN SMALL LETTER A WITH CIRCUMFLEX AND TILDE
+<U1EA5>     /xca         LATIN SMALL LETTER A WITH CIRCUMFLEX AND ACUTE
+<U1EAD>     /xcb         LATIN SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW
+<U00E8>     /xcc         LATIN SMALL LETTER E WITH GRAVE
+<U1EC2>     /xcd         LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE
+<U1EBB>     /xce         LATIN SMALL LETTER E WITH HOOK ABOVE
+<U1EBD>     /xcf         LATIN SMALL LETTER E WITH TILDE
+<U00E9>     /xd0         LATIN SMALL LETTER E WITH ACUTE
+<U1EB9>     /xd1         LATIN SMALL LETTER E WITH DOT BELOW
+<U1EC1>     /xd2         LATIN SMALL LETTER E WITH CIRCUMFLEX AND GRAVE
+<U1EC3>     /xd3         LATIN SMALL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE
+<U1EC5>     /xd4         LATIN SMALL LETTER E WITH CIRCUMFLEX AND TILDE
+<U1EBF>     /xd5         LATIN SMALL LETTER E WITH CIRCUMFLEX AND ACUTE
+<U1EC7>     /xd6         LATIN SMALL LETTER E WITH CIRCUMFLEX AND DOT BELOW
+<U00EC>     /xd7         LATIN SMALL LETTER I WITH GRAVE
+<U1EC9>     /xd8         LATIN SMALL LETTER I WITH HOOK ABOVE
+<U1EC4>     /xd9         LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND TILDE
+<U1EBE>     /xda         LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE
+<U1ED2>     /xdb         LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND GRAVE
+<U0129>     /xdc         LATIN SMALL LETTER I WITH TILDE
+<U00ED>     /xdd         LATIN SMALL LETTER I WITH ACUTE
+<U1ECB>     /xde         LATIN SMALL LETTER I WITH DOT BELOW
+<U00F2>     /xdf         LATIN SMALL LETTER O WITH GRAVE
+<U1ED4>     /xe0         LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE
+<U1ECF>     /xe1         LATIN SMALL LETTER O WITH HOOK ABOVE
+<U00F5>     /xe2         LATIN SMALL LETTER O WITH TILDE
+<U00F3>     /xe3         LATIN SMALL LETTER O WITH ACUTE
+<U1ECD>     /xe4         LATIN SMALL LETTER O WITH DOT BELOW
+<U1ED3>     /xe5         LATIN SMALL LETTER O WITH CIRCUMFLEX AND GRAVE
+<U1ED5>     /xe6         LATIN SMALL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE
+<U1ED7>     /xe7         LATIN SMALL LETTER O WITH CIRCUMFLEX AND TILDE
+<U1ED1>     /xe8         LATIN SMALL LETTER O WITH CIRCUMFLEX AND ACUTE
+<U1ED9>     /xe9         LATIN SMALL LETTER O WITH CIRCUMFLEX AND DOT BELOW
+<U1EDD>     /xea         LATIN SMALL LETTER O WITH HORN AND GRAVE
+<U1EDF>     /xeb         LATIN SMALL LETTER O WITH HORN AND HOOK ABOVE
+<U1EE1>     /xec         LATIN SMALL LETTER O WITH HORN AND TILDE
+<U1EDB>     /xed         LATIN SMALL LETTER O WITH HORN AND ACUTE
+<U1EE3>     /xee         LATIN SMALL LETTER O WITH HORN AND DOT BELOW
+<U00F9>     /xef         LATIN SMALL LETTER U WITH GRAVE
+<U1ED6>     /xf0         LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND TILDE
+<U1EE7>     /xf1         LATIN SMALL LETTER U WITH HOOK ABOVE
+<U0169>     /xf2         LATIN SMALL LETTER U WITH TILDE
+<U00FA>     /xf3         LATIN SMALL LETTER U WITH ACUTE
+<U1EE5>     /xf4         LATIN SMALL LETTER U WITH DOT BELOW
+<U1EEB>     /xf5         LATIN SMALL LETTER U WITH HORN AND GRAVE
+<U1EED>     /xf6         LATIN SMALL LETTER U WITH HORN AND HOOK ABOVE
+<U1EEF>     /xf7         LATIN SMALL LETTER U WITH HORN AND TILDE
+<U1EE9>     /xf8         LATIN SMALL LETTER U WITH HORN AND ACUTE
+<U1EF1>     /xf9         LATIN SMALL LETTER U WITH HORN AND DOT BELOW
+<U1EF3>     /xfa         LATIN SMALL LETTER Y WITH GRAVE
+<U1EF7>     /xfb         LATIN SMALL LETTER Y WITH HOOK ABOVE
+<U1EF9>     /xfc         LATIN SMALL LETTER Y WITH TILDE
+<U00FD>     /xfd         LATIN SMALL LETTER Y WITH ACUTE
+<U1EF5>     /xfe         LATIN SMALL LETTER Y WITH DOT BELOW
+<U1ED0>     /xff         LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE
+END CHARMAP