cleveref (25sep12)

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

1 files changed, 2263 insertions, 2181 deletions

diff --git a/Master/texmf-dist/source/latex/cleveref/cleveref.dtx b/Master/texmf-dist/source/latex/cleveref/cleveref.dtx
index 7a54e2e2798..4fbe588731e 100644
--- a/Master/texmf-dist/source/latex/cleveref/cleveref.dtx
+++ b/Master/texmf-dist/source/latex/cleveref/cleveref.dtx
@@ -1,9 +1,9 @@
-\def\packagedate{2012/03/07}
-\def\packageversion{0.18.5}
+\def\packagedate{2012/09/25}
+\def\packageversion{0.18.6}
 % \iffalse meta-comment
 %
 % Package 'cleveref' to use with LaTeX2e
-% Copyright 2007--2011 by Toby Cubitt
+% Copyright 2006--2012 Toby Cubitt
 %
 % Written and maintained by Toby Cubitt
 %
@@ -23,7 +23,7 @@
 % \iffalse
 %<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
 %<package>\ProvidesPackage{cleveref}
-%<package> [\packagedate{} v\packageversion{} Intelligent cross-referencing]
+%<package> [\packagedate\space v\packageversion\space Intelligent cross-referencing]
 %
 %<*driver>
 \documentclass{ltxdoc}
@@ -40,23 +40,13 @@
 \newcommand{\package}{\texttt}
 \newcommand{\file}{\texttt}
 \newcommand{\option}{\texttt}
-\makeatletter
-%% Commands for referring to code lines
-\def\codelabel#1{\@bsphack
- \protected@write\@auxout{}{\string\newlabel{#1}{{\number\the
-           \c@CodelineNo}{\thepage}}}\@esphack}
-\newcounter{tmpcount}
-\def\coderef#1#2{\setcounter{tmpcount}{0}\@ifundefined{r@#1}\relax
-          {\setcounter{tmpcount}{\ref{#1}}}\relax
-          \addtocounter{tmpcount}{#2}\arabic{tmpcount}}
-\makeatother
 \begin{document}
   \DocInput{cleveref.dtx}
 \end{document}
 %</driver>
 % \fi
 %
-% \CheckSum{18436}
+% \CheckSum{18491}
 %% \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
@@ -271,6 +261,13 @@
 %   than global \textbackslash{}cref@currentlabel definitions. Fixed
 %   compatibility with \package{memoir}'s internal \package{subfig}
 %   re-implementation.}
+% \changes{v0.18.6}{2012/07/18}{Sorted out \package{algorithm} and
+%   \package{algorithmicx} package support. Note: \package{algorithmic}
+%   package is \emph{not} supported. Fixed compatibility with
+%   \package{bigfoot} package. Added support for \package{polyglossia}
+%   package. Mentioned \package{autonum} as a possible replacement for
+%   (incompatible) \option{showonlyrefs} option to \package{mathtools}
+%   package.}
 %
 % \GetFileInfo{cleveref.sty}
 %
@@ -338,16 +335,19 @@
 % happens if you later decide you want equation references to be typeset
 % as |Equation~\ref{eq1}| instead (i.e.\ without the abbreviation and
 % without the parentheses)? What happens if you decide to change the
-% theorem labelled |thm1| into a lemma? What if you move |thm3| so that
-% it appears (and is numbered) before |thm1|, meaning that references to
-% the sequence of theorems 1 through 3 should now be ordered
-% |Theorems~\ref{thm3} to~\ref{thm1}| (i.e.\ the other way around)? What
-% if you decide you prefer references to multiple theorems to be written
-% as |Theorems~\ref{thm1}--\ref{thm3}|? Any such change requires you to
-% search through the entire \LaTeX{} source of your document, modifying
-% all references to equations, updating all references to |thm1|,
-% re-ordering all references to |thm1| and |thm3|, and changing all the
-% formatting of references to multiple theorems.
+% theorem labelled |thm1| into a lemma?\footnote{Note that to allow
+% \package{cleveref} to automatically infer the type of theorem, you need
+% to load either the \package{ntheorem} or the \package{amsthm} package.
+% See \cref{sec:non-bugs} for more details.} What if you move |thm3| so
+% that it appears (and is numbered) before |thm1|, meaning that
+% references to the sequence of theorems 1 through 3 should now be
+% ordered |Theorems~\ref{thm3} to~\ref{thm1}| (i.e.\ the other way
+% around)? What if you decide you prefer references to multiple theorems
+% to be written as |Theorems~\ref{thm1}--\ref{thm3}|? Any such change
+% requires you to search through the entire \LaTeX{} source of your
+% document, modifying all references to equations, updating all
+% references to |thm1|, re-ordering all references to |thm1| and |thm3|,
+% and changing all the formatting of references to multiple theorems.
 %
 % The \package{cleveref} package allows you to define the format for the
 % different types of cross-references once-and-for-all in the preamble of
@@ -778,7 +778,7 @@
 % \cref{sec:language_babel}). But if you don't like the defaults, or are
 % writing in a language that is not supported yet,\footnote{Any
 % contributions of translations for missing languages are very welcome!
-% See \cref{sec:code:babel} for information on how to contribute
+% See \cref{sec:new-features} for information on how to contribute
 % translations.} or you need to refer to something for which no default
 % format is defined, then you can take charge and define your own
 % formats.
@@ -1065,6 +1065,11 @@
 % |\Crefname| definition yourself, to define the plural form as well as
 % the singular form.
 %
+% Note that this has \emph{nothing whatsoever} to do with automatically
+% determining the type of theorem-like environment in a cross-reference!
+% For that, you need to load either the \package{ntheorem} or the
+% \package{amsthm} package. See \cref{sec:non-bugs} for more details.
+%
 %
 %
 % \subsection{Low-Level Customisation: Taking Full Control}
@@ -1116,13 +1121,13 @@
 % \end{quote}
 % The \meta{type} is usually the name of the counter, except for labels
 % whose type has been overridden explicitly (see \cref{sec:label_type}),
-% theorem-like environments when \package{ntheorem} or \package{amsthm}
-% are loaded, in which case it is the environment name, and appendices.
-% For the latter, the \meta{type} is ``appendix'' for the top-level
-% sectioning command (|\chapter| or |\section|, depending on the document
-% class), ``subappendix'' for the sectioning command one level below
-% (|\section| or |subsection|), ``subsubappendix'' for the next level of
-% sectioning command, etc.
+% theorem-like environments \emph{when the \package{ntheorem} or
+% \package{amsthm} package is loaded}, in which case it is the
+% environment name, and appendices. For the latter, the \meta{type} is
+% ``appendix'' for the top-level sectioning command (|\chapter| or
+% |\section|, depending on the document class), ``subappendix'' for the
+% sectioning command one level below (|\section| or |subsection|),
+% ``subsubappendix'' for the next level of sectioning command, etc.
 %
 % As in the case of the |\crefname| and |\Crefname| commands, if the
 % corresponding |\Crefformat| is undefined when |\crefformat| is called,
@@ -1282,18 +1287,19 @@
 % \package{cleveref} supports different languages via package options, in
 % the usual way, though not all languages are supported
 % yet.\footnote{Contributions of translations for missing languages are
-% very welcome! See \cref{sec:code:babel} for information on how to
+% very welcome! See \cref{sec:new-features} for information on how to
 % contribute translations.} The \package{babel} package is also supported
 % when it is loaded, allowing you to change the language used in
 % cross-references using the \package{babel} language switching commands,
-% such as |\selectlanguage| and |\foreignlanguage|.
+% such as |\selectlanguage| and |\foreignlanguage|. Similar support is
+% provided for the \package{polyglossia} babel replacement package.
 %
-% Note that, even when using \package{babel}, you still need to tell
+% Note that when using \package{babel}, you still need to tell
 % \package{cleveref} which language it should use for the default
 % cross-reference formats. It is \emph{not} sufficient to pass the
 % language option to \package{babel} alone. You \emph{must} also
-% \emph{either} pass the desired language option to the
-% \package{cleveref} package directly when loading it:
+% \emph{either} pass the language options to \package{cleveref} package
+% directly when loading it:
 % \begin{quote}
 %   |\usepackage|\oarg{language}|{cleveref}|
 % \end{quote}
@@ -1316,50 +1322,64 @@
 % to the \emph{last} language option. (See the \package{babel}
 % documentation for more details.) \package{Cleveref} does the same: the
 % last language in the option list determines the language for the
-% initial cross-reference format definitions; all other language options
-% are ignored by \package{cleveref}.
-%
-% The \package{babel} support works by redefining the cross-reference
-% 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|
-% \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.)
+% initial cross-reference format definitions; additional language options
+% load \package{cleveref} support for switching between those languages.
+%
+% \package{Polyglossia} uses a different mechanism for selecting and
+% loading languages, and ignores package language options entirely. The
+% default language must be set using \cmd{\setdefaultlanguage}, and
+% additional languages are loaded using \cmd{\setotherlanguage}.
+% \package{Cleveref} recognises these commands, so you should \emph{not}
+% pass language options to \package{cleveref} when using
+% \package{polyglossia}. (Passing language options to \package{cleveref},
+% either as package options of global options, will override the default
+% language set by \package{polyglossia}'s \cmd{\setdefaultlanguage}.)
+%
+% The \package{babel} and \package{polyglossia} support works by
+% redefining the cross-reference 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| \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} or \package{polyglossia}'s language switching
+% mechanism. (See section ``Language and \package{babel} Support'' in the
+% full implementation documentation, and the \package{babel} or
+% \package{polyglossia} 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
 % not know how to redefine them for other languages, and again you will
 % have to take care of it yourself, either by explicitly redefining them
 % in your document after each language switch, or by hooking the
-% redefinitions into \package{babel}'s language switching mechanism.
+% redefinitions into \package{babel} or \package{polyglossia}'s language
+% switching mechanisms.
 %
 % On the other hand, since the language switching commands only modify
 % the cross-reference components, if you use the low-level customisation
 % commands to take full control of the format for a particular
 % cross-reference type, then (unless you're careful) you take it out of
-% the control of \package{babel} entirely. If you want to use the
-% low-level customisation commands, but \emph{do} still want the language
-% switching commands to work, then you have to use the component macros
-% in your customised formats. The cross-reference names are stored in
-% macros called |\cref@|\meta{type}|@name|, |\Cref@|\meta{type}|@name|,
+% the control of \package{babel} or \package{polyglossia} entirely. If
+% you want to use the low-level customisation commands, but \emph{do}
+% still want the language switching commands to work, then you have to
+% use the component macros in your customised formats. The
+% cross-reference names are stored in macros called
+% |\cref@|\meta{type}|@name|, |\Cref@|\meta{type}|@name|,
 % |\cref@|\meta{type}|@name@plural|, and
 % |\Cref@|\meta{type}|@name@plural|.\linebreak[4] (Note that since these
 % macro names contain the ``@'' character, you must use |\makeatletter|
 % and |\makeatother| to access them.)
 %
 % For example, if you wanted to redefine the equation format so that the
-% cross-reference name (``equation'') was also part of the hyperlink,
-% but you still want to be able to switch language using \package{babel},
-% you would need something like:
+% cross-reference name (``equation'') was also part of the hyperlink, but
+% you still want to be able to switch language using \package{babel} or
+% \package{polyglossia}, you would need something like:
 % \begin{quote}
 %   |\makeatletter|\\
 %   |\crefformat{equation}{#2\cref@equation@name~(#1)#3}|\\
@@ -1533,8 +1553,9 @@
 % \label{sec:other_packages}
 % The \package{cleveref} package \emph{must} be loaded \emph{after} all
 % other packages that don't specifically support it,\footnote{At the time
-% of writing, the only package I'm aware of that should be loaded after
-% \package{cleveref} is the \package{hypdvips} package.} i.e.\ the
+% of writing, the only packages I'm aware of that should be loaded after
+% \package{cleveref} are the \package{hypdvips} and \package{autonum}
+% packages.} i.e.\ the
 % \begin{quote}
 %   |\usepackage{cleveref}|
 % \end{quote}
@@ -1551,8 +1572,9 @@
 % its clever cross-referencing features with the features provided by
 % these packages: \package{babel}, \package{hyperref},
 % \package{varioref}, \package{ntheorem}, \package{amsthm},
-% \package{aliascnt}, \package{subfig}, \package{algorithm},
-% \package{algorithm2e}, \package{listings}.
+% \package{aliascnt}, \package{subfig},
+% \package{algorithmicx}\footnote{The \package{algorithmic} package is
+% \emph{not} supported.}, \package{algorithm2e}, \package{listings}.
 %
 % \package{cleveref} implements a significantly enhanced version of the
 % features found in the \package{fancyref} package, \package{ntheorem}'s
@@ -1603,14 +1625,21 @@
 % the starred variants. Go bug the \package{varioref} maintainer about
 % this if you don't like it.)
 %
+% \package{Cleveref} is currently incompatibly with the
+% \package{mathtools} package's \option{showonlyrefs} option, which
+% automatically labels only those equations that are cross-referenced.
+% The \package{autonum} package provides a possible alternative, which
+% implements similar features in a \package{cleveref}-compatible manner.
+%
 %
 %
 % \section{Known Bugs, Non-Bugs, and Possible Future Enhancements}
 % \label{sec:known_bugs}
 %
-% \subsection{Non-Bugs}
+% \subsection{Non-Bugs}\label{sec:non-bugs}
 % The following are \emph{not} bugs. They are either intentional
-% behaviour, or are caused by \LaTeX{} misunderstandings:
+% behaviour, unavoidable behaviour, or are caused by \LaTeX{}
+% misunderstandings:
 % \begin{itemize}
 % \item If you are using both \package{varioref} and \package{hyperref},
 %   \emph{make sure you are loading them in the correct order}, otherwise
@@ -1618,6 +1647,12 @@
 %   \emph{without any warning in the \LaTeX{} output or log!} The
 %   packages \emph{must} be loaded in the following order:
 %   \package{varioref}, \package{hyperref}, \package{cleveref}.
+% \item \package{cleveref} on its own won't automatically infer the type
+%   of theorem-like environment you're referring to in a cross-reference.
+%   Cross-references to all theorem-like environments will use the same
+%   name, ``theorem''. To allow the theorem type to be determined
+%   automatically, you need to load either the \package{ntheorem} or the
+%   \package{amsthm} package.
 % \item If you are using \package{babel}, you \emph{must still} pass the
 %   appropriate language option to \package{cleveref}, as well as to
 %   \package{babel}. Passing it to \package{babel} alone is \emph{not}
@@ -1700,11 +1735,9 @@
 % \item \package{cleveref} is incompatible with the \option{showonlyrefs}
 %   option of the \package{mathtools} package, though it should be
 %   compatible with the rest of \package{mathtools}. (To be fixed in a
-%   future version.)
-% \item \package{cleveref} doesn't include support for all languages yet.
-%   Please contribute translations for missing languages!\footnote{See
-%   \cref{sec:code:babel} for information on how to contribute
-%   translations.}
+%   future version.) The \package{autonum} package, which provides
+%   similar functionality and \emph{is} designed to be
+%   \package{cleveref}-compatible, is a possible alternative.
 % \item \package{cleveref} assumes that counters are only ever reset by
 %   the standard sectioning commands (|\chapter|, |\section|, etc.). If
 %   this is not the case, the automatic compression of consecutive
@@ -1715,6 +1748,7 @@
 %
 %
 % \subsection{Possible New Features and Improvements}
+% \label{sec:new-features}
 % In no particular order:
 % \begin{itemize}
 % \item The \option{poorman} option could be enhanced to allow a choice
@@ -1726,6 +1760,15 @@
 %   pattern matching task -- just take a look at the code for escaping
 %   regexp special characters in this package!} than I'm prepared to
 %   invest.
+% \item \package{cleveref} doesn't include support for all languages yet.
+%   Any contributions of translations for missing languages are most
+%   welcome! If you can contribute definitions for a missing language,
+%   ideally you should add them below the existing ones in the
+%   implementation (using those as a model), generate a patch against the
+%   original \package{cleveref.dtx} file, and send the patch by email to
+%   the package author. However, if you don't know how to produce a
+%   patch, you can instead just send the translations as a plain text
+%   file.
 % \end{itemize}
 %
 %
@@ -1739,17 +1782,17 @@
 % translations. Thanks also to Susanna Goldschmidt for additional help
 % with the translations. Many people have suggested improvements or
 % reported bugs, indeed many have put significant effort into helping
-% investigate and fix them. So thanks (in alphabetical order) to: Alan
-% Munn, Aleksander Gorohovski, Anand Deopurkar, Andreas Haselbacher, Arne
-% Meier, Bas Ploeger, Dan Luecking, David Gleich, Denis Bitouz\'e,
-% Domenic Denicola, Donald Ars\-en\-eau, Hendrik Maryns, Iain Cunningham,
-% James Sharam, Jens Mueller, Joel C. Salomon, 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, Olivier Roy, Patrick H\"acker, Paul Gomme, Ricardo de
-% Aldama S\'anchez, Robert Fischer, Stefan Pinnow, Steve Dower, Ted
-% Pavlic, Thomas Arildsen, and Uwe L\"uck for their help. (If I missed
-% you out, please let me know!)
+% investigate and fix them. So thanks (in alphabetical order) to: Adrian
+% Knoth, Akim Demaille, Alan Munn, Aleksander Gorohovski, Anand
+% Deopurkar, Andreas Haselbacher, Arne Meier, Bas Ploeger, Dan Luecking,
+% David Gleich, Denis Bitouz\'e, Domenic Denicola, Donald Ars\-en\-eau,
+% Hendrik Maryns, Iain Cunningham, 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, Olivier Roy,
+% Patrick H\"acker, Paul Gomme, Ricardo de Aldama S\'anchez, Robert
+% Fischer, Stefan Pinnow, Steve Dower, Ted Pavlic, Thomas Arildsen, and
+% Uwe L\"uck for their help. (If I missed you out, please let me know!)
 %
 %
 % \StopEventually{\clearpage\PrintChanges\clearpage\PrintIndex}
@@ -1897,12 +1940,12 @@
 %   both \cmd{\@footnotetext} and \cmd{\@mpfootnotentext}.
 %    \begin{macrocode}
 \let\cref@old@makefntext\@makefntext
