package/libs/libiconv-full/patches/100-strip_charsets.patch

   1 --- a/lib/aliases_dos.h
   2 +++ b/lib/aliases_dos.h
   3 @@ -2,47 +2,3 @@
   4    S(dos_1, "IBM437", ei_cp437 )
   5    S(dos_2, "437", ei_cp437 )
   6    S(dos_3, "CSPC8CODEPAGE437", ei_cp437 )
   7 -  S(dos_4, "CP737", ei_cp737 )
   8 -  S(dos_5, "CP775", ei_cp775 )
   9 -  S(dos_6, "IBM775", ei_cp775 )
  10 -  S(dos_7, "CSPC775BALTIC", ei_cp775 )
  11 -  S(dos_8, "CP852", ei_cp852 )
  12 -  S(dos_9, "IBM852", ei_cp852 )
  13 -  S(dos_10, "852", ei_cp852 )
  14 -  S(dos_11, "CSPCP852", ei_cp852 )
  15 -  S(dos_12, "CP853", ei_cp853 )
  16 -  S(dos_13, "CP855", ei_cp855 )
  17 -  S(dos_14, "IBM855", ei_cp855 )
  18 -  S(dos_15, "855", ei_cp855 )
  19 -  S(dos_16, "CSIBM855", ei_cp855 )
  20 -  S(dos_17, "CP857", ei_cp857 )
  21 -  S(dos_18, "IBM857", ei_cp857 )
  22 -  S(dos_19, "857", ei_cp857 )
  23 -  S(dos_20, "CSIBM857", ei_cp857 )
  24 -  S(dos_21, "CP858", ei_cp858 )
  25 -  S(dos_22, "CP860", ei_cp860 )
  26 -  S(dos_23, "IBM860", ei_cp860 )
  27 -  S(dos_24, "860", ei_cp860 )
  28 -  S(dos_25, "CSIBM860", ei_cp860 )
  29 -  S(dos_26, "CP861", ei_cp861 )
  30 -  S(dos_27, "IBM861", ei_cp861 )
  31 -  S(dos_28, "861", ei_cp861 )
  32 -  S(dos_29, "CP-IS", ei_cp861 )
  33 -  S(dos_30, "CSIBM861", ei_cp861 )
  34 -  S(dos_31, "CP863", ei_cp863 )
  35 -  S(dos_32, "IBM863", ei_cp863 )
  36 -  S(dos_33, "863", ei_cp863 )
  37 -  S(dos_34, "CSIBM863", ei_cp863 )
  38 -  S(dos_35, "CP864", ei_cp864 )
  39 -  S(dos_36, "IBM864", ei_cp864 )
  40 -  S(dos_37, "CSIBM864", ei_cp864 )
  41 -  S(dos_38, "CP865", ei_cp865 )
  42 -  S(dos_39, "IBM865", ei_cp865 )
  43 -  S(dos_40, "865", ei_cp865 )
  44 -  S(dos_41, "CSIBM865", ei_cp865 )
  45 -  S(dos_42, "CP869", ei_cp869 )
  46 -  S(dos_43, "IBM869", ei_cp869 )
  47 -  S(dos_44, "869", ei_cp869 )
  48 -  S(dos_45, "CP-GR", ei_cp869 )
  49 -  S(dos_46, "CSIBM869", ei_cp869 )
  50 -  S(dos_47, "CP1125", ei_cp1125 )
  51 --- a/lib/aliases.gperf
  52 +++ b/lib/aliases.gperf
  53 @@ -48,8 +48,6 @@ UCS-2-INTERNAL, ei_ucs2internal
  54  UCS-2-SWAPPED, ei_ucs2swapped
  55  UCS-4-INTERNAL, ei_ucs4internal
  56  UCS-4-SWAPPED, ei_ucs4swapped
  57 -C99, ei_c99
  58 -JAVA, ei_java
  59  ISO-8859-1, ei_iso8859_1
  60  ISO_8859-1, ei_iso8859_1
  61  ISO_8859-1:1987, ei_iso8859_1
  62 @@ -68,285 +66,16 @@ LATIN2, ei_iso8859_2
  63  L2, ei_iso8859_2
  64  CSISOLATIN2, ei_iso8859_2
  65  ISO8859-2, ei_iso8859_2
  66 -ISO-8859-3, ei_iso8859_3
  67 -ISO_8859-3, ei_iso8859_3
  68 -ISO_8859-3:1988, ei_iso8859_3
  69 -ISO-IR-109, ei_iso8859_3
  70 -LATIN3, ei_iso8859_3
  71 -L3, ei_iso8859_3
  72 -CSISOLATIN3, ei_iso8859_3
  73 -ISO8859-3, ei_iso8859_3
  74 -ISO-8859-4, ei_iso8859_4
  75 -ISO_8859-4, ei_iso8859_4
  76 -ISO_8859-4:1988, ei_iso8859_4
  77 -ISO-IR-110, ei_iso8859_4
  78 -LATIN4, ei_iso8859_4
  79 -L4, ei_iso8859_4
  80 -CSISOLATIN4, ei_iso8859_4
  81 -ISO8859-4, ei_iso8859_4
  82 -ISO-8859-5, ei_iso8859_5
  83 -ISO_8859-5, ei_iso8859_5
  84 -ISO_8859-5:1988, ei_iso8859_5
  85 -ISO-IR-144, ei_iso8859_5
  86 -CYRILLIC, ei_iso8859_5
  87 -CSISOLATINCYRILLIC, ei_iso8859_5
  88 -ISO8859-5, ei_iso8859_5
  89 -ISO-8859-6, ei_iso8859_6
  90 -ISO_8859-6, ei_iso8859_6
  91 -ISO_8859-6:1987, ei_iso8859_6
  92 -ISO-IR-127, ei_iso8859_6
  93 -ECMA-114, ei_iso8859_6
  94 -ASMO-708, ei_iso8859_6
  95 -ARABIC, ei_iso8859_6
  96 -CSISOLATINARABIC, ei_iso8859_6
  97 -ISO8859-6, ei_iso8859_6
  98 -ISO-8859-7, ei_iso8859_7
  99 -ISO_8859-7, ei_iso8859_7
 100 -ISO_8859-7:1987, ei_iso8859_7
 101 -ISO_8859-7:2003, ei_iso8859_7
 102 -ISO-IR-126, ei_iso8859_7
 103 -ECMA-118, ei_iso8859_7
 104 -ELOT_928, ei_iso8859_7
 105 -GREEK8, ei_iso8859_7
 106 -GREEK, ei_iso8859_7
 107 -CSISOLATINGREEK, ei_iso8859_7
 108 -ISO8859-7, ei_iso8859_7
 109 -ISO-8859-8, ei_iso8859_8
 110 -ISO_8859-8, ei_iso8859_8
 111 -ISO_8859-8:1988, ei_iso8859_8
 112 -ISO-IR-138, ei_iso8859_8
 113 -HEBREW, ei_iso8859_8
 114 -CSISOLATINHEBREW, ei_iso8859_8
 115 -ISO8859-8, ei_iso8859_8
 116 -ISO-8859-9, ei_iso8859_9
 117 -ISO_8859-9, ei_iso8859_9
 118 -ISO_8859-9:1989, ei_iso8859_9
 119 -ISO-IR-148, ei_iso8859_9
 120 -LATIN5, ei_iso8859_9
 121 -L5, ei_iso8859_9
 122 -CSISOLATIN5, ei_iso8859_9
 123 -ISO8859-9, ei_iso8859_9
 124 -ISO-8859-10, ei_iso8859_10
 125 -ISO_8859-10, ei_iso8859_10
 126 -ISO_8859-10:1992, ei_iso8859_10
 127 -ISO-IR-157, ei_iso8859_10
 128 -LATIN6, ei_iso8859_10
 129 -L6, ei_iso8859_10
 130 -CSISOLATIN6, ei_iso8859_10
 131 -ISO8859-10, ei_iso8859_10
 132 -ISO-8859-11, ei_iso8859_11
 133 -ISO_8859-11, ei_iso8859_11
 134 -ISO8859-11, ei_iso8859_11
 135 -ISO-8859-13, ei_iso8859_13
 136 -ISO_8859-13, ei_iso8859_13
 137 -ISO-IR-179, ei_iso8859_13
 138 -LATIN7, ei_iso8859_13
 139 -L7, ei_iso8859_13
 140 -ISO8859-13, ei_iso8859_13
 141 -ISO-8859-14, ei_iso8859_14
 142 -ISO_8859-14, ei_iso8859_14
 143 -ISO_8859-14:1998, ei_iso8859_14
 144 -ISO-IR-199, ei_iso8859_14
 145 -LATIN8, ei_iso8859_14
 146 -L8, ei_iso8859_14
 147 -ISO-CELTIC, ei_iso8859_14
 148 -ISO8859-14, ei_iso8859_14
 149  ISO-8859-15, ei_iso8859_15
 150  ISO_8859-15, ei_iso8859_15
 151  ISO_8859-15:1998, ei_iso8859_15
 152  ISO-IR-203, ei_iso8859_15
 153  LATIN-9, ei_iso8859_15
 154  ISO8859-15, ei_iso8859_15
 155 -ISO-8859-16, ei_iso8859_16
 156 -ISO_8859-16, ei_iso8859_16
 157 -ISO_8859-16:2001, ei_iso8859_16
 158 -ISO-IR-226, ei_iso8859_16
 159 -LATIN10, ei_iso8859_16
 160 -L10, ei_iso8859_16
 161 -ISO8859-16, ei_iso8859_16
 162  KOI8-R, ei_koi8_r
 163  CSKOI8R, ei_koi8_r
 164 -KOI8-U, ei_koi8_u
 165 -KOI8-RU, ei_koi8_ru
 166  CP1250, ei_cp1250
 167  WINDOWS-1250, ei_cp1250
 168  MS-EE, ei_cp1250
 169 -CP1251, ei_cp1251
 170 -WINDOWS-1251, ei_cp1251
 171 -MS-CYRL, ei_cp1251
 172 -CP1252, ei_cp1252
 173 -WINDOWS-1252, ei_cp1252
 174 -MS-ANSI, ei_cp1252
 175 -CP1253, ei_cp1253
 176 -WINDOWS-1253, ei_cp1253
 177 -MS-GREEK, ei_cp1253
 178 -CP1254, ei_cp1254
 179 -WINDOWS-1254, ei_cp1254
 180 -MS-TURK, ei_cp1254
 181 -CP1255, ei_cp1255
 182 -WINDOWS-1255, ei_cp1255
 183 -MS-HEBR, ei_cp1255
 184 -CP1256, ei_cp1256
 185 -WINDOWS-1256, ei_cp1256
 186 -MS-ARAB, ei_cp1256
 187 -CP1257, ei_cp1257
 188 -WINDOWS-1257, ei_cp1257
 189 -WINBALTRIM, ei_cp1257
 190 -CP1258, ei_cp1258
 191 -WINDOWS-1258, ei_cp1258
 192 -CP850, ei_cp850
 193 -IBM850, ei_cp850
 194 -850, ei_cp850
 195 -CSPC850MULTILINGUAL, ei_cp850
 196 -CP862, ei_cp862
 197 -IBM862, ei_cp862
 198 -862, ei_cp862
 199 -CSPC862LATINHEBREW, ei_cp862
 200 -CP866, ei_cp866
 201 -IBM866, ei_cp866
 202 -866, ei_cp866
 203 -CSIBM866, ei_cp866
 204 -MACROMAN, ei_mac_roman
 205 -MACINTOSH, ei_mac_roman
 206 -MAC, ei_mac_roman
 207 -CSMACINTOSH, ei_mac_roman
 208 -MACCENTRALEUROPE, ei_mac_centraleurope
 209 -MACICELAND, ei_mac_iceland
 210 -MACCROATIAN, ei_mac_croatian
 211 -MACROMANIA, ei_mac_romania
 212 -MACCYRILLIC, ei_mac_cyrillic
 213 -MACUKRAINE, ei_mac_ukraine
 214 -MACGREEK, ei_mac_greek
 215 -MACTURKISH, ei_mac_turkish
 216 -MACHEBREW, ei_mac_hebrew
 217 -MACARABIC, ei_mac_arabic
 218 -MACTHAI, ei_mac_thai
 219 -HP-ROMAN8, ei_hp_roman8
 220 -ROMAN8, ei_hp_roman8
 221 -R8, ei_hp_roman8
 222 -CSHPROMAN8, ei_hp_roman8
 223 -NEXTSTEP, ei_nextstep
 224 -ARMSCII-8, ei_armscii_8
 225 -GEORGIAN-ACADEMY, ei_georgian_academy
 226 -GEORGIAN-PS, ei_georgian_ps
 227 -KOI8-T, ei_koi8_t
 228 -PT154, ei_pt154
 229 -PTCP154, ei_pt154
 230 -CP154, ei_pt154
 231 -CYRILLIC-ASIAN, ei_pt154
 232 -CSPTCP154, ei_pt154
 233 -MULELAO-1, ei_mulelao
 234 -CP1133, ei_cp1133
 235 -IBM-CP1133, ei_cp1133
 236 -TIS-620, ei_tis620
 237 -TIS620, ei_tis620
 238 -TIS620-0, ei_tis620
 239 -TIS620.2529-1, ei_tis620
 240 -TIS620.2533-0, ei_tis620
 241 -TIS620.2533-1, ei_tis620
 242 -ISO-IR-166, ei_tis620
 243 -CP874, ei_cp874
 244 -WINDOWS-874, ei_cp874
 245 -VISCII, ei_viscii
 246 -VISCII1.1-1, ei_viscii
 247 -CSVISCII, ei_viscii
 248 -TCVN, ei_tcvn
 249 -TCVN-5712, ei_tcvn
 250 -TCVN5712-1, ei_tcvn
 251 -TCVN5712-1:1993, ei_tcvn
 252 -JIS_C6220-1969-RO, ei_iso646_jp
 253 -ISO646-JP, ei_iso646_jp
 254 -ISO-IR-14, ei_iso646_jp
 255 -JP, ei_iso646_jp
 256 -CSISO14JISC6220RO, ei_iso646_jp
 257 -JIS_X0201, ei_jisx0201
 258 -JISX0201-1976, ei_jisx0201
 259 -X0201, ei_jisx0201
 260 -CSHALFWIDTHKATAKANA, ei_jisx0201
 261 -JIS_X0208, ei_jisx0208
 262 -JIS_X0208-1983, ei_jisx0208
 263 -JIS_X0208-1990, ei_jisx0208
 264 -JIS0208, ei_jisx0208
 265 -X0208, ei_jisx0208
 266 -ISO-IR-87, ei_jisx0208
 267 -JIS_C6226-1983, ei_jisx0208
 268 -CSISO87JISX0208, ei_jisx0208
 269 -JIS_X0212, ei_jisx0212
 270 -JIS_X0212.1990-0, ei_jisx0212
 271 -JIS_X0212-1990, ei_jisx0212
 272 -X0212, ei_jisx0212
 273 -ISO-IR-159, ei_jisx0212
 274 -CSISO159JISX02121990, ei_jisx0212
 275 -GB_1988-80, ei_iso646_cn
 276 -ISO646-CN, ei_iso646_cn
 277 -ISO-IR-57, ei_iso646_cn
 278 -CN, ei_iso646_cn
 279 -CSISO57GB1988, ei_iso646_cn
 280 -GB_2312-80, ei_gb2312
 281 -ISO-IR-58, ei_gb2312
 282 -CSISO58GB231280, ei_gb2312
 283 -CHINESE, ei_gb2312
 284 -ISO-IR-165, ei_isoir165
 285 -CN-GB-ISOIR165, ei_isoir165
 286 -KSC_5601, ei_ksc5601
 287 -KS_C_5601-1987, ei_ksc5601
 288 -KS_C_5601-1989, ei_ksc5601
 289 -ISO-IR-149, ei_ksc5601
 290 -CSKSC56011987, ei_ksc5601
 291 -KOREAN, ei_ksc5601
 292 -EUC-JP, ei_euc_jp
 293 -EUCJP, ei_euc_jp
 294 -EXTENDED_UNIX_CODE_PACKED_FORMAT_FOR_JAPANESE, ei_euc_jp
 295 -CSEUCPKDFMTJAPANESE, ei_euc_jp
 296 -SHIFT_JIS, ei_sjis
 297 -SHIFT-JIS, ei_sjis
 298 -SJIS, ei_sjis
 299 -MS_KANJI, ei_sjis
 300 -CSSHIFTJIS, ei_sjis
 301 -CP932, ei_cp932
 302 -ISO-2022-JP, ei_iso2022_jp
 303 -CSISO2022JP, ei_iso2022_jp
 304 -ISO-2022-JP-1, ei_iso2022_jp1
 305 -ISO-2022-JP-2, ei_iso2022_jp2
 306 -CSISO2022JP2, ei_iso2022_jp2
 307 -EUC-CN, ei_euc_cn
 308 -EUCCN, ei_euc_cn
 309 -GB2312, ei_euc_cn
 310 -CN-GB, ei_euc_cn
 311 -CSGB2312, ei_euc_cn
 312 -GBK, ei_ces_gbk
 313 -CP936, ei_cp936
 314 -MS936, ei_cp936
 315 -WINDOWS-936, ei_cp936
 316 -GB18030, ei_gb18030
 317 -ISO-2022-CN, ei_iso2022_cn
 318 -CSISO2022CN, ei_iso2022_cn
 319 -ISO-2022-CN-EXT, ei_iso2022_cn_ext
 320 -HZ, ei_hz
 321 -HZ-GB-2312, ei_hz
 322 -EUC-TW, ei_euc_tw
 323 -EUCTW, ei_euc_tw
 324 -CSEUCTW, ei_euc_tw
 325 -BIG5, ei_ces_big5
 326 -BIG-5, ei_ces_big5
 327 -BIG-FIVE, ei_ces_big5
 328 -BIGFIVE, ei_ces_big5
 329 -CN-BIG5, ei_ces_big5
 330 -CSBIG5, ei_ces_big5
 331 -CP950, ei_cp950
 332 -BIG5-HKSCS:1999, ei_big5hkscs1999
 333 -BIG5-HKSCS:2001, ei_big5hkscs2001
 334 -BIG5-HKSCS, ei_big5hkscs2004
 335 -BIG5HKSCS, ei_big5hkscs2004
 336 -BIG5-HKSCS:2004, ei_big5hkscs2004
 337 -EUC-KR, ei_euc_kr
 338 -EUCKR, ei_euc_kr
 339 -CSEUCKR, ei_euc_kr
 340 -CP949, ei_cp949
 341 -UHC, ei_cp949
 342 -JOHAB, ei_johab
 343 -CP1361, ei_johab
 344 -ISO-2022-KR, ei_iso2022_kr
 345 -CSISO2022KR, ei_iso2022_kr
 346  CHAR, ei_local_char
 347  WCHAR_T, ei_local_wchar_t
 348 --- a/lib/aliases.h
 349 +++ b/lib/aliases.h
 350 @@ -1,6 +1,6 @@
 351  /* ANSI-C code produced by gperf version 3.0.2 */
 352  /* Command-line: gperf -m 10 lib/aliases.gperf  */
 353 -/* Computed positions: -k'1,3-11,$' */
 354 +/* Computed positions: -k'4-7,10,$' */
 355
 356  #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
 357        && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
 358 @@ -32,12 +32,12 @@
 359  #line 1 "lib/aliases.gperf"
 360  struct alias { int name; unsigned int encoding_index; };
 361
 362 -#define TOTAL_KEYWORDS 341
 363 +#define TOTAL_KEYWORDS 70
 364  #define MIN_WORD_LENGTH 2
 365 -#define MAX_WORD_LENGTH 45
 366 -#define MIN_HASH_VALUE 13
 367 -#define MAX_HASH_VALUE 997
 368 -/* maximum key range = 985, duplicates = 0 */
 369 +#define MAX_WORD_LENGTH 17
 370 +#define MIN_HASH_VALUE 4
 371 +#define MAX_HASH_VALUE 98
 372 +/* maximum key range = 95, duplicates = 0 */
 373
 374  #ifdef __GNUC__
 375  __inline
 376 @@ -49,38 +49,31 @@ inline
 377  static unsigned int
 378  aliases_hash (register const char *str, register unsigned int len)
 379  {
 380 -  static const unsigned short asso_values[] =
 381 +  static const unsigned char asso_values[] =
 382      {
 383 -      998, 998, 998, 998, 998, 998, 998, 998, 998, 998,
 384 -      998, 998, 998, 998, 998, 998, 998, 998, 998, 998,
 385 -      998, 998, 998, 998, 998, 998, 998, 998, 998, 998,
 386 -      998, 998, 998, 998, 998, 998, 998, 998, 998, 998,
 387 -      998, 998, 998, 998, 998,   4, 199, 998,  79,   6,
 388 -       29,  65,  13,  15,   4,  88,  20,  22, 386, 998,
 389 -      998, 998, 998, 998, 998,  47, 188, 110,   6,  26,
 390 -       63,  19,  12,   5, 281, 202,   7, 166,  11,   5,
 391 -       64, 998,   4,  11,  20, 185, 110, 152, 163,   4,
 392 -        4, 998, 998, 998, 998,   5, 998, 998, 998, 998,
 393 -      998, 998, 998, 998, 998, 998, 998, 998, 998, 998,
 394 -      998, 998, 998, 998, 998, 998, 998, 998, 998, 998,
 395 -      998, 998, 998, 998, 998, 998, 998, 998
 396 +      99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
 397 +      99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
 398 +      99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
 399 +      99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
 400 +      99, 99, 99, 99, 99,  6, 99, 99, 22,  3,
 401 +       2,  2, 17,  3,  2,  7,  3,  2, 99, 99,
 402 +      99, 99, 99, 99, 99,  4, 53,  2, 21,  2,
 403 +      99,  7, 99, 15, 99, 99, 19, 99, 33,  2,
 404 +       4, 99, 11, 26, 17, 99, 99,  3, 26, 99,
 405 +      99, 99, 99, 99, 99, 10, 99, 99, 99, 99,
 406 +      99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
 407 +      99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
 408 +      99, 99, 99, 99, 99, 99, 99, 99
 409      };
 410    register int hval = len;
 411
 412    switch (hval)
 413      {
 414        default:
 415 -        hval += asso_values[(unsigned char)str[10]];
 416 -      /*FALLTHROUGH*/
 417 -      case 10:
 418          hval += asso_values[(unsigned char)str[9]];
 419        /*FALLTHROUGH*/
 420        case 9:
 421 -        hval += asso_values[(unsigned char)str[8]];
 422 -      /*FALLTHROUGH*/
 423        case 8:
 424 -        hval += asso_values[(unsigned char)str[7]];
 425 -      /*FALLTHROUGH*/
 426        case 7:
 427          hval += asso_values[(unsigned char)str[6]];
 428        /*FALLTHROUGH*/
 429 @@ -94,11 +87,7 @@ aliases_hash (register const char *str,
 430          hval += asso_values[(unsigned char)str[3]];
 431        /*FALLTHROUGH*/
 432        case 3:
 433 -        hval += asso_values[(unsigned char)str[2]];
 434 -      /*FALLTHROUGH*/
 435        case 2:
 436 -      case 1:
 437 -        hval += asso_values[(unsigned char)str[0]];
 438          break;
 439      }
 440    return hval + asso_values[(unsigned char)str[len - 1]];
 441 @@ -106,1576 +95,306 @@ aliases_hash (register const char *str,
 442
 443  struct stringpool_t
 444    {
 445 -    char stringpool_str13[sizeof("L6")];
 446 -    char stringpool_str15[sizeof("L1")];
 447 -    char stringpool_str18[sizeof("HZ")];
 448 -    char stringpool_str22[sizeof("L4")];
 449 -    char stringpool_str24[sizeof("L5")];
 450 -    char stringpool_str26[sizeof("R8")];
 451 -    char stringpool_str29[sizeof("L8")];
 452 -    char stringpool_str31[sizeof("866")];
 453 -    char stringpool_str38[sizeof("L2")];
 454 -    char stringpool_str42[sizeof("SJIS")];
 455 -    char stringpool_str43[sizeof("ISO-IR-6")];
 456 -    char stringpool_str55[sizeof("ISO-IR-166")];
 457 -    char stringpool_str57[sizeof("LATIN6")];
 458 -    char stringpool_str61[sizeof("LATIN1")];
 459 -    char stringpool_str68[sizeof("ISO-IR-14")];
 460 -    char stringpool_str74[sizeof("L3")];
 461 -    char stringpool_str75[sizeof("LATIN4")];
 462 -    char stringpool_str77[sizeof("ISO-IR-165")];
 463 -    char stringpool_str79[sizeof("LATIN5")];
 464 -    char stringpool_str80[sizeof("ISO-IR-126")];
 465 -    char stringpool_str81[sizeof("862")];
 466 -    char stringpool_str82[sizeof("ISO-IR-144")];
 467 -    char stringpool_str89[sizeof("LATIN8")];
 468 -    char stringpool_str91[sizeof("ISO-IR-58")];
 469 -    char stringpool_str96[sizeof("ISO-IR-148")];
 470 -    char stringpool_str97[sizeof("L7")];
 471 -    char stringpool_str98[sizeof("LATIN-9")];
 472 -    char stringpool_str100[sizeof("ISO-IR-149")];
 473 -    char stringpool_str102[sizeof("ISO-IR-159")];
 474 -    char stringpool_str103[sizeof("ISO-IR-226")];
 475 -    char stringpool_str107[sizeof("LATIN2")];
 476 -    char stringpool_str108[sizeof("ISO8859-6")];
 477 -    char stringpool_str109[sizeof("ISO-IR-199")];
 478 -    char stringpool_str112[sizeof("ISO8859-1")];
 479 -    char stringpool_str113[sizeof("ISO-8859-6")];
 480 -    char stringpool_str114[sizeof("ISO_8859-6")];
 481 -    char stringpool_str115[sizeof("ISO8859-16")];
 482 -    char stringpool_str116[sizeof("PT154")];
 483 -    char stringpool_str117[sizeof("ISO-8859-1")];
 484 -    char stringpool_str118[sizeof("ISO_8859-1")];
 485 -    char stringpool_str119[sizeof("ISO8859-11")];
 486 -    char stringpool_str120[sizeof("ISO-8859-16")];
 487 -    char stringpool_str121[sizeof("ISO_8859-16")];
 488 -    char stringpool_str123[sizeof("CN")];
 489 -    char stringpool_str124[sizeof("ISO-8859-11")];
 490 -    char stringpool_str125[sizeof("ISO_8859-11")];
 491 -    char stringpool_str126[sizeof("ISO8859-4")];
 492 -    char stringpool_str128[sizeof("ISO_8859-16:2001")];
 493 -    char stringpool_str130[sizeof("ISO8859-5")];
 494 -    char stringpool_str131[sizeof("ISO-8859-4")];
 495 -    char stringpool_str132[sizeof("ISO_8859-4")];
 496 -    char stringpool_str133[sizeof("ISO8859-14")];
 497 -    char stringpool_str134[sizeof("ISO-IR-101")];
 498 -    char stringpool_str135[sizeof("ISO-8859-5")];
 499 -    char stringpool_str136[sizeof("ISO_8859-5")];
 500 -    char stringpool_str137[sizeof("ISO8859-15")];
 501 -    char stringpool_str138[sizeof("ISO-8859-14")];
 502 -    char stringpool_str139[sizeof("ISO_8859-14")];
 503 -    char stringpool_str140[sizeof("ISO8859-8")];
 504 -    char stringpool_str142[sizeof("ISO-8859-15")];
 505 -    char stringpool_str143[sizeof("ISO_8859-15")];
 506 -    char stringpool_str144[sizeof("ISO8859-9")];
 507 -    char stringpool_str145[sizeof("ISO-8859-8")];
 508 -    char stringpool_str146[sizeof("ISO_8859-8")];
 509 -    char stringpool_str147[sizeof("CP866")];
 510 -    char stringpool_str148[sizeof("ISO-IR-138")];
 511 -    char stringpool_str149[sizeof("ISO-8859-9")];
 512 -    char stringpool_str150[sizeof("ISO_8859-9")];
 513 -    char stringpool_str151[sizeof("ISO_8859-14:1998")];
 514 -    char stringpool_str153[sizeof("ISO_8859-15:1998")];
 515 -    char stringpool_str155[sizeof("ELOT_928")];
 516 -    char stringpool_str156[sizeof("TCVN")];
 517 -    char stringpool_str157[sizeof("C99")];
 518 -    char stringpool_str158[sizeof("ISO8859-2")];
 519 -    char stringpool_str162[sizeof("CP154")];
 520 -    char stringpool_str163[sizeof("ISO-8859-2")];
 521 -    char stringpool_str164[sizeof("ISO_8859-2")];
 522 -    char stringpool_str166[sizeof("ISO-IR-109")];
 523 -    char stringpool_str168[sizeof("L10")];
 524 -    char stringpool_str169[sizeof("CHAR")];
 525 -    char stringpool_str174[sizeof("CP1256")];
 526 -    char stringpool_str175[sizeof("ISO-IR-179")];
 527 -    char stringpool_str176[sizeof("ISO646-CN")];
 528 -    char stringpool_str177[sizeof("ASCII")];
 529 -    char stringpool_str178[sizeof("CP1251")];
 530 -    char stringpool_str179[sizeof("LATIN3")];
 531 -    char stringpool_str181[sizeof("850")];
 532 -    char stringpool_str183[sizeof("GB2312")];
 533 -    char stringpool_str185[sizeof("CP819")];
 534 -    char stringpool_str192[sizeof("CP1254")];
 535 -    char stringpool_str194[sizeof("CP949")];
 536 -    char stringpool_str196[sizeof("CP1255")];
 537 -    char stringpool_str197[sizeof("CP862")];
 538 -    char stringpool_str198[sizeof("US")];
 539 -    char stringpool_str203[sizeof("CP1361")];
 540 -    char stringpool_str206[sizeof("CP1258")];
 541 -    char stringpool_str207[sizeof("ISO-IR-110")];
 542 -    char stringpool_str209[sizeof("IBM866")];
 543 -    char stringpool_str210[sizeof("CP936")];
 544 -    char stringpool_str211[sizeof("GEORGIAN-PS")];
 545 -    char stringpool_str214[sizeof("LATIN10")];
 546 -    char stringpool_str222[sizeof("CHINESE")];
 547 -    char stringpool_str224[sizeof("CP1252")];
 548 -    char stringpool_str225[sizeof("LATIN7")];
 549 -    char stringpool_str226[sizeof("ISO_8859-10:1992")];
 550 -    char stringpool_str227[sizeof("ISO-IR-57")];
 551 -    char stringpool_str228[sizeof("TIS620")];
 552 -    char stringpool_str230[sizeof("ISO8859-3")];
 553 -    char stringpool_str231[sizeof("UCS-4")];
 554 -    char stringpool_str232[sizeof("ISO-IR-87")];
 555 -    char stringpool_str233[sizeof("TIS-620")];
 556 -    char stringpool_str234[sizeof("ISO-IR-157")];
 557 -    char stringpool_str235[sizeof("ISO-8859-3")];
 558 -    char stringpool_str236[sizeof("ISO_8859-3")];
 559 -    char stringpool_str237[sizeof("ISO8859-13")];
 560 -    char stringpool_str240[sizeof("CSISOLATIN6")];
 561 -    char stringpool_str241[sizeof("BIG5")];
 562 -    char stringpool_str242[sizeof("ISO-8859-13")];
 563 -    char stringpool_str243[sizeof("ISO_8859-13")];
 564 -    char stringpool_str244[sizeof("CSISOLATIN1")];
 565 -    char stringpool_str245[sizeof("KOI8-R")];
 566 -    char stringpool_str246[sizeof("BIG-5")];
 567 -    char stringpool_str247[sizeof("IBM819")];
 568 -    char stringpool_str248[sizeof("ISO-IR-127")];
 569 -    char stringpool_str249[sizeof("CP874")];
 570 -    char stringpool_str251[sizeof("ISO646-US")];
 571 -    char stringpool_str252[sizeof("VISCII")];
 572 -    char stringpool_str253[sizeof("MS-EE")];
 573 -    char stringpool_str256[sizeof("MS-ANSI")];
 574 -    char stringpool_str258[sizeof("CSISOLATIN4")];
 575 -    char stringpool_str259[sizeof("IBM862")];
 576 -    char stringpool_str260[sizeof("CP932")];
 577 -    char stringpool_str261[sizeof("X0212")];
 578 -    char stringpool_str262[sizeof("CSISOLATIN5")];
 579 -    char stringpool_str263[sizeof("UCS-2")];
 580 -    char stringpool_str265[sizeof("ISO8859-10")];
 581 -    char stringpool_str266[sizeof("MS936")];
 582 -    char stringpool_str267[sizeof("WCHAR_T")];
 583 -    char stringpool_str270[sizeof("ISO-8859-10")];
 584 -    char stringpool_str271[sizeof("ISO_8859-10")];
 585 -    char stringpool_str272[sizeof("UTF-16")];
 586 -    char stringpool_str273[sizeof("EUCCN")];
 587 -    char stringpool_str274[sizeof("ROMAN8")];
 588 -    char stringpool_str275[sizeof("ISO-IR-203")];
 589 -    char stringpool_str276[sizeof("ISO8859-7")];
 590 -    char stringpool_str277[sizeof("KOI8-T")];
 591 -    char stringpool_str278[sizeof("EUC-CN")];
 592 -    char stringpool_str279[sizeof("UCS-4LE")];
 593 -    char stringpool_str280[sizeof("ISO-IR-100")];
 594 -    char stringpool_str281[sizeof("ISO-8859-7")];
 595 -    char stringpool_str282[sizeof("ISO_8859-7")];
 596 -    char stringpool_str283[sizeof("MULELAO-1")];
 597 -    char stringpool_str284[sizeof("GB_1988-80")];
 598 -    char stringpool_str288[sizeof("X0201")];
 599 -    char stringpool_str289[sizeof("ECMA-114")];
 600 -    char stringpool_str290[sizeof("CSISOLATIN2")];
 601 -    char stringpool_str291[sizeof("GEORGIAN-ACADEMY")];
 602 -    char stringpool_str292[sizeof("PTCP154")];
 603 -    char stringpool_str295[sizeof("UCS-2LE")];
 604 -    char stringpool_str296[sizeof("CP1253")];
 605 -    char stringpool_str297[sizeof("UTF-8")];
 606 -    char stringpool_str298[sizeof("HP-ROMAN8")];
 607 -    char stringpool_str300[sizeof("CSASCII")];
 608 -    char stringpool_str303[sizeof("ECMA-118")];
 609 -    char stringpool_str304[sizeof("UCS-4-INTERNAL")];
 610 -    char stringpool_str305[sizeof("TCVN5712-1")];
 611 -    char stringpool_str307[sizeof("KOREAN")];
 612 -    char stringpool_str308[sizeof("CP850")];
 613 -    char stringpool_str309[sizeof("MS-CYRL")];
 614 -    char stringpool_str310[sizeof("CP950")];
 615 -    char stringpool_str313[sizeof("TIS620-0")];
 616 -    char stringpool_str316[sizeof("X0208")];
 617 -    char stringpool_str319[sizeof("GREEK8")];
 618 -    char stringpool_str320[sizeof("UCS-2-INTERNAL")];
 619 -    char stringpool_str321[sizeof("TCVN-5712")];
 620 -    char stringpool_str323[sizeof("CP1133")];
 621 -    char stringpool_str324[sizeof("CP1250")];
 622 -    char stringpool_str327[sizeof("ISO-2022-CN")];
 623 -    char stringpool_str329[sizeof("UTF-16LE")];
 624 -    char stringpool_str335[sizeof("CYRILLIC-ASIAN")];
 625 -    char stringpool_str337[sizeof("ISO-10646-UCS-4")];
 626 -    char stringpool_str340[sizeof("ISO-2022-CN-EXT")];
 627 -    char stringpool_str342[sizeof("CP1257")];
 628 -    char stringpool_str345[sizeof("GB_2312-80")];
 629 -    char stringpool_str347[sizeof("JP")];
 630 -    char stringpool_str351[sizeof("EUCKR")];
 631 -    char stringpool_str353[sizeof("ISO-10646-UCS-2")];
 632 -    char stringpool_str354[sizeof("GB18030")];
 633 -    char stringpool_str356[sizeof("EUC-KR")];
 634 -    char stringpool_str357[sizeof("CSKOI8R")];
 635 -    char stringpool_str358[sizeof("CSBIG5")];
 636 -    char stringpool_str360[sizeof("CP367")];
 637 -    char stringpool_str361[sizeof("MACINTOSH")];
 638 -    char stringpool_str362[sizeof("CSISOLATIN3")];
 639 -    char stringpool_str363[sizeof("CN-BIG5")];
 640 -    char stringpool_str366[sizeof("CYRILLIC")];
 641 -    char stringpool_str369[sizeof("CSVISCII")];
 642 -    char stringpool_str370[sizeof("IBM850")];
 643 -    char stringpool_str372[sizeof("MACTHAI")];
 644 -    char stringpool_str374[sizeof("UNICODE-1-1")];
 645 -    char stringpool_str376[sizeof("ISO_646.IRV:1991")];
 646 -    char stringpool_str380[sizeof("US-ASCII")];
 647 -    char stringpool_str381[sizeof("UTF-32")];
 648 -    char stringpool_str384[sizeof("CN-GB-ISOIR165")];
 649 -    char stringpool_str387[sizeof("NEXTSTEP")];
 650 -    char stringpool_str389[sizeof("MAC")];
 651 -    char stringpool_str393[sizeof("EXTENDED_UNIX_CODE_PACKED_FORMAT_FOR_JAPANESE")];
 652 -    char stringpool_str394[sizeof("CSISOLATINARABIC")];
 653 -    char stringpool_str395[sizeof("HZ-GB-2312")];
 654 -    char stringpool_str397[sizeof("ARMSCII-8")];
 655 -    char stringpool_str401[sizeof("CSISOLATINHEBREW")];
 656 -    char stringpool_str405[sizeof("ISO-2022-KR")];
 657 -    char stringpool_str407[sizeof("WINDOWS-1256")];
 658 -    char stringpool_str408[sizeof("UHC")];
 659 -    char stringpool_str409[sizeof("WINDOWS-1251")];
 660 -    char stringpool_str411[sizeof("MS-HEBR")];
 661 -    char stringpool_str412[sizeof("ISO-CELTIC")];
 662 -    char stringpool_str413[sizeof("UTF-32LE")];
 663 -    char stringpool_str416[sizeof("WINDOWS-1254")];
 664 -    char stringpool_str418[sizeof("WINDOWS-1255")];
 665 -    char stringpool_str420[sizeof("SHIFT-JIS")];
 666 -    char stringpool_str421[sizeof("SHIFT_JIS")];
 667 -    char stringpool_str422[sizeof("IBM367")];
 668 -    char stringpool_str423[sizeof("WINDOWS-1258")];
 669 -    char stringpool_str424[sizeof("CSPTCP154")];
 670 -    char stringpool_str426[sizeof("GBK")];
 671 -    char stringpool_str428[sizeof("UNICODELITTLE")];
 672 -    char stringpool_str432[sizeof("WINDOWS-1252")];
 673 -    char stringpool_str433[sizeof("UTF-7")];
 674 -    char stringpool_str435[sizeof("KSC_5601")];
 675 -    char stringpool_str437[sizeof("ASMO-708")];
 676 -    char stringpool_str440[sizeof("CSISO2022CN")];
 677 -    char stringpool_str444[sizeof("BIGFIVE")];
 678 -    char stringpool_str447[sizeof("WINDOWS-936")];
 679 -    char stringpool_str448[sizeof("CSUCS4")];
 680 -    char stringpool_str449[sizeof("BIG-FIVE")];
 681 -    char stringpool_str453[sizeof("ISO646-JP")];
 682 -    char stringpool_str456[sizeof("TIS620.2529-1")];
 683 -    char stringpool_str457[sizeof("CSISOLATINGREEK")];
 684 -    char stringpool_str459[sizeof("CSISOLATINCYRILLIC")];
 685 -    char stringpool_str460[sizeof("UCS-4BE")];
 686 -    char stringpool_str462[sizeof("UNICODE-1-1-UTF-7")];
 687 -    char stringpool_str465[sizeof("EUCTW")];
 688 -    char stringpool_str468[sizeof("WINDOWS-1253")];
 689 -    char stringpool_str469[sizeof("CSHPROMAN8")];
 690 -    char stringpool_str470[sizeof("EUC-TW")];
 691 -    char stringpool_str472[sizeof("KS_C_5601-1989")];
 692 -    char stringpool_str476[sizeof("UCS-2BE")];
 693 -    char stringpool_str479[sizeof("VISCII1.1-1")];
 694 -    char stringpool_str480[sizeof("GREEK")];
 695 -    char stringpool_str482[sizeof("WINDOWS-1250")];
 696 -    char stringpool_str483[sizeof("CSGB2312")];
 697 -    char stringpool_str486[sizeof("WINDOWS-874")];
 698 -    char stringpool_str487[sizeof("CSUNICODE11")];
 699 -    char stringpool_str489[sizeof("JAVA")];
 700 -    char stringpool_str491[sizeof("WINDOWS-1257")];
 701 -    char stringpool_str493[sizeof("CSUNICODE")];
 702 -    char stringpool_str500[sizeof("CSHALFWIDTHKATAKANA")];
 703 -    char stringpool_str502[sizeof("CSISO57GB1988")];
 704 -    char stringpool_str504[sizeof("MACICELAND")];
 705 -    char stringpool_str509[sizeof("CSIBM866")];
 706 -    char stringpool_str510[sizeof("UTF-16BE")];
 707 -    char stringpool_str513[sizeof("ARABIC")];
 708 -    char stringpool_str514[sizeof("CN-GB")];
 709 -    char stringpool_str518[sizeof("CSISO2022KR")];
 710 -    char stringpool_str520[sizeof("CSMACINTOSH")];
 711 -    char stringpool_str526[sizeof("JIS0208")];
 712 -    char stringpool_str528[sizeof("MACROMAN")];
 713 -    char stringpool_str530[sizeof("ISO_8859-4:1988")];
 714 -    char stringpool_str532[sizeof("ISO_8859-5:1988")];
 715 -    char stringpool_str535[sizeof("TIS620.2533-1")];
 716 -    char stringpool_str536[sizeof("ANSI_X3.4-1986")];
 717 -    char stringpool_str537[sizeof("ISO_8859-8:1988")];
 718 -    char stringpool_str538[sizeof("KS_C_5601-1987")];
 719 -    char stringpool_str539[sizeof("CSSHIFTJIS")];
 720 -    char stringpool_str540[sizeof("HEBREW")];
 721 -    char stringpool_str541[sizeof("ISO_8859-9:1989")];
 722 -    char stringpool_str547[sizeof("MACCROATIAN")];
 723 -    char stringpool_str548[sizeof("ISO-2022-JP-1")];
 724 -    char stringpool_str550[sizeof("EUCJP")];
 725 -    char stringpool_str552[sizeof("ANSI_X3.4-1968")];
 726 -    char stringpool_str555[sizeof("EUC-JP")];
 727 -    char stringpool_str561[sizeof("CSISO58GB231280")];
 728 -    char stringpool_str562[sizeof("JIS_C6226-1983")];
 729 -    char stringpool_str566[sizeof("IBM-CP1133")];
 730 -    char stringpool_str569[sizeof("MACCENTRALEUROPE")];
 731 -    char stringpool_str570[sizeof("CSISO159JISX02121990")];
 732 -    char stringpool_str571[sizeof("ISO-2022-JP-2")];
 733 -    char stringpool_str573[sizeof("CSUNICODE11UTF7")];
 734 -    char stringpool_str574[sizeof("UCS-4-SWAPPED")];
 735 -    char stringpool_str578[sizeof("UNICODEBIG")];
 736 -    char stringpool_str579[sizeof("CSISO14JISC6220RO")];
 737 -    char stringpool_str580[sizeof("JIS_C6220-1969-RO")];
 738 -    char stringpool_str582[sizeof("ISO_8859-3:1988")];
 739 -    char stringpool_str586[sizeof("CSPC862LATINHEBREW")];
 740 -    char stringpool_str588[sizeof("BIG5HKSCS")];
 741 -    char stringpool_str589[sizeof("ISO_8859-6:1987")];
 742 -    char stringpool_str590[sizeof("UCS-2-SWAPPED")];
 743 -    char stringpool_str591[sizeof("ISO_8859-1:1987")];
 744 -    char stringpool_str593[sizeof("BIG5-HKSCS")];
 745 -    char stringpool_str594[sizeof("UTF-32BE")];
 746 -    char stringpool_str604[sizeof("ISO-2022-JP")];
 747 -    char stringpool_str607[sizeof("KOI8-U")];
 748 -    char stringpool_str608[sizeof("TIS620.2533-0")];
 749 -    char stringpool_str612[sizeof("KOI8-RU")];
 750 -    char stringpool_str614[sizeof("ISO_8859-2:1987")];
 751 -    char stringpool_str618[sizeof("MACROMANIA")];
 752 -    char stringpool_str641[sizeof("JIS_X0212")];
 753 -    char stringpool_str648[sizeof("CSEUCKR")];
 754 -    char stringpool_str649[sizeof("MACCYRILLIC")];
 755 -    char stringpool_str650[sizeof("ISO_8859-7:2003")];
 756 -    char stringpool_str651[sizeof("MS-ARAB")];
 757 -    char stringpool_str657[sizeof("MS-GREEK")];
 758 -    char stringpool_str666[sizeof("CSKSC56011987")];
 759 -    char stringpool_str668[sizeof("JIS_X0201")];
 760 -    char stringpool_str673[sizeof("ISO_8859-7:1987")];
 761 -    char stringpool_str683[sizeof("CSISO2022JP2")];
 762 -    char stringpool_str696[sizeof("JIS_X0208")];
 763 -    char stringpool_str697[sizeof("JISX0201-1976")];
 764 -    char stringpool_str706[sizeof("JIS_X0212-1990")];
 765 -    char stringpool_str717[sizeof("CSISO2022JP")];
 766 -    char stringpool_str721[sizeof("JOHAB")];
 767 -    char stringpool_str730[sizeof("MS_KANJI")];
 768 -    char stringpool_str734[sizeof("CSISO87JISX0208")];
 769 -    char stringpool_str737[sizeof("MACTURKISH")];
 770 -    char stringpool_str755[sizeof("TCVN5712-1:1993")];
 771 -    char stringpool_str756[sizeof("JIS_X0208-1983")];
 772 -    char stringpool_str762[sizeof("CSEUCTW")];
 773 -    char stringpool_str763[sizeof("MACGREEK")];
 774 -    char stringpool_str770[sizeof("JIS_X0208-1990")];
 775 -    char stringpool_str776[sizeof("WINBALTRIM")];
 776 -    char stringpool_str790[sizeof("MS-TURK")];
 777 -    char stringpool_str792[sizeof("MACUKRAINE")];
 778 -    char stringpool_str796[sizeof("MACARABIC")];
 779 -    char stringpool_str802[sizeof("CSPC850MULTILINGUAL")];
 780 -    char stringpool_str845[sizeof("MACHEBREW")];
 781 -    char stringpool_str903[sizeof("JIS_X0212.1990-0")];
 782 -    char stringpool_str979[sizeof("BIG5-HKSCS:2001")];
 783 -    char stringpool_str986[sizeof("BIG5-HKSCS:2004")];
 784 -    char stringpool_str995[sizeof("BIG5-HKSCS:1999")];
 785 -    char stringpool_str997[sizeof("CSEUCPKDFMTJAPANESE")];
 786 +    char stringpool_str4[sizeof("L2")];
 787 +    char stringpool_str5[sizeof("L1")];
 788 +    char stringpool_str11[sizeof("MS-EE")];
 789 +    char stringpool_str12[sizeof("CP819")];
 790 +    char stringpool_str15[sizeof("UCS-2")];
 791 +    char stringpool_str16[sizeof("IBM819")];
 792 +    char stringpool_str17[sizeof("UTF-8")];
 793 +    char stringpool_str18[sizeof("UTF-32")];
 794 +    char stringpool_str19[sizeof("UTF-16")];
 795 +    char stringpool_str21[sizeof("CP367")];
 796 +    char stringpool_str22[sizeof("ISO8859-2")];
 797 +    char stringpool_str23[sizeof("ISO8859-1")];
 798 +    char stringpool_str24[sizeof("IBM367")];
 799 +    char stringpool_str25[sizeof("UTF-7")];
 800 +    char stringpool_str26[sizeof("CHAR")];
 801 +    char stringpool_str27[sizeof("ISO8859-15")];
 802 +    char stringpool_str28[sizeof("US")];
 803 +    char stringpool_str29[sizeof("ISO-8859-2")];
 804 +    char stringpool_str31[sizeof("ISO-8859-1")];
 805 +    char stringpool_str32[sizeof("ISO-8859-15")];
 806 +    char stringpool_str33[sizeof("ISO_8859-2")];
 807 +    char stringpool_str35[sizeof("ISO_8859-1")];
 808 +    char stringpool_str36[sizeof("ISO_8859-15")];
 809 +    char stringpool_str37[sizeof("KOI8-R")];
 810 +    char stringpool_str38[sizeof("UCS-2LE")];
 811 +    char stringpool_str39[sizeof("UTF-32LE")];
 812 +    char stringpool_str40[sizeof("UTF-16LE")];
 813 +    char stringpool_str41[sizeof("ISO_8859-15:1998")];
 814 +    char stringpool_str43[sizeof("ISO_8859-2:1987")];
 815 +    char stringpool_str44[sizeof("ISO_8859-1:1987")];
 816 +    char stringpool_str45[sizeof("UCS-4")];
 817 +    char stringpool_str47[sizeof("UNICODE-1-1")];
 818 +    char stringpool_str48[sizeof("ISO-IR-6")];
 819 +    char stringpool_str49[sizeof("CSKOI8R")];
 820 +    char stringpool_str50[sizeof("ASCII")];
 821 +    char stringpool_str51[sizeof("UNICODEBIG")];
 822 +    char stringpool_str52[sizeof("ISO-IR-203")];
 823 +    char stringpool_str53[sizeof("UCS-4LE")];
 824 +    char stringpool_str54[sizeof("ISO-IR-101")];
 825 +    char stringpool_str55[sizeof("CP1250")];
 826 +    char stringpool_str56[sizeof("ISO-10646-UCS-2")];
 827 +    char stringpool_str57[sizeof("UNICODE-1-1-UTF-7")];
 828 +    char stringpool_str58[sizeof("LATIN2")];
 829 +    char stringpool_str59[sizeof("UNICODELITTLE")];
 830 +    char stringpool_str60[sizeof("LATIN1")];
 831 +    char stringpool_str61[sizeof("ISO_646.IRV:1991")];
 832 +    char stringpool_str62[sizeof("ISO646-US")];
 833 +    char stringpool_str63[sizeof("CSUNICODE")];
 834 +    char stringpool_str64[sizeof("UCS-2-INTERNAL")];
 835 +    char stringpool_str65[sizeof("LATIN-9")];
 836 +    char stringpool_str66[sizeof("WCHAR_T")];
 837 +    char stringpool_str68[sizeof("CSUCS4")];
 838 +    char stringpool_str69[sizeof("CSUNICODE11")];
 839 +    char stringpool_str70[sizeof("US-ASCII")];
 840 +    char stringpool_str71[sizeof("ISO-10646-UCS-4")];
 841 +    char stringpool_str72[sizeof("UCS-2BE")];
 842 +    char stringpool_str73[sizeof("UTF-32BE")];
 843 +    char stringpool_str74[sizeof("UTF-16BE")];
 844 +    char stringpool_str75[sizeof("ANSI_X3.4-1986")];
 845 +    char stringpool_str76[sizeof("ANSI_X3.4-1968")];
 846 +    char stringpool_str77[sizeof("CSUNICODE11UTF7")];
 847 +    char stringpool_str78[sizeof("UCS-2-SWAPPED")];
 848 +    char stringpool_str79[sizeof("UCS-4-INTERNAL")];
 849 +    char stringpool_str80[sizeof("CSASCII")];
 850 +    char stringpool_str87[sizeof("UCS-4BE")];
 851 +    char stringpool_str88[sizeof("WINDOWS-1250")];
 852 +    char stringpool_str92[sizeof("ISO-IR-100")];
 853 +    char stringpool_str93[sizeof("UCS-4-SWAPPED")];
 854 +    char stringpool_str97[sizeof("CSISOLATIN2")];
 855 +    char stringpool_str98[sizeof("CSISOLATIN1")];
 856    };
 857  static const struct stringpool_t stringpool_contents =
 858    {
 859 -    "L6",
 860 -    "L1",
 861 -    "HZ",
 862 -    "L4",
 863 -    "L5",
 864 -    "R8",
 865 -    "L8",
 866 -    "866",
 867      "L2",
 868 -    "SJIS",
 869 -    "ISO-IR-6",
 870 -    "ISO-IR-166",
 871 -    "LATIN6",
 872 -    "LATIN1",
 873 -    "ISO-IR-14",
 874 -    "L3",
 875 -    "LATIN4",
 876 -    "ISO-IR-165",
 877 -    "LATIN5",
 878 -    "ISO-IR-126",
 879 -    "862",
 880 -    "ISO-IR-144",
 881 -    "LATIN8",
 882 -    "ISO-IR-58",
 883 -    "ISO-IR-148",
 884 -    "L7",
 885 -    "LATIN-9",
 886 -    "ISO-IR-149",
 887 -    "ISO-IR-159",
 888 -    "ISO-IR-226",
 889 -    "LATIN2",
 890 -    "ISO8859-6",
 891 -    "ISO-IR-199",
 892 +    "L1",
 893 +    "MS-EE",
 894 +    "CP819",
 895 +    "UCS-2",
 896 +    "IBM819",
 897 +    "UTF-8",
 898 +    "UTF-32",
 899 +    "UTF-16",
 900 +    "CP367",
 901 +    "ISO8859-2",
 902      "ISO8859-1",
 903 -    "ISO-8859-6",
 904 -    "ISO_8859-6",
 905 -    "ISO8859-16",
 906 -    "PT154",
 907 -    "ISO-8859-1",
 908 -    "ISO_8859-1",
 909 -    "ISO8859-11",
 910 -    "ISO-8859-16",
 911 -    "ISO_8859-16",
 912 -    "CN",
 913 -    "ISO-8859-11",
 914 -    "ISO_8859-11",
 915 -    "ISO8859-4",
 916 -    "ISO_8859-16:2001",
 917 -    "ISO8859-5",
 918 -    "ISO-8859-4",
 919 -    "ISO_8859-4",
 920 -    "ISO8859-14",
 921 -    "ISO-IR-101",
 922 -    "ISO-8859-5",
 923 -    "ISO_8859-5",
 924 +    "IBM367",
 925 +    "UTF-7",
 926 +    "CHAR",
 927      "ISO8859-15",
 928 -    "ISO-8859-14",
 929 -    "ISO_8859-14",
 930 -    "ISO8859-8",
 931 +    "US",
 932 +    "ISO-8859-2",
 933 +    "ISO-8859-1",
 934      "ISO-8859-15",
 935 +    "ISO_8859-2",
 936 +    "ISO_8859-1",
 937      "ISO_8859-15",
 938 -    "ISO8859-9",
 939 -    "ISO-8859-8",
 940 -    "ISO_8859-8",
 941 -    "CP866",
 942 -    "ISO-IR-138",
 943 -    "ISO-8859-9",
 944 -    "ISO_8859-9",
 945 -    "ISO_8859-14:1998",
 946 +    "KOI8-R",
 947 +    "UCS-2LE",
 948 +    "UTF-32LE",
 949 +    "UTF-16LE",
 950      "ISO_8859-15:1998",
 951 -    "ELOT_928",
 952 -    "TCVN",
 953 -    "C99",
 954 -    "ISO8859-2",
 955 -    "CP154",
 956 -    "ISO-8859-2",
 957 -    "ISO_8859-2",
 958 -    "ISO-IR-109",
 959 -    "L10",
 960 -    "CHAR",
 961 -    "CP1256",
 962 -    "ISO-IR-179",
 963 -    "ISO646-CN",
 964 -    "ASCII",
 965 -    "CP1251",
 966 -    "LATIN3",
 967 -    "850",
 968 -    "GB2312",
 969 -    "CP819",
 970 -    "CP1254",
 971 -    "CP949",
 972 -    "CP1255",
 973 -    "CP862",
 974 -    "US",
 975 -    "CP1361",
 976 -    "CP1258",
 977 -    "ISO-IR-110",
 978 -    "IBM866",
 979 -    "CP936",
 980 -    "GEORGIAN-PS",
 981 -    "LATIN10",
 982 -    "CHINESE",
 983 -    "CP1252",
 984 -    "LATIN7",
 985 -    "ISO_8859-10:1992",
 986 -    "ISO-IR-57",
 987 -    "TIS620",
 988 -    "ISO8859-3",
 989 +    "ISO_8859-2:1987",
 990 +    "ISO_8859-1:1987",
 991      "UCS-4",
 992 -    "ISO-IR-87",
 993 -    "TIS-620",
 994 -    "ISO-IR-157",
 995 -    "ISO-8859-3",
 996 -    "ISO_8859-3",
 997 -    "ISO8859-13",
 998 -    "CSISOLATIN6",
 999 -    "BIG5",
1000 -    "ISO-8859-13",
1001 -    "ISO_8859-13",
1002 -    "CSISOLATIN1",
1003 -    "KOI8-R",
1004 -    "BIG-5",
1005 -    "IBM819",
1006 -    "ISO-IR-127",
1007 -    "CP874",
1008 -    "ISO646-US",
1009 -    "VISCII",
1010 -    "MS-EE",
1011 -    "MS-ANSI",
1012 -    "CSISOLATIN4",
1013 -    "IBM862",
1014 -    "CP932",
1015 -    "X0212",
1016 -    "CSISOLATIN5",
1017 -    "UCS-2",
1018 -    "ISO8859-10",
1019 -    "MS936",
1020 -    "WCHAR_T",
1021 -    "ISO-8859-10",
1022 -    "ISO_8859-10",
1023 -    "UTF-16",
1024 -    "EUCCN",
1025 -    "ROMAN8",
1026 +    "UNICODE-1-1",
1027 +    "ISO-IR-6",
1028 +    "CSKOI8R",
1029 +    "ASCII",
1030 +    "UNICODEBIG",
1031      "ISO-IR-203",
1032 -    "ISO8859-7",
1033 -    "KOI8-T",
1034 -    "EUC-CN",
1035      "UCS-4LE",
1036 -    "ISO-IR-100",
1037 -    "ISO-8859-7",
1038 -    "ISO_8859-7",
1039 -    "MULELAO-1",
1040 -    "GB_1988-80",
1041 -    "X0201",
1042 -    "ECMA-114",
1043 -    "CSISOLATIN2",
1044 -    "GEORGIAN-ACADEMY",
1045 -    "PTCP154",
1046 -    "UCS-2LE",
1047 -    "CP1253",
1048 -    "UTF-8",
1049 -    "HP-ROMAN8",
1050 -    "CSASCII",
1051 -    "ECMA-118",
1052 -    "UCS-4-INTERNAL",
1053 -    "TCVN5712-1",
1054 -    "KOREAN",
1055 -    "CP850",
1056 -    "MS-CYRL",
1057 -    "CP950",
1058 -    "TIS620-0",
1059 -    "X0208",
1060 -    "GREEK8",
1061 -    "UCS-2-INTERNAL",
1062 -    "TCVN-5712",
1063 -    "CP1133",
1064 +    "ISO-IR-101",
1065      "CP1250",
1066 -    "ISO-2022-CN",
1067 -    "UTF-16LE",
1068 -    "CYRILLIC-ASIAN",
1069 -    "ISO-10646-UCS-4",
1070 -    "ISO-2022-CN-EXT",
1071 -    "CP1257",
1072 -    "GB_2312-80",
1073 -    "JP",
1074 -    "EUCKR",
1075      "ISO-10646-UCS-2",
1076 -    "GB18030",
1077 -    "EUC-KR",
1078 -    "CSKOI8R",
1079 -    "CSBIG5",
1080 -    "CP367",
1081 -    "MACINTOSH",
1082 -    "CSISOLATIN3",
1083 -    "CN-BIG5",
1084 -    "CYRILLIC",
1085 -    "CSVISCII",
1086 -    "IBM850",
1087 -    "MACTHAI",
1088 -    "UNICODE-1-1",
1089 -    "ISO_646.IRV:1991",
1090 -    "US-ASCII",
1091 -    "UTF-32",
1092 -    "CN-GB-ISOIR165",
1093 -    "NEXTSTEP",
1094 -    "MAC",
1095 -    "EXTENDED_UNIX_CODE_PACKED_FORMAT_FOR_JAPANESE",
1096 -    "CSISOLATINARABIC",
1097 -    "HZ-GB-2312",
1098 -    "ARMSCII-8",
1099 -    "CSISOLATINHEBREW",
1100 -    "ISO-2022-KR",
1101 -    "WINDOWS-1256",
1102 -    "UHC",
1103 -    "WINDOWS-1251",
1104 -    "MS-HEBR",
1105 -    "ISO-CELTIC",
1106 -    "UTF-32LE",
1107 -    "WINDOWS-1254",
1108 -    "WINDOWS-1255",
1109 -    "SHIFT-JIS",
1110 -    "SHIFT_JIS",
1111 -    "IBM367",
1112 -    "WINDOWS-1258",
1113 -    "CSPTCP154",
1114 -    "GBK",
1115 +    "UNICODE-1-1-UTF-7",
1116 +    "LATIN2",
1117      "UNICODELITTLE",
1118 -    "WINDOWS-1252",
1119 -    "UTF-7",
1120 -    "KSC_5601",
1121 -    "ASMO-708",
1122 -    "CSISO2022CN",
1123 -    "BIGFIVE",
1124 -    "WINDOWS-936",
1125 +    "LATIN1",
1126 +    "ISO_646.IRV:1991",
1127 +    "ISO646-US",
1128 +    "CSUNICODE",
1129 +    "UCS-2-INTERNAL",
1130 +    "LATIN-9",
1131 +    "WCHAR_T",
1132      "CSUCS4",
1133 -    "BIG-FIVE",
1134 -    "ISO646-JP",
1135 -    "TIS620.2529-1",
1136 -    "CSISOLATINGREEK",
1137 -    "CSISOLATINCYRILLIC",
1138 -    "UCS-4BE",
1139 -    "UNICODE-1-1-UTF-7",
1140 -    "EUCTW",
1141 -    "WINDOWS-1253",
1142 -    "CSHPROMAN8",
1143 -    "EUC-TW",
1144 -    "KS_C_5601-1989",
1145 -    "UCS-2BE",
1146 -    "VISCII1.1-1",
1147 -    "GREEK",
1148 -    "WINDOWS-1250",
1149 -    "CSGB2312",
1150 -    "WINDOWS-874",
1151      "CSUNICODE11",
1152 -    "JAVA",
1153 -    "WINDOWS-1257",
1154 -    "CSUNICODE",
1155 -    "CSHALFWIDTHKATAKANA",
1156 -    "CSISO57GB1988",
1157 -    "MACICELAND",
1158 -    "CSIBM866",
1159 +    "US-ASCII",
1160 +    "ISO-10646-UCS-4",
1161 +    "UCS-2BE",
1162 +    "UTF-32BE",
1163      "UTF-16BE",
1164 -    "ARABIC",
1165 -    "CN-GB",
1166 -    "CSISO2022KR",
1167 -    "CSMACINTOSH",
1168 -    "JIS0208",
1169 -    "MACROMAN",
1170 -    "ISO_8859-4:1988",
1171 -    "ISO_8859-5:1988",
1172 -    "TIS620.2533-1",
1173      "ANSI_X3.4-1986",
1174 -    "ISO_8859-8:1988",
1175 -    "KS_C_5601-1987",
1176 -    "CSSHIFTJIS",
1177 -    "HEBREW",
1178 -    "ISO_8859-9:1989",
1179 -    "MACCROATIAN",
1180 -    "ISO-2022-JP-1",
1181 -    "EUCJP",
1182      "ANSI_X3.4-1968",
1183 -    "EUC-JP",
1184 -    "CSISO58GB231280",
1185 -    "JIS_C6226-1983",
1186 -    "IBM-CP1133",
1187 -    "MACCENTRALEUROPE",
1188 -    "CSISO159JISX02121990",
1189 -    "ISO-2022-JP-2",
1190      "CSUNICODE11UTF7",
1191 -    "UCS-4-SWAPPED",
1192 -    "UNICODEBIG",
1193 -    "CSISO14JISC6220RO",
1194 -    "JIS_C6220-1969-RO",
1195 -    "ISO_8859-3:1988",
1196 -    "CSPC862LATINHEBREW",
1197 -    "BIG5HKSCS",
1198 -    "ISO_8859-6:1987",
1199      "UCS-2-SWAPPED",
1200 -    "ISO_8859-1:1987",
1201 -    "BIG5-HKSCS",
1202 -    "UTF-32BE",
1203 -    "ISO-2022-JP",
1204 -    "KOI8-U",
1205 -    "TIS620.2533-0",
1206 -    "KOI8-RU",
1207 -    "ISO_8859-2:1987",
1208 -    "MACROMANIA",
1209 -    "JIS_X0212",
1210 -    "CSEUCKR",
1211 -    "MACCYRILLIC",
1212 -    "ISO_8859-7:2003",
1213 -    "MS-ARAB",
1214 -    "MS-GREEK",
1215 -    "CSKSC56011987",
1216 -    "JIS_X0201",
1217 -    "ISO_8859-7:1987",
1218 -    "CSISO2022JP2",
1219 -    "JIS_X0208",
1220 -    "JISX0201-1976",
1221 -    "JIS_X0212-1990",
1222 -    "CSISO2022JP",
1223 -    "JOHAB",
1224 -    "MS_KANJI",
1225 -    "CSISO87JISX0208",
1226 -    "MACTURKISH",
1227 -    "TCVN5712-1:1993",
1228 -    "JIS_X0208-1983",
1229 -    "CSEUCTW",
1230 -    "MACGREEK",
1231 -    "JIS_X0208-1990",
1232 -    "WINBALTRIM",
1233 -    "MS-TURK",
1234 -    "MACUKRAINE",
1235 -    "MACARABIC",
1236 -    "CSPC850MULTILINGUAL",
1237 -    "MACHEBREW",
1238 -    "JIS_X0212.1990-0",
1239 -    "BIG5-HKSCS:2001",
1240 -    "BIG5-HKSCS:2004",
1241 -    "BIG5-HKSCS:1999",
1242 -    "CSEUCPKDFMTJAPANESE"
1243 +    "UCS-4-INTERNAL",
1244 +    "CSASCII",
1245 +    "UCS-4BE",
1246 +    "WINDOWS-1250",
1247 +    "ISO-IR-100",
1248 +    "UCS-4-SWAPPED",
1249 +    "CSISOLATIN2",
1250 +    "CSISOLATIN1"
1251    };
1252  #define stringpool ((const char *) &stringpool_contents)
1253
1254  static const struct alias aliases[] =
1255    {
1256 -    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
1257      {-1}, {-1}, {-1}, {-1},
1258 -#line 134 "lib/aliases.gperf"
1259 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str13, ei_iso8859_10},
1260 -    {-1},
1261 -#line 60 "lib/aliases.gperf"
1262 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str15, ei_iso8859_1},
1263 -    {-1}, {-1},
1264 -#line 325 "lib/aliases.gperf"
1265 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str18, ei_hz},
1266 -    {-1}, {-1}, {-1},
1267 -#line 84 "lib/aliases.gperf"
1268 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str22, ei_iso8859_4},
1269 -    {-1},
1270 -#line 126 "lib/aliases.gperf"
1271 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str24, ei_iso8859_9},
1272 -    {-1},
1273 -#line 226 "lib/aliases.gperf"
1274 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str26, ei_hp_roman8},
1275 -    {-1}, {-1},
1276 -#line 151 "lib/aliases.gperf"
1277 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str29, ei_iso8859_14},
1278 -    {-1},
1279 -#line 207 "lib/aliases.gperf"
1280 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str31, ei_cp866},
1281 -    {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
1282 -#line 68 "lib/aliases.gperf"
1283 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str38, ei_iso8859_2},
1284 -    {-1}, {-1}, {-1},
1285 -#line 303 "lib/aliases.gperf"
1286 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str42, ei_sjis},
1287 -#line 16 "lib/aliases.gperf"
1288 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str43, ei_ascii},
1289 -    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
1290 -    {-1}, {-1},
1291 -#line 247 "lib/aliases.gperf"
1292 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str55, ei_tis620},
1293 -    {-1},
1294 -#line 133 "lib/aliases.gperf"
1295 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str57, ei_iso8859_10},
1296 -    {-1}, {-1}, {-1},
1297 -#line 59 "lib/aliases.gperf"
1298 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str61, ei_iso8859_1},
1299 -    {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
1300 -#line 259 "lib/aliases.gperf"
1301 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str68, ei_iso646_jp},
1302 +#line 66 "lib/aliases.gperf"
1303 +    {(int)(long)&((struct stringpool_t *)0)->stringpool_str4, ei_iso8859_2},
1304 +#line 58 "lib/aliases.gperf"
1305 +    {(int)(long)&((struct stringpool_t *)0)->stringpool_str5, ei_iso8859_1},
1306      {-1}, {-1}, {-1}, {-1}, {-1},
1307 -#line 76 "lib/aliases.gperf"
1308 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str74, ei_iso8859_3},
1309 -#line 83 "lib/aliases.gperf"
1310 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str75, ei_iso8859_4},
1311 -    {-1},
1312 -#line 289 "lib/aliases.gperf"
1313 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str77, ei_isoir165},
1314 -    {-1},
1315 -#line 125 "lib/aliases.gperf"
1316 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str79, ei_iso8859_9},
1317 -#line 107 "lib/aliases.gperf"
1318 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str80, ei_iso8859_7},
1319 -#line 203 "lib/aliases.gperf"
1320 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str81, ei_cp862},
1321 -#line 90 "lib/aliases.gperf"
1322 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str82, ei_iso8859_5},
1323 -    {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
1324 -#line 150 "lib/aliases.gperf"
1325 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str89, ei_iso8859_14},
1326 -    {-1},
1327 -#line 286 "lib/aliases.gperf"
1328 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str91, ei_gb2312},
1329 -    {-1}, {-1}, {-1}, {-1},
1330 -#line 124 "lib/aliases.gperf"
1331 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str96, ei_iso8859_9},
1332 -#line 144 "lib/aliases.gperf"
1333 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str97, ei_iso8859_13},
1334 -#line 158 "lib/aliases.gperf"
1335 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str98, ei_iso8859_15},
1336 -    {-1},
1337 -#line 294 "lib/aliases.gperf"
1338 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str100, ei_ksc5601},
1339 -    {-1},
1340 -#line 278 "lib/aliases.gperf"
1341 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str102, ei_jisx0212},
1342 -#line 163 "lib/aliases.gperf"
1343 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str103, ei_iso8859_16},
1344 -    {-1}, {-1}, {-1},
1345 -#line 67 "lib/aliases.gperf"
1346 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str107, ei_iso8859_2},
1347 -#line 102 "lib/aliases.gperf"
1348 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str108, ei_iso8859_6},
1349 -#line 149 "lib/aliases.gperf"
1350 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str109, ei_iso8859_14},
1351 +#line 79 "lib/aliases.gperf"
1352 +    {(int)(long)&((struct stringpool_t *)0)->stringpool_str11, ei_cp1250},
1353 +#line 55 "lib/aliases.gperf"
1354 +    {(int)(long)&((struct stringpool_t *)0)->stringpool_str12, ei_iso8859_1},
1355      {-1}, {-1},
1356 -#line 62 "lib/aliases.gperf"
1357 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str112, ei_iso8859_1},
1358 -#line 94 "lib/aliases.gperf"
1359 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str113, ei_iso8859_6},
1360 -#line 95 "lib/aliases.gperf"
1361 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str114, ei_iso8859_6},
1362 -#line 166 "lib/aliases.gperf"
1363 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str115, ei_iso8859_16},
1364 -#line 233 "lib/aliases.gperf"
1365 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str116, ei_pt154},
1366 -#line 53 "lib/aliases.gperf"
1367 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str117, ei_iso8859_1},
1368 -#line 54 "lib/aliases.gperf"
1369 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str118, ei_iso8859_1},
1370 -#line 139 "lib/aliases.gperf"
1371 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str119, ei_iso8859_11},
1372 -#line 160 "lib/aliases.gperf"
1373 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str120, ei_iso8859_16},
1374 -#line 161 "lib/aliases.gperf"
1375 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str121, ei_iso8859_16},
1376 -    {-1},
1377 -#line 283 "lib/aliases.gperf"
1378 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str123, ei_iso646_cn},
1379 -#line 137 "lib/aliases.gperf"
1380 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str124, ei_iso8859_11},
1381 -#line 138 "lib/aliases.gperf"
1382 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str125, ei_iso8859_11},
1383 -#line 86 "lib/aliases.gperf"
1384 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str126, ei_iso8859_4},
1385 -    {-1},
1386 -#line 162 "lib/aliases.gperf"
1387 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str128, ei_iso8859_16},
1388 +#line 24 "lib/aliases.gperf"
1389 +    {(int)(long)&((struct stringpool_t *)0)->stringpool_str15, ei_ucs2},
1390 +#line 56 "lib/aliases.gperf"
1391 +    {(int)(long)&((struct stringpool_t *)0)->stringpool_str16, ei_iso8859_1},
1392 +#line 23 "lib/aliases.gperf"
1393 +    {(int)(long)&((struct stringpool_t *)0)->stringpool_str17, ei_utf8},
1394 +#line 41 "lib/aliases.gperf"
1395 +    {(int)(long)&((struct stringpool_t *)0)->stringpool_str18, ei_utf32},
1396 +#line 38 "lib/aliases.gperf"
1397 +    {(int)(long)&((struct stringpool_t *)0)->stringpool_str19, ei_utf16},
1398      {-1},
1399 -#line 93 "lib/aliases.gperf"
1400 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str130, ei_iso8859_5},
1401 -#line 79 "lib/aliases.gperf"
1402 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str131, ei_iso8859_4},
1403 +#line 19 "lib/aliases.gperf"
1404 +    {(int)(long)&((struct stringpool_t *)0)->stringpool_str21, ei_ascii},
1405 +#line 68 "lib/aliases.gperf"
1406 +    {(int)(long)&((struct stringpool_t *)0)->stringpool_str22, ei_iso8859_2},
1407 +#line 60 "lib/aliases.gperf"
1408 +    {(int)(long)&((struct stringpool_t *)0)->stringpool_str23, ei_iso8859_1},
1409 +#line 20 "lib/aliases.gperf"
1410 +    {(int)(long)&((struct stringpool_t *)0)->stringpool_str24, ei_ascii},
1411 +#line 44 "lib/aliases.gperf"
1412 +    {(int)(long)&((struct stringpool_t *)0)->stringpool_str25, ei_utf7},
1413  #line 80 "lib/aliases.gperf"
1414 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str132, ei_iso8859_4},
1415 -#line 153 "lib/aliases.gperf"
1416 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str133, ei_iso8859_14},
1417 -#line 66 "lib/aliases.gperf"
1418 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str134, ei_iso8859_2},
1419 -#line 87 "lib/aliases.gperf"
1420 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str135, ei_iso8859_5},
1421 -#line 88 "lib/aliases.gperf"
1422 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str136, ei_iso8859_5},
1423 -#line 159 "lib/aliases.gperf"
1424 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str137, ei_iso8859_15},
1425 -#line 146 "lib/aliases.gperf"
1426 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str138, ei_iso8859_14},
1427 -#line 147 "lib/aliases.gperf"
1428 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str139, ei_iso8859_14},
1429 -#line 120 "lib/aliases.gperf"
1430 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str140, ei_iso8859_8},
1431 -    {-1},
1432 -#line 154 "lib/aliases.gperf"
1433 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str142, ei_iso8859_15},
1434 -#line 155 "lib/aliases.gperf"
1435 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str143, ei_iso8859_15},
1436 -#line 128 "lib/aliases.gperf"
1437 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str144, ei_iso8859_9},
1438 -#line 114 "lib/aliases.gperf"
1439 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str145, ei_iso8859_8},
1440 -#line 115 "lib/aliases.gperf"
1441 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str146, ei_iso8859_8},
1442 -#line 205 "lib/aliases.gperf"
1443 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str147, ei_cp866},
1444 -#line 117 "lib/aliases.gperf"
1445 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str148, ei_iso8859_8},
1446 -#line 121 "lib/aliases.gperf"
1447 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str149, ei_iso8859_9},
1448 -#line 122 "lib/aliases.gperf"
1449 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str150, ei_iso8859_9},
1450 -#line 148 "lib/aliases.gperf"
1451 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str151, ei_iso8859_14},
1452 -    {-1},
1453 -#line 156 "lib/aliases.gperf"
1454 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str153, ei_iso8859_15},
1455 -    {-1},
1456 -#line 109 "lib/aliases.gperf"
1457 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str155, ei_iso8859_7},
1458 -#line 253 "lib/aliases.gperf"
1459 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str156, ei_tcvn},
1460 -#line 51 "lib/aliases.gperf"
1461 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str157, ei_c99},
1462 -#line 70 "lib/aliases.gperf"
1463 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str158, ei_iso8859_2},
1464 -    {-1}, {-1}, {-1},
1465 -#line 235 "lib/aliases.gperf"
1466 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str162, ei_pt154},
1467 -#line 63 "lib/aliases.gperf"
1468 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str163, ei_iso8859_2},
1469 -#line 64 "lib/aliases.gperf"
1470 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str164, ei_iso8859_2},
1471 -    {-1},
1472 +    {(int)(long)&((struct stringpool_t *)0)->stringpool_str26, ei_local_char},
1473  #line 74 "lib/aliases.gperf"
1474 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str166, ei_iso8859_3},
1475 -    {-1},
1476 -#line 165 "lib/aliases.gperf"
1477 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str168, ei_iso8859_16},
1478 -#line 351 "lib/aliases.gperf"
1479 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str169, ei_local_char},
1480 -    {-1}, {-1}, {-1}, {-1},
1481 -#line 189 "lib/aliases.gperf"
1482 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str174, ei_cp1256},
1483 -#line 142 "lib/aliases.gperf"
1484 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str175, ei_iso8859_13},
1485 -#line 281 "lib/aliases.gperf"
1486 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str176, ei_iso646_cn},
1487 -#line 13 "lib/aliases.gperf"
1488 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str177, ei_ascii},
1489 -#line 174 "lib/aliases.gperf"
1490 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str178, ei_cp1251},
1491 -#line 75 "lib/aliases.gperf"
1492 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str179, ei_iso8859_3},
1493 -    {-1},
1494 -#line 199 "lib/aliases.gperf"
1495 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str181, ei_cp850},
1496 -    {-1},
1497 -#line 314 "lib/aliases.gperf"
1498 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str183, ei_euc_cn},
1499 -    {-1},
1500 -#line 57 "lib/aliases.gperf"
1501 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str185, ei_iso8859_1},
1502 -    {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
1503 -#line 183 "lib/aliases.gperf"
1504 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str192, ei_cp1254},
1505 -    {-1},
1506 -#line 345 "lib/aliases.gperf"
1507 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str194, ei_cp949},
1508 -    {-1},
1509 -#line 186 "lib/aliases.gperf"
1510 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str196, ei_cp1255},
1511 -#line 201 "lib/aliases.gperf"
1512 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str197, ei_cp862},
1513 +    {(int)(long)&((struct stringpool_t *)0)->stringpool_str27, ei_iso8859_15},
1514  #line 21 "lib/aliases.gperf"
1515 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str198, ei_ascii},
1516 -    {-1}, {-1}, {-1}, {-1},
1517 -#line 348 "lib/aliases.gperf"
1518 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str203, ei_johab},
1519 -    {-1}, {-1},
1520 -#line 195 "lib/aliases.gperf"
1521 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str206, ei_cp1258},
1522 -#line 82 "lib/aliases.gperf"
1523 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str207, ei_iso8859_4},
1524 -    {-1},
1525 -#line 206 "lib/aliases.gperf"
1526 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str209, ei_cp866},
1527 -#line 318 "lib/aliases.gperf"
1528 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str210, ei_cp936},
1529 -#line 231 "lib/aliases.gperf"
1530 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str211, ei_georgian_ps},
1531 -    {-1}, {-1},
1532 -#line 164 "lib/aliases.gperf"
1533 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str214, ei_iso8859_16},
1534 -    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
1535 -#line 288 "lib/aliases.gperf"
1536 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str222, ei_gb2312},
1537 -    {-1},
1538 -#line 177 "lib/aliases.gperf"
1539 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str224, ei_cp1252},
1540 -#line 143 "lib/aliases.gperf"
1541 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str225, ei_iso8859_13},
1542 -#line 131 "lib/aliases.gperf"
1543 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str226, ei_iso8859_10},
1544 -#line 282 "lib/aliases.gperf"
1545 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str227, ei_iso646_cn},
1546 -#line 242 "lib/aliases.gperf"
1547 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str228, ei_tis620},
1548 -    {-1},
1549 -#line 78 "lib/aliases.gperf"
1550 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str230, ei_iso8859_3},
1551 -#line 33 "lib/aliases.gperf"
1552 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str231, ei_ucs4},
1553 -#line 271 "lib/aliases.gperf"
1554 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str232, ei_jisx0208},
1555 -#line 241 "lib/aliases.gperf"
1556 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str233, ei_tis620},
1557 -#line 132 "lib/aliases.gperf"
1558 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str234, ei_iso8859_10},
1559 -#line 71 "lib/aliases.gperf"
1560 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str235, ei_iso8859_3},
1561 -#line 72 "lib/aliases.gperf"
1562 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str236, ei_iso8859_3},
1563 -#line 145 "lib/aliases.gperf"
1564 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str237, ei_iso8859_13},
1565 -    {-1}, {-1},
1566 -#line 135 "lib/aliases.gperf"
1567 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str240, ei_iso8859_10},
1568 -#line 330 "lib/aliases.gperf"
1569 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str241, ei_ces_big5},
1570 -#line 140 "lib/aliases.gperf"
1571 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str242, ei_iso8859_13},
1572 -#line 141 "lib/aliases.gperf"
1573 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str243, ei_iso8859_13},
1574 +    {(int)(long)&((struct stringpool_t *)0)->stringpool_str28, ei_ascii},
1575  #line 61 "lib/aliases.gperf"
1576 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str244, ei_iso8859_1},
1577 -#line 167 "lib/aliases.gperf"
1578 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str245, ei_koi8_r},
1579 -#line 331 "lib/aliases.gperf"
1580 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str246, ei_ces_big5},
1581 -#line 58 "lib/aliases.gperf"
1582 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str247, ei_iso8859_1},
1583 -#line 97 "lib/aliases.gperf"
1584 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str248, ei_iso8859_6},
1585 -#line 248 "lib/aliases.gperf"
1586 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str249, ei_cp874},
1587 -    {-1},
1588 -#line 14 "lib/aliases.gperf"
1589 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str251, ei_ascii},
1590 -#line 250 "lib/aliases.gperf"
1591 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str252, ei_viscii},
1592 -#line 173 "lib/aliases.gperf"
1593 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str253, ei_cp1250},
1594 -    {-1}, {-1},
1595 -#line 179 "lib/aliases.gperf"
1596 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str256, ei_cp1252},
1597 -    {-1},
1598 -#line 85 "lib/aliases.gperf"
1599 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str258, ei_iso8859_4},
1600 -#line 202 "lib/aliases.gperf"
1601 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str259, ei_cp862},
1602 -#line 306 "lib/aliases.gperf"
1603 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str260, ei_cp932},
1604 -#line 277 "lib/aliases.gperf"
1605 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str261, ei_jisx0212},
1606 -#line 127 "lib/aliases.gperf"
1607 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str262, ei_iso8859_9},
1608 -#line 24 "lib/aliases.gperf"
1609 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str263, ei_ucs2},
1610 +    {(int)(long)&((struct stringpool_t *)0)->stringpool_str29, ei_iso8859_2},
1611      {-1},
1612 -#line 136 "lib/aliases.gperf"
1613 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str265, ei_iso8859_10},
1614 -#line 319 "lib/aliases.gperf"
1615 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str266, ei_cp936},
1616 -#line 352 "lib/aliases.gperf"
1617 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str267, ei_local_wchar_t},
1618 -    {-1}, {-1},
1619 -#line 129 "lib/aliases.gperf"
1620 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str270, ei_iso8859_10},
1621 -#line 130 "lib/aliases.gperf"
1622 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str271, ei_iso8859_10},
1623 -#line 38 "lib/aliases.gperf"
1624 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str272, ei_utf16},
1625 -#line 313 "lib/aliases.gperf"
1626 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str273, ei_euc_cn},
1627 -#line 225 "lib/aliases.gperf"
1628 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str274, ei_hp_roman8},
1629 -#line 157 "lib/aliases.gperf"
1630 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str275, ei_iso8859_15},
1631 -#line 113 "lib/aliases.gperf"
1632 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str276, ei_iso8859_7},
1633 -#line 232 "lib/aliases.gperf"
1634 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str277, ei_koi8_t},
1635 -#line 312 "lib/aliases.gperf"
1636 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str278, ei_euc_cn},
1637 -#line 37 "lib/aliases.gperf"
1638 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str279, ei_ucs4le},
1639 -#line 56 "lib/aliases.gperf"
1640 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str280, ei_iso8859_1},
1641 -#line 103 "lib/aliases.gperf"
1642 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str281, ei_iso8859_7},
1643 -#line 104 "lib/aliases.gperf"
1644 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str282, ei_iso8859_7},
1645 -#line 238 "lib/aliases.gperf"
1646 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str283, ei_mulelao},
1647 -#line 280 "lib/aliases.gperf"
1648 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str284, ei_iso646_cn},
1649 -    {-1}, {-1}, {-1},
1650 -#line 264 "lib/aliases.gperf"
1651 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str288, ei_jisx0201},
1652 -#line 98 "lib/aliases.gperf"
1653 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str289, ei_iso8859_6},
1654 +#line 51 "lib/aliases.gperf"
1655 +    {(int)(long)&((struct stringpool_t *)0)->stringpool_str31, ei_iso8859_1},
1656  #line 69 "lib/aliases.gperf"
1657 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str290, ei_iso8859_2},
1658 -#line 230 "lib/aliases.gperf"
1659 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str291, ei_georgian_academy},
1660 -#line 234 "lib/aliases.gperf"
1661 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str292, ei_pt154},
1662 -    {-1}, {-1},
1663 -#line 31 "lib/aliases.gperf"
1664 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str295, ei_ucs2le},
1665 -#line 180 "lib/aliases.gperf"
1666 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str296, ei_cp1253},
1667 -#line 23 "lib/aliases.gperf"
1668 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str297, ei_utf8},
1669 -#line 224 "lib/aliases.gperf"
1670 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str298, ei_hp_roman8},
1671 -    {-1},
1672 -#line 22 "lib/aliases.gperf"
1673 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str300, ei_ascii},
1674 -    {-1}, {-1},
1675 -#line 108 "lib/aliases.gperf"
1676 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str303, ei_iso8859_7},
1677 -#line 49 "lib/aliases.gperf"
1678 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str304, ei_ucs4internal},
1679 -#line 255 "lib/aliases.gperf"
1680 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str305, ei_tcvn},
1681 -    {-1},
1682 -#line 296 "lib/aliases.gperf"
1683 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str307, ei_ksc5601},
1684 -#line 197 "lib/aliases.gperf"
1685 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str308, ei_cp850},
1686 -#line 176 "lib/aliases.gperf"
1687 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str309, ei_cp1251},
1688 -#line 336 "lib/aliases.gperf"
1689 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str310, ei_cp950},
1690 -    {-1}, {-1},
1691 -#line 243 "lib/aliases.gperf"
1692 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str313, ei_tis620},
1693 -    {-1}, {-1},
1694 -#line 270 "lib/aliases.gperf"
1695 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str316, ei_jisx0208},
1696 -    {-1}, {-1},
1697 -#line 110 "lib/aliases.gperf"
1698 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str319, ei_iso8859_7},
1699 -#line 47 "lib/aliases.gperf"
1700 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str320, ei_ucs2internal},
1701 -#line 254 "lib/aliases.gperf"
1702 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str321, ei_tcvn},
1703 -    {-1},
1704 -#line 239 "lib/aliases.gperf"
1705 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str323, ei_cp1133},
1706 -#line 171 "lib/aliases.gperf"
1707 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str324, ei_cp1250},
1708 -    {-1}, {-1},
1709 -#line 322 "lib/aliases.gperf"
1710 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str327, ei_iso2022_cn},
1711 +    {(int)(long)&((struct stringpool_t *)0)->stringpool_str32, ei_iso8859_15},
1712 +#line 62 "lib/aliases.gperf"
1713 +    {(int)(long)&((struct stringpool_t *)0)->stringpool_str33, ei_iso8859_2},
1714      {-1},
1715 +#line 52 "lib/aliases.gperf"
1716 +    {(int)(long)&((struct stringpool_t *)0)->stringpool_str35, ei_iso8859_1},
1717 +#line 70 "lib/aliases.gperf"
1718 +    {(int)(long)&((struct stringpool_t *)0)->stringpool_str36, ei_iso8859_15},
1719 +#line 75 "lib/aliases.gperf"
1720 +    {(int)(long)&((struct stringpool_t *)0)->stringpool_str37, ei_koi8_r},
1721 +#line 31 "lib/aliases.gperf"
1722 +    {(int)(long)&((struct stringpool_t *)0)->stringpool_str38, ei_ucs2le},
1723 +#line 43 "lib/aliases.gperf"
1724 +    {(int)(long)&((struct stringpool_t *)0)->stringpool_str39, ei_utf32le},
1725  #line 40 "lib/aliases.gperf"
1726 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str329, ei_utf16le},
1727 -    {-1}, {-1}, {-1}, {-1}, {-1},
1728 -#line 236 "lib/aliases.gperf"
1729 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str335, ei_pt154},
1730 -    {-1},
1731 -#line 34 "lib/aliases.gperf"
1732 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str337, ei_ucs4},
1733 -    {-1}, {-1},
1734 -#line 324 "lib/aliases.gperf"
1735 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str340, ei_iso2022_cn_ext},
1736 -    {-1},
1737 -#line 192 "lib/aliases.gperf"
1738 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str342, ei_cp1257},
1739 -    {-1}, {-1},
1740 -#line 285 "lib/aliases.gperf"
1741 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str345, ei_gb2312},
1742 -    {-1},
1743 -#line 260 "lib/aliases.gperf"
1744 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str347, ei_iso646_jp},
1745 -    {-1}, {-1}, {-1},
1746 -#line 343 "lib/aliases.gperf"
1747 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str351, ei_euc_kr},
1748 -    {-1},
1749 -#line 25 "lib/aliases.gperf"
1750 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str353, ei_ucs2},
1751 -#line 321 "lib/aliases.gperf"
1752 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str354, ei_gb18030},
1753 -    {-1},
1754 -#line 342 "lib/aliases.gperf"
1755 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str356, ei_euc_kr},
1756 -#line 168 "lib/aliases.gperf"
1757 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str357, ei_koi8_r},
1758 -#line 335 "lib/aliases.gperf"
1759 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str358, ei_ces_big5},
1760 -    {-1},
1761 -#line 19 "lib/aliases.gperf"
1762 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str360, ei_ascii},
1763 -#line 210 "lib/aliases.gperf"
1764 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str361, ei_mac_roman},
1765 -#line 77 "lib/aliases.gperf"
1766 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str362, ei_iso8859_3},
1767 -#line 334 "lib/aliases.gperf"
1768 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str363, ei_ces_big5},
1769 -    {-1}, {-1},
1770 -#line 91 "lib/aliases.gperf"
1771 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str366, ei_iso8859_5},
1772 -    {-1}, {-1},
1773 -#line 252 "lib/aliases.gperf"
1774 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str369, ei_viscii},
1775 -#line 198 "lib/aliases.gperf"
1776 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str370, ei_cp850},
1777 +    {(int)(long)&((struct stringpool_t *)0)->stringpool_str40, ei_utf16le},
1778 +#line 71 "lib/aliases.gperf"
1779 +    {(int)(long)&((struct stringpool_t *)0)->stringpool_str41, ei_iso8859_15},
1780      {-1},
1781 -#line 223 "lib/aliases.gperf"
1782 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str372, ei_mac_thai},
1783 +#line 63 "lib/aliases.gperf"
1784 +    {(int)(long)&((struct stringpool_t *)0)->stringpool_str43, ei_iso8859_2},
1785 +#line 53 "lib/aliases.gperf"
1786 +    {(int)(long)&((struct stringpool_t *)0)->stringpool_str44, ei_iso8859_1},
1787 +#line 33 "lib/aliases.gperf"
1788 +    {(int)(long)&((struct stringpool_t *)0)->stringpool_str45, ei_ucs4},
1789      {-1},
1790  #line 29 "lib/aliases.gperf"
1791 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str374, ei_ucs2be},
1792 -    {-1},
1793 -#line 15 "lib/aliases.gperf"
1794 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str376, ei_ascii},
1795 -    {-1}, {-1}, {-1},
1796 -#line 12 "lib/aliases.gperf"
1797 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str380, ei_ascii},
1798 -#line 41 "lib/aliases.gperf"
1799 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str381, ei_utf32},
1800 -    {-1}, {-1},
1801 -#line 290 "lib/aliases.gperf"
1802 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str384, ei_isoir165},
1803 -    {-1}, {-1},
1804 -#line 228 "lib/aliases.gperf"
1805 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str387, ei_nextstep},
1806 -    {-1},
1807 -#line 211 "lib/aliases.gperf"
1808 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str389, ei_mac_roman},
1809 -    {-1}, {-1}, {-1},
1810 -#line 299 "lib/aliases.gperf"
1811 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str393, ei_euc_jp},
1812 -#line 101 "lib/aliases.gperf"
1813 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str394, ei_iso8859_6},
1814 -#line 326 "lib/aliases.gperf"
1815 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str395, ei_hz},
1816 -    {-1},
1817 -#line 229 "lib/aliases.gperf"
1818 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str397, ei_armscii_8},
1819 -    {-1}, {-1}, {-1},
1820 -#line 119 "lib/aliases.gperf"
1821 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str401, ei_iso8859_8},
1822 -    {-1}, {-1}, {-1},
1823 -#line 349 "lib/aliases.gperf"
1824 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str405, ei_iso2022_kr},
1825 -    {-1},
1826 -#line 190 "lib/aliases.gperf"
1827 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str407, ei_cp1256},
1828 -#line 346 "lib/aliases.gperf"
1829 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str408, ei_cp949},
1830 -#line 175 "lib/aliases.gperf"
1831 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str409, ei_cp1251},
1832 -    {-1},
1833 -#line 188 "lib/aliases.gperf"
1834 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str411, ei_cp1255},
1835 -#line 152 "lib/aliases.gperf"
1836 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str412, ei_iso8859_14},
1837 -#line 43 "lib/aliases.gperf"
1838 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str413, ei_utf32le},
1839 -    {-1}, {-1},
1840 -#line 184 "lib/aliases.gperf"
1841 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str416, ei_cp1254},
1842 -    {-1},
1843 -#line 187 "lib/aliases.gperf"
1844 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str418, ei_cp1255},
1845 -    {-1},
1846 -#line 302 "lib/aliases.gperf"
1847 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str420, ei_sjis},
1848 -#line 301 "lib/aliases.gperf"
1849 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str421, ei_sjis},
1850 -#line 20 "lib/aliases.gperf"
1851 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str422, ei_ascii},
1852 -#line 196 "lib/aliases.gperf"
1853 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str423, ei_cp1258},
1854 -#line 237 "lib/aliases.gperf"
1855 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str424, ei_pt154},
1856 -    {-1},
1857 -#line 317 "lib/aliases.gperf"
1858 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str426, ei_ces_gbk},
1859 -    {-1},
1860 +    {(int)(long)&((struct stringpool_t *)0)->stringpool_str47, ei_ucs2be},
1861 +#line 16 "lib/aliases.gperf"
1862 +    {(int)(long)&((struct stringpool_t *)0)->stringpool_str48, ei_ascii},
1863 +#line 76 "lib/aliases.gperf"
1864 +    {(int)(long)&((struct stringpool_t *)0)->stringpool_str49, ei_koi8_r},
1865 +#line 13 "lib/aliases.gperf"
1866 +    {(int)(long)&((struct stringpool_t *)0)->stringpool_str50, ei_ascii},
1867 +#line 28 "lib/aliases.gperf"
1868 +    {(int)(long)&((struct stringpool_t *)0)->stringpool_str51, ei_ucs2be},
1869 +#line 72 "lib/aliases.gperf"
1870 +    {(int)(long)&((struct stringpool_t *)0)->stringpool_str52, ei_iso8859_15},
1871 +#line 37 "lib/aliases.gperf"
1872 +    {(int)(long)&((struct stringpool_t *)0)->stringpool_str53, ei_ucs4le},
1873 +#line 64 "lib/aliases.gperf"
1874 +    {(int)(long)&((struct stringpool_t *)0)->stringpool_str54, ei_iso8859_2},
1875 +#line 77 "lib/aliases.gperf"
1876 +    {(int)(long)&((struct stringpool_t *)0)->stringpool_str55, ei_cp1250},
1877 +#line 25 "lib/aliases.gperf"
1878 +    {(int)(long)&((struct stringpool_t *)0)->stringpool_str56, ei_ucs2},
1879 +#line 45 "lib/aliases.gperf"
1880 +    {(int)(long)&((struct stringpool_t *)0)->stringpool_str57, ei_utf7},
1881 +#line 65 "lib/aliases.gperf"
1882 +    {(int)(long)&((struct stringpool_t *)0)->stringpool_str58, ei_iso8859_2},
1883  #line 32 "lib/aliases.gperf"
1884 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str428, ei_ucs2le},
1885 -    {-1}, {-1}, {-1},
1886 -#line 178 "lib/aliases.gperf"
1887 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str432, ei_cp1252},
1888 -#line 44 "lib/aliases.gperf"
1889 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str433, ei_utf7},
1890 -    {-1},
1891 -#line 291 "lib/aliases.gperf"
1892 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str435, ei_ksc5601},
1893 +    {(int)(long)&((struct stringpool_t *)0)->stringpool_str59, ei_ucs2le},
1894 +#line 57 "lib/aliases.gperf"
1895 +    {(int)(long)&((struct stringpool_t *)0)->stringpool_str60, ei_iso8859_1},
1896 +#line 15 "lib/aliases.gperf"
1897 +    {(int)(long)&((struct stringpool_t *)0)->stringpool_str61, ei_ascii},
1898 +#line 14 "lib/aliases.gperf"
1899 +    {(int)(long)&((struct stringpool_t *)0)->stringpool_str62, ei_ascii},
1900 +#line 26 "lib/aliases.gperf"
1901 +    {(int)(long)&((struct stringpool_t *)0)->stringpool_str63, ei_ucs2},
1902 +#line 47 "lib/aliases.gperf"
1903 +    {(int)(long)&((struct stringpool_t *)0)->stringpool_str64, ei_ucs2internal},
1904 +#line 73 "lib/aliases.gperf"
1905 +    {(int)(long)&((struct stringpool_t *)0)->stringpool_str65, ei_iso8859_15},
1906 +#line 81 "lib/aliases.gperf"
1907 +    {(int)(long)&((struct stringpool_t *)0)->stringpool_str66, ei_local_wchar_t},
1908      {-1},
1909 -#line 99 "lib/aliases.gperf"
1910 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str437, ei_iso8859_6},
1911 -    {-1}, {-1},
1912 -#line 323 "lib/aliases.gperf"
1913 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str440, ei_iso2022_cn},
1914 -    {-1}, {-1}, {-1},
1915 -#line 333 "lib/aliases.gperf"
1916 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str444, ei_ces_big5},
1917 -    {-1}, {-1},
1918 -#line 320 "lib/aliases.gperf"
1919 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str447, ei_cp936},
1920  #line 35 "lib/aliases.gperf"
1921 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str448, ei_ucs4},
1922 -#line 332 "lib/aliases.gperf"
1923 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str449, ei_ces_big5},
1924 -    {-1}, {-1}, {-1},
1925 -#line 258 "lib/aliases.gperf"
1926 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str453, ei_iso646_jp},
1927 -    {-1}, {-1},
1928 -#line 244 "lib/aliases.gperf"
1929 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str456, ei_tis620},
1930 -#line 112 "lib/aliases.gperf"
1931 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str457, ei_iso8859_7},
1932 -    {-1},
1933 -#line 92 "lib/aliases.gperf"
1934 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str459, ei_iso8859_5},
1935 -#line 36 "lib/aliases.gperf"
1936 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str460, ei_ucs4be},
1937 -    {-1},
1938 -#line 45 "lib/aliases.gperf"
1939 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str462, ei_utf7},
1940 -    {-1}, {-1},
1941 -#line 328 "lib/aliases.gperf"
1942 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str465, ei_euc_tw},
1943 -    {-1}, {-1},
1944 -#line 181 "lib/aliases.gperf"
1945 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str468, ei_cp1253},
1946 -#line 227 "lib/aliases.gperf"
1947 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str469, ei_hp_roman8},
1948 -#line 327 "lib/aliases.gperf"
1949 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str470, ei_euc_tw},
1950 -    {-1},
1951 -#line 293 "lib/aliases.gperf"
1952 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str472, ei_ksc5601},
1953 -    {-1}, {-1}, {-1},
1954 -#line 27 "lib/aliases.gperf"
1955 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str476, ei_ucs2be},
1956 -    {-1}, {-1},
1957 -#line 251 "lib/aliases.gperf"
1958 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str479, ei_viscii},
1959 -#line 111 "lib/aliases.gperf"
1960 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str480, ei_iso8859_7},
1961 -    {-1},
1962 -#line 172 "lib/aliases.gperf"
1963 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str482, ei_cp1250},
1964 -#line 316 "lib/aliases.gperf"
1965 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str483, ei_euc_cn},
1966 -    {-1}, {-1},
1967 -#line 249 "lib/aliases.gperf"
1968 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str486, ei_cp874},
1969 +    {(int)(long)&((struct stringpool_t *)0)->stringpool_str68, ei_ucs4},
1970  #line 30 "lib/aliases.gperf"
1971 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str487, ei_ucs2be},
1972 -    {-1},
1973 -#line 52 "lib/aliases.gperf"
1974 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str489, ei_java},
1975 -    {-1},
1976 -#line 193 "lib/aliases.gperf"
1977 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str491, ei_cp1257},
1978 -    {-1},
1979 -#line 26 "lib/aliases.gperf"
1980 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str493, ei_ucs2},
1981 -    {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
1982 -#line 265 "lib/aliases.gperf"
1983 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str500, ei_jisx0201},
1984 -    {-1},
1985 -#line 284 "lib/aliases.gperf"
1986 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str502, ei_iso646_cn},
1987 -    {-1},
1988 -#line 214 "lib/aliases.gperf"
1989 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str504, ei_mac_iceland},
1990 -    {-1}, {-1}, {-1}, {-1},
1991 -#line 208 "lib/aliases.gperf"
1992 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str509, ei_cp866},
1993 +    {(int)(long)&((struct stringpool_t *)0)->stringpool_str69, ei_ucs2be},
1994 +#line 12 "lib/aliases.gperf"
1995 +    {(int)(long)&((struct stringpool_t *)0)->stringpool_str70, ei_ascii},
1996 +#line 34 "lib/aliases.gperf"
1997 +    {(int)(long)&((struct stringpool_t *)0)->stringpool_str71, ei_ucs4},
1998 +#line 27 "lib/aliases.gperf"
1999 +    {(int)(long)&((struct stringpool_t *)0)->stringpool_str72, ei_ucs2be},
2000 +#line 42 "lib/aliases.gperf"
2001 +    {(int)(long)&((struct stringpool_t *)0)->stringpool_str73, ei_utf32be},
2002  #line 39 "lib/aliases.gperf"
2003 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str510, ei_utf16be},
2004 -    {-1}, {-1},
2005 -#line 100 "lib/aliases.gperf"
2006 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str513, ei_iso8859_6},
2007 -#line 315 "lib/aliases.gperf"
2008 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str514, ei_euc_cn},
2009 -    {-1}, {-1}, {-1},
2010 -#line 350 "lib/aliases.gperf"
2011 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str518, ei_iso2022_kr},
2012 -    {-1},
2013 -#line 212 "lib/aliases.gperf"
2014 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str520, ei_mac_roman},
2015 -    {-1}, {-1}, {-1}, {-1}, {-1},
2016 -#line 269 "lib/aliases.gperf"
2017 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str526, ei_jisx0208},
2018 -    {-1},
2019 -#line 209 "lib/aliases.gperf"
2020 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str528, ei_mac_roman},
2021 -    {-1},
2022 -#line 81 "lib/aliases.gperf"
2023 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str530, ei_iso8859_4},
2024 -    {-1},
2025 -#line 89 "lib/aliases.gperf"
2026 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str532, ei_iso8859_5},
2027 -    {-1}, {-1},
2028 -#line 246 "lib/aliases.gperf"
2029 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str535, ei_tis620},
2030 +    {(int)(long)&((struct stringpool_t *)0)->stringpool_str74, ei_utf16be},
2031  #line 18 "lib/aliases.gperf"
2032 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str536, ei_ascii},
2033 -#line 116 "lib/aliases.gperf"
2034 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str537, ei_iso8859_8},
2035 -#line 292 "lib/aliases.gperf"
2036 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str538, ei_ksc5601},
2037 -#line 305 "lib/aliases.gperf"
2038 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str539, ei_sjis},
2039 -#line 118 "lib/aliases.gperf"
2040 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str540, ei_iso8859_8},
2041 -#line 123 "lib/aliases.gperf"
2042 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str541, ei_iso8859_9},
2043 -    {-1}, {-1}, {-1}, {-1}, {-1},
2044 -#line 215 "lib/aliases.gperf"
2045 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str547, ei_mac_croatian},
2046 -#line 309 "lib/aliases.gperf"
2047 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str548, ei_iso2022_jp1},
2048 -    {-1},
2049 -#line 298 "lib/aliases.gperf"
2050 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str550, ei_euc_jp},
2051 -    {-1},
2052 +    {(int)(long)&((struct stringpool_t *)0)->stringpool_str75, ei_ascii},
2053  #line 17 "lib/aliases.gperf"
2054 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str552, ei_ascii},
2055 -    {-1}, {-1},
2056 -#line 297 "lib/aliases.gperf"
2057 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str555, ei_euc_jp},
2058 -    {-1}, {-1}, {-1}, {-1}, {-1},
2059 -#line 287 "lib/aliases.gperf"
2060 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str561, ei_gb2312},
2061 -#line 272 "lib/aliases.gperf"
2062 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str562, ei_jisx0208},
2063 -    {-1}, {-1}, {-1},
2064 -#line 240 "lib/aliases.gperf"
2065 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str566, ei_cp1133},
2066 -    {-1}, {-1},
2067 -#line 213 "lib/aliases.gperf"
2068 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str569, ei_mac_centraleurope},
2069 -#line 279 "lib/aliases.gperf"
2070 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str570, ei_jisx0212},
2071 -#line 310 "lib/aliases.gperf"
2072 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str571, ei_iso2022_jp2},
2073 -    {-1},
2074 +    {(int)(long)&((struct stringpool_t *)0)->stringpool_str76, ei_ascii},
2075  #line 46 "lib/aliases.gperf"
2076 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str573, ei_utf7},
2077 -#line 50 "lib/aliases.gperf"
2078 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str574, ei_ucs4swapped},
2079 -    {-1}, {-1}, {-1},
2080 -#line 28 "lib/aliases.gperf"
2081 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str578, ei_ucs2be},
2082 -#line 261 "lib/aliases.gperf"
2083 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str579, ei_iso646_jp},
2084 -#line 257 "lib/aliases.gperf"
2085 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str580, ei_iso646_jp},
2086 -    {-1},
2087 -#line 73 "lib/aliases.gperf"
2088 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str582, ei_iso8859_3},
2089 -    {-1}, {-1}, {-1},
2090 -#line 204 "lib/aliases.gperf"
2091 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str586, ei_cp862},
2092 -    {-1},
2093 -#line 340 "lib/aliases.gperf"
2094 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str588, ei_big5hkscs2004},
2095 -#line 96 "lib/aliases.gperf"
2096 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str589, ei_iso8859_6},
2097 +    {(int)(long)&((struct stringpool_t *)0)->stringpool_str77, ei_utf7},
2098  #line 48 "lib/aliases.gperf"
2099 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str590, ei_ucs2swapped},
2100 -#line 55 "lib/aliases.gperf"
2101 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str591, ei_iso8859_1},
2102 -    {-1},
2103 -#line 339 "lib/aliases.gperf"
2104 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str593, ei_big5hkscs2004},
2105 -#line 42 "lib/aliases.gperf"
2106 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str594, ei_utf32be},
2107 -    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
2108 -#line 307 "lib/aliases.gperf"
2109 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str604, ei_iso2022_jp},
2110 -    {-1}, {-1},
2111 -#line 169 "lib/aliases.gperf"
2112 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str607, ei_koi8_u},
2113 -#line 245 "lib/aliases.gperf"
2114 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str608, ei_tis620},
2115 -    {-1}, {-1}, {-1},
2116 -#line 170 "lib/aliases.gperf"
2117 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str612, ei_koi8_ru},
2118 -    {-1},
2119 -#line 65 "lib/aliases.gperf"
2120 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str614, ei_iso8859_2},
2121 -    {-1}, {-1}, {-1},
2122 -#line 216 "lib/aliases.gperf"
2123 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str618, ei_mac_romania},
2124 -    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
2125 -    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
2126 -    {-1}, {-1}, {-1}, {-1},
2127 -#line 274 "lib/aliases.gperf"
2128 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str641, ei_jisx0212},
2129 -    {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
2130 -#line 344 "lib/aliases.gperf"
2131 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str648, ei_euc_kr},
2132 -#line 217 "lib/aliases.gperf"
2133 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str649, ei_mac_cyrillic},
2134 -#line 106 "lib/aliases.gperf"
2135 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str650, ei_iso8859_7},
2136 -#line 191 "lib/aliases.gperf"
2137 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str651, ei_cp1256},
2138 -    {-1}, {-1}, {-1}, {-1}, {-1},
2139 -#line 182 "lib/aliases.gperf"
2140 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str657, ei_cp1253},
2141 -    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
2142 -#line 295 "lib/aliases.gperf"
2143 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str666, ei_ksc5601},
2144 -    {-1},
2145 -#line 262 "lib/aliases.gperf"
2146 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str668, ei_jisx0201},
2147 -    {-1}, {-1}, {-1}, {-1},
2148 -#line 105 "lib/aliases.gperf"
2149 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str673, ei_iso8859_7},
2150 -    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
2151 -#line 311 "lib/aliases.gperf"
2152 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str683, ei_iso2022_jp2},
2153 -    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
2154 -    {-1}, {-1}, {-1},
2155 -#line 266 "lib/aliases.gperf"
2156 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str696, ei_jisx0208},
2157 -#line 263 "lib/aliases.gperf"
2158 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str697, ei_jisx0201},
2159 -    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
2160 -#line 276 "lib/aliases.gperf"
2161 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str706, ei_jisx0212},
2162 -    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
2163 -    {-1},
2164 -#line 308 "lib/aliases.gperf"
2165 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str717, ei_iso2022_jp},
2166 -    {-1}, {-1}, {-1},
2167 -#line 347 "lib/aliases.gperf"
2168 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str721, ei_johab},
2169 -    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
2170 -#line 304 "lib/aliases.gperf"
2171 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str730, ei_sjis},
2172 -    {-1}, {-1}, {-1},
2173 -#line 273 "lib/aliases.gperf"
2174 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str734, ei_jisx0208},
2175 -    {-1}, {-1},
2176 -#line 220 "lib/aliases.gperf"
2177 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str737, ei_mac_turkish},
2178 -    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
2179 -    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
2180 -#line 256 "lib/aliases.gperf"
2181 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str755, ei_tcvn},
2182 -#line 267 "lib/aliases.gperf"
2183 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str756, ei_jisx0208},
2184 -    {-1}, {-1}, {-1}, {-1}, {-1},
2185 -#line 329 "lib/aliases.gperf"
2186 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str762, ei_euc_tw},
2187 -#line 219 "lib/aliases.gperf"
2188 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str763, ei_mac_greek},
2189 -    {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
2190 -#line 268 "lib/aliases.gperf"
2191 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str770, ei_jisx0208},
2192 -    {-1}, {-1}, {-1}, {-1}, {-1},
2193 -#line 194 "lib/aliases.gperf"
2194 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str776, ei_cp1257},
2195 -    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
2196 -    {-1}, {-1}, {-1}, {-1},
2197 -#line 185 "lib/aliases.gperf"
2198 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str790, ei_cp1254},
2199 -    {-1},
2200 -#line 218 "lib/aliases.gperf"
2201 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str792, ei_mac_ukraine},
2202 -    {-1}, {-1}, {-1},
2203 -#line 222 "lib/aliases.gperf"
2204 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str796, ei_mac_arabic},
2205 -    {-1}, {-1}, {-1}, {-1}, {-1},
2206 -#line 200 "lib/aliases.gperf"
2207 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str802, ei_cp850},
2208 -    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
2209 -    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
2210 -    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
2211 -    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
2212 +    {(int)(long)&((struct stringpool_t *)0)->stringpool_str78, ei_ucs2swapped},
2213 +#line 49 "lib/aliases.gperf"
2214 +    {(int)(long)&((struct stringpool_t *)0)->stringpool_str79, ei_ucs4internal},
2215 +#line 22 "lib/aliases.gperf"
2216 +    {(int)(long)&((struct stringpool_t *)0)->stringpool_str80, ei_ascii},
2217      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
2218 -#line 221 "lib/aliases.gperf"
2219 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str845, ei_mac_hebrew},
2220 -    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
2221 -    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
2222 -    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
2223 -    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
2224 -    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
2225 -    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
2226 +#line 36 "lib/aliases.gperf"
2227 +    {(int)(long)&((struct stringpool_t *)0)->stringpool_str87, ei_ucs4be},
2228 +#line 78 "lib/aliases.gperf"
2229 +    {(int)(long)&((struct stringpool_t *)0)->stringpool_str88, ei_cp1250},
2230      {-1}, {-1}, {-1},
2231 -#line 275 "lib/aliases.gperf"
2232 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str903, ei_jisx0212},
2233 -    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
2234 -    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
2235 -    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
2236 -    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
2237 -    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
2238 -    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
2239 -    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
2240 -    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
2241 +#line 54 "lib/aliases.gperf"
2242 +    {(int)(long)&((struct stringpool_t *)0)->stringpool_str92, ei_iso8859_1},
2243 +#line 50 "lib/aliases.gperf"
2244 +    {(int)(long)&((struct stringpool_t *)0)->stringpool_str93, ei_ucs4swapped},
2245      {-1}, {-1}, {-1},
2246 -#line 338 "lib/aliases.gperf"
2247 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str979, ei_big5hkscs2001},
2248 -    {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
2249 -#line 341 "lib/aliases.gperf"
2250 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str986, ei_big5hkscs2004},
2251 -    {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
2252 -#line 337 "lib/aliases.gperf"
2253 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str995, ei_big5hkscs1999},
2254 -    {-1},
2255 -#line 300 "lib/aliases.gperf"
2256 -    {(int)(long)&((struct stringpool_t *)0)->stringpool_str997, ei_euc_jp}
2257 +#line 67 "lib/aliases.gperf"
2258 +    {(int)(long)&((struct stringpool_t *)0)->stringpool_str97, ei_iso8859_2},
2259 +#line 59 "lib/aliases.gperf"
2260 +    {(int)(long)&((struct stringpool_t *)0)->stringpool_str98, ei_iso8859_1}
2261    };
2262
2263  #ifdef __GNUC__
2264 --- a/lib/canonical_dos.h
2265 +++ b/lib/canonical_dos.h
2266 @@ -1,15 +1 @@
2267    (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_0,
2268 -  (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_4,
2269 -  (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_5,
2270 -  (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_8,
2271 -  (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_12,
2272 -  (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_13,
2273 -  (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_17,
2274 -  (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_21,
2275 -  (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_22,
2276 -  (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_26,
2277 -  (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_31,
2278 -  (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_35,
2279 -  (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_38,
2280 -  (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_42,
2281 -  (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_47,
2282 --- a/lib/canonical.h
2283 +++ b/lib/canonical.h
2284 @@ -1,107 +1 @@
2285 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str380,
2286 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str297,
2287 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str263,
2288 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str476,
2289 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str295,
2290 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str231,
2291 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str460,
2292 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str279,
2293 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str272,
2294 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str510,
2295 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str329,
2296 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str381,
2297 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str594,
2298 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str413,
2299 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str433,
2300 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str320,
2301 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str590,
2302 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str304,
2303 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str574,
2304 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str157,
2305 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str489,
2306 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str117,
2307 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str163,
2308 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str235,
2309 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str131,
2310 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str135,
2311 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str113,
2312 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str281,
2313 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str145,
2314 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str149,
2315 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str270,
2316 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str124,
2317 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str242,
2318 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str138,
2319 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str142,
2320 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str120,
2321 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str245,
2322 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str607,
2323 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str612,
2324 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str324,
2325 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str178,
2326 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str224,
2327 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str296,
2328 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str192,
2329 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str196,
2330 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str174,
2331 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str342,
2332 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str206,
2333 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str308,
2334 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str197,
2335 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str147,
2336 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str528,
2337 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str569,
2338 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str504,
2339 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str547,
2340 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str618,
2341 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str649,
2342 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str792,
2343 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str763,
2344 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str737,
2345 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str845,
2346 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str796,
2347 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str372,
2348 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str298,
2349 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str387,
2350 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str397,
2351 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str291,
2352 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str211,
2353 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str277,
2354 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str116,
2355 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str283,
2356 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str323,
2357 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str233,
2358 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str249,
2359 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str252,
2360 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str156,
2361 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str580,
2362 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str668,
2363 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str696,
2364 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str641,
2365 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str284,
2366 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str345,
2367    (int)(long)&((struct stringpool_t *)0)->stringpool_str77,
2368 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str435,
2369 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str555,
2370 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str421,
2371 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str260,
2372 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str604,
2373 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str548,
2374 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str571,
2375 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str278,
2376 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str426,
2377 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str210,
2378 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str354,
2379 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str327,
2380 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str340,
2381 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str18,
2382 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str470,
2383 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str241,
2384 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str310,
2385 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str995,
2386 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str979,
2387 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str593,
2388 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str356,
2389 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str194,
2390 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str721,
2391 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str405,
2392 --- a/lib/canonical_local.h
2393 +++ b/lib/canonical_local.h
2394 @@ -1,2 +1 @@
2395 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str169,
2396 -  (int)(long)&((struct stringpool_t *)0)->stringpool_str267,
2397 +
2398 --- a/lib/converters.h
2399 +++ b/lib/converters.h
2400 @@ -129,161 +129,15 @@ struct conv_struct {
2401  #include "ucs2swapped.h"
2402  #include "ucs4internal.h"
2403  #include "ucs4swapped.h"
2404 -#include "c99.h"
2405 -#include "java.h"
2406
2407  /* 8-bit encodings */
2408  #include "iso8859_1.h"
2409  #include "iso8859_2.h"
2410 -#include "iso8859_3.h"
2411 -#include "iso8859_4.h"
2412 -#include "iso8859_5.h"
2413 -#include "iso8859_6.h"
2414 -#include "iso8859_7.h"
2415 -#include "iso8859_8.h"
2416 -#include "iso8859_9.h"
2417 -#include "iso8859_10.h"
2418 -#include "iso8859_11.h"
2419 -#include "iso8859_13.h"
2420 -#include "iso8859_14.h"
2421  #include "iso8859_15.h"
2422 -#include "iso8859_16.h"
2423  #include "koi8_r.h"
2424 -#include "koi8_u.h"
2425 -#include "koi8_ru.h"
2426  #include "cp1250.h"
2427 -#include "cp1251.h"
2428 -#include "cp1252.h"
2429 -#include "cp1253.h"
2430 -#include "cp1254.h"
2431 -#include "cp1255.h"
2432 -#include "cp1256.h"
2433 -#include "cp1257.h"
2434 -#include "cp1258.h"
2435  #include "cp850.h"
2436 -#include "cp862.h"
2437 -#include "cp866.h"
2438 -#include "mac_roman.h"
2439 -#include "mac_centraleurope.h"
2440 -#include "mac_iceland.h"
2441 -#include "mac_croatian.h"
2442 -#include "mac_romania.h"
2443 -#include "mac_cyrillic.h"
2444 -#include "mac_ukraine.h"
2445 -#include "mac_greek.h"
2446 -#include "mac_turkish.h"
2447 -#include "mac_hebrew.h"
2448 -#include "mac_arabic.h"
2449 -#include "mac_thai.h"
2450 -#include "hp_roman8.h"
2451 -#include "nextstep.h"
2452 -#include "armscii_8.h"
2453 -#include "georgian_academy.h"
2454 -#include "georgian_ps.h"
2455 -#include "koi8_t.h"
2456 -#include "pt154.h"
2457 -#include "mulelao.h"
2458 -#include "cp1133.h"
2459 -#include "tis620.h"
2460 -#include "cp874.h"
2461 -#include "viscii.h"
2462 -#include "tcvn.h"
2463 -
2464 -/* CJK character sets [CCS = coded character set] [CJKV.INF chapter 3] */
2465 -
2466 -typedef struct {
2467 -  unsigned short indx; /* index into big table */
2468 -  unsigned short used; /* bitmask of used entries */
2469 -} Summary16;
2470 -
2471 -#include "iso646_jp.h"
2472 -#include "jisx0201.h"
2473 -#include "jisx0208.h"
2474 -#include "jisx0212.h"
2475 -
2476 -#include "iso646_cn.h"
2477 -#include "gb2312.h"
2478 -#include "isoir165.h"
2479 -/*#include "gb12345.h"*/
2480 -#include "gbk.h"
2481 -#include "cns11643.h"
2482 -#include "big5.h"
2483 -
2484 -#include "ksc5601.h"
2485 -#include "johab_hangul.h"
2486 -
2487 -/* CJK encodings [CES = character encoding scheme] [CJKV.INF chapter 4] */
2488 -
2489 -#include "euc_jp.h"
2490 -#include "sjis.h"
2491 -#include "cp932.h"
2492 -#include "iso2022_jp.h"
2493 -#include "iso2022_jp1.h"
2494 -#include "iso2022_jp2.h"
2495 -
2496 -#include "euc_cn.h"
2497 -#include "ces_gbk.h"
2498 -#include "cp936.h"
2499 -#include "gb18030.h"
2500 -#include "iso2022_cn.h"
2501 -#include "iso2022_cnext.h"
2502 -#include "hz.h"
2503 -#include "euc_tw.h"
2504 -#include "ces_big5.h"
2505 -#include "cp950.h"
2506 -#include "big5hkscs1999.h"
2507 -#include "big5hkscs2001.h"
2508 -#include "big5hkscs2004.h"
2509 -
2510 -#include "euc_kr.h"
2511 -#include "cp949.h"
2512 -#include "johab.h"
2513 -#include "iso2022_kr.h"
2514 -
2515 -/* Encodings used by system dependent locales. */
2516 -
2517 -#ifdef USE_AIX
2518 -#include "cp856.h"
2519 -#include "cp922.h"
2520 -#include "cp943.h"
2521 -#include "cp1046.h"
2522 -#include "cp1124.h"
2523 -#include "cp1129.h"
2524 -#include "cp1161.h"
2525 -#include "cp1162.h"
2526 -#include "cp1163.h"
2527 -#endif
2528 -
2529 -#ifdef USE_OSF1
2530 -#include "dec_kanji.h"
2531 -#include "dec_hanyu.h"
2532 -#endif
2533
2534  #ifdef USE_DOS
2535  #include "cp437.h"
2536 -#include "cp737.h"
2537 -#include "cp775.h"
2538 -#include "cp852.h"
2539 -#include "cp853.h"
2540 -#include "cp855.h"
2541 -#include "cp857.h"
2542 -#include "cp858.h"
2543 -#include "cp860.h"
2544 -#include "cp861.h"
2545 -#include "cp863.h"
2546 -#include "cp864.h"
2547 -#include "cp865.h"
2548 -#include "cp869.h"
2549 -#include "cp1125.h"
2550 -#endif
2551 -
2552 -#ifdef USE_EXTRA
2553 -#include "euc_jisx0213.h"
2554 -#include "shift_jisx0213.h"
2555 -#include "iso2022_jp3.h"
2556 -#include "big5_2003.h"
2557 -#include "tds565.h"
2558 -#include "atarist.h"
2559 -#include "riscos1.h"
2560  #endif
2561 -
2562 --- a/lib/encodings.def
2563 +++ b/lib/encodings.def
2564 @@ -161,16 +161,6 @@ DEFENCODING(( "UCS-4-SWAPPED",
2565              ucs4swapped,
2566              { ucs4swapped_mbtowc, NULL }, { ucs4swapped_wctomb, NULL })
2567
2568 -DEFENCODING(( "C99",
2569 -            ),
2570 -            c99,
2571 -            { c99_mbtowc, NULL },         { c99_wctomb, NULL })
2572 -
2573 -DEFENCODING(( "JAVA",
2574 -            ),
2575 -            java,
2576 -            { java_mbtowc, NULL },        { java_wctomb, NULL })
2577 -
2578  /* Standard 8-bit encodings */
2579
2580  DEFENCODING(( "ISO-8859-1",             /* IANA */
2581 @@ -203,148 +193,6 @@ DEFENCODING(( "ISO-8859-2",
2582              iso8859_2,
2583              { iso8859_2_mbtowc, NULL },   { iso8859_2_wctomb, NULL })
2584
2585 -DEFENCODING(( "ISO-8859-3",             /* IANA */
2586 -              "ISO_8859-3",             /* IANA */
2587 -              "ISO_8859-3:1988",        /* IANA */
2588 -              "ISO-IR-109",             /* IANA */
2589 -              "LATIN3",                 /* IANA */
2590 -              "L3",                     /* IANA */
2591 -              "csISOLatin3",            /* IANA */
2592 -              "ISO8859-3",              /* X11R6.4, glibc, FreeBSD */
2593 -            /*"ISO8859_3",                 JDK 1.1 */
2594 -            /*"CP28593",                   Windows */
2595 -            ),
2596 -            iso8859_3,
2597 -            { iso8859_3_mbtowc, NULL },   { iso8859_3_wctomb, NULL })
2598 -
2599 -DEFENCODING(( "ISO-8859-4",             /* IANA */
2600 -              "ISO_8859-4",             /* IANA */
2601 -              "ISO_8859-4:1988",        /* IANA */
2602 -              "ISO-IR-110",             /* IANA */
2603 -              "LATIN4",                 /* IANA */
2604 -              "L4",                     /* IANA */
2605 -              "csISOLatin4",            /* IANA */
2606 -              "ISO8859-4",              /* X11R6.4, glibc, FreeBSD */
2607 -            /*"ISO8859_4",                 JDK 1.1 */
2608 -            /*"CP28594",                   Windows */
2609 -            ),
2610 -            iso8859_4,
2611 -            { iso8859_4_mbtowc, NULL },   { iso8859_4_wctomb, NULL })
2612 -
2613 -DEFENCODING(( "ISO-8859-5",             /* IANA */
2614 -              "ISO_8859-5",             /* IANA */
2615 -              "ISO_8859-5:1988",        /* IANA */
2616 -              "ISO-IR-144",             /* IANA */
2617 -              "CYRILLIC",               /* IANA */
2618 -              "csISOLatinCyrillic",     /* IANA */
2619 -              "ISO8859-5",              /* X11R6.4, glibc, FreeBSD */
2620 -            /*"ISO8859_5",                 JDK 1.1 */
2621 -            /*"CP28595",                   Windows */
2622 -            ),
2623 -            iso8859_5,
2624 -            { iso8859_5_mbtowc, NULL },   { iso8859_5_wctomb, NULL })
2625 -
2626 -DEFENCODING(( "ISO-8859-6",             /* IANA */
2627 -              "ISO_8859-6",             /* IANA */
2628 -              "ISO_8859-6:1987",        /* IANA */
2629 -              "ISO-IR-127",             /* IANA */
2630 -              "ECMA-114",               /* IANA */
2631 -              "ASMO-708",               /* IANA */
2632 -              "ARABIC",                 /* IANA */
2633 -              "csISOLatinArabic",       /* IANA */
2634 -              "ISO8859-6",              /* X11R6.4, glibc, FreeBSD */
2635 -            /*"ISO8859_6",                 JDK 1.1 */
2636 -            /*"CP28596",                   Windows */
2637 -            ),
2638 -            iso8859_6,
2639 -            { iso8859_6_mbtowc, NULL },   { iso8859_6_wctomb, NULL })
2640 -
2641 -DEFENCODING(( "ISO-8859-7",             /* IANA, RFC 1947 */
2642 -              "ISO_8859-7",             /* IANA */
2643 -              "ISO_8859-7:1987",        /* IANA */
2644 -              "ISO_8859-7:2003",
2645 -              "ISO-IR-126",             /* IANA */
2646 -              "ECMA-118",               /* IANA */
2647 -              "ELOT_928",               /* IANA */
2648 -              "GREEK8",                 /* IANA */
2649 -              "GREEK",                  /* IANA */
2650 -              "csISOLatinGreek",        /* IANA */
2651 -              "ISO8859-7",              /* X11R6.4, glibc, FreeBSD */
2652 -            /*"ISO8859_7",                 JDK 1.1 */
2653 -            /*"CP28597",                   Windows */
2654 -            ),
2655 -            iso8859_7,
2656 -            { iso8859_7_mbtowc, NULL },   { iso8859_7_wctomb, NULL })
2657 -
2658 -DEFENCODING(( "ISO-8859-8",             /* IANA */
2659 -              "ISO_8859-8",             /* IANA */
2660 -              "ISO_8859-8:1988",        /* IANA */
2661 -              "ISO-IR-138",             /* IANA */
2662 -              "HEBREW",                 /* IANA */
2663 -              "csISOLatinHebrew",       /* IANA */
2664 -              "ISO8859-8",              /* X11R6.4, glibc, FreeBSD */
2665 -            /*"ISO8859_8",                 JDK 1.1 */
2666 -            /*"CP28598",                   Windows */
2667 -            /*"CP38598",                   Windows */
2668 -            ),
2669 -            iso8859_8,
2670 -            { iso8859_8_mbtowc, NULL },   { iso8859_8_wctomb, NULL })
2671 -
2672 -DEFENCODING(( "ISO-8859-9",             /* IANA */
2673 -              "ISO_8859-9",             /* IANA */
2674 -              "ISO_8859-9:1989",        /* IANA */
2675 -              "ISO-IR-148",             /* IANA */
2676 -              "LATIN5",                 /* IANA */
2677 -              "L5",                     /* IANA */
2678 -              "csISOLatin5",            /* IANA */
2679 -              "ISO8859-9",              /* X11R6.4, glibc, FreeBSD */
2680 -            /*"ISO8859_9",                 JDK 1.1 */
2681 -            /*"CP28599",                   Windows */
2682 -            ),
2683 -            iso8859_9,
2684 -            { iso8859_9_mbtowc, NULL },   { iso8859_9_wctomb, NULL })
2685 -
2686 -DEFENCODING(( "ISO-8859-10",            /* IANA */
2687 -              "ISO_8859-10",
2688 -              "ISO_8859-10:1992",       /* IANA */
2689 -              "ISO-IR-157",             /* IANA */
2690 -              "LATIN6",                 /* IANA */
2691 -              "L6",                     /* IANA */
2692 -              "csISOLatin6",            /* IANA */
2693 -              "ISO8859-10",             /* X11R6.4, glibc, FreeBSD */
2694 -            ),
2695 -            iso8859_10,
2696 -            { iso8859_10_mbtowc, NULL },  { iso8859_10_wctomb, NULL })
2697 -
2698 -DEFENCODING(( "ISO-8859-11",            /* glibc */
2699 -              "ISO_8859-11",
2700 -              "ISO8859-11",             /* X11R6.7, glibc */
2701 -            ),
2702 -            iso8859_11,
2703 -            { iso8859_11_mbtowc, NULL },  { iso8859_11_wctomb, NULL })
2704 -
2705 -DEFENCODING(( "ISO-8859-13",            /* IANA, glibc */
2706 -              "ISO_8859-13",
2707 -              "ISO-IR-179",             /* glibc */
2708 -              "LATIN7",                 /* glibc */
2709 -              "L7",                     /* glibc */
2710 -              "ISO8859-13",             /* glibc, FreeBSD */
2711 -            ),
2712 -            iso8859_13,
2713 -            { iso8859_13_mbtowc, NULL },  { iso8859_13_wctomb, NULL })
2714 -
2715 -DEFENCODING(( "ISO-8859-14",            /* IANA, glibc */
2716 -              "ISO_8859-14",            /* IANA */
2717 -              "ISO_8859-14:1998",       /* IANA, glibc */
2718 -              "ISO-IR-199",             /* IANA */
2719 -              "LATIN8",                 /* IANA, glibc */
2720 -              "L8",                     /* IANA, glibc */
2721 -              "ISO-CELTIC",             /* IANA */
2722 -              "ISO8859-14",             /* glibc, FreeBSD */
2723 -            ),
2724 -            iso8859_14,
2725 -            { iso8859_14_mbtowc, NULL },  { iso8859_14_wctomb, NULL })
2726 -
2727  DEFENCODING(( "ISO-8859-15",            /* IANA, glibc */
2728                "ISO_8859-15",            /* IANA */
2729                "ISO_8859-15:1998",       /* glibc */
2730 @@ -356,17 +204,6 @@ DEFENCODING(( "ISO-8859-15",
2731              iso8859_15,
2732              { iso8859_15_mbtowc, NULL },  { iso8859_15_wctomb, NULL })
2733
2734 -DEFENCODING(( "ISO-8859-16",            /* IANA */
2735 -              "ISO_8859-16",            /* IANA */
2736 -              "ISO_8859-16:2001",       /* IANA */
2737 -              "ISO-IR-226",             /* IANA */
2738 -              "LATIN10",                /* IANA */
2739 -              "L10",                    /* IANA */
2740 -              "ISO8859-16",             /* glibc, FreeBSD */
2741 -            ),
2742 -            iso8859_16,
2743 -            { iso8859_16_mbtowc, NULL },  { iso8859_16_wctomb, NULL })
2744 -
2745  DEFENCODING(( "KOI8-R",                 /* IANA, RFC 1489, X11R6.4, JDK 1.1 */
2746                "csKOI8R",                /* IANA */
2747              /*"CP20866",                   Windows */
2748 @@ -374,16 +211,6 @@ DEFENCODING(( "KOI8-R",
2749              koi8_r,
2750              { koi8_r_mbtowc, NULL },      { koi8_r_wctomb, NULL })
2751
2752 -DEFENCODING(( "KOI8-U",                 /* IANA, RFC 2319 */
2753 -            ),
2754 -            koi8_u,
2755 -            { koi8_u_mbtowc, NULL },      { koi8_u_wctomb, NULL })
2756 -
2757 -DEFENCODING(( "KOI8-RU",
2758 -            ),
2759 -            koi8_ru,
2760 -            { koi8_ru_mbtowc, NULL },     { koi8_ru_wctomb, NULL })
2761 -
2762  /* Windows 8-bit encodings */
2763
2764  DEFENCODING(( "CP1250",                 /* JDK 1.1 */
2765 @@ -393,61 +220,6 @@ DEFENCODING(( "CP1250",
2766              cp1250,
2767              { cp1250_mbtowc, NULL },      { cp1250_wctomb, NULL })
2768
2769 -DEFENCODING(( "CP1251",                 /* JDK 1.1 */
2770 -              "WINDOWS-1251",           /* IANA */
2771 -              "MS-CYRL",
2772 -            ),
2773 -            cp1251,
2774 -            { cp1251_mbtowc, NULL },      { cp1251_wctomb, NULL })
2775 -
2776 -DEFENCODING(( "CP1252",                 /* JDK 1.1 */
2777 -              "WINDOWS-1252",           /* IANA */
2778 -              "MS-ANSI",
2779 -            ),
2780 -            cp1252,
2781 -            { cp1252_mbtowc, NULL },      { cp1252_wctomb, NULL })
2782 -
2783 -DEFENCODING(( "CP1253",                 /* JDK 1.1 */
2784 -              "WINDOWS-1253",           /* IANA */
2785 -              "MS-GREEK",
2786 -            ),
2787 -            cp1253,
2788 -            { cp1253_mbtowc, NULL },      { cp1253_wctomb, NULL })
2789 -
2790 -DEFENCODING(( "CP1254",                 /* JDK 1.1 */
2791 -              "WINDOWS-1254",           /* IANA */
2792 -              "MS-TURK",
2793 -            ),
2794 -            cp1254,
2795 -            { cp1254_mbtowc, NULL },      { cp1254_wctomb, NULL })
2796 -
2797 -DEFENCODING(( "CP1255",                 /* JDK 1.1 */
2798 -              "WINDOWS-1255",           /* IANA */
2799 -              "MS-HEBR",
2800 -            ),
2801 -            cp1255,
2802 -            { cp1255_mbtowc, cp1255_flushwc }, { cp1255_wctomb, NULL })
2803 -
2804 -DEFENCODING(( "CP1256",                 /* JDK 1.1 */
2805 -              "WINDOWS-1256",           /* IANA */
2806 -              "MS-ARAB",
2807 -            ),
2808 -            cp1256,
2809 -            { cp1256_mbtowc, NULL },      { cp1256_wctomb, NULL })
2810 -
2811 -DEFENCODING(( "CP1257",                 /* JDK 1.1 */
2812 -              "WINDOWS-1257",           /* IANA */
2813 -              "WINBALTRIM",
2814 -            ),
2815 -            cp1257,
2816 -            { cp1257_mbtowc, NULL },      { cp1257_wctomb, NULL })
2817 -
2818 -DEFENCODING(( "CP1258",                 /* JDK 1.1 */
2819 -              "WINDOWS-1258",           /* IANA */
2820 -            ),
2821 -            cp1258,
2822 -            { cp1258_mbtowc, cp1258_flushwc }, { cp1258_wctomb, NULL })
2823 -
2824  /* DOS 8-bit encodings */
2825
2826  DEFENCODING(( "CP850",                  /* IANA, JDK 1.1 */
2827 @@ -458,431 +230,3 @@ DEFENCODING(( "CP850",
2828              cp850,
2829              { cp850_mbtowc, NULL },       { cp850_wctomb, NULL })
2830
2831 -DEFENCODING(( "CP862",                  /* IANA, JDK 1.1 */
2832 -              "IBM862",                 /* IANA */
2833 -              "862",                    /* IANA */
2834 -              "csPC862LatinHebrew",     /* IANA */
2835 -            ),
2836 -            cp862,
2837 -            { cp862_mbtowc, NULL },       { cp862_wctomb, NULL })
2838 -
2839 -DEFENCODING(( "CP866",                  /* IANA, JDK 1.1 */
2840 -              "IBM866",                 /* IANA */
2841 -              "866",                    /* IANA */
2842 -              "csIBM866",               /* IANA */
2843 -            ),
2844 -            cp866,
2845 -            { cp866_mbtowc, NULL },       { cp866_wctomb, NULL })
2846 -
2847 -/* Macintosh 8-bit encodings */
2848 -
2849 -DEFENCODING(( "MacRoman",               /* JDK 1.1 */
2850 -              /* This is the best table for MACINTOSH. The ones */
2851 -              /* in glibc and FreeBSD-iconv are bad quality. */
2852 -              "MACINTOSH",              /* IANA */
2853 -              "MAC",                    /* IANA */
2854 -              "csMacintosh",            /* IANA */
2855 -            /*"CP10000",                   Windows */
2856 -            ),
2857 -            mac_roman,
2858 -            { mac_roman_mbtowc, NULL },   { mac_roman_wctomb, NULL })
2859 -
2860 -DEFENCODING(( "MacCentralEurope",       /* JDK 1.1 */
2861 -            /*"CP10029",                   Windows */
2862 -            ),
2863 -            mac_centraleurope,
2864 -            { mac_centraleurope_mbtowc, NULL }, { mac_centraleurope_wctomb, NULL })
2865 -
2866 -DEFENCODING(( "MacIceland",             /* JDK 1.1 */
2867 -            /*"CP10079",                   Windows */
2868 -            ),
2869 -            mac_iceland,
2870 -            { mac_iceland_mbtowc, NULL }, { mac_iceland_wctomb, NULL })
2871 -
2872 -DEFENCODING(( "MacCroatian",            /* JDK 1.1 */
2873 -            /*"CP10082",                   Windows */
2874 -            ),
2875 -            mac_croatian,
2876 -            { mac_croatian_mbtowc, NULL }, { mac_croatian_wctomb, NULL })
2877 -
2878 -DEFENCODING(( "MacRomania",             /* JDK 1.1 */
2879 -            /*"CP10010",                   Windows */
2880 -            ),
2881 -            mac_romania,
2882 -            { mac_romania_mbtowc, NULL }, { mac_romania_wctomb, NULL })
2883 -
2884 -DEFENCODING(( "MacCyrillic",            /* JDK 1.1 */
2885 -            /*"CP10007",                   Windows */
2886 -            ),
2887 -            mac_cyrillic,
2888 -            { mac_cyrillic_mbtowc, NULL }, { mac_cyrillic_wctomb, NULL })
2889 -
2890 -DEFENCODING(( "MacUkraine",             /* JDK 1.1 */
2891 -            /*"CP10017",                   Windows */
2892 -            ),
2893 -            mac_ukraine,
2894 -            { mac_ukraine_mbtowc, NULL }, { mac_ukraine_wctomb, NULL })
2895 -
2896 -DEFENCODING(( "MacGreek",               /* JDK 1.1 */
2897 -            /*"CP10006",                   Windows */
2898 -            ),
2899 -            mac_greek,
2900 -            { mac_greek_mbtowc, NULL },   { mac_greek_wctomb, NULL })
2901 -
2902 -DEFENCODING(( "MacTurkish",             /* JDK 1.1 */
2903 -            /*"CP10081",                   Windows */
2904 -            ),
2905 -            mac_turkish,
2906 -            { mac_turkish_mbtowc, NULL }, { mac_turkish_wctomb, NULL })
2907 -
2908 -DEFENCODING(( "MacHebrew",              /* JDK 1.1 */
2909 -            /*"CP10005",                   Windows */
2910 -            ),
2911 -            mac_hebrew,
2912 -            { mac_hebrew_mbtowc, NULL },  { mac_hebrew_wctomb, NULL })
2913 -
2914 -DEFENCODING(( "MacArabic",              /* JDK 1.1 */
2915 -            /*"CP10004",                   Windows */
2916 -            ),
2917 -            mac_arabic,
2918 -            { mac_arabic_mbtowc, NULL },  { mac_arabic_wctomb, NULL })
2919 -
2920 -DEFENCODING(( "MacThai",                /* JDK 1.1 */
2921 -            /*"CP10021",                   Windows */
2922 -            ),
2923 -            mac_thai,
2924 -            { mac_thai_mbtowc, NULL },    { mac_thai_wctomb, NULL })
2925 -
2926 -/* Other platform specific 8-bit encodings */
2927 -
2928 -DEFENCODING(( "HP-ROMAN8",              /* IANA, X11R6.4 */
2929 -              "ROMAN8",                 /* IANA */
2930 -              "R8",                     /* IANA */
2931 -              "csHPRoman8",             /* IANA */
2932 -            ),
2933 -            hp_roman8,
2934 -            { hp_roman8_mbtowc, NULL },   { hp_roman8_wctomb, NULL })
2935 -
2936 -DEFENCODING(( "NEXTSTEP",
2937 -            ),
2938 -            nextstep,
2939 -            { nextstep_mbtowc, NULL },    { nextstep_wctomb, NULL })
2940 -
2941 -/* Regional 8-bit encodings used for a single language */
2942 -
2943 -DEFENCODING(( "ARMSCII-8",
2944 -            ),
2945 -            armscii_8,
2946 -            { armscii_8_mbtowc, NULL },   { armscii_8_wctomb, NULL })
2947 -
2948 -DEFENCODING(( "GEORGIAN-ACADEMY",
2949 -            ),
2950 -            georgian_academy,
2951 -            { georgian_academy_mbtowc, NULL }, { georgian_academy_wctomb, NULL })
2952 -
2953 -DEFENCODING(( "GEORGIAN-PS",
2954 -            ),
2955 -            georgian_ps,
2956 -            { georgian_ps_mbtowc, NULL }, { georgian_ps_wctomb, NULL })
2957 -
2958 -DEFENCODING(( "KOI8-T",
2959 -            ),
2960 -            koi8_t,
2961 -            { koi8_t_mbtowc, NULL },      { koi8_t_wctomb, NULL })
2962 -
2963 -DEFENCODING(( "PT154",                  /* IANA, glibc */
2964 -              "PTCP154",                /* IANA */
2965 -              "CP154",                  /* IANA */
2966 -              "CYRILLIC-ASIAN",         /* IANA */
2967 -              "csPTCP154",              /* IANA */
2968 -            ),
2969 -            pt154,
2970 -            { pt154_mbtowc, NULL },       { pt154_wctomb, NULL })
2971 -
2972 -DEFENCODING(( "MULELAO-1",
2973 -            ),
2974 -            mulelao,
2975 -            { mulelao_mbtowc, NULL },     { mulelao_wctomb, NULL })
2976 -
2977 -DEFENCODING(( "CP1133",
2978 -              "IBM-CP1133",
2979 -            ),
2980 -            cp1133,
2981 -            { cp1133_mbtowc, NULL },      { cp1133_wctomb, NULL })
2982 -
2983 -DEFENCODING(( "TIS-620",                /* IANA */
2984 -              "TIS620",                 /* glibc */
2985 -              "TIS620-0",               /* glibc */
2986 -              "TIS620.2529-1",          /* glibc */
2987 -              "TIS620.2533-0",          /* glibc */
2988 -              "TIS620.2533-1",
2989 -              "ISO-IR-166",             /* glibc */
2990 -            ),
2991 -            tis620,
2992 -            { tis620_mbtowc, NULL },      { tis620_wctomb, NULL })
2993 -
2994 -DEFENCODING(( "CP874",                  /* JDK 1.1 */
2995 -              "WINDOWS-874",
2996 -            ),
2997 -            cp874,
2998 -            { cp874_mbtowc, NULL },       { cp874_wctomb, NULL })
2999 -
3000 -DEFENCODING(( "VISCII",                 /* IANA, RFC 1456 */
3001 -              "VISCII1.1-1",
3002 -              "csVISCII",               /* IANA */
3003 -            ),
3004 -            viscii,
3005 -            { viscii_mbtowc, NULL },      { viscii_wctomb, NULL })
3006 -
3007 -DEFENCODING(( "TCVN",
3008 -              "TCVN-5712",
3009 -              "TCVN5712-1",
3010 -              "TCVN5712-1:1993",
3011 -            ),
3012 -            tcvn,
3013 -            { tcvn_mbtowc, tcvn_flushwc }, { tcvn_wctomb, NULL })
3014 -
3015 -/* CJK character sets (not documented) */
3016 -
3017 -DEFENCODING(( "JIS_C6220-1969-RO",      /* IANA */
3018 -              "ISO646-JP",              /* IANA */
3019 -              "ISO-IR-14",              /* IANA */
3020 -              "JP",                     /* IANA */
3021 -              "csISO14JISC6220ro",      /* IANA */
3022 -            ),
3023 -            iso646_jp,
3024 -            { iso646_jp_mbtowc, NULL },   { iso646_jp_wctomb, NULL })
3025 -
3026 -DEFENCODING(( "JIS_X0201",              /* IANA */
3027 -              "JISX0201-1976",
3028 -              "X0201",                  /* IANA */
3029 -              "csHalfWidthKatakana",    /* IANA */
3030 -            /*"JISX0201.1976-0",           X11R6.4 */
3031 -            /*"JIS0201",                   JDK 1.1 */
3032 -            ),
3033 -            jisx0201,
3034 -            { jisx0201_mbtowc, NULL },    { jisx0201_wctomb, NULL })
3035 -
3036 -DEFENCODING(( "JIS_X0208",
3037 -              "JIS_X0208-1983",         /* IANA */
3038 -              "JIS_X0208-1990",
3039 -              "JIS0208",
3040 -              "X0208",                  /* IANA */
3041 -              "ISO-IR-87",              /* IANA */
3042 -              "JIS_C6226-1983",         /* IANA */
3043 -              "csISO87JISX0208",        /* IANA */
3044 -            /*"JISX0208.1983-0",           X11R6.4 */
3045 -            /*"JISX0208.1990-0",           X11R6.4 */
3046 -            /*"JIS0208",                   JDK 1.1 */
3047 -            ),
3048 -            jisx0208,
3049 -            { jisx0208_mbtowc, NULL },    { jisx0208_wctomb, NULL })
3050 -
3051 -DEFENCODING(( "JIS_X0212",
3052 -              "JIS_X0212.1990-0",
3053 -              "JIS_X0212-1990",         /* IANA */
3054 -              "X0212",                  /* IANA */
3055 -              "ISO-IR-159",             /* IANA */
3056 -              "csISO159JISX02121990",   /* IANA */
3057 -            /*"JISX0212.1990-0",           X11R6.4 */
3058 -            /*"JIS0212",                   JDK 1.1 */
3059 -            ),
3060 -            jisx0212,
3061 -            { jisx0212_mbtowc, NULL },    { jisx0212_wctomb, NULL })
3062 -
3063 -DEFENCODING(( "GB_1988-80",             /* IANA */
3064 -              "ISO646-CN",              /* IANA */
3065 -              "ISO-IR-57",              /* IANA */
3066 -              "CN",                     /* IANA */
3067 -              "csISO57GB1988",          /* IANA */
3068 -            ),
3069 -            iso646_cn,
3070 -            { iso646_cn_mbtowc, NULL },   { iso646_cn_wctomb, NULL })
3071 -
3072 -DEFENCODING(( "GB_2312-80",             /* IANA */
3073 -              "ISO-IR-58",              /* IANA */
3074 -              "csISO58GB231280",        /* IANA */
3075 -              "CHINESE",                /* IANA */
3076 -            /*"GB2312.1980-0",             X11R6.4 */
3077 -            ),
3078 -            gb2312,
3079 -            { gb2312_mbtowc, NULL },      { gb2312_wctomb, NULL })
3080 -
3081 -DEFENCODING(( "ISO-IR-165",
3082 -              "CN-GB-ISOIR165",         /* RFC 1922 */
3083 -            ),
3084 -            isoir165,
3085 -            { isoir165_mbtowc, NULL },    { isoir165_wctomb, NULL })
3086 -
3087 -DEFENCODING(( "KSC_5601",               /* IANA */
3088 -              "KS_C_5601-1987",         /* IANA */
3089 -              "KS_C_5601-1989",         /* IANA */
3090 -              "ISO-IR-149",             /* IANA */
3091 -              "csKSC56011987",          /* IANA */
3092 -              "KOREAN",                 /* IANA */
3093 -            /*"KSC5601.1987-0",            X11R6.4 */
3094 -            /*"KSX1001:1992",              Ken Lunde */
3095 -            ),
3096 -            ksc5601,
3097 -            { ksc5601_mbtowc, NULL },     { ksc5601_wctomb, NULL })
3098 -
3099 -/* CJK encodings */
3100 -
3101 -DEFENCODING(( "EUC-JP",                 /* IANA */
3102 -              "EUCJP",                  /* glibc */
3103 -              "Extended_UNIX_Code_Packed_Format_for_Japanese", /* IANA */
3104 -              "csEUCPkdFmtJapanese",    /* IANA */
3105 -            /*"EUC_JP",                    JDK 1.1 */
3106 -            /*"CP51932",                   Windows */
3107 -            ),
3108 -            euc_jp,
3109 -            { euc_jp_mbtowc, NULL },      { euc_jp_wctomb, NULL })
3110 -
3111 -DEFENCODING(( "SHIFT_JIS",              /* IANA */
3112 -              "SHIFT-JIS",              /* glibc */
3113 -              "SJIS",                   /* JDK 1.1 */
3114 -              "MS_KANJI",               /* IANA */
3115 -              "csShiftJIS",             /* IANA */
3116 -            ),
3117 -            sjis,
3118 -            { sjis_mbtowc, NULL },        { sjis_wctomb, NULL })
3119 -
3120 -DEFENCODING(( "CP932",                  /* glibc */
3121 -            ),
3122 -            cp932,
3123 -            { cp932_mbtowc, NULL },       { cp932_wctomb, NULL })
3124 -
3125 -DEFENCODING(( "ISO-2022-JP",            /* IANA, RFC 1468 */
3126 -              "csISO2022JP",            /* IANA */
3127 -            /*"ISO2022JP",                 JDK 1.1 */
3128 -            ),
3129 -            iso2022_jp,
3130 -            { iso2022_jp_mbtowc, NULL },  { iso2022_jp_wctomb, iso2022_jp_reset })
3131 -
3132 -DEFENCODING(( "ISO-2022-JP-1",          /* RFC 2237 */
3133 -            ),
3134 -            iso2022_jp1,
3135 -            { iso2022_jp1_mbtowc, NULL }, { iso2022_jp1_wctomb, iso2022_jp1_reset })
3136 -
3137 -DEFENCODING(( "ISO-2022-JP-2",          /* IANA, RFC 1554 */
3138 -              "csISO2022JP2",           /* IANA */
3139 -            ),
3140 -            iso2022_jp2,
3141 -            { iso2022_jp2_mbtowc, NULL }, { iso2022_jp2_wctomb, iso2022_jp2_reset })
3142 -
3143 -DEFENCODING(( "EUC-CN",                 /* glibc */
3144 -              "EUCCN",                  /* glibc */
3145 -              "GB2312",                 /* IANA */
3146 -              "CN-GB",                  /* RFC 1922 */
3147 -              "csGB2312",               /* IANA */
3148 -            /*"EUC_CN",                    JDK 1.1 */
3149 -            /*"CP51936",                   Windows */
3150 -            ),
3151 -            euc_cn,
3152 -            { euc_cn_mbtowc, NULL },      { euc_cn_wctomb, NULL })
3153 -
3154 -DEFENCODING(( "GBK",                    /* IANA, JDK 1.1 */
3155 -            ),
3156 -            ces_gbk,
3157 -            { ces_gbk_mbtowc, NULL },     { ces_gbk_wctomb, NULL })
3158 -
3159 -DEFENCODING(( "CP936",                  /* IANA */
3160 -              "MS936",                  /* IANA */
3161 -              "WINDOWS-936",            /* IANA */
3162 -            ),
3163 -            cp936,
3164 -            { cp936_mbtowc, NULL },       { cp936_wctomb, NULL })
3165 -
3166 -DEFENCODING(( "GB18030",                /* IANA, glibc */
3167 -            /*"CP54936",                   Windows */
3168 -            ),
3169 -            gb18030,
3170 -            { gb18030_mbtowc, NULL },     { gb18030_wctomb, NULL })
3171 -
3172 -DEFENCODING(( "ISO-2022-CN",            /* IANA, RFC 1922 */
3173 -              "csISO2022CN",
3174 -            /*"ISO2022CN",                 JDK 1.1 */
3175 -            ),
3176 -            iso2022_cn,
3177 -            { iso2022_cn_mbtowc, NULL },  { iso2022_cn_wctomb, iso2022_cn_reset })
3178 -
3179 -DEFENCODING(( "ISO-2022-CN-EXT",        /* IANA, RFC 1922 */
3180 -            ),
3181 -            iso2022_cn_ext,
3182 -            { iso2022_cn_ext_mbtowc, NULL }, { iso2022_cn_ext_wctomb, iso2022_cn_ext_reset })
3183 -
3184 -DEFENCODING(( "HZ",                     /* RFC 1843 */
3185 -              "HZ-GB-2312",             /* IANA, RFC 1842 */
3186 -            ),
3187 -            hz,
3188 -            { hz_mbtowc, NULL },          { hz_wctomb, hz_reset })
3189 -
3190 -DEFENCODING(( "EUC-TW",                 /* glibc */
3191 -              "EUCTW",                  /* glibc */
3192 -              "csEUCTW",
3193 -            /*"EUC_TW",                    JDK 1.1 */
3194 -            /*"CP51950",                   Windows */
3195 -            ),
3196 -            euc_tw,
3197 -            { euc_tw_mbtowc, NULL },      { euc_tw_wctomb, NULL })
3198 -
3199 -DEFENCODING(( "BIG5",                   /* IANA, JDK 1.1 */
3200 -              "BIG-5",                  /* glibc */
3201 -              "BIG-FIVE",               /* glibc */
3202 -              "BIGFIVE",                /* glibc */
3203 -              "CN-BIG5",                /* RFC 1922 */
3204 -              "csBig5",                 /* IANA */
3205 -            ),
3206 -            ces_big5,
3207 -            { ces_big5_mbtowc, NULL },    { ces_big5_wctomb, NULL })
3208 -
3209 -DEFENCODING(( "CP950",                  /* JDK 1.1 */
3210 -            ),
3211 -            cp950,
3212 -            { cp950_mbtowc, NULL },       { cp950_wctomb, NULL })
3213 -
3214 -DEFENCODING(( "BIG5-HKSCS:1999",
3215 -            ),
3216 -            big5hkscs1999,
3217 -            { big5hkscs1999_mbtowc, big5hkscs1999_flushwc }, { big5hkscs1999_wctomb, big5hkscs1999_reset })
3218 -
3219 -DEFENCODING(( "BIG5-HKSCS:2001",
3220 -            ),
3221 -            big5hkscs2001,
3222 -            { big5hkscs2001_mbtowc, big5hkscs2001_flushwc }, { big5hkscs2001_wctomb, big5hkscs2001_reset })
3223 -
3224 -DEFENCODING(( "BIG5-HKSCS",             /* IANA */
3225 -              "BIG5HKSCS",              /* glibc */
3226 -              "BIG5-HKSCS:2004",
3227 -            ),
3228 -            big5hkscs2004,
3229 -            { big5hkscs2004_mbtowc, big5hkscs2004_flushwc }, { big5hkscs2004_wctomb, big5hkscs2004_reset })
3230 -
3231 -DEFENCODING(( "EUC-KR",                 /* IANA, RFC 1557 */
3232 -              "EUCKR",                  /* glibc */
3233 -              "csEUCKR",                /* IANA */
3234 -            /*"EUC_KR",                    JDK 1.1 */
3235 -            /*"CP51949",                   Windows */
3236 -            ),
3237 -            euc_kr,
3238 -            { euc_kr_mbtowc, NULL },      { euc_kr_wctomb, NULL })
3239 -
3240 -DEFENCODING(( "CP949",                  /* JDK 1.1 */
3241 -              "UHC",                    /* glibc */
3242 -            ),
3243 -            cp949,
3244 -            { cp949_mbtowc, NULL },       { cp949_wctomb, NULL })
3245 -
3246 -DEFENCODING(( "JOHAB",                  /* glibc */
3247 -              "CP1361",                 /* glibc */
3248 -            ),
3249 -            johab,
3250 -            { johab_mbtowc, NULL },       { johab_wctomb, NULL })
3251 -
3252 -DEFENCODING(( "ISO-2022-KR",            /* IANA, RFC 1557 */
3253 -              "csISO2022KR",            /* IANA */
3254 -            /*"ISO2022KR",                 JDK 1.1 */
3255 -            ),
3256 -            iso2022_kr,
3257 -            { iso2022_kr_mbtowc, NULL },  { iso2022_kr_wctomb, iso2022_kr_reset })
3258 -
3259 --- a/lib/encodings_dos.def
3260 +++ b/lib/encodings_dos.def
3261 @@ -26,102 +26,3 @@ DEFENCODING(( "CP437",
3262              cp437,
3263              { cp437_mbtowc, NULL },       { cp437_wctomb, NULL })
3264
3265 -DEFENCODING(( "CP737",                  /* JDK 1.1 */
3266 -            ),
3267 -            cp737,
3268 -            { cp737_mbtowc, NULL },       { cp737_wctomb, NULL })
3269 -
3270 -DEFENCODING(( "CP775",                  /* IANA, JDK 1.1 */
3271 -              "IBM775",                 /* IANA */
3272 -              "csPC775Baltic",          /* IANA */
3273 -            ),
3274 -            cp775,
3275 -            { cp775_mbtowc, NULL },       { cp775_wctomb, NULL })
3276 -
3277 -DEFENCODING(( "CP852",                  /* IANA, JDK 1.1 */
3278 -              "IBM852",                 /* IANA */
3279 -              "852",                    /* IANA */
3280 -              "csPCp852",               /* IANA */
3281 -            ),
3282 -            cp852,
3283 -            { cp852_mbtowc, NULL },       { cp852_wctomb, NULL })
3284 -
3285 -DEFENCODING(( "CP853",
3286 -            ),
3287 -            cp853,
3288 -            { cp853_mbtowc, NULL },       { cp853_wctomb, NULL })
3289 -
3290 -DEFENCODING(( "CP855",                  /* IANA, JDK 1.1 */
3291 -              "IBM855",                 /* IANA */
3292 -              "855",                    /* IANA */
3293 -              "csIBM855",               /* IANA */
3294 -            ),
3295 -            cp855,
3296 -            { cp855_mbtowc, NULL },       { cp855_wctomb, NULL })
3297 -
3298 -DEFENCODING(( "CP857",                  /* IANA, JDK 1.1 */
3299 -              "IBM857",                 /* IANA */
3300 -              "857",                    /* IANA */
3301 -              "csIBM857",               /* IANA */
3302 -            ),
3303 -            cp857,
3304 -            { cp857_mbtowc, NULL },       { cp857_wctomb, NULL })
3305 -
3306 -DEFENCODING(( "CP858",                  /* JDK 1.1.7 */
3307 -            ),
3308 -            cp858,
3309 -            { cp858_mbtowc, NULL },       { cp858_wctomb, NULL })
3310 -
3311 -DEFENCODING(( "CP860",                  /* IANA, JDK 1.1 */
3312 -              "IBM860",                 /* IANA */
3313 -              "860",                    /* IANA */
3314 -              "csIBM860",               /* IANA */
3315 -            ),
3316 -            cp860,
3317 -            { cp860_mbtowc, NULL },       { cp860_wctomb, NULL })
3318 -
3319 -DEFENCODING(( "CP861",                  /* IANA, JDK 1.1 */
3320 -              "IBM861",                 /* IANA */
3321 -              "861",                    /* IANA */
3322 -              "CP-IS",                  /* IANA */
3323 -              "csIBM861",               /* IANA */
3324 -            ),
3325 -            cp861,
3326 -            { cp861_mbtowc, NULL },       { cp861_wctomb, NULL })
3327 -
3328 -DEFENCODING(( "CP863",                  /* IANA, JDK 1.1 */
3329 -              "IBM863",                 /* IANA */
3330 -              "863",                    /* IANA */
3331 -              "csIBM863",               /* IANA */
3332 -            ),
3333 -            cp863,
3334 -            { cp863_mbtowc, NULL },       { cp863_wctomb, NULL })
3335 -
3336 -DEFENCODING(( "CP864",                  /* IANA, JDK 1.1 */
3337 -              "IBM864",                 /* IANA */
3338 -              "csIBM864",               /* IANA */
3339 -            ),
3340 -            cp864,
3341 -            { cp864_mbtowc, NULL },       { cp864_wctomb, NULL })
3342 -
3343 -DEFENCODING(( "CP865",                  /* IANA, JDK 1.1 */
3344 -              "IBM865",                 /* IANA */
3345 -              "865",                    /* IANA */
3346 -              "csIBM865",               /* IANA */
3347 -            ),
3348 -            cp865,
3349 -            { cp865_mbtowc, NULL },       { cp865_wctomb, NULL })
3350 -
3351 -DEFENCODING(( "CP869",                  /* IANA, JDK 1.1 */
3352 -              "IBM869",                 /* IANA */
3353 -              "869",                    /* IANA */
3354 -              "CP-GR",                  /* IANA */
3355 -              "csIBM869",               /* IANA */
3356 -            ),
3357 -            cp869,
3358 -            { cp869_mbtowc, NULL },       { cp869_wctomb, NULL })
3359 -
3360 -DEFENCODING(( "CP1125",                 /* ICU */
3361 -            ),
3362 -            cp1125,
3363 -            { cp1125_mbtowc, NULL },      { cp1125_wctomb, NULL })
3364 --- a/lib/loop_unicode.h
3365 +++ b/lib/loop_unicode.h
3366 @@ -24,14 +24,15 @@
3367  static int unicode_transliterate (conv_t cd, ucs4_t wc,
3368                                    unsigned char* outptr, size_t outleft)
3369  {
3370 +/*
3371    if (cd->oflags & HAVE_HANGUL_JAMO) {
3372 -    /* Decompose Hangul into Jamo. Use double-width Jamo (contained
3373 +    /-* Decompose Hangul into Jamo. Use double-width Jamo (contained
3374         in all Korean encodings and ISO-2022-JP-2), not half-width Jamo
3375 -       (contained in Unicode only). */
3376 +       (contained in Unicode only). *-/
3377      ucs4_t buf[3];
3378      int ret = johab_hangul_decompose(cd,buf,wc);
3379      if (ret != RET_ILUNI) {
3380 -      /* we know 1 <= ret <= 3 */
3381 +      /-* we know 1 <= ret <= 3 *-/
3382        state_t backup_state = cd->ostate;
3383        unsigned char* backup_outptr = outptr;
3384        size_t backup_outleft = outleft;
3385 @@ -57,9 +58,9 @@ static int unicode_transliterate (conv_t
3386      }
3387    }
3388    {
3389 -    /* Try to use a variant, but postfix it with
3390 +    /-* Try to use a variant, but postfix it with
3391         U+303E IDEOGRAPHIC VARIATION INDICATOR
3392 -       (cf. Ken Lunde's "CJKV information processing", p. 188). */
3393 +       (cf. Ken Lunde's "CJKV information processing", p. 188). *-/
3394      int indx = -1;
3395      if (wc == 0x3006)
3396        indx = 0;
3397 @@ -105,20 +106,20 @@ static int unicode_transliterate (conv_t
3398      }
3399    }
3400    if (wc >= 0x2018 && wc <= 0x201a) {
3401 -    /* Special case for quotation marks 0x2018, 0x2019, 0x201a */
3402 +    /-* Special case for quotation marks 0x2018, 0x2019, 0x201a *-/
3403      ucs4_t substitute =
3404        (cd->oflags & HAVE_QUOTATION_MARKS
3405         ? (wc == 0x201a ? 0x2018 : wc)
3406         : (cd->oflags & HAVE_ACCENTS
3407 -          ? (wc==0x2019 ? 0x00b4 : 0x0060) /* use accents */
3408 -          : 0x0027 /* use apostrophe */
3409 +          ? (wc==0x2019 ? 0x00b4 : 0x0060) /-* use accents *-/
3410 +          : 0x0027 /-* use apostrophe *-/
3411        )  );
3412      int outcount = cd->ofuncs.xxx_wctomb(cd,outptr,substitute,outleft);
3413      if (outcount != RET_ILUNI)
3414        return outcount;
3415    }
3416    {
3417 -    /* Use the transliteration table. */
3418 +    /-* Use the transliteration table. *-/
3419      int indx = translit_index(wc);
3420      if (indx >= 0) {
3421        const unsigned int * cp = &translit_data[indx];
3422 @@ -135,7 +136,7 @@ static int unicode_transliterate (conv_t
3423          }
3424          sub_outcount = cd->ofuncs.xxx_wctomb(cd,outptr,cp[i],outleft);
3425          if (sub_outcount == RET_ILUNI)
3426 -          /* Recursive transliteration. */
3427 +          /-* Recursive transliteration. *-/
3428            sub_outcount = unicode_transliterate(cd,cp[i],outptr,outleft);
3429          if (sub_outcount <= RET_ILUNI)
3430            goto translit_failed;
3431 @@ -151,6 +152,7 @@ static int unicode_transliterate (conv_t
3432          return RET_TOOSMALL;
3433      }
3434    }
3435 +*/
3436    return RET_ILUNI;
3437  }
3438