diff -urN libiconv-1.11.old/lib/aliases_dos.h libiconv-1.11.new/lib/aliases_dos.h
--- libiconv-1.11.old/lib/aliases_dos.h	2005-05-19 19:08:39.000000000 +0200
+++ libiconv-1.11.new/lib/aliases_dos.h	2007-11-11 14:38:31.000000000 +0100
@@ -2,47 +2,3 @@
   S(dos_1, "IBM437", ei_cp437 )
   S(dos_2, "437", ei_cp437 )
   S(dos_3, "CSPC8CODEPAGE437", ei_cp437 )
-  S(dos_4, "CP737", ei_cp737 )
-  S(dos_5, "CP775", ei_cp775 )
-  S(dos_6, "IBM775", ei_cp775 )
-  S(dos_7, "CSPC775BALTIC", ei_cp775 )
-  S(dos_8, "CP852", ei_cp852 )
-  S(dos_9, "IBM852", ei_cp852 )
-  S(dos_10, "852", ei_cp852 )
-  S(dos_11, "CSPCP852", ei_cp852 )
-  S(dos_12, "CP853", ei_cp853 )
-  S(dos_13, "CP855", ei_cp855 )
-  S(dos_14, "IBM855", ei_cp855 )
-  S(dos_15, "855", ei_cp855 )
-  S(dos_16, "CSIBM855", ei_cp855 )
-  S(dos_17, "CP857", ei_cp857 )
-  S(dos_18, "IBM857", ei_cp857 )
-  S(dos_19, "857", ei_cp857 )
-  S(dos_20, "CSIBM857", ei_cp857 )
-  S(dos_21, "CP858", ei_cp858 )
-  S(dos_22, "CP860", ei_cp860 )
-  S(dos_23, "IBM860", ei_cp860 )
-  S(dos_24, "860", ei_cp860 )
-  S(dos_25, "CSIBM860", ei_cp860 )
-  S(dos_26, "CP861", ei_cp861 )
-  S(dos_27, "IBM861", ei_cp861 )
-  S(dos_28, "861", ei_cp861 )
-  S(dos_29, "CP-IS", ei_cp861 )
-  S(dos_30, "CSIBM861", ei_cp861 )
-  S(dos_31, "CP863", ei_cp863 )
-  S(dos_32, "IBM863", ei_cp863 )
-  S(dos_33, "863", ei_cp863 )
-  S(dos_34, "CSIBM863", ei_cp863 )
-  S(dos_35, "CP864", ei_cp864 )
-  S(dos_36, "IBM864", ei_cp864 )
-  S(dos_37, "CSIBM864", ei_cp864 )
-  S(dos_38, "CP865", ei_cp865 )
-  S(dos_39, "IBM865", ei_cp865 )
-  S(dos_40, "865", ei_cp865 )
-  S(dos_41, "CSIBM865", ei_cp865 )
-  S(dos_42, "CP869", ei_cp869 )
-  S(dos_43, "IBM869", ei_cp869 )
-  S(dos_44, "869", ei_cp869 )
-  S(dos_45, "CP-GR", ei_cp869 )
-  S(dos_46, "CSIBM869", ei_cp869 )
-  S(dos_47, "CP1125", ei_cp1125 )
diff -urN libiconv-1.11.old/lib/aliases.gperf libiconv-1.11.new/lib/aliases.gperf
--- libiconv-1.11.old/lib/aliases.gperf	2006-05-18 14:45:17.000000000 +0200
+++ libiconv-1.11.new/lib/aliases.gperf	2007-11-11 14:38:02.000000000 +0100
@@ -48,8 +48,6 @@
 UCS-2-SWAPPED, ei_ucs2swapped
 UCS-4-INTERNAL, ei_ucs4internal
 UCS-4-SWAPPED, ei_ucs4swapped
-C99, ei_c99
-JAVA, ei_java
 ISO-8859-1, ei_iso8859_1
 ISO_8859-1, ei_iso8859_1
 ISO_8859-1:1987, ei_iso8859_1
@@ -68,285 +66,16 @@
 L2, ei_iso8859_2
 CSISOLATIN2, ei_iso8859_2
 ISO8859-2, ei_iso8859_2
-ISO-8859-3, ei_iso8859_3
-ISO_8859-3, ei_iso8859_3
-ISO_8859-3:1988, ei_iso8859_3
-ISO-IR-109, ei_iso8859_3
-LATIN3, ei_iso8859_3
-L3, ei_iso8859_3
-CSISOLATIN3, ei_iso8859_3
-ISO8859-3, ei_iso8859_3
-ISO-8859-4, ei_iso8859_4
-ISO_8859-4, ei_iso8859_4
-ISO_8859-4:1988, ei_iso8859_4
-ISO-IR-110, ei_iso8859_4
-LATIN4, ei_iso8859_4
-L4, ei_iso8859_4
-CSISOLATIN4, ei_iso8859_4
-ISO8859-4, ei_iso8859_4
-ISO-8859-5, ei_iso8859_5
-ISO_8859-5, ei_iso8859_5
-ISO_8859-5:1988, ei_iso8859_5
-ISO-IR-144, ei_iso8859_5
-CYRILLIC, ei_iso8859_5
-CSISOLATINCYRILLIC, ei_iso8859_5
-ISO8859-5, ei_iso8859_5
-ISO-8859-6, ei_iso8859_6
-ISO_8859-6, ei_iso8859_6
-ISO_8859-6:1987, ei_iso8859_6
-ISO-IR-127, ei_iso8859_6
-ECMA-114, ei_iso8859_6
-ASMO-708, ei_iso8859_6
-ARABIC, ei_iso8859_6
-CSISOLATINARABIC, ei_iso8859_6
-ISO8859-6, ei_iso8859_6
-ISO-8859-7, ei_iso8859_7
-ISO_8859-7, ei_iso8859_7
-ISO_8859-7:1987, ei_iso8859_7
-ISO_8859-7:2003, ei_iso8859_7
-ISO-IR-126, ei_iso8859_7
-ECMA-118, ei_iso8859_7
-ELOT_928, ei_iso8859_7
-GREEK8, ei_iso8859_7
-GREEK, ei_iso8859_7
-CSISOLATINGREEK, ei_iso8859_7
-ISO8859-7, ei_iso8859_7
-ISO-8859-8, ei_iso8859_8
-ISO_8859-8, ei_iso8859_8
-ISO_8859-8:1988, ei_iso8859_8
-ISO-IR-138, ei_iso8859_8
-HEBREW, ei_iso8859_8
-CSISOLATINHEBREW, ei_iso8859_8
-ISO8859-8, ei_iso8859_8
-ISO-8859-9, ei_iso8859_9
-ISO_8859-9, ei_iso8859_9
-ISO_8859-9:1989, ei_iso8859_9
-ISO-IR-148, ei_iso8859_9
-LATIN5, ei_iso8859_9
-L5, ei_iso8859_9
-CSISOLATIN5, ei_iso8859_9
-ISO8859-9, ei_iso8859_9
-ISO-8859-10, ei_iso8859_10
-ISO_8859-10, ei_iso8859_10
-ISO_8859-10:1992, ei_iso8859_10
-ISO-IR-157, ei_iso8859_10
-LATIN6, ei_iso8859_10
-L6, ei_iso8859_10
-CSISOLATIN6, ei_iso8859_10
-ISO8859-10, ei_iso8859_10
-ISO-8859-11, ei_iso8859_11
-ISO_8859-11, ei_iso8859_11
-ISO8859-11, ei_iso8859_11
-ISO-8859-13, ei_iso8859_13
-ISO_8859-13, ei_iso8859_13
-ISO-IR-179, ei_iso8859_13
-LATIN7, ei_iso8859_13
-L7, ei_iso8859_13
-ISO8859-13, ei_iso8859_13
-ISO-8859-14, ei_iso8859_14
-ISO_8859-14, ei_iso8859_14
-ISO_8859-14:1998, ei_iso8859_14
-ISO-IR-199, ei_iso8859_14
-LATIN8, ei_iso8859_14
-L8, ei_iso8859_14
-ISO-CELTIC, ei_iso8859_14
-ISO8859-14, ei_iso8859_14
 ISO-8859-15, ei_iso8859_15
 ISO_8859-15, ei_iso8859_15
 ISO_8859-15:1998, ei_iso8859_15
 ISO-IR-203, ei_iso8859_15
 LATIN-9, ei_iso8859_15
 ISO8859-15, ei_iso8859_15
-ISO-8859-16, ei_iso8859_16
-ISO_8859-16, ei_iso8859_16
-ISO_8859-16:2001, ei_iso8859_16
-ISO-IR-226, ei_iso8859_16
-LATIN10, ei_iso8859_16
-L10, ei_iso8859_16
-ISO8859-16, ei_iso8859_16
 KOI8-R, ei_koi8_r
 CSKOI8R, ei_koi8_r
-KOI8-U, ei_koi8_u
-KOI8-RU, ei_koi8_ru
 CP1250, ei_cp1250
 WINDOWS-1250, ei_cp1250
 MS-EE, ei_cp1250
-CP1251, ei_cp1251
-WINDOWS-1251, ei_cp1251
-MS-CYRL, ei_cp1251
-CP1252, ei_cp1252
-WINDOWS-1252, ei_cp1252
-MS-ANSI, ei_cp1252
-CP1253, ei_cp1253
-WINDOWS-1253, ei_cp1253
-MS-GREEK, ei_cp1253
-CP1254, ei_cp1254
-WINDOWS-1254, ei_cp1254
-MS-TURK, ei_cp1254
-CP1255, ei_cp1255
-WINDOWS-1255, ei_cp1255
-MS-HEBR, ei_cp1255
-CP1256, ei_cp1256
-WINDOWS-1256, ei_cp1256
-MS-ARAB, ei_cp1256
-CP1257, ei_cp1257
-WINDOWS-1257, ei_cp1257
-WINBALTRIM, ei_cp1257
-CP1258, ei_cp1258
-WINDOWS-1258, ei_cp1258
-CP850, ei_cp850
-IBM850, ei_cp850
-850, ei_cp850
-CSPC850MULTILINGUAL, ei_cp850
-CP862, ei_cp862
-IBM862, ei_cp862
-862, ei_cp862
-CSPC862LATINHEBREW, ei_cp862
-CP866, ei_cp866
-IBM866, ei_cp866
-866, ei_cp866
-CSIBM866, ei_cp866
-MACROMAN, ei_mac_roman
-MACINTOSH, ei_mac_roman
-MAC, ei_mac_roman
-CSMACINTOSH, ei_mac_roman
-MACCENTRALEUROPE, ei_mac_centraleurope
-MACICELAND, ei_mac_iceland
-MACCROATIAN, ei_mac_croatian
-MACROMANIA, ei_mac_romania
-MACCYRILLIC, ei_mac_cyrillic
-MACUKRAINE, ei_mac_ukraine
-MACGREEK, ei_mac_greek
-MACTURKISH, ei_mac_turkish
-MACHEBREW, ei_mac_hebrew
-MACARABIC, ei_mac_arabic
-MACTHAI, ei_mac_thai
-HP-ROMAN8, ei_hp_roman8
-ROMAN8, ei_hp_roman8
-R8, ei_hp_roman8
-CSHPROMAN8, ei_hp_roman8
-NEXTSTEP, ei_nextstep
-ARMSCII-8, ei_armscii_8
-GEORGIAN-ACADEMY, ei_georgian_academy
-GEORGIAN-PS, ei_georgian_ps
-KOI8-T, ei_koi8_t
-PT154, ei_pt154
-PTCP154, ei_pt154
-CP154, ei_pt154
-CYRILLIC-ASIAN, ei_pt154
-CSPTCP154, ei_pt154
-MULELAO-1, ei_mulelao
-CP1133, ei_cp1133
-IBM-CP1133, ei_cp1133
-TIS-620, ei_tis620
-TIS620, ei_tis620
-TIS620-0, ei_tis620
-TIS620.2529-1, ei_tis620
-TIS620.2533-0, ei_tis620
-TIS620.2533-1, ei_tis620
-ISO-IR-166, ei_tis620
-CP874, ei_cp874
-WINDOWS-874, ei_cp874
-VISCII, ei_viscii
-VISCII1.1-1, ei_viscii
-CSVISCII, ei_viscii
-TCVN, ei_tcvn
-TCVN-5712, ei_tcvn
-TCVN5712-1, ei_tcvn
-TCVN5712-1:1993, ei_tcvn
-JIS_C6220-1969-RO, ei_iso646_jp
-ISO646-JP, ei_iso646_jp
-ISO-IR-14, ei_iso646_jp
-JP, ei_iso646_jp
-CSISO14JISC6220RO, ei_iso646_jp
-JIS_X0201, ei_jisx0201
-JISX0201-1976, ei_jisx0201
-X0201, ei_jisx0201
-CSHALFWIDTHKATAKANA, ei_jisx0201
-JIS_X0208, ei_jisx0208
-JIS_X0208-1983, ei_jisx0208
-JIS_X0208-1990, ei_jisx0208
-JIS0208, ei_jisx0208
-X0208, ei_jisx0208
-ISO-IR-87, ei_jisx0208
-JIS_C6226-1983, ei_jisx0208
-CSISO87JISX0208, ei_jisx0208
-JIS_X0212, ei_jisx0212
-JIS_X0212.1990-0, ei_jisx0212
-JIS_X0212-1990, ei_jisx0212
-X0212, ei_jisx0212
-ISO-IR-159, ei_jisx0212
-CSISO159JISX02121990, ei_jisx0212
-GB_1988-80, ei_iso646_cn
-ISO646-CN, ei_iso646_cn
-ISO-IR-57, ei_iso646_cn
-CN, ei_iso646_cn
-CSISO57GB1988, ei_iso646_cn
-GB_2312-80, ei_gb2312
-ISO-IR-58, ei_gb2312
-CSISO58GB231280, ei_gb2312
-CHINESE, ei_gb2312
-ISO-IR-165, ei_isoir165
-CN-GB-ISOIR165, ei_isoir165
-KSC_5601, ei_ksc5601
-KS_C_5601-1987, ei_ksc5601
-KS_C_5601-1989, ei_ksc5601
-ISO-IR-149, ei_ksc5601
-CSKSC56011987, ei_ksc5601
-KOREAN, ei_ksc5601
-EUC-JP, ei_euc_jp
-EUCJP, ei_euc_jp
-EXTENDED_UNIX_CODE_PACKED_FORMAT_FOR_JAPANESE, ei_euc_jp
-CSEUCPKDFMTJAPANESE, ei_euc_jp
-SHIFT_JIS, ei_sjis
-SHIFT-JIS, ei_sjis
-SJIS, ei_sjis
-MS_KANJI, ei_sjis
-CSSHIFTJIS, ei_sjis
-CP932, ei_cp932
-ISO-2022-JP, ei_iso2022_jp
-CSISO2022JP, ei_iso2022_jp
-ISO-2022-JP-1, ei_iso2022_jp1
-ISO-2022-JP-2, ei_iso2022_jp2
-CSISO2022JP2, ei_iso2022_jp2
-EUC-CN, ei_euc_cn
-EUCCN, ei_euc_cn
-GB2312, ei_euc_cn
-CN-GB, ei_euc_cn
-CSGB2312, ei_euc_cn
-GBK, ei_ces_gbk
-CP936, ei_cp936
-MS936, ei_cp936
-WINDOWS-936, ei_cp936
-GB18030, ei_gb18030
-ISO-2022-CN, ei_iso2022_cn
-CSISO2022CN, ei_iso2022_cn
-ISO-2022-CN-EXT, ei_iso2022_cn_ext
-HZ, ei_hz
-HZ-GB-2312, ei_hz
-EUC-TW, ei_euc_tw
-EUCTW, ei_euc_tw
-CSEUCTW, ei_euc_tw
-BIG5, ei_ces_big5
-BIG-5, ei_ces_big5
-BIG-FIVE, ei_ces_big5
-BIGFIVE, ei_ces_big5
-CN-BIG5, ei_ces_big5
-CSBIG5, ei_ces_big5
-CP950, ei_cp950
-BIG5-HKSCS:1999, ei_big5hkscs1999
-BIG5-HKSCS:2001, ei_big5hkscs2001
-BIG5-HKSCS, ei_big5hkscs2004
-BIG5HKSCS, ei_big5hkscs2004
-BIG5-HKSCS:2004, ei_big5hkscs2004
-EUC-KR, ei_euc_kr
-EUCKR, ei_euc_kr
-CSEUCKR, ei_euc_kr
-CP949, ei_cp949
-UHC, ei_cp949
-JOHAB, ei_johab
-CP1361, ei_johab
-ISO-2022-KR, ei_iso2022_kr
-CSISO2022KR, ei_iso2022_kr
 CHAR, ei_local_char
 WCHAR_T, ei_local_wchar_t
