pdfpages (16jun15)

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

10 files changed, 104 insertions, 113 deletions

diff --git a/Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdf b/Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdf
index f7af62871b2..5802a481928 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 2592aef2920..d5758629917 100644
--- a/Master/texmf-dist/source/latex/pdfpages/pdfpages.dtx
+++ b/Master/texmf-dist/source/latex/pdfpages/pdfpages.dtx
@@ -27,10 +27,12 @@
 %<*dtx>
 \makeatletter
 %</dtx>
-\def\AM@fileversion{v0.4x}
-\def\AM@SVN@Date@i#1-#2-#3\END{\def\AM@filedate{#1/#2/#3}}
-\def\AM@SVN@Date$Date: #1 #2${\AM@SVN@Date@i#1\END}
-\AM@SVN@Date$Date: 2015-05-11 18:08:19 +0200 (Mon, 11 May 2015) $
+\def\AM@fileversion{v0.4y}
+\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-06-15 20:08:28 +0200 $
+\AM@Git@SHA@process$SHA-1: 0a165012872f360ed43fd18b01b5ea77f5f9d6b0 $
 %</!(example1,example2,example3,installer)>
 %
 %
@@ -52,7 +54,7 @@
 %
 %    \makeatletter
 %    \ProvidesFile{pdfpages.dtx}
-   [\AM@filedate\space\AM@fileversion\space
+   [\AM@Git@Date\space\AM@fileversion\space
 %
 %    \iffalse
 %</!(example1,example2,example3,installer)>
@@ -82,7 +84,7 @@
 %
 %    \GetFileInfo{pdfpages.dtx}
 %
-%    \CheckSum{4677}
+%    \CheckSum{4663}
 %
 % \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
@@ -144,10 +146,10 @@
 %
 %    \makeatletter
 %    \title{The \textsf{pdfpages} Package\thanks{This file
-%           has version number \AM@fileversion, last revised \AM@filedate.}}
+%           has version number \AM@fileversion, last revised \AM@Git@Date.}}
 %    \author{Andreas \textsc{Matthias}\\
 %      \href{mailto:andreas.matthias@gmail.com}{andreas.matthias@gmail.com}}
-%    \date{\AM@filedate}
+%    \date{\AM@Git@Date}
 %    \makeatother
 %
 %    \maketitle
@@ -996,6 +998,8 @@
 %            \texttt{CTAN:macros/latex/contrib/eso-pic/}
 %      \item[everyshi]
 %            \texttt{CTAN:macros/latex/contrib/ms/}
+%      \item[pdflscape]
+%            \texttt{CTAN:/macros/latex/contrib/oberdiek/}
 %      \item[graphicx, ifthen, calc]
 %            These packages belong to the standard \LaTeX\
 %            distribution.
@@ -1123,6 +1127,7 @@
   \RequirePackage{count1to}%
   \AddToShipoutPicture{\AM@setanchor}%
 \fi
+\RequirePackage{pdflscape}
 %    \end{macrocode}
 %    Checking for new versions of \texttt{eso-pic.sty}.
 %    \begin{macrocode}
@@ -1186,30 +1191,6 @@
 \newcommand*{\AM@picturecommandstar}{}
 \newsavebox{\AM@pagebox}
 %    \end{macrocode}
