[package] libiconv, update to 1.11 package iconv and libcharset (#2671)

SVN-Revision: 14819

diff --git a/libs/libiconv/Makefile b/libs/libiconv/Makefile
index f651d475bd4adf700e6ba54f03630dc5b7f4c0e7..c0f922b232304ee02acd719d37f30ecf5ed8af20 100644 (file)
--- a/libs/libiconv/Makefile
+++ b/libs/libiconv/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,49 +9,77 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libiconv
-PKG_VERSION:=1.9.1
+PKG_VERSION:=1.11
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/libiconv
-PKG_MD5SUM:=0c99a05e0c3c153bac1c960f78711155
+PKG_MD5SUM:=b77a17e4a5a817100ad4b2613935055e
 
 PKG_FIXUP = libtool
 
 include $(INCLUDE_DIR)/package.mk
 
+define Package/libiconv/Default
+  URL:=http://www.gnu.org/software/libiconv/
+  TITLE:=Character set conversion
+endef
+
 define Package/libiconv
+  $(call Package/libiconv/Default)
   SECTION:=libs
   CATEGORY:=Libraries
-  TITLE:=Character set conversion library
-  URL:=http://www.gnu.org/software/libiconv/
+  TITLE+= library
 endef
 
-TARGET_CFLAGS += $(FPIC)
+define Package/libcharset
+  $(call Package/libiconv/Default)
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE+= library
+endef
+
+define Package/iconv
+  $(call Package/libiconv/Default)
+  DEPENDS:=+libiconv +libcharset
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE+= utility
+endef
+
+TARGET_CFLAGS += $(FPIC) -DUSE_DOS
 
 CONFIGURE_ARGS += \
        --enable-shared \
        --enable-static \
        --disable-rpath \
+       --enable-relocatable
 
 define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) CC="$(TARGET_CC)"
        $(MAKE) -C $(PKG_BUILD_DIR) \
-               includedir="$(PKG_INSTALL_DIR)/usr/include" \
-               libdir="$(PKG_INSTALL_DIR)/usr/lib" \
-               install-lib
+               CC="$(TARGET_CC)" \
+               DESTDIR="$(PKG_INSTALL_DIR)" \
+               install
 endef
 
 define Build/InstallDev
        mkdir -p $(1)/usr/lib/libiconv/include
        $(CP) $(PKG_INSTALL_DIR)/usr/include/iconv.h $(1)/usr/lib/libiconv/include/
        mkdir -p $(1)/usr/lib/libiconv/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcharset.{a,so*} $(1)/usr/lib/libiconv/lib/
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libiconv.{a,so*} $(1)/usr/lib/libiconv/lib/
 endef
 
+define Package/libcharset/install
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcharset.so* $(1)/usr/lib/
+endef
+
 define Package/libiconv/install
        $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libiconv.so.* $(1)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libiconv.so* $(1)/usr/lib/
 endef
 
+$(eval $(call BuildPackage,libcharset))
 $(eval $(call BuildPackage,libiconv))
+$(eval $(call BuildPackage,iconv))

diff --git a/libs/libiconv/patches/001-fix_avr32_compile b/libs/libiconv/patches/001-fix_avr32_compile
deleted file mode 100644 (file)
index 2850f61..0000000
--- a/libs/libiconv/patches/001-fix_avr32_compile
+++ /dev/null
@@ -1,40 +0,0 @@
---- libiconv-1.9.1/autoconf/config.sub.orig    2008-05-15 22:01:31.000000000 -0500
-+++ libiconv-1.9.1/autoconf/config.sub 2008-05-15 22:01:59.000000000 -0500
-@@ -228,7 +228,7 @@
-       | a29k \
-       | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-       | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
--      | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
-+      | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
-       | clipper \
-       | d10v | d30v | dlx | dsp16xx \
-       | fr30 | frv \
-@@ -294,7 +294,7 @@
-       | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-       | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-       | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
--      | avr-* \
-+      | avr-* | avr32-* \
-       | bs2000-* \
-       | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-       | clipper-* | cydra-* \
---- libiconv-1.9.1/libcharset/autoconf/config.sub.orig 2008-05-15 22:08:01.000000000 -0500
-+++ libiconv-1.9.1/libcharset/autoconf/config.sub      2008-05-15 22:08:28.000000000 -0500
-@@ -228,7 +228,7 @@
-       | a29k \
-       | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-       | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
--      | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
-+      | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
-       | clipper \
-       | d10v | d30v | dlx | dsp16xx \
-       | fr30 | frv \
-@@ -294,7 +294,7 @@
-       | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-       | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-       | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
--      | avr-* \
-+      | avr-* | avr32-* \
-       | bs2000-* \
-       | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-       | clipper-* | cydra-* \

diff --git a/libs/libiconv/patches/100-strip_charsets.patch b/libs/libiconv/patches/100-strip_charsets.patch
index 1b8b0fd0bc975a2c5603cd1670aed7ffc8615809..c9aa22f2013be3f912640f22ce210f3bf6b323b4 100644 (file)
--- a/libs/libiconv/patches/100-strip_charsets.patch
+++ b/libs/libiconv/patches/100-strip_charsets.patch
@@ -1,6 +1,57 @@
-diff -Nur libiconv-1.9.1-orig/lib/aliases.gperf libiconv-1.9.1-nocompile/lib/aliases.gperf
---- libiconv-1.9.1-orig/lib/aliases.gperf      2003-05-22 22:17:15.000000000 +0200
-+++ libiconv-1.9.1-nocompile/lib/aliases.gperf 2006-03-05 15:50:42.000000000 +0100
+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
@@ -10,18 +61,10 @@ diff -Nur libiconv-1.9.1-orig/lib/aliases.gperf libiconv-1.9.1-nocompile/lib/ali
  ISO-8859-1, ei_iso8859_1
  ISO_8859-1, ei_iso8859_1
  ISO_8859-1:1987, ei_iso8859_1
-@@ -60,276 +58,5 @@
- L1, ei_iso8859_1
- CSISOLATIN1, ei_iso8859_1
- ISO8859-1, ei_iso8859_1
--ISO-8859-2, ei_iso8859_2
--ISO_8859-2, ei_iso8859_2
--ISO_8859-2:1987, ei_iso8859_2
--ISO-IR-101, ei_iso8859_2
--LATIN2, ei_iso8859_2
--L2, ei_iso8859_2
--CSISOLATIN2, ei_iso8859_2
--ISO8859-2, ei_iso8859_2
+@@ -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
@@ -57,6 +100,7 @@ diff -Nur libiconv-1.9.1-orig/lib/aliases.gperf libiconv-1.9.1-nocompile/lib/ali
 -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
@@ -87,6 +131,9 @@ diff -Nur libiconv-1.9.1-orig/lib/aliases.gperf libiconv-1.9.1-nocompile/lib/ali
 -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
@@ -101,23 +148,26 @@ diff -Nur libiconv-1.9.1-orig/lib/aliases.gperf libiconv-1.9.1-nocompile/lib/ali
 -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
--ISO8859-15, ei_iso8859_15
+ 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:2000, 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-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
+ CP1250, ei_cp1250
+ WINDOWS-1250, ei_cp1250
+ MS-EE, ei_cp1250
 -CP1251, ei_cp1251
 -WINDOWS-1251, ei_cp1251
 -MS-CYRL, ei_cp1251
@@ -177,6 +227,11 @@ diff -Nur libiconv-1.9.1-orig/lib/aliases.gperf libiconv-1.9.1-nocompile/lib/ali
 -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
@@ -257,7 +312,9 @@ diff -Nur libiconv-1.9.1-orig/lib/aliases.gperf libiconv-1.9.1-nocompile/lib/ali
 -CN-GB, ei_euc_cn
 -CSGB2312, ei_euc_cn
 -GBK, ei_ces_gbk
--CP936, 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
@@ -274,8 +331,11 @@ diff -Nur libiconv-1.9.1-orig/lib/aliases.gperf libiconv-1.9.1-nocompile/lib/ali
 -CN-BIG5, ei_ces_big5
 -CSBIG5, ei_ces_big5
 -CP950, ei_cp950
--BIG5-HKSCS, ei_big5hkscs
--BIG5HKSCS, ei_big5hkscs
+-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
@@ -287,74 +347,68 @@ diff -Nur libiconv-1.9.1-orig/lib/aliases.gperf libiconv-1.9.1-nocompile/lib/ali
 -CSISO2022KR, ei_iso2022_kr
  CHAR, ei_local_char
  WCHAR_T, ei_local_wchar_t
-diff -Nur libiconv-1.9.1-orig/lib/aliases.h libiconv-1.9.1-nocompile/lib/aliases.h
---- libiconv-1.9.1-orig/lib/aliases.h  2003-05-22 22:17:17.000000000 +0200
-+++ libiconv-1.9.1-nocompile/lib/aliases.h     2006-03-05 15:50:42.000000000 +0100
+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 */
--/* Command-line: gperf -m 10 lib/aliases.gperf  */
+ /* ANSI-C code produced by gperf version 3.0.2 */
+ /* Command-line: gperf -m 10 lib/aliases.gperf  */
 -/* Computed positions: -k'1,3-11,$' */
-+/* ANSI-C code produced by gperf version 3.0.1 */
-+/* Command-line: gperf -m 10 aliases.gperf  */
-+/* Computed positions: -k'4-7,$' */
++/* Computed positions: -k'4-7,10,$' */
  
  #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
        && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
-@@ -29,15 +29,15 @@
- #error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
- #endif
- 
--#line 1 "lib/aliases.gperf"
-+#line 1 "aliases.gperf"
+@@ -32,12 +32,12 @@
+ #line 1 "lib/aliases.gperf"
  struct alias { int name; unsigned int encoding_index; };
  
--#define TOTAL_KEYWORDS 324
-+#define TOTAL_KEYWORDS 51
+-#define TOTAL_KEYWORDS 341
++#define TOTAL_KEYWORDS 70
  #define MIN_WORD_LENGTH 2
 -#define MAX_WORD_LENGTH 45
--#define MIN_HASH_VALUE 15
--#define MAX_HASH_VALUE 879
--/* maximum key range = 865, duplicates = 0 */
+-#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 67
-+/* maximum key range = 64, duplicates = 0 */
++#define MAX_HASH_VALUE 98
++/* maximum key range = 95, duplicates = 0 */
  
  #ifdef __GNUC__
  __inline
-@@ -49,39 +49,27 @@
+@@ -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[] =
      {
--      880, 880, 880, 880, 880, 880, 880, 880, 880, 880,
--      880, 880, 880, 880, 880, 880, 880, 880, 880, 880,
--      880, 880, 880, 880, 880, 880, 880, 880, 880, 880,
--      880, 880, 880, 880, 880, 880, 880, 880, 880, 880,
--      880, 880, 880, 880, 880,   6,  69, 880,  44,   5,
--        6,  18,  60,   9,   8,  50,  14,  13, 271, 880,
--      880, 880, 880, 880, 880, 107, 152,   5,  29,   7,
--       43, 112,  42,   5, 341, 106,  10, 158,   8,   5,
--        6, 880,  61,  38,  98, 152, 194, 112,  30,  10,
--        6, 880, 880, 880, 880,  60, 880, 880, 880, 880,
--      880, 880, 880, 880, 880, 880, 880, 880, 880, 880,
--      880, 880, 880, 880, 880, 880, 880, 880, 880, 880,
--      880, 880, 880, 880, 880, 880, 880, 880
-+      68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-+      68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-+      68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-+      68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-+      68, 68, 68, 68, 68,  3, 68, 68, 32,  2,
-+       3, 27,  2, 13,  5, 10,  4, 18, 68, 68,
-+      68, 68, 68, 68, 68, 33, 24,  2,  5,  2,
-+      68,  4, 68,  2, 68, 68,  2, 68, 11, 11,
-+      68, 68,  3,  5,  2, 68, 68, 68,  2, 68,
-+      68, 68, 68, 68, 68, 16, 68, 68, 68, 68,
-+      68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-+      68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-+      68, 68, 68, 68, 68, 68, 68, 68
+-      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;
  
@@ -364,19 +418,18 @@ diff -Nur libiconv-1.9.1-orig/lib/aliases.h libiconv-1.9.1-nocompile/lib/aliases
 -        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[9]];