diff -urN libiconv-1.11.old/lib/aliases.h libiconv-1.11.new/lib/aliases.h
--- libiconv-1.11.old/lib/aliases.h	2006-05-18 14:45:18.000000000 +0200
+++ libiconv-1.11.new/lib/aliases.h	2007-11-11 14:39:47.000000000 +0100
@@ -1,6 +1,6 @@
 /* ANSI-C code produced by gperf version 3.0.2 */
 /* Command-line: gperf -m 10 lib/aliases.gperf  */
-/* Computed positions: -k'1,3-11,$' */
+/* Computed positions: -k'4-7,10,$' */
 
 #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
       && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
@@ -32,12 +32,12 @@
 #line 1 "lib/aliases.gperf"
 struct alias { int name; unsigned int encoding_index; };
 
-#define TOTAL_KEYWORDS 341
+#define TOTAL_KEYWORDS 70
 #define MIN_WORD_LENGTH 2
-#define MAX_WORD_LENGTH 45
-#define MIN_HASH_VALUE 13
-#define MAX_HASH_VALUE 997
-/* maximum key range = 985, duplicates = 0 */
+#define MAX_WORD_LENGTH 17
+#define MIN_HASH_VALUE 4
+#define MAX_HASH_VALUE 98
+/* maximum key range = 95, duplicates = 0 */
 
 #ifdef __GNUC__
 __inline
