summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/scripts/pdfjam
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-11-17 00:37:11 +0000
committerKarl Berry <karl@freefriends.org>2010-11-17 00:37:11 +0000
commitc6aff738dd28f8d2c09756543638a22c4c543846 (patch)
tree6e850efae1a818d8205d9475abd687da54f89869 /Master/texmf-dist/scripts/pdfjam
parent73cd5c082800b6704a33df225536f0d8f761c42f (diff)
pdfjam (16nov10)
git-svn-id: svn://tug.org/texlive/trunk@20459 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/scripts/pdfjam')
-rwxr-xr-xMaster/texmf-dist/scripts/pdfjam/pdf1802
-rwxr-xr-xMaster/texmf-dist/scripts/pdfjam/pdf2704
-rwxr-xr-xMaster/texmf-dist/scripts/pdfjam/pdf902
-rwxr-xr-xMaster/texmf-dist/scripts/pdfjam/pdfbook2
-rwxr-xr-xMaster/texmf-dist/scripts/pdfjam/pdfflip2
-rwxr-xr-xMaster/texmf-dist/scripts/pdfjam/pdfjam49
-rwxr-xr-xMaster/texmf-dist/scripts/pdfjam/pdfjam-pocketmod2
-rwxr-xr-xMaster/texmf-dist/scripts/pdfjam/pdfjam-slides3up2
-rwxr-xr-xMaster/texmf-dist/scripts/pdfjam/pdfjam-slides6up2
-rwxr-xr-xMaster/texmf-dist/scripts/pdfjam/pdfjoin2
-rwxr-xr-xMaster/texmf-dist/scripts/pdfjam/pdfnup2
-rwxr-xr-xMaster/texmf-dist/scripts/pdfjam/pdfpun2
12 files changed, 37 insertions, 36 deletions
diff --git a/Master/texmf-dist/scripts/pdfjam/pdf180 b/Master/texmf-dist/scripts/pdfjam/pdf180
index 3079a243f60..6e88947589b 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.06
+## This is a simple wrapper for pdfjam, version 2.08
##
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 79ed1409091..3b4abe15318 100755
--- a/Master/texmf-dist/scripts/pdfjam/pdf270
+++ b/Master/texmf-dist/scripts/pdfjam/pdf270
@@ -4,8 +4,8 @@
##
## Author David Firth (http://go.warwick.ac.uk/dfirth)
##
-## This is a simple wrapper for pdfjam, version 2.06
-##
+## This is a simple wrapper for pdfjam, version 2.08
+##.
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 16cd21478b0..dde5df820bb 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.06
+## This is a simple wrapper for pdfjam, version 2.08
##
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 fffdb69a20f..c6490b3881f 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.06
+## This is a simple wrapper for pdfjam, version 2.08
##
case $1 in
--short-edge)
diff --git a/Master/texmf-dist/scripts/pdfjam/pdfflip b/Master/texmf-dist/scripts/pdfjam/pdfflip
index b3d37c73ce6..3088e56a3e9 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.06
+## This is a simple wrapper for pdfjam, version 2.08
##
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 d5544d9e1cd..e12b466b43b 100755
--- a/Master/texmf-dist/scripts/pdfjam/pdfjam
+++ b/Master/texmf-dist/scripts/pdfjam/pdfjam
@@ -1,5 +1,5 @@
#!/bin/sh
-version=2.06
+version=2.08
#########################################################################
## ##
## pdfjam: A shell-script interface to the "pdfpages" LaTeX package ##
@@ -144,9 +144,9 @@ prattle "This is pdfjam version ${version}."
## /usr/share/etc/pdfjam.conf
## /usr/local/share/pdfjam.conf
## /usr/local/etc/pdfjam.conf
-## ~/.pdfjam.conf
+## $HOME/.pdfjam.conf
## (And they are read in that order; if a setting is made more than
-## once, the last one prevails.)
+## once, the last instance prevails.)
##
## An example configuration file can be found at
## http://go.warwick.ac.uk/pdfjam
@@ -251,12 +251,12 @@ which, see http://www.ctan.org/tex-archive/macros/latex/contrib/pdfpages).
Usage: pdfjam [OPTIONS] [--] [FILE1 [SEL1]] [FILE2 [SEL2]]...
where
-* 'FILE1' etc. are PDF files. For input from /dev/stdin, use the special name
- '/dev/stdin' in place of any of FILE1, FILE2, etc: this can be mixed with
- 'real' files as needed, to allow PDF data to be input through a pipe (note
- that if /dev/stdin is connected to tty, an error results). If 'FILE1' is
- absent, pdfjam will use '/dev/stdin' (and will use '-' for the page
- selection -- see next item).
+* 'FILE1' etc. are PDF files (JPG and PNG files are also allowed). For
+ input from /dev/stdin, use the special name '/dev/stdin' in place of any
+ of FILE1, FILE2, etc: this can be mixed with 'real' files as needed, to
+ allow input through a pipe (note that if /dev/stdin is connected to tty,
+ an error results). If 'FILE1' is absent, pdfjam will use '/dev/stdin'
+ (and will use '-' for the page selection -- see next item).
* 'SEL1' is a page selection for FILE1, etc.
To select all pages (the default) use '-'. See the pdfpages manual for
more details. An example:
@@ -667,25 +667,25 @@ while test -n "${1}${2}"; do
sed 's/|awaited/|-/g'`
pageSpecAwaited=false
else
- error_exit "no PDF file found at ${1}" \
+ error_exit "no PDF/JPG/PNG file found at ${1}" \
$E_NOINPUT
fi ;;
- *) ## All other args should be PDF source files and page
- ## selections; if not, we'll quit
+ *) ## All other args should be PDF (or JPG/PNG)
+ ## source files and page selections; if not, we'll quit
if test "$checkfiles" = true ; ## not always available
then
case `file -Lb "${1}"` in
- "PDF document"*|"JPEG image data"*)
- ## it's a PDF file as expected
+ "PDF document"*|"JPEG image data"*|"PNG image"*)
+ ## it's a PDF file (or JPG/PNG) as expected
fileSpec="$fileSpec${newline}"${1}"|awaited"
pageSpecAwaited=true
;;
*)
case ${1} in
*.[pP][dD][fF] | *.[jJ][pP][eE][gG] | \
- *.[jJ][pP][gG])
- ## should be PDF file, but isn't
- error_exit "no PDF file found at ${1}" \
+ *.[jJ][pP][gG] | *.[pP][nN][gG])
+ ## should be PDF/JPG/PNG file, but isn't
+ error_exit "no PDF/JPG/PNG file found at ${1}" \
$E_NOINPUT
;;
*) ## if page spec needed, assume this is it;
@@ -695,7 +695,7 @@ while test -n "${1}${2}"; do
sed "s/|awaited/|$1/g"`
pageSpecAwaited=false
else
- error_exit "no PDF file found at ${1}" \
+ error_exit "no PDF/JPG/PNG file found at ${1}" \
$E_NOINPUT
fi
;;
@@ -704,8 +704,9 @@ while test -n "${1}${2}"; do
esac
else ## no checking of file contents; rely on .pdf extension
case ${1} in
- *.[pP][dD][fF] | *.[jJ][pP][eE][gG] | *.[jJ][pP][gG])
- ## assume it's a PDF file
+ *.[pP][dD][fF] | *.[jJ][pP][eE][gG] \
+ | *.[jJ][pP][gG] | *.[pP][nN][gG])
+ ## assume it's a PDF/JPG/PNG file
test -f "${1}" || error_exit \
"${1} not found" $E_NOINPUT
fileSpec="$fileSpec"$newline${1}"|"awaited
@@ -718,7 +719,7 @@ while test -n "${1}${2}"; do
sed "s/|awaited/|$1/g"`
pageSpecAwaited=false
else
- error_exit "no PDF file found at ${1}" \
+ error_exit "no PDF/JPG/PNG file found at ${1}" \
$E_NOINPUT
fi
;;
@@ -742,7 +743,7 @@ then
## no argument specifying a PDF source was given
inputFromStdin=true
fileSpec="/dev/stdin|-"
- prattle "No pdf source specified: input is from stdin."
+ prattle "No PDF/JPG/PNG source specified: input is from stdin."
fi
fi
##
@@ -960,7 +961,7 @@ umask $original_umask
##
if test "$batch" = true ; then
if test "$fileSpec" = "" ; then
- error_exit "--batch was used, but no PDF source file(s) specified" \
+ error_exit "--batch was used, but no PDF/JPG/PNG source file(s) specified" \
$E_USAGE
fi
if test "$inputFromStdin" = true ; then
@@ -1056,7 +1057,7 @@ do
then
if tty -s ; then
error_exit \
- "tty is connected to connected to stdin, no PDF file found" \
+ "tty is connected to connected to stdin, no PDF/JPG/PNG file found" \
$E_NOINPUT
fi
cat > "$uniqueName"
diff --git a/Master/texmf-dist/scripts/pdfjam/pdfjam-pocketmod b/Master/texmf-dist/scripts/pdfjam/pdfjam-pocketmod
index c6a0f782b68..72efd0e9db9 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.06
+## This is a simple wrapper for (three runs of) pdfjam, version 2.08
##
##
## 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 40a2338bfb4..e41e50a7b96 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.06
+## This is a simple wrapper for pdfjam, version 2.08
##
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 dbb5bdd02aa..bb65d013379 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.06
+## This is a simple wrapper for pdfjam, version 2.08
##
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 f34ae0202cb..923c50d6b6c 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.06
+## This is a simple wrapper for pdfjam, version 2.08
##
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 f6d8af52812..9b2a5f4fdac 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.06
+## This is a simple wrapper for pdfjam, version 2.08
##
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 2d008ae6d71..a49396d950e 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.06
+## This is a simple wrapper for (three runs of) pdfjam, version 2.08
##
##
E_USAGE=64 ## for a command line usage error