pdfjam update (13may10)

git-svn-id: svn://tug.org/texlive/trunk@18257 c570f23f-e606-0410-a88d-b1316a301751

17 files changed, 29 insertions, 20 deletions

diff --git a/Master/texmf-dist/doc/latex/pdfjam/PDFjam-README.html b/Master/texmf-dist/doc/latex/pdfjam/PDFjam-README.html
index 14de2cd43f6..8b15d755cca 100644
--- a/Master/texmf-dist/doc/latex/pdfjam/PDFjam-README.html
+++ b/Master/texmf-dist/doc/latex/pdfjam/PDFjam-README.html
@@ -82,9 +82,11 @@
 
 <a name="download"></a> <h2 align="justify">Download</h2>
 
-<p>PDFjam is a project at <a href="http://freshmeat.net/projects/pdfjam/">freshmeat</a>: please subscribe there to receive update announcements. <a name="install"></a>Download the shell scripts as <a href="http://www2.warwick.ac.uk/fac/sci/statistics/staff/academic/firth/software/pdfjam/pdfjam_latest.tgz">pdfjam_latest.tgz</a>. </p>
+<p>PDFjam is a project at <a href="http://freshmeat.net/projects/pdfjam/">freshmeat</a>: please subscribe there to receive update announcements.</p>
 
