pdfpages (7mar21)

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

10 files changed, 84 insertions, 39 deletions

diff --git a/Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdf b/Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdf
index a1227b99fcc..df6493f4d55 100644
--- a/Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdf
+++ b/Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdf
diff --git a/Master/texmf-dist/source/latex/pdfpages/pdfpages.dtx b/Master/texmf-dist/source/latex/pdfpages/pdfpages.dtx
index eb64a63b55e..10188c05a9c 100644
--- a/Master/texmf-dist/source/latex/pdfpages/pdfpages.dtx
+++ b/Master/texmf-dist/source/latex/pdfpages/pdfpages.dtx
@@ -27,12 +27,12 @@
 %<*dtx>
 \makeatletter
 %</dtx>
-\def\AM@fileversion{v0.5s}
+\def\AM@fileversion{v0.5t}
 \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: 2021-02-05 15:10:20 +0100 $
-\AM@Git@SHA@process$SHA-1: 96070951ed4fc4b97d5a7a910640f7dbd57cc928 $
+\AM@Git@Date@process$Date: 2021-03-06 23:19:52 +0100 $
+\AM@Git@SHA@process$SHA-1: 591720c980385429528b3bf2256f2d4f7c2c55e9 $
 %</!(example1,example2,example3,installer)>
 %
 %
@@ -84,7 +84,7 @@
 %
 %    \GetFileInfo{pdfpages.dtx}
 %
-%    \CheckSum{5060}
+%    \CheckSum{5076}
 %
 % \CharacterTable
 %  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -3531,9 +3531,18 @@
 }
 %    \end{macrocode}
 %    Rotate page.
-%    \begin{macrocode}
-\def\AM@setRotate{\PLS@Rotate{90}}
-\def\AM@resetRotate{\PLS@Rotate{0}}
+%    Use new pdfmanagement macros if available, and fallback to pdflscape
+%    if they are not available.
+%    \begin{macrocode}
+\ExplSyntaxOn
+\@ifundefined{pdfmanagement_add:nnn}{%
+  \def\AM@setRotate{\PLS@Rotate{90}}%
+  \def\AM@resetRotate{\PLS@Rotate{0}}%
+}{%
+  \def\AM@setRotate{\pdfmanagement_add:nnn{ThisPage}{Rotate}{90}}%
+  \def\AM@resetRotate{}%
+}%
+\ExplSyntaxOff
 %    \end{macrocode}
 %    Link to original document.
 %    \begin{macrocode}
@@ -3706,6 +3715,8 @@
 \let\AM@pagesize@boogie\relax
 %    \end{macrocode}
 %    Rotate page.
+%    Use new pdfmanagement macros if available, and fallback to pdflscape
+%    if they are not available.
 %    \begin{macrocode}
 \def\AM@setRotate{\special{pS:
     [{ThisPage}\string<\string</Rotate 90\string>\string>%]
@@ -3895,8 +3906,15 @@
 %    \end{macrocode}
 %    Rotate page.
 %    \begin{macrocode}
-\def\AM@setRotate{\PLS@Rotate{90}}
-\def\AM@resetRotate{\PLS@Rotate{0}}
+\ExplSyntaxOn
+\@ifundefined{pdfmanagement_add:nnn}{%
+  \def\AM@setRotate{\PLS@Rotate{90}}%
+  \def\AM@resetRotate{\PLS@Rotate{0}}%
+}{%
+  \def\AM@setRotate{\pdfmanagement_add:nnn{ThisPage}{Rotate}{90}}%
+  \def\AM@resetRotate{}%
+}%
+\ExplSyntaxOff
 %    \end{macrocode}
 %    Link to original document.
 %    \begin{macrocode}
@@ -4821,6 +4839,12 @@
 %      |\fboxrule| equal the values which were active just before
 %      calling |\includepdf|.
 %    \end{itemize}
+%
+%    \subsection*{2021/03/06 v0.5t}
+%    \begin{itemize}
+%    \item Page rotation: Use new pdfmanagement macros if they are
+%      available, and fallback to pdflscape if they are not available.
+%    \end{itemize}
 %    \Finale
 %
 %    \iffalse
diff --git a/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty b/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty
index 3d16c000edb..faee6c6c7e5 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.5s}
+\def\AM@fileversion{v0.5t}
 \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: 2021-02-05 15:10:20 +0100 $
-\AM@Git@SHA@process$SHA-1: 96070951ed4fc4b97d5a7a910640f7dbd57cc928 $
+\AM@Git@Date@process$Date: 2021-03-06 23:19:52 +0100 $
+\AM@Git@SHA@process$SHA-1: 591720c980385429528b3bf2256f2d4f7c2c55e9 $
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{pdfpages}
    [\AM@Git@Date\space\AM@fileversion\space
diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def b/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def
index db5170ba947..23d8c147147 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.5s}
+\def\AM@fileversion{v0.5t}
 \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: 2021-02-05 15:10:20 +0100 $
-\AM@Git@SHA@process$SHA-1: 96070951ed4fc4b97d5a7a910640f7dbd57cc928 $
+\AM@Git@Date@process$Date: 2021-03-06 23:19:52 +0100 $
+\AM@Git@SHA@process$SHA-1: 591720c980385429528b3bf2256f2d4f7c2c55e9 $
 \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 83f82279d8b..7f3f7de8cb5 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.5s}
+\def\AM@fileversion{v0.5t}
 \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: 2021-02-05 15:10:20 +0100 $
-\AM@Git@SHA@process$SHA-1: 96070951ed4fc4b97d5a7a910640f7dbd57cc928 $
+\AM@Git@Date@process$Date: 2021-03-06 23:19:52 +0100 $
+\AM@Git@SHA@process$SHA-1: 591720c980385429528b3bf2256f2d4f7c2c55e9 $
 \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 e38d26c6353..f2dc66fb558 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.5s}
