cvsdist efcb472
--- a2ps-4.13/etc/a2ps-site.cfg.in.encoding	2000-01-15 23:39:36.000000000 +0000
cvsdist efcb472
+++ a2ps-4.13/etc/a2ps-site.cfg.in	2002-08-05 10:22:20.000000000 +0100
cvsdist 42af694
@@ -11,7 +11,7 @@
cvsdist 42af694
 #################################################################
cvsdist 42af694
 
cvsdist 42af694
 # Default encoding
cvsdist 42af694
-Options: --encoding=@ENCODING@
cvsdist 42af694
+#Options: --encoding=@ENCODING@
cvsdist 42af694
 
cvsdist 42af694
 # Default medium
cvsdist 42af694
 Options: --medium=@MEDIUM@
cvsdist efcb472
--- a2ps-4.13/src/main.c.encoding	2002-08-05 10:22:20.000000000 +0100
cvsdist efcb472
+++ a2ps-4.13/src/main.c	2002-08-05 10:22:20.000000000 +0100
cvsdist 42af694
@@ -32,6 +32,7 @@
cvsdist 42af694
 /************************************************************************/
cvsdist 42af694
 #include <assert.h>
cvsdist 42af694
 #include <string.h>
cvsdist 42af694
+#include <langinfo.h>
cvsdist 42af694
 #include <locale.h>
cvsdist 42af694
 
cvsdist 42af694
 #include "a2ps.h"
cvsdist 42af694
@@ -1021,9 +1022,8 @@
cvsdist 42af694
   sheets_map = sheets_map_new ();
cvsdist 42af694
   style_sheets = new_style_sheets ();
cvsdist 42af694
 
cvsdist 42af694
-  /* Process special case: Japanese Document */
cvsdist 42af694
-  if (! strncmp (locale, "ja", 2) )
cvsdist 42af694
-    job->requested_encoding_name = xstrdup ("euc-jp");
cvsdist 42af694
+  /* Use locale to set default encoding. */
cvsdist 42af694
+  job->requested_encoding_name = xstrdup (nl_langinfo (CODESET));
cvsdist 42af694
 
cvsdist 42af694
   /* Process the command line options. */
cvsdist 42af694
   argn = a2ps_handle_options (job, argc, argv);
cvsdist efcb472
--- a2ps-4.13/encoding/encoding.map.encoding	2002-08-05 10:22:20.000000000 +0100
cvsdist efcb472
+++ a2ps-4.13/encoding/encoding.map	2002-08-05 10:38:55.000000000 +0100
cvsdist 42af694
@@ -45,6 +45,7 @@
cvsdist 42af694
 latin1			iso1
cvsdist 42af694
 iso1			iso1
cvsdist 42af694
 iso-8859-1		iso1
cvsdist 42af694
+ansi_x3.4-1968		iso1
cvsdist 42af694
 
cvsdist 42af694
 latin2			iso2
cvsdist 42af694
 iso2			iso2
cvsdist efcb472
@@ -128,3 +129,6 @@
cvsdist efcb472
 # Apple' Macintosh
cvsdist efcb472
 mac			mac
cvsdist efcb472
 macintosh		mac
cvsdist efcb472
+
cvsdist efcb472
+# We don't handle UTF-8 at all yet.  Sometimes latin1 will work...
cvsdist efcb472
+utf-8			iso1