From 03b8dcfa3435f0265dfad4fd09aaab8f4ff9c617 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 15 Jul 2017 21:26:18 +0000 Subject: pdfpages (15jul17) git-svn-id: svn://tug.org/texlive/trunk@44812 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/source/latex/pdfpages/pdfpages.dtx | 49 +++++++++------------- 1 file changed, 20 insertions(+), 29 deletions(-) (limited to 'Master/texmf-dist/source/latex/pdfpages') diff --git a/Master/texmf-dist/source/latex/pdfpages/pdfpages.dtx b/Master/texmf-dist/source/latex/pdfpages/pdfpages.dtx index a3dab664d9a..afd0d81e03e 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 % -\def\AM@fileversion{v0.5i} +\def\AM@fileversion{v0.5j} \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: 2017-06-14 22:06:21 +0200 $ -\AM@Git@SHA@process$SHA-1: 90315e6aa61828e6cf53e18c155e1927edb7cecf $ +\AM@Git@Date@process$Date: 2017-07-14 19:56:55 +0200 $ +\AM@Git@SHA@process$SHA-1: 5cfd471736b8290e5fba3ced19e38e96b7f30949 $ % % % @@ -84,7 +84,7 @@ % % \GetFileInfo{pdfpages.dtx} % -% \CheckSum{4931} +% \CheckSum{4923} % % \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 @@ -2602,24 +2602,7 @@ % \macro{\AM@trim@leadingspace} % Removes leading space. % \begin{macrocode} -\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} +\DeclareRobustCommand{\AM@trim@leadingspace}[1]{\ifdim\z@=0pt#1\fi} % \end{macrocode} % \macro{\AM@isphantom} % Checks, if current page is an empty (phantom) page. @@ -2966,13 +2949,16 @@ \def\AM@addtolist{% \def\@captype{\AM@lof@list}% \long\def\@makecaption##1##2{}% - \let\@fs@capt\relax% float.sty - \expandafter\caption\expandafter{\AM@lof@heading}% + \def\@fs@capt##1##2{}% float.sty \AM@addtolist@hook - \@ifundefined{hyper@@anchor}{}{% - \@ifundefined{float@caption}{% - \hyper@@anchor{\@currentHref}{\relax}% - }{}}% + \@ifundefined{hyper@@anchor}{% + \expandafter\caption\expandafter{\AM@lof@heading}% + }{% + \hyper@makecurrent{\@captype}% + \expandafter\caption\expandafter{\AM@lof@heading}% + \hyper@@anchor{\@currentHref}{\relax}% + \let\Hy@float@currentHref\@undefined + }% \label{\AM@lof@label}% \vskip-\baselineskip } @@ -2990,7 +2976,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}}% - \def\AM@lof@heading{#3}% + \def\AM@lof@heading{\ignorespaces #3}% \def\AM@lof@label{\AM@trim@space{#4}}% \AM@checkinteger{\AM@lof@page}% \ifAM@integer\else @@ -4673,6 +4659,11 @@ % of a PDF correctly. % \end{itemize} % +% \subsection*{2017/07/14 v0.5j} +% \begin{itemize} +% \item Fixed |addtolist| which was broken when used with |float.sty|. +% \end{itemize} +% % \Finale % % \iffalse -- cgit v1.2.3