From b59e690bdb8fc242c27d15ccb3aebcddf8e22ef7 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 14 Apr 2016 21:47:17 +0000 Subject: pdfpages (14apr16) git-svn-id: svn://tug.org/texlive/trunk@40524 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty | 17 +++-- .../texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def | 8 +-- Master/texmf-dist/tex/latex/pdfpages/ppdvips.def | 8 +-- Master/texmf-dist/tex/latex/pdfpages/ppluatex.def | 72 ++++++++++++++-------- Master/texmf-dist/tex/latex/pdfpages/ppnull.def | 8 +-- Master/texmf-dist/tex/latex/pdfpages/pppdftex.def | 58 +++++++++-------- Master/texmf-dist/tex/latex/pdfpages/ppvtex.def | 8 +-- Master/texmf-dist/tex/latex/pdfpages/ppxetex.def | 8 +-- 8 files changed, 112 insertions(+), 75 deletions(-) (limited to 'Master/texmf-dist/tex/latex/pdfpages') diff --git a/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty b/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty index 575f28d0946..f391e1baaf5 100644 --- a/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty +++ b/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty @@ -8,7 +8,7 @@ %% %% This file is part of the pdfpages package. %% -%% Copyright (C) 2001-2015 Andreas MATTHIAS +%% Copyright (C) 2001-2016 Andreas MATTHIAS %% %% This work may be distributed and/or modified under the conditions %% of the LaTeX Project Public License, either version 1.3c @@ -24,12 +24,12 @@ %% Please send error reports and suggestions for improvements to %% Andreas MATTHIAS . %% -\def\AM@fileversion{v0.5d} +\def\AM@fileversion{v0.5e} \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: 2015-09-18 22:10:48 +0200 $ -\AM@Git@SHA@process$SHA-1: f1e7d3caf5b8b03ed23867a46e056f5fdfa03499 $ +\AM@Git@Date@process$Date: 2016-04-13 23:07:07 +0200 $ +\AM@Git@SHA@process$SHA-1: 50fd5681f79b0951a6874e051507955fd5adce0f $ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{pdfpages} [\AM@Git@Date\space\AM@fileversion\space @@ -556,6 +556,13 @@ angle=\AM@lscape@rot]{\AM@docname}}% \let\@filelist\AM@filelist@save \setlength{\@tempdimc}{\ht\@tempboxa + \dp\@tempboxa}% +\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}% @@ -566,6 +573,7 @@ (\AM@ynupi - 1) }% \def\AM@ypos{% + \AM@texcoord + \AM@ymargin + \AM@yoffset + \AM@localyoff + (\AM@templateheight + \AM@deltay + \tw@\fboxrule) * (\AM@xnupi - 1) @@ -577,6 +585,7 @@ (\AM@xnupi - 1) }% \def\AM@ypos{% + \AM@texcoord + \AM@ymargin + \AM@yoffset + \AM@localyoff + (\AM@templateheight + \AM@deltay + \tw@\fboxrule) * (\AM@ynup-\AM@ynupi) diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def b/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def index f5ca505eccc..3f16e9ad627 100644 --- a/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def +++ b/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def @@ -8,7 +8,7 @@ %% %% This file is part of the pdfpages package. %% -%% Copyright (C) 2001-2015 Andreas MATTHIAS +%% Copyright (C) 2001-2016 Andreas MATTHIAS %% %% This work may be distributed and/or modified under the conditions %% of the LaTeX Project Public License, either version 1.3c @@ -24,12 +24,12 @@ %% Please send error reports and suggestions for improvements to %% Andreas MATTHIAS . %% -\def\AM@fileversion{v0.5d} +\def\AM@fileversion{v0.5e} \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: 2015-09-18 22:10:48 +0200 $ -\AM@Git@SHA@process$SHA-1: f1e7d3caf5b8b03ed23867a46e056f5fdfa03499 $ +\AM@Git@Date@process$Date: 2016-04-13 23:07:07 +0200 $ +\AM@Git@SHA@process$SHA-1: 50fd5681f79b0951a6874e051507955fd5adce0f $ \ProvidesFile{ppdvipdfmx.def} [\AM@Git@Date\space\AM@fileversion\space Pdfpages driver for dvipdfmx (AM)] diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def b/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def index 5b55cc1dbba..3a9dd00cd88 100644 --- a/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def +++ b/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def @@ -8,7 +8,7 @@ %% %% This file is part of the pdfpages package. %% -%% Copyright (C) 2001-2015 Andreas MATTHIAS +%% Copyright (C) 2001-2016 Andreas MATTHIAS %% %% This work may be distributed and/or modified under the conditions %% of the LaTeX Project Public License, either version 1.3c @@ -24,12 +24,12 @@ %% Please send error reports and suggestions for improvements to %% Andreas MATTHIAS . %% -\def\AM@fileversion{v0.5d} +\def\AM@fileversion{v0.5e} \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: 2015-09-18 22:10:48 +0200 $ -\AM@Git@SHA@process$SHA-1: f1e7d3caf5b8b03ed23867a46e056f5fdfa03499 $ +\AM@Git@Date@process$Date: 2016-04-13 23:07:07 +0200 $ +\AM@Git@SHA@process$SHA-1: 50fd5681f79b0951a6874e051507955fd5adce0f $ \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 4d921741c22..4585493f8ed 100644 --- a/Master/texmf-dist/tex/latex/pdfpages/ppluatex.def +++ b/Master/texmf-dist/tex/latex/pdfpages/ppluatex.def @@ -8,7 +8,7 @@ %% %% This file is part of the pdfpages package. %% -%% Copyright (C) 2001-2015 Andreas MATTHIAS +%% Copyright (C) 2001-2016 Andreas MATTHIAS %% %% This work may be distributed and/or modified under the conditions %% of the LaTeX Project Public License, either version 1.3c @@ -24,19 +24,39 @@ %% Please send error reports and suggestions for improvements to %% Andreas MATTHIAS . %% -\def\AM@fileversion{v0.5d} +\def\AM@fileversion{v0.5e} \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: 2015-09-18 22:10:48 +0200 $ -\AM@Git@SHA@process$SHA-1: f1e7d3caf5b8b03ed23867a46e056f5fdfa03499 $ +\AM@Git@Date@process$Date: 2016-04-13 23:07:07 +0200 $ +\AM@Git@SHA@process$SHA-1: 50fd5681f79b0951a6874e051507955fd5adce0f $ \ProvidesFile{ppluatex.def} [\AM@Git@Date\space\AM@fileversion\space Pdfpages driver for LuaTeX (AM)] -\ifcase\pdfoutput +\ifnum\luatexversion<85 + \let\AM@outputmode\pdfoutput + \let\AM@saveimageresource\pdfximage + \let\AM@lastsavedimageresourcepages\pdflastximagepages + \let\AM@luatexpagewidth\pdfpagewidth + \let\AM@luatexpageheight\pdfpageheight + \let\AM@annotation\pdfannot + \let\AM@thread\pdfthread + \let\AM@destination\pdfdest +\else + \let\AM@outputmode\outputmode + \let\AM@saveimageresource\saveimageresource + \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 } +\fi +\ifcase\AM@outputmode \input{ppnull.def} \expandafter\endinput \fi + \let\AM@Gread@@pdftex\Gread@@pdftex \renewcommand*{\Gread@@pdftex}[1]{% \xdef\AM@currentdocname@fix{#1}% @@ -44,16 +64,16 @@ } \def\AM@getpagecount{% \setbox\@tempboxa=\hbox{\includegraphics{\AM@currentdocname}}% - \pdfximage{\AM@currentdocname@fix}% - \edef\AM@pagecount{\the\pdflastximagepages}% + \AM@saveimageresource{\AM@currentdocname@fix}% + \edef\AM@pagecount{\the\AM@lastsavedimageresourcepages}% } \def\AM@getpagedimen{% \AM@pagewidth=\paperwidth \AM@pageheight=\paperheight } \def\AM@setpagedimen{% - \pdfpagewidth\AM@pagewidth - \pdfpageheight\AM@pageheight + \AM@luatexpagewidth\AM@pagewidth + \AM@luatexpageheight\AM@pageheight } \let\AM@pagesize@boogie\relax \let\AM@fitpaper@special\relax @@ -69,27 +89,27 @@ \def\AM@setRotate{\PLS@Rotate{90}} \def\AM@resetRotate{\PLS@Rotate{0}} \def\AM@linktodoc@special@begin{% - \pdfannot width \wd\@tempboxa - height \ht\@tempboxa - depth \dp\@tempboxa - {/Subtype /Link /Border [0 0 0] - /A << /S /GoToR - /F (\AM@linkfilename) - /D [\AM@linktodoc@page@m@ne \AM@linktodocfit] - \ifAM@newwindow/NewWindow true\fi >>}% + \AM@annotation width \wd\@tempboxa + height \ht\@tempboxa + depth \dp\@tempboxa + {/Subtype /Link /Border [0 0 0] + /A << /S /GoToR + /F (\AM@linkfilename) + /D [\AM@linktodoc@page@m@ne \AM@linktodocfit] + \ifAM@newwindow/NewWindow true\fi >>}% } \let\AM@linktodoc@special@end\relax \def\AM@survey@special@begin{% - \pdfannot width \wd\@tempboxa - height \ht\@tempboxa - depth \dp\@tempboxa - {/Subtype /Link /Border [0 0 0] - /A << /S /GoTo - /D (pdfpages.\AM@linktodoc@page@m@ne) >>}% + \AM@annotation width \wd\@tempboxa + height \ht\@tempboxa + depth \dp\@tempboxa + {/Subtype /Link /Border [0 0 0] + /A << /S /GoTo + /D (pdfpages.\AM@linktodoc@page@m@ne) >>}% } \let\AM@survey@special@end\relax \def\AM@thread@special@begin{% - \pdfthread width \wd\@tempboxa + \AM@thread width \wd\@tempboxa height \ht\@tempboxa depth \dp\@tempboxa attr {/I <<\threadinfodict>>}% @@ -97,8 +117,8 @@ } \let\AM@thread@special@end\relax \def\AM@view{fit} -\def\AM@dest@special{\pdfdest name {\AM@linkname.\AM@page} \AM@view} -\def\AM@anchor@special{\pdfdest name {pdfpages.\the\count1} fit} +\def\AM@dest@special{\AM@destination name {\AM@linkname.\AM@page} \AM@view} +\def\AM@anchor@special{\AM@destination name {pdfpages.\the\count1} fit} \def\AM@convert@dest#1{% \expandafter\AM@convert@dest@i\ifdim\z@=0pt#1 \END\fi} \def\AM@convert@dest@i#1 #2\END{% diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppnull.def b/Master/texmf-dist/tex/latex/pdfpages/ppnull.def index 867fff4c058..71782bbe500 100644 --- a/Master/texmf-dist/tex/latex/pdfpages/ppnull.def +++ b/Master/texmf-dist/tex/latex/pdfpages/ppnull.def @@ -8,7 +8,7 @@ %% %% This file is part of the pdfpages package. %% -%% Copyright (C) 2001-2015 Andreas MATTHIAS +%% Copyright (C) 2001-2016 Andreas MATTHIAS %% %% This work may be distributed and/or modified under the conditions %% of the LaTeX Project Public License, either version 1.3c @@ -24,12 +24,12 @@ %% Please send error reports and suggestions for improvements to %% Andreas MATTHIAS . %% -\def\AM@fileversion{v0.5d} +\def\AM@fileversion{v0.5e} \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: 2015-09-18 22:10:48 +0200 $ -\AM@Git@SHA@process$SHA-1: f1e7d3caf5b8b03ed23867a46e056f5fdfa03499 $ +\AM@Git@Date@process$Date: 2016-04-13 23:07:07 +0200 $ +\AM@Git@SHA@process$SHA-1: 50fd5681f79b0951a6874e051507955fd5adce0f $ \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 8f819643668..1a4a1802ea1 100644 --- a/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def +++ b/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def @@ -8,7 +8,7 @@ %% %% This file is part of the pdfpages package. %% -%% Copyright (C) 2001-2015 Andreas MATTHIAS +%% Copyright (C) 2001-2016 Andreas MATTHIAS %% %% This work may be distributed and/or modified under the conditions %% of the LaTeX Project Public License, either version 1.3c @@ -24,12 +24,12 @@ %% Please send error reports and suggestions for improvements to %% Andreas MATTHIAS . %% -\def\AM@fileversion{v0.5d} +\def\AM@fileversion{v0.5e} \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: 2015-09-18 22:10:48 +0200 $ -\AM@Git@SHA@process$SHA-1: f1e7d3caf5b8b03ed23867a46e056f5fdfa03499 $ +\AM@Git@Date@process$Date: 2016-04-13 23:07:07 +0200 $ +\AM@Git@SHA@process$SHA-1: 50fd5681f79b0951a6874e051507955fd5adce0f $ \ProvidesFile{pppdftex.def} [\AM@Git@Date\space\AM@fileversion\space Pdfpages driver for pdfTeX (AM)] @@ -41,6 +41,14 @@ \let\AM@endinput\relax \expandafter\endinput \fi + \let\AM@outputmode\pdfoutput + \let\AM@saveimageresource\pdfximage + \let\AM@lastsavedimageresourcepages\pdflastximagepages + \let\AM@luatexpagewidth\pdfpagewidth + \let\AM@luatexpageheight\pdfpageheight + \let\AM@annotation\pdfannot + \let\AM@thread\pdfthread + \let\AM@destination\pdfdest \ifcase\pdfoutput \input{ppnull.def} \expandafter\endinput @@ -73,16 +81,16 @@ } \def\AM@getpagecount{% \setbox\@tempboxa=\hbox{\includegraphics{\AM@currentdocname}}% - \pdfximage{\AM@currentdocname@fix}% - \edef\AM@pagecount{\the\pdflastximagepages}% + \AM@saveimageresource{\AM@currentdocname@fix}% + \edef\AM@pagecount{\the\AM@lastsavedimageresourcepages}% } \def\AM@getpagedimen{% \AM@pagewidth=\paperwidth \AM@pageheight=\paperheight } \def\AM@setpagedimen{% - \pdfpagewidth\AM@pagewidth - \pdfpageheight\AM@pageheight + \AM@luatexpagewidth\AM@pagewidth + \AM@luatexpageheight\AM@pageheight } \let\AM@pagesize@boogie\relax \let\AM@fitpaper@special\relax @@ -98,27 +106,27 @@ \def\AM@setRotate{\PLS@Rotate{90}} \def\AM@resetRotate{\PLS@Rotate{0}} \def\AM@linktodoc@special@begin{% - \pdfannot width \wd\@tempboxa - height \ht\@tempboxa - depth \dp\@tempboxa - {/Subtype /Link /Border [0 0 0] - /A << /S /GoToR - /F (\AM@linkfilename) - /D [\AM@linktodoc@page@m@ne \AM@linktodocfit] - \ifAM@newwindow/NewWindow true\fi >>}% + \AM@annotation width \wd\@tempboxa + height \ht\@tempboxa + depth \dp\@tempboxa + {/Subtype /Link /Border [0 0 0] + /A << /S /GoToR + /F (\AM@linkfilename) + /D [\AM@linktodoc@page@m@ne \AM@linktodocfit] + \ifAM@newwindow/NewWindow true\fi >>}% } \let\AM@linktodoc@special@end\relax \def\AM@survey@special@begin{% - \pdfannot width \wd\@tempboxa - height \ht\@tempboxa - depth \dp\@tempboxa - {/Subtype /Link /Border [0 0 0] - /A << /S /GoTo - /D (pdfpages.\AM@linktodoc@page@m@ne) >>}% + \AM@annotation width \wd\@tempboxa + height \ht\@tempboxa + depth \dp\@tempboxa + {/Subtype /Link /Border [0 0 0] + /A << /S /GoTo + /D (pdfpages.\AM@linktodoc@page@m@ne) >>}% } \let\AM@survey@special@end\relax \def\AM@thread@special@begin{% - \pdfthread width \wd\@tempboxa + \AM@thread width \wd\@tempboxa height \ht\@tempboxa depth \dp\@tempboxa attr {/I <<\threadinfodict>>}% @@ -126,8 +134,8 @@ } \let\AM@thread@special@end\relax \def\AM@view{fit} -\def\AM@dest@special{\pdfdest name {\AM@linkname.\AM@page} \AM@view} -\def\AM@anchor@special{\pdfdest name {pdfpages.\the\count1} fit} +\def\AM@dest@special{\AM@destination name {\AM@linkname.\AM@page} \AM@view} +\def\AM@anchor@special{\AM@destination name {pdfpages.\the\count1} fit} \def\AM@convert@dest#1{% \expandafter\AM@convert@dest@i\ifdim\z@=0pt#1 \END\fi} \def\AM@convert@dest@i#1 #2\END{% diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def b/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def index 7135a3b9928..6fe9c463691 100644 --- a/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def +++ b/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def @@ -8,7 +8,7 @@ %% %% This file is part of the pdfpages package. %% -%% Copyright (C) 2001-2015 Andreas MATTHIAS +%% Copyright (C) 2001-2016 Andreas MATTHIAS %% %% This work may be distributed and/or modified under the conditions %% of the LaTeX Project Public License, either version 1.3c @@ -24,12 +24,12 @@ %% Please send error reports and suggestions for improvements to %% Andreas MATTHIAS . %% -\def\AM@fileversion{v0.5d} +\def\AM@fileversion{v0.5e} \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: 2015-09-18 22:10:48 +0200 $ -\AM@Git@SHA@process$SHA-1: f1e7d3caf5b8b03ed23867a46e056f5fdfa03499 $ +\AM@Git@Date@process$Date: 2016-04-13 23:07:07 +0200 $ +\AM@Git@SHA@process$SHA-1: 50fd5681f79b0951a6874e051507955fd5adce0f $ \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 87ab51c5396..c33bf2bc709 100644 --- a/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def +++ b/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def @@ -8,7 +8,7 @@ %% %% This file is part of the pdfpages package. %% -%% Copyright (C) 2001-2015 Andreas MATTHIAS +%% Copyright (C) 2001-2016 Andreas MATTHIAS %% %% This work may be distributed and/or modified under the conditions %% of the LaTeX Project Public License, either version 1.3c @@ -24,12 +24,12 @@ %% Please send error reports and suggestions for improvements to %% Andreas MATTHIAS . %% -\def\AM@fileversion{v0.5d} +\def\AM@fileversion{v0.5e} \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: 2015-09-18 22:10:48 +0200 $ -\AM@Git@SHA@process$SHA-1: f1e7d3caf5b8b03ed23867a46e056f5fdfa03499 $ +\AM@Git@Date@process$Date: 2016-04-13 23:07:07 +0200 $ +\AM@Git@SHA@process$SHA-1: 50fd5681f79b0951a6874e051507955fd5adce0f $ \ProvidesFile{ppxetex.def} [\AM@Git@Date\space\AM@fileversion\space Pdfpages driver for XeTeX (AM)] -- cgit v1.2.3