summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/pdfpages
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-12-12 22:54:00 +0000
committerKarl Berry <karl@freefriends.org>2016-12-12 22:54:00 +0000
commit8fb9e20f14ce6565321b8910d17919aee9cb37c0 (patch)
tree4c8bd993adf70de0e031c3cf80fc10a436136b09 /Master/texmf-dist/source/latex/pdfpages
parente76c89b4c5023e1ed378208f5678795a4bb25349 (diff)
pdfpages (12dec16)
git-svn-id: svn://tug.org/texlive/trunk@42688 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/pdfpages')
-rw-r--r--Master/texmf-dist/source/latex/pdfpages/pdfpages.dtx55
1 files changed, 35 insertions, 20 deletions
diff --git a/Master/texmf-dist/source/latex/pdfpages/pdfpages.dtx b/Master/texmf-dist/source/latex/pdfpages/pdfpages.dtx
index a97457fcf7a..3b6704e1bf0 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.5f}
+\def\AM@fileversion{v0.5g}
\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-19 23:45:44 +0200 $
-\AM@Git@SHA@process$SHA-1: 5a5a8af44ff5d6119ea64143e5089987a1df8963 $
+\AM@Git@Date@process$Date: 2016-12-11 20:23:58 +0100 $
+\AM@Git@SHA@process$SHA-1: 64206b6819db72f89b164084ff1466db043f64f3 $
%</!(example1,example2,example3,installer)>
%
%
@@ -84,7 +84,7 @@
%
% \GetFileInfo{pdfpages.dtx}
%
-% \CheckSum{4916}
+% \CheckSum{4925}
%
% \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
@@ -1246,6 +1246,7 @@
\newif\ifAM@reflect\AM@reflectfalse
\newif\ifAM@reflectall\AM@reflectallfalse
\newif\ifAM@scale\AM@scaletrue
+\newif\ifAM@newpage\AM@newpagefalse
% \end{macrocode}
% \subsection{Commands}
% Declare macro names and define default values.
@@ -1694,8 +1695,8 @@
% of paper.
% \begin{macrocode}
\setboolean{AM@endoflist}{false}%
+ \newpage
\whiledo{\not\boolean{AM@endoflist}}{%
- \newpage
\AM@getfirst{\AM@pagelist}%
\edef\AM@page{\the\toks@}%
\AM@isphantom
@@ -1731,6 +1732,7 @@
\@tempcntb=\AM@xnup\relax
\ifnum\@tempcnta>\@tempcntb
\def\AM@xnupi{\@ne}%
+ \AM@newpagetrue
\fi
}
{\@tempcnta=\AM@xnupi\relax
@@ -1747,9 +1749,16 @@
\@tempcntb=\AM@ynup\relax
\ifnum\@tempcnta>\@tempcntb
\def\AM@ynupi{\@ne}%
+ \AM@newpagetrue
\fi
}%
% \end{macrocode}
+% \begin{macrocode}
+ \ifAM@newpage
+ \newpage
+ \AM@newpagefalse
+ \fi
+% \end{macrocode}
% Load next page and verify if it has the same page size as the
% page template. If not, adjust the scale |\AM@localscale| and
% the local offset |\AM@localxoff| and |\AM@localyoff|.
@@ -1848,13 +1857,13 @@
% option |texcoord| eso-pic sets the origin to the upper left corner.
% Let's take care of this.
% \begin{macrocode}
-\edef\AM@texcoord{%
- \ifESO@texcoord
- -\AM@pageheight
- \else
- \z@
- \fi
-}
+ \edef\AM@texcoord{%
+ \ifESO@texcoord
+ -\AM@pageheight
+ \else
+ \z@
+ \fi
+ }%
% \end{macrocode}
% Determine the position (coordinates) of the logical pages.
% These are |\AM@xpos| and |\AM@ypos|.
@@ -1997,7 +2006,7 @@
\hskip\z@
\ifthenelse{\boolean{AM@turn}\AND\boolean{AM@landscape}}{%
\AM@setRotate
- }{}
+ }{}%
\AM@AddToShipoutPicture{%
\begingroup\AM@picturecommand\endgroup}%
\ifAM@firstpage
@@ -2565,7 +2574,7 @@
{\AM@pdfpages@optionstrue}{}%
\ifthenelse{\equal{scale}{\AM@temp}}{%
\AM@scaletrue
- \def\AM@ooo##1={##1}
+ \def\AM@ooo##1={##1}%
\setlength{\@tempdima}{\p@ * \AM@scale@factor * \real{\AM@ooo#2}}%
\edef\AM@scale@factor{\strip@pt\@tempdima}%
}{}%
@@ -3276,7 +3285,7 @@
\PackageError{pdfpages}
{Package pdfpages requires at least\MessageBreak
pdfTeX version 1.00}
- {Update your TeX distribution.}
+ {Update your TeX distribution.}%
\let\AM@endinput\relax
\expandafter\endinput
\fi
@@ -3305,9 +3314,9 @@
\let\AM@lastsavedimageresourcepages\lastsavedimageresourcepages
\let\AM@luatexpagewidth\pagewidth
\let\AM@luatexpageheight\pageheight
- \protected\def\AM@annotation {\pdfextension annot }
- \protected\def\AM@thread {\pdfextension thread }
- \protected\def\AM@destination {\pdfextension dest }
+ \protected\def\AM@annotation {\pdfextension annot }%
+ \protected\def\AM@thread {\pdfextension thread }%
+ \protected\def\AM@destination {\pdfextension dest }%
\fi
%</ppluatexdef>
%</(pppdftexdef,ppluatexdef)>
@@ -4073,7 +4082,7 @@
% \begin{macrocode}
{\catcode`\"=12
\gdef\AM@quote{"}%
-}
+}%
% \end{macrocode}
% Get last page number.
% This driver uses the external program |extractbb| to retrieve the total number
@@ -4148,7 +4157,7 @@
}
\def\AM@setpagedimen{%
\special{pdf:pagesize width \the\AM@pagewidth\space
- height \the\AM@pageheight\space}
+ height \the\AM@pageheight\space}%
}
\def\AM@pagesize@boogie{%
\ifdim\AM@pagewidth=\z@
@@ -4636,6 +4645,12 @@
% |\includepdfset|. (It's no more restricted to options of pdfpages.)
% \end{itemize}
%
+% \subsection*{2016/12/11 v0.5g}
+% \begin{itemize}
+% \item Conflict between |nup| and |addtotoc| fixed. A |\newpage| was triggered
+% on each page where |addtotoc| inserted a label.
+% \end{itemize}
+%
% \Finale
%
% \iffalse