e607f40fd0
2189133 - a2ps: FTBFS in rawhide, 64-bit and C99 compatibility issues 2176254 - a2ps-4.15.5 is available SPDX migration done
54 lines
1.4 KiB
Diff
54 lines
1.4 KiB
Diff
diff --git a/encoding/encoding.map b/encoding/encoding.map
|
|
index 926749e..7eb3873 100644
|
|
--- a/encoding/encoding.map
|
|
+++ b/encoding/encoding.map
|
|
@@ -45,6 +45,7 @@ us-ascii ascii
|
|
latin1 iso1
|
|
iso1 iso1
|
|
iso-8859-1 iso1
|
|
+ansi_x3.4-1968 iso1
|
|
|
|
latin2 iso2
|
|
iso2 iso2
|
|
@@ -142,3 +143,6 @@ hp8 hp
|
|
# Apple' Macintosh
|
|
mac mac
|
|
macintosh mac
|
|
+
|
|
+# We don't handle UTF-8 at all yet. Sometimes latin1 will work...
|
|
+utf-8 iso1
|
|
diff --git a/etc/a2ps-site.cfg.in b/etc/a2ps-site.cfg.in
|
|
index 2bbcddd..f9f699d 100644
|
|
--- a/etc/a2ps-site.cfg.in
|
|
+++ b/etc/a2ps-site.cfg.in
|
|
@@ -11,7 +11,7 @@
|
|
#################################################################
|
|
|
|
# Default encoding
|
|
-Options: --encoding=@ENCODING@
|
|
+#Options: --encoding=@ENCODING@
|
|
|
|
#################################################################
|
|
# 2) Your printers #
|
|
diff --git a/src/main.c b/src/main.c
|
|
index 32699ce..b015fb0 100644
|
|
--- a/src/main.c
|
|
+++ b/src/main.c
|
|
@@ -25,6 +25,7 @@
|
|
#include <config.h>
|
|
|
|
#include <signal.h>
|
|
+#include <langinfo.h>
|
|
#include <locale.h>
|
|
|
|
#include "a2ps.h"
|
|
@@ -989,6 +990,9 @@ main (int argc, char *argv[])
|
|
sheets_map = sheets_map_new ();
|
|
style_sheets = new_style_sheets ();
|
|
|
|
+ /* Use locale to set default encoding. */
|
|
+ job->requested_encoding_name = xstrdup (nl_langinfo (CODESET));
|
|
+
|
|
/* Process the command line options. */
|
|
argn = a2ps_handle_options (job, argc, argv);
|
|
switch (behavior) {
|