diff options
Diffstat (limited to 'Master')
14 files changed, 168 insertions, 77 deletions
diff --git a/Master/texmf-dist/doc/latex/projlib/README.md b/Master/texmf-dist/doc/latex/projlib/README.md index e4f1fe4fe65..b9b4816d75a 100644 --- a/Master/texmf-dist/doc/latex/projlib/README.md +++ b/Master/texmf-dist/doc/latex/projlib/README.md @@ -5,7 +5,7 @@ # The `ProjLib` Toolkit -> **This bundle is dated 2023/10/15.** +> **This bundle is dated 2023/11/05.** > **New documentations are still being written. For now, only the core code is included in TeX Live 2023 (old documentations have been removed from the distribution).** diff --git a/Master/texmf-dist/source/latex/projlib/ProjLib.dtx b/Master/texmf-dist/source/latex/projlib/ProjLib.dtx index 826c6934ad3..fcac850e842 100644 --- a/Master/texmf-dist/source/latex/projlib/ProjLib.dtx +++ b/Master/texmf-dist/source/latex/projlib/ProjLib.dtx @@ -19,84 +19,84 @@ %<*ProjLib> \ProvidesExplPackage {ProjLib} - {2023/10/15} {} + {2023/11/05} {} {Collective interface of the ProjLib toolkit} %</ProjLib> % %<*projlib-author> \ProvidesExplPackage {projlib-author} - {2023/10/15} {} + {2023/11/05} {} {Enhanced author information block} %</projlib-author> % %<*projlib-datetime> \ProvidesExplPackage {projlib-datetime} - {2023/10/15} {} + {2023/11/05} {} {Convert numeric date-time string to natural language} %</projlib-datetime> % %<*projlib-draft> \ProvidesExplPackage {projlib-draft} - {2023/10/15} {} + {2023/11/05} {} {Useful commands during draft stage} %</projlib-draft> % %<*projlib-font> \ProvidesExplPackage {projlib-font} - {2023/10/15} {} + {2023/11/05} {} {Font selection and configuration} %</projlib-font> % %<*projlib-language> \ProvidesExplPackage {projlib-language} - {2023/10/15} {} + {2023/11/05} {} {Multi-language configuration} %</projlib-language> % %<*projlib-logo> \ProvidesExplPackage {projlib-logo} - {2023/10/15} {} + {2023/11/05} {} {The ProjLib logo} %</projlib-logo> % %<*projlib-math> \ProvidesExplPackage {projlib-math} - {2023/10/15} {} + {2023/11/05} {} {Efficient math setup} %</projlib-math> % %<*projlib-paper> \ProvidesExplPackage {projlib-paper} - {2023/10/15} {} + {2023/11/05} {} {Configuration of the paper style} %</projlib-paper> % %<*projlib-text> \ProvidesExplPackage {projlib-text} - {2023/10/15} {} + {2023/11/05} {} {Text-related commands} %</projlib-text> % %<*projlib-theorem> \ProvidesExplPackage {projlib-theorem} - {2023/10/15} {} + {2023/11/05} {} {Configuration of theorem-like environments} %</projlib-theorem> % %<*projlib-titlepage> \ProvidesExplPackage {projlib-titlepage} - {2023/10/15} {} + {2023/11/05} {} {Commands for rendering the title page} %</projlib-titlepage> @@ -2445,27 +2445,36 @@ %<*projlib-font> \keys_define:nn { projlib-font } { - , useosf .bool_set:N = \l__projlib_font_useosf_bool - , useosf .initial:n = { false } - , old-style-figures.bool_set:N = \l__projlib_font_useosf_bool - , old~style~figures.bool_set:N = \l__projlib_font_useosf_bool - , old style figures.bool_set:N = \l__projlib_font_useosf_bool - , lmodern .bool_set:N = \l__projlib_font_lmodern_bool - , lmodern .initial:n = { false } - , latin-modern .bool_set:N = \l__projlib_font_lmodern_bool - , latin~modern .bool_set:N = \l__projlib_font_lmodern_bool - , latin modern .bool_set:N = \l__projlib_font_lmodern_bool - , palatino .bool_set:N = \l__projlib_font_palatino_bool - , palatino .initial:n = { false } - , times .bool_set:N = \l__projlib_font_times_bool - , times .initial:n = { false } - , garamond .bool_set:N = \l__projlib_font_garamond_bool - , garamond .initial:n = { false } - , noto .bool_set:N = \l__projlib_font_noto_bool - , noto .initial:n = { false } - , biolinum .bool_set:N = \l__projlib_font_biolinum_bool - , biolinum .initial:n = { false } - , unknown .code:n = {} + , useosf .bool_set:N = \l__projlib_font_useosf_bool + , useosf .initial:n = { false } + , old-style-figures .bool_set:N = \l__projlib_font_useosf_bool + , old~style~figures .bool_set:N = \l__projlib_font_useosf_bool + , old style figures .bool_set:N = \l__projlib_font_useosf_bool + , new-computer-modern .bool_set:N = \l__projlib_font_newcomputermodern_bool + , new-computer-modern .initial:n = { false } + , new~computer~modern .bool_set:N = \l__projlib_font_newcomputermodern_bool + , new computer modern .bool_set:N = \l__projlib_font_newcomputermodern_bool + , newcm .bool_set:N = \l__projlib_font_computermodern_bool + , computer-modern .bool_set:N = \l__projlib_font_computermodern_bool + , computer-modern .initial:n = { false } + , computer~modern .bool_set:N = \l__projlib_font_computermodern_bool + , computer modern .bool_set:N = \l__projlib_font_computermodern_bool + , latin-modern .initial:n = { false } + , latin-modern .bool_set:N = \l__projlib_font_latinmodern_bool + , latin~modern .bool_set:N = \l__projlib_font_latinmodern_bool + , latin modern .bool_set:N = \l__projlib_font_latinmodern_bool + , lmodern .bool_set:N = \l__projlib_font_latinmodern_bool + , palatino .bool_set:N = \l__projlib_font_palatino_bool + , palatino .initial:n = { false } + , times .bool_set:N = \l__projlib_font_times_bool + , times .initial:n = { false } + , garamond .bool_set:N = \l__projlib_font_garamond_bool + , garamond .initial:n = { false } + , noto .bool_set:N = \l__projlib_font_noto_bool + , noto .initial:n = { false } + , biolinum .bool_set:N = \l__projlib_font_biolinum_bool + , biolinum .initial:n = { false } + , unknown .code:n = {} } \ProcessKeyOptions [ projlib-font ] @@ -2486,7 +2495,21 @@ } } -\bool_if:NT \l__projlib_font_lmodern_bool +\bool_if:NT \l__projlib_font_newcomputermodern_bool + { + \usepackage[default]{fontsetup} + \projlib_font_set_linespacing_latin:n { \setstretch { 1.00 } } + \bool_gset_true:N \g_projlib_font_already_set_bool + } + +\bool_if:NT \l__projlib_font_computermodern_bool + { + \usepackage[olddefault]{fontsetup} + \projlib_font_set_linespacing_latin:n { \setstretch { 1.00 } } + \bool_gset_true:N \g_projlib_font_already_set_bool + } + +\bool_if:NT \l__projlib_font_latinmodern_bool { \RequirePackage { amssymb } \bool_if:NTF \l__projlib_font_useosf_bool @@ -3277,6 +3300,11 @@ \NewDocumentCommand \UseLanguage { m } { + % Set the configuration twice at different stages of begindocument + \hook_gput_code:nnn { begindocument } { projlib-language } + { + \projlib_language_use_language:e { #1 } + } \hook_gput_code:nnn { begindocument/end } { projlib-language } { \projlib_language_use_language:e { #1 } @@ -3990,6 +4018,7 @@ \tl_const:cn { c_crthm_theorem_style_preset_ proof_inner _tl } { remark } } +\RequirePackage { mathtools } \RequirePackage { amsthm } \RequirePackage { create-theorem } @@ -3999,6 +4028,10 @@ \RenewCommandCopy \nameCref \nameCrefthe \RenewCommandCopy \namecrefs \namecrefsthe \RenewCommandCopy \nameCrefs \nameCrefsthe +\RenewCommandCopy \cpageref \cpagerefthe +\RenewCommandCopy \Cpageref \Cpagerefthe +\RenewCommandCopy \crefname \crefthename +\RenewCommandCopy \Crefname \Crefthename \bool_if:NF \l__projlib_theorem_no_theorems_bool { @@ -4221,10 +4254,10 @@ \Crefname { table } { Таблица } { Таблицы } \Crefname { appendix } { Приложение } { Приложения } \tl_gset:Nn { \crefpairconjunction } { \nobreakspace и \nobreakspace } - \tl_gset:Nn { \crefmiddleconjunction } { , \nobreakspace } + \tl_gset:Nn { \crefmiddleconjunction } { , ~ } \tl_gset:Nn { \creflastconjunction } { \nobreakspace и \nobreakspace } \tl_gset:Nn { \crefpairgroupconjunction } { \nobreakspace и \nobreakspace } - \tl_gset:Nn { \crefmiddlegroupconjunction } { , \nobreakspace } + \tl_gset:Nn { \crefmiddlegroupconjunction } { , ~ } \tl_gset:Nn { \creflastgroupconjunction } { \nobreakspace и \nobreakspace } \tl_gset:Nn { \crefrangeconjunction } { \nobreakspace \textasciitilde \nobreakspace } } @@ -4240,14 +4273,26 @@ \Crefname { table } { Tabela } { Tabelas } \Crefname { appendix } { Apêndice } { Apêndices } \tl_gset:Nn { \crefpairconjunction } { \nobreakspace e \nobreakspace } - \tl_gset:Nn { \crefmiddleconjunction } { , \nobreakspace } + \tl_gset:Nn { \crefmiddleconjunction } { , ~ } \tl_gset:Nn { \creflastconjunction } { \nobreakspace e \nobreakspace } \tl_gset:Nn { \crefpairgroupconjunction } { \nobreakspace e \nobreakspace } - \tl_gset:Nn { \crefmiddlegroupconjunction } { , \nobreakspace } + \tl_gset:Nn { \crefmiddlegroupconjunction } { , ~ } \tl_gset:Nn { \creflastgroupconjunction } { \nobreakspace e \nobreakspace } \tl_gset:Nn { \crefrangeconjunction } { \nobreakspace a \nobreakspace } } +\crefformat{equation}{#2\cref@equation@name\nobreakspace\textup{\tagform@{#1}}#3} +\Crefformat{equation}{#2\Cref@equation@name\nobreakspace\textup{\tagform@{#1}}#3} +\crefrangeformat{equation}{\cref@equation@name@plural\nobreakspace#3\textup{\tagform@{#1}}#4\crefrangeconjunction#5\textup{\tagform@{#2}}#6} +\Crefrangeformat{equation}{\Cref@equation@name@plural\nobreakspace#3\textup{\tagform@{#1}}#4\crefrangeconjunction#5\textup{\tagform@{#2}}#6} +\crefmultiformat{equation}{\cref@equation@name@plural\nobreakspace#2\textup{\tagform@{#1}}#3}{\crefpairconjunction#2\textup{\tagform@{#1}}#3}{\crefmiddleconjunction#2\textup{\tagform@{#1}}#3}{\creflastconjunction#2\textup{\tagform@{#1}}#3} +\Crefmultiformat{equation}{\Cref@equation@name@plural\nobreakspace#2\textup{\tagform@{#1}}#3}{\crefpairconjunction#2\textup{\tagform@{#1}}#3}{\crefmiddleconjunction#2\textup{\tagform@{#1}}#3}{\creflastconjunction#2\textup{\tagform@{#1}}#3} +\crefrangemultiformat{equation}{\cref@equation@name@plural\nobreakspace#2\textup{\tagform@{#1}}#3}{\crefpairgroupconjunction#2\textup{\tagform@{#1}}#3}{\crefmiddlegroupconjunction#2\textup{\tagform@{#1}}#3}{\creflastgroupconjunction#2\textup{\tagform@{#1}}#3} +\Crefrangemultiformat{equation}{\Cref@equation@name@plural\nobreakspace#2\textup{\tagform@{#1}}#3}{\crefpairgroupconjunction#2\textup{\tagform@{#1}}#3}{\crefmiddlegroupconjunction#2\textup{\tagform@{#1}}#3}{\creflastgroupconjunction#2\textup{\tagform@{#1}}#3} +\labelcrefformat{equation}{#2\textup{\tagform@{#1}}#3} +\labelcrefrangeformat{equation}{#3\textup{\tagform@{#1}}#4\crefrangeconjunction#5\textup{\tagform@{#2}}#6} +\labelcrefmultiformat{equation}{#2\textup{\tagform@{#1}}#3}{\crefpairconjunction#2\textup{\tagform@{#1}}#3}{\crefmiddleconjunction#2\textup{\tagform@{#1}}#3}{\creflastconjunction#2\textup{\tagform@{#1}}#3} +\labelcrefrangemultiformat{equation}{#2\textup{\tagform@{#1}}#3}{\crefpairgroupconjunction#2\textup{\tagform@{#1}}#3}{\crefmiddlegroupconjunction#2\textup{\tagform@{#1}}#3}{\creflastgroupconjunction#2\textup{\tagform@{#1}}#3} \bool_if:NF \l__projlib_theorem_presetname_bool { \endinput } \bool_if:NT \l__projlib_theorem_complexname_bool { \endinput } diff --git a/Master/texmf-dist/tex/latex/projlib/ProjLib.sty b/Master/texmf-dist/tex/latex/projlib/ProjLib.sty index 6ec9f6b6334..f39a7085d32 100644 --- a/Master/texmf-dist/tex/latex/projlib/ProjLib.sty +++ b/Master/texmf-dist/tex/latex/projlib/ProjLib.sty @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplPackage {ProjLib} - {2023/10/15} {} + {2023/11/05} {} {Collective interface of the ProjLib toolkit} \keys_define:nn { ProjLib } diff --git a/Master/texmf-dist/tex/latex/projlib/projlib-author.sty b/Master/texmf-dist/tex/latex/projlib/projlib-author.sty index 7d92fe3960b..0114f958c1c 100644 --- a/Master/texmf-dist/tex/latex/projlib/projlib-author.sty +++ b/Master/texmf-dist/tex/latex/projlib/projlib-author.sty @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplPackage {projlib-author} - {2023/10/15} {} + {2023/11/05} {} {Enhanced author information block} \keys_define:nn { projlib-author } diff --git a/Master/texmf-dist/tex/latex/projlib/projlib-datetime.sty b/Master/texmf-dist/tex/latex/projlib/projlib-datetime.sty index 792a47c7e34..fbfcbf472a4 100644 --- a/Master/texmf-dist/tex/latex/projlib/projlib-datetime.sty +++ b/Master/texmf-dist/tex/latex/projlib/projlib-datetime.sty @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplPackage {projlib-datetime} - {2023/10/15} {} + {2023/11/05} {} {Convert numeric date-time string to natural language} \tl_new:N \g__projlib_datetime_input_format_tl diff --git a/Master/texmf-dist/tex/latex/projlib/projlib-draft.sty b/Master/texmf-dist/tex/latex/projlib/projlib-draft.sty index b7c0141271a..05c0b684918 100644 --- a/Master/texmf-dist/tex/latex/projlib/projlib-draft.sty +++ b/Master/texmf-dist/tex/latex/projlib/projlib-draft.sty @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplPackage {projlib-draft} - {2023/10/15} {} + {2023/11/05} {} {Useful commands during draft stage} \keys_define:nn { projlib-draft } diff --git a/Master/texmf-dist/tex/latex/projlib/projlib-font.sty b/Master/texmf-dist/tex/latex/projlib/projlib-font.sty index 3fbe6302d4b..23834160eaa 100644 --- a/Master/texmf-dist/tex/latex/projlib/projlib-font.sty +++ b/Master/texmf-dist/tex/latex/projlib/projlib-font.sty @@ -18,32 +18,41 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplPackage {projlib-font} - {2023/10/15} {} + {2023/11/05} {} {Font selection and configuration} \keys_define:nn { projlib-font } { - , useosf .bool_set:N = \l__projlib_font_useosf_bool - , useosf .initial:n = { false } - , old-style-figures.bool_set:N = \l__projlib_font_useosf_bool - , old~style~figures.bool_set:N = \l__projlib_font_useosf_bool - , old style figures.bool_set:N = \l__projlib_font_useosf_bool - , lmodern .bool_set:N = \l__projlib_font_lmodern_bool - , lmodern .initial:n = { false } - , latin-modern .bool_set:N = \l__projlib_font_lmodern_bool - , latin~modern .bool_set:N = \l__projlib_font_lmodern_bool - , latin modern .bool_set:N = \l__projlib_font_lmodern_bool - , palatino .bool_set:N = \l__projlib_font_palatino_bool - , palatino .initial:n = { false } - , times .bool_set:N = \l__projlib_font_times_bool - , times .initial:n = { false } - , garamond .bool_set:N = \l__projlib_font_garamond_bool - , garamond .initial:n = { false } - , noto .bool_set:N = \l__projlib_font_noto_bool - , noto .initial:n = { false } - , biolinum .bool_set:N = \l__projlib_font_biolinum_bool - , biolinum .initial:n = { false } - , unknown .code:n = {} + , useosf .bool_set:N = \l__projlib_font_useosf_bool + , useosf .initial:n = { false } + , old-style-figures .bool_set:N = \l__projlib_font_useosf_bool + , old~style~figures .bool_set:N = \l__projlib_font_useosf_bool + , old style figures .bool_set:N = \l__projlib_font_useosf_bool + , new-computer-modern .bool_set:N = \l__projlib_font_newcomputermodern_bool + , new-computer-modern .initial:n = { false } + , new~computer~modern .bool_set:N = \l__projlib_font_newcomputermodern_bool + , new computer modern .bool_set:N = \l__projlib_font_newcomputermodern_bool + , newcm .bool_set:N = \l__projlib_font_computermodern_bool + , computer-modern .bool_set:N = \l__projlib_font_computermodern_bool + , computer-modern .initial:n = { false } + , computer~modern .bool_set:N = \l__projlib_font_computermodern_bool + , computer modern .bool_set:N = \l__projlib_font_computermodern_bool + , latin-modern .initial:n = { false } + , latin-modern .bool_set:N = \l__projlib_font_latinmodern_bool + , latin~modern .bool_set:N = \l__projlib_font_latinmodern_bool + , latin modern .bool_set:N = \l__projlib_font_latinmodern_bool + , lmodern .bool_set:N = \l__projlib_font_latinmodern_bool + , palatino .bool_set:N = \l__projlib_font_palatino_bool + , palatino .initial:n = { false } + , times .bool_set:N = \l__projlib_font_times_bool + , times .initial:n = { false } + , garamond .bool_set:N = \l__projlib_font_garamond_bool + , garamond .initial:n = { false } + , noto .bool_set:N = \l__projlib_font_noto_bool + , noto .initial:n = { false } + , biolinum .bool_set:N = \l__projlib_font_biolinum_bool + , biolinum .initial:n = { false } + , unknown .code:n = {} } \ProcessKeyOptions [ projlib-font ] @@ -64,7 +73,21 @@ } } -\bool_if:NT \l__projlib_font_lmodern_bool +\bool_if:NT \l__projlib_font_newcomputermodern_bool + { + \usepackage[default]{fontsetup} + \projlib_font_set_linespacing_latin:n { \setstretch { 1.00 } } + \bool_gset_true:N \g_projlib_font_already_set_bool + } + +\bool_if:NT \l__projlib_font_computermodern_bool + { + \usepackage[olddefault]{fontsetup} + \projlib_font_set_linespacing_latin:n { \setstretch { 1.00 } } + \bool_gset_true:N \g_projlib_font_already_set_bool + } + +\bool_if:NT \l__projlib_font_latinmodern_bool { \RequirePackage { amssymb } \bool_if:NTF \l__projlib_font_useosf_bool diff --git a/Master/texmf-dist/tex/latex/projlib/projlib-language.sty b/Master/texmf-dist/tex/latex/projlib/projlib-language.sty index c6b77caec99..dfb7ed8bdeb 100644 --- a/Master/texmf-dist/tex/latex/projlib/projlib-language.sty +++ b/Master/texmf-dist/tex/latex/projlib/projlib-language.sty @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplPackage {projlib-language} - {2023/10/15} {} + {2023/11/05} {} {Multi-language configuration} \clist_const:Nn \c__projlib_language_supported_clist @@ -630,6 +630,11 @@ \NewDocumentCommand \UseLanguage { m } { + % Set the configuration twice at different stages of begindocument + \hook_gput_code:nnn { begindocument } { projlib-language } + { + \projlib_language_use_language:e { #1 } + } \hook_gput_code:nnn { begindocument/end } { projlib-language } { \projlib_language_use_language:e { #1 } diff --git a/Master/texmf-dist/tex/latex/projlib/projlib-logo.sty b/Master/texmf-dist/tex/latex/projlib/projlib-logo.sty index bf631020675..e274a5a74bb 100644 --- a/Master/texmf-dist/tex/latex/projlib/projlib-logo.sty +++ b/Master/texmf-dist/tex/latex/projlib/projlib-logo.sty @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplPackage {projlib-logo} - {2023/10/15} {} + {2023/11/05} {} {The ProjLib logo} \keys_define:nn { projlib-logo } diff --git a/Master/texmf-dist/tex/latex/projlib/projlib-math.sty b/Master/texmf-dist/tex/latex/projlib/projlib-math.sty index 2ef696b08e5..5fd423f4746 100644 --- a/Master/texmf-dist/tex/latex/projlib/projlib-math.sty +++ b/Master/texmf-dist/tex/latex/projlib/projlib-math.sty @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplPackage {projlib-math} - {2023/10/15} {} + {2023/11/05} {} {Efficient math setup} \keys_define:nn { projlib-math } diff --git a/Master/texmf-dist/tex/latex/projlib/projlib-paper.sty b/Master/texmf-dist/tex/latex/projlib/projlib-paper.sty index 39f1f8eb927..0773da076a3 100644 --- a/Master/texmf-dist/tex/latex/projlib/projlib-paper.sty +++ b/Master/texmf-dist/tex/latex/projlib/projlib-paper.sty @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplPackage {projlib-paper} - {2023/10/15} {} + {2023/11/05} {} {Configuration of the paper style} \keys_define:nn { projlib-paper } diff --git a/Master/texmf-dist/tex/latex/projlib/projlib-text.sty b/Master/texmf-dist/tex/latex/projlib/projlib-text.sty index ca193e70b23..769ca911aaf 100644 --- a/Master/texmf-dist/tex/latex/projlib/projlib-text.sty +++ b/Master/texmf-dist/tex/latex/projlib/projlib-text.sty @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplPackage {projlib-text} - {2023/10/15} {} + {2023/11/05} {} {Text-related commands} \keys_define:nn { projlib-text } diff --git a/Master/texmf-dist/tex/latex/projlib/projlib-theorem.sty b/Master/texmf-dist/tex/latex/projlib/projlib-theorem.sty index 133866ca12f..eb6c4db539d 100644 --- a/Master/texmf-dist/tex/latex/projlib/projlib-theorem.sty +++ b/Master/texmf-dist/tex/latex/projlib/projlib-theorem.sty @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplPackage {projlib-theorem} - {2023/10/15} {} + {2023/11/05} {} {Configuration of theorem-like environments} \keys_define:nn { projlib-theorem } @@ -152,6 +152,7 @@ \tl_const:cn { c_crthm_theorem_style_preset_ proof_inner _tl } { remark } } +\RequirePackage { mathtools } \RequirePackage { amsthm } \RequirePackage { create-theorem } @@ -161,6 +162,10 @@ \RenewCommandCopy \nameCref \nameCrefthe \RenewCommandCopy \namecrefs \namecrefsthe \RenewCommandCopy \nameCrefs \nameCrefsthe +\RenewCommandCopy \cpageref \cpagerefthe +\RenewCommandCopy \Cpageref \Cpagerefthe +\RenewCommandCopy \crefname \crefthename +\RenewCommandCopy \Crefname \Crefthename \bool_if:NF \l__projlib_theorem_no_theorems_bool { @@ -380,10 +385,10 @@ \Crefname { table } { Таблица } { Таблицы } \Crefname { appendix } { Приложение } { Приложения } \tl_gset:Nn { \crefpairconjunction } { \nobreakspace и \nobreakspace } - \tl_gset:Nn { \crefmiddleconjunction } { , \nobreakspace } + \tl_gset:Nn { \crefmiddleconjunction } { , ~ } \tl_gset:Nn { \creflastconjunction } { \nobreakspace и \nobreakspace } \tl_gset:Nn { \crefpairgroupconjunction } { \nobreakspace и \nobreakspace } - \tl_gset:Nn { \crefmiddlegroupconjunction } { , \nobreakspace } + \tl_gset:Nn { \crefmiddlegroupconjunction } { , ~ } \tl_gset:Nn { \creflastgroupconjunction } { \nobreakspace и \nobreakspace } \tl_gset:Nn { \crefrangeconjunction } { \nobreakspace \textasciitilde \nobreakspace } } @@ -399,14 +404,27 @@ \Crefname { table } { Tabela } { Tabelas } \Crefname { appendix } { Apêndice } { Apêndices } \tl_gset:Nn { \crefpairconjunction } { \nobreakspace e \nobreakspace } - \tl_gset:Nn { \crefmiddleconjunction } { , \nobreakspace } + \tl_gset:Nn { \crefmiddleconjunction } { , ~ } \tl_gset:Nn { \creflastconjunction } { \nobreakspace e \nobreakspace } \tl_gset:Nn { \crefpairgroupconjunction } { \nobreakspace e \nobreakspace } - \tl_gset:Nn { \crefmiddlegroupconjunction } { , \nobreakspace } + \tl_gset:Nn { \crefmiddlegroupconjunction } { , ~ } \tl_gset:Nn { \creflastgroupconjunction } { \nobreakspace e \nobreakspace } \tl_gset:Nn { \crefrangeconjunction } { \nobreakspace a \nobreakspace } } +\crefformat{equation}{#2\cref@equation@name\nobreakspace\textup{\tagform@{#1}}#3} +\Crefformat{equation}{#2\Cref@equation@name\nobreakspace\textup{\tagform@{#1}}#3} +\crefrangeformat{equation}{\cref@equation@name@plural\nobreakspace#3\textup{\tagform@{#1}}#4\crefrangeconjunction#5\textup{\tagform@{#2}}#6} +\Crefrangeformat{equation}{\Cref@equation@name@plural\nobreakspace#3\textup{\tagform@{#1}}#4\crefrangeconjunction#5\textup{\tagform@{#2}}#6} +\crefmultiformat{equation}{\cref@equation@name@plural\nobreakspace#2\textup{\tagform@{#1}}#3}{\crefpairconjunction#2\textup{\tagform@{#1}}#3}{\crefmiddleconjunction#2\textup{\tagform@{#1}}#3}{\creflastconjunction#2\textup{\tagform@{#1}}#3} +\Crefmultiformat{equation}{\Cref@equation@name@plural\nobreakspace#2\textup{\tagform@{#1}}#3}{\crefpairconjunction#2\textup{\tagform@{#1}}#3}{\crefmiddleconjunction#2\textup{\tagform@{#1}}#3}{\creflastconjunction#2\textup{\tagform@{#1}}#3} +\crefrangemultiformat{equation}{\cref@equation@name@plural\nobreakspace#2\textup{\tagform@{#1}}#3}{\crefpairgroupconjunction#2\textup{\tagform@{#1}}#3}{\crefmiddlegroupconjunction#2\textup{\tagform@{#1}}#3}{\creflastgroupconjunction#2\textup{\tagform@{#1}}#3} +\Crefrangemultiformat{equation}{\Cref@equation@name@plural\nobreakspace#2\textup{\tagform@{#1}}#3}{\crefpairgroupconjunction#2\textup{\tagform@{#1}}#3}{\crefmiddlegroupconjunction#2\textup{\tagform@{#1}}#3}{\creflastgroupconjunction#2\textup{\tagform@{#1}}#3} +\labelcrefformat{equation}{#2\textup{\tagform@{#1}}#3} +\labelcrefrangeformat{equation}{#3\textup{\tagform@{#1}}#4\crefrangeconjunction#5\textup{\tagform@{#2}}#6} +\labelcrefmultiformat{equation}{#2\textup{\tagform@{#1}}#3}{\crefpairconjunction#2\textup{\tagform@{#1}}#3}{\crefmiddleconjunction#2\textup{\tagform@{#1}}#3}{\creflastconjunction#2\textup{\tagform@{#1}}#3} +\labelcrefrangemultiformat{equation}{#2\textup{\tagform@{#1}}#3}{\crefpairgroupconjunction#2\textup{\tagform@{#1}}#3}{\crefmiddlegroupconjunction#2\textup{\tagform@{#1}}#3}{\creflastgroupconjunction#2\textup{\tagform@{#1}}#3} + \bool_if:NF \l__projlib_theorem_presetname_bool { \endinput } \bool_if:NT \l__projlib_theorem_complexname_bool { \endinput } diff --git a/Master/texmf-dist/tex/latex/projlib/projlib-titlepage.sty b/Master/texmf-dist/tex/latex/projlib/projlib-titlepage.sty index 2153a384728..3f3cae0a14c 100644 --- a/Master/texmf-dist/tex/latex/projlib/projlib-titlepage.sty +++ b/Master/texmf-dist/tex/latex/projlib/projlib-titlepage.sty @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplPackage {projlib-titlepage} - {2023/10/15} {} + {2023/11/05} {} {Commands for rendering the title page} \keys_define:nn { projlib-titlepage } |