iApply patch 393791-sliceprint from Debian. - 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 e379c912ba622d04e90920f6748752b50097c1d1 /git/enscript/commit/e379c912ba622d04e90920f6748752b50097c1d1.gph thinkerwim.org 70 1parent 38d5193ad60577bddb3218f0c5d54798a48a6458 /git/enscript/commit/38d5193ad60577bddb3218f0c5d54798a48a6458.gph thinkerwim.org 70 hAuthor: Tim Retout URL:mailto:diocles@gnu.org thinkerwim.org 70 iDate: Sat, 9 Jul 2011 23:43:21 +0100 Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 iApply patch 393791-sliceprint from Debian. Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 iSigned-off-by: Tim Retout Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 iDiffstat: Err thinkerwim.openbsd.amsterdam 70 i M ChangeLog | 6 ++++++ Err thinkerwim.openbsd.amsterdam 70 i M scripts/sliceprint.1 | 6 +++--- Err thinkerwim.openbsd.amsterdam 70 i M scripts/sliceprint.in | 10 ++++++---- Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i3 files changed, 15 insertions(+), 7 deletions(-) Err thinkerwim.openbsd.amsterdam 70 i--- Err thinkerwim.openbsd.amsterdam 70 1diff --git a/ChangeLog b/ChangeLog /git/enscript/file/ChangeLog.gph thinkerwim.org 70 i@@ -1,5 +1,11 @@ Err thinkerwim.openbsd.amsterdam 70 i 2011-07-09 Tim Retout Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i+ Apply patch 393791-sliceprint from Debian: Err thinkerwim.openbsd.amsterdam 70 i+ * scripts/sliceprint.1: Complete documentation. Err thinkerwim.openbsd.amsterdam 70 i+ * scripts/sliceprint.in: Force C locale. Err thinkerwim.openbsd.amsterdam 70 i+ Use more liberal regexp when parsing wrapped lines message. Err thinkerwim.openbsd.amsterdam 70 i+ Add missing space from before args. Savannah bug #31259. Err thinkerwim.openbsd.amsterdam 70 i+ Err thinkerwim.openbsd.amsterdam 70 i * Makefile.am (SUBDIRS): Move intl to be built before compat. Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i * states/Makefile.am: Use $(datadir) instead of $(prefix)/share. Err thinkerwim.openbsd.amsterdam 70 1diff --git a/scripts/sliceprint.1 b/scripts/sliceprint.1 /git/enscript/file/scripts/sliceprint.1.gph thinkerwim.org 70 i@@ -23,12 +23,12 @@ Err thinkerwim.openbsd.amsterdam 70 i sliceprint \- slice documents with long lines. Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i .SH SYNOPSIS Err thinkerwim.openbsd.amsterdam 70 i-.B sliceprint \f1[\f2enscript_options\f1]\f3 \f1[\f2files\f1]\f3 Err thinkerwim.openbsd.amsterdam 70 i+.B sliceprint \f1[\-o\f2file\f1]\f3 \f1[\f2enscript_options\f1]\f3 \f1[\f2files\f1]\f3 Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i .SH DESCRIPTION Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i-XXX Err thinkerwim.openbsd.amsterdam 70 i- Err thinkerwim.openbsd.amsterdam 70 i+\f3Sliceprint\f1 is a wrapper around the \f3enscript(1)\f1\ \-\-slice option. Err thinkerwim.openbsd.amsterdam 70 i+Output slices are written to \f2file\f1.1, \f2file\f1.2 and so on. Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i .SH SEE ALSO Err thinkerwim.openbsd.amsterdam 70 i enscript(1) Err thinkerwim.openbsd.amsterdam 70 1diff --git a/scripts/sliceprint.in b/scripts/sliceprint.in /git/enscript/file/scripts/sliceprint.in.gph thinkerwim.org 70 i@@ -25,12 +25,13 @@ Err thinkerwim.openbsd.amsterdam 70 i # Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i $enscript = "enscript"; Err thinkerwim.openbsd.amsterdam 70 i+$ENV{LC_ALL} = "C"; # we parse enscript's output Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i $program = $0; Err thinkerwim.openbsd.amsterdam 70 i $program =~ s/.*\///g; Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i sub usage { Err thinkerwim.openbsd.amsterdam 70 i- warn "Usage: $program [ENSCRIPT_OPTION]... [FILE]...\n"; Err thinkerwim.openbsd.amsterdam 70 i+ warn "Usage: $program [-oFILE] [ENSCRIPT_OPTION]... [FILE]...\n"; Err thinkerwim.openbsd.amsterdam 70 i } Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i # Handle arguments. Err thinkerwim.openbsd.amsterdam 70 i@@ -65,14 +66,15 @@ $slice = 0; Err thinkerwim.openbsd.amsterdam 70 i while (1) { Err thinkerwim.openbsd.amsterdam 70 i $slice++; Err thinkerwim.openbsd.amsterdam 70 i if (defined($output_file)) { Err thinkerwim.openbsd.amsterdam 70 i- $cmd = "$enscript" . $args . " --slice=$slice -p" Err thinkerwim.openbsd.amsterdam 70 i+ $cmd = "$enscript " . $args . " --slice=$slice -p" Err thinkerwim.openbsd.amsterdam 70 i . $output_file . "." . $slice . " " . $files; Err thinkerwim.openbsd.amsterdam 70 i } else { Err thinkerwim.openbsd.amsterdam 70 i- $cmd = "$enscript" . $args . " --slice=$slice" . $files; Err thinkerwim.openbsd.amsterdam 70 i+ $cmd = "$enscript " . $args . " --slice=$slice" . $files; Err thinkerwim.openbsd.amsterdam 70 i } Err thinkerwim.openbsd.amsterdam 70 i print "printing slice $slice...\n"; Err thinkerwim.openbsd.amsterdam 70 i $result = `$cmd 2>&1`; Err thinkerwim.openbsd.amsterdam 70 i- if ($result !~ ".*lines were.*") { Err thinkerwim.openbsd.amsterdam 70 i+ print $result; Err thinkerwim.openbsd.amsterdam 70 i+ if ($result !~ ".*line.* were wrapped.*") { Err thinkerwim.openbsd.amsterdam 70 i last; Err thinkerwim.openbsd.amsterdam 70 i } Err thinkerwim.openbsd.amsterdam 70 i } Err thinkerwim.openbsd.amsterdam 70 .