@@ -49,38 +49,31 @@
 static unsigned int
 aliases_hash (register const char *str, register unsigned int len)
 {
-  static const unsigned short asso_values[] =
+  static const unsigned char asso_values[] =
     {
-      998, 998, 998, 998, 998, 998, 998, 998, 998, 998,
-      998, 998, 998, 998, 998, 998, 998, 998, 998, 998,
-      998, 998, 998, 998, 998, 998, 998, 998, 998, 998,
-      998, 998, 998, 998, 998, 998, 998, 998, 998, 998,
-      998, 998, 998, 998, 998,   4, 199, 998,  79,   6,
-       29,  65,  13,  15,   4,  88,  20,  22, 386, 998,
-      998, 998, 998, 998, 998,  47, 188, 110,   6,  26,
-       63,  19,  12,   5, 281, 202,   7, 166,  11,   5,
-       64, 998,   4,  11,  20, 185, 110, 152, 163,   4,
-        4, 998, 998, 998, 998,   5, 998, 998, 998, 998,
-      998, 998, 998, 998, 998, 998, 998, 998, 998, 998,
-      998, 998, 998, 998, 998, 998, 998, 998, 998, 998,
-      998, 998, 998, 998, 998, 998, 998, 998
+      99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
+      99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
+      99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
+      99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
+      99, 99, 99, 99, 99,  6, 99, 99, 22,  3,
+       2,  2, 17,  3,  2,  7,  3,  2, 99, 99,
+      99, 99, 99, 99, 99,  4, 53,  2, 21,  2,
+      99,  7, 99, 15, 99, 99, 19, 99, 33,  2,
+       4, 99, 11, 26, 17, 99, 99,  3, 26, 99,
+      99, 99, 99, 99, 99, 10, 99, 99, 99, 99,
+      99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
+      99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
+      99, 99, 99, 99, 99, 99, 99, 99
     };
   register int hval = len;
 
   switch (hval)
     {
       default:
-        hval += asso_values[(unsigned char)str[10]];
-      /*FALLTHROUGH*/
-      case 10:
         hval += asso_values[(unsigned char)str[9]];
       /*FALLTHROUGH*/
       case 9:
-        hval += asso_values[(unsigned char)str[8]];
-      /*FALLTHROUGH*/
       case 8:
-        hval += asso_values[(unsigned char)str[7]];
-      /*FALLTHROUGH*/
       case 7:
         hval += asso_values[(unsigned char)str[6]];
       /*FALLTHROUGH*/
@@ -94,11 +87,7 @@
         hval += asso_values[(unsigned char)str[3]];
       /*FALLTHROUGH*/
       case 3:
-        hval += asso_values[(unsigned char)str[2]];
-      /*FALLTHROUGH*/
       case 2:
-      case 1:
-        hval += asso_values[(unsigned char)str[0]];
         break;
     }
   return hval + asso_values[(unsigned char)str[len - 1]];
@@ -106,1576 +95,306 @@
 
 struct stringpool_t
   {
-    char stringpool_str13[sizeof("L6")];
-    char stringpool_str15[sizeof("L1")];
-    char stringpool_str18[sizeof("HZ")];
-    char stringpool_str22[sizeof("L4")];
-    char stringpool_str24[sizeof("L5")];
-    char stringpool_str26[sizeof("R8")];
-    char stringpool_str29[sizeof("L8")];
-    char stringpool_str31[sizeof("866")];
-    char stringpool_str38[sizeof("L2")];
-    char stringpool_str42[sizeof("SJIS")];
-    char stringpool_str43[sizeof("ISO-IR-6")];
-    char stringpool_str55[sizeof("ISO-IR-166")];
-    char stringpool_str57[sizeof("LATIN6")];
-    char stringpool_str61[sizeof("LATIN1")];
-    char stringpool_str68[sizeof("ISO-IR-14")];
-    char stringpool_str74[sizeof("L3")];
-    char stringpool_str75[sizeof("LATIN4")];
-    char stringpool_str77[sizeof("ISO-IR-165")];
-    char stringpool_str79[sizeof("LATIN5")];
-    char stringpool_str80[sizeof("ISO-IR-126")];
-    char stringpool_str81[sizeof("862")];
-    char stringpool_str82[sizeof("ISO-IR-144")];
-    char stringpool_str89[sizeof("LATIN8")];
-    char stringpool_str91[sizeof("ISO-IR-58")];
-    char stringpool_str96[sizeof("ISO-IR-148")];
-    char stringpool_str97[sizeof("L7")];
-    char stringpool_str98[sizeof("LATIN-9")];
-    char stringpool_str100[sizeof("ISO-IR-149")];
-    char stringpool_str102[sizeof("ISO-IR-159")];
-    char stringpool_str103[sizeof("ISO-IR-226")];
-    char stringpool_str107[sizeof("LATIN2")];
-    char stringpool_str108[sizeof("ISO8859-6")];
-    char stringpool_str109[sizeof("ISO-IR-199")];
-    char stringpool_str112[sizeof("ISO8859-1")];
-    char stringpool_str113[sizeof("ISO-8859-6")];
-    char stringpool_str114[sizeof("ISO_8859-6")];
-    char stringpool_str115[sizeof("ISO8859-16")];
-    char stringpool_str116[sizeof("PT154")];
-    char stringpool_str117[sizeof("ISO-8859-1")];
-    char stringpool_str118[sizeof("ISO_8859-1")];
-    char stringpool_str119[sizeof("ISO8859-11")];
-    char stringpool_str120[sizeof("ISO-8859-16")];
-    char stringpool_str121[sizeof("ISO_8859-16")];
-    char stringpool_str123[sizeof("CN")];
-    char stringpool_str124[sizeof("ISO-8859-11")];
-    char stringpool_str125[sizeof("ISO_8859-11")];
-    char stringpool_str126[sizeof("ISO8859-4")];
-    char stringpool_str128[sizeof("ISO_8859-16:2001")];
-    char stringpool_str130[sizeof("ISO8859-5")];
-    char stringpool_str131[sizeof("ISO-8859-4")];
-    char stringpool_str132[sizeof("ISO_8859-4")];
-    char stringpool_str133[sizeof("ISO8859-14")];
-    char stringpool_str134[sizeof("ISO-IR-101")];
-    char stringpool_str135[sizeof("ISO-8859-5")];
-    char stringpool_str136[sizeof("ISO_8859-5")];
-    char stringpool_str137[sizeof("ISO8859-15")];
-    char stringpool_str138[sizeof("ISO-8859-14")];
-    char stringpool_str139[sizeof("ISO_8859-14")];
-    char stringpool_str140[sizeof("ISO8859-8")];
-    char stringpool_str142[sizeof("ISO-8859-15")];
-    char stringpool_str143[sizeof("ISO_8859-15")];
-    char stringpool_str144[sizeof("ISO8859-9")];
-    char stringpool_str145[sizeof("ISO-8859-8")];
-    char stringpool_str146[sizeof("ISO_8859-8")];
-    char stringpool_str147[sizeof("CP866")];
-    char stringpool_str148[sizeof("ISO-IR-138")];
-    char stringpool_str149[sizeof("ISO-8859-9")];
-    char stringpool_str150[sizeof("ISO_8859-9")];
-    char stringpool_str151[sizeof("ISO_8859-14:1998")];
-    char stringpool_str153[sizeof("ISO_8859-15:1998")];
-    char stringpool_str155[sizeof("ELOT_928")];
-    char stringpool_str156[sizeof("TCVN")];
-    char stringpool_str157[sizeof("C99")];
-    char stringpool_str158[sizeof("ISO8859-2")];
-    char stringpool_str162[sizeof("CP154")];
-    char stringpool_str163[sizeof("ISO-8859-2")];
-    char stringpool_str164[sizeof("ISO_8859-2")];
-    char stringpool_str166[sizeof("ISO-IR-109")];
-    char stringpool_str168[sizeof("L10")];
-    char stringpool_str169[sizeof("CHAR")];
-    char stringpool_str174[sizeof("CP1256")];
-    char stringpool_str175[sizeof("ISO-IR-179")];
-    char stringpool_str176[sizeof("ISO646-CN")];
-    char stringpool_str177[sizeof("ASCII")];
-    char stringpool_str178[sizeof("CP1251")];
-    char stringpool_str179[sizeof("LATIN3")];
-    char stringpool_str181[sizeof("850")];
-    char stringpool_str183[sizeof("GB2312")];
-    char stringpool_str185[sizeof("CP819")];
-    char stringpool_str192[sizeof("CP1254")];
-    char stringpool_str194[sizeof("CP949")];
-    char stringpool_str196[sizeof("CP1255")];
-    char stringpool_str197[sizeof("CP862")];
-    char stringpool_str198[sizeof("US")];
-    char stringpool_str203[sizeof("CP1361")];
-    char stringpool_str206[sizeof("CP1258")];
-    char stringpool_str207[sizeof("ISO-IR-110")];
-    char stringpool_str209[sizeof("IBM866")];
-    char stringpool_str210[sizeof("CP936")];
-    char stringpool_str211[sizeof("GEORGIAN-PS")];
-    char stringpool_str214[sizeof("LATIN10")];
-    char stringpool_str222[sizeof("CHINESE")];
-    char stringpool_str224[sizeof("CP1252")];
-    char stringpool_str225[sizeof("LATIN7")];
-    char stringpool_str226[sizeof("ISO_8859-10:1992")];
-    char stringpool_str227[sizeof("ISO-IR-57")];
-    char stringpool_str228[sizeof("TIS620")];
-    char stringpool_str230[sizeof("ISO8859-3")];
-    char stringpool_str231[sizeof("UCS-4")];
-    char stringpool_str232[sizeof("ISO-IR-87")];
-    char stringpool_str233[sizeof("TIS-620")];
-    char stringpool_str234[sizeof("ISO-IR-157")];
-    char stringpool_str235[sizeof("ISO-8859-3")];
-    char stringpool_str236[sizeof("ISO_8859-3")];
-    char stringpool_str237[sizeof("ISO8859-13")];
-    char stringpool_str240[sizeof("CSISOLATIN6")];
-    char stringpool_str241[sizeof("BIG5")];
-    char stringpool_str242[sizeof("ISO-8859-13")];
-    char stringpool_str243[sizeof("ISO_8859-13")];
-    char stringpool_str244[sizeof("CSISOLATIN1")];
-    char stringpool_str245[sizeof("KOI8-R")];
-    char stringpool_str246[sizeof("BIG-5")];
-    char stringpool_str247[sizeof("IBM819")];
-    char stringpool_str248[sizeof("ISO-IR-127")];
-    char stringpool_str249[sizeof("CP874")];
-    char stringpool_str251[sizeof("ISO646-US")];
-    char stringpool_str252[sizeof("VISCII")];
-    char stringpool_str253[sizeof("MS-EE")];
-    char stringpool_str256[sizeof("MS-ANSI")];
-    char stringpool_str258[sizeof("CSISOLATIN4")];
-    char stringpool_str259[sizeof("IBM862")];
-    char stringpool_str260[sizeof("CP932")];
-    char stringpool_str261[sizeof("X0212")];
-    char stringpool_str262[sizeof("CSISOLATIN5")];
-    char stringpool_str263[sizeof("UCS-2")];
-    char stringpool_str265[sizeof("ISO8859-10")];
-    char stringpool_str266[sizeof("MS936")];
-    char stringpool_str267[sizeof("WCHAR_T")];
-    char stringpool_str270[sizeof("ISO-8859-10")];
-    char stringpool_str271[sizeof("ISO_8859-10")];
-    char stringpool_str272[sizeof("UTF-16")];
-    char stringpool_str273[sizeof("EUCCN")];
-    char stringpool_str274[sizeof("ROMAN8")];
-    char stringpool_str275[sizeof("ISO-IR-203")];
-    char stringpool_str276[sizeof("ISO8859-7")];
-    char stringpool_str277[sizeof("KOI8-T")];
-    char stringpool_str278[sizeof("EUC-CN")];
-    char stringpool_str279[sizeof("UCS-4LE")];
-    char stringpool_str280[sizeof("ISO-IR-100")];
-    char stringpool_str281[sizeof("ISO-8859-7")];
-    char stringpool_str282[sizeof("ISO_8859-7")];
-    char stringpool_str283[sizeof("MULELAO-1")];
-    char stringpool_str284[sizeof("GB_1988-80")];
-    char stringpool_str288[sizeof("X0201")];
-    char stringpool_str289[sizeof("ECMA-114")];
-    char stringpool_str290[sizeof("CSISOLATIN2")];
-    char stringpool_str291[sizeof("GEORGIAN-ACADEMY")];
-    char stringpool_str292[sizeof("PTCP154")];
-    char stringpool_str295[sizeof("UCS-2LE")];
-    char stringpool_str296[sizeof("CP1253")];
-    char stringpool_str297[sizeof("UTF-8")];
-    char stringpool_str298[sizeof("HP-ROMAN8")];
-    char stringpool_str300[sizeof("CSASCII")];
-    char stringpool_str303[sizeof("ECMA-118")];
-    char stringpool_str304[sizeof("UCS-4-INTERNAL")];
-    char stringpool_str305[sizeof("TCVN5712-1")];
-    char stringpool_str307[sizeof("KOREAN")];
-    char stringpool_str308[sizeof("CP850")];
-    char stringpool_str309[sizeof("MS-CYRL")];
-    char stringpool_str310[sizeof("CP950")];
-    char stringpool_str313[sizeof("TIS620-0")];
-    char stringpool_str316[sizeof("X0208")];
-    char stringpool_str319[sizeof("GREEK8")];
-    char stringpool_str320[sizeof("UCS-2-INTERNAL")];
-    char stringpool_str321[sizeof("TCVN-5712")];
-    char stringpool_str323[sizeof("CP1133")];
-    char stringpool_str324[sizeof("CP1250")];
-    char stringpool_str327[sizeof("ISO-2022-CN")];
-    char stringpool_str329[sizeof("UTF-16LE")];
-    char stringpool_str335[sizeof("CYRILLIC-ASIAN")];
-    char stringpool_str337[sizeof("ISO-10646-UCS-4")];
-    char stringpool_str340[sizeof("ISO-2022-CN-EXT")];
-    char stringpool_str342[sizeof("CP1257")];
-    char stringpool_str345[sizeof("GB_2312-80")];
-    char stringpool_str347[sizeof("JP")];
-    char stringpool_str351[sizeof("EUCKR")];
-    char stringpool_str353[sizeof("ISO-10646-UCS-2")];
-    char stringpool_str354[sizeof("GB18030")];
-    char stringpool_str356[sizeof("EUC-KR")];
-    char stringpool_str357[sizeof("CSKOI8R")];
-    char stringpool_str358[sizeof("CSBIG5")];
-    char stringpool_str360[sizeof("CP367")];
-    char stringpool_str361[sizeof("MACINTOSH")];
-    char stringpool_str362[sizeof("CSISOLATIN3")];
-    char stringpool_str363[sizeof("CN-BIG5")];
-    char stringpool_str366[sizeof("CYRILLIC")];
-    char stringpool_str369[sizeof("CSVISCII")];
-    char stringpool_str370[sizeof("IBM850")];
-    char stringpool_str372[sizeof("MACTHAI")];
-    char stringpool_str374[sizeof("UNICODE-1-1")];
-    char stringpool_str376[sizeof("ISO_646.IRV:1991")];
-    char stringpool_str380[sizeof("US-ASCII")];
-    char stringpool_str381[sizeof("UTF-32")];
-    char stringpool_str384[sizeof("CN-GB-ISOIR165")];
-    char stringpool_str387[sizeof("NEXTSTEP")];
-    char stringpool_str389[sizeof("MAC")];
-    char stringpool_str393[sizeof("EXTENDED_UNIX_CODE_PACKED_FORMAT_FOR_JAPANESE")];
-    char stringpool_str394[sizeof("CSISOLATINARABIC")];
-    char stringpool_str395[sizeof("HZ-GB-2312")];
-    char stringpool_str397[sizeof("ARMSCII-8")];
-    char stringpool_str401[sizeof("CSISOLATINHEBREW")];
-    char stringpool_str405[sizeof("ISO-2022-KR")];
-    char stringpool_str407[sizeof("WINDOWS-1256")];
-    char stringpool_str408[sizeof("UHC")];
-    char stringpool_str409[sizeof("WINDOWS-1251")];
-    char stringpool_str411[sizeof("MS-HEBR")];
-    char stringpool_str412[sizeof("ISO-CELTIC")];
-    char stringpool_str413[sizeof("UTF-32LE")];
-    char stringpool_str416[sizeof("WINDOWS-1254")];
-    char stringpool_str418[sizeof("WINDOWS-1255")];
-    char stringpool_str420[sizeof("SHIFT-JIS")];
-    char stringpool_str421[sizeof("SHIFT_JIS")];
-    char stringpool_str422[sizeof("IBM367")];
-    char stringpool_str423[sizeof("WINDOWS-1258")];
-    char stringpool_str424[sizeof("CSPTCP154")];
-    char stringpool_str426[sizeof("GBK")];
-    char stringpool_str428[sizeof("UNICODELITTLE")];
-    char stringpool_str432[sizeof("WINDOWS-1252")];
-    char stringpool_str433[sizeof("UTF-7")];
-    char stringpool_str435[sizeof("KSC_5601")];
-    char stringpool_str437[sizeof("ASMO-708")];
-    char stringpool_str440[sizeof("CSISO2022CN")];
-    char stringpool_str444[sizeof("BIGFIVE")];
-    char stringpool_str447[sizeof("WINDOWS-936")];
-    char stringpool_str448[sizeof("CSUCS4")];
-    char stringpool_str449[sizeof("BIG-FIVE")];
-    char stringpool_str453[sizeof("ISO646-JP")];
-    char stringpool_str456[sizeof("TIS620.2529-1")];
-    char stringpool_str457[sizeof("CSISOLATINGREEK")];
-    char stringpool_str459[sizeof("CSISOLATINCYRILLIC")];
-    char stringpool_str460[sizeof("UCS-4BE")];
-    char stringpool_str462[sizeof("UNICODE-1-1-UTF-7")];
-    char stringpool_str465[sizeof("EUCTW")];
-    char stringpool_str468[sizeof("WINDOWS-1253")];
-    char stringpool_str469[sizeof("CSHPROMAN8")];
-    char stringpool_str470[sizeof("EUC-TW")];
-    char stringpool_str472[sizeof("KS_C_5601-1989")];
-    char stringpool_str476[sizeof("UCS-2BE")];
-    char stringpool_str479[sizeof("VISCII1.1-1")];
-    char stringpool_str480[sizeof("GREEK")];
-    char stringpool_str482[sizeof("WINDOWS-1250")];
-    char stringpool_str483[sizeof("CSGB2312")];
-    char stringpool_str486[sizeof("WINDOWS-874")];
-    char stringpool_str487[sizeof("CSUNICODE11")];
-    char stringpool_str489[sizeof("JAVA")];
-    char stringpool_str491[sizeof("WINDOWS-1257")];
-    char stringpool_str493[sizeof("CSUNICODE")];
-    char stringpool_str500[sizeof("CSHALFWIDTHKATAKANA")];
-    char stringpool_str502[sizeof("CSISO57GB1988")];
-    char stringpool_str504[sizeof("MACICELAND")];
-    char stringpool_str509[sizeof("CSIBM866")];
-    char stringpool_str510[sizeof("UTF-16BE")];
-    char stringpool_str513[sizeof("ARABIC")];
-    char stringpool_str514[sizeof("CN-GB")];
-    char stringpool_str518[sizeof("CSISO2022KR")];
-    char stringpool_str520[sizeof("CSMACINTOSH")];
-    char stringpool_str526[sizeof("JIS0208")];
-    char stringpool_str528[sizeof("MACROMAN")];
-    char stringpool_str530[sizeof("ISO_8859-4:1988")];
-    char stringpool_str532[sizeof("ISO_8859-5:1988")];
-    char stringpool_str535[sizeof("TIS620.2533-1")];
-    char stringpool_str536[sizeof("ANSI_X3.4-1986")];
-    char stringpool_str537[sizeof("ISO_8859-8:1988")];
-    char stringpool_str538[sizeof("KS_C_5601-1987")];
-    char stringpool_str539[sizeof("CSSHIFTJIS")];
-    char stringpool_str540[sizeof("HEBREW")];
-    char stringpool_str541[sizeof("ISO_8859-9:1989")];
-    char stringpool_str547[sizeof("MACCROATIAN")];
-    char stringpool_str548[sizeof("ISO-2022-JP-1")];
-    char stringpool_str550[sizeof("EUCJP")];
-    char stringpool_str552[sizeof("ANSI_X3.4-1968")];
-    char stringpool_str555[sizeof("EUC-JP")];
-    char stringpool_str561[sizeof("CSISO58GB231280")];
-    char stringpool_str562[sizeof("JIS_C6226-1983")];
-    char stringpool_str566[sizeof("IBM-CP1133")];
-    char stringpool_str569[sizeof("MACCENTRALEUROPE")];
-    char stringpool_str570[sizeof("CSISO159JISX02121990")];
-    char stringpool_str571[sizeof("ISO-2022-JP-2")];
-    char stringpool_str573[sizeof("CSUNICODE11UTF7")];
-    char stringpool_str574[sizeof("UCS-4-SWAPPED")];
-    char stringpool_str578[sizeof("UNICODEBIG")];
-    char stringpool_str579[sizeof("CSISO14JISC6220RO")];
-    char stringpool_str580[sizeof("JIS_C6220-1969-RO")];
-    char stringpool_str582[sizeof("ISO_8859-3:1988")];
-    char stringpool_str586[sizeof("CSPC862LATINHEBREW")];
-    char stringpool_str588[sizeof("BIG5HKSCS")];
-    char stringpool_str589[sizeof("ISO_8859-6:1987")];
-    char stringpool_str590[sizeof("UCS-2-SWAPPED")];
-    char stringpool_str591[sizeof("ISO_8859-1:1987")];
-    char stringpool_str593[sizeof("BIG5-HKSCS")];
-    char stringpool_str594[sizeof("UTF-32BE")];
-    char stringpool_str604[sizeof("ISO-2022-JP")];
-    char stringpool_str607[sizeof("KOI8-U")];
-    char stringpool_str608[sizeof("TIS620.2533-0")];
-    char stringpool_str612[sizeof("KOI8-RU")];
-    char stringpool_str614[sizeof("ISO_8859-2:1987")];
-    char stringpool_str618[sizeof("MACROMANIA")];
-    char stringpool_str641[sizeof("JIS_X0212")];
-    char stringpool_str648[sizeof("CSEUCKR")];
-    char stringpool_str649[sizeof("MACCYRILLIC")];
-    char stringpool_str650[sizeof("ISO_8859-7:2003")];
-    char stringpool_str651[sizeof("MS-ARAB")];
-    char stringpool_str657[sizeof("MS-GREEK")];
-    char stringpool_str666[sizeof("CSKSC56011987")];
-    char stringpool_str668[sizeof("JIS_X0201")];
-    char stringpool_str673[sizeof("ISO_8859-7:1987")];
-    char stringpool_str683[sizeof("CSISO2022JP2")];
-    char stringpool_str696[sizeof("JIS_X0208")];
-    char stringpool_str697[sizeof("JISX0201-1976")];
-    char stringpool_str706[sizeof("JIS_X0212-1990")];
-    char stringpool_str717[sizeof("CSISO2022JP")];
-    char stringpool_str721[sizeof("JOHAB")];
-    char stringpool_str730[sizeof("MS_KANJI")];
-    char stringpool_str734[sizeof("CSISO87JISX0208")];
-    char stringpool_str737[sizeof("MACTURKISH")];
-    char stringpool_str755[sizeof("TCVN5712-1:1993")];
-    char stringpool_str756[sizeof("JIS_X0208-1983")];
-    char stringpool_str762[sizeof("CSEUCTW")];
-    char stringpool_str763[sizeof("MACGREEK")];
-    char stringpool_str770[sizeof("JIS_X0208-1990")];
-    char stringpool_str776[sizeof("WINBALTRIM")];
-    char stringpool_str790[sizeof("MS-TURK")];
-    char stringpool_str792[sizeof("MACUKRAINE")];
-    char stringpool_str796[sizeof("MACARABIC")];
-    char stringpool_str802[sizeof("CSPC850MULTILINGUAL")];
-    char stringpool_str845[sizeof("MACHEBREW")];
-    char stringpool_str903[sizeof("JIS_X0212.1990-0")];
-    char stringpool_str979[sizeof("BIG5-HKSCS:2001")];
-    char stringpool_str986[sizeof("BIG5-HKSCS:2004")];
-    char stringpool_str995[sizeof("BIG5-HKSCS:1999")];
-    char stringpool_str997[sizeof("CSEUCPKDFMTJAPANESE")];
+    char stringpool_str4[sizeof("L2")];
+    char stringpool_str5[sizeof("L1")];
+    char stringpool_str11[sizeof("MS-EE")];
+    char stringpool_str12[sizeof("CP819")];
+    char stringpool_str15[sizeof("UCS-2")];
+    char stringpool_str16[sizeof("IBM819")];
+    char stringpool_str17[sizeof("UTF-8")];
+    char stringpool_str18[sizeof("UTF-32")];
+    char stringpool_str19[sizeof("UTF-16")];
+    char stringpool_str21[sizeof("CP367")];
+    char stringpool_str22[sizeof("ISO8859-2")];
+    char stringpool_str23[sizeof("ISO8859-1")];
+    char stringpool_str24[sizeof("IBM367")];
+    char stringpool_str25[sizeof("UTF-7")];
+    char stringpool_str26[sizeof("CHAR")];
+    char stringpool_str27[sizeof("ISO8859-15")];
+    char stringpool_str28[sizeof("US")];
+    char stringpool_str29[sizeof("ISO-8859-2")];
+    char stringpool_str31[sizeof("ISO-8859-1")];
+    char stringpool_str32[sizeof("ISO-8859-15")];
+    char stringpool_str33[sizeof("ISO_8859-2")];
+    char stringpool_str35[sizeof("ISO_8859-1")];
+    char stringpool_str36[sizeof("ISO_8859-15")];
+    char stringpool_str37[sizeof("KOI8-R")];
+    char stringpool_str38[sizeof("UCS-2LE")];
+    char stringpool_str39[sizeof("UTF-32LE")];
+    char stringpool_str40[sizeof("UTF-16LE")];
+    char stringpool_str41[sizeof("ISO_8859-15:1998")];
+    char stringpool_str43[sizeof("ISO_8859-2:1987")];
+    char stringpool_str44[sizeof("ISO_8859-1:1987")];
+    char stringpool_str45[sizeof("UCS-4")];
+    char stringpool_str47[sizeof("UNICODE-1-1")];
+    char stringpool_str48[sizeof("ISO-IR-6")];
+    char stringpool_str49[sizeof("CSKOI8R")];
+    char stringpool_str50[sizeof("ASCII")];
+    char stringpool_str51[sizeof("UNICODEBIG")];
+    char stringpool_str52[sizeof("ISO-IR-203")];
+    char stringpool_str53[sizeof("UCS-4LE")];
+    char stringpool_str54[sizeof("ISO-IR-101")];
+    char stringpool_str55[sizeof("CP1250")];
+    char stringpool_str56[sizeof("ISO-10646-UCS-2")];
+    char stringpool_str57[sizeof("UNICODE-1-1-UTF-7")];
+    char stringpool_str58[sizeof("LATIN2")];
+    char stringpool_str59[sizeof("UNICODELITTLE")];
+    char stringpool_str60[sizeof("LATIN1")];
+    char stringpool_str61[sizeof("ISO_646.IRV:1991")];
+    char stringpool_str62[sizeof("ISO646-US")];
+    char stringpool_str63[sizeof("CSUNICODE")];
+    char stringpool_str64[sizeof("UCS-2-INTERNAL")];
+    char stringpool_str65[sizeof("LATIN-9")];
+    char stringpool_str66[sizeof("WCHAR_T")];
+    char stringpool_str68[sizeof("CSUCS4")];
+    char stringpool_str69[sizeof("CSUNICODE11")];
+    char stringpool_str70[sizeof("US-ASCII")];
+    char stringpool_str71[sizeof("ISO-10646-UCS-4")];
+    char stringpool_str72[sizeof("UCS-2BE")];
+    char stringpool_str73[sizeof("UTF-32BE")];
+    char stringpool_str74[sizeof("UTF-16BE")];
+    char stringpool_str75[sizeof("ANSI_X3.4-1986")];
+    char stringpool_str76[sizeof("ANSI_X3.4-1968")];
+    char stringpool_str77[sizeof("CSUNICODE11UTF7")];
+    char stringpool_str78[sizeof("UCS-2-SWAPPED")];
+    char stringpool_str79[sizeof("UCS-4-INTERNAL")];
+    char stringpool_str80[sizeof("CSASCII")];
+    char stringpool_str87[sizeof("UCS-4BE")];
+    char stringpool_str88[sizeof("WINDOWS-1250")];
+    char stringpool_str92[sizeof("ISO-IR-100")];
+    char stringpool_str93[sizeof("UCS-4-SWAPPED")];
+    char stringpool_str97[sizeof("CSISOLATIN2")];
+    char stringpool_str98[sizeof("CSISOLATIN1")];
   };
 static const struct stringpool_t stringpool_contents =
   {
-    "L6",
-    "L1",
-    "HZ",
-    "L4",
-    "L5",
-    "R8",
-    "L8",
-    "866",
     "L2",
-    "SJIS",
-    "ISO-IR-6",
-    "ISO-IR-166",
-    "LATIN6",
-    "LATIN1",
-    "ISO-IR-14",
-    "L3",
-    "LATIN4",
-    "ISO-IR-165",
-    "LATIN5",
-    "ISO-IR-126",
-    "862",
-    "ISO-IR-144",
-    "LATIN8",
-    "ISO-IR-58",
-    "ISO-IR-148",
-    "L7",
-    "LATIN-9",
-    "ISO-IR-149",
-    "ISO-IR-159",
-    "ISO-IR-226",
-    "LATIN2",
-    "ISO8859-6",
-    "ISO-IR-199",
+    "L1",
+    "MS-EE",
+    "CP819",
+    "UCS-2",
+    "IBM819",
+    "UTF-8",
+    "UTF-32",
+    "UTF-16",
+    "CP367",
+    "ISO8859-2",
     "ISO8859-1",
-    "ISO-8859-6",
-    "ISO_8859-6",
-    "ISO8859-16",
-    "PT154",
-    "ISO-8859-1",
-    "ISO_8859-1",
-    "ISO8859-11",
-    "ISO-8859-16",
-    "ISO_8859-16",
-    "CN",
-    "ISO-8859-11",
-    "ISO_8859-11",
-    "ISO8859-4",
-    "ISO_8859-16:2001",
-    "ISO8859-5",
-    "ISO-8859-4",
-    "ISO_8859-4",
-    "ISO8859-14",
-    "ISO-IR-101",
-    "ISO-8859-5",
-    "ISO_8859-5",
+    "IBM367",
+    "UTF-7",
+    "CHAR",
     "ISO8859-15",
-    "ISO-8859-14",
-    "ISO_8859-14",
-    "ISO8859-8",
+    "US",
+    "ISO-8859-2",
+    "ISO-8859-1",
     "ISO-8859-15",
+    "ISO_8859-2",
+    "ISO_8859-1",
     "ISO_8859-15",
-    "ISO8859-9",
-    "ISO-8859-8",
-    "ISO_8859-8",
-    "CP866",
-    "ISO-IR-138",
-    "ISO-8859-9",
-    "ISO_8859-9",
-    "ISO_8859-14:1998",
+    "KOI8-R",
+    "UCS-2LE",
+    "UTF-32LE",
+    "UTF-16LE",
     "ISO_8859-15:1998",
-    "ELOT_928",
-    "TCVN",
-    "C99",
-    "ISO8859-2",
-    "CP154",
-    "ISO-8859-2",
-    "ISO_8859-2",
-    "ISO-IR-109",
-    "L10",
-    "CHAR",
-    "CP1256",
-    "ISO-IR-179",
-    "ISO646-CN",
-    "ASCII",
-    "CP1251",
-    "LATIN3",
-    "850",
-    "GB2312",
-    "CP819",
-    "CP1254",
-    "CP949",
-    "CP1255",
-    "CP862",
-    "US",
-    "CP1361",
-    "CP1258",
-    "ISO-IR-110",
-    "IBM866",
-    "CP936",
-    "GEORGIAN-PS",
-    "LATIN10",
-    "CHINESE",
-    "CP1252",
-    "LATIN7",
-    "ISO_8859-10:1992",
-    "ISO-IR-57",
-    "TIS620",
-    "ISO8859-3",
+    "ISO_8859-2:1987",
+    "ISO_8859-1:1987",
     "UCS-4",
-    "ISO-IR-87",
-    "TIS-620",
-    "ISO-IR-157",
-    "ISO-8859-3",
-    "ISO_8859-3",
-    "ISO8859-13",
-    "CSISOLATIN6",
-    "BIG5",
-    "ISO-8859-13",
-    "ISO_8859-13",
-    "CSISOLATIN1",
-    "KOI8-R",
-    "BIG-5",
-    "IBM819",
-    "ISO-IR-127",
-    "CP874",
-    "ISO646-US",
-    "VISCII",
-    "MS-EE",
-    "MS-ANSI",
-    "CSISOLATIN4",
-    "IBM862",
-    "CP932",
-    "X0212",
-    "CSISOLATIN5",
-    "UCS-2",
-    "ISO8859-10",
-    "MS936",
-    "WCHAR_T",
-    "ISO-8859-10",
-    "ISO_8859-10",
-    "UTF-16",
-    "EUCCN",
-    "ROMAN8",
+    "UNICODE-1-1",
+    "ISO-IR-6",
+    "CSKOI8R",
+    "ASCII",
+    "UNICODEBIG",
     "ISO-IR-203",
-    "ISO8859-7",
-    "KOI8-T",
-    "EUC-CN",
     "UCS-4LE",
-    "ISO-IR-100",
-    "ISO-8859-7",
-    "ISO_8859-7",
-    "MULELAO-1",
-    "GB_1988-80",
-    "X0201",
-    "ECMA-114",
-    "CSISOLATIN2",
-    "GEORGIAN-ACADEMY",
-    "PTCP154",
-    "UCS-2LE",
-    "CP1253",
-    "UTF-8",
-    "HP-ROMAN8",
-    "CSASCII",
-    "ECMA-118",
-    "UCS-4-INTERNAL",
-    "TCVN5712-1",
-    "KOREAN",
-    "CP850",
-    "MS-CYRL",
-    "CP950",
-    "TIS620-0",
-    "X0208",
-    "GREEK8",
-    "UCS-2-INTERNAL",
-    "TCVN-5712",
-    "CP1133",
+    "ISO-IR-101",
     "CP1250",
-    "ISO-2022-CN",
-    "UTF-16LE",
-    "CYRILLIC-ASIAN",
-    "ISO-10646-UCS-4",
-    "ISO-2022-CN-EXT",
-    "CP1257",
-    "GB_2312-80",
-    "JP",
-    "EUCKR",
     "ISO-10646-UCS-2",
-    "GB18030",
-    "EUC-KR",
-    "CSKOI8R",
-    "CSBIG5",
-    "CP367",
-    "MACINTOSH",
-    "CSISOLATIN3",
-    "CN-BIG5",
-    "CYRILLIC",
-    "CSVISCII",
-    "IBM850",
-    "MACTHAI",
-    "UNICODE-1-1",
-    "ISO_646.IRV:1991",
-    "US-ASCII",
-    "UTF-32",
-    "CN-GB-ISOIR165",
-    "NEXTSTEP",
-    "MAC",
-    "EXTENDED_UNIX_CODE_PACKED_FORMAT_FOR_JAPANESE",
-    "CSISOLATINARABIC",
-    "HZ-GB-2312",
-    "ARMSCII-8",
-    "CSISOLATINHEBREW",
-    "ISO-2022-KR",
-    "WINDOWS-1256",
-    "UHC",
-    "WINDOWS-1251",
-    "MS-HEBR",
-    "ISO-CELTIC",
-    "UTF-32LE",
-    "WINDOWS-1254",
-    "WINDOWS-1255",
-    "SHIFT-JIS",
-    "SHIFT_JIS",
-    "IBM367",
-    "WINDOWS-1258",
-    "CSPTCP154",
-    "GBK",
+    "UNICODE-1-1-UTF-7",
+    "LATIN2",
     "UNICODELITTLE",
-    "WINDOWS-1252",
-    "UTF-7",
-    "KSC_5601",
-    "ASMO-708",
-    "CSISO2022CN",
-    "BIGFIVE",
-    "WINDOWS-936",
+    "LATIN1",
+    "ISO_646.IRV:1991",
+    "ISO646-US",
+    "CSUNICODE",
+    "UCS-2-INTERNAL",
+    "LATIN-9",
+    "WCHAR_T",
     "CSUCS4",
-    "BIG-FIVE",
-    "ISO646-JP",
-    "TIS620.2529-1",
-    "CSISOLATINGREEK",
-    "CSISOLATINCYRILLIC",
-    "UCS-4BE",
-    "UNICODE-1-1-UTF-7",
-    "EUCTW",
-    "WINDOWS-1253",
-    "CSHPROMAN8",
-    "EUC-TW",
-    "KS_C_5601-1989",
-    "UCS-2BE",
-    "VISCII1.1-1",
-    "GREEK",
-    "WINDOWS-1250",
-    "CSGB2312",
-    "WINDOWS-874",
     "CSUNICODE11",
-    "JAVA",
-    "WINDOWS-1257",
-    "CSUNICODE",
-    "CSHALFWIDTHKATAKANA",
-    "CSISO57GB1988",
-    "MACICELAND",
-    "CSIBM866",
+    "US-ASCII",
+    "ISO-10646-UCS-4",
+    "UCS-2BE",
+    "UTF-32BE",
     "UTF-16BE",
-    "ARABIC",
-    "CN-GB",
-    "CSISO2022KR",
-    "CSMACINTOSH",
-    "JIS0208",
-    "MACROMAN",
-    "ISO_8859-4:1988",
-    "ISO_8859-5:1988",
-    "TIS620.2533-1",
     "ANSI_X3.4-1986",
-    "ISO_8859-8:1988",
-    "KS_C_5601-1987",
-    "CSSHIFTJIS",
-    "HEBREW",
-    "ISO_8859-9:1989",
-    "MACCROATIAN",
-    "ISO-2022-JP-1",
-    "EUCJP",
     "ANSI_X3.4-1968",
-    "EUC-JP",
-    "CSISO58GB231280",
-    "JIS_C6226-1983",
-    "IBM-CP1133",
-    "MACCENTRALEUROPE",
-    "CSISO159JISX02121990",
-    "ISO-2022-JP-2",
     "CSUNICODE11UTF7",
-    "UCS-4-SWAPPED",
-    "UNICODEBIG",
-    "CSISO14JISC6220RO",
-    "JIS_C6220-1969-RO",
-    "ISO_8859-3:1988",
-    "CSPC862LATINHEBREW",
-    "BIG5HKSCS",
-    "ISO_8859-6:1987",
     "UCS-2-SWAPPED",
-    "ISO_8859-1:1987",
-    "BIG5-HKSCS",
-    "UTF-32BE",
-    "ISO-2022-JP",
-    "KOI8-U",
-    "TIS620.2533-0",
-    "KOI8-RU",
-    "ISO_8859-2:1987",
-    "MACROMANIA",
-    "JIS_X0212",
-    "CSEUCKR",
-    "MACCYRILLIC",
-    "ISO_8859-7:2003",
-    "MS-ARAB",
-    "MS-GREEK",
-    "CSKSC56011987",
-    "JIS_X0201",
-    "ISO_8859-7:1987",
-    "CSISO2022JP2",
-    "JIS_X0208",
-    "JISX0201-1976",
-    "JIS_X0212-1990",
-    "CSISO2022JP",
-    "JOHAB",
-    "MS_KANJI",
-    "CSISO87JISX0208",
-    "MACTURKISH",
-    "TCVN5712-1:1993",
-    "JIS_X0208-1983",
-    "CSEUCTW",
-    "MACGREEK",
-    "JIS_X0208-1990",
-    "WINBALTRIM",
-    "MS-TURK",
-    "MACUKRAINE",
-    "MACARABIC",
-    "CSPC850MULTILINGUAL",
-    "MACHEBREW",
-    "JIS_X0212.1990-0",
-    "BIG5-HKSCS:2001",
-    "BIG5-HKSCS:2004",
-    "BIG5-HKSCS:1999",
-    "CSEUCPKDFMTJAPANESE"
+    "UCS-4-INTERNAL",
+    "CSASCII",
+    "UCS-4BE",
+    "WINDOWS-1250",
+    "ISO-IR-100",
+    "UCS-4-SWAPPED",
+    "CSISOLATIN2",
+    "CSISOLATIN1"
   };
 #define stringpool ((const char *) &stringpool_contents)
 
 static const struct alias aliases[] =
   {
-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
     {-1}, {-1}, {-1}, {-1},
-#line 134 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str13, ei_iso8859_10},
-    {-1},
-#line 60 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str15, ei_iso8859_1},
-    {-1}, {-1},
-#line 325 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str18, ei_hz},
-    {-1}, {-1}, {-1},
-#line 84 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str22, ei_iso8859_4},
-    {-1},
-#line 126 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str24, ei_iso8859_9},
-    {-1},
-#line 226 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str26, ei_hp_roman8},
-    {-1}, {-1},
-#line 151 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str29, ei_iso8859_14},
-    {-1},
-#line 207 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str31, ei_cp866},
-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#line 68 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str38, ei_iso8859_2},
-    {-1}, {-1}, {-1},
-#line 303 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str42, ei_sjis},
-#line 16 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str43, ei_ascii},
-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-    {-1}, {-1},
-#line 247 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str55, ei_tis620},
-    {-1},
-#line 133 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str57, ei_iso8859_10},
-    {-1}, {-1}, {-1},
-#line 59 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str61, ei_iso8859_1},
-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#line 259 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str68, ei_iso646_jp},
+#line 66 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str4, ei_iso8859_2},
+#line 58 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str5, ei_iso8859_1},
     {-1}, {-1}, {-1}, {-1}, {-1},
-#line 76 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str74, ei_iso8859_3},
-#line 83 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str75, ei_iso8859_4},
-    {-1},
-#line 289 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str77, ei_isoir165},
-    {-1},
-#line 125 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str79, ei_iso8859_9},
-#line 107 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str80, ei_iso8859_7},
-#line 203 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str81, ei_cp862},
-#line 90 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str82, ei_iso8859_5},
-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#line 150 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str89, ei_iso8859_14},
-    {-1},
-#line 286 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str91, ei_gb2312},
-    {-1}, {-1}, {-1}, {-1},
-#line 124 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str96, ei_iso8859_9},
-#line 144 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str97, ei_iso8859_13},
-#line 158 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str98, ei_iso8859_15},
-    {-1},
-#line 294 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str100, ei_ksc5601},
-    {-1},
-#line 278 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str102, ei_jisx0212},
-#line 163 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str103, ei_iso8859_16},
-    {-1}, {-1}, {-1},
-#line 67 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str107, ei_iso8859_2},
-#line 102 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str108, ei_iso8859_6},
-#line 149 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str109, ei_iso8859_14},
+#line 79 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str11, ei_cp1250},
+#line 55 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str12, ei_iso8859_1},
     {-1}, {-1},
-#line 62 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str112, ei_iso8859_1},
-#line 94 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str113, ei_iso8859_6},
-#line 95 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str114, ei_iso8859_6},
-#line 166 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str115, ei_iso8859_16},
-#line 233 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str116, ei_pt154},
-#line 53 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str117, ei_iso8859_1},
-#line 54 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str118, ei_iso8859_1},
-#line 139 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str119, ei_iso8859_11},
-#line 160 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str120, ei_iso8859_16},
-#line 161 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str121, ei_iso8859_16},
-    {-1},
-#line 283 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str123, ei_iso646_cn},
-#line 137 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str124, ei_iso8859_11},
-#line 138 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str125, ei_iso8859_11},
-#line 86 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str126, ei_iso8859_4},
-    {-1},
-#line 162 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str128, ei_iso8859_16},
+#line 24 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str15, ei_ucs2},
+#line 56 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str16, ei_iso8859_1},
+#line 23 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str17, ei_utf8},
+#line 41 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str18, ei_utf32},
+#line 38 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str19, ei_utf16},
     {-1},
-#line 93 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str130, ei_iso8859_5},
-#line 79 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str131, ei_iso8859_4},
+#line 19 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str21, ei_ascii},
+#line 68 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str22, ei_iso8859_2},
+#line 60 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str23, ei_iso8859_1},
+#line 20 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str24, ei_ascii},
+#line 44 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str25, ei_utf7},
 #line 80 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str132, ei_iso8859_4},
-#line 153 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str133, ei_iso8859_14},
-#line 66 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str134, ei_iso8859_2},
-#line 87 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str135, ei_iso8859_5},
-#line 88 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str136, ei_iso8859_5},
-#line 159 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str137, ei_iso8859_15},
-#line 146 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str138, ei_iso8859_14},
-#line 147 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str139, ei_iso8859_14},
-#line 120 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str140, ei_iso8859_8},
-    {-1},
-#line 154 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str142, ei_iso8859_15},
-#line 155 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str143, ei_iso8859_15},
-#line 128 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str144, ei_iso8859_9},
-#line 114 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str145, ei_iso8859_8},
-#line 115 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str146, ei_iso8859_8},
-#line 205 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str147, ei_cp866},
-#line 117 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str148, ei_iso8859_8},
-#line 121 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str149, ei_iso8859_9},
-#line 122 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str150, ei_iso8859_9},
-#line 148 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str151, ei_iso8859_14},
-    {-1},
-#line 156 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str153, ei_iso8859_15},
-    {-1},
-#line 109 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str155, ei_iso8859_7},
-#line 253 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str156, ei_tcvn},
-#line 51 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str157, ei_c99},
-#line 70 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str158, ei_iso8859_2},
-    {-1}, {-1}, {-1},
-#line 235 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str162, ei_pt154},
-#line 63 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str163, ei_iso8859_2},
-#line 64 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str164, ei_iso8859_2},
-    {-1},
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str26, ei_local_char},
 #line 74 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str166, ei_iso8859_3},
-    {-1},
-#line 165 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str168, ei_iso8859_16},
-#line 351 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str169, ei_local_char},
-    {-1}, {-1}, {-1}, {-1},
-#line 189 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str174, ei_cp1256},
-#line 142 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str175, ei_iso8859_13},
-#line 281 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str176, ei_iso646_cn},
-#line 13 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str177, ei_ascii},
-#line 174 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str178, ei_cp1251},
-#line 75 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str179, ei_iso8859_3},
-    {-1},
-#line 199 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str181, ei_cp850},
-    {-1},
-#line 314 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str183, ei_euc_cn},
-    {-1},
-#line 57 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str185, ei_iso8859_1},
-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#line 183 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str192, ei_cp1254},
-    {-1},
-#line 345 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str194, ei_cp949},
-    {-1},
-#line 186 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str196, ei_cp1255},
-#line 201 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str197, ei_cp862},
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str27, ei_iso8859_15},
 #line 21 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str198, ei_ascii},
