summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/minimalist/minimalist-classical.sty
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/minimalist-classical.sty
parent61bc2520e547446bddedc290572684496c9347a0 (diff)
CTAN sync 202310010301
Diffstat (limited to 'macros/latex/contrib/minimalist/minimalist-classical.sty')
-rw-r--r--macros/latex/contrib/minimalist/minimalist-classical.sty41
1 files changed, 27 insertions, 14 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
}