From 5ef57beafc2325d43527f56b57905eee2e5a864b Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 4 Jun 2008 16:37:51 +0000 Subject: pdfpages update (3jun08) git-svn-id: svn://tug.org/texlive/trunk@8553 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/source/latex/pdfpages/pdfpages.dtx | 37 ++++++++++++++++++---- 1 file changed, 30 insertions(+), 7 deletions(-) (limited to 'Master/texmf-dist/source/latex') 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 % -\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) $ % % % @@ -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 -- cgit v1.2.3