-    {-1}, {-1}, {-1}, {-1},
-#line 348 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str203, ei_johab},
-    {-1}, {-1},
-#line 195 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str206, ei_cp1258},
-#line 82 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str207, ei_iso8859_4},
-    {-1},
-#line 206 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str209, ei_cp866},
-#line 318 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str210, ei_cp936},
-#line 231 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str211, ei_georgian_ps},
-    {-1}, {-1},
-#line 164 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str214, ei_iso8859_16},
-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#line 288 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str222, ei_gb2312},
-    {-1},
-#line 177 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str224, ei_cp1252},
-#line 143 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str225, ei_iso8859_13},
-#line 131 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str226, ei_iso8859_10},
-#line 282 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str227, ei_iso646_cn},
-#line 242 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str228, ei_tis620},
-    {-1},
-#line 78 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str230, ei_iso8859_3},
-#line 33 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str231, ei_ucs4},
-#line 271 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str232, ei_jisx0208},
-#line 241 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str233, ei_tis620},
-#line 132 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str234, ei_iso8859_10},
-#line 71 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str235, ei_iso8859_3},
-#line 72 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str236, ei_iso8859_3},
-#line 145 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str237, ei_iso8859_13},
-    {-1}, {-1},
-#line 135 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str240, ei_iso8859_10},
-#line 330 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str241, ei_ces_big5},
-#line 140 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str242, ei_iso8859_13},
-#line 141 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str243, ei_iso8859_13},
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str28, ei_ascii},
 #line 61 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str244, ei_iso8859_1},
