summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/minimalist
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2023-01-07 03:07:46 +0000
committerNorbert Preining <norbert@preining.info>2023-01-07 03:07:46 +0000
commitc946b2e792715f6030486d5214be1df081de37a8 (patch)
treecd461cb5c2d7834ca03fbeee84717ed2dcb2b14b /macros/latex/contrib/minimalist
parent90bcf28fa05846213901e6a0fff80656a13bc701 (diff)
CTAN sync 202301070307
Diffstat (limited to 'macros/latex/contrib/minimalist')
-rw-r--r--macros/latex/contrib/minimalist/DEPENDS.txt1
-rw-r--r--macros/latex/contrib/minimalist/README.md41
-rw-r--r--macros/latex/contrib/minimalist/minimalist-classical.sty16
-rw-r--r--macros/latex/contrib/minimalist/minimalist-flow.sty54
-rw-r--r--macros/latex/contrib/minimalist/minimalist-plain.sty56
-rw-r--r--macros/latex/contrib/minimalist/minimalist-stream.sty73
-rw-r--r--macros/latex/contrib/minimalist/minimalist.sty4
-rw-r--r--macros/latex/contrib/minimalist/minimart.cls4
-rw-r--r--macros/latex/contrib/minimalist/minimbook.cls4
9 files changed, 117 insertions, 136 deletions
diff --git a/macros/latex/contrib/minimalist/DEPENDS.txt b/macros/latex/contrib/minimalist/DEPENDS.txt
new file mode 100644
index 0000000000..21f065cd4f
--- /dev/null
+++ b/macros/latex/contrib/minimalist/DEPENDS.txt
@@ -0,0 +1 @@
+hard projlib \ No newline at end of file
diff --git a/macros/latex/contrib/minimalist/README.md b/macros/latex/contrib/minimalist/README.md
index 3c4ecee278..a86486ba21 100644
--- a/macros/latex/contrib/minimalist/README.md
+++ b/macros/latex/contrib/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/macros/latex/contrib/minimalist/minimalist-classical.sty b/macros/latex/contrib/minimalist/minimalist-classical.sty
index 513c8e7f55..0ea75181ce 100644
--- a/macros/latex/contrib/minimalist/minimalist-classical.sty
+++ b/macros/latex/contrib/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/macros/latex/contrib/minimalist/minimalist-flow.sty b/macros/latex/contrib/minimalist/minimalist-flow.sty
index f85b6c15c4..acc236efe5 100644
--- a/macros/latex/contrib/minimalist/minimalist-flow.sty
+++ b/macros/latex/contrib/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/macros/latex/contrib/minimalist/minimalist-plain.sty b/macros/latex/contrib/minimalist/minimalist-plain.sty
index 705118b378..ed4d399512 100644
--- a/macros/latex/contrib/minimalist/minimalist-plain.sty
+++ b/macros/latex/contrib/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/macros/latex/contrib/minimalist/minimalist-stream.sty b/macros/latex/contrib/minimalist/minimalist-stream.sty
index 9dbf900f89..e9e94eda46 100644
--- a/macros/latex/contrib/minimalist/minimalist-stream.sty
+++ b/macros/latex/contrib/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/macros/latex/contrib/minimalist/minimalist.sty b/macros/latex/contrib/minimalist/minimalist.sty
index dbc9de5a03..0266993cec 100644
--- a/macros/latex/contrib/minimalist/minimalist.sty
+++ b/macros/latex/contrib/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/macros/latex/contrib/minimalist/minimart.cls b/macros/latex/contrib/minimalist/minimart.cls
index 7d2debb6bf..14681ba41d 100644
--- a/macros/latex/contrib/minimalist/minimart.cls
+++ b/macros/latex/contrib/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/macros/latex/contrib/minimalist/minimbook.cls b/macros/latex/contrib/minimalist/minimbook.cls
index be112f4f52..63d84a04a0 100644
--- a/macros/latex/contrib/minimalist/minimbook.cls
+++ b/macros/latex/contrib/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 }