summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/minimalist
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2023-10-01 03:01:18 +0000
committerNorbert Preining <norbert@preining.info>2023-10-01 03:01:18 +0000
commit8a05034cb5d7ae61b2de6857258caa3e43b496aa (patch)
treeb9c266e7f98a034ed060178b3c0c162598e68948 /macros/latex/contrib/minimalist
parent61bc2520e547446bddedc290572684496c9347a0 (diff)
CTAN sync 202310010301
Diffstat (limited to 'macros/latex/contrib/minimalist')
-rw-r--r--macros/latex/contrib/minimalist/minimalist-classical.sty41
-rw-r--r--macros/latex/contrib/minimalist/minimalist-default.sty49
-rw-r--r--macros/latex/contrib/minimalist/minimalist-flow.sty49
-rw-r--r--macros/latex/contrib/minimalist/minimalist-plain.sty49
-rw-r--r--macros/latex/contrib/minimalist/minimalist-stream.sty45
-rw-r--r--macros/latex/contrib/minimalist/minimalist.sty7
-rw-r--r--macros/latex/contrib/minimalist/minimart.cls2
-rw-r--r--macros/latex/contrib/minimalist/minimbook.cls2
8 files changed, 197 insertions, 47 deletions
diff --git a/macros/latex/contrib/minimalist/minimalist-classical.sty b/macros/latex/contrib/minimalist/minimalist-classical.sty
index 928ce7ccd0..e5207e6288 100644
--- a/macros/latex/contrib/minimalist/minimalist-classical.sty
+++ b/macros/latex/contrib/minimalist/minimalist-classical.sty
@@ -18,7 +18,7 @@
\NeedsTeXFormat{LaTeX2e}[2022-06-01]
\ProvidesExplPackage
{minimalist-classical}
- {2023/09/28} {}
+ {2023/09/30} {}
{The "classical" style of minimalist}
\IfPackageLoadedTF { minimalist } {}
@@ -57,7 +57,7 @@
\bool_if:NF \l_minimalist_is_under_bfseries_bool
{
\colorlet{minimalist-temp-color}{.}
- \color{minimalist-temp-color!70!paper}
+ \color{minimalist-temp-color!90!paper}
}
\minimalist_original_bfseries:
\bool_set_true:N \l_minimalist_is_under_bfseries_bool
@@ -744,6 +744,14 @@ heading_suffix "}\n"
\def\simpleqedsymbol{
\makebox[1em]{\rlap{\textcolor{.!12!paper}{\rule[-0.1em]{.95em}{.95em}}}{\kern.07em\raisebox{.07em}{\textcolor{paper}{\rule[-0.1em]{.81em}{.81em}}}\kern.07em}}}
+\DeclareRobustCommand{\simpleqed}{%
+ \ifmmode \quad\hbox{\simpleqedsymbol}
+ \else
+ \leavevmode\unskip\penalty9999 \hbox{}\nobreak\hfill
+ \quad\hbox{\simpleqedsymbol}%
+ \fi
+}
+
\bool_if:NTF \l__minimalist_theorem_in_new_line_bool
{
\newtheoremstyle{simple}
@@ -751,24 +759,24 @@ heading_suffix "}\n"
{\normalfont}{}
{\normalfont}{}
{\newline}
- { \global\let\qedsymbol\simpleqedsymbol
+ {
\rlap{\vbox{\hbox{\parbox{\linewidth}{
{\thmname{#1}\thmnumber{\nobreakspace #2}}
\thmnote{\hspace{.4em}\color{.!50!paper} \minimalist_insert_l_mathparen: #3 \minimalist_insert_r_mathparen: }
}}\hbox{\strut}\vspace{0pt}}}\vspace{-2\parskip}
- \pushQED{\qed}
+ \pushQED{\simpleqed}
}
\newtheoremstyle{simple-var}
{.5\baselineskip}{.5\baselineskip}
{ \bool_if:NTF \l__minimalist_emphasis_theorem_bool { \itshape } { \normalfont } }{}
{\normalfont}{}
{\newline}
- { \global\let\qedsymbol\simpleqedsymbol
+ {
\rlap{\vbox{\hbox{\parbox{\linewidth}{
{\thmname{#1}\thmnumber{\nobreakspace #2}}
\thmnote{\hspace{.4em}\color{.!50!paper} \minimalist_insert_l_mathparen: #3 \minimalist_insert_r_mathparen: }
}}\hbox{\strut}\vspace{0pt}}}\vspace{-2\parskip}
- \pushQED{\qed}
+ \pushQED{\simpleqed}
}
}
{
@@ -777,34 +785,38 @@ heading_suffix "}\n"
{\normalfont}{}
{\normalfont}{}
{0pt}
- { \global\let\qedsymbol\simpleqedsymbol
+ {
{\thmname{#1}\thmnumber{\nobreakspace #2}}\hspace{.4em}
\textcolor{.!27!paper}{ \l_minimalist_sep_bar }\hspace{.4em}
\color{.!50!paper}\thmnote{ \minimalist_insert_l_mathparen: #3 \minimalist_insert_r_mathparen: \nobreakspace\nobreakspace}
- \pushQED{\qed}
+ \pushQED{\simpleqed}
}
\newtheoremstyle{simple-var}
{.5\baselineskip}{.5\baselineskip}
{ \bool_if:NTF \l__minimalist_emphasis_theorem_bool { \itshape } { \normalfont } }{}
{\normalfont}{}
{0pt}
- { \global\let\qedsymbol\simpleqedsymbol
+ {
{\thmname{#1}\thmnumber{\nobreakspace #2}}\hspace{.4em}
\textcolor{.!27!paper}{ \l_minimalist_sep_bar }\hspace{.4em}
\color{.!50!paper}\thmnote{ \minimalist_insert_l_mathparen: #3 \minimalist_insert_r_mathparen: \nobreakspace\nobreakspace}
- \pushQED{\qed}
+ \pushQED{\simpleqed}
}
}
-\def\@endtheorem{\global\let\qedsymbol\simpleqedsymbol
- \popQED\endtrivlist\@endpefalse
- \global\let\qedsymbol\customqedsymbol}
\theoremstyle{simple}
+\def\@endtheorem{\popQED\endtrivlist\@endpefalse}
+
\newcommand{\customqedsymbol}{
\makebox[1em]{\color{.!27!paper}\rule[-0.1em]{.95em}{.95em}}}
\let\qedsymbol\customqedsymbol
+%% Special treatments for the Q.E.D. symbol
+\def\noQED{\let\popQED\relax}
+\let\noqed\noQED
+\def\proofless{\let\qedsymbol\customqedsymbol\let\simpleqedsymbol\customqedsymbol}
+
\bool_if:NTF \l__minimalist_fast_bool
{
\RequirePackage { hyperref }
@@ -1042,7 +1054,8 @@ heading_suffix "}\n"
{
\vspace{-.5\baselineskip}
}
- {\textcolor{main-text!27!paper}{\rule{\textwidth}{0.75pt}}\par}
+ {\textcolor{main-text!27!paper}{\rule{\textwidth}{0.75pt}}}
+ \par
\ResumeLineNumbers
}
diff --git a/macros/latex/contrib/minimalist/minimalist-default.sty b/macros/latex/contrib/minimalist/minimalist-default.sty
index 0e29cd936c..c94577ae35 100644
--- a/macros/latex/contrib/minimalist/minimalist-default.sty
+++ b/macros/latex/contrib/minimalist/minimalist-default.sty
@@ -18,7 +18,7 @@
\NeedsTeXFormat{LaTeX2e}[2022-06-01]
\ProvidesExplPackage
{minimalist-default}
- {2023/09/28} {}
+ {2023/09/30} {}
{The default style of minimalist}
\IfPackageLoadedTF { minimalist } {}
@@ -57,7 +57,7 @@
\bool_if:NF \l_minimalist_is_under_bfseries_bool
{
\colorlet{minimalist-temp-color}{.}
- \color{minimalist-temp-color!70!paper}
+ \color{minimalist-temp-color!90!paper}
}
\minimalist_original_bfseries:
\bool_set_true:N \l_minimalist_is_under_bfseries_bool
@@ -721,6 +721,16 @@ heading_suffix "}\n"
\PassOptionsToPackage { nopatch = eqnum } { microtype }
+\def\simpleqedsymbol{
+ \makebox[1em]{\rlap{\textcolor{.!12!paper}{\rule[-0.1em]{.95em}{.95em}}}{\kern.07em\raisebox{.07em}{\textcolor{paper}{\rule[-0.1em]{.81em}{.81em}}}\kern.07em}}}
+\DeclareRobustCommand{\simpleqed}{%
+ \ifmmode \quad\hbox{\simpleqedsymbol}
+ \else
+ \leavevmode\unskip\penalty9999 \hbox{}\nobreak\hfill
+ \quad\hbox{\simpleqedsymbol}%
+ \fi
+}
+
\bool_if:NTF \l__minimalist_theorem_in_new_line_bool
{
\newtheoremstyle{simple}
@@ -737,6 +747,10 @@ heading_suffix "}\n"
{\thmname{#1}\thmnumber{\nobreakspace #2}}
{\color{main-text!50!paper}\thmnote{\hspace{.4em} \minimalist_insert_l_mathparen: #3 \minimalist_insert_r_mathparen: }}
}}\hbox{\strut}\vspace{0pt}}}
+ \bool_if:NT \l__minimalist_theorem_with_qed_bool
+ {
+ \pushQED{\simpleqed}
+ }
}
\newtheoremstyle{simple-var}
{.75\baselineskip}{}
@@ -752,6 +766,10 @@ heading_suffix "}\n"
{\thmname{#1}\thmnumber{\nobreakspace #2}}
{\color{main-text!50!paper}\thmnote{\hspace{.4em} \minimalist_insert_l_mathparen: #3 \minimalist_insert_r_mathparen: }}
}}\hbox{\strut}\vspace{0pt}}}
+ \bool_if:NT \l__minimalist_theorem_with_qed_bool
+ {
+ \pushQED{\simpleqed}
+ }
}
}
{
@@ -764,11 +782,17 @@ heading_suffix "}\n"
}{}
{\normalfont}{}
{0pt}
- {{\thmname{#1}\thmnumber{\nobreakspace #2}}
+ {
+ {\thmname{#1}\thmnumber{\nobreakspace #2}}
{\color{main-text!50!paper}\thmnote{\hspace{.4em} \minimalist_insert_l_mathparen: #3 \minimalist_insert_r_mathparen: }}
\minimalist_bfseries:\minimalist_sffamily: .
- \nobreakspace\nobreakspace}
+ \nobreakspace\nobreakspace
% {\normalfont\textcolor{main-text!27!paper}{---}}
+ \bool_if:NT \l__minimalist_theorem_with_qed_bool
+ {
+ \pushQED{\simpleqed}
+ }
+ }
\newtheoremstyle{simple-var}
{}{}
{
@@ -778,19 +802,32 @@ heading_suffix "}\n"
}{}
{\normalfont}{}
{0pt}
- {{\thmname{#1}\thmnumber{\nobreakspace #2}}
+ {
+ {\thmname{#1}\thmnumber{\nobreakspace #2}}
{\color{main-text!50!paper}\thmnote{\hspace{.4em} \minimalist_insert_l_mathparen: #3 \minimalist_insert_r_mathparen: }}
\minimalist_bfseries:\minimalist_sffamily: .
- \nobreakspace\nobreakspace}
+ \nobreakspace\nobreakspace
% {\normalfont\textcolor{main-text!27!paper}{---}}
+ \bool_if:NT \l__minimalist_theorem_with_qed_bool
+ {
+ \pushQED{\simpleqed}
+ }
+ }
}
\theoremstyle{simple}
+\def\@endtheorem{\popQED\endtrivlist\@endpefalse}
+
\newcommand{\customqedsymbol}{
\makebox[1em]{\color{.!27!paper}\rule[-0.1em]{.95em}{.95em}}}
\let\qedsymbol\customqedsymbol
+%% Special treatments for the Q.E.D. symbol
+\def\noQED{\let\popQED\relax}
+\let\noqed\noQED
+\def\proofless{\let\qedsymbol\customqedsymbol\let\simpleqedsymbol\customqedsymbol}
+
\bool_if:NTF \l__minimalist_fast_bool
{
\RequirePackage { hyperref }
diff --git a/macros/latex/contrib/minimalist/minimalist-flow.sty b/macros/latex/contrib/minimalist/minimalist-flow.sty
index 9f3e52f939..7887188690 100644
--- a/macros/latex/contrib/minimalist/minimalist-flow.sty
+++ b/macros/latex/contrib/minimalist/minimalist-flow.sty
@@ -18,7 +18,7 @@
\NeedsTeXFormat{LaTeX2e}[2022-06-01]
\ProvidesExplPackage
{minimalist-flow}
- {2023/09/28} {}
+ {2023/09/30} {}
{The "flow" style of minimalist}
\IfPackageLoadedTF { minimalist } {}
@@ -57,7 +57,7 @@
\bool_if:NF \l_minimalist_is_under_bfseries_bool
{
\colorlet{minimalist-temp-color}{.}
- \color{minimalist-temp-color!70!paper}
+ \color{minimalist-temp-color!90!paper}
}
\minimalist_original_bfseries:
\bool_set_true:N \l_minimalist_is_under_bfseries_bool
@@ -732,6 +732,16 @@ heading_suffix "}\n"
\PassOptionsToPackage { nopatch = eqnum } { microtype }
+\def\simpleqedsymbol{
+ \makebox[1em]{\rlap{\textcolor{.!12!paper}{\rule[-0.1em]{.95em}{.95em}}}{\kern.07em\raisebox{.07em}{\textcolor{paper}{\rule[-0.1em]{.81em}{.81em}}}\kern.07em}}}
+\DeclareRobustCommand{\simpleqed}{%
+ \ifmmode \quad\hbox{\simpleqedsymbol}
+ \else
+ \leavevmode\unskip\penalty9999 \hbox{}\nobreak\hfill
+ \quad\hbox{\simpleqedsymbol}%
+ \fi
+}
+
\bool_if:NTF \l__minimalist_theorem_in_new_line_bool
{
\newtheoremstyle{simple}
@@ -748,6 +758,10 @@ heading_suffix "}\n"
{\thmnumber{ \minimalist_apply_title_numbering_style:n { #2 } \hspace{.75em} }\thmname{#1}}
{\color{main-text!50!paper}\thmnote{\hspace{.4em} \minimalist_insert_l_mathparen: #3 \minimalist_insert_r_mathparen: }}
}}\hbox{\strut}\vspace{0pt}}}
+ \bool_if:NT \l__minimalist_theorem_with_qed_bool
+ {
+ \pushQED{\simpleqed}
+ }
}
\newtheoremstyle{simple-var}
{.75\baselineskip}{}
@@ -763,6 +777,10 @@ heading_suffix "}\n"
{\thmnumber{ \minimalist_apply_title_numbering_style:n { #2 } \hspace{.75em} }\thmname{#1}}
{\color{main-text!50!paper}\thmnote{\hspace{.4em} \minimalist_insert_l_mathparen: #3 \minimalist_insert_r_mathparen: }}
}}\hbox{\strut}\vspace{0pt}}}
+ \bool_if:NT \l__minimalist_theorem_with_qed_bool
+ {
+ \pushQED{\simpleqed}
+ }
}
}
{
@@ -775,8 +793,14 @@ heading_suffix "}\n"
}{}
{\normalfont}{}
{0pt}
- {{\thmnumber{ \minimalist_apply_title_numbering_style:n { #2 } \hspace{.75em} }\thmname{#1}}
- {\color{main-text!50!paper}\thmnote{\hspace{.4em} \minimalist_insert_l_mathparen: #3 \minimalist_insert_r_mathparen: }}\nobreakspace\nobreakspace{\normalfont\textcolor{main-text!27!paper}{---}}\nobreakspace\nobreakspace}
+ {
+ {\thmnumber{ \minimalist_apply_title_numbering_style:n { #2 } \hspace{.75em} }\thmname{#1}}
+ {\color{main-text!50!paper}\thmnote{\hspace{.4em} \minimalist_insert_l_mathparen: #3 \minimalist_insert_r_mathparen: }}\nobreakspace\nobreakspace{\normalfont\textcolor{main-text!27!paper}{---}}\nobreakspace\nobreakspace
+ \bool_if:NT \l__minimalist_theorem_with_qed_bool
+ {
+ \pushQED{\simpleqed}
+ }
+ }
\newtheoremstyle{simple-var}
{}{}
{
@@ -786,16 +810,29 @@ heading_suffix "}\n"
}{}
{\normalfont}{}
{0pt}
- {{\thmnumber{ \minimalist_apply_title_numbering_style:n { #2 } \hspace{.75em} }\thmname{#1}}
- {\color{main-text!50!paper}\thmnote{\hspace{.4em} \minimalist_insert_l_mathparen: #3 \minimalist_insert_r_mathparen: }}\nobreakspace\nobreakspace{\normalfont\textcolor{main-text!27!paper}{---}}\nobreakspace\nobreakspace}
+ {
+ {\thmnumber{ \minimalist_apply_title_numbering_style:n { #2 } \hspace{.75em} }\thmname{#1}}
+ {\color{main-text!50!paper}\thmnote{\hspace{.4em} \minimalist_insert_l_mathparen: #3 \minimalist_insert_r_mathparen: }}\nobreakspace\nobreakspace{\normalfont\textcolor{main-text!27!paper}{---}}\nobreakspace\nobreakspace
+ \bool_if:NT \l__minimalist_theorem_with_qed_bool
+ {
+ \pushQED{\simpleqed}
+ }
+ }
}
\theoremstyle{simple}
+\def\@endtheorem{\popQED\endtrivlist\@endpefalse}
+
\newcommand{\customqedsymbol}{
\makebox[1em]{\color{.!27!paper}\rule[-0.1em]{.95em}{.95em}}}
\let\qedsymbol\customqedsymbol
+%% Special treatments for the Q.E.D. symbol
+\def\noQED{\let\popQED\relax}
+\let\noqed\noQED
+\def\proofless{\let\qedsymbol\customqedsymbol\let\simpleqedsymbol\customqedsymbol}
+
\bool_if:NTF \l__minimalist_fast_bool
{
\RequirePackage { hyperref }
diff --git a/macros/latex/contrib/minimalist/minimalist-plain.sty b/macros/latex/contrib/minimalist/minimalist-plain.sty
index 0d27d27c40..9abd77b655 100644
--- a/macros/latex/contrib/minimalist/minimalist-plain.sty
+++ b/macros/latex/contrib/minimalist/minimalist-plain.sty
@@ -18,7 +18,7 @@
\NeedsTeXFormat{LaTeX2e}[2022-06-01]
\ProvidesExplPackage
{minimalist-plain}
- {2023/09/28} {}
+ {2023/09/30} {}
{The "plain" style of minimalist}
\IfPackageLoadedTF { minimalist } {}
@@ -57,7 +57,7 @@
\bool_if:NF \l_minimalist_is_under_bfseries_bool
{
\colorlet{minimalist-temp-color}{.}
- \color{minimalist-temp-color!70!paper}
+ \color{minimalist-temp-color!90!paper}
}
\minimalist_original_bfseries:
\bool_set_true:N \l_minimalist_is_under_bfseries_bool
@@ -695,6 +695,16 @@ heading_suffix "}\n"
\PassOptionsToPackage { nopatch = eqnum } { microtype }
+\def\simpleqedsymbol{
+ \makebox[1em]{\rlap{\textcolor{.!12!paper}{\rule[-0.1em]{.95em}{.95em}}}{\kern.07em\raisebox{.07em}{\textcolor{paper}{\rule[-0.1em]{.81em}{.81em}}}\kern.07em}}}
+\DeclareRobustCommand{\simpleqed}{%
+ \ifmmode \quad\hbox{\simpleqedsymbol}
+ \else
+ \leavevmode\unskip\penalty9999 \hbox{}\nobreak\hfill
+ \quad\hbox{\simpleqedsymbol}%
+ \fi
+}
+
\bool_if:NTF \l__minimalist_theorem_in_new_line_bool
{
\newtheoremstyle{simple}
@@ -711,6 +721,10 @@ heading_suffix "}\n"
{\thmname{#1}\thmnumber{\nobreakspace #2}}
{\color{main-text!50!paper}\thmnote{\hspace{.4em} \minimalist_insert_l_mathparen: #3 \minimalist_insert_r_mathparen: }}
}}\hbox{\strut}\vspace{0pt}}}
+ \bool_if:NT \l__minimalist_theorem_with_qed_bool
+ {
+ \pushQED{\simpleqed}
+ }
}
\newtheoremstyle{simple-var}
{.75\baselineskip}{}
@@ -726,6 +740,10 @@ heading_suffix "}\n"
{\thmname{#1}\thmnumber{\nobreakspace #2}}
{\color{main-text!50!paper}\thmnote{\hspace{.4em} \minimalist_insert_l_mathparen: #3 \minimalist_insert_r_mathparen: }}
}}\hbox{\strut}\vspace{0pt}}}
+ \bool_if:NT \l__minimalist_theorem_with_qed_bool
+ {
+ \pushQED{\simpleqed}
+ }
}
}
{
@@ -738,11 +756,17 @@ heading_suffix "}\n"
}{}
{\normalfont}{}
{0pt}
- {{\thmname{#1}\thmnumber{\nobreakspace #2}}
+ {
+ {\thmname{#1}\thmnumber{\nobreakspace #2}}
{\color{main-text!50!paper}\thmnote{\hspace{.4em} \minimalist_insert_l_mathparen: #3 \minimalist_insert_r_mathparen: }}
\minimalist_bfseries:\minimalist_sffamily: .
- \nobreakspace\nobreakspace}
+ \nobreakspace\nobreakspace
% {\normalfont\textcolor{main-text!27!paper}{---}}
+ \bool_if:NT \l__minimalist_theorem_with_qed_bool
+ {
+ \pushQED{\simpleqed}
+ }
+ }
\newtheoremstyle{simple-var}
{}{}
{
@@ -752,19 +776,32 @@ heading_suffix "}\n"
}{}
{\normalfont}{}
{0pt}
- {{\thmname{#1}\thmnumber{\nobreakspace #2}}
+ {
+ {\thmname{#1}\thmnumber{\nobreakspace #2}}
{\color{main-text!50!paper}\thmnote{\hspace{.4em} \minimalist_insert_l_mathparen: #3 \minimalist_insert_r_mathparen: }}
\minimalist_bfseries:\minimalist_sffamily: .
- \nobreakspace\nobreakspace}
+ \nobreakspace\nobreakspace
% {\normalfont\textcolor{main-text!27!paper}{---}}
+ \bool_if:NT \l__minimalist_theorem_with_qed_bool
+ {
+ \pushQED{\simpleqed}
+ }
+ }
}
\theoremstyle{simple}
+\def\@endtheorem{\popQED\endtrivlist\@endpefalse}
+
\newcommand{\customqedsymbol}{
\makebox[1em]{\color{.!27!paper}\rule[-0.1em]{.95em}{.95em}}}
\let\qedsymbol\customqedsymbol
+%% Special treatments for the Q.E.D. symbol
+\def\noQED{\let\popQED\relax}
+\let\noqed\noQED
+\def\proofless{\let\qedsymbol\customqedsymbol\let\simpleqedsymbol\customqedsymbol}
+
\bool_if:NTF \l__minimalist_fast_bool
{
\RequirePackage { hyperref }
diff --git a/macros/latex/contrib/minimalist/minimalist-stream.sty b/macros/latex/contrib/minimalist/minimalist-stream.sty
index afe534e03c..daea466465 100644
--- a/macros/latex/contrib/minimalist/minimalist-stream.sty
+++ b/macros/latex/contrib/minimalist/minimalist-stream.sty
@@ -18,7 +18,7 @@
\NeedsTeXFormat{LaTeX2e}[2022-06-01]
\ProvidesExplPackage
{minimalist-stream}
- {2023/09/28} {}
+ {2023/09/30} {}
{The "stream" style of minimalist}
\IfPackageLoadedTF { minimalist } {}
@@ -57,7 +57,7 @@
\bool_if:NF \l_minimalist_is_under_bfseries_bool
{
\colorlet{minimalist-temp-color}{.}
- \color{minimalist-temp-color!70!paper}
+ \color{minimalist-temp-color!90!paper}
}
\minimalist_original_bfseries:
\bool_set_true:N \l_minimalist_is_under_bfseries_bool
@@ -801,6 +801,16 @@ heading_suffix "}\n"
\PassOptionsToPackage { nopatch = eqnum } { microtype }
+\def\simpleqedsymbol{
+ \makebox[1em]{\rlap{\textcolor{.!12!paper}{\rule[-0.1em]{.95em}{.95em}}}{\kern.07em\raisebox{.07em}{\textcolor{paper}{\rule[-0.1em]{.81em}{.81em}}}\kern.07em}}}
+\DeclareRobustCommand{\simpleqed}{%
+ \ifmmode \quad\hbox{\simpleqedsymbol}
+ \else
+ \leavevmode\unskip\penalty9999 \hbox{}\nobreak\hfill
+ \quad\hbox{\simpleqedsymbol}%
+ \fi
+}
+
\newtheoremstyle{simple-newline}
{-.2\baselineskip plus 2pt minus .1\baselineskip}{.3\baselineskip plus 2pt minus .1\baselineskip}
{\normalfont}{}
@@ -818,6 +828,10 @@ heading_suffix "}\n"
{\color{main-text!50!paper}\thmnote{\hspace{.4em} \minimalist_insert_l_mathparen: #3 \minimalist_insert_r_mathparen: }}
\phantom{q} % To provide something below the baseline
}}\hbox{\strut}\vspace{0pt}}}
+ \bool_if:NT \l__minimalist_theorem_with_qed_bool
+ {
+ \pushQED{\simpleqed}
+ }
}
\newtheoremstyle{simple-newline-var}
{-.2\baselineskip plus 2pt minus .1\baselineskip}{.3\baselineskip plus 2pt minus .1\baselineskip}
@@ -836,6 +850,10 @@ heading_suffix "}\n"
{\color{main-text!50!paper}\thmnote{\hspace{.4em} \minimalist_insert_l_mathparen: #3 \minimalist_insert_r_mathparen: }}
\phantom{q} % To provide something below the baseline
}}\hbox{\strut}\vspace{0pt}}}
+ \bool_if:NT \l__minimalist_theorem_with_qed_bool
+ {
+ \pushQED{\simpleqed}
+ }
}
\dim_new:N \l_minimalist_space_before_inline_theorem_dim
@@ -862,6 +880,10 @@ heading_suffix "}\n"
{\thmname{#1}}
{\color{main-text!50!paper}\thmnote{\hspace{.4em} \minimalist_insert_l_mathparen: #3 \minimalist_insert_r_mathparen: }}
. \hspace{.5em}
+ \bool_if:NT \l__minimalist_theorem_with_qed_bool
+ {
+ \pushQED{\simpleqed}
+ }
}
\newtheoremstyle{simple-inline-var}
% {.3\baselineskip plus 2pt minus .1\baselineskip}{.3\baselineskip plus 2pt minus .1\baselineskip}
@@ -878,6 +900,10 @@ heading_suffix "}\n"
{\thmname{#1}}
{\color{main-text!50!paper}\thmnote{\hspace{.4em} \minimalist_insert_l_mathparen: #3 \minimalist_insert_r_mathparen: }}
. \hspace{.5em}
+ \bool_if:NT \l__minimalist_theorem_with_qed_bool
+ {
+ \pushQED{\simpleqed}
+ }
}
\bool_if:NTF \l__minimalist_theorem_in_new_line_bool
@@ -902,22 +928,17 @@ heading_suffix "}\n"
. \hspace{.5em}
}
-\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}{%
- \ifmmode \quad\hbox{\simpleqedsymbol}
- \else
- \leavevmode\unskip\penalty9999 \hbox{}\nobreak\hfill
- \quad\hbox{\simpleqedsymbol}%
- \fi
-}
-
\def\@endtheorem{\popQED\endtrivlist\@endpefalse}
\newcommand{\customqedsymbol}{
\makebox[1em]{\color{.!27!paper}\rule[-0.1em]{.95em}{.95em}}}
\let\qedsymbol\customqedsymbol
+%% Special treatments for the Q.E.D. symbol
+\def\noQED{\let\popQED\relax}
+\let\noqed\noQED
+\def\proofless{\let\qedsymbol\customqedsymbol\let\simpleqedsymbol\customqedsymbol}
+
\bool_if:NTF \l__minimalist_fast_bool
{
\RequirePackage { hyperref }
diff --git a/macros/latex/contrib/minimalist/minimalist.sty b/macros/latex/contrib/minimalist/minimalist.sty
index 960bbb1501..bec6ef6178 100644
--- a/macros/latex/contrib/minimalist/minimalist.sty
+++ b/macros/latex/contrib/minimalist/minimalist.sty
@@ -18,7 +18,7 @@
\NeedsTeXFormat{LaTeX2e}[2022-06-01]
\ProvidesExplPackage
{minimalist}
- {2023/09/28} {}
+ {2023/09/30} {}
{A simple and clear style for articles and books}
\keys_define:nn { minimalist }
@@ -91,6 +91,11 @@
, theorem~in~new~line .bool_set:N = \l__minimalist_theorem_in_new_line_bool
, theorem in new line .bool_set:N = \l__minimalist_theorem_in_new_line_bool
+ , theorem-with-qed .bool_set:N = \l__minimalist_theorem_with_qed_bool
+ , theorem-with-qed .initial:n = { false }
+ , theorem~with~qed .bool_set:N = \l__minimalist_theorem_with_qed_bool
+ , theorem with qed .bool_set:N = \l__minimalist_theorem_with_qed_bool
+
, colored-proof .tl_set:N = \l__minimalist_colored_proof_tl
, colored-proof .initial:n = { * }
, colored-proof .default:n = { blue!50!cyan!55!main-text }
diff --git a/macros/latex/contrib/minimalist/minimart.cls b/macros/latex/contrib/minimalist/minimart.cls
index 73108bd5fb..27ddd5d99e 100644
--- a/macros/latex/contrib/minimalist/minimart.cls
+++ b/macros/latex/contrib/minimalist/minimart.cls
@@ -18,7 +18,7 @@
\NeedsTeXFormat{LaTeX2e}[2022-06-01]
\ProvidesExplClass
{minimart}
- {2023/09/28} {}
+ {2023/09/30} {}
{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 9463eee17b..e1e4db8d95 100644
--- a/macros/latex/contrib/minimalist/minimbook.cls
+++ b/macros/latex/contrib/minimalist/minimbook.cls
@@ -18,7 +18,7 @@
\NeedsTeXFormat{LaTeX2e}[2022-06-01]
\ProvidesExplClass
{minimbook}
- {2023/09/28} {}
+ {2023/09/30} {}
{A simple and clear book style}
\tl_const:Nn \l__minimclass_base_class_tl { book }