cleveref (9feb18)

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

3 files changed, 45 insertions, 36 deletions

diff --git a/Master/texmf-dist/doc/latex/cleveref/cleveref.pdf b/Master/texmf-dist/doc/latex/cleveref/cleveref.pdf
index 90ca7534841..d4aa78555fa 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 32eee6e034f..079c442a94b 100644
--- a/Master/texmf-dist/source/latex/cleveref/cleveref.dtx
+++ b/Master/texmf-dist/source/latex/cleveref/cleveref.dtx
@@ -1,9 +1,9 @@
-\def\packagedate{2017/07/10}
-\def\packageversion{0.21}
+\def\packagedate{2018/02/08}
+\def\packageversion{0.21.1}
 % \iffalse meta-comment
 %
 % Package 'cleveref' to use with LaTeX2e
-% Copyright 2006--2017 Toby Cubitt
+% Copyright 2006--2018 Toby Cubitt
 %
 % Written and maintained by Toby Cubitt
 %
@@ -46,7 +46,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{19606}
+% \CheckSum{19604}
 %% \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
@@ -320,6 +320,11 @@
 %   bug in \package{amsmath}$+$\package{hyperref} subequations support,
 %   which made hyperlinks point to wrong location in \emph{all} equations
 %   following the first use of subequations in a document.}
+% \changes{v0.21.1}{2018/02/08}{Fix bug in \package{hyperref}
+%   \textbackslash{}cpagerefrange support. Disable \package{hyperref}
+%   support when \package{hyperref} is loaded with implicit=false option,
+%   and generate a warning that this situation is unsupported. Fix bug
+%   that broke \texttt{compress} option.}
 %
 % \GetFileInfo{cleveref.sty}
 %
@@ -1907,10 +1912,10 @@
 % Lev Bishop, Mak Trifkovic, Matej Batic, Matt Gately, Matthew Skala,
 % Michael Barber, Michael Gorven, Michal Kaut, Mico Loretan, Milania,
 % Nicolas Dudebout, Olivier Roy, Patrick H\"acker, Paul Gomme, Ricardo de
-% Aldama S\'anchez, Robert Fischer, Sebastian \O{}rsted, Stefan Pinnow,
-% Steve Dower, Ted Pavlic, Thomas Arildsen, Tobias Jores, Uwe L\"uck and
-% Vadim Makarov for their help.
-% (If I inadvertently missed you out, please let me know!)
+% Aldama S\'anchez, Robert Fischer, Sebastian \O{}rsted, Simon Spiegel,
+% Stefan Pinnow, Steve Dower, Ted Pavlic, Thomas Arildsen, Tobias Jores,
+% Uwe L\"uck and Vadim Makarov for their help. (If I've inadvertently
+% missed you out, please let me know!)
 %
 %
 % \StopEventually{\clearpage\PrintChanges\clearpage\PrintIndex}
@@ -3165,7 +3170,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}%
@@ -3976,17 +3981,11 @@
 % \end{macro}
 % \end{macro}
 %
-% \begin{macro}{\@setcpagerefrange}
-% \begin{macro}{\@setCpagerefrange}
-% \begin{macro}{\@setlabelcpagerefrange}
 % \begin{macro}{\@@setcpagerefrange}
 %   The \cmd{\@@setcpagerefrange} macro deals with typesetting page range
 %   references, just as \cmd{\@@setcpageref} does for normal page
 %   references.
 %    \begin{macrocode}
-\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%
 %    \end{macrocode}
@@ -4048,9 +4047,6 @@
   \endgroup}%
 %    \end{macrocode}
 % \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
 %
 % \begin{macro}{\@@@setcpagerefrange}
 %   We again separate out the very final typesetting step into a
@@ -5274,7 +5270,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}%
 %    \end{macrocode}
@@ -5527,9 +5529,9 @@
 % \begin{macro}{\Cpageref*}
 %    \begin{macrocode}
     \DeclareRobustCommand{\cpageref}{%
-      \@ifstar{\@crefstar{cpageref}}{\@cref{cpageref}}}%
+      \@ifstar\@crefstar\@cref{cref}}%
     \DeclareRobustCommand{\Cpageref}{%
-      \@ifstar{\@crefstar{Cpageref}}{\@cref{Cpageref}}}%
+      \@ifstar\@crefstar\@cref{Cref}}%
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -5538,12 +5540,14 @@
 % \begin{macro}{\@cpagerefrangestar}
 %    \begin{macrocode}
     \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}%
 %    \end{macrocode}
 % \end{macro}
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}}}%