-#line 167 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str245, ei_koi8_r},
-#line 331 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str246, ei_ces_big5},
-#line 58 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str247, ei_iso8859_1},
-#line 97 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str248, ei_iso8859_6},
-#line 248 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str249, ei_cp874},
-    {-1},
-#line 14 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str251, ei_ascii},
-#line 250 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str252, ei_viscii},
-#line 173 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str253, ei_cp1250},
-    {-1}, {-1},
-#line 179 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str256, ei_cp1252},
-    {-1},
-#line 85 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str258, ei_iso8859_4},
-#line 202 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str259, ei_cp862},
-#line 306 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str260, ei_cp932},
-#line 277 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str261, ei_jisx0212},
-#line 127 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str262, ei_iso8859_9},
-#line 24 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str263, ei_ucs2},
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str29, ei_iso8859_2},
     {-1},
-#line 136 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str265, ei_iso8859_10},
-#line 319 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str266, ei_cp936},
-#line 352 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str267, ei_local_wchar_t},
-    {-1}, {-1},
-#line 129 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str270, ei_iso8859_10},
-#line 130 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str271, ei_iso8859_10},
-#line 38 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str272, ei_utf16},
-#line 313 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str273, ei_euc_cn},
-#line 225 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str274, ei_hp_roman8},
-#line 157 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str275, ei_iso8859_15},
-#line 113 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str276, ei_iso8859_7},
-#line 232 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str277, ei_koi8_t},
-#line 312 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str278, ei_euc_cn},
-#line 37 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str279, ei_ucs4le},
-#line 56 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str280, ei_iso8859_1},
-#line 103 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str281, ei_iso8859_7},
-#line 104 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str282, ei_iso8859_7},
-#line 238 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str283, ei_mulelao},
-#line 280 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str284, ei_iso646_cn},
-    {-1}, {-1}, {-1},
-#line 264 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str288, ei_jisx0201},
-#line 98 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str289, ei_iso8859_6},
+#line 51 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str31, ei_iso8859_1},
 #line 69 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str290, ei_iso8859_2},
-#line 230 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str291, ei_georgian_academy},
-#line 234 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str292, ei_pt154},
-    {-1}, {-1},
-#line 31 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str295, ei_ucs2le},
-#line 180 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str296, ei_cp1253},
-#line 23 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str297, ei_utf8},
-#line 224 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str298, ei_hp_roman8},
-    {-1},
-#line 22 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str300, ei_ascii},
-    {-1}, {-1},
-#line 108 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str303, ei_iso8859_7},
-#line 49 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str304, ei_ucs4internal},
-#line 255 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str305, ei_tcvn},
-    {-1},
-#line 296 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str307, ei_ksc5601},
-#line 197 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str308, ei_cp850},
-#line 176 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str309, ei_cp1251},
-#line 336 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str310, ei_cp950},
-    {-1}, {-1},
-#line 243 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str313, ei_tis620},
-    {-1}, {-1},
-#line 270 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str316, ei_jisx0208},
-    {-1}, {-1},
-#line 110 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str319, ei_iso8859_7},
-#line 47 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str320, ei_ucs2internal},
-#line 254 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str321, ei_tcvn},
-    {-1},
-#line 239 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str323, ei_cp1133},
-#line 171 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str324, ei_cp1250},
-    {-1}, {-1},
-#line 322 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str327, ei_iso2022_cn},
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str32, ei_iso8859_15},
+#line 62 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str33, ei_iso8859_2},
     {-1},
+#line 52 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str35, ei_iso8859_1},
+#line 70 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str36, ei_iso8859_15},
+#line 75 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str37, ei_koi8_r},
+#line 31 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str38, ei_ucs2le},
+#line 43 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str39, ei_utf32le},
 #line 40 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str329, ei_utf16le},
-    {-1}, {-1}, {-1}, {-1}, {-1},
-#line 236 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str335, ei_pt154},
-    {-1},
-#line 34 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str337, ei_ucs4},
-    {-1}, {-1},
-#line 324 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str340, ei_iso2022_cn_ext},
-    {-1},
-#line 192 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str342, ei_cp1257},
-    {-1}, {-1},
-#line 285 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str345, ei_gb2312},
-    {-1},
-#line 260 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str347, ei_iso646_jp},
-    {-1}, {-1}, {-1},
-#line 343 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str351, ei_euc_kr},
-    {-1},
-#line 25 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str353, ei_ucs2},
-#line 321 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str354, ei_gb18030},
-    {-1},
-#line 342 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str356, ei_euc_kr},
-#line 168 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str357, ei_koi8_r},
-#line 335 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str358, ei_ces_big5},
-    {-1},
-#line 19 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str360, ei_ascii},
-#line 210 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str361, ei_mac_roman},
-#line 77 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str362, ei_iso8859_3},
-#line 334 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str363, ei_ces_big5},
-    {-1}, {-1},
-#line 91 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str366, ei_iso8859_5},
-    {-1}, {-1},
-#line 252 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str369, ei_viscii},
-#line 198 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str370, ei_cp850},
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str40, ei_utf16le},
+#line 71 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str41, ei_iso8859_15},
     {-1},
-#line 223 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str372, ei_mac_thai},
+#line 63 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str43, ei_iso8859_2},
+#line 53 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str44, ei_iso8859_1},
+#line 33 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str45, ei_ucs4},
     {-1},
 #line 29 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str374, ei_ucs2be},
-    {-1},
-#line 15 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str376, ei_ascii},
-    {-1}, {-1}, {-1},
-#line 12 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str380, ei_ascii},
-#line 41 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str381, ei_utf32},
-    {-1}, {-1},
-#line 290 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str384, ei_isoir165},
-    {-1}, {-1},
-#line 228 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str387, ei_nextstep},
-    {-1},
-#line 211 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str389, ei_mac_roman},
-    {-1}, {-1}, {-1},
-#line 299 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str393, ei_euc_jp},
-#line 101 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str394, ei_iso8859_6},
-#line 326 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str395, ei_hz},
-    {-1},
-#line 229 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str397, ei_armscii_8},
-    {-1}, {-1}, {-1},
-#line 119 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str401, ei_iso8859_8},
-    {-1}, {-1}, {-1},
-#line 349 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str405, ei_iso2022_kr},
-    {-1},
-#line 190 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str407, ei_cp1256},
-#line 346 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str408, ei_cp949},
-#line 175 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str409, ei_cp1251},
-    {-1},
-#line 188 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str411, ei_cp1255},
-#line 152 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str412, ei_iso8859_14},
-#line 43 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str413, ei_utf32le},
-    {-1}, {-1},
-#line 184 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str416, ei_cp1254},
-    {-1},
-#line 187 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str418, ei_cp1255},
-    {-1},
-#line 302 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str420, ei_sjis},
-#line 301 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str421, ei_sjis},
-#line 20 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str422, ei_ascii},
-#line 196 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str423, ei_cp1258},
-#line 237 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str424, ei_pt154},
-    {-1},
-#line 317 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str426, ei_ces_gbk},
-    {-1},
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str47, ei_ucs2be},
+#line 16 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str48, ei_ascii},
+#line 76 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str49, ei_koi8_r},
+#line 13 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str50, ei_ascii},
+#line 28 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str51, ei_ucs2be},
+#line 72 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str52, ei_iso8859_15},
+#line 37 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str53, ei_ucs4le},
+#line 64 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str54, ei_iso8859_2},
+#line 77 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str55, ei_cp1250},
+#line 25 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str56, ei_ucs2},
+#line 45 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str57, ei_utf7},
+#line 65 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str58, ei_iso8859_2},
 #line 32 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str428, ei_ucs2le},
-    {-1}, {-1}, {-1},
-#line 178 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str432, ei_cp1252},
-#line 44 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str433, ei_utf7},
-    {-1},
-#line 291 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str435, ei_ksc5601},
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str59, ei_ucs2le},
+#line 57 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str60, ei_iso8859_1},
+#line 15 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str61, ei_ascii},
+#line 14 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str62, ei_ascii},
+#line 26 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str63, ei_ucs2},
+#line 47 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str64, ei_ucs2internal},
+#line 73 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str65, ei_iso8859_15},
+#line 81 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str66, ei_local_wchar_t},
     {-1},
-#line 99 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str437, ei_iso8859_6},
-    {-1}, {-1},
-#line 323 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str440, ei_iso2022_cn},
-    {-1}, {-1}, {-1},
-#line 333 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str444, ei_ces_big5},
-    {-1}, {-1},
-#line 320 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str447, ei_cp936},
 #line 35 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str448, ei_ucs4},
-#line 332 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str449, ei_ces_big5},
-    {-1}, {-1}, {-1},
-#line 258 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str453, ei_iso646_jp},
-    {-1}, {-1},
-#line 244 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str456, ei_tis620},
-#line 112 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str457, ei_iso8859_7},
-    {-1},
-#line 92 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str459, ei_iso8859_5},
-#line 36 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str460, ei_ucs4be},
-    {-1},
-#line 45 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str462, ei_utf7},
-    {-1}, {-1},
-#line 328 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str465, ei_euc_tw},
-    {-1}, {-1},
-#line 181 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str468, ei_cp1253},
-#line 227 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str469, ei_hp_roman8},
-#line 327 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str470, ei_euc_tw},
-    {-1},
-#line 293 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str472, ei_ksc5601},
-    {-1}, {-1}, {-1},
-#line 27 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str476, ei_ucs2be},
-    {-1}, {-1},
-#line 251 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str479, ei_viscii},
-#line 111 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str480, ei_iso8859_7},
-    {-1},
-#line 172 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str482, ei_cp1250},
-#line 316 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str483, ei_euc_cn},
-    {-1}, {-1},
-#line 249 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str486, ei_cp874},
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str68, ei_ucs4},
 #line 30 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str487, ei_ucs2be},
-    {-1},
-#line 52 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str489, ei_java},
-    {-1},
-#line 193 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str491, ei_cp1257},
-    {-1},
-#line 26 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str493, ei_ucs2},
-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#line 265 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str500, ei_jisx0201},
-    {-1},
-#line 284 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str502, ei_iso646_cn},
-    {-1},
-#line 214 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str504, ei_mac_iceland},
-    {-1}, {-1}, {-1}, {-1},
-#line 208 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str509, ei_cp866},
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str69, ei_ucs2be},
+#line 12 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str70, ei_ascii},
+#line 34 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str71, ei_ucs4},
+#line 27 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str72, ei_ucs2be},
+#line 42 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str73, ei_utf32be},
 #line 39 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str510, ei_utf16be},
-    {-1}, {-1},
-#line 100 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str513, ei_iso8859_6},
-#line 315 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str514, ei_euc_cn},
-    {-1}, {-1}, {-1},
-#line 350 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str518, ei_iso2022_kr},
-    {-1},
-#line 212 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str520, ei_mac_roman},
-    {-1}, {-1}, {-1}, {-1}, {-1},
-#line 269 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str526, ei_jisx0208},
-    {-1},
-#line 209 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str528, ei_mac_roman},
-    {-1},
-#line 81 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str530, ei_iso8859_4},
-    {-1},
-#line 89 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str532, ei_iso8859_5},
-    {-1}, {-1},
-#line 246 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str535, ei_tis620},
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str74, ei_utf16be},
 #line 18 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str536, ei_ascii},
-#line 116 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str537, ei_iso8859_8},
-#line 292 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str538, ei_ksc5601},
-#line 305 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str539, ei_sjis},
-#line 118 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str540, ei_iso8859_8},
-#line 123 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str541, ei_iso8859_9},
-    {-1}, {-1}, {-1}, {-1}, {-1},
-#line 215 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str547, ei_mac_croatian},
-#line 309 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str548, ei_iso2022_jp1},
-    {-1},
-#line 298 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str550, ei_euc_jp},
-    {-1},
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str75, ei_ascii},
 #line 17 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str552, ei_ascii},
-    {-1}, {-1},
-#line 297 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str555, ei_euc_jp},
-    {-1}, {-1}, {-1}, {-1}, {-1},
-#line 287 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str561, ei_gb2312},
-#line 272 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str562, ei_jisx0208},
-    {-1}, {-1}, {-1},
-#line 240 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str566, ei_cp1133},
-    {-1}, {-1},
-#line 213 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str569, ei_mac_centraleurope},
-#line 279 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str570, ei_jisx0212},
-#line 310 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str571, ei_iso2022_jp2},
-    {-1},
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str76, ei_ascii},
 #line 46 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str573, ei_utf7},
-#line 50 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str574, ei_ucs4swapped},
-    {-1}, {-1}, {-1},
-#line 28 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str578, ei_ucs2be},
-#line 261 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str579, ei_iso646_jp},
-#line 257 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str580, ei_iso646_jp},
-    {-1},
-#line 73 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str582, ei_iso8859_3},
-    {-1}, {-1}, {-1},
-#line 204 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str586, ei_cp862},
-    {-1},
-#line 340 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str588, ei_big5hkscs2004},
-#line 96 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str589, ei_iso8859_6},
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str77, ei_utf7},
 #line 48 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str590, ei_ucs2swapped},
