pdfpages (19sep15)

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

10 files changed, 59 insertions, 30 deletions

diff --git a/Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdf b/Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdf
index 471f9d6458a..11f87edfe1f 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 a992c2bf948..cd0011b9339 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.5c}
+\def\AM@fileversion{v0.5d}
 \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-08-16 20:57:52 +0200 $
-\AM@Git@SHA@process$SHA-1: 0165ce378c8de8098af302bb25e577befd88f5d0 $
+\AM@Git@Date@process$Date: 2015-09-18 22:10:48 +0200 $
+\AM@Git@SHA@process$SHA-1: f1e7d3caf5b8b03ed23867a46e056f5fdfa03499 $
 %</!(example1,example2,example3,installer)>
 %
 %
@@ -84,7 +84,7 @@
 %
 %    \GetFileInfo{pdfpages.dtx}
 %
-%    \CheckSum{4786}
+%    \CheckSum{4799}
 %
 % \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
@@ -1175,7 +1175,24 @@
   \RequirePackage{count1to}%
   \AddToShipoutPicture{\AM@setanchor}%
 \fi
-\RequirePackage{pdflscape}
+%    \end{macrocode}
+%    To rotate pages we use |\PLS@Rotate| from |pdflscape|. But simply
+%    loading |pdflscape| modifies the |landscape| environment such that
+%    \emph{all} landscape pages are rotated by default. To prevent this
+%    we postpone the loading of the package.
+%
+%    If the user loads |pdflscape| explicitely she gets the rotated
+%    landscape environment and the packages will not be reloaded by the next
+%    commands.  However, if |pdflscape| is not loaded by the user, then we
+%    load it and reset the |landscape| environment afterwards.
+%    \begin{macrocode}
+\AtBeginDocument{%
+  \let\AM@orig@landscape\landscape
+  \let\AM@orig@endlandscape\endlandscape
+  \RequirePackage{pdflscape}%
+  \let\landscape\AM@orig@landscape
+  \let\endlandscape\AM@orig@endlandscape
+}
 %    \end{macrocode}
 %    Let's save the original meaning of |\includegraphics|, because
 %    graphicx.sty in demo mode (`demo' option) will overwrite |\includegraphics|
@@ -4514,6 +4531,12 @@
 %      pages of a PDF.
 %    \end{itemize}
 %
+%    \subsection*{2015/09/18 v0.5d}
+%    \begin{itemize}
+%      \item \emph{Iff} pdflscape is \emph{not} loaded by the user explicitly,
+%      reset modification of the landscape environment after loading
+%      pdflscape.
+%    \end{itemize}
 %
 %    \Finale
 %    
diff --git a/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty b/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty
index c96de60d739..575f28d0946 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.5c}
+\def\AM@fileversion{v0.5d}
 \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-08-16 20:57:52 +0200 $
-\AM@Git@SHA@process$SHA-1: 0165ce378c8de8098af302bb25e577befd88f5d0 $
+\AM@Git@Date@process$Date: 2015-09-18 22:10:48 +0200 $
+\AM@Git@SHA@process$SHA-1: f1e7d3caf5b8b03ed23867a46e056f5fdfa03499 $
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{pdfpages}
    [\AM@Git@Date\space\AM@fileversion\space
@@ -82,7 +82,13 @@
   \RequirePackage{count1to}%
   \AddToShipoutPicture{\AM@setanchor}%
 \fi
-\RequirePackage{pdflscape}
+\AtBeginDocument{%
+  \let\AM@orig@landscape\landscape
+  \let\AM@orig@endlandscape\endlandscape
+  \RequirePackage{pdflscape}%
+  \let\landscape\AM@orig@landscape
+  \let\endlandscape\AM@orig@endlandscape
+}
 \let\AM@Ginclude@graphics\Ginclude@graphics
 \@ifpackagelater{eso-pic}{2001/07/20}
   {\def\AM@AddToShipoutPicture{\AddToShipoutPicture*}%
diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def b/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def
index 9406745a106..f5ca505eccc 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.5c}
+\def\AM@fileversion{v0.5d}
 \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-08-16 20:57:52 +0200 $
-\AM@Git@SHA@process$SHA-1: 0165ce378c8de8098af302bb25e577befd88f5d0 $
+\AM@Git@Date@process$Date: 2015-09-18 22:10:48 +0200 $
+\AM@Git@SHA@process$SHA-1: f1e7d3caf5b8b03ed23867a46e056f5fdfa03499 $
 \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 f18424b5cfe..5b55cc1dbba 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.5c}
+\def\AM@fileversion{v0.5d}
 \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-08-16 20:57:52 +0200 $
-\AM@Git@SHA@process$SHA-1: 0165ce378c8de8098af302bb25e577befd88f5d0 $
+\AM@Git@Date@process$Date: 2015-09-18 22:10:48 +0200 $
+\AM@Git@SHA@process$SHA-1: f1e7d3caf5b8b03ed23867a46e056f5fdfa03499 $
 \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 af0c2f15512..4d921741c22 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.5c}
+\def\AM@fileversion{v0.5d}
 \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-08-16 20:57:52 +0200 $
-\AM@Git@SHA@process$SHA-1: 0165ce378c8de8098af302bb25e577befd88f5d0 $
+\AM@Git@Date@process$Date: 2015-09-18 22:10:48 +0200 $
+\AM@Git@SHA@process$SHA-1: f1e7d3caf5b8b03ed23867a46e056f5fdfa03499 $
 \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 70082d1252b..867fff4c058 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.5c}
+\def\AM@fileversion{v0.5d}
 \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-08-16 20:57:52 +0200 $
-\AM@Git@SHA@process$SHA-1: 0165ce378c8de8098af302bb25e577befd88f5d0 $
+\AM@Git@Date@process$Date: 2015-09-18 22:10:48 +0200 $
+\AM@Git@SHA@process$SHA-1: f1e7d3caf5b8b03ed23867a46e056f5fdfa03499 $
 \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 09f71572238..8f819643668 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.5c}
+\def\AM@fileversion{v0.5d}
 \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-08-16 20:57:52 +0200 $
-\AM@Git@SHA@process$SHA-1: 0165ce378c8de8098af302bb25e577befd88f5d0 $
+\AM@Git@Date@process$Date: 2015-09-18 22:10:48 +0200 $
+\AM@Git@SHA@process$SHA-1: f1e7d3caf5b8b03ed23867a46e056f5fdfa03499 $
 \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 b8e1dfe572d..7135a3b9928 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.5c}
+\def\AM@fileversion{v0.5d}
 \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-08-16 20:57:52 +0200 $
-\AM@Git@SHA@process$SHA-1: 0165ce378c8de8098af302bb25e577befd88f5d0 $
+\AM@Git@Date@process$Date: 2015-09-18 22:10:48 +0200 $
+\AM@Git@SHA@process$SHA-1: f1e7d3caf5b8b03ed23867a46e056f5fdfa03499 $
 \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 a6cfc3d37c5..87ab51c5396 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.5c}
+\def\AM@fileversion{v0.5d}
 \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-08-16 20:57:52 +0200 $
-\AM@Git@SHA@process$SHA-1: 0165ce378c8de8098af302bb25e577befd88f5d0 $
+\AM@Git@Date@process$Date: 2015-09-18 22:10:48 +0200 $
+\AM@Git@SHA@process$SHA-1: f1e7d3caf5b8b03ed23867a46e056f5fdfa03499 $
 \ProvidesFile{ppxetex.def}
    [\AM@Git@Date\space\AM@fileversion\space
     Pdfpages driver for XeTeX (AM)]