Reinstate the DEPLANARISE macros, this time in what I believe is a

[sgt/charset] / mimeenc.c

diff --git a/mimeenc.c b/mimeenc.c
index 4f76e89..9916cf4 100644 (file)
--- a/mimeenc.c
+++ b/mimeenc.c
@@ -27,19 +27,26 @@ static const struct {
      * are marked with a comment saying WILD.
      */
 
+    { "US-ASCII", CS_ASCII },
     { "ANSI_X3.4-1968", CS_ASCII },
     { "iso-ir-6", CS_ASCII },
     { "ANSI_X3.4-1986", CS_ASCII },
     { "ISO_646.irv:1991", CS_ASCII },
     { "ASCII", CS_ASCII },
     { "ISO646-US", CS_ASCII },
-    { "US-ASCII", CS_ASCII },
     { "us", CS_ASCII },
     { "IBM367", CS_ASCII },
     { "cp367", CS_ASCII },
     { "csASCII", CS_ASCII },
     { "646", CS_ASCII },              /* WILD */
 
+    { "BS_4730", CS_BS4730 },
+    { "iso-ir-4", CS_BS4730 },
+    { "ISO646-GB", CS_BS4730 },
+    { "gb", CS_BS4730 },
+    { "uk", CS_BS4730 },
+    { "csISO4UnitedKingdom", CS_BS4730 },
+
     { "ISO-8859-1", CS_ISO8859_1 },
     { "ISO8859-1", CS_ISO8859_1 },     /* WILD */
     { "iso-ir-100", CS_ISO8859_1 },
@@ -132,6 +139,8 @@ static const struct {
     { "csISOLatin6", CS_ISO8859_10 },
     { "latin6", CS_ISO8859_10 },
 
+    { "TIS-620", CS_ISO8859_11 },
+
     { "ISO-8859-13", CS_ISO8859_13 },
     { "ISO8859-13", CS_ISO8859_13 },   /* WILD */
 
@@ -201,6 +210,10 @@ static const struct {
 
     { "KOI8-RU", CS_KOI8_RU },        /* WILD */
 
+    { "JIS_X0201", CS_JISX0201 },
+    { "X0201", CS_JISX0201 },
+    { "csHalfWidthKatakana", CS_JISX0201 },
+
     { "macintosh", CS_MAC_ROMAN_OLD },
     { "mac", CS_MAC_ROMAN_OLD },
     { "csMacintosh", CS_MAC_ROMAN_OLD },
@@ -246,10 +259,8 @@ static const struct {
 
     { "Big5", CS_BIG5 },
     { "csBig5", CS_BIG5 },
-    /* The following two names are not listed on the above web page, but
-     * I've seen them in the wild in real e-mail. */
-    { "Big-5", CS_BIG5 },
-    { "ChineseBig5", CS_BIG5 },
+    { "Big-5", CS_BIG5 },             /* WILD */
+    { "ChineseBig5", CS_BIG5 },               /* WILD */
 
     { "Shift_JIS", CS_SHIFT_JIS },
     { "MS_Kanji", CS_SHIFT_JIS },