+       /*FALLTHROUGH*/
+       case 9:
 -        hval += asso_values[(unsigned char)str[8]];
 -      /*FALLTHROUGH*/
--      case 8:
+       case 8:
 -        hval += asso_values[(unsigned char)str[7]];
 -      /*FALLTHROUGH*/
--      case 7:
+       case 7:
          hval += asso_values[(unsigned char)str[6]];
        /*FALLTHROUGH*/
-       case 6:
-@@ -94,11 +82,7 @@
+@@ -94,11 +87,7 @@
          hval += asso_values[(unsigned char)str[3]];
        /*FALLTHROUGH*/
        case 3:
@@ -388,1566 +441,1798 @@ diff -Nur libiconv-1.9.1-orig/lib/aliases.h libiconv-1.9.1-nocompile/lib/aliases
          break;
      }
    return hval + asso_values[(unsigned char)str[len - 1]];
-@@ -106,1479 +90,227 @@
+@@ -106,1576 +95,306 @@
  
  struct stringpool_t
    {
--    char stringpool_str15[sizeof("CN")];
--    char stringpool_str17[sizeof("L1")];
--    char stringpool_str18[sizeof("L2")];
--    char stringpool_str20[sizeof("L6")];
--    char stringpool_str21[sizeof("L5")];
--    char stringpool_str26[sizeof("L8")];
--    char stringpool_str29[sizeof("862")];
--    char stringpool_str30[sizeof("L3")];
--    char stringpool_str33[sizeof("866")];
--    char stringpool_str34[sizeof("C99")];
--    char stringpool_str38[sizeof("EUCCN")];
--    char stringpool_str41[sizeof("CP1251")];
--    char stringpool_str43[sizeof("CP1252")];
--    char stringpool_str44[sizeof("CP862")];
--    char stringpool_str45[sizeof("EUC-CN")];
--    char stringpool_str47[sizeof("CP1256")];
--    char stringpool_str48[sizeof("CP866")];
--    char stringpool_str49[sizeof("CP1255")];
--    char stringpool_str50[sizeof("HZ")];
--    char stringpool_str52[sizeof("CP1361")];
--    char stringpool_str53[sizeof("CP932")];
--    char stringpool_str55[sizeof("CP819")];
--    char stringpool_str57[sizeof("CP936")];
--    char stringpool_str58[sizeof("X0212")];
--    char stringpool_str59[sizeof("CP1258")];
--    char stringpool_str62[sizeof("L7")];
--    char stringpool_str67[sizeof("CP1253")];
--    char stringpool_str72[sizeof("L4")];
--    char stringpool_str75[sizeof("CP1133")];
--    char stringpool_str77[sizeof("R8")];
--    char stringpool_str84[sizeof("CHINESE")];
--    char stringpool_str85[sizeof("ISO8859-1")];
--    char stringpool_str87[sizeof("ISO8859-2")];
--    char stringpool_str91[sizeof("ISO8859-6")];
--    char stringpool_str92[sizeof("ISO-8859-1")];
--    char stringpool_str93[sizeof("ISO8859-5")];
--    char stringpool_str94[sizeof("ISO-8859-2")];
--    char stringpool_str95[sizeof("X0201")];
--    char stringpool_str97[sizeof("ISO8859-16")];
--    char stringpool_str98[sizeof("ISO-8859-6")];
--    char stringpool_str99[sizeof("ISO8859-15")];
--    char stringpool_str100[sizeof("ISO-8859-5")];
--    char stringpool_str101[sizeof("ISO8859-9")];
--    char stringpool_str103[sizeof("ISO8859-8")];
--    char stringpool_str104[sizeof("ISO-8859-16")];
--    char stringpool_str105[sizeof("850")];
--    char stringpool_str106[sizeof("ISO-8859-15")];
--    char stringpool_str108[sizeof("ISO-8859-9")];
--    char stringpool_str109[sizeof("CP949")];
--    char stringpool_str110[sizeof("ISO-8859-8")];
--    char stringpool_str111[sizeof("ISO8859-3")];
--    char stringpool_str112[sizeof("ISO-IR-6")];
--    char stringpool_str113[sizeof("X0208")];
--    char stringpool_str114[sizeof("CYRILLIC")];
--    char stringpool_str116[sizeof("ISO-2022-CN")];
--    char stringpool_str117[sizeof("ISO8859-13")];
--    char stringpool_str118[sizeof("ISO-8859-3")];
--    char stringpool_str119[sizeof("CP1250")];
--    char stringpool_str120[sizeof("CP950")];
--    char stringpool_str121[sizeof("CP850")];
--    char stringpool_str122[sizeof("ISO646-CN")];
--    char stringpool_str123[sizeof("SJIS")];
--    char stringpool_str124[sizeof("ISO-8859-13")];
--    char stringpool_str125[sizeof("ISO-IR-126")];
--    char stringpool_str126[sizeof("ISO-IR-226")];
--    char stringpool_str127[sizeof("ISO-IR-166")];
--    char stringpool_str129[sizeof("ISO-IR-165")];
--    char stringpool_str131[sizeof("CP1257")];
--    char stringpool_str132[sizeof("ASCII")];
--    char stringpool_str134[sizeof("ISO-IR-58")];
--    char stringpool_str136[sizeof("CP367")];
--    char stringpool_str137[sizeof("LATIN1")];
--    char stringpool_str138[sizeof("ISO-IR-159")];
--    char stringpool_str139[sizeof("LATIN2")];
--    char stringpool_str142[sizeof("ISO-IR-199")];
--    char stringpool_str143[sizeof("LATIN6")];
--    char stringpool_str145[sizeof("LATIN5")];
--    char stringpool_str146[sizeof("ISO_8859-1")];
--    char stringpool_str147[sizeof("CSISO2022CN")];
--    char stringpool_str148[sizeof("ISO_8859-2")];
--    char stringpool_str149[sizeof("ISO-IR-138")];
--    char stringpool_str151[sizeof("CP1254")];
--    char stringpool_str152[sizeof("ISO_8859-6")];
--    char stringpool_str154[sizeof("ISO_8859-5")];
--    char stringpool_str155[sizeof("LATIN8")];
--    char stringpool_str157[sizeof("ISO-IR-101")];
--    char stringpool_str158[sizeof("ISO_8859-16")];
--    char stringpool_str159[sizeof("GB2312")];
--    char stringpool_str160[sizeof("ISO_8859-15")];
--    char stringpool_str161[sizeof("ISO-CELTIC")];
--    char stringpool_str162[sizeof("ISO_8859-9")];
--    char stringpool_str163[sizeof("LATIN3")];
--    char stringpool_str164[sizeof("ISO_8859-8")];
--    char stringpool_str165[sizeof("UHC")];
--    char stringpool_str169[sizeof("ISO8859-10")];
--    char stringpool_str170[sizeof("ISO_8859-15:1998")];
--    char stringpool_str171[sizeof("MAC")];
--    char stringpool_str172[sizeof("ISO_8859-3")];
--    char stringpool_str173[sizeof("ISO-IR-109")];
--    char stringpool_str175[sizeof("ISO8859-7")];
--    char stringpool_str176[sizeof("ISO-8859-10")];
--    char stringpool_str177[sizeof("CSASCII")];
--    char stringpool_str178[sizeof("ISO_8859-13")];
--    char stringpool_str179[sizeof("ISO-IR-179")];
--    char stringpool_str182[sizeof("ISO-8859-7")];
--    char stringpool_str184[sizeof("ISO-IR-203")];
--    char stringpool_str189[sizeof("ISO-IR-149")];
--    char stringpool_str190[sizeof("MS-EE")];
--    char stringpool_str191[sizeof("ISO-IR-148")];
--    char stringpool_str192[sizeof("US")];
--    char stringpool_str194[sizeof("CP874")];
--    char stringpool_str195[sizeof("ISO8859-4")];
--    char stringpool_str196[sizeof("ISO-IR-110")];
--    char stringpool_str197[sizeof("ISO_8859-10:1992")];
--    char stringpool_str199[sizeof("ISO_8859-16:2000")];
--    char stringpool_str201[sizeof("ISO8859-14")];
--    char stringpool_str202[sizeof("ISO-8859-4")];
--    char stringpool_str203[sizeof("IBM862")];
--    char stringpool_str206[sizeof("ISO-IR-57")];
--    char stringpool_str207[sizeof("IBM866")];
--    char stringpool_str208[sizeof("ISO-8859-14")];
--    char stringpool_str209[sizeof("ISO-IR-127")];
--    char stringpool_str210[sizeof("ISO-2022-CN-EXT")];
--    char stringpool_str211[sizeof("ISO-IR-87")];
--    char stringpool_str212[sizeof("ISO-IR-157")];
--    char stringpool_str213[sizeof("UCS-2")];
--    char stringpool_str214[sizeof("IBM819")];
--    char stringpool_str221[sizeof("ISO_8859-14:1998")];
--    char stringpool_str222[sizeof("ISO-IR-14")];
--    char stringpool_str225[sizeof("ELOT_928")];
--    char stringpool_str227[sizeof("LATIN7")];
--    char stringpool_str228[sizeof("UTF-16")];
--    char stringpool_str230[sizeof("ISO_8859-10")];
--    char stringpool_str232[sizeof("CSUNICODE")];
--    char stringpool_str233[sizeof("UCS-2LE")];
--    char stringpool_str234[sizeof("UTF-8")];
--    char stringpool_str235[sizeof("ISO-IR-100")];
--    char stringpool_str236[sizeof("ISO_8859-7")];
--    char stringpool_str237[sizeof("UTF-32")];
--    char stringpool_str238[sizeof("CHAR")];
--    char stringpool_str241[sizeof("UNICODE-1-1")];
--    char stringpool_str242[sizeof("CSUNICODE11")];
--    char stringpool_str244[sizeof("TIS620")];
--    char stringpool_str245[sizeof("EUCKR")];
--    char stringpool_str246[sizeof("UTF-16LE")];
--    char stringpool_str247[sizeof("LATIN4")];
--    char stringpool_str250[sizeof("KSC_5601")];
--    char stringpool_str251[sizeof("TIS-620")];
--    char stringpool_str252[sizeof("EUC-KR")];
--    char stringpool_str254[sizeof("IBM-CP1133")];
--    char stringpool_str256[sizeof("ISO_8859-4")];
--    char stringpool_str257[sizeof("UTF-32LE")];
--    char stringpool_str258[sizeof("VISCII")];
--    char stringpool_str259[sizeof("KOI8-R")];
--    char stringpool_str262[sizeof("ISO_8859-14")];
--    char stringpool_str264[sizeof("CSKOI8R")];
--    char stringpool_str266[sizeof("GREEK8")];
--    char stringpool_str267[sizeof("MS-CYRL")];
--    char stringpool_str270[sizeof("CSVISCII")];
--    char stringpool_str280[sizeof("IBM850")];
--    char stringpool_str283[sizeof("ISO-IR-144")];
--    char stringpool_str286[sizeof("BIG5")];
--    char stringpool_str287[sizeof("UCS-4LE")];
--    char stringpool_str288[sizeof("GB18030")];
--    char stringpool_str290[sizeof("MACCYRILLIC")];
--    char stringpool_str291[sizeof("CSUNICODE11UTF7")];
--    char stringpool_str292[sizeof("UNICODE-1-1-UTF-7")];
--    char stringpool_str293[sizeof("BIG-5")];
--    char stringpool_str295[sizeof("IBM367")];
--    char stringpool_str296[sizeof("TIS620-0")];
--    char stringpool_str298[sizeof("CSBIG5")];
--    char stringpool_str299[sizeof("NEXTSTEP")];
--    char stringpool_str301[sizeof("CSKSC56011987")];
--    char stringpool_str302[sizeof("CSISOLATIN1")];
--    char stringpool_str303[sizeof("KOREAN")];
--    char stringpool_str304[sizeof("CSISOLATIN2")];
--    char stringpool_str305[sizeof("CN-BIG5")];
--    char stringpool_str306[sizeof("UTF-7")];
--    char stringpool_str308[sizeof("CSISOLATIN6")];
--    char stringpool_str309[sizeof("CSISOLATINCYRILLIC")];
--    char stringpool_str310[sizeof("CSISOLATIN5")];
--    char stringpool_str312[sizeof("TCVN")];
--    char stringpool_str315[sizeof("TIS620.2529-1")];
--    char stringpool_str318[sizeof("CSGB2312")];
--    char stringpool_str320[sizeof("ISO-10646-UCS-2")];
--    char stringpool_str321[sizeof("UCS-4")];
--    char stringpool_str322[sizeof("MULELAO-1")];
--    char stringpool_str323[sizeof("ISO-2022-KR")];
--    char stringpool_str324[sizeof("ECMA-118")];
--    char stringpool_str325[sizeof("GB_2312-80")];
--    char stringpool_str326[sizeof("CSUCS4")];
--    char stringpool_str327[sizeof("GBK")];
--    char stringpool_str328[sizeof("CSISOLATIN3")];
--    char stringpool_str329[sizeof("ISO646-US")];
--    char stringpool_str331[sizeof("US-ASCII")];
--    char stringpool_str332[sizeof("TIS620.2533-1")];
--    char stringpool_str333[sizeof("KOI8-T")];
--    char stringpool_str334[sizeof("MS-ANSI")];
--    char stringpool_str335[sizeof("KS_C_5601-1989")];
--    char stringpool_str336[sizeof("GB_1988-80")];
--    char stringpool_str339[sizeof("EUCTW")];
--    char stringpool_str343[sizeof("GREEK")];
--    char stringpool_str346[sizeof("EUC-TW")];
--    char stringpool_str347[sizeof("WINDOWS-1251")];
--    char stringpool_str348[sizeof("WINDOWS-1252")];
--    char stringpool_str349[sizeof("JP")];
--    char stringpool_str350[sizeof("WINDOWS-1256")];
--    char stringpool_str351[sizeof("WINDOWS-1255")];
--    char stringpool_str353[sizeof("VISCII1.1-1")];
--    char stringpool_str354[sizeof("CSISO2022KR")];
--    char stringpool_str356[sizeof("WINDOWS-1258")];
--    char stringpool_str360[sizeof("WINDOWS-1253")];
--    char stringpool_str361[sizeof("ARMSCII-8")];
--    char stringpool_str366[sizeof("CSIBM866")];
--    char stringpool_str368[sizeof("ROMAN8")];
--    char stringpool_str369[sizeof("HZ-GB-2312")];
--    char stringpool_str370[sizeof("EUCJP")];
--    char stringpool_str371[sizeof("TIS620.2533-0")];
--    char stringpool_str372[sizeof("KS_C_5601-1987")];
--    char stringpool_str373[sizeof("MACICELAND")];
--    char stringpool_str374[sizeof("ISO-10646-UCS-4")];
--    char stringpool_str375[sizeof("UCS-2BE")];
--    char stringpool_str377[sizeof("EUC-JP")];
--    char stringpool_str386[sizeof("WINDOWS-1250")];
--    char stringpool_str387[sizeof("ARABIC")];
--    char stringpool_str388[sizeof("UTF-16BE")];
--    char stringpool_str391[sizeof("TCVN-5712")];
--    char stringpool_str392[sizeof("WINDOWS-1257")];
--    char stringpool_str394[sizeof("CSPC862LATINHEBREW")];
--    char stringpool_str396[sizeof("TCVN5712-1")];
--    char stringpool_str399[sizeof("UTF-32BE")];
--    char stringpool_str402[sizeof("WINDOWS-1254")];
--    char stringpool_str404[sizeof("CSEUCKR")];
--    char stringpool_str406[sizeof("ASMO-708")];
--    char stringpool_str409[sizeof("CSISOLATINARABIC")];
--    char stringpool_str410[sizeof("MACINTOSH")];
--    char stringpool_str411[sizeof("UCS-2-INTERNAL")];
--    char stringpool_str412[sizeof("CSISOLATIN4")];
--    char stringpool_str416[sizeof("ECMA-114")];
--    char stringpool_str418[sizeof("CN-GB-ISOIR165")];
--    char stringpool_str420[sizeof("ANSI_X3.4-1986")];
--    char stringpool_str421[sizeof("CSISO57GB1988")];
--    char stringpool_str423[sizeof("CSISO58GB231280")];
--    char stringpool_str424[sizeof("HP-ROMAN8")];
--    char stringpool_str426[sizeof("ANSI_X3.4-1968")];
--    char stringpool_str427[sizeof("MACTHAI")];
--    char stringpool_str429[sizeof("UCS-4BE")];
--    char stringpool_str430[sizeof("CSHPROMAN8")];
--    char stringpool_str432[sizeof("CN-GB")];
--    char stringpool_str434[sizeof("UNICODELITTLE")];
--    char stringpool_str435[sizeof("ISO_8859-5:1988")];
--    char stringpool_str438[sizeof("ISO_8859-9:1989")];
--    char stringpool_str440[sizeof("ISO_8859-8:1988")];
--    char stringpool_str441[sizeof("KOI8-U")];
--    char stringpool_str444[sizeof("ISO_8859-3:1988")];
--    char stringpool_str448[sizeof("ISO-2022-JP")];
--    char stringpool_str449[sizeof("ISO-2022-JP-1")];
--    char stringpool_str450[sizeof("ISO-2022-JP-2")];
--    char stringpool_str451[sizeof("CSISOLATINHEBREW")];
--    char stringpool_str454[sizeof("ISO646-JP")];
--    char stringpool_str457[sizeof("EXTENDED_UNIX_CODE_PACKED_FORMAT_FOR_JAPANESE")];
--    char stringpool_str465[sizeof("UCS-4-INTERNAL")];
--    char stringpool_str467[sizeof("ISO_8859-1:1987")];
--    char stringpool_str468[sizeof("ISO_8859-2:1987")];
--    char stringpool_str470[sizeof("ISO_8859-6:1987")];
--    char stringpool_str479[sizeof("CSISO2022JP")];
--    char stringpool_str480[sizeof("CSISO2022JP2")];
--    char stringpool_str486[sizeof("ISO_8859-4:1988")];
--    char stringpool_str489[sizeof("MACCENTRALEUROPE")];
--    char stringpool_str492[sizeof("HEBREW")];
--    char stringpool_str494[sizeof("MS-HEBR")];
--    char stringpool_str496[sizeof("ISO_646.IRV:1991")];
--    char stringpool_str498[sizeof("CSEUCTW")];
--    char stringpool_str503[sizeof("KOI8-RU")];
--    char stringpool_str505[sizeof("WINDOWS-874")];
--    char stringpool_str508[sizeof("JIS0208")];
--    char stringpool_str509[sizeof("GEORGIAN-PS")];
--    char stringpool_str512[sizeof("ISO_8859-7:1987")];
--    char stringpool_str514[sizeof("CSISOLATINGREEK")];
--    char stringpool_str515[sizeof("JIS_C6226-1983")];
--    char stringpool_str518[sizeof("MACROMAN")];
--    char stringpool_str519[sizeof("UCS-2-SWAPPED")];
--    char stringpool_str524[sizeof("CSMACINTOSH")];
--    char stringpool_str527[sizeof("BIGFIVE")];
--    char stringpool_str528[sizeof("CSISO159JISX02121990")];
--    char stringpool_str529[sizeof("CSISO14JISC6220RO")];
--    char stringpool_str530[sizeof("CSPC850MULTILINGUAL")];
--    char stringpool_str534[sizeof("BIG-FIVE")];
--    char stringpool_str541[sizeof("JIS_C6220-1969-RO")];
--    char stringpool_str545[sizeof("JIS_X0212")];
--    char stringpool_str549[sizeof("BIG5HKSCS")];
--    char stringpool_str553[sizeof("JISX0201-1976")];
--    char stringpool_str554[sizeof("GEORGIAN-ACADEMY")];
--    char stringpool_str556[sizeof("BIG5-HKSCS")];
--    char stringpool_str560[sizeof("CSISO87JISX0208")];
--    char stringpool_str570[sizeof("MACGREEK")];
--    char stringpool_str571[sizeof("MS-GREEK")];
--    char stringpool_str573[sizeof("UCS-4-SWAPPED")];
--    char stringpool_str578[sizeof("MACCROATIAN")];
--    char stringpool_str582[sizeof("JIS_X0201")];
--    char stringpool_str585[sizeof("WCHAR_T")];
--    char stringpool_str594[sizeof("UNICODEBIG")];
--    char stringpool_str599[sizeof("JIS_X0212-1990")];
--    char stringpool_str600[sizeof("JIS_X0208")];
--    char stringpool_str614[sizeof("MACARABIC")];
--    char stringpool_str619[sizeof("CSHALFWIDTHKATAKANA")];
--    char stringpool_str620[sizeof("JIS_X0208-1983")];
--    char stringpool_str621[sizeof("SHIFT-JIS")];
--    char stringpool_str626[sizeof("MACUKRAINE")];
--    char stringpool_str635[sizeof("CSEUCPKDFMTJAPANESE")];
--    char stringpool_str646[sizeof("JIS_X0208-1990")];
--    char stringpool_str663[sizeof("CSSHIFTJIS")];
--    char stringpool_str664[sizeof("JIS_X0212.1990-0")];
--    char stringpool_str665[sizeof("MACHEBREW")];
--    char stringpool_str675[sizeof("SHIFT_JIS")];
--    char stringpool_str685[sizeof("TCVN5712-1:1993")];
--    char stringpool_str694[sizeof("MS-TURK")];
--    char stringpool_str717[sizeof("MACTURKISH")];
--    char stringpool_str731[sizeof("MACROMANIA")];
--    char stringpool_str750[sizeof("MS-ARAB")];
--    char stringpool_str753[sizeof("JAVA")];
--    char stringpool_str798[sizeof("MS_KANJI")];
--    char stringpool_str799[sizeof("JOHAB")];
--    char stringpool_str879[sizeof("WINBALTRIM")];
-+    char stringpool_str4[sizeof("L1")];
-+    char stringpool_str7[sizeof("US")];
-+    char stringpool_str10[sizeof("CHAR")];
-+    char stringpool_str11[sizeof("ASCII")];
-+    char stringpool_str12[sizeof("UCS-4")];
-+    char stringpool_str14[sizeof("UCS-2")];
-+    char stringpool_str16[sizeof("UTF-8")];
-+    char stringpool_str17[sizeof("CSUCS4")];
-+    char stringpool_str18[sizeof("UCS-4LE")];
-+    char stringpool_str19[sizeof("UCS-2LE")];
-+    char stringpool_str20[sizeof("CSASCII")];
-+    char stringpool_str21[sizeof("UTF-16")];
-+    char stringpool_str22[sizeof("UTF-16LE")];
-+    char stringpool_str23[sizeof("LATIN1")];
-+    char stringpool_str24[sizeof("ISO-IR-6")];
-+    char stringpool_str26[sizeof("UCS-4-INTERNAL")];
-+    char stringpool_str27[sizeof("UCS-2-INTERNAL")];
-+    char stringpool_str28[sizeof("UTF-7")];
-+    char stringpool_str29[sizeof("ISO646-US")];
-+    char stringpool_str30[sizeof("CP367")];
-+    char stringpool_str31[sizeof("UCS-4-SWAPPED")];
-+    char stringpool_str32[sizeof("UCS-2-SWAPPED")];
-+    char stringpool_str33[sizeof("UNICODE-1-1")];
-+    char stringpool_str34[sizeof("UNICODEBIG")];
-+    char stringpool_str35[sizeof("UNICODELITTLE")];
-+    char stringpool_str36[sizeof("ISO-8859-1")];
-+    char stringpool_str37[sizeof("CSUNICODE")];
-+    char stringpool_str39[sizeof("CSUNICODE11")];
-+    char stringpool_str40[sizeof("UCS-4BE")];
-+    char stringpool_str41[sizeof("UCS-2BE")];
-+    char stringpool_str42[sizeof("UTF-32")];
-+    char stringpool_str43[sizeof("CP819")];
-+    char stringpool_str44[sizeof("UTF-16BE")];
-+    char stringpool_str45[sizeof("UTF-32LE")];
-+    char stringpool_str46[sizeof("ISO_646.IRV:1991")];
-+    char stringpool_str47[sizeof("UNICODE-1-1-UTF-7")];
-+    char stringpool_str48[sizeof("IBM819")];
-+    char stringpool_str49[sizeof("ISO_8859-1")];
-+    char stringpool_str50[sizeof("ISO8859-1")];
-+    char stringpool_str51[sizeof("CSUNICODE11UTF7")];
-+    char stringpool_str52[sizeof("US-ASCII")];
-+    char stringpool_str53[sizeof("ISO-IR-100")];
-+    char stringpool_str58[sizeof("IBM367")];
-+    char stringpool_str59[sizeof("ISO-10646-UCS-4")];
-+    char stringpool_str60[sizeof("ISO-10646-UCS-2")];
-+    char stringpool_str62[sizeof("ISO_8859-1:1987")];
-+    char stringpool_str63[sizeof("WCHAR_T")];
-+    char stringpool_str64[sizeof("CSISOLATIN1")];
-+    char stringpool_str65[sizeof("ANSI_X3.4-1968")];
-+    char stringpool_str66[sizeof("ANSI_X3.4-1986")];
-+    char stringpool_str67[sizeof("UTF-32BE")];
+-    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 =
    {
--    "CN",
-     "L1",
--    "L2",
 -    "L6",
--    "L5",
--    "L8",
--    "862",
--    "L3",
--    "866",
--    "C99",
--    "EUCCN",
--    "CP1251",
--    "CP1252",
--    "CP862",
--    "EUC-CN",
--    "CP1256",
--    "CP866",
--    "CP1255",
+-    "L1",
 -    "HZ",
--    "CP1361",
--    "CP932",
--    "CP819",
--    "CP936",
--    "X0212",
--    "CP1258",
--    "L7",
--    "CP1253",
 -    "L4",
--    "CP1133",
+-    "L5",
 -    "R8",
--    "CHINESE",
--    "ISO8859-1",
--    "ISO8859-2",
--    "ISO8859-6",
--    "ISO-8859-1",
--    "ISO8859-5",
--    "ISO-8859-2",
--    "X0201",
--    "ISO8859-16",
--    "ISO-8859-6",
--    "ISO8859-15",
--    "ISO-8859-5",
--    "ISO8859-9",
--    "ISO8859-8",
--    "ISO-8859-16",
--    "850",
--    "ISO-8859-15",
--    "ISO-8859-9",
--    "CP949",
--    "ISO-8859-8",
--    "ISO8859-3",
--    "ISO-IR-6",
--    "X0208",
--    "CYRILLIC",
--    "ISO-2022-CN",
--    "ISO8859-13",
--    "ISO-8859-3",
--    "CP1250",
--    "CP950",
--    "CP850",
--    "ISO646-CN",
+-    "L8",
+-    "866",
+     "L2",
 -    "SJIS",
--    "ISO-8859-13",
--    "ISO-IR-126",
--    "ISO-IR-226",
+-    "ISO-IR-6",
 -    "ISO-IR-166",
+-    "LATIN6",
+-    "LATIN1",
+-    "ISO-IR-14",
+-    "L3",
+-    "LATIN4",
 -    "ISO-IR-165",
--    "CP1257",
--    "ASCII",
+-    "LATIN5",
+-    "ISO-IR-126",
+-    "862",
+-    "ISO-IR-144",
+-    "LATIN8",
 -    "ISO-IR-58",
--    "CP367",
--    "LATIN1",
+-    "ISO-IR-148",
+-    "L7",
+-    "LATIN-9",
+-    "ISO-IR-149",
 -    "ISO-IR-159",
+-    "ISO-IR-226",
 -    "LATIN2",
+-    "ISO8859-6",
 -    "ISO-IR-199",
--    "LATIN6",
--    "LATIN5",
--    "ISO_8859-1",
--    "CSISO2022CN",
--    "ISO_8859-2",
--    "ISO-IR-138",
--    "CP1254",
++    "L1",
++    "MS-EE",
++    "CP819",
++    "UCS-2",
++    "IBM819",
++    "UTF-8",
++    "UTF-32",
++    "UTF-16",
++    "CP367",
++    "ISO8859-2",
+     "ISO8859-1",
+-    "ISO-8859-6",
 -    "ISO_8859-6",
--    "ISO_8859-5",
--    "LATIN8",
--    "ISO-IR-101",
+-    "ISO8859-16",
+-    "PT154",
+-    "ISO-8859-1",
+-    "ISO_8859-1",
+-    "ISO8859-11",
+-    "ISO-8859-16",
 -    "ISO_8859-16",
--    "GB2312",
--    "ISO_8859-15",
--    "ISO-CELTIC",
--    "ISO_8859-9",
--    "LATIN3",
+-    "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",
--    "UHC",
--    "ISO8859-10",
--    "ISO_8859-15:1998",
--    "MAC",
--    "ISO_8859-3",
+-    "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",
--    "ISO8859-7",
--    "ISO-8859-10",
--    "CSASCII",
--    "ISO_8859-13",
+-    "L10",
+-    "CHAR",
+-    "CP1256",
 -    "ISO-IR-179",
--    "ISO-8859-7",
--    "ISO-IR-203",
--    "ISO-IR-149",
--    "MS-EE",
--    "ISO-IR-148",
-     "US",
--    "CP874",
--    "ISO8859-4",
+-    "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_8859-16:2000",
--    "ISO8859-14",
--    "ISO-8859-4",
--    "IBM862",
 -    "ISO-IR-57",
--    "IBM866",
--    "ISO-8859-14",
--    "ISO-IR-127",
--    "ISO-2022-CN-EXT",
+-    "TIS620",
+-    "ISO8859-3",
++    "ISO_8859-2:1987",
++    "ISO_8859-1:1987",
+     "UCS-4",
 -    "ISO-IR-87",
+-    "TIS-620",
 -    "ISO-IR-157",
-+    "CHAR",
-+    "ASCII",
-+    "UCS-4",
-     "UCS-2",
+-    "ISO-8859-3",
+-    "ISO_8859-3",
+-    "ISO8859-13",
+-    "CSISOLATIN6",
+-    "BIG5",
+-    "ISO-8859-13",
+-    "ISO_8859-13",
+-    "CSISOLATIN1",
+-    "KOI8-R",
+-    "BIG-5",
 -    "IBM819",
--    "ISO_8859-14:1998",
--    "ISO-IR-14",
--    "ELOT_928",
--    "LATIN7",
--    "UTF-16",
+-    "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",
--    "CSUNICODE",
--    "UCS-2LE",
-     "UTF-8",
--    "ISO-IR-100",
--    "ISO_8859-7",
--    "UTF-32",
--    "CHAR",
-+    "CSUCS4",
-+    "UCS-4LE",
-+    "UCS-2LE",
-+    "CSASCII",
-+    "UTF-16",
-+    "UTF-16LE",
-+    "LATIN1",
+-    "UTF-16",
+-    "EUCCN",
+-    "ROMAN8",
++    "UNICODE-1-1",
 +    "ISO-IR-6",
-+    "UCS-4-INTERNAL",
-+    "UCS-2-INTERNAL",
-+    "UTF-7",
-+    "ISO646-US",
-+    "CP367",
-+    "UCS-4-SWAPPED",
-+    "UCS-2-SWAPPED",
-     "UNICODE-1-1",
++    "CSKOI8R",
++    "ASCII",
 +    "UNICODEBIG",
-+    "UNICODELITTLE",
-+    "ISO-8859-1",
-+    "CSUNICODE",
-     "CSUNICODE11",
--    "TIS620",
--    "EUCKR",
--    "UTF-16LE",
--    "LATIN4",
--    "KSC_5601",
--    "TIS-620",
--    "EUC-KR",
--    "IBM-CP1133",
--    "ISO_8859-4",
-+    "UCS-4BE",
-+    "UCS-2BE",
-+    "UTF-32",
-+    "CP819",
-+    "UTF-16BE",
-     "UTF-32LE",
--    "VISCII",
--    "KOI8-R",
--    "ISO_8859-14",
--    "CSKOI8R",
--    "GREEK8",
--    "MS-CYRL",
--    "CSVISCII",
--    "IBM850",
--    "ISO-IR-144",
--    "BIG5",
--    "UCS-4LE",
--    "GB18030",
--    "MACCYRILLIC",
--    "CSUNICODE11UTF7",
-+    "ISO_646.IRV:1991",
-     "UNICODE-1-1-UTF-7",
--    "BIG-5",
--    "IBM367",
--    "TIS620-0",
--    "CSBIG5",
--    "NEXTSTEP",
--    "CSKSC56011987",
--    "CSISOLATIN1",
--    "KOREAN",
--    "CSISOLATIN2",
--    "CN-BIG5",
--    "UTF-7",
--    "CSISOLATIN6",
--    "CSISOLATINCYRILLIC",
--    "CSISOLATIN5",
--    "TCVN",
--    "TIS620.2529-1",
--    "CSGB2312",
--    "ISO-10646-UCS-2",
--    "UCS-4",
+     "ISO-IR-203",
+-    "ISO8859-7",
+-    "KOI8-T",
+-    "EUC-CN",
+     "UCS-4LE",
+-    "ISO-IR-100",
+-    "ISO-8859-7",
+-    "ISO_8859-7",
 -    "MULELAO-1",
--    "ISO-2022-KR",
+-    "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",
--    "CSUCS4",
--    "GBK",
--    "CSISOLATIN3",
--    "ISO646-US",
-+    "IBM819",
-+    "ISO_8859-1",
-+    "ISO8859-1",
-+    "CSUNICODE11UTF7",
-     "US-ASCII",
--    "TIS620.2533-1",
--    "KOI8-T",
--    "MS-ANSI",
--    "KS_C_5601-1989",
--    "GB_1988-80",
--    "EUCTW",
--    "GREEK",
--    "EUC-TW",
--    "WINDOWS-1251",
--    "WINDOWS-1252",
 -    "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",
--    "VISCII1.1-1",
--    "CSISO2022KR",
+-    "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",
--    "ARMSCII-8",
--    "CSIBM866",
--    "ROMAN8",
--    "HZ-GB-2312",
--    "EUCJP",
--    "TIS620.2533-0",
--    "KS_C_5601-1987",
--    "MACICELAND",
-+    "ISO-IR-100",
-+    "IBM367",
-     "ISO-10646-UCS-4",
+-    "CSHPROMAN8",
+-    "EUC-TW",
+-    "KS_C_5601-1989",
 -    "UCS-2BE",
--    "EUC-JP",
+-    "VISCII1.1-1",
+-    "GREEK",
 -    "WINDOWS-1250",
--    "ARABIC",
--    "UTF-16BE",
--    "TCVN-5712",
+-    "CSGB2312",
+-    "WINDOWS-874",
+     "CSUNICODE11",
+-    "JAVA",
 -    "WINDOWS-1257",
--    "CSPC862LATINHEBREW",
--    "TCVN5712-1",
--    "UTF-32BE",
--    "WINDOWS-1254",
--    "CSEUCKR",
--    "ASMO-708",
--    "CSISOLATINARABIC",
--    "MACINTOSH",
--    "UCS-2-INTERNAL",
--    "CSISOLATIN4",
--    "ECMA-114",
--    "CN-GB-ISOIR165",
--    "ANSI_X3.4-1986",
+-    "CSUNICODE",
+-    "CSHALFWIDTHKATAKANA",
 -    "CSISO57GB1988",
--    "CSISO58GB231280",
--    "HP-ROMAN8",
--    "ANSI_X3.4-1968",
--    "MACTHAI",
--    "UCS-4BE",
--    "CSHPROMAN8",
+-    "MACICELAND",
+-    "CSIBM866",
++    "US-ASCII",
++    "ISO-10646-UCS-4",
++    "UCS-2BE",
++    "UTF-32BE",
+     "UTF-16BE",
+-    "ARABIC",
 -    "CN-GB",
--    "UNICODELITTLE",
+-    "CSISO2022KR",
+-    "CSMACINTOSH",
+-    "JIS0208",
+-    "MACROMAN",
+-    "ISO_8859-4:1988",
 -    "ISO_8859-5:1988",
--    "ISO_8859-9:1989",
+-    "TIS620.2533-1",
+     "ANSI_X3.4-1986",
 -    "ISO_8859-8:1988",
--    "KOI8-U",
--    "ISO_8859-3:1988",
--    "ISO-2022-JP",
--    "ISO-2022-JP-1",
--    "ISO-2022-JP-2",
--    "CSISOLATINHEBREW",
--    "ISO646-JP",
--    "EXTENDED_UNIX_CODE_PACKED_FORMAT_FOR_JAPANESE",
--    "UCS-4-INTERNAL",
-+    "ISO-10646-UCS-2",
-     "ISO_8859-1:1987",
--    "ISO_8859-2:1987",
--    "ISO_8859-6:1987",
--    "CSISO2022JP",
--    "CSISO2022JP2",
--    "ISO_8859-4:1988",
--    "MACCENTRALEUROPE",
+-    "KS_C_5601-1987",
+-    "CSSHIFTJIS",
 -    "HEBREW",
--    "MS-HEBR",
--    "ISO_646.IRV:1991",
--    "CSEUCTW",
--    "KOI8-RU",
--    "WINDOWS-874",
--    "JIS0208",
--    "GEORGIAN-PS",
--    "ISO_8859-7:1987",
--    "CSISOLATINGREEK",
+-    "ISO_8859-9:1989",
+-    "MACCROATIAN",
+-    "ISO-2022-JP-1",
+-    "EUCJP",
+     "ANSI_X3.4-1968",
+-    "EUC-JP",
+-    "CSISO58GB231280",
 -    "JIS_C6226-1983",
--    "MACROMAN",
--    "UCS-2-SWAPPED",
--    "CSMACINTOSH",
--    "BIGFIVE",
+-    "IBM-CP1133",
+-    "MACCENTRALEUROPE",
 -    "CSISO159JISX02121990",
+-    "ISO-2022-JP-2",
+     "CSUNICODE11UTF7",
+-    "UCS-4-SWAPPED",
+-    "UNICODEBIG",
 -    "CSISO14JISC6220RO",
--    "CSPC850MULTILINGUAL",
--    "BIG-FIVE",
 -    "JIS_C6220-1969-RO",
--    "JIS_X0212",
+-    "ISO_8859-3:1988",
+-    "CSPC862LATINHEBREW",
 -    "BIG5HKSCS",
--    "JISX0201-1976",
--    "GEORGIAN-ACADEMY",
+-    "ISO_8859-6:1987",
+     "UCS-2-SWAPPED",
+-    "ISO_8859-1:1987",
 -    "BIG5-HKSCS",
--    "CSISO87JISX0208",
--    "MACGREEK",
+-    "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",
--    "UCS-4-SWAPPED",
--    "MACCROATIAN",
+-    "CSKSC56011987",
 -    "JIS_X0201",
-     "WCHAR_T",
--    "UNICODEBIG",
--    "JIS_X0212-1990",
+-    "ISO_8859-7:1987",
+-    "CSISO2022JP2",
 -    "JIS_X0208",
--    "MACARABIC",
--    "CSHALFWIDTHKATAKANA",
+-    "JISX0201-1976",
+-    "JIS_X0212-1990",
+-    "CSISO2022JP",
+-    "JOHAB",
+-    "MS_KANJI",
+-    "CSISO87JISX0208",
+-    "MACTURKISH",
+-    "TCVN5712-1:1993",
 -    "JIS_X0208-1983",
--    "SHIFT-JIS",
--    "MACUKRAINE",
--    "CSEUCPKDFMTJAPANESE",
+-    "CSEUCTW",
+-    "MACGREEK",
 -    "JIS_X0208-1990",
--    "CSSHIFTJIS",
--    "JIS_X0212.1990-0",
--    "MACHEBREW",
--    "SHIFT_JIS",
--    "TCVN5712-1:1993",
+-    "WINBALTRIM",
 -    "MS-TURK",
--    "MACTURKISH",
--    "MACROMANIA",
--    "MS-ARAB",
--    "JAVA",
--    "MS_KANJI",
--    "JOHAB",
--    "WINBALTRIM"
-+    "CSISOLATIN1",
-+    "ANSI_X3.4-1968",
-+    "ANSI_X3.4-1986",
-+    "UTF-32BE"
+-    "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}, {-1}, {-1},
--#line 271 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str15, ei_iso646_cn},
+     {-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_str17, ei_iso8859_1},
--#line 68 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str18, ei_iso8859_2},
--    {-1},
--#line 133 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str20, ei_iso8859_10},
--#line 125 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str21, ei_iso8859_9},
--    {-1}, {-1}, {-1}, {-1},
--#line 147 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str26, ei_iso8859_14},
--    {-1}, {-1},
--#line 196 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str29, ei_cp862},
--#line 76 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str30, ei_iso8859_3},
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str15, ei_iso8859_1},
 -    {-1}, {-1},
--#line 200 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str33, ei_cp866},
--#line 51 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str34, ei_c99},
+-#line 325 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str18, ei_hz},
 -    {-1}, {-1}, {-1},
--#line 301 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str38, ei_euc_cn},
+-#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 167 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str41, ei_cp1251},
+-#line 151 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str29, ei_iso8859_14},
 -    {-1},
--#line 170 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str43, ei_cp1252},
--#line 194 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str44, ei_cp862},
--#line 300 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str45, ei_euc_cn},
+-#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 182 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str47, ei_cp1256},
--#line 198 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str48, ei_cp866},
--#line 179 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str49, ei_cp1255},
--#line 311 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str50, ei_hz},
+-#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 331 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str52, ei_johab},
--#line 294 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str53, ei_cp932},
+-#line 289 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str77, ei_isoir165},
 -    {-1},
--#line 57 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str55, ei_iso8859_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 306 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str57, ei_ces_gbk},
--#line 265 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str58, ei_jisx0212},
--#line 188 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str59, ei_cp1258},
--    {-1}, {-1},
--#line 140 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str62, ei_iso8859_13},
+-#line 286 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str91, ei_gb2312},
 -    {-1}, {-1}, {-1}, {-1},
--#line 173 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str67, ei_cp1253},
-     {-1}, {-1}, {-1}, {-1},
--#line 84 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str72, ei_iso8859_4},
-+#line 58 "aliases.gperf"
-+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str4, ei_iso8859_1},
-     {-1}, {-1},
--#line 227 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str75, ei_cp1133},
+-#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 219 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str77, ei_hp_roman8},
--    {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
--#line 276 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str84, ei_gb2312},
--#line 62 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str85, ei_iso8859_1},
+-#line 294 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str100, ei_ksc5601},
 -    {-1},
--#line 70 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str87, ei_iso8859_2},
+-#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_str91, ei_iso8859_6},
+-    {(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_str92, ei_iso8859_1},
--#line 93 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str93, ei_iso8859_5},
--#line 63 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str94, ei_iso8859_2},
--#line 252 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str95, ei_jisx0201},
+-    {(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 159 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str97, ei_iso8859_16},
--#line 94 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str98, ei_iso8859_6},
--#line 154 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str99, ei_iso8859_15},
+-#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_str100, ei_iso8859_5},
--#line 127 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str101, ei_iso8859_9},
+-    {(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 119 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str103, ei_iso8859_8},
+-#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_str104, ei_iso8859_16},
--#line 192 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str105, ei_cp850},
--#line 150 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str106, ei_iso8859_15},
+-    {(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 120 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str108, ei_iso8859_9},
--#line 328 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str109, ei_cp949},
--#line 113 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str110, ei_iso8859_8},
--#line 78 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str111, ei_iso8859_3},
--#line 16 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str112, ei_ascii},
--#line 258 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str113, ei_jisx0208},
--#line 91 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str114, ei_iso8859_5},
+-#line 156 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str153, ei_iso8859_15},
 -    {-1},
--#line 308 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str116, ei_iso2022_cn},
--#line 141 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str117, ei_iso8859_13},
--#line 71 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str118, ei_iso8859_3},
--#line 164 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str119, ei_cp1250},
--#line 322 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str120, ei_cp950},
--#line 190 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str121, ei_cp850},
--#line 269 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str122, ei_iso646_cn},
--#line 291 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str123, ei_sjis},
--#line 136 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str124, ei_iso8859_13},
--#line 106 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str125, ei_iso8859_7},
--#line 158 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str126, ei_iso8859_16},
+-#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_str127, ei_tis620},
+-    {(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},
--#line 277 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str129, ei_isoir165},
++    {(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 185 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str131, ei_cp1257},
+-#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_str132, ei_ascii},
+-    {(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 274 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str134, ei_gb2312},
+-#line 199 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str181, ei_cp850},
 -    {-1},
--#line 19 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str136, ei_ascii},
--#line 59 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str137, ei_iso8859_1},
--#line 266 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str138, ei_jisx0212},
--#line 67 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str139, ei_iso8859_2},
+-#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 145 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str142, ei_iso8859_14},
--#line 132 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str143, ei_iso8859_10},
+-#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 124 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str145, ei_iso8859_9},
--#line 54 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str146, ei_iso8859_1},
--#line 309 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str147, ei_iso2022_cn},
--#line 64 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str148, ei_iso8859_2},
--#line 116 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str149, ei_iso8859_8},
+-#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 176 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str151, ei_cp1254},
--#line 95 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str152, ei_iso8859_6},
+-#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 88 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str154, ei_iso8859_5},
--#line 146 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str155, ei_iso8859_14},
+-#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 66 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str157, ei_iso8859_2},
--#line 156 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str158, ei_iso8859_16},
--#line 302 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str159, ei_euc_cn},
--#line 151 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str160, ei_iso8859_15},
--#line 148 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str161, ei_iso8859_14},
--#line 121 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str162, ei_iso8859_9},
--#line 75 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str163, ei_iso8859_3},
--#line 114 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str164, ei_iso8859_8},
--#line 329 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str165, ei_cp949},
+-#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 135 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str169, ei_iso8859_10},
--#line 152 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str170, ei_iso8859_15},
--#line 204 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str171, ei_mac_roman},
--#line 72 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str172, ei_iso8859_3},
--#line 74 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str173, ei_iso8859_3},
+-#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 112 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str175, ei_iso8859_7},
--#line 128 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str176, ei_iso8859_10},
 -#line 22 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str177, ei_ascii},
--#line 137 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str178, ei_iso8859_13},
--#line 138 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str179, ei_iso8859_13},
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str300, ei_ascii},
 -    {-1}, {-1},
--#line 103 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str182, ei_iso8859_7},
+-#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 153 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str184, ei_iso8859_15},
--    {-1}, {-1}, {-1}, {-1},
--#line 282 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str189, ei_ksc5601},
--#line 166 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str190, ei_cp1250},
--#line 123 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str191, ei_iso8859_9},
--#line 21 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str192, ei_ascii},
+-#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_str194, ei_cp874},
--#line 86 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str195, ei_iso8859_4},
--#line 82 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str196, ei_iso8859_4},
--#line 130 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str197, ei_iso8859_10},
--    {-1},
--#line 157 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str199, ei_iso8859_16},
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str335, ei_pt154},
 -    {-1},
--#line 149 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str201, ei_iso8859_14},
--#line 79 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str202, ei_iso8859_4},
--#line 195 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str203, ei_cp862},
+-#line 34 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str337, ei_ucs4},
 -    {-1}, {-1},
--#line 270 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str206, ei_iso646_cn},
--#line 199 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str207, ei_cp866},
--#line 142 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str208, ei_iso8859_14},
--#line 97 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str209, ei_iso8859_6},
--#line 310 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str210, ei_iso2022_cn_ext},
--#line 259 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str211, ei_jisx0208},
--#line 131 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str212, ei_iso8859_10},
--#line 24 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str213, ei_ucs2},
--#line 58 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str214, ei_iso8859_1},
--    {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
--#line 144 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str221, ei_iso8859_14},
--#line 247 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str222, ei_iso646_jp},
+-#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 108 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str225, ei_iso8859_7},
+-#line 285 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str345, ei_gb2312},
 -    {-1},
--#line 139 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str227, ei_iso8859_13},
--#line 38 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str228, ei_utf16},
+-#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 129 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str230, ei_iso8859_10},
+-#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 26 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str232, ei_ucs2},
--#line 31 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str233, ei_ucs2le},
--#line 23 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str234, ei_utf8},
--#line 56 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str235, ei_iso8859_1},
--#line 104 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str236, ei_iso8859_7},
--#line 41 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str237, ei_utf32},
+-#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_str238, ei_local_char},
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str363, ei_ces_big5},
 -    {-1}, {-1},
--#line 29 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str241, ei_ucs2be},
--#line 30 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str242, ei_ucs2be},
--    {-1},
--#line 230 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str244, ei_tis620},
--#line 326 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str245, ei_euc_kr},
--#line 40 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str246, ei_utf16le},
--#line 83 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str247, ei_iso8859_4},
+-#line 91 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str366, ei_iso8859_5},
 -    {-1}, {-1},
--#line 279 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str250, ei_ksc5601},
--#line 229 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str251, ei_tis620},
--#line 325 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str252, ei_euc_kr},
+-#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_str254, ei_cp1133},
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str387, ei_nextstep},
 -    {-1},
--#line 80 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str256, ei_iso8859_4},
--#line 43 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str257, ei_utf32le},
--#line 238 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str258, ei_viscii},
--#line 160 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str259, ei_koi8_r},
--    {-1}, {-1},
--#line 143 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str262, ei_iso8859_14},
+-#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 161 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str264, ei_koi8_r},
+-#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 109 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str266, ei_iso8859_7},
--#line 169 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str267, ei_cp1251},
--    {-1}, {-1},
--#line 240 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str270, ei_viscii},
--    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
--#line 191 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str280, ei_cp850},
--    {-1}, {-1},
--#line 90 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str283, ei_iso8859_5},
+-#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 316 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str286, ei_ces_big5},
--#line 37 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str287, ei_ucs4le},
--#line 307 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str288, ei_gb18030},
+-#line 184 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str416, ei_cp1254},
 -    {-1},
--#line 210 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str290, ei_mac_cyrillic},
--#line 46 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str291, ei_utf7},
--#line 45 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str292, ei_utf7},
--#line 317 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str293, ei_ces_big5},
+-#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_str295, ei_ascii},
--#line 231 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str296, ei_tis620},
--    {-1},
--#line 321 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str298, ei_ces_big5},
--#line 221 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str299, ei_nextstep},
+-    {(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 283 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str301, ei_ksc5601},
--#line 61 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str302, ei_iso8859_1},
--#line 284 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str303, ei_ksc5601},
--#line 69 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str304, ei_iso8859_2},
--#line 320 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str305, ei_ces_big5},
+-#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_str306, ei_utf7},
--    {-1},
--#line 134 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str308, ei_iso8859_10},
--#line 92 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str309, ei_iso8859_5},
--#line 126 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str310, ei_iso8859_9},
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str433, ei_utf7},
 -    {-1},
--#line 241 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str312, ei_tcvn},
+-#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 232 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str315, ei_tis620},
+-#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 304 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str318, ei_euc_cn},
--    {-1},
--#line 25 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str320, ei_ucs2},
--#line 33 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str321, ei_ucs4},
--#line 226 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str322, ei_mulelao},
+-#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_str323, ei_iso2022_kr},
--#line 107 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str324, ei_iso8859_7},
--#line 273 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str325, ei_gb2312},
--#line 35 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str326, ei_ucs4},
--#line 305 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str327, ei_ces_gbk},
--#line 77 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str328, ei_iso8859_3},
--#line 14 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str329, ei_ascii},
--    {-1},
--#line 12 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str331, ei_ascii},
--#line 234 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str332, ei_tis620},
--#line 225 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str333, ei_koi8_t},
--#line 172 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str334, ei_cp1252},
--#line 281 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str335, ei_ksc5601},
--#line 268 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str336, ei_iso646_cn},
--    {-1}, {-1},
--#line 314 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str339, ei_euc_tw},
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str449, ei_ces_big5},
 -    {-1}, {-1}, {-1},
--#line 110 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str343, ei_iso8859_7},
+-#line 258 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str453, ei_iso646_jp},
 -    {-1}, {-1},
--#line 313 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str346, ei_euc_tw},
--#line 168 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str347, ei_cp1251},
--#line 171 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str348, ei_cp1252},
--#line 248 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str349, ei_iso646_jp},
--#line 183 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str350, ei_cp1256},
--#line 180 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str351, ei_cp1255},
+-#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 239 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str353, ei_viscii},
--#line 333 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str354, ei_iso2022_kr},
+-#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 189 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str356, ei_cp1258},
--    {-1}, {-1}, {-1},
--#line 174 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str360, ei_cp1253},
--#line 222 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str361, ei_armscii_8},
--    {-1}, {-1}, {-1}, {-1},
--#line 201 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str366, ei_cp866},
+-#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 218 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str368, ei_hp_roman8},
--#line 312 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str369, ei_hz},
--#line 286 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str370, ei_euc_jp},
--#line 233 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str371, ei_tis620},
--#line 280 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str372, ei_ksc5601},
--#line 207 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str373, ei_mac_iceland},
--#line 34 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str374, ei_ucs4},
+-#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_str375, ei_ucs2be},
--    {-1},
--#line 285 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str377, ei_euc_jp},
--    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
--#line 165 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str386, ei_cp1250},
--#line 100 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str387, ei_iso8859_6},
--#line 39 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str388, ei_utf16be},
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str476, ei_ucs2be},
 -    {-1}, {-1},
--#line 242 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str391, ei_tcvn},
--#line 186 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str392, ei_cp1257},
--    {-1},
--#line 197 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str394, ei_cp862},
+-#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 243 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str396, ei_tcvn},
--    {-1}, {-1},
--#line 42 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str399, ei_utf32be},
+-#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 177 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str402, ei_cp1254},
+-#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 327 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str404, ei_euc_kr},
+-#line 52 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str489, ei_java},
 -    {-1},
--#line 99 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str406, ei_iso8859_6},
--    {-1}, {-1},
--#line 101 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str409, ei_iso8859_6},
--#line 203 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str410, ei_mac_roman},
--#line 47 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str411, ei_ucs2internal},
--#line 85 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str412, ei_iso8859_4},
--    {-1}, {-1}, {-1},
--#line 98 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str416, ei_iso8859_6},
+-#line 193 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str491, ei_cp1257},
 -    {-1},
--#line 278 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str418, ei_isoir165},
+-#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 18 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str420, ei_ascii},
--#line 272 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str421, ei_iso646_cn},
+-#line 284 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str502, ei_iso646_cn},
 -    {-1},
--#line 275 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str423, ei_gb2312},
--#line 217 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str424, ei_hp_roman8},
+-#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 17 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str426, ei_ascii},
--#line 216 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str427, ei_mac_thai},
+-#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 36 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str429, ei_ucs4be},
--#line 220 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str430, ei_hp_roman8},
+-#line 209 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str528, ei_mac_roman},
 -    {-1},
--#line 303 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str432, ei_euc_cn},
+-#line 81 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str530, ei_iso8859_4},
 -    {-1},
--#line 32 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str434, ei_ucs2le},
 -#line 89 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str435, ei_iso8859_5},
--    {-1}, {-1},
--#line 122 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str438, ei_iso8859_9},
--    {-1},
--#line 115 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str440, ei_iso8859_8},
--#line 162 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str441, ei_koi8_u},
--    {-1}, {-1},
--#line 73 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str444, ei_iso8859_3},
--    {-1}, {-1}, {-1},
--#line 295 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str448, ei_iso2022_jp},
--#line 297 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str449, ei_iso2022_jp1},
--#line 298 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str450, ei_iso2022_jp2},
--#line 118 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str451, ei_iso8859_8},
+-    {(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_str454, ei_iso646_jp},
--    {-1}, {-1},
--#line 287 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str457, ei_euc_jp},
--    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
--#line 49 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str465, ei_ucs4internal},
+-    {(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 55 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str467, ei_iso8859_1},
--#line 65 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str468, ei_iso8859_2},
+-#line 298 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str550, ei_euc_jp},
 -    {-1},
--#line 96 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str470, ei_iso8859_6},
--    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
--#line 296 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str479, ei_iso2022_jp},
--#line 299 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str480, ei_iso2022_jp2},
--    {-1}, {-1}, {-1}, {-1}, {-1},
--#line 81 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str486, ei_iso8859_4},
++    {(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 206 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str489, ei_mac_centraleurope},
+-#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 117 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str492, ei_iso8859_8},
--    {-1},
--#line 181 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str494, ei_cp1255},
+-#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},
--#line 15 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str496, ei_ascii},
++    {(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 315 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str498, ei_euc_tw},
--    {-1}, {-1}, {-1}, {-1},
--#line 163 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str503, ei_koi8_ru},
+-#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 237 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str505, ei_cp874},
--    {-1}, {-1},
--#line 257 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str508, ei_jisx0208},
--#line 224 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str509, ei_georgian_ps},
--    {-1}, {-1},
--#line 105 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str512, ei_iso8859_7},
+-#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 111 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str514, ei_iso8859_7},
--#line 260 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str515, ei_jisx0208},
--    {-1}, {-1},
--#line 202 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str518, ei_mac_roman},
--#line 48 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str519, ei_ucs2swapped},
--    {-1}, {-1}, {-1}, {-1},
--#line 205 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str524, ei_mac_roman},
+-#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 319 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str527, ei_ces_big5},
--#line 267 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str528, ei_jisx0212},
--#line 249 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str529, ei_iso646_jp},
--#line 193 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str530, ei_cp850},
--    {-1}, {-1}, {-1},
--#line 318 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str534, ei_ces_big5},
--    {-1}, {-1}, {-1}, {-1}, {-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_str541, ei_iso646_jp},
--    {-1}, {-1}, {-1},
--#line 262 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str545, ei_jisx0212},
--    {-1}, {-1}, {-1},
--#line 324 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str549, ei_big5hkscs},
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str608, ei_tis620},
 -    {-1}, {-1}, {-1},
--#line 251 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str553, ei_jisx0201},
--#line 223 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str554, ei_georgian_academy},
+-#line 170 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str612, ei_koi8_ru},
 -    {-1},
--#line 323 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str556, ei_big5hkscs},
+-#line 65 "lib/aliases.gperf"
+-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str614, ei_iso8859_2},
 -    {-1}, {-1}, {-1},
--#line 261 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str560, ei_jisx0208},
+-#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},
--#line 212 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str570, ei_mac_greek},
--#line 175 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str571, ei_cp1253},
--    {-1},
--#line 50 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str573, ei_ucs4swapped},
 -    {-1}, {-1}, {-1}, {-1},
--#line 208 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str578, ei_mac_croatian},
--    {-1}, {-1}, {-1},
--#line 250 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str582, ei_jisx0201},
--    {-1}, {-1},
--#line 335 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str585, ei_local_wchar_t},
+-#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 28 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str594, ei_ucs2be},
+-#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 264 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str599, ei_jisx0212},
--#line 254 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str600, ei_jisx0208},
+-#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},
--    {-1}, {-1}, {-1}, {-1},
--#line 215 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str614, ei_mac_arabic},
--    {-1}, {-1}, {-1}, {-1},
--#line 253 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str619, ei_jisx0201},
--#line 255 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str620, ei_jisx0208},
--#line 290 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str621, ei_sjis},
--    {-1}, {-1}, {-1}, {-1},
--#line 211 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str626, ei_mac_ukraine},
+-#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 288 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str635, ei_euc_jp},
+-#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 256 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str646, ei_jisx0208},
+-#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},
--#line 293 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str663, ei_sjis},
--#line 263 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str664, ei_jisx0212},
--#line 214 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str665, ei_mac_hebrew},
+-    {-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},
--#line 289 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str675, ei_sjis},
+-    {-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},
--#line 244 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str685, ei_tcvn},
--    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
--#line 178 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str694, ei_cp1254},
 -    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
 -    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
--    {-1}, {-1}, {-1}, {-1},
--#line 213 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str717, ei_mac_turkish},
 -    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
--    {-1}, {-1}, {-1}, {-1},
--#line 209 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str731, ei_mac_romania},
++    {(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},
--#line 184 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str750, ei_cp1256},
-+#line 21 "aliases.gperf"
-+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str7, ei_ascii},
-     {-1}, {-1},
--#line 52 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str753, ei_java},
 -    {-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 292 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str798, ei_sjis},
--#line 330 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str799, ei_johab},
++#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},
@@ -1956,120 +2241,170 @@ diff -Nur libiconv-1.9.1-orig/lib/aliases.h libiconv-1.9.1-nocompile/lib/aliases
 -    {-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 187 "lib/aliases.gperf"
--    {(int)(long)&((struct stringpool_t *)0)->stringpool_str879, ei_cp1257}
-+#line 61 "aliases.gperf"
-+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str10, ei_local_char},
-+#line 13 "aliases.gperf"
-+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str11, ei_ascii},
-+#line 33 "aliases.gperf"
-+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str12, ei_ucs4},
-+    {-1},
-+#line 24 "aliases.gperf"
-+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str14, ei_ucs2},
-+    {-1},
-+#line 23 "aliases.gperf"
-+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str16, ei_utf8},
-+#line 35 "aliases.gperf"
-+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str17, ei_ucs4},
-+#line 37 "aliases.gperf"
-+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str18, ei_ucs4le},
-+#line 31 "aliases.gperf"
-+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str19, ei_ucs2le},
-+#line 22 "aliases.gperf"
-+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str20, ei_ascii},
-+#line 38 "aliases.gperf"
-+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str21, ei_utf16},
-+#line 40 "aliases.gperf"
-+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str22, ei_utf16le},
-+#line 57 "aliases.gperf"
-+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str23, ei_iso8859_1},
-+#line 16 "aliases.gperf"
-+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str24, ei_ascii},
-+    {-1},
-+#line 49 "aliases.gperf"
-+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str26, ei_ucs4internal},
-+#line 47 "aliases.gperf"
-+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str27, ei_ucs2internal},
-+#line 44 "aliases.gperf"
-+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str28, ei_utf7},
-+#line 14 "aliases.gperf"
-+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str29, ei_ascii},
-+#line 19 "aliases.gperf"
-+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str30, ei_ascii},
-+#line 50 "aliases.gperf"
-+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str31, ei_ucs4swapped},
-+#line 48 "aliases.gperf"
-+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str32, ei_ucs2swapped},
-+#line 29 "aliases.gperf"
-+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str33, ei_ucs2be},
-+#line 28 "aliases.gperf"
-+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str34, ei_ucs2be},
-+#line 32 "aliases.gperf"
-+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str35, ei_ucs2le},
-+#line 51 "aliases.gperf"
-+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str36, ei_iso8859_1},
-+#line 26 "aliases.gperf"
-+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str37, ei_ucs2},
-+    {-1},
-+#line 30 "aliases.gperf"
-+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str39, ei_ucs2be},
-+#line 36 "aliases.gperf"
-+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str40, ei_ucs4be},
-+#line 27 "aliases.gperf"
-+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str41, ei_ucs2be},
-+#line 41 "aliases.gperf"
-+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str42, ei_utf32},
-+#line 55 "aliases.gperf"
-+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str43, ei_iso8859_1},
-+#line 39 "aliases.gperf"
-+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str44, ei_utf16be},
-+#line 43 "aliases.gperf"
-+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str45, ei_utf32le},
-+#line 15 "aliases.gperf"
-+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str46, ei_ascii},
-+#line 45 "aliases.gperf"
-+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str47, ei_utf7},
-+#line 56 "aliases.gperf"
-+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str48, ei_iso8859_1},
-+#line 52 "aliases.gperf"
-+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str49, ei_iso8859_1},
-+#line 60 "aliases.gperf"
-+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str50, ei_iso8859_1},
-+#line 46 "aliases.gperf"
-+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str51, ei_utf7},
-+#line 12 "aliases.gperf"
-+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str52, ei_ascii},
-+#line 54 "aliases.gperf"
-+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str53, ei_iso8859_1},
-+    {-1}, {-1}, {-1}, {-1},
-+#line 20 "aliases.gperf"
-+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str58, ei_ascii},
-+#line 34 "aliases.gperf"
-+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str59, ei_ucs4},
-+#line 25 "aliases.gperf"
-+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str60, ei_ucs2},
-+    {-1},
-+#line 53 "aliases.gperf"
-+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str62, ei_iso8859_1},
-+#line 62 "aliases.gperf"
-+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str63, ei_local_wchar_t},
-+#line 59 "aliases.gperf"
-+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str64, ei_iso8859_1},
-+#line 17 "aliases.gperf"
-+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str65, ei_ascii},
-+#line 18 "aliases.gperf"
-+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str66, ei_ascii},
-+#line 42 "aliases.gperf"
-+    {(int)(long)&((struct stringpool_t *)0)->stringpool_str67, ei_utf32be}
++#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 -Nur libiconv-1.9.1-orig/lib/converters.h libiconv-1.9.1-nocompile/lib/converters.h
---- libiconv-1.9.1-orig/lib/converters.h       2002-05-29 16:06:52.000000000 +0200
-+++ libiconv-1.9.1-nocompile/lib/converters.h  2006-03-05 15:50:36.000000000 +0100
-@@ -125,154 +125,7 @@
+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"
@@ -2078,7 +2413,7 @@ diff -Nur libiconv-1.9.1-orig/lib/converters.h libiconv-1.9.1-nocompile/lib/conv
  
  /* 8-bit encodings */
  #include "iso8859_1.h"
