texlive[65319] Master/texmf-dist: pdfpages (20dec22)
commits+karl at tug.org
commits+karl at tug.org
Tue Dec 20 21:57:34 CET 2022
Revision: 65319
http://tug.org/svn/texlive?view=revision&revision=65319
Author: karl
Date: 2022-12-20 21:57:33 +0100 (Tue, 20 Dec 2022)
Log Message:
-----------
pdfpages (20dec22)
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 2022-12-20 20:57:17 UTC (rev 65318)
+++ trunk/Master/texmf-dist/source/latex/pdfpages/pdfpages.dtx 2022-12-20 20:57:33 UTC (rev 65319)
@@ -27,12 +27,12 @@
%<*dtx>
\makeatletter
%</dtx>
-\def\AM at fileversion{v0.5w}
+\def\AM at fileversion{v0.5x}
\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-10-09 23:29:26 +0200 $
-\AM at Git@SHA at process$SHA-1: b912335fcefa15a5e7de97ef3732a2dcb82fe755 $
+\AM at Git@Date at process$Date: 2022-12-19 22:46:31 +0100 $
+\AM at Git@SHA at process$SHA-1: 730ca37af6c475efcbb518a30f4e6a615378fa58 $
%</!(example1,example2,example3,installer)>
%
%
@@ -3054,10 +3054,10 @@
\def\@fs at capt##1##2{}% float.sty
\AM at addtolist@hook
\@ifundefined{hyper@@anchor}{%
- \expandafter\caption\expandafter{\AM at lof@heading}%
+ \expandafter\caption\expandafter{\the\AM at lof@heading}%
}{%
\hyper at makecurrent{\@captype}%
- \expandafter\caption\expandafter{\AM at lof@heading}%
+ \expandafter\caption\expandafter{\the\AM at lof@heading}%
\hyper@@anchor{\@currentHref}{\relax}%
\let\Hy at float@currentHref\@undefined
}%
@@ -3074,11 +3074,12 @@
}
% \end{macrocode}
% \begin{macrocode}
+\newtoks\AM at lof@heading
\newcommand{\AM at parse@loflisti}{}
\def\AM at parse@loflisti#1,#2,#3,#4,#5\END{%
\edef\AM at lof@page{\AM at trim@space{#1}}%
\edef\AM at lof@list{\AM at trim@space{#2}}%
- \def\AM at lof@heading{\ignorespaces #3}%
+ \AM at lof@heading{\ignorespaces #3}%
\edef\AM at lof@label{\AM at trim@space{#4}}%
\AM at checkinteger{\AM at lof@page}%
\ifAM at integer\else
@@ -3242,8 +3243,8 @@
\else\AM at outputfalse\fi}
\define at key{pdfpages}{xr-prefix}{\edef\AM at xrprefix{#1}}
\define at key{pdfpages}{fitpaper}[true]{\setboolean{AM at fitpaper}{#1}}
-\define at key{pdfpages}{addtotoc}{\edef\AM at toclist{#1,}}
-\define at key{pdfpages}{addtolist}{\edef\AM at loflist{#1,}}
+\define at key{pdfpages}{addtotoc}{\protected at edef\AM at toclist{#1,}}
+\define at key{pdfpages}{addtolist}{\protected at edef\AM at loflist{#1,}}
\define at key{pdfpages}{doublepages}[true]%
{\setboolean{AM at doublepages}{#1}}
\define at key{pdfpages}{doublepagestwist}[true]%
@@ -4871,6 +4872,11 @@
% \begin{itemize}
% \item Keyval arguments get fully expanded.
% \end{itemize}
+%
+% \subsection*{2022/12/19 v0.5x}
+% \begin{itemize}
+% \item Expand args of addtotoc and addtolist more graciously.
+% \end{itemize}
% \Finale
%
% \iffalse
Modified: trunk/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty 2022-12-20 20:57:17 UTC (rev 65318)
+++ trunk/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty 2022-12-20 20:57:33 UTC (rev 65319)
@@ -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.5w}
+\def\AM at fileversion{v0.5x}
\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-10-09 23:29:26 +0200 $
-\AM at Git@SHA at process$SHA-1: b912335fcefa15a5e7de97ef3732a2dcb82fe755 $
+\AM at Git@Date at process$Date: 2022-12-19 22:46:31 +0100 $
+\AM at Git@SHA at process$SHA-1: 730ca37af6c475efcbb518a30f4e6a615378fa58 $
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{pdfpages}
[\AM at Git@Date\space\AM at fileversion\space
@@ -1432,10 +1432,10 @@
\def\@fs at capt##1##2{}% float.sty
\AM at addtolist@hook
\@ifundefined{hyper@@anchor}{%
- \expandafter\caption\expandafter{\AM at lof@heading}%
+ \expandafter\caption\expandafter{\the\AM at lof@heading}%
}{%
\hyper at makecurrent{\@captype}%
- \expandafter\caption\expandafter{\AM at lof@heading}%
+ \expandafter\caption\expandafter{\the\AM at lof@heading}%
\hyper@@anchor{\@currentHref}{\relax}%
\let\Hy at float@currentHref\@undefined
}%
@@ -1448,11 +1448,12 @@
\else \expandafter\AM at parse@loflisti\AM at loflist\END
\fi
}
+\newtoks\AM at lof@heading
\newcommand{\AM at parse@loflisti}{}
\def\AM at parse@loflisti#1,#2,#3,#4,#5\END{%
\edef\AM at lof@page{\AM at trim@space{#1}}%
\edef\AM at lof@list{\AM at trim@space{#2}}%
- \def\AM at lof@heading{\ignorespaces #3}%
+ \AM at lof@heading{\ignorespaces #3}%
\edef\AM at lof@label{\AM at trim@space{#4}}%
\AM at checkinteger{\AM at lof@page}%
\ifAM at integer\else
@@ -1588,8 +1589,8 @@
\else\AM at outputfalse\fi}
\define at key{pdfpages}{xr-prefix}{\edef\AM at xrprefix{#1}}
\define at key{pdfpages}{fitpaper}[true]{\setboolean{AM at fitpaper}{#1}}
-\define at key{pdfpages}{addtotoc}{\edef\AM at toclist{#1,}}
-\define at key{pdfpages}{addtolist}{\edef\AM at loflist{#1,}}
+\define at key{pdfpages}{addtotoc}{\protected at edef\AM at toclist{#1,}}
+\define at key{pdfpages}{addtolist}{\protected at edef\AM at loflist{#1,}}
\define at key{pdfpages}{doublepages}[true]%
{\setboolean{AM at doublepages}{#1}}
\define at key{pdfpages}{doublepagestwist}[true]%
Modified: trunk/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def 2022-12-20 20:57:17 UTC (rev 65318)
+++ trunk/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def 2022-12-20 20:57:33 UTC (rev 65319)
@@ -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.5w}
+\def\AM at fileversion{v0.5x}
\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-10-09 23:29:26 +0200 $
-\AM at Git@SHA at process$SHA-1: b912335fcefa15a5e7de97ef3732a2dcb82fe755 $
+\AM at Git@Date at process$Date: 2022-12-19 22:46:31 +0100 $
+\AM at Git@SHA at process$SHA-1: 730ca37af6c475efcbb518a30f4e6a615378fa58 $
\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 2022-12-20 20:57:17 UTC (rev 65318)
+++ trunk/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def 2022-12-20 20:57:33 UTC (rev 65319)
@@ -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.5w}
+\def\AM at fileversion{v0.5x}
\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-10-09 23:29:26 +0200 $
-\AM at Git@SHA at process$SHA-1: b912335fcefa15a5e7de97ef3732a2dcb82fe755 $
+\AM at Git@Date at process$Date: 2022-12-19 22:46:31 +0100 $
+\AM at Git@SHA at process$SHA-1: 730ca37af6c475efcbb518a30f4e6a615378fa58 $
\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 2022-12-20 20:57:17 UTC (rev 65318)
+++ trunk/Master/texmf-dist/tex/latex/pdfpages/ppluatex.def 2022-12-20 20:57:33 UTC (rev 65319)
@@ -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.5w}
+\def\AM at fileversion{v0.5x}
\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-10-09 23:29:26 +0200 $
-\AM at Git@SHA at process$SHA-1: b912335fcefa15a5e7de97ef3732a2dcb82fe755 $
+\AM at Git@Date at process$Date: 2022-12-19 22:46:31 +0100 $
+\AM at Git@SHA at process$SHA-1: 730ca37af6c475efcbb518a30f4e6a615378fa58 $
\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 2022-12-20 20:57:17 UTC (rev 65318)
+++ trunk/Master/texmf-dist/tex/latex/pdfpages/ppnull.def 2022-12-20 20:57:33 UTC (rev 65319)
@@ -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.5w}
+\def\AM at fileversion{v0.5x}
\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-10-09 23:29:26 +0200 $
-\AM at Git@SHA at process$SHA-1: b912335fcefa15a5e7de97ef3732a2dcb82fe755 $
+\AM at Git@Date at process$Date: 2022-12-19 22:46:31 +0100 $
+\AM at Git@SHA at process$SHA-1: 730ca37af6c475efcbb518a30f4e6a615378fa58 $
\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 2022-12-20 20:57:17 UTC (rev 65318)
+++ trunk/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def 2022-12-20 20:57:33 UTC (rev 65319)
@@ -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.5w}
+\def\AM at fileversion{v0.5x}
\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-10-09 23:29:26 +0200 $
-\AM at Git@SHA at process$SHA-1: b912335fcefa15a5e7de97ef3732a2dcb82fe755 $
+\AM at Git@Date at process$Date: 2022-12-19 22:46:31 +0100 $
+\AM at Git@SHA at process$SHA-1: 730ca37af6c475efcbb518a30f4e6a615378fa58 $
\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 2022-12-20 20:57:17 UTC (rev 65318)
+++ trunk/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def 2022-12-20 20:57:33 UTC (rev 65319)
@@ -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.5w}
+\def\AM at fileversion{v0.5x}
\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-10-09 23:29:26 +0200 $
-\AM at Git@SHA at process$SHA-1: b912335fcefa15a5e7de97ef3732a2dcb82fe755 $
+\AM at Git@Date at process$Date: 2022-12-19 22:46:31 +0100 $
+\AM at Git@SHA at process$SHA-1: 730ca37af6c475efcbb518a30f4e6a615378fa58 $
\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 2022-12-20 20:57:17 UTC (rev 65318)
+++ trunk/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def 2022-12-20 20:57:33 UTC (rev 65319)
@@ -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.5w}
+\def\AM at fileversion{v0.5x}
\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-10-09 23:29:26 +0200 $
-\AM at Git@SHA at process$SHA-1: b912335fcefa15a5e7de97ef3732a2dcb82fe755 $
+\AM at Git@Date at process$Date: 2022-12-19 22:46:31 +0100 $
+\AM at Git@SHA at process$SHA-1: 730ca37af6c475efcbb518a30f4e6a615378fa58 $
\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.