cleveref (9feb18)

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

1 files changed, 17 insertions, 12 deletions

diff --git a/Master/texmf-dist/tex/latex/cleveref/cleveref.sty b/Master/texmf-dist/tex/latex/cleveref/cleveref.sty
index 026390ca0d3..ca69c4a48c4 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{2017/07/10}
-\def\packageversion{0.21}
+\def\packagedate{2018/02/08}
+\def\packageversion{0.21.1}
 %% 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.
@@ -762,7 +762,7 @@
   \cref@stack@dropempty{#2}%
   \edef\@firstref{\cref@stack@top{#2}}%
   \let\@nextref\@firstref%
-  \cref@isrefsametypetrue%
+  \@cref@sametypetrue%
   \@whilesw\if@cref@sametype\fi{%
     \expandafter\cref@stack@pull\expandafter{\@nextref}{#3}%
     \cref@stack@pop{#2}%
@@ -1191,9 +1191,6 @@
   \fi}%
 \def\@@@setcpageref#1#2{%
   \cpageref@getlabel{#2}{\@temppage}#1{\@temppage}{}{}}%
-\def\@setcpagerefrange#1#2#3{\@@setcpagerefrange{#1}{#2}{cref}{#3}}%
-\def\@setCpagerefrange#1#2#3{\@@setcpagerefrange{#1}{#2}{Cref}{#3}}%
-\def\@setlabelcpagerefrange#1#2#3{\@@setcpagerefrange{#1}{#2}{labelcref}{#3}}%
 \def\@@setcpagerefrange#1#2#3#4{%
   \begingroup%
     \expandafter\ifx\csname r@#1@cref\endcsname\relax%
@@ -1981,7 +1978,13 @@
 \let\if@cref@hyperrefloaded\iffalse%
 \let\cref@addtoreset\@addtoreset%
 \@ifpackageloaded{hyperref}{%
-  \@ifpackagewith{hyperref}{implicit=false}{}{%
+  \@ifpackagewith{hyperref}{implicit=false}{%
+    \let\if@cref@hyperrefloaded\iftrue%
+    \PackageWarning{cleveref}{hyperref package loaded with
+      implicit=false option - disabling cleveref's hyperref support.
+      This situation is not supported by cleveref, and there's no guarantee
+      anything will work. You're on your own!}%
+  }{%
     \let\if@cref@hyperrefloaded\iftrue%
     \PackageInfo{cleveref}{`hyperref' support loaded}%
     \let\cref@addtoreset\HyOrg@addtoreset%
@@ -2115,16 +2118,18 @@
     \def\@crefrangestar#1#2#3{%
       \@crefstarredtrue\@@setcrefrange{#1}{#2}{#3}{}\@crefstarredfalse}%
     \DeclareRobustCommand{\cpageref}{%
-      \@ifstar{\@crefstar{cpageref}}{\@cref{cpageref}}}%
+      \@ifstar\@crefstar\@cref{cref}}%
     \DeclareRobustCommand{\Cpageref}{%
-      \@ifstar{\@crefstar{Cpageref}}{\@cref{Cpageref}}}%
+      \@ifstar\@crefstar\@cref{Cref}}%
     \DeclareRobustCommand{\cpagerefrange}{%
-      \@ifstar{\@cpagerefrangestar{cpageref}}{\@setcpagerefrange}}%
+      \@ifstar{\@cpagerefrangestar{cref}}{\@cpagerefrangenostar{cref}}}%
     \DeclareRobustCommand{\Cpagerefrange}{%
-      \@ifstar{\@cpagerefrangestar{Cpageref}}{\@setCpagerefrange}}%
+      \@ifstar{\@cpagerefrangestar{Cref}}{\@cpagerefrangenostar{Cref}}}%
+    \def\@cpagerefrangenostar#1#2#3{%
+      \@@setcpagerefrange{#2}{#3}{#1}{}}
     \def\@cpagerefrangestar#1#2#3{%
       \@crefstarredtrue%
-      \@@setcpagerefrange{#1}{#2}{#3}{}%
+      \@@setcpagerefrange{#2}{#3}{#1}{}%
       \@crefstarredfalse}%
     \DeclareRobustCommand{\labelcref}{%
       \@ifstar{\@labelcrefstar}{\@cref{labelcref}}}%