--#include "iso8859_2.h"
+ #include "iso8859_2.h"
 -#include "iso8859_3.h"
 -#include "iso8859_4.h"
 -#include "iso8859_5.h"
@@ -2087,14 +2422,15 @@ diff -Nur libiconv-1.9.1-orig/lib/converters.h libiconv-1.9.1-nocompile/lib/conv
 -#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_15.h"
 -#include "iso8859_16.h"
--#include "koi8_r.h"
+ #include "koi8_r.h"
 -#include "koi8_u.h"
 -#include "koi8_ru.h"
--#include "cp1250.h"
+ #include "cp1250.h"
 -#include "cp1251.h"
 -#include "cp1252.h"
 -#include "cp1253.h"
@@ -2103,7 +2439,7 @@ diff -Nur libiconv-1.9.1-orig/lib/converters.h libiconv-1.9.1-nocompile/lib/conv
 -#include "cp1256.h"
 -#include "cp1257.h"
 -#include "cp1258.h"
--#include "cp850.h"
+ #include "cp850.h"
 -#include "cp862.h"
 -#include "cp866.h"
 -#include "mac_roman.h"
@@ -2124,6 +2460,7 @@ diff -Nur libiconv-1.9.1-orig/lib/converters.h libiconv-1.9.1-nocompile/lib/conv
 -#include "georgian_academy.h"
 -#include "georgian_ps.h"
 -#include "koi8_t.h"
