summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/pdfpages/pdfpages.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'macros/latex/contrib/pdfpages/pdfpages.dtx')
-rw-r--r--macros/latex/contrib/pdfpages/pdfpages.dtx24
1 files changed, 17 insertions, 7 deletions
diff --git a/macros/latex/contrib/pdfpages/pdfpages.dtx b/macros/latex/contrib/pdfpages/pdfpages.dtx
index 8dea875318..7c53462359 100644
--- a/macros/latex/contrib/pdfpages/pdfpages.dtx
+++ b/macros/latex/contrib/pdfpages/pdfpages.dtx
@@ -2,7 +2,7 @@
% \iffalse
%
%<*(package,pppdftexdef,ppluatexdef,ppvtexdef,ppxetexdef,ppdvipsdef,ppdvipdfmxdef,ppnulldef)>
-%% Copyright (C) 2001-2022 Andreas MATTHIAS
+%% Copyright (C) 2001-2024 Andreas MATTHIAS
%%
%% This work may be distributed and/or modified under the conditions
%% of the LaTeX Project Public License, either version 1.3c
@@ -27,12 +27,12 @@
%<*dtx>
\makeatletter
%</dtx>
-\def\AM@fileversion{v0.5x}
+\def\AM@fileversion{v0.5y}
\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: 2022-12-19 22:46:31 +0100 $
-\AM@Git@SHA@process$SHA-1: 730ca37af6c475efcbb518a30f4e6a615378fa58 $
+\AM@Git@Date@process$Date: 2024-01-21 13:41:59 +0100 $
+\AM@Git@SHA@process$SHA-1: 019995ba4828f9b782eae8f6d4c9e90f257fa598 $
%</!(example1,example2,example3,installer)>
%
%
@@ -84,7 +84,7 @@
%
% \GetFileInfo{pdfpages.dtx}
%
-% \CheckSum{5077}
+% \CheckSum{5106}
%
% \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
@@ -1378,6 +1378,7 @@
\newcommand*{\includepdf}[2][]{%
\begingroup
\global\pdfpages@includegraphics@status\tw@
+ \@ifundefined{@setmarks}{\let\@setmarks\relax}{}
\AM@pagecnt\@ne
\let\AM@threadname\relax
\def\AM@tmp{pdfpages}
@@ -1734,7 +1735,7 @@
% of paper.
% \begin{macrocode}
\setboolean{AM@endoflist}{false}%
- \newpage
+ \clearpage
\whiledo{\not\boolean{AM@endoflist}}{%
\AM@getfirst{\AM@pagelist}%
\edef\AM@page{\the\toks@}%
@@ -1794,7 +1795,7 @@
% \end{macrocode}
% \begin{macrocode}
\ifAM@newpage
- \newpage
+ \clearpage
\AM@newpagefalse
\fi
% \end{macrocode}
@@ -4877,6 +4878,15 @@
% \begin{itemize}
% \item Expand args of addtotoc and addtolist more graciously.
% \end{itemize}
+%
+% \subsection*{2024/01/21 v0.5y}
+% \begin{itemize}
+% \item Fix issues with twocolumn documents
+% \begin{itemize}
+% \item |\newpage| -> |\clearpage|
+% \item Define |\@setmarks| if undefined.
+% \end{itemize}
+% \end{itemize}
% \Finale
%
% \iffalse