cleveref (19apr18)

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

1 files changed, 145 insertions, 9 deletions

diff --git a/Master/texmf-dist/tex/latex/cleveref/cleveref.sty b/Master/texmf-dist/tex/latex/cleveref/cleveref.sty
index 6a0bd665e4e..be631676833 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--2016  Toby Cubitt
 %% See the files README and COPYING.
 %% 
-\def\packagedate{2018/03/03}
-\def\packageversion{0.21.3}
+\def\packagedate{2018/03/27}
+\def\packageversion{0.21.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.
@@ -1686,31 +1686,167 @@
   \@crefdefinemultiformat{#1}%
   \@crefrangedefinemultiformat{#1}}%
 \def\@crefcopyformats#1#2{%
+  \let\@tempf\iffalse%
   \@ifundefined{cref@#2@name}{%
     \edef\@tempa{\expandafter\noexpand\csname cref@#2@name\endcsname}%
     \edef\@tempb{\expandafter\noexpand\csname cref@#1@name\endcsname}%
     \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb%
     \edef\@tempa{\expandafter\noexpand\csname cref@#2@name@plural\endcsname}%
     \edef\@tempb{\expandafter\noexpand\csname cref@#1@name@plural\endcsname}%
-    \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
+    \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb%
+  }{%
+    \let\@tempf\iftrue%
+  }%
   \@ifundefined{Cref@#2@name}{%
     \edef\@tempa{\expandafter\noexpand\csname Cref@#2@name\endcsname}%
     \edef\@tempb{\expandafter\noexpand\csname Cref@#1@name\endcsname}%
     \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb%
     \edef\@tempa{\expandafter\noexpand\csname Cref@#2@name@plural\endcsname}%
     \edef\@tempb{\expandafter\noexpand\csname Cref@#1@name@plural\endcsname}%
-    \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
+    \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb%
+  }{%
+    \let\@tempf\iftrue%
+  }%
   \@ifundefined{cref@#2@label}{%
     \@ifundefined{cref@#1@label}{}{%
       \edef\@tempa{\expandafter\noexpand\csname cref@#2@label\endcsname}%
       \edef\@tempb{\expandafter\noexpand\csname cref@#1@label\endcsname}%
-      \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}}{}%
+      \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}%
+  }{%
+    \let\@tempf\iftrue%
+  }%
   \@ifundefined{cref@#2@rangelabel}{%
     \@ifundefined{cref@#1@rangelabel}{}{%
       \edef\@tempa{\expandafter\noexpand\csname cref@#2@rangelabel\endcsname}%
       \edef\@tempb{\expandafter\noexpand\csname cref@#1@rangelabel\endcsname}%
-      \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}}{}%
-  \@crefdefineallformats{#2}%
+      \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}%
+  }{%
+    \let\@tempf\iftrue%
+  }%
+  \@tempf\relax%
+    \@crefdefineallformats{#2}%
+  \else%
+    \@ifundefined{cref@#2@format}{%
+      \edef\@tempa{\expandafter\noexpand\csname cref@#2@format\endcsname}%
+      \edef\@tempb{\expandafter\noexpand\csname cref@#1@format\endcsname}%
+      \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
+    \@ifundefined{crefrange@#2@format}{%
+      \edef\@tempa{\expandafter\noexpand\csname crefrange@#2@format\endcsname}%
+      \edef\@tempb{\expandafter\noexpand\csname crefrange@#1@format\endcsname}%
+      \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
+    \@ifundefined{cref@#2@format@first}{%
+      \edef\@tempa{\expandafter\noexpand\csname cref@#2@format@first\endcsname}%
+      \edef\@tempb{\expandafter\noexpand\csname cref@#1@format@first\endcsname}%
+      \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
+    \@ifundefined{cref@#2@format@second}{%
+      \edef\@tempa{\expandafter\noexpand\csname cref@#2@format@second\endcsname}%
+      \edef\@tempb{\expandafter\noexpand\csname cref@#1@format@second\endcsname}%
+      \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
+    \@ifundefined{cref@#2@format@middle}{%
+      \edef\@tempa{\expandafter\noexpand\csname cref@#2@format@middle\endcsname}%
+      \edef\@tempb{\expandafter\noexpand\csname cref@#1@format@middle\endcsname}%
+      \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
+    \@ifundefined{cref@#2@format@last}{%
+      \edef\@tempa{\expandafter\noexpand\csname cref@#2@format@last\endcsname}%
+      \edef\@tempb{\expandafter\noexpand\csname cref@#1@format@last\endcsname}%
+      \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
+    \@ifundefined{crefrange@#2@format@first}{%
+      \edef\@tempa{\expandafter\noexpand\csname crefrange@#2@format@first\endcsname}%
+      \edef\@tempb{\expandafter\noexpand\csname crefrange@#1@format@first\endcsname}%
+      \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
+    \@ifundefined{crefrange@#2@format@second}{%
+      \edef\@tempa{\expandafter\noexpand\csname crefrange@#2@format@second\endcsname}%
+      \edef\@tempb{\expandafter\noexpand\csname crefrange@#1@format@second\endcsname}%
+      \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
+    \@ifundefined{crefrange@#2@format@middle}{%
+      \edef\@tempa{\expandafter\noexpand\csname crefrange@#2@format@middle\endcsname}%
+      \edef\@tempb{\expandafter\noexpand\csname crefrange@#1@format@middle\endcsname}%
+      \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
+    \@ifundefined{crefrange@#2@format@last}{%
+      \edef\@tempa{\expandafter\noexpand\csname crefrange@#2@format@last\endcsname}%
+      \edef\@tempb{\expandafter\noexpand\csname crefrange@#1@format@last\endcsname}%
+      \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
+    \@ifundefined{Cref@#2@format}{%
+      \edef\@tempa{\expandafter\noexpand\csname Cref@#2@format\endcsname}%
+      \edef\@tempb{\expandafter\noexpand\csname Cref@#1@format\endcsname}%
+      \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
+    \@ifundefined{Crefrange@#2@format}{%
+      \edef\@tempa{\expandafter\noexpand\csname Crefrange@#2@format\endcsname}%
+      \edef\@tempb{\expandafter\noexpand\csname Crefrange@#1@format\endcsname}%
+      \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
+    \@ifundefined{Cref@#2@format@first}{%
+      \edef\@tempa{\expandafter\noexpand\csname Cref@#2@format@first\endcsname}%
+      \edef\@tempb{\expandafter\noexpand\csname Cref@#1@format@first\endcsname}%
+      \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
+    \@ifundefined{Cref@#2@format@second}{%
+      \edef\@tempa{\expandafter\noexpand\csname Cref@#2@format@second\endcsname}%
+      \edef\@tempb{\expandafter\noexpand\csname Cref@#1@format@second\endcsname}%
+      \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
+    \@ifundefined{Cref@#2@format@middle}{%
+      \edef\@tempa{\expandafter\noexpand\csname Cref@#2@format@middle\endcsname}%
+      \edef\@tempb{\expandafter\noexpand\csname Cref@#1@format@middle\endcsname}%
+      \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
+    \@ifundefined{Cref@#2@format@last}{%
+      \edef\@tempa{\expandafter\noexpand\csname Cref@#2@format@last\endcsname}%
+      \edef\@tempb{\expandafter\noexpand\csname Cref@#1@format@last\endcsname}%
+      \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
+    \@ifundefined{Crefrange@#2@format@first}{%
+      \edef\@tempa{\expandafter\noexpand\csname Crefrange@#2@format@first\endcsname}%
+      \edef\@tempb{\expandafter\noexpand\csname Crefrange@#1@format@first\endcsname}%
+      \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
+    \@ifundefined{Crefrange@#2@format@second}{%
+      \edef\@tempa{\expandafter\noexpand\csname Crefrange@#2@format@second\endcsname}%
+      \edef\@tempb{\expandafter\noexpand\csname Crefrange@#1@format@second\endcsname}%
+      \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
+    \@ifundefined{Crefrange@#2@format@middle}{%
+      \edef\@tempa{\expandafter\noexpand\csname Crefrange@#2@format@middle\endcsname}%
+      \edef\@tempb{\expandafter\noexpand\csname Crefrange@#1@format@middle\endcsname}%
+      \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
+    \@ifundefined{Crefrange@#2@format@last}{%
+      \edef\@tempa{\expandafter\noexpand\csname Crefrange@#2@format@last\endcsname}%
+      \edef\@tempb{\expandafter\noexpand\csname Crefrange@#1@format@last\endcsname}%
+      \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
+    \@ifundefined{labelcref@#2@format}{%
+      \edef\@tempa{\expandafter\noexpand\csname labelcref@#2@format\endcsname}%
+      \edef\@tempb{\expandafter\noexpand\csname labelcref@#1@format\endcsname}%
+      \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
+    \@ifundefined{labelcrefrange@#2@format}{%
+      \edef\@tempa{\expandafter\noexpand\csname labelcrefrange@#2@format\endcsname}%
+      \edef\@tempb{\expandafter\noexpand\csname labelcrefrange@#1@format\endcsname}%
+      \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
+    \@ifundefined{labelcref@#2@format@first}{%
+      \edef\@tempa{\expandafter\noexpand\csname labelcref@#2@format@first\endcsname}%
+      \edef\@tempb{\expandafter\noexpand\csname labelcref@#1@format@first\endcsname}%
+      \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
+    \@ifundefined{labelcref@#2@format@second}{%
+      \edef\@tempa{\expandafter\noexpand\csname labelcref@#2@format@second\endcsname}%
+      \edef\@tempb{\expandafter\noexpand\csname labelcref@#1@format@second\endcsname}%
+      \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
+    \@ifundefined{labelcref@#2@format@middle}{%
+      \edef\@tempa{\expandafter\noexpand\csname labelcref@#2@format@middle\endcsname}%
+      \edef\@tempb{\expandafter\noexpand\csname labelcref@#1@format@middle\endcsname}%
+      \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
+    \@ifundefined{labelcref@#2@format@last}{%
+      \edef\@tempa{\expandafter\noexpand\csname labelcref@#2@format@last\endcsname}%
+      \edef\@tempb{\expandafter\noexpand\csname labelcref@#1@format@last\endcsname}%
+      \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
+    \@ifundefined{labelcrefrange@#2@format@first}{%
+      \edef\@tempa{\expandafter\noexpand\csname labelcrefrange@#2@format@first\endcsname}%
+      \edef\@tempb{\expandafter\noexpand\csname labelcrefrange@#1@format@first\endcsname}%
+      \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
+    \@ifundefined{labelcrefrange@#2@format@second}{%
+      \edef\@tempa{\expandafter\noexpand\csname labelcrefrange@#2@format@second\endcsname}%
+      \edef\@tempb{\expandafter\noexpand\csname labelcrefrange@#1@format@second\endcsname}%
+      \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
+    \@ifundefined{labelcrefrange@#2@format@middle}{%
+      \edef\@tempa{\expandafter\noexpand\csname labelcrefrange@#2@format@middle\endcsname}%
+      \edef\@tempb{\expandafter\noexpand\csname labelcrefrange@#1@format@middle\endcsname}%
+      \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
+    \@ifundefined{labelcrefrange@#2@format@last}{%
+      \edef\@tempa{\expandafter\noexpand\csname labelcrefrange@#2@format@last\endcsname}%
+      \edef\@tempb{\expandafter\noexpand\csname labelcrefrange@#1@format@last\endcsname}%
+      \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
+  \fi%
 }
 \newcommand\crefformat[2]{\@crefformat{cref}{#1}{#2}}%
 \newcommand\Crefformat[2]{\@crefformat{Cref}{#1}{#2}}%
@@ -7898,9 +8034,9 @@
     \cref@stack@pop{\@tempstack}%
     \cref@isstackfull{\@tempstack}}%
   \@crefcopyformats{section}{subsection}%
-  \@crefcopyformats{section}{subsubsection}%
+  \@crefcopyformats{subsection}{subsubsection}%
   \@crefcopyformats{appendix}{subappendix}%
-  \@crefcopyformats{appendix}{subsubappendix}%
+  \@crefcopyformats{subappendix}{subsubappendix}%
   \@crefcopyformats{figure}{subfigure}%
   \@crefcopyformats{table}{subtable}%
   \@crefcopyformats{equation}{subequation}%