diff options
author | Norbert Preining <preining@logic.at> | 2007-12-02 16:06:21 +0000 |
---|---|---|
committer | Norbert Preining <preining@logic.at> | 2007-12-02 16:06:21 +0000 |
commit | e248bd684640a14cfb36eeb3df6319483901f1e5 (patch) | |
tree | ff39277eb07d7924b1b1fb264f4b629770f0fa1a | |
parent | 89dcd2b563d003b3984ccbc79ee4cb0841d0052b (diff) |
update cleveref from CTAN
git-svn-id: svn://tug.org/texlive/trunk@5680 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r-- | Master/texmf-dist/doc/latex/cleveref/README | 62 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/cleveref/cleveref.pdf | bin | 278594 -> 278832 bytes | |||
-rw-r--r-- | Master/texmf-dist/source/latex/cleveref/cleveref.dtx | 59 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/cleveref/cleveref.sty | 52 |
4 files changed, 92 insertions, 81 deletions
diff --git a/Master/texmf-dist/doc/latex/cleveref/README b/Master/texmf-dist/doc/latex/cleveref/README index 1eeb709e239..1e7057d46e6 100644 --- a/Master/texmf-dist/doc/latex/cleveref/README +++ b/Master/texmf-dist/doc/latex/cleveref/README @@ -1,31 +1,31 @@ -cleveref, a LaTeX package for intelligent cross-referencing
-Copyright (C) 2007 Toby Cubitt
-
-Files:
-cleveref.ins Batch file, run through LaTeX
-cleveref.dtx Docstrip archive, run through LaTeX
-cleveref.sty LaTeX package, generated by cleveref.ins from cleveref.dtx
-cleveref.dvi Package documentation, generated from cleveref.dtx
-cleveref.pdf Package documentation; can also be generated from cleveref.dtx
-README This file
-
-E-mail: toby-cleveref@dr-qubit.org
-Address: Department of Mathematics, University of Bristol, UK
-
-This material is subject to the LaTeX Project Public License. See
-http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html for the
-details of that license.
-
-
-Abstract:
----------
-The cleveref package enhances LaTeX's cross-referencing features, allowing the
-formatting of references to be determined automatically according to the type
-of reference (equation, section, etc.). The format for each reference type can
-be fully customised in the preamble of your document. In addition, cleveref
-can typeset references to lists of multiple labels, automatically formatting
-them according to their type, and collapsing sequences of numerically
-consecutive labels to a reference range. Again, the multiple-reference
-formatting is fully customisable. Though a number of other packages provide
-similar features, all have certain deficiencies which cleveref attempts to
-overcome.
+cleveref, a LaTeX package for intelligent cross-referencing +Copyright (C) 2007 Toby Cubitt + +Files: +cleveref.ins Batch file, run through LaTeX +cleveref.dtx Docstrip archive, run through LaTeX +cleveref.sty LaTeX package, generated by cleveref.ins from cleveref.dtx +cleveref.dvi Package documentation, generated from cleveref.dtx +cleveref.pdf Package documentation; can also be generated from cleveref.dtx +README This file + +E-mail: toby-cleveref@dr-qubit.org +Address: Department of Mathematics, University of Bristol, UK + +This material is subject to the LaTeX Project Public License. See +http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html for the +details of that license. + + +Abstract: +--------- +The cleveref package enhances LaTeX's cross-referencing features, allowing the +formatting of references to be determined automatically according to the type +of reference (equation, section, etc.). The format for each reference type can +be fully customised in the preamble of your document. In addition, cleveref +can typeset references to lists of multiple labels, automatically formatting +them according to their type, and collapsing sequences of numerically +consecutive labels to a reference range. Again, the multiple-reference +formatting is fully customisable. Though a number of other packages provide +similar features, all have certain deficiencies which cleveref attempts to +overcome. diff --git a/Master/texmf-dist/doc/latex/cleveref/cleveref.pdf b/Master/texmf-dist/doc/latex/cleveref/cleveref.pdf Binary files differindex 93607444106..9f28bfed688 100644 --- a/Master/texmf-dist/doc/latex/cleveref/cleveref.pdf +++ b/Master/texmf-dist/doc/latex/cleveref/cleveref.pdf diff --git a/Master/texmf-dist/source/latex/cleveref/cleveref.dtx b/Master/texmf-dist/source/latex/cleveref/cleveref.dtx index 62ceb705fff..6cad24c2f7a 100644 --- a/Master/texmf-dist/source/latex/cleveref/cleveref.dtx +++ b/Master/texmf-dist/source/latex/cleveref/cleveref.dtx @@ -60,7 +60,7 @@ %</driver> % \fi % -% \CheckSum{3381} +% \CheckSum{3387} %% \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 @@ -101,6 +101,7 @@ % type. Removed hyperref and ntheorem options; support for these and % amsmath is enabled automatically if those packages are loaded.} % \changes{v0.11}{2007/21/11}{Made referencing aware of appendices.} +% \changes{v0.11.1}{2007/29/11}{Bug fixes.} % % % \GetFileInfo{cleveref.sty} @@ -969,18 +970,19 @@ % name as the ``type'' and instead uses whatever is supplied. % \begin{macrocode} \let\cref@old@refstepcounter\refstepcounter -\def\refstepcounter% - {\@ifnextchar[{\refstepcounter@optarg}{\refstepcounter@noarg}}%] +\def\refstepcounter{% + \@ifnextchar[{\refstepcounter@optarg}{\refstepcounter@noarg}%] +} \def\refstepcounter@noarg#1{% \cref@old@refstepcounter{#1}% - \reset@by{#1}{\@result}% + \cref@resetby{#1}{\@result}% \ifx\@result\relax\def\@result{}% \else\edef\@result{\csname the\@result\endcsname}\fi% \protected@edef\@currentlabel{% [#1][\arabic{#1}][\@result]\@currentlabel}} \def\refstepcounter@optarg[#1]#2{% \cref@old@refstepcounter{#2}% - \reset@by{#2}{\@result}% + \cref@resetby{#2}{\@result}% \ifx\@result\relax\def\@result{}% \else\edef\@result{\csname the\@result\endcsname}\fi% \protected@edef\@currentlabel{% @@ -1072,7 +1074,7 @@ \@ifundefined{chapter}{% \def\refstepcounter@noarg##1{% \cref@old@refstepcounter{##1}% - \reset@by{##1}{\@result}% + \cref@resetby{##1}{\@result}% \ifx\@result\relax\def\@result{}% \else\edef\@result{\csname the\@result\endcsname}\fi% \def\@tmpa{##1} @@ -1087,7 +1089,7 @@ }{% \def\refstepcounter@noarg##1{% \cref@old@refstepcounter{##1}% - \reset@by{##1}{\@result}% + \cref@resetby{##1}{\@result}% \ifx\@result\relax\def\@result{}% \else\edef\@result{\csname the\@result\endcsname}\fi% \def\@tmpa{##1} @@ -1098,7 +1100,7 @@ \else \protected@edef\@currentlabel{% [##1][\arabic{##1}][\@result]\@currentlabel} - \fi} + \fi}% }% } % \end{macrocode} @@ -1193,7 +1195,9 @@ % appropriately. \cmd{\reset@by} searches through all the sectioning % counters' reset lists, from lowest-level (subsubsection) to highest % (part), checking whether the given counter is in the list, and -% returns the first sectioning counter whose list it appears in. +% returns the first sectioning counter whose list it appears (value is +% returned by defining its second argument, which should be a macro +% name). % \begin{macrocode} \newif\if@cref@inresetlist \def\cref@isinresetlist#1#2{% @@ -1860,7 +1864,7 @@ % Define the other capitalisation variants to be the partial expansions % (expanded just once) of \cmd{\@tmpa} and \cmd{\@tmpb}. % \begin{macrocode} - \newtoks\@toksa% + \toksdef\@toksa=0% \@toksa={% \expandafter\gdef\csname\@other @#2@name\endcsname}% \expandafter\the\expandafter\@toksa\expandafter{\@tmpa}% @@ -1891,6 +1895,7 @@ \@tmplabel{####1}{####3}{####4}}% \expandafter\def\expandafter\@tmpb\expandafter{% \@tmplabel{####2}{####5}{####6}}% + \toksdef\@toksa=0% \@toksa={\def\@tmprangelabel##1##2##3##4##5##6}% \expandafter\expandafter\expandafter\expandafter% \expandafter\expandafter\expandafter\the% @@ -1936,7 +1941,6 @@ % \begin{macrocode} \def\@crefdefineformat#1{% \begingroup% - \newtoks\@toksa% % \end{macrocode} % put format components into tmp macros % \begin{macrocode} @@ -1956,6 +1960,7 @@ % \end{macrocode} % Define \cmd{\crefformat} and \cmd{\Crefformat}. % \begin{macrocode} + \toksdef\@toksa=0% \@toksa={\crefformat{#1}}% \expandafter\the\expandafter\@toksa\expandafter{\@tmpfirst}% \@toksa={\Crefformat{#1}}% @@ -1964,8 +1969,6 @@ % \def\@crefrangedefineformat#1{% \begingroup% - \newtoks\@toksa% - \newtoks\@toksb% % \end{macrocode} % put format components into tmp macros % \begin{macrocode} @@ -1985,6 +1988,7 @@ % \end{macrocode} % Define \cmd{\crefrangeformat} and \cmd{\Crefrangeformat}. % \begin{macrocode} + \toksdef\@toksa=0% \@toksa={\crefrangeformat{#1}}% \expandafter\the\expandafter\@toksa\expandafter{\@tmpfirst}% \@toksa={\Crefrangeformat{#1}}% @@ -1993,8 +1997,6 @@ % \def\@crefdefinemultiformat#1{% \begingroup% - \newtoks\@toksa% - \newtoks\@toksb% % \end{macrocode} % put format components into tmp macros % \begin{macrocode} @@ -2027,6 +2029,8 @@ % Bundle all four arguments for \cmd{\crefmultiformat} in token % register \cmd{\@toksb}, then call it. % \begin{macrocode} + \toksdef\@toksa=0% + \toksdef\@toksb=1% \@toksb={}% \expandafter\cref@append@toks\expandafter\@toksb\expandafter{% \expandafter{\@tmpfirst}}% @@ -2057,8 +2061,6 @@ % \def\@crefrangedefinemultiformat#1{% \begingroup% - \newtoks\@toksa% - \newtoks\@toksb% % \end{macrocode} % put format components into tmp macros % \begin{macrocode} @@ -2092,6 +2094,8 @@ % Bundle all four arguments for \cmd{\crefrangemultiformat} in token % register \cmd{\@toksb}, then call it. % \begin{macrocode} + \toksdef\@toksa=0% + \toksdef\@toksb=1% \@toksb={}% \expandafter\cref@append@toks\expandafter\@toksb\expandafter{% \expandafter{\@tmpfirst}}% @@ -2189,7 +2193,7 @@ % of the capitalisation variant we've just defined above. The % \cmd{\@toska} token register just makes the code less verbose. % \begin{macrocode} - \newtoks\@toksa% + \toksdef\@toksa=0% \@toksa={\def\@tmpa##1##2##3}% \expandafter\expandafter\expandafter\the% \expandafter\expandafter\expandafter\@toksa% @@ -2243,7 +2247,7 @@ % of the capitalisation variant we've just defined above. The % \cmd{\@toska} token register just makes the code less verbose. % \begin{macrocode} - \newtoks\@toksa% + \toksdef\@toksa=0% \@toksa={\def\@tmpa##1##2##3##4##5##6}% \expandafter\expandafter\expandafter\the% \expandafter\expandafter\expandafter\@toksa% @@ -2300,6 +2304,7 @@ % of the capitalisation variant we've just defined above. The % \cmd{\@toska} token register just makes the code less verbose. % \begin{macrocode} + \toksdef\@toksa=0% \@toksa={\def\@tmpa##1##2##3}% \expandafter\expandafter\expandafter\the% \expandafter\expandafter\expandafter\@toksa% @@ -2386,6 +2391,7 @@ % of the capitalisation variant we've just defined above. The % \cmd{\@toska} token register just makes the code less verbose. % \begin{macrocode} + \toksdef\@toksa=0% \@toksa={\def\@tmpa##1##2##3##4##5##6}% \expandafter\expandafter\expandafter\the% \expandafter\expandafter\expandafter\@toksa% @@ -2731,7 +2737,8 @@ % type information. So we only need to change \cmd{\@currentlabel} in % our \cmd{\refstepcounter} if an optional argument was supplied. % \begin{macrocode} -\def\refstepcounter@noarg#1{\cref@old@refstepcounter{#1}} +\def\refstepcounter@noarg#1{\cref@old@refstepcounter{#1}% +} \def\refstepcounter@optarg[#1]#2{% \cref@old@refstepcounter{#2}% \expandafter\@cref@getlabel\@currentlabel\@nil{\@tmplabel}% @@ -2755,34 +2762,34 @@ \cref@resetby{##1}{\@result}% \ifx\@result\relax\def\@result{}% \else\edef\@result{\csname the\@result\endcsname}\fi% - \def\@tmpa{##1} + \def\@tmpa{##1}% \def\@tmpb{section}% \ifx\@tmpa\@tmpb% \protected@edef\@currentlabel{% [appendix][\arabic{##1}][\@result]% \csname p@##1\endcsname\csname the##1\endcsname}% - \else + \else% \protected@edef\@currentlabel{% [##1][\arabic{##1}][\@result]% \csname p@##1\endcsname\csname the##1\endcsname}% - fi}% + \fi}% }{% \def\H@refstepcounter##1{% \stepcounter{##1}% \cref@resetby{##1}{\@result}% \ifx\@result\relax\def\@result{}% \else\edef\@result{\csname the\@result\endcsname}\fi% - \def\@tmpa{##1} + \def\@tmpa{##1}% \def\@tmpb{chapter}% \ifx\@tmpa\@tmpb% \protected@edef\@currentlabel{% [appendix][\arabic{##1}][\@result]% \csname p@##1\endcsname\csname the##1\endcsname}% - \else + \else% \protected@edef\@currentlabel{% [##1][\arabic{##1}][\@result]% \csname p@##1\endcsname\csname the##1\endcsname}% - fi}% + \fi}% }% } % \end{macrocode} diff --git a/Master/texmf-dist/tex/latex/cleveref/cleveref.sty b/Master/texmf-dist/tex/latex/cleveref/cleveref.sty index 2f5ba2ab5a1..3d0505e458f 100644 --- a/Master/texmf-dist/tex/latex/cleveref/cleveref.sty +++ b/Master/texmf-dist/tex/latex/cleveref/cleveref.sty @@ -39,18 +39,19 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \let\cref@old@refstepcounter\refstepcounter -\def\refstepcounter% - {\@ifnextchar[{\refstepcounter@optarg}{\refstepcounter@noarg}}%] +\def\refstepcounter{% + \@ifnextchar[{\refstepcounter@optarg}{\refstepcounter@noarg}%] +} \def\refstepcounter@noarg#1{% \cref@old@refstepcounter{#1}% - \reset@by{#1}{\@result}% + \cref@resetby{#1}{\@result}% \ifx\@result\relax\def\@result{}% \else\edef\@result{\csname the\@result\endcsname}\fi% \protected@edef\@currentlabel{% [#1][\arabic{#1}][\@result]\@currentlabel}} \def\refstepcounter@optarg[#1]#2{% \cref@old@refstepcounter{#2}% - \reset@by{#2}{\@result}% + \cref@resetby{#2}{\@result}% \ifx\@result\relax\def\@result{}% \else\edef\@result{\csname the\@result\endcsname}\fi% \protected@edef\@currentlabel{% @@ -91,7 +92,7 @@ \@ifundefined{chapter}{% \def\refstepcounter@noarg##1{% \cref@old@refstepcounter{##1}% - \reset@by{##1}{\@result}% + \cref@resetby{##1}{\@result}% \ifx\@result\relax\def\@result{}% \else\edef\@result{\csname the\@result\endcsname}\fi% \def\@tmpa{##1} @@ -106,7 +107,7 @@ }{% \def\refstepcounter@noarg##1{% \cref@old@refstepcounter{##1}% - \reset@by{##1}{\@result}% + \cref@resetby{##1}{\@result}% \ifx\@result\relax\def\@result{}% \else\edef\@result{\csname the\@result\endcsname}\fi% \def\@tmpa{##1} @@ -117,7 +118,7 @@ \else \protected@edef\@currentlabel{% [##1][\arabic{##1}][\@result]\@currentlabel} - \fi} + \fi}% }% } \def\cref@getlabel#1#2{% @@ -618,7 +619,7 @@ \expandafter\expandafter\expandafter\@tmpb% \expandafter\expandafter\expandafter{% \expandafter\@changecase\@tmpb}% - \newtoks\@toksa% + \toksdef\@toksa=0% \@toksa={% \expandafter\gdef\csname\@other @#2@name\endcsname}% \expandafter\the\expandafter\@toksa\expandafter{\@tmpa}% @@ -639,6 +640,7 @@ \@tmplabel{####1}{####3}{####4}}% \expandafter\def\expandafter\@tmpb\expandafter{% \@tmplabel{####2}{####5}{####6}}% + \toksdef\@toksa=0% \@toksa={\def\@tmprangelabel##1##2##3##4##5##6}% \expandafter\expandafter\expandafter\expandafter% \expandafter\expandafter\expandafter\the% @@ -676,7 +678,6 @@ } \def\@crefdefineformat#1{% \begingroup% - \newtoks\@toksa% \@crefconstructcomponents{#1}% \expandafter\expandafter\expandafter\def% \expandafter\expandafter\expandafter\@tmpfirst% @@ -686,6 +687,7 @@ \expandafter\expandafter\expandafter\@tmpFirst% \expandafter\expandafter\expandafter{% \expandafter\@tmpName\expandafter~\@tmplabel}% + \toksdef\@toksa=0% \@toksa={\crefformat{#1}}% \expandafter\the\expandafter\@toksa\expandafter{\@tmpfirst}% \@toksa={\Crefformat{#1}}% @@ -693,8 +695,6 @@ \endgroup} \def\@crefrangedefineformat#1{% \begingroup% - \newtoks\@toksa% - \newtoks\@toksb% \@crefconstructcomponents{#1}% \expandafter\expandafter\expandafter\def% \expandafter\expandafter\expandafter\@tmpfirst% @@ -704,6 +704,7 @@ \expandafter\expandafter\expandafter\@tmpFirst% \expandafter\expandafter\expandafter{% \expandafter\@tmpNameplural\expandafter~\@tmprangelabel}% + \toksdef\@toksa=0% \@toksa={\crefrangeformat{#1}}% \expandafter\the\expandafter\@toksa\expandafter{\@tmpfirst}% \@toksa={\Crefrangeformat{#1}}% @@ -711,8 +712,6 @@ \endgroup} \def\@crefdefinemultiformat#1{% \begingroup% - \newtoks\@toksa% - \newtoks\@toksb% \@crefconstructcomponents{#1}% \expandafter\expandafter\expandafter\def% \expandafter\expandafter\expandafter\@tmpfirst% @@ -734,6 +733,8 @@ \expandafter\expandafter\expandafter\@tmplast% \expandafter\expandafter\expandafter{% \expandafter\creflastconjunction\@tmplabel}% + \toksdef\@toksa=0% + \toksdef\@toksb=1% \@toksb={}% \expandafter\cref@append@toks\expandafter\@toksb\expandafter{% \expandafter{\@tmpfirst}}% @@ -759,8 +760,6 @@ \endgroup} \def\@crefrangedefinemultiformat#1{% \begingroup% - \newtoks\@toksa% - \newtoks\@toksb% \@crefconstructcomponents{#1}% \expandafter\expandafter\expandafter\def% \expandafter\expandafter\expandafter\@tmpfirst% @@ -782,6 +781,8 @@ \expandafter\expandafter\expandafter\@tmplast% \expandafter\expandafter\expandafter{% \expandafter\creflastconjunction\@tmprangelabel}% + \toksdef\@toksa=0% + \toksdef\@toksb=1% \@toksb={}% \expandafter\cref@append@toks\expandafter\@toksb\expandafter{% \expandafter{\@tmpfirst}}% @@ -835,7 +836,7 @@ \fi}% \@tmpa#1\@nil% \@ifundefined{\@other @#2@format}{% - \newtoks\@toksa% + \toksdef\@toksa=0% \@toksa={\def\@tmpa##1##2##3}% \expandafter\expandafter\expandafter\the% \expandafter\expandafter\expandafter\@toksa% @@ -865,7 +866,7 @@ \fi}% \@tmpa#1\@nil% \@ifundefined{\@other @#2@format}{% - \newtoks\@toksa% + \toksdef\@toksa=0% \@toksa={\def\@tmpa##1##2##3##4##5##6}% \expandafter\expandafter\expandafter\the% \expandafter\expandafter\expandafter\@toksa% @@ -897,6 +898,7 @@ \fi}% \@tmpa#1\@nil% \@ifundefined{\@other @#2@format@first}{% + \toksdef\@toksa=0% \@toksa={\def\@tmpa##1##2##3}% \expandafter\expandafter\expandafter\the% \expandafter\expandafter\expandafter\@toksa% @@ -954,6 +956,7 @@ \fi}% \@tmpa#1\@nil% \@ifundefined{\@other @#2@format@first}{% + \toksdef\@toksa=0% \@toksa={\def\@tmpa##1##2##3##4##5##6}% \expandafter\expandafter\expandafter\the% \expandafter\expandafter\expandafter\@toksa% @@ -1215,7 +1218,8 @@ \protected@edef\@currentlabel{% [#1][\arabic{#1}][\@result]% \csname p@#1\endcsname\csname the#1\endcsname}} -\def\refstepcounter@noarg#1{\cref@old@refstepcounter{#1}} +\def\refstepcounter@noarg#1{\cref@old@refstepcounter{#1}% +} \def\refstepcounter@optarg[#1]#2{% \cref@old@refstepcounter{#2}% \expandafter\@cref@getlabel\@currentlabel\@nil{\@tmplabel}% @@ -1232,34 +1236,34 @@ \cref@resetby{##1}{\@result}% \ifx\@result\relax\def\@result{}% \else\edef\@result{\csname the\@result\endcsname}\fi% - \def\@tmpa{##1} + \def\@tmpa{##1}% \def\@tmpb{section}% \ifx\@tmpa\@tmpb% \protected@edef\@currentlabel{% [appendix][\arabic{##1}][\@result]% \csname p@##1\endcsname\csname the##1\endcsname}% - \else + \else% \protected@edef\@currentlabel{% [##1][\arabic{##1}][\@result]% \csname p@##1\endcsname\csname the##1\endcsname}% - fi}% + \fi}% }{% \def\H@refstepcounter##1{% \stepcounter{##1}% \cref@resetby{##1}{\@result}% \ifx\@result\relax\def\@result{}% \else\edef\@result{\csname the\@result\endcsname}\fi% - \def\@tmpa{##1} + \def\@tmpa{##1}% \def\@tmpb{chapter}% \ifx\@tmpa\@tmpb% \protected@edef\@currentlabel{% [appendix][\arabic{##1}][\@result]% \csname p@##1\endcsname\csname the##1\endcsname}% - \else + \else% \protected@edef\@currentlabel{% [##1][\arabic{##1}][\@result]% \csname p@##1\endcsname\csname the##1\endcsname}% - fi}% + \fi}% }% } \newif\if@crefstarred |