-#line 55 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str591, ei_iso8859_1},
-    {-1},
-#line 339 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str593, ei_big5hkscs2004},
-#line 42 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str594, ei_utf32be},
-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#line 307 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str604, ei_iso2022_jp},
-    {-1}, {-1},
-#line 169 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str607, ei_koi8_u},
-#line 245 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str608, ei_tis620},
-    {-1}, {-1}, {-1},
-#line 170 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str612, ei_koi8_ru},
-    {-1},
-#line 65 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str614, ei_iso8859_2},
-    {-1}, {-1}, {-1},
-#line 216 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str618, ei_mac_romania},
-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-    {-1}, {-1}, {-1}, {-1},
-#line 274 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str641, ei_jisx0212},
-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#line 344 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str648, ei_euc_kr},
-#line 217 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str649, ei_mac_cyrillic},
-#line 106 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str650, ei_iso8859_7},
-#line 191 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str651, ei_cp1256},
-    {-1}, {-1}, {-1}, {-1}, {-1},
-#line 182 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str657, ei_cp1253},
-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#line 295 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str666, ei_ksc5601},
-    {-1},
-#line 262 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str668, ei_jisx0201},
-    {-1}, {-1}, {-1}, {-1},
-#line 105 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str673, ei_iso8859_7},
-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#line 311 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str683, ei_iso2022_jp2},
-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-    {-1}, {-1}, {-1},
-#line 266 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str696, ei_jisx0208},
-#line 263 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str697, ei_jisx0201},
-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#line 276 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str706, ei_jisx0212},
-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-    {-1},
-#line 308 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str717, ei_iso2022_jp},
-    {-1}, {-1}, {-1},
-#line 347 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str721, ei_johab},
-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#line 304 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str730, ei_sjis},
-    {-1}, {-1}, {-1},
-#line 273 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str734, ei_jisx0208},
-    {-1}, {-1},
-#line 220 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str737, ei_mac_turkish},
-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#line 256 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str755, ei_tcvn},
-#line 267 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str756, ei_jisx0208},
-    {-1}, {-1}, {-1}, {-1}, {-1},
-#line 329 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str762, ei_euc_tw},
-#line 219 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str763, ei_mac_greek},
-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#line 268 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str770, ei_jisx0208},
-    {-1}, {-1}, {-1}, {-1}, {-1},
-#line 194 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str776, ei_cp1257},
-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-    {-1}, {-1}, {-1}, {-1},
-#line 185 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str790, ei_cp1254},
-    {-1},
-#line 218 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str792, ei_mac_ukraine},
-    {-1}, {-1}, {-1},
-#line 222 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str796, ei_mac_arabic},
-    {-1}, {-1}, {-1}, {-1}, {-1},
-#line 200 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str802, ei_cp850},
-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str78, ei_ucs2swapped},
+#line 49 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str79, ei_ucs4internal},
+#line 22 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str80, ei_ascii},
     {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#line 221 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str845, ei_mac_hebrew},
-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+#line 36 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str87, ei_ucs4be},
+#line 78 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str88, ei_cp1250},
     {-1}, {-1}, {-1},
-#line 275 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str903, ei_jisx0212},
-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+#line 54 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str92, ei_iso8859_1},
+#line 50 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str93, ei_ucs4swapped},
     {-1}, {-1}, {-1},
-#line 338 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str979, ei_big5hkscs2001},
-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#line 341 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str986, ei_big5hkscs2004},
-    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#line 337 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str995, ei_big5hkscs1999},
-    {-1},
-#line 300 "lib/aliases.gperf"
-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str997, ei_euc_jp}
+#line 67 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str97, ei_iso8859_2},
+#line 59 "lib/aliases.gperf"
+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str98, ei_iso8859_1}
   };
 
 #ifdef __GNUC__
