diff options
| -rw-r--r-- | Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdf | bin | 172282 -> 172136 bytes | |||
| -rw-r--r-- | Master/texmf-dist/source/latex/pdfpages/pdfpages.dtx | 37 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty | 23 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/pdfpages/ppnull.def | 4 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/pdfpages/pppdftex.def | 4 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/pdfpages/ppvtex.def | 4 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/pdfpages/ppxetex.def | 4 |
7 files changed, 56 insertions, 20 deletions
diff --git a/Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdf b/Master/texmf-dist/doc/latex/pdfpages/pdfpages.pdf Binary files differindex f771d52268a..c22e2aab977 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 742c898c047..46f3f3ebf89 100644 --- a/Master/texmf-dist/source/latex/pdfpages/pdfpages.dtx +++ b/Master/texmf-dist/source/latex/pdfpages/pdfpages.dtx @@ -27,10 +27,10 @@ %<*dtx> \makeatletter %</dtx> -\def\AM@fileversion{v0.4d} +\def\AM@fileversion{v0.4e} \def\AM@SVN@Date@i#1-#2-#3\END{\def\AM@filedate{#1/#2/#3}} \def\AM@SVN@Date$Date: #1 #2${\AM@SVN@Date@i#1\END} -\AM@SVN@Date$Date: 2008-04-27 20:52:17 +0200 (Sun, 27 Apr 2008) $ +\AM@SVN@Date$Date: 2008-05-11 00:31:21 +0200 (Sun, 11 May 2008) $ %</!(example1,example2,example3,installer)> % % @@ -76,7 +76,7 @@ % % \GetFileInfo{pdfpages.dtx} % -% \CheckSum{4250} +% \CheckSum{4268} % % \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 @@ -2408,9 +2408,26 @@ \def\AM@trim@spaceii#1 #2\END{#1} % \end{macrocode} % \macro{\AM@trim@leadingspace} -% Just removes leading space. +% Removes leading space. % \begin{macrocode} -\def\AM@trim@leadingspace#1{\ifdim\z@=0pt#1\fi} +\DeclareRobustCommand{\AM@trim@leadingspace}[1]{% + \AM@@trim@leadingspace#1 \END{#1}% +} +% \end{macrocode} +% \begin{macrocode} +\def\AM@@trim@leadingspace#1 #2\END#3{% + \begingroup + \def\x{#1}% + \expandafter\endgroup + \ifx\x\@empty + \AM@remove@leadingspace#3\END + \else + #3% + \fi +} +% \end{macrocode} +% \begin{macrocode} +\@firstofone{\def\AM@remove@leadingspace} #1\END{#1} % \end{macrocode} % \macro{\AM@isphantom} % Checks, if current page is an empty (phantom) page. @@ -2753,7 +2770,7 @@ % \begin{macrocode} \newcommand{\AM@addtolist@hook}{\relax} \newcommand{\AM@addtolist}{} -\def\AM@addtolist{ +\def\AM@addtolist{% \def\@captype{\AM@lof@list}% \long\def\@makecaption##1##2{}% \let\@fs@capt\relax% float.sty @@ -2780,7 +2797,7 @@ \def\AM@parse@loflisti#1,#2,#3,#4,#5\END{% \def\AM@lof@page{\AM@trim@space{#1}}% \def\AM@lof@list{\AM@trim@space{#2}}% - \edef\AM@lof@heading{\AM@trim@leadingspace{#3}}% + \def\AM@lof@heading{\AM@trim@leadingspace{#3}}% \def\AM@lof@label{\AM@trim@space{#4}}% \AM@checkinteger{\AM@lof@page}% \ifAM@integer\else @@ -3811,6 +3828,12 @@ % \item A more robust check of |\XeTeXversion|. % \end{itemize} % +% \subsection*{2008/05/11 v0.4e} +% \begin{itemize} +% \item Make |\AM@trim@leadinspace| robust to allow macros +% in the caption-argument of |addtolist|. +% \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 5630b73ac98..a5394336a0e 100644 --- a/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty +++ b/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty @@ -24,10 +24,10 @@ %% Please send error reports and suggestions for improvements to %% Andreas MATTHIAS <andreas.matthias@gmail.com>. %% -\def\AM@fileversion{v0.4d} +\def\AM@fileversion{v0.4e} \def\AM@SVN@Date@i#1-#2-#3\END{\def\AM@filedate{#1/#2/#3}} \def\AM@SVN@Date$Date: #1 #2${\AM@SVN@Date@i#1\END} -\AM@SVN@Date$Date: 2008-04-27 20:52:17 +0200 (Sun, 27 Apr 2008) $ +\AM@SVN@Date$Date: 2008-05-11 00:31:21 +0200 (Sun, 11 May 2008) $ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{pdfpages} [\AM@filedate\space\AM@fileversion\space @@ -1061,7 +1061,20 @@ \expandafter\AM@trim@spacei\expandafter{\ifdim\z@=0pt#1}\fi} \def\AM@trim@spacei#1{\AM@trim@spaceii#1 \END} \def\AM@trim@spaceii#1 #2\END{#1} -\def\AM@trim@leadingspace#1{\ifdim\z@=0pt#1\fi} +\DeclareRobustCommand{\AM@trim@leadingspace}[1]{% + \AM@@trim@leadingspace#1 \END{#1}% +} +\def\AM@@trim@leadingspace#1 #2\END#3{% + \begingroup + \def\x{#1}% + \expandafter\endgroup + \ifx\x\@empty + \AM@remove@leadingspace#3\END + \else + #3% + \fi +} +\@firstofone{\def\AM@remove@leadingspace} #1\END{#1} \newif\ifAM@phantompage \newcommand*{\AM@isphantom}{% \expandafter\ifx\expandafter\\\AM@page\\% @@ -1285,7 +1298,7 @@ } \newcommand{\AM@addtolist@hook}{\relax} \newcommand{\AM@addtolist}{} -\def\AM@addtolist{ +\def\AM@addtolist{% \def\@captype{\AM@lof@list}% \long\def\@makecaption##1##2{}% \let\@fs@capt\relax% float.sty @@ -1308,7 +1321,7 @@ \def\AM@parse@loflisti#1,#2,#3,#4,#5\END{% \def\AM@lof@page{\AM@trim@space{#1}}% \def\AM@lof@list{\AM@trim@space{#2}}% - \edef\AM@lof@heading{\AM@trim@leadingspace{#3}}% + \def\AM@lof@heading{\AM@trim@leadingspace{#3}}% \def\AM@lof@label{\AM@trim@space{#4}}% \AM@checkinteger{\AM@lof@page}% \ifAM@integer\else diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppnull.def b/Master/texmf-dist/tex/latex/pdfpages/ppnull.def index 9b437ff0139..6b1b8db78ea 100644 --- a/Master/texmf-dist/tex/latex/pdfpages/ppnull.def +++ b/Master/texmf-dist/tex/latex/pdfpages/ppnull.def @@ -24,10 +24,10 @@ %% Please send error reports and suggestions for improvements to %% Andreas MATTHIAS <andreas.matthias@gmail.com>. %% -\def\AM@fileversion{v0.4d} +\def\AM@fileversion{v0.4e} \def\AM@SVN@Date@i#1-#2-#3\END{\def\AM@filedate{#1/#2/#3}} \def\AM@SVN@Date$Date: #1 #2${\AM@SVN@Date@i#1\END} -\AM@SVN@Date$Date: 2008-04-27 20:52:17 +0200 (Sun, 27 Apr 2008) $ +\AM@SVN@Date$Date: 2008-05-11 00:31:21 +0200 (Sun, 11 May 2008) $ \ProvidesFile{ppnull.def} [\AM@filedate\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 41ba99490e1..c2126f09207 100644 --- a/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def +++ b/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def @@ -24,10 +24,10 @@ %% Please send error reports and suggestions for improvements to %% Andreas MATTHIAS <andreas.matthias@gmail.com>. %% -\def\AM@fileversion{v0.4d} +\def\AM@fileversion{v0.4e} \def\AM@SVN@Date@i#1-#2-#3\END{\def\AM@filedate{#1/#2/#3}} \def\AM@SVN@Date$Date: #1 #2${\AM@SVN@Date@i#1\END} -\AM@SVN@Date$Date: 2008-04-27 20:52:17 +0200 (Sun, 27 Apr 2008) $ +\AM@SVN@Date$Date: 2008-05-11 00:31:21 +0200 (Sun, 11 May 2008) $ \ProvidesFile{pppdftex.def} [\AM@filedate\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 b1faf628c5c..652ff8d4c29 100644 --- a/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def +++ b/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def @@ -24,10 +24,10 @@ %% Please send error reports and suggestions for improvements to %% Andreas MATTHIAS <andreas.matthias@gmail.com>. %% -\def\AM@fileversion{v0.4d} +\def\AM@fileversion{v0.4e} \def\AM@SVN@Date@i#1-#2-#3\END{\def\AM@filedate{#1/#2/#3}} \def\AM@SVN@Date$Date: #1 #2${\AM@SVN@Date@i#1\END} -\AM@SVN@Date$Date: 2008-04-27 20:52:17 +0200 (Sun, 27 Apr 2008) $ +\AM@SVN@Date$Date: 2008-05-11 00:31:21 +0200 (Sun, 11 May 2008) $ \ProvidesFile{ppvtex.def} [\AM@filedate\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 38d50fe2424..8a513843d09 100644 --- a/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def +++ b/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def @@ -12,10 +12,10 @@ %% Please send error reports and suggestions for improvements to %% Andreas MATTHIAS <andreas.matthias@gmail.com>. %% -\def\AM@fileversion{v0.4d} +\def\AM@fileversion{v0.4e} \def\AM@SVN@Date@i#1-#2-#3\END{\def\AM@filedate{#1/#2/#3}} \def\AM@SVN@Date$Date: #1 #2${\AM@SVN@Date@i#1\END} -\AM@SVN@Date$Date: 2008-04-27 20:52:17 +0200 (Sun, 27 Apr 2008) $ +\AM@SVN@Date$Date: 2008-05-11 00:31:21 +0200 (Sun, 11 May 2008) $ \ProvidesFile{ppxetex.def} [\AM@filedate\space\AM@fileversion\space Pdfpages driver for XeTeX (AM)] |