+\def\AM@fileversion{v0.5t}
 \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: 2021-02-05 15:10:20 +0100 $
-\AM@Git@SHA@process$SHA-1: 96070951ed4fc4b97d5a7a910640f7dbd57cc928 $
+\AM@Git@Date@process$Date: 2021-03-06 23:19:52 +0100 $
+\AM@Git@SHA@process$SHA-1: 591720c980385429528b3bf2256f2d4f7c2c55e9 $
 \ProvidesFile{ppluatex.def}
    [\AM@Git@Date\space\AM@fileversion\space
     Pdfpages driver for LuaTeX (AM)]
@@ -88,8 +88,15 @@
       \let\AM@IfFileExists\grffile@IfFileExists}%
   }{}%
 }
-\def\AM@setRotate{\PLS@Rotate{90}}
-\def\AM@resetRotate{\PLS@Rotate{0}}
+\ExplSyntaxOn
+\@ifundefined{pdfmanagement_add:nnn}{%
+  \def\AM@setRotate{\PLS@Rotate{90}}%
+  \def\AM@resetRotate{\PLS@Rotate{0}}%
+}{%
+  \def\AM@setRotate{\pdfmanagement_add:nnn{ThisPage}{Rotate}{90}}%
+  \def\AM@resetRotate{}%
+}%
+\ExplSyntaxOff
 \def\AM@linktodoc@special@begin{%
     \AM@annotation width \wd\@tempboxa
                    height \ht\@tempboxa
diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppnull.def b/Master/texmf-dist/tex/latex/pdfpages/ppnull.def
index d10fcb09fdc..2c89a21c108 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.5s}
+\def\AM@fileversion{v0.5t}
 \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: 2021-02-05 15:10:20 +0100 $
-\AM@Git@SHA@process$SHA-1: 96070951ed4fc4b97d5a7a910640f7dbd57cc928 $
+\AM@Git@Date@process$Date: 2021-03-06 23:19:52 +0100 $
+\AM@Git@SHA@process$SHA-1: 591720c980385429528b3bf2256f2d4f7c2c55e9 $
 \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 5d055172655..d3c01383bbe 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.5s}
+\def\AM@fileversion{v0.5t}
 \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: 2021-02-05 15:10:20 +0100 $
-\AM@Git@SHA@process$SHA-1: 96070951ed4fc4b97d5a7a910640f7dbd57cc928 $
+\AM@Git@Date@process$Date: 2021-03-06 23:19:52 +0100 $
+\AM@Git@SHA@process$SHA-1: 591720c980385429528b3bf2256f2d4f7c2c55e9 $
 \ProvidesFile{pppdftex.def}
    [\AM@Git@Date\space\AM@fileversion\space
     Pdfpages driver for pdfTeX (AM)]
@@ -105,8 +105,15 @@
       \let\AM@IfFileExists\grffile@IfFileExists}%
   }{}%
 }
-\def\AM@setRotate{\PLS@Rotate{90}}
-\def\AM@resetRotate{\PLS@Rotate{0}}
+\ExplSyntaxOn
+\@ifundefined{pdfmanagement_add:nnn}{%
+  \def\AM@setRotate{\PLS@Rotate{90}}%
+  \def\AM@resetRotate{\PLS@Rotate{0}}%
+}{%
+  \def\AM@setRotate{\pdfmanagement_add:nnn{ThisPage}{Rotate}{90}}%
+  \def\AM@resetRotate{}%
+}%
+\ExplSyntaxOff
 \def\AM@linktodoc@special@begin{%
     \AM@annotation width \wd\@tempboxa
                    height \ht\@tempboxa
diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def b/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def
index da1c416298a..a6f7ef62360 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.5s}
+\def\AM@fileversion{v0.5t}
 \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: 2021-02-05 15:10:20 +0100 $
-\AM@Git@SHA@process$SHA-1: 96070951ed4fc4b97d5a7a910640f7dbd57cc928 $
+\AM@Git@Date@process$Date: 2021-03-06 23:19:52 +0100 $
+\AM@Git@SHA@process$SHA-1: 591720c980385429528b3bf2256f2d4f7c2c55e9 $
 \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 5dc78a905ed..5cf9299d32b 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.5s}
+\def\AM@fileversion{v0.5t}
 \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: 2021-02-05 15:10:20 +0100 $
-\AM@Git@SHA@process$SHA-1: 96070951ed4fc4b97d5a7a910640f7dbd57cc928 $
+\AM@Git@Date@process$Date: 2021-03-06 23:19:52 +0100 $
+\AM@Git@SHA@process$SHA-1: 591720c980385429528b3bf2256f2d4f7c2c55e9 $
 \ProvidesFile{ppxetex.def}
    [\AM@Git@Date\space\AM@fileversion\space
     Pdfpages driver for XeTeX (AM)]
@@ -114,8 +114,15 @@
     \def\reserved@a{#2}%
   \fi
   \reserved@a}
-\def\AM@setRotate{\PLS@Rotate{90}}
-\def\AM@resetRotate{\PLS@Rotate{0}}
+\ExplSyntaxOn
+\@ifundefined{pdfmanagement_add:nnn}{%
+  \def\AM@setRotate{\PLS@Rotate{90}}%
+  \def\AM@resetRotate{\PLS@Rotate{0}}%
+}{%
+  \def\AM@setRotate{\pdfmanagement_add:nnn{ThisPage}{Rotate}{90}}%
+  \def\AM@resetRotate{}%
+}%
+\ExplSyntaxOff
 \def\AM@linktodoc@special@begin{%
   \special{pdf: annot
                 width \the\wd\@tempboxa\space