diff -urN libiconv-1.11.old/lib/canonical_dos.h libiconv-1.11.new/lib/canonical_dos.h
--- libiconv-1.11.old/lib/canonical_dos.h	2005-05-19 19:08:39.000000000 +0200
+++ libiconv-1.11.new/lib/canonical_dos.h	2007-11-11 14:41:34.000000000 +0100
@@ -1,15 +1 @@
   (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_0,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_4,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_5,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_8,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_12,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_13,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_17,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_21,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_22,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_26,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_31,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_35,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_38,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_42,
-  (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_47,
diff -urN libiconv-1.11.old/lib/canonical.h libiconv-1.11.new/lib/canonical.h
--- libiconv-1.11.old/lib/canonical.h	2006-05-18 14:45:20.000000000 +0200
+++ libiconv-1.11.new/lib/canonical.h	2007-11-11 15:05:29.000000000 +0100
@@ -1,107 +1 @@
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str380,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str297,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str263,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str476,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str295,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str231,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str460,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str279,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str272,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str510,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str329,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str381,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str594,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str413,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str433,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str320,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str590,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str304,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str574,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str157,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str489,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str117,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str163,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str235,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str131,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str135,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str113,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str281,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str145,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str149,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str270,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str124,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str242,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str138,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str142,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str120,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str245,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str607,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str612,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str324,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str178,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str224,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str296,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str192,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str196,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str174,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str342,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str206,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str308,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str197,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str147,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str528,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str569,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str504,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str547,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str618,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str649,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str792,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str763,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str737,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str845,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str796,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str372,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str298,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str387,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str397,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str291,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str211,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str277,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str116,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str283,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str323,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str233,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str249,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str252,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str156,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str580,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str668,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str696,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str641,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str284,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str345,
   (int)(long)&((struct stringpool_t *)0)->stringpool_str77,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str435,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str555,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str421,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str260,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str604,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str548,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str571,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str278,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str426,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str210,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str354,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str327,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str340,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str18,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str470,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str241,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str310,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str995,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str979,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str593,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str356,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str194,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str721,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str405,
diff -urN libiconv-1.11.old/lib/canonical_local.h libiconv-1.11.new/lib/canonical_local.h
--- libiconv-1.11.old/lib/canonical_local.h	2006-05-18 14:45:20.000000000 +0200
+++ libiconv-1.11.new/lib/canonical_local.h	2007-11-11 15:20:08.000000000 +0100
@@ -1,2 +1 @@
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str169,
-  (int)(long)&((struct stringpool_t *)0)->stringpool_str267,
+
diff -urN libiconv-1.11.old/lib/converters.h libiconv-1.11.new/lib/converters.h
--- libiconv-1.11.old/lib/converters.h	2006-05-18 14:43:55.000000000 +0200
+++ libiconv-1.11.new/lib/converters.h	2007-11-11 14:44:59.000000000 +0100
@@ -129,161 +129,15 @@
 #include "ucs2swapped.h"
 #include "ucs4internal.h"
 #include "ucs4swapped.h"
-#include "c99.h"
-#include "java.h"
 
 /* 8-bit encodings */
 #include "iso8859_1.h"
 #include "iso8859_2.h"
-#include "iso8859_3.h"
-#include "iso8859_4.h"
-#include "iso8859_5.h"
-#include "iso8859_6.h"
-#include "iso8859_7.h"
-#include "iso8859_8.h"
-#include "iso8859_9.h"
-#include "iso8859_10.h"
-#include "iso8859_11.h"
-#include "iso8859_13.h"
-#include "iso8859_14.h"
 #include "iso8859_15.h"
-#include "iso8859_16.h"
 #include "koi8_r.h"
-#include "koi8_u.h"
-#include "koi8_ru.h"
 #include "cp1250.h"
-#include "cp1251.h"
-#include "cp1252.h"
-#include "cp1253.h"
-#include "cp1254.h"
-#include "cp1255.h"
-#include "cp1256.h"
-#include "cp1257.h"
-#include "cp1258.h"
 #include "cp850.h"
-#include "cp862.h"
-#include "cp866.h"
-#include "mac_roman.h"
-#include "mac_centraleurope.h"
-#include "mac_iceland.h"
-#include "mac_croatian.h"
-#include "mac_romania.h"
-#include "mac_cyrillic.h"
-#include "mac_ukraine.h"
-#include "mac_greek.h"
-#include "mac_turkish.h"
-#include "mac_hebrew.h"
-#include "mac_arabic.h"
-#include "mac_thai.h"
-#include "hp_roman8.h"
-#include "nextstep.h"
-#include "armscii_8.h"
-#include "georgian_academy.h"
-#include "georgian_ps.h"
-#include "koi8_t.h"
-#include "pt154.h"
-#include "mulelao.h"
-#include "cp1133.h"
-#include "tis620.h"
-#include "cp874.h"
-#include "viscii.h"
-#include "tcvn.h"
-
-/* CJK character sets [CCS = coded character set] [CJKV.INF chapter 3] */
-
-typedef struct {
-  unsigned short indx; /* index into big table */
-  unsigned short used; /* bitmask of used entries */
-} Summary16;
-
-#include "iso646_jp.h"
-#include "jisx0201.h"
-#include "jisx0208.h"
-#include "jisx0212.h"
-
-#include "iso646_cn.h"
-#include "gb2312.h"
-#include "isoir165.h"
-/*#include "gb12345.h"*/
-#include "gbk.h"
-#include "cns11643.h"
-#include "big5.h"
-
-#include "ksc5601.h"
-#include "johab_hangul.h"
-
-/* CJK encodings [CES = character encoding scheme] [CJKV.INF chapter 4] */
-
-#include "euc_jp.h"
-#include "sjis.h"
-#include "cp932.h"
-#include "iso2022_jp.h"
-#include "iso2022_jp1.h"
-#include "iso2022_jp2.h"
-
-#include "euc_cn.h"
-#include "ces_gbk.h"
-#include "cp936.h"
-#include "gb18030.h"
-#include "iso2022_cn.h"
-#include "iso2022_cnext.h"
-#include "hz.h"
-#include "euc_tw.h"
-#include "ces_big5.h"
-#include "cp950.h"
-#include "big5hkscs1999.h"
-#include "big5hkscs2001.h"
-#include "big5hkscs2004.h"
-
-#include "euc_kr.h"
-#include "cp949.h"
-#include "johab.h"
-#include "iso2022_kr.h"
-
-/* Encodings used by system dependent locales. */
-
-#ifdef USE_AIX
-#include "cp856.h"
-#include "cp922.h"
-#include "cp943.h"
-#include "cp1046.h"
-#include "cp1124.h"
-#include "cp1129.h"
-#include "cp1161.h"
-#include "cp1162.h"
-#include "cp1163.h"
-#endif
-
-#ifdef USE_OSF1
-#include "dec_kanji.h"
-#include "dec_hanyu.h"
-#endif
 
 #ifdef USE_DOS
 #include "cp437.h"
-#include "cp737.h"
-#include "cp775.h"
-#include "cp852.h"
-#include "cp853.h"
-#include "cp855.h"
-#include "cp857.h"
-#include "cp858.h"
-#include "cp860.h"
-#include "cp861.h"
-#include "cp863.h"
-#include "cp864.h"
-#include "cp865.h"
-#include "cp869.h"
-#include "cp1125.h"
-#endif
-
-#ifdef USE_EXTRA
-#include "euc_jisx0213.h"
-#include "shift_jisx0213.h"
-#include "iso2022_jp3.h"
-#include "big5_2003.h"
-#include "tds565.h"
-#include "atarist.h"
-#include "riscos1.h"
 #endif
-
diff -urN libiconv-1.11.old/lib/encodings.def libiconv-1.11.new/lib/encodings.def
--- libiconv-1.11.old/lib/encodings.def	2006-05-18 14:43:55.000000000 +0200
+++ libiconv-1.11.new/lib/encodings.def	2007-11-11 14:59:15.000000000 +0100
@@ -161,16 +161,6 @@
             ucs4swapped,
             { ucs4swapped_mbtowc, NULL }, { ucs4swapped_wctomb, NULL })
 
-DEFENCODING(( "C99",
-            ),
-            c99,
-            { c99_mbtowc, NULL },         { c99_wctomb, NULL })
-
-DEFENCODING(( "JAVA",
-            ),
-            java,
-            { java_mbtowc, NULL },        { java_wctomb, NULL })
-
 /* Standard 8-bit encodings */
 
 DEFENCODING(( "ISO-8859-1",             /* IANA */
@@ -203,148 +193,6 @@
             iso8859_2,
             { iso8859_2_mbtowc, NULL },   { iso8859_2_wctomb, NULL })
 
-DEFENCODING(( "ISO-8859-3",             /* IANA */
-              "ISO_8859-3",             /* IANA */
-              "ISO_8859-3:1988",        /* IANA */
-              "ISO-IR-109",             /* IANA */
-              "LATIN3",                 /* IANA */
-              "L3",                     /* IANA */
-              "csISOLatin3",            /* IANA */
-              "ISO8859-3",              /* X11R6.4, glibc, FreeBSD */
-            /*"ISO8859_3",                 JDK 1.1 */
-            /*"CP28593",                   Windows */
-            ),
-            iso8859_3,
-            { iso8859_3_mbtowc, NULL },   { iso8859_3_wctomb, NULL })
-
-DEFENCODING(( "ISO-8859-4",             /* IANA */
-              "ISO_8859-4",             /* IANA */
-              "ISO_8859-4:1988",        /* IANA */
-              "ISO-IR-110",             /* IANA */
-              "LATIN4",                 /* IANA */
-              "L4",                     /* IANA */
-              "csISOLatin4",            /* IANA */
-              "ISO8859-4",              /* X11R6.4, glibc, FreeBSD */
-            /*"ISO8859_4",                 JDK 1.1 */
-            /*"CP28594",                   Windows */
-            ),
-            iso8859_4,
-            { iso8859_4_mbtowc, NULL },   { iso8859_4_wctomb, NULL })
-
-DEFENCODING(( "ISO-8859-5",             /* IANA */
-              "ISO_8859-5",             /* IANA */
-              "ISO_8859-5:1988",        /* IANA */
-              "ISO-IR-144",             /* IANA */
-              "CYRILLIC",               /* IANA */
-              "csISOLatinCyrillic",     /* IANA */
-              "ISO8859-5",              /* X11R6.4, glibc, FreeBSD */
-            /*"ISO8859_5",                 JDK 1.1 */
-            /*"CP28595",                   Windows */
-            ),
-            iso8859_5,
-            { iso8859_5_mbtowc, NULL },   { iso8859_5_wctomb, NULL })
-
-DEFENCODING(( "ISO-8859-6",             /* IANA */
-              "ISO_8859-6",             /* IANA */
-              "ISO_8859-6:1987",        /* IANA */
-              "ISO-IR-127",             /* IANA */
-              "ECMA-114",               /* IANA */
-              "ASMO-708",               /* IANA */
-              "ARABIC",                 /* IANA */
-              "csISOLatinArabic",       /* IANA */
-              "ISO8859-6",              /* X11R6.4, glibc, FreeBSD */
-            /*"ISO8859_6",                 JDK 1.1 */
-            /*"CP28596",                   Windows */
-            ),
-            iso8859_6,
-            { iso8859_6_mbtowc, NULL },   { iso8859_6_wctomb, NULL })
-
-DEFENCODING(( "ISO-8859-7",             /* IANA, RFC 1947 */
-              "ISO_8859-7",             /* IANA */
-              "ISO_8859-7:1987",        /* IANA */
-              "ISO_8859-7:2003",
-              "ISO-IR-126",             /* IANA */
-              "ECMA-118",               /* IANA */
-              "ELOT_928",               /* IANA */
-              "GREEK8",                 /* IANA */
-              "GREEK",                  /* IANA */
-              "csISOLatinGreek",        /* IANA */
-              "ISO8859-7",              /* X11R6.4, glibc, FreeBSD */
-            /*"ISO8859_7",                 JDK 1.1 */
-            /*"CP28597",                   Windows */
-            ),
-            iso8859_7,
-            { iso8859_7_mbtowc, NULL },   { iso8859_7_wctomb, NULL })
-
-DEFENCODING(( "ISO-8859-8",             /* IANA */
-              "ISO_8859-8",             /* IANA */
-              "ISO_8859-8:1988",        /* IANA */
-              "ISO-IR-138",             /* IANA */
-              "HEBREW",                 /* IANA */
-              "csISOLatinHebrew",       /* IANA */
-              "ISO8859-8",              /* X11R6.4, glibc, FreeBSD */
-            /*"ISO8859_8",                 JDK 1.1 */
-            /*"CP28598",                   Windows */
-            /*"CP38598",                   Windows */
-            ),
-            iso8859_8,
-            { iso8859_8_mbtowc, NULL },   { iso8859_8_wctomb, NULL })
-
-DEFENCODING(( "ISO-8859-9",             /* IANA */
-              "ISO_8859-9",             /* IANA */
-              "ISO_8859-9:1989",        /* IANA */
-              "ISO-IR-148",             /* IANA */
-              "LATIN5",                 /* IANA */
-              "L5",                     /* IANA */
-              "csISOLatin5",            /* IANA */
-              "ISO8859-9",              /* X11R6.4, glibc, FreeBSD */
-            /*"ISO8859_9",                 JDK 1.1 */
-            /*"CP28599",                   Windows */
-            ),
-            iso8859_9,
-            { iso8859_9_mbtowc, NULL },   { iso8859_9_wctomb, NULL })
-
-DEFENCODING(( "ISO-8859-10",            /* IANA */
-              "ISO_8859-10",
-              "ISO_8859-10:1992",       /* IANA */
-              "ISO-IR-157",             /* IANA */
-              "LATIN6",                 /* IANA */
-              "L6",                     /* IANA */
-              "csISOLatin6",            /* IANA */
-              "ISO8859-10",             /* X11R6.4, glibc, FreeBSD */
-            ),
-            iso8859_10,
-            { iso8859_10_mbtowc, NULL },  { iso8859_10_wctomb, NULL })
-
-DEFENCODING(( "ISO-8859-11",            /* glibc */
-              "ISO_8859-11",
-              "ISO8859-11",             /* X11R6.7, glibc */
-            ),
-            iso8859_11,
-            { iso8859_11_mbtowc, NULL },  { iso8859_11_wctomb, NULL })
-
-DEFENCODING(( "ISO-8859-13",            /* IANA, glibc */
-              "ISO_8859-13",
-              "ISO-IR-179",             /* glibc */
-              "LATIN7",                 /* glibc */
-              "L7",                     /* glibc */
-              "ISO8859-13",             /* glibc, FreeBSD */
-            ),
-            iso8859_13,
-            { iso8859_13_mbtowc, NULL },  { iso8859_13_wctomb, NULL })
-
-DEFENCODING(( "ISO-8859-14",            /* IANA, glibc */
-              "ISO_8859-14",            /* IANA */
-              "ISO_8859-14:1998",       /* IANA, glibc */
-              "ISO-IR-199",             /* IANA */
-              "LATIN8",                 /* IANA, glibc */
-              "L8",                     /* IANA, glibc */
-              "ISO-CELTIC",             /* IANA */
-              "ISO8859-14",             /* glibc, FreeBSD */
-            ),
-            iso8859_14,
-            { iso8859_14_mbtowc, NULL },  { iso8859_14_wctomb, NULL })
-
 DEFENCODING(( "ISO-8859-15",            /* IANA, glibc */
               "ISO_8859-15",            /* IANA */
               "ISO_8859-15:1998",       /* glibc */
@@ -356,17 +204,6 @@
             iso8859_15,
             { iso8859_15_mbtowc, NULL },  { iso8859_15_wctomb, NULL })
 
-DEFENCODING(( "ISO-8859-16",            /* IANA */
-              "ISO_8859-16",            /* IANA */
-              "ISO_8859-16:2001",       /* IANA */
-              "ISO-IR-226",             /* IANA */
-              "LATIN10",                /* IANA */
-              "L10",                    /* IANA */
-              "ISO8859-16",             /* glibc, FreeBSD */
-            ),
-            iso8859_16,
-            { iso8859_16_mbtowc, NULL },  { iso8859_16_wctomb, NULL })
-
 DEFENCODING(( "KOI8-R",                 /* IANA, RFC 1489, X11R6.4, JDK 1.1 */
               "csKOI8R",                /* IANA */
             /*"CP20866",                   Windows */
@@ -374,16 +211,6 @@
             koi8_r,
             { koi8_r_mbtowc, NULL },      { koi8_r_wctomb, NULL })
 
-DEFENCODING(( "KOI8-U",                 /* IANA, RFC 2319 */
-            ),
-            koi8_u,
-            { koi8_u_mbtowc, NULL },      { koi8_u_wctomb, NULL })
-
-DEFENCODING(( "KOI8-RU",
-            ),
-            koi8_ru,
-            { koi8_ru_mbtowc, NULL },     { koi8_ru_wctomb, NULL })
-
 /* Windows 8-bit encodings */
 
 DEFENCODING(( "CP1250",                 /* JDK 1.1 */
@@ -393,61 +220,6 @@
             cp1250,
             { cp1250_mbtowc, NULL },      { cp1250_wctomb, NULL })
 
-DEFENCODING(( "CP1251",                 /* JDK 1.1 */
-              "WINDOWS-1251",           /* IANA */
-              "MS-CYRL",
-            ),
-            cp1251,
-            { cp1251_mbtowc, NULL },      { cp1251_wctomb, NULL })
-
-DEFENCODING(( "CP1252",                 /* JDK 1.1 */
-              "WINDOWS-1252",           /* IANA */
-              "MS-ANSI",
-            ),
-            cp1252,
-            { cp1252_mbtowc, NULL },      { cp1252_wctomb, NULL })
-
-DEFENCODING(( "CP1253",                 /* JDK 1.1 */
-              "WINDOWS-1253",           /* IANA */
-              "MS-GREEK",
-            ),
-            cp1253,
-            { cp1253_mbtowc, NULL },      { cp1253_wctomb, NULL })
-
-DEFENCODING(( "CP1254",                 /* JDK 1.1 */
-              "WINDOWS-1254",           /* IANA */
-              "MS-TURK",
-            ),
-            cp1254,
-            { cp1254_mbtowc, NULL },      { cp1254_wctomb, NULL })
-
-DEFENCODING(( "CP1255",                 /* JDK 1.1 */
-              "WINDOWS-1255",           /* IANA */
-              "MS-HEBR",
-            ),
-            cp1255,
-            { cp1255_mbtowc, cp1255_flushwc }, { cp1255_wctomb, NULL })
-
-DEFENCODING(( "CP1256",                 /* JDK 1.1 */
-              "WINDOWS-1256",           /* IANA */
-              "MS-ARAB",
-            ),
-            cp1256,
-            { cp1256_mbtowc, NULL },      { cp1256_wctomb, NULL })
-
-DEFENCODING(( "CP1257",                 /* JDK 1.1 */
-              "WINDOWS-1257",           /* IANA */
-              "WINBALTRIM",
-            ),
-            cp1257,
-            { cp1257_mbtowc, NULL },      { cp1257_wctomb, NULL })
-
-DEFENCODING(( "CP1258",                 /* JDK 1.1 */
-              "WINDOWS-1258",           /* IANA */
-            ),
-            cp1258,
-            { cp1258_mbtowc, cp1258_flushwc }, { cp1258_wctomb, NULL })
-
 /* DOS 8-bit encodings */
 
 DEFENCODING(( "CP850",                  /* IANA, JDK 1.1 */
@@ -458,431 +230,3 @@
             cp850,
             { cp850_mbtowc, NULL },       { cp850_wctomb, NULL })
 
-DEFENCODING(( "CP862",                  /* IANA, JDK 1.1 */
-              "IBM862",                 /* IANA */
-              "862",                    /* IANA */
-              "csPC862LatinHebrew",     /* IANA */
-            ),
-            cp862,
-            { cp862_mbtowc, NULL },       { cp862_wctomb, NULL })
-
-DEFENCODING(( "CP866",                  /* IANA, JDK 1.1 */
-              "IBM866",                 /* IANA */
-              "866",                    /* IANA */
-              "csIBM866",               /* IANA */
-            ),
-            cp866,
-            { cp866_mbtowc, NULL },       { cp866_wctomb, NULL })
-
-/* Macintosh 8-bit encodings */
-
-DEFENCODING(( "MacRoman",               /* JDK 1.1 */
-              /* This is the best table for MACINTOSH. The ones */
-              /* in glibc and FreeBSD-iconv are bad quality. */
-              "MACINTOSH",              /* IANA */
-              "MAC",                    /* IANA */
-              "csMacintosh",            /* IANA */
-            /*"CP10000",                   Windows */
-            ),
-            mac_roman,
-            { mac_roman_mbtowc, NULL },   { mac_roman_wctomb, NULL })
-
-DEFENCODING(( "MacCentralEurope",       /* JDK 1.1 */
-            /*"CP10029",                   Windows */
-            ),
-            mac_centraleurope,
-            { mac_centraleurope_mbtowc, NULL }, { mac_centraleurope_wctomb, NULL })
-
-DEFENCODING(( "MacIceland",             /* JDK 1.1 */
-            /*"CP10079",                   Windows */
-            ),
-            mac_iceland,
-            { mac_iceland_mbtowc, NULL }, { mac_iceland_wctomb, NULL })
-
-DEFENCODING(( "MacCroatian",            /* JDK 1.1 */
-            /*"CP10082",                   Windows */
-            ),
-            mac_croatian,
-            { mac_croatian_mbtowc, NULL }, { mac_croatian_wctomb, NULL })
-
-DEFENCODING(( "MacRomania",             /* JDK 1.1 */
-            /*"CP10010",                   Windows */
-            ),
-            mac_romania,
-            { mac_romania_mbtowc, NULL }, { mac_romania_wctomb, NULL })
-
-DEFENCODING(( "MacCyrillic",            /* JDK 1.1 */
-            /*"CP10007",                   Windows */
-            ),
-            mac_cyrillic,
-            { mac_cyrillic_mbtowc, NULL }, { mac_cyrillic_wctomb, NULL })
-
-DEFENCODING(( "MacUkraine",             /* JDK 1.1 */
-            /*"CP10017",                   Windows */
-            ),
-            mac_ukraine,
-            { mac_ukraine_mbtowc, NULL }, { mac_ukraine_wctomb, NULL })
-
-DEFENCODING(( "MacGreek",               /* JDK 1.1 */
-            /*"CP10006",                   Windows */
-            ),
-            mac_greek,
-            { mac_greek_mbtowc, NULL },   { mac_greek_wctomb, NULL })
-
-DEFENCODING(( "MacTurkish",             /* JDK 1.1 */
-            /*"CP10081",                   Windows */
-            ),
-            mac_turkish,
-            { mac_turkish_mbtowc, NULL }, { mac_turkish_wctomb, NULL })
-
-DEFENCODING(( "MacHebrew",              /* JDK 1.1 */
-            /*"CP10005",                   Windows */
-            ),
-            mac_hebrew,
-            { mac_hebrew_mbtowc, NULL },  { mac_hebrew_wctomb, NULL })
-
-DEFENCODING(( "MacArabic",              /* JDK 1.1 */
-            /*"CP10004",                   Windows */
-            ),
-            mac_arabic,
-            { mac_arabic_mbtowc, NULL },  { mac_arabic_wctomb, NULL })
-
-DEFENCODING(( "MacThai",                /* JDK 1.1 */
-            /*"CP10021",                   Windows */
-            ),
-            mac_thai,
-            { mac_thai_mbtowc, NULL },    { mac_thai_wctomb, NULL })
-
-/* Other platform specific 8-bit encodings */
-
-DEFENCODING(( "HP-ROMAN8",              /* IANA, X11R6.4 */
-              "ROMAN8",                 /* IANA */
-              "R8",                     /* IANA */
-              "csHPRoman8",             /* IANA */
-            ),
-            hp_roman8,
-            { hp_roman8_mbtowc, NULL },   { hp_roman8_wctomb, NULL })
-
-DEFENCODING(( "NEXTSTEP",
-            ),
-            nextstep,
-            { nextstep_mbtowc, NULL },    { nextstep_wctomb, NULL })
-
-/* Regional 8-bit encodings used for a single language */
-
-DEFENCODING(( "ARMSCII-8",
-            ),
-            armscii_8,
-            { armscii_8_mbtowc, NULL },   { armscii_8_wctomb, NULL })
-
-DEFENCODING(( "GEORGIAN-ACADEMY",
-            ),
-            georgian_academy,
-            { georgian_academy_mbtowc, NULL }, { georgian_academy_wctomb, NULL })
-
-DEFENCODING(( "GEORGIAN-PS",
-            ),
-            georgian_ps,
-            { georgian_ps_mbtowc, NULL }, { georgian_ps_wctomb, NULL })
-
-DEFENCODING(( "KOI8-T",
-            ),
-            koi8_t,
-            { koi8_t_mbtowc, NULL },      { koi8_t_wctomb, NULL })
-
-DEFENCODING(( "PT154",                  /* IANA, glibc */
-              "PTCP154",                /* IANA */
-              "CP154",                  /* IANA */
-              "CYRILLIC-ASIAN",         /* IANA */
-              "csPTCP154",              /* IANA */
-            ),
-            pt154,
-            { pt154_mbtowc, NULL },       { pt154_wctomb, NULL })
-
-DEFENCODING(( "MULELAO-1",
-            ),
-            mulelao,
-            { mulelao_mbtowc, NULL },     { mulelao_wctomb, NULL })
-
-DEFENCODING(( "CP1133",
-              "IBM-CP1133",
-            ),
-            cp1133,
-            { cp1133_mbtowc, NULL },      { cp1133_wctomb, NULL })
-
-DEFENCODING(( "TIS-620",                /* IANA */
-              "TIS620",                 /* glibc */
-              "TIS620-0",               /* glibc */
-              "TIS620.2529-1",          /* glibc */
-              "TIS620.2533-0",          /* glibc */
-              "TIS620.2533-1",
-              "ISO-IR-166",             /* glibc */
-            ),
-            tis620,
-            { tis620_mbtowc, NULL },      { tis620_wctomb, NULL })
-
-DEFENCODING(( "CP874",                  /* JDK 1.1 */
-              "WINDOWS-874",
-            ),
-            cp874,
-            { cp874_mbtowc, NULL },       { cp874_wctomb, NULL })
-
-DEFENCODING(( "VISCII",                 /* IANA, RFC 1456 */
-              "VISCII1.1-1",
-              "csVISCII",               /* IANA */
-            ),
-            viscii,
-            { viscii_mbtowc, NULL },      { viscii_wctomb, NULL })
-
-DEFENCODING(( "TCVN",
-              "TCVN-5712",
-              "TCVN5712-1",
-              "TCVN5712-1:1993",
-            ),
-            tcvn,
-            { tcvn_mbtowc, tcvn_flushwc }, { tcvn_wctomb, NULL })
-
-/* CJK character sets (not documented) */
-
-DEFENCODING(( "JIS_C6220-1969-RO",      /* IANA */
-              "ISO646-JP",              /* IANA */
-              "ISO-IR-14",              /* IANA */
-              "JP",                     /* IANA */
-              "csISO14JISC6220ro",      /* IANA */
-            ),
-            iso646_jp,
-            { iso646_jp_mbtowc, NULL },   { iso646_jp_wctomb, NULL })
-
-DEFENCODING(( "JIS_X0201",              /* IANA */
-              "JISX0201-1976",
-              "X0201",                  /* IANA */
-              "csHalfWidthKatakana",    /* IANA */
-            /*"JISX0201.1976-0",           X11R6.4 */
-            /*"JIS0201",                   JDK 1.1 */
-            ),
-            jisx0201,
-            { jisx0201_mbtowc, NULL },    { jisx0201_wctomb, NULL })
-
-DEFENCODING(( "JIS_X0208",
-              "JIS_X0208-1983",         /* IANA */
-              "JIS_X0208-1990",
-              "JIS0208",
-              "X0208",                  /* IANA */
-              "ISO-IR-87",              /* IANA */
-              "JIS_C6226-1983",         /* IANA */
-              "csISO87JISX0208",        /* IANA */
-            /*"JISX0208.1983-0",           X11R6.4 */
-            /*"JISX0208.1990-0",           X11R6.4 */
-            /*"JIS0208",                   JDK 1.1 */
-            ),
-            jisx0208,
-            { jisx0208_mbtowc, NULL },    { jisx0208_wctomb, NULL })
-
-DEFENCODING(( "JIS_X0212",
-              "JIS_X0212.1990-0",
-              "JIS_X0212-1990",         /* IANA */
-              "X0212",                  /* IANA */
-              "ISO-IR-159",             /* IANA */
-              "csISO159JISX02121990",   /* IANA */
-            /*"JISX0212.1990-0",           X11R6.4 */
-            /*"JIS0212",                   JDK 1.1 */
-            ),
-            jisx0212,
-            { jisx0212_mbtowc, NULL },    { jisx0212_wctomb, NULL })
-
-DEFENCODING(( "GB_1988-80",             /* IANA */
-              "ISO646-CN",              /* IANA */
-              "ISO-IR-57",              /* IANA */
-              "CN",                     /* IANA */
-              "csISO57GB1988",          /* IANA */
-            ),
-            iso646_cn,
-            { iso646_cn_mbtowc, NULL },   { iso646_cn_wctomb, NULL })
-
-DEFENCODING(( "GB_2312-80",             /* IANA */
-              "ISO-IR-58",              /* IANA */
-              "csISO58GB231280",        /* IANA */
-              "CHINESE",                /* IANA */
-            /*"GB2312.1980-0",             X11R6.4 */
-            ),
-            gb2312,
-            { gb2312_mbtowc, NULL },      { gb2312_wctomb, NULL })
-
-DEFENCODING(( "ISO-IR-165",
-              "CN-GB-ISOIR165",         /* RFC 1922 */
-            ),
-            isoir165,
-            { isoir165_mbtowc, NULL },    { isoir165_wctomb, NULL })
-
-DEFENCODING(( "KSC_5601",               /* IANA */
-              "KS_C_5601-1987",         /* IANA */
-              "KS_C_5601-1989",         /* IANA */
-              "ISO-IR-149",             /* IANA */
-              "csKSC56011987",          /* IANA */
-              "KOREAN",                 /* IANA */
-            /*"KSC5601.1987-0",            X11R6.4 */
-            /*"KSX1001:1992",              Ken Lunde */
-            ),
-            ksc5601,
-            { ksc5601_mbtowc, NULL },     { ksc5601_wctomb, NULL })
-
-/* CJK encodings */
-
-DEFENCODING(( "EUC-JP",                 /* IANA */
-              "EUCJP",                  /* glibc */
-              "Extended_UNIX_Code_Packed_Format_for_Japanese", /* IANA */
-              "csEUCPkdFmtJapanese",    /* IANA */
-            /*"EUC_JP",                    JDK 1.1 */
-            /*"CP51932",                   Windows */
-            ),
-            euc_jp,
-            { euc_jp_mbtowc, NULL },      { euc_jp_wctomb, NULL })
-
-DEFENCODING(( "SHIFT_JIS",              /* IANA */
-              "SHIFT-JIS",              /* glibc */
-              "SJIS",                   /* JDK 1.1 */
-              "MS_KANJI",               /* IANA */
-              "csShiftJIS",             /* IANA */
-            ),
-            sjis,
-            { sjis_mbtowc, NULL },        { sjis_wctomb, NULL })
-
-DEFENCODING(( "CP932",                  /* glibc */
-            ),
-            cp932,
-            { cp932_mbtowc, NULL },       { cp932_wctomb, NULL })
-
-DEFENCODING(( "ISO-2022-JP",            /* IANA, RFC 1468 */
-              "csISO2022JP",            /* IANA */
-            /*"ISO2022JP",                 JDK 1.1 */
-            ),
-            iso2022_jp,
-            { iso2022_jp_mbtowc, NULL },  { iso2022_jp_wctomb, iso2022_jp_reset })
-
-DEFENCODING(( "ISO-2022-JP-1",          /* RFC 2237 */
-            ),
-            iso2022_jp1,
-            { iso2022_jp1_mbtowc, NULL }, { iso2022_jp1_wctomb, iso2022_jp1_reset })
-
-DEFENCODING(( "ISO-2022-JP-2",          /* IANA, RFC 1554 */
-              "csISO2022JP2",           /* IANA */
-            ),
-            iso2022_jp2,
-            { iso2022_jp2_mbtowc, NULL }, { iso2022_jp2_wctomb, iso2022_jp2_reset })
-
-DEFENCODING(( "EUC-CN",                 /* glibc */
-              "EUCCN",                  /* glibc */
-              "GB2312",                 /* IANA */
-              "CN-GB",                  /* RFC 1922 */
-              "csGB2312",               /* IANA */
-            /*"EUC_CN",                    JDK 1.1 */
-            /*"CP51936",                   Windows */
-            ),
-            euc_cn,
-            { euc_cn_mbtowc, NULL },      { euc_cn_wctomb, NULL })
-
-DEFENCODING(( "GBK",                    /* IANA, JDK 1.1 */
-            ),
-            ces_gbk,
-            { ces_gbk_mbtowc, NULL },     { ces_gbk_wctomb, NULL })
-
-DEFENCODING(( "CP936",                  /* IANA */
-              "MS936",                  /* IANA */
-              "WINDOWS-936",            /* IANA */
-            ),
-            cp936,
-            { cp936_mbtowc, NULL },       { cp936_wctomb, NULL })
-
-DEFENCODING(( "GB18030",                /* IANA, glibc */
-            /*"CP54936",                   Windows */
-            ),
-            gb18030,
-            { gb18030_mbtowc, NULL },     { gb18030_wctomb, NULL })
-
-DEFENCODING(( "ISO-2022-CN",            /* IANA, RFC 1922 */
-              "csISO2022CN",
-            /*"ISO2022CN",                 JDK 1.1 */
-            ),
-            iso2022_cn,
-            { iso2022_cn_mbtowc, NULL },  { iso2022_cn_wctomb, iso2022_cn_reset })
-
-DEFENCODING(( "ISO-2022-CN-EXT",        /* IANA, RFC 1922 */
-            ),
-            iso2022_cn_ext,
-            { iso2022_cn_ext_mbtowc, NULL }, { iso2022_cn_ext_wctomb, iso2022_cn_ext_reset })
-
-DEFENCODING(( "HZ",                     /* RFC 1843 */
-              "HZ-GB-2312",             /* IANA, RFC 1842 */
-            ),
-            hz,
-            { hz_mbtowc, NULL },          { hz_wctomb, hz_reset })
-
-DEFENCODING(( "EUC-TW",                 /* glibc */
-              "EUCTW",                  /* glibc */
-              "csEUCTW",
-            /*"EUC_TW",                    JDK 1.1 */
-            /*"CP51950",                   Windows */
-            ),
-            euc_tw,
-            { euc_tw_mbtowc, NULL },      { euc_tw_wctomb, NULL })
-
-DEFENCODING(( "BIG5",                   /* IANA, JDK 1.1 */
-              "BIG-5",                  /* glibc */
-              "BIG-FIVE",               /* glibc */
-              "BIGFIVE",                /* glibc */
-              "CN-BIG5",                /* RFC 1922 */
-              "csBig5",                 /* IANA */
-            ),
-            ces_big5,
-            { ces_big5_mbtowc, NULL },    { ces_big5_wctomb, NULL })
-
-DEFENCODING(( "CP950",                  /* JDK 1.1 */
-            ),
-            cp950,
-            { cp950_mbtowc, NULL },       { cp950_wctomb, NULL })
-
-DEFENCODING(( "BIG5-HKSCS:1999",
-            ),
-            big5hkscs1999,
-            { big5hkscs1999_mbtowc, big5hkscs1999_flushwc }, { big5hkscs1999_wctomb, big5hkscs1999_reset })
-
-DEFENCODING(( "BIG5-HKSCS:2001",
-            ),
-            big5hkscs2001,
-            { big5hkscs2001_mbtowc, big5hkscs2001_flushwc }, { big5hkscs2001_wctomb, big5hkscs2001_reset })
-
-DEFENCODING(( "BIG5-HKSCS",             /* IANA */
-              "BIG5HKSCS",              /* glibc */
-              "BIG5-HKSCS:2004",
-            ),
-            big5hkscs2004,
-            { big5hkscs2004_mbtowc, big5hkscs2004_flushwc }, { big5hkscs2004_wctomb, big5hkscs2004_reset })
-
-DEFENCODING(( "EUC-KR",                 /* IANA, RFC 1557 */
-              "EUCKR",                  /* glibc */
-              "csEUCKR",                /* IANA */
-            /*"EUC_KR",                    JDK 1.1 */
-            /*"CP51949",                   Windows */
-            ),
-            euc_kr,
-            { euc_kr_mbtowc, NULL },      { euc_kr_wctomb, NULL })
-
-DEFENCODING(( "CP949",                  /* JDK 1.1 */
-              "UHC",                    /* glibc */
-            ),
-            cp949,
-            { cp949_mbtowc, NULL },       { cp949_wctomb, NULL })
-
-DEFENCODING(( "JOHAB",                  /* glibc */
-              "CP1361",                 /* glibc */
-            ),
-            johab,
-            { johab_mbtowc, NULL },       { johab_wctomb, NULL })
-
-DEFENCODING(( "ISO-2022-KR",            /* IANA, RFC 1557 */
-              "csISO2022KR",            /* IANA */
-            /*"ISO2022KR",                 JDK 1.1 */
-            ),
-            iso2022_kr,
-            { iso2022_kr_mbtowc, NULL },  { iso2022_kr_wctomb, iso2022_kr_reset })
-
diff -urN libiconv-1.11.old/lib/encodings_dos.def libiconv-1.11.new/lib/encodings_dos.def
--- libiconv-1.11.old/lib/encodings_dos.def	2005-05-19 18:19:21.000000000 +0200
+++ libiconv-1.11.new/lib/encodings_dos.def	2007-11-11 14:57:20.000000000 +0100
@@ -26,102 +26,3 @@
             cp437,
             { cp437_mbtowc, NULL },       { cp437_wctomb, NULL })
 
-DEFENCODING(( "CP737",                  /* JDK 1.1 */
-            ),
-            cp737,
-            { cp737_mbtowc, NULL },       { cp737_wctomb, NULL })
-
-DEFENCODING(( "CP775",                  /* IANA, JDK 1.1 */
-              "IBM775",                 /* IANA */
-              "csPC775Baltic",          /* IANA */
-            ),
-            cp775,
-            { cp775_mbtowc, NULL },       { cp775_wctomb, NULL })
-
-DEFENCODING(( "CP852",                  /* IANA, JDK 1.1 */
-              "IBM852",                 /* IANA */
-              "852",                    /* IANA */
-              "csPCp852",               /* IANA */
-            ),
-            cp852,
-            { cp852_mbtowc, NULL },       { cp852_wctomb, NULL })
-
-DEFENCODING(( "CP853",
-            ),
-            cp853,
-            { cp853_mbtowc, NULL },       { cp853_wctomb, NULL })
-
-DEFENCODING(( "CP855",                  /* IANA, JDK 1.1 */
-              "IBM855",                 /* IANA */
-              "855",                    /* IANA */
-              "csIBM855",               /* IANA */
-            ),
-            cp855,
-            { cp855_mbtowc, NULL },       { cp855_wctomb, NULL })
-
-DEFENCODING(( "CP857",                  /* IANA, JDK 1.1 */
-              "IBM857",                 /* IANA */
-              "857",                    /* IANA */
-              "csIBM857",               /* IANA */
-            ),
-            cp857,
-            { cp857_mbtowc, NULL },       { cp857_wctomb, NULL })
-
-DEFENCODING(( "CP858",                  /* JDK 1.1.7 */
-            ),
-            cp858,
-            { cp858_mbtowc, NULL },       { cp858_wctomb, NULL })
-
-DEFENCODING(( "CP860",                  /* IANA, JDK 1.1 */
-              "IBM860",                 /* IANA */
-              "860",                    /* IANA */
-              "csIBM860",               /* IANA */
-            ),
-            cp860,
-            { cp860_mbtowc, NULL },       { cp860_wctomb, NULL })
-
-DEFENCODING(( "CP861",                  /* IANA, JDK 1.1 */
-              "IBM861",                 /* IANA */
-              "861",                    /* IANA */
-              "CP-IS",                  /* IANA */
-              "csIBM861",               /* IANA */
-            ),
-            cp861,
-            { cp861_mbtowc, NULL },       { cp861_wctomb, NULL })
-
-DEFENCODING(( "CP863",                  /* IANA, JDK 1.1 */
-              "IBM863",                 /* IANA */
-              "863",                    /* IANA */
-              "csIBM863",               /* IANA */
-            ),
-            cp863,
-            { cp863_mbtowc, NULL },       { cp863_wctomb, NULL })
-
-DEFENCODING(( "CP864",                  /* IANA, JDK 1.1 */
-              "IBM864",                 /* IANA */
-              "csIBM864",               /* IANA */
-            ),
-            cp864,
-            { cp864_mbtowc, NULL },       { cp864_wctomb, NULL })
-
-DEFENCODING(( "CP865",                  /* IANA, JDK 1.1 */
-              "IBM865",                 /* IANA */
-              "865",                    /* IANA */
-              "csIBM865",               /* IANA */
-            ),
-            cp865,
-            { cp865_mbtowc, NULL },       { cp865_wctomb, NULL })
-
-DEFENCODING(( "CP869",                  /* IANA, JDK 1.1 */
-              "IBM869",                 /* IANA */
-              "869",                    /* IANA */
-              "CP-GR",                  /* IANA */
-              "csIBM869",               /* IANA */
-            ),
-            cp869,
-            { cp869_mbtowc, NULL },       { cp869_wctomb, NULL })
-
-DEFENCODING(( "CP1125",                 /* ICU */
-            ),
-            cp1125,
-            { cp1125_mbtowc, NULL },      { cp1125_wctomb, NULL })
diff -urN libiconv-1.11.old/lib/loop_unicode.h libiconv-1.11.new/lib/loop_unicode.h
--- libiconv-1.11.old/lib/loop_unicode.h	2006-01-23 14:16:12.000000000 +0100
+++ libiconv-1.11.new/lib/loop_unicode.h	2007-11-11 14:28:10.000000000 +0100
@@ -24,14 +24,15 @@
 static int unicode_transliterate (conv_t cd, ucs4_t wc,
                                   unsigned char* outptr, size_t outleft)
 {
+/*
   if (cd->oflags & HAVE_HANGUL_JAMO) {
-    /* Decompose Hangul into Jamo. Use double-width Jamo (contained
+    /-* Decompose Hangul into Jamo. Use double-width Jamo (contained
        in all Korean encodings and ISO-2022-JP-2), not half-width Jamo
-       (contained in Unicode only). */
+       (contained in Unicode only). *-/
     ucs4_t buf[3];
     int ret = johab_hangul_decompose(cd,buf,wc);
     if (ret != RET_ILUNI) {
-      /* we know 1 <= ret <= 3 */
+      /-* we know 1 <= ret <= 3 *-/
       state_t backup_state = cd->ostate;
       unsigned char* backup_outptr = outptr;
       size_t backup_outleft = outleft;
@@ -57,9 +58,9 @@
     }
   }
   {
-    /* Try to use a variant, but postfix it with
+    /-* Try to use a variant, but postfix it with
        U+303E IDEOGRAPHIC VARIATION INDICATOR
-       (cf. Ken Lunde's "CJKV information processing", p. 188). */
+       (cf. Ken Lunde's "CJKV information processing", p. 188). *-/
     int indx = -1;
     if (wc == 0x3006)
       indx = 0;
@@ -105,20 +106,20 @@
     }
   }
   if (wc >= 0x2018 && wc <= 0x201a) {
-    /* Special case for quotation marks 0x2018, 0x2019, 0x201a */
+    /-* Special case for quotation marks 0x2018, 0x2019, 0x201a *-/
     ucs4_t substitute =
       (cd->oflags & HAVE_QUOTATION_MARKS
        ? (wc == 0x201a ? 0x2018 : wc)
        : (cd->oflags & HAVE_ACCENTS
-          ? (wc==0x2019 ? 0x00b4 : 0x0060) /* use accents */
-          : 0x0027 /* use apostrophe */
+          ? (wc==0x2019 ? 0x00b4 : 0x0060) /-* use accents *-/
+          : 0x0027 /-* use apostrophe *-/
       )  );
     int outcount = cd->ofuncs.xxx_wctomb(cd,outptr,substitute,outleft);
     if (outcount != RET_ILUNI)
       return outcount;
   }
   {
-    /* Use the transliteration table. */
+    /-* Use the transliteration table. *-/
     int indx = translit_index(wc);
     if (indx >= 0) {
       const unsigned int * cp = &translit_data[indx];
@@ -135,7 +136,7 @@
         }
         sub_outcount = cd->ofuncs.xxx_wctomb(cd,outptr,cp[i],outleft);
         if (sub_outcount == RET_ILUNI)
-          /* Recursive transliteration. */
+          /-* Recursive transliteration. *-/
           sub_outcount = unicode_transliterate(cd,cp[i],outptr,outleft);
         if (sub_outcount <= RET_ILUNI)
           goto translit_failed;
@@ -151,6 +152,7 @@
         return RET_TOOSMALL;
     }
   }
+*/
   return RET_ILUNI;
 }
 
