From 6c0c35302c593fa0e104de83d292366a80abe038 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 25 Nov 2024 21:11:11 +0000 Subject: zref-clever (25nov24) git-svn-id: svn://tug.org/texlive/trunk@72967 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/doc/latex/zref-clever/CHANGELOG.md | 22 +- .../doc/latex/zref-clever/zref-clever-code.pdf | Bin 886317 -> 897844 bytes .../doc/latex/zref-clever/zref-clever-doc.pdf | Bin 223588 -> 224010 bytes .../doc/latex/zref-clever/zref-clever-doc.tex | 128 +-- .../source/latex/zref-clever/zref-clever.dtx | 1055 ++++++++++++-------- .../source/latex/zref-clever/zref-clever.ins | 1 + .../tex/latex/zref-clever/zref-clever-german.lang | 224 ++--- .../tex/latex/zref-clever/zref-clever-russian.lang | 336 +++---- .../tex/latex/zref-clever/zref-clever-swedish.lang | 238 +++++ .../tex/latex/zref-clever/zref-clever.sty | 183 ++-- 10 files changed, 1344 insertions(+), 843 deletions(-) create mode 100644 Master/texmf-dist/tex/latex/zref-clever/zref-clever-swedish.lang (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/zref-clever/CHANGELOG.md b/Master/texmf-dist/doc/latex/zref-clever/CHANGELOG.md index 9cfeded72fb..189a3d70525 100644 --- a/Master/texmf-dist/doc/latex/zref-clever/CHANGELOG.md +++ b/Master/texmf-dist/doc/latex/zref-clever/CHANGELOG.md @@ -1,6 +1,26 @@ # Changelog -## [Unreleased](https://github.com/gusbrs/zref-clever/compare/v0.4.9...HEAD) +## [Unreleased](https://github.com/gusbrs/zref-clever/compare/v0.5.0...HEAD) + +## [v0.5.0](https://github.com/gusbrs/zref-clever/compare/v0.4.9...v0.5.0) (2024-11-25) + +### Added +- Swedish localization (see issue + [#35](https://github.com/gusbrs/zref-clever/issues/35)). + +### Changed +- The `declension` option from `\zcDeclareLanguage`, the `case` option from + `\zcLanguageSetup`, and the `d` general option (from `\zcref`) have been + renamed to `variants`, `variant`, and `v`, respectively. This is a + "semantic generalization" of the existing infrastructure. In other words, + the package now interprets more broadly type name variants, which can be + used for any language-specific needs and not just declension cases. See + discussion at issue [#35](https://github.com/gusbrs/zref-clever/issues/35). + +### Deprecated +- The `declension` option from `\zcDeclareLanguage`, the `case` option from + `\zcLanguageSetup`, and the `d` general option (from `\zcref`) have been + deprecated in favor of their new names. ## [v0.4.9](https://github.com/gusbrs/zref-clever/compare/v0.4.8...v0.4.9) (2024-11-16) diff --git a/Master/texmf-dist/doc/latex/zref-clever/zref-clever-code.pdf b/Master/texmf-dist/doc/latex/zref-clever/zref-clever-code.pdf index 67cc89a1db3..bbadec4b546 100644 Binary files a/Master/texmf-dist/doc/latex/zref-clever/zref-clever-code.pdf and b/Master/texmf-dist/doc/latex/zref-clever/zref-clever-code.pdf differ diff --git a/Master/texmf-dist/doc/latex/zref-clever/zref-clever-doc.pdf b/Master/texmf-dist/doc/latex/zref-clever/zref-clever-doc.pdf index 658f16af4e6..0d690197acd 100644 Binary files a/Master/texmf-dist/doc/latex/zref-clever/zref-clever-doc.pdf and b/Master/texmf-dist/doc/latex/zref-clever/zref-clever-doc.pdf differ diff --git a/Master/texmf-dist/doc/latex/zref-clever/zref-clever-doc.tex b/Master/texmf-dist/doc/latex/zref-clever/zref-clever-doc.tex index fc7290791dc..f446558a5d0 100644 --- a/Master/texmf-dist/doc/latex/zref-clever/zref-clever-doc.tex +++ b/Master/texmf-dist/doc/latex/zref-clever/zref-clever-doc.tex @@ -733,11 +733,11 @@ language known by \pkg{zref-clever}. For more details on \zcref*[ref=title,noname]{sec:internationalization}, see \zcref{sec:internationalization}. -\DescribeOption{d} % -The \opt{d} option sets the declension case, and affects the type name used -for typesetting the reference. Whether this option is operative, and which -values it accepts, depends on the declared setup for each language. For -details, see \zcref{sec:internationalization}. +\DescribeOption{v} % +The \opt{v} option sets the variant, and affects the type name used for +typesetting the reference. Whether this option is operative, and which values +it accepts, depends on the declared setup for each language. For details, see +\zcref{sec:internationalization}. \DescribeOption{nudge} % \DescribeOption{nudgeif} % @@ -1360,7 +1360,9 @@ indeed required, without users having to worry about it at all. & UKenglish \\ & USenglish \\ french & acadian \\ - spanish & \\ + & \\ + & \\ + & \\ \bottomrule \end{tabular} \quad @@ -1378,6 +1380,8 @@ indeed required, without users having to worry about it at all. & brazil \\ & portuges \\ russian & \\ + spanish & \\ + swedish & \\ \bottomrule \end{tabular} \caption{Declared languages and aliases} @@ -1399,32 +1403,35 @@ with \cs{zcDeclareLanguage}, \cs{zcDeclareLanguageAlias}, and \end{function} Declare a new language for use with \pkg{zref-clever}. If \meta{language} has already been declared, just warn. The \meta{options} argument receives the -usual \texttt{key=value} list and recognizes three keys: \opt{declension}, -\opt{gender}, and \opt{allcaps}. \opt{declension} receives a coma separated -list of valid declension cases for \meta{language}. The first element of the -list is considered to be the default case, both for the \opt{d} option in -\cs{zcref} and for the \opt{case} option in \cs{zcLanguageSetup}. Similarly, -\opt{gender} receives a comma separated list of genders for \meta{language}. -The elements in this list are those which are recognized as valid for the -language for both the \opt{g} option in \cs{zcref} and the \opt{gender} option -in \cs{zcLanguageSetup}. There is no default presumed in this case. Finally, -\opt{allcaps} can be used with languages for which nouns must be always -capitalized for grammatical reasons. For a language declared with the -\opt{allcaps} option, the \opt{cap} reference option (see \zcref{sec:options}) -is disregarded, and \cs{zcref} always uses the capitalized type name forms. -This means that language files for languages with such a trait can be halved -in size, and that user customization for them is simplified, only requiring -the capitalized name forms. On the other hand, the non-capitalized -\texttt{name-} reference format options are rendered no-op for the language in -question. \zcref[S]{tab:language-options} presents an overview of the options -in effect for the languages declared by \pkg{zref-clever}. -\cs{zcDeclareLanguage} is preamble only. +usual \texttt{key=value} list and recognizes three keys: \opt{variants}, +\opt{gender}, and \opt{allcaps}. \opt{variants} receives a coma separated +list of valid type name variants for \meta{language}.\footnote{This option was + initially conceived to support declension cases, but was eventually + generalized to encompass a broader meaning, and is now more flexibly + interpreted as simply ``variants''.} The first element of the list is +considered to be the default variant, both for the \opt{v} option in +\cs{zcref} and for the \opt{variant} option in \cs{zcLanguageSetup}. +Similarly, \opt{gender} receives a comma separated list of genders for +\meta{language}. The elements in this list are those which are recognized as +valid for the language for both the \opt{g} option in \cs{zcref} and the +\opt{gender} option in \cs{zcLanguageSetup}. There is no default presumed in +this case. Finally, \opt{allcaps} can be used with languages for which nouns +must be always capitalized for grammatical reasons. For a language declared +with the \opt{allcaps} option, the \opt{cap} reference option (see +\zcref{sec:options}) is disregarded, and \cs{zcref} always uses the +capitalized type name forms. This means that language files for languages +with such a trait can be halved in size, and that user customization for them +is simplified, only requiring the capitalized name forms. On the other hand, +the non-capitalized \texttt{name-} reference format options are rendered no-op +for the language in question. \zcref[S]{tab:language-options} presents an +overview of the options in effect for the languages declared by +\pkg{zref-clever}. \cs{zcDeclareLanguage} is preamble only. \begin{table} \centering \begin{tabular}{l>{\ttfamily}c>{\ttfamily}c>{\ttfamily}c} \toprule - Language & declension & gender & allcaps \\ + Language & variants & gender & allcaps \\ \midrule dutch & -- & f,m,n & -- \\ english & -- & -- & -- \\ @@ -1434,6 +1441,7 @@ in effect for the languages declared by \pkg{zref-clever}. portuguese & -- & f,m & -- \\ spanish & -- & f,m & -- \\ russian & n,a,g,d,i,p & f,m,n & -- \\ + swedish & -- & -- & -- \\ \bottomrule \end{tabular} \caption{Options for declared languages} @@ -1459,24 +1467,24 @@ the user. \cs{zcDeclareLanguageAlias} is preamble only. Sets language-specific reference format options for \meta{language} (see \zcref{sec:reference-format}), be they type-specific or not. \meta{language} must be already known to \pkg{zref-clever}. Besides reference format options, -\cs{zcLanguageSetup} knows three other keys: \opt{type}, \opt{case}, and +\cs{zcLanguageSetup} knows three other keys: \opt{type}, \opt{variant}, and \opt{gender}. The first two work like a ``switch'' affecting the options \emph{following} it. For example, if \texttt{type=foo} is given in \meta{options} the options following it will be set as type-specific options -for reference type \texttt{foo}. Similarly, after \texttt{case=X} (provided -\texttt{X} is a valid declension case for \meta{language}), the following -\texttt{[Nn]ame-} options will set values for the \texttt{X} declension case -(other reference format options are not affected by \opt{case}). Before the -first occurrence of either \opt{type} or \opt{case} default values are set. -For \opt{case} this means the default declension case, which is the first -element of the list provided to the \opt{declension} option in -\cs{zcDeclareLanguage}. For \opt{type} this means language-specific but not -type-specific option values (see \zcref{sec:reference-format}). An empty -valued \texttt{type=} key can also ``unset'' the type. The \opt{gender} key -sets the gender of the current \texttt{type} (provided the value it receives -is one of the declared genders for \meta{language}). For \texttt{type}s which -have multiple valid genders for a given language, the option can also receive -a comma separated list. \cs{zcLanguageSetup} is preamble only. +for reference type \texttt{foo}. Similarly, after \texttt{variant=X} +(provided \texttt{X} is a valid variant for \meta{language}), the following +\texttt{[Nn]ame-} options will set values for the \texttt{X} variant (other +reference format options are not affected by \opt{variant}). Before the first +occurrence of either \opt{type} or \opt{variant} default values are set. For +\opt{variant} this means the default variant, which is the first element of +the list provided to the \opt{variants} option in \cs{zcDeclareLanguage}. For +\opt{type} this means language-specific but not type-specific option values +(see \zcref{sec:reference-format}). An empty valued \texttt{type=} key can +also ``unset'' the type. The \opt{gender} key sets the gender of the current +\texttt{type} (provided the value it receives is one of the declared genders +for \meta{language}). For \texttt{type}s which have multiple valid genders +for a given language, the option can also receive a comma separated list. +\cs{zcLanguageSetup} is preamble only. A couple of examples to illustrate the syntax of \cs{zcLanguageSetup}: @@ -1492,16 +1500,16 @@ A couple of examples to illustrate the syntax of \cs{zcLanguageSetup}: \zcLanguageSetup{german}{ type = section , gender = m , - case = N , + variant = N , Name-sg = Abschnitt , Name-pl = Abschnitte , - case = A , + variant = A , Name-sg = Abschnitt , Name-pl = Abschnitte , - case = D , + variant = D , Name-sg = Abschnitt , Name-pl = Abschnitten , - case = G , + variant = G , Name-sg = Abschnitts , Name-pl = Abschnitte , } @@ -1517,16 +1525,16 @@ particularly for numbered and gendered articles, even if those don't have their typeset output automated. For reference type names, the declension cases for each language must be -declared with \cs{zcDeclareLanguage}, and the name reference format options -must be provided for each case, which is done for built-in language files of -languages which have noun declension, and can be done by the user with -\cs{zcLanguageSetup}, as we've seen. \pkg{zref-clever} does not try to guess -or infer the case though, you must tell it to \cs{zcref}. And this is done by -means of the \opt{d} option (see \zcref{sec:options}). So you may write -something like ``\texttt{nach den - \cs{zcref}[d=D]\{sec:section-1,sec:section-2\}}'' to get ``nach den +declared as \opt{variants} with \cs{zcDeclareLanguage}, and the name reference +format options must be provided for each case, which is done for built-in +language files of languages which have noun declension, and can be done by the +user with \cs{zcLanguageSetup}, as we've seen. \pkg{zref-clever} does not try +to guess or infer the case though, you must tell it to \cs{zcref}. And this +is done by means of the \opt{v} option (see \zcref{sec:options}). So you may +write something like ``\texttt{nach den + \cs{zcref}[v=D]\{sec:section-1,sec:section-2\}}'' to get ``nach den Abschnitten 1 und 2''. Or ``\texttt{trotz des - \cs{zcref}[d=G]\{eq:theorem-1\}}'' to get ``trotz des Theorems 1''. + \cs{zcref}[v=G]\{eq:theorem-1\}}'' to get ``trotz des Theorems 1''. Regarding the text surrounding the reference -- the inflected article, the passing preposition, etc.\ --, the issue is more delicate. \pkg{zref-clever} @@ -1677,9 +1685,9 @@ the kernel, its syntax and underlying relation with counters is pretty much the same. The same for \pkg{ntheorem}. For \pkg{thmtools}' \cs{declaretheorem}, though some adjustments to the examples below may be required, the basic logic is the same (there is no integration with the -\opt{Refname}, \opt{refname}, and \opt{label} options, which are targeted to -the standard reference system, but you don't actually need them to get things -working conveniently). +\opt{Refname} and \opt{refname} options, which are targeted to the standard +reference system, but you don't actually need them to get things working +conveniently). \subsubsection*{Simple case} @@ -2542,10 +2550,12 @@ The package's language files have been provided or improved thanks to: % 2022-12-27: https://github.com/gusbrs/zref-clever/pull/13 Matteo Ferrigato (Italian), % 'matteo339' % 2022-12-12: https://github.com/gusbrs/zref-clever/issues/11 - and Sergey Slyusarev (Russian). % 'jemmybutton' + Sergey Slyusarev (Russian), % 'jemmybutton' % 2024-05-18: https://github.com/gusbrs/zref-clever/issues/28 % 2024-05-19: https://github.com/gusbrs/zref-clever/pull/29 % 2024-05-20: https://github.com/gusbrs/zref-clever/pull/30 + and \username{Timmyfox} (Swedish). + % 2024-11-22: https://github.com/gusbrs/zref-clever/issues/35 If I have inadvertently left anyone off the list I apologize, and please let me know, so that I can correct the oversight. diff --git a/Master/texmf-dist/source/latex/zref-clever/zref-clever.dtx b/Master/texmf-dist/source/latex/zref-clever/zref-clever.dtx index 40b488eb9bd..48969fe7ecd 100644 --- a/Master/texmf-dist/source/latex/zref-clever/zref-clever.dtx +++ b/Master/texmf-dist/source/latex/zref-clever/zref-clever.dtx @@ -172,7 +172,7 @@ % % Identify the package. % \begin{macrocode} -\ProvidesExplPackage {zref-clever} {2024-11-16} {0.4.9} +\ProvidesExplPackage {zref-clever} {2024-11-25} {0.5.0} {Clever LaTeX cross-references based on zref} % \end{macrocode} % @@ -618,31 +618,31 @@ See~documentation~for~'\iow_char:N\\zcDeclareLanguage'~and~ '\iow_char:N\\zcDeclareLanguageAlias'. } -\msg_new:nnn { zref-clever } { unknown-language-decl } +\msg_new:nnn { zref-clever } { unknown-language-variant } { - Can't~set~declension~'#1'~for~unknown~language~'#2'~\msg_line_context:.~ + Can't~set~variant~'#1'~for~unknown~language~'#2'~\msg_line_context:.~ See~documentation~for~'\iow_char:N\\zcDeclareLanguage'~and~ '\iow_char:N\\zcDeclareLanguageAlias'. } -\msg_new:nnn { zref-clever } { language-no-decl-ref } +\msg_new:nnn { zref-clever } { language-no-variants-ref } { - Language~'#1'~has~no~declared~declension~cases~\msg_line_context:.~ - Nothing~to~do~with~option~'d=#2'. + Language~'#1'~has~no~declared~variants~\msg_line_context:.~ + Nothing~to~do~with~option~'v=#2'. } \msg_new:nnn { zref-clever } { language-no-gender } { Language~'#1'~has~no~declared~gender~\msg_line_context:.~ Nothing~to~do~with~option~'#2=#3'. } -\msg_new:nnn { zref-clever } { language-no-decl-setup } +\msg_new:nnn { zref-clever } { language-no-variants-setup } { - Language~'#1'~has~no~declared~declension~cases~\msg_line_context:.~ - Nothing~to~do~with~option~'case=#2'. + Language~'#1'~has~no~declared~variants~\msg_line_context:.~ + Nothing~to~do~with~option~'variant=#2'. } -\msg_new:nnn { zref-clever } { unknown-decl-case } +\msg_new:nnn { zref-clever } { unknown-variant } { - Declension~case~'#1'~unknown~for~language~'#2'~\msg_line_context:.~ - Using~default~declension~case. + Variant~'#1'~unknown~for~language~'#2'~\msg_line_context:.~ + Using~default~variant. } \msg_new:nnn { zref-clever } { nudge-multitype } { @@ -1410,19 +1410,19 @@ % { % \l_@@_setup_type_tl , % \l_@@_setup_language_tl , -% \l_@@_lang_decl_case_tl , -% \l_@@_lang_declension_seq , +% \l_@@_lang_variant_tl , +% \l_@@_lang_variants_seq , % \l_@@_lang_gender_seq , % } -% Store ``current'' type, language, and declension cases in different places -% for type-specific and language-specific options handling, notably in -% \cs{@@_provide_langfile:n}, \cs{zcRefTypeSetup}, and -% \cs{zcLanguageSetup}, but also for language specific options retrieval. +% Store ``current'' type, language, and variants in different places for +% type-specific and language-specific options handling, notably in +% \cs{@@_provide_langfile:n}, \cs{zcRefTypeSetup}, and \cs{zcLanguageSetup}, +% but also for language specific options retrieval. % \begin{macrocode} \tl_new:N \l_@@_setup_type_tl \tl_new:N \l_@@_setup_language_tl -\tl_new:N \l_@@_lang_decl_case_tl -\seq_new:N \l_@@_lang_declension_seq +\tl_new:N \l_@@_lang_variant_tl +\seq_new:N \l_@@_lang_variants_seq \seq_new:N \l_@@_lang_gender_seq % \end{macrocode} % \end{macro} @@ -1701,18 +1701,18 @@ % the only difference is that the ``language name'' happens to be the same as % the ``base language name'', in other words, it is an ``alias to itself''. % \oarg{options} receive a \texttt{k=v} set of options, with three valid -% options. The first, \opt{declension}, takes the noun declension cases -% prefixes for \meta{language} as a comma separated list, whose first element -% is taken to be the default case. The second, \opt{gender}, receives the -% genders for \meta{language} as comma separated list. The third, -% \opt{allcaps}, is a boolean, and indicates that for \meta{language} all -% nouns must be capitalized for grammatical reasons, in which case, the -% \opt{cap} option is disregarded for \meta{language}. If \meta{language} is -% already known, just warn. This implies a particular restriction regarding -% \oarg{options}, namely that these options, when defined by the package, -% cannot be redefined by the user. This is deliberate, otherwise the built-in -% language files would become much too sensitive to this particular user -% input, and unnecessarily so. \cs{zcDeclareLanguage} is preamble only. +% options. The first, \opt{variants}, takes the variants for \meta{language} +% as a comma separated list, whose first element is taken to be the default +% case. The second, \opt{gender}, receives the genders for \meta{language} as +% comma separated list. The third, \opt{allcaps}, is a boolean, and indicates +% that for \meta{language} all nouns must be capitalized for grammatical +% reasons, in which case, the \opt{cap} option is disregarded for +% \meta{language}. If \meta{language} is already known, just warn. This +% implies a particular restriction regarding \oarg{options}, namely that these +% options, when defined by the package, cannot be redefined by the user. This +% is deliberate, otherwise the built-in language files would become much too +% sensitive to this particular user input, and unnecessarily so. +% \cs{zcDeclareLanguage} is preamble only. % \begin{syntax} % \cs{zcDeclareLanguage} \oarg{options} \marg{language} % \end{syntax} @@ -1769,21 +1769,23 @@ % \begin{macrocode} \keys_define:nn { zref-clever/declarelang } { - declension .code:n = + variants .code:n = { \seq_new:c { \@@_opt_varname_language:enn - { \l_@@_setup_language_tl } { declension } { seq } + { \l_@@_setup_language_tl } { variants } { seq } } \seq_gset_from_clist:cn { \@@_opt_varname_language:enn - { \l_@@_setup_language_tl } { declension } { seq } + { \l_@@_setup_language_tl } { variants } { seq } } {#1} } , - declension .value_required:n = true , + variants .value_required:n = true , + % NOTE Option deprecated in 2024-11-24 for v0.5.0. + declension .meta:n = { variants = {#1} } , gender .code:n = { \seq_new:c @@ -1826,11 +1828,11 @@ % behavior is language dependent, but the language itself can also be set as % an option (\opt{lang}, value stored in \cs{l_@@_ref_language_tl}). % Second, some of its tasks must be done regardless of any option being -% given (e.g. the default declension case, the \opt{allcaps} option). -% Hence, we must validate the language settings after the reference options -% have been set. It is expected to be called right (or soon) after -% \cs{keys_set:nn} in \cs{@@_zcref:nnn}, where current values for -% \cs{l_@@_ref_language_tl} and \cs{l_@@_ref_decl_case_tl} are in place. +% given (e.g. the default variant, the \opt{allcaps} option). Hence, we +% must validate the language settings after the reference options have been +% set. It is expected to be called right (or soon) after \cs{keys_set:nn} +% in \cs{@@_zcref:nnn}, where current values for \cs{l_@@_ref_language_tl} +% and \cs{l_@@_ref_variant_tl} are in place. % \begin{macrocode} \cs_new_protected:Npn \@@_process_language_settings: { @@ -1838,47 +1840,47 @@ { \l_@@_ref_language_tl } { % \end{macrocode} -% Validate the declension case (\opt{d}) option against the declared cases for -% the reference language. If the user value for the latter does not match the -% declension cases declared for the former, the function sets an appropriate -% value for \cs{l_@@_ref_decl_case_tl}, either using the default case, or -% clearing the variable, depending on the language setup. And also issues a -% warning about it. +% Validate the variant (\opt{v}) option against the declared variants for the +% reference language. If the user value for the latter does not match the +% variants declared for the former, the function sets an appropriate value for +% \cs{l_@@_ref_variant_tl}, either using the default case, or clearing the +% variable, depending on the language setup. And also issues a warning about +% it. % \begin{macrocode} \@@_opt_seq_get:cNF { \@@_opt_varname_language:enn - { \l_@@_ref_language_tl } { declension } { seq } + { \l_@@_ref_language_tl } { variants } { seq } } - \l_@@_lang_declension_seq - { \seq_clear:N \l_@@_lang_declension_seq } - \seq_if_empty:NTF \l_@@_lang_declension_seq + \l_@@_lang_variants_seq + { \seq_clear:N \l_@@_lang_variants_seq } + \seq_if_empty:NTF \l_@@_lang_variants_seq { - \tl_if_empty:NF \l_@@_ref_decl_case_tl + \tl_if_empty:NF \l_@@_ref_variant_tl { \msg_warning:nnee { zref-clever } - { language-no-decl-ref } + { language-no-variants-ref } { \l_@@_ref_language_tl } - { \l_@@_ref_decl_case_tl } - \tl_clear:N \l_@@_ref_decl_case_tl + { \l_@@_ref_variant_tl } + \tl_clear:N \l_@@_ref_variant_tl } } { - \tl_if_empty:NTF \l_@@_ref_decl_case_tl + \tl_if_empty:NTF \l_@@_ref_variant_tl { - \seq_get_left:NN \l_@@_lang_declension_seq - \l_@@_ref_decl_case_tl + \seq_get_left:NN \l_@@_lang_variants_seq + \l_@@_ref_variant_tl } { - \seq_if_in:NVF \l_@@_lang_declension_seq - \l_@@_ref_decl_case_tl + \seq_if_in:NVF \l_@@_lang_variants_seq + \l_@@_ref_variant_tl { \msg_warning:nnee { zref-clever } - { unknown-decl-case } - { \l_@@_ref_decl_case_tl } + { unknown-variant } + { \l_@@_ref_variant_tl } { \l_@@_ref_language_tl } - \seq_get_left:NN \l_@@_lang_declension_seq - \l_@@_ref_decl_case_tl + \seq_get_left:NN \l_@@_lang_variants_seq + \l_@@_ref_variant_tl } } } @@ -1933,15 +1935,15 @@ } { % \end{macrocode} -% If the language itself is not declared, we still have to issue declension -% and gender warnings, if \opt{d} or \opt{g} options were used. +% If the language itself is not declared, we still have to variant and gender +% warnings, if \opt{d} or \opt{g} options were used. % \begin{macrocode} - \tl_if_empty:NF \l_@@_ref_decl_case_tl + \tl_if_empty:NF \l_@@_ref_variant_tl { - \msg_warning:nnee { zref-clever } { unknown-language-decl } - { \l_@@_ref_decl_case_tl } + \msg_warning:nnee { zref-clever } { unknown-language-variant } + { \l_@@_ref_variant_tl } { \l_@@_ref_language_tl } - \tl_clear:N \l_@@_ref_decl_case_tl + \tl_clear:N \l_@@_ref_variant_tl } \tl_if_empty:NF \l_@@_ref_gender_tl { @@ -2005,7 +2007,7 @@ % % \cs{@@_provide_langfile:n} is only meant to load the built-in language % files. For languages declared by the user, or for any settings to a known -% language made with \cs{zcLanguageSetup}, values are populated directly to a +% language made with \cs{zcLanguageSetup}, values are populated directly to % corresponding variables. Hence, there is no need to ``load'' anything in % this case: definitions and assignments made by the user are performed % immediately. @@ -2051,15 +2053,15 @@ \@@_opt_seq_get:cNF { \@@_opt_varname_language:nnn - {#1} { declension } { seq } + {#1} { variants } { seq } } - \l_@@_lang_declension_seq - { \seq_clear:N \l_@@_lang_declension_seq } - \seq_if_empty:NTF \l_@@_lang_declension_seq - { \tl_clear:N \l_@@_lang_decl_case_tl } + \l_@@_lang_variants_seq + { \seq_clear:N \l_@@_lang_variants_seq } + \seq_if_empty:NTF \l_@@_lang_variants_seq + { \tl_clear:N \l_@@_lang_variant_tl } { - \seq_get_left:NN \l_@@_lang_declension_seq - \l_@@_lang_decl_case_tl + \seq_get_left:NN \l_@@_lang_variants_seq + \l_@@_lang_variant_tl } \@@_opt_seq_get:cNF { @@ -2110,25 +2112,25 @@ { \tl_clear:N \l_@@_setup_type_tl } { \tl_set:Nn \l_@@_setup_type_tl {#1} } } , - case .code:n = + variant .code:n = { - \seq_if_empty:NTF \l_@@_lang_declension_seq + \seq_if_empty:NTF \l_@@_lang_variants_seq { - \msg_info:nnee { zref-clever } { language-no-decl-setup } + \msg_info:nnee { zref-clever } { language-no-variants-setup } { \l_@@_setup_language_tl } {#1} } { - \seq_if_in:NnTF \l_@@_lang_declension_seq {#1} - { \tl_set:Nn \l_@@_lang_decl_case_tl {#1} } + \seq_if_in:NnTF \l_@@_lang_variants_seq {#1} + { \tl_set:Nn \l_@@_lang_variant_tl {#1} } { - \msg_info:nnee { zref-clever } { unknown-decl-case } + \msg_info:nnee { zref-clever } { unknown-variant } {#1} { \l_@@_setup_language_tl } - \seq_get_left:NN \l_@@_lang_declension_seq - \l_@@_lang_decl_case_tl + \seq_get_left:NN \l_@@_lang_variants_seq + \l_@@_lang_variant_tl } } } , - case .value_required:n = true , + variant .value_required:n = true , gender .value_required:n = true , gender .code:n = { @@ -2459,7 +2461,7 @@ { option-only-type-specific } {#1} } { - \tl_if_empty:NTF \l_@@_lang_decl_case_tl + \tl_if_empty:NTF \l_@@_lang_variant_tl { \@@_opt_tl_gset_if_new:cn { @@ -2476,7 +2478,7 @@ \@@_opt_varname_lang_type:eeen { \l_@@_setup_language_tl } { \l_@@_setup_type_tl } - { \l_@@_lang_decl_case_tl - #1 } { tl } + { \l_@@_lang_variant_tl - #1 } { tl } } {##1} } @@ -3583,11 +3585,11 @@ % % % -% \subsubsection*{\opt{d} option} +% \subsubsection*{\opt{v} option} % -% For setting the declension case. Short for convenience and for not -% polluting the markup too much given that, for languages that need it, it may -% get to be used frequently. +% For setting the variant. Short for convenience and for not polluting the +% markup too much given that, for languages that need it, it may get to be +% used frequently. % % \contributor{\username{samcarter}} and \contributor{Alan Munn} provided % useful comments about declension on the TeX.SX chat. Also, @@ -3596,11 +3598,13 @@ % source to frame the problem in general terms. % % \begin{macrocode} -\tl_new:N \l_@@_ref_decl_case_tl +\tl_new:N \l_@@_ref_variant_tl \keys_define:nn { zref-clever/reference } { - d .code:n = - { \msg_warning:nnn { zref-clever } { option-document-only } { d } } , + v .code:n = + { \msg_warning:nnn { zref-clever } { option-document-only } { v } } , + % NOTE Option deprecated in 2024-11-24 for v0.5.0. + d .meta:n = { v = {#1} } , } \AddToHook { begindocument } { @@ -3610,8 +3614,10 @@ % We just store the value at this point, which is validated by % \cs{@@_process_language_settings:} after \cs{keys_set:nn}. % \begin{macrocode} - d .tl_set:N = \l_@@_ref_decl_case_tl , - d .value_required:n = true , + v .tl_set:N = \l_@@_ref_variant_tl , + v .value_required:n = true , + % NOTE Option deprecated in 2024-11-24 for v0.5.0. + d .meta:n = { v = {#1} } , } } % \end{macrocode} @@ -4634,15 +4640,15 @@ \@@_opt_seq_get:cNF { \@@_opt_varname_language:nnn - {#1} { declension } { seq } + {#1} { variants } { seq } } - \l_@@_lang_declension_seq - { \seq_clear:N \l_@@_lang_declension_seq } - \seq_if_empty:NTF \l_@@_lang_declension_seq - { \tl_clear:N \l_@@_lang_decl_case_tl } + \l_@@_lang_variants_seq + { \seq_clear:N \l_@@_lang_variants_seq } + \seq_if_empty:NTF \l_@@_lang_variants_seq + { \tl_clear:N \l_@@_lang_variant_tl } { - \seq_get_left:NN \l_@@_lang_declension_seq - \l_@@_lang_decl_case_tl + \seq_get_left:NN \l_@@_lang_variants_seq + \l_@@_lang_variant_tl } \@@_opt_seq_get:cNF { @@ -4674,25 +4680,27 @@ { \tl_clear:N \l_@@_setup_type_tl } { \tl_set:Nn \l_@@_setup_type_tl {#1} } } , - case .code:n = + variant .code:n = { - \seq_if_empty:NTF \l_@@_lang_declension_seq + \seq_if_empty:NTF \l_@@_lang_variants_seq { - \msg_warning:nnee { zref-clever } { language-no-decl-setup } + \msg_warning:nnee { zref-clever } { language-no-variants-setup } { \l_@@_setup_language_tl } {#1} } { - \seq_if_in:NnTF \l_@@_lang_declension_seq {#1} - { \tl_set:Nn \l_@@_lang_decl_case_tl {#1} } + \seq_if_in:NnTF \l_@@_lang_variants_seq {#1} + { \tl_set:Nn \l_@@_lang_variant_tl {#1} } { - \msg_warning:nnee { zref-clever } { unknown-decl-case } + \msg_warning:nnee { zref-clever } { unknown-variant } {#1} { \l_@@_setup_language_tl } - \seq_get_left:NN \l_@@_lang_declension_seq - \l_@@_lang_decl_case_tl + \seq_get_left:NN \l_@@_lang_variants_seq + \l_@@_lang_variant_tl } } } , - case .value_required:n = true , + variant .value_required:n = true , + % NOTE Option deprecated in 2024-11-24 for v0.5.0. + case .meta:n = { variant = {#1} } , gender .value_required:n = true , gender .code:n = { @@ -5030,7 +5038,7 @@ { option-only-type-specific } {#1} } { - \tl_if_empty:NTF \l_@@_lang_decl_case_tl + \tl_if_empty:NTF \l_@@_lang_variant_tl { \@@_opt_tl_gset:cn { @@ -5047,7 +5055,7 @@ \@@_opt_varname_lang_type:eeen { \l_@@_setup_language_tl } { \l_@@_setup_type_tl } - { \l_@@_lang_decl_case_tl - #1 } + { \l_@@_lang_variant_tl - #1 } { tl } } {##1} @@ -7353,11 +7361,11 @@ } \l_@@_type_name_tl { - \tl_if_empty:NF \l_@@_ref_decl_case_tl + \tl_if_empty:NF \l_@@_ref_variant_tl { \tl_put_left:Nn \l_@@_name_format_tl { - } \tl_put_left:NV \l_@@_name_format_tl - \l_@@_ref_decl_case_tl + \l_@@_ref_variant_tl } \@@_opt_tl_get:cNF { @@ -7396,17 +7404,17 @@ } \l_@@_type_name_tl { - \tl_if_empty:NF \l_@@_ref_decl_case_tl + \tl_if_empty:NF \l_@@_ref_variant_tl { \tl_put_left:Nn \l_@@_name_format_tl { - } \tl_put_left:NV \l_@@_name_format_tl - \l_@@_ref_decl_case_tl + \l_@@_ref_variant_tl \tl_put_left:Nn \l_@@_name_format_fallback_tl { - } \tl_put_left:NV \l_@@_name_format_fallback_tl - \l_@@_ref_decl_case_tl + \l_@@_ref_variant_tl } \@@_opt_tl_get:cNF { @@ -8560,19 +8568,19 @@ % forms of names for all the supported reference types, according to the % language definitions, that is, usually for \opt{Name-sg}, \opt{name-sg}, % \opt{Name-pl}, \opt{name-pl}, but only for the capitalized forms if the -% language was declared with \opt{allcaps} option, and names for each -% declension case, if the language was declared with \opt{declension}; iii) -% genders for each reference type, if the language was declared with -% \opt{gender}. The language file may include some other things, like some -% type specific settings for separators or refbounds, and also some -% abbreviated name forms. In the case of abbreviated name forms, it is usual -% and desirable to provide some, but they should be used sparingly, only for -% cases where the abbreviation is a common and well established tradition for -% the language. The reason is that \texttt{abbrev=true} is quite a common use -% case, and it is easier to provide an occasional wanted abbreviated form, if -% the language file didn't include it, than it is to disable several unwanted -% ones, if the language file includes too many of them. What should be aimed -% at is to provide a good default abbreviations set. Unusual or disputable +% language was declared with \opt{allcaps} option, and names for each variant, +% if the language was declared with \opt{variants}; iii) genders for each +% reference type, if the language was declared with \opt{gender}. The +% language file may include some other things, like some type specific +% settings for separators or refbounds, and also some abbreviated name forms. +% In the case of abbreviated name forms, it is usual and desirable to provide +% some, but they should be used sparingly, only for cases where the +% abbreviation is a common and well established tradition for the language. +% The reason is that \texttt{abbrev=true} is quite a common use case, and it +% is easier to provide an occasional wanted abbreviated form, if the language +% file didn't include it, than it is to disable several unwanted ones, if the +% language file includes too many of them. What should be aimed at is to +% provide a good default abbreviations set. Unusual or disputable % abbreviations should be avoided. In particular, there is no need at all to % provide the same set of abbreviations for each language. It is not because % English has them for a given type that some other language has to have them, @@ -8854,7 +8862,7 @@ type = solution , % \begin{macrocode} %<*package> \zcDeclareLanguage - [ declension = { N , A , D , G } , gender = { f , m , n } , allcaps ] + [ variants = { N , A , D , G } , gender = { f , m , n } , allcaps ] { german } \zcDeclareLanguageAlias { ngerman } { german } \zcDeclareLanguageAlias { austrian } { german } @@ -8881,106 +8889,106 @@ rangesep = {~bis\nobreakspace} , type = book , gender = n , - case = N , + variant = N , Name-sg = Buch , Name-pl = Bücher , - case = A , + variant = A , Name-sg = Buch , Name-pl = Bücher , - case = D , + variant = D , Name-sg = Buch , Name-pl = Büchern , - case = G , + variant = G , Name-sg = Buches , Name-pl = Bücher , type = part , gender = m , - case = N , + variant = N , Name-sg = Teil , Name-pl = Teile , - case = A , + variant = A , Name-sg = Teil , Name-pl = Teile , - case = D , + variant = D , Name-sg = Teil , Name-pl = Teilen , - case = G , + variant = G , Name-sg = Teiles , Name-pl = Teile , type = chapter , gender = n , - case = N , + variant = N , Name-sg = Kapitel , Name-pl = Kapitel , - case = A , + variant = A , Name-sg = Kapitel , Name-pl = Kapitel , - case = D , + variant = D , Name-sg = Kapitel , Name-pl = Kapiteln , - case = G , + variant = G , Name-sg = Kapitels , Name-pl = Kapitel , type = section , gender = m , - case = N , + variant = N , Name-sg = Abschnitt , Name-pl = Abschnitte , - case = A , + variant = A , Name-sg = Abschnitt , Name-pl = Abschnitte , - case = D , + variant = D , Name-sg = Abschnitt , Name-pl = Abschnitten , - case = G , + variant = G , Name-sg = Abschnitts , Name-pl = Abschnitte , type = paragraph , gender = m , - case = N , + variant = N , Name-sg = Absatz , Name-pl = Absätze , - case = A , + variant = A , Name-sg = Absatz , Name-pl = Absätze , - case = D , + variant = D , Name-sg = Absatz , Name-pl = Absätzen , - case = G , + variant = G , Name-sg = Absatzes , Name-pl = Absätze , type = appendix , gender = m , - case = N , + variant = N , Name-sg = Anhang , Name-pl = Anhänge , - case = A , + variant = A , Name-sg = Anhang , Name-pl = Anhänge , - case = D , + variant = D , Name-sg = Anhang , Name-pl = Anhängen , - case = G , + variant = G , Name-sg = Anhangs , Name-pl = Anhänge , type = page , gender = f , - case = N , + variant = N , Name-sg = Seite , Name-pl = Seiten , - case = A , + variant = A , Name-sg = Seite , Name-pl = Seiten , - case = D , + variant = D , Name-sg = Seite , Name-pl = Seiten , - case = G , + variant = G , Name-sg = Seite , Name-pl = Seiten , rangesep = {\textendash} , @@ -8988,37 +8996,37 @@ type = page , type = line , gender = f , - case = N , + variant = N , Name-sg = Zeile , Name-pl = Zeilen , - case = A , + variant = A , Name-sg = Zeile , Name-pl = Zeilen , - case = D , + variant = D , Name-sg = Zeile , Name-pl = Zeilen , - case = G , + variant = G , Name-sg = Zeile , Name-pl = Zeilen , type = figure , gender = f , - case = N , + variant = N , Name-sg = Abbildung , Name-pl = Abbildungen , Name-sg-ab = Abb. , Name-pl-ab = Abb. , - case = A , + variant = A , Name-sg = Abbildung , Name-pl = Abbildungen , Name-sg-ab = Abb. , Name-pl-ab = Abb. , - case = D , + variant = D , Name-sg = Abbildung , Name-pl = Abbildungen , Name-sg-ab = Abb. , Name-pl-ab = Abb. , - case = G , + variant = G , Name-sg = Abbildung , Name-pl = Abbildungen , Name-sg-ab = Abb. , @@ -9026,91 +9034,91 @@ type = figure , type = table , gender = f , - case = N , + variant = N , Name-sg = Tabelle , Name-pl = Tabellen , - case = A , + variant = A , Name-sg = Tabelle , Name-pl = Tabellen , - case = D , + variant = D , Name-sg = Tabelle , Name-pl = Tabellen , - case = G , + variant = G , Name-sg = Tabelle , Name-pl = Tabellen , type = item , gender = m , - case = N , + variant = N , Name-sg = Punkt , Name-pl = Punkte , - case = A , + variant = A , Name-sg = Punkt , Name-pl = Punkte , - case = D , + variant = D , Name-sg = Punkt , Name-pl = Punkten , - case = G , + variant = G , Name-sg = Punktes , Name-pl = Punkte , type = footnote , gender = f , - case = N , + variant = N , Name-sg = Fußnote , Name-pl = Fußnoten , - case = A , + variant = A , Name-sg = Fußnote , Name-pl = Fußnoten , - case = D , + variant = D , Name-sg = Fußnote , Name-pl = Fußnoten , - case = G , + variant = G , Name-sg = Fußnote , Name-pl = Fußnoten , type = endnote , gender = f , - case = N , + variant = N , Name-sg = Endnote , Name-pl = Endnoten , - case = A , + variant = A , Name-sg = Endnote , Name-pl = Endnoten , - case = D , + variant = D , Name-sg = Endnote , Name-pl = Endnoten , - case = G , + variant = G , Name-sg = Endnote , Name-pl = Endnoten , type = note , gender = f , - case = N , + variant = N , Name-sg = Anmerkung , Name-pl = Anmerkungen , - case = A , + variant = A , Name-sg = Anmerkung , Name-pl = Anmerkungen , - case = D , + variant = D , Name-sg = Anmerkung , Name-pl = Anmerkungen , - case = G , + variant = G , Name-sg = Anmerkung , Name-pl = Anmerkungen , type = equation , gender = f , - case = N , + variant = N , Name-sg = Gleichung , Name-pl = Gleichungen , - case = A , + variant = A , Name-sg = Gleichung , Name-pl = Gleichungen , - case = D , + variant = D , Name-sg = Gleichung , Name-pl = Gleichungen , - case = G , + variant = G , Name-sg = Gleichung , Name-pl = Gleichungen , refbounds-first-sg = {,(,),} , @@ -9118,196 +9126,196 @@ type = equation , type = theorem , gender = n , - case = N , + variant = N , Name-sg = Theorem , Name-pl = Theoreme , - case = A , + variant = A , Name-sg = Theorem , Name-pl = Theoreme , - case = D , + variant = D , Name-sg = Theorem , Name-pl = Theoremen , - case = G , + variant = G , Name-sg = Theorems , Name-pl = Theoreme , type = lemma , gender = n , - case = N , + variant = N , Name-sg = Lemma , Name-pl = Lemmata , - case = A , + variant = A , Name-sg = Lemma , Name-pl = Lemmata , - case = D , + variant = D , Name-sg = Lemma , Name-pl = Lemmata , - case = G , + variant = G , Name-sg = Lemmas , Name-pl = Lemmata , type = corollary , gender = n , - case = N , + variant = N , Name-sg = Korollar , Name-pl = Korollare , - case = A , + variant = A , Name-sg = Korollar , Name-pl = Korollare , - case = D , + variant = D , Name-sg = Korollar , Name-pl = Korollaren , - case = G , + variant = G , Name-sg = Korollars , Name-pl = Korollare , type = proposition , gender = m , - case = N , + variant = N , Name-sg = Satz , Name-pl = Sätze , - case = A , + variant = A , Name-sg = Satz , Name-pl = Sätze , - case = D , + variant = D , Name-sg = Satz , Name-pl = Sätzen , - case = G , + variant = G , Name-sg = Satzes , Name-pl = Sätze , type = definition , gender = f , - case = N , + variant = N , Name-sg = Definition , Name-pl = Definitionen , - case = A , + variant = A , Name-sg = Definition , Name-pl = Definitionen , - case = D , + variant = D , Name-sg = Definition , Name-pl = Definitionen , - case = G , + variant = G , Name-sg = Definition , Name-pl = Definitionen , type = proof , gender = m , - case = N , + variant = N , Name-sg = Beweis , Name-pl = Beweise , - case = A , + variant = A , Name-sg = Beweis , Name-pl = Beweise , - case = D , + variant = D , Name-sg = Beweis , Name-pl = Beweisen , - case = G , + variant = G , Name-sg = Beweises , Name-pl = Beweise , type = result , gender = n , - case = N , + variant = N , Name-sg = Ergebnis , Name-pl = Ergebnisse , - case = A , + variant = A , Name-sg = Ergebnis , Name-pl = Ergebnisse , - case = D , + variant = D , Name-sg = Ergebnis , Name-pl = Ergebnissen , - case = G , + variant = G , Name-sg = Ergebnisses , Name-pl = Ergebnisse , type = remark , gender = f , - case = N , + variant = N , Name-sg = Bemerkung , Name-pl = Bemerkungen , - case = A , + variant = A , Name-sg = Bemerkung , Name-pl = Bemerkungen , - case = D , + variant = D , Name-sg = Bemerkung , Name-pl = Bemerkungen , - case = G , + variant = G , Name-sg = Bemerkung , Name-pl = Bemerkungen , type = example , gender = n , - case = N , + variant = N , Name-sg = Beispiel , Name-pl = Beispiele , - case = A , + variant = A , Name-sg = Beispiel , Name-pl = Beispiele , - case = D , + variant = D , Name-sg = Beispiel , Name-pl = Beispielen , - case = G , + variant = G , Name-sg = Beispiels , Name-pl = Beispiele , type = algorithm , gender = m , - case = N , + variant = N , Name-sg = Algorithmus , Name-pl = Algorithmen , - case = A , + variant = A , Name-sg = Algorithmus , Name-pl = Algorithmen , - case = D , + variant = D , Name-sg = Algorithmus , Name-pl = Algorithmen , - case = G , + variant = G , Name-sg = Algorithmus , Name-pl = Algorithmen , type = listing , gender = n , - case = N , + variant = N , Name-sg = Listing , Name-pl = Listings , - case = A , + variant = A , Name-sg = Listing , Name-pl = Listings , - case = D , + variant = D , Name-sg = Listing , Name-pl = Listings , - case = G , + variant = G , Name-sg = Listings , Name-pl = Listings , type = exercise , gender = f , - case = N , + variant = N , Name-sg = Übungsaufgabe , Name-pl = Übungsaufgaben , - case = A , + variant = A , Name-sg = Übungsaufgabe , Name-pl = Übungsaufgaben , - case = D , + variant = D , Name-sg = Übungsaufgabe , Name-pl = Übungsaufgaben , - case = G , + variant = G , Name-sg = Übungsaufgabe , Name-pl = Übungsaufgaben , type = solution , gender = f , - case = N , + variant = N , Name-sg = Lösung , Name-pl = Lösungen , - case = A , + variant = A , Name-sg = Lösung , Name-pl = Lösungen , - case = D , + variant = D , Name-sg = Lösung , Name-pl = Lösungen , - case = G , + variant = G , Name-sg = Lösung , Name-pl = Lösungen , % \end{macrocode} @@ -10568,7 +10576,7 @@ type = solution , % \begin{macrocode} %<*package> \zcDeclareLanguage - [ declension = { n , a , g , d , i , p } , gender = { f , m , n } ] + [ variants = { n , a , g , d , i , p } , gender = { f , m , n } ] { russian } % % \end{macrocode} @@ -10591,32 +10599,32 @@ rangesep = {~по\nobreakspace} , type = book , gender = f , - case = n , + variant = n , Name-sg = Книга , name-sg = книга , Name-pl = Книги , name-pl = книги , - case = a , + variant = a , Name-sg = Книгу , name-sg = книгу , Name-pl = Книги , name-pl = книги , - case = g , + variant = g , Name-sg = Книги , name-sg = книги , Name-pl = Книг , name-pl = книг , - case = d , + variant = d , Name-sg = Книге , name-sg = книге , Name-pl = Книгам , name-pl = книгам , - case = i , + variant = i , Name-sg = Книгой , name-sg = книгой , Name-pl = Книгами , name-pl = книгами , - case = p , + variant = p , Name-sg = Книге , name-sg = книге , Name-pl = Книгах , @@ -10624,7 +10632,7 @@ type = book , type = part , gender = f , - case = n , + variant = n , Name-sg = Часть , name-sg = часть , Name-pl = Части , @@ -10633,7 +10641,7 @@ type = part , name-sg-ab = ч. , Name-pl-ab = Чч. , name-pl-ab = чч. , - case = a , + variant = a , Name-sg = Часть , name-sg = часть , Name-pl = Части , @@ -10642,7 +10650,7 @@ type = part , name-sg-ab = ч. , Name-pl-ab = Чч. , name-pl-ab = чч. , - case = g , + variant = g , Name-sg = Части , name-sg = части , Name-pl = Частей , @@ -10651,7 +10659,7 @@ type = part , name-sg-ab = ч. , Name-pl-ab = Чч. , name-pl-ab = чч. , - case = d , + variant = d , Name-sg = Части , name-sg = части , Name-pl = Частям , @@ -10660,7 +10668,7 @@ type = part , name-sg-ab = ч. , Name-pl-ab = Чч. , name-pl-ab = чч. , - case = i , + variant = i , Name-sg = Частью , name-sg = частью , Name-pl = Частями , @@ -10669,7 +10677,7 @@ type = part , name-sg-ab = ч. , Name-pl-ab = Чч. , name-pl-ab = чч. , - case = p , + variant = p , Name-sg = Части , name-sg = части , Name-pl = Частях , @@ -10681,7 +10689,7 @@ type = part , type = chapter , gender = f , - case = n , + variant = n , Name-sg = Глава , name-sg = глава , Name-pl = Главы , @@ -10690,7 +10698,7 @@ type = chapter , name-sg-ab = гл. , Name-pl-ab = Гл. , name-pl-ab = гл. , - case = a , + variant = a , Name-sg = Главу , name-sg = главу , Name-pl = Главы , @@ -10699,7 +10707,7 @@ type = chapter , name-sg-ab = гл. , Name-pl-ab = Гл. , name-pl-ab = гл. , - case = g , + variant = g , Name-sg = Главы , name-sg = главы , Name-pl = Глав , @@ -10708,7 +10716,7 @@ type = chapter , name-sg-ab = гл. , Name-pl-ab = Гл. , name-pl-ab = гл. , - case = d , + variant = d , Name-sg = Главе , name-sg = главе , Name-pl = Главам , @@ -10717,7 +10725,7 @@ type = chapter , name-sg-ab = гл. , Name-pl-ab = Гл. , name-pl-ab = гл. , - case = i , + variant = i , Name-sg = Главой , name-sg = главой , Name-pl = Главами , @@ -10726,7 +10734,7 @@ type = chapter , name-sg-ab = гл. , Name-pl-ab = Гл. , name-pl-ab = гл. , - case = p , + variant = p , Name-sg = Главе , name-sg = главе , Name-pl = Главах , @@ -10738,32 +10746,32 @@ type = chapter , type = section , gender = m , - case = n , + variant = n , Name-sg = Раздел , name-sg = раздел , Name-pl = Разделы , name-pl = разделы , - case = a , + variant = a , Name-sg = Раздел , name-sg = раздел , Name-pl = Разделы , name-pl = разделы , - case = g , + variant = g , Name-sg = Раздела , name-sg = раздела , Name-pl = Разделов , name-pl = разделов , - case = d , + variant = d , Name-sg = Разделу , name-sg = разделу , Name-pl = Разделам , name-pl = разделам , - case = i , + variant = i , Name-sg = Разделом , name-sg = разделом , Name-pl = Разделами , name-pl = разделами , - case = p , + variant = p , Name-sg = Разделе , name-sg = разделе , Name-pl = Разделах , @@ -10771,32 +10779,32 @@ type = section , type = paragraph , gender = m , - case = n , + variant = n , Name-sg = Абзац , name-sg = абзац , Name-pl = Абзацы , name-pl = абзацы , - case = a , + variant = a , Name-sg = Абзац , name-sg = абзац , Name-pl = Абзацы , name-pl = абзацы , - case = g , + variant = g , Name-sg = Абзаца , name-sg = абзаца , Name-pl = Абзацев , name-pl = абзацев , - case = d , + variant = d , Name-sg = Абзацу , name-sg = абзацу , Name-pl = Абзацам , name-pl = абзацам , - case = i , + variant = i , Name-sg = Абзацем , name-sg = абзацем , Name-pl = Абзацами , name-pl = абзацами , - case = p , + variant = p , Name-sg = Абзаце , name-sg = абзаце , Name-pl = Абзацах , @@ -10804,32 +10812,32 @@ type = paragraph , type = appendix , gender = n , - case = n , + variant = n , Name-sg = Приложение , name-sg = приложение , Name-pl = Приложения , name-pl = приложения , - case = a , + variant = a , Name-sg = Приложение , name-sg = приложение , Name-pl = Приложения , name-pl = приложения , - case = g , + variant = g , Name-sg = Приложения , name-sg = приложения , Name-pl = Приложений , name-pl = приложений , - case = d , + variant = d , Name-sg = Приложению , name-sg = приложению , Name-pl = Приложениям , name-pl = приложениям , - case = i , + variant = i , Name-sg = Приложением , name-sg = приложением , Name-pl = Приложениями , name-pl = приложениями , - case = p , + variant = p , Name-sg = Приложении , name-sg = приложении , Name-pl = Приложениях , @@ -10837,7 +10845,7 @@ type = appendix , type = page , gender = f , - case = n , + variant = n , Name-sg = Страница , name-sg = страница , Name-pl = Страницы , @@ -10846,7 +10854,7 @@ type = page , name-sg-ab = с. , Name-pl-ab = Сс. , name-pl-ab = сс. , - case = a , + variant = a , Name-sg = Страницу , name-sg = страницу , Name-pl = Страницы , @@ -10855,7 +10863,7 @@ type = page , name-sg-ab = с. , Name-pl-ab = Сс. , name-pl-ab = сс. , - case = g , + variant = g , Name-sg = Страницы , name-sg = страницы , Name-pl = Страниц , @@ -10864,7 +10872,7 @@ type = page , name-sg-ab = с. , Name-pl-ab = Сс. , name-pl-ab = сс. , - case = d , + variant = d , Name-sg = Странице , name-sg = странице , Name-pl = Страницам , @@ -10873,7 +10881,7 @@ type = page , name-sg-ab = с. , Name-pl-ab = Сс. , name-pl-ab = сс. , - case = i , + variant = i , Name-sg = Страницей , name-sg = страницей , Name-pl = Страницами , @@ -10882,7 +10890,7 @@ type = page , name-sg-ab = с. , Name-pl-ab = Сс. , name-pl-ab = сс. , - case = p , + variant = p , Name-sg = Странице , name-sg = странице , Name-pl = Страницах , @@ -10897,32 +10905,32 @@ type = page , type = line , gender = f , - case = n , + variant = n , Name-sg = Строка , name-sg = строка , Name-pl = Строки , name-pl = строки , - case = a , + variant = a , Name-sg = Строку , name-sg = строку , Name-pl = Строки , name-pl = строки , - case = g , + variant = g , Name-sg = Строки , name-sg = строки , Name-pl = Строк , name-pl = строк , - case = d , + variant = d , Name-sg = Строке , name-sg = строке , Name-pl = Строкам , name-pl = строкам , - case = i , + variant = i , Name-sg = Строкой , name-sg = строкой , Name-pl = Строками , name-pl = строками , - case = p , + variant = p , Name-sg = Строке , name-sg = строке , Name-pl = Строках , @@ -10930,7 +10938,7 @@ type = line , type = figure , gender = m , - case = n , + variant = n , Name-sg = Рисунок , name-sg = рисунок , Name-pl = Рисунки , @@ -10939,7 +10947,7 @@ type = figure , name-sg-ab = рис. , Name-pl-ab = Рис. , name-pl-ab = рис. , - case = a , + variant = a , Name-sg = Рисунок , name-sg = рисунок , Name-pl = Рисунки , @@ -10948,7 +10956,7 @@ type = figure , name-sg-ab = рис. , Name-pl-ab = Рис. , name-pl-ab = рис. , - case = g , + variant = g , Name-sg = Рисунка , name-sg = рисунка , Name-pl = Рисунков , @@ -10957,7 +10965,7 @@ type = figure , name-sg-ab = рис. , Name-pl-ab = Рис. , name-pl-ab = рис. , - case = d , + variant = d , Name-sg = Рисунку , name-sg = рисунку , Name-pl = Рисункам , @@ -10966,7 +10974,7 @@ type = figure , name-sg-ab = рис. , Name-pl-ab = Рис. , name-pl-ab = рис. , - case = i , + variant = i , Name-sg = Рисунком , name-sg = рисунком , Name-pl = Рисунками , @@ -10975,7 +10983,7 @@ type = figure , name-sg-ab = рис. , Name-pl-ab = Рис. , name-pl-ab = рис. , - case = p , + variant = p , Name-sg = Рисунке , name-sg = рисунке , Name-pl = Рисунках , @@ -10987,7 +10995,7 @@ type = figure , type = table , gender = f , - case = n , + variant = n , Name-sg = Таблица , name-sg = таблица , Name-pl = Таблицы , @@ -10996,7 +11004,7 @@ type = table , name-sg-ab = табл. , Name-pl-ab = Табл. , name-pl-ab = табл. , - case = a , + variant = a , Name-sg = Таблицу , name-sg = таблицу , Name-pl = Таблицы , @@ -11005,7 +11013,7 @@ type = table , name-sg-ab = табл. , Name-pl-ab = Табл. , name-pl-ab = табл. , - case = g , + variant = g , Name-sg = Таблицы , name-sg = таблицы , Name-pl = Таблиц , @@ -11014,7 +11022,7 @@ type = table , name-sg-ab = табл. , Name-pl-ab = Табл. , name-pl-ab = табл. , - case = d , + variant = d , Name-sg = Таблице , name-sg = таблице , Name-pl = Таблицам , @@ -11023,7 +11031,7 @@ type = table , name-sg-ab = табл. , Name-pl-ab = Табл. , name-pl-ab = табл. , - case = i , + variant = i , Name-sg = Таблицей , name-sg = таблицей , Name-pl = Таблицами , @@ -11032,7 +11040,7 @@ type = table , name-sg-ab = табл. , Name-pl-ab = Табл. , name-pl-ab = табл. , - case = p , + variant = p , Name-sg = Таблице , name-sg = таблице , Name-pl = Таблицах , @@ -11044,7 +11052,7 @@ type = table , type = item , gender = m , - case = n , + variant = n , Name-sg = Пункт , name-sg = пункт , Name-pl = Пункты , @@ -11053,7 +11061,7 @@ type = item , name-sg-ab = п. , Name-pl-ab = Пп. , name-pl-ab = пп. , - case = a , + variant = a , Name-sg = Пункт , name-sg = пункт , Name-pl = Пункты , @@ -11062,7 +11070,7 @@ type = item , name-sg-ab = п. , Name-pl-ab = Пп. , name-pl-ab = пп. , - case = g , + variant = g , Name-sg = Пункта , name-sg = пункта , Name-pl = Пунктов , @@ -11071,7 +11079,7 @@ type = item , name-sg-ab = п. , Name-pl-ab = Пп. , name-pl-ab = пп. , - case = d , + variant = d , Name-sg = Пункту , name-sg = пункту , Name-pl = Пунктам , @@ -11080,7 +11088,7 @@ type = item , name-sg-ab = п. , Name-pl-ab = Пп. , name-pl-ab = пп. , - case = i , + variant = i , Name-sg = Пунктом , name-sg = пунктом , Name-pl = Пунктами , @@ -11089,7 +11097,7 @@ type = item , name-sg-ab = п. , Name-pl-ab = Пп. , name-pl-ab = пп. , - case = p , + variant = p , Name-sg = Пункте , name-sg = пункте , Name-pl = Пунктах , @@ -11101,32 +11109,32 @@ type = item , type = footnote , gender = f , - case = n , + variant = n , Name-sg = Сноска , name-sg = сноска , Name-pl = Сноски , name-pl = сноски , - case = a , + variant = a , Name-sg = Сноску , name-sg = сноску , Name-pl = Сноски , name-pl = сноски , - case = g , + variant = g , Name-sg = Сноски , name-sg = сноски , Name-pl = Сносок , name-pl = сносок , - case = d , + variant = d , Name-sg = Сноске , name-sg = сноске , Name-pl = Сноскам , name-pl = сноскам , - case = i , + variant = i , Name-sg = Сноской , name-sg = сноской , Name-pl = Сносками , name-pl = сносками , - case = p , + variant = p , Name-sg = Сноске , name-sg = сноске , Name-pl = Сносках , @@ -11134,32 +11142,32 @@ type = footnote , type = endnote , gender = f , - case = n , + variant = n , Name-sg = Сноска , name-sg = сноска , Name-pl = Сноски , name-pl = сноски , - case = a , + variant = a , Name-sg = Сноску , name-sg = сноску , Name-pl = Сноски , name-pl = сноски , - case = g , + variant = g , Name-sg = Сноски , name-sg = сноски , Name-pl = Сносок , name-pl = сносок , - case = d , + variant = d , Name-sg = Сноске , name-sg = сноске , Name-pl = Сноскам , name-pl = сноскам , - case = i , + variant = i , Name-sg = Сноской , name-sg = сноской , Name-pl = Сносками , name-pl = сносками , - case = p , + variant = p , Name-sg = Сноске , name-sg = сноске , Name-pl = Сносках , @@ -11167,32 +11175,32 @@ type = endnote , type = note , gender = f , - case = n , + variant = n , Name-sg = Заметка , name-sg = заметка , Name-pl = Заметки , name-pl = заметки , - case = a , + variant = a , Name-sg = Заметку , name-sg = заметку , Name-pl = Заметки , name-pl = заметки , - case = g , + variant = g , Name-sg = Заметки , name-sg = заметки , Name-pl = Заметок , name-pl = заметок , - case = d , + variant = d , Name-sg = Заметке , name-sg = заметке , Name-pl = Заметкам , name-pl = заметкам , - case = i , + variant = i , Name-sg = Заметкой , name-sg = заметкой , Name-pl = Заметками , name-pl = заметками , - case = p , + variant = p , Name-sg = Заметке , name-sg = заметке , Name-pl = Заметках , @@ -11200,7 +11208,7 @@ type = note , type = equation , gender = n , - case = n , + variant = n , Name-sg = Уравнение , name-sg = уравнение , Name-pl = Уравнения , @@ -11209,7 +11217,7 @@ type = equation , name-sg-ab = ур. , Name-pl-ab = Ур. , name-pl-ab = ур. , - case = a , + variant = a , Name-sg = Уравнение , name-sg = уравнение , Name-pl = Уравнения , @@ -11218,7 +11226,7 @@ type = equation , name-sg-ab = ур. , Name-pl-ab = Ур. , name-pl-ab = ур. , - case = g , + variant = g , Name-sg = Уравнения , name-sg = уравнения , Name-pl = Уравнений , @@ -11227,7 +11235,7 @@ type = equation , name-sg-ab = ур. , Name-pl-ab = Ур. , name-pl-ab = ур. , - case = d , + variant = d , Name-sg = Уравнению , name-sg = уравнению , Name-pl = Уравнениям , @@ -11236,7 +11244,7 @@ type = equation , name-sg-ab = ур. , Name-pl-ab = Ур. , name-pl-ab = ур. , - case = i , + variant = i , Name-sg = Уравнением , name-sg = уравнением , Name-pl = Уравнениями , @@ -11245,7 +11253,7 @@ type = equation , name-sg-ab = ур. , Name-pl-ab = Ур. , name-pl-ab = ур. , - case = p , + variant = p , Name-sg = Уравнении , name-sg = уравнении , Name-pl = Уравнениях , @@ -11260,7 +11268,7 @@ type = equation , type = theorem , gender = f , - case = n , + variant = n , Name-sg = Теорема , name-sg = теорема , Name-pl = Теоремы , @@ -11269,7 +11277,7 @@ type = theorem , name-sg-ab = теор. , Name-pl-ab = Теор. , name-pl-ab = теор. , - case = a , + variant = a , Name-sg = Теорему , name-sg = теорему , Name-pl = Теоремы , @@ -11278,7 +11286,7 @@ type = theorem , name-sg-ab = теор. , Name-pl-ab = Теор. , name-pl-ab = теор. , - case = g , + variant = g , Name-sg = Теоремы , name-sg = теоремы , Name-pl = Теорем , @@ -11287,7 +11295,7 @@ type = theorem , name-sg-ab = теор. , Name-pl-ab = Теор. , name-pl-ab = теор. , - case = d , + variant = d , Name-sg = Теореме , name-sg = теореме , Name-pl = Теоремам , @@ -11296,7 +11304,7 @@ type = theorem , name-sg-ab = теор. , Name-pl-ab = Теор. , name-pl-ab = теор. , - case = i , + variant = i , Name-sg = Теоремой , name-sg = теоремой , Name-pl = Теоремами , @@ -11305,7 +11313,7 @@ type = theorem , name-sg-ab = теор. , Name-pl-ab = Теор. , name-pl-ab = теор. , - case = p , + variant = p , Name-sg = Теореме , name-sg = теореме , Name-pl = Теоремах , @@ -11317,32 +11325,32 @@ type = theorem , type = lemma , gender = f , - case = n , + variant = n , Name-sg = Лемма , name-sg = лемма , Name-pl = Леммы , name-pl = леммы , - case = a , + variant = a , Name-sg = Лемму , name-sg = лемму , Name-pl = Леммы , name-pl = леммы , - case = g , + variant = g , Name-sg = Леммы , name-sg = леммы , Name-pl = Лемм , name-pl = лемм , - case = d , + variant = d , Name-sg = Лемме , name-sg = лемме , Name-pl = Леммам , name-pl = леммам , - case = i , + variant = i , Name-sg = Леммой , name-sg = леммой , Name-pl = Леммами , name-pl = леммами , - case = p , + variant = p , Name-sg = Лемме , name-sg = лемме , Name-pl = Леммах , @@ -11350,32 +11358,32 @@ type = lemma , type = corollary , gender = m , - case = n , + variant = n , Name-sg = Вывод , name-sg = вывод , Name-pl = Выводы , name-pl = выводы , - case = a , + variant = a , Name-sg = Вывод , name-sg = вывод , Name-pl = Выводы , name-pl = выводы , - case = g , + variant = g , Name-sg = Вывода , name-sg = вывода , Name-pl = Выводов , name-pl = выводов , - case = d , + variant = d , Name-sg = Выводу , name-sg = выводу , Name-pl = Выводам , name-pl = выводам , - case = i , + variant = i , Name-sg = Выводом , name-sg = выводом , Name-pl = Выводами , name-pl = выводами , - case = p , + variant = p , Name-sg = Выводе , name-sg = выводе , Name-pl = Выводах , @@ -11383,7 +11391,7 @@ type = corollary , type = proposition , gender = n , - case = n , + variant = n , Name-sg = Предложение , name-sg = предложение , Name-pl = Предложения , @@ -11392,7 +11400,7 @@ type = proposition , name-sg-ab = предл. , Name-pl-ab = Предл. , name-pl-ab = предл. , - case = a , + variant = a , Name-sg = Предложение , name-sg = предложение , Name-pl = Предложения , @@ -11401,7 +11409,7 @@ type = proposition , name-sg-ab = предл. , Name-pl-ab = Предл. , name-pl-ab = предл. , - case = g , + variant = g , Name-sg = Предложения , name-sg = предложения , Name-pl = Предложений , @@ -11410,7 +11418,7 @@ type = proposition , name-sg-ab = предл. , Name-pl-ab = Предл. , name-pl-ab = предл. , - case = d , + variant = d , Name-sg = Предложению , name-sg = предложению , Name-pl = Предложениям , @@ -11419,7 +11427,7 @@ type = proposition , name-sg-ab = предл. , Name-pl-ab = Предл. , name-pl-ab = предл. , - case = i , + variant = i , Name-sg = Предложением , name-sg = предложением , Name-pl = Предложениями , @@ -11428,7 +11436,7 @@ type = proposition , name-sg-ab = предл. , Name-pl-ab = Предл. , name-pl-ab = предл. , - case = p , + variant = p , Name-sg = Предложении , name-sg = предложении , Name-pl = Предложениях , @@ -11440,7 +11448,7 @@ type = proposition , type = definition , gender = n , - case = n , + variant = n , Name-sg = Определение , name-sg = определение , Name-pl = Определения , @@ -11449,7 +11457,7 @@ type = definition , name-sg-ab = опр. , Name-pl-ab = Опр. , name-pl-ab = опр. , - case = a , + variant = a , Name-sg = Определение , name-sg = определение , Name-pl = Определения , @@ -11458,7 +11466,7 @@ type = definition , name-sg-ab = опр. , Name-pl-ab = Опр. , name-pl-ab = опр. , - case = g , + variant = g , Name-sg = Определения , name-sg = определения , Name-pl = Определений , @@ -11467,7 +11475,7 @@ type = definition , name-sg-ab = опр. , Name-pl-ab = Опр. , name-pl-ab = опр. , - case = d , + variant = d , Name-sg = Определению , name-sg = определению , Name-pl = Определениям , @@ -11476,7 +11484,7 @@ type = definition , name-sg-ab = опр. , Name-pl-ab = Опр. , name-pl-ab = опр. , - case = i , + variant = i , Name-sg = Определением , name-sg = определением , Name-pl = Определениями , @@ -11485,7 +11493,7 @@ type = definition , name-sg-ab = опр. , Name-pl-ab = Опр. , name-pl-ab = опр. , - case = p , + variant = p , Name-sg = Определении , name-sg = определении , Name-pl = Определениях , @@ -11497,32 +11505,32 @@ type = definition , type = proof , gender = n , - case = n , + variant = n , Name-sg = Доказательство , name-sg = доказательство , Name-pl = Доказательства , name-pl = доказательства , - case = a , + variant = a , Name-sg = Доказательство , name-sg = доказательство , Name-pl = Доказательства , name-pl = доказательства , - case = g , + variant = g , Name-sg = Доказательства , name-sg = доказательства , Name-pl = Доказательств , name-pl = доказательств , - case = d , + variant = d , Name-sg = Доказательству , name-sg = доказательству , Name-pl = Доказательствам , name-pl = доказательствам , - case = i , + variant = i , Name-sg = Доказательством , name-sg = доказательством , Name-pl = Доказательствами , name-pl = доказательствами , - case = p , + variant = p , Name-sg = Доказательстве , name-sg = доказательстве , Name-pl = Доказательствах , @@ -11530,32 +11538,32 @@ type = proof , type = result , gender = m , - case = n , + variant = n , Name-sg = Результат , name-sg = результат , Name-pl = Результаты , name-pl = результаты , - case = a , + variant = a , Name-sg = Результат , name-sg = результат , Name-pl = Результаты , name-pl = результаты , - case = g , + variant = g , Name-sg = Результата , name-sg = результата , Name-pl = Результатов , name-pl = результатов , - case = d , + variant = d , Name-sg = Результату , name-sg = результату , Name-pl = Результатам , name-pl = результатам , - case = i , + variant = i , Name-sg = Результатом , name-sg = результатом , Name-pl = Результатами , name-pl = результатами , - case = p , + variant = p , Name-sg = Результате , name-sg = результате , Name-pl = Результатах , @@ -11563,7 +11571,7 @@ type = result , type = remark , gender = n , - case = n , + variant = n , Name-sg = Примечание , name-sg = примечание , Name-pl = Примечания , @@ -11572,7 +11580,7 @@ type = remark , name-sg-ab = прим. , Name-pl-ab = Прим. , name-pl-ab = прим. , - case = a , + variant = a , Name-sg = Примечание , name-sg = примечание , Name-pl = Примечания , @@ -11581,7 +11589,7 @@ type = remark , name-sg-ab = прим. , Name-pl-ab = Прим. , name-pl-ab = прим. , - case = g , + variant = g , Name-sg = Примечания , name-sg = примечания , Name-pl = Примечаний , @@ -11590,7 +11598,7 @@ type = remark , name-sg-ab = прим. , Name-pl-ab = Прим. , name-pl-ab = прим. , - case = d , + variant = d , Name-sg = Примечанию , name-sg = примечанию , Name-pl = Примечаниям , @@ -11599,7 +11607,7 @@ type = remark , name-sg-ab = прим. , Name-pl-ab = Прим. , name-pl-ab = прим. , - case = i , + variant = i , Name-sg = Примечанием , name-sg = примечанием , Name-pl = Примечаниями , @@ -11608,7 +11616,7 @@ type = remark , name-sg-ab = прим. , Name-pl-ab = Прим. , name-pl-ab = прим. , - case = p , + variant = p , Name-sg = Примечании , name-sg = примечании , Name-pl = Примечаниях , @@ -11620,32 +11628,32 @@ type = remark , type = example , gender = m , - case = n , + variant = n , Name-sg = Пример , name-sg = пример , Name-pl = Примеры , name-pl = примеры , - case = a , + variant = a , Name-sg = Пример , name-sg = пример , Name-pl = Примеры , name-pl = примеры , - case = g , + variant = g , Name-sg = Примера , name-sg = примера , Name-pl = Примеров , name-pl = примеров , - case = d , + variant = d , Name-sg = Примеру , name-sg = примеру , Name-pl = Примерам , name-pl = примерам , - case = i , + variant = i , Name-sg = Примером , name-sg = примером , Name-pl = Примерами , name-pl = примерами , - case = p , + variant = p , Name-sg = Примере , name-sg = примере , Name-pl = Примерах , @@ -11653,32 +11661,32 @@ type = example , type = algorithm , gender = m , - case = n , + variant = n , Name-sg = Алгоритм , name-sg = алгоритм , Name-pl = Алгоритмы , name-pl = алгоритмы , - case = a , + variant = a , Name-sg = Алгоритм , name-sg = алгоритм , Name-pl = Алгоритмы , name-pl = алгоритмы , - case = g , + variant = g , Name-sg = Алгоритма , name-sg = алгоритма , Name-pl = Алгоритмов , name-pl = алгоритмов , - case = d , + variant = d , Name-sg = Алгоритму , name-sg = алгоритму , Name-pl = Алгоритмам , name-pl = алгоритмам , - case = i , + variant = i , Name-sg = Алгоритмом , name-sg = алгоритмом , Name-pl = Алгоритмами , name-pl = алгоритмами , - case = p , + variant = p , Name-sg = Алгоритме , name-sg = алгоритме , Name-pl = Алгоритмах , @@ -11686,32 +11694,32 @@ type = algorithm , type = listing , gender = m , - case = n , + variant = n , Name-sg = Листинг , name-sg = листинг , Name-pl = Листинги , name-pl = листинги , - case = a , + variant = a , Name-sg = Листинг , name-sg = листинг , Name-pl = Листинги , name-pl = листинги , - case = g , + variant = g , Name-sg = Листинга , name-sg = листинга , Name-pl = Листингов , name-pl = листингов , - case = d , + variant = d , Name-sg = Листингу , name-sg = листингу , Name-pl = Листингам , name-pl = листингам , - case = i , + variant = i , Name-sg = Листингом , name-sg = листинглм , Name-pl = Листингами , name-pl = листингами , - case = p , + variant = p , Name-sg = Листинге , name-sg = листинге , Name-pl = Листингах , @@ -11719,7 +11727,7 @@ type = listing , type = exercise , gender = n , - case = n , + variant = n , Name-sg = Упражнение , name-sg = упражнение , Name-pl = Упражнения , @@ -11728,7 +11736,7 @@ type = exercise , name-sg-ab = упр. , Name-pl-ab = Упр. , name-pl-ab = упр. , - case = a , + variant = a , Name-sg = Упражнение , name-sg = упражнение , Name-pl = Упражнения , @@ -11737,7 +11745,7 @@ type = exercise , name-sg-ab = упр. , Name-pl-ab = Упр. , name-pl-ab = упр. , - case = g , + variant = g , Name-sg = Упражнения , name-sg = упражнения , Name-pl = Упражнений , @@ -11746,7 +11754,7 @@ type = exercise , name-sg-ab = упр. , Name-pl-ab = Упр. , name-pl-ab = упр. , - case = d , + variant = d , Name-sg = Упражнению , name-sg = упражнению , Name-pl = Упражнениям , @@ -11755,7 +11763,7 @@ type = exercise , name-sg-ab = упр. , Name-pl-ab = Упр. , name-pl-ab = упр. , - case = i , + variant = i , Name-sg = Упражнением , name-sg = упражнением , Name-pl = Упражнениями , @@ -11764,7 +11772,7 @@ type = exercise , name-sg-ab = упр. , Name-pl-ab = Упр. , name-pl-ab = упр. , - case = p , + variant = p , Name-sg = Упражнении , name-sg = упражнении , Name-pl = Упражнениях , @@ -11776,32 +11784,32 @@ type = exercise , type = solution , gender = n , - case = n , + variant = n , Name-sg = Решение , name-sg = решение , Name-pl = Решения , name-pl = решения , - case = a , + variant = a , Name-sg = Решение , name-sg = решение , Name-pl = Решения , name-pl = решения , - case = g , + variant = g , Name-sg = Решения , name-sg = решения , Name-pl = Решений , name-pl = решений , - case = d , + variant = d , Name-sg = Решению , name-sg = решению , Name-pl = Решениям , name-pl = решениям , - case = i , + variant = i , Name-sg = Решением , name-sg = решением , Name-pl = Решениями , name-pl = решениями , - case = p , + variant = p , Name-sg = Решении , name-sg = решении , Name-pl = Решениях , @@ -11813,6 +11821,221 @@ type = solution , % \end{macrocode} % % +% \subsection{Swedish} +% +% Swedish language file initially contributed by +% \contributor{\username{Timmyfox}} (\githubissue{35}). +% +% \begin{macrocode} +%<*package> +\zcDeclareLanguage { swedish } +% +% \end{macrocode} +% +% \begin{macrocode} +%<*lang-swedish> +% \end{macrocode} +% +% \begin{macrocode} +namesep = {\nobreakspace} , +pairsep = {~och\nobreakspace} , +listsep = {,~} , +lastsep = {~och\nobreakspace} , +tpairsep = {~och\nobreakspace} , +tlistsep = {,~} , +tlastsep = {~och\nobreakspace} , +notesep = {~} , +rangesep = {\textendash} , +rangetopair = false , + +type = book , + Name-sg = Bok , + name-sg = bok , + Name-pl = Bok , + name-pl = bok , + +type = part , + Name-sg = Del , + name-sg = del , + Name-pl = Del , + name-pl = del , + +type = chapter , + Name-sg = Kapitel , + name-sg = kapitel , + Name-pl = Kapitel , + name-pl = kapitel , + +type = section , + Name-sg = Avsnitt , + name-sg = avsnitt , + Name-pl = Avsnitt , + name-pl = avsnitt , + +type = paragraph , + Name-sg = Paragraf , + name-sg = paragraf , + Name-pl = Paragraf , + name-pl = paragraf , + +type = appendix , + Name-sg = Bilaga , + name-sg = bilaga , + Name-pl = Bilaga , + name-pl = bilaga , + +type = page , + Name-sg = Sida , + name-sg = sida , + Name-pl = Sida , + name-pl = sida , + +type = line , + Name-sg = Rad , + name-sg = rad , + Name-pl = Rad , + name-pl = rad , + +type = figure , + Name-sg = Figur , + name-sg = figur , + Name-pl = Figur , + name-pl = figur , + Name-sg-ab = Fig. , + name-sg-ab = fig. , + Name-pl-ab = Fig. , + name-pl-ab = fig. , + +type = table , + Name-sg = Tabell , + name-sg = tabell , + Name-pl = Tabell , + name-pl = tabell , + Name-sg-ab = Tab. , + name-sg-ab = tab. , + Name-pl-ab = Tab. , + name-pl-ab = tab. , + +type = item , + Name-sg = Punkt , + name-sg = punkt , + Name-pl = Punkt , + name-pl = punkt , + +type = footnote , + Name-sg = Fotnot , + name-sg = fotnot , + Name-pl = Fotnot , + name-pl = fotnot , + +type = endnote , + Name-sg = Slutnot , + name-sg = slutnot , + Name-pl = Slutnot , + name-pl = slutnot , + +type = note , + Name-sg = Not , + name-sg = not , + Name-pl = Not , + name-pl = not , + +type = equation , + Name-sg = Ekvation , + name-sg = ekvation , + Name-pl = Ekvation , + name-pl = ekvation , + Name-sg-ab = Ekv. , + name-sg-ab = ekv. , + Name-pl-ab = Ekv. , + name-pl-ab = ekv. , + refbounds-first-sg = {,(,),} , + refbounds = {(,,,)} , + +type = theorem , + Name-sg = Sats , + name-sg = sats , + Name-pl = Sats , + name-pl = sats , + +type = lemma , + Name-sg = Hjälpsats , + name-sg = hjälpsats , + Name-pl = Hjälpsats , + name-pl = hjälpsats , + +type = corollary , + Name-sg = Följdsats , + name-sg = följdsats , + Name-pl = Följdsats , + name-pl = följdsats , + +type = proposition , + Name-sg = Påstående , + name-sg = påstående , + Name-pl = Påstående , + name-pl = påstående , + +type = definition , + Name-sg = Definition , + name-sg = definition , + Name-pl = Definition , + name-pl = definition , + +type = proof , + Name-sg = Bevis , + name-sg = bevis , + Name-pl = Bevis , + name-pl = bevis , + +type = result , + Name-sg = Resultat , + name-sg = resultat , + Name-pl = Resultat , + name-pl = resultat , + +type = remark , + Name-sg = Anmärkning , + name-sg = anmärkning , + Name-pl = Anmärkning , + name-pl = anmärkning , + +type = example , + Name-sg = Exempel , + name-sg = exempel , + Name-pl = Exempel , + name-pl = exempel , + +type = algorithm , + Name-sg = Algoritm , + name-sg = algoritm , + Name-pl = Algoritm , + name-pl = algoritm , + +type = listing , + Name-sg = Kod , + name-sg = kod , + Name-pl = Kod , + name-pl = kod , + +type = exercise , + Name-sg = Uppgift , + name-sg = uppgift , + Name-pl = Uppgift , + name-pl = uppgift , + +type = solution , + Name-sg = Lösning , + name-sg = lösning , + Name-pl = Lösning , + name-pl = lösning , +% \end{macrocode} +% +% \begin{macrocode} +% +% \end{macrocode} +% +% % \PrintIndex % % \endinput diff --git a/Master/texmf-dist/source/latex/zref-clever/zref-clever.ins b/Master/texmf-dist/source/latex/zref-clever/zref-clever.ins index 0aefb6ce737..6545e91539c 100644 --- a/Master/texmf-dist/source/latex/zref-clever/zref-clever.ins +++ b/Master/texmf-dist/source/latex/zref-clever/zref-clever.ins @@ -96,5 +96,6 @@ for those people who are interested. \generate{\file{zref-clever-dutch.lang}{\from{zref-clever.dtx}{lang-dutch}}} \generate{\file{zref-clever-italian.lang}{\from{zref-clever.dtx}{lang-italian}}} \generate{\file{zref-clever-russian.lang}{\from{zref-clever.dtx}{lang-russian}}} +\generate{\file{zref-clever-swedish.lang}{\from{zref-clever.dtx}{lang-swedish}}} \endbatchfile diff --git a/Master/texmf-dist/tex/latex/zref-clever/zref-clever-german.lang b/Master/texmf-dist/tex/latex/zref-clever/zref-clever-german.lang index c42c05da3d9..ebb1cd0946e 100644 --- a/Master/texmf-dist/tex/latex/zref-clever/zref-clever-german.lang +++ b/Master/texmf-dist/tex/latex/zref-clever/zref-clever-german.lang @@ -53,106 +53,106 @@ rangesep = {~bis\nobreakspace} , type = book , gender = n , - case = N , + variant = N , Name-sg = Buch , Name-pl = Bücher , - case = A , + variant = A , Name-sg = Buch , Name-pl = Bücher , - case = D , + variant = D , Name-sg = Buch , Name-pl = Büchern , - case = G , + variant = G , Name-sg = Buches , Name-pl = Bücher , type = part , gender = m , - case = N , + variant = N , Name-sg = Teil , Name-pl = Teile , - case = A , + variant = A , Name-sg = Teil , Name-pl = Teile , - case = D , + variant = D , Name-sg = Teil , Name-pl = Teilen , - case = G , + variant = G , Name-sg = Teiles , Name-pl = Teile , type = chapter , gender = n , - case = N , + variant = N , Name-sg = Kapitel , Name-pl = Kapitel , - case = A , + variant = A , Name-sg = Kapitel , Name-pl = Kapitel , - case = D , + variant = D , Name-sg = Kapitel , Name-pl = Kapiteln , - case = G , + variant = G , Name-sg = Kapitels , Name-pl = Kapitel , type = section , gender = m , - case = N , + variant = N , Name-sg = Abschnitt , Name-pl = Abschnitte , - case = A , + variant = A , Name-sg = Abschnitt , Name-pl = Abschnitte , - case = D , + variant = D , Name-sg = Abschnitt , Name-pl = Abschnitten , - case = G , + variant = G , Name-sg = Abschnitts , Name-pl = Abschnitte , type = paragraph , gender = m , - case = N , + variant = N , Name-sg = Absatz , Name-pl = Absätze , - case = A , + variant = A , Name-sg = Absatz , Name-pl = Absätze , - case = D , + variant = D , Name-sg = Absatz , Name-pl = Absätzen , - case = G , + variant = G , Name-sg = Absatzes , Name-pl = Absätze , type = appendix , gender = m , - case = N , + variant = N , Name-sg = Anhang , Name-pl = Anhänge , - case = A , + variant = A , Name-sg = Anhang , Name-pl = Anhänge , - case = D , + variant = D , Name-sg = Anhang , Name-pl = Anhängen , - case = G , + variant = G , Name-sg = Anhangs , Name-pl = Anhänge , type = page , gender = f , - case = N , + variant = N , Name-sg = Seite , Name-pl = Seiten , - case = A , + variant = A , Name-sg = Seite , Name-pl = Seiten , - case = D , + variant = D , Name-sg = Seite , Name-pl = Seiten , - case = G , + variant = G , Name-sg = Seite , Name-pl = Seiten , rangesep = {\textendash} , @@ -160,37 +160,37 @@ type = page , type = line , gender = f , - case = N , + variant = N , Name-sg = Zeile , Name-pl = Zeilen , - case = A , + variant = A , Name-sg = Zeile , Name-pl = Zeilen , - case = D , + variant = D , Name-sg = Zeile , Name-pl = Zeilen , - case = G , + variant = G , Name-sg = Zeile , Name-pl = Zeilen , type = figure , gender = f , - case = N , + variant = N , Name-sg = Abbildung , Name-pl = Abbildungen , Name-sg-ab = Abb. , Name-pl-ab = Abb. , - case = A , + variant = A , Name-sg = Abbildung , Name-pl = Abbildungen , Name-sg-ab = Abb. , Name-pl-ab = Abb. , - case = D , + variant = D , Name-sg = Abbildung , Name-pl = Abbildungen , Name-sg-ab = Abb. , Name-pl-ab = Abb. , - case = G , + variant = G , Name-sg = Abbildung , Name-pl = Abbildungen , Name-sg-ab = Abb. , @@ -198,91 +198,91 @@ type = figure , type = table , gender = f , - case = N , + variant = N , Name-sg = Tabelle , Name-pl = Tabellen , - case = A , + variant = A , Name-sg = Tabelle , Name-pl = Tabellen , - case = D , + variant = D , Name-sg = Tabelle , Name-pl = Tabellen , - case = G , + variant = G , Name-sg = Tabelle , Name-pl = Tabellen , type = item , gender = m , - case = N , + variant = N , Name-sg = Punkt , Name-pl = Punkte , - case = A , + variant = A , Name-sg = Punkt , Name-pl = Punkte , - case = D , + variant = D , Name-sg = Punkt , Name-pl = Punkten , - case = G , + variant = G , Name-sg = Punktes , Name-pl = Punkte , type = footnote , gender = f , - case = N , + variant = N , Name-sg = Fußnote , Name-pl = Fußnoten , - case = A , + variant = A , Name-sg = Fußnote , Name-pl = Fußnoten , - case = D , + variant = D , Name-sg = Fußnote , Name-pl = Fußnoten , - case = G , + variant = G , Name-sg = Fußnote , Name-pl = Fußnoten , type = endnote , gender = f , - case = N , + variant = N , Name-sg = Endnote , Name-pl = Endnoten , - case = A , + variant = A , Name-sg = Endnote , Name-pl = Endnoten , - case = D , + variant = D , Name-sg = Endnote , Name-pl = Endnoten , - case = G , + variant = G , Name-sg = Endnote , Name-pl = Endnoten , type = note , gender = f , - case = N , + variant = N , Name-sg = Anmerkung , Name-pl = Anmerkungen , - case = A , + variant = A , Name-sg = Anmerkung , Name-pl = Anmerkungen , - case = D , + variant = D , Name-sg = Anmerkung , Name-pl = Anmerkungen , - case = G , + variant = G , Name-sg = Anmerkung , Name-pl = Anmerkungen , type = equation , gender = f , - case = N , + variant = N , Name-sg = Gleichung , Name-pl = Gleichungen , - case = A , + variant = A , Name-sg = Gleichung , Name-pl = Gleichungen , - case = D , + variant = D , Name-sg = Gleichung , Name-pl = Gleichungen , - case = G , + variant = G , Name-sg = Gleichung , Name-pl = Gleichungen , refbounds-first-sg = {,(,),} , @@ -290,196 +290,196 @@ type = equation , type = theorem , gender = n , - case = N , + variant = N , Name-sg = Theorem , Name-pl = Theoreme , - case = A , + variant = A , Name-sg = Theorem , Name-pl = Theoreme , - case = D , + variant = D , Name-sg = Theorem , Name-pl = Theoremen , - case = G , + variant = G , Name-sg = Theorems , Name-pl = Theoreme , type = lemma , gender = n , - case = N , + variant = N , Name-sg = Lemma , Name-pl = Lemmata , - case = A , + variant = A , Name-sg = Lemma , Name-pl = Lemmata , - case = D , + variant = D , Name-sg = Lemma , Name-pl = Lemmata , - case = G , + variant = G , Name-sg = Lemmas , Name-pl = Lemmata , type = corollary , gender = n , - case = N , + variant = N , Name-sg = Korollar , Name-pl = Korollare , - case = A , + variant = A , Name-sg = Korollar , Name-pl = Korollare , - case = D , + variant = D , Name-sg = Korollar , Name-pl = Korollaren , - case = G , + variant = G , Name-sg = Korollars , Name-pl = Korollare , type = proposition , gender = m , - case = N , + variant = N , Name-sg = Satz , Name-pl = Sätze , - case = A , + variant = A , Name-sg = Satz , Name-pl = Sätze , - case = D , + variant = D , Name-sg = Satz , Name-pl = Sätzen , - case = G , + variant = G , Name-sg = Satzes , Name-pl = Sätze , type = definition , gender = f , - case = N , + variant = N , Name-sg = Definition , Name-pl = Definitionen , - case = A , + variant = A , Name-sg = Definition , Name-pl = Definitionen , - case = D , + variant = D , Name-sg = Definition , Name-pl = Definitionen , - case = G , + variant = G , Name-sg = Definition , Name-pl = Definitionen , type = proof , gender = m , - case = N , + variant = N , Name-sg = Beweis , Name-pl = Beweise , - case = A , + variant = A , Name-sg = Beweis , Name-pl = Beweise , - case = D , + variant = D , Name-sg = Beweis , Name-pl = Beweisen , - case = G , + variant = G , Name-sg = Beweises , Name-pl = Beweise , type = result , gender = n , - case = N , + variant = N , Name-sg = Ergebnis , Name-pl = Ergebnisse , - case = A , + variant = A , Name-sg = Ergebnis , Name-pl = Ergebnisse , - case = D , + variant = D , Name-sg = Ergebnis , Name-pl = Ergebnissen , - case = G , + variant = G , Name-sg = Ergebnisses , Name-pl = Ergebnisse , type = remark , gender = f , - case = N , + variant = N , Name-sg = Bemerkung , Name-pl = Bemerkungen , - case = A , + variant = A , Name-sg = Bemerkung , Name-pl = Bemerkungen , - case = D , + variant = D , Name-sg = Bemerkung , Name-pl = Bemerkungen , - case = G , + variant = G , Name-sg = Bemerkung , Name-pl = Bemerkungen , type = example , gender = n , - case = N , + variant = N , Name-sg = Beispiel , Name-pl = Beispiele , - case = A , + variant = A , Name-sg = Beispiel , Name-pl = Beispiele , - case = D , + variant = D , Name-sg = Beispiel , Name-pl = Beispielen , - case = G , + variant = G , Name-sg = Beispiels , Name-pl = Beispiele , type = algorithm , gender = m , - case = N , + variant = N , Name-sg = Algorithmus , Name-pl = Algorithmen , - case = A , + variant = A , Name-sg = Algorithmus , Name-pl = Algorithmen , - case = D , + variant = D , Name-sg = Algorithmus , Name-pl = Algorithmen , - case = G , + variant = G , Name-sg = Algorithmus , Name-pl = Algorithmen , type = listing , gender = n , - case = N , + variant = N , Name-sg = Listing , Name-pl = Listings , - case = A , + variant = A , Name-sg = Listing , Name-pl = Listings , - case = D , + variant = D , Name-sg = Listing , Name-pl = Listings , - case = G , + variant = G , Name-sg = Listings , Name-pl = Listings , type = exercise , gender = f , - case = N , + variant = N , Name-sg = Übungsaufgabe , Name-pl = Übungsaufgaben , - case = A , + variant = A , Name-sg = Übungsaufgabe , Name-pl = Übungsaufgaben , - case = D , + variant = D , Name-sg = Übungsaufgabe , Name-pl = Übungsaufgaben , - case = G , + variant = G , Name-sg = Übungsaufgabe , Name-pl = Übungsaufgaben , type = solution , gender = f , - case = N , + variant = N , Name-sg = Lösung , Name-pl = Lösungen , - case = A , + variant = A , Name-sg = Lösung , Name-pl = Lösungen , - case = D , + variant = D , Name-sg = Lösung , Name-pl = Lösungen , - case = G , + variant = G , Name-sg = Lösung , Name-pl = Lösungen , %% diff --git a/Master/texmf-dist/tex/latex/zref-clever/zref-clever-russian.lang b/Master/texmf-dist/tex/latex/zref-clever/zref-clever-russian.lang index a98e2349fba..bdd7d98bc8b 100644 --- a/Master/texmf-dist/tex/latex/zref-clever/zref-clever-russian.lang +++ b/Master/texmf-dist/tex/latex/zref-clever/zref-clever-russian.lang @@ -54,32 +54,32 @@ rangesep = {~по\nobreakspace} , type = book , gender = f , - case = n , + variant = n , Name-sg = Книга , name-sg = книга , Name-pl = Книги , name-pl = книги , - case = a , + variant = a , Name-sg = Книгу , name-sg = книгу , Name-pl = Книги , name-pl = книги , - case = g , + variant = g , Name-sg = Книги , name-sg = книги , Name-pl = Книг , name-pl = книг , - case = d , + variant = d , Name-sg = Книге , name-sg = книге , Name-pl = Книгам , name-pl = книгам , - case = i , + variant = i , Name-sg = Книгой , name-sg = книгой , Name-pl = Книгами , name-pl = книгами , - case = p , + variant = p , Name-sg = Книге , name-sg = книге , Name-pl = Книгах , @@ -87,7 +87,7 @@ type = book , type = part , gender = f , - case = n , + variant = n , Name-sg = Часть , name-sg = часть , Name-pl = Части , @@ -96,7 +96,7 @@ type = part , name-sg-ab = ч. , Name-pl-ab = Чч. , name-pl-ab = чч. , - case = a , + variant = a , Name-sg = Часть , name-sg = часть , Name-pl = Части , @@ -105,7 +105,7 @@ type = part , name-sg-ab = ч. , Name-pl-ab = Чч. , name-pl-ab = чч. , - case = g , + variant = g , Name-sg = Части , name-sg = части , Name-pl = Частей , @@ -114,7 +114,7 @@ type = part , name-sg-ab = ч. , Name-pl-ab = Чч. , name-pl-ab = чч. , - case = d , + variant = d , Name-sg = Части , name-sg = части , Name-pl = Частям , @@ -123,7 +123,7 @@ type = part , name-sg-ab = ч. , Name-pl-ab = Чч. , name-pl-ab = чч. , - case = i , + variant = i , Name-sg = Частью , name-sg = частью , Name-pl = Частями , @@ -132,7 +132,7 @@ type = part , name-sg-ab = ч. , Name-pl-ab = Чч. , name-pl-ab = чч. , - case = p , + variant = p , Name-sg = Части , name-sg = части , Name-pl = Частях , @@ -144,7 +144,7 @@ type = part , type = chapter , gender = f , - case = n , + variant = n , Name-sg = Глава , name-sg = глава , Name-pl = Главы , @@ -153,7 +153,7 @@ type = chapter , name-sg-ab = гл. , Name-pl-ab = Гл. , name-pl-ab = гл. , - case = a , + variant = a , Name-sg = Главу , name-sg = главу , Name-pl = Главы , @@ -162,7 +162,7 @@ type = chapter , name-sg-ab = гл. , Name-pl-ab = Гл. , name-pl-ab = гл. , - case = g , + variant = g , Name-sg = Главы , name-sg = главы , Name-pl = Глав , @@ -171,7 +171,7 @@ type = chapter , name-sg-ab = гл. , Name-pl-ab = Гл. , name-pl-ab = гл. , - case = d , + variant = d , Name-sg = Главе , name-sg = главе , Name-pl = Главам , @@ -180,7 +180,7 @@ type = chapter , name-sg-ab = гл. , Name-pl-ab = Гл. , name-pl-ab = гл. , - case = i , + variant = i , Name-sg = Главой , name-sg = главой , Name-pl = Главами , @@ -189,7 +189,7 @@ type = chapter , name-sg-ab = гл. , Name-pl-ab = Гл. , name-pl-ab = гл. , - case = p , + variant = p , Name-sg = Главе , name-sg = главе , Name-pl = Главах , @@ -201,32 +201,32 @@ type = chapter , type = section , gender = m , - case = n , + variant = n , Name-sg = Раздел , name-sg = раздел , Name-pl = Разделы , name-pl = разделы , - case = a , + variant = a , Name-sg = Раздел , name-sg = раздел , Name-pl = Разделы , name-pl = разделы , - case = g , + variant = g , Name-sg = Раздела , name-sg = раздела , Name-pl = Разделов , name-pl = разделов , - case = d , + variant = d , Name-sg = Разделу , name-sg = разделу , Name-pl = Разделам , name-pl = разделам , - case = i , + variant = i , Name-sg = Разделом , name-sg = разделом , Name-pl = Разделами , name-pl = разделами , - case = p , + variant = p , Name-sg = Разделе , name-sg = разделе , Name-pl = Разделах , @@ -234,32 +234,32 @@ type = section , type = paragraph , gender = m , - case = n , + variant = n , Name-sg = Абзац , name-sg = абзац , Name-pl = Абзацы , name-pl = абзацы , - case = a , + variant = a , Name-sg = Абзац , name-sg = абзац , Name-pl = Абзацы , name-pl = абзацы , - case = g , + variant = g , Name-sg = Абзаца , name-sg = абзаца , Name-pl = Абзацев , name-pl = абзацев , - case = d , + variant = d , Name-sg = Абзацу , name-sg = абзацу , Name-pl = Абзацам , name-pl = абзацам , - case = i , + variant = i , Name-sg = Абзацем , name-sg = абзацем , Name-pl = Абзацами , name-pl = абзацами , - case = p , + variant = p , Name-sg = Абзаце , name-sg = абзаце , Name-pl = Абзацах , @@ -267,32 +267,32 @@ type = paragraph , type = appendix , gender = n , - case = n , + variant = n , Name-sg = Приложение , name-sg = приложение , Name-pl = Приложения , name-pl = приложения , - case = a , + variant = a , Name-sg = Приложение , name-sg = приложение , Name-pl = Приложения , name-pl = приложения , - case = g , + variant = g , Name-sg = Приложения , name-sg = приложения , Name-pl = Приложений , name-pl = приложений , - case = d , + variant = d , Name-sg = Приложению , name-sg = приложению , Name-pl = Приложениям , name-pl = приложениям , - case = i , + variant = i , Name-sg = Приложением , name-sg = приложением , Name-pl = Приложениями , name-pl = приложениями , - case = p , + variant = p , Name-sg = Приложении , name-sg = приложении , Name-pl = Приложениях , @@ -300,7 +300,7 @@ type = appendix , type = page , gender = f , - case = n , + variant = n , Name-sg = Страница , name-sg = страница , Name-pl = Страницы , @@ -309,7 +309,7 @@ type = page , name-sg-ab = с. , Name-pl-ab = Сс. , name-pl-ab = сс. , - case = a , + variant = a , Name-sg = Страницу , name-sg = страницу , Name-pl = Страницы , @@ -318,7 +318,7 @@ type = page , name-sg-ab = с. , Name-pl-ab = Сс. , name-pl-ab = сс. , - case = g , + variant = g , Name-sg = Страницы , name-sg = страницы , Name-pl = Страниц , @@ -327,7 +327,7 @@ type = page , name-sg-ab = с. , Name-pl-ab = Сс. , name-pl-ab = сс. , - case = d , + variant = d , Name-sg = Странице , name-sg = странице , Name-pl = Страницам , @@ -336,7 +336,7 @@ type = page , name-sg-ab = с. , Name-pl-ab = Сс. , name-pl-ab = сс. , - case = i , + variant = i , Name-sg = Страницей , name-sg = страницей , Name-pl = Страницами , @@ -345,7 +345,7 @@ type = page , name-sg-ab = с. , Name-pl-ab = Сс. , name-pl-ab = сс. , - case = p , + variant = p , Name-sg = Странице , name-sg = странице , Name-pl = Страницах , @@ -360,32 +360,32 @@ type = page , type = line , gender = f , - case = n , + variant = n , Name-sg = Строка , name-sg = строка , Name-pl = Строки , name-pl = строки , - case = a , + variant = a , Name-sg = Строку , name-sg = строку , Name-pl = Строки , name-pl = строки , - case = g , + variant = g , Name-sg = Строки , name-sg = строки , Name-pl = Строк , name-pl = строк , - case = d , + variant = d , Name-sg = Строке , name-sg = строке , Name-pl = Строкам , name-pl = строкам , - case = i , + variant = i , Name-sg = Строкой , name-sg = строкой , Name-pl = Строками , name-pl = строками , - case = p , + variant = p , Name-sg = Строке , name-sg = строке , Name-pl = Строках , @@ -393,7 +393,7 @@ type = line , type = figure , gender = m , - case = n , + variant = n , Name-sg = Рисунок , name-sg = рисунок , Name-pl = Рисунки , @@ -402,7 +402,7 @@ type = figure , name-sg-ab = рис. , Name-pl-ab = Рис. , name-pl-ab = рис. , - case = a , + variant = a , Name-sg = Рисунок , name-sg = рисунок , Name-pl = Рисунки , @@ -411,7 +411,7 @@ type = figure , name-sg-ab = рис. , Name-pl-ab = Рис. , name-pl-ab = рис. , - case = g , + variant = g , Name-sg = Рисунка , name-sg = рисунка , Name-pl = Рисунков , @@ -420,7 +420,7 @@ type = figure , name-sg-ab = рис. , Name-pl-ab = Рис. , name-pl-ab = рис. , - case = d , + variant = d , Name-sg = Рисунку , name-sg = рисунку , Name-pl = Рисункам , @@ -429,7 +429,7 @@ type = figure , name-sg-ab = рис. , Name-pl-ab = Рис. , name-pl-ab = рис. , - case = i , + variant = i , Name-sg = Рисунком , name-sg = рисунком , Name-pl = Рисунками , @@ -438,7 +438,7 @@ type = figure , name-sg-ab = рис. , Name-pl-ab = Рис. , name-pl-ab = рис. , - case = p , + variant = p , Name-sg = Рисунке , name-sg = рисунке , Name-pl = Рисунках , @@ -450,7 +450,7 @@ type = figure , type = table , gender = f , - case = n , + variant = n , Name-sg = Таблица , name-sg = таблица , Name-pl = Таблицы , @@ -459,7 +459,7 @@ type = table , name-sg-ab = табл. , Name-pl-ab = Табл. , name-pl-ab = табл. , - case = a , + variant = a , Name-sg = Таблицу , name-sg = таблицу , Name-pl = Таблицы , @@ -468,7 +468,7 @@ type = table , name-sg-ab = табл. , Name-pl-ab = Табл. , name-pl-ab = табл. , - case = g , + variant = g , Name-sg = Таблицы , name-sg = таблицы , Name-pl = Таблиц , @@ -477,7 +477,7 @@ type = table , name-sg-ab = табл. , Name-pl-ab = Табл. , name-pl-ab = табл. , - case = d , + variant = d , Name-sg = Таблице , name-sg = таблице , Name-pl = Таблицам , @@ -486,7 +486,7 @@ type = table , name-sg-ab = табл. , Name-pl-ab = Табл. , name-pl-ab = табл. , - case = i , + variant = i , Name-sg = Таблицей , name-sg = таблицей , Name-pl = Таблицами , @@ -495,7 +495,7 @@ type = table , name-sg-ab = табл. , Name-pl-ab = Табл. , name-pl-ab = табл. , - case = p , + variant = p , Name-sg = Таблице , name-sg = таблице , Name-pl = Таблицах , @@ -507,7 +507,7 @@ type = table , type = item , gender = m , - case = n , + variant = n , Name-sg = Пункт , name-sg = пункт , Name-pl = Пункты , @@ -516,7 +516,7 @@ type = item , name-sg-ab = п. , Name-pl-ab = Пп. , name-pl-ab = пп. , - case = a , + variant = a , Name-sg = Пункт , name-sg = пункт , Name-pl = Пункты , @@ -525,7 +525,7 @@ type = item , name-sg-ab = п. , Name-pl-ab = Пп. , name-pl-ab = пп. , - case = g , + variant = g , Name-sg = Пункта , name-sg = пункта , Name-pl = Пунктов , @@ -534,7 +534,7 @@ type = item , name-sg-ab = п. , Name-pl-ab = Пп. , name-pl-ab = пп. , - case = d , + variant = d , Name-sg = Пункту , name-sg = пункту , Name-pl = Пунктам , @@ -543,7 +543,7 @@ type = item , name-sg-ab = п. , Name-pl-ab = Пп. , name-pl-ab = пп. , - case = i , + variant = i , Name-sg = Пунктом , name-sg = пунктом , Name-pl = Пунктами , @@ -552,7 +552,7 @@ type = item , name-sg-ab = п. , Name-pl-ab = Пп. , name-pl-ab = пп. , - case = p , + variant = p , Name-sg = Пункте , name-sg = пункте , Name-pl = Пунктах , @@ -564,32 +564,32 @@ type = item , type = footnote , gender = f , - case = n , + variant = n , Name-sg = Сноска , name-sg = сноска , Name-pl = Сноски , name-pl = сноски , - case = a , + variant = a , Name-sg = Сноску , name-sg = сноску , Name-pl = Сноски , name-pl = сноски , - case = g , + variant = g , Name-sg = Сноски , name-sg = сноски , Name-pl = Сносок , name-pl = сносок , - case = d , + variant = d , Name-sg = Сноске , name-sg = сноске , Name-pl = Сноскам , name-pl = сноскам , - case = i , + variant = i , Name-sg = Сноской , name-sg = сноской , Name-pl = Сносками , name-pl = сносками , - case = p , + variant = p , Name-sg = Сноске , name-sg = сноске , Name-pl = Сносках , @@ -597,32 +597,32 @@ type = footnote , type = endnote , gender = f , - case = n , + variant = n , Name-sg = Сноска , name-sg = сноска , Name-pl = Сноски , name-pl = сноски , - case = a , + variant = a , Name-sg = Сноску , name-sg = сноску , Name-pl = Сноски , name-pl = сноски , - case = g , + variant = g , Name-sg = Сноски , name-sg = сноски , Name-pl = Сносок , name-pl = сносок , - case = d , + variant = d , Name-sg = Сноске , name-sg = сноске , Name-pl = Сноскам , name-pl = сноскам , - case = i , + variant = i , Name-sg = Сноской , name-sg = сноской , Name-pl = Сносками , name-pl = сносками , - case = p , + variant = p , Name-sg = Сноске , name-sg = сноске , Name-pl = Сносках , @@ -630,32 +630,32 @@ type = endnote , type = note , gender = f , - case = n , + variant = n , Name-sg = Заметка , name-sg = заметка , Name-pl = Заметки , name-pl = заметки , - case = a , + variant = a , Name-sg = Заметку , name-sg = заметку , Name-pl = Заметки , name-pl = заметки , - case = g , + variant = g , Name-sg = Заметки , name-sg = заметки , Name-pl = Заметок , name-pl = заметок , - case = d , + variant = d , Name-sg = Заметке , name-sg = заметке , Name-pl = Заметкам , name-pl = заметкам , - case = i , + variant = i , Name-sg = Заметкой , name-sg = заметкой , Name-pl = Заметками , name-pl = заметками , - case = p , + variant = p , Name-sg = Заметке , name-sg = заметке , Name-pl = Заметках , @@ -663,7 +663,7 @@ type = note , type = equation , gender = n , - case = n , + variant = n , Name-sg = Уравнение , name-sg = уравнение , Name-pl = Уравнения , @@ -672,7 +672,7 @@ type = equation , name-sg-ab = ур. , Name-pl-ab = Ур. , name-pl-ab = ур. , - case = a , + variant = a , Name-sg = Уравнение , name-sg = уравнение , Name-pl = Уравнения , @@ -681,7 +681,7 @@ type = equation , name-sg-ab = ур. , Name-pl-ab = Ур. , name-pl-ab = ур. , - case = g , + variant = g , Name-sg = Уравнения , name-sg = уравнения , Name-pl = Уравнений , @@ -690,7 +690,7 @@ type = equation , name-sg-ab = ур. , Name-pl-ab = Ур. , name-pl-ab = ур. , - case = d , + variant = d , Name-sg = Уравнению , name-sg = уравнению , Name-pl = Уравнениям , @@ -699,7 +699,7 @@ type = equation , name-sg-ab = ур. , Name-pl-ab = Ур. , name-pl-ab = ур. , - case = i , + variant = i , Name-sg = Уравнением , name-sg = уравнением , Name-pl = Уравнениями , @@ -708,7 +708,7 @@ type = equation , name-sg-ab = ур. , Name-pl-ab = Ур. , name-pl-ab = ур. , - case = p , + variant = p , Name-sg = Уравнении , name-sg = уравнении , Name-pl = Уравнениях , @@ -723,7 +723,7 @@ type = equation , type = theorem , gender = f , - case = n , + variant = n , Name-sg = Теорема , name-sg = теорема , Name-pl = Теоремы , @@ -732,7 +732,7 @@ type = theorem , name-sg-ab = теор. , Name-pl-ab = Теор. , name-pl-ab = теор. , - case = a , + variant = a , Name-sg = Теорему , name-sg = теорему , Name-pl = Теоремы , @@ -741,7 +741,7 @@ type = theorem , name-sg-ab = теор. , Name-pl-ab = Теор. , name-pl-ab = теор. , - case = g , + variant = g , Name-sg = Теоремы , name-sg = теоремы , Name-pl = Теорем , @@ -750,7 +750,7 @@ type = theorem , name-sg-ab = теор. , Name-pl-ab = Теор. , name-pl-ab = теор. , - case = d , + variant = d , Name-sg = Теореме , name-sg = теореме , Name-pl = Теоремам , @@ -759,7 +759,7 @@ type = theorem , name-sg-ab = теор. , Name-pl-ab = Теор. , name-pl-ab = теор. , - case = i , + variant = i , Name-sg = Теоремой , name-sg = теоремой , Name-pl = Теоремами , @@ -768,7 +768,7 @@ type = theorem , name-sg-ab = теор. , Name-pl-ab = Теор. , name-pl-ab = теор. , - case = p , + variant = p , Name-sg = Теореме , name-sg = теореме , Name-pl = Теоремах , @@ -780,32 +780,32 @@ type = theorem , type = lemma , gender = f , - case = n , + variant = n , Name-sg = Лемма , name-sg = лемма , Name-pl = Леммы , name-pl = леммы , - case = a , + variant = a , Name-sg = Лемму , name-sg = лемму , Name-pl = Леммы , name-pl = леммы , - case = g , + variant = g , Name-sg = Леммы , name-sg = леммы , Name-pl = Лемм , name-pl = лемм , - case = d , + variant = d , Name-sg = Лемме , name-sg = лемме , Name-pl = Леммам , name-pl = леммам , - case = i , + variant = i , Name-sg = Леммой , name-sg = леммой , Name-pl = Леммами , name-pl = леммами , - case = p , + variant = p , Name-sg = Лемме , name-sg = лемме , Name-pl = Леммах , @@ -813,32 +813,32 @@ type = lemma , type = corollary , gender = m , - case = n , + variant = n , Name-sg = Вывод , name-sg = вывод , Name-pl = Выводы , name-pl = выводы , - case = a , + variant = a , Name-sg = Вывод , name-sg = вывод , Name-pl = Выводы , name-pl = выводы , - case = g , + variant = g , Name-sg = Вывода , name-sg = вывода , Name-pl = Выводов , name-pl = выводов , - case = d , + variant = d , Name-sg = Выводу , name-sg = выводу , Name-pl = Выводам , name-pl = выводам , - case = i , + variant = i , Name-sg = Выводом , name-sg = выводом , Name-pl = Выводами , name-pl = выводами , - case = p , + variant = p , Name-sg = Выводе , name-sg = выводе , Name-pl = Выводах , @@ -846,7 +846,7 @@ type = corollary , type = proposition , gender = n , - case = n , + variant = n , Name-sg = Предложение , name-sg = предложение , Name-pl = Предложения , @@ -855,7 +855,7 @@ type = proposition , name-sg-ab = предл. , Name-pl-ab = Предл. , name-pl-ab = предл. , - case = a , + variant = a , Name-sg = Предложение , name-sg = предложение , Name-pl = Предложения , @@ -864,7 +864,7 @@ type = proposition , name-sg-ab = предл. , Name-pl-ab = Предл. , name-pl-ab = предл. , - case = g , + variant = g , Name-sg = Предложения , name-sg = предложения , Name-pl = Предложений , @@ -873,7 +873,7 @@ type = proposition , name-sg-ab = предл. , Name-pl-ab = Предл. , name-pl-ab = предл. , - case = d , + variant = d , Name-sg = Предложению , name-sg = предложению , Name-pl = Предложениям , @@ -882,7 +882,7 @@ type = proposition , name-sg-ab = предл. , Name-pl-ab = Предл. , name-pl-ab = предл. , - case = i , + variant = i , Name-sg = Предложением , name-sg = предложением , Name-pl = Предложениями , @@ -891,7 +891,7 @@ type = proposition , name-sg-ab = предл. , Name-pl-ab = Предл. , name-pl-ab = предл. , - case = p , + variant = p , Name-sg = Предложении , name-sg = предложении , Name-pl = Предложениях , @@ -903,7 +903,7 @@ type = proposition , type = definition , gender = n , - case = n , + variant = n , Name-sg = Определение , name-sg = определение , Name-pl = Определения , @@ -912,7 +912,7 @@ type = definition , name-sg-ab = опр. , Name-pl-ab = Опр. , name-pl-ab = опр. , - case = a , + variant = a , Name-sg = Определение , name-sg = определение , Name-pl = Определения , @@ -921,7 +921,7 @@ type = definition , name-sg-ab = опр. , Name-pl-ab = Опр. , name-pl-ab = опр. , - case = g , + variant = g , Name-sg = Определения , name-sg = определения , Name-pl = Определений , @@ -930,7 +930,7 @@ type = definition , name-sg-ab = опр. , Name-pl-ab = Опр. , name-pl-ab = опр. , - case = d , + variant = d , Name-sg = Определению , name-sg = определению , Name-pl = Определениям , @@ -939,7 +939,7 @@ type = definition , name-sg-ab = опр. , Name-pl-ab = Опр. , name-pl-ab = опр. , - case = i , + variant = i , Name-sg = Определением , name-sg = определением , Name-pl = Определениями , @@ -948,7 +948,7 @@ type = definition , name-sg-ab = опр. , Name-pl-ab = Опр. , name-pl-ab = опр. , - case = p , + variant = p , Name-sg = Определении , name-sg = определении , Name-pl = Определениях , @@ -960,32 +960,32 @@ type = definition , type = proof , gender = n , - case = n , + variant = n , Name-sg = Доказательство , name-sg = доказательство , Name-pl = Доказательства , name-pl = доказательства , - case = a , + variant = a , Name-sg = Доказательство , name-sg = доказательство , Name-pl = Доказательства , name-pl = доказательства , - case = g , + variant = g , Name-sg = Доказательства , name-sg = доказательства , Name-pl = Доказательств , name-pl = доказательств , - case = d , + variant = d , Name-sg = Доказательству , name-sg = доказательству , Name-pl = Доказательствам , name-pl = доказательствам , - case = i , + variant = i , Name-sg = Доказательством , name-sg = доказательством , Name-pl = Доказательствами , name-pl = доказательствами , - case = p , + variant = p , Name-sg = Доказательстве , name-sg = доказательстве , Name-pl = Доказательствах , @@ -993,32 +993,32 @@ type = proof , type = result , gender = m , - case = n , + variant = n , Name-sg = Результат , name-sg = результат , Name-pl = Результаты , name-pl = результаты , - case = a , + variant = a , Name-sg = Результат , name-sg = результат , Name-pl = Результаты , name-pl = результаты , - case = g , + variant = g , Name-sg = Результата , name-sg = результата , Name-pl = Результатов , name-pl = результатов , - case = d , + variant = d , Name-sg = Результату , name-sg = результату , Name-pl = Результатам , name-pl = результатам , - case = i , + variant = i , Name-sg = Результатом , name-sg = результатом , Name-pl = Результатами , name-pl = результатами , - case = p , + variant = p , Name-sg = Результате , name-sg = результате , Name-pl = Результатах , @@ -1026,7 +1026,7 @@ type = result , type = remark , gender = n , - case = n , + variant = n , Name-sg = Примечание , name-sg = примечание , Name-pl = Примечания , @@ -1035,7 +1035,7 @@ type = remark , name-sg-ab = прим. , Name-pl-ab = Прим. , name-pl-ab = прим. , - case = a , + variant = a , Name-sg = Примечание , name-sg = примечание , Name-pl = Примечания , @@ -1044,7 +1044,7 @@ type = remark , name-sg-ab = прим. , Name-pl-ab = Прим. , name-pl-ab = прим. , - case = g , + variant = g , Name-sg = Примечания , name-sg = примечания , Name-pl = Примечаний , @@ -1053,7 +1053,7 @@ type = remark , name-sg-ab = прим. , Name-pl-ab = Прим. , name-pl-ab = прим. , - case = d , + variant = d , Name-sg = Примечанию , name-sg = примечанию , Name-pl = Примечаниям , @@ -1062,7 +1062,7 @@ type = remark , name-sg-ab = прим. , Name-pl-ab = Прим. , name-pl-ab = прим. , - case = i , + variant = i , Name-sg = Примечанием , name-sg = примечанием , Name-pl = Примечаниями , @@ -1071,7 +1071,7 @@ type = remark , name-sg-ab = прим. , Name-pl-ab = Прим. , name-pl-ab = прим. , - case = p , + variant = p , Name-sg = Примечании , name-sg = примечании , Name-pl = Примечаниях , @@ -1083,32 +1083,32 @@ type = remark , type = example , gender = m , - case = n , + variant = n , Name-sg = Пример , name-sg = пример , Name-pl = Примеры , name-pl = примеры , - case = a , + variant = a , Name-sg = Пример , name-sg = пример , Name-pl = Примеры , name-pl = примеры , - case = g , + variant = g , Name-sg = Примера , name-sg = примера , Name-pl = Примеров , name-pl = примеров , - case = d , + variant = d , Name-sg = Примеру , name-sg = примеру , Name-pl = Примерам , name-pl = примерам , - case = i , + variant = i , Name-sg = Примером , name-sg = примером , Name-pl = Примерами , name-pl = примерами , - case = p , + variant = p , Name-sg = Примере , name-sg = примере , Name-pl = Примерах , @@ -1116,32 +1116,32 @@ type = example , type = algorithm , gender = m , - case = n , + variant = n , Name-sg = Алгоритм , name-sg = алгоритм , Name-pl = Алгоритмы , name-pl = алгоритмы , - case = a , + variant = a , Name-sg = Алгоритм , name-sg = алгоритм , Name-pl = Алгоритмы , name-pl = алгоритмы , - case = g , + variant = g , Name-sg = Алгоритма , name-sg = алгоритма , Name-pl = Алгоритмов , name-pl = алгоритмов , - case = d , + variant = d , Name-sg = Алгоритму , name-sg = алгоритму , Name-pl = Алгоритмам , name-pl = алгоритмам , - case = i , + variant = i , Name-sg = Алгоритмом , name-sg = алгоритмом , Name-pl = Алгоритмами , name-pl = алгоритмами , - case = p , + variant = p , Name-sg = Алгоритме , name-sg = алгоритме , Name-pl = Алгоритмах , @@ -1149,32 +1149,32 @@ type = algorithm , type = listing , gender = m , - case = n , + variant = n , Name-sg = Листинг , name-sg = листинг , Name-pl = Листинги , name-pl = листинги , - case = a , + variant = a , Name-sg = Листинг , name-sg = листинг , Name-pl = Листинги , name-pl = листинги , - case = g , + variant = g , Name-sg = Листинга , name-sg = листинга , Name-pl = Листингов , name-pl = листингов , - case = d , + variant = d , Name-sg = Листингу , name-sg = листингу , Name-pl = Листингам , name-pl = листингам , - case = i , + variant = i , Name-sg = Листингом , name-sg = листинглм , Name-pl = Листингами , name-pl = листингами , - case = p , + variant = p , Name-sg = Листинге , name-sg = листинге , Name-pl = Листингах , @@ -1182,7 +1182,7 @@ type = listing , type = exercise , gender = n , - case = n , + variant = n , Name-sg = Упражнение , name-sg = упражнение , Name-pl = Упражнения , @@ -1191,7 +1191,7 @@ type = exercise , name-sg-ab = упр. , Name-pl-ab = Упр. , name-pl-ab = упр. , - case = a , + variant = a , Name-sg = Упражнение , name-sg = упражнение , Name-pl = Упражнения , @@ -1200,7 +1200,7 @@ type = exercise , name-sg-ab = упр. , Name-pl-ab = Упр. , name-pl-ab = упр. , - case = g , + variant = g , Name-sg = Упражнения , name-sg = упражнения , Name-pl = Упражнений , @@ -1209,7 +1209,7 @@ type = exercise , name-sg-ab = упр. , Name-pl-ab = Упр. , name-pl-ab = упр. , - case = d , + variant = d , Name-sg = Упражнению , name-sg = упражнению , Name-pl = Упражнениям , @@ -1218,7 +1218,7 @@ type = exercise , name-sg-ab = упр. , Name-pl-ab = Упр. , name-pl-ab = упр. , - case = i , + variant = i , Name-sg = Упражнением , name-sg = упражнением , Name-pl = Упражнениями , @@ -1227,7 +1227,7 @@ type = exercise , name-sg-ab = упр. , Name-pl-ab = Упр. , name-pl-ab = упр. , - case = p , + variant = p , Name-sg = Упражнении , name-sg = упражнении , Name-pl = Упражнениях , @@ -1239,32 +1239,32 @@ type = exercise , type = solution , gender = n , - case = n , + variant = n , Name-sg = Решение , name-sg = решение , Name-pl = Решения , name-pl = решения , - case = a , + variant = a , Name-sg = Решение , name-sg = решение , Name-pl = Решения , name-pl = решения , - case = g , + variant = g , Name-sg = Решения , name-sg = решения , Name-pl = Решений , name-pl = решений , - case = d , + variant = d , Name-sg = Решению , name-sg = решению , Name-pl = Решениям , name-pl = решениям , - case = i , + variant = i , Name-sg = Решением , name-sg = решением , Name-pl = Решениями , name-pl = решениями , - case = p , + variant = p , Name-sg = Решении , name-sg = решении , Name-pl = Решениях , diff --git a/Master/texmf-dist/tex/latex/zref-clever/zref-clever-swedish.lang b/Master/texmf-dist/tex/latex/zref-clever/zref-clever-swedish.lang new file mode 100644 index 00000000000..cc27fa53af4 --- /dev/null +++ b/Master/texmf-dist/tex/latex/zref-clever/zref-clever-swedish.lang @@ -0,0 +1,238 @@ +%% +%% This is file `zref-clever-swedish.lang', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% zref-clever.dtx (with options: `lang-swedish') +%% +%% This file was generated from file(s) of the LaTeX package "zref-clever". +%% +%% Copyright (C) 2021-2024 gusbrs +%% +%% It may be distributed and/or modified under the conditions of the +%% LaTeX Project Public License (LPPL), either version 1.3c of this +%% license or (at your option) any later version. The latest version +%% of this license is in the file: +%% +%% https://www.latex-project.org/lppl.txt +%% +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +%% +%% +%% This work is "maintained" (as per LPPL maintenance status) by gusbrs. +%% +%% This work consists of the files zref-clever.dtx, +%% zref-clever.ins, +%% zref-clever-doc.tex, +%% zref-clever-code.tex, +%% and the files generated from them. +%% +%% The released version of this package is available from CTAN. +%% +%% ----------------------------------------------------------------------- +%% +%% The development version of the package can be found at +%% +%% https://github.com/gusbrs/zref-clever +%% +%% for those people who are interested. +%% +%% ----------------------------------------------------------------------- +%% +namesep = {\nobreakspace} , +pairsep = {~och\nobreakspace} , +listsep = {,~} , +lastsep = {~och\nobreakspace} , +tpairsep = {~och\nobreakspace} , +tlistsep = {,~} , +tlastsep = {~och\nobreakspace} , +notesep = {~} , +rangesep = {\textendash} , +rangetopair = false , + +type = book , + Name-sg = Bok , + name-sg = bok , + Name-pl = Bok , + name-pl = bok , + +type = part , + Name-sg = Del , + name-sg = del , + Name-pl = Del , + name-pl = del , + +type = chapter , + Name-sg = Kapitel , + name-sg = kapitel , + Name-pl = Kapitel , + name-pl = kapitel , + +type = section , + Name-sg = Avsnitt , + name-sg = avsnitt , + Name-pl = Avsnitt , + name-pl = avsnitt , + +type = paragraph , + Name-sg = Paragraf , + name-sg = paragraf , + Name-pl = Paragraf , + name-pl = paragraf , + +type = appendix , + Name-sg = Bilaga , + name-sg = bilaga , + Name-pl = Bilaga , + name-pl = bilaga , + +type = page , + Name-sg = Sida , + name-sg = sida , + Name-pl = Sida , + name-pl = sida , + +type = line , + Name-sg = Rad , + name-sg = rad , + Name-pl = Rad , + name-pl = rad , + +type = figure , + Name-sg = Figur , + name-sg = figur , + Name-pl = Figur , + name-pl = figur , + Name-sg-ab = Fig. , + name-sg-ab = fig. , + Name-pl-ab = Fig. , + name-pl-ab = fig. , + +type = table , + Name-sg = Tabell , + name-sg = tabell , + Name-pl = Tabell , + name-pl = tabell , + Name-sg-ab = Tab. , + name-sg-ab = tab. , + Name-pl-ab = Tab. , + name-pl-ab = tab. , + +type = item , + Name-sg = Punkt , + name-sg = punkt , + Name-pl = Punkt , + name-pl = punkt , + +type = footnote , + Name-sg = Fotnot , + name-sg = fotnot , + Name-pl = Fotnot , + name-pl = fotnot , + +type = endnote , + Name-sg = Slutnot , + name-sg = slutnot , + Name-pl = Slutnot , + name-pl = slutnot , + +type = note , + Name-sg = Not , + name-sg = not , + Name-pl = Not , + name-pl = not , + +type = equation , + Name-sg = Ekvation , + name-sg = ekvation , + Name-pl = Ekvation , + name-pl = ekvation , + Name-sg-ab = Ekv. , + name-sg-ab = ekv. , + Name-pl-ab = Ekv. , + name-pl-ab = ekv. , + refbounds-first-sg = {,(,),} , + refbounds = {(,,,)} , + +type = theorem , + Name-sg = Sats , + name-sg = sats , + Name-pl = Sats , + name-pl = sats , + +type = lemma , + Name-sg = Hjälpsats , + name-sg = hjälpsats , + Name-pl = Hjälpsats , + name-pl = hjälpsats , + +type = corollary , + Name-sg = Följdsats , + name-sg = följdsats , + Name-pl = Följdsats , + name-pl = följdsats , + +type = proposition , + Name-sg = Påstående , + name-sg = påstående , + Name-pl = Påstående , + name-pl = påstående , + +type = definition , + Name-sg = Definition , + name-sg = definition , + Name-pl = Definition , + name-pl = definition , + +type = proof , + Name-sg = Bevis , + name-sg = bevis , + Name-pl = Bevis , + name-pl = bevis , + +type = result , + Name-sg = Resultat , + name-sg = resultat , + Name-pl = Resultat , + name-pl = resultat , + +type = remark , + Name-sg = Anmärkning , + name-sg = anmärkning , + Name-pl = Anmärkning , + name-pl = anmärkning , + +type = example , + Name-sg = Exempel , + name-sg = exempel , + Name-pl = Exempel , + name-pl = exempel , + +type = algorithm , + Name-sg = Algoritm , + name-sg = algoritm , + Name-pl = Algoritm , + name-pl = algoritm , + +type = listing , + Name-sg = Kod , + name-sg = kod , + Name-pl = Kod , + name-pl = kod , + +type = exercise , + Name-sg = Uppgift , + name-sg = uppgift , + Name-pl = Uppgift , + name-pl = uppgift , + +type = solution , + Name-sg = Lösning , + name-sg = lösning , + Name-pl = Lösning , + name-pl = lösning , +%% +%% +%% End of file `zref-clever-swedish.lang'. diff --git a/Master/texmf-dist/tex/latex/zref-clever/zref-clever.sty b/Master/texmf-dist/tex/latex/zref-clever/zref-clever.sty index ec3b4b08820..7c6d158a9bc 100644 --- a/Master/texmf-dist/tex/latex/zref-clever/zref-clever.sty +++ b/Master/texmf-dist/tex/latex/zref-clever/zref-clever.sty @@ -52,7 +52,7 @@ 'zref-clever' requires a LaTeX kernel \zrefclever@required@kernel\space or newer.% }% }% -\ProvidesExplPackage {zref-clever} {2024-11-16} {0.4.9} +\ProvidesExplPackage {zref-clever} {2024-11-25} {0.5.0} {Clever LaTeX cross-references based on zref} \RequirePackage { zref-base } \RequirePackage { zref-user } @@ -211,31 +211,31 @@ See~documentation~for~'\iow_char:N\\zcDeclareLanguage'~and~ '\iow_char:N\\zcDeclareLanguageAlias'. } -\msg_new:nnn { zref-clever } { unknown-language-decl } +\msg_new:nnn { zref-clever } { unknown-language-variant } { - Can't~set~declension~'#1'~for~unknown~language~'#2'~\msg_line_context:.~ + Can't~set~variant~'#1'~for~unknown~language~'#2'~\msg_line_context:.~ See~documentation~for~'\iow_char:N\\zcDeclareLanguage'~and~ '\iow_char:N\\zcDeclareLanguageAlias'. } -\msg_new:nnn { zref-clever } { language-no-decl-ref } +\msg_new:nnn { zref-clever } { language-no-variants-ref } { - Language~'#1'~has~no~declared~declension~cases~\msg_line_context:.~ - Nothing~to~do~with~option~'d=#2'. + Language~'#1'~has~no~declared~variants~\msg_line_context:.~ + Nothing~to~do~with~option~'v=#2'. } \msg_new:nnn { zref-clever } { language-no-gender } { Language~'#1'~has~no~declared~gender~\msg_line_context:.~ Nothing~to~do~with~option~'#2=#3'. } -\msg_new:nnn { zref-clever } { language-no-decl-setup } +\msg_new:nnn { zref-clever } { language-no-variants-setup } { - Language~'#1'~has~no~declared~declension~cases~\msg_line_context:.~ - Nothing~to~do~with~option~'case=#2'. + Language~'#1'~has~no~declared~variants~\msg_line_context:.~ + Nothing~to~do~with~option~'variant=#2'. } -\msg_new:nnn { zref-clever } { unknown-decl-case } +\msg_new:nnn { zref-clever } { unknown-variant } { - Declension~case~'#1'~unknown~for~language~'#2'~\msg_line_context:.~ - Using~default~declension~case. + Variant~'#1'~unknown~for~language~'#2'~\msg_line_context:.~ + Using~default~variant. } \msg_new:nnn { zref-clever } { nudge-multitype } { @@ -621,8 +621,8 @@ \__zrefclever_opt_bool_if:N { c } { T , F , TF } \tl_new:N \l__zrefclever_setup_type_tl \tl_new:N \l__zrefclever_setup_language_tl -\tl_new:N \l__zrefclever_lang_decl_case_tl -\seq_new:N \l__zrefclever_lang_declension_seq +\tl_new:N \l__zrefclever_lang_variant_tl +\seq_new:N \l__zrefclever_lang_variants_seq \seq_new:N \l__zrefclever_lang_gender_seq \seq_new:N \g__zrefclever_rf_opts_tl_not_type_specific_seq \seq_gset_from_clist:Nn @@ -823,21 +823,23 @@ \@onlypreamble \zcDeclareLanguageAlias \keys_define:nn { zref-clever/declarelang } { - declension .code:n = + variants .code:n = { \seq_new:c { \__zrefclever_opt_varname_language:enn - { \l__zrefclever_setup_language_tl } { declension } { seq } + { \l__zrefclever_setup_language_tl } { variants } { seq } } \seq_gset_from_clist:cn { \__zrefclever_opt_varname_language:enn - { \l__zrefclever_setup_language_tl } { declension } { seq } + { \l__zrefclever_setup_language_tl } { variants } { seq } } {#1} } , - declension .value_required:n = true , + variants .value_required:n = true , + % NOTE Option deprecated in 2024-11-24 for v0.5.0. + declension .meta:n = { variants = {#1} } , gender .code:n = { \seq_new:c @@ -877,37 +879,37 @@ \__zrefclever_opt_seq_get:cNF { \__zrefclever_opt_varname_language:enn - { \l__zrefclever_ref_language_tl } { declension } { seq } + { \l__zrefclever_ref_language_tl } { variants } { seq } } - \l__zrefclever_lang_declension_seq - { \seq_clear:N \l__zrefclever_lang_declension_seq } - \seq_if_empty:NTF \l__zrefclever_lang_declension_seq + \l__zrefclever_lang_variants_seq + { \seq_clear:N \l__zrefclever_lang_variants_seq } + \seq_if_empty:NTF \l__zrefclever_lang_variants_seq { - \tl_if_empty:NF \l__zrefclever_ref_decl_case_tl + \tl_if_empty:NF \l__zrefclever_ref_variant_tl { \msg_warning:nnee { zref-clever } - { language-no-decl-ref } + { language-no-variants-ref } { \l__zrefclever_ref_language_tl } - { \l__zrefclever_ref_decl_case_tl } - \tl_clear:N \l__zrefclever_ref_decl_case_tl + { \l__zrefclever_ref_variant_tl } + \tl_clear:N \l__zrefclever_ref_variant_tl } } { - \tl_if_empty:NTF \l__zrefclever_ref_decl_case_tl + \tl_if_empty:NTF \l__zrefclever_ref_variant_tl { - \seq_get_left:NN \l__zrefclever_lang_declension_seq - \l__zrefclever_ref_decl_case_tl + \seq_get_left:NN \l__zrefclever_lang_variants_seq + \l__zrefclever_ref_variant_tl } { - \seq_if_in:NVF \l__zrefclever_lang_declension_seq - \l__zrefclever_ref_decl_case_tl + \seq_if_in:NVF \l__zrefclever_lang_variants_seq + \l__zrefclever_ref_variant_tl { \msg_warning:nnee { zref-clever } - { unknown-decl-case } - { \l__zrefclever_ref_decl_case_tl } + { unknown-variant } + { \l__zrefclever_ref_variant_tl } { \l__zrefclever_ref_language_tl } - \seq_get_left:NN \l__zrefclever_lang_declension_seq - \l__zrefclever_ref_decl_case_tl + \seq_get_left:NN \l__zrefclever_lang_variants_seq + \l__zrefclever_ref_variant_tl } } } @@ -952,12 +954,12 @@ { \keys_set:nn { zref-clever/reference } { cap = true } } } { - \tl_if_empty:NF \l__zrefclever_ref_decl_case_tl + \tl_if_empty:NF \l__zrefclever_ref_variant_tl { - \msg_warning:nnee { zref-clever } { unknown-language-decl } - { \l__zrefclever_ref_decl_case_tl } + \msg_warning:nnee { zref-clever } { unknown-language-variant } + { \l__zrefclever_ref_variant_tl } { \l__zrefclever_ref_language_tl } - \tl_clear:N \l__zrefclever_ref_decl_case_tl + \tl_clear:N \l__zrefclever_ref_variant_tl } \tl_if_empty:NF \l__zrefclever_ref_gender_tl { @@ -995,15 +997,15 @@ \__zrefclever_opt_seq_get:cNF { \__zrefclever_opt_varname_language:nnn - {#1} { declension } { seq } + {#1} { variants } { seq } } - \l__zrefclever_lang_declension_seq - { \seq_clear:N \l__zrefclever_lang_declension_seq } - \seq_if_empty:NTF \l__zrefclever_lang_declension_seq - { \tl_clear:N \l__zrefclever_lang_decl_case_tl } + \l__zrefclever_lang_variants_seq + { \seq_clear:N \l__zrefclever_lang_variants_seq } + \seq_if_empty:NTF \l__zrefclever_lang_variants_seq + { \tl_clear:N \l__zrefclever_lang_variant_tl } { - \seq_get_left:NN \l__zrefclever_lang_declension_seq - \l__zrefclever_lang_decl_case_tl + \seq_get_left:NN \l__zrefclever_lang_variants_seq + \l__zrefclever_lang_variant_tl } \__zrefclever_opt_seq_get:cNF { @@ -1036,25 +1038,25 @@ { \tl_clear:N \l__zrefclever_setup_type_tl } { \tl_set:Nn \l__zrefclever_setup_type_tl {#1} } } , - case .code:n = + variant .code:n = { - \seq_if_empty:NTF \l__zrefclever_lang_declension_seq + \seq_if_empty:NTF \l__zrefclever_lang_variants_seq { - \msg_info:nnee { zref-clever } { language-no-decl-setup } + \msg_info:nnee { zref-clever } { language-no-variants-setup } { \l__zrefclever_setup_language_tl } {#1} } { - \seq_if_in:NnTF \l__zrefclever_lang_declension_seq {#1} - { \tl_set:Nn \l__zrefclever_lang_decl_case_tl {#1} } + \seq_if_in:NnTF \l__zrefclever_lang_variants_seq {#1} + { \tl_set:Nn \l__zrefclever_lang_variant_tl {#1} } { - \msg_info:nnee { zref-clever } { unknown-decl-case } + \msg_info:nnee { zref-clever } { unknown-variant } {#1} { \l__zrefclever_setup_language_tl } - \seq_get_left:NN \l__zrefclever_lang_declension_seq - \l__zrefclever_lang_decl_case_tl + \seq_get_left:NN \l__zrefclever_lang_variants_seq + \l__zrefclever_lang_variant_tl } } } , - case .value_required:n = true , + variant .value_required:n = true , gender .value_required:n = true , gender .code:n = { @@ -1385,7 +1387,7 @@ { option-only-type-specific } {#1} } { - \tl_if_empty:NTF \l__zrefclever_lang_decl_case_tl + \tl_if_empty:NTF \l__zrefclever_lang_variant_tl { \__zrefclever_opt_tl_gset_if_new:cn { @@ -1402,7 +1404,7 @@ \__zrefclever_opt_varname_lang_type:eeen { \l__zrefclever_setup_language_tl } { \l__zrefclever_setup_type_tl } - { \l__zrefclever_lang_decl_case_tl - #1 } { tl } + { \l__zrefclever_lang_variant_tl - #1 } { tl } } {##1} } @@ -2219,18 +2221,22 @@ } } } -\tl_new:N \l__zrefclever_ref_decl_case_tl +\tl_new:N \l__zrefclever_ref_variant_tl \keys_define:nn { zref-clever/reference } { - d .code:n = - { \msg_warning:nnn { zref-clever } { option-document-only } { d } } , + v .code:n = + { \msg_warning:nnn { zref-clever } { option-document-only } { v } } , + % NOTE Option deprecated in 2024-11-24 for v0.5.0. + d .meta:n = { v = {#1} } , } \AddToHook { begindocument } { \keys_define:nn { zref-clever/reference } { - d .tl_set:N = \l__zrefclever_ref_decl_case_tl , - d .value_required:n = true , + v .tl_set:N = \l__zrefclever_ref_variant_tl , + v .value_required:n = true , + % NOTE Option deprecated in 2024-11-24 for v0.5.0. + d .meta:n = { v = {#1} } , } } \bool_new:N \l__zrefclever_nudge_enabled_bool @@ -2921,15 +2927,15 @@ \__zrefclever_opt_seq_get:cNF { \__zrefclever_opt_varname_language:nnn - {#1} { declension } { seq } + {#1} { variants } { seq } } - \l__zrefclever_lang_declension_seq - { \seq_clear:N \l__zrefclever_lang_declension_seq } - \seq_if_empty:NTF \l__zrefclever_lang_declension_seq - { \tl_clear:N \l__zrefclever_lang_decl_case_tl } + \l__zrefclever_lang_variants_seq + { \seq_clear:N \l__zrefclever_lang_variants_seq } + \seq_if_empty:NTF \l__zrefclever_lang_variants_seq + { \tl_clear:N \l__zrefclever_lang_variant_tl } { - \seq_get_left:NN \l__zrefclever_lang_declension_seq - \l__zrefclever_lang_decl_case_tl + \seq_get_left:NN \l__zrefclever_lang_variants_seq + \l__zrefclever_lang_variant_tl } \__zrefclever_opt_seq_get:cNF { @@ -2952,25 +2958,27 @@ { \tl_clear:N \l__zrefclever_setup_type_tl } { \tl_set:Nn \l__zrefclever_setup_type_tl {#1} } } , - case .code:n = + variant .code:n = { - \seq_if_empty:NTF \l__zrefclever_lang_declension_seq + \seq_if_empty:NTF \l__zrefclever_lang_variants_seq { - \msg_warning:nnee { zref-clever } { language-no-decl-setup } + \msg_warning:nnee { zref-clever } { language-no-variants-setup } { \l__zrefclever_setup_language_tl } {#1} } { - \seq_if_in:NnTF \l__zrefclever_lang_declension_seq {#1} - { \tl_set:Nn \l__zrefclever_lang_decl_case_tl {#1} } + \seq_if_in:NnTF \l__zrefclever_lang_variants_seq {#1} + { \tl_set:Nn \l__zrefclever_lang_variant_tl {#1} } { - \msg_warning:nnee { zref-clever } { unknown-decl-case } + \msg_warning:nnee { zref-clever } { unknown-variant } {#1} { \l__zrefclever_setup_language_tl } - \seq_get_left:NN \l__zrefclever_lang_declension_seq - \l__zrefclever_lang_decl_case_tl + \seq_get_left:NN \l__zrefclever_lang_variants_seq + \l__zrefclever_lang_variant_tl } } } , - case .value_required:n = true , + variant .value_required:n = true , + % NOTE Option deprecated in 2024-11-24 for v0.5.0. + case .meta:n = { variant = {#1} } , gender .value_required:n = true , gender .code:n = { @@ -3308,7 +3316,7 @@ { option-only-type-specific } {#1} } { - \tl_if_empty:NTF \l__zrefclever_lang_decl_case_tl + \tl_if_empty:NTF \l__zrefclever_lang_variant_tl { \__zrefclever_opt_tl_gset:cn { @@ -3325,7 +3333,7 @@ \__zrefclever_opt_varname_lang_type:eeen { \l__zrefclever_setup_language_tl } { \l__zrefclever_setup_type_tl } - { \l__zrefclever_lang_decl_case_tl - #1 } + { \l__zrefclever_lang_variant_tl - #1 } { tl } } {##1} @@ -5057,11 +5065,11 @@ } \l__zrefclever_type_name_tl { - \tl_if_empty:NF \l__zrefclever_ref_decl_case_tl + \tl_if_empty:NF \l__zrefclever_ref_variant_tl { \tl_put_left:Nn \l__zrefclever_name_format_tl { - } \tl_put_left:NV \l__zrefclever_name_format_tl - \l__zrefclever_ref_decl_case_tl + \l__zrefclever_ref_variant_tl } \__zrefclever_opt_tl_get:cNF { @@ -5100,17 +5108,17 @@ } \l__zrefclever_type_name_tl { - \tl_if_empty:NF \l__zrefclever_ref_decl_case_tl + \tl_if_empty:NF \l__zrefclever_ref_variant_tl { \tl_put_left:Nn \l__zrefclever_name_format_tl { - } \tl_put_left:NV \l__zrefclever_name_format_tl - \l__zrefclever_ref_decl_case_tl + \l__zrefclever_ref_variant_tl \tl_put_left:Nn \l__zrefclever_name_format_fallback_tl { - } \tl_put_left:NV \l__zrefclever_name_format_fallback_tl - \l__zrefclever_ref_decl_case_tl + \l__zrefclever_ref_variant_tl } \__zrefclever_opt_tl_get:cNF { @@ -5723,7 +5731,7 @@ \zcDeclareLanguageAlias { UKenglish } { english } \zcDeclareLanguageAlias { USenglish } { english } \zcDeclareLanguage - [ declension = { N , A , D , G } , gender = { f , m , n } , allcaps ] + [ variants = { N , A , D , G } , gender = { f , m , n } , allcaps ] { german } \zcDeclareLanguageAlias { ngerman } { german } \zcDeclareLanguageAlias { austrian } { german } @@ -5740,8 +5748,9 @@ \zcDeclareLanguage [ gender = { f , m , n } ] { dutch } \zcDeclareLanguage [ gender = { f , m } ] { italian } \zcDeclareLanguage - [ declension = { n , a , g , d , i , p } , gender = { f , m , n } ] + [ variants = { n , a , g , d , i , p } , gender = { f , m , n } ] { russian } +\zcDeclareLanguage { swedish } %% %% %% End of file `zref-clever.sty'. -- cgit v1.2.3