summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-09-06 22:28:52 +0000
committerKarl Berry <karl@freefriends.org>2010-09-06 22:28:52 +0000
commit41f1763602b07a81ef001c41f6ef9faec6f49ddc (patch)
treeaf0def0171966075f80f8eec4279913a8468c52c /Master/texmf-dist/source/latex
parent096fa95fa16c9205c5fca73f875faa7d8389e3b8 (diff)
cleveref 0.17.4 (5sep10)
git-svn-id: svn://tug.org/texlive/trunk@19590 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex')
-rw-r--r--Master/texmf-dist/source/latex/cleveref/cleveref.dtx735
1 files changed, 432 insertions, 303 deletions
diff --git a/Master/texmf-dist/source/latex/cleveref/cleveref.dtx b/Master/texmf-dist/source/latex/cleveref/cleveref.dtx
index e1a64bc900c..87540e9a73d 100644
--- a/Master/texmf-dist/source/latex/cleveref/cleveref.dtx
+++ b/Master/texmf-dist/source/latex/cleveref/cleveref.dtx
@@ -21,7 +21,7 @@
% \iffalse
%<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
%<package>\ProvidesPackage{cleveref}
-%<package> [2010/06/24 v0.17.1 Intelligent cross-referencing]
+%<package> [2010/09/04 v0.17.4 Intelligent cross-referencing]
%
%<*driver>
\documentclass{ltxdoc}
@@ -62,7 +62,7 @@
%</driver>
% \fi
%
-% \CheckSum{13523}
+% \CheckSum{13845}
%% \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
@@ -197,12 +197,25 @@
% the \package{amsmath} multline environment's support for the optional
% argument to \textbackslash{}label\dots again. Added
% \textbackslash{}labelcref command.}
+% \changes{v0.17.2}{2010/07/24}{Removed unneeded argument from
+% \textbackslash{}@footnotetext redefinition, to improve compatibility
+% with other packages that redefine footnotes.}
+% \changes{v0.17.3}{2010/08/30}{Added missing default format definitions
+% for ``part''. Fixed bad active character interaction between
+% \package{cleveref} and some \package{babel} languages (in particular
+% Spanish). Fixed \package{hyperref} support code so
+% that it is only enabled if \package{hyperref} was loaded with the
+% \option{implicit} option set to \option{true} (the default).}
+% \changes{v0.17.4}{2010/09/04}{Added automatic support for
+% \package{aliascnt} counters whose parent counter gets reset. Fixed
+% serious bug in the test for \package{hyperref}'s \option{implicit}
+% options.}
%
%
% \GetFileInfo{cleveref.sty}
%
-% \def\fileversion{0.17.1}
-% \def\filedate{24/06/2010}
+% \def\fileversion{0.17.4}
+% \def\filedate{04/09/2010}
%
% \title{The \package{cleveref} package\thanks{This document
% corresponds to \textsf{cleveref}~\fileversion, dated
@@ -1082,15 +1095,17 @@
% names and conjunctions for the default cross-reference types. Any
% customisations you make to the default cross-reference names and
% conjunctions \emph{in the preamble} apply to the main language (i.e.\
-% the last language listed in the options). A |\selectlanguage| command
-% or similar will override these customisations, replacing them with the
-% defaults for the new language. If you later use |\selectlanguage| to
-% switch back to the main language, your customisations will be restored.
-% If you want to customise cross-reference names or conjunctions for any
-% language other than the main one, you either have to explicitly
-% redefine them after every language switching command, or hook the
-% redefinitions into \package{babel}'s language switching mechanism. (See
-% \cref{sec:code:babel} and the \package{babel} package documentation.)
+% the last language listed in the options). A |\selectlanguage|
+% \package{babel} command (or similar) in the document body will override
+% these customisations, replacing them with the defaults for the newly
+% selected language. If you later use |\selectlanguage| to switch back to
+% the main language, any customisations from the preamble will be
+% restored. If you want to customise cross-reference names or
+% conjunctions for any language other than the main one, you either have
+% to explicitly redefine them after every language switching command, or
+% hook the redefinitions into \package{babel}'s language switching
+% mechanism. (See \cref{sec:code:babel} and the \package{babel} package
+% documentation.)
%
% If you have defined formats for new cross-reference types for which no
% defaults are provided, then you're on your own. \package{cleveref} will
@@ -1183,11 +1198,12 @@
% argument to a large number of labels.
%
% You can use this trick to get different cross-reference formats for
-% different theorem-like environments, \emph{without} using the
-% \package{ntheorem} package.\footnote{This trick seems to belong to
-% \LaTeX{} mythology, and certainly isn't my own idea! But I haven't been
-% able to definitively track down who originally came up with it.} For
-% example,
+% different theorem-like environments,\footnote{This trick seems to
+% belong to \LaTeX{} mythology, and certainly isn't my own idea! But I
+% haven't been able to definitively track down who originally came up
+% with it.} \emph{without} using the \package{amsthm} or
+% \package{ntheorem} package (although using one of those packages is a
+% better solution if available). For example,
% \begin{quote}
% |\usepackage{aliascnt}|\\
% |\usepackage{cleveref}|\\
@@ -1196,6 +1212,9 @@
% |\aliascntresetthe{lemma}|\\
% |\crefname{lemma}{lemma}{lemmas}|
% \end{quote}
+% Note that \package{aliascnt} must be loaded before \package{cleveref},
+% and any \cmd{\newaliascnt} commands \emph{must} come \emph{after}
+% \package{cleveref} has been loaded.
%
%
%
@@ -1526,11 +1545,11 @@
% \begin{macrocode}
\let\cref@old@footnotetext\@footnotetext
\let\cref@old@mpfootnotetext\@mpfootnotetext
-\def\@footnotetext#1{%
+\def\@footnotetext{%
\cref@constructprefix{footnote}{\@result}%
\protected@xdef\cref@currentlabel{%
[footnote][\arabic{footnote}][\@result]\p@footnote\@thefnmark}%
- \cref@old@footnotetext{#1}}
+ \cref@old@footnotetext}
\def\@mpfootnotetext#1{%
\cref@constructprefix{mpfootnote}{\@result}%
\protected@xdef\cref@currentlabel{%
@@ -3762,11 +3781,11 @@
\expandafter\expandafter\expandafter\def%
\expandafter\expandafter\expandafter\@tmpfirst%
\expandafter\expandafter\expandafter{%
- \expandafter\@tmpname\expandafter~\@tmplabel}%
+ \expandafter\@tmpname\expandafter\nobreakspace\@tmplabel}%
\expandafter\expandafter\expandafter\def%
\expandafter\expandafter\expandafter\@tmpFirst%
\expandafter\expandafter\expandafter{%
- \expandafter\@tmpName\expandafter~\@tmplabel}%
+ \expandafter\@tmpName\expandafter\nobreakspace\@tmplabel}%
\expandafter\def\expandafter\@tmplabel\expandafter{\@tmplabel}%
% \end{macrocode}
% Define \cmd{\crefformat} and \cmd{\Crefformat}.
@@ -3803,11 +3822,11 @@
\expandafter\expandafter\expandafter\def%
\expandafter\expandafter\expandafter\@tmpfirst%
\expandafter\expandafter\expandafter{%
- \expandafter\@tmpnameplural\expandafter~\@tmprangelabel}%
+ \expandafter\@tmpnameplural\expandafter\nobreakspace\@tmprangelabel}%
\expandafter\expandafter\expandafter\def%
\expandafter\expandafter\expandafter\@tmpFirst%
\expandafter\expandafter\expandafter{%
- \expandafter\@tmpNameplural\expandafter~\@tmprangelabel}%
+ \expandafter\@tmpNameplural\expandafter\nobreakspace\@tmprangelabel}%
\expandafter\def\expandafter\@tmprangelabel%
\expandafter{\@tmprangelabel}%
% \end{macrocode}
@@ -3850,11 +3869,11 @@
\expandafter\expandafter\expandafter\def%
\expandafter\expandafter\expandafter\@tmpfirst%
\expandafter\expandafter\expandafter{%
- \expandafter\@tmpnameplural\expandafter~\@tmplabel}%
+ \expandafter\@tmpnameplural\expandafter\nobreakspace\@tmplabel}%
\expandafter\expandafter\expandafter\def%
\expandafter\expandafter\expandafter\@tmpFirst%
\expandafter\expandafter\expandafter{%
- \expandafter\@tmpNameplural\expandafter~\@tmplabel}%
+ \expandafter\@tmpNameplural\expandafter\nobreakspace\@tmplabel}%
\expandafter\def\expandafter\@tmpsecond\expandafter{%
\expandafter\crefpairconjunction\@tmplabel}%
\expandafter\def\expandafter\@tmpmiddle\expandafter{%
@@ -3932,11 +3951,11 @@
\expandafter\expandafter\expandafter\def%
\expandafter\expandafter\expandafter\@tmpfirst%
\expandafter\expandafter\expandafter{%
- \expandafter\@tmpnameplural\expandafter~\@tmprangelabel}%
+ \expandafter\@tmpnameplural\expandafter\nobreakspace\@tmprangelabel}%
\expandafter\expandafter\expandafter\def%
\expandafter\expandafter\expandafter\@tmpFirst%
\expandafter\expandafter\expandafter{%
- \expandafter\@tmpNameplural\expandafter~\@tmprangelabel}%
+ \expandafter\@tmpNameplural\expandafter\nobreakspace\@tmprangelabel}%
\expandafter\def\expandafter\@tmpsecond\expandafter{%
\expandafter\crefpairconjunction\@tmprangelabel}%
\expandafter\def\expandafter\@tmpmiddle\expandafter{%
@@ -4494,7 +4513,11 @@
% \package{cleveref}.
% \begin{macrocode}
\@ifpackageloaded{hyperref}{%
- \PackageInfo{cleveref}{`hyperref' support loaded}
+ \@ifpackagewith{hyperref}{implicit=false}{%
+ \let\if@cref@hyperrefloaded\iffalse%
+ }{%
+ \let\if@cref@hyperrefloaded\iftrue%
+ \PackageInfo{cleveref}{`hyperref' support loaded}
% \end{macrocode}
% \begin{macro}{\cref@hyperref}
% We define a utility macro to extract the hyper-link supplied by
@@ -4504,8 +4527,8 @@
% \cmd{r@\meta{label}}, \emph{not} the one prefixed with |cref@| that
% we've created ourselves.
% \begin{macrocode}
- \def\cref@hyperref#1{\expandafter\expandafter\expandafter%
- \@fourthoffive\csname r@#1\endcsname}
+ \def\cref@hyperref#1{\expandafter\expandafter\expandafter%
+ \@fourthoffive\csname r@#1\endcsname}
% \end{macrocode}
% \end{macro}
%
@@ -4518,16 +4541,16 @@
% \cmd{\H@refstepcounter} itself, in order to ensure that the extra
% information we need is stored in \cmd{\cref@currentlabel}.
% \begin{macrocode}
- \let\cref@old@H@refstepcounter\H@refstepcounter
- \def\H@refstepcounter#1{%
- \cref@old@H@refstepcounter{#1}%
- \cref@constructprefix{#1}{\@result}%
- \@ifundefined{cref@#1@alias}%
- {\def\@tmpa{#1}}%
- {\def\@tmpa{\csname cref@#1@alias\endcsname}}%
- \protected@xdef\cref@currentlabel{%
- [\@tmpa][\arabic{#1}][\@result]%
- \csname p@#1\endcsname\csname the#1\endcsname}}
+ \let\cref@old@H@refstepcounter\H@refstepcounter
+ \def\H@refstepcounter#1{%
+ \cref@old@H@refstepcounter{#1}%
+ \cref@constructprefix{#1}{\@result}%
+ \@ifundefined{cref@#1@alias}%
+ {\def\@tmpa{#1}}%
+ {\def\@tmpa{\csname cref@#1@alias\endcsname}}%
+ \protected@xdef\cref@currentlabel{%
+ [\@tmpa][\arabic{#1}][\@result]%
+ \csname p@#1\endcsname\csname the#1\endcsname}}
% \end{macrocode}
% \end{macro}
%
@@ -4547,12 +4570,12 @@
% \cmd{\cref@refstepcounter@optarg} defined below then overrides the
% label type.
% \begin{macrocode}
- \let\refstepcounter@noarg\cref@old@refstepcounter%
- \def\refstepcounter@optarg[#1]#2{%
- \cref@old@refstepcounter{#2}%
- \protected@xdef\cref@currentlabel{%
- \expandafter\cref@override@label@type%
- \cref@currentlabel\@nil{#1}}}
+ \let\refstepcounter@noarg\cref@old@refstepcounter%
+ \def\refstepcounter@optarg[#1]#2{%
+ \cref@old@refstepcounter{#2}%
+ \protected@xdef\cref@currentlabel{%
+ \expandafter\cref@override@label@type%
+ \cref@currentlabel\@nil{#1}}}
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -4563,111 +4586,111 @@
% ``appendix'' instead. But this time, it is \cmd{\H@refstepcounter}
% that needs to be redefined.
% \begin{macrocode}
- \renewcommand\appendix{%
- \cref@old@appendix%
- \@ifundefined{chapter}{%
- \def\H@refstepcounter##1{%
- \cref@old@H@refstepcounter{##1}%
- \cref@constructprefix{##1}{\@result}%
+ \renewcommand\appendix{%
+ \cref@old@appendix%
+ \@ifundefined{chapter}{%
+ \def\H@refstepcounter##1{%
+ \cref@old@H@refstepcounter{##1}%
+ \cref@constructprefix{##1}{\@result}%
% \end{macrocode}
-% We add a large value to the front of the counter data, to force
-% references to anything in appendices to be sorted after
-% everything else.
+% We add a large value to the front of the counter data, to force
+% references to anything in appendices to be sorted after
+% everything else.
% \begin{macrocode}
- \ifx\@result\@empty%
- \def\@result{2147483647}%
- \else%
- \edef\@result{2147483647,\@result}%
- \fi%
+ \ifx\@result\@empty%
+ \def\@result{2147483647}%
+ \else%
+ \edef\@result{2147483647,\@result}%
+ \fi%
% \end{macrocode}
-% Override the cross-reference type of sectioning commands.
+% Override the cross-reference type of sectioning commands.
% \begin{macrocode}
- \def\@tmpa{##1}%
- \def\@tmpb{section}%
- \ifx\@tmpa\@tmpb%
- \protected@xdef\cref@currentlabel{%
- [appendix][\arabic{##1}][\@result]%
- \csname p@##1\endcsname\csname the##1\endcsname}%
- \else%
\def\@tmpa{##1}%
- \def\@tmpb{subsection}%
+ \def\@tmpb{section}%
\ifx\@tmpa\@tmpb%
\protected@xdef\cref@currentlabel{%
- [subappendix][\arabic{##1}][\@result]%
+ [appendix][\arabic{##1}][\@result]%
\csname p@##1\endcsname\csname the##1\endcsname}%
\else%
\def\@tmpa{##1}%
- \def\@tmpb{subsubsection}%
+ \def\@tmpb{subsection}%
\ifx\@tmpa\@tmpb%
\protected@xdef\cref@currentlabel{%
- [subsubappendix][\arabic{##1}][\@result]%
+ [subappendix][\arabic{##1}][\@result]%
\csname p@##1\endcsname\csname the##1\endcsname}%
\else%
- \@ifundefined{cref@##1@alias}%
- {\def\@tmpa{##1}}%
- {\def\@tmpa{\csname cref@##1@alias\endcsname}}%
- \protected@xdef\cref@currentlabel{%
- [\@tmpa][\arabic{##1}][\@result]%
- \csname p@##1\endcsname\csname the##1\endcsname}
+ \def\@tmpa{##1}%
+ \def\@tmpb{subsubsection}%
+ \ifx\@tmpa\@tmpb%
+ \protected@xdef\cref@currentlabel{%
+ [subsubappendix][\arabic{##1}][\@result]%
+ \csname p@##1\endcsname\csname the##1\endcsname}%
+ \else%
+ \@ifundefined{cref@##1@alias}%
+ {\def\@tmpa{##1}}%
+ {\def\@tmpa{\csname cref@##1@alias\endcsname}}%
+ \protected@xdef\cref@currentlabel{%
+ [\@tmpa][\arabic{##1}][\@result]%
+ \csname p@##1\endcsname\csname the##1\endcsname}
+ \fi%
\fi%
- \fi%
- \fi}%
- }{%
- \def\H@refstepcounter##1{%
- \cref@old@H@refstepcounter{##1}%
- \cref@constructprefix{##1}{\@result}%
+ \fi}%
+ }{%
+ \def\H@refstepcounter##1{%
+ \cref@old@H@refstepcounter{##1}%
+ \cref@constructprefix{##1}{\@result}%
% \end{macrocode}
-% Again, the large value added to the front of the counter data
-% forces references to appendix items to be sorted last.
+% Again, the large value added to the front of the counter data
+% forces references to appendix items to be sorted last.
% \begin{macrocode}
- \ifx\@result\@empty%
- \def\@result{2147483647}%
- \else%
- \edef\@result{2147483647,\@result}%
- \fi%
+ \ifx\@result\@empty%
+ \def\@result{2147483647}%
+ \else%
+ \edef\@result{2147483647,\@result}%
+ \fi%
% \end{macrocode}
-% Override the cross-reference type of sectioning commands.
+% Override the cross-reference type of sectioning commands.
% \begin{macrocode}
- \def\@tmpa{##1}%
- \def\@tmpb{chapter}%
- \ifx\@tmpa\@tmpb%
- \protected@xdef\cref@currentlabel{%
- [appendix][\arabic{##1}][\@result]%
- \csname p@##1\endcsname\csname the##1\endcsname}%
- \else%
\def\@tmpa{##1}%
- \def\@tmpb{section}%
+ \def\@tmpb{chapter}%
\ifx\@tmpa\@tmpb%
\protected@xdef\cref@currentlabel{%
- [subappendix][\arabic{##1}][\@result]%
+ [appendix][\arabic{##1}][\@result]%
\csname p@##1\endcsname\csname the##1\endcsname}%
\else%
\def\@tmpa{##1}%
- \def\@tmpb{subsection}%
+ \def\@tmpb{section}%
\ifx\@tmpa\@tmpb%
\protected@xdef\cref@currentlabel{%
- [subsubappendix][\arabic{##1}][\@result]%
+ [subappendix][\arabic{##1}][\@result]%
\csname p@##1\endcsname\csname the##1\endcsname}%
\else%
\def\@tmpa{##1}%
- \def\@tmpb{subsubsection}%
+ \def\@tmpb{subsection}%
\ifx\@tmpa\@tmpb%
\protected@xdef\cref@currentlabel{%
- [subsubsubappendix][\arabic{##1}][\@result]%
+ [subsubappendix][\arabic{##1}][\@result]%
\csname p@##1\endcsname\csname the##1\endcsname}%
\else%
- \@ifundefined{cref@##1@alias}%
- {\def\@tmpa{##1}}%
- {\def\@tmpa{\csname cref@##1@alias\endcsname}}%
- \protected@xdef\cref@currentlabel{%
- [\@tmpa][\arabic{##1}][\@result]%
- \csname p@##1\endcsname\csname the##1\endcsname}
+ \def\@tmpa{##1}%
+ \def\@tmpb{subsubsection}%
+ \ifx\@tmpa\@tmpb%
+ \protected@xdef\cref@currentlabel{%
+ [subsubsubappendix][\arabic{##1}][\@result]%
+ \csname p@##1\endcsname\csname the##1\endcsname}%
+ \else%
+ \@ifundefined{cref@##1@alias}%
+ {\def\@tmpa{##1}}%
+ {\def\@tmpa{\csname cref@##1@alias\endcsname}}%
+ \protected@xdef\cref@currentlabel{%
+ [\@tmpa][\arabic{##1}][\@result]%
+ \csname p@##1\endcsname\csname the##1\endcsname}
+ \fi%
\fi%
\fi%
- \fi%
- \fi}%
- }%
- }
+ \fi}%
+ }%
+ }
% \end{macrocode}
% \end{macro}
%
@@ -4678,25 +4701,25 @@
% \begin{macro}{\@crefstar}
% \begin{macro}{\@crefrangestar}
% \begin{macro}{\@crefrangenostar}
-% Redefine \cmd{\cref} and all the others to allow starred variants,
-% which don't create hyper-links. The starred variants simply set a
-% flag, which is tested in \cmd{\@@setcref} and \cmd{\@@setrangeref}
-% (below).
-% \begin{macrocode}
- \DeclareRobustCommand{\cref}{%
- \@ifstar{\@crefstar{cref}}{\@crefnostar{cref}}}
- \DeclareRobustCommand{\Cref}{%
- \@ifstar{\@crefstar{Cref}}{\@crefnostar{Cref}}}
- \def\@crefnostar#1#2{\@cref{#1}{#2}}
- \def\@crefstar#1#2{%
- \@crefstarredtrue\@cref{#1}{#2}\@crefstarredfalse}
- \DeclareRobustCommand{\crefrange}{%
- \@ifstar{\@crefrangestar{cref}}{\@crefrangenostar{cref}}}
- \DeclareRobustCommand{\Crefrange}{%
- \@ifstar{\@crefrangestar{Cref}}{\@crefrangenostar{Cref}}}
- \def\@crefrangenostar#1#2#3{\@setcrefrange{#2}{#3}{#1}{}}
- \def\@crefrangestar#1#2#3{%
- \@crefstarredtrue\@setcrefrange{#2}{#3}{#1}{}\@crefstarredfalse}
+% Redefine \cmd{\cref} and all the others to allow starred variants,
+% which don't create hyper-links. The starred variants simply set a
+% flag, which is tested in \cmd{\@@setcref} and \cmd{\@@setrangeref}
+% (below).
+% \begin{macrocode}
+ \DeclareRobustCommand{\cref}{%
+ \@ifstar{\@crefstar{cref}}{\@crefnostar{cref}}}
+ \DeclareRobustCommand{\Cref}{%
+ \@ifstar{\@crefstar{Cref}}{\@crefnostar{Cref}}}
+ \def\@crefnostar#1#2{\@cref{#1}{#2}}
+ \def\@crefstar#1#2{%
+ \@crefstarredtrue\@cref{#1}{#2}\@crefstarredfalse}
+ \DeclareRobustCommand{\crefrange}{%
+ \@ifstar{\@crefrangestar{cref}}{\@crefrangenostar{cref}}}
+ \DeclareRobustCommand{\Crefrange}{%
+ \@ifstar{\@crefrangestar{Cref}}{\@crefrangenostar{Cref}}}
+ \def\@crefrangenostar#1#2#3{\@setcrefrange{#2}{#3}{#1}{}}
+ \def\@crefrangestar#1#2#3{%
+ \@crefstarredtrue\@setcrefrange{#2}{#3}{#1}{}\@crefstarredfalse}
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -4708,32 +4731,33 @@
%
% \begin{macro}{\@@setcref}
% \begin{macro}{\@@setcrefrange}
-% Redefine \cmd{\@@setcref} and \cmd{\@@setrangeref} to create
-% hyper-links (unless the starred flag is set), using the extra
-% arguments supplied in \cmd{\r@cref@\meta{label}} (via the aux file)
-% by \package{hyperref}.
-% \begin{macrocode}
- \def\@@setcref#1#2{%
- \cref@getlabel{#2}{\@tmplabel}%
- \if@crefstarred%
- #1{\@tmplabel}{}{}%
- \else%
- \edef\@tmplink{\cref@hyperref{#2}}%
- #1{\@tmplabel}{\hyper@linkstart{link}{\@tmplink}}{\hyper@linkend}%
- \fi}
- \def\@@setcrefrange#1#2#3{%
- \cref@getlabel{#2}{\@labela}%
- \cref@getlabel{#3}{\@labelb}%
- \if@crefstarred%
- #1{\@labela}{\@labelb}{}{}{}{}%
- \else%
- \edef\@linka{\cref@hyperref{#2}}%
- \edef\@linkb{\cref@hyperref{#3}}%
- #1{\@labela}{\@labelb}%
- {\hyper@linkstart{link}{\@linka}}{\hyper@linkend}%
- {\hyper@linkstart{link}{\@linkb}}{\hyper@linkend}%
- \fi}%
-}{}% end of \@ifpackageloaded{hyperref}
+% Redefine \cmd{\@@setcref} and \cmd{\@@setrangeref} to create
+% hyper-links (unless the starred flag is set), using the extra
+% arguments supplied in \cmd{\r@cref@\meta{label}} (via the aux file)
+% by \package{hyperref}.
+% \begin{macrocode}
+ \def\@@setcref#1#2{%
+ \cref@getlabel{#2}{\@tmplabel}%
+ \if@crefstarred%
+ #1{\@tmplabel}{}{}%
+ \else%
+ \edef\@tmplink{\cref@hyperref{#2}}%
+ #1{\@tmplabel}{\hyper@linkstart{link}{\@tmplink}}{\hyper@linkend}%
+ \fi}
+ \def\@@setcrefrange#1#2#3{%
+ \cref@getlabel{#2}{\@labela}%
+ \cref@getlabel{#3}{\@labelb}%
+ \if@crefstarred%
+ #1{\@labela}{\@labelb}{}{}{}{}%
+ \else%
+ \edef\@linka{\cref@hyperref{#2}}%
+ \edef\@linkb{\cref@hyperref{#3}}%
+ #1{\@labela}{\@labelb}%
+ {\hyper@linkstart{link}{\@linka}}{\hyper@linkend}%
+ {\hyper@linkstart{link}{\@linkb}}{\hyper@linkend}%
+ \fi}%
+ }% end of false case of \@ifpackagewith{hyperref}{implicit=false}
+ }{}% end of \@ifpackageloaded{hyperref}
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -4808,8 +4832,8 @@
% essentially this). So we modify \cmd{\newtheorem} (actually, the
% lower-level \cmd{\@othm}, \cmd{\@xnthm} and \cmd{\@ynthm} macros) so
% that it does so. We do this in such a way that default definitions or
-% explicit \cmd{\crefname} definitions for for theorem-like
-% environments override those produced automatically by our modified
+% explicit \cmd{\crefname} definitions for theorem-like environments
+% override those produced automatically by our modified
% \cmd{\newtheorem}.
%
% The catch is that, although the \cmd{\newtheorem} command provides
@@ -5030,7 +5054,8 @@
% \begin{macrocode}
\@ifpackageloaded{listings}{%
\PackageInfo{cleveref}{`listings' support loaded}
- \crefalias{lstnumber}{line}}{}% end of \@ifpackageloaded{listings}
+ \crefalias{lstnumber}{line}%
+ \crefalias{lstlisting}{listing}}{}% end of \@ifpackageloaded{listings}
% \end{macrocode}
% \end{macro}
%
@@ -5075,6 +5100,36 @@
%
%
%
+% \subsection{\package{aliascnt} Support}
+% \begin{macro}{aliascnt}
+% For the \package{aliascnt} trick described in \cref{sec:label-type}
+% of the documentation to work, we have to inform \package{cleveref}
+% about how aliased counters get reset. \package{aliascnt}'s
+% \cmd{\newaliascnt} command doesn't add the aliased counter to any
+% reset list, but if the counter it's aliased to gets reset, the
+% aliased counter will get reset too. In order for \package{cleveref}
+% to correcly sort cross-references to the aliased counter, we have to
+% add that counter to the appropriate reset list, even though that
+% isn't necessary to actually reset the counter itself. We add this to
+% the \cmd{\newaliascnt} command.
+% \end{macro}
+% \begin{macro}{\newaliascnt}
+% \begin{macrocode}
+\@ifpackageloaded{aliascnt}{%
+ \PackageInfo{cleveref}{`aliascnt' support loaded}
+ \let\cref@old@newaliascnt\newaliascnt
+ \renewcommand*{\newaliascnt}[2]{%
+ \cref@old@newaliascnt{#1}{#2}%
+ \cref@resetby{#2}{\@result}%
+ \ifx\@result\relax\else%
+ \@addtoreset{#1}{\@result}%
+ \fi}
+ }{}% end of \@ifpackageloaded{aliascnt}
+% \end{macrocode}
+% \end{macro}
+%
+%
+%
% \subsection{\package{varioref} Support}
% \begin{macro}{varioref}
% If \package{varioref} is loaded, we redefine its commands to use
@@ -5193,39 +5248,39 @@
% \end{macro}
% \begin{macrocode}
\else%
- \@ifpackageloaded{hyperref}{%
- \DeclareRobustCommand{\vref}{%
- \@ifstar{\cref@vrefstar{cref}}{\cref@vref{cref}}}
- \DeclareRobustCommand{\Vref}{%
- \@ifstar{\cref@vrefstar{Cref}}{\cref@vref{Cref}}}
- \DeclareRobustCommand{\vrefrange}{%
- \@ifstar{\cref@vrefrangestar{cref}}{\cref@vrefrange{cref}}}
- \DeclareRobustCommand{\Vrefrange}{%
- \@ifstar{\cref@vrefrangestar{Cref}}{\cref@vrefrange{Cref}}}
- \DeclareRobustCommand{\fullref}{%
- \@ifstar{\cref@fullrefstar{cref}}{\cref@fullref{cref}}}
- \DeclareRobustCommand{\Fullref}{%
- \@ifstar{\cref@fullrefstar{Cref}}{\cref@fullref{Cref}}}
- \def\cref@vrefstar#1#2{%
- \@crefstarredtrue%
- \cref@vref{#1}{#2}%
- \@crefstarredfalse}
- \def\cref@vrefrangestar#1#2#3{%
- \@crefstarredtrue%
- \cref@vrefrange{#1}{#2}{#3}%
- \@crefstarredfalse}
- \def\cref@fullrefstar#1#2{%
- \@crefstarredtrue%
- \cref@fullref{#1}{#2}%
- \@crefstarredfalse}
- }{%
- \DeclareRobustCommand{\vref}{\cref@vref{cref}}
- \DeclareRobustCommand{\Vref}{\cref@vref{Cref}}
- \DeclareRobustCommand{\vrefrange}{\cref@vrefrange{cref}}
- \DeclareRobustCommand{\Vrefrange}{\cref@vrefrange{Cref}}
- \DeclareRobustCommand{\fullref}{\cref@fullref{cref}}
- \DeclareRobustCommand{\Fullref}{\cref@fullref{Cref}}
- }
+ \if@cref@hyperrefloaded\relax% hyperref loaded
+ \DeclareRobustCommand{\vref}{%
+ \@ifstar{\cref@vrefstar{cref}}{\cref@vref{cref}}}
+ \DeclareRobustCommand{\Vref}{%
+ \@ifstar{\cref@vrefstar{Cref}}{\cref@vref{Cref}}}
+ \DeclareRobustCommand{\vrefrange}{%
+ \@ifstar{\cref@vrefrangestar{cref}}{\cref@vrefrange{cref}}}
+ \DeclareRobustCommand{\Vrefrange}{%
+ \@ifstar{\cref@vrefrangestar{Cref}}{\cref@vrefrange{Cref}}}
+ \DeclareRobustCommand{\fullref}{%
+ \@ifstar{\cref@fullrefstar{cref}}{\cref@fullref{cref}}}
+ \DeclareRobustCommand{\Fullref}{%
+ \@ifstar{\cref@fullrefstar{Cref}}{\cref@fullref{Cref}}}
+ \def\cref@vrefstar#1#2{%
+ \@crefstarredtrue%
+ \cref@vref{#1}{#2}%
+ \@crefstarredfalse}
+ \def\cref@vrefrangestar#1#2#3{%
+ \@crefstarredtrue%
+ \cref@vrefrange{#1}{#2}{#3}%
+ \@crefstarredfalse}
+ \def\cref@fullrefstar#1#2{%
+ \@crefstarredtrue%
+ \cref@fullref{#1}{#2}%
+ \@crefstarredfalse}
+ \else%
+ \DeclareRobustCommand{\vref}{\cref@vref{cref}}
+ \DeclareRobustCommand{\Vref}{\cref@vref{Cref}}
+ \DeclareRobustCommand{\vrefrange}{\cref@vrefrange{cref}}
+ \DeclareRobustCommand{\Vrefrange}{\cref@vrefrange{Cref}}
+ \DeclareRobustCommand{\fullref}{\cref@fullref{cref}}
+ \DeclareRobustCommand{\Fullref}{\cref@fullref{Cref}}
+ \fi% end of test for hyperref
\fi%
}% end of \AtBeginDocument
}{}% end of \@ifpackageloaded{varioref}
@@ -5682,7 +5737,7 @@
% there \emph{must} be a better way to get a backslash character into
% the token stream, obviating the need for the ugly \cmd{\@tmpa} macro.
% \begin{macrocode}
- \@ifpackageloaded{hyperref}{%
+ \if@cref@hyperrefloaded\relax% hyperref loaded
\def\@crefnostar#1#2{%
\gdef\cref@poorman@text{}%
\@cref{#1}{#2}%
@@ -5728,7 +5783,7 @@
\fi}%
\@tmpa#1\@nil}
%
- }{%
+ \else% hyperref not loaded
\DeclareRobustCommand{\cref}[1]{%
\edef\cref@poorman@text{}%
\@cref{cref}{#1}%
@@ -5747,7 +5802,7 @@
\@setcrefrange{#1}{#2}{Cref}{}%
\cref@writescript{}{%
\string\Crefrange\string{#1\string}\string{#2\string}}}
- }
+ \fi% end of test for hyperref
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -5940,7 +5995,7 @@
\creflastgroupconjunction%
\expandafter\g@addto@macro\expandafter\cref@poorman@text%
\expandafter{\creflastgroupconjunction}}
- \@ifpackageloaded{hyperref}{%
+ \if@cref@hyperrefloaded\relax% hyperref loaded
\def\@@setcref#1#2{%
\cref@getlabel{#2}{\@tmplabel}%
\if@crefstarred%
@@ -5970,7 +6025,7 @@
\expandafter\g@addto@macro\expandafter\cref@poorman@text%
\expandafter{#1{\ref{#2}}{\ref{#3}}{}{}{}{}}%
\fi}
- }{%
+ \else% hyperref not loaded
\let\old@@setcref\@@setcref%
\let\old@@setcrefrange\@@setcrefrange%
\def\@@setcref#1#2{%
@@ -5983,7 +6038,7 @@
\expandafter\g@addto@macro%
\expandafter{\expandafter\cref@poorman@text\expandafter}%
\expandafter{#1{\ref{#2}}{\ref{#3}}{}{}{}{}}}
- }
+ \fi% end of hyperref test
}% end of poorman option
% \end{macrocode}
% \end{macro}
@@ -6160,22 +6215,23 @@
% to define the formats created by the document preamble.
% \begin{macrocode}
\AtBeginDocument{%
- \def\crefrangeconjunction@preamble{ to~}%
+ \def\crefrangeconjunction@preamble{ to\nobreakspace}%
\def\crefrangepreconjunction@preamble{}%
\def\crefrangepostconjunction@preamble{}%
- \def\crefpairconjunction@preamble{ and~}%
+ \def\crefpairconjunction@preamble{ and\nobreakspace}%
\def\crefmiddleconjunction@preamble{, }%
- \def\creflastconjunction@preamble{ and~}%
+ \def\creflastconjunction@preamble{ and\nobreakspace}%
% \end{macrocode}
% We have to define the group conjunctions explicitly here, rather than
% relying on fall-back definitions in terms of the above conjunctions
% (see \cref{sec:code:default_formats}), in case any other language
% option defines them explicitly and we need to override those.
% \begin{macrocode}
- \def\crefpairgroupconjunction@preamble{ and~}%
+ \def\crefpairgroupconjunction@preamble{ and\nobreakspace}%
\def\crefmiddlegroupconjunction@preamble{, }%
- \def\creflastgroupconjunction@preamble{, and~}%
+ \def\creflastgroupconjunction@preamble{, and\nobreakspace}%
\Crefname@preamble{equation}{Equation}{Equations}%
+ \Crefname@preamble{part}{Part}{Parts}%
\Crefname@preamble{chapter}{Chapter}{Chapters}%
\Crefname@preamble{section}{Section}{Sections}%
\Crefname@preamble{appendix}{Appendix}{Appendices}%
@@ -6196,6 +6252,7 @@
\Crefname@preamble{line}{Line}{Lines}%
\if@cref@capitalise%
\crefname@preamble{equation}{Eq.}{Eqs.}%
+ \crefname@preamble{part}{Part}{Parts}%
\crefname@preamble{chapter}{Chapter}{Chapters}%
\crefname@preamble{section}{Section}{Sections}%
\crefname@preamble{appendix}{Appendix}{Appendices}%
@@ -6216,6 +6273,7 @@
\crefname@preamble{line}{Line}{Lines}%
\else%
\crefname@preamble{equation}{eq.}{eqs.}%
+ \crefname@preamble{part}{part}{parts}%
\crefname@preamble{chapter}{chapter}{chapters}%
\crefname@preamble{section}{section}{sections}%
\crefname@preamble{appendix}{appendix}{appendices}%
@@ -6243,16 +6301,17 @@
% appropriately.
% \begin{macrocode}
\cref@addto\extrasenglish{%
- \renewcommand{\crefrangeconjunction}{ to~}%
+ \renewcommand{\crefrangeconjunction}{ to\nobreakspace}%
\renewcommand\crefrangepreconjunction{}%
\renewcommand\crefrangepostconjunction{}%
- \renewcommand{\crefpairconjunction}{ and~}%
+ \renewcommand{\crefpairconjunction}{ and\nobreakspace}%
\renewcommand{\crefmiddleconjunction}{, }%
- \renewcommand{\creflastconjunction}{ and~}%
- \renewcommand{\crefpairgroupconjunction}{ and~}%
+ \renewcommand{\creflastconjunction}{ and\nobreakspace}%
+ \renewcommand{\crefpairgroupconjunction}{ and\nobreakspace}%
\renewcommand{\crefmiddlegroupconjunction}{, }%
- \renewcommand{\creflastgroupconjunction}{, and~}%
+ \renewcommand{\creflastgroupconjunction}{, and\nobreakspace}%
\Crefname{equation}{Equation}{Equations}%
+ \Crefname{part}{Part}{Parts}%
\Crefname{chapter}{Chapter}{Chapters}%
\Crefname{section}{Section}{Sections}%
\Crefname{subsection}{Section}{Sections}%
@@ -6284,6 +6343,7 @@
\Crefname{line}{Line}{Lines}%
\if@cref@capitalise%
\crefname{equation}{Eq.}{Eqs.}%
+ \crefname{part}{Part}{Parts}%
\crefname{chapter}{Chapter}{Chapters}%
\crefname{section}{Section}{Sections}%
\crefname{subsection}{Section}{Sections}%
@@ -6315,6 +6375,7 @@
\crefname{line}{Line}{Lines}%
\else%
\crefname{equation}{eq.}{eqs.}%
+ \crefname{part}{part}{parts}%
\crefname{chapter}{chapter}{chapters}%
\crefname{section}{section}{sections}%
\crefname{subsection}{section}{sections}%
@@ -6361,12 +6422,12 @@
% to define the formats created by the document preamble.
% \begin{macrocode}
\AtBeginDocument{%
- \def\crefrangeconjunction@preamble{ bis~}%
+ \def\crefrangeconjunction@preamble{ bis\nobreakspace}%
\def\crefrangepreconjunction@preamble{}%
\def\crefrangepostconjunction@preamble{}%
- \def\crefpairconjunction@preamble{ und~}%
+ \def\crefpairconjunction@preamble{ und\nobreakspace}%
\def\crefmiddleconjunction@preamble{, }%
- \def\creflastconjunction@preamble{ und~}%
+ \def\creflastconjunction@preamble{ und\nobreakspace}%
% \end{macrocode}
% We don't want the extra comma before ``und'' that would be added by the
% default fall-back definitions in terms of the above conjunctions, so we
@@ -6375,10 +6436,11 @@
% other language option defines them explicitly and we need to override
% them.
% \begin{macrocode}
- \def\crefpairgroupconjunction@preamble{ und~}%
+ \def\crefpairgroupconjunction@preamble{ und\nobreakspace}%
\def\crefmiddlegroupconjunction@preamble{, }%
- \def\creflastgroupconjunction@preamble{ und~}%
+ \def\creflastgroupconjunction@preamble{ und\nobreakspace}%
\Crefname@preamble{equation}{Gleichung}{Gleichungen}%
+ \Crefname@preamble{part}{Teil}{Teilen}%
\Crefname@preamble{chapter}{Kapitel}{Kapitel}%
\Crefname@preamble{section}{Abschnitt}{Abschnitte}%
\Crefname@preamble{appendix}{Anhang}{Anh\"ange}%
@@ -6399,6 +6461,7 @@
\Crefname@preamble{line}{Linie}{Linien}%
\if@cref@capitalise%
\crefname@preamble{equation}{Gleichung}{Gleichungen}%
+ \crefname@preamble{part}{Teil}{Teilen}%
\crefname@preamble{chapter}{Kapitel}{Kapitel}%
\crefname@preamble{section}{Abschnitt}{Abschnitte}%
\crefname@preamble{appendix}{Anhang}{Anh\"ange}%
@@ -6419,6 +6482,7 @@
\crefname@preamble{line}{Linie}{Linien}%
\else%
\crefname@preamble{equation}{Gleichung}{Gleichungen}%
+ \crefname@preamble{part}{Teil}{Teilen}%
\crefname@preamble{chapter}{Kapitel}{Kapitel}%
\crefname@preamble{section}{Abschnitt}{Abschnitte}%
\crefname@preamble{appendix}{Anhang}{Anh\"ange}%
@@ -6446,16 +6510,17 @@
% appropriately.
% \begin{macrocode}
\cref@addto\extrasgerman{%
- \renewcommand{\crefrangeconjunction}{ bis~}%
+ \renewcommand{\crefrangeconjunction}{ bis\nobreakspace}%
\renewcommand\crefrangepreconjunction{}%
\renewcommand\crefrangepostconjunction{}%
- \renewcommand{\crefpairconjunction}{ und~}%
+ \renewcommand{\crefpairconjunction}{ und\nobreakspace}%
\renewcommand{\crefmiddleconjunction}{, }%
- \renewcommand{\creflastconjunction}{ und~}%
- \renewcommand{\crefpairgroupconjunction}{ und~}%
+ \renewcommand{\creflastconjunction}{ und\nobreakspace}%
+ \renewcommand{\crefpairgroupconjunction}{ und\nobreakspace}%
\renewcommand{\crefmiddlegroupconjunction}{, }%
- \renewcommand{\creflastgroupconjunction}{ und~}%
+ \renewcommand{\creflastgroupconjunction}{ und\nobreakspace}%
\Crefname{equation}{Gleichung}{Gleichungen}%
+ \Crefname{part}{Teil}{Teilen}%
\Crefname{chapter}{Kapitel}{Kapitel}%
\Crefname{section}{Abschnitt}{Abschnitte}%
\Crefname{subsection}{Abschnitt}{Abschnitte}%
@@ -6487,6 +6552,7 @@
\Crefname{line}{Linie}{Linien}%
\if@cref@capitalise%
\crefname{equation}{Gleichung}{Gleichungen}%
+ \crefname{part}{Teil}{Teilen}%
\crefname{chapter}{Kapitel}{Kapitel}%
\crefname{section}{Abschnitt}{Abschnitte}%
\crefname{subsection}{Abschnitt}{Abschnitte}%
@@ -6518,6 +6584,7 @@
\crefname{line}{Linie}{Linien}%
\else%
\crefname{equation}{Gleichung}{Gleichungen}%
+ \crefname{part}{Teil}{Teilen}%
\crefname{chapter}{Kapitel}{Kapitel}%
\crefname{section}{Abschnitt}{Abschnitte}%
\crefname{subsection}{Abschnitt}{Abschnitte}%
@@ -6566,16 +6633,17 @@
\def\cref@language{ngerman}
\AtBeginDocument{%
\cref@addto\extrasngerman{%
- \renewcommand{\crefrangeconjunction}{ bis~}%
+ \renewcommand{\crefrangeconjunction}{ bis\nobreakspace}%
\renewcommand\crefrangepreconjunction{}%
\renewcommand\crefrangepostconjunction{}%
- \renewcommand{\crefpairconjunction}{ und~}%
+ \renewcommand{\crefpairconjunction}{ und\nobreakspace}%
\renewcommand{\crefmiddleconjunction}{, }%
- \renewcommand{\creflastconjunction}{ und~}%
- \renewcommand{\crefpairgroupconjunction}{ und~}%
+ \renewcommand{\creflastconjunction}{ und\nobreakspace}%
+ \renewcommand{\crefpairgroupconjunction}{ und\nobreakspace}%
\renewcommand{\crefmiddlegroupconjunction}{, }%
- \renewcommand{\creflastgroupconjunction}{ und~}%
+ \renewcommand{\creflastgroupconjunction}{ und\nobreakspace}%
\Crefname{equation}{Gleichung}{Gleichungen}%
+ \Crefname{part}{Teil}{Teilen}%
\Crefname{chapter}{Kapitel}{Kapitel}%
\Crefname{section}{Abschnitt}{Abschnitte}%
\Crefname{subsection}{Abschnitt}{Abschnitte}%
@@ -6607,6 +6675,7 @@
\Crefname{line}{Linie}{Linien}%
\if@cref@capitalise%
\crefname{equation}{Gleichung}{Gleichungen}%
+ \crefname{part}{Teil}{Teilen}%
\crefname{chapter}{Kapitel}{Kapitel}%
\crefname{section}{Abschnitt}{Abschnitte}%
\crefname{subsection}{Abschnitt}{Abschnitte}%
@@ -6638,6 +6707,7 @@
\crefname{line}{Linie}{Linien}%
\else%
\crefname{equation}{Gleichung}{Gleichungen}%
+ \crefname{part}{Teil}{Teilen}%
\crefname{chapter}{Kapitel}{Kapitel}%
\crefname{section}{Abschnitt}{Abschnitte}%
\crefname{subsection}{Abschnitt}{Abschnitte}%
@@ -6682,12 +6752,12 @@
% to define the formats created by the document preamble.
% \begin{macrocode}
\AtBeginDocument{%
- \def\crefrangeconjunction@preamble{ tot~}%
+ \def\crefrangeconjunction@preamble{ tot\nobreakspace}%
\def\crefrangepreconjunction@preamble{}%
\def\crefrangepostconjunction@preamble{}%
- \def\crefpairconjunction@preamble{ en~}%
+ \def\crefpairconjunction@preamble{ en\nobreakspace}%
\def\crefmiddleconjunction@preamble{, }%
- \def\creflastconjunction@preamble{ en~}%
+ \def\creflastconjunction@preamble{ en\nobreakspace}%
% \end{macrocode}
% As in German, we don't want the extra comma before ``en'' that would be
% added by the default fall-back definitions in terms of the above
@@ -6696,10 +6766,11 @@
% here, in case any other language option defines them explicitly and we
% need to override them.
% \begin{macrocode}
- \def\crefpairgroupconjunction@preamble{ en~}%
+ \def\crefpairgroupconjunction@preamble{ en\nobreakspace}%
\def\crefmiddlegroupconjunction@preamble{, }%
- \def\creflastgroupconjunction@preamble{ en~}%
+ \def\creflastgroupconjunction@preamble{ en\nobreakspace}%
\Crefname@preamble{equation}{Vergel\ij{}king}{Vergel\ij{}kingen}%
+ \Crefname@preamble{part}{Deel}{Delen}%
\Crefname@preamble{chapter}{Hoofdstuk}{Hoofdstuken}%
\Crefname@preamble{section}{Paragraaf}{Paragrafen}%
\Crefname@preamble{appendix}{Appendix}{Appendices}%
@@ -6719,6 +6790,7 @@
\Crefname@preamble{line}{Lijn}{Lijnen}%
\if@cref@capitalise%
\crefname@preamble{equation}{Verg.}{Verg's.}%
+ \crefname@preamble{part}{Deel}{Delen}%
\crefname@preamble{chapter}{Hoofdstuk}{Hoofdstukken}%
\crefname@preamble{section}{Paragraaf}{Paragrafen}%
\crefname@preamble{appendix}{Appendix}{Appendices}%
@@ -6739,6 +6811,7 @@
\crefname@preamble{line}{Lijn}{Lijnen}%
\else%
\crefname@preamble{equation}{verg.}{verg's.}%
+ \crefname@preamble{part}{deel}{delen}%
\crefname@preamble{chapter}{hoofdstuk}{hoofdstukken}%
\crefname@preamble{section}{paragraaf}{paragrafen}%
\crefname@preamble{appendix}{appendix}{appendices}%
@@ -6766,16 +6839,17 @@
% appropriately.
% \begin{macrocode}
\cref@addto\extrasdutch{%
- \renewcommand{\crefrangeconjunction}{ tot~}%
+ \renewcommand{\crefrangeconjunction}{ tot\nobreakspace}%
\renewcommand\crefrangepreconjunction{}%
\renewcommand\crefrangepostconjunction{}%
- \renewcommand{\crefpairconjunction}{ en~}%
+ \renewcommand{\crefpairconjunction}{ en\nobreakspace}%
\renewcommand{\crefmiddleconjunction}{, }%
- \renewcommand{\creflastconjunction}{ en~}%
- \renewcommand{\crefpairgroupconjunction}{ en~}%
+ \renewcommand{\creflastconjunction}{ en\nobreakspace}%
+ \renewcommand{\crefpairgroupconjunction}{ en\nobreakspace}%
\renewcommand{\crefmiddlegroupconjunction}{, }%
- \renewcommand{\creflastgroupconjunction}{ en~}%
+ \renewcommand{\creflastgroupconjunction}{ en\nobreakspace}%
\Crefname{equation}{Vergel\ij{}king}{Vergel\ij{}kingen}%
+ \Crefname{part}{Deel}{Delen}%
\Crefname{chapter}{Hoofdstuk}{Hoofdstuken}%
\Crefname{section}{Paragraaf}{Paragrafen}%
\Crefname{subsection}{Paragraaf}{Paragrafen}%
@@ -6807,6 +6881,7 @@
\Crefname{line}{Lijn}{Lijnen}%
\if@cref@capitalise%
\crefname{equation}{Verg.}{Verg's.}%
+ \crefname{part}{Deel}{Delen}%
\crefname{chapter}{Hoofdstuk}{Hoofdstukken}%
\crefname{section}{Paragraaf}{Paragrafen}%
\crefname{appendix}{Appendix}{Appendices}%
@@ -6827,6 +6902,7 @@
\crefname{line}{Lijn}{Lijnen}%
\else%
\crefname{equation}{verg.}{verg's.}%
+ \crefname{part}{deel}{delen}%
\crefname{chapter}{hoofdstuk}{hoofdstukken}%
\crefname{section}{paragraaf}{paragrafen}%
\crefname{appendix}{appendix}{appendices}%
@@ -6862,21 +6938,22 @@
% define the formats created by the document preamble.
% \begin{macrocode}
\AtBeginDocument{%
- \def\crefrangeconjunction@preamble{ \`a~}%
+ \def\crefrangeconjunction@preamble{ \`a\nobreakspace}%
\def\crefrangepreconjunction@preamble{}%
\def\crefrangepostconjunction@preamble{}%
- \def\crefpairconjunction@preamble{ et~}%
+ \def\crefpairconjunction@preamble{ et\nobreakspace}%
\def\crefmiddleconjunction@preamble{, }%
- \def\creflastconjunction@preamble{ et~}%
+ \def\creflastconjunction@preamble{ et\nobreakspace}%
% \end{macrocode}
% Erring on the side of caution, I've left off the extra comma before
% ``et'' between groups, pending more knowledgeable input on punctuation
% rules from a native French speaker.
% \begin{macrocode}
- \def\crefpairgroupconjunction@preamble{ et~}%
+ \def\crefpairgroupconjunction@preamble{ et\nobreakspace}%
\def\crefmiddlegroupconjunction@preamble{, }%
- \def\creflastgroupconjunction@preamble{, et~}%
+ \def\creflastgroupconjunction@preamble{, et\nobreakspace}%
\Crefname@preamble{equation}{{\'E}quation}{{\'E}quations}%
+ \Crefname@preamble{part}{Partie}{Parties}%
\Crefname@preamble{chapter}{Chapitre}{Chapitres}%
\Crefname@preamble{section}{Section}{Sections}%
\Crefname@preamble{appendix}{Appendice}{Appendices}%
@@ -6896,6 +6973,7 @@
\Crefname@preamble{line}{Ligne}{Lignes}%
\if@cref@capitalise%
\crefname@preamble{equation}{{\'E}quation}{{\'E}quations}%
+ \crefname@preamble{part}{Partie}{Parties}%
\crefname@preamble{chapter}{Chapitre}{Chapitres}%
\crefname@preamble{section}{Section}{Sections}%
\crefname@preamble{appendix}{Appendice}{Appendices}%
@@ -6916,6 +6994,7 @@
\crefname@preamble{line}{Ligne}{Lignes}%
\else%
\crefname@preamble{equation}{{\'e}quation}{{\'e}quations}%
+ \crefname@preamble{part}{partie}{parties}%
\crefname@preamble{chapter}{chapitre}{chapitres}%
\crefname@preamble{section}{section}{sections}%
\crefname@preamble{appendix}{appendice}{appendices}%
@@ -6943,16 +7022,17 @@
% appropriately.
% \begin{macrocode}
\cref@addto\extrasfrench{%
- \renewcommand{\crefrangeconjunction}{ \`a~}%
+ \renewcommand{\crefrangeconjunction}{ \`a\nobreakspace}%
\renewcommand\crefrangepreconjunction{}%
\renewcommand\crefrangepostconjunction{}%
- \renewcommand{\crefpairconjunction}{ et~}%
+ \renewcommand{\crefpairconjunction}{ et\nobreakspace}%
\renewcommand{\crefmiddleconjunction}{, }%
- \renewcommand{\creflastconjunction}{ et~}%
- \renewcommand{\crefpairgroupconjunction}{ et~}%
+ \renewcommand{\creflastconjunction}{ et\nobreakspace}%
+ \renewcommand{\crefpairgroupconjunction}{ et\nobreakspace}%
\renewcommand{\crefmiddlegroupconjunction}{, }%
- \renewcommand{\creflastgroupconjunction}{ et~}%
+ \renewcommand{\creflastgroupconjunction}{ et\nobreakspace}%
\Crefname{equation}{{\'E}quation}{{\'E}quations}%
+ \Crefname{part}{Partie}{Parties}%
\Crefname{chapter}{Chapitre}{Chapitres}%
\Crefname{section}{Section}{Sections}%
\Crefname{subsection}{Section}{Sections}%
@@ -6984,6 +7064,7 @@
\Crefname{line}{Ligne}{Lignes}%
\if@cref@capitalise%
\crefname{equation}{{\'E}quation}{{\'E}quations}%
+ \crefname{part}{Partie}{Parties}%
\crefname{chapter}{Chapitre}{Chapitres}%
\crefname{section}{Section}{Sections}%
\crefname{subsection}{Section}{Sections}%
@@ -7015,6 +7096,7 @@
\crefname{line}{Ligne}{Lignes}%
\else%
\crefname{equation}{{\'e}quation}{{\'e}quations}%
+ \crefname{part}{partie}{parties}%
\crefname{chapter}{chapitre}{chapitres}%
\crefname{section}{section}{sections}%
\crefname{subsection}{section}{sections}%
@@ -7060,16 +7142,17 @@
% define the formats created by the document preamble.
% \begin{macrocode}
\AtBeginDocument{%
- \def\crefrangeconjunction@preamble{ a~}%
+ \def\crefrangeconjunction@preamble{ a\nobreakspace}%
\def\crefrangepreconjunction@preamble{}%
\def\crefrangepostconjunction@preamble{}%
- \def\crefpairconjunction@preamble{ y~}%
+ \def\crefpairconjunction@preamble{ y\nobreakspace}%
\def\crefmiddleconjunction@preamble{, }%
- \def\creflastconjunction@preamble{ y~}%
- \def\crefpairgroupconjunction@preamble{ y~}%
+ \def\creflastconjunction@preamble{ y\nobreakspace}%
+ \def\crefpairgroupconjunction@preamble{ y\nobreakspace}%
\def\crefmiddlegroupconjunction@preamble{, }%
- \def\creflastgroupconjunction@preamble{ y~}%
+ \def\creflastgroupconjunction@preamble{ y\nobreakspace}%
\Crefname@preamble{equation}{Ecuaci\'on}{Ecuaciones}%
+ \Crefname@preamble{part}{Parte}{Partes}%
\Crefname@preamble{chapter}{Cap\'itulo}{Cap\'itulos}%
\Crefname@preamble{section}{Secci\'on}{Secciones}%
\Crefname@preamble{appendix}{Ap\'endice}{Ap\'endices}%
@@ -7089,27 +7172,29 @@
\Crefname@preamble{algorithm}{Algoritmo}{Algoritmos}%
\Crefname@preamble{line}{L\'inea}{L\'ineas}%
\if@cref@capitalise%
- \crefname@preamble{equation}{Ecuaci\'on}{ecuaciones}%
- \crefname@preamble{chapter}{Cap\'itulo}{cap\'itulos}%
- \crefname@preamble{section}{Secci\'on}{secciones}%
- \crefname@preamble{appendix}{Ap\'endice}{ap\'endices}%
- \crefname@preamble{enumi}{Punto}{puntos}%
+ \crefname@preamble{equation}{Ecuaci\'on}{Ecuaciones}%
+ \crefname@preamble{part}{Parte}{Partes}%
+ \crefname@preamble{chapter}{Cap\'itulo}{Cap\'itulos}%
+ \crefname@preamble{section}{Secci\'on}{Secciones}%
+ \crefname@preamble{appendix}{Ap\'endice}{Ap\'endices}%
+ \crefname@preamble{enumi}{Punto}{Puntos}%
\crefname@preamble{footnote}{Nota}{Notas}%
- \crefname@preamble{figure}{Figura}{figuras}%
- \crefname@preamble{table}{Cuadro}{cuadros}%
- \crefname@preamble{theorem}{Teorema}{teoremas}%
- \crefname@preamble{lemma}{Lema}{lemas}%
- \crefname@preamble{corollary}{Corolario}{corolarios}%
- \crefname@preamble{proposition}{Proposici\'on}{proposiciones}%
- \crefname@preamble{definition}{Definici\'on}{definiciones}%
- \crefname@preamble{result}{Resultado}{resultados}%
- \crefname@preamble{example}{Ejemplo}{ejemplos}%
- \crefname@preamble{remark}{Observaci\'on}{observaciones}%
- \crefname@preamble{note}{Nota}{notas}%
+ \crefname@preamble{figure}{Figura}{Figuras}%
+ \crefname@preamble{table}{Cuadro}{Cuadros}%
+ \crefname@preamble{theorem}{Teorema}{Teoremas}%
+ \crefname@preamble{lemma}{Lema}{Lemas}%
+ \crefname@preamble{corollary}{Corolario}{Corolarios}%
+ \crefname@preamble{proposition}{Proposici\'on}{Proposiciones}%
+ \crefname@preamble{definition}{Definici\'on}{Definiciones}%
+ \crefname@preamble{result}{Resultado}{Resultados}%
+ \crefname@preamble{example}{Ejemplo}{Ejemplos}%
+ \crefname@preamble{remark}{Observaci\'on}{Observaciones}%
+ \crefname@preamble{note}{Nota}{Notas}%
\crefname@preamble{algorithm}{Algoritmo}{Algoritmos}%
\crefname@preamble{line}{L\'inea}{L\'ineas}%
\else%
\crefname@preamble{equation}{ecuaci\'on}{ecuaciones}%
+ \crefname@preamble{part}{parte}{partes}%
\crefname@preamble{chapter}{cap\'itulo}{cap\'itulos}%
\crefname@preamble{section}{secci\'on}{secciones}%
\crefname@preamble{appendix}{ap\'endice}{ap\'endices}%
@@ -7137,16 +7222,17 @@
% appropriately.
% \begin{macrocode}
\cref@addto\extrasspanish{%
- \renewcommand{\crefrangeconjunction}{ a~}%
+ \renewcommand{\crefrangeconjunction}{ a\nobreakspace}%
\renewcommand{\crefrangepreconjunction}{}%
\renewcommand{\crefrangepostconjunction}{}%
- \renewcommand{\crefpairconjunction}{ y~}%
+ \renewcommand{\crefpairconjunction}{ y\nobreakspace}%
\renewcommand{\crefmiddleconjunction}{, }%
- \renewcommand{\creflastconjunction}{ y~}%
- \renewcommand{\crefpairgroupconjunction}{ y~}%
+ \renewcommand{\creflastconjunction}{ y\nobreakspace}%
+ \renewcommand{\crefpairgroupconjunction}{ y\nobreakspace}%
\renewcommand{\crefmiddlegroupconjunction}{, }%
- \renewcommand{\creflastgroupconjunction}{ y~}%
+ \renewcommand{\creflastgroupconjunction}{ y\nobreakspace}%
\Crefname{equation}{Ecuaci\'on}{Ecuaciones}%
+ \Crefname{part}{Parte}{Partes}%
\Crefname{chapter}{Cap\'itulo}{Cap\'itulos}%
\Crefname{section}{Secci\'on}{Secciones}%
\Crefname{subsection}{Secci\'on}{Secciones}%
@@ -7178,6 +7264,7 @@
\Crefname{line}{L\'inea}{L\'ineas}%
\if@cref@capitalise%
\crefname{equation}{Ecuaci\'on}{Ecuaciones}%
+ \crefname{part}{Parte}{Partes}%
\crefname{chapter}{Cap\'itulo}{Cap\'itulos}%
\crefname{section}{Secci\'on}{Secciones}%
\crefname{subsection}{Secci\'on}{Secciones}%
@@ -7209,6 +7296,7 @@
\crefname{line}{L\'inea}{L\'ineas}%
\else%
\crefname{equation}{ecuaci\'on}{ecuaciones}%
+ \crefname{part}{parte}{partes}%
\crefname{chapter}{cap\'itulo}{cap\'itulos}%
\crefname{section}{secci\'on}{secciones}%
\crefname{subsection}{secci\'on}{secciones}%
@@ -7243,7 +7331,6 @@
% \end{macrocode}
%
%
-%
% \begin{macro}{italian}
% Italian translations kindly contributed by Massimo Redaelli.
% \end{macro}
@@ -7256,22 +7343,23 @@
% makes use of |\crefrangepreconjunction|.)
% \begin{macrocode}
\AtBeginDocument{%
- \def\crefrangeconjunction@preamble{ a~}%
- \def\crefrangepreconjunction@preamble{da~}%
+ \def\crefrangeconjunction@preamble{ a\nobreakspace}%
+ \def\crefrangepreconjunction@preamble{da\nobreakspace}%
\def\crefrangepostconjunction@preamble{}%
- \def\crefpairconjunction@preamble{ e~}%
+ \def\crefpairconjunction@preamble{ e\nobreakspace}%
\def\crefmiddleconjunction@preamble{, }%
- \def\creflastconjunction@preamble{ e~}%
+ \def\creflastconjunction@preamble{ e\nobreakspace}%
% \end{macrocode}
% We have to define the group conjunctions explicitly here, rather than
% relying on fall-back definitions in terms of the above conjunctions
% (see \cref{sec:code:default_formats}), in case any other language
% option defines them explicitly and we need to override those.
% \begin{macrocode}
- \def\crefpairgroupconjunction@preamble{ e~}%
+ \def\crefpairgroupconjunction@preamble{ e\nobreakspace}%
\def\crefmiddlegroupconjunction@preamble{, }%
- \def\creflastgroupconjunction@preamble{ e~}%
+ \def\creflastgroupconjunction@preamble{ e\nobreakspace}%
\Crefname@preamble{equation}{Equazione}{Equazioni}%
+ \Crefname@preamble{part}{Parte}{Parti}%
\Crefname@preamble{chapter}{Capitolo}{Capitoli}%
\Crefname@preamble{section}{Sezione}{Sezioni}%
\Crefname@preamble{appendix}{Appendice}{Appendici}%
@@ -7292,6 +7380,7 @@
\Crefname@preamble{line}{Linea}{Linee}%
\if@cref@capitalise%
\crefname@preamble{equation}{Eq.}{Eq.}%
+ \crefname@preamble{part}{Parte}{Parti}%
\crefname@preamble{chapter}{Capitolo}{Capitoli}%
\crefname@preamble{section}{Sezione}{Sezioni}%
\crefname@preamble{appendix}{Appendice}{Appendici}%
@@ -7312,6 +7401,7 @@
\crefname@preamble{line}{Linea}{Linee}%
\else%
\crefname@preamble{equation}{eq.}{eq.}%
+ \crefname@preamble{part}{parte}{parti}%
\crefname@preamble{chapter}{capitolo}{capitoli}%
\crefname@preamble{section}{sezione}{sezioni}%
\crefname@preamble{appendix}{appendice}{appendici}%
@@ -7339,16 +7429,17 @@
% appropriately.
% \begin{macrocode}
\cref@addto\extrasitalian{%
- \renewcommand{\crefrangeconjunction}{ a~}%
- \renewcommand\crefrangepreconjunction{da~}%
+ \renewcommand{\crefrangeconjunction}{ a\nobreakspace}%
+ \renewcommand\crefrangepreconjunction{da\nobreakspace}%
\renewcommand\crefrangepostconjunction{}%
- \renewcommand{\crefpairconjunction}{ e~}%
+ \renewcommand{\crefpairconjunction}{ e\nobreakspace}%
\renewcommand{\crefmiddleconjunction}{, }%
- \renewcommand{\creflastconjunction}{ e~}%
- \renewcommand{\crefpairgroupconjunction}{ e~}%
+ \renewcommand{\creflastconjunction}{ e\nobreakspace}%
+ \renewcommand{\crefpairgroupconjunction}{ e\nobreakspace}%
\renewcommand{\crefmiddlegroupconjunction}{, }%
- \renewcommand{\creflastgroupconjunction}{ e~}%
+ \renewcommand{\creflastgroupconjunction}{ e\nobreakspace}%
\Crefname{equation}{Equazione}{Equazioni}%
+ \Crefname{part}{Parte}{Parti}%
\Crefname{chapter}{Capitolo}{Capitoli}%
\Crefname{section}{Sezione}{Sezioni}%
\Crefname{subsection}{Sezione}{Sezioni}%
@@ -7380,6 +7471,7 @@
\Crefname{line}{Linea}{Linee}%
\if@cref@capitalise%
\crefname{equation}{Eq.}{Eq.}%
+ \crefname{part}{Parte}{Parti}%
\crefname{chapter}{Capitolo}{Capitoli}%
\crefname{section}{Sezione}{Sezioni}%
\crefname{subsection}{Sezione}{Sezioni}%
@@ -7411,6 +7503,7 @@
\crefname{line}{Linea}{Linee}%
\else%
\crefname{equation}{eq.}{eq.}%
+ \crefname{part}{parte}{parti}%
\crefname{chapter}{capitolo}{capitoli}%
\crefname{section}{sezione}{sezioni}%
\crefname{subsection}{sezione}{sezioni}%
@@ -7460,22 +7553,25 @@
\def\crefrangeconjunction@preamble{--}%
\def\crefrangepreconjunction@preamble{}%
\def\crefrangepostconjunction@preamble{}%
- \def\crefpairconjunction@preamble{ \cyri~}%
+ \def\crefpairconjunction@preamble{ \cyri\nobreakspace}%
\def\crefmiddleconjunction@preamble{, }%
- \def\creflastconjunction@preamble{ \cyri~}%
+ \def\creflastconjunction@preamble{ \cyri\nobreakspace}%
% \end{macrocode}
% We have to define the group conjunctions explicitly here, rather than
% relying on fall-back definitions in terms of the above conjunctions
% (see \cref{sec:code:default_formats}), in case any other language
% option defines them explicitly and we need to override those.
% \begin{macrocode}
- \def\crefpairgroupconjunction@preamble{ \cyri~}%
+ \def\crefpairgroupconjunction@preamble{ \cyri\nobreakspace}%
\def\crefmiddlegroupconjunction@preamble{, }%
\def\creflastgroupconjunction@preamble%
- {, \cyra\ \cyrt\cyra\cyrk\cyrzh\cyre~}%
+ {, \cyra\ \cyrt\cyra\cyrk\cyrzh\cyre\nobreakspace}%
\Crefname@preamble{equation}%
{\CYRF\cyro\cyrr\cyrm\cyru\cyrl\cyra}%
{\CYRF\cyro\cyrr\cyrm\cyru\cyrl\cyrery}%
+ \Crefname@preamble{part}%
+ {\CYRCH\cyra\cyrs\cyrt\cyrsftsn}%
+ {\CYRCH\cyra\cyrs\cyrt\cyri}%
\Crefname@preamble{chapter}%
{\CYRG\cyrl\cyra\cyrv\cyra}%
{\CYRG\cyrl\cyra\cyrv\cyrery}%
@@ -7534,6 +7630,9 @@
\crefname@preamble{equation}%
{\CYRF-\cyrl.}%
{\CYRF-\cyrl.}%
+ \crefname@preamble{part}%
+ {\CYRCH\cyra\cyrs\cyrt\cyrsftsn}%
+ {\CYRCH\cyra\cyrs\cyrt\cyri}%
\crefname@preamble{chapter}%
{\CYRG\cyrl\cyra\cyrv\cyra}%
{\CYRG\cyrl\cyra\cyrv\cyrery}%
@@ -7588,6 +7687,9 @@
{\CYRS\cyrt\cyrr\cyro\cyrk\cyri}%
\else%
\crefname@preamble{equation}{\cyrf-\cyrl.}{\cyrf-\cyrl.}%
+ \crefname@preamble{part}%
+ {\cyrch\cyra\cyrs\cyrt\cyrsftsn}%
+ {\cyrch\cyra\cyrs\cyrt\cyri}%
\crefname@preamble{chapter}%
{\cyrg\cyrl\cyra\cyrv.}%
{\cyrg\cyrl\cyra\cyrv.}%
@@ -7652,16 +7754,19 @@
\renewcommand{\crefrangeconjunction}{--}%
\renewcommand\crefrangepreconjunction{}%
\renewcommand\crefrangepostconjunction{}%
- \renewcommand{\crefpairconjunction}{ \cyri~}%
+ \renewcommand{\crefpairconjunction}{ \cyri\nobreakspace}%
\renewcommand{\crefmiddleconjunction}{, }%
- \renewcommand{\creflastconjunction}{ \cyri~}%
- \renewcommand{\crefpairgroupconjunction}{ \cyri~}%
+ \renewcommand{\creflastconjunction}{ \cyri\nobreakspace}%
+ \renewcommand{\crefpairgroupconjunction}{ \cyri\nobreakspace}%
\renewcommand{\crefmiddlegroupconjunction}{, }%
\renewcommand{\creflastgroupconjunction}%
- {, \cyra\ \cyrt\cyra\cyrk\cyrzh\cyre~}%
+ {, \cyra\ \cyrt\cyra\cyrk\cyrzh\cyre\nobreakspace}%
\Crefname{equation}%
{\CYRF\cyro\cyrr\cyrm\cyru\cyrl\cyra}%
{\CYRF\cyro\cyrr\cyrm\cyru\cyrl\cyrery}%
+ \Crefname{part}%
+ {\CYRCH\cyra\cyrs\cyrt\cyrsftsn}%
+ {\CYRCH\cyra\cyrs\cyrt\cyri}%
\Crefname{chapter}%
{\CYRG\cyrl\cyra\cyrv\cyra}%
{\CYRG\cyrl\cyra\cyrv\cyrery}%
@@ -7751,6 +7856,9 @@
{\CYRS\cyrt\cyrr\cyro\cyrk\cyri}%
\if@cref@capitalise%
\crefname{equation}{\CYRF-\cyrl.}{\CYRF-\cyrl.}%
+ \crefname{part}%
+ {\CYRCH\cyra\cyrs\cyrt\cyrsftsn}%
+ {\CYRCH\cyra\cyrs\cyrt\cyri}%
\crefname{chapter}%
{\CYRG\cyrl\cyra\cyrv\cyra}%
{\CYRG\cyrl\cyra\cyrv\cyrery}%
@@ -7830,6 +7938,9 @@
{\CYRS\cyrt\cyrr\cyro\cyrk\cyri}%
\else%
\crefname{equation}{\cyrf-\cyrl.}{\cyrf-\cyrl.}%
+ \crefname{part}%
+ {\cyrch\cyra\cyrs\cyrt\cyrsftsn}%
+ {\cyrch\cyra\cyrs\cyrt\cyri}%
\crefname{chapter}%
{\cyrg\cyrl\cyra\cyrv.}%
{\cyrg\cyrl\cyra\cyrv.}%
@@ -7927,22 +8038,25 @@
\def\crefrangeconjunction@preamble{--}%
\def\crefrangepreconjunction@preamble{}%
\def\crefrangepostconjunction@preamble{}%
- \def\crefpairconjunction@preamble{ \cyrii~}%
+ \def\crefpairconjunction@preamble{ \cyrii\nobreakspace}%
\def\crefmiddleconjunction@preamble{, }%
- \def\creflastconjunction@preamble{ \cyrii~}%
+ \def\creflastconjunction@preamble{ \cyrii\nobreakspace}%
% \end{macrocode}
% We have to define the group conjunctions explicitly here, rather than
% relying on fall-back definitions in terms of the above conjunctions
% (see \cref{sec:code:default_formats}), in case any other language
% option defines them explicitly and we need to override those.
% \begin{macrocode}
- \def\crefpairgroupconjunction@preamble{ \cyrt\cyra~}%
+ \def\crefpairgroupconjunction@preamble{ \cyrt\cyra\nobreakspace}%
\def\crefmiddlegroupconjunction@preamble{, }%
\def\creflastgroupconjunction@preamble%
- {, \cyra\ \cyrt\cyra\cyrk\cyro\cyrzh~}%
+ {, \cyra\ \cyrt\cyra\cyrk\cyro\cyrzh\nobreakspace}%
\Crefname@preamble{equation}%
{\CYRF\cyro\cyrr\cyrm\cyru\cyrl\cyra}%
{\CYRF\cyro\cyrr\cyrm\cyru\cyrl\cyri}%
+ \Crefname@preamble{part}%
+ {\CYRCH\cyra\cyrs\cyrt\cyri\cyrn\cyra}%
+ {\CYRCH\cyra\cyrs\cyrt\cyri\cyrn\cyri}%
\Crefname@preamble{chapter}%
{\CYRG\cyrl\cyra\cyrv\cyra}%
{\CYRG\cyrl\cyra\cyrv\cyri}%
@@ -7999,6 +8113,9 @@
{\CYRS\cyrt\cyrr\cyro\cyrk\cyri}%
\if@cref@capitalise%
\crefname@preamble{equation}{\CYRF-\cyrl.}{\CYRF-\cyrl.}%
+ \crefname@preamble{part}%
+ {\CYRCH\cyra\cyrs\cyrt\cyri\cyrn\cyra}%
+ {\CYRCH\cyra\cyrs\cyrt\cyri\cyrn\cyri}%
\crefname@preamble{chapter}%
{\CYRG\cyrl\cyra\cyrv\cyra}%
{\CYRG\cyrl\cyra\cyrv\cyri}%
@@ -8053,6 +8170,9 @@
{\CYRS\cyrt\cyrr\cyro\cyrk\cyri}%
\else%
\crefname@preamble{equation}{\cyrf-\cyrl.}{\cyrf-\cyrl.}%
+ \crefname@preamble{part}%
+ {\cyrch\cyra\cyrs\cyrt\cyri\cyrn\cyra}%
+ {\cyrch\cyra\cyrs\cyrt\cyri\cyrn\cyri}%
\crefname@preamble{chapter}%
{\cyrg\cyrl\cyra\cyrv.}%
{\cyrg\cyrl\cyra\cyrv.}%
@@ -8117,16 +8237,19 @@
\renewcommand{\crefrangeconjunction}{--}%
\renewcommand\crefrangepreconjunction{}%
\renewcommand\crefrangepostconjunction{}%
- \renewcommand{\crefpairconjunction}{ \cyrii~}%
+ \renewcommand{\crefpairconjunction}{ \cyrii\nobreakspace}%
\renewcommand{\crefmiddleconjunction}{, }%
- \renewcommand{\creflastconjunction}{ \cyrii~}%
- \renewcommand{\crefpairgroupconjunction}{ \cyrt\cyra~}%
+ \renewcommand{\creflastconjunction}{ \cyrii\nobreakspace}%
+ \renewcommand{\crefpairgroupconjunction}{ \cyrt\cyra\nobreakspace}%
\renewcommand{\crefmiddlegroupconjunction}{, }%
\renewcommand{\creflastgroupconjunction}%
- {, \cyra\ \cyrt\cyra\cyrk\cyro\cyrzh~}%
+ {, \cyra\ \cyrt\cyra\cyrk\cyro\cyrzh\nobreakspace}%
\Crefname{equation}%
{\CYRF\cyro\cyrr\cyrm\cyru\cyrl\cyra}%
{\CYRF\cyro\cyrr\cyrm\cyru\cyrl\cyri}%
+ \Crefname{part}%
+ {\CYRCH\cyra\cyrs\cyrt\cyri\cyrn\cyra}%
+ {\CYRCH\cyra\cyrs\cyrt\cyri\cyrn\cyri}%
\Crefname{chapter}%
{\CYRG\cyrl\cyra\cyrv\cyra}%
{\CYRG\cyrl\cyra\cyrv\cyri}%
@@ -8216,6 +8339,9 @@
{\CYRS\cyrt\cyrr\cyro\cyrk\cyri}%
\if@cref@capitalise%
\crefname{equation}{\CYRF-\cyrl.}{\CYRF-\cyrl.}%
+ \crefname{part}%
+ {\CYRCH\cyra\cyrs\cyrt\cyri\cyrn\cyra}%
+ {\CYRCH\cyra\cyrs\cyrt\cyri\cyrn\cyri}%
\crefname{chapter}%
{\CYRG\cyrl\cyra\cyrv\cyra}%
{\CYRG\cyrl\cyra\cyrv\cyri}%
@@ -8295,6 +8421,9 @@
{\CYRS\cyrt\cyrr\cyro\cyrk\cyri}%
\else%
\crefname{equation}{\cyrf-\cyrl.}{\cyrf-\cyrl.}%
+ \crefname{part}%
+ {\cyrch\cyra\cyrs\cyrt\cyri\cyrn\cyra}%
+ {\cyrch\cyra\cyrs\cyrt\cyri\cyrn\cyri}%
\crefname{chapter}%
{\cyrg\cyrl\cyra\cyrv.}%
{\cyrg\cyrl\cyra\cyrv.}%