cleveref 0.18.4 (15feb12)

git-svn-id: svn://tug.org/texlive/trunk@25401 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 141 insertions, 146 deletions

diff --git a/Master/texmf-dist/doc/latex/cleveref/cleveref.pdf b/Master/texmf-dist/doc/latex/cleveref/cleveref.pdf
index ea88835f42b..2bed6a491f7 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 ae5514f82f7..7cfef5ae041 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{2012/01/18}
-\def\packageversion{0.18.3}
+\def\packagedate{2012/02/15}
+\def\packageversion{0.18.4}
 % \iffalse meta-comment
 %
 % Package 'cleveref' to use with LaTeX2e
@@ -56,7 +56,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{18207}
+% \CheckSum{18194}
 %% \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
@@ -261,6 +261,11 @@
 %   \package{IEEEtrantools} support.}
 % \changes{v0.18.3}{2012/01/18}{Fixed bugs with multiple equations and
 %   subequations in an \textbackslash{}IEEEeqnarray.}
+% \changes{v0.18.4}{2012/01/23}{Set \textbackslash{}cref@currentlabel
+%   locally instead of globally, to match how
+%   \textbackslash{}@currentlabel is set. Fix \package{xr} compatibility
+%   by adding a ``cref'' suffix  to \package{cleveref}'s internal label
+%   names, instead of a prefix.}
 %
 % \GetFileInfo{cleveref.sty}
 %
@@ -1712,12 +1717,13 @@
 % thanks (in alphabetical order) to: Alan Munn, Aleksander Gorohovski,
 % Anand Deopurkar, Arne Meier, Bas Ploeger, Dan Luecking, David Gleich,
 % Denis Bitouz\'e, Domenic Denicola, Donald Arseneau, Hendrik Maryns,
-% James Sharam, Jens Mueller, Joel C. Salomon, Joris Pinkse, Kristian
-% Debrabant, Leo Shidai Liu, Lev Bishop, Mak Trifkovic, Matej Batic, Matt
-% Gately, Matthew Skala, Michael Barber, Michael Gorven, Michal Kaut,
-% Mico Loretan, Olivier Roy, Paul Gomme, Ricardo de Aldama S\'anchez,
-% Stefan Pinnow, Ted Pavlic, Thomas Arildsen, and Uwe L\"uck for their
-% help. (If I missed you out, please let me know!)
+% Iain Cunningham, James Sharam, Jens Mueller, Joel C. Salomon, Joris
+% Pinkse, Kristian Debrabant, Leo Shidai Liu, Lev Bishop, Mak Trifkovic,
+% Matej Batic, Matt Gately, Matthew Skala, Michael Barber, Michael
+% Gorven, Michal Kaut, Mico Loretan, Olivier Roy, Patrick H\"acker, Paul
+% Gomme, Ricardo de Aldama S\'anchez, Robert Fischer, Stefan Pinnow, Ted
+% Pavlic, Thomas Arildsen, and Uwe L\"uck for their help. (If I missed
+% you out, please let me know!)
 %
 %
 % \StopEventually{\clearpage\PrintChanges\clearpage\PrintIndex}
@@ -1750,8 +1756,8 @@
 % lines to the \file{aux} file for \emph{each} label: the standard one,
 % plus an additional one which contains the extra information in
 % \cmd{\cref@currentlabel}. The additional \cmd{\newlabel} line has the
-% prefix |cref@| added to the label name. Thus the extra information in
-% \cmd{\cref@currentlabel} will end up in \cmd{\r@cref@\meta{label}} when
+% suffix |@cref| added to the label name. Thus the extra information in
+% \cmd{\cref@currentlabel} will end up in \cmd{\r@\meta{label}@cref} when
 % the \file{aux} file is re-read on the next pass.
 %
 % Doing things this way involves less hacking to get everything else