+-#include "pt154.h"
 -#include "mulelao.h"
 -#include "cp1133.h"
 -#include "tis620.h"
@@ -2165,6 +2502,7 @@ diff -Nur libiconv-1.9.1-orig/lib/converters.h libiconv-1.9.1-nocompile/lib/conv
 -
 -#include "euc_cn.h"
 -#include "ces_gbk.h"
+-#include "cp936.h"
 -#include "gb18030.h"
 -#include "iso2022_cn.h"
 -#include "iso2022_cnext.h"
@@ -2172,7 +2510,9 @@ diff -Nur libiconv-1.9.1-orig/lib/converters.h libiconv-1.9.1-nocompile/lib/conv
 -#include "euc_tw.h"
 -#include "ces_big5.h"
 -#include "cp950.h"
--#include "big5hkscs.h"
+-#include "big5hkscs1999.h"
+-#include "big5hkscs2001.h"
+-#include "big5hkscs2004.h"
 -
 -#include "euc_kr.h"
 -#include "cp949.h"
@@ -2197,9 +2537,9 @@ diff -Nur libiconv-1.9.1-orig/lib/converters.h libiconv-1.9.1-nocompile/lib/conv
 -#include "dec_kanji.h"
 -#include "dec_hanyu.h"
 -#endif