-%    \macro{\AM@setlscape}
-%    |\AM@setlscape| is defined in the driver files but may be
-%    redefined here, if `pdflscape.sty' is loaded.
-%    This package is necessary, if landscape pages are produced
-%    \textit{and} `thumbpdf.sty' is used.
-%    \begin{macrocode}
-\newif\ifAM@thumbpdf
-\newif\ifAM@pdflscape
-\AtBeginDocument{%
-  \@ifpackageloaded{thumbpdf}{\AM@thumbpdftrue}{\AM@thumbpdffalse}%
-  \@ifpackageloaded{pdflscape}{\AM@pdflscapetrue}{\AM@pdflscapefalse}%
-  \ifAM@thumbpdf
-    \ifAM@pdflscape
-      \def\AM@setlscape{\PLS@Rotate{90}}%
-    \else 
-      \PackageWarningNoLine{pdfpages}{%
-        You are using `thumbpdf.sty' but not\MessageBreak
-        `pdflscape.sty'.\MessageBreak
-        Please, insert `pdflscape.sty' in  your document\MessageBreak
-        to get a pleasant PDF document with thumbs}%
-    \fi
-  \fi
-}
-%    \end{macrocode}
 %    \macro{\AM@checkinteger}
 %    Check, if |#1| is a positive integer.
 %    \begin{macrocode}
@@ -1892,10 +1873,9 @@
       \ifnum\AM@ynupi=\AM@ynup\relax
         \begingroup\AM@pagecommand\endgroup
         \hskip\z@
-        \ifthenelse{\boolean{AM@turn}}
-          {\ifthenelse{\boolean{AM@landscape}}
-             {\AM@setlscape}{}}
-          {}%
+        \ifthenelse{\boolean{AM@turn}\AND\boolean{AM@landscape}}{%
+          \AM@setRotate
+        }{}
         \AM@AddToShipoutPicture{%
           \begingroup\AM@picturecommand\endgroup}%
         \ifAM@firstpage
@@ -1911,10 +1891,6 @@
           }%
           \AM@ClearShipoutPicture
         \fi
-%        \ifAM@reflectall \setbox\AM@pagebox\null \fi
-%        \ifAM@pdflscape\PLS@Rotate{0}\fi
-%        \AM@ClearShipoutPicture
-
 %    \end{macrocode}
 %    When creating signatures, every second page must be rotated
 %    by $180^{\circ}$ and therefore the xoffset must be multiplied
@@ -1938,6 +1914,9 @@
     \@firstcolumnfalse
   \fi
   \newpage
+  \ifthenelse{\boolean{AM@turn}\AND\boolean{AM@landscape}}{%
+    \AM@resetRotate
+  }{}
 }% AM@output
 %    \end{macrocode}
 %    \macro{\AM@readlist}
@@ -3294,7 +3273,8 @@
 %    \end{macrocode}
 %    Rotate page.
 %    \begin{macrocode}
-\def\AM@setlscape{\pdfpageattr{/Rotate 90}}
+\def\AM@setRotate{\PLS@Rotate{90}}
+\def\AM@resetRotate{\PLS@Rotate{0}}
 %    \end{macrocode}
 %    Link to original document.
 %    \begin{macrocode}
@@ -3468,10 +3448,11 @@
 %    \end{macrocode}
 %    Rotate page.
 %    \begin{macrocode}
-\def\AM@setlscape{\special{pS:
+\def\AM@setRotate{\special{pS:
     [{ThisPage}\string<\string</Rotate 90\string>\string>%]
     /PUT pdfmark}%
 }
+\def\AM@resetRotate{}
 %    \end{macrocode}
 %    Change paper size.
 %    \begin{macrocode}
@@ -3654,7 +3635,8 @@
 %    \end{macrocode}
 %    Rotate page.
 %    \begin{macrocode}
-\def\AM@setlscape{\special{pdf: put @thispage << /Rotate 90 >>}}
+\def\AM@setRotate{\PLS@Rotate{90}}
+\def\AM@resetRotate{\PLS@Rotate{0}}
 %    \end{macrocode}
 %    Link to original document.
 %    \begin{macrocode}
@@ -3807,7 +3789,8 @@
 %    \end{macrocode}
 %    Rotate page.
 %    \begin{macrocode}
-\def\AM@setlscape{\AM@notsupported{Page rotations}}
+\def\AM@setRotate{\AM@notsupported{Page rotations}}
+\def\AM@resetRotate{}
 %    \end{macrocode}
 %    Change paper size.
 %    \begin{macrocode}
@@ -3923,7 +3906,8 @@
 %    \end{macrocode}
 %    Rotate page.
 %    \begin{macrocode}
-\def\AM@setlscape{\AM@notsupported{Page rotation}}
+\def\AM@setRotate{\AM@notsupported{Page rotation}}
+\def\AM@resetRotate{}
 %    \end{macrocode}
 %    Change paper size.
 %    \begin{macrocode}
diff --git a/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty b/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty
index 0bfa88b8d09..164f84c2aff 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty
+++ b/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty
@@ -24,13 +24,15 @@
 %% Please send error reports and suggestions for improvements to
 %%   Andreas MATTHIAS <andreas.matthias@gmail.com>.
 %%
-\def\AM@fileversion{v0.4x}
-\def\AM@SVN@Date@i#1-#2-#3\END{\def\AM@filedate{#1/#2/#3}}
-\def\AM@SVN@Date$Date: #1 #2${\AM@SVN@Date@i#1\END}
-\AM@SVN@Date$Date: 2015-05-11 18:08:19 +0200 (Mon, 11 May 2015) $
+\def\AM@fileversion{v0.4y}
+\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-06-15 20:08:28 +0200 $
+\AM@Git@SHA@process$SHA-1: 0a165012872f360ed43fd18b01b5ea77f5f9d6b0 $
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{pdfpages}
-   [\AM@filedate\space\AM@fileversion\space
+   [\AM@Git@Date\space\AM@fileversion\space
     Insert pages of external PDF documents (AM)]
 \newif\ifAM@pkg@draft \AM@pkg@draftfalse
 \newif\ifAM@pkg@survey \AM@pkg@surveyfalse
@@ -74,6 +76,7 @@
   \RequirePackage{count1to}%
   \AddToShipoutPicture{\AM@setanchor}%
 \fi
+\RequirePackage{pdflscape}
 \@ifpackagelater{eso-pic}{2001/07/20}
   {\def\AM@AddToShipoutPicture{\AddToShipoutPicture*}%
    \def\AM@ClearShipoutPicture{\relax}}
@@ -126,23 +129,6 @@
 \newcommand*{\AM@picturecommand}{}
 \newcommand*{\AM@picturecommandstar}{}
 \newsavebox{\AM@pagebox}
-\newif\ifAM@thumbpdf
-\newif\ifAM@pdflscape
-\AtBeginDocument{%
-  \@ifpackageloaded{thumbpdf}{\AM@thumbpdftrue}{\AM@thumbpdffalse}%
-  \@ifpackageloaded{pdflscape}{\AM@pdflscapetrue}{\AM@pdflscapefalse}%
-  \ifAM@thumbpdf
-    \ifAM@pdflscape
-      \def\AM@setlscape{\PLS@Rotate{90}}%
-    \else
-      \PackageWarningNoLine{pdfpages}{%
-        You are using `thumbpdf.sty' but not\MessageBreak
-        `pdflscape.sty'.\MessageBreak
-        Please, insert `pdflscape.sty' in  your document\MessageBreak
-        to get a pleasant PDF document with thumbs}%
-    \fi
-  \fi
-}
 \newif\ifAM@integer
 \begingroup
 \@makeother_
