diff options
31 files changed, 100 insertions, 86 deletions
diff --git a/Master/texmf-dist/doc/latex/pdfjam/VERSION b/Master/texmf-dist/doc/latex/pdfjam/VERSION deleted file mode 100644 index 049f8f03bfb..00000000000 --- a/Master/texmf-dist/doc/latex/pdfjam/VERSION +++ /dev/null @@ -1 +0,0 @@ -This is PDFjam 2.06
\ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/pdfjam/COPYING b/Master/texmf-dist/doc/support/pdfjam/COPYING index d60c31a97a5..d60c31a97a5 100644 --- a/Master/texmf-dist/doc/latex/pdfjam/COPYING +++ b/Master/texmf-dist/doc/support/pdfjam/COPYING diff --git a/Master/texmf-dist/doc/latex/pdfjam/PDFjam-README.html b/Master/texmf-dist/doc/support/pdfjam/PDFjam-README.html index 8b15d755cca..fcfdd9ac014 100644 --- a/Master/texmf-dist/doc/latex/pdfjam/PDFjam-README.html +++ b/Master/texmf-dist/doc/support/pdfjam/PDFjam-README.html @@ -9,7 +9,7 @@ <p><em>Author</em>: David Firth, <a href="http://go.warwick.ac.uk/dfirth">http://go.warwick.ac.uk/dfirth</a></p> -<p> <strong> This file is kept up to date at <a href="http://go.warwick.ac.uk/pdfjam">http://go.warwick.ac.uk/pdfjam</a>. </strong> </p> +<p> <strong> This file is kept up to date at <a href="http://go.warwick.ac.uk/pdfjam" _mce_href="http://go.warwick.ac.uk/pdfjam">http://go.warwick.ac.uk/pdfjam</a>. </strong> </p> <ul> <li><a href="#overview">Overview</a> </li> <li><a href="#prereq">Pre-requisites</a> </li> @@ -27,7 +27,7 @@ <h2 align="justify">Overview</h2> -<p><strong>PDFjam</strong> is a small collection of shell scripts which provide a simple interface to much of the functionality of the excellent <a href="http://www.ctan.org/tex-archive/macros/latex/contrib/pdfpages/pdfpages.pdf" title="Link to the pdfpages manual (PDF)">pdfpages <img src="http://www2.warwick.ac.uk/brands/icons/acrobat.gif" alt="PDF file" title="PDF file" border="0" height="16" width="16" /></a> package (by Andreas Matthias) for <a href="http://www.tug.org/applications/pdftex/">pdfLaTeX</a>. </p> +<p><strong>PDFjam</strong> is a small collection of shell scripts which provide a simple interface to much of the functionality of the excellent <a href="http://www.ctan.org/tex-archive/macros/latex/contrib/pdfpages/pdfpages.pdf" title="Link to the pdfpages manual (PDF)">pdfpages <img src="http://www2.warwick.ac.uk/brands/icons/acrobat.gif" alt="PDF file" title="PDF file" border="0" height="16" width="16" /></a> package (by Andreas Matthias) for <a href="http://www.tug.org/applications/pdftex/">pdfLaTeX</a>. These scripts take one or more PDF files (and/or JPG/PNG graphics files) as input, and produce one or more PDF files as output. They are useful for joining files together, selecting pages, reducing several source pages onto one output page, etc., etc.</p> <p>The main script is named "<strong><tt>pdfjam</tt></strong>". This is the core of the package.</p> @@ -54,7 +54,9 @@ <p> The PDFjam software is made available free, under GPL version 2 (see the file named <tt>COPYING</tt> that is included with the package). It comes with ABSOLUTELY NO WARRANTY of fitness for any purpose whatever. </p> -<a name="prereq"></a> <h2 align="justify">Pre-requisites</h2> +<p> <a name="prereq"></a></p> + +<h2 align="justify">Pre-requisites</h2> <ol> <li>A Unix-like operating system (Linux, Mac OS X, Solaris, etc.; possibly Cygwin)</li> @@ -64,23 +66,25 @@ <p>Some of the options offered by <tt>pdfjam</tt> also require the LaTeX packages <a href="http://www.ctan.org/tex-archive/macros/latex/contrib/geometry/">geometry</a> and <a href="http://www.ctan.org/tex-archive/macros/latex/contrib/hyperref/">hyperref</a>.</p> -<a name="documentation"></a> <h2 align="justify">Documentation</h2> +<p> <a name="documentation"></a></p> + +<h2 align="justify">Documentation</h2> <p>The primary documentation for <tt>pdfjam</tt>, and hence for the other scripts that call it, is obtained by </p> -<pre> - pdfjam --help +<pre> pdfjam --help </pre> <p>This gives information on the arguments to <tt>pdfjam</tt>, and the default settings that apply at your installation. In addition to the arguments that are explicitly documented there, <tt>pdfjam</tt> provides access to all of the options of the pdfpages package: that's a large number of options, and it's a set of options that might change, so users are referred to the current <a href="http://www.ctan.org/tex-archive/macros/latex/contrib/pdfpages/pdfpages.pdf" title="Link to the pdfpages manual (PDF)">pdfpages manual <img src="http://www2.warwick.ac.uk/brands/icons/acrobat.gif" alt="PDF file" title="PDF file" border="0" height="16" width="16" /></a> to see what's available.</p> <p>In addition, each of the scripts has a (rather basic) <tt>man</tt> page. For example,</p> -<pre> - man pdfjam-pocketmod +<pre> man pdfjam-pocketmod </pre> <p>gives information about usage and other aspects of the <tt>pdfjam-pocketmod</tt> script.</p> -<a name="download"></a> <h2 align="justify">Download</h2> +<p> <a name="download"></a></p> + +<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.</p> @@ -99,9 +103,14 @@ <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> +<p>Cosmin Popescu has written a <a href="http://qt-apps.org/content/show.php/pdfnup-gui?content=134874.">front-end to the pdfnup script, based on Qt</a>.<br /> + </p> + +<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> -<a name="install"></a><h2 align="justify">Installation/configuration</h2> +<p> <a name="install"></a></p> + +<h2 align="justify">Installation/configuration</h2> <p>The shell scripts in the <em>bin</em> sub-directory of the package should be placed on the PATH of anyone who needs to use them.</p> @@ -115,17 +124,17 @@ <p>For example, if you want your own output to be on "US letter" size paper by default, simply put the line </p> -<pre> - paper=letterpaper +<pre> paper=letterpaper </pre> <p> in a plain text file named file <tt>.pdfnup.conf</tt> in your home directory. (The code word <tt>letterpaper</tt> is how LaTeX refers to that particular page size; for other available paper sizes, please see the output of <tt>pdfjam --help</tt>.)</p> <p>On some systems it might even be necessary to change the list of places (i.e., <tt>/etc/pdfjam.conf</tt> and others as listed above) that is searched for site-wide configuration files. This can only be done by editing the <tt>pdfjam</tt> script itself. To see which directories on <em>your</em> system are searched for a file named <tt>pdfjam.conf</tt>, use </p> -<pre> - pdfjam --configpath +<pre> pdfjam --configpath </pre> -<a name="using"></a> <h2 align="justify">Using the scripts</h2> +<p> <a name="using"></a></p> + +<h2 align="justify">Using the scripts</h2> <p>For a full overview of what <tt>pdfjam</tt> can do, the importance of the <a href="http://www.ctan.org/tex-archive/macros/latex/contrib/pdfpages/pdfpages.pdf" title="Link to the pdfpages manual (PDF)">pdfpages manual <img src="http://www2.warwick.ac.uk/brands/icons/acrobat.gif" alt="PDF file" title="PDF file" border="0" height="16" width="16" /></a> cannot be stressed enough! The following examples merely serve as a brief introduction.</p> @@ -133,13 +142,11 @@ <p>Consider converting each of two documents to a side-by-side "2-up" format. Since we want the two documents to be processed separately, we'll use the <tt>--batch</tt> option: </p> -<pre> - pdfjam --batch --nup 2x1 --suffix 2up --landscape --outfile . file1.pdf file2.pdf +<pre> pdfjam --batch --nup 2x1 --suffix 2up --landscape --outfile . file1.pdf file2.pdf </pre> <p> This will produce new files <tt>file1-2up.pdf</tt> and <tt>file2-2up.pdf</tt> in the current working directory. The above call could be shortened a bit, by using <tt>pdfnup</tt>, to</p> -<pre> - pdfnup --batch --suffix 2up file1.pdf file2.pdf +<pre> pdfnup --batch --suffix 2up file1.pdf file2.pdf </pre> <p> In a 'vanilla' installation of <tt>pdfjam</tt>, the default for <tt>--outfile</tt> is the current working directory.</p> @@ -147,8 +154,7 @@ <p>Suppose we want a single new document which puts together selected pages from two different files: </p> -<pre> - pdfjam file1.pdf '{},2-' file2.pdf '10,3-6' --outfile ../myNewFile.pdf +<pre> pdfjam file1.pdf '{},2-' file2.pdf '10,3-6' --outfile ../myNewFile.pdf </pre> <p>The new file <tt>myNewFile.pdf</tt>, in the parent directory of the current one, contains an empty page, followed by all pages of <tt>file1.pdf</tt> except the first, followed by pages 10, 3, 4, 5 and 6 from <tt>file2.pdf</tt>. </p> @@ -156,8 +162,7 @@ <p>(All pages in an output file from <tt>pdfjam</tt> will have the same size and orientation: for joining together PDF files while preserving different page sizes and orientations, <tt>pdfjam</tt> is not the tool to use; and since <tt>pdfjoin</tt> simply calls <tt>pdfjam</tt>, the same comment applies also to <tt>pdfjoin</tt>. I'm told that if you have <a href="http://pages.cs.wisc.edu/~ghost/">Ghostscript</a> installed, something along these lines might more nicely join files with different page sizes and orientations: </p> -<pre> - gs -dBATCH -dNOPAUSE -q -sDEVICE=pdfwrite -sOutputFile=finished.pdf file1.pdf file2.pdf +<pre> gs -dBATCH -dNOPAUSE -q -sDEVICE=pdfwrite -sOutputFile=finished.pdf file1.pdf file2.pdf </pre> <p>But I haven't tried it.)</p> @@ -165,8 +170,7 @@ <p>To make a portrait-oriented 4-up file from the pages of three input files, with a thin-line frame around the input pages,</p> -<pre> - pdfjam file1.pdf file2.pdf file3.pdf --no-landscape --frame true --nup 2x2 \ +<pre> pdfjam file1.pdf file2.pdf file3.pdf --no-landscape --frame true --nup 2x2 \ --suffix 4up --outfile ~/Documents </pre> <p>Here a <em>directory</em> was specified at <tt>--outfile</tt>: the resultant file in this case will be ~/Documents/file3-4up.pdf. (Note that <strong>if there's a writeable file with that name already, it will be overwritten</strong>: no check is made, and no warning given.)</p> @@ -175,23 +179,20 @@ <p>Suppose we have a document made up of "US letter" size pages, and we want to convert it to A4:</p> -<pre> - pdfjam 'my US letter file.pdf' --a4paper --outfile 'my A4 file.pdf' +<pre> pdfjam 'my US letter file.pdf' --a4paper --outfile 'my A4 file.pdf' </pre> <h3 align="justify">Example 5</h3> <p>A useful application of <tt>pdfjam</tt> is for producing a handout from a file of presentation slides. For slides made with the standard 4:3 aspect ratio a nice 6-up handout on A4 paper can be made by </p> -<pre> - pdfjam --nup 2x3 --frame true --noautoscale false --delta "0.2cm 0.3cm" \ +<pre> pdfjam --nup 2x3 --frame true --noautoscale false --delta "0.2cm 0.3cm" \ --scale 0.95 myslides.pdf --outfile myhandout.pdf </pre> <p>The <tt>--delta</tt> option here comes from the pdfpages package; the <tt>--scale</tt> option is passed to LaTeX's <tt>\includegraphics</tt> command. </p> <p>The two wrapper scripts <tt>pdfjam-slides6up</tt> and <tt>pdfjam-slides3up</tt> are provided in order to make this particular application of <tt>pdfjam</tt> easy: for example, </p> -<pre> - pdfjam-slides3up --pagenumbering true --batch slides1.pdf slides2.pdf +<pre> pdfjam-slides3up --pagenumbering true --batch slides1.pdf slides2.pdf </pre> <p>makes a pair of 3-up handouts <tt>slides1-3up.pdf</tt> and <tt>slides2-3up.pdf</tt>, with space for side-notes and with the handout pages numbered.</p> @@ -201,8 +202,7 @@ <p> Suppose we want to trim the pages of our input file prior to n-upping. This can be done by using a pipe: </p> -<pre> - pdfjam myfile.pdf --trim '1cm 2cm 1cm 2cm' --clip true --outfile /dev/stdout | \ +<pre> pdfjam myfile.pdf --trim '1cm 2cm 1cm 2cm' --clip true --outfile /dev/stdout | \ pdfnup --frame true --outfile myoutput.pdf </pre> <p>The <tt>--trim</tt> option specifies an amount to trim from the left, bottom, right and top sides respectively; to work as intended here it needs also <tt>--clip true</tt>. These (i.e., <tt>trim</tt> and <tt>clip</tt>) are in fact options to LaTeX's <tt>\includegraphics</tt> command (in the standard <em>graphics</em> package).</p> @@ -213,42 +213,48 @@ <p>To offset the content of double-sided printed pages so that they are suitable for binding with a <a href="http://de.wikipedia.org/wiki/Heftstreifen">Heftstreifen</a>, use the <tt>--twoside</tt> option:</p> -<pre> - pdfjam --twoside myfile.pdf --offset '1cm 0cm' --suffix 'offset' +<pre> pdfjam --twoside myfile.pdf --offset '1cm 0cm' --suffix 'offset' </pre> <h3 align="justify">Example 8</h3> <p> To use PDF input files whose names do not end in "<tt>.pdf</tt>", you will need to use the <tt>--checkfiles</tt> option. This depends on the availability of the <tt>file</tt> utility, with support for the options <tt>-Lb</tt>; this can be checked by trying </p> -<pre> - file -Lb 'my PDF file' +<pre> file -Lb 'my PDF file' </pre> <p> where <tt>'my PDF file'</tt> is the name of a PDF file on your system. The result should be something like "<tt>PDF document, version 1.4</tt>" (possibly with a different version number).</p> <p> With "<tt>file -Lb</tt>" available, we can use PDF files whose names lack the usual "<tt>.pdf</tt>" extension. For example, </p> -<pre> - pdfnup --checkfiles 'my PDF file' +<pre> pdfnup --checkfiles 'my PDF file' </pre> <p>should result in a file named "<tt>my PDF file-nup.pdf</tt>" in the current working directory.</p> <h3 align="justify">Example 9</h3> +<p>If you want to print a landscape-oriented PDF document on both sides of the paper, using a duplex printer that does not have 'tumble' capability, make a new version with every second page rotated for printing:</p> + +<pre> pdfjam --landscape --doublepagestwistodd true my-landscape-document.pdf +</pre> +<h3 align="justify">Example 10</h3> + <p> Please feel free to suggest other examples that might help people! (For the email address, see <a href="#bugs">reporting bugs</a>)</p> -<a name="droplets"></a> <h2 align="justify">Mac OS X only: drag-and-drop</h2> +<p> <a name="droplets"></a></p> + +<h2 align="justify">Mac OS X only: drag-and-drop</h2> <p>Under <strong>Mac OS X</strong>, <a href="http://www.wsanchez.net/software/">DropScript</a> has been used to make some simple drag-and-drop applications. Some sample droplets are provided in <a href="http://www.warwick.ac.uk/go/pdfjam/pdfdroplets_1.21.dmg">pdfdroplets_1.21.dmg</a>: these may be all you'll need! The sample droplets look like this: </p> <center> <img src="pdfdroplets.png" border="0" /> </center> <p> These droplets assume that your pdflatex is at <tt>/usr/texbin/pdflatex</tt>. If pdflatex lives somewhere else on your system, the droplets won't work until you include in your home directory a file named <tt>.pdfnup.conf</tt> (or there is a system-wide file <tt>pdfnup.conf</tt> at one of the four locations listed above), containing the line </p> -<pre> -pdflatex=/path/to/pdflatex +<pre>pdflatex=/path/to/pdflatex </pre> <p>where <tt> /path/to/pdflatex </tt> is the answer you get when you type <tt> which pdflatex </tt> in the Terminal. (If you get no answer, chances are that you do not have <tt>pdflatex</tt> installed on your Mac; if you need to install it, you could just download and install <a href="http://www.tug.org/mactex">MacTeX</a> or one of its slimmed-down variants.) </p> -<a name="faq"></a> <h2 align="justify">FAQ</h2> +<p> <a name="faq"></a></p> + +<h2 align="justify">FAQ</h2> <p> <strong>1. Why "PDFjam"?</strong><br /> Because it's for PDF files, and jam is what I like best on my toast (well, second best after marmalade, anyway). </p> @@ -256,7 +262,9 @@ pdflatex=/path/to/pdflatex <p> <strong>2. The thing runs but the output doesn't look the way it should. Why?</strong><br /> Most likely either your pdfTeX or your pdfpages installation is an old version. (Check also that <tt>pdftex.def</tt>, to be found in in <tt>.../texmf/tex/latex/graphics/</tt>, is up to date.) If the problem persists even with up-to-date versions of pdfTeX, <tt>pdftex.def</tt> and pdfpages, then please do report it. </p> -<a name="bugs"></a> <h2 align="justify">Reporting bugs</h2> +<p> <a name="bugs"></a></p> + +<h2 align="justify">Reporting bugs</h2> <p>Please report any bugs found in these scripts, to d.firth (at warwick.ac.uk).</p> @@ -268,10 +276,15 @@ pdflatex=/path/to/pdflatex <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> <a name="history"></a></p> + +<h2 align="justify">Version history</h2> + +<p> <strong>2.08</strong>: fixed a bug in one of the tests [2010-11-14] </p> + +<p> <strong>2.07</strong>: two other common graphics formats (JPG and PNG) are now explicitly allowed as input files (i.e., not only PDF files are allowed as inputs). [2010-11-13] </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.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> @@ -354,4 +367,4 @@ behaviour (thanks to Julien Bossert for this good suggestion). [2010-05-11] </p> <p> <strong>0.3</strong>: first public release of pdfnup [2002-04-04] </p> -</body> </html>
\ No newline at end of file +</body> </html> diff --git a/Master/texmf-dist/doc/support/pdfjam/VERSION b/Master/texmf-dist/doc/support/pdfjam/VERSION new file mode 100644 index 00000000000..1971909e632 --- /dev/null +++ b/Master/texmf-dist/doc/support/pdfjam/VERSION @@ -0,0 +1 @@ +This is PDFjam 2.08
\ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/pdfjam/pdfdroplets.png b/Master/texmf-dist/doc/support/pdfjam/pdfdroplets.png Binary files differindex 850e5802ac6..850e5802ac6 100644 --- a/Master/texmf-dist/doc/latex/pdfjam/pdfdroplets.png +++ b/Master/texmf-dist/doc/support/pdfjam/pdfdroplets.png diff --git a/Master/texmf-dist/doc/latex/pdfjam/pdfjam.conf b/Master/texmf-dist/doc/support/pdfjam/pdfjam.conf index 9b8f90c12e1..9b8f90c12e1 100644 --- a/Master/texmf-dist/doc/latex/pdfjam/pdfjam.conf +++ b/Master/texmf-dist/doc/support/pdfjam/pdfjam.conf diff --git a/Master/texmf-dist/doc/latex/pdfjam/tests.zip b/Master/texmf-dist/doc/support/pdfjam/tests.zip Binary files differindex 762420eb79c..71afaeaee06 100644 --- a/Master/texmf-dist/doc/latex/pdfjam/tests.zip +++ b/Master/texmf-dist/doc/support/pdfjam/tests.zip 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 diff --git a/Master/texmf/doc/man/man1/pdf180.man1.pdf b/Master/texmf/doc/man/man1/pdf180.man1.pdf Binary files differindex 27293eb740e..a843ddbc4bc 100644 --- a/Master/texmf/doc/man/man1/pdf180.man1.pdf +++ b/Master/texmf/doc/man/man1/pdf180.man1.pdf diff --git a/Master/texmf/doc/man/man1/pdf270.man1.pdf b/Master/texmf/doc/man/man1/pdf270.man1.pdf Binary files differindex f6efd0710d6..f9f3c2f2bd1 100644 --- a/Master/texmf/doc/man/man1/pdf270.man1.pdf +++ b/Master/texmf/doc/man/man1/pdf270.man1.pdf diff --git a/Master/texmf/doc/man/man1/pdf90.man1.pdf b/Master/texmf/doc/man/man1/pdf90.man1.pdf Binary files differindex ac294fd42b7..faa6ce0be31 100644 --- a/Master/texmf/doc/man/man1/pdf90.man1.pdf +++ b/Master/texmf/doc/man/man1/pdf90.man1.pdf diff --git a/Master/texmf/doc/man/man1/pdfbook.man1.pdf b/Master/texmf/doc/man/man1/pdfbook.man1.pdf Binary files differindex a4aa69185be..4462f827e67 100644 --- a/Master/texmf/doc/man/man1/pdfbook.man1.pdf +++ b/Master/texmf/doc/man/man1/pdfbook.man1.pdf diff --git a/Master/texmf/doc/man/man1/pdfflip.man1.pdf b/Master/texmf/doc/man/man1/pdfflip.man1.pdf Binary files differindex bbb3f40b418..4e77b43f4c0 100644 --- a/Master/texmf/doc/man/man1/pdfflip.man1.pdf +++ b/Master/texmf/doc/man/man1/pdfflip.man1.pdf diff --git a/Master/texmf/doc/man/man1/pdfjam-pocketmod.man1.pdf b/Master/texmf/doc/man/man1/pdfjam-pocketmod.man1.pdf Binary files differindex 5244569a60a..43cc467d13b 100644 --- a/Master/texmf/doc/man/man1/pdfjam-pocketmod.man1.pdf +++ b/Master/texmf/doc/man/man1/pdfjam-pocketmod.man1.pdf diff --git a/Master/texmf/doc/man/man1/pdfjam-slides3up.man1.pdf b/Master/texmf/doc/man/man1/pdfjam-slides3up.man1.pdf Binary files differindex 9e7478dca0f..0a59e160e35 100644 --- a/Master/texmf/doc/man/man1/pdfjam-slides3up.man1.pdf +++ b/Master/texmf/doc/man/man1/pdfjam-slides3up.man1.pdf diff --git a/Master/texmf/doc/man/man1/pdfjam-slides6up.man1.pdf b/Master/texmf/doc/man/man1/pdfjam-slides6up.man1.pdf Binary files differindex f10fe83610c..2d6c520fe87 100644 --- a/Master/texmf/doc/man/man1/pdfjam-slides6up.man1.pdf +++ b/Master/texmf/doc/man/man1/pdfjam-slides6up.man1.pdf diff --git a/Master/texmf/doc/man/man1/pdfjam.man1.pdf b/Master/texmf/doc/man/man1/pdfjam.man1.pdf Binary files differindex 47e1b5e01d7..023726a7c7b 100644 --- a/Master/texmf/doc/man/man1/pdfjam.man1.pdf +++ b/Master/texmf/doc/man/man1/pdfjam.man1.pdf diff --git a/Master/texmf/doc/man/man1/pdfjoin.man1.pdf b/Master/texmf/doc/man/man1/pdfjoin.man1.pdf Binary files differindex a3d180b3176..83732dfb3fb 100644 --- a/Master/texmf/doc/man/man1/pdfjoin.man1.pdf +++ b/Master/texmf/doc/man/man1/pdfjoin.man1.pdf diff --git a/Master/texmf/doc/man/man1/pdfnup.man1.pdf b/Master/texmf/doc/man/man1/pdfnup.man1.pdf Binary files differindex f49eb2532cf..f387885524f 100644 --- a/Master/texmf/doc/man/man1/pdfnup.man1.pdf +++ b/Master/texmf/doc/man/man1/pdfnup.man1.pdf diff --git a/Master/texmf/doc/man/man1/pdfpun.man1.pdf b/Master/texmf/doc/man/man1/pdfpun.man1.pdf Binary files differindex e1023beee12..3d11c6d8ad6 100644 --- a/Master/texmf/doc/man/man1/pdfpun.man1.pdf +++ b/Master/texmf/doc/man/man1/pdfpun.man1.pdf |