--
--#ifdef USE_DOS
--#include "cp437.h"
+ 
+ #ifdef USE_DOS
+ #include "cp437.h"
 -#include "cp737.h"
 -#include "cp775.h"
 -#include "cp852.h"
@@ -2220,14 +2560,16 @@ diff -Nur libiconv-1.9.1-orig/lib/converters.h libiconv-1.9.1-nocompile/lib/conv
 -#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 -Nur libiconv-1.9.1-orig/lib/encodings.def libiconv-1.9.1-nocompile/lib/encodings.def
---- libiconv-1.9.1-orig/lib/encodings.def      2003-04-24 12:48:06.000000000 +0200
-+++ libiconv-1.9.1-nocompile/lib/encodings.def 2006-03-05 15:52:21.000000000 +0100
-@@ -155,16 +155,6 @@
+ #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 })
  
@@ -2244,23 +2586,10 @@ diff -Nur libiconv-1.9.1-orig/lib/encodings.def libiconv-1.9.1-nocompile/lib/enc
  /* Standard 8-bit encodings */
  
  DEFENCODING(( "ISO-8859-1",             /* IANA */
-@@ -182,635 +172,3 @@
-             iso8859_1,
-             { iso8859_1_mbtowc, NULL },   { iso8859_1_wctomb, NULL })
+@@ -203,148 +193,6 @@
+             iso8859_2,
+             { iso8859_2_mbtowc, NULL },   { iso8859_2_wctomb, NULL })
  
