texlive[46847] Master/texmf-dist: cleveref (5mar18)
commits+karl at tug.org
commits+karl at tug.org
Mon Mar 5 23:11:07 CET 2018
Revision: 46847
http://tug.org/svn/texlive?view=revision&revision=46847
Author: karl
Date: 2018-03-05 23:11:07 +0100 (Mon, 05 Mar 2018)
Log Message:
-----------
cleveref (5mar18)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/cleveref/README
trunk/Master/texmf-dist/doc/latex/cleveref/cleveref.pdf
trunk/Master/texmf-dist/source/latex/cleveref/cleveref.dtx
trunk/Master/texmf-dist/tex/latex/cleveref/cleveref.sty
Modified: trunk/Master/texmf-dist/doc/latex/cleveref/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/cleveref/README 2018-03-05 22:10:49 UTC (rev 46846)
+++ trunk/Master/texmf-dist/doc/latex/cleveref/README 2018-03-05 22:11:07 UTC (rev 46847)
@@ -1,5 +1,5 @@
cleveref, a LaTeX package for intelligent cross-referencing
-Copyright (C) 2007--2013 Toby Cubitt
+Copyright (C) 2007--2018 Toby Cubitt
Files:
cleveref.ins Batch file, run through LaTeX
@@ -10,7 +10,7 @@
README This file
E-mail: toby-cleveref at dr-qubit.org
-Address: DAMTP, University of Cambridge, United Kingdom
+Address: Department of Computer Science, UCL, United Kingdom
This material is subject to the LaTeX Project Public License. See
http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html for the
Modified: trunk/Master/texmf-dist/doc/latex/cleveref/cleveref.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/cleveref/cleveref.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/cleveref/cleveref.dtx 2018-03-05 22:10:49 UTC (rev 46846)
+++ trunk/Master/texmf-dist/source/latex/cleveref/cleveref.dtx 2018-03-05 22:11:07 UTC (rev 46847)
@@ -1,5 +1,5 @@
-\def\packagedate{2018/02/08}
-\def\packageversion{0.21.1}
+\def\packagedate{2018/03/03}
+\def\packageversion{0.21.3}
% \iffalse meta-comment
%
% Package 'cleveref' to use with LaTeX2e
@@ -46,7 +46,7 @@
%</driver>
% \fi
%
-% \CheckSum{19604}
+% \CheckSum{19145}
%% \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
@@ -325,6 +325,17 @@
% 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.}
+% \changes{v0.21.2}{2018/02/09}{Fix bug in undefined reference warning
+% message printed by \textbackslash{}namecref etc., and note in the
+% documentation that these commands only accept a single reference.
+% Add support for \textbackslash{}crefalias'ing of appendix reference
+% types.}
+% \changes{v0.21.3}{2018/03/03}{Fix bug in \package{hyperref}-support
+% version of \textbackslash{}cpageref. Fix spelling mistakes in Dutch
+% translations. Add additional advanced cross-reference formatting
+% example to manual. Modify \textbackslash{}@crefcopyformats so it
+% copys over format \emph{components}, rather than copying over the
+% low-level format definitions.}
%
% \GetFileInfo{cleveref.sty}
%
@@ -640,6 +651,12 @@
% \cref{sec:capitalise}). (When that option is set, |\namecref| produces
% an uppercase reference name.)
%
+% Note that all these commands can only be passed a \emph{single}
+% reference name; they do \emph{not} accept multi-references like
+% |\cref|. (Passing multiple references to these commands would make
+% little sense if the references had different types, and is redundant if
+% they have the same type.)
+%
% There is a slight pitfall that you should be aware of when using the
% |\namecref| commands. They get the reference name from the names
% defined for the label's reference type using |\crefname| or |\Crefname|
@@ -1428,7 +1445,7 @@
% You're really defining the body of a LaTeX macro, with the formatted
% labels as arguments. This is a very powerful tool. It means that the
% only limit on how you can process the labels is your ability to code it
-% in \TeX{}!\footnote{And since \TeX{} is Turing-complete, that means you
+% in \TeX{}.\footnote{Since \TeX{} is Turing-complete, that means you
% can do anything you like short of solving the Halting Problem.} Which
% potentially allows for very sophisticated cross-reference formatting.
%
@@ -1448,12 +1465,24 @@
% entirety, even if it has a part in common.) With the help of this
% macro, you can produce the desired reference-range formatting with:
% \begin{quote}
-% |\crefrangelabelformat{equation}|\\
-% | |\ding{229} |{(#3#1#4--#5\crefstripprefix{#1}{#2}#6)}|\\
-% |\crefrangelabelformat{subequation}|\\
-% | |\ding{229} |{(#3#1#4--#5\crefstripprefix{#1}{#2}#6)}|
+% |\crefrangelabelformat{equation}%|\\
+% | {(#3#1#4--#5\crefstripprefix{#1}{#2}#6)}|\\
+% |\crefrangelabelformat{subequation}%|\\
+% | {(#3#1#4--#5\crefstripprefix{#1}{#2}#6)}|
% \end{quote}
%
+% Similarly, stripping prefixes from multi-references so that e.g.\linebreak
+% |\cref{fig1a,fig1b,fig1d}| is typeset as ``figs.~1a, b and d'' instead
+% of ``figs.~1a, 1b and 1d'' can be achieved by passing the prefix from
+% the first component to the others in an auxiliary macro (called
+% |\crefstripprefixinfo| here):
+% \begin{quote}
+% |\crefmultiformat{figure}%|\\
+% | {\edef\crefstripprefixinfo{#1}figs.~#2#1#3}%|\\
+% | { and~#2\crefstripprefix{\crefstripprefixinfo}{#1}#3}%|\\
+% | {, #2\crefstripprefix{\crefstripprefixinfo}{#1}#3}%|\\
+% | {, and~#2\crefstripprefix{\crefstripprefixinfo}{#1}#3}|
+% \end{quote}
%
%
% \section{Language, \package{babel} and \package{polyglossia}
@@ -1483,7 +1512,7 @@
% \begin{quote}
% |\usepackage|\oarg{language}|{cleveref}|
% \end{quote}
-% \emph{or} specify the desired language globally as a document class
+% \emph{or} (better) specify the desired language globally as a document class
% option:
% \begin{quote}
% |\documentclass|\oarg{language}\marg{class}\\
@@ -1905,9 +1934,9 @@
% So thanks (in alphabetical order) to: Adrian Knoth, Akim Demaille, Alan
% Munn, Aleksander Gorohovski, Amar Ghaisas, Anand Deopurkar, Andreas
% Haselbacher, Arne Meier, Bas Ploeger, Christian Tuma, Dan Luecking,
-% David Gleich, Denis Bitouz\'e, Domenic Denicola, Donald Ars\-en\-eau,
-% Eric Ahlberg, Frank Mittlebach, Hendrik Maryns, Iain Cunningham, Ingolf
-% Becker, James Sharam, Jens Mueller, Joel C.
+% David Gleich, Davide Liessi, Denis Bitouz\'e, Domenic Denicola, Donald
+% Ars\-en\-eau, Eric Ahlberg, Frank Mittlebach, Hendrik Maryns, Iain
+% Cunningham, Ingolf Becker, James Sharam, Jens Mueller, Joel C.\
% Salomon, Jonas Nyrup, 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, Milania,
@@ -2244,22 +2273,31 @@
\def\@tempa{##1}%
\def\@tempb{section}%
\ifx\@tempa\@tempb%
+ \@ifundefined{cref at appendix@alias}%
+ {\def\@tempa{appendix}}%
+ {\def\@tempa{\cref at appendix@alias}}%
\protected at edef\cref at currentlabel{%
- [appendix][\arabic{##1}][\cref at result]%
+ [\@tempa][\arabic{##1}][\cref at result]%
\csname p@##1\endcsname\csname the##1\endcsname}%
\else%
\def\@tempa{##1}%
\def\@tempb{subsection}%
\ifx\@tempa\@tempb%
+ \@ifundefined{cref at subappendix@alias}%
+ {\def\@tempa{subappendix}}%
+ {\def\@tempa{\cref at subappendix@alias}}%
\protected at edef\cref at currentlabel{%
- [subappendix][\arabic{##1}][\cref at result]%
+ [\@tempa][\arabic{##1}][\cref at result]%
\csname p@##1\endcsname\csname the##1\endcsname}%
\else%
\def\@tempa{##1}%
\def\@tempb{subsubsection}%
\ifx\@tempa\@tempb%
+ \@ifundefined{cref at subsubappendix@alias}%
+ {\def\@tempa{subsubappendix}}%
+ {\def\@tempa{\cref at subsubappendix@alias}}%
\protected at edef\cref at currentlabel{%
- [subsubappendix][\arabic{##1}][\cref at result]%
+ [\@tempa][\arabic{##1}][\cref at result]%
\csname p@##1\endcsname\csname the##1\endcsname}%
\else%
\@ifundefined{cref@##1 at alias}%
@@ -2291,29 +2329,41 @@
\def\@tempa{##1}%
\def\@tempb{chapter}%
\ifx\@tempa\@tempb%
+ \@ifundefined{cref at appendix@alias}%
+ {\def\@tempa{appendix}}%
+ {\def\@tempa{\cref at appendix@alias}}%
\protected at edef\cref at currentlabel{%
- [appendix][\arabic{##1}][\cref at result]%
+ [\@tempa][\arabic{##1}][\cref at result]%
\csname p@##1\endcsname\csname the##1\endcsname}%
\else%
\def\@tempa{##1}%
\def\@tempb{section}%
\ifx\@tempa\@tempb%
+ \@ifundefined{cref at subappendix@alias}%
+ {\def\@tempa{subappendix}}%
+ {\def\@tempa{\cref at subappendix@alias}}%
\protected at edef\cref at currentlabel{%
- [subappendix][\arabic{##1}][\cref at result]%
+ [\@tempa][\arabic{##1}][\cref at result]%
\csname p@##1\endcsname\csname the##1\endcsname}%
\else%
\def\@tempa{##1}%
\def\@tempb{subsection}%
\ifx\@tempa\@tempb%
+ \@ifundefined{cref at subsubappendix@alias}%
+ {\def\@tempa{subsubappendix}}%
+ {\def\@tempa{\cref at subsubappendix@alias}}%
\protected at edef\cref at currentlabel{%
- [subsubappendix][\arabic{##1}][\cref at result]%
+ [\@tempa][\arabic{##1}][\cref at result]%
\csname p@##1\endcsname\csname the##1\endcsname}%
\else%
\def\@tempa{##1}%
\def\@tempb{subsubsection}%
\ifx\@tempa\@tempb%
+ \@ifundefined{cref at subsubappendix@alias}%
+ {\def\@tempa{subsubsubappendix}}%
+ {\def\@tempa{\cref at subsubsubappendix@alias}}%
\protected at edef\cref at currentlabel{%
- [subsubsubappendix][\arabic{##1}][\cref at result]%
+ [\@tempa][\arabic{##1}][\cref at result]%
\csname p@##1\endcsname\csname the##1\endcsname}%
\else%
\@ifundefined{cref@##1 at alias}%
@@ -3866,13 +3916,13 @@
\expandafter\ifx\csname r@#2 at cref\endcsname\relax%
\protect\G at refundefinedtrue%
\nfss at text{\reset at font\bfseries ??}%
- \@latex at warning{Reference `#1' on page \thepage \space undefined}%
+ \@latex at warning{Reference `#2' on page \thepage \space undefined}%
\else%
\cref at gettype{#2}{\@tempa}%
\@ifundefined{#1@\@tempa @name#3}{%
\protect\G at refundefinedtrue%
\nfss at text{\reset at font\bfseries ??}%
- \@latex at warning{Reference name forlabel type `\@tempa' undefined}%
+ \@latex at warning{Reference name for label type `\@tempa' undefined}%
}{%
\edef\@tempa{%
\expandafter\noexpand\csname #1@\@tempa @name#3\endcsname}%
@@ -4814,47 +4864,6 @@
\edef\@tempa{\expandafter\noexpand\csname cref@#2 at name@plural\endcsname}%
\edef\@tempb{\expandafter\noexpand\csname cref@#1 at name@plural\endcsname}%
\expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
- \@ifundefined{cref@#2 at format}{%
- \edef\@tempa{\expandafter\noexpand\csname cref@#2 at format\endcsname}%
- \edef\@tempb{\expandafter\noexpand\csname cref@#1 at format\endcsname}%
- \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
- \@ifundefined{crefrange@#2 at format}{%
- \edef\@tempa{\expandafter\noexpand\csname crefrange@#2 at format\endcsname}%
- \edef\@tempb{\expandafter\noexpand\csname crefrange@#1 at format\endcsname}%
- \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
- \@ifundefined{cref@#2 at format@first}{%
- \edef\@tempa{\expandafter\noexpand\csname cref@#2 at format@first\endcsname}%
- \edef\@tempb{\expandafter\noexpand\csname cref@#1 at format@first\endcsname}%
- \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
- \@ifundefined{cref@#2 at format@second}{%
- \edef\@tempa{\expandafter\noexpand\csname cref@#2 at format@second\endcsname}%
- \edef\@tempb{\expandafter\noexpand\csname cref@#1 at format@second\endcsname}%
- \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
- \@ifundefined{cref@#2 at format@middle}{%
- \edef\@tempa{\expandafter\noexpand\csname cref@#2 at format@middle\endcsname}%
- \edef\@tempb{\expandafter\noexpand\csname cref@#1 at format@middle\endcsname}%
- \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
- \@ifundefined{cref@#2 at format@last}{%
- \edef\@tempa{\expandafter\noexpand\csname cref@#2 at format@last\endcsname}%
- \edef\@tempb{\expandafter\noexpand\csname cref@#1 at format@last\endcsname}%
- \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
- \@ifundefined{crefrange@#2 at format@first}{%
- \edef\@tempa{\expandafter\noexpand\csname crefrange@#2 at format@first\endcsname}%
- \edef\@tempb{\expandafter\noexpand\csname crefrange@#1 at format@first\endcsname}%
- \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
- \@ifundefined{crefrange@#2 at format@second}{%
- \edef\@tempa{\expandafter\noexpand\csname crefrange@#2 at format@second\endcsname}%
- \edef\@tempb{\expandafter\noexpand\csname crefrange@#1 at format@second\endcsname}%
- \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
- \@ifundefined{crefrange@#2 at format@middle}{%
- \edef\@tempa{\expandafter\noexpand\csname crefrange@#2 at format@middle\endcsname}%
- \edef\@tempb{\expandafter\noexpand\csname crefrange@#1 at format@middle\endcsname}%
- \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
- \@ifundefined{crefrange@#2 at format@last}{%
- \edef\@tempa{\expandafter\noexpand\csname crefrange@#2 at format@last\endcsname}%
- \edef\@tempb{\expandafter\noexpand\csname crefrange@#1 at format@last\endcsname}%
- \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
-%
\@ifundefined{Cref@#2 at name}{%
\edef\@tempa{\expandafter\noexpand\csname Cref@#2 at name\endcsname}%
\edef\@tempb{\expandafter\noexpand\csname Cref@#1 at name\endcsname}%
@@ -4862,87 +4871,17 @@
\edef\@tempa{\expandafter\noexpand\csname Cref@#2 at name@plural\endcsname}%
\edef\@tempb{\expandafter\noexpand\csname Cref@#1 at name@plural\endcsname}%
\expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
- \@ifundefined{Cref@#2 at format}{%
- \edef\@tempa{\expandafter\noexpand\csname Cref@#2 at format\endcsname}%
- \edef\@tempb{\expandafter\noexpand\csname Cref@#1 at format\endcsname}%
- \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
- \@ifundefined{Crefrange@#2 at format}{%
- \edef\@tempa{\expandafter\noexpand\csname Crefrange@#2 at format\endcsname}%
- \edef\@tempb{\expandafter\noexpand\csname Crefrange@#1 at format\endcsname}%
- \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
- \@ifundefined{Cref@#2 at format@first}{%
- \edef\@tempa{\expandafter\noexpand\csname Cref@#2 at format@first\endcsname}%
- \edef\@tempb{\expandafter\noexpand\csname Cref@#1 at format@first\endcsname}%
- \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
- \@ifundefined{Cref@#2 at format@second}{%
- \edef\@tempa{\expandafter\noexpand\csname Cref@#2 at format@second\endcsname}%
- \edef\@tempb{\expandafter\noexpand\csname Cref@#1 at format@second\endcsname}%
- \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
- \@ifundefined{Cref@#2 at format@middle}{%
- \edef\@tempa{\expandafter\noexpand\csname Cref@#2 at format@middle\endcsname}%
- \edef\@tempb{\expandafter\noexpand\csname Cref@#1 at format@middle\endcsname}%
- \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
- \@ifundefined{Cref@#2 at format@last}{%
- \edef\@tempa{\expandafter\noexpand\csname Cref@#2 at format@last\endcsname}%
- \edef\@tempb{\expandafter\noexpand\csname Cref@#1 at format@last\endcsname}%
- \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
- \@ifundefined{Crefrange@#2 at format@first}{%
- \edef\@tempa{\expandafter\noexpand\csname Crefrange@#2 at format@first\endcsname}%
- \edef\@tempb{\expandafter\noexpand\csname Crefrange@#1 at format@first\endcsname}%
- \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
- \@ifundefined{Crefrange@#2 at format@second}{%
- \edef\@tempa{\expandafter\noexpand\csname Crefrange@#2 at format@second\endcsname}%
- \edef\@tempb{\expandafter\noexpand\csname Crefrange@#1 at format@second\endcsname}%
- \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
- \@ifundefined{Crefrange@#2 at format@middle}{%
- \edef\@tempa{\expandafter\noexpand\csname Crefrange@#2 at format@middle\endcsname}%
- \edef\@tempb{\expandafter\noexpand\csname Crefrange@#1 at format@middle\endcsname}%
- \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
- \@ifundefined{Crefrange@#2 at format@last}{%
- \edef\@tempa{\expandafter\noexpand\csname Crefrange@#2 at format@last\endcsname}%
- \edef\@tempb{\expandafter\noexpand\csname Crefrange@#1 at format@last\endcsname}%
- \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
-%
- \@ifundefined{labelcref@#2 at format}{%
- \edef\@tempa{\expandafter\noexpand\csname labelcref@#2 at format\endcsname}%
- \edef\@tempb{\expandafter\noexpand\csname labelcref@#1 at format\endcsname}%
- \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
- \@ifundefined{labelcrefrange@#2 at format}{%
- \edef\@tempa{\expandafter\noexpand\csname labelcrefrange@#2 at format\endcsname}%
- \edef\@tempb{\expandafter\noexpand\csname labelcrefrange@#1 at format\endcsname}%
- \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
- \@ifundefined{labelcref@#2 at format@first}{%
- \edef\@tempa{\expandafter\noexpand\csname labelcref@#2 at format@first\endcsname}%
- \edef\@tempb{\expandafter\noexpand\csname labelcref@#1 at format@first\endcsname}%
- \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
- \@ifundefined{labelcref@#2 at format@second}{%
- \edef\@tempa{\expandafter\noexpand\csname labelcref@#2 at format@second\endcsname}%
- \edef\@tempb{\expandafter\noexpand\csname labelcref@#1 at format@second\endcsname}%
- \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
- \@ifundefined{labelcref@#2 at format@middle}{%
- \edef\@tempa{\expandafter\noexpand\csname labelcref@#2 at format@middle\endcsname}%
- \edef\@tempb{\expandafter\noexpand\csname labelcref@#1 at format@middle\endcsname}%
- \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
- \@ifundefined{labelcref@#2 at format@last}{%
- \edef\@tempa{\expandafter\noexpand\csname labelcref@#2 at format@last\endcsname}%
- \edef\@tempb{\expandafter\noexpand\csname labelcref@#1 at format@last\endcsname}%
- \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
- \@ifundefined{labelcrefrange@#2 at format@first}{%
- \edef\@tempa{\expandafter\noexpand\csname labelcrefrange@#2 at format@first\endcsname}%
- \edef\@tempb{\expandafter\noexpand\csname labelcrefrange@#1 at format@first\endcsname}%
- \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
- \@ifundefined{labelcrefrange@#2 at format@second}{%
- \edef\@tempa{\expandafter\noexpand\csname labelcrefrange@#2 at format@second\endcsname}%
- \edef\@tempb{\expandafter\noexpand\csname labelcrefrange@#1 at format@second\endcsname}%
- \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
- \@ifundefined{labelcrefrange@#2 at format@middle}{%
- \edef\@tempa{\expandafter\noexpand\csname labelcrefrange@#2 at format@middle\endcsname}%
- \edef\@tempb{\expandafter\noexpand\csname labelcrefrange@#1 at format@middle\endcsname}%
- \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
- \@ifundefined{labelcrefrange@#2 at format@last}{%
- \edef\@tempa{\expandafter\noexpand\csname labelcrefrange@#2 at format@last\endcsname}%
- \edef\@tempb{\expandafter\noexpand\csname labelcrefrange@#1 at format@last\endcsname}%
- \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
+ \@ifundefined{cref@#2 at label}{%
+ \@ifundefined{cref@#1 at label}{}{%
+ \edef\@tempa{\expandafter\noexpand\csname cref@#2 at label\endcsname}%
+ \edef\@tempb{\expandafter\noexpand\csname cref@#1 at label\endcsname}%
+ \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}}{}%
+ \@ifundefined{cref@#2 at rangelabel}{%
+ \@ifundefined{cref@#1 at rangelabel}{}{%
+ \edef\@tempa{\expandafter\noexpand\csname cref@#2 at rangelabel\endcsname}%
+ \edef\@tempb{\expandafter\noexpand\csname cref@#1 at rangelabel\endcsname}%
+ \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}}{}%
+ \@crefdefineallformats{#2}%
}
% \end{macrocode}
% \end{macro}
@@ -5399,22 +5338,31 @@
\def\@tempa{##1}%
\def\@tempb{section}%
\ifx\@tempa\@tempb%
+ \@ifundefined{cref at appendix@alias}%
+ {\def\@tempa{appendix}}%
+ {\def\@tempa{\cref at appendix@alias}}%
\protected at edef\cref at currentlabel{%
- [appendix][\arabic{##1}][\cref at result]%
+ [\@tempa][\arabic{##1}][\cref at result]%
\csname p@##1\endcsname\csname the##1\endcsname}%
\else%
\def\@tempa{##1}%
\def\@tempb{subsection}%
\ifx\@tempa\@tempb%
+ \@ifundefined{cref at subappendix@alias}%
+ {\def\@tempa{subappendix}}%
+ {\def\@tempa{\cref at subappendix@alias}}%
\protected at edef\cref at currentlabel{%
- [subappendix][\arabic{##1}][\cref at result]%
+ [\@tempa][\arabic{##1}][\cref at result]%
\csname p@##1\endcsname\csname the##1\endcsname}%
\else%
\def\@tempa{##1}%
\def\@tempb{subsubsection}%
\ifx\@tempa\@tempb%
+ \@ifundefined{cref at subsubappendix@alias}%
+ {\def\@tempa{subsubappendix}}%
+ {\def\@tempa{\cref at subsubappendix@alias}}%
\protected at edef\cref at currentlabel{%
- [subsubappendix][\arabic{##1}][\cref at result]%
+ [\@tempa][\arabic{##1}][\cref at result]%
\csname p@##1\endcsname\csname the##1\endcsname}%
\else%
\@ifundefined{cref@##1 at alias}%
@@ -5446,29 +5394,41 @@
\def\@tempa{##1}%
\def\@tempb{chapter}%
\ifx\@tempa\@tempb%
+ \@ifundefined{cref at appendix@alias}%
+ {\def\@tempa{appendix}}%
+ {\def\@tempa{\cref at appendix@alias}}%
\protected at edef\cref at currentlabel{%
- [appendix][\arabic{##1}][\cref at result]%
+ [\@tempa][\arabic{##1}][\cref at result]%
\csname p@##1\endcsname\csname the##1\endcsname}%
\else%
\def\@tempa{##1}%
\def\@tempb{section}%
\ifx\@tempa\@tempb%
+ \@ifundefined{cref at subappendix@alias}%
+ {\def\@tempa{subappendix}}%
+ {\def\@tempa{\cref at subappendix@alias}}%
\protected at edef\cref at currentlabel{%
- [subappendix][\arabic{##1}][\cref at result]%
+ [\@tempa][\arabic{##1}][\cref at result]%
\csname p@##1\endcsname\csname the##1\endcsname}%
\else%
\def\@tempa{##1}%
\def\@tempb{subsection}%
\ifx\@tempa\@tempb%
+ \@ifundefined{cref at subsubappendix@alias}%
+ {\def\@tempa{subsubappendix}}%
+ {\def\@tempa{\cref at subsubappendix@alias}}%
\protected at edef\cref at currentlabel{%
- [subsubappendix][\arabic{##1}][\cref at result]%
+ [\@tempa][\arabic{##1}][\cref at result]%
\csname p@##1\endcsname\csname the##1\endcsname}%
\else%
\def\@tempa{##1}%
\def\@tempb{subsubsection}%
\ifx\@tempa\@tempb%
+ \@ifundefined{cref at subsubappendix@alias}%
+ {\def\@tempa{subsubsubappendix}}%
+ {\def\@tempa{\cref at subsubsubappendix@alias}}%
\protected at edef\cref at currentlabel{%
- [subsubsubappendix][\arabic{##1}][\cref at result]%
+ [\@tempa][\arabic{##1}][\cref at result]%
\csname p@##1\endcsname\csname the##1\endcsname}%
\else%
\@ifundefined{cref@##1 at alias}%
@@ -5529,9 +5489,9 @@
% \begin{macro}{\Cpageref*}
% \begin{macrocode}
\DeclareRobustCommand{\cpageref}{%
- \@ifstar\@crefstar\@cref{cref}}%
+ \@ifstar\@crefstar\@cref{cpageref}}%
\DeclareRobustCommand{\Cpageref}{%
- \@ifstar\@crefstar\@cref{Cref}}%
+ \@ifstar\@crefstar\@cref{Cpageref}}%
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -9142,7 +9102,7 @@
%
% \subsubsection{Dutch}
% \begin{macro}{dutch}
-% Dutch translations kindly contributed by Philip H\"olzenspies.
+% Dutch translations kindly contributed by Philip H\"olzenspies and Tom Marcoen.
% \end{macro}
%
% Set up the definitions used at the beginning of the document to define
@@ -9173,11 +9133,11 @@
\Crefname at preamble{table}{Tabel}{Tabellen}%
\Crefname at preamble{page}{Pagina}{Pagina's}%
\Crefname at preamble{part}{Deel}{Delen}%
- \Crefname at preamble{chapter}{Hoofdstuk}{Hoofdstuken}%
+ \Crefname at preamble{chapter}{Hoofdstuk}{Hoofdstukken}%
\Crefname at preamble{section}{Paragraaf}{Paragrafen}%
\Crefname at preamble{appendix}{Appendix}{Appendices}%
\Crefname at preamble{enumi}{Punt}{Punten}%
- \Crefname at preamble{footnote}{Voetnote}{Voetnoten}%
+ \Crefname at preamble{footnote}{Voetnoot}{Voetnoten}%
\Crefname at preamble{lemma}{Lemma}{Lemma's}%
\Crefname at preamble{corollary}{Corollarium}{Corollaria}%
\Crefname at preamble{proposition}{Bewering}{Beweringen}%
@@ -9192,8 +9152,8 @@
%
\if at cref@capitalise% capitalise set
\if at cref@abbrev%
- \crefname at preamble{equation}{Verg.}{Verg's.}%
- \crefname at preamble{figure}{Fig.}{Fig's.}%
+ \crefname at preamble{equation}{Verg.}{Verg.'s}%
+ \crefname at preamble{figure}{Fig.}{Fig.'s}%
\else%
\crefname at preamble{equation}{Vergel\ij{}king}{Vergel\ij{}kingen}%
\crefname at preamble{figure}{Figuur}{Figuren}%
@@ -9205,7 +9165,7 @@
\crefname at preamble{section}{Paragraaf}{Paragrafen}%
\crefname at preamble{appendix}{Appendix}{Appendices}%
\crefname at preamble{enumi}{Punt}{Punten}%
- \crefname at preamble{footnote}{Voetnote}{Voetnoten}%
+ \crefname at preamble{footnote}{Voetnoot}{Voetnoten}%
\crefname at preamble{theorem}{Theorema}{Theorema's}%
\crefname at preamble{lemma}{Lemma}{Lemma's}%
\crefname at preamble{corollary}{Corollarium}{Corollaria}%
@@ -9221,8 +9181,8 @@
%
\else% capitalise unset
\if at cref@abbrev%
- \crefname at preamble{equation}{verg.}{verg's.}%
- \crefname at preamble{figure}{fig.}{fig's.}%
+ \crefname at preamble{equation}{verg.}{verg.'s}%
+ \crefname at preamble{figure}{fig.}{fig.'s}%
\else%
\crefname at preamble{equation}{vergel\ij{}king}{vergel\ij{}kingen}%
\crefname at preamble{figure}{figuur}{figuren}%
@@ -9234,7 +9194,7 @@
\crefname at preamble{section}{paragraaf}{paragrafen}%
\crefname at preamble{appendix}{appendix}{appendices}%
\crefname at preamble{enumi}{punt}{punten}%
- \crefname at preamble{footnote}{voetnote}{voetnoten}%
+ \crefname at preamble{footnote}{voetnoot}{voetnoten}%
\crefname at preamble{theorem}{theorema}{theorema's}%
\crefname at preamble{lemma}{lemma}{lemma's}%
\crefname at preamble{corollary}{corollarium}{corollaria}%
Modified: trunk/Master/texmf-dist/tex/latex/cleveref/cleveref.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/cleveref/cleveref.sty 2018-03-05 22:10:49 UTC (rev 46846)
+++ trunk/Master/texmf-dist/tex/latex/cleveref/cleveref.sty 2018-03-05 22:11:07 UTC (rev 46847)
@@ -11,8 +11,8 @@
%% Copyright (C) 2006--2016 Toby Cubitt
%% See the files README and COPYING.
%%
-\def\packagedate{2018/02/08}
-\def\packageversion{0.21.1}
+\def\packagedate{2018/03/03}
+\def\packageversion{0.21.3}
%% 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.
@@ -186,22 +186,31 @@
\def\@tempa{##1}%
\def\@tempb{section}%
\ifx\@tempa\@tempb%
+ \@ifundefined{cref at appendix@alias}%
+ {\def\@tempa{appendix}}%
+ {\def\@tempa{\cref at appendix@alias}}%
\protected at edef\cref at currentlabel{%
- [appendix][\arabic{##1}][\cref at result]%
+ [\@tempa][\arabic{##1}][\cref at result]%
\csname p@##1\endcsname\csname the##1\endcsname}%
\else%
\def\@tempa{##1}%
\def\@tempb{subsection}%
\ifx\@tempa\@tempb%
+ \@ifundefined{cref at subappendix@alias}%
+ {\def\@tempa{subappendix}}%
+ {\def\@tempa{\cref at subappendix@alias}}%
\protected at edef\cref at currentlabel{%
- [subappendix][\arabic{##1}][\cref at result]%
+ [\@tempa][\arabic{##1}][\cref at result]%
\csname p@##1\endcsname\csname the##1\endcsname}%
\else%
\def\@tempa{##1}%
\def\@tempb{subsubsection}%
\ifx\@tempa\@tempb%
+ \@ifundefined{cref at subsubappendix@alias}%
+ {\def\@tempa{subsubappendix}}%
+ {\def\@tempa{\cref at subsubappendix@alias}}%
\protected at edef\cref at currentlabel{%
- [subsubappendix][\arabic{##1}][\cref at result]%
+ [\@tempa][\arabic{##1}][\cref at result]%
\csname p@##1\endcsname\csname the##1\endcsname}%
\else%
\@ifundefined{cref@##1 at alias}%
@@ -226,29 +235,41 @@
\def\@tempa{##1}%
\def\@tempb{chapter}%
\ifx\@tempa\@tempb%
+ \@ifundefined{cref at appendix@alias}%
+ {\def\@tempa{appendix}}%
+ {\def\@tempa{\cref at appendix@alias}}%
\protected at edef\cref at currentlabel{%
- [appendix][\arabic{##1}][\cref at result]%
+ [\@tempa][\arabic{##1}][\cref at result]%
\csname p@##1\endcsname\csname the##1\endcsname}%
\else%
\def\@tempa{##1}%
\def\@tempb{section}%
\ifx\@tempa\@tempb%
+ \@ifundefined{cref at subappendix@alias}%
+ {\def\@tempa{subappendix}}%
+ {\def\@tempa{\cref at subappendix@alias}}%
\protected at edef\cref at currentlabel{%
- [subappendix][\arabic{##1}][\cref at result]%
+ [\@tempa][\arabic{##1}][\cref at result]%
\csname p@##1\endcsname\csname the##1\endcsname}%
\else%
\def\@tempa{##1}%
\def\@tempb{subsection}%
\ifx\@tempa\@tempb%
+ \@ifundefined{cref at subsubappendix@alias}%
+ {\def\@tempa{subsubappendix}}%
+ {\def\@tempa{\cref at subsubappendix@alias}}%
\protected at edef\cref at currentlabel{%
- [subsubappendix][\arabic{##1}][\cref at result]%
+ [\@tempa][\arabic{##1}][\cref at result]%
\csname p@##1\endcsname\csname the##1\endcsname}%
\else%
\def\@tempa{##1}%
\def\@tempb{subsubsection}%
\ifx\@tempa\@tempb%
+ \@ifundefined{cref at subsubappendix@alias}%
+ {\def\@tempa{subsubsubappendix}}%
+ {\def\@tempa{\cref at subsubsubappendix@alias}}%
\protected at edef\cref at currentlabel{%
- [subsubsubappendix][\arabic{##1}][\cref at result]%
+ [\@tempa][\arabic{##1}][\cref at result]%
\csname p@##1\endcsname\csname the##1\endcsname}%
\else%
\@ifundefined{cref@##1 at alias}%
@@ -1139,13 +1160,13 @@
\expandafter\ifx\csname r@#2 at cref\endcsname\relax%
\protect\G at refundefinedtrue%
\nfss at text{\reset at font\bfseries ??}%
- \@latex at warning{Reference `#1' on page \thepage \space undefined}%
+ \@latex at warning{Reference `#2' on page \thepage \space undefined}%
\else%
\cref at gettype{#2}{\@tempa}%
\@ifundefined{#1@\@tempa @name#3}{%
\protect\G at refundefinedtrue%
\nfss at text{\reset at font\bfseries ??}%
- \@latex at warning{Reference name forlabel type `\@tempa' undefined}%
+ \@latex at warning{Reference name for label type `\@tempa' undefined}%
}{%
\edef\@tempa{%
\expandafter\noexpand\csname #1@\@tempa @name#3\endcsname}%
@@ -1672,46 +1693,6 @@
\edef\@tempa{\expandafter\noexpand\csname cref@#2 at name@plural\endcsname}%
\edef\@tempb{\expandafter\noexpand\csname cref@#1 at name@plural\endcsname}%
\expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
- \@ifundefined{cref@#2 at format}{%
- \edef\@tempa{\expandafter\noexpand\csname cref@#2 at format\endcsname}%
- \edef\@tempb{\expandafter\noexpand\csname cref@#1 at format\endcsname}%
- \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
- \@ifundefined{crefrange@#2 at format}{%
- \edef\@tempa{\expandafter\noexpand\csname crefrange@#2 at format\endcsname}%
- \edef\@tempb{\expandafter\noexpand\csname crefrange@#1 at format\endcsname}%
- \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
- \@ifundefined{cref@#2 at format@first}{%
- \edef\@tempa{\expandafter\noexpand\csname cref@#2 at format@first\endcsname}%
- \edef\@tempb{\expandafter\noexpand\csname cref@#1 at format@first\endcsname}%
- \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
- \@ifundefined{cref@#2 at format@second}{%
- \edef\@tempa{\expandafter\noexpand\csname cref@#2 at format@second\endcsname}%
- \edef\@tempb{\expandafter\noexpand\csname cref@#1 at format@second\endcsname}%
- \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
- \@ifundefined{cref@#2 at format@middle}{%
- \edef\@tempa{\expandafter\noexpand\csname cref@#2 at format@middle\endcsname}%
- \edef\@tempb{\expandafter\noexpand\csname cref@#1 at format@middle\endcsname}%
- \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
- \@ifundefined{cref@#2 at format@last}{%
- \edef\@tempa{\expandafter\noexpand\csname cref@#2 at format@last\endcsname}%
- \edef\@tempb{\expandafter\noexpand\csname cref@#1 at format@last\endcsname}%
- \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
- \@ifundefined{crefrange@#2 at format@first}{%
- \edef\@tempa{\expandafter\noexpand\csname crefrange@#2 at format@first\endcsname}%
- \edef\@tempb{\expandafter\noexpand\csname crefrange@#1 at format@first\endcsname}%
- \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
- \@ifundefined{crefrange@#2 at format@second}{%
- \edef\@tempa{\expandafter\noexpand\csname crefrange@#2 at format@second\endcsname}%
- \edef\@tempb{\expandafter\noexpand\csname crefrange@#1 at format@second\endcsname}%
- \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
- \@ifundefined{crefrange@#2 at format@middle}{%
- \edef\@tempa{\expandafter\noexpand\csname crefrange@#2 at format@middle\endcsname}%
- \edef\@tempb{\expandafter\noexpand\csname crefrange@#1 at format@middle\endcsname}%
- \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
- \@ifundefined{crefrange@#2 at format@last}{%
- \edef\@tempa{\expandafter\noexpand\csname crefrange@#2 at format@last\endcsname}%
- \edef\@tempb{\expandafter\noexpand\csname crefrange@#1 at format@last\endcsname}%
- \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
\@ifundefined{Cref@#2 at name}{%
\edef\@tempa{\expandafter\noexpand\csname Cref@#2 at name\endcsname}%
\edef\@tempb{\expandafter\noexpand\csname Cref@#1 at name\endcsname}%
@@ -1719,86 +1700,17 @@
\edef\@tempa{\expandafter\noexpand\csname Cref@#2 at name@plural\endcsname}%
\edef\@tempb{\expandafter\noexpand\csname Cref@#1 at name@plural\endcsname}%
\expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
- \@ifundefined{Cref@#2 at format}{%
- \edef\@tempa{\expandafter\noexpand\csname Cref@#2 at format\endcsname}%
- \edef\@tempb{\expandafter\noexpand\csname Cref@#1 at format\endcsname}%
- \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
- \@ifundefined{Crefrange@#2 at format}{%
- \edef\@tempa{\expandafter\noexpand\csname Crefrange@#2 at format\endcsname}%
- \edef\@tempb{\expandafter\noexpand\csname Crefrange@#1 at format\endcsname}%
- \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
- \@ifundefined{Cref@#2 at format@first}{%
- \edef\@tempa{\expandafter\noexpand\csname Cref@#2 at format@first\endcsname}%
- \edef\@tempb{\expandafter\noexpand\csname Cref@#1 at format@first\endcsname}%
- \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
- \@ifundefined{Cref@#2 at format@second}{%
- \edef\@tempa{\expandafter\noexpand\csname Cref@#2 at format@second\endcsname}%
- \edef\@tempb{\expandafter\noexpand\csname Cref@#1 at format@second\endcsname}%
- \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
- \@ifundefined{Cref@#2 at format@middle}{%
- \edef\@tempa{\expandafter\noexpand\csname Cref@#2 at format@middle\endcsname}%
- \edef\@tempb{\expandafter\noexpand\csname Cref@#1 at format@middle\endcsname}%
- \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
- \@ifundefined{Cref@#2 at format@last}{%
- \edef\@tempa{\expandafter\noexpand\csname Cref@#2 at format@last\endcsname}%
- \edef\@tempb{\expandafter\noexpand\csname Cref@#1 at format@last\endcsname}%
- \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
- \@ifundefined{Crefrange@#2 at format@first}{%
- \edef\@tempa{\expandafter\noexpand\csname Crefrange@#2 at format@first\endcsname}%
- \edef\@tempb{\expandafter\noexpand\csname Crefrange@#1 at format@first\endcsname}%
- \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
- \@ifundefined{Crefrange@#2 at format@second}{%
- \edef\@tempa{\expandafter\noexpand\csname Crefrange@#2 at format@second\endcsname}%
- \edef\@tempb{\expandafter\noexpand\csname Crefrange@#1 at format@second\endcsname}%
- \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
- \@ifundefined{Crefrange@#2 at format@middle}{%
- \edef\@tempa{\expandafter\noexpand\csname Crefrange@#2 at format@middle\endcsname}%
- \edef\@tempb{\expandafter\noexpand\csname Crefrange@#1 at format@middle\endcsname}%
- \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
- \@ifundefined{Crefrange@#2 at format@last}{%
- \edef\@tempa{\expandafter\noexpand\csname Crefrange@#2 at format@last\endcsname}%
- \edef\@tempb{\expandafter\noexpand\csname Crefrange@#1 at format@last\endcsname}%
- \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
- \@ifundefined{labelcref@#2 at format}{%
- \edef\@tempa{\expandafter\noexpand\csname labelcref@#2 at format\endcsname}%
- \edef\@tempb{\expandafter\noexpand\csname labelcref@#1 at format\endcsname}%
- \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
- \@ifundefined{labelcrefrange@#2 at format}{%
- \edef\@tempa{\expandafter\noexpand\csname labelcrefrange@#2 at format\endcsname}%
- \edef\@tempb{\expandafter\noexpand\csname labelcrefrange@#1 at format\endcsname}%
- \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
- \@ifundefined{labelcref@#2 at format@first}{%
- \edef\@tempa{\expandafter\noexpand\csname labelcref@#2 at format@first\endcsname}%
- \edef\@tempb{\expandafter\noexpand\csname labelcref@#1 at format@first\endcsname}%
- \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
- \@ifundefined{labelcref@#2 at format@second}{%
- \edef\@tempa{\expandafter\noexpand\csname labelcref@#2 at format@second\endcsname}%
- \edef\@tempb{\expandafter\noexpand\csname labelcref@#1 at format@second\endcsname}%
- \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
- \@ifundefined{labelcref@#2 at format@middle}{%
- \edef\@tempa{\expandafter\noexpand\csname labelcref@#2 at format@middle\endcsname}%
- \edef\@tempb{\expandafter\noexpand\csname labelcref@#1 at format@middle\endcsname}%
- \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
- \@ifundefined{labelcref@#2 at format@last}{%
- \edef\@tempa{\expandafter\noexpand\csname labelcref@#2 at format@last\endcsname}%
- \edef\@tempb{\expandafter\noexpand\csname labelcref@#1 at format@last\endcsname}%
- \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
- \@ifundefined{labelcrefrange@#2 at format@first}{%
- \edef\@tempa{\expandafter\noexpand\csname labelcrefrange@#2 at format@first\endcsname}%
- \edef\@tempb{\expandafter\noexpand\csname labelcrefrange@#1 at format@first\endcsname}%
- \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
- \@ifundefined{labelcrefrange@#2 at format@second}{%
- \edef\@tempa{\expandafter\noexpand\csname labelcrefrange@#2 at format@second\endcsname}%
- \edef\@tempb{\expandafter\noexpand\csname labelcrefrange@#1 at format@second\endcsname}%
- \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
- \@ifundefined{labelcrefrange@#2 at format@middle}{%
- \edef\@tempa{\expandafter\noexpand\csname labelcrefrange@#2 at format@middle\endcsname}%
- \edef\@tempb{\expandafter\noexpand\csname labelcrefrange@#1 at format@middle\endcsname}%
- \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
- \@ifundefined{labelcrefrange@#2 at format@last}{%
- \edef\@tempa{\expandafter\noexpand\csname labelcrefrange@#2 at format@last\endcsname}%
- \edef\@tempb{\expandafter\noexpand\csname labelcrefrange@#1 at format@last\endcsname}%
- \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}{}%
+ \@ifundefined{cref@#2 at label}{%
+ \@ifundefined{cref@#1 at label}{}{%
+ \edef\@tempa{\expandafter\noexpand\csname cref@#2 at label\endcsname}%
+ \edef\@tempb{\expandafter\noexpand\csname cref@#1 at label\endcsname}%
+ \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}}{}%
+ \@ifundefined{cref@#2 at rangelabel}{%
+ \@ifundefined{cref@#1 at rangelabel}{}{%
+ \edef\@tempa{\expandafter\noexpand\csname cref@#2 at rangelabel\endcsname}%
+ \edef\@tempb{\expandafter\noexpand\csname cref@#1 at rangelabel\endcsname}%
+ \expandafter\expandafter\expandafter\let\expandafter\@tempa\@tempb}}{}%
+ \@crefdefineallformats{#2}%
}
\newcommand\crefformat[2]{\@crefformat{cref}{#1}{#2}}%
\newcommand\Crefformat[2]{\@crefformat{Cref}{#1}{#2}}%
@@ -2026,22 +1938,31 @@
\def\@tempa{##1}%
\def\@tempb{section}%
\ifx\@tempa\@tempb%
+ \@ifundefined{cref at appendix@alias}%
+ {\def\@tempa{appendix}}%
+ {\def\@tempa{\cref at appendix@alias}}%
\protected at edef\cref at currentlabel{%
- [appendix][\arabic{##1}][\cref at result]%
+ [\@tempa][\arabic{##1}][\cref at result]%
\csname p@##1\endcsname\csname the##1\endcsname}%
\else%
\def\@tempa{##1}%
\def\@tempb{subsection}%
\ifx\@tempa\@tempb%
+ \@ifundefined{cref at subappendix@alias}%
+ {\def\@tempa{subappendix}}%
+ {\def\@tempa{\cref at subappendix@alias}}%
\protected at edef\cref at currentlabel{%
- [subappendix][\arabic{##1}][\cref at result]%
+ [\@tempa][\arabic{##1}][\cref at result]%
\csname p@##1\endcsname\csname the##1\endcsname}%
\else%
\def\@tempa{##1}%
\def\@tempb{subsubsection}%
\ifx\@tempa\@tempb%
+ \@ifundefined{cref at subsubappendix@alias}%
+ {\def\@tempa{subsubappendix}}%
+ {\def\@tempa{\cref at subsubappendix@alias}}%
\protected at edef\cref at currentlabel{%
- [subsubappendix][\arabic{##1}][\cref at result]%
+ [\@tempa][\arabic{##1}][\cref at result]%
\csname p@##1\endcsname\csname the##1\endcsname}%
\else%
\@ifundefined{cref@##1 at alias}%
@@ -2066,29 +1987,41 @@
\def\@tempa{##1}%
\def\@tempb{chapter}%
\ifx\@tempa\@tempb%
+ \@ifundefined{cref at appendix@alias}%
+ {\def\@tempa{appendix}}%
+ {\def\@tempa{\cref at appendix@alias}}%
\protected at edef\cref at currentlabel{%
- [appendix][\arabic{##1}][\cref at result]%
+ [\@tempa][\arabic{##1}][\cref at result]%
\csname p@##1\endcsname\csname the##1\endcsname}%
\else%
\def\@tempa{##1}%
\def\@tempb{section}%
\ifx\@tempa\@tempb%
+ \@ifundefined{cref at subappendix@alias}%
+ {\def\@tempa{subappendix}}%
+ {\def\@tempa{\cref at subappendix@alias}}%
\protected at edef\cref at currentlabel{%
- [subappendix][\arabic{##1}][\cref at result]%
+ [\@tempa][\arabic{##1}][\cref at result]%
\csname p@##1\endcsname\csname the##1\endcsname}%
\else%
\def\@tempa{##1}%
\def\@tempb{subsection}%
\ifx\@tempa\@tempb%
+ \@ifundefined{cref at subsubappendix@alias}%
+ {\def\@tempa{subsubappendix}}%
+ {\def\@tempa{\cref at subsubappendix@alias}}%
\protected at edef\cref at currentlabel{%
- [subsubappendix][\arabic{##1}][\cref at result]%
+ [\@tempa][\arabic{##1}][\cref at result]%
\csname p@##1\endcsname\csname the##1\endcsname}%
\else%
\def\@tempa{##1}%
\def\@tempb{subsubsection}%
\ifx\@tempa\@tempb%
+ \@ifundefined{cref at subsubappendix@alias}%
+ {\def\@tempa{subsubsubappendix}}%
+ {\def\@tempa{\cref at subsubsubappendix@alias}}%
\protected at edef\cref at currentlabel{%
- [subsubsubappendix][\arabic{##1}][\cref at result]%
+ [\@tempa][\arabic{##1}][\cref at result]%
\csname p@##1\endcsname\csname the##1\endcsname}%
\else%
\@ifundefined{cref@##1 at alias}%
@@ -2118,9 +2051,9 @@
\def\@crefrangestar#1#2#3{%
\@crefstarredtrue\@@setcrefrange{#1}{#2}{#3}{}\@crefstarredfalse}%
\DeclareRobustCommand{\cpageref}{%
- \@ifstar\@crefstar\@cref{cref}}%
+ \@ifstar\@crefstar\@cref{cpageref}}%
\DeclareRobustCommand{\Cpageref}{%
- \@ifstar\@crefstar\@cref{Cref}}%
+ \@ifstar\@crefstar\@cref{Cpageref}}%
\DeclareRobustCommand{\cpagerefrange}{%
\@ifstar{\@cpagerefrangestar{cref}}{\@cpagerefrangenostar{cref}}}%
\DeclareRobustCommand{\Cpagerefrange}{%
@@ -4256,11 +4189,11 @@
\Crefname at preamble{table}{Tabel}{Tabellen}%
\Crefname at preamble{page}{Pagina}{Pagina's}%
\Crefname at preamble{part}{Deel}{Delen}%
- \Crefname at preamble{chapter}{Hoofdstuk}{Hoofdstuken}%
+ \Crefname at preamble{chapter}{Hoofdstuk}{Hoofdstukken}%
\Crefname at preamble{section}{Paragraaf}{Paragrafen}%
\Crefname at preamble{appendix}{Appendix}{Appendices}%
\Crefname at preamble{enumi}{Punt}{Punten}%
- \Crefname at preamble{footnote}{Voetnote}{Voetnoten}%
+ \Crefname at preamble{footnote}{Voetnoot}{Voetnoten}%
\Crefname at preamble{lemma}{Lemma}{Lemma's}%
\Crefname at preamble{corollary}{Corollarium}{Corollaria}%
\Crefname at preamble{proposition}{Bewering}{Beweringen}%
@@ -4275,8 +4208,8 @@
%
\if at cref@capitalise% capitalise set
\if at cref@abbrev%
- \crefname at preamble{equation}{Verg.}{Verg's.}%
- \crefname at preamble{figure}{Fig.}{Fig's.}%
+ \crefname at preamble{equation}{Verg.}{Verg.'s}%
+ \crefname at preamble{figure}{Fig.}{Fig.'s}%
\else%
\crefname at preamble{equation}{Vergel\ij{}king}{Vergel\ij{}kingen}%
\crefname at preamble{figure}{Figuur}{Figuren}%
@@ -4288,7 +4221,7 @@
\crefname at preamble{section}{Paragraaf}{Paragrafen}%
\crefname at preamble{appendix}{Appendix}{Appendices}%
\crefname at preamble{enumi}{Punt}{Punten}%
- \crefname at preamble{footnote}{Voetnote}{Voetnoten}%
+ \crefname at preamble{footnote}{Voetnoot}{Voetnoten}%
\crefname at preamble{theorem}{Theorema}{Theorema's}%
\crefname at preamble{lemma}{Lemma}{Lemma's}%
\crefname at preamble{corollary}{Corollarium}{Corollaria}%
@@ -4304,8 +4237,8 @@
%
\else% capitalise unset
\if at cref@abbrev%
- \crefname at preamble{equation}{verg.}{verg's.}%
- \crefname at preamble{figure}{fig.}{fig's.}%
+ \crefname at preamble{equation}{verg.}{verg.'s}%
+ \crefname at preamble{figure}{fig.}{fig.'s}%
\else%
\crefname at preamble{equation}{vergel\ij{}king}{vergel\ij{}kingen}%
\crefname at preamble{figure}{figuur}{figuren}%
@@ -4317,7 +4250,7 @@
\crefname at preamble{section}{paragraaf}{paragrafen}%
\crefname at preamble{appendix}{appendix}{appendices}%
\crefname at preamble{enumi}{punt}{punten}%
- \crefname at preamble{footnote}{voetnote}{voetnoten}%
+ \crefname at preamble{footnote}{voetnoot}{voetnoten}%
\crefname at preamble{theorem}{theorema}{theorema's}%
\crefname at preamble{lemma}{lemma}{lemma's}%
\crefname at preamble{corollary}{corollarium}{corollaria}%
More information about the tex-live-commits
mailing list