Add a `--list-charsets' option to Halibut to enumerate canonical names of known

character sets.

(Also make libcharset `return_in_enum' values saner.)

git-svn-id: svn://svn.tartarus.org/sgt/charset@5341 cda61777-01e9-0310-a592-d414129be87e

diff --git a/localenc.c b/localenc.c
index b620c66..95b540c 100644 (file)
--- a/localenc.c
+++ b/localenc.c
@@ -47,30 +47,30 @@ static const struct {
     { "CP437", CS_CP437, 1 },
     { "CP850", CS_CP850, 1 },
     { "CP1250", CS_CP1250, 1 },
-    { "Win1250", CS_CP1250, 1 },
+    { "Win1250", CS_CP1250, 0 },
     { "CP1251", CS_CP1251, 1 },
-    { "Win1251", CS_CP1251, 1 },
+    { "Win1251", CS_CP1251, 0 },
     { "CP1252", CS_CP1252, 1 },
-    { "Win1252", CS_CP1252, 1 },
+    { "Win1252", CS_CP1252, 0 },
     { "CP1253", CS_CP1253, 1 },
-    { "Win1253", CS_CP1253, 1 },
+    { "Win1253", CS_CP1253, 0 },
     { "CP1254", CS_CP1254, 1 },
-    { "Win1254", CS_CP1254, 1 },
+    { "Win1254", CS_CP1254, 0 },
     { "CP1255", CS_CP1255, 1 },
-    { "Win1255", CS_CP1255, 1 },
+    { "Win1255", CS_CP1255, 0 },
     { "CP1256", CS_CP1256, 1 },
-    { "Win1256", CS_CP1256, 1 },
+    { "Win1256", CS_CP1256, 0 },
     { "CP1257", CS_CP1257, 1 },
-    { "Win1257", CS_CP1257, 1 },
+    { "Win1257", CS_CP1257, 0 },
     { "CP1258", CS_CP1258, 1 },
-    { "Win1258", CS_CP1258, 1 },
+    { "Win1258", CS_CP1258, 0 },
     { "KOI8-R", CS_KOI8_R, 1 },
     { "KOI8-U", CS_KOI8_U, 1 },
     { "KOI8-RU", CS_KOI8_RU, 1 },
     { "JIS X 0201", CS_JISX0201, 1 },
-    { "JIS-X-0201", CS_JISX0201, 1 },
-    { "JIS_X_0201", CS_JISX0201, 1 },
-    { "JISX0201", CS_JISX0201, 1 },
+    { "JIS-X-0201", CS_JISX0201, 0 },
+    { "JIS_X_0201", CS_JISX0201, 0 },
+    { "JISX0201", CS_JISX0201, 0 },
     { "Mac Roman", CS_MAC_ROMAN, 1 },
     { "Mac Turkish", CS_MAC_TURKISH, 1 },
     { "Mac Croatian", CS_MAC_CROATIAN, 1 },
@@ -111,10 +111,10 @@ static const struct {
     { "CP949", CS_CP949, 1 },
     { "PDFDocEncoding", CS_PDF, 1 },
     { "COMPOUND_TEXT", CS_CTEXT, 1 },
-    { "COMPOUND-TEXT", CS_CTEXT, 1 },
-    { "COMPOUND TEXT", CS_CTEXT, 1 },
-    { "COMPOUNDTEXT", CS_CTEXT, 1 },
-    { "CTEXT", CS_CTEXT, 1 },
+    { "COMPOUND-TEXT", CS_CTEXT, 0 },
+    { "COMPOUND TEXT", CS_CTEXT, 0 },
+    { "COMPOUNDTEXT", CS_CTEXT, 0 },
+    { "CTEXT", CS_CTEXT, 0 },
 };
 
 const char *charset_to_localenc(int charset)