summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/projlib
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2023-11-06 03:03:43 +0000
committerNorbert Preining <norbert@preining.info>2023-11-06 03:03:43 +0000
commit240fd5fe8af67337e240c10434af4834fc86278f (patch)
treed3c79826e19d48c5559e120397514b76a28402ea /macros/latex/contrib/projlib
parentccd8f4d47ffbc15cb02b18cfb88cae0e995c3e69 (diff)
CTAN sync 202311060303
Diffstat (limited to 'macros/latex/contrib/projlib')
-rw-r--r--macros/latex/contrib/projlib/ProjLib.dtx121
-rw-r--r--macros/latex/contrib/projlib/README.md2
2 files changed, 84 insertions, 39 deletions
diff --git a/macros/latex/contrib/projlib/ProjLib.dtx b/macros/latex/contrib/projlib/ProjLib.dtx
index 826c6934ad..fcac850e84 100644
--- a/macros/latex/contrib/projlib/ProjLib.dtx
+++ b/macros/latex/contrib/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/macros/latex/contrib/projlib/README.md b/macros/latex/contrib/projlib/README.md
index e4f1fe4fe6..b9b4816d75 100644
--- a/macros/latex/contrib/projlib/README.md
+++ b/macros/latex/contrib/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).**