-\long\def\@makefntext#1{%
+\long\def\@makefntext{%
   \cref@constructprefix{footnote}{\cref@result}%
   \protected@edef\cref@currentlabel{%
     [footnote][\arabic{footnote}][\cref@result]%
     \p@footnote\@thefnmark}%
-  \cref@old@makefntext{#1}}
+  \cref@old@makefntext}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -2029,7 +2072,6 @@
 %
 %
 % \begin{macro}{\appendix}
-% \begin{macro}{\cref@old@appendix}
 %   The \cmd{\appendix} command causes the top-level sectioning commands
 %   (\cmd{\chapter} or \cmd{\section}, depending on the document class)
 %   to produce appendices instead. Since we want to be able to format
@@ -2042,13 +2084,11 @@
 %   ``chapter'' fulfils that role.
 %    \begin{macrocode}
 \@ifundefined{appendix}{}{%
-  \let\cref@old@appendix\appendix
-  \renewcommand\appendix{%
-    \cref@old@appendix%
+  \g@addto@macro\appendix{%
     \@ifundefined{chapter}{%
-      \gdef\refstepcounter@noarg##1{%
-        \cref@old@refstepcounter{##1}%
-        \cref@constructprefix{##1}{\cref@result}%
+      \gdef\refstepcounter@noarg#1{%
+        \cref@old@refstepcounter{#1}%
+        \cref@constructprefix{#1}{\cref@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
@@ -2062,40 +2102,40 @@
 %    \end{macrocode}
 %       Override the cross-reference type of sectioning commands.
 %    \begin{macrocode}
-        \def\@tempa{##1}%
+        \def\@tempa{#1}%
         \def\@tempb{section}%
         \ifx\@tempa\@tempb%
           \protected@edef\cref@currentlabel{%
-            [appendix][\arabic{##1}][\cref@result]%
-            \csname p@##1\endcsname\csname the##1\endcsname}%
+            [appendix][\arabic{#1}][\cref@result]%
+            \csname p@#1\endcsname\csname the#1\endcsname}%
         \else%
-          \def\@tempa{##1}%
+          \def\@tempa{#1}%
           \def\@tempb{subsection}%
           \ifx\@tempa\@tempb%
             \protected@edef\cref@currentlabel{%
-              [subappendix][\arabic{##1}][\cref@result]%
-              \csname p@##1\endcsname\csname the##1\endcsname}%
+              [subappendix][\arabic{#1}][\cref@result]%
+              \csname p@#1\endcsname\csname the#1\endcsname}%
           \else%
-            \def\@tempa{##1}%
+            \def\@tempa{#1}%
             \def\@tempb{subsubsection}%
             \ifx\@tempa\@tempb%
               \protected@edef\cref@currentlabel{%
-                [subsubappendix][\arabic{##1}][\cref@result]%
-                \csname p@##1\endcsname\csname the##1\endcsname}%
+                [subsubappendix][\arabic{#1}][\cref@result]%
+                \csname p@#1\endcsname\csname the#1\endcsname}%
             \else%
-              \@ifundefined{cref@##1@alias}%
-                {\def\@tempa{##1}}%
-                {\def\@tempa{\csname cref@##1@alias\endcsname}}%
+              \@ifundefined{cref@#1@alias}%
+                {\def\@tempa{#1}}%
+                {\def\@tempa{\csname cref@#1@alias\endcsname}}%
               \protected@edef\cref@currentlabel{%
-                [\@tempa][\arabic{##1}][\cref@result]%
-                \csname p@##1\endcsname\csname the##1\endcsname}
+                [\@tempa][\arabic{#1}][\cref@result]%
+                \csname p@#1\endcsname\csname the#1\endcsname}
             \fi%
           \fi%
         \fi}%
     }{%
-      \def\refstepcounter@noarg##1{%
-        \cref@old@refstepcounter{##1}%
-        \cref@constructprefix{##1}{\cref@result}%
+      \def\refstepcounter@noarg#1{%
+        \cref@old@refstepcounter{#1}%
+        \cref@constructprefix{#1}{\cref@result}%
 %    \end{macrocode}
 %     Again, the large value added to the front of the counter data forces
 %     references to appendix items to be sorted last.
@@ -2108,40 +2148,40 @@
 %    \end{macrocode}
 %       Override the cross-reference type of sectioning commands.
 %    \begin{macrocode}
-        \def\@tempa{##1}%
+        \def\@tempa{#1}%
         \def\@tempb{chapter}%
         \ifx\@tempa\@tempb%
           \protected@edef\cref@currentlabel{%
-            [appendix][\arabic{##1}][\cref@result]%
-            \csname p@##1\endcsname\csname the##1\endcsname}%
+            [appendix][\arabic{#1}][\cref@result]%
+            \csname p@#1\endcsname\csname the#1\endcsname}%
         \else%
-          \def\@tempa{##1}%
+          \def\@tempa{#1}%
           \def\@tempb{section}%
           \ifx\@tempa\@tempb%
             \protected@edef\cref@currentlabel{%
-              [subappendix][\arabic{##1}][\cref@result]%
-              \csname p@##1\endcsname\csname the##1\endcsname}%
+              [subappendix][\arabic{#1}][\cref@result]%
+              \csname p@#1\endcsname\csname the#1\endcsname}%
           \else%
-            \def\@tempa{##1}%
+            \def\@tempa{#1}%
             \def\@tempb{subsection}%
             \ifx\@tempa\@tempb%
               \protected@edef\cref@currentlabel{%
-                [subsubappendix][\arabic{##1}][\cref@result]%
-                \csname p@##1\endcsname\csname the##1\endcsname}%
+                [subsubappendix][\arabic{#1}][\cref@result]%
+                \csname p@#1\endcsname\csname the#1\endcsname}%
             \else%
-              \def\@tempa{##1}%
+              \def\@tempa{#1}%
               \def\@tempb{subsubsection}%
               \ifx\@tempa\@tempb%
                 \protected@edef\cref@currentlabel{%
-                  [subsubsubappendix][\arabic{##1}][\cref@result]%
-                  \csname p@##1\endcsname\csname the##1\endcsname}%
+                  [subsubsubappendix][\arabic{#1}][\cref@result]%
+                  \csname p@#1\endcsname\csname the#1\endcsname}%
               \else%
-                \@ifundefined{cref@##1@alias}%
-                  {\def\@tempa{##1}}%
-                  {\def\@tempa{\csname cref@##1@alias\endcsname}}%
+                \@ifundefined{cref@#1@alias}%
+                  {\def\@tempa{#1}}%
+                  {\def\@tempa{\csname cref@#1@alias\endcsname}}%
                 \protected@edef\cref@currentlabel{%
-                  [\@tempa][\arabic{##1}][\cref@result]%
-                  \csname p@##1\endcsname\csname the##1\endcsname}
+                  [\@tempa][\arabic{#1}][\cref@result]%
+                  \csname p@#1\endcsname\csname the#1\endcsname}
               \fi%
             \fi%
           \fi%
@@ -2151,7 +2191,6 @@
 }% end of \@ifundefined{appendix}
 %    \end{macrocode}
 % \end{macro}
-% \end{macro}
 %
 %
 %
@@ -5073,12 +5112,11 @@
 %   that needs to be redefined.
 %    \begin{macrocode}
     \@ifundefined{appendix}{}{%
-      \renewcommand\appendix{%
-        \cref@old@appendix%
+      \g@addto@macro\appendix{%
         \@ifundefined{chapter}{%
-          \def\H@refstepcounter##1{%
-            \cref@old@H@refstepcounter{##1}%
-            \cref@constructprefix{##1}{\cref@result}%
+          \def\H@refstepcounter#1{%
+            \cref@old@H@refstepcounter{#1}%
+            \cref@constructprefix{#1}{\cref@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
@@ -5092,40 +5130,40 @@
 %    \end{macrocode}
 %         Override the cross-reference type of sectioning commands.
 %    \begin{macrocode}
-            \def\@tempa{##1}%
+            \def\@tempa{#1}%
             \def\@tempb{section}%
             \ifx\@tempa\@tempb%
               \protected@edef\cref@currentlabel{%
-                [appendix][\arabic{##1}][\cref@result]%
-                \csname p@##1\endcsname\csname the##1\endcsname}%
+                [appendix][\arabic{#1}][\cref@result]%
+                \csname p@#1\endcsname\csname the#1\endcsname}%
             \else%
-              \def\@tempa{##1}%
+              \def\@tempa{#1}%
               \def\@tempb{subsection}%
               \ifx\@tempa\@tempb%
                 \protected@edef\cref@currentlabel{%
-                  [subappendix][\arabic{##1}][\cref@result]%
-                  \csname p@##1\endcsname\csname the##1\endcsname}%
+                  [subappendix][\arabic{#1}][\cref@result]%
+                  \csname p@#1\endcsname\csname the#1\endcsname}%
               \else%
-                \def\@tempa{##1}%
+                \def\@tempa{#1}%
                 \def\@tempb{subsubsection}%
                 \ifx\@tempa\@tempb%
                   \protected@edef\cref@currentlabel{%
-                    [subsubappendix][\arabic{##1}][\cref@result]%
-                    \csname p@##1\endcsname\csname the##1\endcsname}%
+                    [subsubappendix][\arabic{#1}][\cref@result]%
+                    \csname p@#1\endcsname\csname the#1\endcsname}%
                 \else%
-                  \@ifundefined{cref@##1@alias}%
-                    {\def\@tempa{##1}}%
-                    {\def\@tempa{\csname cref@##1@alias\endcsname}}%
+                  \@ifundefined{cref@#1@alias}%
+                    {\def\@tempa{#1}}%
+                    {\def\@tempa{\csname cref@#1@alias\endcsname}}%
                   \protected@edef\cref@currentlabel{%
-                    [\@tempa][\arabic{##1}][\cref@result]%
-                    \csname p@##1\endcsname\csname the##1\endcsname}
+                    [\@tempa][\arabic{#1}][\cref@result]%
+                    \csname p@#1\endcsname\csname the#1\endcsname}
                 \fi%
               \fi%
             \fi}%
         }{%
-          \def\H@refstepcounter##1{%
-            \cref@old@H@refstepcounter{##1}%
-            \cref@constructprefix{##1}{\cref@result}%
+          \def\H@refstepcounter#1{%
+            \cref@old@H@refstepcounter{#1}%
+            \cref@constructprefix{#1}{\cref@result}%
 %    \end{macrocode}
 %         Again, the large value added to the front of the counter data
 %         forces references to appendix items to be sorted last.
@@ -5138,40 +5176,40 @@
 %    \end{macrocode}
 %         Override the cross-reference type of sectioning commands.
 %    \begin{macrocode}
-            \def\@tempa{##1}%
+            \def\@tempa{#1}%
             \def\@tempb{chapter}%
             \ifx\@tempa\@tempb%
               \protected@edef\cref@currentlabel{%
-                [appendix][\arabic{##1}][\cref@result]%
-                \csname p@##1\endcsname\csname the##1\endcsname}%
+                [appendix][\arabic{#1}][\cref@result]%
+                \csname p@#1\endcsname\csname the#1\endcsname}%
             \else%
-              \def\@tempa{##1}%
+              \def\@tempa{#1}%
               \def\@tempb{section}%
               \ifx\@tempa\@tempb%
                 \protected@edef\cref@currentlabel{%
-                  [subappendix][\arabic{##1}][\cref@result]%
-                  \csname p@##1\endcsname\csname the##1\endcsname}%
+                  [subappendix][\arabic{#1}][\cref@result]%
+                  \csname p@#1\endcsname\csname the#1\endcsname}%
               \else%
-                \def\@tempa{##1}%
+                \def\@tempa{#1}%
                 \def\@tempb{subsection}%
                 \ifx\@tempa\@tempb%
                   \protected@edef\cref@currentlabel{%
-                    [subsubappendix][\arabic{##1}][\cref@result]%
-                    \csname p@##1\endcsname\csname the##1\endcsname}%
+                    [subsubappendix][\arabic{#1}][\cref@result]%
+                    \csname p@#1\endcsname\csname the#1\endcsname}%
                 \else%
-                  \def\@tempa{##1}%
+                  \def\@tempa{#1}%
                   \def\@tempb{subsubsection}%
                   \ifx\@tempa\@tempb%
                     \protected@edef\cref@currentlabel{%
-                      [subsubsubappendix][\arabic{##1}][\cref@result]%
-                      \csname p@##1\endcsname\csname the##1\endcsname}%
+                      [subsubsubappendix][\arabic{#1}][\cref@result]%
+                      \csname p@#1\endcsname\csname the#1\endcsname}%
                   \else%
-                    \@ifundefined{cref@##1@alias}%
-                      {\def\@tempa{##1}}%
-                      {\def\@tempa{\csname cref@##1@alias\endcsname}}%
+                    \@ifundefined{cref@#1@alias}%
+                      {\def\@tempa{#1}}%
+                      {\def\@tempa{\csname cref@#1@alias\endcsname}}%
                     \protected@edef\cref@currentlabel{%
-                      [\@tempa][\arabic{##1}][\cref@result]%
-                      \csname p@##1\endcsname\csname the##1\endcsname}
+                      [\@tempa][\arabic{#1}][\cref@result]%
+                      \csname p@#1\endcsname\csname the#1\endcsname}
                   \fi%
                 \fi%
               \fi%
@@ -6564,19 +6602,19 @@
 %
 %
 %
-% \subsubsection{\package{algorithm} support}
-% \begin{macro}{algorithm}
-%   If \package{algorithm} is loaded, we modify its line numbering
+% \subsubsection{\package{algorithmicx} support}
+% \begin{macro}{algorithmicx}
+%   If \package{algorithmicx} is loaded, we modify its line numbering
 %   mechanism so that labels referring to line numbers in algorithms work
 %   with \package{cleveref}.
 % \end{macro}
 %    \begin{macrocode}
-  \@ifpackageloaded{algorithm}{%
-  \PackageInfo{cleveref}{`algorithm' support loaded}
+  \@ifpackageloaded{algorithmicx}{%
+  \PackageInfo{cleveref}{`algorithmicx' support loaded}
 %    \end{macrocode}
 %
 % \begin{macro}{\ALG@step}
-%   We modify \package{algorithm}'s \cmd{\ALG@step} macro, which
+%   We modify \package{algorithmicx}'s \cmd{\ALG@step} macro, which
 %   increments the line number, so that it stores the necessary
 %   information in \cmd{\cref@currentlabel}. \cmd{\ALG@step} already
 %   increments the line number counter \cmd{\ALG@line} using
@@ -6585,9 +6623,7 @@
 %   first decrement the counter and then re-increment it using
 %   \cmd{\refstepcounter}.
 %    \begin{macrocode}
-  \let\cref@old@ALG@step\ALG@step
-  \def\ALG@step{%
-    \cref@old@ALG@step%
+  \g@addto@macro\ALG@step{%
     \addtocounter{ALG@line}{-1}%
     \refstepcounter{ALG@line}%
     \expandafter\@cref@getprefix\cref@currentlabel\@nil\cref@currentprefix%
@@ -6599,16 +6635,17 @@
 %   However, this is not yet sufficient. The \cmd{\refstepcounter} above
 %   is called within a group, so the resulting \cmd{\cref@currentlabel}
 %   definition will not persist beyond the end of the group. To transfer
-%   the information to the ``outside'', we follow \package{algorithm}'s
+%   the information to the ``outside'', we follow \package{algorithmicx}'
 %   own method for getting the label information into
 %   \cmd{\@currentlabel}: we define \cmd{\cref@currentlabel} within
 %   |algorithm| environments to refer specifically to macros that store
-%   the line number information.
+%   the line number information. The package conveniently supplies a
+%   \cmd{\ALG@beginalgorithmic} hook, so we make use of it here.
 %    \begin{macrocode}
   \g@addto@macro\ALG@beginalgorithmic{%
     \def\cref@currentlabel{%
       [line][\arabic{ALG@line}][\cref@currentprefix]\theALG@line}}
-  }{}%  end of \@ifpackageloaded{algorithm}
+  }{}%  end of \@ifpackageloaded{algorithmicx}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -6710,8 +6747,8 @@
   \AtBeginDocument{
     \let\cref@old@refsteponlycounter\refsteponlycounter
     \def\refsteponlycounter{%
-      \@ifnextchar[{\refstepcounter@optarg}%
-        {\cref@old@refsteponlycounter}%]
+      \@ifnextchar[\refstepcounter@optarg%
+        \cref@old@refsteponlycounter%]
     }}
 %    \end{macrocode}
 % \end{macro}
@@ -7161,12 +7198,12 @@
 % juggling of catcodes and lccodes!
 %
 % Both \cmd{\DeclareOption} and \cmd{\AtEndDocument} store their
-% arguments in token lists, so all the following \TeX code is already
+% arguments in token lists, so all the following \TeX{} code is already
 % tokenised long before it is expanded and evaluated. Thus there is no
 % (easy) way to change the catcodes of the characters appearing here
 % before they are tokenised. In one way this is convenient: the catcode
 % changes we make don't ``take'' until evaluated, so we can continue to
-% use the standard \TeX characters (\textbackslash, \{, \} etc.) even
+% use the standard \TeX{} characters (\textbackslash, \{, \} etc.) even
 % after the lines containing the catcode commands. But in another, more
 % significant, way, it is very inconvenient: it makes it difficult to
 % define the regexp special characters as active characters, since it's
@@ -7239,7 +7276,7 @@
 %    \begin{macrocode}
     \begingroup%
       \lccode`|=92 \lccode`<=123 \lccode`>=125 \lccode`C=67
-      \lowercase{\def\@tempa{%[
+      \lowercase{\def\@tempa{%[|
           s/||label|[[^]]*|]/||label/g}}
       \expandafter\g@addto@macro\expandafter%
         \cref@poorman@text\expandafter{\@tempa^^J}%
@@ -7347,7 +7384,7 @@
 %   |\cref@poorman@text|. At the very lowest layer of the macro stack, we
 %   redefine the macros that actually typeset the various parts of the
 %   references to additionally add a copy of whatever they typeset to
-%   |\cref@poorman@test|.
+%   |\cref@poorman@text|.
 %
 %   We first redefine the user-level referencing commands so that they
 %   write a substitution rule for the reference to the script, as well as
@@ -8005,12 +8042,31 @@
     \toks@\expandafter{#1}%
     \edef#1{\the\toks@\the\@temptokena}%
   \fi%
-  \@temptokena{}\toks@\@temptokena%
-}
+  \@temptokena{}\toks@\@temptokena}
 \@onlypreamble\cref@addto
 %    \end{macrocode}
 % \end{macro}
 %
+% \begin{macro}{\cref@addlanguagedefs}
+%   Utility macro to add code to \cmd{\extras}\meta{language} or
+%   \cmd{\captions}\meta{language}, depending on whether \package{babel}
+%   or \package{polyglossia} are loaded.
+%    \begin{macrocode}
+\long\def\cref@addlanguagedefs#1#2{%
+  \@ifpackageloaded{polyglossia}%
+    {\AtBeginDocument{%
+        \ifcsdef{#1@loaded}{%
+          \expandafter\cref@addto\csname captions#1\endcsname{#2}}{}}}%
+    {\@ifpackageloaded{babel}{%
+      \edef\@curroptions{\@ptionlist{\@currname.\@currext}}%
+      \@expandtwoargs\in@{,#1,}{,\@classoptionslist,\@curroptions,}%
+      \ifin@%
+        \AtBeginDocument{%
+          \expandafter\cref@addto\csname extras#1\endcsname{#2}}%
+      \fi}{}}}
+%    \end{macrocode}
+% \end{macro}
+%
 %
 % Passing a language option to \package{cleveref} defines the
 % cross-reference names and conjunctions as appropriate for that
@@ -8022,7 +8078,7 @@
 % aren't already defined by the end of the preamble, the \emph{first}
 % language option would override all the others. Unfortunately, the
 % convention in \LaTeX{} and \package{babel} is for the \emph{last}
-% language option to take precedence. So we instead used the
+% language option to take precedence. So we instead use the
 % \cmd{\crefname@preamble} command to save the definitions in
 % |\cref@|\meta{type}|@name@preamble| etc., and after all the language
 % options have been processed, use the contents of these to set the
@@ -8051,17 +8107,15 @@
 % slightly cleaner.
 %
 %
-%  \subsubsection{English}
+% \subsubsection{English}
 % \begin{macro}{english}
 %   English definitions (these are used by default).
 % \end{macro}
+%
+% Set up the definitions used at the beginning of the document to define
+% the formats created by the document preamble.
 %    \begin{macrocode}
 \DeclareOption{english}{%
-  \PackageInfo{cleveref}{loaded `english' language definitions}
-%    \end{macrocode}
-% First, we set up the definitions used at the beginning of the document
-% to define the formats created by the document preamble.
-%    \begin{macrocode}
   \AtBeginDocument{%
     \def\crefrangeconjunction@preamble{ to\nobreakspace}%
     \def\crefrangepreconjunction@preamble{}%
@@ -8161,140 +8215,143 @@
       \crefname@preamble{line}{line}{lines}%
     \fi%
     \def\cref@language{english}%
+  }}% end \AtBeginDocument and \DeclareOption
 %    \end{macrocode}
 %
-% Next, we add the definitions to \cmd{\extras}\dots{} so that
-% \package{babel}'s \cmd{\selectlanguage} command will change the format
-% appropriately.
-%    \begin{macrocode}
-    \cref@addto\extrasenglish{%
-      \renewcommand{\crefrangeconjunction}{ to\nobreakspace}%
-      \renewcommand\crefrangepreconjunction{}%
-      \renewcommand\crefrangepostconjunction{}%
-      \renewcommand{\crefpairconjunction}{ and\nobreakspace}%
-      \renewcommand{\crefmiddleconjunction}{, }%
-      \renewcommand{\creflastconjunction}{ and\nobreakspace}%
-      \renewcommand{\crefpairgroupconjunction}{ and\nobreakspace}%
-      \renewcommand{\crefmiddlegroupconjunction}{, }%
-      \renewcommand{\creflastgroupconjunction}{, and\nobreakspace}%
+% If using \package{babel} and the corresponding option is set, or if
+% using \package{polyglossia} and the language has been loaded, add
+% format definition commands to \cmd{\extras}\meta{language} or
+% \cmd{\captions}\meta{language} so that language switching commands will
+% change the cross-reference formats appropriately.
+%    \begin{macrocode}
+\cref@addlanguagedefs{english}{%
+  \PackageInfo{cleveref}{loaded `english' language definitions}
+  \renewcommand{\crefrangeconjunction}{ to\nobreakspace}%
+  \renewcommand\crefrangepreconjunction{}%
+  \renewcommand\crefrangepostconjunction{}%
+  \renewcommand{\crefpairconjunction}{ and\nobreakspace}%
+  \renewcommand{\crefmiddleconjunction}{, }%
+  \renewcommand{\creflastconjunction}{ and\nobreakspace}%
+  \renewcommand{\crefpairgroupconjunction}{ and\nobreakspace}%
+  \renewcommand{\crefmiddlegroupconjunction}{, }%
+  \renewcommand{\creflastgroupconjunction}{, and\nobreakspace}%
  %
-      \Crefname{equation}{Equation}{Equations}%
-      \Crefname{figure}{Figure}{Figures}%
-      \Crefname{subfigure}{Figure}{Figures}%
-      \Crefname{table}{Table}{Tables}%
-      \Crefname{subtable}{Table}{Tables}%
-      \Crefname{page}{Page}{Pages}%
-      \Crefname{part}{Part}{Parts}%
-      \Crefname{chapter}{Chapter}{Chapters}%
-      \Crefname{section}{Section}{Sections}%
-      \Crefname{subsection}{Section}{Sections}%
-      \Crefname{subsubsection}{Section}{Sections}%
-      \Crefname{appendix}{Appendix}{Appendices}%
-      \Crefname{subappendix}{Appendix}{Appendices}%
-      \Crefname{subsubappendix}{Appendix}{Appendices}%
-      \Crefname{subsubsubappendix}{Appendix}{Appendices}%
-      \Crefname{enumi}{Item}{Items}%
-      \Crefname{enumii}{Item}{Items}%
-      \Crefname{enumiii}{Item}{Items}%
-      \Crefname{enumiv}{Item}{Items}%
-      \Crefname{enumv}{Item}{Items}%
-      \Crefname{footnote}{Footnote}{Footnotes}%
-      \Crefname{theorem}{Theorem}{Theorems}%
-      \Crefname{lemma}{Lemma}{Lemmas}%
-      \Crefname{corollary}{Corollary}{Corollaries}%
-      \Crefname{proposition}{Proposition}{Propositions}%
-      \Crefname{definition}{Definition}{Definitions}%
-      \Crefname{result}{Result}{Results}%
-      \Crefname{example}{Example}{Examples}%
-      \Crefname{remark}{Remark}{Remarks}%
-      \Crefname{note}{Note}{Notes}%
-      \Crefname{algorithm}{Algorithm}{Algorithms}%
-      \Crefname{listing}{Listing}{Listings}%
-      \Crefname{line}{Line}{Lines}%
+  \Crefname{equation}{Equation}{Equations}%
+  \Crefname{figure}{Figure}{Figures}%
+  \Crefname{subfigure}{Figure}{Figures}%
+  \Crefname{table}{Table}{Tables}%
+  \Crefname{subtable}{Table}{Tables}%
+  \Crefname{page}{Page}{Pages}%
+  \Crefname{part}{Part}{Parts}%
+  \Crefname{chapter}{Chapter}{Chapters}%
+  \Crefname{section}{Section}{Sections}%
+  \Crefname{subsection}{Section}{Sections}%
+  \Crefname{subsubsection}{Section}{Sections}%
+  \Crefname{appendix}{Appendix}{Appendices}%
+  \Crefname{subappendix}{Appendix}{Appendices}%
+  \Crefname{subsubappendix}{Appendix}{Appendices}%
+  \Crefname{subsubsubappendix}{Appendix}{Appendices}%
+  \Crefname{enumi}{Item}{Items}%
+  \Crefname{enumii}{Item}{Items}%
+  \Crefname{enumiii}{Item}{Items}%
+  \Crefname{enumiv}{Item}{Items}%
+  \Crefname{enumv}{Item}{Items}%
+  \Crefname{footnote}{Footnote}{Footnotes}%
+  \Crefname{theorem}{Theorem}{Theorems}%
+  \Crefname{lemma}{Lemma}{Lemmas}%
+  \Crefname{corollary}{Corollary}{Corollaries}%
+  \Crefname{proposition}{Proposition}{Propositions}%
+  \Crefname{definition}{Definition}{Definitions}%
+  \Crefname{result}{Result}{Results}%
+  \Crefname{example}{Example}{Examples}%
+  \Crefname{remark}{Remark}{Remarks}%
+  \Crefname{note}{Note}{Notes}%
+  \Crefname{algorithm}{Algorithm}{Algorithms}%
+  \Crefname{listing}{Listing}{Listings}%
+  \Crefname{line}{Line}{Lines}%
  %
-      \if@cref@capitalise%  capitalise set
-        \if@cref@abbrev%
-          \crefname{equation}{Eq.}{Eqs.}%
-          \crefname{figure}{Fig.}{Figs.}%
-          \crefname{subfigure}{Fig.}{Figs.}%
-        \else%
-          \crefname{equation}{Equation}{Equations}%
-          \crefname{figure}{Figure}{Figures}%
-          \crefname{subfigure}{Figure}{Figures}%
-        \fi%
-        \crefname{page}{Page}{Pages}%
-        \crefname{table}{Table}{Tables}%
-        \crefname{subtable}{Table}{Tables}%
-        \crefname{part}{Part}{Parts}%
-        \crefname{chapter}{Chapter}{Chapters}%
-        \crefname{section}{Section}{Sections}%
-        \crefname{subsection}{Section}{Sections}%
-        \crefname{subsubsection}{Section}{Sections}%
-        \crefname{appendix}{Appendix}{Appendices}%
-        \crefname{subappendix}{Appendix}{Appendices}%
-        \crefname{subsubappendix}{Appendix}{Appendices}%
-        \crefname{subsubsubappendix}{Appendix}{Appendices}%
-        \crefname{enumi}{Item}{Items}%
-        \crefname{enumii}{Item}{Items}%
-        \crefname{enumiii}{Item}{Items}%
-        \crefname{enumiv}{Item}{Items}%
-        \crefname{enumv}{Item}{Items}%
-        \crefname{footnote}{Footnote}{Footnotes}%
-        \crefname{theorem}{Theorem}{Theorems}%
-        \crefname{lemma}{Lemma}{Lemmas}%
-        \crefname{corollary}{Corollary}{Corollaries}%
-        \crefname{proposition}{Proposition}{Propositions}%
-        \crefname{definition}{Definition}{Definitions}%
-        \crefname{result}{Result}{Results}%
-        \crefname{example}{Example}{Examples}%
-        \crefname{remark}{Remark}{Remarks}%
-        \crefname{note}{Note}{Notes}%
-        \crefname{algorithm}{Algorithm}{Algorithms}%
-        \crefname{listing}{Listing}{Listings}%
-        \crefname{line}{Line}{Lines}%
+  \if@cref@capitalise%  capitalise set
+    \if@cref@abbrev%
+      \crefname{equation}{Eq.}{Eqs.}%
+      \crefname{figure}{Fig.}{Figs.}%
+      \crefname{subfigure}{Fig.}{Figs.}%
+    \else%
+      \crefname{equation}{Equation}{Equations}%
+      \crefname{figure}{Figure}{Figures}%
+      \crefname{subfigure}{Figure}{Figures}%
+    \fi%
+    \crefname{page}{Page}{Pages}%
+    \crefname{table}{Table}{Tables}%
+    \crefname{subtable}{Table}{Tables}%
+    \crefname{part}{Part}{Parts}%
+    \crefname{chapter}{Chapter}{Chapters}%
+    \crefname{section}{Section}{Sections}%
+    \crefname{subsection}{Section}{Sections}%
+    \crefname{subsubsection}{Section}{Sections}%
+    \crefname{appendix}{Appendix}{Appendices}%
+    \crefname{subappendix}{Appendix}{Appendices}%
+    \crefname{subsubappendix}{Appendix}{Appendices}%
+    \crefname{subsubsubappendix}{Appendix}{Appendices}%
+    \crefname{enumi}{Item}{Items}%
+    \crefname{enumii}{Item}{Items}%
+    \crefname{enumiii}{Item}{Items}%
+    \crefname{enumiv}{Item}{Items}%
+    \crefname{enumv}{Item}{Items}%
+    \crefname{footnote}{Footnote}{Footnotes}%
+    \crefname{theorem}{Theorem}{Theorems}%
+    \crefname{lemma}{Lemma}{Lemmas}%
+    \crefname{corollary}{Corollary}{Corollaries}%
+    \crefname{proposition}{Proposition}{Propositions}%
+    \crefname{definition}{Definition}{Definitions}%
+    \crefname{result}{Result}{Results}%
+    \crefname{example}{Example}{Examples}%
+    \crefname{remark}{Remark}{Remarks}%
+    \crefname{note}{Note}{Notes}%
+    \crefname{algorithm}{Algorithm}{Algorithms}%
+    \crefname{listing}{Listing}{Listings}%
+    \crefname{line}{Line}{Lines}%
  %
-      \else%  capitalise unset
-        \if@cref@abbrev%
-          \crefname{equation}{eq.}{eqs.}%
-          \crefname{figure}{fig.}{figs.}%
-          \crefname{subfigure}{fig.}{figs.}%
-        \else%
-          \crefname{equation}{equation}{equations}%
-          \crefname{figure}{figure}{figures}%
-          \crefname{subfigure}{figure}{figures}%
-        \fi%
-        \crefname{table}{table}{tables}%
-        \crefname{subtable}{table}{tables}%
-        \crefname{page}{page}{pages}%
-        \crefname{part}{part}{parts}%
-        \crefname{chapter}{chapter}{chapters}%
-        \crefname{section}{section}{sections}%
-        \crefname{subsection}{section}{sections}%
-        \crefname{subsubsection}{section}{sections}%
-        \crefname{appendix}{appendix}{appendices}%
-        \crefname{subappendix}{appendix}{appendices}%
-        \crefname{subsubappendix}{appendix}{appendices}%
-        \crefname{subsubsubappendix}{appendix}{appendices}%
-        \crefname{enumi}{item}{items}%
-        \crefname{enumii}{item}{items}%
-        \crefname{enumiii}{item}{items}%
-        \crefname{enumiv}{item}{items}%
-        \crefname{enumv}{item}{items}%
-        \crefname{footnote}{footnote}{footnotes}%
-        \crefname{theorem}{theorem}{theorems}%
-        \crefname{lemma}{lemma}{lemmas}%
-        \crefname{corollary}{corollary}{corollaries}%
-        \crefname{proposition}{proposition}{propositions}%
-        \crefname{definition}{definition}{definitions}%
-        \crefname{result}{result}{results}%
-        \crefname{example}{example}{examples}%
-        \crefname{remark}{remark}{remarks}%
-        \crefname{note}{note}{notes}%
-        \crefname{algorithm}{algorithm}{algorithms}%
-        \crefname{listing}{listing}{listings}%
-        \crefname{line}{line}{lines}%
-      \fi%
-    }}}
+  \else%  capitalise unset
+    \if@cref@abbrev%
+      \crefname{equation}{eq.}{eqs.}%
+      \crefname{figure}{fig.}{figs.}%
+      \crefname{subfigure}{fig.}{figs.}%
+    \else%
+      \crefname{equation}{equation}{equations}%
+      \crefname{figure}{figure}{figures}%
+      \crefname{subfigure}{figure}{figures}%
+    \fi%
+    \crefname{table}{table}{tables}%
+    \crefname{subtable}{table}{tables}%
+    \crefname{page}{page}{pages}%
+    \crefname{part}{part}{parts}%
+    \crefname{chapter}{chapter}{chapters}%
+    \crefname{section}{section}{sections}%
+    \crefname{subsection}{section}{sections}%
+    \crefname{subsubsection}{section}{sections}%
+    \crefname{appendix}{appendix}{appendices}%
+    \crefname{subappendix}{appendix}{appendices}%
+    \crefname{subsubappendix}{appendix}{appendices}%
+    \crefname{subsubsubappendix}{appendix}{appendices}%
+    \crefname{enumi}{item}{items}%
+    \crefname{enumii}{item}{items}%
+    \crefname{enumiii}{item}{items}%
+    \crefname{enumiv}{item}{items}%
+    \crefname{enumv}{item}{items}%
+    \crefname{footnote}{footnote}{footnotes}%
+    \crefname{theorem}{theorem}{theorems}%
+    \crefname{lemma}{lemma}{lemmas}%
+    \crefname{corollary}{corollary}{corollaries}%
+    \crefname{proposition}{proposition}{propositions}%
+    \crefname{definition}{definition}{definitions}%
+    \crefname{result}{result}{results}%
+    \crefname{example}{example}{examples}%
+    \crefname{remark}{remark}{remarks}%
+    \crefname{note}{note}{notes}%
+    \crefname{algorithm}{algorithm}{algorithms}%
+    \crefname{listing}{listing}{listings}%
+    \crefname{line}{line}{lines}%
+  \fi}% end \cref@addlangagedefs
 %    \end{macrocode}
 %
 %
@@ -8304,13 +8361,11 @@
 %   additions by the package author (so you know to blame the latter for
 %   any errors!).
 % \end{macro}
+%
+% Set up the definitions used at the beginning of the document to define
+% the formats created by the document preamble.
 %    \begin{macrocode}
 \DeclareOption{german}{%
-  \PackageInfo{cleveref}{loaded `german' language definitions}
-%    \end{macrocode}
-% First, we set up the definitions used at the beginning of the document
-% to define the formats created by the document preamble.
-%    \begin{macrocode}
   \AtBeginDocument{%
     \def\crefrangeconjunction@preamble{ bis\nobreakspace}%
     \def\crefrangepreconjunction@preamble{}%
@@ -8376,186 +8431,189 @@
     \crefname@preamble{listing}{Listing}{Listings}%
     \crefname@preamble{line}{Zeile}{Zeilen}%
     \def\cref@language{german}%
-%    \end{macrocode}
-%
-% Next, we add the definitions to \cmd{\extras}\dots{} so that
-% \package{babel}'s \cmd{\selectlanguage} command will change the format
-% appropriately.
-%    \begin{macrocode}
-    \cref@addto\extrasgerman{%
-      \renewcommand{\crefrangeconjunction}{ bis\nobreakspace}%
-      \renewcommand\crefrangepreconjunction{}%
-      \renewcommand\crefrangepostconjunction{}%
-      \renewcommand{\crefpairconjunction}{ und\nobreakspace}%
-      \renewcommand{\crefmiddleconjunction}{, }%
-      \renewcommand{\creflastconjunction}{ und\nobreakspace}%
-      \renewcommand{\crefpairgroupconjunction}{ und\nobreakspace}%
-      \renewcommand{\crefmiddlegroupconjunction}{, }%
-      \renewcommand{\creflastgroupconjunction}{ und\nobreakspace}%
+  }}% end \AtBeginDocument and \DeclareOption
+%    \end{macrocode}
+%
+% If using \package{babel} and the corresponding option is set, or if
+% using \package{polyglossia} and the language has been loaded, add
+% format definition commands to \cmd{\extras}\meta{language} or
+% \cmd{\captions}\meta{language} so that language switching commands will
+% change the cross-reference formats appropriately.
+%    \begin{macrocode}
+\cref@addlanguagedefs{german}{%
+  \PackageInfo{cleveref}{loaded `german language definitions}
+  \renewcommand{\crefrangeconjunction}{ bis\nobreakspace}%
+  \renewcommand\crefrangepreconjunction{}%
+  \renewcommand\crefrangepostconjunction{}%
+  \renewcommand{\crefpairconjunction}{ und\nobreakspace}%
+  \renewcommand{\crefmiddleconjunction}{, }%
+  \renewcommand{\creflastconjunction}{ und\nobreakspace}%
+  \renewcommand{\crefpairgroupconjunction}{ und\nobreakspace}%
+  \renewcommand{\crefmiddlegroupconjunction}{, }%
+  \renewcommand{\creflastgroupconjunction}{ und\nobreakspace}%
  %
-      \Crefname{equation}{Gleichung}{Gleichungen}%
-      \Crefname{figure}{Abbildung}{Abbildungen}%
-      \Crefname{subfigure}{Abbildung}{Abbildungen}%
-      \Crefname{table}{Tabelle}{Tabellen}%
-      \Crefname{subtable}{Tabelle}{Tabellen}%
-      \Crefname{page}{Seite}{Seiten}%
-      \Crefname{part}{Teil}{Teile}%
-      \Crefname{chapter}{Kapitel}{Kapitel}%
-      \Crefname{section}{Abschnitt}{Abschnitte}%
-      \Crefname{subsection}{Abschnitt}{Abschnitte}%
-      \Crefname{subsubsection}{Abschnitt}{Abschnitte}%
-      \Crefname{appendix}{Anhang}{Anh\"ange}%
-      \Crefname{subappendix}{Anhang}{Anh\"ange}%
-      \Crefname{subsubappendix}{Anhang}{Anh\"ange}%
-      \Crefname{subsubsubappendix}{Anhang}{Anh\"ange}%
-      \Crefname{enumi}{Punkt}{Punkte}%
-      \Crefname{enumii}{Punkt}{Punkte}%
-      \Crefname{enumiii}{Punkt}{Punkte}%
-      \Crefname{enumiv}{Punkt}{Punkte}%
-      \Crefname{enumv}{Punkt}{Punkte}%
-      \Crefname{footnote}{Fu\ss note}{Fu\ss noten}%
-      \Crefname{theorem}{Theorem}{Theoreme}%
-      \Crefname{lemma}{Lemma}{Lemmata}%
-      \Crefname{corollary}{Korollar}{Korollare}%
-      \Crefname{proposition}{Satz}{S\"atze}%
-      \Crefname{definition}{Definition}{Definitionen}%
-      \Crefname{result}{Ergebnis}{Ergebnisse}%
-      \Crefname{example}{Beispiel}{Beispiele}%
-      \Crefname{remark}{Bemerkung}{Bemerkungen}%
-      \Crefname{note}{Anmerkung}{Anmerkungen}%
-      \Crefname{algorithm}{Algorithmus}{Algorithmen}%
-      \Crefname{listing}{Listing}{Listings}%
-      \Crefname{line}{Zeile}{Zeilen}%
+  \Crefname{equation}{Gleichung}{Gleichungen}%
+  \Crefname{figure}{Abbildung}{Abbildungen}%
+  \Crefname{subfigure}{Abbildung}{Abbildungen}%
+  \Crefname{table}{Tabelle}{Tabellen}%
+  \Crefname{subtable}{Tabelle}{Tabellen}%
+  \Crefname{page}{Seite}{Seiten}%
+  \Crefname{part}{Teil}{Teile}%
+  \Crefname{chapter}{Kapitel}{Kapitel}%
+  \Crefname{section}{Abschnitt}{Abschnitte}%
+  \Crefname{subsection}{Abschnitt}{Abschnitte}%
+  \Crefname{subsubsection}{Abschnitt}{Abschnitte}%
+  \Crefname{appendix}{Anhang}{Anh\"ange}%
+  \Crefname{subappendix}{Anhang}{Anh\"ange}%
+  \Crefname{subsubappendix}{Anhang}{Anh\"ange}%
+  \Crefname{subsubsubappendix}{Anhang}{Anh\"ange}%
+  \Crefname{enumi}{Punkt}{Punkte}%
+  \Crefname{enumii}{Punkt}{Punkte}%
+  \Crefname{enumiii}{Punkt}{Punkte}%
+  \Crefname{enumiv}{Punkt}{Punkte}%
+  \Crefname{enumv}{Punkt}{Punkte}%
+  \Crefname{footnote}{Fu\ss note}{Fu\ss noten}%
+  \Crefname{theorem}{Theorem}{Theoreme}%
+  \Crefname{lemma}{Lemma}{Lemmata}%
+  \Crefname{corollary}{Korollar}{Korollare}%
+  \Crefname{proposition}{Satz}{S\"atze}%
+  \Crefname{definition}{Definition}{Definitionen}%
+  \Crefname{result}{Ergebnis}{Ergebnisse}%
+  \Crefname{example}{Beispiel}{Beispiele}%
+  \Crefname{remark}{Bemerkung}{Bemerkungen}%
+  \Crefname{note}{Anmerkung}{Anmerkungen}%
+  \Crefname{algorithm}{Algorithmus}{Algorithmen}%
+  \Crefname{listing}{Listing}{Listings}%
+  \Crefname{line}{Zeile}{Zeilen}%
  %
-      \crefname{equation}{Gleichung}{Gleichungen}%
-      \crefname{figure}{Abbildung}{Abbildungen}%
-      \crefname{subfigure}{Abbildung}{Abbildungen}%
-      \crefname{table}{Tabelle}{Tabellen}%
-      \crefname{subtable}{Tabelle}{Tabellen}%
-      \crefname{page}{Seite}{Seiten}%
-      \crefname{part}{Teil}{Teile}%
-      \crefname{chapter}{Kapitel}{Kapitel}%
-      \crefname{section}{Abschnitt}{Abschnitte}%
-      \crefname{subsection}{Abschnitt}{Abschnitte}%
-      \crefname{subsubsection}{Abschnitt}{Abschnitte}%
-      \crefname{appendix}{Anhang}{Anh\"ange}%
-      \crefname{subappendix}{Anhang}{Anh\"ange}%
-      \crefname{subsubappendix}{Anhang}{Anh\"ange}%
-      \crefname{subsubsubappendix}{Anhang}{Anh\"ange}%
-      \crefname{enumi}{Punkt}{Punkte}%
-      \crefname{enumii}{Punkt}{Punkte}%
-      \crefname{enumiii}{Punkt}{Punkte}%
-      \crefname{enumiv}{Punkt}{Punkte}%
-      \crefname{enumv}{Punkt}{Punkte}%
-      \crefname{footnote}{Fu\ss note}{Fu\ss noten}%
-      \crefname{theorem}{Theorem}{Theoreme}%
-      \crefname{lemma}{Lemma}{Lemmata}%
-      \crefname{corollary}{Korollar}{Korollare}%
-      \crefname{proposition}{Satz}{S\"atze}%
-      \crefname{definition}{Definition}{Definitionen}%
-      \crefname{result}{Ergebnis}{Ergebnisse}%
-      \crefname{example}{Beispiel}{Beispiele}%
-      \crefname{remark}{Bemerkung}{Bemerkungen}%
-      \crefname{note}{Anmerkung}{Anmerkungen}%
-      \crefname{algorithm}{Algorithmus}{Algorithmen}%
-      \crefname{listing}{Listing}{Listings}%
-      \crefname{line}{Zeile}{Zeilen}%
-    }}}
+  \crefname{equation}{Gleichung}{Gleichungen}%
+  \crefname{figure}{Abbildung}{Abbildungen}%
+  \crefname{subfigure}{Abbildung}{Abbildungen}%
+  \crefname{table}{Tabelle}{Tabellen}%
+  \crefname{subtable}{Tabelle}{Tabellen}%
+  \crefname{page}{Seite}{Seiten}%
+  \crefname{part}{Teil}{Teile}%
+  \crefname{chapter}{Kapitel}{Kapitel}%
+  \crefname{section}{Abschnitt}{Abschnitte}%
+  \crefname{subsection}{Abschnitt}{Abschnitte}%
+  \crefname{subsubsection}{Abschnitt}{Abschnitte}%
+  \crefname{appendix}{Anhang}{Anh\"ange}%
+  \crefname{subappendix}{Anhang}{Anh\"ange}%
+  \crefname{subsubappendix}{Anhang}{Anh\"ange}%
+  \crefname{subsubsubappendix}{Anhang}{Anh\"ange}%
+  \crefname{enumi}{Punkt}{Punkte}%
+  \crefname{enumii}{Punkt}{Punkte}%
+  \crefname{enumiii}{Punkt}{Punkte}%
+  \crefname{enumiv}{Punkt}{Punkte}%
+  \crefname{enumv}{Punkt}{Punkte}%
+  \crefname{footnote}{Fu\ss note}{Fu\ss noten}%
+  \crefname{theorem}{Theorem}{Theoreme}%
+  \crefname{lemma}{Lemma}{Lemmata}%
+  \crefname{corollary}{Korollar}{Korollare}%
+  \crefname{proposition}{Satz}{S\"atze}%
+  \crefname{definition}{Definition}{Definitionen}%
+  \crefname{result}{Ergebnis}{Ergebnisse}%
+  \crefname{example}{Beispiel}{Beispiele}%
+  \crefname{remark}{Bemerkung}{Bemerkungen}%
+  \crefname{note}{Anmerkung}{Anmerkungen}%
+  \crefname{algorithm}{Algorithmus}{Algorithmen}%
+  \crefname{listing}{Listing}{Listings}%
+  \crefname{line}{Zeile}{Zeilen}}% end \cref@addlangagedefs
 %    \end{macrocode}
 %
 %
 % \begin{macro}{ngerman}
 %   It so happens that none of the cross-reference names differ in the
 %   ``Neuerechtschreibung'', so we make \option{ngerman} execute
-%   \option{german}. However, we still need to add the definitions to
-%   \cmd{\extrasngerman} (note the ``n'') so that \cmd{\selectlanguage}
-%   etc.\ will work.
+%   \option{german}.
 % \end{macro}
 %    \begin{macrocode}
 \DeclareOption{ngerman}{%
-  \PackageInfo{cleveref}{loaded `ngerman' language definitions}
   \ExecuteOptions{german}
-  \def\cref@language{ngerman}
-  \AtBeginDocument{%
-    \cref@addto\extrasngerman{%
-      \renewcommand{\crefrangeconjunction}{ bis\nobreakspace}%
-      \renewcommand\crefrangepreconjunction{}%
-      \renewcommand\crefrangepostconjunction{}%
-      \renewcommand{\crefpairconjunction}{ und\nobreakspace}%
-      \renewcommand{\crefmiddleconjunction}{, }%
-      \renewcommand{\creflastconjunction}{ und\nobreakspace}%
-      \renewcommand{\crefpairgroupconjunction}{ und\nobreakspace}%
-      \renewcommand{\crefmiddlegroupconjunction}{, }%
-      \renewcommand{\creflastgroupconjunction}{ und\nobreakspace}%
+  \def\cref@language{ngerman}}
+%    \end{macrocode}
+% However, we still need to add the definitions to \cmd{\extrasngerman}
+% (note the ``n'') so that \cmd{\selectlanguage} etc.\ will work.
+%    \begin{macrocode}
+\cref@addlanguagedefs{ngerman}{%
+  \PackageInfo{cleveref}{loaded `ngerman' language definitions}
+  \renewcommand{\crefrangeconjunction}{ bis\nobreakspace}%
+  \renewcommand\crefrangepreconjunction{}%
+  \renewcommand\crefrangepostconjunction{}%
+  \renewcommand{\crefpairconjunction}{ und\nobreakspace}%
+  \renewcommand{\crefmiddleconjunction}{, }%
+  \renewcommand{\creflastconjunction}{ und\nobreakspace}%
+  \renewcommand{\crefpairgroupconjunction}{ und\nobreakspace}%
+  \renewcommand{\crefmiddlegroupconjunction}{, }%
+  \renewcommand{\creflastgroupconjunction}{ und\nobreakspace}%
  %
-      \Crefname{equation}{Gleichung}{Gleichungen}%
-      \Crefname{figure}{Abbildung}{Abbildungen}%
-      \Crefname{subfigure}{Abbildung}{Abbildungen}%
-      \Crefname{table}{Tabelle}{Tabellen}%
-      \Crefname{subtable}{Tabelle}{Tabellen}%
-      \Crefname{page}{Seite}{Seiten}%
-      \Crefname{part}{Teil}{Teile}%
-      \Crefname{chapter}{Kapitel}{Kapitel}%
-      \Crefname{section}{Abschnitt}{Abschnitte}%
-      \Crefname{subsection}{Abschnitt}{Abschnitte}%
-      \Crefname{subsubsection}{Abschnitt}{Abschnitte}%
-      \Crefname{appendix}{Anhang}{Anh\"ange}%
-      \Crefname{subappendix}{Anhang}{Anh\"ange}%
-      \Crefname{subsubappendix}{Anhang}{Anh\"ange}%
-      \Crefname{subsubsubappendix}{Anhang}{Anh\"ange}%
-      \Crefname{enumi}{Punkt}{Punkte}%
-      \Crefname{enumii}{Punkt}{Punkte}%
-      \Crefname{enumiii}{Punkt}{Punkte}%
-      \Crefname{enumiv}{Punkt}{Punkte}%
-      \Crefname{enumv}{Punkt}{Punkte}%
-      \Crefname{footnote}{Fu\ss note}{Fu\ss noten}%
-      \Crefname{theorem}{Theorem}{Theoreme}%
-      \Crefname{lemma}{Lemma}{Lemmata}%
-      \Crefname{corollary}{Korollar}{Korollare}%
-      \Crefname{proposition}{Satz}{S\"atze}%
-      \Crefname{definition}{Definition}{Definitionen}%
-      \Crefname{result}{Ergebnis}{Ergebnisse}%
-      \Crefname{example}{Beispiel}{Beispiele}%
-      \Crefname{remark}{Bemerkung}{Bemerkungen}%
-      \Crefname{note}{Anmerkung}{Anmerkungen}%
-      \Crefname{algorithm}{Algorithmus}{Algorithmen}%
-      \Crefname{listing}{Listing}{Listings}%
-      \Crefname{line}{Zeile}{Zeilen}%
+  \Crefname{equation}{Gleichung}{Gleichungen}%
+  \Crefname{figure}{Abbildung}{Abbildungen}%
+  \Crefname{subfigure}{Abbildung}{Abbildungen}%
+  \Crefname{table}{Tabelle}{Tabellen}%
+  \Crefname{subtable}{Tabelle}{Tabellen}%
+  \Crefname{page}{Seite}{Seiten}%
+  \Crefname{part}{Teil}{Teile}%
+  \Crefname{chapter}{Kapitel}{Kapitel}%
+  \Crefname{section}{Abschnitt}{Abschnitte}%
+  \Crefname{subsection}{Abschnitt}{Abschnitte}%
+  \Crefname{subsubsection}{Abschnitt}{Abschnitte}%
+  \Crefname{appendix}{Anhang}{Anh\"ange}%
+  \Crefname{subappendix}{Anhang}{Anh\"ange}%
+  \Crefname{subsubappendix}{Anhang}{Anh\"ange}%
+  \Crefname{subsubsubappendix}{Anhang}{Anh\"ange}%
+  \Crefname{enumi}{Punkt}{Punkte}%
+  \Crefname{enumii}{Punkt}{Punkte}%
+  \Crefname{enumiii}{Punkt}{Punkte}%
+  \Crefname{enumiv}{Punkt}{Punkte}%
+  \Crefname{enumv}{Punkt}{Punkte}%
+  \Crefname{footnote}{Fu\ss note}{Fu\ss noten}%
+  \Crefname{theorem}{Theorem}{Theoreme}%
+  \Crefname{lemma}{Lemma}{Lemmata}%
+  \Crefname{corollary}{Korollar}{Korollare}%
+  \Crefname{proposition}{Satz}{S\"atze}%
+  \Crefname{definition}{Definition}{Definitionen}%
+  \Crefname{result}{Ergebnis}{Ergebnisse}%
+  \Crefname{example}{Beispiel}{Beispiele}%
+  \Crefname{remark}{Bemerkung}{Bemerkungen}%
+  \Crefname{note}{Anmerkung}{Anmerkungen}%
+  \Crefname{algorithm}{Algorithmus}{Algorithmen}%
+  \Crefname{listing}{Listing}{Listings}%
+  \Crefname{line}{Zeile}{Zeilen}%
  %
-      \crefname{equation}{Gleichung}{Gleichungen}%
-      \crefname{figure}{Abbildung}{Abbildungen}%
-      \crefname{subfigure}{Abbildung}{Abbildungen}%
-      \crefname{table}{Tabelle}{Tabellen}%
-      \crefname{subtable}{Tabelle}{Tabellen}%
-      \crefname{page}{Seite}{Seiten}%
-      \crefname{part}{Teil}{Teile}%
-      \crefname{chapter}{Kapitel}{Kapitel}%
-      \crefname{section}{Abschnitt}{Abschnitte}%
-      \crefname{subsection}{Abschnitt}{Abschnitte}%
-      \crefname{subsubsection}{Abschnitt}{Abschnitte}%
-      \crefname{appendix}{Anhang}{Anh\"ange}%
-      \crefname{subappendix}{Anhang}{Anh\"ange}%
-      \crefname{subsubappendix}{Anhang}{Anh\"ange}%
-      \crefname{subsubsubappendix}{Anhang}{Anh\"ange}%
-      \crefname{enumi}{Punkt}{Punkte}%
-      \crefname{enumii}{Punkt}{Punkte}%
-      \crefname{enumiii}{Punkt}{Punkte}%
-      \crefname{enumiv}{Punkt}{Punkte}%
-      \crefname{enumv}{Punkt}{Punkte}%
-      \crefname{footnote}{Fu\ss note}{Fu\ss noten}%
-      \crefname{theorem}{Theorem}{Theoreme}%
-      \crefname{lemma}{Lemma}{Lemmata}%
-      \crefname{corollary}{Korollar}{Korollare}%
-      \crefname{proposition}{Satz}{S\"atze}%
-      \crefname{definition}{Definition}{Definitionen}%
-      \crefname{result}{Ergebnis}{Ergebnisse}%
-      \crefname{example}{Beispiel}{Beispiele}%
-      \crefname{remark}{Bemerkung}{Bemerkungen}%
-      \crefname{note}{Anmerkung}{Anmerkungen}%
-      \crefname{algorithm}{Algorithmus}{Algorithmen}%
-      \crefname{listing}{Listing}{Listings}%
-      \crefname{line}{Zeile}{Zeilen}%
-    }}}
+  \crefname{equation}{Gleichung}{Gleichungen}%
+  \crefname{figure}{Abbildung}{Abbildungen}%
+  \crefname{subfigure}{Abbildung}{Abbildungen}%
+  \crefname{table}{Tabelle}{Tabellen}%
+  \crefname{subtable}{Tabelle}{Tabellen}%
+  \crefname{page}{Seite}{Seiten}%
+  \crefname{part}{Teil}{Teile}%
+  \crefname{chapter}{Kapitel}{Kapitel}%
+  \crefname{section}{Abschnitt}{Abschnitte}%
+  \crefname{subsection}{Abschnitt}{Abschnitte}%
+  \crefname{subsubsection}{Abschnitt}{Abschnitte}%
+  \crefname{appendix}{Anhang}{Anh\"ange}%
+  \crefname{subappendix}{Anhang}{Anh\"ange}%
+  \crefname{subsubappendix}{Anhang}{Anh\"ange}%
+  \crefname{subsubsubappendix}{Anhang}{Anh\"ange}%
+  \crefname{enumi}{Punkt}{Punkte}%
+  \crefname{enumii}{Punkt}{Punkte}%
+  \crefname{enumiii}{Punkt}{Punkte}%
+  \crefname{enumiv}{Punkt}{Punkte}%
+  \crefname{enumv}{Punkt}{Punkte}%
+  \crefname{footnote}{Fu\ss note}{Fu\ss noten}%
+  \crefname{theorem}{Theorem}{Theoreme}%
+  \crefname{lemma}{Lemma}{Lemmata}%
+  \crefname{corollary}{Korollar}{Korollare}%
+  \crefname{proposition}{Satz}{S\"atze}%
+  \crefname{definition}{Definition}{Definitionen}%
+  \crefname{result}{Ergebnis}{Ergebnisse}%
+  \crefname{example}{Beispiel}{Beispiele}%
+  \crefname{remark}{Bemerkung}{Bemerkungen}%
+  \crefname{note}{Anmerkung}{Anmerkungen}%
+  \crefname{algorithm}{Algorithmus}{Algorithmen}%
+  \crefname{listing}{Listing}{Listings}%
+  \crefname{line}{Zeile}{Zeilen}}% end \cref@addlangagedefs
 %    \end{macrocode}
 %
 %
@@ -8563,13 +8621,11 @@
 % \begin{macro}{dutch}
 %   Dutch translations kindly contributed by Philip H\"olzenspies.
 % \end{macro}
+%
+% Set up the definitions used at the beginning of the document to define
+% the formats created by the document preamble.
 %    \begin{macrocode}
 \DeclareOption{dutch}{%
-  \PackageInfo{cleveref}{loaded `dutch' language definitions}
-%    \end{macrocode}
-% First, we set up the definitions used at the beginning of the document
-% to define the formats created by the document preamble.
-%    \begin{macrocode}
   \AtBeginDocument{%
     \def\crefrangeconjunction@preamble{ tot\nobreakspace}%
     \def\crefrangepreconjunction@preamble{}%
@@ -8670,122 +8726,125 @@
       \crefname@preamble{line}{lijn}{lijnen}%
     \fi%
     \def\cref@language{dutch}%
+  }}% end \DeclareOption and \AtBeginDocument
 %    \end{macrocode}
 %
-% Next, we add the definitions to \cmd{\extras}\dots{} so that
-% \package{babel}'s \cmd{\selectlanguage} command will change the format
-% appropriately.
-%    \begin{macrocode}
-    \cref@addto\extrasdutch{%
-      \renewcommand{\crefrangeconjunction}{ tot\nobreakspace}%
-      \renewcommand\crefrangepreconjunction{}%
-      \renewcommand\crefrangepostconjunction{}%
-      \renewcommand{\crefpairconjunction}{ en\nobreakspace}%
-      \renewcommand{\crefmiddleconjunction}{, }%
-      \renewcommand{\creflastconjunction}{ en\nobreakspace}%
-      \renewcommand{\crefpairgroupconjunction}{ en\nobreakspace}%
-      \renewcommand{\crefmiddlegroupconjunction}{, }%
-      \renewcommand{\creflastgroupconjunction}{ en\nobreakspace}%
+% If using \package{babel} and the corresponding option is set, or if
+% using \package{polyglossia} and the language has been loaded, add
+% format definition commands to \cmd{\extras}\meta{language} or
+% \cmd{\captions}\meta{language} so that language switching commands will
+% change the cross-reference formats appropriately.
+%    \begin{macrocode}
+\cref@addlanguagedefs{dutch}{%
+  \PackageInfo{cleveref}{loaded `dutch' language definitions}
+  \renewcommand{\crefrangeconjunction}{ tot\nobreakspace}%
+  \renewcommand\crefrangepreconjunction{}%
+  \renewcommand\crefrangepostconjunction{}%
+  \renewcommand{\crefpairconjunction}{ en\nobreakspace}%
+  \renewcommand{\crefmiddleconjunction}{, }%
+  \renewcommand{\creflastconjunction}{ en\nobreakspace}%
+  \renewcommand{\crefpairgroupconjunction}{ en\nobreakspace}%
+  \renewcommand{\crefmiddlegroupconjunction}{, }%
+  \renewcommand{\creflastgroupconjunction}{ en\nobreakspace}%
  %
-      \Crefname{equation}{Vergel\ij{}king}{Vergel\ij{}kingen}%
-      \Crefname{figure}{Figuur}{Figuren}%
-      \Crefname{subfigure}{Figuur}{Figuren}%
-      \Crefname{table}{Tabel}{Tabellen}%
-      \Crefname{subtable}{Tabel}{Tabellen}%
-      \Crefname{page}{Pagina}{Pagina's}%
-      \Crefname{part}{Deel}{Delen}%
-      \Crefname{chapter}{Hoofdstuk}{Hoofdstuken}%
-      \Crefname{section}{Paragraaf}{Paragrafen}%
-      \Crefname{subsection}{Paragraaf}{Paragrafen}%
-      \Crefname{subsubsection}{Paragraaf}{Paragrafen}%
-      \Crefname{appendix}{Appendix}{Appendices}%
-      \Crefname{subappendix}{Appendix}{Appendices}%
-      \Crefname{subsubappendix}{Appendix}{Appendices}%
-      \Crefname{subsubsubappendix}{Appendix}{Appendices}%
-      \Crefname{enumi}{Punt}{Punten}%
-      \Crefname{enumii}{Punt}{Punten}%
-      \Crefname{enumiii}{Punt}{Punten}%
-      \Crefname{enumiv}{Punt}{Punten}%
-      \Crefname{enumv}{Punt}{Punten}%
-      \Crefname{footnote}{Voetnote}{Voetnoten}%
-      \Crefname{theorem}{Theorema}{Theorema's}%
-      \Crefname{lemma}{Lemma}{Lemma's}%
-      \Crefname{corollary}{Corollarium}{Corollaria}%
-      \Crefname{proposition}{Bewering}{Beweringen}%
-      \Crefname{definition}{Definitie}{Definities}%
-      \Crefname{result}{Resultaat}{Resultaten}%
-      \Crefname{example}{Voorbeeld}{Voorbeelden}%
-      \Crefname{remark}{Opmerking}{Opmerkingen}%
-      \Crefname{note}{Aantekening}{Aantekeningen}%
-      \Crefname{algorithm}{Algoritme}{Algoritmen}%
-      \Crefname{listing}{Listing}{Listings}%
-      \Crefname{line}{Lijn}{Lijnen}%
+  \Crefname{equation}{Vergel\ij{}king}{Vergel\ij{}kingen}%
+  \Crefname{figure}{Figuur}{Figuren}%
+  \Crefname{subfigure}{Figuur}{Figuren}%
+  \Crefname{table}{Tabel}{Tabellen}%
+  \Crefname{subtable}{Tabel}{Tabellen}%
+  \Crefname{page}{Pagina}{Pagina's}%
+  \Crefname{part}{Deel}{Delen}%
+  \Crefname{chapter}{Hoofdstuk}{Hoofdstuken}%
+  \Crefname{section}{Paragraaf}{Paragrafen}%
+  \Crefname{subsection}{Paragraaf}{Paragrafen}%
+  \Crefname{subsubsection}{Paragraaf}{Paragrafen}%
+  \Crefname{appendix}{Appendix}{Appendices}%
+  \Crefname{subappendix}{Appendix}{Appendices}%
+  \Crefname{subsubappendix}{Appendix}{Appendices}%
+  \Crefname{subsubsubappendix}{Appendix}{Appendices}%
+  \Crefname{enumi}{Punt}{Punten}%
+  \Crefname{enumii}{Punt}{Punten}%
+  \Crefname{enumiii}{Punt}{Punten}%
+  \Crefname{enumiv}{Punt}{Punten}%
+  \Crefname{enumv}{Punt}{Punten}%
+  \Crefname{footnote}{Voetnote}{Voetnoten}%
+  \Crefname{theorem}{Theorema}{Theorema's}%
+  \Crefname{lemma}{Lemma}{Lemma's}%
+  \Crefname{corollary}{Corollarium}{Corollaria}%
+  \Crefname{proposition}{Bewering}{Beweringen}%
+  \Crefname{definition}{Definitie}{Definities}%
+  \Crefname{result}{Resultaat}{Resultaten}%
+  \Crefname{example}{Voorbeeld}{Voorbeelden}%
+  \Crefname{remark}{Opmerking}{Opmerkingen}%
+  \Crefname{note}{Aantekening}{Aantekeningen}%
+  \Crefname{algorithm}{Algoritme}{Algoritmen}%
+  \Crefname{listing}{Listing}{Listings}%
+  \Crefname{line}{Lijn}{Lijnen}%
  %
-      \if@cref@capitalise%  capitalise set
-        \if@cref@abbrev%
-          \crefname{equation}{Verg.}{Verg's.}%
-          \crefname{figure}{Fig.}{Fig's.}%
-          \crefname{subfigure}{Fig.}{Fig's.}%
-        \else%
-          \crefname{equation}{Vergel\ij{}king}{Vergel\ij{}kingen}%
-          \crefname{figure}{Figuur}{Figuren}%
-          \crefname{subfigure}{Figuur}{Figuren}%
-        \fi%
-        \crefname{table}{Tabel}{Tabellen}%
-        \crefname{subtable}{Tabel}{Tabellen}%
-        \crefname{page}{Pagina}{Pagina's}%
-        \crefname{part}{Deel}{Delen}%
-        \crefname{chapter}{Hoofdstuk}{Hoofdstukken}%
-        \crefname{section}{Paragraaf}{Paragrafen}%
-        \crefname{appendix}{Appendix}{Appendices}%
-        \crefname{enumi}{Punt}{Punten}%
-        \crefname{footnote}{Voetnote}{Voetnoten}%
-        \crefname{theorem}{Theorema}{Theorema's}%
-        \crefname{lemma}{Lemma}{Lemma's}%
-        \crefname{corollary}{Corollarium}{Corollaria}%
-        \crefname{proposition}{Bewering}{Beweringen}%
-        \crefname{definition}{Definitie}{Definities}%
-        \crefname{result}{Resultaat}{Resultaten}%
-        \crefname{example}{Voorbeeld}{Voorbeelden}%
-        \crefname{remark}{Opmerking}{Opmerkingen}%
-        \crefname{note}{Aantekening}{Aantekeningen}%
-        \crefname{algorithm}{Algoritme}{Algoritmen}%
-        \crefname{listing}{Listing}{Listings}%
-        \crefname{line}{Lijn}{Lijnen}%
+  \if@cref@capitalise%  capitalise set
+    \if@cref@abbrev%
+      \crefname{equation}{Verg.}{Verg's.}%
+      \crefname{figure}{Fig.}{Fig's.}%
+      \crefname{subfigure}{Fig.}{Fig's.}%
+    \else%
+      \crefname{equation}{Vergel\ij{}king}{Vergel\ij{}kingen}%
+      \crefname{figure}{Figuur}{Figuren}%
+      \crefname{subfigure}{Figuur}{Figuren}%
+    \fi%
+    \crefname{table}{Tabel}{Tabellen}%
+    \crefname{subtable}{Tabel}{Tabellen}%
+    \crefname{page}{Pagina}{Pagina's}%
+    \crefname{part}{Deel}{Delen}%
+    \crefname{chapter}{Hoofdstuk}{Hoofdstukken}%
+    \crefname{section}{Paragraaf}{Paragrafen}%
+    \crefname{appendix}{Appendix}{Appendices}%
+    \crefname{enumi}{Punt}{Punten}%
+    \crefname{footnote}{Voetnote}{Voetnoten}%
+    \crefname{theorem}{Theorema}{Theorema's}%
+    \crefname{lemma}{Lemma}{Lemma's}%
+    \crefname{corollary}{Corollarium}{Corollaria}%
+    \crefname{proposition}{Bewering}{Beweringen}%
+    \crefname{definition}{Definitie}{Definities}%
+    \crefname{result}{Resultaat}{Resultaten}%
+    \crefname{example}{Voorbeeld}{Voorbeelden}%
+    \crefname{remark}{Opmerking}{Opmerkingen}%
+    \crefname{note}{Aantekening}{Aantekeningen}%
+    \crefname{algorithm}{Algoritme}{Algoritmen}%
+    \crefname{listing}{Listing}{Listings}%
+    \crefname{line}{Lijn}{Lijnen}%
  %
-      \else%  capitalise unset
-        \if@cref@abbrev%
-          \crefname{equation}{verg.}{verg's.}%
-          \crefname{figure}{fig.}{fig's.}%
-          \crefname{subfigure}{fig.}{fig's.}%
-        \else%
-          \crefname{equation}{vergel\ij{}king}{vergel\ij{}kingen}%
-          \crefname{figure}{figuur}{figuren}%
-          \crefname{subfigure}{figuur}{figuren}%
-        \fi%
-        \crefname{table}{tabel}{tabellen}%
-        \crefname{subtable}{tabel}{tabellen}%
-        \crefname{page}{pagina}{pagina's}%
-        \crefname{part}{deel}{delen}%
-        \crefname{chapter}{hoofdstuk}{hoofdstukken}%
-        \crefname{section}{paragraaf}{paragrafen}%
-        \crefname{appendix}{appendix}{appendices}%
-        \crefname{enumi}{punt}{punten}%
-        \crefname{footnote}{voetnote}{voetnoten}%
-        \crefname{theorem}{theorema}{theorema's}%
-        \crefname{lemma}{lemma}{lemma's}%
-        \crefname{corollary}{corollarium}{corollaria}%
-        \crefname{proposition}{bewering}{beweringen}%
-        \crefname{definition}{definitie}{definities}%
-        \crefname{result}{resultaat}{resultaten}%
-        \crefname{example}{voorbeeld}{voorbeelden}%
-        \crefname{remark}{opmerking}{opmerkingen}%
-        \crefname{note}{aantekening}{aantekeningen}%
-        \crefname{algorithm}{algoritme}{algoritmen}%
-        \crefname{listing}{listing}{listings}%
-        \crefname{line}{lijn}{lijnen}%
-      \fi%
-    }}}
+  \else%  capitalise unset
+    \if@cref@abbrev%
+      \crefname{equation}{verg.}{verg's.}%
+      \crefname{figure}{fig.}{fig's.}%
+      \crefname{subfigure}{fig.}{fig's.}%
+    \else%
+      \crefname{equation}{vergel\ij{}king}{vergel\ij{}kingen}%
+      \crefname{figure}{figuur}{figuren}%
+      \crefname{subfigure}{figuur}{figuren}%
+    \fi%
+    \crefname{table}{tabel}{tabellen}%
+    \crefname{subtable}{tabel}{tabellen}%
+    \crefname{page}{pagina}{pagina's}%
+    \crefname{part}{deel}{delen}%
+    \crefname{chapter}{hoofdstuk}{hoofdstukken}%
+    \crefname{section}{paragraaf}{paragrafen}%
+    \crefname{appendix}{appendix}{appendices}%
+    \crefname{enumi}{punt}{punten}%
+    \crefname{footnote}{voetnote}{voetnoten}%
+    \crefname{theorem}{theorema}{theorema's}%
+    \crefname{lemma}{lemma}{lemma's}%
+    \crefname{corollary}{corollarium}{corollaria}%
+    \crefname{proposition}{bewering}{beweringen}%
+    \crefname{definition}{definitie}{definities}%
+    \crefname{result}{resultaat}{resultaten}%
+    \crefname{example}{voorbeeld}{voorbeelden}%
+    \crefname{remark}{opmerking}{opmerkingen}%
+    \crefname{note}{aantekening}{aantekeningen}%
+    \crefname{algorithm}{algoritme}{algoritmen}%
+    \crefname{listing}{listing}{listings}%
+    \crefname{line}{lijn}{lijnen}%
+  \fi}% end \cref@addlanguagedefs
 %    \end{macrocode}
 %
 %
@@ -8794,13 +8853,11 @@
 %   French translations attempted by the package author (please report
 %   any corrections that might be needed!).
 % \end{macro}
+%
+% Set up the definitions used at the beginning of the document to define
+% the formats created by the document preamble.
 %    \begin{macrocode}
 \DeclareOption{french}{%
-  \PackageInfo{cleveref}{loaded `french' language definitions}
-%    \end{macrocode}
-% First, we set up the definitions used at the beginning of the document to
-% define the formats created by the document preamble.
-%    \begin{macrocode}
   \AtBeginDocument{%
     \def\crefrangeconjunction@preamble{ \`a\nobreakspace}%
     \def\crefrangepreconjunction@preamble{}%
@@ -8888,128 +8945,131 @@
       \crefname@preamble{line}{ligne}{lignes}%
     \fi%
     \def\cref@language{french}%
+  }}% end \DeclareOption and \AtBeginDocument
 %    \end{macrocode}
 %
-% Next, we add the definitions to \cmd{\extras}\dots{} so that
-% \package{babel}'s \cmd{\selectlanguage} command will change the format
-% appropriately.
-%    \begin{macrocode}
-    \cref@addto\extrasfrench{%
-      \renewcommand{\crefrangeconjunction}{ \`a\nobreakspace}%
-      \renewcommand\crefrangepreconjunction{}%
-      \renewcommand\crefrangepostconjunction{}%
-      \renewcommand{\crefpairconjunction}{ et\nobreakspace}%
-      \renewcommand{\crefmiddleconjunction}{, }%
-      \renewcommand{\creflastconjunction}{ et\nobreakspace}%
-      \renewcommand{\crefpairgroupconjunction}{ et\nobreakspace}%
-      \renewcommand{\crefmiddlegroupconjunction}{, }%
-      \renewcommand{\creflastgroupconjunction}{ et\nobreakspace}%
+% If using \package{babel} and the corresponding option is set, or if
+% using \package{polyglossia} and the language has been loaded, add
+% format definition commands to \cmd{\extras}\meta{language} or
+% \cmd{\captions}\meta{language} so that language switching commands will
+% change the cross-reference formats appropriately.
+%    \begin{macrocode}
+\cref@addlanguagedefs{french}{%
+  \PackageInfo{cleveref}{loaded `french' language definitions}
+  \renewcommand{\crefrangeconjunction}{ \`a\nobreakspace}%
+  \renewcommand\crefrangepreconjunction{}%
+  \renewcommand\crefrangepostconjunction{}%
+  \renewcommand{\crefpairconjunction}{ et\nobreakspace}%
+  \renewcommand{\crefmiddleconjunction}{, }%
+  \renewcommand{\creflastconjunction}{ et\nobreakspace}%
+  \renewcommand{\crefpairgroupconjunction}{ et\nobreakspace}%
+  \renewcommand{\crefmiddlegroupconjunction}{, }%
+  \renewcommand{\creflastgroupconjunction}{ et\nobreakspace}%
  %
-      \Crefname{equation}{{\'E}quation}{{\'E}quations}%
-      \Crefname{figure}{Figure}{Figures}%
-      \Crefname{subfigure}{Figure}{Figures}%
-      \Crefname{table}{Tableau}{Tableaux}%
-      \Crefname{subtable}{Tableau}{Tableaux}%
-      \Crefname{page}{Page}{Pages}%
-      \Crefname{part}{Partie}{Parties}%
-      \Crefname{chapter}{Chapitre}{Chapitres}%
-      \Crefname{section}{Section}{Sections}%
-      \Crefname{subsection}{Section}{Sections}%
-      \Crefname{subsubsection}{Section}{Sections}%
-      \Crefname{appendix}{Annexe}{Annexes}%
-      \Crefname{subappendix}{Annexe}{Annexes}%
-      \Crefname{subsubappendix}{Annexe}{Annexes}%
-      \Crefname{subsubsubappendix}{Annexe}{Annexes}%
-      \Crefname{enumi}{Point}{Points}%
-      \Crefname{enumii}{Point}{Points}%
-      \Crefname{enumiii}{Point}{Points}%
-      \Crefname{enumiv}{Point}{Points}%
-      \Crefname{enumv}{Point}{Points}%
-      \Crefname{footnote}{Note}{Notes}%
-      \Crefname{theorem}{Th\'eor\`eme}{Th\'eor\`emes}%
-      \Crefname{lemma}{Lemme}{Lemmes}%
-      \Crefname{corollary}{Corollaire}{Corollaires}%
-      \Crefname{proposition}{Proposition}{Propositions}%
-      \Crefname{definition}{D\'efinition}{D\'efinitions}%
-      \Crefname{result}{R\'esultat}{R\'esultats}%
-      \Crefname{example}{Exemple}{Exemples}%
-      \Crefname{remark}{Remarque}{Remarques}%
-      \Crefname{note}{Commentaire}{Commentaires}%
-      \Crefname{algorithm}{Algorithme}{Algorithmes}%
-      \Crefname{listing}{Liste}{Listes}%
-      \Crefname{line}{Ligne}{Lignes}%
+  \Crefname{equation}{{\'E}quation}{{\'E}quations}%
+  \Crefname{figure}{Figure}{Figures}%
+  \Crefname{subfigure}{Figure}{Figures}%
+  \Crefname{table}{Tableau}{Tableaux}%
+  \Crefname{subtable}{Tableau}{Tableaux}%
+  \Crefname{page}{Page}{Pages}%
+  \Crefname{part}{Partie}{Parties}%
+  \Crefname{chapter}{Chapitre}{Chapitres}%
+  \Crefname{section}{Section}{Sections}%
+  \Crefname{subsection}{Section}{Sections}%
+  \Crefname{subsubsection}{Section}{Sections}%
+  \Crefname{appendix}{Annexe}{Annexes}%
+  \Crefname{subappendix}{Annexe}{Annexes}%
+  \Crefname{subsubappendix}{Annexe}{Annexes}%
+  \Crefname{subsubsubappendix}{Annexe}{Annexes}%
+  \Crefname{enumi}{Point}{Points}%
+  \Crefname{enumii}{Point}{Points}%
+  \Crefname{enumiii}{Point}{Points}%
+  \Crefname{enumiv}{Point}{Points}%
+  \Crefname{enumv}{Point}{Points}%
+  \Crefname{footnote}{Note}{Notes}%
+  \Crefname{theorem}{Th\'eor\`eme}{Th\'eor\`emes}%
+  \Crefname{lemma}{Lemme}{Lemmes}%
+  \Crefname{corollary}{Corollaire}{Corollaires}%
+  \Crefname{proposition}{Proposition}{Propositions}%
+  \Crefname{definition}{D\'efinition}{D\'efinitions}%
+  \Crefname{result}{R\'esultat}{R\'esultats}%
+  \Crefname{example}{Exemple}{Exemples}%
+  \Crefname{remark}{Remarque}{Remarques}%
+  \Crefname{note}{Commentaire}{Commentaires}%
+  \Crefname{algorithm}{Algorithme}{Algorithmes}%
+  \Crefname{listing}{Liste}{Listes}%
+  \Crefname{line}{Ligne}{Lignes}%
  %
-      \if@cref@capitalise%  capitalise set
-        \crefname{equation}{{\'E}quation}{{\'E}quations}%
-        \crefname{figure}{Figure}{Figures}%
-        \crefname{subfigure}{Figure}{Figures}%
-        \crefname{table}{Tableau}{Tableaux}%
-        \crefname{subtable}{Tableau}{Tableaux}%
-        \crefname{page}{Page}{Pages}%
-        \crefname{part}{Partie}{Parties}%
-        \crefname{chapter}{Chapitre}{Chapitres}%
-        \crefname{section}{Section}{Sections}%
-        \crefname{subsection}{Section}{Sections}%
-        \crefname{subsubsection}{Section}{Sections}%
-        \crefname{appendix}{Annexe}{Annexes}%
-        \crefname{subappendix}{Annexe}{Annexes}%
-        \crefname{subsubappendix}{Annexe}{Annexes}%
-        \crefname{subsubsubappendix}{Annexe}{Annexes}%
-        \crefname{enumi}{Point}{Points}%
-        \crefname{enumii}{Point}{Points}%
-        \crefname{enumiii}{Point}{Points}%
-        \crefname{enumiv}{Point}{Points}%
-        \crefname{enumv}{Point}{Points}%
-        \crefname{footnote}{Note}{Notes}%
-        \crefname{theorem}{Th\'eor\`eme}{Th\'eor\`emes}%
-        \crefname{lemma}{Lemme}{Lemmes}%
-        \crefname{corollary}{Corollaire}{Corollaires}%
-        \crefname{proposition}{Proposition}{Propositions}%
-        \crefname{definition}{D\'efinition}{D\'efinitions}%
-        \crefname{result}{R\'esultat}{R\'esultats}%
-        \crefname{example}{Exemple}{Exemples}%
-        \crefname{remark}{Remarque}{Remarques}%
-        \crefname{note}{Commentaire}{Commentaires}%
-        \crefname{algorithm}{Algorithme}{Algorithmes}%
-        \crefname{listing}{Liste}{Listes}%
-        \crefname{line}{Ligne}{Lignes}%
+  \if@cref@capitalise%  capitalise set
+    \crefname{equation}{{\'E}quation}{{\'E}quations}%
+    \crefname{figure}{Figure}{Figures}%
+    \crefname{subfigure}{Figure}{Figures}%
+    \crefname{table}{Tableau}{Tableaux}%
+    \crefname{subtable}{Tableau}{Tableaux}%
+    \crefname{page}{Page}{Pages}%
+    \crefname{part}{Partie}{Parties}%
+    \crefname{chapter}{Chapitre}{Chapitres}%
+    \crefname{section}{Section}{Sections}%
+    \crefname{subsection}{Section}{Sections}%
+    \crefname{subsubsection}{Section}{Sections}%
+    \crefname{appendix}{Annexe}{Annexes}%
+    \crefname{subappendix}{Annexe}{Annexes}%
+    \crefname{subsubappendix}{Annexe}{Annexes}%
+    \crefname{subsubsubappendix}{Annexe}{Annexes}%
+    \crefname{enumi}{Point}{Points}%
+    \crefname{enumii}{Point}{Points}%
+    \crefname{enumiii}{Point}{Points}%
+    \crefname{enumiv}{Point}{Points}%
+    \crefname{enumv}{Point}{Points}%
+    \crefname{footnote}{Note}{Notes}%
+    \crefname{theorem}{Th\'eor\`eme}{Th\'eor\`emes}%
+    \crefname{lemma}{Lemme}{Lemmes}%
+    \crefname{corollary}{Corollaire}{Corollaires}%
+    \crefname{proposition}{Proposition}{Propositions}%
+    \crefname{definition}{D\'efinition}{D\'efinitions}%
+    \crefname{result}{R\'esultat}{R\'esultats}%
+    \crefname{example}{Exemple}{Exemples}%
+    \crefname{remark}{Remarque}{Remarques}%
+    \crefname{note}{Commentaire}{Commentaires}%
+    \crefname{algorithm}{Algorithme}{Algorithmes}%
+    \crefname{listing}{Liste}{Listes}%
+    \crefname{line}{Ligne}{Lignes}%
  %
-      \else%  capitalise unset
-        \crefname{equation}{{\'e}quation}{{\'e}quations}%
-        \crefname{figure}{figure}{figures}%
-        \crefname{subfigure}{figure}{figures}%
-        \crefname{table}{tableau}{tableaux}%
-        \crefname{subtable}{tableau}{tableaux}%
-        \crefname{page}{page}{pages}%
-        \crefname{part}{partie}{parties}%
-        \crefname{chapter}{chapitre}{chapitres}%
-        \crefname{section}{section}{sections}%
-        \crefname{subsection}{section}{sections}%
-        \crefname{subsubsection}{section}{sections}%
-        \crefname{appendix}{annexe}{annexes}%
-        \crefname{subappendix}{annexe}{annexes}%
-        \crefname{subsubappendix}{annexe}{annexes}%
-        \crefname{subsubsubappendix}{annexe}{annexes}%
-        \crefname{enumi}{point}{points}%
-        \crefname{enumii}{point}{points}%
-        \crefname{enumiii}{point}{points}%
-        \crefname{enumiv}{point}{points}%
-        \crefname{enumv}{point}{points}%
-        \crefname{footnote}{note}{notes}%
-        \crefname{theorem}{th\'eor\`eme}{th\'eor\`emes}%
-        \crefname{lemma}{lemme}{lemmes}%
-        \crefname{corollary}{corollaire}{corollaires}%
-        \crefname{proposition}{proposition}{propositions}%
-        \crefname{definition}{d\'efinition}{d\'efinitions}%
-        \crefname{result}{r\'esultat}{r\'esultats}%
-        \crefname{example}{exemple}{exemples}%
-        \crefname{remark}{remarque}{remarques}%
-        \crefname{note}{commentaire}{commentaires}%
-        \crefname{algorithm}{algorithme}{algorithmes}%
-        \crefname{listing}{liste}{listes}%
-        \crefname{line}{ligne}{lignes}%
-      \fi%
-    }}}
+  \else%  capitalise unset
+    \crefname{equation}{{\'e}quation}{{\'e}quations}%
+    \crefname{figure}{figure}{figures}%
+    \crefname{subfigure}{figure}{figures}%
+    \crefname{table}{tableau}{tableaux}%
+    \crefname{subtable}{tableau}{tableaux}%
+    \crefname{page}{page}{pages}%
+    \crefname{part}{partie}{parties}%
+    \crefname{chapter}{chapitre}{chapitres}%
+    \crefname{section}{section}{sections}%
+    \crefname{subsection}{section}{sections}%
+    \crefname{subsubsection}{section}{sections}%
+    \crefname{appendix}{annexe}{annexes}%
+    \crefname{subappendix}{annexe}{annexes}%
+    \crefname{subsubappendix}{annexe}{annexes}%
+    \crefname{subsubsubappendix}{annexe}{annexes}%
+    \crefname{enumi}{point}{points}%
+    \crefname{enumii}{point}{points}%
+    \crefname{enumiii}{point}{points}%
+    \crefname{enumiv}{point}{points}%
+    \crefname{enumv}{point}{points}%
+    \crefname{footnote}{note}{notes}%
+    \crefname{theorem}{th\'eor\`eme}{th\'eor\`emes}%
+    \crefname{lemma}{lemme}{lemmes}%
+    \crefname{corollary}{corollaire}{corollaires}%
+    \crefname{proposition}{proposition}{propositions}%
+    \crefname{definition}{d\'efinition}{d\'efinitions}%
+    \crefname{result}{r\'esultat}{r\'esultats}%
+    \crefname{example}{exemple}{exemples}%
+    \crefname{remark}{remarque}{remarques}%
+    \crefname{note}{commentaire}{commentaires}%
+    \crefname{algorithm}{algorithme}{algorithmes}%
+    \crefname{listing}{liste}{listes}%
+    \crefname{line}{ligne}{lignes}%
+  \fi}% end \cref@loadlanguagedefs
 %    \end{macrocode}
 %
 %
@@ -9017,13 +9077,11 @@
 % \begin{macro}{spanish}
 %   Spanish translations generously contributed by Gonzalo Medina.
 % \end{macro}
+%
+% Set up the definitions used at the beginning of the document to define
+% the formats created by the document preamble.
 %    \begin{macrocode}
 \DeclareOption{spanish}{%
-  \PackageInfo{cleveref}{loaded `spanish' language definitions}
-%    \end{macrocode}
-% First, we set up the definitions used at the beginning of the document to
-% define the formats created by the document preamble.
-%    \begin{macrocode}
   \AtBeginDocument{%
     \def\crefrangeconjunction@preamble{ a\nobreakspace}%
     \def\crefrangepreconjunction@preamble{}%
@@ -9107,128 +9165,131 @@
       \crefname@preamble{line}{l\'inea}{l\'ineas}%
     \fi%
     \def\cref@language{spanish}%
+  }}% end \DeclareOption and \AtBeginDocument
 %    \end{macrocode}
 %
-% Next, we add the definitions to \cmd{\extras}\dots{} so that
-% \package{babel}'s \cmd{\selectlanguage} command will change the format
-% appropriately.
-%    \begin{macrocode}
-    \cref@addto\extrasspanish{%
-      \renewcommand{\crefrangeconjunction}{ a\nobreakspace}%
-      \renewcommand{\crefrangepreconjunction}{}%
-      \renewcommand{\crefrangepostconjunction}{}%
-      \renewcommand{\crefpairconjunction}{ y\nobreakspace}%
-      \renewcommand{\crefmiddleconjunction}{, }%
-      \renewcommand{\creflastconjunction}{ y\nobreakspace}%
-      \renewcommand{\crefpairgroupconjunction}{ y\nobreakspace}%
-      \renewcommand{\crefmiddlegroupconjunction}{, }%
-      \renewcommand{\creflastgroupconjunction}{ y\nobreakspace}%
+% If using \package{babel} and the corresponding option is set, or if
+% using \package{polyglossia} and the language has been loaded, add
+% format definition commands to \cmd{\extras}\meta{language} or
+% \cmd{\captions}\meta{language} so that language switching commands will
+% change the cross-reference formats appropriately.
+%    \begin{macrocode}
+\cref@addlanguagedefs{spanish}{%
+  \PackageInfo{cleveref}{loaded `spanish' language definitions}
+  \renewcommand{\crefrangeconjunction}{ a\nobreakspace}%
+  \renewcommand{\crefrangepreconjunction}{}%
+  \renewcommand{\crefrangepostconjunction}{}%
+  \renewcommand{\crefpairconjunction}{ y\nobreakspace}%
+  \renewcommand{\crefmiddleconjunction}{, }%
+  \renewcommand{\creflastconjunction}{ y\nobreakspace}%
+  \renewcommand{\crefpairgroupconjunction}{ y\nobreakspace}%
+  \renewcommand{\crefmiddlegroupconjunction}{, }%
+  \renewcommand{\creflastgroupconjunction}{ y\nobreakspace}%
  %
-      \Crefname{equation}{Ecuaci\'on}{Ecuaciones}%
-      \Crefname{figure}{Figura}{Figuras}%
-      \Crefname{subfigure}{Figura}{Figuras}%
-      \Crefname{table}{Cuadro}{Cuadros}%
-      \Crefname{subtable}{Cuadro}{Cuadros}%
-      \Crefname{page}{P\'agina}{P\'aginas}%
-      \Crefname{part}{Parte}{Partes}%
-      \Crefname{chapter}{Cap\'itulo}{Cap\'itulos}%
-      \Crefname{section}{Apartado}{Apartados}%
-      \Crefname{subsection}{Apartado}{Apartados}%
-      \Crefname{subsubsection}{Apartado}{Apartados}%
-      \Crefname{appendix}{Ap\'endice}{Ap\'endices}%
-      \Crefname{subappendix}{Ap\'endice}{Ap\'endices}%
-      \Crefname{subsubappendix}{Ap\'endice}{Ap\'endices}%
-      \Crefname{subsubsubappendix}{Ap\'endice}{Ap\'endices}%
-      \Crefname{enumi}{Punto}{Puntos}%
-      \Crefname{enumii}{Punto}{Puntos}%
-      \Crefname{enumiii}{Punto}{Puntos}%
-      \Crefname{enumiv}{Punto}{Puntos}%
-      \Crefname{enumv}{Punto}{Puntos}%
-      \Crefname{footnote}{Nota}{Notas}%
-      \Crefname{theorem}{Teorema}{Teoremas}%
-      \Crefname{lemma}{Lema}{Lemas}%
-      \Crefname{corollary}{Corolario}{Corolarios}%
-      \Crefname{proposition}{Proposici\'on}{Proposiciones}%
-      \Crefname{definition}{Definici\'on}{Definiciones}%
-      \Crefname{result}{Resultado}{Resultados}%
-      \Crefname{example}{Ejemplo}{Ejemplos}%
-      \Crefname{remark}{Observaci\'on}{Observaci\'on}%
-      \Crefname{note}{Nota}{Notas}%
-      \Crefname{algorithm}{Algoritmo}{Algoritmos}%
-      \Crefname{listing}{Listado}{Listados}%
-      \Crefname{line}{L\'inea}{L\'ineas}%
+  \Crefname{equation}{Ecuaci\'on}{Ecuaciones}%
+  \Crefname{figure}{Figura}{Figuras}%
+  \Crefname{subfigure}{Figura}{Figuras}%
+  \Crefname{table}{Cuadro}{Cuadros}%
+  \Crefname{subtable}{Cuadro}{Cuadros}%
+  \Crefname{page}{P\'agina}{P\'aginas}%
+  \Crefname{part}{Parte}{Partes}%
+  \Crefname{chapter}{Cap\'itulo}{Cap\'itulos}%
+  \Crefname{section}{Apartado}{Apartados}%
+  \Crefname{subsection}{Apartado}{Apartados}%
+  \Crefname{subsubsection}{Apartado}{Apartados}%
+  \Crefname{appendix}{Ap\'endice}{Ap\'endices}%
+  \Crefname{subappendix}{Ap\'endice}{Ap\'endices}%
+  \Crefname{subsubappendix}{Ap\'endice}{Ap\'endices}%
+  \Crefname{subsubsubappendix}{Ap\'endice}{Ap\'endices}%
+  \Crefname{enumi}{Punto}{Puntos}%
+  \Crefname{enumii}{Punto}{Puntos}%
+  \Crefname{enumiii}{Punto}{Puntos}%
+  \Crefname{enumiv}{Punto}{Puntos}%
+  \Crefname{enumv}{Punto}{Puntos}%
+  \Crefname{footnote}{Nota}{Notas}%
+  \Crefname{theorem}{Teorema}{Teoremas}%
+  \Crefname{lemma}{Lema}{Lemas}%
+  \Crefname{corollary}{Corolario}{Corolarios}%
+  \Crefname{proposition}{Proposici\'on}{Proposiciones}%
+  \Crefname{definition}{Definici\'on}{Definiciones}%
+  \Crefname{result}{Resultado}{Resultados}%
+  \Crefname{example}{Ejemplo}{Ejemplos}%
+  \Crefname{remark}{Observaci\'on}{Observaci\'on}%
+  \Crefname{note}{Nota}{Notas}%
+  \Crefname{algorithm}{Algoritmo}{Algoritmos}%
+  \Crefname{listing}{Listado}{Listados}%
+  \Crefname{line}{L\'inea}{L\'ineas}%
  %
-      \if@cref@capitalise%  capitalise set
-        \crefname{equation}{Ecuaci\'on}{Ecuaciones}%
-        \crefname{figure}{Figura}{Figuras}%
-        \crefname{subfigure}{Figura}{Figuras}%
-        \crefname{table}{Cuadro}{Cuadros}%
-        \crefname{subtable}{Cuadro}{Cuadros}%
-        \crefname{page}{P\'agina}{P\'aginas}%
-        \crefname{part}{Parte}{Partes}%
-        \crefname{chapter}{Cap\'itulo}{Cap\'itulos}%
-        \crefname{section}{Apartado}{Apartados}%
-        \crefname{subsection}{Apartado}{Apartados}%
-        \crefname{subsubsection}{Apartado}{Apartados}%
-        \crefname{appendix}{Ap\'endice}{Ap\'endices}%
-        \crefname{subappendix}{Ap\'endice}{Ap\'endices}%
-        \crefname{subsubappendix}{Ap\'endice}{Ap\'endices}%
-        \crefname{subsubsubappendix}{Ap\'endice}{Ap\'endices}%
-        \crefname{enumi}{Punto}{Puntos}%
-        \crefname{enumii}{Punto}{Puntos}%
-        \crefname{enumiii}{Punto}{Puntos}%
-        \crefname{enumiv}{Punto}{Puntos}%
-        \crefname{enumv}{Punto}{Puntos}%
-        \crefname{footnote}{Nota}{Notas}%
-        \crefname{theorem}{Teorema}{Teoremas}%
-        \crefname{lemma}{Lema}{Lemas}%
-        \crefname{corollary}{Corolario}{Corolarios}%
-        \crefname{proposition}{Proposici\'on}{Proposiciones}%
-        \crefname{definition}{Definici\'on}{Definiciones}%
-        \crefname{result}{Resultado}{Resultados}%
-        \crefname{example}{Ejemplo}{Ejemplos}%
-        \crefname{remark}{Observaci\'on}{Observaci\'ones}%
-        \crefname{note}{Nota}{Notas}%
-        \crefname{algorithm}{Algoritmo}{Algoritmos}%
-        \crefname{listing}{Listado}{Listados}%
-        \crefname{line}{L\'inea}{L\'ineas}%
+  \if@cref@capitalise%  capitalise set
+    \crefname{equation}{Ecuaci\'on}{Ecuaciones}%
+    \crefname{figure}{Figura}{Figuras}%
+    \crefname{subfigure}{Figura}{Figuras}%
+    \crefname{table}{Cuadro}{Cuadros}%
+    \crefname{subtable}{Cuadro}{Cuadros}%
+    \crefname{page}{P\'agina}{P\'aginas}%
+    \crefname{part}{Parte}{Partes}%
+    \crefname{chapter}{Cap\'itulo}{Cap\'itulos}%
+    \crefname{section}{Apartado}{Apartados}%
+    \crefname{subsection}{Apartado}{Apartados}%
+    \crefname{subsubsection}{Apartado}{Apartados}%
+    \crefname{appendix}{Ap\'endice}{Ap\'endices}%
+    \crefname{subappendix}{Ap\'endice}{Ap\'endices}%
+    \crefname{subsubappendix}{Ap\'endice}{Ap\'endices}%
+    \crefname{subsubsubappendix}{Ap\'endice}{Ap\'endices}%
+    \crefname{enumi}{Punto}{Puntos}%
+    \crefname{enumii}{Punto}{Puntos}%
+    \crefname{enumiii}{Punto}{Puntos}%
+    \crefname{enumiv}{Punto}{Puntos}%
+    \crefname{enumv}{Punto}{Puntos}%
+    \crefname{footnote}{Nota}{Notas}%
+    \crefname{theorem}{Teorema}{Teoremas}%
+    \crefname{lemma}{Lema}{Lemas}%
+    \crefname{corollary}{Corolario}{Corolarios}%
+    \crefname{proposition}{Proposici\'on}{Proposiciones}%
+    \crefname{definition}{Definici\'on}{Definiciones}%
+    \crefname{result}{Resultado}{Resultados}%
+    \crefname{example}{Ejemplo}{Ejemplos}%
+    \crefname{remark}{Observaci\'on}{Observaci\'ones}%
+    \crefname{note}{Nota}{Notas}%
+    \crefname{algorithm}{Algoritmo}{Algoritmos}%
+    \crefname{listing}{Listado}{Listados}%
+    \crefname{line}{L\'inea}{L\'ineas}%
  %
-      \else%  capitalise unset
-        \crefname{equation}{ecuaci\'on}{ecuaciones}%
-        \crefname{figure}{figura}{figuras}%
-        \crefname{subfigure}{figura}{figuras}%
-        \crefname{table}{cuadro}{cuadros}%
-        \crefname{subtable}{cuadro}{cuadros}%
-        \crefname{page}{p\'agina}{p\'aginas}%
-        \crefname{part}{parte}{partes}%
-        \crefname{chapter}{cap\'itulo}{cap\'itulos}%
-        \crefname{section}{apartado}{apartados}%
-        \crefname{subsection}{apartado}{apartados}%
-        \crefname{subsubsection}{apartado}{apartados}%
-        \crefname{appendix}{ap\'endice}{ap\'endices}%
-        \crefname{subappendix}{ap\'endice}{ap\'endices}%
-        \crefname{subsubappendix}{ap\'endice}{ap\'endices}%
-        \crefname{subsubsubappendix}{ap\'endice}{ap\'endices}%
-        \crefname{enumi}{punto}{puntos}%
-        \crefname{enumii}{punto}{puntos}%
-        \crefname{enumiii}{punto}{puntos}%
-        \crefname{enumiv}{punto}{puntos}%
-        \crefname{enumv}{punto}{puntos}%
-        \crefname{footnote}{nota}{notas}%
-        \crefname{theorem}{teorema}{teoremas}%
-        \crefname{lemma}{lema}{lemas}%
-        \crefname{corollary}{corolario}{corolarios}%
-        \crefname{proposition}{proposici\'on}{proposiciones}%
-        \crefname{definition}{definici\'on}{definiciones}%
-        \crefname{result}{resultado}{resultados}%
-        \crefname{example}{ejemplo}{ejemplos}%
-        \crefname{remark}{observaci\'on}{observaci\'ones}%
-        \crefname{note}{nota}{notas}%
-        \crefname{algorithm}{algoritmo}{algoritmos}%
-        \crefname{listing}{listado}{listados}%
-        \crefname{line}{l\'inea}{l\'ineas}%
-      \fi%
-    }}}
+  \else%  capitalise unset
+    \crefname{equation}{ecuaci\'on}{ecuaciones}%
+    \crefname{figure}{figura}{figuras}%
+    \crefname{subfigure}{figura}{figuras}%
+    \crefname{table}{cuadro}{cuadros}%
+    \crefname{subtable}{cuadro}{cuadros}%
+    \crefname{page}{p\'agina}{p\'aginas}%
+    \crefname{part}{parte}{partes}%
+    \crefname{chapter}{cap\'itulo}{cap\'itulos}%
+    \crefname{section}{apartado}{apartados}%
+    \crefname{subsection}{apartado}{apartados}%
+    \crefname{subsubsection}{apartado}{apartados}%
+    \crefname{appendix}{ap\'endice}{ap\'endices}%
+    \crefname{subappendix}{ap\'endice}{ap\'endices}%
+    \crefname{subsubappendix}{ap\'endice}{ap\'endices}%
+    \crefname{subsubsubappendix}{ap\'endice}{ap\'endices}%
+    \crefname{enumi}{punto}{puntos}%
+    \crefname{enumii}{punto}{puntos}%
+    \crefname{enumiii}{punto}{puntos}%
+    \crefname{enumiv}{punto}{puntos}%
+    \crefname{enumv}{punto}{puntos}%
+    \crefname{footnote}{nota}{notas}%
+    \crefname{theorem}{teorema}{teoremas}%
+    \crefname{lemma}{lema}{lemas}%
+    \crefname{corollary}{corolario}{corolarios}%
+    \crefname{proposition}{proposici\'on}{proposiciones}%
+    \crefname{definition}{definici\'on}{definiciones}%
+    \crefname{result}{resultado}{resultados}%
+    \crefname{example}{ejemplo}{ejemplos}%
+    \crefname{remark}{observaci\'on}{observaci\'ones}%
+    \crefname{note}{nota}{notas}%
+    \crefname{algorithm}{algoritmo}{algoritmos}%
+    \crefname{listing}{listado}{listados}%
+    \crefname{line}{l\'inea}{l\'ineas}%
+  \fi}% end \cref@loadlanguagedefs
 %    \end{macrocode}
 %
 %
@@ -9236,14 +9297,11 @@
 % \begin{macro}{italian}
 %   Italian translations kindly contributed by Massimo Redaelli.
 % \end{macro}
+%
+% Set up the definitions used at the beginning of the document to define
+% the formats created by the document preamble.
 %    \begin{macrocode}
 \DeclareOption{italian}{%
-  \PackageInfo{cleveref}{loaded `italian' language definitions}
-%    \end{macrocode}
-% First, we set up the definitions used at the beginning of the document to
-% define the formats created by the document preamble. (Note that Italian
-% makes use of |\crefrangepreconjunction|.)
-%    \begin{macrocode}
   \AtBeginDocument{%
     \def\crefrangeconjunction@preamble{ a\nobreakspace}%
     \def\crefrangepreconjunction@preamble{da\nobreakspace}%
@@ -9343,140 +9401,143 @@
       \crefname@preamble{line}{linea}{linee}%
     \fi%
     \def\cref@language{italian}%
+  }}% end \DeclareOption and \AtBeginDocument
 %    \end{macrocode}
 %
-% Next, we add the definitions to \cmd{\extras}\dots{} so that
-% \package{babel}'s \cmd{\selectlanguage} command will change the format
-% appropriately.
-%    \begin{macrocode}
-    \cref@addto\extrasitalian{%
-      \renewcommand{\crefrangeconjunction}{ a\nobreakspace}%
-      \renewcommand\crefrangepreconjunction{da\nobreakspace}%
-      \renewcommand\crefrangepostconjunction{}%
-      \renewcommand{\crefpairconjunction}{ e\nobreakspace}%
-      \renewcommand{\crefmiddleconjunction}{, }%
-      \renewcommand{\creflastconjunction}{ e\nobreakspace}%
-      \renewcommand{\crefpairgroupconjunction}{ e\nobreakspace}%
-      \renewcommand{\crefmiddlegroupconjunction}{, }%
-      \renewcommand{\creflastgroupconjunction}{ e\nobreakspace}%
+% If using \package{babel} and the corresponding option is set, or if
+% using \package{polyglossia} and the language has been loaded, add
+% format definition commands to \cmd{\extras}\meta{language} or
+% \cmd{\captions}\meta{language} so that language switching commands will
+% change the cross-reference formats appropriately.
+%    \begin{macrocode}
+\cref@addlanguagedefs{italian}{%
+  \PackageInfo{cleveref}{loaded `italian' language definitions}
+  \renewcommand{\crefrangeconjunction}{ a\nobreakspace}%
+  \renewcommand\crefrangepreconjunction{da\nobreakspace}%
+  \renewcommand\crefrangepostconjunction{}%
+  \renewcommand{\crefpairconjunction}{ e\nobreakspace}%
+  \renewcommand{\crefmiddleconjunction}{, }%
+  \renewcommand{\creflastconjunction}{ e\nobreakspace}%
+  \renewcommand{\crefpairgroupconjunction}{ e\nobreakspace}%
+  \renewcommand{\crefmiddlegroupconjunction}{, }%
+  \renewcommand{\creflastgroupconjunction}{ e\nobreakspace}%
  %
-      \Crefname{equation}{Equazione}{Equazioni}%
-      \Crefname{figure}{Figura}{Figure}%
-      \Crefname{subfigure}{Figura}{Figure}%
-      \Crefname{table}{Tabella}{Tabelle}%
-      \Crefname{subtable}{Tabella}{Tabelle}%
-      \Crefname{page}{Pagina}{Pagine}%
-      \Crefname{part}{Parte}{Parti}%
-      \Crefname{chapter}{Capitolo}{Capitoli}%
-      \Crefname{section}{Sezione}{Sezioni}%
-      \Crefname{subsection}{Sezione}{Sezioni}%
-      \Crefname{subsubsection}{Sezione}{Sezioni}%
-      \Crefname{appendix}{Appendice}{Appendici}%
-      \Crefname{subappendix}{Appendice}{Appendici}%
-      \Crefname{subsubappendix}{Appendice}{Appendici}%
-      \Crefname{subsubsubappendix}{Appendice}{Appendici}%
-      \Crefname{enumi}{Voce}{Voci}%
-      \Crefname{enumii}{Voce}{Voci}%
-      \Crefname{enumiii}{Voce}{Voci}%
-      \Crefname{enumiv}{Voce}{Voci}%
-      \Crefname{enumv}{Voce}{Voci}%
-      \Crefname{footnote}{Nota}{Note}%
-      \Crefname{theorem}{Teorema}{Teoremi}%
-      \Crefname{lemma}{Lemma}{Lemmi}%
-      \Crefname{corollary}{Corollario}{Corollari}%
-      \Crefname{proposition}{Proposizione}{Proposizioni}%
-      \Crefname{definition}{Definizione}{Definizione}%
-      \Crefname{result}{Risultato}{Risultati}%
-      \Crefname{example}{esempio}{esempi}%
-      \Crefname{remark}{Osservazione}{Osservazioni}%
-      \Crefname{note}{Nota}{Note}%
-      \Crefname{algorithm}{Algoritmo}{Algoritmi}%
-      \Crefname{listing}{Elenco}{Elenchi}%
-      \Crefname{line}{Linea}{Linee}%
+  \Crefname{equation}{Equazione}{Equazioni}%
+  \Crefname{figure}{Figura}{Figure}%
+  \Crefname{subfigure}{Figura}{Figure}%
+  \Crefname{table}{Tabella}{Tabelle}%
+  \Crefname{subtable}{Tabella}{Tabelle}%
+  \Crefname{page}{Pagina}{Pagine}%
+  \Crefname{part}{Parte}{Parti}%
+  \Crefname{chapter}{Capitolo}{Capitoli}%
+  \Crefname{section}{Sezione}{Sezioni}%
+  \Crefname{subsection}{Sezione}{Sezioni}%
+  \Crefname{subsubsection}{Sezione}{Sezioni}%
+  \Crefname{appendix}{Appendice}{Appendici}%
+  \Crefname{subappendix}{Appendice}{Appendici}%
+  \Crefname{subsubappendix}{Appendice}{Appendici}%
+  \Crefname{subsubsubappendix}{Appendice}{Appendici}%
+  \Crefname{enumi}{Voce}{Voci}%
+  \Crefname{enumii}{Voce}{Voci}%
+  \Crefname{enumiii}{Voce}{Voci}%
+  \Crefname{enumiv}{Voce}{Voci}%
+  \Crefname{enumv}{Voce}{Voci}%
+  \Crefname{footnote}{Nota}{Note}%
+  \Crefname{theorem}{Teorema}{Teoremi}%
+  \Crefname{lemma}{Lemma}{Lemmi}%
+  \Crefname{corollary}{Corollario}{Corollari}%
+  \Crefname{proposition}{Proposizione}{Proposizioni}%
+  \Crefname{definition}{Definizione}{Definizione}%
+  \Crefname{result}{Risultato}{Risultati}%
+  \Crefname{example}{esempio}{esempi}%
+  \Crefname{remark}{Osservazione}{Osservazioni}%
+  \Crefname{note}{Nota}{Note}%
+  \Crefname{algorithm}{Algoritmo}{Algoritmi}%
+  \Crefname{listing}{Elenco}{Elenchi}%
+  \Crefname{line}{Linea}{Linee}%
  %
-      \if@cref@capitalise%  capitalise set
-        \if@cref@abbrev%
-          \crefname{equation}{Eq.}{Eq.}%
-          \crefname{figure}{Fig.}{Fig.}%
-          \crefname{subfigure}{Fig.}{Fig.}%
-        \else%
-          \crefname{equation}{Equazione}{Equazioni}%
-          \crefname{figure}{Figura}{Figure}%
-          \crefname{figure}{Figura}{Figure}%
-        \fi%
-        \crefname{table}{Tabella}{Tabelle}%
-        \crefname{page}{Pagina}{Pagine}%
-        \crefname{subtable}{Tabella}{Tabelle}%
-        \crefname{part}{Parte}{Parti}%
-        \crefname{chapter}{Capitolo}{Capitoli}%
-        \crefname{section}{Sezione}{Sezioni}%
-        \crefname{subsection}{Sezione}{Sezioni}%
-        \crefname{subsubsection}{Sezione}{Sezioni}%
-        \crefname{appendix}{Appendice}{Appendici}%
-        \crefname{subappendix}{Appendice}{Appendici}%
-        \crefname{subsubappendix}{Appendice}{Appendici}%
-        \crefname{subsubsubappendix}{Appendice}{Appendici}%
-        \crefname{enumi}{Voce}{Voci}%
-        \crefname{enumii}{Voce}{Voci}%
-        \crefname{enumiii}{Voce}{Voci}%
-        \crefname{enumiv}{Voce}{Voci}%
-        \crefname{enumv}{Voce}{Voci}%
-        \crefname{footnote}{Nota}{Note}%
-        \crefname{theorem}{Teorema}{Teoremi}%
-        \crefname{lemma}{Lemma}{Lemmi}%
-        \crefname{corollary}{Corollario}{Corollari}%
-        \crefname{proposition}{Proposizione}{Proposizioni}%
-        \crefname{definition}{Definizione}{Definizione}%
-        \crefname{result}{Risultato}{Risultati}%
-        \crefname{example}{Esempio}{Esempi}%
-        \crefname{remark}{Osservazione}{Osservazioni}%
-        \crefname{note}{Nota}{Note}%
-        \crefname{algorithm}{Algoritmo}{Algoritmi}%
-        \crefname{listing}{Elenco}{Elenchi}%
-        \crefname{line}{Linea}{Linee}%
+  \if@cref@capitalise%  capitalise set
+    \if@cref@abbrev%
+      \crefname{equation}{Eq.}{Eq.}%
+      \crefname{figure}{Fig.}{Fig.}%
+      \crefname{subfigure}{Fig.}{Fig.}%
+    \else%
+      \crefname{equation}{Equazione}{Equazioni}%
+      \crefname{figure}{Figura}{Figure}%
+      \crefname{figure}{Figura}{Figure}%
+    \fi%
+    \crefname{table}{Tabella}{Tabelle}%
+    \crefname{page}{Pagina}{Pagine}%
+    \crefname{subtable}{Tabella}{Tabelle}%
+    \crefname{part}{Parte}{Parti}%
+    \crefname{chapter}{Capitolo}{Capitoli}%
+    \crefname{section}{Sezione}{Sezioni}%
+    \crefname{subsection}{Sezione}{Sezioni}%
+    \crefname{subsubsection}{Sezione}{Sezioni}%
+    \crefname{appendix}{Appendice}{Appendici}%
+    \crefname{subappendix}{Appendice}{Appendici}%
+    \crefname{subsubappendix}{Appendice}{Appendici}%
+    \crefname{subsubsubappendix}{Appendice}{Appendici}%
+    \crefname{enumi}{Voce}{Voci}%
+    \crefname{enumii}{Voce}{Voci}%
+    \crefname{enumiii}{Voce}{Voci}%
+    \crefname{enumiv}{Voce}{Voci}%
+    \crefname{enumv}{Voce}{Voci}%
+    \crefname{footnote}{Nota}{Note}%
+    \crefname{theorem}{Teorema}{Teoremi}%
+    \crefname{lemma}{Lemma}{Lemmi}%
+    \crefname{corollary}{Corollario}{Corollari}%
+    \crefname{proposition}{Proposizione}{Proposizioni}%
+    \crefname{definition}{Definizione}{Definizione}%
+    \crefname{result}{Risultato}{Risultati}%
+    \crefname{example}{Esempio}{Esempi}%
+    \crefname{remark}{Osservazione}{Osservazioni}%
+    \crefname{note}{Nota}{Note}%
+    \crefname{algorithm}{Algoritmo}{Algoritmi}%
+    \crefname{listing}{Elenco}{Elenchi}%
+    \crefname{line}{Linea}{Linee}%
  %
-      \else%  capitalise unset
-        \if@cref@abbrev%
-          \crefname{equation}{eq.}{eq.}%
-          \crefname{figure}{fig.}{fig.}%
-          \crefname{subfigure}{fig.}{fig.}%
-        \else%
-          \crefname{equation}{equazione}{equazioni}%
-          \crefname{figure}{figura}{figure}%
-          \crefname{figure}{figura}{figure}%
-        \fi%
-        \crefname{table}{tabella}{tabelle}%
-        \crefname{page}{pagina}{pagine}%
-        \crefname{subtable}{tabella}{tabelle}%
-        \crefname{part}{parte}{parti}%
-        \crefname{chapter}{capitolo}{capitoli}%
-        \crefname{section}{sezione}{sezioni}%
-        \crefname{subsection}{sezione}{sezioni}%
-        \crefname{subsubsection}{sezione}{sezioni}%
-        \crefname{appendix}{appendice}{appendici}%
-        \crefname{subappendix}{appendice}{appendici}%
-        \crefname{subsubappendix}{appendice}{appendici}%
-        \crefname{subsubsubappendix}{appendice}{appendici}%
-        \crefname{enumi}{voce}{voci}%
-        \crefname{enumii}{voce}{voci}%
-        \crefname{enumiii}{voce}{voci}%
-        \crefname{enumiv}{voce}{voci}%
-        \crefname{enumv}{voce}{voci}%
-        \crefname{footnote}{nota}{note}%
-        \crefname{theorem}{teorema}{teoremi}%
-        \crefname{lemma}{lemma}{lemmi}%
-        \crefname{corollary}{corollario}{corollari}%
-        \crefname{proposition}{proposizione}{proposizioni}%
-        \crefname{definition}{definizione}{definizione}%
-        \crefname{result}{risultato}{risultati}%
-        \crefname{example}{esempio}{esempi}%
-        \crefname{remark}{osservazione}{osservazioni}%
-        \crefname{note}{nota}{note}%
-        \crefname{algorithm}{algoritmo}{algoritmi}%
-        \crefname{listing}{elenco}{elenchi}%
-        \crefname{line}{linea}{linee}%
-      \fi%
-    }}}
+  \else%  capitalise unset
+    \if@cref@abbrev%
+      \crefname{equation}{eq.}{eq.}%
+      \crefname{figure}{fig.}{fig.}%
+      \crefname{subfigure}{fig.}{fig.}%
+    \else%
+      \crefname{equation}{equazione}{equazioni}%
+      \crefname{figure}{figura}{figure}%
+      \crefname{figure}{figura}{figure}%
+    \fi%
+    \crefname{table}{tabella}{tabelle}%
+    \crefname{page}{pagina}{pagine}%
+    \crefname{subtable}{tabella}{tabelle}%
+    \crefname{part}{parte}{parti}%
+    \crefname{chapter}{capitolo}{capitoli}%
+    \crefname{section}{sezione}{sezioni}%
+    \crefname{subsection}{sezione}{sezioni}%
+    \crefname{subsubsection}{sezione}{sezioni}%
+    \crefname{appendix}{appendice}{appendici}%
+    \crefname{subappendix}{appendice}{appendici}%
+    \crefname{subsubappendix}{appendice}{appendici}%
+    \crefname{subsubsubappendix}{appendice}{appendici}%
+    \crefname{enumi}{voce}{voci}%
+    \crefname{enumii}{voce}{voci}%
+    \crefname{enumiii}{voce}{voci}%
+    \crefname{enumiv}{voce}{voci}%
+    \crefname{enumv}{voce}{voci}%
+    \crefname{footnote}{nota}{note}%
+    \crefname{theorem}{teorema}{teoremi}%
+    \crefname{lemma}{lemma}{lemmi}%
+    \crefname{corollary}{corollario}{corollari}%
+    \crefname{proposition}{proposizione}{proposizioni}%
+    \crefname{definition}{definizione}{definizione}%
+    \crefname{result}{risultato}{risultati}%
+    \crefname{example}{esempio}{esempi}%
+    \crefname{remark}{osservazione}{osservazioni}%
+    \crefname{note}{nota}{note}%
+    \crefname{algorithm}{algoritmo}{algoritmi}%
+    \crefname{listing}{elenco}{elenchi}%
+    \crefname{line}{linea}{linee}%
+  \fi}% end \cref@loadlanguagedefs
 %    \end{macrocode}
 %
 %
@@ -9484,13 +9545,11 @@
 % \begin{macro}{russian}
 %   Russian translations generously contributed by Aleksander Gorohovski.
 % \end{macro}
+%
+% Set up the definitions used at the beginning of the document to define
+% the formats created by the document preamble.
 %    \begin{macrocode}
 \DeclareOption{russian}{%
-  \PackageInfo{cleveref}{loaded `russian' language definitions}
-%    \end{macrocode}
-% First, we set up the definitions used at the beginning of the document
-% to define the formats created by the document preamble.
-%    \begin{macrocode}
   \AtBeginDocument{%
     \def\crefrangeconjunction@preamble{--}%
     \def\crefrangepreconjunction@preamble{}%
@@ -9791,456 +9850,459 @@
         {\cyrch\cyra\cyrs\cyrt\cyri}%
     \fi%
     \def\cref@language{russian}%
+  }}% end \DeclareOption and \AtBeginDocument
 %    \end{macrocode}
 %
-% Next, we add the definitions to \cmd{\extras}\dots{} so that
-% \package{babel}'s \cmd{\selectlanguage} command will change the format
-% appropriately.
-%    \begin{macrocode}
-    \cref@addto\extrasrussian{%
-      \renewcommand{\crefrangeconjunction}{--}%
-      \renewcommand\crefrangepreconjunction{}%
-      \renewcommand\crefrangepostconjunction{}%
-      \renewcommand{\crefpairconjunction}{ \cyri\nobreakspace}%
-      \renewcommand{\crefmiddleconjunction}{, }%
-      \renewcommand{\creflastconjunction}{ \cyri\nobreakspace}%
-      \renewcommand{\crefpairgroupconjunction}{ \cyri\nobreakspace}%
-      \renewcommand{\crefmiddlegroupconjunction}{, }%
-      \renewcommand{\creflastgroupconjunction}%
-        {, \cyra\ \cyrt\cyra\cyrk\cyrzh\cyre\nobreakspace}%
+% If using \package{babel} and the corresponding option is set, or if
+% using \package{polyglossia} and the language has been loaded, add
+% format definition commands to \cmd{\extras}\meta{language} or
+% \cmd{\captions}\meta{language} so that language switching commands will
+% change the cross-reference formats appropriately.
+%    \begin{macrocode}
+\cref@addlanguagedefs{russian}{%
+  \PackageInfo{cleveref}{loaded `russian' language definitions}
+  \renewcommand{\crefrangeconjunction}{--}%
+  \renewcommand\crefrangepreconjunction{}%
+  \renewcommand\crefrangepostconjunction{}%
+  \renewcommand{\crefpairconjunction}{ \cyri\nobreakspace}%
+  \renewcommand{\crefmiddleconjunction}{, }%
+  \renewcommand{\creflastconjunction}{ \cyri\nobreakspace}%
+  \renewcommand{\crefpairgroupconjunction}{ \cyri\nobreakspace}%
+  \renewcommand{\crefmiddlegroupconjunction}{, }%
+  \renewcommand{\creflastgroupconjunction}%
+    {, \cyra\ \cyrt\cyra\cyrk\cyrzh\cyre\nobreakspace}%
  %
-        \Crefname{page}%
-        {\CYRS\cyrt\cyrr\cyra\cyrn\cyri\cyrc\cyra}%
-        {\CYRS\cyrt\cyrr\cyra\cyrn\cyri\cyrc\cyrery}%
-      \Crefname{equation}%
+    \Crefname{page}%
+    {\CYRS\cyrt\cyrr\cyra\cyrn\cyri\cyrc\cyra}%
+    {\CYRS\cyrt\cyrr\cyra\cyrn\cyri\cyrc\cyrery}%
+  \Crefname{equation}%
+    {\CYRF\cyro\cyrr\cyrm\cyru\cyrl\cyra}%
+    {\CYRF\cyro\cyrr\cyrm\cyru\cyrl\cyrery}%
+  \Crefname{figure}%
+    {\CYRR\cyri\cyrs\cyru\cyrn\cyro\cyrk}%
+    {\CYRR\cyri\cyrs\cyru\cyrn\cyrk\cyri}%
+  \Crefname{subfigure}%
+    {\CYRR\cyri\cyrs\cyru\cyrn\cyro\cyrk}%
+    {\CYRR\cyri\cyrs\cyru\cyrn\cyrk\cyri}%
+  \Crefname{table}%
+    {\CYRT\cyra\cyrb\cyrl\cyri\cyrc\cyra}%
+    {\CYRT\cyra\cyrb\cyrl\cyri\cyrc\cyrery}%
+  \Crefname{subtable}%
+    {\CYRT\cyra\cyrb\cyrl\cyri\cyrc\cyra}%
+    {\CYRT\cyra\cyrb\cyrl\cyri\cyrc\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}%
+  \Crefname{section}%
+    {\CYRR\cyra\cyrz\cyrd\cyre\cyrl}%
+    {\CYRR\cyra\cyrz\cyrd\cyre\cyrl\cyrery}%
+  \Crefname{subsection}%
+    {\CYRR\cyra\cyrz\cyrd\cyre\cyrl}%
+    {\CYRR\cyra\cyrz\cyrd\cyre\cyrl\cyrery}%
+  \Crefname{subsubsection}%
+    {\CYRR\cyra\cyrz\cyrd\cyre\cyrl}%
+    {\CYRR\cyra\cyrz\cyrd\cyre\cyrl\cyrery}%
+  \Crefname{appendix}%
+    {\CYRP\cyrr\cyri\cyrl\cyro\cyrzh\cyre\cyrn\cyri\cyre}%
+    {\CYRP\cyrr\cyri\cyrl\cyro\cyrzh\cyre\cyrn\cyri\cyrya}%
+  \Crefname{subappendix}%
+    {\CYRP\cyrr\cyri\cyrl\cyro\cyrzh\cyre\cyrn\cyri\cyre}%
+    {\CYRP\cyrr\cyri\cyrl\cyro\cyrzh\cyre\cyrn\cyri\cyrya}
+  \Crefname{subsubappendix}%
+    {\CYRP\cyrr\cyri\cyrl\cyro\cyrzh\cyre\cyrn\cyri\cyre}%
+    {\CYRP\cyrr\cyri\cyrl\cyro\cyrzh\cyre\cyrn\cyri\cyrya}
+  \Crefname{subsubsubappendix}%
+    {\CYRP\cyrr\cyri\cyrl\cyro\cyrzh\cyre\cyrn\cyri\cyre}%
+    {\CYRP\cyrr\cyri\cyrl\cyro\cyrzh\cyre\cyrn\cyri\cyrya}
+  \Crefname{enumi}%
+    {\CYRP\cyru\cyrn\cyrk\cyrt}%
+    {\CYRP\cyru\cyrn\cyrk\cyrt\cyrery}%
+  \Crefname{enumii}%
+    {\CYRP\cyru\cyrn\cyrk\cyrt}%
+    {\CYRP\cyru\cyrn\cyrk\cyrt\cyrery}%
+  \Crefname{enumiii}%
+    {\CYRP\cyru\cyrn\cyrk\cyrt}%
+    {\CYRP\cyru\cyrn\cyrk\cyrt\cyrery}%
+  \Crefname{enumiv}%
+    {\CYRP\cyru\cyrn\cyrk\cyrt}%
+    {\CYRP\cyru\cyrn\cyrk\cyrt\cyrery}%
+  \Crefname{enumv}%
+    {\CYRP\cyru\cyrn\cyrk\cyrt}%
+    {\CYRP\cyru\cyrn\cyrk\cyrt\cyrery}%
+  \Crefname{footnote}%
+    {\CYRS\cyrn\cyro\cyrs\cyrk\cyra}%
+    {\CYRS\cyrn\cyro\cyrs\cyrk\cyri}%
+  \Crefname{theorem}%
+    {\CYRT\cyre\cyro\cyrr\cyre\cyrm\cyra}%
+    {\CYRT\cyre\cyro\cyrr\cyre\cyrm\cyrery}%
+  \Crefname{lemma}%
+    {\CYRL\cyre\cyrm\cyrm\cyra}%
+    {\CYRL\cyre\cyrm\cyrm\cyrery}%
+  \Crefname{corollary}%
+    {\CYRV\cyrery\cyrv\cyro\cyrd}%
+    {\CYRV\cyrery\cyrv\cyro\cyrd\cyrery}%
+  \Crefname{proposition}%
+    {\CYRU\cyrt\cyrv\cyre\cyrr\cyrzh\cyrd\cyre\cyrn\cyri\cyre}%
+    {\CYRU\cyrt\cyrv\cyre\cyrr\cyrzh\cyrd\cyre\cyrn\cyri\cyrya}%
+  \Crefname{definition}%
+    {\CYRO\cyrp\cyrr\cyre\cyrd\cyre\cyrl\cyre\cyrn\cyri\cyre}%
+    {\CYRO\cyrp\cyrr\cyre\cyrd\cyre\cyrl\cyre\cyrn\cyri\cyrya}%
+  \Crefname{result}%
+    {\CYRR\cyre\cyrz\cyru\cyrl\cyrsftsn\cyrt\cyra\cyrt}%
+    {\CYRR\cyre\cyrz\cyru\cyrl\cyrsftsn\cyrt\cyra\cyrt\cyrery}%
+  \Crefname{example}%
+    {\CYRP\cyrr\cyri\cyrm\cyre\cyrr}%
+    {\CYRP\cyrr\cyri\cyrm\cyre\cyrr\cyrery}%
+  \Crefname{remark}%
+    {\CYRP\cyrr\cyri\cyrm\cyre\cyrch\cyra\cyrn\cyri\cyre}%
+    {\CYRP\cyrr\cyri\cyrm\cyre\cyrch\cyra\cyrn\cyri\cyrya}%
+  \Crefname{note}%
+    {\CYRZ\cyra\cyrm\cyre\cyrt\cyrk\cyra}%
+    {\CYRZ\cyra\cyrm\cyre\cyrt\cyrk\cyri}%
+  \Crefname{algorithm}%
+    {\CYRA\cyrl\cyrg\cyro\cyrr\cyri\cyrt\cyrm}%
+    {\CYRA\cyrl\cyrg\cyro\cyrr\cyri\cyrt\cyrm\cyrery}%
+  \Crefname{listing}%
+    {\CYRL\cyri\cyrs\cyrt\cyri\cyrn\cyrg}%
+    {\CYRL\cyri\cyrs\cyrt\cyri\cyrn\cyrg\cyri}%
+  \Crefname{line}%
+    {\CYRS\cyrt\cyrr\cyro\cyrk\cyra}%
+    {\CYRS\cyrt\cyrr\cyro\cyrk\cyri}%
+ %
+  \if@cref@capitalise%  capitalise set
+    \if@cref@abbrev%  abbrev set
+      \crefname{equation}%
+        {\CYRF-\cyrl.}%
+        {\CYRF-\cyrl.}%
+      \crefname{figure}%
+        {\CYRR\cyri\cyrs.}%
+        {\CYRR\cyri\cyrs.}%
+      \crefname{subfigure}%
+        {\CYRR\cyri\cyrs.}%
+        {\CYRR\cyri\cyrs.}%
+      \crefname{table}%
+        {\CYRT\cyra\cyrb\cyrl.}%
+        {\CYRT\cyra\cyrb\cyrl.}%
+      \crefname{subtable}%
+        {\CYRT\cyra\cyrb\cyrl.}%
+        {\CYRT\cyra\cyrb\cyrl.}%
+      \crefname{enumi}%
+        {\CYRP.}%
+        {\CYRP.\cyrp.}%
+      \crefname{enumii}%
+        {\CYRP.}%
+        {\CYRP.\cyrp.}%
+      \crefname{enumiii}%
+        {\CYRP.}%
+        {\CYRP.\cyrp.}%
+      \crefname{enumiv}%
+        {\CYRP.}%
+        {\CYRP.\cyrp.}%
+      \crefname{enumv}%
+        {\CYRP.}%
+        {\CYRP.\cyrp.}%
+    \else%  abbrev unset
+      \crefname{equation}%
         {\CYRF\cyro\cyrr\cyrm\cyru\cyrl\cyra}%
         {\CYRF\cyro\cyrr\cyrm\cyru\cyrl\cyrery}%
-      \Crefname{figure}%
+      \crefname{figure}%
         {\CYRR\cyri\cyrs\cyru\cyrn\cyro\cyrk}%
         {\CYRR\cyri\cyrs\cyru\cyrn\cyrk\cyri}%
-      \Crefname{subfigure}%
+      \crefname{subfigure}%
         {\CYRR\cyri\cyrs\cyru\cyrn\cyro\cyrk}%
         {\CYRR\cyri\cyrs\cyru\cyrn\cyrk\cyri}%
-      \Crefname{table}%
+      \crefname{table}%
         {\CYRT\cyra\cyrb\cyrl\cyri\cyrc\cyra}%
         {\CYRT\cyra\cyrb\cyrl\cyri\cyrc\cyrery}%
-      \Crefname{subtable}%
+      \crefname{subtable}%
         {\CYRT\cyra\cyrb\cyrl\cyri\cyrc\cyra}%
         {\CYRT\cyra\cyrb\cyrl\cyri\cyrc\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}%
-      \Crefname{section}%
-        {\CYRR\cyra\cyrz\cyrd\cyre\cyrl}%
-        {\CYRR\cyra\cyrz\cyrd\cyre\cyrl\cyrery}%
-      \Crefname{subsection}%
-        {\CYRR\cyra\cyrz\cyrd\cyre\cyrl}%
-        {\CYRR\cyra\cyrz\cyrd\cyre\cyrl\cyrery}%
-      \Crefname{subsubsection}%
-        {\CYRR\cyra\cyrz\cyrd\cyre\cyrl}%
-        {\CYRR\cyra\cyrz\cyrd\cyre\cyrl\cyrery}%
-      \Crefname{appendix}%
-        {\CYRP\cyrr\cyri\cyrl\cyro\cyrzh\cyre\cyrn\cyri\cyre}%
-        {\CYRP\cyrr\cyri\cyrl\cyro\cyrzh\cyre\cyrn\cyri\cyrya}%
-      \Crefname{subappendix}%
-        {\CYRP\cyrr\cyri\cyrl\cyro\cyrzh\cyre\cyrn\cyri\cyre}%
-        {\CYRP\cyrr\cyri\cyrl\cyro\cyrzh\cyre\cyrn\cyri\cyrya}
-      \Crefname{subsubappendix}%
-        {\CYRP\cyrr\cyri\cyrl\cyro\cyrzh\cyre\cyrn\cyri\cyre}%
-        {\CYRP\cyrr\cyri\cyrl\cyro\cyrzh\cyre\cyrn\cyri\cyrya}
-      \Crefname{subsubsubappendix}%
-        {\CYRP\cyrr\cyri\cyrl\cyro\cyrzh\cyre\cyrn\cyri\cyre}%
-        {\CYRP\cyrr\cyri\cyrl\cyro\cyrzh\cyre\cyrn\cyri\cyrya}
-      \Crefname{enumi}%
+      \crefname{enumi}%
         {\CYRP\cyru\cyrn\cyrk\cyrt}%
         {\CYRP\cyru\cyrn\cyrk\cyrt\cyrery}%
-      \Crefname{enumii}%
+      \crefname{enumii}%
         {\CYRP\cyru\cyrn\cyrk\cyrt}%
         {\CYRP\cyru\cyrn\cyrk\cyrt\cyrery}%
-      \Crefname{enumiii}%
+      \crefname{enumiii}%
         {\CYRP\cyru\cyrn\cyrk\cyrt}%
         {\CYRP\cyru\cyrn\cyrk\cyrt\cyrery}%
-      \Crefname{enumiv}%
+      \crefname{enumiv}%
         {\CYRP\cyru\cyrn\cyrk\cyrt}%
         {\CYRP\cyru\cyrn\cyrk\cyrt\cyrery}%
-      \Crefname{enumv}%
+      \crefname{enumv}%
         {\CYRP\cyru\cyrn\cyrk\cyrt}%
         {\CYRP\cyru\cyrn\cyrk\cyrt\cyrery}%
-      \Crefname{footnote}%
-        {\CYRS\cyrn\cyro\cyrs\cyrk\cyra}%
-        {\CYRS\cyrn\cyro\cyrs\cyrk\cyri}%
-      \Crefname{theorem}%
-        {\CYRT\cyre\cyro\cyrr\cyre\cyrm\cyra}%
-        {\CYRT\cyre\cyro\cyrr\cyre\cyrm\cyrery}%
-      \Crefname{lemma}%
-        {\CYRL\cyre\cyrm\cyrm\cyra}%
-        {\CYRL\cyre\cyrm\cyrm\cyrery}%
-      \Crefname{corollary}%
-        {\CYRV\cyrery\cyrv\cyro\cyrd}%
-        {\CYRV\cyrery\cyrv\cyro\cyrd\cyrery}%
-      \Crefname{proposition}%
-        {\CYRU\cyrt\cyrv\cyre\cyrr\cyrzh\cyrd\cyre\cyrn\cyri\cyre}%
-        {\CYRU\cyrt\cyrv\cyre\cyrr\cyrzh\cyrd\cyre\cyrn\cyri\cyrya}%
-      \Crefname{definition}%
-        {\CYRO\cyrp\cyrr\cyre\cyrd\cyre\cyrl\cyre\cyrn\cyri\cyre}%
-        {\CYRO\cyrp\cyrr\cyre\cyrd\cyre\cyrl\cyre\cyrn\cyri\cyrya}%
-      \Crefname{result}%
-        {\CYRR\cyre\cyrz\cyru\cyrl\cyrsftsn\cyrt\cyra\cyrt}%
-        {\CYRR\cyre\cyrz\cyru\cyrl\cyrsftsn\cyrt\cyra\cyrt\cyrery}%
-      \Crefname{example}%
-        {\CYRP\cyrr\cyri\cyrm\cyre\cyrr}%
-        {\CYRP\cyrr\cyri\cyrm\cyre\cyrr\cyrery}%
-      \Crefname{remark}%
-        {\CYRP\cyrr\cyri\cyrm\cyre\cyrch\cyra\cyrn\cyri\cyre}%
-        {\CYRP\cyrr\cyri\cyrm\cyre\cyrch\cyra\cyrn\cyri\cyrya}%
-      \Crefname{note}%
-        {\CYRZ\cyra\cyrm\cyre\cyrt\cyrk\cyra}%
-        {\CYRZ\cyra\cyrm\cyre\cyrt\cyrk\cyri}%
-      \Crefname{algorithm}%
-        {\CYRA\cyrl\cyrg\cyro\cyrr\cyri\cyrt\cyrm}%
-        {\CYRA\cyrl\cyrg\cyro\cyrr\cyri\cyrt\cyrm\cyrery}%
-      \Crefname{listing}%
-        {\CYRL\cyri\cyrs\cyrt\cyri\cyrn\cyrg}%
-        {\CYRL\cyri\cyrs\cyrt\cyri\cyrn\cyrg\cyri}%
-      \Crefname{line}%
-        {\CYRS\cyrt\cyrr\cyro\cyrk\cyra}%
-        {\CYRS\cyrt\cyrr\cyro\cyrk\cyri}%
- %
-      \if@cref@capitalise%  capitalise set
-        \if@cref@abbrev%  abbrev set
-          \crefname{equation}%
-            {\CYRF-\cyrl.}%
-            {\CYRF-\cyrl.}%
-          \crefname{figure}%
-            {\CYRR\cyri\cyrs.}%
-            {\CYRR\cyri\cyrs.}%
-          \crefname{subfigure}%
-            {\CYRR\cyri\cyrs.}%
-            {\CYRR\cyri\cyrs.}%
-          \crefname{table}%
-            {\CYRT\cyra\cyrb\cyrl.}%
-            {\CYRT\cyra\cyrb\cyrl.}%
-          \crefname{subtable}%
-            {\CYRT\cyra\cyrb\cyrl.}%
-            {\CYRT\cyra\cyrb\cyrl.}%
-          \crefname{enumi}%
-            {\CYRP.}%
-            {\CYRP.\cyrp.}%
-          \crefname{enumii}%
-            {\CYRP.}%
-            {\CYRP.\cyrp.}%
-          \crefname{enumiii}%
-            {\CYRP.}%
-            {\CYRP.\cyrp.}%
-          \crefname{enumiv}%
-            {\CYRP.}%
-            {\CYRP.\cyrp.}%
-          \crefname{enumv}%
-            {\CYRP.}%
-            {\CYRP.\cyrp.}%
-        \else%  abbrev unset
-          \crefname{equation}%
-            {\CYRF\cyro\cyrr\cyrm\cyru\cyrl\cyra}%
-            {\CYRF\cyro\cyrr\cyrm\cyru\cyrl\cyrery}%
-          \crefname{figure}%
-            {\CYRR\cyri\cyrs\cyru\cyrn\cyro\cyrk}%
-            {\CYRR\cyri\cyrs\cyru\cyrn\cyrk\cyri}%
-          \crefname{subfigure}%
-            {\CYRR\cyri\cyrs\cyru\cyrn\cyro\cyrk}%
-            {\CYRR\cyri\cyrs\cyru\cyrn\cyrk\cyri}%
-          \crefname{table}%
-            {\CYRT\cyra\cyrb\cyrl\cyri\cyrc\cyra}%
-            {\CYRT\cyra\cyrb\cyrl\cyri\cyrc\cyrery}%
-          \crefname{subtable}%
-            {\CYRT\cyra\cyrb\cyrl\cyri\cyrc\cyra}%
-            {\CYRT\cyra\cyrb\cyrl\cyri\cyrc\cyrery}%
-          \crefname{enumi}%
-            {\CYRP\cyru\cyrn\cyrk\cyrt}%
-            {\CYRP\cyru\cyrn\cyrk\cyrt\cyrery}%
-          \crefname{enumii}%
-            {\CYRP\cyru\cyrn\cyrk\cyrt}%
-            {\CYRP\cyru\cyrn\cyrk\cyrt\cyrery}%
-          \crefname{enumiii}%
-            {\CYRP\cyru\cyrn\cyrk\cyrt}%
-            {\CYRP\cyru\cyrn\cyrk\cyrt\cyrery}%
-          \crefname{enumiv}%
-            {\CYRP\cyru\cyrn\cyrk\cyrt}%
-            {\CYRP\cyru\cyrn\cyrk\cyrt\cyrery}%
-          \crefname{enumv}%
-            {\CYRP\cyru\cyrn\cyrk\cyrt}%
-            {\CYRP\cyru\cyrn\cyrk\cyrt\cyrery}%
-        \fi%
-        \crefname{page}%
-          {\CYRS\cyrt\cyrr\cyra\cyrn\cyri\cyrc\cyra}%
-          {\CYRS\cyrt\cyrr\cyra\cyrn\cyri\cyrc\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}%
-        \crefname{section}%
-          {\CYRR\cyra\cyrz\cyrd\cyre\cyrl}%
-          {\CYRR\cyra\cyrz\cyrd\cyre\cyrl\cyrery}%
-        \crefname{subsection}%
-          {\CYRR\cyra\cyrz\cyrd\cyre\cyrl}%
-          {\CYRR\cyra\cyrz\cyrd\cyre\cyrl\cyrery}%
-        \crefname{subsubsection}%
-          {\CYRR\cyra\cyrz\cyrd\cyre\cyrl}%
-          {\CYRR\cyra\cyrz\cyrd\cyre\cyrl\cyrery}%
-        \crefname{appendix}%
-          {\CYRP\cyrr\cyri\cyrl\cyro\cyrzh\cyre\cyrn\cyri\cyre}%
-          {\CYRP\cyrr\cyri\cyrl\cyro\cyrzh\cyre\cyrn\cyri\cyrya}%
-        \crefname{subappendix}%
-          {\CYRP\cyrr\cyri\cyrl\cyro\cyrzh\cyre\cyrn\cyri\cyre}%
-          {\CYRP\cyrr\cyri\cyrl\cyro\cyrzh\cyre\cyrn\cyri\cyrya}%
-        \crefname{subsubappendix}%
-          {\CYRP\cyrr\cyri\cyrl\cyro\cyrzh\cyre\cyrn\cyri\cyre}%
-          {\CYRP\cyrr\cyri\cyrl\cyro\cyrzh\cyre\cyrn\cyri\cyrya}%
-        \crefname{subsubsubappendix}%
-          {\CYRP\cyrr\cyri\cyrl\cyro\cyrzh\cyre\cyrn\cyri\cyre}%
-          {\CYRP\cyrr\cyri\cyrl\cyro\cyrzh\cyre\cyrn\cyri\cyrya}%
-        \crefname{footnote}%
-          {\CYRS\cyrn\cyro\cyrs\cyrk\cyra}%
-          {\CYRS\cyrn\cyro\cyrs\cyrk\cyri}%
-        \crefname{theorem}%
-          {\CYRT\cyre\cyro\cyrr\cyre\cyrm\cyra}%
-          {\CYRT\cyre\cyro\cyrr\cyre\cyrm\cyrery}%
-        \crefname{lemma}%
-          {\CYRL\cyre\cyrm\cyrm\cyra}%
-          {\CYRL\cyre\cyrm\cyrm\cyrery}%
-        \crefname{corollary}%
-          {\CYRV\cyrery\cyrv\cyro\cyrd}%
-          {\CYRV\cyrery\cyrv\cyro\cyrd\cyrery}%
-        \crefname{proposition}%
-          {\CYRU\cyrt\cyrv\cyre\cyrr\cyrzh\cyrd\cyre\cyrn\cyri\cyre}%
-          {\CYRU\cyrt\cyrv\cyre\cyrr\cyrzh\cyrd\cyre\cyrn\cyri\cyrya}%
-        \crefname{definition}%
-          {\CYRO\cyrp\cyrr\cyre\cyrd\cyre\cyrl\cyre\cyrn\cyri\cyre}%
-          {\CYRO\cyrp\cyrr\cyre\cyrd\cyre\cyrl\cyre\cyrn\cyri\cyrya}%
-        \crefname{result}%
-          {\CYRR\cyre\cyrz\cyru\cyrl\cyrsftsn\cyrt\cyra\cyrt}%
-          {\CYRR\cyre\cyrz\cyru\cyrl\cyrsftsn\cyrt\cyra\cyrt\cyrery}%
-        \crefname{example}%
-          {\CYRP\cyrr\cyri\cyrm\cyre\cyrr}%
-          {\CYRP\cyrr\cyri\cyrm\cyre\cyrr\cyrery}%
-        \crefname{remark}%
-          {\CYRP\cyrr\cyri\cyrm\cyre\cyrch\cyra\cyrn\cyri\cyre}%
-          {\CYRP\cyrr\cyri\cyrm\cyre\cyrch\cyra\cyrn\cyri\cyrya}%
-        \crefname{note}%
-          {\CYRZ\cyra\cyrm\cyre\cyrt\cyrk\cyra}%
-          {\CYRZ\cyra\cyrm\cyre\cyrt\cyrk\cyri}%
-        \crefname{algorithm}%
-          {\CYRA\cyrl\cyrg\cyro\cyrr\cyri\cyrt\cyrm}%
-          {\CYRA\cyrl\cyrg\cyro\cyrr\cyri\cyrt\cyrm\cyrery}%
-        \crefname{listing}%
-          {\CYRL\cyri\cyrs\cyrt\cyri\cyrn\cyrg}%
-          {\CYRL\cyri\cyrs\cyrt\cyri\cyrn\cyrg\cyri}%
-        \crefname{line}%
-          {\CYRS\cyrt\cyrr\cyro\cyrk\cyra}%
-          {\CYRS\cyrt\cyrr\cyro\cyrk\cyri}%
+    \fi%
+    \crefname{page}%
+      {\CYRS\cyrt\cyrr\cyra\cyrn\cyri\cyrc\cyra}%
+      {\CYRS\cyrt\cyrr\cyra\cyrn\cyri\cyrc\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}%
+    \crefname{section}%
+      {\CYRR\cyra\cyrz\cyrd\cyre\cyrl}%
+      {\CYRR\cyra\cyrz\cyrd\cyre\cyrl\cyrery}%
+    \crefname{subsection}%
+      {\CYRR\cyra\cyrz\cyrd\cyre\cyrl}%
+      {\CYRR\cyra\cyrz\cyrd\cyre\cyrl\cyrery}%
+    \crefname{subsubsection}%
+      {\CYRR\cyra\cyrz\cyrd\cyre\cyrl}%
+      {\CYRR\cyra\cyrz\cyrd\cyre\cyrl\cyrery}%
+    \crefname{appendix}%
+      {\CYRP\cyrr\cyri\cyrl\cyro\cyrzh\cyre\cyrn\cyri\cyre}%
+      {\CYRP\cyrr\cyri\cyrl\cyro\cyrzh\cyre\cyrn\cyri\cyrya}%
+    \crefname{subappendix}%
+      {\CYRP\cyrr\cyri\cyrl\cyro\cyrzh\cyre\cyrn\cyri\cyre}%
+      {\CYRP\cyrr\cyri\cyrl\cyro\cyrzh\cyre\cyrn\cyri\cyrya}%
+    \crefname{subsubappendix}%
+      {\CYRP\cyrr\cyri\cyrl\cyro\cyrzh\cyre\cyrn\cyri\cyre}%
+      {\CYRP\cyrr\cyri\cyrl\cyro\cyrzh\cyre\cyrn\cyri\cyrya}%
+    \crefname{subsubsubappendix}%
+      {\CYRP\cyrr\cyri\cyrl\cyro\cyrzh\cyre\cyrn\cyri\cyre}%
+      {\CYRP\cyrr\cyri\cyrl\cyro\cyrzh\cyre\cyrn\cyri\cyrya}%
+    \crefname{footnote}%
+      {\CYRS\cyrn\cyro\cyrs\cyrk\cyra}%
+      {\CYRS\cyrn\cyro\cyrs\cyrk\cyri}%
+    \crefname{theorem}%
+      {\CYRT\cyre\cyro\cyrr\cyre\cyrm\cyra}%
+      {\CYRT\cyre\cyro\cyrr\cyre\cyrm\cyrery}%
+    \crefname{lemma}%
+      {\CYRL\cyre\cyrm\cyrm\cyra}%
+      {\CYRL\cyre\cyrm\cyrm\cyrery}%
+    \crefname{corollary}%
+      {\CYRV\cyrery\cyrv\cyro\cyrd}%
+      {\CYRV\cyrery\cyrv\cyro\cyrd\cyrery}%
+    \crefname{proposition}%
+      {\CYRU\cyrt\cyrv\cyre\cyrr\cyrzh\cyrd\cyre\cyrn\cyri\cyre}%
+      {\CYRU\cyrt\cyrv\cyre\cyrr\cyrzh\cyrd\cyre\cyrn\cyri\cyrya}%
+    \crefname{definition}%
+      {\CYRO\cyrp\cyrr\cyre\cyrd\cyre\cyrl\cyre\cyrn\cyri\cyre}%
+      {\CYRO\cyrp\cyrr\cyre\cyrd\cyre\cyrl\cyre\cyrn\cyri\cyrya}%
+    \crefname{result}%
+      {\CYRR\cyre\cyrz\cyru\cyrl\cyrsftsn\cyrt\cyra\cyrt}%
+      {\CYRR\cyre\cyrz\cyru\cyrl\cyrsftsn\cyrt\cyra\cyrt\cyrery}%
+    \crefname{example}%
+      {\CYRP\cyrr\cyri\cyrm\cyre\cyrr}%
+      {\CYRP\cyrr\cyri\cyrm\cyre\cyrr\cyrery}%
+    \crefname{remark}%
+      {\CYRP\cyrr\cyri\cyrm\cyre\cyrch\cyra\cyrn\cyri\cyre}%
+      {\CYRP\cyrr\cyri\cyrm\cyre\cyrch\cyra\cyrn\cyri\cyrya}%
+    \crefname{note}%
+      {\CYRZ\cyra\cyrm\cyre\cyrt\cyrk\cyra}%
+      {\CYRZ\cyra\cyrm\cyre\cyrt\cyrk\cyri}%
+    \crefname{algorithm}%
+      {\CYRA\cyrl\cyrg\cyro\cyrr\cyri\cyrt\cyrm}%
+      {\CYRA\cyrl\cyrg\cyro\cyrr\cyri\cyrt\cyrm\cyrery}%
+    \crefname{listing}%
+      {\CYRL\cyri\cyrs\cyrt\cyri\cyrn\cyrg}%
+      {\CYRL\cyri\cyrs\cyrt\cyri\cyrn\cyrg\cyri}%
+    \crefname{line}%
+      {\CYRS\cyrt\cyrr\cyro\cyrk\cyra}%
+      {\CYRS\cyrt\cyrr\cyro\cyrk\cyri}%
  %
-      \else%  capitalise unset
-        \if@cref@abbrev%  abbrev set
-          \crefname{equation}%
-            {\cyrf-\cyrl.}%
-            {\cyrf-\cyrl.}%
-          \crefname{chapter}%
-            {\cyrg\cyrl\cyra\cyrv.}%
-            {\cyrg\cyrl\cyra\cyrv.}%
-          \crefname{section}%
-            {\cyrr\cyra\cyrz\cyrd.}%
-            {\cyrr\cyra\cyrz\cyrd\cyre\cyrl.}%
-          \crefname{subsection}%
-            {\cyrr\cyra\cyrz\cyrd.}%
-            {\cyrr\cyra\cyrz\cyrd\cyre\cyrl.}%
-          \crefname{subsubsection}%
-            {\cyrr\cyra\cyrz\cyrd.}%
-            {\cyrr\cyra\cyrz\cyrd\cyre\cyrl.}%
-          \crefname{appendix}%
-            {\cyrp\cyrr\cyri\cyrl\cyro\cyrzh.}%
-            {\cyrp\cyrr\cyri\cyrl\cyro\cyrzh.}%
-          \crefname{subappendix}%
-            {\cyrp\cyrr\cyri\cyrl\cyro\cyrzh.}%
-            {\cyrp\cyrr\cyri\cyrl\cyro\cyrzh.}%
-          \crefname{subsubappendix}%
-            {\cyrp\cyrr\cyri\cyrl\cyro\cyrzh.}%
-            {\cyrp\cyrr\cyri\cyrl\cyro\cyrzh.}%
-          \crefname{subsubsubappendix}%
-            {\cyrp\cyrr\cyri\cyrl\cyro\cyrzh.}%
-            {\cyrp\cyrr\cyri\cyrl\cyro\cyrzh.}%
-          \crefname{enumi}%
-            {\cyrp.}%
-            {\cyrp.\cyrp.}%
-          \crefname{enumii}%
-            {\cyrp.}%
-            {\cyrp.\cyrp.}%
-          \crefname{enumiii}%
-            {\cyrp.}%
-            {\cyrp.\cyrp.}%
-          \crefname{enumiv}%
-            {\cyrp.}%
-            {\cyrp.\cyrp.}%
-          \crefname{enumv}%
-            {\cyrp.}%
-            {\cyrp.\cyrp.}%
-          \crefname{footnote}%
-            {\cyrs\cyrn\cyro\cyrs\cyrk.}%
-            {\cyrs\cyrn\cyro\cyrs\cyrk.}%
-          \crefname{figure}%
-            {\cyrr\cyri\cyrs.}%
-            {\cyrr\cyri\cyrs.}%
-          \crefname{subfigure}%
-            {\cyrr\cyri\cyrs.}%
-            {\cyrr\cyri\cyrs.}%
-          \crefname{table}%
-            {\cyrt\cyra\cyrb\cyrl.}%
-            {\cyrt\cyra\cyrb\cyrl.}%
-          \crefname{subtable}%
-            {\cyrt\cyra\cyrb\cyrl.}%
-            {\cyrt\cyra\cyrb\cyrl.}%
-          \crefname{theorem}%
-            {\cyrt\cyre\cyro\cyrr\cyre\cyrm.}%
-            {\cyrt\cyre\cyro\cyrr\cyre\cyrm.}%
-          \crefname{lemma}%
-            {\cyrl\cyre\cyrm\cyrm.}%
-            {\cyrl\cyre\cyrm\cyrm.}%
-          \crefname{corollary}%
-            {\cyrv\cyrery\cyrv\cyro\cyrd}%
-            {\cyrv\cyrery\cyrv\cyro\cyrd.}%
-          \crefname{proposition}%
-            {\cyru\cyrt\cyrv\cyre\cyrr\cyrzh\cyrd.}%
-            {\cyru\cyrt\cyrv\cyre\cyrr\cyrzh\cyrd.}%
-          \crefname{definition}%
-            {\cyro\cyrp\cyrr\cyre\cyrd\cyre\cyrl\cyre\cyrn.}%
-            {\cyro\cyrp\cyrr\cyre\cyrd\cyre\cyrl\cyre\cyrn.}%
-          \crefname{result}%
-            {\cyrr\cyre\cyrz\cyru\cyrl\cyrsftsn\cyrt.}%
-            {\cyrr\cyre\cyrz\cyru\cyrl\cyrsftsn\cyrt.}%
-          \crefname{example}%
-            {\cyrp\cyrr\cyri\cyrm.}%
-            {\cyrp\cyrr\cyri\cyrm\cyre\cyrr.}%
-          \crefname{remark}%
-            {\cyrp\cyrr\cyri\cyrm\cyre\cyrch.}%
-            {\cyrp\cyrr\cyri\cyrm\cyre\cyrch.}%
-          \crefname{note}%
-            {\cyrz\cyra\cyrm\cyre\cyrt\cyrk.}%
-            {\cyrz\cyra\cyrm\cyre\cyrt\cyrk.}%
-          \crefname{algorithm}%
-            {\cyra\cyrl\cyrg.}%
-            {\cyra\cyrl\cyrg.}%
-          \crefname{listing}%
-            {\cyrl\cyri\cyrs\cyrt\cyri\cyrn.}%
-            {\cyrl\cyri\cyrs\cyrt\cyri\cyrn\cyrg.}%
-          \crefname{line}%
-            {\cyrs\cyrt\cyrr\cyrk.}%
-            {\cyrs\cyrt\cyrr\cyrk.}%
-        \else%  abbrev unset
-          \crefname{equation}%
-            {\cyrf\cyro\cyrr\cyrm\cyru\cyrl\cyra}%
-            {\cyrf\cyro\cyrr\cyrm\cyru\cyrl\cyrery}%
-          \crefname{figure}%
-            {\cyrr\cyri\cyrs\cyru\cyrn\cyro\cyrk}%
-            {\cyrr\cyri\cyrs\cyru\cyrn\cyrk\cyri}%
-          \crefname{subfigure}%
-            {\cyrr\cyri\cyrs\cyru\cyrn\cyro\cyrk}%
-            {\cyrr\cyri\cyrs\cyru\cyrn\cyrk\cyri}%
-          \crefname{table}%
-            {\cyrt\cyra\cyrb\cyrl\cyri\cyrc\cyra}%
-            {\cyrt\cyra\cyrb\cyrl\cyri\cyrc\cyrery}%
-          \crefname{subtable}%
-            {\cyrt\cyra\cyrb\cyrl\cyri\cyrc\cyra}%
-            {\cyrt\cyra\cyrb\cyrl\cyri\cyrc\cyrery}%
-          \crefname{enumi}%
-            {\cyrp\cyru\cyrn\cyrk\cyrt}%
-            {\cyrp\cyru\cyrn\cyrk\cyrt\cyrery}%
-          \crefname{enumii}%
-            {\cyrp\cyru\cyrn\cyrk\cyrt}%
-            {\cyrp\cyru\cyrn\cyrk\cyrt\cyrery}%
-          \crefname{enumiii}%
-            {\cyrp\cyru\cyrn\cyrk\cyrt}%
-            {\cyrp\cyru\cyrn\cyrk\cyrt\cyrery}%
-          \crefname{enumiv}%
-            {\cyrp\cyru\cyrn\cyrk\cyrt}%
-            {\cyrp\cyru\cyrn\cyrk\cyrt\cyrery}%
-          \crefname{enumv}%
-            {\cyrp\cyru\cyrn\cyrk\cyrt}%
-            {\cyrp\cyru\cyrn\cyrk\cyrt\cyrery}%
-          \crefname{chapter}%
-            {\cyrg\cyrl\cyra\cyrv\cyra}%
-            {\cyrg\cyrl\cyra\cyrv\cyrery}%
-          \crefname{section}%
-            {\cyrr\cyra\cyrz\cyrd\cyre\cyrl}%
-            {\cyrr\cyra\cyrz\cyrd\cyre\cyrl\cyrery}%
-          \crefname{subsection}%
-            {\cyrr\cyra\cyrz\cyrd\cyre\cyrl}%
-            {\cyrr\cyra\cyrz\cyrd\cyre\cyrl\cyrery}%
-          \crefname{subsubsection}%
-            {\cyrr\cyra\cyrz\cyrd\cyre\cyrl}%
-            {\cyrr\cyra\cyrz\cyrd\cyre\cyrl\cyrery}%
-          \crefname{appendix}%
-            {\cyrp\cyrr\cyri\cyrl\cyro\cyrzh\cyre\cyrn\cyri\cyre}%
-            {\cyrp\cyrr\cyri\cyrl\cyro\cyrzh\cyre\cyrn\cyri\cyrya}%
-          \crefname{subappendix}%
-            {\cyrp\cyrr\cyri\cyrl\cyro\cyrzh\cyre\cyrn\cyri\cyre}%
-            {\cyrp\cyrr\cyri\cyrl\cyro\cyrzh\cyre\cyrn\cyri\cyrya}%
-          \crefname{subsubappendix}%
-            {\cyrp\cyrr\cyri\cyrl\cyro\cyrzh\cyre\cyrn\cyri\cyre}%
-            {\cyrp\cyrr\cyri\cyrl\cyro\cyrzh\cyre\cyrn\cyri\cyrya}%
-          \crefname{subsubsubappendix}%
-            {\cyrp\cyrr\cyri\cyrl\cyro\cyrzh\cyre\cyrn\cyri\cyre}%
-            {\cyrp\cyrr\cyri\cyrl\cyro\cyrzh\cyre\cyrn\cyri\cyrya}%
-          \crefname{footnote}%
-            {\cyrs\cyrn\cyro\cyrs\cyrk\cyra}%
-            {\cyrs\cyrn\cyro\cyrs\cyrk\cyri}%
-          \crefname{theorem}%
-            {\cyrt\cyre\cyro\cyrr\cyre\cyrm\cyra}%
-            {\cyrt\cyre\cyro\cyrr\cyre\cyrm\cyrery}%
-          \crefname{lemma}%
-            {\cyrl\cyre\cyrm\cyrm\cyra}%
-            {\cyrl\cyre\cyrm\cyrm\cyrery}%
-          \crefname{corollary}%
-            {\cyrv\cyrery\cyrv\cyro\cyrd}%
-            {\cyrv\cyrery\cyrv\cyro\cyrd\cyrery}%
-          \crefname{proposition}%
-            {\cyru\cyrt\cyrv\cyre\cyrr\cyrzh\cyrd\cyre\cyrn\cyri\cyre}%
-            {\cyru\cyrt\cyrv\cyre\cyrr\cyrzh\cyrd\cyre\cyrn\cyri\cyrya}%
-          \crefname{definition}%
-            {\cyro\cyrp\cyrr\cyre\cyrd\cyre\cyrl\cyre\cyrn\cyri\cyre}%
-            {\cyro\cyrp\cyrr\cyre\cyrd\cyre\cyrl\cyre\cyrn\cyri\cyrya}%
-          \crefname{result}%
-            {\cyrr\cyre\cyrz\cyru\cyrl\cyrsftsn\cyrt\cyra\cyrt}%
-            {\cyrr\cyre\cyrz\cyru\cyrl\cyrsftsn\cyrt\cyra\cyrt\cyrery}%
-          \crefname{example}%
-            {\cyrp\cyrr\cyri\cyrm\cyre\cyrr}%
-            {\cyrp\cyrr\cyri\cyrm\cyre\cyrr\cyrery}%
-          \crefname{remark}%
-            {\cyrp\cyrr\cyri\cyrm\cyre\cyrch\cyra\cyrn\cyri\cyre}%
-            {\cyrp\cyrr\cyri\cyrm\cyre\cyrch\cyra\cyrn\cyri\cyrya}%
-          \crefname{note}%
-            {\cyrz\cyra\cyrm\cyre\cyrt\cyrk\cyra}%
-            {\cyrz\cyra\cyrm\cyre\cyrt\cyrk\cyri}%
-          \crefname{algorithm}%
-            {\cyra\cyrl\cyrg\cyro\cyrr\cyri\cyrt\cyrm}%
-            {\cyra\cyrl\cyrg\cyro\cyrr\cyri\cyrt\cyrm\cyrery}%
-          \crefname{listing}%
-            {\cyrl\cyri\cyrs\cyrt\cyri\cyrn\cyrg}%
-            {\cyrl\cyri\cyrs\cyrt\cyri\cyrn\cyrg\cyri}%
-          \crefname{line}%
-            {\cyrs\cyrt\cyrr\cyro\cyrk\cyra}%
-            {\cyrs\cyrt\cyrr\cyro\cyrk\cyri}%
-        \fi%
-        \crefname{page}%
-          {\cyrs\cyrt\cyrr\cyra\cyrn\cyri\cyrc\cyre}%
-          {\cyrs\cyrt\cyrr\cyra\cyrn\cyri\cyrc\cyra\cyrh}%
-        \crefname{part}%
-          {\cyrch\cyra\cyrs\cyrt\cyrsftsn}%
-          {\cyrch\cyra\cyrs\cyrt\cyri}%
-      \fi%
-    }}}
+  \else%  capitalise unset
+    \if@cref@abbrev%  abbrev set
+      \crefname{equation}%
+        {\cyrf-\cyrl.}%
+        {\cyrf-\cyrl.}%
+      \crefname{chapter}%
+        {\cyrg\cyrl\cyra\cyrv.}%
+        {\cyrg\cyrl\cyra\cyrv.}%
+      \crefname{section}%
+        {\cyrr\cyra\cyrz\cyrd.}%
+        {\cyrr\cyra\cyrz\cyrd\cyre\cyrl.}%
+      \crefname{subsection}%
+        {\cyrr\cyra\cyrz\cyrd.}%
+        {\cyrr\cyra\cyrz\cyrd\cyre\cyrl.}%
+      \crefname{subsubsection}%
+        {\cyrr\cyra\cyrz\cyrd.}%
+        {\cyrr\cyra\cyrz\cyrd\cyre\cyrl.}%
+      \crefname{appendix}%
+        {\cyrp\cyrr\cyri\cyrl\cyro\cyrzh.}%
+        {\cyrp\cyrr\cyri\cyrl\cyro\cyrzh.}%
+      \crefname{subappendix}%
+        {\cyrp\cyrr\cyri\cyrl\cyro\cyrzh.}%
+        {\cyrp\cyrr\cyri\cyrl\cyro\cyrzh.}%
+      \crefname{subsubappendix}%
+        {\cyrp\cyrr\cyri\cyrl\cyro\cyrzh.}%
+        {\cyrp\cyrr\cyri\cyrl\cyro\cyrzh.}%
+      \crefname{subsubsubappendix}%
+        {\cyrp\cyrr\cyri\cyrl\cyro\cyrzh.}%
+        {\cyrp\cyrr\cyri\cyrl\cyro\cyrzh.}%
+      \crefname{enumi}%
+        {\cyrp.}%
+        {\cyrp.\cyrp.}%
+      \crefname{enumii}%
+        {\cyrp.}%
+        {\cyrp.\cyrp.}%
+      \crefname{enumiii}%
+        {\cyrp.}%
+        {\cyrp.\cyrp.}%
+      \crefname{enumiv}%
+        {\cyrp.}%
+        {\cyrp.\cyrp.}%
+      \crefname{enumv}%
+        {\cyrp.}%
+        {\cyrp.\cyrp.}%
+      \crefname{footnote}%
+        {\cyrs\cyrn\cyro\cyrs\cyrk.}%
+        {\cyrs\cyrn\cyro\cyrs\cyrk.}%
+      \crefname{figure}%
+        {\cyrr\cyri\cyrs.}%
+        {\cyrr\cyri\cyrs.}%
+      \crefname{subfigure}%
+        {\cyrr\cyri\cyrs.}%
+        {\cyrr\cyri\cyrs.}%
+      \crefname{table}%
+        {\cyrt\cyra\cyrb\cyrl.}%
+        {\cyrt\cyra\cyrb\cyrl.}%
+      \crefname{subtable}%
+        {\cyrt\cyra\cyrb\cyrl.}%
+        {\cyrt\cyra\cyrb\cyrl.}%
+      \crefname{theorem}%
+        {\cyrt\cyre\cyro\cyrr\cyre\cyrm.}%
+        {\cyrt\cyre\cyro\cyrr\cyre\cyrm.}%
+      \crefname{lemma}%
+        {\cyrl\cyre\cyrm\cyrm.}%
+        {\cyrl\cyre\cyrm\cyrm.}%
+      \crefname{corollary}%
+        {\cyrv\cyrery\cyrv\cyro\cyrd}%
+        {\cyrv\cyrery\cyrv\cyro\cyrd.}%
+      \crefname{proposition}%
+        {\cyru\cyrt\cyrv\cyre\cyrr\cyrzh\cyrd.}%
+        {\cyru\cyrt\cyrv\cyre\cyrr\cyrzh\cyrd.}%
+      \crefname{definition}%
+        {\cyro\cyrp\cyrr\cyre\cyrd\cyre\cyrl\cyre\cyrn.}%
+        {\cyro\cyrp\cyrr\cyre\cyrd\cyre\cyrl\cyre\cyrn.}%
+      \crefname{result}%
+        {\cyrr\cyre\cyrz\cyru\cyrl\cyrsftsn\cyrt.}%
+        {\cyrr\cyre\cyrz\cyru\cyrl\cyrsftsn\cyrt.}%
+      \crefname{example}%
+        {\cyrp\cyrr\cyri\cyrm.}%
+        {\cyrp\cyrr\cyri\cyrm\cyre\cyrr.}%
+      \crefname{remark}%
+        {\cyrp\cyrr\cyri\cyrm\cyre\cyrch.}%
+        {\cyrp\cyrr\cyri\cyrm\cyre\cyrch.}%
+      \crefname{note}%
+        {\cyrz\cyra\cyrm\cyre\cyrt\cyrk.}%
+        {\cyrz\cyra\cyrm\cyre\cyrt\cyrk.}%
+      \crefname{algorithm}%
+        {\cyra\cyrl\cyrg.}%
+        {\cyra\cyrl\cyrg.}%
+      \crefname{listing}%
+        {\cyrl\cyri\cyrs\cyrt\cyri\cyrn.}%
+        {\cyrl\cyri\cyrs\cyrt\cyri\cyrn\cyrg.}%
+      \crefname{line}%
+        {\cyrs\cyrt\cyrr\cyrk.}%
+        {\cyrs\cyrt\cyrr\cyrk.}%
+    \else%  abbrev unset
+      \crefname{equation}%
+        {\cyrf\cyro\cyrr\cyrm\cyru\cyrl\cyra}%
+        {\cyrf\cyro\cyrr\cyrm\cyru\cyrl\cyrery}%
+      \crefname{figure}%
+        {\cyrr\cyri\cyrs\cyru\cyrn\cyro\cyrk}%
+        {\cyrr\cyri\cyrs\cyru\cyrn\cyrk\cyri}%
+      \crefname{subfigure}%
+        {\cyrr\cyri\cyrs\cyru\cyrn\cyro\cyrk}%
+        {\cyrr\cyri\cyrs\cyru\cyrn\cyrk\cyri}%
+      \crefname{table}%
+        {\cyrt\cyra\cyrb\cyrl\cyri\cyrc\cyra}%
+        {\cyrt\cyra\cyrb\cyrl\cyri\cyrc\cyrery}%
+      \crefname{subtable}%
+        {\cyrt\cyra\cyrb\cyrl\cyri\cyrc\cyra}%
+        {\cyrt\cyra\cyrb\cyrl\cyri\cyrc\cyrery}%
+      \crefname{enumi}%
+        {\cyrp\cyru\cyrn\cyrk\cyrt}%
+        {\cyrp\cyru\cyrn\cyrk\cyrt\cyrery}%
+      \crefname{enumii}%
+        {\cyrp\cyru\cyrn\cyrk\cyrt}%
+        {\cyrp\cyru\cyrn\cyrk\cyrt\cyrery}%
+      \crefname{enumiii}%
+        {\cyrp\cyru\cyrn\cyrk\cyrt}%
+        {\cyrp\cyru\cyrn\cyrk\cyrt\cyrery}%
+      \crefname{enumiv}%
+        {\cyrp\cyru\cyrn\cyrk\cyrt}%
+        {\cyrp\cyru\cyrn\cyrk\cyrt\cyrery}%
+      \crefname{enumv}%
+        {\cyrp\cyru\cyrn\cyrk\cyrt}%
+        {\cyrp\cyru\cyrn\cyrk\cyrt\cyrery}%
+      \crefname{chapter}%
+        {\cyrg\cyrl\cyra\cyrv\cyra}%
+        {\cyrg\cyrl\cyra\cyrv\cyrery}%
+      \crefname{section}%
+        {\cyrr\cyra\cyrz\cyrd\cyre\cyrl}%
+        {\cyrr\cyra\cyrz\cyrd\cyre\cyrl\cyrery}%
+      \crefname{subsection}%
+        {\cyrr\cyra\cyrz\cyrd\cyre\cyrl}%
+        {\cyrr\cyra\cyrz\cyrd\cyre\cyrl\cyrery}%
+      \crefname{subsubsection}%
+        {\cyrr\cyra\cyrz\cyrd\cyre\cyrl}%
+        {\cyrr\cyra\cyrz\cyrd\cyre\cyrl\cyrery}%
+      \crefname{appendix}%
+        {\cyrp\cyrr\cyri\cyrl\cyro\cyrzh\cyre\cyrn\cyri\cyre}%
+        {\cyrp\cyrr\cyri\cyrl\cyro\cyrzh\cyre\cyrn\cyri\cyrya}%
+      \crefname{subappendix}%
+        {\cyrp\cyrr\cyri\cyrl\cyro\cyrzh\cyre\cyrn\cyri\cyre}%
+        {\cyrp\cyrr\cyri\cyrl\cyro\cyrzh\cyre\cyrn\cyri\cyrya}%
+      \crefname{subsubappendix}%
+        {\cyrp\cyrr\cyri\cyrl\cyro\cyrzh\cyre\cyrn\cyri\cyre}%
+        {\cyrp\cyrr\cyri\cyrl\cyro\cyrzh\cyre\cyrn\cyri\cyrya}%
+      \crefname{subsubsubappendix}%
+        {\cyrp\cyrr\cyri\cyrl\cyro\cyrzh\cyre\cyrn\cyri\cyre}%
+        {\cyrp\cyrr\cyri\cyrl\cyro\cyrzh\cyre\cyrn\cyri\cyrya}%
+      \crefname{footnote}%
+        {\cyrs\cyrn\cyro\cyrs\cyrk\cyra}%
+        {\cyrs\cyrn\cyro\cyrs\cyrk\cyri}%
+      \crefname{theorem}%
+        {\cyrt\cyre\cyro\cyrr\cyre\cyrm\cyra}%
+        {\cyrt\cyre\cyro\cyrr\cyre\cyrm\cyrery}%
+      \crefname{lemma}%
+        {\cyrl\cyre\cyrm\cyrm\cyra}%
+        {\cyrl\cyre\cyrm\cyrm\cyrery}%
+      \crefname{corollary}%
+        {\cyrv\cyrery\cyrv\cyro\cyrd}%
+        {\cyrv\cyrery\cyrv\cyro\cyrd\cyrery}%
+      \crefname{proposition}%
+        {\cyru\cyrt\cyrv\cyre\cyrr\cyrzh\cyrd\cyre\cyrn\cyri\cyre}%
+        {\cyru\cyrt\cyrv\cyre\cyrr\cyrzh\cyrd\cyre\cyrn\cyri\cyrya}%
+      \crefname{definition}%
+        {\cyro\cyrp\cyrr\cyre\cyrd\cyre\cyrl\cyre\cyrn\cyri\cyre}%
+        {\cyro\cyrp\cyrr\cyre\cyrd\cyre\cyrl\cyre\cyrn\cyri\cyrya}%
+      \crefname{result}%
+        {\cyrr\cyre\cyrz\cyru\cyrl\cyrsftsn\cyrt\cyra\cyrt}%
+        {\cyrr\cyre\cyrz\cyru\cyrl\cyrsftsn\cyrt\cyra\cyrt\cyrery}%
+      \crefname{example}%
+        {\cyrp\cyrr\cyri\cyrm\cyre\cyrr}%
+        {\cyrp\cyrr\cyri\cyrm\cyre\cyrr\cyrery}%
+      \crefname{remark}%
+        {\cyrp\cyrr\cyri\cyrm\cyre\cyrch\cyra\cyrn\cyri\cyre}%
+        {\cyrp\cyrr\cyri\cyrm\cyre\cyrch\cyra\cyrn\cyri\cyrya}%
+      \crefname{note}%
+        {\cyrz\cyra\cyrm\cyre\cyrt\cyrk\cyra}%
+        {\cyrz\cyra\cyrm\cyre\cyrt\cyrk\cyri}%
+      \crefname{algorithm}%
+        {\cyra\cyrl\cyrg\cyro\cyrr\cyri\cyrt\cyrm}%
+        {\cyra\cyrl\cyrg\cyro\cyrr\cyri\cyrt\cyrm\cyrery}%
+      \crefname{listing}%
+        {\cyrl\cyri\cyrs\cyrt\cyri\cyrn\cyrg}%
+        {\cyrl\cyri\cyrs\cyrt\cyri\cyrn\cyrg\cyri}%
+      \crefname{line}%
+        {\cyrs\cyrt\cyrr\cyro\cyrk\cyra}%
+        {\cyrs\cyrt\cyrr\cyro\cyrk\cyri}%
+    \fi%
+    \crefname{page}%
+      {\cyrs\cyrt\cyrr\cyra\cyrn\cyri\cyrc\cyre}%
+      {\cyrs\cyrt\cyrr\cyra\cyrn\cyri\cyrc\cyra\cyrh}%
+    \crefname{part}%
+      {\cyrch\cyra\cyrs\cyrt\cyrsftsn}%
+      {\cyrch\cyra\cyrs\cyrt\cyri}%
+  \fi}% end \cref@loadlanguagedefs
 %    \end{macrocode}
 %
 %
@@ -10248,13 +10310,11 @@
 % \begin{macro}{ukrainian}
 %   Ukrainian translations courtesy of Aleksander Gorohovski.
 % \end{macro}
+%
+% Set up the definitions used at the beginning of the document to define
+% the formats created by the document preamble.
 %    \begin{macrocode}
 \DeclareOption{ukrainian}{%
-  \PackageInfo{cleveref}{loaded `ukrainian' language definitions}
-%    \end{macrocode}
-% First, we set up the definitions used at the beginning of the document
-% to define the formats created by the document preamble.
-%    \begin{macrocode}
   \AtBeginDocument{%
     \def\crefrangeconjunction@preamble{--}%
     \def\crefrangepreconjunction@preamble{}%
@@ -10555,457 +10615,460 @@
         {\cyrch\cyra\cyrs\cyrt\cyri\cyrn\cyri}%
     \fi%
     \def\cref@language{ukrainian}%
+  }}% end \DeclareOption and \AtBeginDocument
 %    \end{macrocode}
 %
-% Next, we add the definitions to \cmd{\extras}\dots{} so that
-% \package{babel}'s \cmd{\selectlanguage} command will change the format
-% appropriately.
-%    \begin{macrocode}
-    \cref@addto\extrasukrainian{%
-      \renewcommand{\crefrangeconjunction}{--}%
-      \renewcommand\crefrangepreconjunction{}%
-      \renewcommand\crefrangepostconjunction{}%
-      \renewcommand{\crefpairconjunction}{ \cyrii\nobreakspace}%
-      \renewcommand{\crefmiddleconjunction}{, }%
-      \renewcommand{\creflastconjunction}{ \cyrii\nobreakspace}%
-      \renewcommand{\crefpairgroupconjunction}%
-        { \cyrt\cyra\nobreakspace}%
-      \renewcommand{\crefmiddlegroupconjunction}{, }%
-      \renewcommand{\creflastgroupconjunction}%
-        {, \cyra\ \cyrt\cyra\cyrk\cyro\cyrzh\nobreakspace}%
+% If using \package{babel} and the corresponding option is set, or if
+% using \package{polyglossia} and the language has been loaded, add
+% format definition commands to \cmd{\extras}\meta{language} or
+% \cmd{\captions}\meta{language} so that language switching commands will
+% change the cross-reference formats appropriately.
+%    \begin{macrocode}
+\cref@addlanguagedefs{ukrainian}{%
+  \PackageInfo{cleveref}{loaded `ukrainian' language definitions}
+  \renewcommand{\crefrangeconjunction}{--}%
+  \renewcommand\crefrangepreconjunction{}%
+  \renewcommand\crefrangepostconjunction{}%
+  \renewcommand{\crefpairconjunction}{ \cyrii\nobreakspace}%
+  \renewcommand{\crefmiddleconjunction}{, }%
+  \renewcommand{\creflastconjunction}{ \cyrii\nobreakspace}%
+  \renewcommand{\crefpairgroupconjunction}%
+    { \cyrt\cyra\nobreakspace}%
+  \renewcommand{\crefmiddlegroupconjunction}{, }%
+  \renewcommand{\creflastgroupconjunction}%
+    {, \cyra\ \cyrt\cyra\cyrk\cyro\cyrzh\nobreakspace}%
+ %
+    \Crefname{equation}%
+    {\CYRF\cyro\cyrr\cyrm\cyru\cyrl\cyra}%
+    {\CYRF\cyro\cyrr\cyrm\cyru\cyrl\cyri}%
+  \Crefname{figure}%
+    {\CYRR\cyri\cyrs\cyru\cyrn\cyro\cyrk}%
+    {\CYRR\cyri\cyrs\cyru\cyrn\cyrk\cyri}%
+  \Crefname{subfigure}%
+    {\CYRR\cyri\cyrs\cyru\cyrn\cyro\cyrk}%
+    {\CYRR\cyri\cyrs\cyru\cyrn\cyrk\cyri}%
+  \Crefname{table}%
+    {\CYRT\cyra\cyrb\cyrl\cyri\cyrc\cyrya}%
+    {\CYRT\cyra\cyrb\cyrl\cyri\cyrc\cyrii}%
+  \Crefname{subtable}%
+    {\CYRT\cyra\cyrb\cyrl\cyri\cyrc\cyrya}%
+    {\CYRT\cyra\cyrb\cyrl\cyri\cyrc\cyrii}%
+  \Crefname{enumi}%
+    {\CYRP\cyru\cyrn\cyrk\cyrt}%
+    {\CYRP\cyru\cyrn\cyrk\cyrt\cyri}%
+  \Crefname{enumii}%
+    {\CYRP\cyru\cyrn\cyrk\cyrt}%
+    {\CYRP\cyru\cyrn\cyrk\cyrt\cyri}%
+  \Crefname{enumiii}%
+    {\CYRP\cyru\cyrn\cyrk\cyrt}%
+    {\CYRP\cyru\cyrn\cyrk\cyrt\cyri}%
+  \Crefname{enumiv}%
+    {\CYRP\cyru\cyrn\cyrk\cyrt}%
+    {\CYRP\cyru\cyrn\cyrk\cyrt\cyri}%
+  \Crefname{enumv}%
+    {\CYRP\cyru\cyrn\cyrk\cyrt}%
+    {\CYRP\cyru\cyrn\cyrk\cyrt\cyri}%
+  \Crefname{chapter}%
+    {\CYRG\cyrl\cyra\cyrv\cyra}%
+    {\CYRG\cyrl\cyra\cyrv\cyri}%
+  \Crefname{section}%
+    {\CYRR\cyro\cyrz\cyrd\cyrii\cyrl}%
+    {\CYRR\cyro\cyrz\cyrd\cyrii\cyrl\cyri}%
+  \Crefname{subsection}%
+    {\CYRR\cyro\cyrz\cyrd\cyrii\cyrl}%
+    {\CYRR\cyro\cyrz\cyrd\cyrii\cyrl\cyri}%
+  \Crefname{subsubsection}%
+    {\CYRR\cyro\cyrz\cyrd\cyrii\cyrl}%
+    {\CYRR\cyro\cyrz\cyrd\cyrii\cyrl\cyri}%
+  \Crefname{appendix}%
+    {\CYRD\cyro\cyrd\cyra\cyrt\cyro\cyrk}%
+    {\CYRD\cyro\cyrd\cyra\cyrt\cyrk\cyri}%
+  \Crefname{subappendix}%
+    {\CYRD\cyro\cyrd\cyra\cyrt\cyro\cyrk}%
+    {\CYRD\cyro\cyrd\cyra\cyrt\cyrk\cyri}%
+  \Crefname{subsubappendix}%
+    {\CYRD\cyro\cyrd\cyra\cyrt\cyro\cyrk}%
+    {\CYRD\cyro\cyrd\cyra\cyrt\cyrk\cyri}%
+  \Crefname{subsubsubappendix}%
+    {\CYRD\cyro\cyrd\cyra\cyrt\cyro\cyrk}%
+    {\CYRD\cyro\cyrd\cyra\cyrt\cyrk\cyri}%
+  \Crefname{footnote}%
+    {\CYRV\cyri\cyrn\cyro\cyrs\cyrk\cyra}%
+    {\CYRV\cyri\cyrn\cyro\cyrs\cyrk\cyri}%
+  \Crefname{theorem}%
+    {\CYRT\cyre\cyro\cyrr\cyre\cyrm\cyra}%
+    {\CYRT\cyre\cyro\cyrr\cyre\cyrm\cyri}%
+  \Crefname{lemma}%
+    {\CYRL\cyre\cyrm\cyrm\cyra}%
+    {\CYRL\cyre\cyrm\cyrm\cyri}%
+  \Crefname{corollary}%
+    {\CYRV\cyri\cyrs\cyrn\cyro\cyrv\cyro\cyrk}%
+    {\CYRV\cyri\cyrs\cyrn\cyro\cyrv\cyrk\cyri}%
+  \Crefname{proposition}%
+    {\CYRT\cyrv\cyre\cyrr\cyrd\cyrzh\cyre\cyrn\cyrn\cyrya}%
+    {\CYRT\cyrv\cyre\cyrr\cyrd\cyrzh\cyre\cyrn\cyrn\cyrya}%
+  \Crefname{definition}%
+    {\CYRV\cyri\cyrz\cyrn\cyra\cyrch\cyre\cyrn\cyrn\cyrya}%
+    {\CYRV\cyri\cyrz\cyrn\cyra\cyrch\cyre\cyrn\cyrn\cyrya}%
+  \Crefname{result}%
+    {\CYRR\cyre\cyrz\cyru\cyrl\cyrsftsn\cyrt\cyra\cyrt}%
+    {\CYRR\cyre\cyrz\cyru\cyrl\cyrsftsn\cyrt\cyra\cyrt\cyri}%
+  \Crefname{example}%
+    {\CYRP\cyrr\cyri\cyrk\cyrl\cyra\cyrd}%
+    {\CYRP\cyrr\cyri\cyrk\cyrl\cyra\cyrd\cyri}%
+  \Crefname{remark}%
+    {\CYRP\cyrr\cyri\cyrm\cyrii\cyrt\cyrk\cyra}%
+    {\CYRP\cyrr\cyri\cyrm\cyrii\cyrt\cyrk\cyri}%
+  \Crefname{note}%
+    {\CYRZ\cyra\cyrm\cyrii\cyrt\cyrk\cyra}%
+    {\CYRZ\cyra\cyrm\cyrii\cyrt\cyrk\cyri}%
+  \Crefname{algorithm}%
+    {\CYRA\cyrl\cyrg\cyro\cyrr\cyri\cyrt\cyrm}%
+    {\CYRA\cyrl\cyrg\cyro\cyrr\cyri\cyrt\cyrm\cyri}%
+  \Crefname{listing}%
+    {\CYRL\cyrii\cyrs\cyrt\cyri\cyrn\cyrg}%
+    {\CYRL\cyrii\cyrs\cyrt\cyri\cyrn\cyrg\cyri}%
+  \Crefname{line}%
+    {\CYRS\cyrt\cyrr\cyro\cyrk\cyra}%
+    {\CYRS\cyrt\cyrr\cyro\cyrk\cyri}%
+  \Crefname{page}%
+    {\CYRS\cyrt\cyro\cyrr\cyri\cyrn\cyrk\cyra}%
+    {\CYRS\cyrt\cyro\cyrr\cyrii\cyrn\cyrk\cyri}%
+  \Crefname{part}%
+    {\CYRCH\cyra\cyrs\cyrt\cyri\cyrn\cyra}%
+    {\CYRCH\cyra\cyrs\cyrt\cyri\cyrn\cyri}%
  %
-        \Crefname{equation}%
+  \if@cref@capitalise%  capitalise set
+    \if@cref@abbrev%  abbrev set
+      \crefname{equation}%
+        {\CYRF-\cyrl.}%
+        {\CYRF-\cyrl.}%
+      \crefname{figure}%
+        {\CYRR\cyri\cyrs.}%
+        {\CYRR\cyri\cyrs.}%
+      \crefname{subfigure}%
+        {\CYRR\cyri\cyrs.}%
+        {\CYRR\cyri\cyrs.}%
+      \crefname{table}%
+        {\CYRT\cyra\cyrb\cyrl.}%
+        {\CYRT\cyra\cyrb\cyrl.}%
+      \crefname{subtable}%
+        {\CYRT\cyra\cyrb\cyrl.}%
+        {\CYRT\cyra\cyrb\cyrl.}%
+      \crefname{enumi}%
+        {\CYRP.}%
+        {\CYRP.\cyrp.}%
+      \crefname{enumii}%
+        {\CYRP.}%
+        {\CYRP.\cyrp.}%
+      \crefname{enumiii}%
+        {\CYRP.}%
+        {\CYRP.\cyrp.}%
+      \crefname{enumiv}%
+        {\CYRP.}%
+        {\CYRP.\cyrp.}%
+      \crefname{enumv}%
+        {\CYRP.}%
+        {\CYRP.\cyrp.}%
+    \else%  abbrev unset
+      \crefname{equation}%
         {\CYRF\cyro\cyrr\cyrm\cyru\cyrl\cyra}%
         {\CYRF\cyro\cyrr\cyrm\cyru\cyrl\cyri}%
-      \Crefname{figure}%
+      \crefname{figure}%
         {\CYRR\cyri\cyrs\cyru\cyrn\cyro\cyrk}%
         {\CYRR\cyri\cyrs\cyru\cyrn\cyrk\cyri}%
-      \Crefname{subfigure}%
+      \crefname{subfigure}%
         {\CYRR\cyri\cyrs\cyru\cyrn\cyro\cyrk}%
         {\CYRR\cyri\cyrs\cyru\cyrn\cyrk\cyri}%
-      \Crefname{table}%
+      \crefname{table}%
         {\CYRT\cyra\cyrb\cyrl\cyri\cyrc\cyrya}%
         {\CYRT\cyra\cyrb\cyrl\cyri\cyrc\cyrii}%
-      \Crefname{subtable}%
+      \crefname{subtable}%
         {\CYRT\cyra\cyrb\cyrl\cyri\cyrc\cyrya}%
         {\CYRT\cyra\cyrb\cyrl\cyri\cyrc\cyrii}%
-      \Crefname{enumi}%
+      \crefname{enumi}%
         {\CYRP\cyru\cyrn\cyrk\cyrt}%
         {\CYRP\cyru\cyrn\cyrk\cyrt\cyri}%
-      \Crefname{enumii}%
+      \crefname{enumii}%
         {\CYRP\cyru\cyrn\cyrk\cyrt}%
         {\CYRP\cyru\cyrn\cyrk\cyrt\cyri}%
-      \Crefname{enumiii}%
+      \crefname{enumiii}%
         {\CYRP\cyru\cyrn\cyrk\cyrt}%
         {\CYRP\cyru\cyrn\cyrk\cyrt\cyri}%
-      \Crefname{enumiv}%
+      \crefname{enumiv}%
         {\CYRP\cyru\cyrn\cyrk\cyrt}%
         {\CYRP\cyru\cyrn\cyrk\cyrt\cyri}%
-      \Crefname{enumv}%
+      \crefname{enumv}%
         {\CYRP\cyru\cyrn\cyrk\cyrt}%
         {\CYRP\cyru\cyrn\cyrk\cyrt\cyri}%
-      \Crefname{chapter}%
-        {\CYRG\cyrl\cyra\cyrv\cyra}%
-        {\CYRG\cyrl\cyra\cyrv\cyri}%
-      \Crefname{section}%
-        {\CYRR\cyro\cyrz\cyrd\cyrii\cyrl}%
-        {\CYRR\cyro\cyrz\cyrd\cyrii\cyrl\cyri}%
-      \Crefname{subsection}%
-        {\CYRR\cyro\cyrz\cyrd\cyrii\cyrl}%
-        {\CYRR\cyro\cyrz\cyrd\cyrii\cyrl\cyri}%
-      \Crefname{subsubsection}%
-        {\CYRR\cyro\cyrz\cyrd\cyrii\cyrl}%
-        {\CYRR\cyro\cyrz\cyrd\cyrii\cyrl\cyri}%
-      \Crefname{appendix}%
-        {\CYRD\cyro\cyrd\cyra\cyrt\cyro\cyrk}%
-        {\CYRD\cyro\cyrd\cyra\cyrt\cyrk\cyri}%
-      \Crefname{subappendix}%
-        {\CYRD\cyro\cyrd\cyra\cyrt\cyro\cyrk}%
-        {\CYRD\cyro\cyrd\cyra\cyrt\cyrk\cyri}%
-      \Crefname{subsubappendix}%
-        {\CYRD\cyro\cyrd\cyra\cyrt\cyro\cyrk}%
-        {\CYRD\cyro\cyrd\cyra\cyrt\cyrk\cyri}%
-      \Crefname{subsubsubappendix}%
-        {\CYRD\cyro\cyrd\cyra\cyrt\cyro\cyrk}%
-        {\CYRD\cyro\cyrd\cyra\cyrt\cyrk\cyri}%
-      \Crefname{footnote}%
-        {\CYRV\cyri\cyrn\cyro\cyrs\cyrk\cyra}%
-        {\CYRV\cyri\cyrn\cyro\cyrs\cyrk\cyri}%
-      \Crefname{theorem}%
-        {\CYRT\cyre\cyro\cyrr\cyre\cyrm\cyra}%
-        {\CYRT\cyre\cyro\cyrr\cyre\cyrm\cyri}%
-      \Crefname{lemma}%
-        {\CYRL\cyre\cyrm\cyrm\cyra}%
-        {\CYRL\cyre\cyrm\cyrm\cyri}%
-      \Crefname{corollary}%
-        {\CYRV\cyri\cyrs\cyrn\cyro\cyrv\cyro\cyrk}%
-        {\CYRV\cyri\cyrs\cyrn\cyro\cyrv\cyrk\cyri}%
-      \Crefname{proposition}%
-        {\CYRT\cyrv\cyre\cyrr\cyrd\cyrzh\cyre\cyrn\cyrn\cyrya}%
-        {\CYRT\cyrv\cyre\cyrr\cyrd\cyrzh\cyre\cyrn\cyrn\cyrya}%
-      \Crefname{definition}%
-        {\CYRV\cyri\cyrz\cyrn\cyra\cyrch\cyre\cyrn\cyrn\cyrya}%
-        {\CYRV\cyri\cyrz\cyrn\cyra\cyrch\cyre\cyrn\cyrn\cyrya}%
-      \Crefname{result}%
-        {\CYRR\cyre\cyrz\cyru\cyrl\cyrsftsn\cyrt\cyra\cyrt}%
-        {\CYRR\cyre\cyrz\cyru\cyrl\cyrsftsn\cyrt\cyra\cyrt\cyri}%
-      \Crefname{example}%
-        {\CYRP\cyrr\cyri\cyrk\cyrl\cyra\cyrd}%
-        {\CYRP\cyrr\cyri\cyrk\cyrl\cyra\cyrd\cyri}%
-      \Crefname{remark}%
-        {\CYRP\cyrr\cyri\cyrm\cyrii\cyrt\cyrk\cyra}%
-        {\CYRP\cyrr\cyri\cyrm\cyrii\cyrt\cyrk\cyri}%
-      \Crefname{note}%
-        {\CYRZ\cyra\cyrm\cyrii\cyrt\cyrk\cyra}%
-        {\CYRZ\cyra\cyrm\cyrii\cyrt\cyrk\cyri}%
-      \Crefname{algorithm}%
-        {\CYRA\cyrl\cyrg\cyro\cyrr\cyri\cyrt\cyrm}%
-        {\CYRA\cyrl\cyrg\cyro\cyrr\cyri\cyrt\cyrm\cyri}%
-      \Crefname{listing}%
-        {\CYRL\cyrii\cyrs\cyrt\cyri\cyrn\cyrg}%
-        {\CYRL\cyrii\cyrs\cyrt\cyri\cyrn\cyrg\cyri}%
-      \Crefname{line}%
-        {\CYRS\cyrt\cyrr\cyro\cyrk\cyra}%
-        {\CYRS\cyrt\cyrr\cyro\cyrk\cyri}%
-      \Crefname{page}%
-        {\CYRS\cyrt\cyro\cyrr\cyri\cyrn\cyrk\cyra}%
-        {\CYRS\cyrt\cyro\cyrr\cyrii\cyrn\cyrk\cyri}%
-      \Crefname{part}%
-        {\CYRCH\cyra\cyrs\cyrt\cyri\cyrn\cyra}%
-        {\CYRCH\cyra\cyrs\cyrt\cyri\cyrn\cyri}%
- %
-      \if@cref@capitalise%  capitalise set
-        \if@cref@abbrev%  abbrev set
-          \crefname{equation}%
-            {\CYRF-\cyrl.}%
-            {\CYRF-\cyrl.}%
-          \crefname{figure}%
-            {\CYRR\cyri\cyrs.}%
-            {\CYRR\cyri\cyrs.}%
-          \crefname{subfigure}%
-            {\CYRR\cyri\cyrs.}%
-            {\CYRR\cyri\cyrs.}%
-          \crefname{table}%
-            {\CYRT\cyra\cyrb\cyrl.}%
-            {\CYRT\cyra\cyrb\cyrl.}%
-          \crefname{subtable}%
-            {\CYRT\cyra\cyrb\cyrl.}%
-            {\CYRT\cyra\cyrb\cyrl.}%
-          \crefname{enumi}%
-            {\CYRP.}%
-            {\CYRP.\cyrp.}%
-          \crefname{enumii}%
-            {\CYRP.}%
-            {\CYRP.\cyrp.}%
-          \crefname{enumiii}%
-            {\CYRP.}%
-            {\CYRP.\cyrp.}%
-          \crefname{enumiv}%
-            {\CYRP.}%
-            {\CYRP.\cyrp.}%
-          \crefname{enumv}%
-            {\CYRP.}%
-            {\CYRP.\cyrp.}%
-        \else%  abbrev unset
-          \crefname{equation}%
-            {\CYRF\cyro\cyrr\cyrm\cyru\cyrl\cyra}%
-            {\CYRF\cyro\cyrr\cyrm\cyru\cyrl\cyri}%
-          \crefname{figure}%
-            {\CYRR\cyri\cyrs\cyru\cyrn\cyro\cyrk}%
-            {\CYRR\cyri\cyrs\cyru\cyrn\cyrk\cyri}%
-          \crefname{subfigure}%
-            {\CYRR\cyri\cyrs\cyru\cyrn\cyro\cyrk}%
-            {\CYRR\cyri\cyrs\cyru\cyrn\cyrk\cyri}%
-          \crefname{table}%
-            {\CYRT\cyra\cyrb\cyrl\cyri\cyrc\cyrya}%
-            {\CYRT\cyra\cyrb\cyrl\cyri\cyrc\cyrii}%
-          \crefname{subtable}%
-            {\CYRT\cyra\cyrb\cyrl\cyri\cyrc\cyrya}%
-            {\CYRT\cyra\cyrb\cyrl\cyri\cyrc\cyrii}%
-          \crefname{enumi}%
-            {\CYRP\cyru\cyrn\cyrk\cyrt}%
-            {\CYRP\cyru\cyrn\cyrk\cyrt\cyri}%
-          \crefname{enumii}%
-            {\CYRP\cyru\cyrn\cyrk\cyrt}%
-            {\CYRP\cyru\cyrn\cyrk\cyrt\cyri}%
-          \crefname{enumiii}%
-            {\CYRP\cyru\cyrn\cyrk\cyrt}%
-            {\CYRP\cyru\cyrn\cyrk\cyrt\cyri}%
-          \crefname{enumiv}%
-            {\CYRP\cyru\cyrn\cyrk\cyrt}%
-            {\CYRP\cyru\cyrn\cyrk\cyrt\cyri}%
-          \crefname{enumv}%
-            {\CYRP\cyru\cyrn\cyrk\cyrt}%
-            {\CYRP\cyru\cyrn\cyrk\cyrt\cyri}%
-        \fi%
-        \crefname{chapter}%
-          {\CYRG\cyrl\cyra\cyrv\cyra}%
-          {\CYRG\cyrl\cyra\cyrv\cyri}%
-        \crefname{section}%
-          {\CYRR\cyro\cyrz\cyrd\cyrii\cyrl}%
-          {\CYRR\cyro\cyrz\cyrd\cyrii\cyrl\cyri}%
-        \crefname{subsection}%
-          {\CYRR\cyro\cyrz\cyrd\cyrii\cyrl}%
-          {\CYRR\cyro\cyrz\cyrd\cyrii\cyrl\cyri}%
-        \crefname{subsubsection}%
-          {\CYRR\cyro\cyrz\cyrd\cyrii\cyrl}%
-          {\CYRR\cyro\cyrz\cyrd\cyrii\cyrl\cyri}%
-        \crefname{appendix}%
-          {\CYRD\cyro\cyrd\cyra\cyrt\cyro\cyrk}%
-          {\CYRD\cyro\cyrd\cyra\cyrt\cyrk\cyri}%
-        \crefname{subappendix}%
-          {\CYRD\cyro\cyrd\cyra\cyrt\cyro\cyrk}%
-          {\CYRD\cyro\cyrd\cyra\cyrt\cyrk\cyri}%
-        \crefname{subsubappendix}%
-          {\CYRD\cyro\cyrd\cyra\cyrt\cyro\cyrk}%
-          {\CYRD\cyro\cyrd\cyra\cyrt\cyrk\cyri}%
-        \crefname{subsubsubappendix}%
-          {\CYRD\cyro\cyrd\cyra\cyrt\cyro\cyrk}%
-          {\CYRD\cyro\cyrd\cyra\cyrt\cyrk\cyri}%
-        \crefname{footnote}%
-          {\CYRV\cyri\cyrn\cyro\cyrs\cyrk\cyra}%
-          {\CYRV\cyri\cyrn\cyro\cyrs\cyrk\cyri}%
-        \crefname{theorem}%
-          {\CYRT\cyre\cyro\cyrr\cyre\cyrm\cyra}%
-          {\CYRT\cyre\cyro\cyrr\cyre\cyrm\cyri}%
-        \crefname{lemma}%
-          {\CYRL\cyre\cyrm\cyrm\cyra}%
-          {\CYRL\cyre\cyrm\cyrm\cyri}%
-        \crefname{corollary}%
-          {\CYRV\cyri\cyrs\cyrn\cyro\cyrv\cyro\cyrk}%
-          {\CYRV\cyri\cyrs\cyrn\cyro\cyrv\cyrk\cyri}%
-        \crefname{proposition}%
-          {\CYRT\cyrv\cyre\cyrr\cyrd\cyrzh\cyre\cyrn\cyrn\cyrya}%
-          {\CYRT\cyrv\cyre\cyrr\cyrd\cyrzh\cyre\cyrn\cyrn\cyrya}%
-        \crefname{definition}%
-          {\CYRV\cyri\cyrz\cyrn\cyra\cyrch\cyre\cyrn\cyrn\cyrya}%
-          {\CYRV\cyri\cyrz\cyrn\cyra\cyrch\cyre\cyrn\cyrn\cyrya}%
-        \crefname{result}%
-          {\CYRR\cyre\cyrz\cyru\cyrl\cyrsftsn\cyrt\cyra\cyrt}%
-          {\CYRR\cyre\cyrz\cyru\cyrl\cyrsftsn\cyrt\cyra\cyrt\cyri}%
-        \crefname{example}%
-          {\CYRP\cyrr\cyri\cyrk\cyrl\cyra\cyrd}%
-          {\CYRP\cyrr\cyri\cyrk\cyrl\cyra\cyrd\cyri}%
-        \crefname{remark}%
-          {\CYRP\cyrr\cyri\cyrm\cyrii\cyrt\cyrk\cyra}%
-          {\CYRP\cyrr\cyri\cyrm\cyrii\cyrt\cyrk\cyri}%
-        \crefname{note}%
-          {\CYRZ\cyra\cyrm\cyrii\cyrt\cyrk\cyra}%
-          {\CYRZ\cyra\cyrm\cyrii\cyrt\cyrk\cyri}%
-        \crefname{algorithm}%
-          {\CYRA\cyrl\cyrg\cyro\cyrr\cyri\cyrt\cyrm}%
-          {\CYRA\cyrl\cyrg\cyro\cyrr\cyri\cyrt\cyrm\cyri}%
-        \crefname{listing}%
-          {\CYRL\cyrii\cyrs\cyrt\cyri\cyrn\cyrg}%
-          {\CYRL\cyrii\cyrs\cyrt\cyri\cyrn\cyrg\cyri}%
-        \crefname{line}%
-          {\CYRS\cyrt\cyrr\cyro\cyrk\cyra}%
-          {\CYRS\cyrt\cyrr\cyro\cyrk\cyri}%
-        \crefname{page}%
-          {\CYRS\cyrt\cyro\cyrr\cyri\cyrn\cyrk\cyra}%
-          {\CYRS\cyrt\cyro\cyrr\cyrii\cyrn\cyrk\cyri}%
-        \crefname{part}%
-          {\CYRCH\cyra\cyrs\cyrt\cyri\cyrn\cyra}%
-          {\CYRCH\cyra\cyrs\cyrt\cyri\cyrn\cyri}%
+    \fi%
+    \crefname{chapter}%
+      {\CYRG\cyrl\cyra\cyrv\cyra}%
+      {\CYRG\cyrl\cyra\cyrv\cyri}%
+    \crefname{section}%
+      {\CYRR\cyro\cyrz\cyrd\cyrii\cyrl}%
+      {\CYRR\cyro\cyrz\cyrd\cyrii\cyrl\cyri}%
+    \crefname{subsection}%
+      {\CYRR\cyro\cyrz\cyrd\cyrii\cyrl}%
+      {\CYRR\cyro\cyrz\cyrd\cyrii\cyrl\cyri}%
+    \crefname{subsubsection}%
+      {\CYRR\cyro\cyrz\cyrd\cyrii\cyrl}%
+      {\CYRR\cyro\cyrz\cyrd\cyrii\cyrl\cyri}%
+    \crefname{appendix}%
+      {\CYRD\cyro\cyrd\cyra\cyrt\cyro\cyrk}%
+      {\CYRD\cyro\cyrd\cyra\cyrt\cyrk\cyri}%
+    \crefname{subappendix}%
+      {\CYRD\cyro\cyrd\cyra\cyrt\cyro\cyrk}%
+      {\CYRD\cyro\cyrd\cyra\cyrt\cyrk\cyri}%
+    \crefname{subsubappendix}%
+      {\CYRD\cyro\cyrd\cyra\cyrt\cyro\cyrk}%
+      {\CYRD\cyro\cyrd\cyra\cyrt\cyrk\cyri}%
+    \crefname{subsubsubappendix}%
+      {\CYRD\cyro\cyrd\cyra\cyrt\cyro\cyrk}%
+      {\CYRD\cyro\cyrd\cyra\cyrt\cyrk\cyri}%
+    \crefname{footnote}%
+      {\CYRV\cyri\cyrn\cyro\cyrs\cyrk\cyra}%
+      {\CYRV\cyri\cyrn\cyro\cyrs\cyrk\cyri}%
+    \crefname{theorem}%
+      {\CYRT\cyre\cyro\cyrr\cyre\cyrm\cyra}%
+      {\CYRT\cyre\cyro\cyrr\cyre\cyrm\cyri}%
+    \crefname{lemma}%
+      {\CYRL\cyre\cyrm\cyrm\cyra}%
+      {\CYRL\cyre\cyrm\cyrm\cyri}%
+    \crefname{corollary}%
+      {\CYRV\cyri\cyrs\cyrn\cyro\cyrv\cyro\cyrk}%
+      {\CYRV\cyri\cyrs\cyrn\cyro\cyrv\cyrk\cyri}%
+    \crefname{proposition}%
+      {\CYRT\cyrv\cyre\cyrr\cyrd\cyrzh\cyre\cyrn\cyrn\cyrya}%
+      {\CYRT\cyrv\cyre\cyrr\cyrd\cyrzh\cyre\cyrn\cyrn\cyrya}%
+    \crefname{definition}%
+      {\CYRV\cyri\cyrz\cyrn\cyra\cyrch\cyre\cyrn\cyrn\cyrya}%
+      {\CYRV\cyri\cyrz\cyrn\cyra\cyrch\cyre\cyrn\cyrn\cyrya}%
+    \crefname{result}%
+      {\CYRR\cyre\cyrz\cyru\cyrl\cyrsftsn\cyrt\cyra\cyrt}%
+      {\CYRR\cyre\cyrz\cyru\cyrl\cyrsftsn\cyrt\cyra\cyrt\cyri}%
+    \crefname{example}%
+      {\CYRP\cyrr\cyri\cyrk\cyrl\cyra\cyrd}%
+      {\CYRP\cyrr\cyri\cyrk\cyrl\cyra\cyrd\cyri}%
+    \crefname{remark}%
+      {\CYRP\cyrr\cyri\cyrm\cyrii\cyrt\cyrk\cyra}%
+      {\CYRP\cyrr\cyri\cyrm\cyrii\cyrt\cyrk\cyri}%
+    \crefname{note}%
+      {\CYRZ\cyra\cyrm\cyrii\cyrt\cyrk\cyra}%
+      {\CYRZ\cyra\cyrm\cyrii\cyrt\cyrk\cyri}%
+    \crefname{algorithm}%
+      {\CYRA\cyrl\cyrg\cyro\cyrr\cyri\cyrt\cyrm}%
+      {\CYRA\cyrl\cyrg\cyro\cyrr\cyri\cyrt\cyrm\cyri}%
+    \crefname{listing}%
+      {\CYRL\cyrii\cyrs\cyrt\cyri\cyrn\cyrg}%
+      {\CYRL\cyrii\cyrs\cyrt\cyri\cyrn\cyrg\cyri}%
+    \crefname{line}%
+      {\CYRS\cyrt\cyrr\cyro\cyrk\cyra}%
+      {\CYRS\cyrt\cyrr\cyro\cyrk\cyri}%
+    \crefname{page}%
+      {\CYRS\cyrt\cyro\cyrr\cyri\cyrn\cyrk\cyra}%
+      {\CYRS\cyrt\cyro\cyrr\cyrii\cyrn\cyrk\cyri}%
+    \crefname{part}%
+      {\CYRCH\cyra\cyrs\cyrt\cyri\cyrn\cyra}%
+      {\CYRCH\cyra\cyrs\cyrt\cyri\cyrn\cyri}%
  %
-      \else%  capitalise unset
-        \if@cref@abbrev%  abbrev set
-          \crefname{equation}%
-            {\cyrf-\cyrl.}%
-            {\cyrf-\cyrl.}%
-          \crefname{chapter}%
-            {\cyrg\cyrl\cyra\cyrv.}%
-            {\cyrg\cyrl\cyra\cyrv.}%
-          \crefname{section}%
-            {\cyrr\cyro\cyrz\cyrd.}%
-            {\cyrr\cyro\cyrz\cyrd\cyrii\cyrl.}%
-          \crefname{subsection}%
-            {\cyrr\cyro\cyrz\cyrd.}%
-            {\cyrr\cyro\cyrz\cyrd\cyrii\cyrl.}%
-          \crefname{subsubsection}%
-            {\cyrr\cyro\cyrz\cyrd.}%
-            {\cyrr\cyro\cyrz\cyrd\cyrii\cyrl.}%
-          \crefname{appendix}%
-            {\cyrd\cyro\cyrd\cyra\cyrt.}%
-            {\cyrd\cyro\cyrd\cyra\cyrt\cyrk.}%
-          \crefname{subappendix}%
-            {\cyrd\cyro\cyrd\cyra\cyrt.}%
-            {\cyrd\cyro\cyrd\cyra\cyrt\cyrk.}%
-          \crefname{subsubappendix}%
-            {\cyrd\cyro\cyrd\cyra\cyrt.}%
-            {\cyrd\cyro\cyrd\cyra\cyrt\cyrk.}%
-          \crefname{subsubsubappendix}%
-            {\cyrd\cyro\cyrd\cyra\cyrt.}%
-            {\cyrd\cyro\cyrd\cyra\cyrt\cyrk.}%
-          \crefname{enumi}%
-            {\cyrp.}%
-            {\cyrp.\cyrp.}%
-          \crefname{enumii}%
-            {\cyrp.}%
-            {\cyrp.\cyrp.}%
-          \crefname{enumiii}%
-            {\cyrp.}%
-            {\cyrp.\cyrp.}%
-          \crefname{enumiv}%
-            {\cyrp.}%
-            {\cyrp.\cyrp.}%
-          \crefname{enumv}%
-            {\cyrp.}%
-            {\cyrp.\cyrp.}%
-          \crefname{footnote}%
-            {\cyrv\cyri\cyrn\cyro\cyrs\cyrk.}%
-            {\cyrv\cyri\cyrn\cyro\cyrs\cyrk.}%
-          \crefname{figure}%
-            {\cyrr\cyri\cyrs.}%
-            {\cyrr\cyri\cyrs.}%
-          \crefname{subfigure}%
-            {\cyrr\cyri\cyrs.}%
-            {\cyrr\cyri\cyrs.}%
-          \crefname{table}%
-            {\cyrt\cyra\cyrb\cyrl.}%
-            {\cyrt\cyra\cyrb\cyrl.}%
-          \crefname{subtable}%
-            {\cyrt\cyra\cyrb\cyrl.}%
-            {\cyrt\cyra\cyrb\cyrl.}%
-          \crefname{theorem}%
-            {\cyrt\cyre\cyro\cyrr\cyre\cyrm.}%
-            {\cyrt\cyre\cyro\cyrr\cyre\cyrm.}%
-          \crefname{lemma}%
-            {\cyrl\cyre\cyrm\cyrm.}%
-            {\cyrl\cyre\cyrm\cyrm.}%
-          \crefname{corollary}%
-            {\cyrv\cyri\cyrs\cyrn\cyro\cyrv.}%
-            {\cyrv\cyri\cyrs\cyrn\cyro\cyrv\cyrk.}%
-          \crefname{proposition}%
-            {\cyrt\cyrv\cyre\cyrr\cyrd\cyrzh\cyre\cyrn\cyrn.}%
-            {\cyrt\cyrv\cyre\cyrr\cyrd\cyrzh\cyre\cyrn\cyrn.}%
-          \crefname{definition}%
-            {\cyrv\cyri\cyrz\cyrn\cyra\cyrch\cyre\cyrn\cyrn.}%
-            {\cyrv\cyri\cyrz\cyrn\cyra\cyrch\cyre\cyrn\cyrn.}%
-          \crefname{result}%
-            {\cyrr\cyre\cyrz\cyru\cyrl\cyrsftsn\cyrt.}%
-            {\cyrr\cyre\cyrz\cyru\cyrl\cyrsftsn\cyrt\cyra\cyrt.}%
-          \crefname{example}%
-            {\cyrp\cyrr\cyri\cyrk\cyrl.}%
-            {\cyrp\cyrr\cyri\cyrk\cyrl\cyra\cyrd.}%
-          \crefname{remark}%
-            {\cyrp\cyrr\cyri\cyrm\cyrii\cyrt.}%
-            {\cyrp\cyrr\cyri\cyrm\cyrii\cyrt.}%
-          \crefname{note}%
-            {\cyrz\cyra\cyrm\cyrii\cyrt.}%
-            {\cyrz\cyra\cyrm\cyrii\cyrt.}%
-          \crefname{algorithm}%
-            {\cyra\cyrl\cyrg.}%
-            {\cyra\cyrl\cyrg.}%
-          \crefname{listing}%
-            {\cyrl\cyrii\cyrs\cyrt\cyri\cyrn.}%
-            {\cyrl\cyrii\cyrs\cyrt\cyri\cyrn\cyrg.}%
-          \crefname{line}%
-            {\cyrs\cyrt\cyrr\cyrk.}%
-            {\cyrs\cyrt\cyrr\cyrk.}%
-        \else%  abbrev unset
-          \crefname{equation}%
-            {\cyrf\cyro\cyrr\cyrm\cyru\cyrl\cyra}%
-            {\cyrf\cyro\cyrr\cyrm\cyru\cyrl\cyri}%
-          \crefname{figure}%
-            {\cyrr\cyri\cyrs\cyru\cyrn\cyro\cyrk}%
-            {\cyrr\cyri\cyrs\cyru\cyrn\cyrk\cyri}%
-          \crefname{subfigure}%
-            {\cyrr\cyri\cyrs\cyru\cyrn\cyro\cyrk}%
-            {\cyrr\cyri\cyrs\cyru\cyrn\cyrk\cyri}%
-          \crefname{table}%
-            {\cyrt\cyra\cyrb\cyrl\cyri\cyrc\cyrya}%
-            {\cyrt\cyra\cyrb\cyrl\cyri\cyrc\cyrii}%
-          \crefname{subtable}%
-            {\cyrt\cyra\cyrb\cyrl\cyri\cyrc\cyrya}%
-            {\cyrt\cyra\cyrb\cyrl\cyri\cyrc\cyrii}%
-          \crefname{enumi}%
-            {\cyrp\cyru\cyrn\cyrk\cyrt}%
-            {\cyrp\cyru\cyrn\cyrk\cyrt\cyri}%
-          \crefname{enumii}%
-            {\cyrp\cyru\cyrn\cyrk\cyrt}%
-            {\cyrp\cyru\cyrn\cyrk\cyrt\cyri}%
-          \crefname{enumiii}%
-            {\cyrp\cyru\cyrn\cyrk\cyrt}%
-            {\cyrp\cyru\cyrn\cyrk\cyrt\cyri}%
-          \crefname{enumiv}%
-            {\cyrp\cyru\cyrn\cyrk\cyrt}%
-            {\cyrp\cyru\cyrn\cyrk\cyrt\cyri}%
-          \crefname{enumv}%
-            {\cyrp\cyru\cyrn\cyrk\cyrt}%
-            {\cyrp\cyru\cyrn\cyrk\cyrt\cyri}%
-          \crefname{chapter}%
-            {\cyrg\cyrl\cyra\cyrv\cyra}%
-            {\cyrg\cyrl\cyra\cyrv\cyri}%
-          \crefname{section}%
-            {\cyrr\cyro\cyrz\cyrd\cyrii\cyrl}%
-            {\cyrr\cyro\cyrz\cyrd\cyrii\cyrl\cyri}%
-          \crefname{subsection}%
-            {\cyrr\cyro\cyrz\cyrd\cyrii\cyrl}%
-            {\cyrr\cyro\cyrz\cyrd\cyrii\cyrl\cyri}%
-          \crefname{subsubsection}%
-            {\cyrr\cyro\cyrz\cyrd\cyrii\cyrl}%
-            {\cyrr\cyro\cyrz\cyrd\cyrii\cyrl\cyri}%
-          \crefname{appendix}%
-            {\cyrd\cyro\cyrd\cyra\cyrt\cyro\cyrk}%
-            {\cyrd\cyro\cyrd\cyra\cyrt\cyrk\cyri}%
-          \crefname{subappendix}%
-            {\cyrd\cyro\cyrd\cyra\cyrt\cyro\cyrk}%
-            {\cyrd\cyro\cyrd\cyra\cyrt\cyrk\cyri}%
-          \crefname{subsubappendix}%
-            {\cyrd\cyro\cyrd\cyra\cyrt\cyro\cyrk}%
-            {\cyrd\cyro\cyrd\cyra\cyrt\cyrk\cyri}%
-          \crefname{subsubsubappendix}%
-            {\cyrd\cyro\cyrd\cyra\cyrt\cyro\cyrk}%
-            {\cyrd\cyro\cyrd\cyra\cyrt\cyrk\cyri}%
-          \crefname{footnote}%
-            {\cyrv\cyri\cyrn\cyro\cyrs\cyrk\cyra}%
-            {\cyrv\cyri\cyrn\cyro\cyrs\cyrk\cyri}%
-          \crefname{theorem}%
-            {\cyrt\cyre\cyro\cyrr\cyre\cyrm\cyra}%
-            {\cyrt\cyre\cyro\cyrr\cyre\cyrm\cyri}%
-          \crefname{lemma}%
-            {\cyrl\cyre\cyrm\cyrm\cyra}%
-            {\cyrl\cyre\cyrm\cyrm\cyri}%
-          \crefname{corollary}%
-            {\cyrv\cyri\cyrs\cyrn\cyro\cyrv\cyro\cyrk}%
-            {\cyrv\cyri\cyrs\cyrn\cyro\cyrv\cyrk\cyri}%
-          \crefname{proposition}%
-            {\cyrt\cyrv\cyre\cyrr\cyrd\cyrzh\cyre\cyrn\cyrn\cyrya}%
-            {\cyrt\cyrv\cyre\cyrr\cyrd\cyrzh\cyre\cyrn\cyrn\cyrya}%
-          \crefname{definition}%
-            {\cyrv\cyri\cyrz\cyrn\cyra\cyrch\cyre\cyrn\cyrn\cyrya}%
-            {\cyrv\cyri\cyrz\cyrn\cyra\cyrch\cyre\cyrn\cyrn\cyrya}%
-          \crefname{result}%
-            {\cyrr\cyre\cyrz\cyru\cyrl\cyrsftsn\cyrt\cyra\cyrt}%
-            {\cyrr\cyre\cyrz\cyru\cyrl\cyrsftsn\cyrt\cyra\cyrt\cyri}%
-          \crefname{example}%
-            {\cyrp\cyrr\cyri\cyrk\cyrl\cyra\cyrd}%
-            {\cyrp\cyrr\cyri\cyrk\cyrl\cyra\cyrd\cyri}%
-          \crefname{remark}%
-            {\cyrp\cyrr\cyri\cyrm\cyrii\cyrt\cyrk\cyra}%
-            {\cyrp\cyrr\cyri\cyrm\cyrii\cyrt\cyrk\cyri}%
-          \crefname{note}%
-            {\cyrz\cyra\cyrm\cyrii\cyrt\cyrk\cyra}%
-            {\cyrz\cyra\cyrm\cyrii\cyrt\cyrk\cyri}%
-          \crefname{algorithm}%
-            {\cyra\cyrl\cyrg\cyro\cyrr\cyri\cyrt\cyrm}%
-            {\cyra\cyrl\cyrg\cyro\cyrr\cyri\cyrt\cyrm\cyri}%
-          \crefname{listing}%
-            {\cyrl\cyrii\cyrs\cyrt\cyri\cyrn\cyrg}%
-            {\cyrl\cyrii\cyrs\cyrt\cyri\cyrn\cyrg\cyri}%
-          \crefname{line}%
-            {\cyrs\cyrt\cyrr\cyro\cyrk\cyra}%
-            {\cyrs\cyrt\cyrr\cyro\cyrk\cyri}%
-        \fi%
-        \crefname{page}%
-          {\cyrs\cyrt\cyro\cyrr\cyri\cyrn\cyrc\cyrii}%
-          {\cyrs\cyrt\cyro\cyrr\cyrii\cyrn\cyrk\cyra\cyrh}%
-        \crefname{part}%
-          {\cyrch\cyra\cyrs\cyrt\cyri\cyrn\cyra}%
-          {\cyrch\cyra\cyrs\cyrt\cyri\cyrn\cyri}%
-      \fi%
-    }}}
+  \else%  capitalise unset
+    \if@cref@abbrev%  abbrev set
+      \crefname{equation}%
+        {\cyrf-\cyrl.}%
+        {\cyrf-\cyrl.}%
+      \crefname{chapter}%
+        {\cyrg\cyrl\cyra\cyrv.}%
+        {\cyrg\cyrl\cyra\cyrv.}%
+      \crefname{section}%
+        {\cyrr\cyro\cyrz\cyrd.}%
+        {\cyrr\cyro\cyrz\cyrd\cyrii\cyrl.}%
+      \crefname{subsection}%
+        {\cyrr\cyro\cyrz\cyrd.}%
+        {\cyrr\cyro\cyrz\cyrd\cyrii\cyrl.}%
+      \crefname{subsubsection}%
+        {\cyrr\cyro\cyrz\cyrd.}%
+        {\cyrr\cyro\cyrz\cyrd\cyrii\cyrl.}%
+      \crefname{appendix}%
+        {\cyrd\cyro\cyrd\cyra\cyrt.}%
+        {\cyrd\cyro\cyrd\cyra\cyrt\cyrk.}%
+      \crefname{subappendix}%
+        {\cyrd\cyro\cyrd\cyra\cyrt.}%
+        {\cyrd\cyro\cyrd\cyra\cyrt\cyrk.}%
+      \crefname{subsubappendix}%
+        {\cyrd\cyro\cyrd\cyra\cyrt.}%
+        {\cyrd\cyro\cyrd\cyra\cyrt\cyrk.}%
+      \crefname{subsubsubappendix}%
+        {\cyrd\cyro\cyrd\cyra\cyrt.}%
+        {\cyrd\cyro\cyrd\cyra\cyrt\cyrk.}%
+      \crefname{enumi}%
+        {\cyrp.}%
+        {\cyrp.\cyrp.}%
+      \crefname{enumii}%
+        {\cyrp.}%
+        {\cyrp.\cyrp.}%
+      \crefname{enumiii}%
+        {\cyrp.}%
+        {\cyrp.\cyrp.}%
+      \crefname{enumiv}%
+        {\cyrp.}%
+        {\cyrp.\cyrp.}%
+      \crefname{enumv}%
+        {\cyrp.}%
+        {\cyrp.\cyrp.}%
+      \crefname{footnote}%
+        {\cyrv\cyri\cyrn\cyro\cyrs\cyrk.}%
+        {\cyrv\cyri\cyrn\cyro\cyrs\cyrk.}%
+      \crefname{figure}%
+        {\cyrr\cyri\cyrs.}%
+        {\cyrr\cyri\cyrs.}%
+      \crefname{subfigure}%
+        {\cyrr\cyri\cyrs.}%
+        {\cyrr\cyri\cyrs.}%
+      \crefname{table}%
+        {\cyrt\cyra\cyrb\cyrl.}%
+        {\cyrt\cyra\cyrb\cyrl.}%
+      \crefname{subtable}%
+        {\cyrt\cyra\cyrb\cyrl.}%
+        {\cyrt\cyra\cyrb\cyrl.}%
+      \crefname{theorem}%
+        {\cyrt\cyre\cyro\cyrr\cyre\cyrm.}%
+        {\cyrt\cyre\cyro\cyrr\cyre\cyrm.}%
+      \crefname{lemma}%
+        {\cyrl\cyre\cyrm\cyrm.}%
+        {\cyrl\cyre\cyrm\cyrm.}%
+      \crefname{corollary}%
+        {\cyrv\cyri\cyrs\cyrn\cyro\cyrv.}%
+        {\cyrv\cyri\cyrs\cyrn\cyro\cyrv\cyrk.}%
+      \crefname{proposition}%
+        {\cyrt\cyrv\cyre\cyrr\cyrd\cyrzh\cyre\cyrn\cyrn.}%
+        {\cyrt\cyrv\cyre\cyrr\cyrd\cyrzh\cyre\cyrn\cyrn.}%
+      \crefname{definition}%
+        {\cyrv\cyri\cyrz\cyrn\cyra\cyrch\cyre\cyrn\cyrn.}%
+        {\cyrv\cyri\cyrz\cyrn\cyra\cyrch\cyre\cyrn\cyrn.}%
+      \crefname{result}%
+        {\cyrr\cyre\cyrz\cyru\cyrl\cyrsftsn\cyrt.}%
+        {\cyrr\cyre\cyrz\cyru\cyrl\cyrsftsn\cyrt\cyra\cyrt.}%
+      \crefname{example}%
+        {\cyrp\cyrr\cyri\cyrk\cyrl.}%
+        {\cyrp\cyrr\cyri\cyrk\cyrl\cyra\cyrd.}%
+      \crefname{remark}%
+        {\cyrp\cyrr\cyri\cyrm\cyrii\cyrt.}%
+        {\cyrp\cyrr\cyri\cyrm\cyrii\cyrt.}%
+      \crefname{note}%
+        {\cyrz\cyra\cyrm\cyrii\cyrt.}%
+        {\cyrz\cyra\cyrm\cyrii\cyrt.}%
+      \crefname{algorithm}%
+        {\cyra\cyrl\cyrg.}%
+        {\cyra\cyrl\cyrg.}%
+      \crefname{listing}%
+        {\cyrl\cyrii\cyrs\cyrt\cyri\cyrn.}%
+        {\cyrl\cyrii\cyrs\cyrt\cyri\cyrn\cyrg.}%
+      \crefname{line}%
+        {\cyrs\cyrt\cyrr\cyrk.}%
+        {\cyrs\cyrt\cyrr\cyrk.}%
+    \else%  abbrev unset
+      \crefname{equation}%
+        {\cyrf\cyro\cyrr\cyrm\cyru\cyrl\cyra}%
+        {\cyrf\cyro\cyrr\cyrm\cyru\cyrl\cyri}%
+      \crefname{figure}%
+        {\cyrr\cyri\cyrs\cyru\cyrn\cyro\cyrk}%
+        {\cyrr\cyri\cyrs\cyru\cyrn\cyrk\cyri}%
+      \crefname{subfigure}%
+        {\cyrr\cyri\cyrs\cyru\cyrn\cyro\cyrk}%
+        {\cyrr\cyri\cyrs\cyru\cyrn\cyrk\cyri}%
+      \crefname{table}%
+        {\cyrt\cyra\cyrb\cyrl\cyri\cyrc\cyrya}%
+        {\cyrt\cyra\cyrb\cyrl\cyri\cyrc\cyrii}%
+      \crefname{subtable}%
+        {\cyrt\cyra\cyrb\cyrl\cyri\cyrc\cyrya}%
+        {\cyrt\cyra\cyrb\cyrl\cyri\cyrc\cyrii}%
+      \crefname{enumi}%
+        {\cyrp\cyru\cyrn\cyrk\cyrt}%
+        {\cyrp\cyru\cyrn\cyrk\cyrt\cyri}%
+      \crefname{enumii}%
+        {\cyrp\cyru\cyrn\cyrk\cyrt}%
+        {\cyrp\cyru\cyrn\cyrk\cyrt\cyri}%
+      \crefname{enumiii}%
+        {\cyrp\cyru\cyrn\cyrk\cyrt}%
+        {\cyrp\cyru\cyrn\cyrk\cyrt\cyri}%
+      \crefname{enumiv}%
+        {\cyrp\cyru\cyrn\cyrk\cyrt}%
+        {\cyrp\cyru\cyrn\cyrk\cyrt\cyri}%
+      \crefname{enumv}%
+        {\cyrp\cyru\cyrn\cyrk\cyrt}%
+        {\cyrp\cyru\cyrn\cyrk\cyrt\cyri}%
+      \crefname{chapter}%
+        {\cyrg\cyrl\cyra\cyrv\cyra}%
+        {\cyrg\cyrl\cyra\cyrv\cyri}%
+      \crefname{section}%
+        {\cyrr\cyro\cyrz\cyrd\cyrii\cyrl}%
+        {\cyrr\cyro\cyrz\cyrd\cyrii\cyrl\cyri}%
+      \crefname{subsection}%
+        {\cyrr\cyro\cyrz\cyrd\cyrii\cyrl}%
+        {\cyrr\cyro\cyrz\cyrd\cyrii\cyrl\cyri}%
+      \crefname{subsubsection}%
+        {\cyrr\cyro\cyrz\cyrd\cyrii\cyrl}%
+        {\cyrr\cyro\cyrz\cyrd\cyrii\cyrl\cyri}%
+      \crefname{appendix}%
+        {\cyrd\cyro\cyrd\cyra\cyrt\cyro\cyrk}%
+        {\cyrd\cyro\cyrd\cyra\cyrt\cyrk\cyri}%
+      \crefname{subappendix}%
+        {\cyrd\cyro\cyrd\cyra\cyrt\cyro\cyrk}%
+        {\cyrd\cyro\cyrd\cyra\cyrt\cyrk\cyri}%
+      \crefname{subsubappendix}%
+        {\cyrd\cyro\cyrd\cyra\cyrt\cyro\cyrk}%
+        {\cyrd\cyro\cyrd\cyra\cyrt\cyrk\cyri}%
+      \crefname{subsubsubappendix}%
+        {\cyrd\cyro\cyrd\cyra\cyrt\cyro\cyrk}%
+        {\cyrd\cyro\cyrd\cyra\cyrt\cyrk\cyri}%
+      \crefname{footnote}%
+        {\cyrv\cyri\cyrn\cyro\cyrs\cyrk\cyra}%
+        {\cyrv\cyri\cyrn\cyro\cyrs\cyrk\cyri}%
+      \crefname{theorem}%
+        {\cyrt\cyre\cyro\cyrr\cyre\cyrm\cyra}%
+        {\cyrt\cyre\cyro\cyrr\cyre\cyrm\cyri}%
+      \crefname{lemma}%
+        {\cyrl\cyre\cyrm\cyrm\cyra}%
+        {\cyrl\cyre\cyrm\cyrm\cyri}%
+      \crefname{corollary}%
+        {\cyrv\cyri\cyrs\cyrn\cyro\cyrv\cyro\cyrk}%
+        {\cyrv\cyri\cyrs\cyrn\cyro\cyrv\cyrk\cyri}%
+      \crefname{proposition}%
+        {\cyrt\cyrv\cyre\cyrr\cyrd\cyrzh\cyre\cyrn\cyrn\cyrya}%
+        {\cyrt\cyrv\cyre\cyrr\cyrd\cyrzh\cyre\cyrn\cyrn\cyrya}%
+      \crefname{definition}%
+        {\cyrv\cyri\cyrz\cyrn\cyra\cyrch\cyre\cyrn\cyrn\cyrya}%
+        {\cyrv\cyri\cyrz\cyrn\cyra\cyrch\cyre\cyrn\cyrn\cyrya}%
+      \crefname{result}%
+        {\cyrr\cyre\cyrz\cyru\cyrl\cyrsftsn\cyrt\cyra\cyrt}%
+        {\cyrr\cyre\cyrz\cyru\cyrl\cyrsftsn\cyrt\cyra\cyrt\cyri}%
+      \crefname{example}%
+        {\cyrp\cyrr\cyri\cyrk\cyrl\cyra\cyrd}%
+        {\cyrp\cyrr\cyri\cyrk\cyrl\cyra\cyrd\cyri}%
+      \crefname{remark}%
+        {\cyrp\cyrr\cyri\cyrm\cyrii\cyrt\cyrk\cyra}%
+        {\cyrp\cyrr\cyri\cyrm\cyrii\cyrt\cyrk\cyri}%
+      \crefname{note}%
+        {\cyrz\cyra\cyrm\cyrii\cyrt\cyrk\cyra}%
+        {\cyrz\cyra\cyrm\cyrii\cyrt\cyrk\cyri}%
+      \crefname{algorithm}%
+        {\cyra\cyrl\cyrg\cyro\cyrr\cyri\cyrt\cyrm}%
+        {\cyra\cyrl\cyrg\cyro\cyrr\cyri\cyrt\cyrm\cyri}%
+      \crefname{listing}%
+        {\cyrl\cyrii\cyrs\cyrt\cyri\cyrn\cyrg}%
+        {\cyrl\cyrii\cyrs\cyrt\cyri\cyrn\cyrg\cyri}%
+      \crefname{line}%
+        {\cyrs\cyrt\cyrr\cyro\cyrk\cyra}%
+        {\cyrs\cyrt\cyrr\cyro\cyrk\cyri}%
+    \fi%
+    \crefname{page}%
+      {\cyrs\cyrt\cyro\cyrr\cyri\cyrn\cyrc\cyrii}%
+      {\cyrs\cyrt\cyro\cyrr\cyrii\cyrn\cyrk\cyra\cyrh}%
+    \crefname{part}%
+      {\cyrch\cyra\cyrs\cyrt\cyri\cyrn\cyra}%
+      {\cyrch\cyra\cyrs\cyrt\cyri\cyrn\cyri}%
+  \fi}% end \cref@loadlanguagedefs
 %    \end{macrocode}
 %
 %
@@ -11013,13 +11076,11 @@
 % \begin{macro}{norsk}
 %   Norwegian translations kindly donated by Sveinung Heggen.
 % \end{macro}
+%
+% Set up the definitions used at the beginning of the document to define
+% the formats created by the document preamble.
 %    \begin{macrocode}
 \DeclareOption{norsk}{%
-  \PackageInfo{cleveref}{loaded norsk language definitions}
-%    \end{macrocode}
-% First, we set up the definitions used at the beginning of the document to
-% define the formats created by the document preamble.
-%    \begin{macrocode}
   \AtBeginDocument{%
     \def\crefrangeconjunction@preamble{ til\nobreakspace}%
     \def\crefrangepreconjunction@preamble{}%
@@ -11109,128 +11170,131 @@
       \crefname@preamble{line}{linje}{linjene}%
     \fi%
     \def\cref@language{norsk}%
-%    \end{macrocode}
-%
-% Next, we add the definitions to \cmd{\extras}\dots{} so that
-% \package{babel}'s \cmd{\selectlanguage} command will change the format
-% appropriately.
-%    \begin{macrocode}
-    \cref@addto\extrasnorsk{%
-      \renewcommand{\crefrangeconjunction}{ til\nobreakspace}%
-      \renewcommand\crefrangepreconjunction{}%
-      \renewcommand\crefrangepostconjunction{}%
-      \renewcommand{\crefpairconjunction}{ og\nobreakspace}%
-      \renewcommand{\crefmiddleconjunction}{, }%
-      \renewcommand{\creflastconjunction}{ og\nobreakspace}%
-      \renewcommand{\crefpairgroupconjunction}{ og\nobreakspace}%
-      \renewcommand{\crefmiddlegroupconjunction}{, }%
-      \renewcommand{\creflastgroupconjunction}{ og\nobreakspace}%
+  }}% end \DeclareOption and \AtBeginDocument
+%    \end{macrocode}
+%
+% If using \package{babel} and the corresponding option is set, or if
+% using \package{polyglossia} and the language has been loaded, add
+% format definition commands to \cmd{\extras}\meta{language} or
+% \cmd{\captions}\meta{language} so that language switching commands will
+% change the cross-reference formats appropriately.
+%    \begin{macrocode}
+\cref@addlanguagedefs{norsk}{%
+  \PackageInfo{cleveref}{loaded `norsk' language definitions}
+  \renewcommand{\crefrangeconjunction}{ til\nobreakspace}%
+  \renewcommand\crefrangepreconjunction{}%
+  \renewcommand\crefrangepostconjunction{}%
+  \renewcommand{\crefpairconjunction}{ og\nobreakspace}%
+  \renewcommand{\crefmiddleconjunction}{, }%
+  \renewcommand{\creflastconjunction}{ og\nobreakspace}%
+  \renewcommand{\crefpairgroupconjunction}{ og\nobreakspace}%
+  \renewcommand{\crefmiddlegroupconjunction}{, }%
+  \renewcommand{\creflastgroupconjunction}{ og\nobreakspace}%
  %
-      \Crefname{equation}{Likning}{Likningene}%
-      \Crefname{figure}{Figur}{Figurene}%
-      \Crefname{subfigure}{Figur}{Figurene}%
-      \Crefname{table}{Tabell}{Tabellene}%
-      \Crefname{subtable}{Tabell}{Tabellene}%
-      \Crefname{page}{Side}{Siden}%
-      \Crefname{part}{Del}{Delene}%
-      \Crefname{chapter}{Kapittel}{Kapitlene}%
-      \Crefname{section}{Avsnitt}{Avsnittene}%
-      \Crefname{subsection}{Avsnitt}{Avsnittene}%
-      \Crefname{subsubsection}{Avsnitt}{Avsnittene}%
-      \Crefname{appendix}{Tillegg}{Tilleggene}%
-      \Crefname{subappendix}{Tillegg}{Tilleggene}%
-      \Crefname{subsubappendix}{Tillegg}{Tilleggene}%
-      \Crefname{subsubsubappendix}{Tillegg}{Tilleggene}%
-      \Crefname{enumi}{Punkt}{Punktene}%
-      \Crefname{enumii}{Punkt}{Punktene}%
-      \Crefname{enumiii}{Punkt}{Punktene}%
-      \Crefname{enumiv}{Punkt}{Punktene}%
-      \Crefname{enumv}{Punkt}{Punktene}%
-      \Crefname{footnote}{Fotnote}{Fotnotene}%
-      \Crefname{theorem}{Teorem}{Teoremene}%
-      \Crefname{lemma}{Lemma}{Lemma}%
-      \Crefname{corollary}{Korollar}{Korollarene}%
-      \Crefname{proposition}{P\aa stand}{P\aa standene}%
-      \Crefname{definition}{Definisjon}{Definisjonene}%
-      \Crefname{result}{Resultat}{Resultatene}%
-      \Crefname{example}{Eksempel}{Eksemplene}%
-      \Crefname{remark}{Bemerkning}{Bemerkningene}%
-      \Crefname{note}{Note}{Notene}%
-      \Crefname{algorithm}{Algoritme}{Algoritmene}%
-      \Crefname{listing}{Opplisting}{Opplistingene}%
-      \Crefname{line}{Linje}{Linjene}%
+  \Crefname{equation}{Likning}{Likningene}%
+  \Crefname{figure}{Figur}{Figurene}%
+  \Crefname{subfigure}{Figur}{Figurene}%
+  \Crefname{table}{Tabell}{Tabellene}%
+  \Crefname{subtable}{Tabell}{Tabellene}%
+  \Crefname{page}{Side}{Siden}%
+  \Crefname{part}{Del}{Delene}%
+  \Crefname{chapter}{Kapittel}{Kapitlene}%
+  \Crefname{section}{Avsnitt}{Avsnittene}%
+  \Crefname{subsection}{Avsnitt}{Avsnittene}%
+  \Crefname{subsubsection}{Avsnitt}{Avsnittene}%
+  \Crefname{appendix}{Tillegg}{Tilleggene}%
+  \Crefname{subappendix}{Tillegg}{Tilleggene}%
+  \Crefname{subsubappendix}{Tillegg}{Tilleggene}%
+  \Crefname{subsubsubappendix}{Tillegg}{Tilleggene}%
+  \Crefname{enumi}{Punkt}{Punktene}%
+  \Crefname{enumii}{Punkt}{Punktene}%
+  \Crefname{enumiii}{Punkt}{Punktene}%
+  \Crefname{enumiv}{Punkt}{Punktene}%
+  \Crefname{enumv}{Punkt}{Punktene}%
+  \Crefname{footnote}{Fotnote}{Fotnotene}%
+  \Crefname{theorem}{Teorem}{Teoremene}%
+  \Crefname{lemma}{Lemma}{Lemma}%
+  \Crefname{corollary}{Korollar}{Korollarene}%
+  \Crefname{proposition}{P\aa stand}{P\aa standene}%
+  \Crefname{definition}{Definisjon}{Definisjonene}%
+  \Crefname{result}{Resultat}{Resultatene}%
+  \Crefname{example}{Eksempel}{Eksemplene}%
+  \Crefname{remark}{Bemerkning}{Bemerkningene}%
+  \Crefname{note}{Note}{Notene}%
+  \Crefname{algorithm}{Algoritme}{Algoritmene}%
+  \Crefname{listing}{Opplisting}{Opplistingene}%
+  \Crefname{line}{Linje}{Linjene}%
  %
-      \if@cref@capitalise%
-        \crefname{equation}{Likning}{Likningene}%
-        \crefname{figure}{Figur}{Figurene}%
-        \crefname{subfigure}{Figur}{Figurene}%
-        \crefname{table}{Tabell}{Tabellene}%
-        \crefname{subtable}{Tabell}{Tabellene}%
-        \crefname{page}{Side}{Siden}%
-        \crefname{part}{Del}{Delene}%
-        \crefname{chapter}{Kapittel}{Kapitlene}%
-        \crefname{section}{Avsnitt}{Avsnittene}%
-        \crefname{subsection}{Avsnitt}{Avsnittene}%
-        \crefname{subsubsection}{Avsnitt}{Avsnittene}%
-        \crefname{appendix}{Tillegg}{Tilleggene}%
-        \crefname{subappendix}{Tillegg}{Tilleggene}%
-        \crefname{subsubappendix}{Tillegg}{Tilleggene}%
-        \crefname{subsubsubappendix}{Tillegg}{Tilleggene}%
-        \crefname{enumi}{Punkt}{Punktene}%
-        \crefname{enumii}{Punkt}{Punktene}%
-        \crefname{enumiii}{Punkt}{Punktene}%
-        \crefname{enumiv}{Punkt}{Punktene}%
-        \crefname{enumv}{Punkt}{Punktene}%
-        \crefname{footnote}{Fotnote}{Fotnotene}%
-        \crefname{theorem}{Teorem}{Teoremene}%
-        \crefname{lemma}{Lemma}{Lemma}%
-        \crefname{corollary}{Korollar}{Korollarene}%
-        \crefname{proposition}{P\aa stand}{P\aa standene}%
-        \crefname{definition}{Definisjon}{Definisjonene}%
-        \crefname{result}{Resultat}{Resultatene}%
-        \crefname{example}{Eksempel}{Eksemplene}%
-        \crefname{remark}{Bemerkning}{Bemerkningene}%
-        \crefname{note}{Note}{Notene}%
-        \crefname{algorithm}{Algoritme}{Algoritmene}%
-        \crefname{listing}{Opplisting}{Opplistingene}%
-        \crefname{line}{Linje}{Linjene}%
+  \if@cref@capitalise%
+    \crefname{equation}{Likning}{Likningene}%
+    \crefname{figure}{Figur}{Figurene}%
+    \crefname{subfigure}{Figur}{Figurene}%
+    \crefname{table}{Tabell}{Tabellene}%
+    \crefname{subtable}{Tabell}{Tabellene}%
+    \crefname{page}{Side}{Siden}%
+    \crefname{part}{Del}{Delene}%
+    \crefname{chapter}{Kapittel}{Kapitlene}%
+    \crefname{section}{Avsnitt}{Avsnittene}%
+    \crefname{subsection}{Avsnitt}{Avsnittene}%
+    \crefname{subsubsection}{Avsnitt}{Avsnittene}%
+    \crefname{appendix}{Tillegg}{Tilleggene}%
+    \crefname{subappendix}{Tillegg}{Tilleggene}%
+    \crefname{subsubappendix}{Tillegg}{Tilleggene}%
+    \crefname{subsubsubappendix}{Tillegg}{Tilleggene}%
+    \crefname{enumi}{Punkt}{Punktene}%
+    \crefname{enumii}{Punkt}{Punktene}%
+    \crefname{enumiii}{Punkt}{Punktene}%
+    \crefname{enumiv}{Punkt}{Punktene}%
+    \crefname{enumv}{Punkt}{Punktene}%
+    \crefname{footnote}{Fotnote}{Fotnotene}%
+    \crefname{theorem}{Teorem}{Teoremene}%
+    \crefname{lemma}{Lemma}{Lemma}%
+    \crefname{corollary}{Korollar}{Korollarene}%
+    \crefname{proposition}{P\aa stand}{P\aa standene}%
+    \crefname{definition}{Definisjon}{Definisjonene}%
+    \crefname{result}{Resultat}{Resultatene}%
+    \crefname{example}{Eksempel}{Eksemplene}%
+    \crefname{remark}{Bemerkning}{Bemerkningene}%
+    \crefname{note}{Note}{Notene}%
+    \crefname{algorithm}{Algoritme}{Algoritmene}%
+    \crefname{listing}{Opplisting}{Opplistingene}%
+    \crefname{line}{Linje}{Linjene}%
  %
-      \else%
-        \crefname{equation}{likning}{likningene}%
-        \crefname{figure}{figur}{figurene}%
-        \crefname{subfigure}{figur}{figurene}%
-        \crefname{table}{tabell}{tabellene}%
-        \crefname{subtable}{tabell}{tabellene}%
-        \crefname{page}{side}{siden}%
-        \crefname{part}{del}{delene}%
-        \crefname{chapter}{kapittel}{kapitlene}%
-        \crefname{section}{avsnitt}{avsnittene}%
-        \crefname{subsection}{avsnitt}{avsnittene}%
-        \crefname{subsubsection}{avsnitt}{avsnittene}%
-        \crefname{appendix}{tillegg}{tilleggene}%
-        \crefname{subappendix}{tillegg}{tilleggene}%
-        \crefname{subsubappendix}{tillegg}{tilleggene}%
-        \crefname{subsubsubappendix}{tillegg}{tilleggene}%
-        \crefname{enumi}{punkt}{punktene}%
-        \crefname{enumii}{punkt}{punktene}%
-        \crefname{enumiii}{punkt}{punktene}%
-        \crefname{enumiv}{punkt}{punktene}%
-        \crefname{enumv}{punkt}{punktene}%
-        \crefname{footnote}{fotnote}{fotnotene}%
-        \crefname{theorem}{teorem}{teoremene}%
-        \crefname{lemma}{lemma}{lemma}%
-        \crefname{corollary}{korollar}{korollarene}%
-        \crefname{proposition}{p\aa stand}{p\aa standene}%
-        \crefname{definition}{definisjon}{definisjonene}%
-        \crefname{result}{resultat}{resultatene}%
-        \crefname{example}{eksempel}{eksemplene}%
-        \crefname{remark}{bemerkning}{bemerkningene}%
-        \crefname{note}{note}{notene}%
-        \crefname{algorithm}{algoritme}{algoritmene}%
-        \crefname{listing}{opplisting}{opplistingene}%
-        \crefname{line}{linje}{linjene}%
-      \fi%
-    }}}
+  \else%
+    \crefname{equation}{likning}{likningene}%
+    \crefname{figure}{figur}{figurene}%
+    \crefname{subfigure}{figur}{figurene}%
+    \crefname{table}{tabell}{tabellene}%
+    \crefname{subtable}{tabell}{tabellene}%
+    \crefname{page}{side}{siden}%
+    \crefname{part}{del}{delene}%
+    \crefname{chapter}{kapittel}{kapitlene}%
+    \crefname{section}{avsnitt}{avsnittene}%
+    \crefname{subsection}{avsnitt}{avsnittene}%
+    \crefname{subsubsection}{avsnitt}{avsnittene}%
+    \crefname{appendix}{tillegg}{tilleggene}%
+    \crefname{subappendix}{tillegg}{tilleggene}%
+    \crefname{subsubappendix}{tillegg}{tilleggene}%
+    \crefname{subsubsubappendix}{tillegg}{tilleggene}%
+    \crefname{enumi}{punkt}{punktene}%
+    \crefname{enumii}{punkt}{punktene}%
+    \crefname{enumiii}{punkt}{punktene}%
+    \crefname{enumiv}{punkt}{punktene}%
+    \crefname{enumv}{punkt}{punktene}%
+    \crefname{footnote}{fotnote}{fotnotene}%
+    \crefname{theorem}{teorem}{teoremene}%
+    \crefname{lemma}{lemma}{lemma}%
+    \crefname{corollary}{korollar}{korollarene}%
+    \crefname{proposition}{p\aa stand}{p\aa standene}%
+    \crefname{definition}{definisjon}{definisjonene}%
+    \crefname{result}{resultat}{resultatene}%
+    \crefname{example}{eksempel}{eksemplene}%
+    \crefname{remark}{bemerkning}{bemerkningene}%
+    \crefname{note}{note}{notene}%
+    \crefname{algorithm}{algoritme}{algoritmene}%
+    \crefname{listing}{opplisting}{opplistingene}%
+    \crefname{line}{linje}{linjene}%
+  \fi}% end \cref@loadlanguagedefs
 %    \end{macrocode}
 %
 %
@@ -11238,13 +11302,11 @@
 % \begin{macro}{danish}
 %   Danish translations courtesy of Benjamin H{\o}yer.
 % \end{macro}
+%
+% Set up the definitions used at the beginning of the document to define
+% the formats created by the document preamble.
 %    \begin{macrocode}
 \DeclareOption{danish}{%
-  \PackageInfo{cleveref}{loaded danish language definitions}
-%    \end{macrocode}
-% First, we set up the definitions used at the beginning of the document to
-% define the formats created by the document preamble.
-%    \begin{macrocode}
   \AtBeginDocument{%
     \def\crefrangeconjunction@preamble{ til\nobreakspace}%
     \def\crefrangepreconjunction@preamble{}%
@@ -11331,125 +11393,128 @@
       \crefname@preamble{line}{linje}{linjer}%
     \fi%
     \def\cref@language{danish}%
-%    \end{macrocode}
-%
-% Next, we add the definitions to \cmd{\extras}\dots{} so that
-% \package{babel}'s \cmd{\selectlanguage} command will change the format
-% appropriately.
-%    \begin{macrocode}
-    \cref@addto\extrasdanish{%
-      \renewcommand{\crefrangeconjunction@preamble}{ til\nobreakspace}%
-      \renewcommand\crefrangepreconjunction@preamble{}%
-      \renewcommand\crefrangepostconjunction@preamble{}%
-      \renewcommand{\crefpairconjunction@preamble}{ og\nobreakspace}%
-      \renewcommand{\crefmiddleconjunction@preamble}{, }%
-      \renewcommand{\creflastconjunction@preamble}{ og\nobreakspace}%
-      \renewcommand{\crefpairgroupconjunction@preamble}{ og\nobreakspace}%
-      \renewcommand{\crefmiddlegroupconjunction@preamble}{, }%
-      \renewcommand{\creflastgroupconjunction@preamble}{ og\nobreakspace}%
+  }}% end \DeclareOption and \AtBeginDocument
+%    \end{macrocode}
+%
+% If using \package{babel} and the corresponding option is set, or if
+% using \package{polyglossia} and the language has been loaded, add
+% format definition commands to \cmd{\extras}\meta{language} or
+% \cmd{\captions}\meta{language} so that language switching commands will
+% change the cross-reference formats appropriately.
+%    \begin{macrocode}
+\cref@addlanguagedefs{danish}{%
+  \PackageInfo{cleveref}{loaded `danish' language definitions}
+  \renewcommand{\crefrangeconjunction@preamble}{ til\nobreakspace}%
+  \renewcommand\crefrangepreconjunction@preamble{}%
+  \renewcommand\crefrangepostconjunction@preamble{}%
+  \renewcommand{\crefpairconjunction@preamble}{ og\nobreakspace}%
+  \renewcommand{\crefmiddleconjunction@preamble}{, }%
+  \renewcommand{\creflastconjunction@preamble}{ og\nobreakspace}%
+  \renewcommand{\crefpairgroupconjunction@preamble}{ og\nobreakspace}%
+  \renewcommand{\crefmiddlegroupconjunction@preamble}{, }%
+  \renewcommand{\creflastgroupconjunction@preamble}{ og\nobreakspace}%
  %
-      \Crefname{equation}{Ligning}{Ligninger}%
-      \Crefname{figure}{Figur}{Figurer}%
-      \Crefname{subfigure}{Figur}{Figurer}%
-      \Crefname{table}{Tabel}{Tabeller}%
-      \Crefname{subtable}{Tabel}{Tabeller}%
-      \Crefname{page}{Side}{Sider}%
-      \Crefname{part}{Del}{Dele}%
-      \Crefname{chapter}{Kapitel}{Kapitler}%
-      \Crefname{section}{Afsnit}{Afsnit}%
-      \Crefname{subsection}{Afsnit}{Afsnit}%
-      \Crefname{subsubsection}{Afsnit}{Afsnit}%
-      \Crefname{appendix}{Appendiks}{Appendiks}%
-      \Crefname{subappendix}{Appendiks}{Appendiks}%
-      \Crefname{subsubappendix}{Appendiks}{Appendiks}%
-      \Crefname{subsubsubappendix}{Appendiks}{Appendiks}%
-      \Crefname{enumi}{Punkt}{Punkter}%
-      \Crefname{enumii}{Punkt}{Punkter}%
-      \Crefname{enumiii}{Punkt}{Punkter}%
-      \Crefname{enumiv}{Punkt}{Punkter}%
-      \Crefname{enumv}{Punkt}{Punkter}%
-      \Crefname{footnote}{Fodnote}{Fodnoter}%
-      \Crefname{theorem}{Teorem}{Teoremer}%
-      \Crefname{lemma}{Lemma}{Lemma}%
-      \Crefname{corollary}{F\o lgeslutning}{F\o lgeslutninger}%
-      \Crefname{proposition}{Udsagn}{Udsagn}%
-      \Crefname{definition}{Definition}{Definitioner}%
-      \Crefname{result}{Resultat}{Resultater}%
-      \Crefname{example}{Eksempel}{Eksempler}%
-      \Crefname{remark}{Bem\ae rkning}{Bem\ae rkninger}%
-      \Crefname{note}{Note}{Noter}%
-      \Crefname{algorithm}{Algoritme}{Algoritmer}%
-      \Crefname{line}{Linje}{Linjer}%
+  \Crefname{equation}{Ligning}{Ligninger}%
+  \Crefname{figure}{Figur}{Figurer}%
+  \Crefname{subfigure}{Figur}{Figurer}%
+  \Crefname{table}{Tabel}{Tabeller}%
+  \Crefname{subtable}{Tabel}{Tabeller}%
+  \Crefname{page}{Side}{Sider}%
+  \Crefname{part}{Del}{Dele}%
+  \Crefname{chapter}{Kapitel}{Kapitler}%
+  \Crefname{section}{Afsnit}{Afsnit}%
+  \Crefname{subsection}{Afsnit}{Afsnit}%
+  \Crefname{subsubsection}{Afsnit}{Afsnit}%
+  \Crefname{appendix}{Appendiks}{Appendiks}%
+  \Crefname{subappendix}{Appendiks}{Appendiks}%
+  \Crefname{subsubappendix}{Appendiks}{Appendiks}%
+  \Crefname{subsubsubappendix}{Appendiks}{Appendiks}%
+  \Crefname{enumi}{Punkt}{Punkter}%
+  \Crefname{enumii}{Punkt}{Punkter}%
+  \Crefname{enumiii}{Punkt}{Punkter}%
+  \Crefname{enumiv}{Punkt}{Punkter}%
+  \Crefname{enumv}{Punkt}{Punkter}%
+  \Crefname{footnote}{Fodnote}{Fodnoter}%
+  \Crefname{theorem}{Teorem}{Teoremer}%
+  \Crefname{lemma}{Lemma}{Lemma}%
+  \Crefname{corollary}{F\o lgeslutning}{F\o lgeslutninger}%
+  \Crefname{proposition}{Udsagn}{Udsagn}%
+  \Crefname{definition}{Definition}{Definitioner}%
+  \Crefname{result}{Resultat}{Resultater}%
+  \Crefname{example}{Eksempel}{Eksempler}%
+  \Crefname{remark}{Bem\ae rkning}{Bem\ae rkninger}%
+  \Crefname{note}{Note}{Noter}%
+  \Crefname{algorithm}{Algoritme}{Algoritmer}%
+  \Crefname{line}{Linje}{Linjer}%
  %
-      \if@cref@capitalise%
-        \crefname{equation}{Ligning}{Ligninger}%
-        \crefname{figure}{Figur}{Figurer}%
-        \crefname{subfigure}{Figur}{Figurer}%
-        \crefname{table}{Tabel}{Tabeller}%
-        \crefname{subtable}{Tabel}{Tabeller}%
-        \crefname{page}{Side}{Sider}%
-        \crefname{part}{Del}{Dele}%
-        \crefname{chapter}{Kapitel}{Kapitler}%
-        \crefname{section}{Afsnit}{Afsnit}%
-        \crefname{subsection}{Afsnit}{Afsnit}%
-        \crefname{subsubsection}{Afsnit}{Afsnit}%
-        \crefname{appendix}{Appendiks}{Appendiks}%
-        \crefname{subappendix}{Appendiks}{Appendiks}%
-        \crefname{subsubappendix}{Appendiks}{Appendiks}%
-        \crefname{subsubsubappendix}{Appendiks}{Appendiks}%
-        \crefname{enumi}{Punkt}{Punkter}%
-        \crefname{enumii}{Punkt}{Punkter}%
-        \crefname{enumiii}{Punkt}{Punkter}%
-        \crefname{enumiv}{Punkt}{Punkter}%
-        \crefname{enumv}{Punkt}{Punkter}%
-        \crefname{footnote}{Fodnote}{Fodnoter}%
-        \crefname{theorem}{Teorem}{Teoremer}%
-        \crefname{lemma}{Lemma}{Lemma}%
-        \crefname{corollary}{F\o lgeslutning}{F\o lgeslutninger}%
-        \crefname{proposition}{Udsagn}{Udsagn}%
-        \crefname{definition}{Definition}{Definitioner}%
-        \crefname{result}{Resultat}{Resultater}%
-        \crefname{example}{Eksempel}{Eksempler}%
-        \crefname{remark}{Bem\ae rkning}{Bem\ae rkninger}%
-        \crefname{note}{Note}{Noter}%
-        \crefname{algorithm}{Algoritme}{Algoritmer}%
-        \crefname{line}{Linje}{Linjer}%
+  \if@cref@capitalise%
+    \crefname{equation}{Ligning}{Ligninger}%
+    \crefname{figure}{Figur}{Figurer}%
+    \crefname{subfigure}{Figur}{Figurer}%
+    \crefname{table}{Tabel}{Tabeller}%
+    \crefname{subtable}{Tabel}{Tabeller}%
+    \crefname{page}{Side}{Sider}%
+    \crefname{part}{Del}{Dele}%
+    \crefname{chapter}{Kapitel}{Kapitler}%
+    \crefname{section}{Afsnit}{Afsnit}%
+    \crefname{subsection}{Afsnit}{Afsnit}%
+    \crefname{subsubsection}{Afsnit}{Afsnit}%
+    \crefname{appendix}{Appendiks}{Appendiks}%
+    \crefname{subappendix}{Appendiks}{Appendiks}%
+    \crefname{subsubappendix}{Appendiks}{Appendiks}%
+    \crefname{subsubsubappendix}{Appendiks}{Appendiks}%
+    \crefname{enumi}{Punkt}{Punkter}%
+    \crefname{enumii}{Punkt}{Punkter}%
+    \crefname{enumiii}{Punkt}{Punkter}%
+    \crefname{enumiv}{Punkt}{Punkter}%
+    \crefname{enumv}{Punkt}{Punkter}%
+    \crefname{footnote}{Fodnote}{Fodnoter}%
+    \crefname{theorem}{Teorem}{Teoremer}%
+    \crefname{lemma}{Lemma}{Lemma}%
+    \crefname{corollary}{F\o lgeslutning}{F\o lgeslutninger}%
+    \crefname{proposition}{Udsagn}{Udsagn}%
+    \crefname{definition}{Definition}{Definitioner}%
+    \crefname{result}{Resultat}{Resultater}%
+    \crefname{example}{Eksempel}{Eksempler}%
+    \crefname{remark}{Bem\ae rkning}{Bem\ae rkninger}%
+    \crefname{note}{Note}{Noter}%
+    \crefname{algorithm}{Algoritme}{Algoritmer}%
+    \crefname{line}{Linje}{Linjer}%
  %
-      \else%
-        \crefname{equation}{ligning}{ligninger}%
-        \crefname{figure}{figur}{figurer}%
-        \crefname{subfigure}{figur}{figurer}%
-        \crefname{table}{tabel}{tabeller}%
-        \crefname{subtable}{tabel}{tabeller}%
-        \crefname{page}{side}{sider}%
-        \crefname{part}{del}{dele}%
-        \crefname{chapter}{kapitel}{kapitler}%
-        \crefname{section}{afsnit}{afsnit}%
-        \crefname{subsection}{afsnit}{afsnit}%
-        \crefname{subsubsection}{afsnit}{afsnit}%
-        \crefname{appendix}{appendiks}{appendiks}%
-        \crefname{subappendix}{appendiks}{appendiks}%
-        \crefname{subsubappendix}{appendiks}{appendiks}%
-        \crefname{subsubsubappendix}{appendiks}{appendiks}%
-        \crefname{enumi}{punkt}{punkter}%
-        \crefname{enumii}{punkt}{punkter}%
-        \crefname{enumiii}{punkt}{punkter}%
-        \crefname{enumiv}{punkt}{punkter}%
-        \crefname{enumv}{punkt}{punkter}%
-        \crefname{footnote}{fodnote}{fodnoter}%
-        \crefname{theorem}{teorem}{teoremer}%
-        \crefname{lemma}{lemma}{lemma}%
-        \crefname{corollary}{f\o lgeslutning}{f\o lgeslutninger}%
-        \crefname{proposition}{udsagn}{udsagn}%
-        \crefname{definition}{definition}{definitioner}%
-        \crefname{result}{resultat}{resultater}%
-        \crefname{example}{eksempel}{eksempler}%
-        \crefname{remark}{bem\ae rkning}{bem\ae rkninger}%
-        \crefname{note}{note}{noter}%
-        \crefname{algorithm}{algoritme}{algoritmer}%
-        \crefname{line}{linje}{linjer}%
-      \fi%
-    }}}
+  \else%
+    \crefname{equation}{ligning}{ligninger}%
+    \crefname{figure}{figur}{figurer}%
+    \crefname{subfigure}{figur}{figurer}%
+    \crefname{table}{tabel}{tabeller}%
+    \crefname{subtable}{tabel}{tabeller}%
+    \crefname{page}{side}{sider}%
+    \crefname{part}{del}{dele}%
+    \crefname{chapter}{kapitel}{kapitler}%
+    \crefname{section}{afsnit}{afsnit}%
+    \crefname{subsection}{afsnit}{afsnit}%
+    \crefname{subsubsection}{afsnit}{afsnit}%
+    \crefname{appendix}{appendiks}{appendiks}%
+    \crefname{subappendix}{appendiks}{appendiks}%
+    \crefname{subsubappendix}{appendiks}{appendiks}%
+    \crefname{subsubsubappendix}{appendiks}{appendiks}%
+    \crefname{enumi}{punkt}{punkter}%
+    \crefname{enumii}{punkt}{punkter}%
+    \crefname{enumiii}{punkt}{punkter}%
+    \crefname{enumiv}{punkt}{punkter}%
+    \crefname{enumv}{punkt}{punkter}%
+    \crefname{footnote}{fodnote}{fodnoter}%
+    \crefname{theorem}{teorem}{teoremer}%
+    \crefname{lemma}{lemma}{lemma}%
+    \crefname{corollary}{f\o lgeslutning}{f\o lgeslutninger}%
+    \crefname{proposition}{udsagn}{udsagn}%
+    \crefname{definition}{definition}{definitioner}%
+    \crefname{result}{resultat}{resultater}%
+    \crefname{example}{eksempel}{eksempler}%
+    \crefname{remark}{bem\ae rkning}{bem\ae rkninger}%
+    \crefname{note}{note}{noter}%
+    \crefname{algorithm}{algoritme}{algoritmer}%
+    \crefname{line}{linje}{linjer}%
+  \fi}% end \cref@loadlanguagedefs
 %    \end{macrocode}
 %
 %
@@ -11457,9 +11522,11 @@
 % \begin{macro}{esperanto}
 %   Esperanto translations courtesy of Johannes Mueller.
 % \end{macro}
+%
+% Set up the definitions used at the beginning of the document to define
+% the formats created by the document preamble.
 %    \begin{macrocode}
 \DeclareOption{esperanto}{%
-  \PackageInfo{cleveref}{loaded `esperanto' language definitions}
   \AtBeginDocument{%
     \def\crefrangeconjunction@preamble{ \^gis\nobreakspace}%
     \def\crefrangepreconjunction@preamble{}%
@@ -11540,87 +11607,95 @@
       \crefname@preamble{line}{linio}{linioj}%
     \fi%
     \def\cref@language{esperanto}%
+  }}% end \DeclareOption and \AtBeginDocument
+% \end{macrocode}
 %
-    \cref@addto\extrasesperanto{%
-      \renewcommand{\crefrangeconjunction}{ \^gis\nobreakspace}%
-      \renewcommand{\crefrangepreconjunction}{}%
-      \renewcommand{\crefrangepostconjunction}{}%
-      \renewcommand{\crefpairconjunction}{ kaj\nobreakspace}%
-      \renewcommand{\crefmiddleconjunction}{, }%
-      \renewcommand{\creflastconjunction}{ kaj\nobreakspace}%
-      \renewcommand{\crefpairgroupconjunction}{ kaj\nobreakspace}%
-      \renewcommand{\crefmiddlegroupconjunction}{, }%
-      \renewcommand{\creflastgroupconjunction}{ kaj\nobreakspace}%
-%
-      \Crefname{equation}{Ekvacio}{Ekvacioj}%
-      \Crefname{part}{Parto}{Partoj}%
-      \Crefname{chapter}{\^Capitro}{\^Capitroj}%
-      \Crefname{section}{Sekcio}{Sekcioj}%
-      \Crefname{appendix}{Aldono}{Aldonoj}%
-      \Crefname{enumi}{Punkto}{Punktoj}%
-      \Crefname{footnote}{Piednoto}{Piednotoj}%
-      \Crefname{figure}{Figuro}{Figuroj}%
-      \Crefname{table}{Tabelo}{Tabeloj}%
-      \Crefname{theorem}{Teoremo}{Teoremoj}%
-      \Crefname{lemma}{Lemo}{Lemoj}%
-      \Crefname{corollary}{Korolario}{Korolarioj}%
-      \Crefname{proposition}{Propozicio}{Propozicioj}%
-      \Crefname{definition}{Defino}{Definoj}%
-      \Crefname{result}{Rezulto}{Rezultoj}%
-      \Crefname{example}{Ekzemplo}{Ekzemploj}%
-      \Crefname{remark}{Rimarko}{Rimarkoj}%
-      \Crefname{note}{Noto}{Notoj}%
-      \Crefname{algorithm}{Algoritmo}{Algoritmoj}%
-      \Crefname{listing}{Listado}{Listadoj}%
-      \Crefname{line}{Linio}{Linioj}%
-%
-      \if@cref@capitalise%
-        \crefname{equation}{Ekvacio}{Ekvacioj}%
-        \crefname{part}{Parto}{Partoj}%
-        \crefname{chapter}{\^Capitro}{\^Capitroj}%
-        \crefname{section}{Sekcio}{Sekcioj}%
-        \crefname{appendix}{Aldono}{Aldonoj}%
-        \crefname{enumi}{Punkto}{Punktoj}%
-        \crefname{footnote}{Piednoto}{Piednotoj}%
-        \crefname{figure}{Figuro}{Figuroj}%
-        \crefname{table}{Tabelo}{Tabeloj}%
-        \crefname{theorem}{Teoremo}{Teoremoj}%
-        \crefname{lemma}{Lemo}{Lemoj}%
-        \crefname{corollary}{Korolario}{Korolarioj}%
-        \crefname{proposition}{Propozicio}{Propozicioj}%
-        \crefname{definition}{Defino}{Definoj}%
-        \crefname{result}{Rezulto}{Rezultoj}%
-        \crefname{example}{Ekzemplo}{Ekzemploj}%
-        \crefname{remark}{Rimarko}{Rimarkoj}%
-        \crefname{note}{Noto}{Notoj}%
-        \crefname{algorithm}{Algoritmo}{Algoritmoj}%
-        \crefname{listing}{Listado}{Listadoj}%
-        \crefname{line}{Linio}{Linioj}%
+% If using \package{babel} and the corresponding option is set, or if
+% using \package{polyglossia} and the language has been loaded, add
+% format definition commands to \cmd{\extras}\meta{language} or
+% \cmd{\captions}\meta{language} so that language switching commands will
+% change the cross-reference formats appropriately.
+%    \begin{macrocode}
+\cref@addlanguagedefs{esperanto}{%
+  \PackageInfo{cleveref}{loaded `esperanto' language definitions}
+  \renewcommand{\crefrangeconjunction}{ \^gis\nobreakspace}%
+  \renewcommand{\crefrangepreconjunction}{}%
+  \renewcommand{\crefrangepostconjunction}{}%
+  \renewcommand{\crefpairconjunction}{ kaj\nobreakspace}%
+  \renewcommand{\crefmiddleconjunction}{, }%
+  \renewcommand{\creflastconjunction}{ kaj\nobreakspace}%
+  \renewcommand{\crefpairgroupconjunction}{ kaj\nobreakspace}%
+  \renewcommand{\crefmiddlegroupconjunction}{, }%
+  \renewcommand{\creflastgroupconjunction}{ kaj\nobreakspace}%
+%
+  \Crefname{equation}{Ekvacio}{Ekvacioj}%
+  \Crefname{part}{Parto}{Partoj}%
+  \Crefname{chapter}{\^Capitro}{\^Capitroj}%
+  \Crefname{section}{Sekcio}{Sekcioj}%
+  \Crefname{appendix}{Aldono}{Aldonoj}%
+  \Crefname{enumi}{Punkto}{Punktoj}%
+  \Crefname{footnote}{Piednoto}{Piednotoj}%
+  \Crefname{figure}{Figuro}{Figuroj}%
+  \Crefname{table}{Tabelo}{Tabeloj}%
+  \Crefname{theorem}{Teoremo}{Teoremoj}%
+  \Crefname{lemma}{Lemo}{Lemoj}%
+  \Crefname{corollary}{Korolario}{Korolarioj}%
+  \Crefname{proposition}{Propozicio}{Propozicioj}%
+  \Crefname{definition}{Defino}{Definoj}%
+  \Crefname{result}{Rezulto}{Rezultoj}%
+  \Crefname{example}{Ekzemplo}{Ekzemploj}%
+  \Crefname{remark}{Rimarko}{Rimarkoj}%
+  \Crefname{note}{Noto}{Notoj}%
+  \Crefname{algorithm}{Algoritmo}{Algoritmoj}%
+  \Crefname{listing}{Listado}{Listadoj}%
+  \Crefname{line}{Linio}{Linioj}%
+%
+  \if@cref@capitalise%
+    \crefname{equation}{Ekvacio}{Ekvacioj}%
+    \crefname{part}{Parto}{Partoj}%
+    \crefname{chapter}{\^Capitro}{\^Capitroj}%
+    \crefname{section}{Sekcio}{Sekcioj}%
+    \crefname{appendix}{Aldono}{Aldonoj}%
+    \crefname{enumi}{Punkto}{Punktoj}%
+    \crefname{footnote}{Piednoto}{Piednotoj}%
+    \crefname{figure}{Figuro}{Figuroj}%
+    \crefname{table}{Tabelo}{Tabeloj}%
+    \crefname{theorem}{Teoremo}{Teoremoj}%
+    \crefname{lemma}{Lemo}{Lemoj}%
+    \crefname{corollary}{Korolario}{Korolarioj}%
+    \crefname{proposition}{Propozicio}{Propozicioj}%
+    \crefname{definition}{Defino}{Definoj}%
+    \crefname{result}{Rezulto}{Rezultoj}%
+    \crefname{example}{Ekzemplo}{Ekzemploj}%
+    \crefname{remark}{Rimarko}{Rimarkoj}%
+    \crefname{note}{Noto}{Notoj}%
+    \crefname{algorithm}{Algoritmo}{Algoritmoj}%
+    \crefname{listing}{Listado}{Listadoj}%
+    \crefname{line}{Linio}{Linioj}%
 %
-      \else%
-        \crefname{equation}{ekvacio}{ekvacioj}%
-        \crefname{part}{parto}{partoj}%
-        \crefname{chapter}{\^capitro}{\^capitroj}%
-        \crefname{section}{sekcio}{sekcioj}%
-        \crefname{appendix}{aldono}{aldonoj}%
-        \crefname{enumi}{punkto}{punktoj}%
-        \crefname{footnote}{piednoto}{piednotoj}%
-        \crefname{figure}{figuro}{figuroj}%
-        \crefname{table}{tabelo}{tabeloj}%
-        \crefname{theorem}{teoremo}{teoremoj}%
-        \crefname{lemma}{lemo}{lemoj}%
-        \crefname{corollary}{korolario}{korolarioj}%
-        \crefname{proposition}{propozicio}{propozicioj}%
-        \crefname{definition}{defino}{definoj}%
-        \crefname{result}{rezulto}{rezultoj}%
-        \crefname{example}{ekzemplo}{ekzemploj}%
-        \crefname{remark}{rimarko}{rimarkoj}%
-        \crefname{note}{noto}{notoj}%
-        \crefname{algorithm}{algoritmo}{algoritmoj}%
-        \crefname{listing}{listado}{listadoj}%
-        \crefname{line}{linio}{linioj}%
-      \fi%
-  }}}
+  \else%
+    \crefname{equation}{ekvacio}{ekvacioj}%
+    \crefname{part}{parto}{partoj}%
+    \crefname{chapter}{\^capitro}{\^capitroj}%
+    \crefname{section}{sekcio}{sekcioj}%
+    \crefname{appendix}{aldono}{aldonoj}%
+    \crefname{enumi}{punkto}{punktoj}%
+    \crefname{footnote}{piednoto}{piednotoj}%
+    \crefname{figure}{figuro}{figuroj}%
+    \crefname{table}{tabelo}{tabeloj}%
+    \crefname{theorem}{teoremo}{teoremoj}%
+    \crefname{lemma}{lemo}{lemoj}%
+    \crefname{corollary}{korolario}{korolarioj}%
+    \crefname{proposition}{propozicio}{propozicioj}%
+    \crefname{definition}{defino}{definoj}%
+    \crefname{result}{rezulto}{rezultoj}%
+    \crefname{example}{ekzemplo}{ekzemploj}%
+    \crefname{remark}{rimarko}{rimarkoj}%
+    \crefname{note}{noto}{notoj}%
+    \crefname{algorithm}{algoritmo}{algoritmoj}%
+    \crefname{listing}{listado}{listadoj}%
+    \crefname{line}{linio}{linioj}%
+  \fi}% end \cref@loadlanguagedefs
 %    \end{macrocode}
 %
 %
@@ -11677,7 +11752,14 @@
 % Set up the default English format definitions, then process options in
 % the order they were supplied.
 %    \begin{macrocode}
-\ExecuteOptions{english}
+\@ifpackageloaded{polyglossia}%
+  {\ifcsdef{languagename}%
+    {\ExecuteOptions{\languagename}}%
+    {\PackageWarning{cleveref}%
+       {`polyglossia' loaded but default language not set
+         - defaulting to english}%
+     \ExecuteOptions{english}}}%
+  {\ExecuteOptions{english}}
 \ProcessOptions*\relax
 %    \end{macrocode}
 %