-<p>(If for some reason you don't want the latest version, you can still get older versions. Since version 2.00 the URLs are all of the form <tt>http://go.warwick.ac.uk/pdfjam/pdfjam_VN.tgz</tt>, with &quot;VN&quot; representing the version number. So &quot;VN&quot; could be 2.00, 2.01, 2.02, 2.03 or 2.04; from PDFjam version 2.05 onwards, the dot will be omitted from the file name, so &quot;VN&quot; will be 205, 206, etc.)</p>
+<p>Download the shell scripts as <a href="http://www2.warwick.ac.uk/fac/sci/statistics/staff/academic/firth/software/pdfjam/pdfjam_latest.tgz">pdfjam_latest.tgz</a>. </p>
+
+<p>(If for some reason you don't want the latest version, you can still get older versions. Since version 2.00 the URLs are all of the form <tt>http://go.warwick.ac.uk/pdfjam/pdfjam_VN.tgz</tt>, with &quot;VN&quot; representing the version number. So &quot;VN&quot; could be 2.00, 2.01, 2.02, 2.03 or 2.04; from PDFjam version 2.05 onwards, the dot will be omitted from the version number in the file name, so &quot;VN&quot; will be 205, 206, etc.)</p>
 
 <p>Various people have kindly packaged PDFjam for distribution in other ways (and perhaps there are some not listed here?): </p>
 
@@ -93,7 +95,8 @@
   <li>Paul Chvostek has made a <a href="http://www.freebsd.org/cgi/ports.cgi?query=pdfjam">port to FreeBSD</a> </li>
   <li>Pander has provided a link to <a href="http://packages.ubuntu.com/search?keywords=pdfjam">Ubuntu packages</a> </li>
   <li>Petr Uzel has made available <a href="http://software.opensuse.org/search?baseproject=ALL&amp;p=1&amp;q=pdfjam">openSUSE packages</a> </li>
-  <li>Karl Berry has kindly provided a <a href="http://mirror.ctan.org/support/pdfjam">CTAN package</a>.</li>
+  <li>Alexis Ballier has provided a <a href="http://packages.gentoo.org/package/app-text/pdfjam">Gentoo package</a> </li>
+  <li>Karl Berry has provided a <a href="http://mirror.ctan.org/support/pdfjam">CTAN package</a>.</li>
 </ul>
 
 <p> To download some stand-alone <em>Mac OS X droplets</em> (based on PDFjam version 1.21), see <a href="#droplets">below</a>. </p>
@@ -260,14 +263,17 @@ pdflatex=/path/to/pdflatex
 <h3>Some known problems:</h3>
 
 <ul>
-  <li> Use of <tt>pdfjam</tt> in a pipeline does not seem to work in <em>Cygwin</em>. Scripts like <tt>pdfjam-pocketmod</tt>, which use pipelines, therefore do not work there. The problem seems to be with <em>Cygwin</em>'s handling of file descriptors with pipelines.</li>
+  <li> In <em>Cygwin</em>, using <tt>pdfjam</tt> in a pipeline does not seem to work. Scripts like <tt>pdfjam-pocketmod</tt>, which use pipelines, therefore do not work there. The problem seems to be with <em>Cygwin</em>'s handling of file descriptors within pipelines.</li>
 </ul>
 
 <p>Solving these problems is on the to-do list: if you have solved one of them already please let me know!</p>
 
 <a name="history"></a> <h2 align="justify">Version history</h2>
 
-<p> <strong>2.05</strong>: changes to the <tt>pdfbook</tt> script &mdash; the <tt>--right-edge-binding</tt> option is now redundant, and there's a new <tt>--short-edge</tt> option for binding along the short edge of pages instead of the long edge (thanks to Marco Pessotto for this). The <tt>--preamble</tt> option to <tt>pdfjam</tt> is enhanced, to allow multiple instances which get concatenated. Also various minor corrections to man pages. [2010-04-25] </p>
+<p> <strong>2.06</strong>: changed the <tt>pdfbook</tt> script to include <tt>--booklet true</tt> as the default
+behaviour (thanks to Julien Bossert for this good suggestion). [2010-05-11] </p>
+
+<p> <strong>2.05</strong>: changes to the <tt>pdfbook</tt> script [the <tt>--right-edge-binding</tt> option is now redundant, and there's a new <tt>--short-edge</tt> option for binding along the short edge of pages instead of the long edge (thanks to Marco Pessotto for this)]. The <tt>--preamble</tt> option to <tt>pdfjam</tt> is enhanced, to allow multiple instances which get concatenated. Also various minor corrections to man pages. [2010-04-25] </p>
 
 <p> <strong>2.04</strong>: various minor improvements suggested by Debian maintainers (thanks to Eduard Bloch for these). The main things are: addition of the <tt>--version</tt> option; liberalisation of <tt>pdfjam</tt> to allow files in <em>JPEG</em> format to be specified as input, as well as PDF (I don't know why or if this might work! but some people have said it does); tidying of the man files; and more use of <tt>exec</tt>, to avoid forking. [2010-04-22] </p>
 
diff --git a/Master/texmf-dist/doc/latex/pdfjam/VERSION b/Master/texmf-dist/doc/latex/pdfjam/VERSION
index 793cf9a340d..049f8f03bfb 100644
--- a/Master/texmf-dist/doc/latex/pdfjam/VERSION
+++ b/Master/texmf-dist/doc/latex/pdfjam/VERSION
@@ -1 +1 @@
-This is PDFjam 2.05
\ No newline at end of file
+This is PDFjam 2.06
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/pdfjam/tests.zip b/Master/texmf-dist/doc/latex/pdfjam/tests.zip
index 2f4b644de5d..762420eb79c 100644
--- a/Master/texmf-dist/doc/latex/pdfjam/tests.zip
+++ b/Master/texmf-dist/doc/latex/pdfjam/tests.zip
diff --git a/Master/texmf-dist/scripts/pdfjam/pdf180 b/Master/texmf-dist/scripts/pdfjam/pdf180
index 860be220297..3079a243f60 100755
--- a/Master/texmf-dist/scripts/pdfjam/pdf180
+++ b/Master/texmf-dist/scripts/pdfjam/pdf180
@@ -4,7 +4,7 @@
 ##
 ##  Author David Firth (http://go.warwick.ac.uk/dfirth)
 ##
-##  This is a simple wrapper for pdfjam, version 2.05
+##  This is a simple wrapper for pdfjam, version 2.06
 ##
 exec pdfjam --suffix rotated180 --angle 180 --fitpaper true "$@"
 
diff --git a/Master/texmf-dist/scripts/pdfjam/pdf270 b/Master/texmf-dist/scripts/pdfjam/pdf270
index 07e211fbe66..79ed1409091 100755
--- a/Master/texmf-dist/scripts/pdfjam/pdf270
+++ b/Master/texmf-dist/scripts/pdfjam/pdf270
@@ -4,7 +4,7 @@
 ##
 ##  Author David Firth (http://go.warwick.ac.uk/dfirth)
 ##
-##  This is a simple wrapper for pdfjam, version 2.05
+##  This is a simple wrapper for pdfjam, version 2.06
 ##
 exec pdfjam --suffix rotated270 --angle 270 --fitpaper true --rotateoversize true "$@"
 
diff --git a/Master/texmf-dist/scripts/pdfjam/pdf90 b/Master/texmf-dist/scripts/pdfjam/pdf90
index 7158aa5c9bb..16cd21478b0 100755
--- a/Master/texmf-dist/scripts/pdfjam/pdf90
+++ b/Master/texmf-dist/scripts/pdfjam/pdf90
@@ -4,7 +4,7 @@
 ##
 ##  Author David Firth (http://go.warwick.ac.uk/dfirth)
 ##
-##  This is a simple wrapper for pdfjam, version 2.05
+##  This is a simple wrapper for pdfjam, version 2.06
 ##
 exec pdfjam --suffix rotated90 --angle 90 --fitpaper true --rotateoversize true "$@"
 
diff --git a/Master/texmf-dist/scripts/pdfjam/pdfbook b/Master/texmf-dist/scripts/pdfjam/pdfbook
index 2bd3e0fecbf..fffdb69a20f 100755
--- a/Master/texmf-dist/scripts/pdfjam/pdfbook
+++ b/Master/texmf-dist/scripts/pdfjam/pdfbook
@@ -5,7 +5,7 @@
 ##  Author David Firth (http://go.warwick.ac.uk/dfirth), with help
 ##  from Marco Pessotto
 ##
-##  This is a simple wrapper for pdfjam, version 2.05
+##  This is a simple wrapper for pdfjam, version 2.06
 ##
 case $1 in
     --short-edge)
@@ -38,12 +38,12 @@ fi
 ##
 if test -z "$shortedge"
 then 
-    exec pdfjam --landscape --suffix book $signature "$@"
+    exec pdfjam --booklet true --landscape --suffix book $signature "$@"
 else
     (kpsewhich everyshi.sty >/dev/null) || {
 	echo "the 'everyshi' package is not installed."; exit 1
     }
-    exec pdfjam --landscape --suffix book $signature \
+    exec pdfjam --booklet true --landscape --suffix book $signature \
 	--preamble '\usepackage{everyshi}
 \makeatletter
 \EveryShipout{\ifodd\c@page\pdfpageattr{/Rotate 180}\fi}
diff --git a/Master/texmf-dist/scripts/pdfjam/pdfflip b/Master/texmf-dist/scripts/pdfjam/pdfflip
index 8643abcd07e..b3d37c73ce6 100755
--- a/Master/texmf-dist/scripts/pdfjam/pdfflip
+++ b/Master/texmf-dist/scripts/pdfjam/pdfflip
@@ -4,6 +4,6 @@
 ##
 ##  Author David Firth (http://go.warwick.ac.uk/dfirth)
 ##
-##  This is a simple wrapper for pdfjam, version 2.05
+##  This is a simple wrapper for pdfjam, version 2.06
 ##
 exec pdfjam --suffix flipped --reflect true --fitpaper true  "$@"
diff --git a/Master/texmf-dist/scripts/pdfjam/pdfjam b/Master/texmf-dist/scripts/pdfjam/pdfjam
index 439040d6bc8..d5544d9e1cd 100755
--- a/Master/texmf-dist/scripts/pdfjam/pdfjam
+++ b/Master/texmf-dist/scripts/pdfjam/pdfjam
@@ -1,5 +1,5 @@
 #!/bin/sh
-version=2.05
+version=2.06
 #########################################################################
 ##                                                                     ##
 ##  pdfjam: A shell-script interface to the "pdfpages" LaTeX package   ##
diff --git a/Master/texmf-dist/scripts/pdfjam/pdfjam-pocketmod b/Master/texmf-dist/scripts/pdfjam/pdfjam-pocketmod
index 864f4821140..c6a0f782b68 100755
--- a/Master/texmf-dist/scripts/pdfjam/pdfjam-pocketmod
+++ b/Master/texmf-dist/scripts/pdfjam/pdfjam-pocketmod
@@ -6,7 +6,7 @@
 ##
 ##  Author David Firth (http://go.warwick.ac.uk/dfirth)
 ##
-##  This is a simple wrapper for (three runs of) pdfjam, version 2.05
+##  This is a simple wrapper for (three runs of) pdfjam, version 2.06
 ##
 ##
 ##  It's hard (?) to set up this particular script to read from /dev/stdin, 
diff --git a/Master/texmf-dist/scripts/pdfjam/pdfjam-slides3up b/Master/texmf-dist/scripts/pdfjam/pdfjam-slides3up
index f6736bede44..40a2338bfb4 100755
--- a/Master/texmf-dist/scripts/pdfjam/pdfjam-slides3up
+++ b/Master/texmf-dist/scripts/pdfjam/pdfjam-slides3up
@@ -5,7 +5,7 @@
 ##
 ##  Author David Firth (http://go.warwick.ac.uk/dfirth)
 ##
-##  This is a simple wrapper for pdfjam, version 2.05
+##  This is a simple wrapper for pdfjam, version 2.06
 ##
 footskip=3.1cm                           ## default setting
 pagecommand='{\thispagestyle{empty}}'    ## default setting
diff --git a/Master/texmf-dist/scripts/pdfjam/pdfjam-slides6up b/Master/texmf-dist/scripts/pdfjam/pdfjam-slides6up
index 3dd9136b81f..dbb5bdd02aa 100755
--- a/Master/texmf-dist/scripts/pdfjam/pdfjam-slides6up
+++ b/Master/texmf-dist/scripts/pdfjam/pdfjam-slides6up
@@ -5,7 +5,7 @@
 ##
 ##  Author David Firth (http://go.warwick.ac.uk/dfirth)
 ##
-##  This is a simple wrapper for pdfjam, version 2.05
+##  This is a simple wrapper for pdfjam, version 2.06
 ##
 footskip=2.7cm                           ## default setting
 pagecommand='{\thispagestyle{empty}}'    ## default setting
diff --git a/Master/texmf-dist/scripts/pdfjam/pdfjoin b/Master/texmf-dist/scripts/pdfjam/pdfjoin
index d475cd4e28a..f34ae0202cb 100755
--- a/Master/texmf-dist/scripts/pdfjam/pdfjoin
+++ b/Master/texmf-dist/scripts/pdfjam/pdfjoin
@@ -4,7 +4,7 @@
 ##
 ##  Author David Firth (http://go.warwick.ac.uk/dfirth)
 ##
-##  This is a simple wrapper for pdfjam, version 2.05
+##  This is a simple wrapper for pdfjam, version 2.06
 ##
 E_USAGE=64           ##  for a command line usage error
 for arg
diff --git a/Master/texmf-dist/scripts/pdfjam/pdfnup b/Master/texmf-dist/scripts/pdfjam/pdfnup
index 0b551d34fb5..f6d8af52812 100755
--- a/Master/texmf-dist/scripts/pdfjam/pdfnup
+++ b/Master/texmf-dist/scripts/pdfjam/pdfnup
@@ -4,7 +4,7 @@
 ##
 ##  Author David Firth (http://go.warwick.ac.uk/dfirth)
 ##
-##  This is a simple wrapper for pdfjam, version 2.05
+##  This is a simple wrapper for pdfjam, version 2.06
 ##
 E_USAGE=64           ##  for a command line usage error
 for arg
diff --git a/Master/texmf-dist/scripts/pdfjam/pdfpun b/Master/texmf-dist/scripts/pdfjam/pdfpun
index aea8ff87eec..2d008ae6d71 100755
--- a/Master/texmf-dist/scripts/pdfjam/pdfpun
+++ b/Master/texmf-dist/scripts/pdfjam/pdfpun
@@ -5,7 +5,7 @@
 ##
 ##  Author David Firth (http://go.warwick.ac.uk/dfirth)
 ##
-##  This is a simple wrapper for (three runs of) pdfjam, version 2.05
+##  This is a simple wrapper for (three runs of) pdfjam, version 2.06
 ##
 ##
 E_USAGE=64           ##  for a command line usage error
diff --git a/Master/texmf/doc/man/man1/pdfbook.1 b/Master/texmf/doc/man/man1/pdfbook.1
index f0be4b73ed3..75f72bd5aef 100644
--- a/Master/texmf/doc/man/man1/pdfbook.1
+++ b/Master/texmf/doc/man/man1/pdfbook.1
@@ -18,6 +18,9 @@ binding, use '--short-edge' as the first argument; this will only work if the La
 The default output page orientation is 
 landscape.  To change this, use the '--no-landscape' option.
 .PP
+By default, the option '--booklet true' is used (see the pdfpages manual
+for details).  To turn this off, just specify '--booklet false'.
+.PP
 If no source PDF file ('SRC') is specified, input
 is from /dev/stdin. If 'PAGESPEC' is omitted, all pages are processed.
 .PP
diff --git a/Master/texmf/doc/man/man1/pdfbook.man1.pdf b/Master/texmf/doc/man/man1/pdfbook.man1.pdf
index 2e6d334c676..a4aa69185be 100644
--- a/Master/texmf/doc/man/man1/pdfbook.man1.pdf
+++ b/Master/texmf/doc/man/man1/pdfbook.man1.pdf