@@ -659,10 +645,9 @@
       \ifnum\AM@ynupi=\AM@ynup\relax
         \begingroup\AM@pagecommand\endgroup
         \hskip\z@
-        \ifthenelse{\boolean{AM@turn}}
-          {\ifthenelse{\boolean{AM@landscape}}
-             {\AM@setlscape}{}}
-          {}%
+        \ifthenelse{\boolean{AM@turn}\AND\boolean{AM@landscape}}{%
+          \AM@setRotate
+        }{}
         \AM@AddToShipoutPicture{%
           \begingroup\AM@picturecommand\endgroup}%
         \ifAM@firstpage
@@ -678,7 +663,6 @@
           }%
           \AM@ClearShipoutPicture
         \fi
-
         \ifAM@signature
           \ifAM@sigrotate\AM@sigrotatefalse\else\AM@sigrotatetrue\fi
           \@tempdima=\AM@xoffset\relax
@@ -695,6 +679,9 @@
     \@firstcolumnfalse
   \fi
   \newpage
+  \ifthenelse{\boolean{AM@turn}\AND\boolean{AM@landscape}}{%
+    \AM@resetRotate
+  }{}
 }% AM@output
 \newif\ifAM@defaultone
 \newcommand*{\AM@readlist}[1]{%
diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfm.def b/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfm.def
index f113dffe845..0f2174e3dfb 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfm.def
+++ b/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfm.def
@@ -24,12 +24,14 @@
 %% Please send error reports and suggestions for improvements to
 %%   Andreas MATTHIAS <andreas.matthias@gmail.com>.
 %%
-\def\AM@fileversion{v0.4x}
-\def\AM@SVN@Date@i#1-#2-#3\END{\def\AM@filedate{#1/#2/#3}}
-\def\AM@SVN@Date$Date: #1 #2${\AM@SVN@Date@i#1\END}
-\AM@SVN@Date$Date: 2015-05-11 18:08:19 +0200 (Mon, 11 May 2015) $
+\def\AM@fileversion{v0.4y}
+\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-06-15 20:08:28 +0200 $
+\AM@Git@SHA@process$SHA-1: 0a165012872f360ed43fd18b01b5ea77f5f9d6b0 $
 \ProvidesFile{ppdvipdfm.def}
-   [\AM@filedate\space\AM@fileversion\space
+   [\AM@Git@Date\space\AM@fileversion\space
     Pdfpages driver for dvipdfm (AM)]
 \def\AM@tmp{dvipdfm.def}
 \ifx\Gin@driver\AM@tmp\else
@@ -63,7 +65,8 @@
   \paperheight\AM@pageheight
 }
 \let\AM@pagesize@boogie\relax
-\def\AM@setlscape{\AM@notsupported{Page rotation}}
+\def\AM@setRotate{\AM@notsupported{Page rotation}}
+\def\AM@resetRotate{}
 \def\AM@fitpaper@special{\AM@notsupported{Option fitpaper}}
 \def\AM@findfile#1{%
   \AM@findfile@i{#1}{pdf}%
diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def b/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def
index 77f33a6a607..5bd0969e0c2 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def
+++ b/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def
@@ -24,12 +24,14 @@
 %% Please send error reports and suggestions for improvements to
 %%   Andreas MATTHIAS <andreas.matthias@gmail.com>.
 %%
-\def\AM@fileversion{v0.4x}
-\def\AM@SVN@Date@i#1-#2-#3\END{\def\AM@filedate{#1/#2/#3}}
-\def\AM@SVN@Date$Date: #1 #2${\AM@SVN@Date@i#1\END}
-\AM@SVN@Date$Date: 2015-05-11 18:08:19 +0200 (Mon, 11 May 2015) $
+\def\AM@fileversion{v0.4y}
+\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-06-15 20:08:28 +0200 $
+\AM@Git@SHA@process$SHA-1: 0a165012872f360ed43fd18b01b5ea77f5f9d6b0 $
 \ProvidesFile{ppdvips.def}
-   [\AM@filedate\space\AM@fileversion\space
+   [\AM@Git@Date\space\AM@fileversion\space
     Pdfpages driver for dvips (AM)]
 \def\AM@notsupported#1{%
   \PackageWarning{pdfpages}{#1 not supported by driver dvips}}
@@ -51,7 +53,8 @@
   \paperheight\AM@pageheight
 }
 \let\AM@pagesize@boogie\relax
-\def\AM@setlscape{\AM@notsupported{Page rotations}}
+\def\AM@setRotate{\AM@notsupported{Page rotations}}
+\def\AM@resetRotate{}
 \def\AM@fitpaper@special{\AM@notsupported{Option fitpaper}}
 \def\AM@findfile#1{%
   \AM@findfile@i{#1}{eps}%
diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppluatex.def b/Master/texmf-dist/tex/latex/pdfpages/ppluatex.def
index 241c47eeda3..65028a453a7 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/ppluatex.def
+++ b/Master/texmf-dist/tex/latex/pdfpages/ppluatex.def
@@ -24,12 +24,14 @@
 %% Please send error reports and suggestions for improvements to
 %%   Andreas MATTHIAS <andreas.matthias@gmail.com>.
 %%
-\def\AM@fileversion{v0.4x}
-\def\AM@SVN@Date@i#1-#2-#3\END{\def\AM@filedate{#1/#2/#3}}
-\def\AM@SVN@Date$Date: #1 #2${\AM@SVN@Date@i#1\END}
-\AM@SVN@Date$Date: 2015-05-11 18:08:19 +0200 (Mon, 11 May 2015) $
+\def\AM@fileversion{v0.4y}
+\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-06-15 20:08:28 +0200 $
+\AM@Git@SHA@process$SHA-1: 0a165012872f360ed43fd18b01b5ea77f5f9d6b0 $
 \ProvidesFile{ppluatex.def}
-   [\AM@filedate\space\AM@fileversion\space
+   [\AM@Git@Date\space\AM@fileversion\space
     Pdfpages driver for luaTeX (AM)]
 \ifcase\pdfoutput
   \input{ppnull.def}
@@ -64,7 +66,8 @@
   \let\AM@IfFileExists\grffile@IfFileExists}{%
   \let\AM@IfFileExists\IfFileExists}%
 }
-\def\AM@setlscape{\pdfpageattr{/Rotate 90}}
+\def\AM@setRotate{\PLS@Rotate{90}}
+\def\AM@resetRotate{\PLS@Rotate{0}}
 \def\AM@linktodoc@special@begin{%
     \pdfannot 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 2f1769b8bd3..16df34ef404 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/ppnull.def
+++ b/Master/texmf-dist/tex/latex/pdfpages/ppnull.def
@@ -24,12 +24,14 @@
 %% Please send error reports and suggestions for improvements to
 %%   Andreas MATTHIAS <andreas.matthias@gmail.com>.
 %%
-\def\AM@fileversion{v0.4x}
-\def\AM@SVN@Date@i#1-#2-#3\END{\def\AM@filedate{#1/#2/#3}}
-\def\AM@SVN@Date$Date: #1 #2${\AM@SVN@Date@i#1\END}
-\AM@SVN@Date$Date: 2015-05-11 18:08:19 +0200 (Mon, 11 May 2015) $
+\def\AM@fileversion{v0.4y}
+\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-06-15 20:08:28 +0200 $
+\AM@Git@SHA@process$SHA-1: 0a165012872f360ed43fd18b01b5ea77f5f9d6b0 $
 \ProvidesFile{ppnull.def}
-   [\AM@filedate\space\AM@fileversion\space
+   [\AM@Git@Date\space\AM@fileversion\space
     Pdfpages dummy driver (AM)]
 \AM@DVIoutputtrue
 \PackageWarningNoLine{pdfpages}{%
diff --git a/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def b/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def
index bd8cc33aa80..f867ffe3e23 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def
+++ b/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def
@@ -24,12 +24,14 @@
 %% Please send error reports and suggestions for improvements to
 %%   Andreas MATTHIAS <andreas.matthias@gmail.com>.
 %%
-\def\AM@fileversion{v0.4x}
-\def\AM@SVN@Date@i#1-#2-#3\END{\def\AM@filedate{#1/#2/#3}}
-\def\AM@SVN@Date$Date: #1 #2${\AM@SVN@Date@i#1\END}
-\AM@SVN@Date$Date: 2015-05-11 18:08:19 +0200 (Mon, 11 May 2015) $
+\def\AM@fileversion{v0.4y}
+\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-06-15 20:08:28 +0200 $
+\AM@Git@SHA@process$SHA-1: 0a165012872f360ed43fd18b01b5ea77f5f9d6b0 $
 \ProvidesFile{pppdftex.def}
-   [\AM@filedate\space\AM@fileversion\space
+   [\AM@Git@Date\space\AM@fileversion\space
     Pdfpages driver for pdfTeX (AM)]
 \ifnum\pdftexversion<100
   \PackageError{pdfpages}
@@ -93,7 +95,8 @@
   \let\AM@IfFileExists\grffile@IfFileExists}{%
   \let\AM@IfFileExists\IfFileExists}%
 }
-\def\AM@setlscape{\pdfpageattr{/Rotate 90}}
+\def\AM@setRotate{\PLS@Rotate{90}}
+\def\AM@resetRotate{\PLS@Rotate{0}}
 \def\AM@linktodoc@special@begin{%
     \pdfannot 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 65c68f7129b..c37988fa12c 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def
+++ b/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def
@@ -24,12 +24,14 @@
 %% Please send error reports and suggestions for improvements to
 %%   Andreas MATTHIAS <andreas.matthias@gmail.com>.
 %%
-\def\AM@fileversion{v0.4x}
-\def\AM@SVN@Date@i#1-#2-#3\END{\def\AM@filedate{#1/#2/#3}}
-\def\AM@SVN@Date$Date: #1 #2${\AM@SVN@Date@i#1\END}
-\AM@SVN@Date$Date: 2015-05-11 18:08:19 +0200 (Mon, 11 May 2015) $
+\def\AM@fileversion{v0.4y}
+\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-06-15 20:08:28 +0200 $
+\AM@Git@SHA@process$SHA-1: 0a165012872f360ed43fd18b01b5ea77f5f9d6b0 $
 \ProvidesFile{ppvtex.def}
-   [\AM@filedate\space\AM@fileversion\space
+   [\AM@Git@Date\space\AM@fileversion\space
     Pdfpages driver for VTeX (AM)]
 \begingroup
 \@ifundefined{ver@vtex.def}{%
@@ -67,10 +69,11 @@
   \mediaheight\AM@pageheight
 }
 \let\AM@pagesize@boogie\relax
-\def\AM@setlscape{\special{pS:
+\def\AM@setRotate{\special{pS:
     [{ThisPage}\string<\string</Rotate 90\string>\string>%]
     /PUT pdfmark}%
 }
+\def\AM@resetRotate{}
 \def\AM@fitpaper@special{%
   \immediate\xspecial{option updatemediasizes="on"}}
 \def\AM@findfile#1{%
diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def b/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def
index 9d1b3820179..9fad5dceef1 100644
--- a/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def
+++ b/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def
@@ -24,12 +24,14 @@
 %% Please send error reports and suggestions for improvements to
 %%   Andreas MATTHIAS <andreas.matthias@gmail.com>.
 %%
-\def\AM@fileversion{v0.4x}
-\def\AM@SVN@Date@i#1-#2-#3\END{\def\AM@filedate{#1/#2/#3}}
-\def\AM@SVN@Date$Date: #1 #2${\AM@SVN@Date@i#1\END}
-\AM@SVN@Date$Date: 2015-05-11 18:08:19 +0200 (Mon, 11 May 2015) $
+\def\AM@fileversion{v0.4y}
+\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-06-15 20:08:28 +0200 $
+\AM@Git@SHA@process$SHA-1: 0a165012872f360ed43fd18b01b5ea77f5f9d6b0 $
 \ProvidesFile{ppxetex.def}
-   [\AM@filedate\space\AM@fileversion\space
+   [\AM@Git@Date\space\AM@fileversion\space
     Pdfpages driver for XeTeX (AM)]
 \begingroup
 \@ifundefined{ver@xetex.def}{%
@@ -111,7 +113,8 @@
     \def\reserved@a{#2}%
   \fi
   \reserved@a}
-\def\AM@setlscape{\special{pdf: put @thispage << /Rotate 90 >>}}
+\def\AM@setRotate{\PLS@Rotate{90}}
+\def\AM@resetRotate{\PLS@Rotate{0}}
 \def\AM@linktodoc@special@begin{%
   \special{pdf: annot
                 width \the\wd\@tempboxa\space