iFlexible encoding and support of locale paper size - enscript - GNU Enscript	Err	thinkerwim.openbsd.amsterdam	70
hgit clone git://thinkerwim.org/enscript.git	URL:git://thinkerwim.org/enscript.git	thinkerwim.org	70
1Log	/git/enscript/log.gph	thinkerwim.org	70
1Files	/git/enscript/files.gph	thinkerwim.org	70
1Refs	/git/enscript/refs.gph	thinkerwim.org	70
1README	/git/enscript/file/README.gph	thinkerwim.org	70
1LICENSE	/git/enscript/file/COPYING.gph	thinkerwim.org	70
i---	Err	thinkerwim.openbsd.amsterdam	70
1commit 3638fc4643436b27b4fd034416d77651a057fc42	/git/enscript/commit/3638fc4643436b27b4fd034416d77651a057fc42.gph	thinkerwim.org	70
1parent a356d343aa9db52b75432cde927b6f9bad6a7c44	/git/enscript/commit/a356d343aa9db52b75432cde927b6f9bad6a7c44.gph	thinkerwim.org	70
hAuthor: Werner Fink <werner@suse.de>	URL:mailto:werner@suse.de	thinkerwim.org	70
iDate:   Tue, 23 Jan 2018 15:26:47 +0100	Err	thinkerwim.openbsd.amsterdam	70
i	Err	thinkerwim.openbsd.amsterdam	70
iFlexible encoding and support of locale paper size	Err	thinkerwim.openbsd.amsterdam	70
i	Err	thinkerwim.openbsd.amsterdam	70
ias well paper size names known by ghostscript	Err	thinkerwim.openbsd.amsterdam	70
i	Err	thinkerwim.openbsd.amsterdam	70
iSigned-off-by: Werner Fink <werner@suse.de>	Err	thinkerwim.openbsd.amsterdam	70
iSigned-off-by: James Cloos <cloos@jhcloos.com>	Err	thinkerwim.openbsd.amsterdam	70
i	Err	thinkerwim.openbsd.amsterdam	70
iDiffstat:	Err	thinkerwim.openbsd.amsterdam	70
i  M configure.ac                        |      18 ++++++++++++++++++	Err	thinkerwim.openbsd.amsterdam	70
i  M lib/Makefile.am                     |       1 +	Err	thinkerwim.openbsd.amsterdam	70
i  M lib/enscript.cfg.in                 |      34 ++++++++++++++++++++++++++++++-	Err	thinkerwim.openbsd.amsterdam	70
i  M src/main.c                          |       6 ++++++	Err	thinkerwim.openbsd.amsterdam	70
i  M src/util.c                          |      10 ++++++++++	Err	thinkerwim.openbsd.amsterdam	70
i	Err	thinkerwim.openbsd.amsterdam	70
i5 files changed, 68 insertions(+), 1 deletion(-)	Err	thinkerwim.openbsd.amsterdam	70
i---	Err	thinkerwim.openbsd.amsterdam	70
1diff --git a/configure.ac b/configure.ac	/git/enscript/file/configure.ac.gph	thinkerwim.org	70
i@@ -65,6 +65,23 @@ AC_ARG_WITH(media,	Err	thinkerwim.openbsd.amsterdam	70
i MEDIA=$ac_cv_value_media	Err	thinkerwim.openbsd.amsterdam	70
i AC_SUBST(MEDIA)	Err	thinkerwim.openbsd.amsterdam	70
i 	Err	thinkerwim.openbsd.amsterdam	70
i+dnl Define the default input encoding.	Err	thinkerwim.openbsd.amsterdam	70
i+AC_ARG_WITH(encoding,	Err	thinkerwim.openbsd.amsterdam	70
i+[  --with-encoding(=ENCODING) use input encoding (ENCODING), default is latin1],	Err	thinkerwim.openbsd.amsterdam	70
i+  if test "X$withval" != "Xno"; then	Err	thinkerwim.openbsd.amsterdam	70
i+    if test "X$withval" = "Xyes"; then	Err	thinkerwim.openbsd.amsterdam	70
i+      ac_cv_value_encoding='latin1'	Err	thinkerwim.openbsd.amsterdam	70
i+    else	Err	thinkerwim.openbsd.amsterdam	70
i+      ac_cv_value_encoding=$withval	Err	thinkerwim.openbsd.amsterdam	70
i+    fi	Err	thinkerwim.openbsd.amsterdam	70
i+  else	Err	thinkerwim.openbsd.amsterdam	70
i+    ac_cv_value_encoding=${ENCODING-latin1}	Err	thinkerwim.openbsd.amsterdam	70
i+  fi,	Err	thinkerwim.openbsd.amsterdam	70
i+  ac_cv_value_encoding=${ENCODING-latin1}	Err	thinkerwim.openbsd.amsterdam	70
i+)	Err	thinkerwim.openbsd.amsterdam	70
i+ENCODING=$ac_cv_value_encoding	Err	thinkerwim.openbsd.amsterdam	70
i+AC_SUBST(ENCODING)	Err	thinkerwim.openbsd.amsterdam	70
i+	Err	thinkerwim.openbsd.amsterdam	70
i dnl Find the printer spooler command.	Err	thinkerwim.openbsd.amsterdam	70
i 	Err	thinkerwim.openbsd.amsterdam	70
i AC_CHECK_PROG(SPOOLER, lpr, lpr)	Err	thinkerwim.openbsd.amsterdam	70
i@@ -142,6 +159,7 @@ echo ""	Err	thinkerwim.openbsd.amsterdam	70
i echo "Option     Change with configure's option   Current value"	Err	thinkerwim.openbsd.amsterdam	70
i echo "---------------------------------------------------------"	Err	thinkerwim.openbsd.amsterdam	70
i echo "Media      --with-media=MEDIA               $MEDIA"	Err	thinkerwim.openbsd.amsterdam	70
i+echo "Encoding   --with-encoding=ENCODING         $ENCODING"	Err	thinkerwim.openbsd.amsterdam	70
i echo "Spooler    --with-spooler=SPOOLER           $SPOOLER"	Err	thinkerwim.openbsd.amsterdam	70
i echo "PS level   --with-ps-level=LEVEL            $PSLEVEL"	Err	thinkerwim.openbsd.amsterdam	70
i echo ""	Err	thinkerwim.openbsd.amsterdam	70
1diff --git a/lib/Makefile.am b/lib/Makefile.am	/git/enscript/file/lib/Makefile.am.gph	thinkerwim.org	70
i@@ -35,6 +35,7 @@ EXTRA_DIST = ChangeLog.old enscript.cfg.in $(pkgdata_DATA)        \	Err	thinkerwim.openbsd.amsterdam	70
i         Makefile-encodings make-encoding.pl	Err	thinkerwim.openbsd.amsterdam	70
i 	Err	thinkerwim.openbsd.amsterdam	70
i do_subst = sed -e 's%@DATADIR@%$(datadir)%g' \	Err	thinkerwim.openbsd.amsterdam	70
i+               -e 's%@encoding@%@ENCODING@%g' \	Err	thinkerwim.openbsd.amsterdam	70
i                -e 's%@media@%@MEDIA@%g' \	Err	thinkerwim.openbsd.amsterdam	70
i                -e 's%@BINDIR@%$(bindir)%g' \	Err	thinkerwim.openbsd.amsterdam	70
i                -e 's%@spooler@%@SPOOLER@%g' \	Err	thinkerwim.openbsd.amsterdam	70
1diff --git a/lib/enscript.cfg.in b/lib/enscript.cfg.in	/git/enscript/file/lib/enscript.cfg.in.gph	thinkerwim.org	70
i@@ -40,7 +40,7 @@ AppendCtrlD: 0	Err	thinkerwim.openbsd.amsterdam	70
i Clean7Bit: 1	Err	thinkerwim.openbsd.amsterdam	70
i 	Err	thinkerwim.openbsd.amsterdam	70
i # Default input encoding.	Err	thinkerwim.openbsd.amsterdam	70
i-DefaultEncoding: latin1	Err	thinkerwim.openbsd.amsterdam	70
i+DefaultEncoding: @encoding@	Err	thinkerwim.openbsd.amsterdam	70
i 	Err	thinkerwim.openbsd.amsterdam	70
i # Default fancy header.	Err	thinkerwim.openbsd.amsterdam	70
i DefaultFancyHeader: enscript	Err	thinkerwim.openbsd.amsterdam	70
i@@ -94,6 +94,38 @@ Media:  Letter                612        792        38        24        574        768	Err	thinkerwim.openbsd.amsterdam	70
i Media:        A4dj                595        842        24        50        571        818	Err	thinkerwim.openbsd.amsterdam	70
i Media:  Letterdj        612     792     24      40      588     768	Err	thinkerwim.openbsd.amsterdam	70
i 	Err	thinkerwim.openbsd.amsterdam	70
i+# Define ghostscript page names and their sizes	Err	thinkerwim.openbsd.amsterdam	70
i+Media:        letter                612        792        24        24        574        768	Err	thinkerwim.openbsd.amsterdam	70
i+Media:        note                540        720        24        24        516        696	Err	thinkerwim.openbsd.amsterdam	70
i+Media:        legal                612        1008        24        24        588        984	Err	thinkerwim.openbsd.amsterdam	70
i+Media:        a0                2380        3368        24        24        2356        3344	Err	thinkerwim.openbsd.amsterdam	70
i+Media:        a1                1684        2380        24        24        1660        2356	Err	thinkerwim.openbsd.amsterdam	70
i+Media:        a2                1190        1684        24        24        1166        1660	Err	thinkerwim.openbsd.amsterdam	70
i+Media:        a3                842        1190        24        24        818        1166	Err	thinkerwim.openbsd.amsterdam	70
i+Media:        a4                595        842        24        24        571        818	Err	thinkerwim.openbsd.amsterdam	70
i+Media:        a5                421        595        24        24        397        571	Err	thinkerwim.openbsd.amsterdam	70
i+Media:        a6                297        421        24        24        273        397	Err	thinkerwim.openbsd.amsterdam	70
i+Media:        a7                210        297        24        24        186        273	Err	thinkerwim.openbsd.amsterdam	70
i+Media:        a8                148        210        24        24        124        186	Err	thinkerwim.openbsd.amsterdam	70
i+Media:        a9                105        148        24        24        81        124	Err	thinkerwim.openbsd.amsterdam	70
i+Media:        a10                74        105        24        24        50        81	Err	thinkerwim.openbsd.amsterdam	70
i+Media:        b0                2836        4008        24        24        2812        3984	Err	thinkerwim.openbsd.amsterdam	70
i+Media:        b1                2004        2836        24        24        1980        2812	Err	thinkerwim.openbsd.amsterdam	70
i+Media:        b2                1418        2004        24        24        1394        1980	Err	thinkerwim.openbsd.amsterdam	70
i+Media:        b3                1002        1418        24        24        978        1394	Err	thinkerwim.openbsd.amsterdam	70
i+Media:        b4                709        1002        24        24        685        978	Err	thinkerwim.openbsd.amsterdam	70
i+Media:        b5                501        709        24        24        477        685	Err	thinkerwim.openbsd.amsterdam	70
i+Media:        archE                2592        3456        24        24        2568        3432	Err	thinkerwim.openbsd.amsterdam	70
i+Media:        archD                1728        2592        24        24        1704        2568	Err	thinkerwim.openbsd.amsterdam	70
i+Media:        archC                1296        1728        24        24        1272        1704	Err	thinkerwim.openbsd.amsterdam	70
i+Media:        archB                864        1296        24        24        840        1272	Err	thinkerwim.openbsd.amsterdam	70
i+Media:        archA                648        864        24        24        624        840	Err	thinkerwim.openbsd.amsterdam	70
i+Media:        flsa                612        936        24        24        588        912	Err	thinkerwim.openbsd.amsterdam	70
i+Media:        flse                612        936        24        24        588        912	Err	thinkerwim.openbsd.amsterdam	70
i+Media:        halfletter        396        612        24        24        372        588	Err	thinkerwim.openbsd.amsterdam	70
i+Media:        11x17                792        1224        24        24        768        1200	Err	thinkerwim.openbsd.amsterdam	70
i+Media:        ledger                1224        792        24        24        1200        768	Err	thinkerwim.openbsd.amsterdam	70
i+	Err	thinkerwim.openbsd.amsterdam	70
i # Spooler option to suppress the job header.	Err	thinkerwim.openbsd.amsterdam	70
i NoJobHeaderSwitch: -h	Err	thinkerwim.openbsd.amsterdam	70
i 	Err	thinkerwim.openbsd.amsterdam	70
1diff --git a/src/main.c b/src/main.c	/git/enscript/file/src/main.c.gph	thinkerwim.org	70
i@@ -24,6 +24,8 @@	Err	thinkerwim.openbsd.amsterdam	70
i 	Err	thinkerwim.openbsd.amsterdam	70
i #include "gsint.h"	Err	thinkerwim.openbsd.amsterdam	70
i #include "getopt.h"	Err	thinkerwim.openbsd.amsterdam	70
i+#include <locale.h>	Err	thinkerwim.openbsd.amsterdam	70
i+#include <limits.h>	Err	thinkerwim.openbsd.amsterdam	70
i 	Err	thinkerwim.openbsd.amsterdam	70
i /*	Err	thinkerwim.openbsd.amsterdam	70
i  * Prototypes for static functions.	Err	thinkerwim.openbsd.amsterdam	70
i@@ -957,6 +959,10 @@ main (int argc, char *argv[])	Err	thinkerwim.openbsd.amsterdam	70
i #if HAVE_LC_MESSAGES	Err	thinkerwim.openbsd.amsterdam	70
i   setlocale (LC_MESSAGES, "");	Err	thinkerwim.openbsd.amsterdam	70
i #endif	Err	thinkerwim.openbsd.amsterdam	70
i+  setlocale (LC_CTYPE, "");	Err	thinkerwim.openbsd.amsterdam	70
i+#ifdef LC_PAPER	Err	thinkerwim.openbsd.amsterdam	70
i+  setlocale (LC_PAPER, "");	Err	thinkerwim.openbsd.amsterdam	70
i+#endif	Err	thinkerwim.openbsd.amsterdam	70
i #endif	Err	thinkerwim.openbsd.amsterdam	70
i #if ENABLE_NLS	Err	thinkerwim.openbsd.amsterdam	70
i   bindtextdomain (PACKAGE, LOCALEDIR);	Err	thinkerwim.openbsd.amsterdam	70
1diff --git a/src/util.c b/src/util.c	/git/enscript/file/src/util.c.gph	thinkerwim.org	70
i@@ -171,6 +171,16 @@ read_config (char *path, char *file)	Err	thinkerwim.openbsd.amsterdam	70
i         {	Err	thinkerwim.openbsd.amsterdam	70
i           token2 = GET_TOKEN (NULL);	Err	thinkerwim.openbsd.amsterdam	70
i           CHECK_TOKEN ();	Err	thinkerwim.openbsd.amsterdam	70
i+#ifdef LC_PAPER	Err	thinkerwim.openbsd.amsterdam	70
i+          if (!strcasecmp("LC_PAPER", token2))	Err	thinkerwim.openbsd.amsterdam	70
i+            {	Err	thinkerwim.openbsd.amsterdam	70
i+              unsigned int paperheight = (unsigned int)nl_langinfo(_NL_PAPER_HEIGHT);	Err	thinkerwim.openbsd.amsterdam	70
i+              if (paperheight && paperheight == 279)	Err	thinkerwim.openbsd.amsterdam	70
i+                token2 = "letter";	Err	thinkerwim.openbsd.amsterdam	70
i+              else	Err	thinkerwim.openbsd.amsterdam	70
i+                token2 = "a4";	Err	thinkerwim.openbsd.amsterdam	70
i+            }	Err	thinkerwim.openbsd.amsterdam	70
i+#endif	Err	thinkerwim.openbsd.amsterdam	70
i           xfree (media_name);	Err	thinkerwim.openbsd.amsterdam	70
i           media_name = xstrdup (token2);	Err	thinkerwim.openbsd.amsterdam	70
i         }	Err	thinkerwim.openbsd.amsterdam	70
.