From a1e1019735070ba683719bbbf7aba33af09f329d Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 17 Jul 2009 00:58:21 +0000 Subject: cleveref 0.13.1 (14jul09) git-svn-id: svn://tug.org/texlive/trunk@14289 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/source/latex/cleveref/cleveref.dtx | 97 +++++++++++++++------- 1 file changed, 65 insertions(+), 32 deletions(-) (limited to 'Master/texmf-dist/source/latex/cleveref') diff --git a/Master/texmf-dist/source/latex/cleveref/cleveref.dtx b/Master/texmf-dist/source/latex/cleveref/cleveref.dtx index 44e36f06c9e..11c26ec6100 100644 --- a/Master/texmf-dist/source/latex/cleveref/cleveref.dtx +++ b/Master/texmf-dist/source/latex/cleveref/cleveref.dtx @@ -21,7 +21,7 @@ % \iffalse %\NeedsTeXFormat{LaTeX2e}[1999/12/01] %\ProvidesPackage{cleveref} -% [2009/17/04 v0.13 Intelligent cross-referencing] +% [2009/01/07 v0.13.1 Intelligent cross-referencing] % %<*driver> %\documentclass{ltxdoc} @@ -61,7 +61,7 @@ % % \fi % -% \CheckSum{6721} +% \CheckSum{6793} %% \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 @@ -99,22 +99,26 @@ % components, unless overridden using the old format definition % commands.} % \changes{v0.10}{2007/10/30}% -% {Allow optional argument to \\label to override reference -% type. Removed hyperref and ntheorem options; support for these and -% amsmath is enabled automatically if those packages are loaded.} +% {Allow optional argument to \textbackslash label to override +% reference type. Removed hyperref and ntheorem options; support for +% these and amsmath is enabled automatically if those packages are +% loaded.} % \changes{v0.11}{2007/11/21}{Made referencing aware of appendices.} % \changes{v0.11.1}{2007/11/29}{Bug fixes.} -% \changes{v0.12}{2009/02/11}{Restore working \\ref* when hyperref is -% loaded -- first release mirrored on www.dr-qubit.org} +% \changes{v0.12}{2009/02/11}{Restore working \textbackslash ref* when +% hyperref is loaded -- first release mirrored on www.dr-qubit.org} % \changes{v0.13}{2009/04/17}{Finally implemented sort and compress -% package options. Support amsmath \\tag command. Added babel support -% for English, German and French. Added varioref support.} +% package options. Support amsmath \textbackslash tag command. Added +% babel support for English, German and French. Added varioref +% support.} +% \changes{v0.13.1}{2009/07/01}{Bug fix to \textbackslash cref@get* +% commands to allow fragile and non-expandable commands in label tags.} % % % \GetFileInfo{cleveref.sty} % -% \def\fileversion{0.13} -% \def\filedate{17/04/2009} +% \def\fileversion{0.13.1} +% \def\filedate{01/07/2009} % % \title{The \package{cleveref} package\thanks{This document % corresponds to \textsf{cleveref}~\fileversion, dated @@ -1108,6 +1112,11 @@ % German and French. Please contribute translations for missing % languages!\footnote{See \cref{sec:code:babel} for information on how % to contribute translations.} +% \item \package{cleveref} can't cope with active characters being +% present in cross-reference label names. For example, if French babel +% support is loaded, the commonly used ``:'' in label names will often +% fail, spewing the usual random selection of mysterious TeX errors +% that accompany such deep-seated errors. % \item \package{cleveref} assumes that counters are only ever reset by % the standard sectioning commands (|\chapter|, |\section|, etc.). If % this is not the case, the automatic compression of consecutive @@ -1441,28 +1450,40 @@ % \begin{macrocode} \def\cref@getlabel#1#2{% \expandafter\let\expandafter\@tmpa\csname r@#1\endcsname% - \edef\@tmpa{\expandafter\@firstoftwo\@tmpa}% - \expandafter\@cref@getlabel\@tmpa\@nil#2} + \expandafter\expandafter\expandafter\def% + \expandafter\expandafter\expandafter\@tmpa% + \expandafter\expandafter\expandafter{% + \expandafter\@firstoftwo\@tmpa}% + \expandafter\@cref@getlabel\@tmpa\@nil#2}% \def\@cref@getlabel{\@ifnextchar[%] \@@cref@getlabel{\@@cref@getlabel[][][]}} \def\@@cref@getlabel[#1][#2][#3]#4\@nil#5{\def#5{#4}} \def\cref@gettype#1#2{% \expandafter\let\expandafter\@tmpa\csname r@#1\endcsname% - \edef\@tmpa{\expandafter\@firstoftwo\@tmpa}% - \expandafter\@cref@gettype\@tmpa\@nil#2} + \expandafter\expandafter\expandafter\def% + \expandafter\expandafter\expandafter\@tmpa% + \expandafter\expandafter\expandafter{% + \expandafter\@firstoftwo\@tmpa}% + \expandafter\@cref@gettype\@tmpa\@nil#2}% \def\@cref@gettype{\@ifnextchar[%] \@@cref@gettype{\@@cref@gettype[][][]}} \def\@@cref@gettype[#1][#2][#3]#4\@nil#5{\def#5{#1}} \def\cref@getcounter#1#2{% \expandafter\let\expandafter\@tmpa\csname r@#1\endcsname% - \edef\@tmpa{\expandafter\@firstoftwo\@tmpa}% + \expandafter\expandafter\expandafter\def% + \expandafter\expandafter\expandafter\@tmpa% + \expandafter\expandafter\expandafter{% + \expandafter\@firstoftwo\@tmpa}% \expandafter\@cref@getcounter\@tmpa\@nil#2} \def\@cref@getcounter{\@ifnextchar[%] \@@cref@getcounter{\@@cref@getcounter[][][]}} \def\@@cref@getcounter[#1][#2][#3]#4\@nil#5{\def#5{#2}} \def\cref@getprefix#1#2{% \expandafter\let\expandafter\@tmpa\csname r@#1\endcsname% - \edef\@tmpa{\expandafter\@firstoftwo\@tmpa}% + \expandafter\expandafter\expandafter\def% + \expandafter\expandafter\expandafter\@tmpa% + \expandafter\expandafter\expandafter{% + \expandafter\@firstoftwo\@tmpa}% \expandafter\@cref@getprefix\@tmpa\@nil#2} \def\@cref@getprefix{\@ifnextchar[%] \@@cref@getprefix{\@@cref@getprefix[][][]}} @@ -3421,19 +3442,31 @@ \@fourthoffive\csname r@#1\endcsname} \def\cref@getlabel#1#2{% \expandafter\let\expandafter\@tmpa\csname r@#1\endcsname% - \edef\@tmpa{\expandafter\@firstoffive\@tmpa}% + \expandafter\expandafter\expandafter\def% + \expandafter\expandafter\expandafter\@tmpa% + \expandafter\expandafter\expandafter{% + \expandafter\@firstoffive\@tmpa}% \expandafter\@cref@getlabel\@tmpa\@nil#2} \def\cref@gettype#1#2{% \expandafter\let\expandafter\@tmpa\csname r@#1\endcsname% - \edef\@tmpa{\expandafter\@firstoffive\@tmpa}% + \expandafter\expandafter\expandafter\def% + \expandafter\expandafter\expandafter\@tmpa% + \expandafter\expandafter\expandafter{% + \expandafter\@firstoffive\@tmpa}% \expandafter\@cref@gettype\@tmpa\@nil#2} \def\cref@getcounter#1#2{% \expandafter\let\expandafter\@tmpa\csname r@#1\endcsname% - \edef\@tmpa{\expandafter\@firstoffive\@tmpa}% + \expandafter\expandafter\expandafter\def% + \expandafter\expandafter\expandafter\@tmpa% + \expandafter\expandafter\expandafter{% + \expandafter\@firstoffive\@tmpa}% \expandafter\@cref@getcounter\@tmpa\@nil#2} \def\cref@getprefix#1#2{% \expandafter\let\expandafter\@tmpa\csname r@#1\endcsname% - \edef\@tmpa{\expandafter\@firstoffive\@tmpa}% + \expandafter\expandafter\expandafter\def% + \expandafter\expandafter\expandafter\@tmpa% + \expandafter\expandafter\expandafter{% + \expandafter\@firstoffive\@tmpa}% \expandafter\@cref@getprefix\@tmpa\@nil#2} % \end{macrocode} % \end{macro} @@ -3640,7 +3673,6 @@ {\hyper@linkstart{link}{\@linka}}{\hyper@linkend}% {\hyper@linkstart{link}{\@linkb}}{\hyper@linkend}% \fi}% - }{}% end of \@ifpackageloaded % \end{macrocode} % \end{macro} % \end{macro} @@ -3652,16 +3684,17 @@ % it `takes'. (\package{hyperref} stores the original \cmd{\@setref} in % \cmd{\real@setref}.) % \begin{macrocode} -\AtBeginDocument{% - \DeclareRobustCommand{\ref}{\@ifstar\cref@refstar\cref@ref} - \def\cref@refstar#1{% - \expandafter\ifx\csname r@#1\endcsname\relax% - \let\@result\relax% - \else% - \cref@getlabel{#1}{\@result}% - \fi% - \expandafter\real@setref\csname r@#1\endcsname{\cref@reflabel}{#1}}% -} + \AtBeginDocument{% + \DeclareRobustCommand{\ref}{\@ifstar\cref@refstar\cref@ref} + \def\cref@refstar#1{% + \expandafter\ifx\csname r@#1\endcsname\relax% + \let\@result\relax% + \else% + \cref@getlabel{#1}{\@result}% + \fi% + \expandafter\real@setref\csname r@#1\endcsname{\cref@reflabel}{#1}}% + } +}{}% end of \@ifpackageloaded{hyperref} % \end{macrocode} % \end{macro} % -- cgit v1.2.3