pdfpages (20apr16)

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

8 files changed, 66 insertions, 54 deletions

diff --git a/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty b/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty
index f391e1baaf5..2ad8e7e6885 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 <andreas.matthias@gmail.com>.
 %%
-\def\AM@fileversion{v0.5e}
+\def\AM@fileversion{v0.5f}
 \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-13 23:07:07 +0200 $
-\AM@Git@SHA@process$SHA-1: 50fd5681f79b0951a6874e051507955fd5adce0f $
+\AM@Git@Date@process$Date: 2016-04-19 23:45:44 +0200 $
+\AM@Git@SHA@process$SHA-1: 5a5a8af44ff5d6119ea64143e5089987a1df8963 $
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{pdfpages}
    [\AM@Git@Date\space\AM@fileversion\space
@@ -185,15 +185,19 @@
     \PackageError{pdfpages}{Cannot find file `#1'}{}%
   \fi
 }
+\newtoks\AM@global@opts
+\newcommand*{\AM@disable@width@height}{width=!,height=!}
+\AM@global@opts\expandafter{\AM@disable@width@height}
 \newcommand*{\includepdfset}[1]{%
-  \AM@split@options{pdfpages}{#1}%
-  \edef\AM@temp{{pdfpages}{\the\@temptokena}}%
-  \expandafter\setkeys\AM@temp
+  \AM@global@opts\expandafter{\AM@disable@width@height,#1}%
 }
 \newcommand*{\includepdf}[2][]{%
   \begingroup
   \let\AM@threadname\relax
-  \AM@split@options{pdfpages}{#1}%
+  \def\AM@tmp{pdfpages}
+  \expandafter\AM@split@options
+    \expandafter\AM@tmp
+    \expandafter{\the\AM@global@opts,#1}
   \edef\AM@temp{{pdfpages}{\the\@temptokena}}%
   \expandafter\setkeys\AM@temp
   \ifthenelse{\boolean{AM@pkg@draft} \and \boolean{AM@survey}}{%
@@ -230,7 +234,7 @@
   \fi
   \ifAM@output
     \expandafter\AM@readlist\expandafter{\AM@pagestemp}%
-    \AM@output{#1}%
+    \expandafter\AM@output\expandafter{\the\AM@global@opts,#1}%
   \fi
   \AM@CheckAtEnd
   \endgroup
@@ -239,11 +243,14 @@
 \newcommand*{\includepdfmerge}[2][]{%
   \begingroup
   \let\AM@currentdocname\relax
-  \AM@split@options{pdfpages}{#1}%
+  \def\AM@tmp{pdfpages}
+  \expandafter\AM@split@options
+    \expandafter\AM@tmp
+    \expandafter{\the\AM@global@opts,#1}%
   \edef\AM@temp{{pdfpages}{\the\@temptokena}}%
   \expandafter\setkeys\AM@temp
   \AM@readlist{#2}%
-  \AM@output{#1}%
+  \expandafter\AM@output\expandafter{\the\AM@global@opts,#1}%
   \AM@CheckAtEnd
   \endgroup
   \AM@ClearShipoutPicture
@@ -360,9 +367,10 @@
         \setbox\@tempboxa=\hbox{%
           \rotatebox{\AM@lscape@rot}{\copy\AM@templatesizebox}}%
       \else
+        \edef\AM@opts{[\AM@disable@width@height,\the\@temptokena,
+                       page=\AM@page, angle=\AM@lscape@rot]}%
         \setbox\@tempboxa=\hbox{%
-          \expandafter\includegraphics\expandafter[\the\@temptokena,
-            page=\AM@page, angle=\AM@lscape@rot]{\AM@docname}}%
+          \expandafter\includegraphics\AM@opts{\AM@docname}}%
       \fi
     \fi
     \ifthenelse{\boolean{AM@fitpaper}}{
@@ -402,10 +410,11 @@
     \setbox\@tempboxa=\hbox{%
       \rotatebox{\AM@lscape@rot}{\copy\@tempboxa}}%
   \else
+    \edef\AM@opts{[\AM@disable@width@height,\the\@temptokena,
+                   page=\AM@page, scale=\AM@globalscale,
+                   angle=\AM@lscape@rot]}%
     \setbox\@tempboxa=\hbox{%
-      \expandafter\includegraphics\expandafter[\the\@temptokena,
-                       page=\AM@page, scale=\AM@globalscale,
-                       angle=\AM@lscape@rot]{\AM@docname}}%
+      \expandafter\includegraphics\AM@opts{\AM@docname}}%
   \fi
   \let\@filelist\AM@filelist@save
   \edef\AM@templatewidth{\the\wd\@tempboxa}%
@@ -483,10 +492,11 @@
          \def\AM@ynupi{\@ne}%
        \fi
       }%
+    \edef\AM@opts{[\AM@disable@width@height,\the\@temptokena,
+                   page=\AM@page, scale=\AM@globalscale,
+                   angle=\AM@lscape@rot]}%
     \setbox\@tempboxa=\hbox{%
-      \expandafter\includegraphics\expandafter[\the\@temptokena,
-                       page=\AM@page, scale=\AM@globalscale,
-                       angle=\AM@lscape@rot]{\AM@docname}}%
+      \expandafter\includegraphics\AM@opts{\AM@docname}}%
     \edef\AM@localwd{\the\wd\@tempboxa}%
     \setlength{\@tempdima}{\ht\@tempboxa + \dp\@tempboxa}%
     \edef\AM@localht{\the\@tempdima}%
@@ -510,11 +520,11 @@
         \ifAM@rotateoversize
           \def\AM@rotateoversize{90}%
           \let\AM@filelist@save\@filelist
+          \edef\AM@opts{[\AM@disable@width@height,\the\@temptokena,
+                        page=\AM@page, scale=\AM@globalscale,
+                        angle=\AM@lscape@rot, angle=90]}%
           \setbox\@tempboxa=\hbox{%
-            \expandafter\includegraphics\expandafter
-                [\the\@temptokena, page=\AM@page,
-                 scale=\AM@globalscale,
-                 angle=\AM@lscape@rot, angle=90]{\AM@docname}}%
+            \expandafter\includegraphics\AM@opts{\AM@docname}}%
           \let\@filelist\AM@filelist@save
           \edef\AM@localwd{\the\wd\@tempboxa}%
           \setlength{\@tempdima}{\ht\@tempboxa + \dp\@tempboxa}%
@@ -550,10 +560,11 @@
     \fi
     \let\AM@filelist@save\@filelist
     \AM@split@options{Gin}{#1}%
+    \edef\AM@opts{[\AM@disable@width@height,\the\@temptokena,
+                   page=\AM@page, scale=\AM@globalscale,
+                   angle=\AM@lscape@rot]}%
     \setbox\@tempboxa=\hbox{%
-      \expandafter\includegraphics\expandafter[\the\@temptokena,
-                       page=\AM@page, scale=\AM@globalscale,
-                       angle=\AM@lscape@rot]{\AM@docname}}%
+      \expandafter\includegraphics\AM@opts{\AM@docname}}%
     \let\@filelist\AM@filelist@save
     \setlength{\@tempdimc}{\ht\@tempboxa + \dp\@tempboxa}%
 \edef\AM@texcoord{%
@@ -606,6 +617,13 @@
       \def\AM@shippage{}%
     \else
       \AM@split@options{Gin}{#1}%
+        \edef\AM@opts{[\AM@disable@width@height,\the\@temptokena,
+                       page=\AM@page, scale=\AM@globalscale,
+                       scale=\AM@localscale,
+                       \ifAM@sigrotate angle=180,\fi
+                       \ifAM@doublepagestwist\ifAM@doublepagestmp
+                       angle=180,\fi\fi
+                       angle=\AM@rotateoversize, angle=\AM@lscape@rot]}%
       \edef\AM@shippage{%
         \noexpand\put(\AM@xpos,\AM@ypos){%
         \noexpand\raisebox{\dp\@tempboxa}{%
@@ -613,14 +631,8 @@
         \AM@hyper@begin@ii\noexpand\AM@fbox{%
           \noexpand\AM@ARBug@hook
           \noexpand\AM@reflectbox{%
-          \noexpand\includegraphics[\the\@temptokena,
-                    page=\AM@page, scale=\AM@globalscale,
-                    scale=\AM@localscale,
-                    \ifAM@sigrotate angle=180,\fi
-                    \ifAM@doublepagestwist\ifAM@doublepagestmp
-                      angle=180,\fi\fi
-                    angle=\AM@rotateoversize,
-                    angle=\AM@lscape@rot]{\AM@docname}}}%
+            \expandafter\noexpand\expandafter
+            \includegraphics\AM@opts{\AM@docname}}}%
         \AM@hyper@end}}%
       }%
     \fi
diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def b/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def
index 3f16e9ad627..fe61a67ac1d 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 <andreas.matthias@gmail.com>.
 %%
-\def\AM@fileversion{v0.5e}
+\def\AM@fileversion{v0.5f}
 \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-13 23:07:07 +0200 $
-\AM@Git@SHA@process$SHA-1: 50fd5681f79b0951a6874e051507955fd5adce0f $
+\AM@Git@Date@process$Date: 2016-04-19 23:45:44 +0200 $
+\AM@Git@SHA@process$SHA-1: 5a5a8af44ff5d6119ea64143e5089987a1df8963 $
 \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 3a9dd00cd88..ab2d17b4d54 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 <andreas.matthias@gmail.com>.
 %%
-\def\AM@fileversion{v0.5e}
+\def\AM@fileversion{v0.5f}
 \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-13 23:07:07 +0200 $
-\AM@Git@SHA@process$SHA-1: 50fd5681f79b0951a6874e051507955fd5adce0f $
+\AM@Git@Date@process$Date: 2016-04-19 23:45:44 +0200 $
+\AM@Git@SHA@process$SHA-1: 5a5a8af44ff5d6119ea64143e5089987a1df8963 $
 \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 4585493f8ed..76b6258af60 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 <andreas.matthias@gmail.com>.
 %%
-\def\AM@fileversion{v0.5e}
+\def\AM@fileversion{v0.5f}
 \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-13 23:07:07 +0200 $
-\AM@Git@SHA@process$SHA-1: 50fd5681f79b0951a6874e051507955fd5adce0f $
+\AM@Git@Date@process$Date: 2016-04-19 23:45:44 +0200 $
+\AM@Git@SHA@process$SHA-1: 5a5a8af44ff5d6119ea64143e5089987a1df8963 $
 \ProvidesFile{ppluatex.def}
    [\AM@Git@Date\space\AM@fileversion\space
     Pdfpages driver for LuaTeX (AM)]
diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppnull.def b/Master/texmf-dist/tex/latex/pdfpages/ppnull.def
index 71782bbe500..33c75dbb547 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 <andreas.matthias@gmail.com>.
 %%
-\def\AM@fileversion{v0.5e}
+\def\AM@fileversion{v0.5f}
 \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-13 23:07:07 +0200 $
-\AM@Git@SHA@process$SHA-1: 50fd5681f79b0951a6874e051507955fd5adce0f $
+\AM@Git@Date@process$Date: 2016-04-19 23:45:44 +0200 $
+\AM@Git@SHA@process$SHA-1: 5a5a8af44ff5d6119ea64143e5089987a1df8963 $
 \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 1a4a1802ea1..73f35f32510 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 <andreas.matthias@gmail.com>.
 %%
-\def\AM@fileversion{v0.5e}
+\def\AM@fileversion{v0.5f}
 \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-13 23:07:07 +0200 $
-\AM@Git@SHA@process$SHA-1: 50fd5681f79b0951a6874e051507955fd5adce0f $
+\AM@Git@Date@process$Date: 2016-04-19 23:45:44 +0200 $
+\AM@Git@SHA@process$SHA-1: 5a5a8af44ff5d6119ea64143e5089987a1df8963 $
 \ProvidesFile{pppdftex.def}
    [\AM@Git@Date\space\AM@fileversion\space
     Pdfpages driver for pdfTeX (AM)]
diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def b/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def
index 6fe9c463691..fc1e36928d1 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 <andreas.matthias@gmail.com>.
 %%
-\def\AM@fileversion{v0.5e}
+\def\AM@fileversion{v0.5f}
 \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-13 23:07:07 +0200 $
-\AM@Git@SHA@process$SHA-1: 50fd5681f79b0951a6874e051507955fd5adce0f $
+\AM@Git@Date@process$Date: 2016-04-19 23:45:44 +0200 $
+\AM@Git@SHA@process$SHA-1: 5a5a8af44ff5d6119ea64143e5089987a1df8963 $
 \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 c33bf2bc709..eb1572a5e50 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 <andreas.matthias@gmail.com>.
 %%
-\def\AM@fileversion{v0.5e}
+\def\AM@fileversion{v0.5f}
 \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-13 23:07:07 +0200 $
-\AM@Git@SHA@process$SHA-1: 50fd5681f79b0951a6874e051507955fd5adce0f $
+\AM@Git@Date@process$Date: 2016-04-19 23:45:44 +0200 $
+\AM@Git@SHA@process$SHA-1: 5a5a8af44ff5d6119ea64143e5089987a1df8963 $
 \ProvidesFile{ppxetex.def}
    [\AM@Git@Date\space\AM@fileversion\space
     Pdfpages driver for XeTeX (AM)]