diff --git a/src/modules/_Charset/misc.c b/src/modules/_Charset/misc.c
index 6b6ec4980c2f420504b110075a1ee35d66210021..7c651a568090d3802cbfb73cc528688234df2aa5 100644
--- a/src/modules/_Charset/misc.c
+++ b/src/modules/_Charset/misc.c
@@ -1545,6 +1545,151 @@ p_wchar1 map_NC_NC00_10_81[] = {
   0x006c, 0x006d, 0x006e, 0x006f, 0x0070, 0x0071, 0x0072, 0x0073,
   0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007a, 0x00b4,
   0x00f1, 0x005b, 0x00a8, 0x007f, };
+p_wchar1 map_ANSI_X3_110_1983[] = {
+  0x0021, 0x0022, 0xfffd, 0xfffd, 0x0025, 0x0026, 0x0027, 0x0028,
+  0x0029, 0x002a, 0x002b, 0x002c, 0x002d, 0x002e, 0x002f, 0x0030,
+  0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038,
+  0x0039, 0x003a, 0x003b, 0x003c, 0x003d, 0x003e, 0x003f, 0x0040,
+  0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048,
+  0x0049, 0x004a, 0x004b, 0x004c, 0x004d, 0x004e, 0x004f, 0x0050,
+  0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058,
+  0x0059, 0x005a, 0x005b, 0x005c, 0x005d, 0x005e, 0x005f, 0x0060,
+  0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068,
+  0x0069, 0x006a, 0x006b, 0x006c, 0x006d, 0x006e, 0x006f, 0x0070,
+  0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078,
+  0x0079, 0x007a, 0x007b, 0x007c, 0x007d, 0x007e, 0x007f, 0x0080,
+  0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, 0x0088,
+  0x0089, 0x008a, 0x008b, 0x008c, 0x008d, 0x008e, 0x008f, 0x0090,
+  0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, 0x0098,
+  0x0099, 0x009a, 0x009b, 0x009c, 0x009d, 0x009e, 0x009f, 0x00a0,
+  0x00a1, 0x00a2, 0x00a3, 0x0024, 0x00a5, 0x0023, 0x00a7, 0x00a4,
+  0x2018, 0x201c, 0x00ab, 0x2190, 0x2191, 0x2192, 0x2193, 0x00b0,
+  0x00b1, 0x00b2, 0x00b3, 0x00d7, 0x00b5, 0x00b6, 0x00b7, 0x00f7,
+  0x2019, 0x201d, 0x00bb, 0x00bc, 0x00bd, 0x00be, 0x00bf, 0xfffd,
+  0xe006, 0xe007, 0xe008, 0xe009, 0xe00a, 0xe00b, 0xe00c, 0xe00d,
+  0xe015, 0xe00e, 0xe011, 0xe013, 0xe00f, 0xe012, 0xe010, 0x2014,
+  0x00b9, 0x00ae, 0x00a9, 0x2122, 0x2669, 0x2501, 0x2503, 0x2571,
+  0x2572, 0x25e2, 0x25e3, 0x215b, 0x215c, 0x215d, 0x215e, 0x2126,
+  0x00c6, 0x00d0, 0x00aa, 0x0126, 0x254b, 0x0132, 0x013f, 0x0141,
+  0x00d8, 0x0152, 0x00ba, 0x00de, 0x0166, 0x014a, 0x0149, 0x0138,
+  0x00e6, 0x0111, 0x00f0, 0x0127, 0x0131, 0x0133, 0x0140, 0x0142,
+  0x00f8, 0x0153, 0x00df, 0x00fe, 0x0167, 0x014b, 0xfffd, };
+p_wchar1 map_iso_ir_90[] = {
+  0x0021, 0x0022, 0x0023, 0x00a4, 0x0025, 0x0026, 0x0027, 0x0028,
+  0x0029, 0x002a, 0x002b, 0x002c, 0x002d, 0x002e, 0x002f, 0x0030,
+  0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038,
+  0x0039, 0x003a, 0x003b, 0x003c, 0x003d, 0x003e, 0x003f, 0x0040,
+  0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048,
+  0x0049, 0x004a, 0x004b, 0x004c, 0x004d, 0x004e, 0x004f, 0x0050,
+  0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058,
+  0x0059, 0x005a, 0x005b, 0x005c, 0x005d, 0x005e, 0x005f, 0x0060,
+  0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068,
+  0x0069, 0x006a, 0x006b, 0x006c, 0x006d, 0x006e, 0x006f, 0x0070,
+  0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078,
+  0x0079, 0x007a, 0x007b, 0x007c, 0x007d, 0x007e, 0x007f, 0x0080,
+  0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, 0x0088,
+  0x0089, 0x008a, 0x008b, 0x008c, 0x008d, 0x008e, 0x008f, 0x0090,
+  0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, 0x0098,
+  0x0099, 0x009a, 0x009b, 0x009c, 0x009d, 0x009e, 0x009f, 0x00a0,
+  0x00a1, 0x00a2, 0x00a3, 0x0024, 0x00a5, 0xfffd, 0x00a7, 0xfffd,
+  0x2018, 0x201c, 0x00ab, 0x2190, 0x2191, 0x2192, 0x2193, 0x00b0,
+  0x00b1, 0x00b2, 0x00b3, 0x00d7, 0x00b5, 0x00b6, 0x00b7, 0x00f7,
+  0x2019, 0x201d, 0x00bb, 0x00bc, 0x00bd, 0x00be, 0x00bf, 0xfffd,
+  0xe006, 0xe007, 0xe008, 0xe009, 0xe00a, 0xe00b, 0xe00c, 0xe00d,
+  0xfffd, 0xe00e, 0xe011, 0xe013, 0xe00f, 0xe012, 0xe010, 0x2014,
+  0x00b9, 0x00ae, 0x00a9, 0x2122, 0x2669, 0xfffd, 0xfffd, 0xfffd,
+  0xfffd, 0xfffd, 0xfffd, 0x215b, 0x215c, 0x215d, 0x215e, 0x2126,
+  0x00c6, 0x00d0, 0x00aa, 0x0126, 0xfffd, 0x0132, 0x013f, 0x0141,
+  0x00d8, 0x0152, 0x00ba, 0x00de, 0x0166, 0x014a, 0x0149, 0x0138,
+  0x00e6, 0x0111, 0x00f0, 0x0127, 0x0131, 0x0133, 0x0140, 0x0142,
+  0x00f8, 0x0153, 0x00df, 0x00fe, 0x0167, 0x014b, 0xfffd, };
+p_wchar1 map_T_101_G2[] = {
+  0x0021, 0x0022, 0xfffd, 0xfffd, 0x0025, 0x0026, 0x0027, 0x0028,
+  0x0029, 0x002a, 0x002b, 0x002c, 0x002d, 0x002e, 0x002f, 0x0030,
+  0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038,
+  0x0039, 0x003a, 0x003b, 0x003c, 0x003d, 0x003e, 0x003f, 0x0040,
+  0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048,
+  0x0049, 0x004a, 0x004b, 0x004c, 0x004d, 0x004e, 0x004f, 0x0050,
+  0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058,
+  0x0059, 0x005a, 0x005b, 0x005c, 0x005d, 0x005e, 0x005f, 0x0060,
+  0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068,
+  0x0069, 0x006a, 0x006b, 0x006c, 0x006d, 0x006e, 0x006f, 0x0070,
+  0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078,
+  0x0079, 0x007a, 0x007b, 0x007c, 0x007d, 0x007e, 0x007f, 0x0080,
+  0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, 0x0088,
+  0x0089, 0x008a, 0x008b, 0x008c, 0x008d, 0x008e, 0x008f, 0x0090,
+  0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, 0x0098,
+  0x0099, 0x009a, 0x009b, 0x009c, 0x009d, 0x009e, 0x009f, 0x00a0,
+  0x00a1, 0x00a2, 0x00a3, 0x0024, 0x00a5, 0x0023, 0x00a7, 0x00a4,
+  0x2018, 0x201c, 0x00ab, 0x2190, 0x2191, 0x2192, 0x2193, 0x00b0,
+  0x00b1, 0x00b2, 0x00b3, 0x00d7, 0x00b5, 0x00b6, 0x00b7, 0x00f7,
+  0x2019, 0x201d, 0x00bb, 0x00bc, 0x00bd, 0x00be, 0x00bf, 0xfffd,
+  0xe006, 0xe007, 0xe008, 0xe009, 0xe00a, 0xe00b, 0xe00c, 0xe00d,
+  0xe015, 0xe00e, 0xe011, 0xe013, 0xe00f, 0xe012, 0xe010, 0x2014,
+  0x00b9, 0x00ae, 0x00a9, 0x2122, 0x2669, 0x2501, 0x2503, 0x2571,
+  0x2572, 0x25e2, 0x25e3, 0x215b, 0x215c, 0x215d, 0x215e, 0x2126,
+  0x00c6, 0x00d0, 0x00aa, 0x0126, 0x254b, 0x0132, 0x013f, 0x0141,
+  0x00d8, 0x0152, 0x00ba, 0x00de, 0x0166, 0x014a, 0x0149, 0x0138,
+  0x00e6, 0x0111, 0x00f0, 0x0127, 0x0131, 0x0133, 0x0140, 0x0142,
+  0x00f8, 0x0153, 0x00df, 0x00fe, 0x0167, 0x014b, 0xfffd, };
+p_wchar1 map_T_61_8bit[] = {
+  0x0021, 0x0022, 0xfffd, 0xfffd, 0x0025, 0x0026, 0x0027, 0x0028,
+  0x0029, 0x002a, 0x002b, 0x002c, 0x002d, 0x002e, 0x002f, 0x0030,
+  0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038,
+  0x0039, 0x003a, 0x003b, 0x003c, 0x003d, 0x003e, 0x003f, 0x0040,
+  0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048,
+  0x0049, 0x004a, 0x004b, 0x004c, 0x004d, 0x004e, 0x004f, 0x0050,
+  0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058,
+  0x0059, 0x005a, 0x005b, 0xfffd, 0x005d, 0xfffd, 0x005f, 0xfffd,
+  0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068,
+  0x0069, 0x006a, 0x006b, 0x006c, 0x006d, 0x006e, 0x006f, 0x0070,
+  0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078,
+  0x0079, 0x007a, 0xfffd, 0x007c, 0xfffd, 0xfffd, 0x007f, 0x0080,
+  0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, 0x0088,
+  0x0089, 0x008a, 0x008b, 0x008c, 0x008d, 0x008e, 0x008f, 0x0090,
+  0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, 0x0098,
+  0x0099, 0x009a, 0x009b, 0x009c, 0x009d, 0x009e, 0x009f, 0x00a0,
+  0x00a1, 0x00a2, 0x00a3, 0x0024, 0x00a5, 0x0023, 0x00a7, 0x00a4,
+  0xfffd, 0xfffd, 0x00ab, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0x00b0,
+  0x00b1, 0x00b2, 0x00b3, 0x00d7, 0x00b5, 0x00b6, 0x00b7, 0x00f7,
+  0xfffd, 0xfffd, 0x00bb, 0x00bc, 0x00bd, 0x00be, 0x00bf, 0xfffd,
+  0xe006, 0xe007, 0xe008, 0xe009, 0xe00a, 0xe00b, 0xe00c, 0xe00d,
+  0xfffd, 0xe00e, 0xe011, 0xe013, 0xe00f, 0xe012, 0xe010, 0xfffd,
+  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
+  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0x2126,
+  0x00c6, 0x00d0, 0x00aa, 0x0126, 0xfffd, 0x0132, 0x013f, 0x0141,
+  0x00d8, 0x0152, 0x00ba, 0x00de, 0x0166, 0x014a, 0x0149, 0x0138,
+  0x00e6, 0x0111, 0x00f0, 0x0127, 0x0131, 0x0133, 0x0140, 0x0142,
+  0x00f8, 0x0153, 0x00df, 0x00fe, 0x0167, 0x014b, 0xfffd, };
+p_wchar1 map_videotex_suppl[] = {
+  0x0021, 0x0022, 0xfffd, 0xfffd, 0x0025, 0x0026, 0x0027, 0x0028,
+  0x0029, 0x002a, 0x002b, 0x002c, 0x002d, 0x002e, 0x002f, 0x0030,
+  0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038,
+  0x0039, 0x003a, 0x003b, 0x003c, 0x003d, 0x003e, 0x003f, 0x0040,
+  0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048,
+  0x0049, 0x004a, 0x004b, 0x004c, 0x004d, 0x004e, 0x004f, 0x0050,
+  0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058,
+  0x0059, 0x005a, 0x005b, 0x005c, 0x005d, 0x005e, 0x005f, 0x0060,
+  0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068,
+  0x0069, 0x006a, 0x006b, 0x006c, 0x006d, 0x006e, 0x006f, 0x0070,
+  0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078,
+  0x0079, 0x007a, 0x007b, 0x007c, 0x007d, 0x007e, 0x007f, 0x0080,
+  0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, 0x0088,
+  0x0089, 0x008a, 0x008b, 0x008c, 0x008d, 0x008e, 0x008f, 0x0090,
+  0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, 0x0098,
+  0x0099, 0x009a, 0x009b, 0x009c, 0x009d, 0x009e, 0x009f, 0x00a0,
+  0x00a1, 0x00a2, 0x00a3, 0x0024, 0x00a5, 0x0023, 0x00a7, 0x00a4,
+  0x2018, 0x201c, 0x00ab, 0x2190, 0x2191, 0x2192, 0x2193, 0x00b0,
+  0x00b1, 0x00b2, 0x00b3, 0x00d7, 0x00b5, 0x00b6, 0x00b7, 0x00f7,
+  0x2019, 0x201d, 0x00bb, 0x00bc, 0x00bd, 0x00be, 0x00bf, 0xe005,
+  0xe006, 0xe007, 0xe008, 0xe009, 0xe00a, 0xe00b, 0xe00c, 0xe00d,
+  0xfffd, 0xe00e, 0xe011, 0xfffd, 0xe00f, 0xe012, 0xe010, 0x2014,
+  0x00b9, 0x00ae, 0x00a9, 0x2122, 0x2669, 0xfffd, 0xfffd, 0xfffd,
+  0xfffd, 0xfffd, 0xfffd, 0x215b, 0x215c, 0x215d, 0x215e, 0x2126,
+  0x00c6, 0x00d0, 0x00aa, 0x0126, 0xfffd, 0x0132, 0x013f, 0x0141,
+  0x00d8, 0x0152, 0x00ba, 0x00de, 0x0166, 0x014a, 0x0149, 0x0138,
+  0x00e6, 0x0111, 0x00f0, 0x0127, 0x0131, 0x0133, 0x0140, 0x0142,
+  0x00f8, 0x0153, 0x00df, 0x00fe, 0x0167, 0x014b, 0xfffd, };
 
 static struct {
   char *name;
@@ -1564,6 +1709,7 @@ static struct {
   { "865", map_IBM865, 128, 255 },
   { "869", map_IBM869, 128, 255 },
   { "904", map_IBM904, 128, 255 },
+  { "ansi_x3.110-1983", map_ANSI_X3_110_1983, 33, 255 },
   { "cp-ar", map_IBM868, 128, 255 },
   { "cp-gr", map_IBM869, 128, 255 },
   { "cp-is", map_IBM861, 128, 255 },
@@ -1606,6 +1752,7 @@ static struct {
   { "cp904", map_IBM904, 128, 255 },
   { "cp905", map_IBM905, 32, 255 },
   { "cp918", map_IBM918, 32, 255 },
+  { "csa_t500-1983", map_ANSI_X3_110_1983, 33, 255 },
   { "cuba", map_NC_NC00_10_81, 36, 127 },
   { "dec", map_DEC_MCS, 160, 255 },
   { "dec-mcs", map_DEC_MCS, 160, 255 },
@@ -1698,10 +1845,15 @@ static struct {
   { "ibm905", map_IBM905, 32, 255 },
   { "ibm918", map_IBM918, 32, 255 },
   { "invariant", map_INVARIANT, 35, 127 },
+  { "iso-ir-103", map_T_61_8bit, 33, 255 },
+  { "iso-ir-128", map_T_101_G2, 33, 255 },
   { "iso-ir-150", map_greek_ccitt, 36, 127 },
   { "iso-ir-151", map_NC_NC00_10_81, 36, 127 },
   { "iso-ir-157", map_latin6, 161, 255 },
   { "iso-ir-158", map_latin_lap, 160, 255 },
+  { "iso-ir-70", map_videotex_suppl, 33, 255 },
+  { "iso-ir-90", map_iso_ir_90, 33, 255 },
+  { "iso-ir-99", map_ANSI_X3_110_1983, 33, 255 },
   { "iso646-cu", map_NC_NC00_10_81, 36, 127 },
   { "iso646-dk", map_DS_2089, 91, 127 },
   { "iso646-kr", map_KSC5636, 92, 127 },
@@ -1714,10 +1866,15 @@ static struct {
   { "latin6", map_latin6, 161, 255 },
   { "mac", map_macintosh, 128, 255 },
   { "macintosh", map_macintosh, 128, 255 },
+  { "naplps", map_ANSI_X3_110_1983, 33, 255 },
   { "nc_nc00-10:81", map_NC_NC00_10_81, 36, 127 },
   { "r8", map_hp_roman8, 161, 255 },
   { "ref", map_ISO_646_basic_1983, 35, 122 },
   { "roman8", map_hp_roman8, 161, 255 },
+  { "t.101-g2", map_T_101_G2, 33, 255 },
+  { "t.61", map_T_61_8bit, 33, 255 },
+  { "t.61-8bit", map_T_61_8bit, 33, 255 },
+  { "videotex-suppl", map_videotex_suppl, 33, 255 },
   { "x0201", map_JIS_X0201, 92, 255 },
 };
 #define NUM_CHARSETS (sizeof(charset_map)/sizeof(charset_map[0]))
diff --git a/src/modules/_Charset/tables.c b/src/modules/_Charset/tables.c
index 55240ad89416595058671a3ac2f237465bd3adcf..d589c3e8220e1e9a11c306ee306b6f230d1cec0d 100644
--- a/src/modules/_Charset/tables.c
+++ b/src/modules/_Charset/tables.c
@@ -1,5 +1,11 @@
 #include "iso2022.h"
 
+extern UNICHAR map_ANSI_X3_110_1983[];
+extern UNICHAR map_T_61_8bit[];
+extern UNICHAR map_T_101_G2[];
+extern UNICHAR map_iso_ir_90[];
+extern UNICHAR map_videotex_suppl[];
+
 UNICHAR map_ISO_646_irv_1983[] = {
   0x0021, 0x0022, 0x0023, 0x00a4, 0x0025, 0x0026, 0x0027, 0x0028,
   0x0029, 0x002a, 0x002b, 0x002c, 0x002d, 0x002e, 0x002f, 0x0030,
@@ -377,19 +383,6 @@ UNICHAR map_NS_4551_2[] = {
   0x0069, 0x006a, 0x006b, 0x006c, 0x006d, 0x006e, 0x006f, 0x0070,
   0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078,
   0x0079, 0x007a, 0x00e6, 0x00f8, 0x00e5, 0x007c, };
-UNICHAR map_videotex_suppl[] = {
-  0x0021, 0x0022, 0xfffd, 0xfffd, 0x0025, 0x0026, 0x0027, 0x0028,
-  0x0029, 0x002a, 0x002b, 0x002c, 0x002d, 0x002e, 0x002f, 0x0030,
-  0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038,
-  0x0039, 0x003a, 0x003b, 0x003c, 0x003d, 0x003e, 0x003f, 0x0040,
-  0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048,
-  0x0049, 0x004a, 0x004b, 0x004c, 0x004d, 0x004e, 0x004f, 0x0050,
-  0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058,
-  0x0059, 0x005a, 0x005b, 0x005c, 0x005d, 0x005e, 0x005f, 0x0060,
-  0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068,
-  0x0069, 0x006a, 0x006b, 0x006c, 0x006d, 0x006e, 0x006f, 0x0070,
-  0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078,
-  0x0079, 0x007a, 0x007b, 0x007c, 0x007d, 0x007e, };
 UNICHAR map_NF_Z_62_010[] = {
   0x0021, 0x0022, 0x00a3, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028,
   0x0029, 0x002a, 0x002b, 0x002c, 0x002d, 0x002e, 0x002f, 0x0030,
@@ -468,19 +461,6 @@ UNICHAR map_ASMO_449[] = {
   0x0649, 0x064a, 0x064b, 0x064c, 0x064d, 0x064e, 0x064f, 0x0650,
   0x0651, 0x0652, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
   0xfffd, 0xfffd, 0x007b, 0x007c, 0x007d, 0x007e, };
-UNICHAR map_iso_ir_90[] = {
-  0x0021, 0x0022, 0x0023, 0x00a4, 0x0025, 0x0026, 0x0027, 0x0028,
-  0x0029, 0x002a, 0x002b, 0x002c, 0x002d, 0x002e, 0x002f, 0x0030,
-  0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038,
-  0x0039, 0x003a, 0x003b, 0x003c, 0x003d, 0x003e, 0x003f, 0x0040,
-  0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048,
-  0x0049, 0x004a, 0x004b, 0x004c, 0x004d, 0x004e, 0x004f, 0x0050,
-  0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058,
-  0x0059, 0x005a, 0x005b, 0x005c, 0x005d, 0x005e, 0x005f, 0x0060,
-  0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068,
-  0x0069, 0x006a, 0x006b, 0x006c, 0x006d, 0x006e, 0x006f, 0x0070,
-  0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078,
-  0x0079, 0x007a, 0x007b, 0x007c, 0x007d, 0x007e, };
 UNICHAR map_JIS_C6229_1984_a[] = {
   0xfffd, 0x0022, 0x00a3, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028,
   0x0029, 0x002a, 0x002b, 0x002c, 0x002d, 0x002e, 0x002f, 0x0030,
@@ -572,19 +552,6 @@ UNICHAR map_ISO_2033_1983[] = {
   0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
   0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
   0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, };
-UNICHAR map_ANSI_X3_110_1983[] = {
-  0x0021, 0x0022, 0xfffd, 0xfffd, 0x0025, 0x0026, 0x0027, 0x0028,
-  0x0029, 0x002a, 0x002b, 0x002c, 0x002d, 0x002e, 0x002f, 0x0030,
-  0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038,
-  0x0039, 0x003a, 0x003b, 0x003c, 0x003d, 0x003e, 0x003f, 0x0040,
-  0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048,
-  0x0049, 0x004a, 0x004b, 0x004c, 0x004d, 0x004e, 0x004f, 0x0050,
-  0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058,
-  0x0059, 0x005a, 0x005b, 0x005c, 0x005d, 0x005e, 0x005f, 0x0060,
-  0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068,
-  0x0069, 0x006a, 0x006b, 0x006c, 0x006d, 0x006e, 0x006f, 0x0070,
-  0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078,
-  0x0079, 0x007a, 0x007b, 0x007c, 0x007d, 0x007e, };
 UNICHAR map_T_61_7bit[] = {
   0x0021, 0x0022, 0x0023, 0x00a4, 0x0025, 0x0026, 0x0027, 0x0028,
   0x0029, 0x002a, 0x002b, 0x002c, 0x002d, 0x002e, 0x002f, 0x0030,
@@ -598,19 +565,6 @@ UNICHAR map_T_61_7bit[] = {
   0x0069, 0x006a, 0x006b, 0x006c, 0x006d, 0x006e, 0x006f, 0x0070,
   0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078,
   0x0079, 0x007a, 0xfffd, 0x007c, 0xfffd, 0xfffd, };
-UNICHAR map_T_61_8bit[] = {
-  0x0021, 0x0022, 0xfffd, 0xfffd, 0x0025, 0x0026, 0x0027, 0x0028,
-  0x0029, 0x002a, 0x002b, 0x002c, 0x002d, 0x002e, 0x002f, 0x0030,
-  0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038,
-  0x0039, 0x003a, 0x003b, 0x003c, 0x003d, 0x003e, 0x003f, 0x0040,
-  0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048,
-  0x0049, 0x004a, 0x004b, 0x004c, 0x004d, 0x004e, 0x004f, 0x0050,
-  0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058,
-  0x0059, 0x005a, 0x005b, 0xfffd, 0x005d, 0xfffd, 0x005f, 0xfffd,
-  0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068,
-  0x0069, 0x006a, 0x006b, 0x006c, 0x006d, 0x006e, 0x006f, 0x0070,
-  0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078,
-  0x0079, 0x007a, 0xfffd, 0x007c, 0xfffd, 0xfffd, };
 UNICHAR map_CSA_Z243_4_1985_1[] = {
   0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028,
   0x0029, 0x002a, 0x002b, 0x002c, 0x002d, 0x002e, 0x002f, 0x0030,
@@ -663,19 +617,6 @@ UNICHAR map_JUS_I_B1_003_serb[] = {
   0x0438, 0x0458, 0x043a, 0x043b, 0x043c, 0x043d, 0x043e, 0x043f,
   0x0459, 0x0440, 0x0441, 0x0442, 0x0443, 0x0432, 0x045a, 0x045f,
   0x0455, 0x0437, 0x0448, 0x0452, 0x045b, 0x0447, };
-UNICHAR map_T_101_G2[] = {
-  0x0021, 0x0022, 0xfffd, 0xfffd, 0x0025, 0x0026, 0x0027, 0x0028,
-  0x0029, 0x002a, 0x002b, 0x002c, 0x002d, 0x002e, 0x002f, 0x0030,
-  0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038,
-  0x0039, 0x003a, 0x003b, 0x003c, 0x003d, 0x003e, 0x003f, 0x0040,
-  0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048,
-  0x0049, 0x004a, 0x004b, 0x004c, 0x004d, 0x004e, 0x004f, 0x0050,
-  0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058,
-  0x0059, 0x005a, 0x005b, 0x005c, 0x005d, 0x005e, 0x005f, 0x0060,
-  0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068,
-  0x0069, 0x006a, 0x006b, 0x006c, 0x006d, 0x006e, 0x006f, 0x0070,
-  0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078,
-  0x0079, 0x007a, 0x007b, 0x007c, 0x007d, 0x007e, };
 UNICHAR map_JUS_I_B1_003_mac[] = {
   0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028,
   0x0029, 0x002a, 0x002b, 0x002c, 0x002d, 0x002e, 0x002f, 0x0030,
@@ -6506,7 +6447,6 @@ UNICHAR *iso2022_9696[] = {
   NULL, NULL, NULL, NULL, 
   NULL, NULL, NULL, NULL };
 struct charset_def charset_map[] = {
-  { "ansi_x3.110-1983", map_ANSI_X3_110_1983, MODE_94 },
   { "ansi_x3.4-1968", map_ANSI_X3_4_1968, MODE_94 },
   { "ansi_x3.4-1986", map_ANSI_X3_4_1968, MODE_94 },
   { "arabic", map_ISO_8859_6_1987, MODE_96 },
@@ -6523,7 +6463,6 @@ struct charset_def charset_map[] = {
   { "cp819", map_ISO_8859_1_1987, MODE_96 },
   { "csa7-1", map_CSA_Z243_4_1985_1, MODE_94 },
   { "csa7-2", map_CSA_Z243_4_1985_2, MODE_94 },
-  { "csa_t500-1983", map_ANSI_X3_110_1983, MODE_94 },
   { "csa_z243.4-1985-1", map_CSA_Z243_4_1985_1, MODE_94 },
   { "csa_z243.4-1985-2", map_CSA_Z243_4_1985_2, MODE_94 },
   { "csa_z243.4-1985-gr", map_CSA_Z243_4_1985_gr, MODE_96 },
@@ -6570,7 +6509,6 @@ struct charset_def charset_map[] = {
   { "iso-ir-100", map_ISO_8859_1_1987, MODE_96 },
   { "iso-ir-101", map_ISO_8859_2_1987, MODE_96 },
   { "iso-ir-102", map_T_61_7bit, MODE_94 },
-  { "iso-ir-103", map_T_61_8bit, MODE_94 },
   { "iso-ir-109", map_ISO_8859_3_1988, MODE_96 },
   { "iso-ir-11", map_SEN_850200_C, MODE_94 },
   { "iso-ir-110", map_ISO_8859_4_1988, MODE_96 },
@@ -6580,7 +6518,6 @@ struct charset_def charset_map[] = {
   { "iso-ir-123", map_CSA_Z243_4_1985_gr, MODE_96 },
   { "iso-ir-126", map_ISO_8859_7_1987, MODE_96 },
   { "iso-ir-127", map_ISO_8859_6_1987, MODE_96 },
-  { "iso-ir-128", map_T_101_G2, MODE_94 },
   { "iso-ir-13", map_JIS_C6220_1969_jp, MODE_94 },
   { "iso-ir-138", map_ISO_8859_8_1988, MODE_96 },
   { "iso-ir-139", map_CSN_369103, MODE_96 },
@@ -6622,7 +6559,6 @@ struct charset_def charset_map[] = {
   { "iso-ir-60", map_NS_4551_1, MODE_94 },
   { "iso-ir-61", map_NS_4551_2, MODE_94 },
   { "iso-ir-69", map_NF_Z_62_010, MODE_94 },
-  { "iso-ir-70", map_videotex_suppl, MODE_94 },
   { "iso-ir-8-1", map_NATS_SEFI, MODE_94 },
   { "iso-ir-8-2", map_NATS_SEFI_ADD, MODE_94 },
   { "iso-ir-84", map_PT2, MODE_94 },
@@ -6633,7 +6569,6 @@ struct charset_def charset_map[] = {
   { "iso-ir-89", map_ASMO_449, MODE_94 },
   { "iso-ir-9-1", map_NATS_DANO, MODE_94 },
   { "iso-ir-9-2", map_NATS_DANO_ADD, MODE_94 },
-  { "iso-ir-90", map_iso_ir_90, MODE_94 },
   { "iso-ir-91", map_JIS_C6229_1984_a, MODE_94 },
   { "iso-ir-92", map_JIS_C6229_1984_b, MODE_94 },
   { "iso-ir-93", map_JIS_C6229_1984_b_add, MODE_94 },
@@ -6641,7 +6576,6 @@ struct charset_def charset_map[] = {
   { "iso-ir-95", map_JIS_C6229_1984_hand_add, MODE_94 },
   { "iso-ir-96", map_JIS_C6229_1984_kana, MODE_94 },
   { "iso-ir-98", map_ISO_2033_1983, MODE_94 },
-  { "iso-ir-99", map_ANSI_X3_110_1983, MODE_94 },
   { "iso646-ca", map_CSA_Z243_4_1985_1, MODE_94 },
   { "iso646-ca2", map_CSA_Z243_4_1985_2, MODE_94 },
   { "iso646-cn", map_GB_1988_80, MODE_94 },
@@ -6737,7 +6671,6 @@ struct charset_def charset_map[] = {
   { "latin5", map_ISO_8859_9_1989, MODE_96 },
   { "macedonian", map_JUS_I_B1_003_mac, MODE_94 },
   { "msz_7795.3", map_MSZ_7795_3, MODE_94 },
-  { "naplps", map_ANSI_X3_110_1983, MODE_94 },
   { "nats-dano", map_NATS_DANO, MODE_94 },
   { "nats-dano-add", map_NATS_DANO_ADD, MODE_94 },
   { "nats-sefi", map_NATS_SEFI, MODE_94 },
@@ -6756,14 +6689,10 @@ struct charset_def charset_map[] = {
   { "sen_850200_c", map_SEN_850200_C, MODE_94 },
   { "serbian", map_JUS_I_B1_003_serb, MODE_94 },
   { "st_sev_358-88", map_GOST_19768_74, MODE_96 },
-  { "t.101-g2", map_T_101_G2, MODE_94 },
-  { "t.61", map_T_61_8bit, MODE_94 },
   { "t.61-7bit", map_T_61_7bit, MODE_94 },
-  { "t.61-8bit", map_T_61_8bit, MODE_94 },
   { "uk", map_BS_4730, MODE_94 },
   { "us", map_ANSI_X3_4_1968, MODE_94 },
   { "us-ascii", map_ANSI_X3_4_1968, MODE_94 },
-  { "videotex-suppl", map_videotex_suppl, MODE_94 },
   { "x0201-7", map_JIS_C6220_1969_jp, MODE_94 },
   { "x0208", map_JIS_C6226_1983, MODE_9494 },
   { "x0212", map_JIS_X0212_1990, MODE_9494 },