@@ -1790,13 +1796,13 @@
   \@ifundefined{cref@#1@alias}%
     {\def\@tempa{#1}}%
     {\def\@tempa{\csname cref@#1@alias\endcsname}}%
-  \protected@xdef\cref@currentlabel{%
+  \protected@edef\cref@currentlabel{%
     [\@tempa][\arabic{#1}][\cref@result]%
     \csname p@#1\endcsname\csname the#1\endcsname}}
 \def\refstepcounter@optarg[#1]#2{%
   \cref@old@refstepcounter{#2}%
   \cref@constructprefix{#2}{\cref@result}%
-  \protected@xdef\cref@currentlabel{%
+  \protected@edef\cref@currentlabel{%
     [#1][\arabic{#2}][\cref@result]%
     \csname p@#2\endcsname\csname the#2\endcsname}}
 %    \end{macrocode}
@@ -1811,7 +1817,7 @@
 % \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
+%   \package{cleveref}-specific one with the suffix |@cref| added to the
 %   label name, which contains the extra information from
 %   \cmd{cref@currentlabel}. We call the original \cmd{\label} command,
 %   stored in \cmd{\cref@old@label}, to write the standard label to the
@@ -1834,16 +1840,16 @@
     \@bsphack%
     \cref@old@label{#1}%
     \protected@write\@auxout{}%
-      {\string\newlabel{cref@#1}{{\cref@currentlabel}{\thepage}}}%
+      {\string\newlabel{#1@cref}{{\cref@currentlabel}{\thepage}}}%
     \@esphack}%
   \def\label@optarg[#1]#2{%
     \@bsphack%
     \cref@old@label{#2}%
-    \protected@xdef\cref@currentlabel{%
+    \protected@edef\cref@currentlabel{%
       \expandafter\cref@override@label@type%
         \cref@currentlabel\@nil{#1}}%
     \protected@write\@auxout{}%
-      {\string\newlabel{cref@#2}{{\cref@currentlabel}{\thepage}}}%
+      {\string\newlabel{#2@cref}{{\cref@currentlabel}{\thepage}}}%
     \@esphack}
 }% end of AtBeginDocument
 %    \end{macrocode}
@@ -1853,30 +1859,26 @@
 % \end{macro}
 %
 %
-% \begin{macro}{\@footnotetext}
-% \begin{macro}{\@mpfootnotetext}
+% \begin{macro}{\@makefntext}
 %   Footnotes don't use the \cmd{\refstepcounter} mechanism, but instead
-%   set\linebreak[4] \cmd{\@currentlabel} directly in
-%   \cmd{\@footnotetext} or \cmd{\@mpfootnotetext}. We modify these to
-%   make them also set \cmd{\cref@currentlabel} appropriately.
-%    \begin{macrocode}
-\let\cref@old@footnotetext\@footnotetext
-\let\cref@old@mpfootnotetext\@mpfootnotetext
-\def\@footnotetext{%
+%   set\linebreak[4] \cmd{\@currentlabel} directly inside the footnote
+%   insertion item. Thus we need to explicitly set
+%   \cmd{\cref@currentlabel} in footnotes. To avoid the definition
+%   spilling out of the footnote, we need to set it inside
+%   \cmd{\insert}'s implicit insertion item grouping level. To this end,
+%   we add the explicit \cmd{\cref@currentlabel} redefinition to
+%   \cmd{\@makefntext}, which gets called from within \cmd{\insert} by
+%   both \cmd{\@footnotetext} and \cmd{\@mpfootnotentext}.
+%    \begin{macrocode}
+\let\cref@old@makefntext\@makefntext
+\long\def\@makefntext#1{%
   \cref@constructprefix{footnote}{\cref@result}%
-  \protected@xdef\cref@currentlabel{%
+  \protected@edef\cref@currentlabel{%
     [footnote][\arabic{footnote}][\cref@result]%
     \p@footnote\@thefnmark}%
-  \cref@old@footnotetext}
-\def\@mpfootnotetext#1{%
-  \cref@constructprefix{mpfootnote}{\cref@result}%
-  \protected@xdef\cref@currentlabel{%
-    [footnote][\arabic{mpfootnote}][\cref@result]%
-    \p@footnote\@thefnmark}%
-  \cref@old@mpfootnotetext{#1}}
+  \cref@old@makefntext{#1}}
 %    \end{macrocode}
 % \end{macro}
-% \end{macro}
 %
 %
 % \begin{macro}{\newtheorem}
@@ -2037,28 +2039,28 @@
         \def\@tempa{##1}%
         \def\@tempb{section}%
         \ifx\@tempa\@tempb%
-          \protected@xdef\cref@currentlabel{%
+          \protected@edef\cref@currentlabel{%
             [appendix][\arabic{##1}][\cref@result]%
             \csname p@##1\endcsname\csname the##1\endcsname}%
         \else%
           \def\@tempa{##1}%
           \def\@tempb{subsection}%
           \ifx\@tempa\@tempb%
-            \protected@xdef\cref@currentlabel{%
+            \protected@edef\cref@currentlabel{%
               [subappendix][\arabic{##1}][\cref@result]%
               \csname p@##1\endcsname\csname the##1\endcsname}%
           \else%
             \def\@tempa{##1}%
             \def\@tempb{subsubsection}%
             \ifx\@tempa\@tempb%
-              \protected@xdef\cref@currentlabel{%
+              \protected@edef\cref@currentlabel{%
                 [subsubappendix][\arabic{##1}][\cref@result]%
                 \csname p@##1\endcsname\csname the##1\endcsname}%
             \else%
               \@ifundefined{cref@##1@alias}%
                 {\def\@tempa{##1}}%
                 {\def\@tempa{\csname cref@##1@alias\endcsname}}%
-              \protected@xdef\cref@currentlabel{%
+              \protected@edef\cref@currentlabel{%
                 [\@tempa][\arabic{##1}][\cref@result]%
                 \csname p@##1\endcsname\csname the##1\endcsname}
             \fi%
@@ -2083,35 +2085,35 @@
         \def\@tempa{##1}%
         \def\@tempb{chapter}%
         \ifx\@tempa\@tempb%
-          \protected@xdef\cref@currentlabel{%
+          \protected@edef\cref@currentlabel{%
             [appendix][\arabic{##1}][\cref@result]%
             \csname p@##1\endcsname\csname the##1\endcsname}%
         \else%
           \def\@tempa{##1}%
           \def\@tempb{section}%
           \ifx\@tempa\@tempb%
-            \protected@xdef\cref@currentlabel{%
+            \protected@edef\cref@currentlabel{%
               [subappendix][\arabic{##1}][\cref@result]%
               \csname p@##1\endcsname\csname the##1\endcsname}%
           \else%
             \def\@tempa{##1}%
             \def\@tempb{subsection}%
             \ifx\@tempa\@tempb%
-              \protected@xdef\cref@currentlabel{%
+              \protected@edef\cref@currentlabel{%
                 [subsubappendix][\arabic{##1}][\cref@result]%
                 \csname p@##1\endcsname\csname the##1\endcsname}%
             \else%
               \def\@tempa{##1}%
               \def\@tempb{subsubsection}%
               \ifx\@tempa\@tempb%
-                \protected@xdef\cref@currentlabel{%
+                \protected@edef\cref@currentlabel{%
                   [subsubsubappendix][\arabic{##1}][\cref@result]%
                   \csname p@##1\endcsname\csname the##1\endcsname}%
               \else%
                 \@ifundefined{cref@##1@alias}%
                   {\def\@tempa{##1}}%
                   {\def\@tempa{\csname cref@##1@alias\endcsname}}%
-                \protected@xdef\cref@currentlabel{%
+                \protected@edef\cref@currentlabel{%
                   [\@tempa][\arabic{##1}][\cref@result]%
                   \csname p@##1\endcsname\csname the##1\endcsname}
               \fi%
@@ -2157,7 +2159,7 @@
 % \begin{macro}{\cref@getprefix}
 %   Define some utility macros for extracting label, type, and counter
 %   information from the contents of \cmd{\cref@currentlabel}, as written
-%   to the \file{aux} file and stored in \cmd{\r@cref@\meta{label}} when
+%   to the \file{aux} file and stored in \cmd{\r@\meta{label}@cref} when
 %   this is re-read on the next pass. Some other packages commandeer the
 %   referencing system to write label information to the \file{aux} file
 %   for other purposes, and probably use \cmd{\ref} to recover it later.
@@ -2171,13 +2173,13 @@
 %   \cmd{\csname}\ldots\cmd{\endcsname}.
 %    \begin{macrocode}
 \def\cref@getref#1#2{%
-  \expandafter\let\expandafter#2\csname r@cref@#1\endcsname%
+  \expandafter\let\expandafter#2\csname r@#1@cref\endcsname%
   \expandafter\expandafter\expandafter\def%
     \expandafter\expandafter\expandafter#2%
     \expandafter\expandafter\expandafter{%
       \expandafter\@firstoftwo#2}}
 \def\cref@getpageref#1#2{%
-  \expandafter\let\expandafter#2\csname r@cref@#1\endcsname%
+  \expandafter\let\expandafter#2\csname r@#1@cref\endcsname%
   \expandafter\expandafter\expandafter\def%
     \expandafter\expandafter\expandafter#2%
     \expandafter\expandafter\expandafter{%
@@ -2505,10 +2507,10 @@
 %    \end{macrocode}
 % Conversely, undefined references come after everything else.
 %    \begin{macrocode}
-      \expandafter\ifx\csname r@cref@#1\endcsname\relax%
+      \expandafter\ifx\csname r@#1@cref\endcsname\relax%
         \def\cref@result{2}%
       \else%
-        \expandafter\ifx\csname r@cref@#2\endcsname\relax%
+        \expandafter\ifx\csname r@#2@cref\endcsname\relax%
           \def\cref@result{1}%
         \else%
 %    \end{macrocode}
@@ -2606,10 +2608,10 @@
 %    \end{macrocode}
 % Conversely, undefined references come after everything else.
 %    \begin{macrocode}
-      \expandafter\ifx\csname r@cref@#1\endcsname\relax%
+      \expandafter\ifx\csname r@#1@cref\endcsname\relax%
         \def\cref@result{2}%
       \else%
-        \expandafter\ifx\csname r@cref@#2\endcsname\relax%
+        \expandafter\ifx\csname r@#2@cref\endcsname\relax%
           \def\cref@result{1}%
         \else%
 %    \end{macrocode}
@@ -2836,7 +2838,7 @@
 %   consecutive (needed when typesetting reference ranges). This uses
 %   the counter and prefix (i.e.\ formatted version of the counter that
 %   resets the label's counter) information provided by
-%   \cmd{\r@cref@\meta{label}} (via the \file{aux} file) to check if the
+%   \cmd{\r@\meta{label}@cref} (via the \file{aux} file) to check if the
 %   prefices are identical (i.e.\ the references come from the same
 %   chapter, section or whatever), and that the label counters differ
 %   by~0 or~1.
@@ -2905,7 +2907,7 @@
 %    \begin{macrocode}
 \def\cref@processgroup#1#2{%
   \edef\@nextref{\cref@stack@top{#1}}%
-  \expandafter\ifx\csname r@cref@\@nextref\endcsname\relax%
+  \expandafter\ifx\csname r@\@nextref @cref\endcsname\relax%
     \def\@grouptype{\@undefined}%
     \def\@groupformat{\@undefined}%
   \else%
@@ -2932,7 +2934,7 @@
         \let\@nexttype\@grouptype%
         \let\@nextforamt\@groupformat%
       \else%
-        \expandafter\ifx\csname r@cref@\@nextref\endcsname\relax%
+        \expandafter\ifx\csname r@\@nextref @cref\endcsname\relax%
           \def\@nexttype{\@undefined}%
           \def\@nextformat{\@undefined}%
         \else%
@@ -2964,7 +2966,7 @@
 \def\cref@processgroupall#1#2{%
   \cref@stack@init{\@tempstack}%
   \edef\@nextref{\cref@stack@top{#1}}%
-  \expandafter\ifx\csname r@cref@\@nextref\endcsname\relax%
+  \expandafter\ifx\csname r@\@nextref @cref\endcsname\relax%
     \def\@grouptype{\@undefined}%
     \def\@groupformat{\@undefined}%
   \else%
@@ -2990,7 +2992,7 @@
         \let\@nextformat\relax%
       \fi%
     \else%
-      \expandafter\ifx\csname r@cref@\@nextref\endcsname\relax%
+      \expandafter\ifx\csname r@\@nextref @cref\endcsname\relax%
         \def\@nexttype{\@undefined}%
         \def\@nextformat{\@undefined}%
       \else%
@@ -3049,7 +3051,7 @@
     \let#3\relax%
     \edef\@nextref{\cref@stack@top{#1}}%
     #4=1\relax%
-    \expandafter\ifx\csname r@cref@#2\endcsname\relax%
+    \expandafter\ifx\csname r@#2@cref\endcsname\relax%
       \@cref@refconsecutivefalse%
     \else%
 %    \end{macrocode}
@@ -3072,7 +3074,7 @@
 %     Otherwise, test whether next reference is consecutive or not.
 %    \begin{macrocode}
       \else%
-        \expandafter\ifx\csname r@cref@\@nextref\endcsname\relax%
+        \expandafter\ifx\csname r@\@nextref @cref\endcsname\relax%
           \@cref@refconsecutivefalse%
         \else%
           \edef\@tempa{{#2}{\@nextref}}%
@@ -3111,7 +3113,7 @@
 %         Otherwise, test whether next reference is consecutive or not.
 %    \begin{macrocode}
         \else%
-          \expandafter\ifx\csname r@cref@\@nextref\endcsname\relax%
+          \expandafter\ifx\csname r@\@nextref @cref\endcsname\relax%
             \@cref@refconsecutivefalse%
           \else%
             \edef\@tempa{{#3}{\@nextref}}%
@@ -3385,7 +3387,7 @@
 %   reference group to typeset.
 %    \begin{macrocode}
 \def\@setcref#1#2#3{%
-  \expandafter\ifx\csname r@cref@#1\endcsname\relax%
+  \expandafter\ifx\csname r@#1@cref\endcsname\relax%
     \protect\G@refundefinedtrue%
     \nfss@text{\reset@font\bfseries ??}%
     \@latex@warning{Reference `#1' on page \thepage \space undefined}%
@@ -3439,11 +3441,11 @@
 %    \end{macrocode}
 % Check if both references are defined.
 %    \begin{macrocode}
-    \expandafter\ifx\csname r@cref@#1\endcsname\relax%
+    \expandafter\ifx\csname r@#1@cref\endcsname\relax%
       \protect\G@refundefinedtrue%
       \@latex@warning{Reference `#1' on page \thepage \space%
         undefined}%
-      \expandafter\ifx\csname r@cref@#2\endcsname\relax%
+      \expandafter\ifx\csname r@#2@cref\endcsname\relax%
         \nfss@text{\reset@font\bfseries ??}--%
         \nfss@text{\reset@font\bfseries ??}%
         \@latex@warning{Reference `#2' on page \thepage \space%
@@ -3453,7 +3455,7 @@
         \nfss@text{\reset@font\bfseries ??}--\@labelb%
       \fi%
     \else%
-      \expandafter\ifx\csname r@cref@#2\endcsname\relax%
+      \expandafter\ifx\csname r@#2@cref\endcsname\relax%
         \protect\G@refundefinedtrue%
         \cref@getlabel{#1}{\@labela}%
         \@labela--\nfss@text{\reset@font\bfseries ??}%
@@ -3577,7 +3579,7 @@
 %   \cmd{namecref} commands.
 %    \begin{macrocode}
 \def\@setnamecref#1#2#3#4{%
-  \expandafter\ifx\csname r@cref@#2\endcsname\relax%
+  \expandafter\ifx\csname r@#2@cref\endcsname\relax%
     \protect\G@refundefinedtrue%
     \nfss@text{\reset@font\bfseries ??}%
     \@latex@warning{Reference `#1' on page \thepage \space undefined}%
@@ -3706,8 +3708,8 @@
 %    instead of a range.
 %    \begin{macrocode}
     \ifx\@endref\relax\else%
-      \expandafter\ifx\csname r@cref@\@beginref\endcsname\relax\else%
-        \expandafter\ifx\csname r@cref@\@endref\endcsname\relax\else%
+      \expandafter\ifx\csname r@\@beginref @cref\endcsname\relax\else%
+        \expandafter\ifx\csname r@\@endref @cref\endcsname\relax\else%
           \cref@getpageref{\@beginref}{\@tempa}%
           \cref@getpageref{\@endref}{\@tempb}%
           \ifx\@tempa\@tempb\relax%
@@ -3799,7 +3801,7 @@
 %   reference group to typeset.
 %    \begin{macrocode}
 \def\@setcpageref#1#2#3{%
-  \expandafter\ifx\csname r@cref@#1\endcsname\relax%
+  \expandafter\ifx\csname r@#1@cref\endcsname\relax%
     \protect\G@refundefinedtrue%
     \nfss@text{\reset@font\bfseries ??}%
     \@latex@warning{Reference `#1' on page \thepage \space undefined}%
@@ -3848,11 +3850,11 @@
 %    \end{macrocode}
 % Check if both references are defined.
 %    \begin{macrocode}
-    \expandafter\ifx\csname r@cref@#1\endcsname\relax%
+    \expandafter\ifx\csname r@#1@cref\endcsname\relax%
       \protect\G@refundefinedtrue%
       \@latex@warning{Reference `#1' on page \thepage \space%
         undefined}%
-      \expandafter\ifx\csname r@cref@#2\endcsname\relax%
+      \expandafter\ifx\csname r@#2@cref\endcsname\relax%
         \nfss@text{\reset@font\bfseries ??}--%
         \nfss@text{\reset@font\bfseries ??}%
         \@latex@warning{Reference `#2' on page \thepage \space%
@@ -3862,7 +3864,7 @@
         \nfss@text{\reset@font\bfseries ??}--\@pageb%
       \fi%
     \else%
-      \expandafter\ifx\csname r@cref@#2\endcsname\relax%
+      \expandafter\ifx\csname r@#2@cref\endcsname\relax%
         \protect\G@refundefinedtrue%
         \cref@getpageref{#1}{\@pagea}%
         \@pagea--\nfss@text{\reset@font\bfseries ??}%
@@ -4983,7 +4985,7 @@
 %   \package{hyperref} adds the hyperlink information to the standard
 %   \cmd{\newlabel} line in the \file{aux} file, so we have to retrieve
 %   it from the standard \cmd{r@\meta{label}}, \emph{not} the one
-%   prefixed with |cref@| that we've created ourselves.
+%   suffixed with |@cref| that we've created ourselves.
 %    \begin{macrocode}
     \def\cref@hyperref#1{\expandafter\expandafter\expandafter%
       \@fourthoffive\csname r@#1\endcsname}
@@ -5006,7 +5008,7 @@
       \@ifundefined{cref@#1@alias}%
         {\def\@tempa{#1}}%
         {\def\@tempa{\csname cref@#1@alias\endcsname}}%
-      \protected@xdef\cref@currentlabel{%
+      \protected@edef\cref@currentlabel{%
         [\@tempa][\arabic{#1}][\cref@result]%
         \csname p@#1\endcsname\csname the#1\endcsname}}
 %    \end{macrocode}
@@ -5031,7 +5033,7 @@
     \let\refstepcounter@noarg\cref@old@refstepcounter%
     \def\refstepcounter@optarg[#1]#2{%
       \cref@old@refstepcounter{#2}%
-      \protected@xdef\cref@currentlabel{%
+      \protected@edef\cref@currentlabel{%
         \expandafter\cref@override@label@type%
           \cref@currentlabel\@nil{#1}}}
 %    \end{macrocode}
@@ -5067,28 +5069,28 @@
             \def\@tempa{##1}%
             \def\@tempb{section}%
             \ifx\@tempa\@tempb%
-              \protected@xdef\cref@currentlabel{%
+              \protected@edef\cref@currentlabel{%
                 [appendix][\arabic{##1}][\cref@result]%
                 \csname p@##1\endcsname\csname the##1\endcsname}%
             \else%
               \def\@tempa{##1}%
               \def\@tempb{subsection}%
               \ifx\@tempa\@tempb%
-                \protected@xdef\cref@currentlabel{%
+                \protected@edef\cref@currentlabel{%
                   [subappendix][\arabic{##1}][\cref@result]%
                   \csname p@##1\endcsname\csname the##1\endcsname}%
               \else%
                 \def\@tempa{##1}%
                 \def\@tempb{subsubsection}%
                 \ifx\@tempa\@tempb%
-                  \protected@xdef\cref@currentlabel{%
+                  \protected@edef\cref@currentlabel{%
                     [subsubappendix][\arabic{##1}][\cref@result]%
                     \csname p@##1\endcsname\csname the##1\endcsname}%
                 \else%
                   \@ifundefined{cref@##1@alias}%
                     {\def\@tempa{##1}}%
                     {\def\@tempa{\csname cref@##1@alias\endcsname}}%
-                  \protected@xdef\cref@currentlabel{%
+                  \protected@edef\cref@currentlabel{%
                     [\@tempa][\arabic{##1}][\cref@result]%
                     \csname p@##1\endcsname\csname the##1\endcsname}
                 \fi%
@@ -5113,35 +5115,35 @@
             \def\@tempa{##1}%
             \def\@tempb{chapter}%
             \ifx\@tempa\@tempb%
-              \protected@xdef\cref@currentlabel{%
+              \protected@edef\cref@currentlabel{%
                 [appendix][\arabic{##1}][\cref@result]%
                 \csname p@##1\endcsname\csname the##1\endcsname}%
             \else%
               \def\@tempa{##1}%
               \def\@tempb{section}%
               \ifx\@tempa\@tempb%
-                \protected@xdef\cref@currentlabel{%
+                \protected@edef\cref@currentlabel{%
                   [subappendix][\arabic{##1}][\cref@result]%
                   \csname p@##1\endcsname\csname the##1\endcsname}%
               \else%
                 \def\@tempa{##1}%
                 \def\@tempb{subsection}%
                 \ifx\@tempa\@tempb%
-                  \protected@xdef\cref@currentlabel{%
+                  \protected@edef\cref@currentlabel{%
                     [subsubappendix][\arabic{##1}][\cref@result]%
                     \csname p@##1\endcsname\csname the##1\endcsname}%
                 \else%
                   \def\@tempa{##1}%
                   \def\@tempb{subsubsection}%
                   \ifx\@tempa\@tempb%
-                    \protected@xdef\cref@currentlabel{%
+                    \protected@edef\cref@currentlabel{%
                       [subsubsubappendix][\arabic{##1}][\cref@result]%
                       \csname p@##1\endcsname\csname the##1\endcsname}%
                   \else%
                     \@ifundefined{cref@##1@alias}%
                       {\def\@tempa{##1}}%
                       {\def\@tempa{\csname cref@##1@alias\endcsname}}%
-                    \protected@xdef\cref@currentlabel{%
+                    \protected@edef\cref@currentlabel{%
                       [\@tempa][\arabic{##1}][\cref@result]%
                       \csname p@##1\endcsname\csname the##1\endcsname}
                   \fi%
@@ -5325,7 +5327,7 @@
       \@ifundefined{cref@#1@alias}%
         {\def\@tempa{#1}}%
         {\def\@tempa{\csname cref@#1@alias\endcsname}}%
-      \protected@xdef\cref@currentlabel{%
+      \protected@edef\cref@currentlabel{%
         [\@tempa][\arabic{#1}][\cref@result]%
         \csname p@#1\endcsname\csname the#1\endcsname}}%
   \fi%
diff --git a/Master/texmf-dist/tex/latex/cleveref/cleveref.sty b/Master/texmf-dist/tex/latex/cleveref/cleveref.sty
index 2c84707b70e..1b82c4e1957 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{2012/01/18}
-\def\packageversion{0.18.3}
+\def\packagedate{2012/02/15}
+\def\packageversion{0.18.4}
 %% 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.
@@ -51,13 +51,13 @@
   \@ifundefined{cref@#1@alias}%
     {\def\@tempa{#1}}%
     {\def\@tempa{\csname cref@#1@alias\endcsname}}%
-  \protected@xdef\cref@currentlabel{%
+  \protected@edef\cref@currentlabel{%
     [\@tempa][\arabic{#1}][\cref@result]%
     \csname p@#1\endcsname\csname the#1\endcsname}}
 \def\refstepcounter@optarg[#1]#2{%
   \cref@old@refstepcounter{#2}%
   \cref@constructprefix{#2}{\cref@result}%
-  \protected@xdef\cref@currentlabel{%
+  \protected@edef\cref@currentlabel{%
     [#1][\arabic{#2}][\cref@result]%
     \csname p@#2\endcsname\csname the#2\endcsname}}
 \AtBeginDocument{%
@@ -68,32 +68,25 @@
     \@bsphack%
     \cref@old@label{#1}%
     \protected@write\@auxout{}%
-      {\string\newlabel{cref@#1}{{\cref@currentlabel}{\thepage}}}%
+      {\string\newlabel{#1@cref}{{\cref@currentlabel}{\thepage}}}%
     \@esphack}%
   \def\label@optarg[#1]#2{%
     \@bsphack%
     \cref@old@label{#2}%
-    \protected@xdef\cref@currentlabel{%
+    \protected@edef\cref@currentlabel{%
       \expandafter\cref@override@label@type%
         \cref@currentlabel\@nil{#1}}%
     \protected@write\@auxout{}%
-      {\string\newlabel{cref@#2}{{\cref@currentlabel}{\thepage}}}%
+      {\string\newlabel{#2@cref}{{\cref@currentlabel}{\thepage}}}%
     \@esphack}
 }% end of AtBeginDocument
-\let\cref@old@footnotetext\@footnotetext
-\let\cref@old@mpfootnotetext\@mpfootnotetext
-\def\@footnotetext{%
+\let\cref@old@makefntext\@makefntext
+\long\def\@makefntext#1{%
   \cref@constructprefix{footnote}{\cref@result}%
-  \protected@xdef\cref@currentlabel{%
+  \protected@edef\cref@currentlabel{%
     [footnote][\arabic{footnote}][\cref@result]%
     \p@footnote\@thefnmark}%
-  \cref@old@footnotetext}
-\def\@mpfootnotetext#1{%
-  \cref@constructprefix{mpfootnote}{\cref@result}%
-  \protected@xdef\cref@currentlabel{%
-    [footnote][\arabic{mpfootnote}][\cref@result]%
-    \p@footnote\@thefnmark}%
-  \cref@old@mpfootnotetext{#1}}
+  \cref@old@makefntext{#1}}
 \let\cref@old@othm\@othm
 \def\@othm#1[#2]#3{%
   \edef\@tempa{\expandafter\noexpand%
@@ -179,28 +172,28 @@
         \def\@tempa{##1}%
         \def\@tempb{section}%
         \ifx\@tempa\@tempb%
-          \protected@xdef\cref@currentlabel{%
+          \protected@edef\cref@currentlabel{%
             [appendix][\arabic{##1}][\cref@result]%
             \csname p@##1\endcsname\csname the##1\endcsname}%
         \else%
           \def\@tempa{##1}%
           \def\@tempb{subsection}%
           \ifx\@tempa\@tempb%
-            \protected@xdef\cref@currentlabel{%
+            \protected@edef\cref@currentlabel{%
               [subappendix][\arabic{##1}][\cref@result]%
               \csname p@##1\endcsname\csname the##1\endcsname}%
           \else%
             \def\@tempa{##1}%
             \def\@tempb{subsubsection}%
             \ifx\@tempa\@tempb%
-              \protected@xdef\cref@currentlabel{%
+              \protected@edef\cref@currentlabel{%
                 [subsubappendix][\arabic{##1}][\cref@result]%
                 \csname p@##1\endcsname\csname the##1\endcsname}%
             \else%
               \@ifundefined{cref@##1@alias}%
                 {\def\@tempa{##1}}%
                 {\def\@tempa{\csname cref@##1@alias\endcsname}}%
-              \protected@xdef\cref@currentlabel{%
+              \protected@edef\cref@currentlabel{%
                 [\@tempa][\arabic{##1}][\cref@result]%
                 \csname p@##1\endcsname\csname the##1\endcsname}
             \fi%
@@ -218,35 +211,35 @@
         \def\@tempa{##1}%
         \def\@tempb{chapter}%
         \ifx\@tempa\@tempb%
-          \protected@xdef\cref@currentlabel{%
+          \protected@edef\cref@currentlabel{%
             [appendix][\arabic{##1}][\cref@result]%
             \csname p@##1\endcsname\csname the##1\endcsname}%
         \else%
           \def\@tempa{##1}%
           \def\@tempb{section}%
           \ifx\@tempa\@tempb%
-            \protected@xdef\cref@currentlabel{%
+            \protected@edef\cref@currentlabel{%
               [subappendix][\arabic{##1}][\cref@result]%
               \csname p@##1\endcsname\csname the##1\endcsname}%
           \else%
             \def\@tempa{##1}%
             \def\@tempb{subsection}%
             \ifx\@tempa\@tempb%
-              \protected@xdef\cref@currentlabel{%
+              \protected@edef\cref@currentlabel{%
                 [subsubappendix][\arabic{##1}][\cref@result]%
                 \csname p@##1\endcsname\csname the##1\endcsname}%
             \else%
               \def\@tempa{##1}%
               \def\@tempb{subsubsection}%
               \ifx\@tempa\@tempb%
-                \protected@xdef\cref@currentlabel{%
+                \protected@edef\cref@currentlabel{%
                   [subsubsubappendix][\arabic{##1}][\cref@result]%
                   \csname p@##1\endcsname\csname the##1\endcsname}%
               \else%
                 \@ifundefined{cref@##1@alias}%
                   {\def\@tempa{##1}}%
                   {\def\@tempa{\csname cref@##1@alias\endcsname}}%
-                \protected@xdef\cref@currentlabel{%
+                \protected@edef\cref@currentlabel{%
                   [\@tempa][\arabic{##1}][\cref@result]%
                   \csname p@##1\endcsname\csname the##1\endcsname}
               \fi%
@@ -263,13 +256,13 @@
   \edef\act{\noexpand#1={\the#1\the\toks0}}%
   \act}%
 \def\cref@getref#1#2{%
-  \expandafter\let\expandafter#2\csname r@cref@#1\endcsname%
+  \expandafter\let\expandafter#2\csname r@#1@cref\endcsname%
   \expandafter\expandafter\expandafter\def%
     \expandafter\expandafter\expandafter#2%
     \expandafter\expandafter\expandafter{%
       \expandafter\@firstoftwo#2}}
 \def\cref@getpageref#1#2{%
-  \expandafter\let\expandafter#2\csname r@cref@#1\endcsname%
+  \expandafter\let\expandafter#2\csname r@#1@cref\endcsname%
   \expandafter\expandafter\expandafter\def%
     \expandafter\expandafter\expandafter#2%
     \expandafter\expandafter\expandafter{%
@@ -458,10 +451,10 @@
     \ifx\@tempa\@empty%
       \def\cref@result{2}%
     \else%
-      \expandafter\ifx\csname r@cref@#1\endcsname\relax%
+      \expandafter\ifx\csname r@#1@cref\endcsname\relax%
         \def\cref@result{2}%
       \else%
-        \expandafter\ifx\csname r@cref@#2\endcsname\relax%
+        \expandafter\ifx\csname r@#2@cref\endcsname\relax%
           \def\cref@result{1}%
         \else%
           \cref@getcounter{#1}{\@countera}%
@@ -530,10 +523,10 @@
     \ifx\@tempa\@empty%
       \def\cref@result{2}%
     \else%
-      \expandafter\ifx\csname r@cref@#1\endcsname\relax%
+      \expandafter\ifx\csname r@#1@cref\endcsname\relax%
         \def\cref@result{2}%
       \else%
-        \expandafter\ifx\csname r@cref@#2\endcsname\relax%
+        \expandafter\ifx\csname r@#2@cref\endcsname\relax%
           \def\cref@result{1}%
         \else%
           \cref@getpageref{#1}{\@tempa}%
@@ -733,7 +726,7 @@
   \expandafter\endgroup\@after}
 \def\cref@processgroup#1#2{%
   \edef\@nextref{\cref@stack@top{#1}}%
-  \expandafter\ifx\csname r@cref@\@nextref\endcsname\relax%
+  \expandafter\ifx\csname r@\@nextref @cref\endcsname\relax%
     \def\@grouptype{\@undefined}%
     \def\@groupformat{\@undefined}%
   \else%
@@ -759,7 +752,7 @@
         \let\@nexttype\@grouptype%
         \let\@nextforamt\@groupformat%
       \else%
-        \expandafter\ifx\csname r@cref@\@nextref\endcsname\relax%
+        \expandafter\ifx\csname r@\@nextref @cref\endcsname\relax%
           \def\@nexttype{\@undefined}%
           \def\@nextformat{\@undefined}%
         \else%
@@ -782,7 +775,7 @@
 \def\cref@processgroupall#1#2{%
   \cref@stack@init{\@tempstack}%
   \edef\@nextref{\cref@stack@top{#1}}%
-  \expandafter\ifx\csname r@cref@\@nextref\endcsname\relax%
+  \expandafter\ifx\csname r@\@nextref @cref\endcsname\relax%
     \def\@grouptype{\@undefined}%
     \def\@groupformat{\@undefined}%
   \else%
@@ -807,7 +800,7 @@
         \let\@nextformat\relax%
       \fi%
     \else%
-      \expandafter\ifx\csname r@cref@\@nextref\endcsname\relax%
+      \expandafter\ifx\csname r@\@nextref @cref\endcsname\relax%
         \def\@nexttype{\@undefined}%
         \def\@nextformat{\@undefined}%
       \else%
@@ -849,7 +842,7 @@
     \let#3\relax%
     \edef\@nextref{\cref@stack@top{#1}}%
     #4=1\relax%
-    \expandafter\ifx\csname r@cref@#2\endcsname\relax%
+    \expandafter\ifx\csname r@#2@cref\endcsname\relax%
       \@cref@refconsecutivefalse%
     \else%
       \ifx\@nextref\@empty%
@@ -863,7 +856,7 @@
             \edef\@nextref{\cref@stack@top{#1}}%
           \fi}%
       \else%
-        \expandafter\ifx\csname r@cref@\@nextref\endcsname\relax%
+        \expandafter\ifx\csname r@\@nextref @cref\endcsname\relax%
           \@cref@refconsecutivefalse%
         \else%
           \edef\@tempa{{#2}{\@nextref}}%
@@ -891,7 +884,7 @@
               \edef\@nextref{\cref@stack@top{#1}}%
             \fi}%
         \else%
-          \expandafter\ifx\csname r@cref@\@nextref\endcsname\relax%
+          \expandafter\ifx\csname r@\@nextref @cref\endcsname\relax%
             \@cref@refconsecutivefalse%
           \else%
             \edef\@tempa{{#3}{\@nextref}}%
@@ -1047,7 +1040,7 @@
   }% end loop over main reference stack
   \endgroup}
 \def\@setcref#1#2#3{%
-  \expandafter\ifx\csname r@cref@#1\endcsname\relax%
+  \expandafter\ifx\csname r@#1@cref\endcsname\relax%
     \protect\G@refundefinedtrue%
     \nfss@text{\reset@font\bfseries ??}%
     \@latex@warning{Reference `#1' on page \thepage \space undefined}%
@@ -1073,11 +1066,11 @@
 \def\@@setcref#1#2{\cref@getlabel{#2}{\@templabel}#1{\@templabel}{}{}}
 \def\@setcrefrange#1#2#3#4{%
   \begingroup%
-    \expandafter\ifx\csname r@cref@#1\endcsname\relax%
+    \expandafter\ifx\csname r@#1@cref\endcsname\relax%
       \protect\G@refundefinedtrue%
       \@latex@warning{Reference `#1' on page \thepage \space%
         undefined}%
-      \expandafter\ifx\csname r@cref@#2\endcsname\relax%
+      \expandafter\ifx\csname r@#2@cref\endcsname\relax%
         \nfss@text{\reset@font\bfseries ??}--%
         \nfss@text{\reset@font\bfseries ??}%
         \@latex@warning{Reference `#2' on page \thepage \space%
@@ -1087,7 +1080,7 @@
         \nfss@text{\reset@font\bfseries ??}--\@labelb%
       \fi%
     \else%
-      \expandafter\ifx\csname r@cref@#2\endcsname\relax%
+      \expandafter\ifx\csname r@#2@cref\endcsname\relax%
         \protect\G@refundefinedtrue%
         \cref@getlabel{#1}{\@labela}%
         \@labela--\nfss@text{\reset@font\bfseries ??}%
@@ -1147,7 +1140,7 @@
 \DeclareRobustCommand{\lcnamecrefs}[1]{%
   \@setnamecref{Cref}{#1}{@plural}{\MakeLowercase}}
 \def\@setnamecref#1#2#3#4{%
-  \expandafter\ifx\csname r@cref@#2\endcsname\relax%
+  \expandafter\ifx\csname r@#2@cref\endcsname\relax%
     \protect\G@refundefinedtrue%
     \nfss@text{\reset@font\bfseries ??}%
     \@latex@warning{Reference `#1' on page \thepage \space undefined}%
@@ -1212,8 +1205,8 @@
       \count@consecutive=1\relax%
     \fi%
     \ifx\@endref\relax\else%
-      \expandafter\ifx\csname r@cref@\@beginref\endcsname\relax\else%
-        \expandafter\ifx\csname r@cref@\@endref\endcsname\relax\else%
+      \expandafter\ifx\csname r@\@beginref @cref\endcsname\relax\else%
+        \expandafter\ifx\csname r@\@endref @cref\endcsname\relax\else%
           \cref@getpageref{\@beginref}{\@tempa}%
           \cref@getpageref{\@endref}{\@tempb}%
           \ifx\@tempa\@tempb\relax%
@@ -1276,7 +1269,7 @@
   }% end loop over reference stack
   \endgroup}
 \def\@setcpageref#1#2#3{%
-  \expandafter\ifx\csname r@cref@#1\endcsname\relax%
+  \expandafter\ifx\csname r@#1@cref\endcsname\relax%
     \protect\G@refundefinedtrue%
     \nfss@text{\reset@font\bfseries ??}%
     \@latex@warning{Reference `#1' on page \thepage \space undefined}%
@@ -1302,11 +1295,11 @@
   \cref@getpageref{#2}{\@temppage}#1{\@temppage}{}{}}
 \def\@setcpagerefrange#1#2#3#4{%
   \begingroup%
-    \expandafter\ifx\csname r@cref@#1\endcsname\relax%
+    \expandafter\ifx\csname r@#1@cref\endcsname\relax%
       \protect\G@refundefinedtrue%
       \@latex@warning{Reference `#1' on page \thepage \space%
         undefined}%
-      \expandafter\ifx\csname r@cref@#2\endcsname\relax%
+      \expandafter\ifx\csname r@#2@cref\endcsname\relax%
         \nfss@text{\reset@font\bfseries ??}--%
         \nfss@text{\reset@font\bfseries ??}%
         \@latex@warning{Reference `#2' on page \thepage \space%
@@ -1316,7 +1309,7 @@
         \nfss@text{\reset@font\bfseries ??}--\@pageb%
       \fi%
     \else%
-      \expandafter\ifx\csname r@cref@#2\endcsname\relax%
+      \expandafter\ifx\csname r@#2@cref\endcsname\relax%
         \protect\G@refundefinedtrue%
         \cref@getpageref{#1}{\@pagea}%
         \@pagea--\nfss@text{\reset@font\bfseries ??}%
@@ -1962,13 +1955,13 @@
       \@ifundefined{cref@#1@alias}%
         {\def\@tempa{#1}}%
         {\def\@tempa{\csname cref@#1@alias\endcsname}}%
-      \protected@xdef\cref@currentlabel{%
+      \protected@edef\cref@currentlabel{%
         [\@tempa][\arabic{#1}][\cref@result]%
         \csname p@#1\endcsname\csname the#1\endcsname}}
     \let\refstepcounter@noarg\cref@old@refstepcounter%
     \def\refstepcounter@optarg[#1]#2{%
       \cref@old@refstepcounter{#2}%
-      \protected@xdef\cref@currentlabel{%
+      \protected@edef\cref@currentlabel{%
         \expandafter\cref@override@label@type%
           \cref@currentlabel\@nil{#1}}}
     \@ifundefined{appendix}{}{%
@@ -1986,28 +1979,28 @@
             \def\@tempa{##1}%
             \def\@tempb{section}%
             \ifx\@tempa\@tempb%
-              \protected@xdef\cref@currentlabel{%
+              \protected@edef\cref@currentlabel{%
                 [appendix][\arabic{##1}][\cref@result]%
                 \csname p@##1\endcsname\csname the##1\endcsname}%
             \else%
               \def\@tempa{##1}%
               \def\@tempb{subsection}%
               \ifx\@tempa\@tempb%
-                \protected@xdef\cref@currentlabel{%
+                \protected@edef\cref@currentlabel{%
                   [subappendix][\arabic{##1}][\cref@result]%
                   \csname p@##1\endcsname\csname the##1\endcsname}%
               \else%
                 \def\@tempa{##1}%
                 \def\@tempb{subsubsection}%
                 \ifx\@tempa\@tempb%
-                  \protected@xdef\cref@currentlabel{%
+                  \protected@edef\cref@currentlabel{%
                     [subsubappendix][\arabic{##1}][\cref@result]%
                     \csname p@##1\endcsname\csname the##1\endcsname}%
                 \else%
                   \@ifundefined{cref@##1@alias}%
                     {\def\@tempa{##1}}%
                     {\def\@tempa{\csname cref@##1@alias\endcsname}}%
-                  \protected@xdef\cref@currentlabel{%
+                  \protected@edef\cref@currentlabel{%
                     [\@tempa][\arabic{##1}][\cref@result]%
                     \csname p@##1\endcsname\csname the##1\endcsname}
                 \fi%
@@ -2025,35 +2018,35 @@
             \def\@tempa{##1}%
             \def\@tempb{chapter}%
             \ifx\@tempa\@tempb%
-              \protected@xdef\cref@currentlabel{%
+              \protected@edef\cref@currentlabel{%
                 [appendix][\arabic{##1}][\cref@result]%
                 \csname p@##1\endcsname\csname the##1\endcsname}%
             \else%
               \def\@tempa{##1}%
               \def\@tempb{section}%
               \ifx\@tempa\@tempb%
-                \protected@xdef\cref@currentlabel{%
+                \protected@edef\cref@currentlabel{%
                   [subappendix][\arabic{##1}][\cref@result]%
                   \csname p@##1\endcsname\csname the##1\endcsname}%
               \else%
                 \def\@tempa{##1}%
                 \def\@tempb{subsection}%
                 \ifx\@tempa\@tempb%
-                  \protected@xdef\cref@currentlabel{%
+                  \protected@edef\cref@currentlabel{%
                     [subsubappendix][\arabic{##1}][\cref@result]%
                     \csname p@##1\endcsname\csname the##1\endcsname}%
                 \else%
                   \def\@tempa{##1}%
                   \def\@tempb{subsubsection}%
                   \ifx\@tempa\@tempb%
-                    \protected@xdef\cref@currentlabel{%
+                    \protected@edef\cref@currentlabel{%
                       [subsubsubappendix][\arabic{##1}][\cref@result]%
                       \csname p@##1\endcsname\csname the##1\endcsname}%
                   \else%
                     \@ifundefined{cref@##1@alias}%
                       {\def\@tempa{##1}}%
                       {\def\@tempa{\csname cref@##1@alias\endcsname}}%
-                    \protected@xdef\cref@currentlabel{%
+                    \protected@edef\cref@currentlabel{%
                       [\@tempa][\arabic{##1}][\cref@result]%
                       \csname p@##1\endcsname\csname the##1\endcsname}
                   \fi%
@@ -2165,7 +2158,7 @@
       \@ifundefined{cref@#1@alias}%
         {\def\@tempa{#1}}%
         {\def\@tempa{\csname cref@#1@alias\endcsname}}%
-      \protected@xdef\cref@currentlabel{%
+      \protected@edef\cref@currentlabel{%
         [\@tempa][\arabic{#1}][\cref@result]%
         \csname p@#1\endcsname\csname the#1\endcsname}}%
   \fi%