From 8fb9e20f14ce6565321b8910d17919aee9cb37c0 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 12 Dec 2016 22:54:00 +0000 Subject: pdfpages (12dec16) git-svn-id: svn://tug.org/texlive/trunk@42688 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty | 33 +++++++++++++--------- .../texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def | 10 +++---- Master/texmf-dist/tex/latex/pdfpages/ppdvips.def | 6 ++-- Master/texmf-dist/tex/latex/pdfpages/ppluatex.def | 12 ++++---- Master/texmf-dist/tex/latex/pdfpages/ppnull.def | 6 ++-- Master/texmf-dist/tex/latex/pdfpages/pppdftex.def | 8 +++--- Master/texmf-dist/tex/latex/pdfpages/ppvtex.def | 6 ++-- Master/texmf-dist/tex/latex/pdfpages/ppxetex.def | 6 ++-- 8 files changed, 47 insertions(+), 40 deletions(-) (limited to 'Master/texmf-dist/tex/latex') diff --git a/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty b/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty index 2ad8e7e6885..278790de1de 100644 --- a/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty +++ b/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty @@ -24,12 +24,12 @@ %% Please send error reports and suggestions for improvements to %% Andreas MATTHIAS . %% -\def\AM@fileversion{v0.5f} +\def\AM@fileversion{v0.5g} \def\AM@Git@Date@process$#1: #2 #3${\AM@Git@Date@process@i#2\END} \def\AM@Git@Date@process@i#1-#2-#3\END{\def\AM@Git@Date{#1/#2/#3}} \def\AM@Git@SHA@process$#1: #2${\def\AM@Git@SHA{#2}} -\AM@Git@Date@process$Date: 2016-04-19 23:45:44 +0200 $ -\AM@Git@SHA@process$SHA-1: 5a5a8af44ff5d6119ea64143e5089987a1df8963 $ +\AM@Git@Date@process$Date: 2016-12-11 20:23:58 +0100 $ +\AM@Git@SHA@process$SHA-1: 64206b6819db72f89b164084ff1466db043f64f3 $ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{pdfpages} [\AM@Git@Date\space\AM@fileversion\space @@ -128,6 +128,7 @@ \newif\ifAM@reflect\AM@reflectfalse \newif\ifAM@reflectall\AM@reflectallfalse \newif\ifAM@scale\AM@scaletrue +\newif\ifAM@newpage\AM@newpagefalse \newcommand*{\AM@pagestemp}{1} \newcommand*{\AM@pagecommand}{\thispagestyle{empty}} \newcommand*{\AM@lscape@rot}{0} @@ -442,8 +443,8 @@ \ifAM@landscape\AM@sigrotatefalse\else\AM@sigrotatetrue\fi \fi \setboolean{AM@endoflist}{false}% + \newpage \whiledo{\not\boolean{AM@endoflist}}{% - \newpage \AM@getfirst{\AM@pagelist}% \edef\AM@page{\the\toks@}% \AM@isphantom @@ -474,6 +475,7 @@ \@tempcntb=\AM@xnup\relax \ifnum\@tempcnta>\@tempcntb \def\AM@xnupi{\@ne}% + \AM@newpagetrue \fi } {\@tempcnta=\AM@xnupi\relax @@ -490,8 +492,13 @@ \@tempcntb=\AM@ynup\relax \ifnum\@tempcnta>\@tempcntb \def\AM@ynupi{\@ne}% + \AM@newpagetrue \fi }% + \ifAM@newpage + \newpage + \AM@newpagefalse + \fi \edef\AM@opts{[\AM@disable@width@height,\the\@temptokena, page=\AM@page, scale=\AM@globalscale, angle=\AM@lscape@rot]}% @@ -567,13 +574,13 @@ \expandafter\includegraphics\AM@opts{\AM@docname}}% \let\@filelist\AM@filelist@save \setlength{\@tempdimc}{\ht\@tempboxa + \dp\@tempboxa}% -\edef\AM@texcoord{% - \ifESO@texcoord - -\AM@pageheight - \else - \z@ - \fi -} + \edef\AM@texcoord{% + \ifESO@texcoord + -\AM@pageheight + \else + \z@ + \fi + }% \def\AM@add{+}% \if@twoside\ifodd\c@page\else\def\AM@add{-}\fi\fi \setlength{\@tempdimb}{\ht\@tempboxa + \dp\@tempboxa}% @@ -685,7 +692,7 @@ \hskip\z@ \ifthenelse{\boolean{AM@turn}\AND\boolean{AM@landscape}}{% \AM@setRotate - }{} + }{}% \AM@AddToShipoutPicture{% \begingroup\AM@picturecommand\endgroup}% \ifAM@firstpage @@ -1103,7 +1110,7 @@ {\AM@pdfpages@optionstrue}{}% \ifthenelse{\equal{scale}{\AM@temp}}{% \AM@scaletrue - \def\AM@ooo##1={##1} + \def\AM@ooo##1={##1}% \setlength{\@tempdima}{\p@ * \AM@scale@factor * \real{\AM@ooo#2}}% \edef\AM@scale@factor{\strip@pt\@tempdima}% }{}% diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def b/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def index fe61a67ac1d..ed05f3ce2fa 100644 --- a/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def +++ b/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def @@ -24,12 +24,12 @@ %% Please send error reports and suggestions for improvements to %% Andreas MATTHIAS . %% -\def\AM@fileversion{v0.5f} +\def\AM@fileversion{v0.5g} \def\AM@Git@Date@process$#1: #2 #3${\AM@Git@Date@process@i#2\END} \def\AM@Git@Date@process@i#1-#2-#3\END{\def\AM@Git@Date{#1/#2/#3}} \def\AM@Git@SHA@process$#1: #2${\def\AM@Git@SHA{#2}} -\AM@Git@Date@process$Date: 2016-04-19 23:45:44 +0200 $ -\AM@Git@SHA@process$SHA-1: 5a5a8af44ff5d6119ea64143e5089987a1df8963 $ +\AM@Git@Date@process$Date: 2016-12-11 20:23:58 +0100 $ +\AM@Git@SHA@process$SHA-1: 64206b6819db72f89b164084ff1466db043f64f3 $ \ProvidesFile{ppdvipdfmx.def} [\AM@Git@Date\space\AM@fileversion\space Pdfpages driver for dvipdfmx (AM)] @@ -50,7 +50,7 @@ \fi {\catcode`\"=12 \gdef\AM@quote{"}% -} +}% \def\AM@getpagecount{% \expandafter\expandafter\expandafter\AM@get@xbb@filename \csname Gin@rule@.pdf\endcsname\AM@currentdocname @@ -97,7 +97,7 @@ } \def\AM@setpagedimen{% \special{pdf:pagesize width \the\AM@pagewidth\space - height \the\AM@pageheight\space} + height \the\AM@pageheight\space}% } \def\AM@pagesize@boogie{% \ifdim\AM@pagewidth=\z@ diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def b/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def index ab2d17b4d54..868b30f484c 100644 --- a/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def +++ b/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def @@ -24,12 +24,12 @@ %% Please send error reports and suggestions for improvements to %% Andreas MATTHIAS . %% -\def\AM@fileversion{v0.5f} +\def\AM@fileversion{v0.5g} \def\AM@Git@Date@process$#1: #2 #3${\AM@Git@Date@process@i#2\END} \def\AM@Git@Date@process@i#1-#2-#3\END{\def\AM@Git@Date{#1/#2/#3}} \def\AM@Git@SHA@process$#1: #2${\def\AM@Git@SHA{#2}} -\AM@Git@Date@process$Date: 2016-04-19 23:45:44 +0200 $ -\AM@Git@SHA@process$SHA-1: 5a5a8af44ff5d6119ea64143e5089987a1df8963 $ +\AM@Git@Date@process$Date: 2016-12-11 20:23:58 +0100 $ +\AM@Git@SHA@process$SHA-1: 64206b6819db72f89b164084ff1466db043f64f3 $ \ProvidesFile{ppdvips.def} [\AM@Git@Date\space\AM@fileversion\space Pdfpages driver for dvips (AM)] diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppluatex.def b/Master/texmf-dist/tex/latex/pdfpages/ppluatex.def index 76b6258af60..a0410f14839 100644 --- a/Master/texmf-dist/tex/latex/pdfpages/ppluatex.def +++ b/Master/texmf-dist/tex/latex/pdfpages/ppluatex.def @@ -24,12 +24,12 @@ %% Please send error reports and suggestions for improvements to %% Andreas MATTHIAS . %% -\def\AM@fileversion{v0.5f} +\def\AM@fileversion{v0.5g} \def\AM@Git@Date@process$#1: #2 #3${\AM@Git@Date@process@i#2\END} \def\AM@Git@Date@process@i#1-#2-#3\END{\def\AM@Git@Date{#1/#2/#3}} \def\AM@Git@SHA@process$#1: #2${\def\AM@Git@SHA{#2}} -\AM@Git@Date@process$Date: 2016-04-19 23:45:44 +0200 $ -\AM@Git@SHA@process$SHA-1: 5a5a8af44ff5d6119ea64143e5089987a1df8963 $ +\AM@Git@Date@process$Date: 2016-12-11 20:23:58 +0100 $ +\AM@Git@SHA@process$SHA-1: 64206b6819db72f89b164084ff1466db043f64f3 $ \ProvidesFile{ppluatex.def} [\AM@Git@Date\space\AM@fileversion\space Pdfpages driver for LuaTeX (AM)] @@ -48,9 +48,9 @@ \let\AM@lastsavedimageresourcepages\lastsavedimageresourcepages \let\AM@luatexpagewidth\pagewidth \let\AM@luatexpageheight\pageheight - \protected\def\AM@annotation {\pdfextension annot } - \protected\def\AM@thread {\pdfextension thread } - \protected\def\AM@destination {\pdfextension dest } + \protected\def\AM@annotation {\pdfextension annot }% + \protected\def\AM@thread {\pdfextension thread }% + \protected\def\AM@destination {\pdfextension dest }% \fi \ifcase\AM@outputmode \input{ppnull.def} diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppnull.def b/Master/texmf-dist/tex/latex/pdfpages/ppnull.def index 33c75dbb547..3778cd7f508 100644 --- a/Master/texmf-dist/tex/latex/pdfpages/ppnull.def +++ b/Master/texmf-dist/tex/latex/pdfpages/ppnull.def @@ -24,12 +24,12 @@ %% Please send error reports and suggestions for improvements to %% Andreas MATTHIAS . %% -\def\AM@fileversion{v0.5f} +\def\AM@fileversion{v0.5g} \def\AM@Git@Date@process$#1: #2 #3${\AM@Git@Date@process@i#2\END} \def\AM@Git@Date@process@i#1-#2-#3\END{\def\AM@Git@Date{#1/#2/#3}} \def\AM@Git@SHA@process$#1: #2${\def\AM@Git@SHA{#2}} -\AM@Git@Date@process$Date: 2016-04-19 23:45:44 +0200 $ -\AM@Git@SHA@process$SHA-1: 5a5a8af44ff5d6119ea64143e5089987a1df8963 $ +\AM@Git@Date@process$Date: 2016-12-11 20:23:58 +0100 $ +\AM@Git@SHA@process$SHA-1: 64206b6819db72f89b164084ff1466db043f64f3 $ \ProvidesFile{ppnull.def} [\AM@Git@Date\space\AM@fileversion\space Pdfpages dummy driver (AM)] diff --git a/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def b/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def index 73f35f32510..32a827c4b74 100644 --- a/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def +++ b/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def @@ -24,12 +24,12 @@ %% Please send error reports and suggestions for improvements to %% Andreas MATTHIAS . %% -\def\AM@fileversion{v0.5f} +\def\AM@fileversion{v0.5g} \def\AM@Git@Date@process$#1: #2 #3${\AM@Git@Date@process@i#2\END} \def\AM@Git@Date@process@i#1-#2-#3\END{\def\AM@Git@Date{#1/#2/#3}} \def\AM@Git@SHA@process$#1: #2${\def\AM@Git@SHA{#2}} -\AM@Git@Date@process$Date: 2016-04-19 23:45:44 +0200 $ -\AM@Git@SHA@process$SHA-1: 5a5a8af44ff5d6119ea64143e5089987a1df8963 $ +\AM@Git@Date@process$Date: 2016-12-11 20:23:58 +0100 $ +\AM@Git@SHA@process$SHA-1: 64206b6819db72f89b164084ff1466db043f64f3 $ \ProvidesFile{pppdftex.def} [\AM@Git@Date\space\AM@fileversion\space Pdfpages driver for pdfTeX (AM)] @@ -37,7 +37,7 @@ \PackageError{pdfpages} {Package pdfpages requires at least\MessageBreak pdfTeX version 1.00} - {Update your TeX distribution.} + {Update your TeX distribution.}% \let\AM@endinput\relax \expandafter\endinput \fi diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def b/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def index fc1e36928d1..b3285758be5 100644 --- a/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def +++ b/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def @@ -24,12 +24,12 @@ %% Please send error reports and suggestions for improvements to %% Andreas MATTHIAS . %% -\def\AM@fileversion{v0.5f} +\def\AM@fileversion{v0.5g} \def\AM@Git@Date@process$#1: #2 #3${\AM@Git@Date@process@i#2\END} \def\AM@Git@Date@process@i#1-#2-#3\END{\def\AM@Git@Date{#1/#2/#3}} \def\AM@Git@SHA@process$#1: #2${\def\AM@Git@SHA{#2}} -\AM@Git@Date@process$Date: 2016-04-19 23:45:44 +0200 $ -\AM@Git@SHA@process$SHA-1: 5a5a8af44ff5d6119ea64143e5089987a1df8963 $ +\AM@Git@Date@process$Date: 2016-12-11 20:23:58 +0100 $ +\AM@Git@SHA@process$SHA-1: 64206b6819db72f89b164084ff1466db043f64f3 $ \ProvidesFile{ppvtex.def} [\AM@Git@Date\space\AM@fileversion\space Pdfpages driver for VTeX (AM)] diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def b/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def index eb1572a5e50..d7e47986791 100644 --- a/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def +++ b/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def @@ -24,12 +24,12 @@ %% Please send error reports and suggestions for improvements to %% Andreas MATTHIAS . %% -\def\AM@fileversion{v0.5f} +\def\AM@fileversion{v0.5g} \def\AM@Git@Date@process$#1: #2 #3${\AM@Git@Date@process@i#2\END} \def\AM@Git@Date@process@i#1-#2-#3\END{\def\AM@Git@Date{#1/#2/#3}} \def\AM@Git@SHA@process$#1: #2${\def\AM@Git@SHA{#2}} -\AM@Git@Date@process$Date: 2016-04-19 23:45:44 +0200 $ -\AM@Git@SHA@process$SHA-1: 5a5a8af44ff5d6119ea64143e5089987a1df8963 $ +\AM@Git@Date@process$Date: 2016-12-11 20:23:58 +0100 $ +\AM@Git@SHA@process$SHA-1: 64206b6819db72f89b164084ff1466db043f64f3 $ \ProvidesFile{ppxetex.def} [\AM@Git@Date\space\AM@fileversion\space Pdfpages driver for XeTeX (AM)] -- cgit v1.2.3