From 5be9113099c0cd49e0f0702753be415abdac12b0 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 5 Mar 2018 22:11:07 +0000 Subject: cleveref (5mar18) git-svn-id: svn://tug.org/texlive/trunk@46847 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/source/latex/cleveref/cleveref.dtx | 282 +++++++++------------ 1 file changed, 121 insertions(+), 161 deletions(-) (limited to 'Master/texmf-dist/source/latex/cleveref') diff --git a/Master/texmf-dist/source/latex/cleveref/cleveref.dtx b/Master/texmf-dist/source/latex/cleveref/cleveref.dtx index 079c442a94b..4321c0e9135 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{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 @@ % % \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@appendix@alias}% + {\def\@tempa{appendix}}% + {\def\@tempa{\cref@appendix@alias}}% \protected@edef\cref@currentlabel{% - [appendix][\arabic{##1}][\cref@result]% + [\@tempa][\arabic{##1}][\cref@result]% \csname p@##1\endcsname\csname the##1\endcsname}% \else% \def\@tempa{##1}% \def\@tempb{subsection}% \ifx\@tempa\@tempb% + \@ifundefined{cref@subappendix@alias}% + {\def\@tempa{subappendix}}% + {\def\@tempa{\cref@subappendix@alias}}% \protected@edef\cref@currentlabel{% - [subappendix][\arabic{##1}][\cref@result]% + [\@tempa][\arabic{##1}][\cref@result]% \csname p@##1\endcsname\csname the##1\endcsname}% \else% \def\@tempa{##1}% \def\@tempb{subsubsection}% \ifx\@tempa\@tempb% + \@ifundefined{cref@subsubappendix@alias}% + {\def\@tempa{subsubappendix}}% + {\def\@tempa{\cref@subsubappendix@alias}}% \protected@edef\cref@currentlabel{% - [subsubappendix][\arabic{##1}][\cref@result]% + [\@tempa][\arabic{##1}][\cref@result]% \csname p@##1\endcsname\csname the##1\endcsname}% \else% \@ifundefined{cref@##1@alias}% @@ -2291,29 +2329,41 @@ \def\@tempa{##1}% \def\@tempb{chapter}% \ifx\@tempa\@tempb% + \@ifundefined{cref@appendix@alias}% + {\def\@tempa{appendix}}% + {\def\@tempa{\cref@appendix@alias}}% \protected@edef\cref@currentlabel{% - [appendix][\arabic{##1}][\cref@result]% + [\@tempa][\arabic{##1}][\cref@result]% \csname p@##1\endcsname\csname the##1\endcsname}% \else% \def\@tempa{##1}% \def\@tempb{section}% \ifx\@tempa\@tempb% + \@ifundefined{cref@subappendix@alias}% + {\def\@tempa{subappendix}}% + {\def\@tempa{\cref@subappendix@alias}}% \protected@edef\cref@currentlabel{% - [subappendix][\arabic{##1}][\cref@result]% + [\@tempa][\arabic{##1}][\cref@result]% \csname p@##1\endcsname\csname the##1\endcsname}% \else% \def\@tempa{##1}% \def\@tempb{subsection}% \ifx\@tempa\@tempb% + \@ifundefined{cref@subsubappendix@alias}% + {\def\@tempa{subsubappendix}}% + {\def\@tempa{\cref@subsubappendix@alias}}% \protected@edef\cref@currentlabel{% - [subsubappendix][\arabic{##1}][\cref@result]% + [\@tempa][\arabic{##1}][\cref@result]% \csname p@##1\endcsname\csname the##1\endcsname}% \else% \def\@tempa{##1}% \def\@tempb{subsubsection}% \ifx\@tempa\@tempb% + \@ifundefined{cref@subsubappendix@alias}% + {\def\@tempa{subsubsubappendix}}% + {\def\@tempa{\cref@subsubsubappendix@alias}}% \protected@edef\cref@currentlabel{% - [subsubsubappendix][\arabic{##1}][\cref@result]% + [\@tempa][\arabic{##1}][\cref@result]% \csname p@##1\endcsname\csname the##1\endcsname}% \else% \@ifundefined{cref@##1@alias}% @@ -3866,13 +3916,13 @@ \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}% + \@latex@warning{Reference `#2' on page \thepage \space undefined}% \else% \cref@gettype{#2}{\@tempa}% \@ifundefined{#1@\@tempa @name#3}{% \protect\G@refundefinedtrue% \nfss@text{\reset@font\bfseries ??}% - \@latex@warning{Reference name forlabel type `\@tempa' undefined}% + \@latex@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@name@plural\endcsname}% \edef\@tempb{\expandafter\noexpand\csname cref@#1@name@plural\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{Cref@#2@name}{% \edef\@tempa{\expandafter\noexpand\csname Cref@#2@name\endcsname}% \edef\@tempb{\expandafter\noexpand\csname Cref@#1@name\endcsname}% @@ -4862,87 +4871,17 @@ \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}{}% - \@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}{}% + \@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}}{}% + \@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}% } % \end{macrocode} % \end{macro} @@ -5399,22 +5338,31 @@ \def\@tempa{##1}% \def\@tempb{section}% \ifx\@tempa\@tempb% + \@ifundefined{cref@appendix@alias}% + {\def\@tempa{appendix}}% + {\def\@tempa{\cref@appendix@alias}}% \protected@edef\cref@currentlabel{% - [appendix][\arabic{##1}][\cref@result]% + [\@tempa][\arabic{##1}][\cref@result]% \csname p@##1\endcsname\csname the##1\endcsname}% \else% \def\@tempa{##1}% \def\@tempb{subsection}% \ifx\@tempa\@tempb% + \@ifundefined{cref@subappendix@alias}% + {\def\@tempa{subappendix}}% + {\def\@tempa{\cref@subappendix@alias}}% \protected@edef\cref@currentlabel{% - [subappendix][\arabic{##1}][\cref@result]% + [\@tempa][\arabic{##1}][\cref@result]% \csname p@##1\endcsname\csname the##1\endcsname}% \else% \def\@tempa{##1}% \def\@tempb{subsubsection}% \ifx\@tempa\@tempb% + \@ifundefined{cref@subsubappendix@alias}% + {\def\@tempa{subsubappendix}}% + {\def\@tempa{\cref@subsubappendix@alias}}% \protected@edef\cref@currentlabel{% - [subsubappendix][\arabic{##1}][\cref@result]% + [\@tempa][\arabic{##1}][\cref@result]% \csname p@##1\endcsname\csname the##1\endcsname}% \else% \@ifundefined{cref@##1@alias}% @@ -5446,29 +5394,41 @@ \def\@tempa{##1}% \def\@tempb{chapter}% \ifx\@tempa\@tempb% + \@ifundefined{cref@appendix@alias}% + {\def\@tempa{appendix}}% + {\def\@tempa{\cref@appendix@alias}}% \protected@edef\cref@currentlabel{% - [appendix][\arabic{##1}][\cref@result]% + [\@tempa][\arabic{##1}][\cref@result]% \csname p@##1\endcsname\csname the##1\endcsname}% \else% \def\@tempa{##1}% \def\@tempb{section}% \ifx\@tempa\@tempb% + \@ifundefined{cref@subappendix@alias}% + {\def\@tempa{subappendix}}% + {\def\@tempa{\cref@subappendix@alias}}% \protected@edef\cref@currentlabel{% - [subappendix][\arabic{##1}][\cref@result]% + [\@tempa][\arabic{##1}][\cref@result]% \csname p@##1\endcsname\csname the##1\endcsname}% \else% \def\@tempa{##1}% \def\@tempb{subsection}% \ifx\@tempa\@tempb% + \@ifundefined{cref@subsubappendix@alias}% + {\def\@tempa{subsubappendix}}% + {\def\@tempa{\cref@subsubappendix@alias}}% \protected@edef\cref@currentlabel{% - [subsubappendix][\arabic{##1}][\cref@result]% + [\@tempa][\arabic{##1}][\cref@result]% \csname p@##1\endcsname\csname the##1\endcsname}% \else% \def\@tempa{##1}% \def\@tempb{subsubsection}% \ifx\@tempa\@tempb% + \@ifundefined{cref@subsubappendix@alias}% + {\def\@tempa{subsubsubappendix}}% + {\def\@tempa{\cref@subsubsubappendix@alias}}% \protected@edef\cref@currentlabel{% - [subsubsubappendix][\arabic{##1}][\cref@result]% + [\@tempa][\arabic{##1}][\cref@result]% \csname p@##1\endcsname\csname the##1\endcsname}% \else% \@ifundefined{cref@##1@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@preamble{table}{Tabel}{Tabellen}% \Crefname@preamble{page}{Pagina}{Pagina's}% \Crefname@preamble{part}{Deel}{Delen}% - \Crefname@preamble{chapter}{Hoofdstuk}{Hoofdstuken}% + \Crefname@preamble{chapter}{Hoofdstuk}{Hoofdstukken}% \Crefname@preamble{section}{Paragraaf}{Paragrafen}% \Crefname@preamble{appendix}{Appendix}{Appendices}% \Crefname@preamble{enumi}{Punt}{Punten}% - \Crefname@preamble{footnote}{Voetnote}{Voetnoten}% + \Crefname@preamble{footnote}{Voetnoot}{Voetnoten}% \Crefname@preamble{lemma}{Lemma}{Lemma's}% \Crefname@preamble{corollary}{Corollarium}{Corollaria}% \Crefname@preamble{proposition}{Bewering}{Beweringen}% @@ -9192,8 +9152,8 @@ % \if@cref@capitalise% capitalise set \if@cref@abbrev% - \crefname@preamble{equation}{Verg.}{Verg's.}% - \crefname@preamble{figure}{Fig.}{Fig's.}% + \crefname@preamble{equation}{Verg.}{Verg.'s}% + \crefname@preamble{figure}{Fig.}{Fig.'s}% \else% \crefname@preamble{equation}{Vergel\ij{}king}{Vergel\ij{}kingen}% \crefname@preamble{figure}{Figuur}{Figuren}% @@ -9205,7 +9165,7 @@ \crefname@preamble{section}{Paragraaf}{Paragrafen}% \crefname@preamble{appendix}{Appendix}{Appendices}% \crefname@preamble{enumi}{Punt}{Punten}% - \crefname@preamble{footnote}{Voetnote}{Voetnoten}% + \crefname@preamble{footnote}{Voetnoot}{Voetnoten}% \crefname@preamble{theorem}{Theorema}{Theorema's}% \crefname@preamble{lemma}{Lemma}{Lemma's}% \crefname@preamble{corollary}{Corollarium}{Corollaria}% @@ -9221,8 +9181,8 @@ % \else% capitalise unset \if@cref@abbrev% - \crefname@preamble{equation}{verg.}{verg's.}% - \crefname@preamble{figure}{fig.}{fig's.}% + \crefname@preamble{equation}{verg.}{verg.'s}% + \crefname@preamble{figure}{fig.}{fig.'s}% \else% \crefname@preamble{equation}{vergel\ij{}king}{vergel\ij{}kingen}% \crefname@preamble{figure}{figuur}{figuren}% @@ -9234,7 +9194,7 @@ \crefname@preamble{section}{paragraaf}{paragrafen}% \crefname@preamble{appendix}{appendix}{appendices}% \crefname@preamble{enumi}{punt}{punten}% - \crefname@preamble{footnote}{voetnote}{voetnoten}% + \crefname@preamble{footnote}{voetnoot}{voetnoten}% \crefname@preamble{theorem}{theorema}{theorema's}% \crefname@preamble{lemma}{lemma}{lemma's}% \crefname@preamble{corollary}{corollarium}{corollaria}% -- cgit v1.2.3