summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/cleveref/cleveref.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/cleveref/cleveref.sty')
-rw-r--r--Master/texmf-dist/tex/latex/cleveref/cleveref.sty52
1 files changed, 28 insertions, 24 deletions
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