diff options
Diffstat (limited to 'Master')
49 files changed, 439 insertions, 356 deletions
diff --git a/Master/texmf-dist/doc/latex/beaulivre/DEPENDS.txt b/Master/texmf-dist/doc/latex/beaulivre/DEPENDS.txt new file mode 100644 index 00000000000..20468181d04 --- /dev/null +++ b/Master/texmf-dist/doc/latex/beaulivre/DEPENDS.txt @@ -0,0 +1 @@ +hard colorist
\ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/beaulivre/README.md b/Master/texmf-dist/doc/latex/beaulivre/README.md index 0502e93aadd..1841ec55d55 100644 --- a/Master/texmf-dist/doc/latex/beaulivre/README.md +++ b/Master/texmf-dist/doc/latex/beaulivre/README.md @@ -2,15 +2,11 @@ # `beaulivre` : write you books in a colorful way -**The current document class have been rewritten with `expl3`. Please note that the documentations are not yet up-to-date. The syntax of some commands have been changed since the last version, especially the declaration of theorem-like environments by `\CreateTheorem`. For the moment, you can refer to the documentation of the package `create-theorem`.** +> **New documentations are being written and are expected to be completed by the end of 2023. In the meantime, only the core code would be included in TeX Live 2023 coming this April (old documentations have been removed from the distribution).** -`beaulivre` is a LaTeX class for typesetting books, which has a colorful -design. +`beaulivre` is a LaTeX class for typesetting books, which has a colorful design. -Currently, it has native support to Chinese (simplified and traditional), -English, French, German, Italian, Japanese, Portuguese (European and Brazilian), -Russian and Spanish typesetting. And it may compile with either XeLaTeX or -LuaLaTeX. +Currently, it has native support to Chinese (simplified and traditional), English, French, German, Italian, Japanese, Portuguese (European and Brazilian), Russian and Spanish typesetting. And it may compile with either XeLaTeX or LuaLaTeX. This is part of the `colorist` class series. @@ -18,13 +14,11 @@ This is part of the `colorist` class series. Compared with usual document classes, it has the following features: -- Native multi-language support: Chinese (simplified and traditional), English, - French, German, Italian, Japanese, Portuguese (European and Brazilian), - Russian and Spanish - > In particular, for simplified Chinese, traditional Chinese and Japanese, - > the fonts of the corresponding glyphs can be automatically switched -- Ready-to-use theorem-like environments, also with multi-language support -- Support both the standard and the AMS writing fashion +- Several carefully designed styles +- Native multi-language support: Chinese (simplified and traditional), English, French, German, Italian, Japanese, Portuguese (European and Brazilian), Russian and Spanish + > In particular, for simplified Chinese, traditional Chinese and Japanese, the fonts of the corresponding glyphs can be automatically switched +- Ready-to-use theorem-like environments, with clever referencing support +- ... and so much more... # License diff --git a/Master/texmf-dist/doc/latex/colorist/DEPENDS.txt b/Master/texmf-dist/doc/latex/colorist/DEPENDS.txt new file mode 100644 index 00000000000..21f065cd4f4 --- /dev/null +++ b/Master/texmf-dist/doc/latex/colorist/DEPENDS.txt @@ -0,0 +1 @@ +hard projlib
\ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/colorist/README.md b/Master/texmf-dist/doc/latex/colorist/README.md index fbfd1cd0be2..8e281b3e90f 100644 --- a/Master/texmf-dist/doc/latex/colorist/README.md +++ b/Master/texmf-dist/doc/latex/colorist/README.md @@ -2,16 +2,18 @@ # `colorist` bundle: write you documents in a colorful way -<!-- **The whole series have been rewritten with `expl3`. Please note that the documentations are not yet up-to-date. The syntax of some commands have been changed since the last version, especially the declaration of theorem-like environments by `\CreateTheorem`. For the moment, you can refer to the documentation of the package `create-theorem`.** --> +> **New documentations are being written and are expected to be completed by the end of 2023. In the meantime, only the core code would be included in TeX Live 2023 coming this April (old documentations have been removed from the distribution).** ## Introduction -`colorist` is a collection of styles and classes that helps you typesetting articles and books -with a colorful design. It mainly consists of two parts. +`colorist` is a collection of styles and classes that helps you to typeset articles and books with a colorful design. + +It mainly consists of two parts. - Main part: - `colorist.sty` : interface of the main style - - `colorist-fancy.sty` : the fancy style + - `colorist-fancy.sty` : the style "fancy" + - ... and more styles to come (currently on schedule: "plain", "classical", "modern", "simple", "elegant", "flow", "stream") - `colorart.cls` : class for typesetting articles - `colorbook.cls` : class for typesetting books @@ -24,13 +26,13 @@ with a colorful design. It mainly consists of two parts. - `lebhart.cls` : enhanced version of `colorart` - `beaulivre.cls` : enhanced version of `colorbook` - They are similar to the main classes, but have unicode support, thus can - only be used with either XeLaTeX or LuaLaTeX. Currently they have native + They are similar to the main classes, but have Unicode support, thus can + only be used with either XeLaTeX or LuaLaTeX. Currently, they have native support to Chinese (simplified and traditional), English, French, German, Italian, Japanese, Portuguese (European and Brazilian), Russian and Spanish typesetting, and also use more beautiful fonts. -<!-- ### How to get these files +### How to get these files You can get the `.sty` and `.cls` files mentioned above simply by compiling `colorist.ins`: ``` @@ -39,19 +41,18 @@ latex colorist.ins To get the `.tex` source files of the documentation, compile `colorist-doc.ins`: ``` latex colorist-doc.ins -``` --> +``` ## Features Compared with usual document classes, it has the following features: -- Native multi-language support: Chinese (simplified and traditional), English, - French, German, Italian, Japanese, Portuguese (European and Brazilian), - Russian and Spanish - > In particular, for simplified Chinese, traditional Chinese and Japanese, - > the fonts of the corresponding glyphs can be automatically switched -- Ready-to-use theorem-like environments, also with multi-language support +- Several carefully designed styles +- Native multi-language support: Chinese (simplified and traditional), English, French, German, Italian, Japanese, Portuguese (European and Brazilian), Russian and Spanish + > In particular, for simplified Chinese, traditional Chinese and Japanese, the fonts of the corresponding glyphs can be automatically switched +- Ready-to-use theorem-like environments, with clever referencing support - Support both the standard and the AMS writing fashion +- ... and so much more... # License diff --git a/Master/texmf-dist/doc/latex/einfart/DEPENDS.txt b/Master/texmf-dist/doc/latex/einfart/DEPENDS.txt new file mode 100644 index 00000000000..0b83e85a469 --- /dev/null +++ b/Master/texmf-dist/doc/latex/einfart/DEPENDS.txt @@ -0,0 +1 @@ +hard minimalist
\ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/einfart/README.md b/Master/texmf-dist/doc/latex/einfart/README.md index 51bf0b5605f..4f72b8b80c0 100644 --- a/Master/texmf-dist/doc/latex/einfart/README.md +++ b/Master/texmf-dist/doc/latex/einfart/README.md @@ -1,16 +1,12 @@ -<!-- Copyright (C) 2021-2022 by Jinwen XU --> +<!-- Copyright (C) 2021-2023 by Jinwen XU --> # `einfart` : write you articles in a simple and clear way -**The current document class have been rewritten with `expl3`. Please note that the documentations are not yet up-to-date. The syntax of some commands have been changed since the last version, especially the declaration of theorem-like environments by `\CreateTheorem`. For the moment, you can refer to the documentation of the package `create-theorem`.** +> **New documentations are being written and are expected to be completed by the end of 2023. In the meantime, only the core code would be included in TeX Live 2023 coming this April (old documentations have been removed from the distribution).** -`einfart` is a LaTeX class for typesetting articles, which has a simple and -clear design. +`einfart` is a LaTeX class for typesetting articles, which has a simple and clear design. -Currently, it has native support to Chinese (simplified and traditional), -English, French, German, Italian, Japanese, Portuguese (European and Brazilian), -Russian and Spanish typesetting. And it may compile with either XeLaTeX or -LuaLaTeX. +Currently, it has native support to Chinese (simplified and traditional), English, French, German, Italian, Japanese, Portuguese (European and Brazilian), Russian and Spanish typesetting. And it may compile with either XeLaTeX or LuaLaTeX. This is part of the `minimalist` class series. @@ -18,13 +14,12 @@ This is part of the `minimalist` class series. Compared with usual document classes, it has the following features: -- Native multi-language support: Chinese (simplified and traditional), English, - French, German, Italian, Japanese, Portuguese (European and Brazilian), - Russian and Spanish - > In particular, for simplified Chinese, traditional Chinese and Japanese, - > the fonts of the corresponding glyphs can be automatically switched -- Ready-to-use theorem-like environments, also with multi-language support +- Several carefully designed styles +- Native multi-language support: Chinese (simplified and traditional), English, French, German, Italian, Japanese, Portuguese (European and Brazilian), Russian and Spanish + > In particular, for simplified Chinese, traditional Chinese and Japanese, the fonts of the corresponding glyphs can be automatically switched +- Ready-to-use theorem-like environments, with clever referencing support - Support both the standard and the AMS writing fashion +- ... and so much more... # License diff --git a/Master/texmf-dist/doc/latex/lebhart/DEPENDS.txt b/Master/texmf-dist/doc/latex/lebhart/DEPENDS.txt new file mode 100644 index 00000000000..20468181d04 --- /dev/null +++ b/Master/texmf-dist/doc/latex/lebhart/DEPENDS.txt @@ -0,0 +1 @@ +hard colorist
\ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/lebhart/README.md b/Master/texmf-dist/doc/latex/lebhart/README.md index c67e6af8ccc..8c6c5d027b9 100644 --- a/Master/texmf-dist/doc/latex/lebhart/README.md +++ b/Master/texmf-dist/doc/latex/lebhart/README.md @@ -2,15 +2,11 @@ # `lebhart` : write you articles in a colorful way -**The current document class have been rewritten with `expl3`. Please note that the documentations are not yet up-to-date. The syntax of some commands have been changed since the last version, especially the declaration of theorem-like environments by `\CreateTheorem`. For the moment, you can refer to the documentation of the package `create-theorem`.** +> **New documentations are being written and are expected to be completed by the end of 2023. In the meantime, only the core code would be included in TeX Live 2023 coming this April (old documentations have been removed from the distribution).** -`lebhart` is a LaTeX class for typesetting articles, which has a colorful -design. +`lebhart` is a LaTeX class for typesetting articles, which has a colorful design. -Currently, it has native support to Chinese (simplified and traditional), -English, French, German, Italian, Japanese, Portuguese (European and Brazilian), -Russian and Spanish typesetting. And it may compile with either XeLaTeX or -LuaLaTeX. +Currently, it has native support to Chinese (simplified and traditional), English, French, German, Italian, Japanese, Portuguese (European and Brazilian), Russian and Spanish typesetting. And it may compile with either XeLaTeX or LuaLaTeX. This is part of the `colorist` class series. @@ -18,13 +14,12 @@ This is part of the `colorist` class series. Compared with usual document classes, it has the following features: -- Native multi-language support: Chinese (simplified and traditional), English, - French, German, Italian, Japanese, Portuguese (European and Brazilian), - Russian and Spanish - > In particular, for simplified Chinese, traditional Chinese and Japanese, - > the fonts of the corresponding glyphs can be automatically switched -- Ready-to-use theorem-like environments, also with multi-language support +- Several carefully designed styles +- Native multi-language support: Chinese (simplified and traditional), English, French, German, Italian, Japanese, Portuguese (European and Brazilian), Russian and Spanish + > In particular, for simplified Chinese, traditional Chinese and Japanese, the fonts of the corresponding glyphs can be automatically switched +- Ready-to-use theorem-like environments, with clever referencing support - Support both the standard and the AMS writing fashion +- ... and so much more... # License diff --git a/Master/texmf-dist/doc/latex/minimalist/DEPENDS.txt b/Master/texmf-dist/doc/latex/minimalist/DEPENDS.txt new file mode 100644 index 00000000000..21f065cd4f4 --- /dev/null +++ b/Master/texmf-dist/doc/latex/minimalist/DEPENDS.txt @@ -0,0 +1 @@ +hard projlib
\ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/minimalist/README.md b/Master/texmf-dist/doc/latex/minimalist/README.md index 3c4ecee2780..a86486ba21e 100644 --- a/Master/texmf-dist/doc/latex/minimalist/README.md +++ b/Master/texmf-dist/doc/latex/minimalist/README.md @@ -1,24 +1,26 @@ -<!-- Copyright (C) 2021-2022 by Jinwen XU --> +<!-- Copyright (C) 2021-2023 by Jinwen XU --> # `minimalist` bundle: write you documents in a simple and clear way -<!-- -**The whole series have been rewritten with `expl3`. Please note that the documentations are not yet up-to-date. The syntax of some commands have been changed since the last version, especially the declaration of theorem-like environments by `\CreateTheorem`. For the moment, you can refer to the documentation of the package `create-theorem`.** --> + +> **New documentations are being written and are expected to be completed by the end of 2023. In the meantime, only the core code would be included in TeX Live 2023 coming this April (old documentations have been removed from the distribution).** ## Introduction -`minimalist` is a collection of styles and classes that helps you typesetting articles and books -with a simple and clear design. It mainly consists of two parts. +`minimalist` is a collection of styles and classes that helps you to typeset articles and books with a simple and clear design. + +It mainly consists of two parts. - Main part: - `minimalist.sty` : interface of the main style - - `minimalist-plain.sty` : the plain style - - `minimalist-classical.sty` : the classical style - - `minimalist-stream.sty` : the stream style - - `minimalist-flow.sty` : the flow style + - `minimalist-plain.sty` : the style "plain" + - `minimalist-classical.sty` : the style "classical" + - `minimalist-flow.sty` : the style "flow" + - `minimalist-stream.sty` : the style "stream" + - ... and more styles to come (currently on schedule: "modern") - `minimart.cls` : class for typesetting articles - `minimbook.cls` : class for typesetting books - They can be used with any major TeX engine. Currently they have native + They can be used with any major TeX engine. Currently, they have native support to English, French, German, Italian, Portuguese (European and Brazilian) and Spanish typesetting. @@ -27,13 +29,13 @@ with a simple and clear design. It mainly consists of two parts. - `einfart.cls` : more advanced class for typesetting articles - `simplivre.cls` : more advanced class for typesetting books - They are similar to the main classes, but have unicode support, thus can - only be used with either XeLaTeX or LuaLaTeX. Currently they have native + They are similar to the main classes, but have Unicode support, thus can + only be used with either XeLaTeX or LuaLaTeX. Currently, they have native support to Chinese (simplified and traditional), English, French, German, Italian, Japanese, Portuguese (European and Brazilian), Russian and Spanish typesetting, and also use more beautiful fonts. -<!-- ### How to get these files +### How to get these files You can get the `.sty` and `.cls` files mentioned above simply by compiling `minimalist.ins`: ``` @@ -43,19 +45,18 @@ To get the `.tex` source files of the documentation, compile `minimalist-doc.ins`: ``` latex minimalist-doc.ins -``` --> +``` ## Features Compared with usual document classes, it has the following features: -- Native multi-language support: Chinese (simplified and traditional), English, - French, German, Italian, Japanese, Portuguese (European and Brazilian), - Russian and Spanish - > In particular, for simplified Chinese, traditional Chinese and Japanese, - > the fonts of the corresponding glyphs can be automatically switched -- Ready-to-use theorem-like environments, also with multi-language support +- Several carefully designed styles +- Native multi-language support: Chinese (simplified and traditional), English, French, German, Italian, Japanese, Portuguese (European and Brazilian), Russian and Spanish + > In particular, for simplified Chinese, traditional Chinese and Japanese, the fonts of the corresponding glyphs can be automatically switched +- Ready-to-use theorem-like environments, with clever referencing support - Support both the standard and the AMS writing fashion +- ... and so much more... # License diff --git a/Master/texmf-dist/doc/latex/projlib/DEPENDS.txt b/Master/texmf-dist/doc/latex/projlib/DEPENDS.txt new file mode 100644 index 00000000000..b8ee3af57fa --- /dev/null +++ b/Master/texmf-dist/doc/latex/projlib/DEPENDS.txt @@ -0,0 +1 @@ +hard create-theorem
\ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/projlib/README.md b/Master/texmf-dist/doc/latex/projlib/README.md index 1caa674c2fd..c7b786b84a2 100644 --- a/Master/texmf-dist/doc/latex/projlib/README.md +++ b/Master/texmf-dist/doc/latex/projlib/README.md @@ -4,7 +4,7 @@ # The `ProjLib` Toolkit -> **This bundle is dated 2023/01/03.** +> **This bundle is dated 2023/01/05.** > **New documentations are being written and are expected to be completed by the end of 2023. In the meantime, only the core code would be included in TeX Live 2023 coming this April (old documentations have been removed from the distribution).** diff --git a/Master/texmf-dist/doc/latex/simplivre/DEPENDS.txt b/Master/texmf-dist/doc/latex/simplivre/DEPENDS.txt new file mode 100644 index 00000000000..0b83e85a469 --- /dev/null +++ b/Master/texmf-dist/doc/latex/simplivre/DEPENDS.txt @@ -0,0 +1 @@ +hard minimalist
\ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/simplivre/README.md b/Master/texmf-dist/doc/latex/simplivre/README.md index 3d0c3a872c0..99d73b75476 100644 --- a/Master/texmf-dist/doc/latex/simplivre/README.md +++ b/Master/texmf-dist/doc/latex/simplivre/README.md @@ -1,16 +1,12 @@ -<!-- Copyright (C) 2021-2022 by Jinwen XU --> +<!-- Copyright (C) 2021-2023 by Jinwen XU --> # `simplivre` : write you books in a simple and clear way -**The current document class have been rewritten with `expl3`. Please note that the documentations are not yet up-to-date. The syntax of some commands have been changed since the last version, especially the declaration of theorem-like environments by `\CreateTheorem`. For the moment, you can refer to the documentation of the package `create-theorem`.** +> **New documentations are being written and are expected to be completed by the end of 2023. In the meantime, only the core code would be included in TeX Live 2023 coming this April (old documentations have been removed from the distribution).** -`simplivre` is a LaTeX class for typesetting books, which has a simple and clear -design. +`simplivre` is a LaTeX class for typesetting books, which has a simple and clear design. -Currently, it has native support to Chinese (simplified and traditional), -English, French, German, Italian, Japanese, Portuguese (European and Brazilian), -Russian and Spanish typesetting. And it may compile with either XeLaTeX or -LuaLaTeX. +Currently, it has native support to Chinese (simplified and traditional), English, French, German, Italian, Japanese, Portuguese (European and Brazilian), Russian and Spanish typesetting. And it may compile with either XeLaTeX or LuaLaTeX. This is part of the `minimalist` class series. @@ -18,13 +14,11 @@ This is part of the `minimalist` class series. Compared with usual document classes, it has the following features: -- Native multi-language support: Chinese (simplified and traditional), English, - French, German, Italian, Japanese, Portuguese (European and Brazilian), - Russian and Spanish - > In particular, for simplified Chinese, traditional Chinese and Japanese, - > the fonts of the corresponding glyphs can be automatically switched -- Ready-to-use theorem-like environments, also with multi-language support -- Support both the standard and the AMS writing fashion +- Several carefully designed styles +- Native multi-language support: Chinese (simplified and traditional), English, French, German, Italian, Japanese, Portuguese (European and Brazilian), Russian and Spanish + > In particular, for simplified Chinese, traditional Chinese and Japanese, the fonts of the corresponding glyphs can be automatically switched +- Ready-to-use theorem-like environments, with clever referencing support +- ... and so much more... # License diff --git a/Master/texmf-dist/source/latex/projlib/ProjLib.dtx b/Master/texmf-dist/source/latex/projlib/ProjLib.dtx index 4b9f8d3aecf..6123adab0cf 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/01/03} {} + {2023/01/05} {} {Collective interface of the ProjLib toolkit} %</ProjLib> % %<*projlib-author> \ProvidesExplPackage {projlib-author} - {2023/01/03} {} + {2023/01/05} {} {Enhanced author information block} %</projlib-author> % %<*projlib-datetime> \ProvidesExplPackage {projlib-datetime} - {2023/01/03} {} + {2023/01/05} {} {Convert numeric date-time string to natural language} %</projlib-datetime> % %<*projlib-draft> \ProvidesExplPackage {projlib-draft} - {2023/01/03} {} + {2023/01/05} {} {Useful commands during draft stage} %</projlib-draft> % %<*projlib-font> \ProvidesExplPackage {projlib-font} - {2023/01/03} {} + {2023/01/05} {} {Font selection and configuration} %</projlib-font> % %<*projlib-language> \ProvidesExplPackage {projlib-language} - {2023/01/03} {} + {2023/01/05} {} {Multi-language configuration} %</projlib-language> % %<*projlib-logo> \ProvidesExplPackage {projlib-logo} - {2023/01/03} {} + {2023/01/05} {} {The ProjLib logo} %</projlib-logo> % %<*projlib-math> \ProvidesExplPackage {projlib-math} - {2023/01/03} {} + {2023/01/05} {} {Efficient math setup} %</projlib-math> % %<*projlib-paper> \ProvidesExplPackage {projlib-paper} - {2023/01/03} {} + {2023/01/05} {} {Configuration of the paper style} %</projlib-paper> % %<*projlib-text> \ProvidesExplPackage {projlib-text} - {2023/01/03} {} + {2023/01/05} {} {Text-related commands} %</projlib-text> % %<*projlib-theorem> \ProvidesExplPackage {projlib-theorem} - {2023/01/03} {} + {2023/01/05} {} {Configuration of theorem-like environments} %</projlib-theorem> % %<*projlib-titlepage> \ProvidesExplPackage {projlib-titlepage} - {2023/01/03} {} + {2023/01/05} {} {Commands for rendering the title page} %</projlib-titlepage> @@ -556,8 +556,10 @@ \NewDocumentCommand \ProjLibSetDatetimeInputFormat { m } { - \projlib_datetime_set_input_format:n { #1 } + \tl_set:Nn \l_tmpa_tl { \exp_args:Ne \tl_trim_spaces:n { #1 } } + \exp_args:Ne \projlib_datetime_set_input_format:n { \l_tmpa_tl } } +\ProvideDocumentCommand \SetDatetimeInputFormat {} { \ProjLibSetDatetimeInputFormat } \seq_new:N \l__projlib_datetime_date_seq @@ -694,7 +696,7 @@ \regex_match:nnTF { \A \d{1,2}-\d{1,2}-\d{4} \Z } { #1 } { \seq_set_split:Nnn \l__projlib_datetime_date_seq { - } { #1 } - \cs_if_exist_use:c { projlib_datetime_display_month_day_year #2 _ \languagename :nnn } + \cs_if_exist_use:c { projlib_datetime_display_year_month_day #2 _ \languagename :nnn } { \int_eval:n { \seq_item:Nn \l__projlib_datetime_date_seq { 3 } } } % year { \int_eval:n { \seq_item:Nn \l__projlib_datetime_date_seq { 1 } } } % month { \int_eval:n { \seq_item:Nn \l__projlib_datetime_date_seq { 2 } } } % day @@ -739,7 +741,7 @@ \regex_match:nnTF { \A \d{1,2}-\d{1,2}-\d{4} \Z } { #1 } { \seq_set_split:Nnn \l__projlib_datetime_date_seq { - } { #1 } - \cs_if_exist_use:c { projlib_datetime_display_day_month_year #2 _ \languagename :nnn } + \cs_if_exist_use:c { projlib_datetime_display_year_month_day #2 _ \languagename :nnn } { \int_eval:n { \seq_item:Nn \l__projlib_datetime_date_seq { 3 } } } % year { \int_eval:n { \seq_item:Nn \l__projlib_datetime_date_seq { 2 } } } % month { \int_eval:n { \seq_item:Nn \l__projlib_datetime_date_seq { 1 } } } % day @@ -783,6 +785,7 @@ } } } +\cs_generate_variant:Nn \__projlib_datetime_date_parse_year_month_day:n { e } \cs_new_protected:Nn \__projlib_datetime_date_parse_month_day_year:n { @@ -800,6 +803,7 @@ } } } +\cs_generate_variant:Nn \__projlib_datetime_date_parse_month_day_year:n { e } \cs_new_protected:Nn \__projlib_datetime_date_parse_day_month_year:n { @@ -817,6 +821,7 @@ } } } +\cs_generate_variant:Nn \__projlib_datetime_date_parse_day_month_year:n { e } \cs_new:Nn \__projlib_datetime_input_format_to_str: { @@ -830,7 +835,9 @@ \cs_new_protected:Nn \__projlib_datetime_display_date_according_to_format:nn { - \cs_if_exist_use:c { __projlib_datetime_date_parse_ \__projlib_datetime_input_format_to_str: :n } { #1 } + \tl_set:Nx \l_tmpa_tl { #1 } + \regex_replace_all:nnN { \D } { - } \l_tmpa_tl + \cs_if_exist_use:c { __projlib_datetime_date_parse_ \__projlib_datetime_input_format_to_str: :e } { \l_tmpa_tl } \str_case_e:nnF { \l__projlib_datetime_output_format_tl } { { only-year-month } @@ -973,7 +980,9 @@ \cs_new_protected:Nn \projlib_datetime_calculate_week_according_to_format:n { - \cs_if_exist_use:c { __projlib_datetime_date_parse_ \__projlib_datetime_input_format_to_str: :n } { #1 } + \tl_set:Nx \l_tmpa_tl { #1 } + \regex_replace_all:nnN { \D } { - } \l_tmpa_tl + \cs_if_exist_use:c { __projlib_datetime_date_parse_ \__projlib_datetime_input_format_to_str: :e } { \l_tmpa_tl } \__projlib_datetime_calculate_day_of_week_with_year_month_day:nnn { \int_eval:n { \seq_item:Nn \l__projlib_datetime_date_seq { 1 } } } { \int_eval:n { \seq_item:Nn \l__projlib_datetime_date_seq { 2 } } } @@ -3168,27 +3177,49 @@ } \msg_new:nnn { projlib-language } - { language-not-support } + { language-not-supported } { The~language~"#1"~is~not~supported. } +\msg_new:nnn { projlib-language } + { language-not-enabled } + { The~language~"#1"~is~not~enabled. } \cs_new:Nn \projlib_language_use_language_locally:nn { - \cs_if_exist_use:cF { projlib_language_apply_settings_locally_ \projlib_language_str_to_languagename:n { #1 } :n } + \cs_if_exist:cTF { projlib_language_apply_settings_locally_ \projlib_language_str_to_languagename:n { #1 } :n } { - \msg_warning:nnn { projlib-language } { language-not-support } { #1 } + \bool_if:cTF { g__projlib_language_enabled_ \projlib_language_str_to_languagename:n { #1 } _bool } + { + \use:c { projlib_language_apply_settings_locally_ \projlib_language_str_to_languagename:n { #1 } :n } { #2 } + } + { + \msg_warning:nnn { projlib-language } { language-not-enabled } { #1 } + #2 + } + } + { + \msg_warning:nnn { projlib-language } { language-not-supported } { #1 } + #2 } - { #2 } } \cs_generate_variant:Nn \projlib_language_use_language_locally:nn { e } \cs_new:Nn \projlib_language_use_language:n { - \cs_if_exist_use:cF { projlib_language_apply_settings_globally_ \projlib_language_str_to_languagename:n { #1 } : } + \cs_if_exist:cTF { projlib_language_apply_settings_globally_ \projlib_language_str_to_languagename:n { #1 } : } + { + \bool_if:cTF { g__projlib_language_enabled_ \projlib_language_str_to_languagename:n { #1 } _bool } + { + \use:c { projlib_language_apply_settings_globally_ \projlib_language_str_to_languagename:n { #1 } : } + \cs_if_exist_use:c { g_projlib_language_linespacing_ \projlib_language_str_to_languagetype:n { #1 } _tl } + \cs_if_exist_use:c { g_projlib_language_parindent_ \projlib_language_str_to_languagetype:n { #1 } _tl } + } + { + \msg_warning:nnn { projlib-language } { language-not-enabled } { #1 } + } + } { - \msg_warning:nnn { projlib-language } { language-not-support } { #1 } + \msg_warning:nnn { projlib-language } { language-not-supported } { #1 } } - \cs_if_exist_use:c { g_projlib_language_linespacing_ \projlib_language_str_to_languagetype:n { #1 } _tl } - \cs_if_exist_use:c { g_projlib_language_parindent_ \projlib_language_str_to_languagetype:n { #1 } _tl } } \cs_generate_variant:Nn \projlib_language_use_language:n { e } @@ -3768,43 +3799,50 @@ %<*projlib-theorem> \keys_define:nn { projlib-theorem } { - , no-theorems .bool_set:N = \l__projlib_theorem_no_theorems_bool - , no-theorems .initial:n = { false } - , no~theorems .bool_set:N = \l__projlib_theorem_no_theorems_bool - , no theorems .bool_set:N = \l__projlib_theorem_no_theorems_bool - , nothms .bool_set:N = \l__projlib_theorem_no_theorems_bool - , no-theorem-numbering .bool_set:N = \l__projlib_theorem_no_theorem_numbering_bool - , no-theorem-numbering .initial:n = { false } - , no~theorem~numbering .bool_set:N = \l__projlib_theorem_no_theorem_numbering_bool - , no theorem numbering .bool_set:N = \l__projlib_theorem_no_theorem_numbering_bool - , nothmnum .bool_set:N = \l__projlib_theorem_no_theorem_numbering_bool - , theorem-numbering .tl_set:N = \l__projlib_theorem_theorem_numbering_tl - , theorem-numbering .default:n = { * } - , theorem~numbering .tl_set:N = \l__projlib_theorem_theorem_numbering_tl - , theorem~numbering .default:n = { * } - , theorem numbering .tl_set:N = \l__projlib_theorem_theorem_numbering_tl - , theorem numbering .default:n = { * } - , thmnum .tl_set:N = \l__projlib_theorem_theorem_numbering_tl - , thmnum .default:n = { * } - , theorem-style .tl_set:N = \l__projlib_theorem_theorem_style_tl - , theorem-style .initial:n = { } - , theorem-style .value_required:n = true - , theorem~style .tl_set:N = \l__projlib_theorem_theorem_style_tl - , theorem~style .value_required:n = true - , theorem style .tl_set:N = \l__projlib_theorem_theorem_style_tl - , theorem style .value_required:n = true - , complex-name .bool_set:N = \l__projlib_theorem_complexname_bool - , complex-name .initial:n = { true } - , complex~name .bool_set:N = \l__projlib_theorem_complexname_bool - , complex name .bool_set:N = \l__projlib_theorem_complexname_bool - , simple-name .bool_set_inverse:N = \l__projlib_theorem_complexname_bool - , simple~name .bool_set_inverse:N = \l__projlib_theorem_complexname_bool - , simple name .bool_set_inverse:N = \l__projlib_theorem_complexname_bool - , no-preset-names .bool_set_inverse:N = \l__projlib_theorem_presetname_bool - , no-preset-names .initial:n = { false } - , no~preset~names .bool_set_inverse:N = \l__projlib_theorem_presetname_bool - , no preset names .bool_set_inverse:N = \l__projlib_theorem_presetname_bool - , unknown .code:n = { \PassOptionsToPackage { \CurrentOption } { create-theorem } } + , no-theorems .bool_set:N = \l__projlib_theorem_no_theorems_bool + , no-theorems .initial:n = { false } + , no~theorems .bool_set:N = \l__projlib_theorem_no_theorems_bool + , no theorems .bool_set:N = \l__projlib_theorem_no_theorems_bool + , nothms .bool_set:N = \l__projlib_theorem_no_theorems_bool + , no-theorem-numbering .bool_set:N = \l__projlib_theorem_no_theorem_numbering_bool + , no-theorem-numbering .initial:n = { false } + , no~theorem~numbering .bool_set:N = \l__projlib_theorem_no_theorem_numbering_bool + , no theorem numbering .bool_set:N = \l__projlib_theorem_no_theorem_numbering_bool + , nothmnum .bool_set:N = \l__projlib_theorem_no_theorem_numbering_bool + , theorem-numbering .tl_set:N = \l__projlib_theorem_theorem_numbering_tl + , theorem-numbering .default:n = { * } + , theorem~numbering .tl_set:N = \l__projlib_theorem_theorem_numbering_tl + , theorem~numbering .default:n = { * } + , theorem numbering .tl_set:N = \l__projlib_theorem_theorem_numbering_tl + , theorem numbering .default:n = { * } + , thmnum .tl_set:N = \l__projlib_theorem_theorem_numbering_tl + , thmnum .default:n = { * } + , separate-theorem-numbering .bool_set:N = \l__projlib_theorem_separate_theorem_numbering_bool + , separate-theorem-numbering .initial:n = { false } + , separate~theorem~numbering .bool_set:N = \l__projlib_theorem_separate_theorem_numbering_bool + , separate theorem numbering .bool_set:N = \l__projlib_theorem_separate_theorem_numbering_bool + , number-theorems-separately .bool_set:N = \l__projlib_theorem_separate_theorem_numbering_bool + , number~theorems~separately .bool_set:N = \l__projlib_theorem_separate_theorem_numbering_bool + , number theorems separately .bool_set:N = \l__projlib_theorem_separate_theorem_numbering_bool + , theorem-style .tl_set:N = \l__projlib_theorem_theorem_style_tl + , theorem-style .initial:n = { } + , theorem-style .value_required:n = true + , theorem~style .tl_set:N = \l__projlib_theorem_theorem_style_tl + , theorem~style .value_required:n = true + , theorem style .tl_set:N = \l__projlib_theorem_theorem_style_tl + , theorem style .value_required:n = true + , complex-name .bool_set:N = \l__projlib_theorem_complexname_bool + , complex-name .initial:n = { true } + , complex~name .bool_set:N = \l__projlib_theorem_complexname_bool + , complex name .bool_set:N = \l__projlib_theorem_complexname_bool + , simple-name .bool_set_inverse:N = \l__projlib_theorem_complexname_bool + , simple~name .bool_set_inverse:N = \l__projlib_theorem_complexname_bool + , simple name .bool_set_inverse:N = \l__projlib_theorem_complexname_bool + , no-preset-names .bool_set_inverse:N = \l__projlib_theorem_presetname_bool + , no-preset-names .initial:n = { false } + , no~preset~names .bool_set_inverse:N = \l__projlib_theorem_presetname_bool + , no preset names .bool_set_inverse:N = \l__projlib_theorem_presetname_bool + , unknown .code:n = { \PassOptionsToPackage { \CurrentOption } { create-theorem } } } \ProcessKeyOptions [ projlib-theorem ] @@ -3917,22 +3955,41 @@ \cs_if_exist:cTF { c@chapter } { % with \chapter \CreateTheorem { theorem } { parent counter = chapter, create starred version } + \bool_if:NT \l__projlib_theorem_separate_theorem_numbering_bool + { + \exp_args:Nv \CreateTheorem { c_projlib_theorem_supported_clist } { parent counter = chapter, create starred version } + } } { % without \chapter \CreateTheorem { theorem } { parent counter = section, create starred version } + \bool_if:NT \l__projlib_theorem_separate_theorem_numbering_bool + { + \exp_args:Nv \CreateTheorem { c_projlib_theorem_supported_clist } { parent counter = section, create starred version } + } } } { \tl_if_eq:NnTF \l__projlib_theorem_theorem_numbering_tl { * } { \CreateTheorem { theorem } { create starred version } + \bool_if:NT \l__projlib_theorem_separate_theorem_numbering_bool + { + \exp_args:Nv \CreateTheorem { c_projlib_theorem_supported_clist } { create starred version } + } } { \CreateTheorem { theorem } { parent counter = \l__projlib_theorem_theorem_numbering_tl, create starred version } + \bool_if:NT \l__projlib_theorem_separate_theorem_numbering_bool + { + \exp_args:Nv \CreateTheorem { c_projlib_theorem_supported_clist } { parent counter = \l__projlib_theorem_theorem_numbering_tl, create starred version } + } } } - \exp_args:Nv \CreateTheorem { c_projlib_theorem_supported_clist } { shared counter = theorem, create starred version, quiet } + \bool_if:NF \l__projlib_theorem_separate_theorem_numbering_bool + { + \exp_args:Nv \CreateTheorem { c_projlib_theorem_supported_clist } { shared counter = theorem, create starred version, quiet } + } } } diff --git a/Master/texmf-dist/tex/latex/beaulivre/beaulivre.cls b/Master/texmf-dist/tex/latex/beaulivre/beaulivre.cls index 10fc7c5a304..b73a8a293b4 100644 --- a/Master/texmf-dist/tex/latex/beaulivre/beaulivre.cls +++ b/Master/texmf-dist/tex/latex/beaulivre/beaulivre.cls @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplClass {beaulivre} - {2023/01/02} {} + {2023/01/05} {} {A colorful book style} \tl_const:Nn \l__colorclass_base_class_tl { book } diff --git a/Master/texmf-dist/tex/latex/colorist/colorart.cls b/Master/texmf-dist/tex/latex/colorist/colorart.cls index c361d0847ff..041d38111f8 100644 --- a/Master/texmf-dist/tex/latex/colorist/colorart.cls +++ b/Master/texmf-dist/tex/latex/colorist/colorart.cls @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplClass {colorart} - {2023/01/02} {} + {2023/01/05} {} {A colorful article style} \tl_const:Nn \l__colorclass_base_class_tl { article } diff --git a/Master/texmf-dist/tex/latex/colorist/colorbook.cls b/Master/texmf-dist/tex/latex/colorist/colorbook.cls index 2fb2ee3445d..f4f8e267b63 100644 --- a/Master/texmf-dist/tex/latex/colorist/colorbook.cls +++ b/Master/texmf-dist/tex/latex/colorist/colorbook.cls @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplClass {colorbook} - {2023/01/02} {} + {2023/01/05} {} {A colorful book style} \tl_const:Nn \l__colorclass_base_class_tl { book } diff --git a/Master/texmf-dist/tex/latex/colorist/colorist-fancy.sty b/Master/texmf-dist/tex/latex/colorist/colorist-fancy.sty index e5a3dd8a3c8..76b7acf3a15 100644 --- a/Master/texmf-dist/tex/latex/colorist/colorist-fancy.sty +++ b/Master/texmf-dist/tex/latex/colorist/colorist-fancy.sty @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplPackage {colorist-fancy} - {2023/01/02} {} + {2023/01/05} {} {The fancy style of colorist} \IfPackageLoadedTF { colorist } {} @@ -450,19 +450,19 @@ {\hspace*{-2em}} {\titlerule*[10pt]{\parbox{3pt}{\hspace*{-.25pt}\textcolor{main-text!15!paper}{.}}}\color{maintheme}\normalfont\sffamily\contentspage} \titlecontents{section} - [5em] % i.e., 2em (chapter) + 3em + [5.25em] % i.e., 2em (chapter) + 2.75em + 0.5em {\addvspace{.3pc}\normalfont\color{maintheme}\sffamily} {\contentslabel{2.75em}} {\hspace*{-2.75em}} {\titlerule*[10pt]{\parbox{3pt}{\textcolor{main-text!15!paper}{.}}}\color{maintheme}\contentspage} \titlecontents{subsection} - [8.75em] % i.e., 5em (section) + 3.75em + [9.5em] % i.e., 5.25em (section) + 3.5em + 0.75em {\addvspace{.15pc}\normalfont\sffamily} {\contentslabel{3.50em}} {\hspace*{-3.50em}} {\titlerule*[10pt]{\parbox{3pt}{\textcolor{main-text!15!paper}{.}}}\color{main-text!45!paper}\contentspage} \titlecontents{subsubsection} - [12.75em] % i.e., 8.75em (subsection) + 4em + [14em] % i.e., 9.5em (subsection) + 3.75em + 0.75em {\normalfont\sffamily} {\contentslabel{3.75em}} {\hspace*{-3.75em}} @@ -476,16 +476,16 @@ {\hspace*{-1.75em}} {\titlerule*[10pt]{\parbox{3pt}{\textcolor{main-text!15!paper}{.}}}\color{maintheme}\normalfont\sffamily\contentspage} \titlecontents{subsection} - [4.5em] % i.e., 2em (section) + 2.5em + [5em] % i.e., 2em (section) + 2.5em + 0.5em {\addvspace{.15pc}\normalfont\sffamily} - {\contentslabel{2.15em}} - {\hspace*{-2.15em}} + {\contentslabel{2.5em}} + {\hspace*{-2.5em}} {\titlerule*[10pt]{\parbox{3pt}{\textcolor{main-text!15!paper}{.}}}\color{main-text!45!paper}\contentspage} \titlecontents{subsubsection} - [7.75em] % i.e., 5em (subsection) + 3.25em + [9em] % i.e., 5em (subsection) + 3.25em + 0.75em {\normalfont\sffamily} - {\contentslabel{2.75em}} - {\hspace*{-2.75em}} + {\contentslabel{3.25em}} + {\hspace*{-3.25em}} {\titlerule*[10pt]{\parbox{3pt}{\textcolor{main-text!15!paper}{.}}}\color{main-text!45!paper}\contentspage} } diff --git a/Master/texmf-dist/tex/latex/colorist/colorist.sty b/Master/texmf-dist/tex/latex/colorist/colorist.sty index 089a20b4583..d85b7638934 100644 --- a/Master/texmf-dist/tex/latex/colorist/colorist.sty +++ b/Master/texmf-dist/tex/latex/colorist/colorist.sty @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplPackage {colorist} - {2023/01/02} {} + {2023/01/05} {} {A colorful style for articles and books} \keys_define:nn { colorist } diff --git a/Master/texmf-dist/tex/latex/einfart/einfart.cls b/Master/texmf-dist/tex/latex/einfart/einfart.cls index 33b3e641290..bc5d8039c2a 100644 --- a/Master/texmf-dist/tex/latex/einfart/einfart.cls +++ b/Master/texmf-dist/tex/latex/einfart/einfart.cls @@ -2,7 +2,7 @@ %% This is file `einfart/einfart.cls', %% generated with the docstrip utility. %% -%% Copyright (C) 2021-2022 by Jinwen XU +%% Copyright (C) 2021-2023 by Jinwen XU %% %% This is part of the minimalist class series. %% @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplClass {einfart} - {2023/01/02} {} + {2023/01/05} {} {A simple and clear article style} \tl_const:Nn \l__minimclass_base_class_tl { article } diff --git a/Master/texmf-dist/tex/latex/lebhart/lebhart.cls b/Master/texmf-dist/tex/latex/lebhart/lebhart.cls index 9d609a925e2..ef57540e3dd 100644 --- a/Master/texmf-dist/tex/latex/lebhart/lebhart.cls +++ b/Master/texmf-dist/tex/latex/lebhart/lebhart.cls @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplClass {lebhart} - {2023/01/02} {} + {2023/01/05} {} {A colorful article style} \tl_const:Nn \l__colorclass_base_class_tl { article } diff --git a/Master/texmf-dist/tex/latex/minimalist/minimalist-classical.sty b/Master/texmf-dist/tex/latex/minimalist/minimalist-classical.sty index 513c8e7f55e..0ea75181ce4 100644 --- a/Master/texmf-dist/tex/latex/minimalist/minimalist-classical.sty +++ b/Master/texmf-dist/tex/latex/minimalist/minimalist-classical.sty @@ -2,7 +2,7 @@ %% This is file `minimalist/minimalist-classical.sty', %% generated with the docstrip utility. %% -%% Copyright (C) 2021-2022 by Jinwen XU +%% Copyright (C) 2021-2023 by Jinwen XU %% %% This is part of the minimalist class series. %% @@ -18,8 +18,8 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplPackage {minimalist-classical} - {2023/01/02} {} - {The classical style of minimalist} + {2023/01/05} {} + {The "classical" style of minimalist} \IfPackageLoadedTF { minimalist } {} { @@ -318,6 +318,7 @@ \renewcommand{\partstring}{第 \nobreakspace\thepart\nobreakspace 部} } + \bool_if:NTF \l__minimalist_is_book_bool { \setcounter{secnumdepth}{3} @@ -478,6 +479,7 @@ \titlespacing{\subsubsection}{0pt}{.5\baselineskip plus .2\baselineskip minus .1\baselineskip}{.3\baselineskip plus .2\baselineskip minus .1\baselineskip} } + %%================================ %% ToC format %%================================ @@ -521,8 +523,8 @@ \titlecontents{section} [2em] % i.e., 0em (part) + 2em {\normalfont} - {\contentslabel[ \minimalist_apply_title_numbering_style_static:n { \thecontentslabel } ]{1.75em}} - {\hspace*{-1.75em}} + {\contentslabel[ \minimalist_apply_title_numbering_style_static:n { \thecontentslabel } ]{1.5em}} + {\hspace*{-1.5em}} {\titlerule*[1em]{\textcolor{main-text!15!paper}{.}}\contentspage} \titlecontents{subsection} [4.75em] % i.e., 2em (section) + 2.75em @@ -761,10 +763,14 @@ heading_suffix "}\n" } } + + \RequirePackage { projlib-theorem } \SetTheorem { proof, proof* } { qed-symbol = { \customqedsymbol } } + + \exp_args:No \SetTheorem { \c_projlib_theorem_supported_clist, theorem-with-name } { name style = { diff --git a/Master/texmf-dist/tex/latex/minimalist/minimalist-flow.sty b/Master/texmf-dist/tex/latex/minimalist/minimalist-flow.sty index f85b6c15c40..acc236efe5f 100644 --- a/Master/texmf-dist/tex/latex/minimalist/minimalist-flow.sty +++ b/Master/texmf-dist/tex/latex/minimalist/minimalist-flow.sty @@ -2,7 +2,7 @@ %% This is file `minimalist/minimalist-flow.sty', %% generated with the docstrip utility. %% -%% Copyright (C) 2021-2022 by Jinwen XU +%% Copyright (C) 2021-2023 by Jinwen XU %% %% This is part of the minimalist class series. %% @@ -18,8 +18,8 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplPackage {minimalist-flow} - {2023/01/02} {} - {The flow style of minimalist} + {2023/01/05} {} + {The "flow" style of minimalist} \IfPackageLoadedTF { minimalist } {} { @@ -78,13 +78,7 @@ \tl_gset:Nn \g_minimalist_title_font_chapter_tl { \minimalist_bfseries: \g_minimalist_title_font_common_tl \minimalist_scshape: } \tl_gset:Nn \g_minimalist_title_font_section_tl { \minimalist_bfseries: \g_minimalist_title_font_common_tl \minimalist_scshape: } \tl_gset:Nn \g_minimalist_title_font_subsection_tl { \minimalist_bfseries: \g_minimalist_title_font_common_tl \minimalist_scshape: } -% \bool_if:NTF \l__minimalist_runin_bool -% { - \tl_gset:Nn \g_minimalist_title_font_subsubsection_tl { \itshape \g_minimalist_title_font_common_tl } -% } -% { -% \tl_gset:Nn \g_minimalist_title_font_subsubsection_tl { \minimalist_bfseries: \g_minimalist_title_font_common_tl } -% } +\tl_gset:Nn \g_minimalist_title_font_subsubsection_tl { \itshape \g_minimalist_title_font_common_tl } \tl_gset:Nn \g_minimalist_title_font_paragraph_tl { \minimalist_bfseries: \g_minimalist_title_font_common_tl \minimalist_scshape: } \bool_if:NF \l__minimalist_fast_bool @@ -96,18 +90,6 @@ \RequirePackage { tikzpagenodes } % For `current page text area` } -\bool_if:NTF \l__minimalist_fast_bool - { - \tl_const:Nn \l_minimalist_sep_bar { $|$ } - } - { - \tl_const:Nn \l_minimalist_sep_bar - { - \skip_horizontal:n { .1em } - \tikz[baseline=.125em] \draw[line~width=.9pt] (0,0) -- (0,.9em); - \skip_horizontal:n { .1em } - } - } %%================================ %% Footer @@ -289,7 +271,6 @@ { \tl_set:Nx \l_tmpa_tl { #1 } \regex_replace_all:nnN { (\w) } { \c{minimalist_original_bfseries:}{\1} } \l_tmpa_tl - % \regex_replace_all:nnN { (\d) } { {\c{usefont}{U}{zeur}{b}{n}\1} } \l_tmpa_tl \regex_replace_all:nnN { (\d) } { {\c{minimalist_title_numbering_apply_font:n}{\1}} } \l_tmpa_tl \textcolor { .!39!paper } { \normalfont \l_tmpa_tl } } @@ -299,7 +280,6 @@ \group_begin: \tl_set:Nx \l_tmpa_tl { #1 } \regex_replace_all:nnN { (\w) } { \c{minimalist_original_bfseries:}{\1} } \l_tmpa_tl - % \regex_replace_all:nnN { (\d) } { {\c{usefont}{U}{zeur}{b}{n}\1} } \l_tmpa_tl \regex_replace_all:nnN { (\d) } { {\c{minimalist_title_numbering_apply_font:n}{\1}} } \l_tmpa_tl \exp_args:Nnx \regex_count:nnN { \. } {#1} \l_tmpa_int \int_case:nn { \l_tmpa_int } @@ -332,6 +312,7 @@ \renewcommand{\partstring}{第 \nobreakspace\thepart\nobreakspace 部} } + \bool_if:NTF \l__minimalist_is_book_bool { \setcounter{secnumdepth}{3} @@ -488,6 +469,7 @@ \titlespacing{\subsubsection}{0pt}{.5\baselineskip plus .2\baselineskip minus .1\baselineskip}{.3\baselineskip plus .2\baselineskip minus .1\baselineskip} } + %%================================ %% ToC format %%================================ @@ -509,19 +491,19 @@ {\hspace*{-2em}} {\titlerule*[1em]{\textcolor{main-text!15!paper}{.}}\contentspage} \titlecontents{section} - [5em] % i.e., 2em (chapter) + 3em + [5.75em] % i.e., 2em (chapter) + 2.75em + 1em {\normalfont} {\contentslabel[ \minimalist_apply_title_numbering_style_static:n { \thecontentslabel } ]{2.75em}} {\hspace*{-2.75em}} {\titlerule*[1em]{\textcolor{main-text!15!paper}{.}}\contentspage} \titlecontents{subsection} - [9em] % i.e., 5em (section) + 4em + [10.5em] % i.e., 5.75em (section) + 3.75em + 1em {\normalfont} {\contentslabel[ \minimalist_apply_title_numbering_style_static:n { \thecontentslabel } ]{3.75em}} {\hspace*{-3.75em}} {\titlerule*[1em]{\textcolor{main-text!15!paper}{.}}\contentspage} \titlecontents{subsubsection} - [13.5em] % i.e., 9em (subsection) + 4.5em + [15.75em] % i.e., 10.5em (subsection) + 4.25em + 1em {\normalfont} {\contentslabel[ \minimalist_apply_title_numbering_style_static:n { \thecontentslabel } ]{4.25em}} {\hspace*{-4.25em}} @@ -531,20 +513,20 @@ \titlecontents{section} [2em] % i.e., 0em (part) + 2em {\normalfont} - {\contentslabel[ \minimalist_apply_title_numbering_style_static:n { \thecontentslabel } ]{1.75em}} - {\hspace*{-1.75em}} + {\contentslabel[ \minimalist_apply_title_numbering_style_static:n { \thecontentslabel } ]{1.5em}} + {\hspace*{-1.5em}} {\titlerule*[1em]{\textcolor{main-text!15!paper}{.}}\contentspage} \titlecontents{subsection} - [5em] % i.e., 2em (section) + 3em + [5em] % i.e., 2em (section) + 2.5em + 0.5em {\normalfont} - {\contentslabel[ \minimalist_apply_title_numbering_style_static:n { \thecontentslabel } ]{2.75em}} - {\hspace*{-2.75em}} + {\contentslabel[ \minimalist_apply_title_numbering_style_static:n { \thecontentslabel } ]{2.5em}} + {\hspace*{-2.5em}} {\titlerule*[1em]{\textcolor{main-text!15!paper}{.}}\contentspage} \titlecontents{subsubsection} - [9em] % i.e., 5em (subsection) + 4em + [9.5em] % i.e., 5em (subsection) + 3.5em + 1em {\normalfont} - {\contentslabel[ \minimalist_apply_title_numbering_style_static:n { \thecontentslabel } ]{3.75em}} - {\hspace*{-3.75em}} + {\contentslabel[ \minimalist_apply_title_numbering_style_static:n { \thecontentslabel } ]{3.5em}} + {\hspace*{-3.5em}} {\titlerule*[1em]{\textcolor{main-text!15!paper}{.}}\contentspage} } @@ -764,6 +746,8 @@ heading_suffix "}\n" } } + + \RequirePackage { projlib-theorem } \SetTheorem { proof, proof* } { qed-symbol = { \customqedsymbol } } diff --git a/Master/texmf-dist/tex/latex/minimalist/minimalist-plain.sty b/Master/texmf-dist/tex/latex/minimalist/minimalist-plain.sty index 705118b378e..ed4d399512c 100644 --- a/Master/texmf-dist/tex/latex/minimalist/minimalist-plain.sty +++ b/Master/texmf-dist/tex/latex/minimalist/minimalist-plain.sty @@ -2,7 +2,7 @@ %% This is file `minimalist/minimalist-plain.sty', %% generated with the docstrip utility. %% -%% Copyright (C) 2021-2022 by Jinwen XU +%% Copyright (C) 2021-2023 by Jinwen XU %% %% This is part of the minimalist class series. %% @@ -18,8 +18,8 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplPackage {minimalist-plain} - {2023/01/02} {} - {The plain style of minimalist} + {2023/01/05} {} + {The "plain" style of minimalist} \IfPackageLoadedTF { minimalist } {} { @@ -90,18 +90,6 @@ \RequirePackage { tikzpagenodes } % For `current page text area` } -\bool_if:NTF \l__minimalist_fast_bool - { - \tl_const:Nn \l_minimalist_sep_bar { $|$ } - } - { - \tl_const:Nn \l_minimalist_sep_bar - { - \skip_horizontal:n { .1em } - \tikz[baseline=.125em] \draw[line~width=.9pt] (0,0) -- (0,.9em); - \skip_horizontal:n { .1em } - } - } %%================================ %% Footer @@ -284,7 +272,7 @@ \tl_set:Nx \l_tmpa_tl { #1 } \regex_replace_all:nnN { (\w) } { \c{minimalist_original_bfseries:}{\1} } \l_tmpa_tl \regex_replace_all:nnN { (\d) } { {\c{minimalist_title_numbering_apply_font:n}{\1}} } \l_tmpa_tl - \textcolor { main-text!39!paper } { \normalfont \l_tmpa_tl } + \textcolor { .!39!paper } { \normalfont \l_tmpa_tl } } \cs_new_protected:Nn \minimalist_apply_title_numbering_style:n @@ -296,10 +284,10 @@ \exp_args:Nnx \regex_count:nnN { \. } {#1} \l_tmpa_int \int_case:nn { \l_tmpa_int } { - { 0 } { \textcolor { main-text!24!paper } } - { 1 } { \textcolor { main-text!39!paper } } - { 2 } { \textcolor { main-text!39!paper } } - { 3 } { \smaller[2] \textcolor { main-text!24!paper } } + { 0 } { \textcolor { .!24!paper } } + { 1 } { \textcolor { .!39!paper } } + { 2 } { \textcolor { .!39!paper } } + { 3 } { \smaller[2] \textcolor { .!24!paper } } } \l_tmpa_tl \group_end: @@ -324,6 +312,7 @@ \renewcommand{\partstring}{第 \nobreakspace\thepart\nobreakspace 部} } + \bool_if:NTF \l__minimalist_is_book_bool { \setcounter{secnumdepth}{3} @@ -469,6 +458,7 @@ \titlespacing{\subsubsection}{0pt}{.5\baselineskip plus .2\baselineskip minus .1\baselineskip}{.3\baselineskip plus .2\baselineskip minus .1\baselineskip} } + %%================================ %% ToC format %%================================ @@ -490,19 +480,19 @@ {\hspace*{-2em}} {\titlerule*[1em]{\textcolor{main-text!15!paper}{.}}\contentspage} \titlecontents{section} - [5em] % i.e., 2em (chapter) + 3em + [5.75em] % i.e., 2em (chapter) + 2.75em + 1em {\normalfont} {\contentslabel[ \minimalist_apply_title_numbering_style_static:n { \thecontentslabel } ]{2.75em}} {\hspace*{-2.75em}} {\titlerule*[1em]{\textcolor{main-text!15!paper}{.}}\contentspage} \titlecontents{subsection} - [9em] % i.e., 5em (section) + 4em + [10.5em] % i.e., 5.75em (section) + 3.75em + 1em {\normalfont} {\contentslabel[ \minimalist_apply_title_numbering_style_static:n { \thecontentslabel } ]{3.75em}} {\hspace*{-3.75em}} {\titlerule*[1em]{\textcolor{main-text!15!paper}{.}}\contentspage} \titlecontents{subsubsection} - [13.5em] % i.e., 9em (subsection) + 4.5em + [15.75em] % i.e., 10.5em (subsection) + 4.25em + 1em {\normalfont} {\contentslabel[ \minimalist_apply_title_numbering_style_static:n { \thecontentslabel } ]{4.25em}} {\hspace*{-4.25em}} @@ -512,20 +502,20 @@ \titlecontents{section} [2em] % i.e., 0em (part) + 2em {\normalfont} - {\contentslabel[ \minimalist_apply_title_numbering_style_static:n { \thecontentslabel } ]{1.75em}} - {\hspace*{-1.75em}} + {\contentslabel[ \minimalist_apply_title_numbering_style_static:n { \thecontentslabel } ]{1.5em}} + {\hspace*{-1.5em}} {\titlerule*[1em]{\textcolor{main-text!15!paper}{.}}\contentspage} \titlecontents{subsection} - [5em] % i.e., 2em (section) + 3em + [5em] % i.e., 2em (section) + 2.5em + 0.5em {\normalfont} - {\contentslabel[ \minimalist_apply_title_numbering_style_static:n { \thecontentslabel } ]{2.75em}} - {\hspace*{-2.75em}} + {\contentslabel[ \minimalist_apply_title_numbering_style_static:n { \thecontentslabel } ]{2.5em}} + {\hspace*{-2.5em}} {\titlerule*[1em]{\textcolor{main-text!15!paper}{.}}\contentspage} \titlecontents{subsubsection} - [9em] % i.e., 5em (subsection) + 4em + [9.5em] % i.e., 5em (subsection) + 3.5em + 1em {\normalfont} - {\contentslabel[ \minimalist_apply_title_numbering_style_static:n { \thecontentslabel } ]{3.75em}} - {\hspace*{-3.75em}} + {\contentslabel[ \minimalist_apply_title_numbering_style_static:n { \thecontentslabel } ]{3.5em}} + {\hspace*{-3.5em}} {\titlerule*[1em]{\textcolor{main-text!15!paper}{.}}\contentspage} } @@ -745,10 +735,14 @@ heading_suffix "}\n" } } + + \RequirePackage { projlib-theorem } \SetTheorem { proof, proof* } { qed-symbol = { \customqedsymbol } } + + \exp_args:No \SetTheorem { \c_projlib_theorem_supported_clist, theorem-with-name } { name style = { diff --git a/Master/texmf-dist/tex/latex/minimalist/minimalist-stream.sty b/Master/texmf-dist/tex/latex/minimalist/minimalist-stream.sty index 9dbf900f895..e9e94eda465 100644 --- a/Master/texmf-dist/tex/latex/minimalist/minimalist-stream.sty +++ b/Master/texmf-dist/tex/latex/minimalist/minimalist-stream.sty @@ -2,7 +2,7 @@ %% This is file `minimalist/minimalist-stream.sty', %% generated with the docstrip utility. %% -%% Copyright (C) 2021-2022 by Jinwen XU +%% Copyright (C) 2021-2023 by Jinwen XU %% %% This is part of the minimalist class series. %% @@ -18,8 +18,8 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplPackage {minimalist-stream} - {2023/01/02} {} - {The stream style of minimalist} + {2023/01/05} {} + {The "stream" style of minimalist} \IfPackageLoadedTF { minimalist } {} { @@ -90,6 +90,7 @@ \RequirePackage { tikzpagenodes } % For `current page text area` } + %%================================ %% Footer %%================================ @@ -261,8 +262,6 @@ %% Title format %%================================ \RequirePackage [ explicit, newparttoc ] { titlesec } -% \renewcommand{\bottomtitlespace}{.1\textheight} -% \RequirePackage { needspace } \PassOptionsToPackage { normalem } { ulem } \RequirePackage { ulem } @@ -272,9 +271,8 @@ { \tl_set:Nx \l_tmpa_tl { #1 } \regex_replace_all:nnN { (\w) } { \c{minimalist_original_bfseries:}{\1} } \l_tmpa_tl - % \regex_replace_all:nnN { (\d) } { {\c{usefont}{U}{zeur}{b}{n}\1} } \l_tmpa_tl \regex_replace_all:nnN { (\d) } { {\c{minimalist_title_numbering_apply_font:n}{\1}} } \l_tmpa_tl - \textcolor { main-text!39!paper } { \normalfont \l_tmpa_tl } + \textcolor { .!39!paper } { \normalfont \l_tmpa_tl } } \cs_new_protected:Nn \minimalist_apply_title_numbering_style:n @@ -282,15 +280,14 @@ \group_begin: \tl_set:Nx \l_tmpa_tl { #1 } \regex_replace_all:nnN { (\w) } { \c{minimalist_original_bfseries:}{\1} } \l_tmpa_tl - % \regex_replace_all:nnN { (\d) } { {\c{usefont}{U}{zeur}{b}{n}\1} } \l_tmpa_tl \regex_replace_all:nnN { (\d) } { {\c{minimalist_title_numbering_apply_font:n}{\1}} } \l_tmpa_tl \exp_args:Nnx \regex_count:nnN { \. } {#1} \l_tmpa_int \int_case:nn { \l_tmpa_int } { - { 0 } { \textcolor { main-text!39!paper } } - { 1 } { \textcolor { main-text!39!paper } } - { 2 } { \textcolor { main-text!39!paper } } - { 3 } { \smaller[2] \textcolor { main-text!24!paper } } + { 0 } { \textcolor { .!39!paper } } + { 1 } { \textcolor { .!39!paper } } + { 2 } { \textcolor { .!39!paper } } + { 3 } { \smaller[2] \textcolor { .!24!paper } } } \l_tmpa_tl \group_end: @@ -315,7 +312,6 @@ \renewcommand{\partstring}{第 \nobreakspace\thepart\nobreakspace 部} } - \dim_new:N \l_minimalist_title_sep_dim \dim_set:Nn \l_minimalist_title_sep_dim { 1em } @@ -490,11 +486,6 @@ \titlespacing{\subsection}{0pt}{.6\baselineskip plus .2\baselineskip minus .1\baselineskip}{0pt} \titlespacing{\subsubsection}{0pt}{.5\baselineskip plus .1\baselineskip minus .1\baselineskip}{0pt} -\hook_gput_code:nnn { package/bookmark/after } { minimalist } - { - \tl_gset:NV \toclevel@sectionsub \toclevel@subsection - } - %% \sectionsub \titleclass{\sectionsub}{straight}[\section] \newcounter{sectionsub} @@ -526,6 +517,11 @@ \titlespacing{\sectionsub}{0pt}{.8\baselineskip plus .4\baselineskip minus .2\baselineskip}{.6\baselineskip plus .2\baselineskip minus .1\baselineskip} +\hook_gput_code:nnn { package/bookmark/after } { minimalist } + { + \tl_gset:NV \toclevel@sectionsub \toclevel@subsection + } + %%================================ %% ToC format %%================================ @@ -547,28 +543,28 @@ {\hspace*{-2em}} {\titlerule*[1em]{\textcolor{main-text!15!paper}{.}}\contentspage} \titlecontents{section} - [5em] % i.e., 2em (chapter) + 3em + [5.75em] % i.e., 2em (chapter) + 2.75em + 1em {\normalfont} - {\contentslabel[ \minimalist_apply_title_numbering_style_static:n { \thecontentslabel } ]{2.5em}} - {\hspace*{-2.5em}} + {\contentslabel[ \minimalist_apply_title_numbering_style_static:n { \thecontentslabel } ]{2.75em}} + {\hspace*{-2.75em}} {\titlerule*[1em]{\textcolor{main-text!15!paper}{.}}\contentspage} \titlecontents{sectionsub} - [9em] % i.e., 5em (section) + 4em + [10.5em] % i.e., 5.75em (section) + 3.75em + 1em {\normalfont} - {\contentslabel[ \minimalist_apply_title_numbering_style_static:n { \thecontentslabel } ]{3.5em}} - {\hspace*{-3.5em}} + {\contentslabel[ \minimalist_apply_title_numbering_style_static:n { \thecontentslabel } ]{3.75em}} + {\hspace*{-3.75em}} {\titlerule*[1em]{\textcolor{main-text!15!paper}{.}}\contentspage} \titlecontents{subsection} - [9em] % i.e., 5em (section) + 4em + [10.5em] % i.e., 5.75em (section) + 3.75em + 1em {\normalfont} - {\contentslabel[ \minimalist_apply_title_numbering_style_static:n { \thecontentslabel } ]{3.5em}} - {\hspace*{-3.5em}} + {\contentslabel[ \minimalist_apply_title_numbering_style_static:n { \thecontentslabel } ]{3.75em}} + {\hspace*{-3.75em}} {\titlerule*[1em]{\textcolor{main-text!15!paper}{.}}\contentspage} \titlecontents{subsubsection} - [13.5em] % i.e., 9em (subsection) + 4.5em + [15.75em] % i.e., 10.5em (subsection) + 4.25em + 1em {\normalfont} - {\contentslabel[ \minimalist_apply_title_numbering_style_static:n { \thecontentslabel } ]{4.0em}} - {\hspace*{-4.0em}} + {\contentslabel[ \minimalist_apply_title_numbering_style_static:n { \thecontentslabel } ]{4.25em}} + {\hspace*{-4.25em}} {\titlerule*[1em]{\textcolor{main-text!15!paper}{.}}\contentspage} } { @@ -579,13 +575,13 @@ {\hspace*{-1.5em}} {\titlerule*[1em]{\textcolor{main-text!15!paper}{.}}\contentspage} \titlecontents{subsection} - [5em] % i.e., 2em (section) + 3em + [5em] % i.e., 2em (section) + 2.5em + 0.5em {\normalfont} {\contentslabel[ \minimalist_apply_title_numbering_style_static:n { \thecontentslabel } ]{2.5em}} {\hspace*{-2.5em}} {\titlerule*[1em]{\textcolor{main-text!15!paper}{.}}\contentspage} \titlecontents{subsubsection} - [9em] % i.e., 5em (subsection) + 4em + [9.5em] % i.e., 5em (subsection) + 3.5em + 1em {\normalfont} {\contentslabel[ \minimalist_apply_title_numbering_style_static:n { \thecontentslabel } ]{3.5em}} {\hspace*{-3.5em}} @@ -817,13 +813,6 @@ heading_suffix "}\n" . \hspace{.5em} } -% \RequirePackage { regexpatch } -% \xpatchcmd{\proof}{\topsep6\p@\@plus6\p@\relax}{\topsep3\p@\@plus3\p@\relax}{}{} - -\newcommand{\customqedsymbol}{ - \makebox[1em]{\color{.!27!paper}\rule[-0.1em]{.95em}{.95em}}} -\let\qedsymbol\customqedsymbol - \def\simpleqedsymbol{ \makebox[1em]{\rlap{\textcolor{main-text!12!paper}{\rule[-0.1em]{.95em}{.95em}}}{\kern.07em\raisebox{.07em}{\textcolor{paper}{\rule[-0.1em]{.81em}{.81em}}}\kern.07em}}} \DeclareRobustCommand{\simpleqed}{% @@ -836,6 +825,10 @@ heading_suffix "}\n" \def\@endtheorem{\popQED\endtrivlist\@endpefalse} +\newcommand{\customqedsymbol}{ + \makebox[1em]{\color{.!27!paper}\rule[-0.1em]{.95em}{.95em}}} +\let\qedsymbol\customqedsymbol + \bool_if:NTF \l__minimalist_fast_bool { \RequirePackage { hyperref } @@ -856,12 +849,14 @@ heading_suffix "}\n" } } + \PassOptionsToPackage { theorem-style = { remark = simple-inline, proof = proof } } { projlib-theorem } \RequirePackage { projlib-theorem } \SetTheorem { proof, proof* } { qed-symbol = { \customqedsymbol } } + \exp_args:No \SetTheorem { \c_projlib_theorem_supported_clist, theorem-with-name, proof } { shared counter = subsection } \exp_args:No \SetTheorem { \c_projlib_theorem_supported_clist, theorem-with-name } diff --git a/Master/texmf-dist/tex/latex/minimalist/minimalist.sty b/Master/texmf-dist/tex/latex/minimalist/minimalist.sty index dbc9de5a038..0266993cec4 100644 --- a/Master/texmf-dist/tex/latex/minimalist/minimalist.sty +++ b/Master/texmf-dist/tex/latex/minimalist/minimalist.sty @@ -2,7 +2,7 @@ %% This is file `minimalist/minimalist.sty', %% generated with the docstrip utility. %% -%% Copyright (C) 2021-2022 by Jinwen XU +%% Copyright (C) 2021-2023 by Jinwen XU %% %% This is part of the minimalist class series. %% @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplPackage {minimalist} - {2023/01/02} {} + {2023/01/05} {} {A simple and clear style for articles and books} \keys_define:nn { minimalist } diff --git a/Master/texmf-dist/tex/latex/minimalist/minimart.cls b/Master/texmf-dist/tex/latex/minimalist/minimart.cls index 7d2debb6bf1..14681ba41d1 100644 --- a/Master/texmf-dist/tex/latex/minimalist/minimart.cls +++ b/Master/texmf-dist/tex/latex/minimalist/minimart.cls @@ -2,7 +2,7 @@ %% This is file `minimalist/minimart.cls', %% generated with the docstrip utility. %% -%% Copyright (C) 2021-2022 by Jinwen XU +%% Copyright (C) 2021-2023 by Jinwen XU %% %% This is part of the minimalist class series. %% @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplClass {minimart} - {2023/01/02} {} + {2023/01/05} {} {A simple and clear article style} \tl_const:Nn \l__minimclass_base_class_tl { article } diff --git a/Master/texmf-dist/tex/latex/minimalist/minimbook.cls b/Master/texmf-dist/tex/latex/minimalist/minimbook.cls index be112f4f525..63d84a04a03 100644 --- a/Master/texmf-dist/tex/latex/minimalist/minimbook.cls +++ b/Master/texmf-dist/tex/latex/minimalist/minimbook.cls @@ -2,7 +2,7 @@ %% This is file `minimalist/minimbook.cls', %% generated with the docstrip utility. %% -%% Copyright (C) 2021-2022 by Jinwen XU +%% Copyright (C) 2021-2023 by Jinwen XU %% %% This is part of the minimalist class series. %% @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplClass {minimbook} - {2023/01/02} {} + {2023/01/05} {} {A simple and clear book style} \tl_const:Nn \l__minimclass_base_class_tl { book } diff --git a/Master/texmf-dist/tex/latex/projlib/ProjLib.sty b/Master/texmf-dist/tex/latex/projlib/ProjLib.sty index 6795295fb53..9eae2de74ad 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/01/03} {} + {2023/01/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 512b6c19ed2..e4a551c336e 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/01/03} {} + {2023/01/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 ff01ee7032c..d7f7beefe81 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/01/03} {} + {2023/01/05} {} {Convert numeric date-time string to natural language} \tl_new:N \g__projlib_datetime_input_format_tl @@ -97,8 +97,10 @@ \NewDocumentCommand \ProjLibSetDatetimeInputFormat { m } { - \projlib_datetime_set_input_format:n { #1 } + \tl_set:Nn \l_tmpa_tl { \exp_args:Ne \tl_trim_spaces:n { #1 } } + \exp_args:Ne \projlib_datetime_set_input_format:n { \l_tmpa_tl } } +\ProvideDocumentCommand \SetDatetimeInputFormat {} { \ProjLibSetDatetimeInputFormat } \seq_new:N \l__projlib_datetime_date_seq @@ -231,7 +233,7 @@ \regex_match:nnTF { \A \d{1,2}-\d{1,2}-\d{4} \Z } { #1 } { \seq_set_split:Nnn \l__projlib_datetime_date_seq { - } { #1 } - \cs_if_exist_use:c { projlib_datetime_display_month_day_year #2 _ \languagename :nnn } + \cs_if_exist_use:c { projlib_datetime_display_year_month_day #2 _ \languagename :nnn } { \int_eval:n { \seq_item:Nn \l__projlib_datetime_date_seq { 3 } } } % year { \int_eval:n { \seq_item:Nn \l__projlib_datetime_date_seq { 1 } } } % month { \int_eval:n { \seq_item:Nn \l__projlib_datetime_date_seq { 2 } } } % day @@ -275,7 +277,7 @@ \regex_match:nnTF { \A \d{1,2}-\d{1,2}-\d{4} \Z } { #1 } { \seq_set_split:Nnn \l__projlib_datetime_date_seq { - } { #1 } - \cs_if_exist_use:c { projlib_datetime_display_day_month_year #2 _ \languagename :nnn } + \cs_if_exist_use:c { projlib_datetime_display_year_month_day #2 _ \languagename :nnn } { \int_eval:n { \seq_item:Nn \l__projlib_datetime_date_seq { 3 } } } % year { \int_eval:n { \seq_item:Nn \l__projlib_datetime_date_seq { 2 } } } % month { \int_eval:n { \seq_item:Nn \l__projlib_datetime_date_seq { 1 } } } % day @@ -318,6 +320,7 @@ } } } +\cs_generate_variant:Nn \__projlib_datetime_date_parse_year_month_day:n { e } \cs_new_protected:Nn \__projlib_datetime_date_parse_month_day_year:n { @@ -335,6 +338,7 @@ } } } +\cs_generate_variant:Nn \__projlib_datetime_date_parse_month_day_year:n { e } \cs_new_protected:Nn \__projlib_datetime_date_parse_day_month_year:n { @@ -352,6 +356,7 @@ } } } +\cs_generate_variant:Nn \__projlib_datetime_date_parse_day_month_year:n { e } \cs_new:Nn \__projlib_datetime_input_format_to_str: { @@ -365,7 +370,9 @@ \cs_new_protected:Nn \__projlib_datetime_display_date_according_to_format:nn { - \cs_if_exist_use:c { __projlib_datetime_date_parse_ \__projlib_datetime_input_format_to_str: :n } { #1 } + \tl_set:Nx \l_tmpa_tl { #1 } + \regex_replace_all:nnN { \D } { - } \l_tmpa_tl + \cs_if_exist_use:c { __projlib_datetime_date_parse_ \__projlib_datetime_input_format_to_str: :e } { \l_tmpa_tl } \str_case_e:nnF { \l__projlib_datetime_output_format_tl } { { only-year-month } @@ -505,7 +512,9 @@ \cs_new_protected:Nn \projlib_datetime_calculate_week_according_to_format:n { - \cs_if_exist_use:c { __projlib_datetime_date_parse_ \__projlib_datetime_input_format_to_str: :n } { #1 } + \tl_set:Nx \l_tmpa_tl { #1 } + \regex_replace_all:nnN { \D } { - } \l_tmpa_tl + \cs_if_exist_use:c { __projlib_datetime_date_parse_ \__projlib_datetime_input_format_to_str: :e } { \l_tmpa_tl } \__projlib_datetime_calculate_day_of_week_with_year_month_day:nnn { \int_eval:n { \seq_item:Nn \l__projlib_datetime_date_seq { 1 } } } { \int_eval:n { \seq_item:Nn \l__projlib_datetime_date_seq { 2 } } } diff --git a/Master/texmf-dist/tex/latex/projlib/projlib-draft.sty b/Master/texmf-dist/tex/latex/projlib/projlib-draft.sty index 182321367cc..c525cddb585 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/01/03} {} + {2023/01/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 49d2aeefe61..b9479d11145 100644 --- a/Master/texmf-dist/tex/latex/projlib/projlib-font.sty +++ b/Master/texmf-dist/tex/latex/projlib/projlib-font.sty @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplPackage {projlib-font} - {2023/01/03} {} + {2023/01/05} {} {Font selection and configuration} \keys_define:nn { projlib-font } diff --git a/Master/texmf-dist/tex/latex/projlib/projlib-language.sty b/Master/texmf-dist/tex/latex/projlib/projlib-language.sty index 0b4de874ba7..617f7ee4d92 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/01/03} {} + {2023/01/05} {} {Multi-language configuration} \clist_const:Nn \c__projlib_language_supported_clist @@ -574,27 +574,49 @@ } \msg_new:nnn { projlib-language } - { language-not-support } + { language-not-supported } { The~language~"#1"~is~not~supported. } +\msg_new:nnn { projlib-language } + { language-not-enabled } + { The~language~"#1"~is~not~enabled. } \cs_new:Nn \projlib_language_use_language_locally:nn { - \cs_if_exist_use:cF { projlib_language_apply_settings_locally_ \projlib_language_str_to_languagename:n { #1 } :n } + \cs_if_exist:cTF { projlib_language_apply_settings_locally_ \projlib_language_str_to_languagename:n { #1 } :n } { - \msg_warning:nnn { projlib-language } { language-not-support } { #1 } + \bool_if:cTF { g__projlib_language_enabled_ \projlib_language_str_to_languagename:n { #1 } _bool } + { + \use:c { projlib_language_apply_settings_locally_ \projlib_language_str_to_languagename:n { #1 } :n } { #2 } + } + { + \msg_warning:nnn { projlib-language } { language-not-enabled } { #1 } + #2 + } + } + { + \msg_warning:nnn { projlib-language } { language-not-supported } { #1 } + #2 } - { #2 } } \cs_generate_variant:Nn \projlib_language_use_language_locally:nn { e } \cs_new:Nn \projlib_language_use_language:n { - \cs_if_exist_use:cF { projlib_language_apply_settings_globally_ \projlib_language_str_to_languagename:n { #1 } : } + \cs_if_exist:cTF { projlib_language_apply_settings_globally_ \projlib_language_str_to_languagename:n { #1 } : } + { + \bool_if:cTF { g__projlib_language_enabled_ \projlib_language_str_to_languagename:n { #1 } _bool } + { + \use:c { projlib_language_apply_settings_globally_ \projlib_language_str_to_languagename:n { #1 } : } + \cs_if_exist_use:c { g_projlib_language_linespacing_ \projlib_language_str_to_languagetype:n { #1 } _tl } + \cs_if_exist_use:c { g_projlib_language_parindent_ \projlib_language_str_to_languagetype:n { #1 } _tl } + } + { + \msg_warning:nnn { projlib-language } { language-not-enabled } { #1 } + } + } { - \msg_warning:nnn { projlib-language } { language-not-support } { #1 } + \msg_warning:nnn { projlib-language } { language-not-supported } { #1 } } - \cs_if_exist_use:c { g_projlib_language_linespacing_ \projlib_language_str_to_languagetype:n { #1 } _tl } - \cs_if_exist_use:c { g_projlib_language_parindent_ \projlib_language_str_to_languagetype:n { #1 } _tl } } \cs_generate_variant:Nn \projlib_language_use_language:n { e } diff --git a/Master/texmf-dist/tex/latex/projlib/projlib-logo.sty b/Master/texmf-dist/tex/latex/projlib/projlib-logo.sty index ba759d970ea..e7f131c4ef8 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/01/03} {} + {2023/01/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 dbf66f7e4c2..d7eec1d5cfa 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/01/03} {} + {2023/01/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 0a91ba9c116..d5737c21796 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/01/03} {} + {2023/01/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 20036b1e0eb..bca4821e01b 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/01/03} {} + {2023/01/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 77a342ac3a4..209c1d55eb4 100644 --- a/Master/texmf-dist/tex/latex/projlib/projlib-theorem.sty +++ b/Master/texmf-dist/tex/latex/projlib/projlib-theorem.sty @@ -18,48 +18,55 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplPackage {projlib-theorem} - {2023/01/03} {} + {2023/01/05} {} {Configuration of theorem-like environments} \keys_define:nn { projlib-theorem } { - , no-theorems .bool_set:N = \l__projlib_theorem_no_theorems_bool - , no-theorems .initial:n = { false } - , no~theorems .bool_set:N = \l__projlib_theorem_no_theorems_bool - , no theorems .bool_set:N = \l__projlib_theorem_no_theorems_bool - , nothms .bool_set:N = \l__projlib_theorem_no_theorems_bool - , no-theorem-numbering .bool_set:N = \l__projlib_theorem_no_theorem_numbering_bool - , no-theorem-numbering .initial:n = { false } - , no~theorem~numbering .bool_set:N = \l__projlib_theorem_no_theorem_numbering_bool - , no theorem numbering .bool_set:N = \l__projlib_theorem_no_theorem_numbering_bool - , nothmnum .bool_set:N = \l__projlib_theorem_no_theorem_numbering_bool - , theorem-numbering .tl_set:N = \l__projlib_theorem_theorem_numbering_tl - , theorem-numbering .default:n = { * } - , theorem~numbering .tl_set:N = \l__projlib_theorem_theorem_numbering_tl - , theorem~numbering .default:n = { * } - , theorem numbering .tl_set:N = \l__projlib_theorem_theorem_numbering_tl - , theorem numbering .default:n = { * } - , thmnum .tl_set:N = \l__projlib_theorem_theorem_numbering_tl - , thmnum .default:n = { * } - , theorem-style .tl_set:N = \l__projlib_theorem_theorem_style_tl - , theorem-style .initial:n = { } - , theorem-style .value_required:n = true - , theorem~style .tl_set:N = \l__projlib_theorem_theorem_style_tl - , theorem~style .value_required:n = true - , theorem style .tl_set:N = \l__projlib_theorem_theorem_style_tl - , theorem style .value_required:n = true - , complex-name .bool_set:N = \l__projlib_theorem_complexname_bool - , complex-name .initial:n = { true } - , complex~name .bool_set:N = \l__projlib_theorem_complexname_bool - , complex name .bool_set:N = \l__projlib_theorem_complexname_bool - , simple-name .bool_set_inverse:N = \l__projlib_theorem_complexname_bool - , simple~name .bool_set_inverse:N = \l__projlib_theorem_complexname_bool - , simple name .bool_set_inverse:N = \l__projlib_theorem_complexname_bool - , no-preset-names .bool_set_inverse:N = \l__projlib_theorem_presetname_bool - , no-preset-names .initial:n = { false } - , no~preset~names .bool_set_inverse:N = \l__projlib_theorem_presetname_bool - , no preset names .bool_set_inverse:N = \l__projlib_theorem_presetname_bool - , unknown .code:n = { \PassOptionsToPackage { \CurrentOption } { create-theorem } } + , no-theorems .bool_set:N = \l__projlib_theorem_no_theorems_bool + , no-theorems .initial:n = { false } + , no~theorems .bool_set:N = \l__projlib_theorem_no_theorems_bool + , no theorems .bool_set:N = \l__projlib_theorem_no_theorems_bool + , nothms .bool_set:N = \l__projlib_theorem_no_theorems_bool + , no-theorem-numbering .bool_set:N = \l__projlib_theorem_no_theorem_numbering_bool + , no-theorem-numbering .initial:n = { false } + , no~theorem~numbering .bool_set:N = \l__projlib_theorem_no_theorem_numbering_bool + , no theorem numbering .bool_set:N = \l__projlib_theorem_no_theorem_numbering_bool + , nothmnum .bool_set:N = \l__projlib_theorem_no_theorem_numbering_bool + , theorem-numbering .tl_set:N = \l__projlib_theorem_theorem_numbering_tl + , theorem-numbering .default:n = { * } + , theorem~numbering .tl_set:N = \l__projlib_theorem_theorem_numbering_tl + , theorem~numbering .default:n = { * } + , theorem numbering .tl_set:N = \l__projlib_theorem_theorem_numbering_tl + , theorem numbering .default:n = { * } + , thmnum .tl_set:N = \l__projlib_theorem_theorem_numbering_tl + , thmnum .default:n = { * } + , separate-theorem-numbering .bool_set:N = \l__projlib_theorem_separate_theorem_numbering_bool + , separate-theorem-numbering .initial:n = { false } + , separate~theorem~numbering .bool_set:N = \l__projlib_theorem_separate_theorem_numbering_bool + , separate theorem numbering .bool_set:N = \l__projlib_theorem_separate_theorem_numbering_bool + , number-theorems-separately .bool_set:N = \l__projlib_theorem_separate_theorem_numbering_bool + , number~theorems~separately .bool_set:N = \l__projlib_theorem_separate_theorem_numbering_bool + , number theorems separately .bool_set:N = \l__projlib_theorem_separate_theorem_numbering_bool + , theorem-style .tl_set:N = \l__projlib_theorem_theorem_style_tl + , theorem-style .initial:n = { } + , theorem-style .value_required:n = true + , theorem~style .tl_set:N = \l__projlib_theorem_theorem_style_tl + , theorem~style .value_required:n = true + , theorem style .tl_set:N = \l__projlib_theorem_theorem_style_tl + , theorem style .value_required:n = true + , complex-name .bool_set:N = \l__projlib_theorem_complexname_bool + , complex-name .initial:n = { true } + , complex~name .bool_set:N = \l__projlib_theorem_complexname_bool + , complex name .bool_set:N = \l__projlib_theorem_complexname_bool + , simple-name .bool_set_inverse:N = \l__projlib_theorem_complexname_bool + , simple~name .bool_set_inverse:N = \l__projlib_theorem_complexname_bool + , simple name .bool_set_inverse:N = \l__projlib_theorem_complexname_bool + , no-preset-names .bool_set_inverse:N = \l__projlib_theorem_presetname_bool + , no-preset-names .initial:n = { false } + , no~preset~names .bool_set_inverse:N = \l__projlib_theorem_presetname_bool + , no preset names .bool_set_inverse:N = \l__projlib_theorem_presetname_bool + , unknown .code:n = { \PassOptionsToPackage { \CurrentOption } { create-theorem } } } \ProcessKeyOptions [ projlib-theorem ] @@ -167,22 +174,41 @@ \cs_if_exist:cTF { c@chapter } { % with \chapter \CreateTheorem { theorem } { parent counter = chapter, create starred version } + \bool_if:NT \l__projlib_theorem_separate_theorem_numbering_bool + { + \exp_args:Nv \CreateTheorem { c_projlib_theorem_supported_clist } { parent counter = chapter, create starred version } + } } { % without \chapter \CreateTheorem { theorem } { parent counter = section, create starred version } + \bool_if:NT \l__projlib_theorem_separate_theorem_numbering_bool + { + \exp_args:Nv \CreateTheorem { c_projlib_theorem_supported_clist } { parent counter = section, create starred version } + } } } { \tl_if_eq:NnTF \l__projlib_theorem_theorem_numbering_tl { * } { \CreateTheorem { theorem } { create starred version } + \bool_if:NT \l__projlib_theorem_separate_theorem_numbering_bool + { + \exp_args:Nv \CreateTheorem { c_projlib_theorem_supported_clist } { create starred version } + } } { \CreateTheorem { theorem } { parent counter = \l__projlib_theorem_theorem_numbering_tl, create starred version } + \bool_if:NT \l__projlib_theorem_separate_theorem_numbering_bool + { + \exp_args:Nv \CreateTheorem { c_projlib_theorem_supported_clist } { parent counter = \l__projlib_theorem_theorem_numbering_tl, create starred version } + } } } - \exp_args:Nv \CreateTheorem { c_projlib_theorem_supported_clist } { shared counter = theorem, create starred version, quiet } + \bool_if:NF \l__projlib_theorem_separate_theorem_numbering_bool + { + \exp_args:Nv \CreateTheorem { c_projlib_theorem_supported_clist } { shared counter = theorem, create starred version, quiet } + } } } diff --git a/Master/texmf-dist/tex/latex/projlib/projlib-titlepage.sty b/Master/texmf-dist/tex/latex/projlib/projlib-titlepage.sty index e92d08d38ab..dfe0f7d7e53 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/01/03} {} + {2023/01/05} {} {Commands for rendering the title page} \keys_define:nn { projlib-titlepage } diff --git a/Master/texmf-dist/tex/latex/simplivre/simplivre.cls b/Master/texmf-dist/tex/latex/simplivre/simplivre.cls index 63a861edea6..b49f3d82e9a 100644 --- a/Master/texmf-dist/tex/latex/simplivre/simplivre.cls +++ b/Master/texmf-dist/tex/latex/simplivre/simplivre.cls @@ -2,7 +2,7 @@ %% This is file `simplivre/simplivre.cls', %% generated with the docstrip utility. %% -%% Copyright (C) 2021-2022 by Jinwen XU +%% Copyright (C) 2021-2023 by Jinwen XU %% %% This is part of the minimalist class series. %% @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplClass {simplivre} - {2023/01/02} {} + {2023/01/05} {} {A simple and clear book style} \tl_const:Nn \l__minimclass_base_class_tl { book } diff --git a/Master/tlpkg/tlpsrc/beaulivre.tlpsrc b/Master/tlpkg/tlpsrc/beaulivre.tlpsrc index 93b397bcf5e..20468181d04 100644 --- a/Master/tlpkg/tlpsrc/beaulivre.tlpsrc +++ b/Master/tlpkg/tlpsrc/beaulivre.tlpsrc @@ -1 +1 @@ -depend colorist +hard colorist
\ No newline at end of file diff --git a/Master/tlpkg/tlpsrc/colorist.tlpsrc b/Master/tlpkg/tlpsrc/colorist.tlpsrc index e69de29bb2d..21f065cd4f4 100644 --- a/Master/tlpkg/tlpsrc/colorist.tlpsrc +++ b/Master/tlpkg/tlpsrc/colorist.tlpsrc @@ -0,0 +1 @@ +hard projlib
\ No newline at end of file diff --git a/Master/tlpkg/tlpsrc/einfart.tlpsrc b/Master/tlpkg/tlpsrc/einfart.tlpsrc index 8c9facb7c43..0b83e85a469 100644 --- a/Master/tlpkg/tlpsrc/einfart.tlpsrc +++ b/Master/tlpkg/tlpsrc/einfart.tlpsrc @@ -1 +1 @@ -depend minimalist +hard minimalist
\ No newline at end of file diff --git a/Master/tlpkg/tlpsrc/lebhart.tlpsrc b/Master/tlpkg/tlpsrc/lebhart.tlpsrc index 93b397bcf5e..20468181d04 100644 --- a/Master/tlpkg/tlpsrc/lebhart.tlpsrc +++ b/Master/tlpkg/tlpsrc/lebhart.tlpsrc @@ -1 +1 @@ -depend colorist +hard colorist
\ No newline at end of file diff --git a/Master/tlpkg/tlpsrc/minimalist.tlpsrc b/Master/tlpkg/tlpsrc/minimalist.tlpsrc index e69de29bb2d..21f065cd4f4 100644 --- a/Master/tlpkg/tlpsrc/minimalist.tlpsrc +++ b/Master/tlpkg/tlpsrc/minimalist.tlpsrc @@ -0,0 +1 @@ +hard projlib
\ No newline at end of file diff --git a/Master/tlpkg/tlpsrc/projlib.tlpsrc b/Master/tlpkg/tlpsrc/projlib.tlpsrc index e69de29bb2d..b8ee3af57fa 100644 --- a/Master/tlpkg/tlpsrc/projlib.tlpsrc +++ b/Master/tlpkg/tlpsrc/projlib.tlpsrc @@ -0,0 +1 @@ +hard create-theorem
\ No newline at end of file diff --git a/Master/tlpkg/tlpsrc/simplivre.tlpsrc b/Master/tlpkg/tlpsrc/simplivre.tlpsrc index 8c9facb7c43..0b83e85a469 100644 --- a/Master/tlpkg/tlpsrc/simplivre.tlpsrc +++ b/Master/tlpkg/tlpsrc/simplivre.tlpsrc @@ -1 +1 @@ -depend minimalist +hard minimalist
\ No newline at end of file |