diff options
author | Karl Berry <karl@freefriends.org> | 2022-12-20 20:57:33 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2022-12-20 20:57:33 +0000 |
commit | da5ba7f71fefc2c87da99d8b1df350f72889b9ad (patch) | |
tree | f3b2d0d7503d320e1f1169cc5db6740c237971cc /Master/texmf-dist/source/latex/pdfpages | |
parent | b073f30b34a2a83d3555d86900b86f0729faa2e5 (diff) |
pdfpages (20dec22)
git-svn-id: svn://tug.org/texlive/trunk@65319 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/pdfpages')
-rw-r--r-- | Master/texmf-dist/source/latex/pdfpages/pdfpages.dtx | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/Master/texmf-dist/source/latex/pdfpages/pdfpages.dtx b/Master/texmf-dist/source/latex/pdfpages/pdfpages.dtx index 7496cc82d0b..8dea875318c 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.5w} +\def\AM@fileversion{v0.5x} \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-10-09 23:29:26 +0200 $ -\AM@Git@SHA@process$SHA-1: b912335fcefa15a5e7de97ef3732a2dcb82fe755 $ +\AM@Git@Date@process$Date: 2022-12-19 22:46:31 +0100 $ +\AM@Git@SHA@process$SHA-1: 730ca37af6c475efcbb518a30f4e6a615378fa58 $ %</!(example1,example2,example3,installer)> % % @@ -3054,10 +3054,10 @@ \def\@fs@capt##1##2{}% float.sty \AM@addtolist@hook \@ifundefined{hyper@@anchor}{% - \expandafter\caption\expandafter{\AM@lof@heading}% + \expandafter\caption\expandafter{\the\AM@lof@heading}% }{% \hyper@makecurrent{\@captype}% - \expandafter\caption\expandafter{\AM@lof@heading}% + \expandafter\caption\expandafter{\the\AM@lof@heading}% \hyper@@anchor{\@currentHref}{\relax}% \let\Hy@float@currentHref\@undefined }% @@ -3074,11 +3074,12 @@ } % \end{macrocode} % \begin{macrocode} +\newtoks\AM@lof@heading \newcommand{\AM@parse@loflisti}{} \def\AM@parse@loflisti#1,#2,#3,#4,#5\END{% \edef\AM@lof@page{\AM@trim@space{#1}}% \edef\AM@lof@list{\AM@trim@space{#2}}% - \def\AM@lof@heading{\ignorespaces #3}% + \AM@lof@heading{\ignorespaces #3}% \edef\AM@lof@label{\AM@trim@space{#4}}% \AM@checkinteger{\AM@lof@page}% \ifAM@integer\else @@ -3242,8 +3243,8 @@ \else\AM@outputfalse\fi} \define@key{pdfpages}{xr-prefix}{\edef\AM@xrprefix{#1}} \define@key{pdfpages}{fitpaper}[true]{\setboolean{AM@fitpaper}{#1}} -\define@key{pdfpages}{addtotoc}{\edef\AM@toclist{#1,}} -\define@key{pdfpages}{addtolist}{\edef\AM@loflist{#1,}} +\define@key{pdfpages}{addtotoc}{\protected@edef\AM@toclist{#1,}} +\define@key{pdfpages}{addtolist}{\protected@edef\AM@loflist{#1,}} \define@key{pdfpages}{doublepages}[true]% {\setboolean{AM@doublepages}{#1}} \define@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 |