diff options
-rw-r--r-- | Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdf | bin | 301211 -> 301555 bytes | |||
-rw-r--r-- | Master/texmf-dist/source/latex/pdfpages/pdfpages.dtx | 22 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty | 17 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def | 6 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/pdfpages/ppdvips.def | 6 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/pdfpages/ppluatex.def | 6 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/pdfpages/ppnull.def | 6 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/pdfpages/pppdftex.def | 6 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/pdfpages/ppvtex.def | 6 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/pdfpages/ppxetex.def | 6 |
10 files changed, 44 insertions, 37 deletions
diff --git a/Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdf b/Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdf Binary files differindex 918fc0a62f6..6c8e9d74b2d 100644 --- a/Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdf +++ b/Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdf 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 diff --git a/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty b/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty index 19047fa3a91..4db8925d5f9 100644 --- a/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty +++ b/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty @@ -24,12 +24,12 @@ %% Please send error reports and suggestions for improvements to %% Andreas MATTHIAS <andreas.matthias@gmail.com>. %% -\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 $ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{pdfpages} [\AM@Git@Date\space\AM@fileversion\space @@ -1432,10 +1432,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 }% @@ -1448,11 +1448,12 @@ \else \expandafter\AM@parse@loflisti\AM@loflist\END \fi } +\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 @@ -1588,8 +1589,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]% diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def b/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def index b10e2dd16fc..79e6133a2d1 100644 --- a/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def +++ b/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def @@ -24,12 +24,12 @@ %% Please send error reports and suggestions for improvements to %% Andreas MATTHIAS <andreas.matthias@gmail.com>. %% -\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 $ \ProvidesFile{ppdvipdfmx.def} [\AM@Git@Date\space\AM@fileversion\space Pdfpages driver for dvipdfmx (AM)] diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def b/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def index c2c5055c5d0..395af3d00ac 100644 --- a/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def +++ b/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def @@ -24,12 +24,12 @@ %% Please send error reports and suggestions for improvements to %% Andreas MATTHIAS <andreas.matthias@gmail.com>. %% -\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 $ \ProvidesFile{ppdvips.def} [\AM@Git@Date\space\AM@fileversion\space Pdfpages driver for dvips (AM)] diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppluatex.def b/Master/texmf-dist/tex/latex/pdfpages/ppluatex.def index 0e66f4c5070..c506aa2357e 100644 --- a/Master/texmf-dist/tex/latex/pdfpages/ppluatex.def +++ b/Master/texmf-dist/tex/latex/pdfpages/ppluatex.def @@ -24,12 +24,12 @@ %% Please send error reports and suggestions for improvements to %% Andreas MATTHIAS <andreas.matthias@gmail.com>. %% -\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 $ \ProvidesFile{ppluatex.def} [\AM@Git@Date\space\AM@fileversion\space Pdfpages driver for LuaTeX (AM)] diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppnull.def b/Master/texmf-dist/tex/latex/pdfpages/ppnull.def index eb64c4ad0c6..9255a68acd9 100644 --- a/Master/texmf-dist/tex/latex/pdfpages/ppnull.def +++ b/Master/texmf-dist/tex/latex/pdfpages/ppnull.def @@ -24,12 +24,12 @@ %% Please send error reports and suggestions for improvements to %% Andreas MATTHIAS <andreas.matthias@gmail.com>. %% -\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 $ \ProvidesFile{ppnull.def} [\AM@Git@Date\space\AM@fileversion\space Pdfpages dummy driver (AM)] diff --git a/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def b/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def index 5caa83270ff..5b9caf7fcc5 100644 --- a/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def +++ b/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def @@ -24,12 +24,12 @@ %% Please send error reports and suggestions for improvements to %% Andreas MATTHIAS <andreas.matthias@gmail.com>. %% -\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 $ \ProvidesFile{pppdftex.def} [\AM@Git@Date\space\AM@fileversion\space Pdfpages driver for pdfTeX (AM)] diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def b/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def index df0ccbffc44..44936414551 100644 --- a/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def +++ b/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def @@ -24,12 +24,12 @@ %% Please send error reports and suggestions for improvements to %% Andreas MATTHIAS <andreas.matthias@gmail.com>. %% -\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 $ \ProvidesFile{ppvtex.def} [\AM@Git@Date\space\AM@fileversion\space Pdfpages driver for VTeX (AM)] diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def b/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def index 8b6a7c435b5..9631d472001 100644 --- a/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def +++ b/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def @@ -24,12 +24,12 @@ %% Please send error reports and suggestions for improvements to %% Andreas MATTHIAS <andreas.matthias@gmail.com>. %% -\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 $ \ProvidesFile{ppxetex.def} [\AM@Git@Date\space\AM@fileversion\space Pdfpages driver for XeTeX (AM)] |