summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/pdfpages
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-06-16 21:19:54 +0000
committerKarl Berry <karl@freefriends.org>2015-06-16 21:19:54 +0000
commit442f1512f0e014d65451740c97c82c1373fc67d4 (patch)
treee8be40fdce635c489c8c01f2c73d3d5304c029fd /Master/texmf-dist/source/latex/pdfpages
parentaabaf017d9f80254268cc35b62b781ad9dc598f6 (diff)
pdfpages (16jun15)
git-svn-id: svn://tug.org/texlive/trunk@37567 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/pdfpages')
-rw-r--r--Master/texmf-dist/source/latex/pdfpages/pdfpages.dtx74
1 files changed, 29 insertions, 45 deletions
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}