texlive[69524] Master/texmf-dist: pdfpages (21jan24)
commits+karl at tug.org
commits+karl at tug.org
Sun Jan 21 22:16:14 CET 2024
Revision: 69524
https://tug.org/svn/texlive?view=revision&revision=69524
Author: karl
Date: 2024-01-21 22:16:13 +0100 (Sun, 21 Jan 2024)
Log Message:
-----------
pdfpages (21jan24)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdf
trunk/Master/texmf-dist/source/latex/pdfpages/pdfpages.dtx
trunk/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty
trunk/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def
trunk/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def
trunk/Master/texmf-dist/tex/latex/pdfpages/ppluatex.def
trunk/Master/texmf-dist/tex/latex/pdfpages/ppnull.def
trunk/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def
trunk/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def
trunk/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def
Modified: trunk/Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/pdfpages/pdfpages.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/pdfpages/pdfpages.dtx 2024-01-21 21:16:05 UTC (rev 69523)
+++ trunk/Master/texmf-dist/source/latex/pdfpages/pdfpages.dtx 2024-01-21 21:16:13 UTC (rev 69524)
@@ -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 at fileversion{v0.5x}
+\def\AM at fileversion{v0.5y}
\def\AM at Git@Date at process$#1: #2 #3${\AM at Git@Date at process@i#2\END}
\def\AM at Git@Date at process@i#1-#2-#3\END{\def\AM at Git@Date{#1/#2/#3}}
\def\AM at Git@SHA at process$#1: #2${\def\AM at Git@SHA{#2}}
-\AM at Git@Date at process$Date: 2022-12-19 22:46:31 +0100 $
-\AM at Git@SHA at process$SHA-1: 730ca37af6c475efcbb518a30f4e6a615378fa58 $
+\AM at Git@Date at process$Date: 2024-01-21 13:41:59 +0100 $
+\AM at Git@SHA at 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 at includegraphics@status\tw@
+ \@ifundefined{@setmarks}{\let\@setmarks\relax}{}
\AM at pagecnt\@ne
\let\AM at threadname\relax
\def\AM at tmp{pdfpages}
@@ -1734,7 +1735,7 @@
% of paper.
% \begin{macrocode}
\setboolean{AM at endoflist}{false}%
- \newpage
+ \clearpage
\whiledo{\not\boolean{AM at endoflist}}{%
\AM at getfirst{\AM at pagelist}%
\edef\AM at page{\the\toks@}%
@@ -1794,7 +1795,7 @@
% \end{macrocode}
% \begin{macrocode}
\ifAM at newpage
- \newpage
+ \clearpage
\AM at 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
Modified: trunk/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty 2024-01-21 21:16:05 UTC (rev 69523)
+++ trunk/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty 2024-01-21 21:16:13 UTC (rev 69524)
@@ -8,7 +8,7 @@
%%
%% This file is part of the pdfpages package.
%%
-%% 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
@@ -24,12 +24,12 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS <andreas.matthias at gmail.com>.
%%
-\def\AM at fileversion{v0.5x}
+\def\AM at fileversion{v0.5y}
\def\AM at Git@Date at process$#1: #2 #3${\AM at Git@Date at process@i#2\END}
\def\AM at Git@Date at process@i#1-#2-#3\END{\def\AM at Git@Date{#1/#2/#3}}
\def\AM at Git@SHA at process$#1: #2${\def\AM at Git@SHA{#2}}
-\AM at Git@Date at process$Date: 2022-12-19 22:46:31 +0100 $
-\AM at Git@SHA at process$SHA-1: 730ca37af6c475efcbb518a30f4e6a615378fa58 $
+\AM at Git@Date at process$Date: 2024-01-21 13:41:59 +0100 $
+\AM at Git@SHA at process$SHA-1: 019995ba4828f9b782eae8f6d4c9e90f257fa598 $
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{pdfpages}
[\AM at Git@Date\space\AM at fileversion\space
@@ -208,6 +208,7 @@
\newcommand*{\includepdf}[2][]{%
\begingroup
\global\pdfpages at includegraphics@status\tw@
+ \@ifundefined{@setmarks}{\let\@setmarks\relax}{}
\AM at pagecnt\@ne
\let\AM at threadname\relax
\def\AM at tmp{pdfpages}
@@ -468,7 +469,7 @@
\ifAM at landscape\AM at sigrotatefalse\else\AM at sigrotatetrue\fi
\fi
\setboolean{AM at endoflist}{false}%
- \newpage
+ \clearpage
\whiledo{\not\boolean{AM at endoflist}}{%
\AM at getfirst{\AM at pagelist}%
\edef\AM at page{\the\toks@}%
@@ -521,7 +522,7 @@
\fi
}%
\ifAM at newpage
- \newpage
+ \clearpage
\AM at newpagefalse
\fi
\edef\AM at opts{[\AM at disable@width at height,\the\@temptokena,
Modified: trunk/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def 2024-01-21 21:16:05 UTC (rev 69523)
+++ trunk/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def 2024-01-21 21:16:13 UTC (rev 69524)
@@ -8,7 +8,7 @@
%%
%% This file is part of the pdfpages package.
%%
-%% 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
@@ -24,12 +24,12 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS <andreas.matthias at gmail.com>.
%%
-\def\AM at fileversion{v0.5x}
+\def\AM at fileversion{v0.5y}
\def\AM at Git@Date at process$#1: #2 #3${\AM at Git@Date at process@i#2\END}
\def\AM at Git@Date at process@i#1-#2-#3\END{\def\AM at Git@Date{#1/#2/#3}}
\def\AM at Git@SHA at process$#1: #2${\def\AM at Git@SHA{#2}}
-\AM at Git@Date at process$Date: 2022-12-19 22:46:31 +0100 $
-\AM at Git@SHA at process$SHA-1: 730ca37af6c475efcbb518a30f4e6a615378fa58 $
+\AM at Git@Date at process$Date: 2024-01-21 13:41:59 +0100 $
+\AM at Git@SHA at process$SHA-1: 019995ba4828f9b782eae8f6d4c9e90f257fa598 $
\ProvidesFile{ppdvipdfmx.def}
[\AM at Git@Date\space\AM at fileversion\space
Pdfpages driver for dvipdfmx (AM)]
Modified: trunk/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def 2024-01-21 21:16:05 UTC (rev 69523)
+++ trunk/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def 2024-01-21 21:16:13 UTC (rev 69524)
@@ -8,7 +8,7 @@
%%
%% This file is part of the pdfpages package.
%%
-%% 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
@@ -24,12 +24,12 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS <andreas.matthias at gmail.com>.
%%
-\def\AM at fileversion{v0.5x}
+\def\AM at fileversion{v0.5y}
\def\AM at Git@Date at process$#1: #2 #3${\AM at Git@Date at process@i#2\END}
\def\AM at Git@Date at process@i#1-#2-#3\END{\def\AM at Git@Date{#1/#2/#3}}
\def\AM at Git@SHA at process$#1: #2${\def\AM at Git@SHA{#2}}
-\AM at Git@Date at process$Date: 2022-12-19 22:46:31 +0100 $
-\AM at Git@SHA at process$SHA-1: 730ca37af6c475efcbb518a30f4e6a615378fa58 $
+\AM at Git@Date at process$Date: 2024-01-21 13:41:59 +0100 $
+\AM at Git@SHA at process$SHA-1: 019995ba4828f9b782eae8f6d4c9e90f257fa598 $
\ProvidesFile{ppdvips.def}
[\AM at Git@Date\space\AM at fileversion\space
Pdfpages driver for dvips (AM)]
Modified: trunk/Master/texmf-dist/tex/latex/pdfpages/ppluatex.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/pdfpages/ppluatex.def 2024-01-21 21:16:05 UTC (rev 69523)
+++ trunk/Master/texmf-dist/tex/latex/pdfpages/ppluatex.def 2024-01-21 21:16:13 UTC (rev 69524)
@@ -8,7 +8,7 @@
%%
%% This file is part of the pdfpages package.
%%
-%% 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
@@ -24,12 +24,12 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS <andreas.matthias at gmail.com>.
%%
-\def\AM at fileversion{v0.5x}
+\def\AM at fileversion{v0.5y}
\def\AM at Git@Date at process$#1: #2 #3${\AM at Git@Date at process@i#2\END}
\def\AM at Git@Date at process@i#1-#2-#3\END{\def\AM at Git@Date{#1/#2/#3}}
\def\AM at Git@SHA at process$#1: #2${\def\AM at Git@SHA{#2}}
-\AM at Git@Date at process$Date: 2022-12-19 22:46:31 +0100 $
-\AM at Git@SHA at process$SHA-1: 730ca37af6c475efcbb518a30f4e6a615378fa58 $
+\AM at Git@Date at process$Date: 2024-01-21 13:41:59 +0100 $
+\AM at Git@SHA at process$SHA-1: 019995ba4828f9b782eae8f6d4c9e90f257fa598 $
\ProvidesFile{ppluatex.def}
[\AM at Git@Date\space\AM at fileversion\space
Pdfpages driver for LuaTeX (AM)]
Modified: trunk/Master/texmf-dist/tex/latex/pdfpages/ppnull.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/pdfpages/ppnull.def 2024-01-21 21:16:05 UTC (rev 69523)
+++ trunk/Master/texmf-dist/tex/latex/pdfpages/ppnull.def 2024-01-21 21:16:13 UTC (rev 69524)
@@ -8,7 +8,7 @@
%%
%% This file is part of the pdfpages package.
%%
-%% 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
@@ -24,12 +24,12 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS <andreas.matthias at gmail.com>.
%%
-\def\AM at fileversion{v0.5x}
+\def\AM at fileversion{v0.5y}
\def\AM at Git@Date at process$#1: #2 #3${\AM at Git@Date at process@i#2\END}
\def\AM at Git@Date at process@i#1-#2-#3\END{\def\AM at Git@Date{#1/#2/#3}}
\def\AM at Git@SHA at process$#1: #2${\def\AM at Git@SHA{#2}}
-\AM at Git@Date at process$Date: 2022-12-19 22:46:31 +0100 $
-\AM at Git@SHA at process$SHA-1: 730ca37af6c475efcbb518a30f4e6a615378fa58 $
+\AM at Git@Date at process$Date: 2024-01-21 13:41:59 +0100 $
+\AM at Git@SHA at process$SHA-1: 019995ba4828f9b782eae8f6d4c9e90f257fa598 $
\ProvidesFile{ppnull.def}
[\AM at Git@Date\space\AM at fileversion\space
Pdfpages dummy driver (AM)]
Modified: trunk/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def 2024-01-21 21:16:05 UTC (rev 69523)
+++ trunk/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def 2024-01-21 21:16:13 UTC (rev 69524)
@@ -8,7 +8,7 @@
%%
%% This file is part of the pdfpages package.
%%
-%% 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
@@ -24,12 +24,12 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS <andreas.matthias at gmail.com>.
%%
-\def\AM at fileversion{v0.5x}
+\def\AM at fileversion{v0.5y}
\def\AM at Git@Date at process$#1: #2 #3${\AM at Git@Date at process@i#2\END}
\def\AM at Git@Date at process@i#1-#2-#3\END{\def\AM at Git@Date{#1/#2/#3}}
\def\AM at Git@SHA at process$#1: #2${\def\AM at Git@SHA{#2}}
-\AM at Git@Date at process$Date: 2022-12-19 22:46:31 +0100 $
-\AM at Git@SHA at process$SHA-1: 730ca37af6c475efcbb518a30f4e6a615378fa58 $
+\AM at Git@Date at process$Date: 2024-01-21 13:41:59 +0100 $
+\AM at Git@SHA at process$SHA-1: 019995ba4828f9b782eae8f6d4c9e90f257fa598 $
\ProvidesFile{pppdftex.def}
[\AM at Git@Date\space\AM at fileversion\space
Pdfpages driver for pdfTeX (AM)]
Modified: trunk/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def 2024-01-21 21:16:05 UTC (rev 69523)
+++ trunk/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def 2024-01-21 21:16:13 UTC (rev 69524)
@@ -8,7 +8,7 @@
%%
%% This file is part of the pdfpages package.
%%
-%% 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
@@ -24,12 +24,12 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS <andreas.matthias at gmail.com>.
%%
-\def\AM at fileversion{v0.5x}
+\def\AM at fileversion{v0.5y}
\def\AM at Git@Date at process$#1: #2 #3${\AM at Git@Date at process@i#2\END}
\def\AM at Git@Date at process@i#1-#2-#3\END{\def\AM at Git@Date{#1/#2/#3}}
\def\AM at Git@SHA at process$#1: #2${\def\AM at Git@SHA{#2}}
-\AM at Git@Date at process$Date: 2022-12-19 22:46:31 +0100 $
-\AM at Git@SHA at process$SHA-1: 730ca37af6c475efcbb518a30f4e6a615378fa58 $
+\AM at Git@Date at process$Date: 2024-01-21 13:41:59 +0100 $
+\AM at Git@SHA at process$SHA-1: 019995ba4828f9b782eae8f6d4c9e90f257fa598 $
\ProvidesFile{ppvtex.def}
[\AM at Git@Date\space\AM at fileversion\space
Pdfpages driver for VTeX (AM)]
Modified: trunk/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def 2024-01-21 21:16:05 UTC (rev 69523)
+++ trunk/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def 2024-01-21 21:16:13 UTC (rev 69524)
@@ -8,7 +8,7 @@
%%
%% This file is part of the pdfpages package.
%%
-%% 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
@@ -24,12 +24,12 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS <andreas.matthias at gmail.com>.
%%
-\def\AM at fileversion{v0.5x}
+\def\AM at fileversion{v0.5y}
\def\AM at Git@Date at process$#1: #2 #3${\AM at Git@Date at process@i#2\END}
\def\AM at Git@Date at process@i#1-#2-#3\END{\def\AM at Git@Date{#1/#2/#3}}
\def\AM at Git@SHA at process$#1: #2${\def\AM at Git@SHA{#2}}
-\AM at Git@Date at process$Date: 2022-12-19 22:46:31 +0100 $
-\AM at Git@SHA at process$SHA-1: 730ca37af6c475efcbb518a30f4e6a615378fa58 $
+\AM at Git@Date at process$Date: 2024-01-21 13:41:59 +0100 $
+\AM at Git@SHA at process$SHA-1: 019995ba4828f9b782eae8f6d4c9e90f257fa598 $
\ProvidesFile{ppxetex.def}
[\AM at Git@Date\space\AM at fileversion\space
Pdfpages driver for XeTeX (AM)]
More information about the tex-live-commits
mailing list.