--DEFENCODING(( "ISO-8859-2",             /* IANA */
--              "ISO_8859-2",             /* IANA */
--              "ISO_8859-2:1987",        /* IANA */
--              "ISO-IR-101",             /* IANA */
--              "LATIN2",                 /* IANA */
--              "L2",                     /* IANA */
--              "csISOLatin2",            /* IANA */
--              "ISO8859-2",              /* X11R6.4, glibc, FreeBSD */
--            /*"ISO8859_2",                 JDK 1.1 */
--            ),
--            iso8859_2,
--            { iso8859_2_mbtowc, NULL },   { iso8859_2_wctomb, NULL })
--
 -DEFENCODING(( "ISO-8859-3",             /* IANA */
 -              "ISO_8859-3",             /* IANA */
 -              "ISO_8859-3:1988",        /* IANA */
@@ -2270,6 +2599,7 @@ diff -Nur libiconv-1.9.1-orig/lib/encodings.def libiconv-1.9.1-nocompile/lib/enc
 -              "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 })
@@ -2283,6 +2613,7 @@ diff -Nur libiconv-1.9.1-orig/lib/encodings.def libiconv-1.9.1-nocompile/lib/enc
 -              "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 })
@@ -2295,6 +2626,7 @@ diff -Nur libiconv-1.9.1-orig/lib/encodings.def libiconv-1.9.1-nocompile/lib/enc
 -              "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 })
@@ -2309,6 +2641,7 @@ diff -Nur libiconv-1.9.1-orig/lib/encodings.def libiconv-1.9.1-nocompile/lib/enc
 -              "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 })
@@ -2316,6 +2649,7 @@ diff -Nur libiconv-1.9.1-orig/lib/encodings.def libiconv-1.9.1-nocompile/lib/enc
 -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 */
@@ -2324,6 +2658,7 @@ diff -Nur libiconv-1.9.1-orig/lib/encodings.def libiconv-1.9.1-nocompile/lib/enc
 -              "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 })
@@ -2336,6 +2671,8 @@ diff -Nur libiconv-1.9.1-orig/lib/encodings.def libiconv-1.9.1-nocompile/lib/enc
 -              "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 })
@@ -2349,6 +2686,7 @@ diff -Nur libiconv-1.9.1-orig/lib/encodings.def libiconv-1.9.1-nocompile/lib/enc
 -              "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 })
@@ -2365,6 +2703,13 @@ diff -Nur libiconv-1.9.1-orig/lib/encodings.def libiconv-1.9.1-nocompile/lib/enc
 -            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 */
@@ -2387,30 +2732,31 @@ diff -Nur libiconv-1.9.1-orig/lib/encodings.def libiconv-1.9.1-nocompile/lib/enc
 -            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 */
--              "ISO-IR-203",
--              "ISO8859-15",             /* glibc, FreeBSD */
--            ),
--            iso8859_15,
--            { iso8859_15_mbtowc, NULL },  { iso8859_15_wctomb, NULL })
--
--DEFENCODING(( "ISO-8859-16",
--              "ISO_8859-16",
--              "ISO_8859-16:2000",
--              "ISO-IR-226",
+ 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 */
--            ),
--            koi8_r,
--            { koi8_r_mbtowc, NULL },      { koi8_r_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,
@@ -2421,15 +2767,13 @@ diff -Nur libiconv-1.9.1-orig/lib/encodings.def libiconv-1.9.1-nocompile/lib/enc
 -            koi8_ru,
 -            { koi8_ru_mbtowc, NULL },     { koi8_ru_wctomb, NULL })
 -
--/* Windows 8-bit encodings */
--
--DEFENCODING(( "CP1250",                 /* JDK 1.1 */
--              "WINDOWS-1250",           /* IANA */
--              "MS-EE",
--            ),
--            cp1250,
--            { cp1250_mbtowc, NULL },      { cp1250_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",
@@ -2485,16 +2829,13 @@ diff -Nur libiconv-1.9.1-orig/lib/encodings.def libiconv-1.9.1-nocompile/lib/enc
 -            cp1258,
 -            { cp1258_mbtowc, cp1258_flushwc }, { cp1258_wctomb, NULL })
 -
--/* DOS 8-bit encodings */
--
--DEFENCODING(( "CP850",                  /* IANA, JDK 1.1 */
--              "IBM850",                 /* IANA */
--              "850",                    /* IANA */
--              "csPC850Multilingual",    /* IANA */
--            ),
--            cp850,
--            { cp850_mbtowc, NULL },       { cp850_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 */
@@ -2519,61 +2860,73 @@ diff -Nur libiconv-1.9.1-orig/lib/encodings.def libiconv-1.9.1-nocompile/lib/enc
 -              "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 })
@@ -2615,6 +2968,15 @@ diff -Nur libiconv-1.9.1-orig/lib/encodings.def libiconv-1.9.1-nocompile/lib/enc
 -            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,
@@ -2749,6 +3111,7 @@ diff -Nur libiconv-1.9.1-orig/lib/encodings.def libiconv-1.9.1-nocompile/lib/enc
 -              "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 })
@@ -2791,17 +3154,25 @@ diff -Nur libiconv-1.9.1-orig/lib/encodings.def libiconv-1.9.1-nocompile/lib/enc
 -              "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",                    /* JDK 1.1 */
--              "CP936",
+-DEFENCODING(( "GBK",                    /* IANA, JDK 1.1 */
 -            ),
 -            ces_gbk,
 -            { ces_gbk_mbtowc, NULL },     { ces_gbk_wctomb, NULL })
 -
--DEFENCODING(( "GB18030",                /* glibc */
+-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 })
@@ -2828,6 +3199,7 @@ diff -Nur libiconv-1.9.1-orig/lib/encodings.def libiconv-1.9.1-nocompile/lib/enc
 -              "EUCTW",                  /* glibc */
 -              "csEUCTW",
 -            /*"EUC_TW",                    JDK 1.1 */
+-            /*"CP51950",                   Windows */
 -            ),
 -            euc_tw,
 -            { euc_tw_mbtowc, NULL },      { euc_tw_wctomb, NULL })
@@ -2847,16 +3219,28 @@ diff -Nur libiconv-1.9.1-orig/lib/encodings.def libiconv-1.9.1-nocompile/lib/enc
 -            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",
 -            ),
--            big5hkscs,
--            { big5hkscs_mbtowc, NULL },   { big5hkscs_wctomb, NULL })
+-            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 })
@@ -2880,14 +3264,116 @@ diff -Nur libiconv-1.9.1-orig/lib/encodings.def libiconv-1.9.1-nocompile/lib/enc
 -            iso2022_kr,
 -            { iso2022_kr_mbtowc, NULL },  { iso2022_kr_wctomb, iso2022_kr_reset })
 -
