Attachment 21381 Details for Bug 37497 – patch-lib_aliases.h

patch-lib_aliases.h

patch-lib_aliases.h (text/x-c-header), 47.92 KB, created by Joe Marcus Clarke on 2002-04-27 20:50:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Joe Marcus Clarke

Created: 2002-04-27 20:50:25 UTC

Size: 47.92 KB

patch

obsolete

>--- lib/aliases.h.orig	Sat Apr 27 15:44:10 2002
>+++ lib/aliases.h	Sat Apr 27 15:43:37 2002
>@@ -2,12 +2,12 @@
> /* Command-line: gperf -t -L ANSI-C -H aliases_hash -N aliases_lookup -7 -C -k '1,3-11,$' -i 1 lib/aliases.gperf  */
> struct alias { const char* name; unsigned int encoding_index; };
> 
>-#define TOTAL_KEYWORDS 308
>+#define TOTAL_KEYWORDS 322
> #define MIN_WORD_LENGTH 2
> #define MAX_WORD_LENGTH 45
>-#define MIN_HASH_VALUE 4
>-#define MAX_HASH_VALUE 2816
>-/* maximum key range = 2813, duplicates = 0 */
>+#define MIN_HASH_VALUE 8
>+#define MAX_HASH_VALUE 2231
>+/* maximum key range = 2224, duplicates = 0 */
> 
> #ifdef __GNUC__
> __inline
>@@ -21,19 +21,19 @@
> {
>   static const unsigned short asso_values[] =
>     {
>-      2817, 2817, 2817, 2817, 2817, 2817, 2817, 2817, 2817, 2817,
>-      2817, 2817, 2817, 2817, 2817, 2817, 2817, 2817, 2817, 2817,
>-      2817, 2817, 2817, 2817, 2817, 2817, 2817, 2817, 2817, 2817,
>-      2817, 2817, 2817, 2817, 2817, 2817, 2817, 2817, 2817, 2817,
>-      2817, 2817, 2817, 2817, 2817,    1,   21, 2817,   11,  371,
>-        66,  366,   91,  211,  171,   36,    1,  506,   56, 2817,
>-      2817, 2817, 2817, 2817, 2817,  111,   16,  507,   16,    1,
>-        51,   36,  256,    1,  131,  111,    1,    1,    6,    1,
>-         6, 2817,   81,    1,    1,  506,   41,    1,    1,   11,
>-         1, 2817, 2817, 2817, 2817,   36, 2817, 2817, 2817, 2817,
>-      2817, 2817, 2817, 2817, 2817, 2817, 2817, 2817, 2817, 2817,
>-      2817, 2817, 2817, 2817, 2817, 2817, 2817, 2817, 2817, 2817,
>-      2817, 2817, 2817, 2817, 2817, 2817, 2817, 2817
>+      2232, 2232, 2232, 2232, 2232, 2232, 2232, 2232, 2232, 2232,
>+      2232, 2232, 2232, 2232, 2232, 2232, 2232, 2232, 2232, 2232,
>+      2232, 2232, 2232, 2232, 2232, 2232, 2232, 2232, 2232, 2232,
>+      2232, 2232, 2232, 2232, 2232, 2232, 2232, 2232, 2232, 2232,
>+      2232, 2232, 2232, 2232, 2232,    1,   31, 2232,   11,  371,
>+        66,   51,  374,  211,  121,  469,    1,   81,   16, 2232,
>+      2232, 2232, 2232, 2232, 2232,   32,   16,  237,   16,    1,
>+       271,  232,  479,    1,  291,    1,  196,   56,    6,    1,
>+       206, 2232,  201,    1,    1,  506,   26,  321,   91,    6,
>+         1, 2232, 2232, 2232, 2232,   36, 2232, 2232, 2232, 2232,
>+      2232, 2232, 2232, 2232, 2232, 2232, 2232, 2232, 2232, 2232,
>+      2232, 2232, 2232, 2232, 2232, 2232, 2232, 2232, 2232, 2232,
>+      2232, 2232, 2232, 2232, 2232, 2232, 2232, 2232
>     };
>   register int hval = len;
> 
>@@ -41,29 +41,29 @@
>     {
>       default:
>       case 11:
>-        hval += asso_values[(unsigned char) str[10]];
>+        hval += asso_values[str[10]];
>       case 10:
>-        hval += asso_values[(unsigned char) str[9]];
>+        hval += asso_values[str[9]];
>       case 9:
>-        hval += asso_values[(unsigned char) str[8]];
>+        hval += asso_values[str[8]];
>       case 8:
>-        hval += asso_values[(unsigned char) str[7]];
>+        hval += asso_values[str[7]];
>       case 7:
>-        hval += asso_values[(unsigned char) str[6]];
>+        hval += asso_values[str[6]];
>       case 6:
>-        hval += asso_values[(unsigned char) str[5]];
>+        hval += asso_values[str[5]];
>       case 5:
>-        hval += asso_values[(unsigned char) str[4]];
>+        hval += asso_values[str[4]];
>       case 4:
>-        hval += asso_values[(unsigned char) str[3]];
>+        hval += asso_values[str[3]];
>       case 3:
>-        hval += asso_values[(unsigned char) str[2]];
>+        hval += asso_values[str[2]];
>       case 2:
>       case 1:
>-        hval += asso_values[(unsigned char) str[0]];
>+        hval += asso_values[str[0]];
>         break;
>     }
>-  return hval + asso_values[(unsigned char) str[len - 1]];
>+  return hval + asso_values[str[len - 1]];
> }
> 
> #ifdef __GNUC__
>@@ -74,697 +74,658 @@
> {
>   static const struct alias wordlist[] =
>     {
>-      {""}, {""}, {""}, {""},
>-      {"L8", ei_iso8859_14},
>-      {""}, {""}, {""},
>+      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>       {"SJIS", ei_sjis},
>-      {""},
>-      {"MS-EE", ei_cp1250},
>-      {""}, {""}, {""}, {""}, {""}, {""},
>-      {"LATIN8", ei_iso8859_14},
>+      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>       {"850", ei_cp850},
>-      {""}, {""}, {""}, {""},
>-      {"NEXTSTEP", ei_nextstep},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {"L7", ei_iso8859_13},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>+      {""}, {""}, {""}, {""}, {""}, {""}, {""},
>       {"TCVN", ei_tcvn},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {""},
>-      {"L2", ei_iso8859_2},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {""}, {""}, {""}, {""}, {""},
>-      {"R8", ei_hp_roman8},
>-      {"X0208", ei_jisx0208},
>-      {""},
>-      {"LATIN7", ei_iso8859_13},
>-      {""}, {""}, {""}, {""}, {""}, {""},
>-      {"L4", ei_iso8859_4},
>+      {""}, {""}, {""},
>+      {"MS-EE", ei_cp1250},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""},
>+      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>+      {""}, {""}, {""},
>       {"MS-ANSI", ei_cp1252},
>-      {""}, {""}, {""}, {""}, {""}, {""},
>+      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>+      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>+      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>+      {""}, {""}, {""},
>       {"862", ei_cp862},
>-      {""}, {""},
>-      {"JP", ei_iso646_jp},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {"LATIN2", ei_iso8859_2},
>-      {""}, {""}, {""}, {""}, {""}, {""},
>-      {"BIGFIVE", ei_ces_big5},
>-      {""},
>-      {"BIG-FIVE", ei_ces_big5},
>-      {"GREEK8", ei_iso8859_7},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {""},
>-      {"ISO-IR-87", ei_jisx0208},
>-      {""}, {""},
>-      {"ASMO-708", ei_iso8859_6},
>+      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>+      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>+      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>       {""}, {""},
>-      {"L6", ei_iso8859_10},
>+      {"X0208", ei_jisx0208},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>+      {""}, {""},
>+      {"ELOT_928", ei_iso8859_7},
>+      {""}, {""},
>+      {"L8", ei_iso8859_14},
>       {""}, {""}, {""}, {""},
>-      {"LATIN4", ei_iso8859_4},
>-      {"SHIFT-JIS", ei_sjis},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {"ROMAN8", ei_hp_roman8},
>-      {""}, {""}, {""}, {""}, {""}, {""},
>-      {"L5", ei_iso8859_9},
>+      {"R8", ei_hp_roman8},
>+      {""}, {""}, {""}, {""}, {""}, {""}, {""},
>+      {"LATIN8", ei_iso8859_14},
>+      {""}, {""}, {""}, {""},
>+      {"TIS620", ei_tis620},
>+      {""},
>+      {"TIS-620", ei_tis620},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {""}, {""}, {""}, {""}, {""},
>-      {"JIS0208", ei_jisx0208},
>-      {"WINBALTRIM", ei_cp1257},
>       {""}, {""},
>-      {"SHIFT_JIS", ei_sjis},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {"IBM850", ei_cp850},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>+      {"TIS620-0", ei_tis620},
>       {""}, {""}, {""}, {""}, {""},
>-      {"WINDOWS-874", ei_cp874},
>-      {""},
>-      {"HZ", ei_hz},
>-      {""},
>       {"GBK", ei_ces_gbk},
>       {""}, {""}, {""},
>       {"GREEK", ei_iso8859_7},
>       {""},
>-      {"TIS620", ei_tis620},
>-      {"JIS_X0208", ei_jisx0208},
>-      {"TIS-620", ei_tis620},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>+      {"GREEK8", ei_iso8859_7},
>+      {""},
>+      {"CN", ei_iso646_cn},
>+      {"866", ei_cp866},
>       {""}, {""},
>-      {"TIS620-0", ei_tis620},
>-      {"KOI8-R", ei_koi8_r},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {"GEORGIAN-PS", ei_georgian_ps},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {""}, {""}, {""}, {""}, {""}, {""},
>-      {"ISO-IR-58", ei_gb2312},
>+      {"L3", ei_iso8859_3},
>       {""}, {""}, {""},
>-      {"IBM862", ei_cp862},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>       {"KOREAN", ei_ksc5601},
>+      {""},
>+      {"CHINESE", ei_gb2312},
>+      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>+      {"L2", ei_iso8859_2},
>+      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>+      {"VISCII", ei_viscii},
>+      {""}, {""}, {""},
>+      {"ASCII", ei_ascii},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {""}, {""}, {""},
>-      {"MS-ARAB", ei_cp1256},
>       {""},
>-      {"866", ei_cp866},
>-      {""}, {""}, {""}, {""},
>-      {"MS-GREEK", ei_cp1253},
>+      {"IBM850", ei_cp850},
>       {""}, {""}, {""}, {""}, {""},
>-      {"LATIN6", ei_iso8859_10},
>-      {""}, {""}, {""}, {""},
>-      {"HEBREW", ei_iso8859_8},
>+      {"ROMAN8", ei_hp_roman8},
>       {""}, {""}, {""}, {""},
>-      {"ISO-2022-JP", ei_iso2022_jp},
>+      {"ISO8859-8", ei_iso8859_8},
>       {""},
>-      {"L3", ei_iso8859_3},
>+      {"ISO-8859-8", ei_iso8859_8},
>+      {""},
>+      {"LATIN3", ei_iso8859_3},
>       {""}, {""}, {""}, {""},
>-      {"L1", ei_iso8859_1},
>-      {""}, {""}, {""},
>-      {"ISO-IR-57", ei_iso646_cn},
>+      {"IBM862", ei_cp862},
>+      {""},
>+      {"L6", ei_iso8859_10},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>+      {""}, {""},
>+      {"ARMSCII-8", ei_armscii_8},
>       {""},
>+      {"LATIN2", ei_iso8859_2},
>+      {""}, {""},
>+      {"ISO_8859-8", ei_iso8859_8},
>+      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>+      {""}, {""}, {""}, {""}, {""}, {""},
>+      {"MS-ARAB", ei_cp1256},
>+      {""}, {""}, {""}, {""},
>+      {"ISO_8859-8:1988", ei_iso8859_8},
>+      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>+      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>       {"JAVA", ei_java},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {"MS_KANJI", ei_sjis},
>+      {""}, {""}, {""},
>+      {"JIS0208", ei_jisx0208},
>+      {""}, {""}, {""}, {""}, {""},
>+      {"ISO-IR-203", ei_iso8859_15},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>+      {""}, {""}, {""},
>+      {"ISO8859-3", ei_iso8859_3},
>+      {"L5", ei_iso8859_9},
>+      {"ISO-8859-3", ei_iso8859_3},
>+      {""},
>+      {"KOI8-R", ei_koi8_r},
>+      {""}, {""}, {""},
>+      {"ISO_8859-3:1988", ei_iso8859_3},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>+      {""},
>+      {"IBM866", ei_cp866},
>+      {"ISO-IR-58", ei_gb2312},
>+      {""}, {""}, {""},
>+      {"MS_KANJI", ei_sjis},
>+      {""}, {""}, {""}, {""}, {""},
>+      {"ISO8859-2", ei_iso8859_2},
>+      {""},
>+      {"ISO-8859-2", ei_iso8859_2},
>       {""}, {""}, {""}, {""},
>-      {"ISO-2022-JP-2", ei_iso2022_jp2},
>+      {"ISO_8859-3", ei_iso8859_3},
>       {""}, {""}, {""}, {""}, {""}, {""},
>+      {"LATIN6", ei_iso8859_10},
>+      {""}, {""}, {""},
>       {"ISO-IR-6", ei_ascii},
>-      {"LATIN5", ei_iso8859_9},
>-      {""}, {""}, {""}, {""}, {""}, {""},
>-      {"MS-HEBR", ei_cp1255},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>+      {""}, {""},
>+      {"ISO8859-9", ei_iso8859_9},
>+      {""},
>+      {"ISO-8859-9", ei_iso8859_9},
>+      {""},
>+      {"ISO-2022-CN-EXT", ei_iso2022_cn_ext},
>+      {"ISO-2022-CN", ei_iso2022_cn},
>+      {""},
>+      {"ISO_8859-2", ei_iso8859_2},
>+      {"CP850", ei_cp850},
>       {""}, {""}, {""}, {""}, {""},
>-      {"HP-ROMAN8", ei_hp_roman8},
>+      {"HZ", ei_hz},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {"BIG5", ei_ces_big5},
>+      {"EUCCN", ei_euc_cn},
>       {""},
>-      {"BIG-5", ei_ces_big5},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {""}, {""}, {""}, {""},
>-      {"WCHAR_T", ei_local_wchar_t},
>+      {"EUC-CN", ei_euc_cn},
>+      {""},
>+      {"CP862", ei_cp862},
>       {""}, {""},
>-      {"ISO-2022-KR", ei_iso2022_kr},
>+      {"JP", ei_iso646_jp},
>       {""}, {""},
>-      {"ISO-IR-100", ei_iso8859_1},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {"US", ei_ascii},
>-      {""}, {""}, {""}, {""}, {""},
>-      {"CN", ei_iso646_cn},
>-      {"EUCTW", ei_euc_tw},
>+      {"MS-GREEK", ei_cp1253},
>+      {""}, {""},
>+      {"ISO_8859-9", ei_iso8859_9},
>+      {"CP932", ei_cp932},
>+      {"CN-GB", ei_euc_cn},
>       {""},
>-      {"EUC-TW", ei_euc_tw},
>+      {"US", ei_ascii},
>       {""}, {""}, {""},
>-      {"IBM866", ei_cp866},
>+      {"CSVISCII", ei_viscii},
>+      {""}, {""}, {""},
>+      {"CSASCII", ei_ascii},
>+      {"JIS_X0208", ei_jisx0208},
>       {""}, {""},
>-      {"CHINESE", ei_gb2312},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {"JOHAB", ei_johab},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>+      {"NEXTSTEP", ei_nextstep},
>       {""}, {""}, {""}, {""},
>-      {"VISCII", ei_viscii},
>+      {"ISO_8859-9:1989", ei_iso8859_9},
>+      {""}, {""}, {""}, {""}, {""}, {""},
>+      {"MAC", ei_mac_roman},
>+      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>+      {""}, {""}, {""}, {""}, {""},
>+      {"ISO8859-6", ei_iso8859_6},
>       {""},
>-      {"ISO-IR-148", ei_iso8859_9},
>-      {""}, {""}, {""}, {""},
>-      {"UTF-8", ei_utf8},
>-      {""}, {""}, {""}, {""},
>-      {"ISO-IR-226", ei_iso8859_16},
>+      {"ISO-8859-6", ei_iso8859_6},
>       {""}, {""}, {""}, {""},
>-      {"X0212", ei_jisx0212},
>-      {""}, {""}, {""}, {""}, {""},
>-      {"CN-GB", ei_euc_cn},
>+      {"BIGFIVE", ei_ces_big5},
>+      {"CP950", ei_cp950},
>+      {"BIG-FIVE", ei_ces_big5},
>+      {""}, {""}, {""},
>+      {"ARABIC", ei_iso8859_6},
>+      {""}, {""}, {""}, {""}, {""}, {""}, {""},
>+      {"L1", ei_iso8859_1},
>       {""}, {""},
>-      {"UCS-2LE", ei_ucs2le},
>+      {"L4", ei_iso8859_4},
>       {""}, {""}, {""},
>-      {"ISO646-JP", ei_iso646_jp},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>+      {"ISO_8859-5:1988", ei_iso8859_5},
>       {""},
>-      {"UCS-2BE", ei_ucs2be},
>-      {""}, {""}, {""}, {""}, {""},
>-      {"ISO-IR-127", ei_iso8859_6},
>+      {"SHIFT-JIS", ei_sjis},
>+      {""},
>+      {"ASMO-708", ei_iso8859_6},
>+      {""}, {""}, {""}, {""},
>+      {"ISO_8859-6", ei_iso8859_6},
>       {""}, {""}, {""},
>-      {"UCS-4LE", ei_ucs4le},
>-      {"MS-CYRL", ei_cp1251},
>+      {"CSISOLATIN3", ei_iso8859_3},
>+      {"ISO-IR-226", ei_iso8859_16},
>       {""}, {""}, {""}, {""}, {""}, {""},
>-      {"IBM367", ei_ascii},
>-      {""}, {""}, {""},
>-      {"ELOT_928", ei_iso8859_7},
>-      {""}, {""},
>-      {"UCS-4BE", ei_ucs4be},
>-      {""},
>-      {"ASCII", ei_ascii},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {"ARMSCII-8", ei_armscii_8},
>-      {"UTF-7", ei_utf7},
>-      {"EXTENDED_UNIX_CODE_PACKED_FORMAT_FOR_JAPANESE", ei_euc_jp},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {"UCS-2", ei_ucs2},
>-      {""}, {""},
>-      {"ISO-IR-14", ei_iso646_jp},
>-      {""}, {""}, {""}, {""}, {""}, {""},
>-      {"JIS_X0208-1990", ei_jisx0208},
>-      {"EUCJP", ei_euc_jp},
>+      {"IBM819", ei_iso8859_1},
>       {""},
>-      {"EUC-JP", ei_euc_jp},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>+      {"UCS-2BE", ei_ucs2be},
>       {""}, {""}, {""},
>-      {"UCS-2-INTERNAL", ei_ucs2internal},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {"WINDOWS-1258", ei_cp1258},
>-      {""}, {""}, {""}, {""}, {""}, {""},
>-      {"UCS-4", ei_ucs4},
>-      {""},
>-      {"CSISO87JISX0208", ei_jisx0208},
>-      {"WINDOWS-1250", ei_cp1250},
>-      {""}, {""}, {""}, {""}, {""}, {""},
>-      {"UCS-4-INTERNAL", ei_ucs4internal},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""},
>       {"MACROMAN", ei_mac_roman},
>-      {"WINDOWS-1257", ei_cp1257},
>-      {""}, {""}, {""}, {""}, {""},
>-      {"UCS-2-SWAPPED", ei_ucs2swapped},
>-      {""},
>-      {"CP874", ei_cp874},
>       {""}, {""},
>-      {"ISO-2022-JP-1", ei_iso2022_jp1},
>-      {"ISO-8859-8", ei_iso8859_8},
>-      {""}, {""}, {""}, {""},
>-      {"ISO-IR-144", ei_iso8859_5},
>-      {""},
>-      {"ISO-2022-CN-EXT", ei_iso2022_cn_ext},
>-      {"ISO-2022-CN", ei_iso2022_cn},
>-      {""}, {""},
>-      {"CP850", ei_cp850},
>-      {"LATIN3", ei_iso8859_3},
>-      {""}, {""},
>-      {"ISO-IR-157", ei_iso8859_10},
>-      {""}, {""},
>-      {"WINDOWS-1252", ei_cp1252},
>-      {"UCS-4-SWAPPED", ei_ucs4swapped},
>-      {""}, {""},
>-      {"LATIN1", ei_iso8859_1},
>-      {"JIS_X0212", ei_jisx0212},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>+      {"CP866", ei_cp866},
>+      {""}, {""}, {""}, {""}, {""}, {""},
>+      {"SHIFT_JIS", ei_sjis},
>       {""}, {""},
>-      {"ISO_8859-8", ei_iso8859_8},
>+      {"CP936", ei_ces_gbk},
>       {""}, {""},
>       {"CSISOLATIN2", ei_iso8859_2},
>+      {"ISO-IR-100", ei_iso8859_1},
>+      {""}, {""}, {""}, {""}, {""}, {""},
>+      {"ISO-2022-KR", ei_iso2022_kr},
>       {""}, {""}, {""}, {""},
>-      {"WINDOWS-1254", ei_cp1254},
>-      {""}, {""}, {""}, {""}, {""},
>-      {"CHAR", ei_local_char},
>+      {"LATIN5", ei_iso8859_9},
>       {""},
>+      {"TIS620.2533-0", ei_tis620},
>+      {""},
>+      {"EXTENDED_UNIX_CODE_PACKED_FORMAT_FOR_JAPANESE", ei_euc_jp},
>+      {""}, {""}, {""},
>+      {"ISO-IR-138", ei_iso8859_8},
>+      {""}, {""}, {""}, {""},
>+      {"UCS-2", ei_ucs2},
>       {"EUCKR", ei_euc_kr},
>       {""},
>       {"EUC-KR", ei_euc_kr},
>       {""},
>       {"CSKOI8R", ei_koi8_r},
>+      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>+      {""}, {""}, {""}, {""},
>+      {"MACROMANIA", ei_mac_romania},
>+      {"X0212", ei_jisx0212},
>       {""},
>-      {"CSISOLATINGREEK", ei_iso8859_7},
>+      {"L7", ei_iso8859_13},
>+      {""}, {""}, {""}, {""}, {""}, {""},
>+      {"BIG5", ei_ces_big5},
>+      {"CHAR", ei_local_char},
>+      {"BIG-5", ei_ces_big5},
>+      {""}, {""}, {""}, {""}, {""},
>+      {"CSIBM866", ei_cp866},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>       {""}, {""}, {""},
>-      {"ISO-8859-7", ei_iso8859_7},
>-      {""}, {""},
>-      {"TCVN-5712", ei_tcvn},
>-      {""}, {""}, {""}, {""}, {""},
>       {"GB18030", ei_gb18030},
>+      {""}, {""}, {""}, {""},
>+      {"ISO8859-10", ei_iso8859_10},
>       {""},
>-      {"CP862", ei_cp862},
>-      {""}, {""},
>-      {"MS-TURK", ei_cp1254},
>-      {""}, {""}, {""},
>-      {"CSISOLATIN4", ei_iso8859_4},
>-      {""},
>-      {"X0201", ei_jisx0201},
>+      {"ISO-8859-10", ei_iso8859_10},
>+      {""}, {""}, {""}, {""}, {""}, {""},
>+      {"CSISO2022CN", ei_iso2022_cn},
>+      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>       {""}, {""}, {""}, {""}, {""},
>-      {"ISO_8859-8:1988", ei_iso8859_8},
>+      {"CSISOLATINGREEK", ei_iso8859_7},
>       {""}, {""}, {""},
>-      {"ISO-IR-138", ei_iso8859_8},
>-      {""}, {""}, {""}, {""},
>-      {"ISO_8859-7", ei_iso8859_7},
>+      {"ISO8859-5", ei_iso8859_5},
>+      {"CSISOLATIN6", ei_iso8859_10},
>+      {"ISO-8859-5", ei_iso8859_5},
>+      {""}, {""}, {""}, {""}, {""}, {""},
>+      {"ISO_8859-10", ei_iso8859_10},
>+      {"MACGREEK", ei_mac_greek},
>+      {"ISO_8859-4:1988", ei_iso8859_4},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {"MACGREEK", ei_mac_greek},
>-      {"WINDOWS-1256", ei_cp1256},
>+      {"GB_1988-80", ei_iso646_cn},
>+      {""}, {""}, {""},
>+      {"ISO-IR-109", ei_iso8859_3},
>+      {"CSISOLATINARABIC", ei_iso8859_6},
>+      {""}, {""}, {""},
>+      {"ISO_8859-5", ei_iso8859_5},
>+      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>+      {"MS-TURK", ei_cp1254},
>       {""},
>-      {"ISO-IR-110", ei_iso8859_4},
>-      {""}, {""}, {""}, {""},
>-      {"ISO-8859-2", ei_iso8859_2},
>-      {"ECMA-118", ei_iso8859_7},
>+      {"CP819", ei_iso8859_1},
>+      {""}, {""},
>+      {"UCS-2LE", ei_ucs2le},
>+      {"ISO8859-13", ei_iso8859_13},
>       {""},
>-      {"MULELAO-1", ei_mulelao},
>+      {"ISO-8859-13", ei_iso8859_13},
>       {""}, {""},
>-      {"CN-GB-ISOIR165", ei_isoir165},
>+      {"UTF-8", ei_utf8},
>       {""},
>-      {"CSISO2022JP", ei_iso2022_jp},
>-      {"MACHEBREW", ei_mac_hebrew},
>-      {"ISO-IR-126", ei_iso8859_7},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {"MACTHAI", ei_mac_thai},
>+      {"HP-ROMAN8", ei_hp_roman8},
>+      {"US-ASCII", ei_ascii},
>+      {"ISO-2022-JP-2", ei_iso2022_jp2},
>+      {""}, {""}, {""}, {""}, {""}, {""}, {""},
>+      {"ISO_8859-10:1992", ei_iso8859_10},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {""}, {""}, {""},
>-      {"WINDOWS-1255", ei_cp1255},
>-      {""},
>-      {"ISO_8859-2", ei_iso8859_2},
>-      {"ISO_8859-7:1987", ei_iso8859_7},
>       {""},
>-      {"CSISOLATINHEBREW", ei_iso8859_8},
>-      {""},
>-      {"ISO-IR-203", ei_iso8859_15},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {"ISO-8859-4", ei_iso8859_4},
>-      {""}, {""},
>-      {"GEORGIAN-ACADEMY", ei_georgian_academy},
>-      {""}, {""},
>-      {"ISO_8859-4:1988", ei_iso8859_4},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {"ISO_8859-2:1987", ei_iso8859_2},
>+      {"MACICELAND", ei_mac_iceland},
>+      {""}, {""}, {""}, {""}, {""},
>+      {"MACTHAI", ei_mac_thai},
>       {""}, {""},
>-      {"CSISO2022JP2", ei_iso2022_jp2},
>-      {""}, {""}, {""}, {""}, {""}, {""},
>-      {"MACROMANIA", ei_mac_romania},
>+      {"ISO_8859-13", ei_iso8859_13},
>+      {""}, {""}, {""},
>+      {"MACCROATIAN", ei_mac_croatian},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {"ISO_8859-4", ei_iso8859_4},
>-      {""}, {""},
>-      {"ISO646-US", ei_ascii},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {"CSSHIFTJIS", ei_sjis},
>+      {"ISO-IR-199", ei_iso8859_14},
>+      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>+      {"JOHAB", ei_johab},
>       {""}, {""},
>-      {"ISO646-CN", ei_iso646_cn},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {""},
>+      {"ECMA-118", ei_iso8859_7},
>+      {"CSISO58GB231280", ei_gb2312},
>+      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>+      {"ISO_8859-16:2000", ei_iso8859_16},
>+      {""}, {""}, {""},
>       {"GB_2312-80", ei_gb2312},
>       {""},
>       {"GB2312", ei_euc_cn},
>-      {""}, {""},
>-      {"ISO-IR-166", ei_tis620},
>-      {"CSHPROMAN8", ei_hp_roman8},
>+      {"CP949", ei_cp949},
>+      {""}, {""}, {""},
>+      {"CSISO2022KR", ei_iso2022_kr},
>+      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>+      {""}, {""}, {""}, {""},
>+      {"ISO646-CN", ei_iso646_cn},
>+      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>+      {"EUCTW", ei_euc_tw},
>       {""},
>-      {"CSISOLATIN6", ei_iso8859_10},
>+      {"EUC-TW", ei_euc_tw},
>+      {""}, {""}, {""}, {""},
>+      {"CP1258", ei_cp1258},
>       {""},
>-      {"GB_1988-80", ei_iso646_cn},
>+      {"ISO-IR-126", ei_iso8859_7},
>+      {"WINBALTRIM", ei_cp1257},
>       {""}, {""},
>-      {"CSBIG5", ei_ces_big5},
>+      {"ISO_8859-2:1987", ei_iso8859_2},
>+      {"MS-CYRL", ei_cp1251},
>+      {""}, {""}, {""}, {""},
>+      {"JIS_X0208-1990", ei_jisx0208},
>+      {""},
>+      {"UCS-4BE", ei_ucs4be},
>       {""},
>+      {"CSISOLATIN5", ei_iso8859_9},
>+      {""}, {""}, {""},
>+      {"CP1250", ei_cp1250},
>+      {"CSBIG5", ei_ces_big5},
>+      {"X0201", ei_jisx0201},
>       {"CN-BIG5", ei_ces_big5},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>+      {"CN-GB-ISOIR165", ei_isoir165},
>+      {""}, {""},
>+      {"ISO8859-16", ei_iso8859_16},
>+      {"UTF-32BE", ei_utf32be},
>+      {"ISO-8859-16", ei_iso8859_16},
>+      {"ISO-CELTIC", ei_iso8859_14},
>       {""},
>-      {"UTF-32LE", ei_utf32le},
>-      {"ISO_646.IRV:1991", ei_ascii},
>-      {"CSISO2022KR", ei_iso2022_kr},
>-      {""}, {""}, {""}, {""},
>-      {"JIS_X0201", ei_jisx0201},
>+      {"GEORGIAN-PS", ei_georgian_ps},
>       {""},
>-      {"JIS_X0208-1983", ei_jisx0208},
>+      {"ISO-2022-JP", ei_iso2022_jp},
>       {""}, {""}, {""}, {""},
>-      {"ANSI_X3.4-1968", ei_ascii},
>-      {"UTF-32BE", ei_utf32be},
>+      {"ISO_8859-15:1998", ei_iso8859_15},
>+      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>+      {""}, {""}, {""},
>+      {"JIS_X0208-1983", ei_jisx0208},
>+      {"EUCJP", ei_euc_jp},
>       {""},
>-      {"MAC", ei_mac_roman},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {"CP866", ei_cp866},
>-      {""}, {""}, {""}, {""}, {""},
>-      {"EUCCN", ei_euc_cn},
>+      {"EUC-JP", ei_euc_jp},
>       {""},
>-      {"EUC-CN", ei_euc_cn},
>+      {"ISO-IR-166", ei_tis620},
>       {""},
>-      {"ISO_8859-6:1987", ei_iso8859_6},
>-      {""}, {""},
>-      {"MACINTOSH", ei_mac_roman},
>+      {"LATIN1", ei_iso8859_1},
>       {""},
>-      {"ISO_8859-5:1988", ei_iso8859_5},
>-      {""}, {""}, {""}, {""},
>-      {"ECMA-114", ei_iso8859_6},
>-      {"CSIBM866", ei_cp866},
>-      {""}, {""},
>-      {"UNICODELITTLE", ei_ucs2le},
>+      {"ISO_8859-6:1987", ei_iso8859_6},
>       {""}, {""},
>-      {"WINDOWS-1253", ei_cp1253},
>-      {""}, {""}, {""}, {""},
>-      {"WINDOWS-1251", ei_cp1251},
>+      {"ISO_8859-16", ei_iso8859_16},
>+      {"LATIN4", ei_iso8859_4},
>       {""},
>-      {"ISO-IR-165", ei_isoir165},
>+      {"ISO-IR-159", ei_jisx0212},
>       {""},
>+      {"MS-HEBR", ei_cp1255},
>+      {"ISO-IR-148", ei_iso8859_9},
>+      {""}, {""}, {""},
>       {"UTF-32", ei_utf32},
>-      {"CSISOLATIN5", ei_iso8859_9},
>-      {""}, {""}, {""}, {""},
>-      {"CSVISCII", ei_viscii},
>+      {"CSISOLATINCYRILLIC", ei_iso8859_5},
>       {""}, {""}, {""}, {""}, {""}, {""},
>-      {"ISO-8859-6", ei_iso8859_6},
>-      {""}, {""}, {""}, {""},
>-      {"JIS_X0212-1990", ei_jisx0212},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {""}, {""}, {""},
>-      {"JIS_X0212.1990-0", ei_jisx0212},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {"ISO_8859-6", ei_iso8859_6},
>-      {"UTF-16LE", ei_utf16le},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {"CP367", ei_ascii},
>+      {"UNICODELITTLE", ei_ucs2le},
>       {""}, {""}, {""}, {""},
>-      {"UTF-16BE", ei_utf16be},
>-      {"ISO-8859-10", ei_iso8859_10},
>-      {""}, {""}, {""},
>-      {"UNICODEBIG", ei_ucs2be},
>-      {"KOI8-U", ei_koi8_u},
>-      {""}, {""}, {""},
>-      {"CSASCII", ei_ascii},
>-      {"US-ASCII", ei_ascii},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>+      {"ISO-IR-110", ei_iso8859_4},
>       {""}, {""},
>-      {"BIG5HKSCS", ei_big5hkscs},
>+      {"UHC", ei_cp949},
>       {""},
>-      {"BIG5-HKSCS", ei_big5hkscs},
>+      {"MACCENTRALEUROPE", ei_mac_centraleurope},
>+      {""}, {""}, {""}, {""}, {""}, {""}, {""},
>+      {"CP1253", ei_cp1253},
>+      {"TIS620.2533-1", ei_tis620},
>+      {"UCS-2-INTERNAL", ei_ucs2internal},
>+      {""},
>+      {"GEORGIAN-ACADEMY", ei_georgian_academy},
>+      {""}, {""}, {""}, {""}, {""}, {""},
>+      {"ANSI_X3.4-1968", ei_ascii},
>       {""}, {""}, {""},
>-      {"ISO-8859-5", ei_iso8859_5},
>+      {"JIS_X0212", ei_jisx0212},
>       {""}, {""}, {""}, {""}, {""}, {""},
>-      {"ISO_8859-10", ei_iso8859_10},
>-      {"CP1258", ei_cp1258},
>+      {"CSUNICODE", ei_ucs2},
>+      {""}, {""}, {""}, {""}, {""}, {""},
>+      {"KOI8-U", ei_koi8_u},
>+      {"CP1252", ei_cp1252},
>+      {"CSISO2022JP2", ei_iso2022_jp2},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {""}, {""}, {""}, {""},
>-      {"MACICELAND", ei_mac_iceland},
>       {""}, {""}, {""}, {""}, {""},
>-      {"CP1250", ei_cp1250},
>-      {""},
>-      {"ANSI_X3.4-1986", ei_ascii},
>-      {""}, {""}, {""}, {""},
>-      {"ISO_8859-5", ei_iso8859_5},
>-      {""}, {""}, {""}, {""}, {""},
>-      {"ISO_8859-3:1988", ei_iso8859_3},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>+      {"TIS620.2529-1", ei_tis620},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {"KOI8-RU", ei_koi8_ru},
>-      {""}, {""}, {""}, {""}, {""},
>-      {"ISO-IR-101", ei_iso8859_2},
>+      {"ISO8859-1", ei_iso8859_1},
>       {""},
>-      {"ISO_8859-10:1992", ei_iso8859_10},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {"CSISO58GB231280", ei_gb2312},
>-      {"CP1257", ei_cp1257},
>-      {"MACCENTRALEUROPE", ei_mac_centraleurope},
>+      {"ISO-8859-1", ei_iso8859_1},
>       {""},
>-      {"ISO_8859-1:1987", ei_iso8859_1},
>-      {"ISO_8859-14:1998", ei_iso8859_14},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {""}, {""},
>-      {"CSISO2022CN", ei_iso2022_cn},
>+      {"MACUKRAINE", ei_mac_ukraine},
>       {""},
>-      {"CP950", ei_cp950},
>-      {""}, {""}, {""},
>-      {"HZ-GB-2312", ei_hz},
>-      {""}, {""}, {""},
>-      {"ARABIC", ei_iso8859_6},
>-      {""}, {""}, {""}, {""},
>-      {"CSISOLATINARABIC", ei_iso8859_6},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {""}, {""}, {""},
>-      {"UTF-16", ei_utf16},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {"ISO-8859-14", ei_iso8859_14},
>-      {""}, {""}, {""}, {""}, {""},
>-      {"CP1252", ei_cp1252},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>+      {"ISO8859-4", ei_iso8859_4},
>       {""},
>-      {"TIS620.2533-0", ei_tis620},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {"ISO_8859-14", ei_iso8859_14},
>-      {""}, {""}, {""}, {""},
>-      {"ISO_8859-16:2000", ei_iso8859_16},
>-      {""}, {""}, {""},
>-      {"CSHALFWIDTHKATAKANA", ei_jisx0201},
>-      {""}, {""}, {""}, {""},
>-      {"MACUKRAINE", ei_mac_ukraine},
>-      {""}, {""}, {""}, {""}, {""}, {""},
>-      {"CP1254", ei_cp1254},
>-      {"MACCROATIAN", ei_mac_croatian},
>+      {"ISO-8859-4", ei_iso8859_4},
>+      {""},
>+      {"MACARABIC", ei_mac_arabic},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {""}, {""}, {""},
>-      {"ISO_8859-15:1998", ei_iso8859_15},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>+      {""},
>+      {"WCHAR_T", ei_local_wchar_t},
>       {""}, {""}, {""}, {""}, {""}, {""},
>-      {"CSISOLATIN3", ei_iso8859_3},
>-      {""}, {""}, {""}, {""}, {""},
>-      {"JIS_C6220-1969-RO", ei_iso646_jp},
>+      {"ISO_8859-1", ei_iso8859_1},
>+      {""},
>+      {"UCS-4LE", ei_ucs4le},
>       {""}, {""}, {""},
>-      {"CSISOLATIN1", ei_iso8859_1},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {"CSPC862LATINHEBREW", ei_cp862},
>-      {"IBM819", ei_iso8859_1},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {""}, {""}, {""}, {""},
>-      {"ISO-10646-UCS-2", ei_ucs2},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {""}, {""}, {""}, {""}, {""}, {""},
>-      {"ISO-10646-UCS-4", ei_ucs4},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {""}, {""}, {""}, {""}, {""}, {""},
>-      {"ISO-8859-16", ei_iso8859_16},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {"ISO-8859-3", ei_iso8859_3},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {"ISO-8859-1", ei_iso8859_1},
>-      {""}, {""}, {""}, {""}, {""}, {""},
>-      {"ISO_8859-16", ei_iso8859_16},
>+      {"ISO_8859-4", ei_iso8859_4},
>       {""}, {""},
>-      {"TCVN5712-1", ei_tcvn},
>+      {"ISO-2022-JP-1", ei_iso2022_jp1},
>+      {"ISO_8859-14:1998", ei_iso8859_14},
>       {""}, {""}, {""}, {""},
>-      {"ISO-IR-109", ei_iso8859_3},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {"ISO_8859-3", ei_iso8859_3},
>-      {""},
>+      {"ISO8859-15", ei_iso8859_15},
>+      {"UTF-32LE", ei_utf32le},
>+      {"ISO-8859-15", ei_iso8859_15},
>+      {""}, {""}, {""}, {""}, {""}, {""}, {""},
>+      {"CSISO87JISX0208", ei_jisx0208},
>+      {""}, {""},
>       {"CSGB2312", ei_euc_cn},
>-      {"CP1256", ei_cp1256},
>-      {"TIS620.2529-1", ei_tis620},
>+      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>+      {"ISO-IR-149", ei_ksc5601},
>+      {"ANSI_X3.4-1986", ei_ascii},
>       {""}, {""}, {""}, {""}, {""},
>-      {"ISO_8859-1", ei_iso8859_1},
>-      {""}, {""}, {""}, {""},
>-      {"ISO-IR-179", ei_iso8859_13},
>-      {"CP932", ei_cp932},
>-      {""}, {""}, {""}, {""}, {""}, {""},
>-      {"UHC", ei_cp949},
>-      {""}, {""}, {""},
>-      {"ISO-8859-15", ei_iso8859_15},
>-      {""}, {""}, {""},
>-      {"CSEUCTW", ei_euc_tw},
>-      {""}, {""}, {""}, {""}, {""}, {""},
>-      {"ISO-CELTIC", ei_iso8859_14},
>+      {"ISO-IR-165", ei_isoir165},
>+      {""}, {""},
>+      {"CP1256", ei_cp1256},
>       {""}, {""},
>-      {"TCVN5712-1:1993", ei_tcvn},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {""}, {""}, {""}, {""},
>-      {"CSUNICODE", ei_ucs2},
>-      {""}, {""}, {""}, {""}, {""}, {""},
>+      {"ISO646-US", ei_ascii},
>       {"ISO_8859-15", ei_iso8859_15},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {"ISO-IR-149", ei_ksc5601},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {""}, {""}, {""},
>-      {"CP1255", ei_cp1255},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {""}, {""}, {""},
>-      {"CYRILLIC", ei_iso8859_5},
>+      {"CP1133", ei_cp1133},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {""}, {""}, {""}, {""}, {""}, {""},
>-      {"CSISO14JISC6220RO", ei_iso646_jp},
>+      {"LATIN7", ei_iso8859_13},
>+      {""}, {""}, {""}, {""}, {""},
>+      {"ISO-IR-87", ei_jisx0208},
>+      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>+      {"CSISO2022JP", ei_iso2022_jp},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>+      {"IBM367", ei_ascii},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>       {""}, {""}, {""}, {""}, {""},
>-      {"JISX0201-1976", ei_jisx0201},
>-      {""}, {""}, {""}, {""},
>-      {"CSMACINTOSH", ei_mac_roman},
>-      {""}, {""},
>-      {"CSISOLATINCYRILLIC", ei_iso8859_5},
>+      {"BIG5HKSCS", ei_big5hkscs},
>       {""},
>-      {"TIS620.2533-1", ei_tis620},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {"ISO-IR-159", ei_jisx0212},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {"CSISO57GB1988", ei_iso646_cn},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {"CSUCS4", ei_ucs4},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {"CP936", ei_ces_gbk},
>-      {"CSEUCPKDFMTJAPANESE", ei_euc_jp},
>-      {""}, {""}, {""},
>-      {"MACTURKISH", ei_mac_turkish},
>+      {"BIG5-HKSCS", ei_big5hkscs},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>       {""}, {""}, {""}, {""},
>-      {"ISO-8859-9", ei_iso8859_9},
>+      {"ISO_8859-1:1987", ei_iso8859_1},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""},
>+      {""}, {""}, {""}, {""},
>+      {"ISO-IR-179", ei_iso8859_13},
>+      {"JIS_C6220-1969-RO", ei_iso646_jp},
>+      {""}, {""}, {""}, {""},
>+      {"KOI8-RU", ei_koi8_ru},
>+      {""},
>+      {"TCVN-5712", ei_tcvn},
>       {"CSISO159JISX02121990", ei_jisx0212},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {"CSPC850MULTILINGUAL", ei_cp850},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {"ISO_8859-9", ei_iso8859_9},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {"KSC_5601", ei_ksc5601},
>+      {""},
>+      {"CSISOLATIN1", ei_iso8859_1},
>+      {"CSHPROMAN8", ei_hp_roman8},
>       {""}, {""}, {""},
>-      {"CSEUCKR", ei_euc_kr},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>+      {"MULELAO-1", ei_mulelao},
>+      {"CSISOLATIN4", ei_iso8859_4},
>+      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>+      {"ISO8859-7", ei_iso8859_7},
>+      {""},
>+      {"ISO-8859-7", ei_iso8859_7},
>+      {""}, {""}, {""}, {""}, {""}, {""},
>+      {"UNICODEBIG", ei_ucs2be},
>+      {""}, {""}, {""}, {""},
>+      {"JIS_X0201", ei_jisx0201},
>+      {""}, {""},
>+      {"UCS-4", ei_ucs4},
>+      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>+      {"MACINTOSH", ei_mac_roman},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>+      {""},
>+      {"ISO_8859-7", ei_iso8859_7},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {"UNICODE-1-1-UTF-7", ei_utf7},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {"ISO-8859-13", ei_iso8859_13},
>+      {""},
>+      {"CSISOLATINHEBREW", ei_iso8859_8},
>+      {""},
>+      {"CSSHIFTJIS", ei_sjis},
>+      {""},
>+      {"UTF-16BE", ei_utf16be},
>       {""}, {""}, {""},
>-      {"ISO_8859-9:1989", ei_iso8859_9},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {"MACARABIC", ei_mac_arabic},
>+      {"ISO_646.IRV:1991", ei_ascii},
>+      {""},
>+      {"ISO_8859-7:1987", ei_iso8859_7},
>+      {"UCS-4-INTERNAL", ei_ucs4internal},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>+      {"CP1255", ei_cp1255},
>+      {"CYRILLIC", ei_iso8859_5},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>+      {""}, {""}, {""}, {""},
>+      {"WINDOWS-1258", ei_cp1258},
>+      {""},
>+      {"JIS_X0212-1990", ei_jisx0212},
>+      {"ISO646-JP", ei_iso646_jp},
>       {""}, {""},
>-      {"ISO_8859-13", ei_iso8859_13},
>+      {"ISO-IR-14", ei_iso646_jp},
>       {""}, {""}, {""},
>-      {"KS_C_5601-1987", ei_ksc5601},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {"CP1253", ei_cp1253},
>-      {""}, {""},
>-      {"CP819", ei_iso8859_1},
>+      {"WINDOWS-1250", ei_cp1250},
>+      {""},
>+      {"ISO-IR-101", ei_iso8859_2},
>       {""}, {""}, {""}, {""},
>+      {"HEBREW", ei_iso8859_8},
>+      {""}, {""}, {""}, {""}, {""}, {""},
>+      {"CP367", ei_ascii},
>+      {""}, {""}, {""}, {""}, {""}, {""},
>+      {"HZ-GB-2312", ei_hz},
>+      {""}, {""},
>+      {"JIS_X0212.1990-0", ei_jisx0212},
>+      {""},
>+      {"ISO-IR-57", ei_iso646_cn},
>+      {""}, {""},
>+      {"KSC_5601", ei_ksc5601},
>+      {""}, {""},
>+      {"UCS-2-SWAPPED", ei_ucs2swapped},
>+      {""}, {""}, {""}, {""}, {""},
>       {"JIS_C6226-1983", ei_jisx0208},
>       {""},
>-      {"CP1251", ei_cp1251},
>+      {"WINDOWS-1253", ei_cp1253},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>+      {""}, {""}, {""},
>+      {"CSEUCKR", ei_euc_kr},
>+      {""},
>+      {"WINDOWS-1252", ei_cp1252},
>+      {""}, {""}, {""},
>+      {"UTF-16", ei_utf16},
>+      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>+      {"IBM-CP1133", ei_cp1133},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>+      {""},
>+      {"ISO8859-14", ei_iso8859_14},
>+      {""},
>+      {"ISO-8859-14", ei_iso8859_14},
>+      {"JISX0201-1976", ei_jisx0201},
>+      {""}, {""}, {""}, {""}, {""}, {""}, {""},
>+      {"CSPC862LATINHEBREW", ei_cp862},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>+      {""},
>+      {"WINDOWS-1256", ei_cp1256},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>+      {""}, {""},
>+      {"CP874", ei_cp874},
>+      {""}, {""},
>+      {"ISO_8859-14", ei_iso8859_14},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>+      {""}, {""}, {""},
>+      {"UTF-16LE", ei_utf16le},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>+      {""}, {""}, {""}, {""}, {""},
>+      {"KS_C_5601-1989", ei_ksc5601},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {"ISO-IR-199", ei_iso8859_14},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>+      {"CP1361", ei_johab},
>+      {""}, {""}, {""}, {""},
>+      {"CSISO14JISC6220RO", ei_iso646_jp},
>+      {""}, {""}, {""}, {""},
>+      {"WINDOWS-1255", ei_cp1255},
>+      {""}, {""},
>+      {"CSMACINTOSH", ei_mac_roman},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>+      {""},
>+      {"CSEUCPKDFMTJAPANESE", ei_euc_jp},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>+      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>+      {"ECMA-114", ei_iso8859_6},
>+      {"ISO-10646-UCS-2", ei_ucs2},
>+      {""},
>+      {"ISO-IR-127", ei_iso8859_6},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>+      {""}, {""}, {""},
>+      {"TCVN5712-1:1993", ei_tcvn},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>+      {""}, {""},
>+      {"MACCYRILLIC", ei_mac_cyrillic},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>+      {""}, {""}, {""}, {""}, {""},
>+      {"CSEUCTW", ei_euc_tw},
>       {""},
>-      {"VISCII1.1-1", ei_viscii},
>+      {"CP1251", ei_cp1251},
>+      {"CSISO57GB1988", ei_iso646_cn},
>+      {""}, {""}, {""}, {""},
>+      {"CP1254", ei_cp1254},
>+      {""}, {""},
>+      {"MACHEBREW", ei_mac_hebrew},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>+      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>+      {"UCS-4-SWAPPED", ei_ucs4swapped},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>+      {""},
>+      {"WINDOWS-1251", ei_cp1251},
>+      {""}, {""},
>+      {"WINDOWS-1254", ei_cp1254},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {"CP949", ei_cp949},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {""}, {""}, {""}, {""}, {""},
>-      {"MACCYRILLIC", ei_mac_cyrillic},
>+      {"ISO-IR-144", ei_iso8859_5},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>+      {""}, {""},
>+      {"UTF-7", ei_utf7},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {""}, {""}, {""},
>-      {"UNICODE-1-1", ei_ucs2be},
>       {""}, {""}, {""}, {""},
>-      {"CP1361", ei_johab},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>+      {"CSUCS4", ei_ucs4},
>+      {"ISO-IR-157", ei_iso8859_10},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>+      {""}, {""},
>+      {"VISCII1.1-1", ei_viscii},
>+      {""}, {""},
>+      {"WINDOWS-1257", ei_cp1257},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>+      {""}, {""}, {""}, {""}, {""},
>+      {"CP1257", ei_cp1257},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {""}, {""}, {""},
>-      {"CSUNICODE11UTF7", ei_utf7},
>+      {""}, {""},
>+      {"CSPC850MULTILINGUAL", ei_cp850},
>+      {""},
>+      {"KS_C_5601-1987", ei_ksc5601},
>+      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>+      {"UNICODE-1-1", ei_ucs2be},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {"KS_C_5601-1989", ei_ksc5601},
>-      {""}, {""}, {""}, {""}, {""}, {""},
>-      {"CP1133", ei_cp1133},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {""}, {""}, {""},
>-      {"IBM-CP1133", ei_cp1133},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>+      {"WINDOWS-874", ei_cp874},
>+      {"ISO-10646-UCS-4", ei_ucs4},
>+      {""}, {""}, {""}, {""}, {""},
>+      {"TCVN5712-1", ei_tcvn},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>@@ -772,8 +733,12 @@
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>+      {""}, {""}, {""}, {""}, {""},
>+      {"MACTURKISH", ei_mac_turkish},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>+      {""},
>+      {"UNICODE-1-1-UTF-7", ei_utf7},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>@@ -784,11 +749,15 @@
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>+      {""},
>+      {"CSHALFWIDTHKATAKANA", ei_jisx0201},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {""}, {""}, {""}, {""}, {""},
>+      {""}, {""}, {""},
>+      {"CSKSC56011987", ei_ksc5601},
>+      {""}, {""}, {""}, {""},
>       {"CSUNICODE11", ei_ucs2be},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>@@ -801,13 +770,8 @@
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
>       {""}, {""},
>-      {"CSKSC56011987", ei_ksc5601}
>+      {"CSUNICODE11UTF7", ei_utf7}
>     };
> 
>   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)

Actions: View

Attachments on bug 37497: 21381