From e2d2baec9bd8267295ba458fa84718e3d7ee8a76 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 24 Dec 2011 23:51:55 +0000 Subject: cleveref 0.18.1 (24dec11) git-svn-id: svn://tug.org/texlive/trunk@24937 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/cleveref/cleveref.pdf | Bin 364722 -> 364803 bytes .../texmf-dist/source/latex/cleveref/cleveref.dtx | 43 ++++++++++++++------- Master/texmf-dist/tex/latex/cleveref/cleveref.sty | 20 +++++----- 3 files changed, 41 insertions(+), 22 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/cleveref/cleveref.pdf b/Master/texmf-dist/doc/latex/cleveref/cleveref.pdf index 87647421076..4219c90b95e 100644 Binary files a/Master/texmf-dist/doc/latex/cleveref/cleveref.pdf and b/Master/texmf-dist/doc/latex/cleveref/cleveref.pdf differ diff --git a/Master/texmf-dist/source/latex/cleveref/cleveref.dtx b/Master/texmf-dist/source/latex/cleveref/cleveref.dtx index 23bcbccf9ed..f977a23fd89 100644 --- a/Master/texmf-dist/source/latex/cleveref/cleveref.dtx +++ b/Master/texmf-dist/source/latex/cleveref/cleveref.dtx @@ -1,5 +1,5 @@ -\def\packagedate{2011/10/24} -\def\packageversion{0.18} +\def\packagedate{2011/12/24} +\def\packageversion{0.18.1} % \iffalse meta-comment % % Package 'cleveref' to use with LaTeX2e @@ -56,7 +56,7 @@ % % \fi % -% \CheckSum{18238} +% \CheckSum{18240} %% \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 %% Lower-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 @@ -251,6 +251,8 @@ % \package{revtex4-1} docclasses. Fixed \package{subfig} and % \package{caption} compatibility with optional argument to % \textbackslash{}label.} +% \changes{v0.18.1}{2011/12/24}{Fixed compatibility with newer versions +% of \package{caption} package.} % % \GetFileInfo{cleveref.sty} % @@ -1796,6 +1798,9 @@ % % % \begin{macro}{\label} +% \begin{macro}{\cref@label} +% \begin{macro}{\label@optarg} +% \begin{macro}{\label@noarg} % We redefine the \cmd{\label} command to make it define \emph{two} % labels each time it's called: the standard one, and an additional % \package{cleveref}-specific one with the prefix |cref@| added to the @@ -1835,6 +1840,9 @@ }% end of AtBeginDocument % \end{macrocode} % \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} % % % \begin{macro}{\@footnotetext} @@ -6664,18 +6672,26 @@ % % \subsubsection{\package{caption} support} % \begin{macro}{caption} -% The \package{caption} package redefines \cmd{\label} within floats, -% breaking \package{cleveref}'s optional argument, so we fix this here. +% The \package{caption} package redefines \cmd{\label} within floats. +% Since version 3.2c, it is careful to redefine \cmd{\label} in a way +% that doesn't break any optional arguments introduced by other +% packages (such as \package{cleveref}'s), so we no longer need to add +% any compatibility hacks. +% +% Earlier versions of \package{caption} do break \package{cleveref}'s +% optional argument, however, so we have to fix things here for those +% verions. % \begin{macrocode} \@ifpackageloaded{caption}{% - \PackageInfo{cleveref}{`caption' support loaded} + \@ifpackagelater{caption}{2011/08/19}{}{% + \PackageInfo{cleveref}{`caption' support loaded} % \end{macrocode} % % \begin{macro}{\cref@old@caption@xlabel} % \begin{macro}{\cref@old@label} % \begin{macro}{\cref@ORI@label} % \begin{macro}{\caption@ORI@label} -% We fix the \cmd{\label} argument passing by redefining +% We fix the \cmd{\label} argument parsing by redefining % \cmd{\caption@xlabel}, the macro which \cmd{\label} is let to inside % floats, to juggle around the various \package{cleveref} and % \package{caption} \cmd{\label}-processing macros so that everything @@ -6701,12 +6717,12 @@ % in \cmd{\cref@ORI@old@label}, and make \cmd{\caption@ORI@label} call % that. Oof! % \begin{macrocode} - \let\cref@old@caption@xlabel\caption@xlabel - \def\caption@xlabel{% - \let\cref@ORI@label\cref@old@label% - \let\cref@old@label\cref@old@caption@xlabel% - \let\caption@ORI@label\cref@ORI@label% - \cref@label}% + \let\cref@old@caption@xlabel\caption@xlabel + \def\caption@xlabel{% + \let\cref@ORI@label\cref@old@label% + \let\cref@old@label\cref@old@caption@xlabel% + \let\caption@ORI@label\cref@ORI@label% + \cref@label}% % \end{macrocode} % \end{macro} % \end{macro} @@ -6714,6 +6730,7 @@ % \end{macro} % % \begin{macrocode} + }% end of \@ifpackagelater }{}% end of \@ifpackageloaded{caption} % \end{macrocode} % \end{macro} diff --git a/Master/texmf-dist/tex/latex/cleveref/cleveref.sty b/Master/texmf-dist/tex/latex/cleveref/cleveref.sty index 4aa16531708..d31f1b45ae4 100644 --- a/Master/texmf-dist/tex/latex/cleveref/cleveref.sty +++ b/Master/texmf-dist/tex/latex/cleveref/cleveref.sty @@ -11,8 +11,8 @@ %% Copyright (C) 2006 Toby Cubitt %% See the files README and COPYING. %% -\def\packagedate{2011/10/24} -\def\packageversion{0.18} +\def\packagedate{2011/12/24} +\def\packageversion{0.18.1} %% This file may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.2 %% of this license or (at your option) any later version. @@ -2882,13 +2882,15 @@ \cref@label}% }{}% end of \@ifpackageloaded{subfig} \@ifpackageloaded{caption}{% - \PackageInfo{cleveref}{`caption' support loaded} - \let\cref@old@caption@xlabel\caption@xlabel - \def\caption@xlabel{% - \let\cref@ORI@label\cref@old@label% - \let\cref@old@label\cref@old@caption@xlabel% - \let\caption@ORI@label\cref@ORI@label% - \cref@label}% + \@ifpackagelater{caption}{2011/08/19}{}{% + \PackageInfo{cleveref}{`caption' support loaded} + \let\cref@old@caption@xlabel\caption@xlabel + \def\caption@xlabel{% + \let\cref@ORI@label\cref@old@label% + \let\cref@old@label\cref@old@caption@xlabel% + \let\caption@ORI@label\cref@ORI@label% + \cref@label}% + }% end of \@ifpackagelater }{}% end of \@ifpackageloaded{caption} \@ifpackageloaded{aliascnt}{% \PackageInfo{cleveref}{`aliascnt' support loaded} -- cgit v1.2.3