-diff -Nur libiconv-1.9.1-orig/lib/loop_unicode.h libiconv-1.9.1-nocompile/lib/loop_unicode.h
---- libiconv-1.9.1-orig/lib/loop_unicode.h     2003-04-16 12:08:22.000000000 +0200
-+++ libiconv-1.9.1-nocompile/lib/loop_unicode.h        2006-03-05 15:52:29.000000000 +0100
-@@ -21,17 +21,19 @@
- /* This file defines the conversion loop via Unicode as a pivot encoding. */
+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 })
  
- /* Attempt to transliterate wc. Return code as in xxx_wctomb. */
-+
+-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)
  {
@@ -2906,7 +3392,7 @@ diff -Nur libiconv-1.9.1-orig/lib/loop_unicode.h libiconv-1.9.1-nocompile/lib/lo
        state_t backup_state = cd->ostate;
        unsigned char* backup_outptr = outptr;
        size_t backup_outleft = outleft;
-@@ -57,9 +59,9 @@
+@@ -57,9 +58,9 @@
      }
    }
    {
@@ -2918,7 +3404,7 @@ diff -Nur libiconv-1.9.1-orig/lib/loop_unicode.h libiconv-1.9.1-nocompile/lib/lo
      int indx = -1;
      if (wc == 0x3006)
        indx = 0;
-@@ -105,20 +107,20 @@
+@@ -105,20 +106,20 @@
      }
    }
    if (wc >= 0x2018 && wc <= 0x201a) {
@@ -2943,7 +3429,7 @@ diff -Nur libiconv-1.9.1-orig/lib/loop_unicode.h libiconv-1.9.1-nocompile/lib/lo
      int indx = translit_index(wc);
      if (indx >= 0) {
        const unsigned int * cp = &translit_data[indx];
-@@ -135,7 +137,7 @@
+@@ -135,7 +136,7 @@
          }
          sub_outcount = cd->ofuncs.xxx_wctomb(cd,outptr,cp[i],outleft);
          if (sub_outcount == RET_ILUNI)
@@ -2952,7 +3438,7 @@ diff -Nur libiconv-1.9.1-orig/lib/loop_unicode.h libiconv-1.9.1-nocompile/lib/lo
            sub_outcount = unicode_transliterate(cd,cp[i],outptr,outleft);
          if (sub_outcount <= RET_ILUNI)
            goto translit_failed;
-@@ -151,6 +153,7 @@
+@@ -151,6 +152,7 @@
          return RET_TOOSMALL;
      }
    }