From a0867c71356c67c442bdebc0de39b7996f847bf7 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Wed, 8 Mar 2023 03:03:20 +0000 Subject: CTAN sync 202303080303 --- .../contrib/minimalist/minimalist-classical.sty | 233 +++++++++++-------- .../latex/contrib/minimalist/minimalist-flow.sty | 240 +++++++++++-------- .../latex/contrib/minimalist/minimalist-plain.sty | 256 ++++++++++++--------- .../latex/contrib/minimalist/minimalist-stream.sty | 170 +++++++++----- macros/latex/contrib/minimalist/minimalist.sty | 22 +- macros/latex/contrib/minimalist/minimart.cls | 2 +- macros/latex/contrib/minimalist/minimbook.cls | 2 +- 7 files changed, 561 insertions(+), 364 deletions(-) (limited to 'macros/latex/contrib/minimalist') diff --git a/macros/latex/contrib/minimalist/minimalist-classical.sty b/macros/latex/contrib/minimalist/minimalist-classical.sty index 0ea75181ce..31bbbdf00b 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/01/05} {} + {2023/03/07} {} {The "classical" style of minimalist} \IfPackageLoadedTF { minimalist } {} @@ -30,6 +30,19 @@ \endinput } +\bool_new:N \l__minimalist_colored_proof_bool +\bool_set_true:N \l__minimalist_colored_proof_bool +\tl_if_eq:NnTF \l__minimalist_colored_proof_tl { * } + { + \bool_set_false:N \l__minimalist_colored_proof_bool + } + { + \tl_if_eq:NnT \l__minimalist_colored_proof_tl { false } + { + \bool_set_false:N \l__minimalist_colored_proof_bool + } + } + %%================================ %% Title fonts %%================================ @@ -57,6 +70,14 @@ \cs_new:Nn \minimalist_bfseries: {} } +\bool_if:NTF \l__minimalist_use_sffamily_bool + { + \cs_new:Nn \minimalist_sffamily: { \sffamily } + } + { + \cs_new:Nn \minimalist_sffamily: {} + } + \bool_if:NTF \l__minimalist_use_scshape_bool { \cs_new:Nn \minimalist_scshape: { \scshape } @@ -74,12 +95,12 @@ \tl_new:N \g_minimalist_title_font_subsubsection_tl \tl_new:N \g_minimalist_title_font_paragraph_tl -\tl_gset:Nn \g_minimalist_title_font_part_tl { \minimalist_bfseries: \g_minimalist_title_font_common_tl } -\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: } -\tl_gset:Nn \g_minimalist_title_font_subsection_tl { \minimalist_bfseries: } -\tl_gset:Nn \g_minimalist_title_font_subsubsection_tl { \minimalist_bfseries: \itshape } -\tl_gset:Nn \g_minimalist_title_font_paragraph_tl { \minimalist_bfseries: \minimalist_scshape: } +\tl_gset:Nn \g_minimalist_title_font_part_tl { \minimalist_bfseries:\minimalist_sffamily: \g_minimalist_title_font_common_tl } +\tl_gset:Nn \g_minimalist_title_font_chapter_tl { \minimalist_bfseries:\minimalist_sffamily: \g_minimalist_title_font_common_tl \minimalist_scshape: } +\tl_gset:Nn \g_minimalist_title_font_section_tl { \minimalist_bfseries:\minimalist_sffamily: } +\tl_gset:Nn \g_minimalist_title_font_subsection_tl { \minimalist_bfseries:\minimalist_sffamily: } +\tl_gset:Nn \g_minimalist_title_font_subsubsection_tl { \minimalist_bfseries:\minimalist_sffamily: \itshape } +\tl_gset:Nn \g_minimalist_title_font_paragraph_tl { \minimalist_bfseries:\minimalist_sffamily: \minimalist_scshape: } \bool_if:NF \l__minimalist_fast_bool { @@ -421,7 +442,7 @@ {\LocallyStopLineNumbers \g_minimalist_title_font_section_tl\centering}{}{0em} {{\small\textcolor{main-text!27!paper}{\footnotesize \g_minimalist_section_decoration_char_tl } - \,\,\textcolor{main-text!90!paper}{\minimalist_bfseries:\arabic{section}} + \,\,\textcolor{main-text!90!paper}{\minimalist_bfseries:\minimalist_sffamily:\arabic{section}} \,\,\textcolor{main-text!27!paper}{\footnotesize \g_minimalist_section_decoration_char_tl }}\\ \seculine{#1}} [\ResumeLineNumbers] @@ -543,6 +564,7 @@ %%================================ %% Lists %%================================ +\PassOptionsToPackage { inline } { enumitem } \RequirePackage { enumitem } \setlistdepth{10} \setlist{noitemsep, topsep=.33\topsep-.5\parskip} @@ -553,7 +575,7 @@ ref = \normalfont\color{.!45!paper}\arabic{enumi}.\emph{\roman*}$\mskip-.5mu\big)$} \setlist[enumerate,3]{label = \normalfont\emph{\alph*}$\mskip-.5mu\big)$, ref = \normalfont\color{.!45!paper}\arabic{enumi}.\emph{\roman{enumii}}.\emph{\alph*}$\mskip-.5mu\big)$} -\setlist[description]{font=\normalfont\minimalist_bfseries:} +\setlist[description]{font=\normalfont\minimalist_bfseries:\minimalist_sffamily:} \newcommand\desculine{\bgroup\markoverwith{\color{.!55!paper} \rule[-.45ex]{2pt}{.75pt}}\ULon} \renewcommand{\descriptionlabel}[1]{ @@ -699,7 +721,7 @@ heading_suffix "}\n" \RequirePackage { mathtools } \RequirePackage { amsthm } -\def\tagform@#1{\maketag@@@{\textcolor{main-text!39!paper}{(\ignorespaces#1\unskip\@@italiccorr)}}} +\def\tagform@#1{\maketag@@@{\textcolor{.!39!paper}{(\ignorespaces#1\unskip\@@italiccorr)}}} \PassOptionsToPackage { nopatch = eqnum } { microtype } @@ -756,10 +778,19 @@ heading_suffix "}\n" \renewcommand\Hy@numberline[1]{#1.~} % https://tex.stackexchange.com/a/1821 % Add the bookmark of ToC - \hook_gput_code:nnn { cmd/tableofcontents/before } { minimalist } + \bool_if:NTF \l__minimalist_is_book_bool { - \if@openright\cleardoublepage\else\clearpage\fi - \pdfbookmark[0]{\contentsname}{toc} + \hook_gput_code:nnn { cmd/tableofcontents/before } { minimalist } + { + \if@openright\cleardoublepage\else\clearpage\fi + \pdfbookmark[0]{\contentsname}{toc} + } + } + { + \hook_gput_code:nnn { cmd/tableofcontents/before } { minimalist } + { + \pdfbookmark[1]{\contentsname}{toc} + } } } @@ -769,23 +800,32 @@ heading_suffix "}\n" \SetTheorem { proof, proof* } { qed-symbol = { \customqedsymbol } } +\bool_if:NT \l__minimalist_colored_proof_bool + { + \hook_gput_code:nnn { env/proof/begin } { minimalist } + { + \Hy@SaveLastskip + \color{ \l__minimalist_colored_proof_tl } + \Hy@RestoreLastskip + } + } \exp_args:No \SetTheorem { \c_projlib_theorem_supported_clist, theorem-with-name } { name style = { , heading style = { - , english = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , french = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , ngerman = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , italian = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , portuguese = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , brazilian = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , spanish = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , schinese = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , tchinese = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , japanese = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , russian = \minimalist_bfseries:\g_minimalist_title_font_common_tl + , english = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , french = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , ngerman = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , italian = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , portuguese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , brazilian = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , spanish = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , schinese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl + , tchinese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl + , japanese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl + , russian = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl } } } @@ -794,18 +834,18 @@ heading_suffix "}\n" { name style = { , heading style = { - , english = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit - , french = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit - , ngerman = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit - , italian = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit - , portuguese = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit - , brazilian = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit - , spanish = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit - , russian = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit - , schinese = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , tchinese = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , japanese = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , russian = \minimalist_bfseries:\g_minimalist_title_font_common_tl + , english = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textit + , french = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textit + , ngerman = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textit + , italian = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textit + , portuguese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textit + , brazilian = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textit + , spanish = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textit + , russian = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textit + , schinese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl + , tchinese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl + , japanese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl + , russian = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl } } } @@ -816,33 +856,33 @@ heading_suffix "}\n" { name style = { , crefname style = { - , english = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , french = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , ngerman = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , italian = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , portuguese = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , brazilian = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , spanish = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , schinese = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , tchinese = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , japanese = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , russian = \minimalist_bfseries:\g_minimalist_title_font_common_tl + , english = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , french = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , ngerman = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , italian = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , portuguese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , brazilian = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , spanish = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , schinese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl + , tchinese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl + , japanese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl + , russian = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl } , Crefname style = { - , english = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , french = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , ngerman = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , italian = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , portuguese = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , brazilian = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , spanish = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , schinese = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , tchinese = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , japanese = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , russian = \minimalist_bfseries:\g_minimalist_title_font_common_tl + , english = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , french = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , ngerman = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , italian = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , portuguese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , brazilian = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , spanish = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , schinese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl + , tchinese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl + , japanese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl + , russian = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl } , numbering style = { - \minimalist_bfseries:\g_minimalist_title_font_common_tl + \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl } } } @@ -851,35 +891,35 @@ heading_suffix "}\n" { name style = { , crefname style = { - , english = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit - , french = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit - , ngerman = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit - , italian = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit - , portuguese = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit - , brazilian = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit - , spanish = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit - , russian = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit - , schinese = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , tchinese = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , japanese = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , russian = \minimalist_bfseries:\g_minimalist_title_font_common_tl + , english = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textit + , french = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textit + , ngerman = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textit + , italian = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textit + , portuguese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textit + , brazilian = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textit + , spanish = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textit + , russian = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textit + , schinese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl + , tchinese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl + , japanese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl + , russian = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl } , Crefname style = { - , english = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit - , french = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit - , ngerman = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit - , italian = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit - , portuguese = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit - , brazilian = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit - , spanish = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit - , russian = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit - , schinese = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , tchinese = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , japanese = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , russian = \minimalist_bfseries:\g_minimalist_title_font_common_tl + , english = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textit + , french = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textit + , ngerman = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textit + , italian = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textit + , portuguese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textit + , brazilian = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textit + , spanish = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textit + , russian = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textit + , schinese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl + , tchinese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl + , japanese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl + , russian = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl } , numbering style = { - \minimalist_bfseries:\g_minimalist_title_font_common_tl + \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl } } } @@ -925,16 +965,17 @@ heading_suffix "}\n" } \RequirePackage { projlib-titlepage } - \renewcommand{\maketitle}{ - \LocallyStopLineNumbers - \ProjLibTitlePage [ style = simple ] - { - , title = \@title - , author = \@author - , date = \@date - } - \ResumeLineNumbers - } + \RenewDocumentCommand \maketitle { O{} } + { + \LocallyStopLineNumbers + \ProjLibTitlePage [ style = simple, #1 ] + { + , title = \@title + , author = \@author + , date = \@date + } + \ResumeLineNumbers + } } { \renewcommand{\@maketitle} @@ -946,7 +987,7 @@ heading_suffix "}\n" \vspace{-.5\baselineskip} \begin{flushright} \let\footnote\thanks - {\minimalist_bfseries:\@title}\\\medskip + {\minimalist_bfseries:\minimalist_sffamily:\@title}\\\medskip \color{main-text!80!paper} {\small\minimalist_scshape:\@author} \par\vspace{-\parskip}\vspace{2pt} @@ -1011,7 +1052,7 @@ heading_suffix "}\n" \LocallyStopLineNumbers \vspace{-.5\baselineskip} \begin{flushright} - {\minimalist_bfseries:\minimalist_scshape:\small\keywordname}\par + {\minimalist_bfseries:\minimalist_sffamily:\minimalist_scshape:\small\keywordname}\par \vspace{-\parskip} \vspace{-.30\baselineskip} \begin{minipage}[t]{.833\textwidth} diff --git a/macros/latex/contrib/minimalist/minimalist-flow.sty b/macros/latex/contrib/minimalist/minimalist-flow.sty index acc236efe5..106d18dc0b 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/01/05} {} + {2023/03/07} {} {The "flow" style of minimalist} \IfPackageLoadedTF { minimalist } {} @@ -30,6 +30,19 @@ \endinput } +\bool_new:N \l__minimalist_colored_proof_bool +\bool_set_true:N \l__minimalist_colored_proof_bool +\tl_if_eq:NnTF \l__minimalist_colored_proof_tl { * } + { + \tl_set:Nn \l__minimalist_colored_proof_tl { blue!50!cyan!55!main-text } + } + { + \tl_if_eq:NnT \l__minimalist_colored_proof_tl { false } + { + \bool_set_false:N \l__minimalist_colored_proof_bool + } + } + %%================================ %% Title fonts %%================================ @@ -57,6 +70,14 @@ \cs_new:Nn \minimalist_bfseries: {} } +\bool_if:NTF \l__minimalist_use_sffamily_bool + { + \cs_new:Nn \minimalist_sffamily: { \sffamily } + } + { + \cs_new:Nn \minimalist_sffamily: {} + } + \bool_if:NTF \l__minimalist_use_scshape_bool { \cs_new:Nn \minimalist_scshape: { \scshape } @@ -74,12 +95,12 @@ \tl_new:N \g_minimalist_title_font_subsubsection_tl \tl_new:N \g_minimalist_title_font_paragraph_tl -\tl_gset:Nn \g_minimalist_title_font_part_tl { \minimalist_bfseries: \g_minimalist_title_font_common_tl } -\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: } +\tl_gset:Nn \g_minimalist_title_font_part_tl { \minimalist_bfseries:\minimalist_sffamily: \g_minimalist_title_font_common_tl } +\tl_gset:Nn \g_minimalist_title_font_chapter_tl { \minimalist_bfseries:\minimalist_sffamily: \g_minimalist_title_font_common_tl \minimalist_scshape: } +\tl_gset:Nn \g_minimalist_title_font_section_tl { \minimalist_bfseries:\minimalist_sffamily: \g_minimalist_title_font_common_tl \minimalist_scshape: } +\tl_gset:Nn \g_minimalist_title_font_subsection_tl { \minimalist_bfseries:\minimalist_sffamily: \g_minimalist_title_font_common_tl \minimalist_scshape: } \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: } +\tl_gset:Nn \g_minimalist_title_font_paragraph_tl { \minimalist_bfseries:\minimalist_sffamily: \g_minimalist_title_font_common_tl \minimalist_scshape: } \bool_if:NF \l__minimalist_fast_bool { @@ -272,7 +293,12 @@ \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 { .!39!paper } { \normalfont \l_tmpa_tl } + % \textcolor { .!39!paper } { \normalfont \l_tmpa_tl } + \bool_if:NF \l_minimalist_is_under_bfseries_bool + { + \colorlet{minimalist-temp-color}{.} + } + \textcolor { minimalist-temp-color!39!paper } { \normalfont \l_tmpa_tl } } \cs_new_protected:Nn \minimalist_apply_title_numbering_style:n @@ -284,10 +310,9 @@ \exp_args:Nnx \regex_count:nnN { \. } {#1} \l_tmpa_int \int_case:nn { \l_tmpa_int } { - { 0 } { \textcolor { .!24!paper } } - { 1 } { \textcolor { .!39!paper } } - { 2 } { \textcolor { .!39!paper } } - { 3 } { \smaller[.5] \textcolor { .!39!paper } } + { 0 } { \textcolor { main-text!39!paper } } + { 1 } { \textcolor { main-text!39!paper } } + { 2 } { \textcolor { main-text!39!paper } } } \l_tmpa_tl \group_end: @@ -533,6 +558,7 @@ %%================================ %% Lists %%================================ +\PassOptionsToPackage { inline } { enumitem } \RequirePackage { enumitem } \setlistdepth{10} \setlist{noitemsep, topsep=.33\topsep-.5\parskip} @@ -543,7 +569,7 @@ ref = \normalfont\color{.!45!paper}\arabic{enumi}.\emph{\roman*}$\mskip-.5mu\big)$} \setlist[enumerate,3]{label = \normalfont\emph{\alph*}$\mskip-.5mu\big)$, ref = \normalfont\color{.!45!paper}\arabic{enumi}.\emph{\roman{enumii}}.\emph{\alph*}$\mskip-.5mu\big)$} -\setlist[description]{font=\normalfont\minimalist_bfseries:} +\setlist[description]{font=\normalfont\minimalist_bfseries:\minimalist_sffamily:} \renewlist{itemize}{itemize}{10} \setlist[itemize]{leftmargin=*,label=\textcolor{.!27!paper}{$\cdot$}} @@ -684,7 +710,7 @@ heading_suffix "}\n" \RequirePackage { mathtools } \RequirePackage { amsthm } -\def\tagform@#1{\maketag@@@{\textcolor{main-text!39!paper}{(\ignorespaces#1\unskip\@@italiccorr)}}} +\def\tagform@#1{\maketag@@@{\textcolor{.!39!paper}{(\ignorespaces#1\unskip\@@italiccorr)}}} \PassOptionsToPackage { nopatch = eqnum } { microtype } @@ -739,10 +765,19 @@ heading_suffix "}\n" \renewcommand\Hy@numberline[1]{#1.~} % https://tex.stackexchange.com/a/1821 % Add the bookmark of ToC - \hook_gput_code:nnn { cmd/tableofcontents/before } { minimalist } + \bool_if:NTF \l__minimalist_is_book_bool { - \if@openright\cleardoublepage\else\clearpage\fi - \pdfbookmark[0]{\contentsname}{toc} + \hook_gput_code:nnn { cmd/tableofcontents/before } { minimalist } + { + \if@openright\cleardoublepage\else\clearpage\fi + \pdfbookmark[0]{\contentsname}{toc} + } + } + { + \hook_gput_code:nnn { cmd/tableofcontents/before } { minimalist } + { + \pdfbookmark[1]{\contentsname}{toc} + } } } @@ -752,7 +787,15 @@ heading_suffix "}\n" \SetTheorem { proof, proof* } { qed-symbol = { \customqedsymbol } } -\AddToHook{env/proof/begin}{\Hy@SaveLastskip\color{blue!50!cyan!55!main-text}\Hy@RestoreLastskip} +\bool_if:NT \l__minimalist_colored_proof_bool + { + \hook_gput_code:nnn { env/proof/begin } { minimalist } + { + \Hy@SaveLastskip + \color{ \l__minimalist_colored_proof_tl } + \Hy@RestoreLastskip + } + } \exp_args:No \SetTheorem { \c_projlib_theorem_supported_clist, theorem-with-name, proof } { shared counter = subsection } @@ -760,17 +803,17 @@ heading_suffix "}\n" { name style = { , heading style = { - , english = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , french = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , ngerman = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , italian = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , portuguese = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , brazilian = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , spanish = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , schinese = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , tchinese = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , japanese = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , russian = \minimalist_bfseries:\g_minimalist_title_font_common_tl + , english = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , french = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , ngerman = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , italian = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , portuguese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , brazilian = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , spanish = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , schinese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl + , tchinese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl + , japanese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl + , russian = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl } , numbering style = { \minimalist_apply_title_numbering_style_static:n } } @@ -780,18 +823,18 @@ heading_suffix "}\n" { name style = { , heading style = { - , english = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit - , french = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit - , ngerman = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit - , italian = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit - , portuguese = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit - , brazilian = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit - , spanish = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit - , russian = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit - , schinese = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , tchinese = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , japanese = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , russian = \minimalist_bfseries:\g_minimalist_title_font_common_tl + , english = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textit + , french = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textit + , ngerman = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textit + , italian = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textit + , portuguese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textit + , brazilian = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textit + , spanish = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textit + , russian = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textit + , schinese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl + , tchinese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl + , japanese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl + , russian = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl } , numbering style = { \minimalist_apply_title_numbering_style_static:n } } @@ -803,30 +846,30 @@ heading_suffix "}\n" { name style = { , crefname style = { - , english = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , french = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , ngerman = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , italian = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , portuguese = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , brazilian = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , spanish = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , schinese = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , tchinese = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , japanese = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , russian = \minimalist_bfseries:\g_minimalist_title_font_common_tl + , english = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , french = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , ngerman = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , italian = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , portuguese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , brazilian = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , spanish = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , schinese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl + , tchinese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl + , japanese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl + , russian = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl } , Crefname style = { - , english = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , french = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , ngerman = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , italian = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , portuguese = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , brazilian = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , spanish = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , schinese = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , tchinese = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , japanese = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , russian = \minimalist_bfseries:\g_minimalist_title_font_common_tl + , english = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , french = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , ngerman = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , italian = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , portuguese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , brazilian = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , spanish = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , schinese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl + , tchinese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl + , japanese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl + , russian = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl } , numbering style = { \minimalist_apply_title_numbering_style_static:n } } @@ -836,32 +879,32 @@ heading_suffix "}\n" { name style = { , crefname style = { - , english = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit - , french = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit - , ngerman = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit - , italian = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit - , portuguese = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit - , brazilian = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit - , spanish = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit - , russian = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit - , schinese = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , tchinese = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , japanese = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , russian = \minimalist_bfseries:\g_minimalist_title_font_common_tl + , english = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textit + , french = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textit + , ngerman = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textit + , italian = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textit + , portuguese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textit + , brazilian = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textit + , spanish = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textit + , russian = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textit + , schinese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl + , tchinese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl + , japanese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl + , russian = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl } , Crefname style = { - , english = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit - , french = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit - , ngerman = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit - , italian = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit - , portuguese = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit - , brazilian = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit - , spanish = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit - , russian = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit - , schinese = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , tchinese = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , japanese = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , russian = \minimalist_bfseries:\g_minimalist_title_font_common_tl + , english = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textit + , french = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textit + , ngerman = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textit + , italian = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textit + , portuguese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textit + , brazilian = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textit + , spanish = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textit + , russian = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textit + , schinese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl + , tchinese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl + , japanese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl + , russian = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl } , numbering style = { \minimalist_apply_title_numbering_style_static:n } } @@ -909,16 +952,17 @@ heading_suffix "}\n" } \RequirePackage { projlib-titlepage } - \renewcommand{\maketitle}{ - \LocallyStopLineNumbers - \ProjLibTitlePage [ style = simple ] - { - , title = \@title - , author = \@author - , date = \@date - } - \ResumeLineNumbers - } + \RenewDocumentCommand \maketitle { O{} } + { + \LocallyStopLineNumbers + \ProjLibTitlePage [ style = simple, #1 ] + { + , title = \@title + , author = \@author + , date = \@date + } + \ResumeLineNumbers + } } { \renewcommand{\@maketitle} @@ -926,7 +970,7 @@ heading_suffix "}\n" \LocallyStopLineNumbers \begin{center} \let\footnote\thanks - {\minimalist_bfseries:\sffamily\minimalist_scshape:\Large\@title}\\\bigskip + {\minimalist_bfseries:\minimalist_scshape:\sffamily\Large\@title}\\\bigskip \color{main-text!80!paper} {\small\minimalist_scshape:\@author} \par\smallskip\vspace{-\parskip} @@ -984,7 +1028,7 @@ heading_suffix "}\n" \LocallyStopLineNumbers \vspace{-.75\baselineskip} \begin{center} - {\minimalist_bfseries:\minimalist_scshape:\small\keywordname}\\ + { \g_minimalist_title_font_section_tl \minimalist_scshape: \small\keywordname}\\ \vspace{-.3\baselineskip} \begin{minipage}[t]{.833\textwidth} \vspace{0pt} diff --git a/macros/latex/contrib/minimalist/minimalist-plain.sty b/macros/latex/contrib/minimalist/minimalist-plain.sty index ed4d399512..134fb89080 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/01/05} {} + {2023/03/07} {} {The "plain" style of minimalist} \IfPackageLoadedTF { minimalist } {} @@ -30,6 +30,19 @@ \endinput } +\bool_new:N \l__minimalist_colored_proof_bool +\bool_set_true:N \l__minimalist_colored_proof_bool +\tl_if_eq:NnTF \l__minimalist_colored_proof_tl { * } + { + \bool_set_false:N \l__minimalist_colored_proof_bool + } + { + \tl_if_eq:NnT \l__minimalist_colored_proof_tl { false } + { + \bool_set_false:N \l__minimalist_colored_proof_bool + } + } + %%================================ %% Title fonts %%================================ @@ -57,6 +70,14 @@ \cs_new:Nn \minimalist_bfseries: {} } +\bool_if:NTF \l__minimalist_use_sffamily_bool + { + \cs_new:Nn \minimalist_sffamily: { \sffamily } + } + { + \cs_new:Nn \minimalist_sffamily: {} + } + \bool_if:NTF \l__minimalist_use_scshape_bool { \cs_new:Nn \minimalist_scshape: { \scshape } @@ -74,12 +95,12 @@ \tl_new:N \g_minimalist_title_font_subsubsection_tl \tl_new:N \g_minimalist_title_font_paragraph_tl -\tl_gset:Nn \g_minimalist_title_font_part_tl { \minimalist_bfseries: \g_minimalist_title_font_common_tl } -\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: } -\tl_gset:Nn \g_minimalist_title_font_subsubsection_tl { \minimalist_bfseries: \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: } +\tl_gset:Nn \g_minimalist_title_font_part_tl { \minimalist_bfseries:\minimalist_sffamily: \g_minimalist_title_font_common_tl } +\tl_gset:Nn \g_minimalist_title_font_chapter_tl { \minimalist_bfseries:\minimalist_sffamily: \g_minimalist_title_font_common_tl \minimalist_scshape: } +\tl_gset:Nn \g_minimalist_title_font_section_tl { \minimalist_bfseries:\minimalist_sffamily: \g_minimalist_title_font_common_tl \minimalist_scshape: } +\tl_gset:Nn \g_minimalist_title_font_subsection_tl { \minimalist_bfseries:\minimalist_sffamily: \g_minimalist_title_font_common_tl \minimalist_scshape: } +\tl_gset:Nn \g_minimalist_title_font_subsubsection_tl { \minimalist_bfseries:\minimalist_sffamily: \g_minimalist_title_font_common_tl } +\tl_gset:Nn \g_minimalist_title_font_paragraph_tl { \minimalist_bfseries:\minimalist_sffamily: \g_minimalist_title_font_common_tl \minimalist_scshape: } \bool_if:NF \l__minimalist_fast_bool { @@ -272,7 +293,12 @@ \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 { .!39!paper } { \normalfont \l_tmpa_tl } + % \textcolor { .!39!paper } { \normalfont \l_tmpa_tl } + \bool_if:NF \l_minimalist_is_under_bfseries_bool + { + \colorlet{minimalist-temp-color}{.} + } + \textcolor { minimalist-temp-color!39!paper } { \normalfont \l_tmpa_tl } } \cs_new_protected:Nn \minimalist_apply_title_numbering_style:n @@ -284,10 +310,9 @@ \exp_args:Nnx \regex_count:nnN { \. } {#1} \l_tmpa_int \int_case:nn { \l_tmpa_int } { - { 0 } { \textcolor { .!24!paper } } - { 1 } { \textcolor { .!39!paper } } - { 2 } { \textcolor { .!39!paper } } - { 3 } { \smaller[2] \textcolor { .!24!paper } } + { 0 } { \textcolor { main-text!39!paper } } + { 1 } { \textcolor { main-text!39!paper } } + { 2 } { \textcolor { main-text!39!paper } } } \l_tmpa_tl \group_end: @@ -415,7 +440,7 @@ \titleformat{\section} {\LocallyStopLineNumbers \g_minimalist_title_font_section_tl\centering} - {\raisebox{-.02\baselineskip}{\large \minimalist_apply_title_numbering_style_static:n { \thesection } }}{1em} + {\raisebox{-.02\baselineskip}{\large \minimalist_apply_title_numbering_style:n { \thesection } }}{1em} {#1} [\ResumeLineNumbers] @@ -423,7 +448,7 @@ \titleformat{\subsection} {\LocallyStopLineNumbers \g_minimalist_title_font_subsection_tl} - { \minimalist_apply_title_numbering_style_static:n { \thesubsection } }{.75em} + { \minimalist_apply_title_numbering_style:n { \thesubsection } }{.75em} {#1} [\ResumeLineNumbers] @@ -432,14 +457,14 @@ { \titleformat{\subsubsection}[runin] {\g_minimalist_title_font_subsubsection_tl} - { \minimalist_apply_title_numbering_style_static:n { \thesection } }{.5em} + { \minimalist_apply_title_numbering_style:n { \thesection } }{.5em} {#1.}[\hspace*{.3em}] } { \titleformat{\subsubsection} {\LocallyStopLineNumbers \g_minimalist_title_font_subsubsection_tl} - { \minimalist_apply_title_numbering_style_static:n { \thesubsubsection } }{.5em} + { \minimalist_apply_title_numbering_style:n { \thesubsubsection } }{.5em} {#1} [\ResumeLineNumbers] } @@ -522,6 +547,7 @@ %%================================ %% Lists %%================================ +\PassOptionsToPackage { inline } { enumitem } \RequirePackage { enumitem } \setlistdepth{10} \setlist{noitemsep, topsep=.33\topsep-.5\parskip} @@ -532,7 +558,7 @@ ref = \normalfont\color{.!45!paper}\arabic{enumi}.\emph{\roman*}$\mskip-.5mu\big)$} \setlist[enumerate,3]{label = \normalfont\emph{\alph*}$\mskip-.5mu\big)$, ref = \normalfont\color{.!45!paper}\arabic{enumi}.\emph{\roman{enumii}}.\emph{\alph*}$\mskip-.5mu\big)$} -\setlist[description]{font=\normalfont\minimalist_bfseries:} +\setlist[description]{font=\normalfont\minimalist_bfseries:\minimalist_sffamily:} \renewlist{itemize}{itemize}{10} \setlist[itemize]{leftmargin=*,label=\textcolor{.!27!paper}{$\cdot$}} @@ -673,7 +699,7 @@ heading_suffix "}\n" \RequirePackage { mathtools } \RequirePackage { amsthm } -\def\tagform@#1{\maketag@@@{\textcolor{main-text!39!paper}{(\ignorespaces#1\unskip\@@italiccorr)}}} +\def\tagform@#1{\maketag@@@{\textcolor{.!39!paper}{(\ignorespaces#1\unskip\@@italiccorr)}}} \PassOptionsToPackage { nopatch = eqnum } { microtype } @@ -706,7 +732,8 @@ heading_suffix "}\n" {\normalfont}{} {0pt} {{\thmname{#1}\thmnumber{\nobreakspace #2}} - {\color{main-text!50!paper}\thmnote{\hspace{.4em}$($#3$)$}}\nobreakspace\nobreakspace{\normalfont\textcolor{main-text!27!paper}{---}}\nobreakspace\nobreakspace} + {\color{main-text!50!paper}\thmnote{\hspace{.4em}$($#3$)$}}.\nobreakspace\nobreakspace} + % {\normalfont\textcolor{main-text!27!paper}{---}} } \theoremstyle{simple} @@ -728,10 +755,19 @@ heading_suffix "}\n" \renewcommand\Hy@numberline[1]{#1.~} % https://tex.stackexchange.com/a/1821 % Add the bookmark of ToC - \hook_gput_code:nnn { cmd/tableofcontents/before } { minimalist } + \bool_if:NTF \l__minimalist_is_book_bool { - \if@openright\cleardoublepage\else\clearpage\fi - \pdfbookmark[0]{\contentsname}{toc} + \hook_gput_code:nnn { cmd/tableofcontents/before } { minimalist } + { + \if@openright\cleardoublepage\else\clearpage\fi + \pdfbookmark[0]{\contentsname}{toc} + } + } + { + \hook_gput_code:nnn { cmd/tableofcontents/before } { minimalist } + { + \pdfbookmark[1]{\contentsname}{toc} + } } } @@ -741,23 +777,32 @@ heading_suffix "}\n" \SetTheorem { proof, proof* } { qed-symbol = { \customqedsymbol } } +\bool_if:NT \l__minimalist_colored_proof_bool + { + \hook_gput_code:nnn { env/proof/begin } { minimalist } + { + \Hy@SaveLastskip + \color{ \l__minimalist_colored_proof_tl } + \Hy@RestoreLastskip + } + } \exp_args:No \SetTheorem { \c_projlib_theorem_supported_clist, theorem-with-name } { name style = { , heading style = { - , english = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , french = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , ngerman = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , italian = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , portuguese = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , brazilian = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , spanish = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , schinese = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , tchinese = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , japanese = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , russian = \minimalist_bfseries:\g_minimalist_title_font_common_tl + , english = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , french = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , ngerman = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , italian = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , portuguese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , brazilian = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , spanish = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , schinese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl + , tchinese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl + , japanese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl + , russian = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl } } } @@ -766,18 +811,18 @@ heading_suffix "}\n" { name style = { , heading style = { - , english = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit - , french = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit - , ngerman = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit - , italian = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit - , portuguese = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit - , brazilian = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit - , spanish = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit - , russian = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit - , schinese = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , tchinese = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , japanese = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , russian = \minimalist_bfseries:\g_minimalist_title_font_common_tl + , english = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textit + , french = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textit + , ngerman = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textit + , italian = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textit + , portuguese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textit + , brazilian = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textit + , spanish = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textit + , russian = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textit + , schinese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl + , tchinese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl + , japanese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl + , russian = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl } } } @@ -788,33 +833,33 @@ heading_suffix "}\n" { name style = { , crefname style = { - , english = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , french = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , ngerman = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , italian = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , portuguese = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , brazilian = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , spanish = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , schinese = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , tchinese = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , japanese = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , russian = \minimalist_bfseries:\g_minimalist_title_font_common_tl + , english = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , french = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , ngerman = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , italian = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , portuguese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , brazilian = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , spanish = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , schinese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl + , tchinese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl + , japanese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl + , russian = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl } , Crefname style = { - , english = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , french = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , ngerman = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , italian = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , portuguese = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , brazilian = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , spanish = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , schinese = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , tchinese = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , japanese = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , russian = \minimalist_bfseries:\g_minimalist_title_font_common_tl + , english = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , french = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , ngerman = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , italian = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , portuguese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , brazilian = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , spanish = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , schinese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl + , tchinese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl + , japanese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl + , russian = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl } , numbering style = { - \minimalist_bfseries:\g_minimalist_title_font_common_tl + \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl } } } @@ -823,35 +868,35 @@ heading_suffix "}\n" { name style = { , crefname style = { - , english = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit - , french = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit - , ngerman = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit - , italian = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit - , portuguese = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit - , brazilian = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit - , spanish = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit - , russian = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit - , schinese = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , tchinese = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , japanese = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , russian = \minimalist_bfseries:\g_minimalist_title_font_common_tl + , english = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textit + , french = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textit + , ngerman = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textit + , italian = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textit + , portuguese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textit + , brazilian = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textit + , spanish = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textit + , russian = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textit + , schinese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl + , tchinese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl + , japanese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl + , russian = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl } , Crefname style = { - , english = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit - , french = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit - , ngerman = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit - , italian = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit - , portuguese = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit - , brazilian = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit - , spanish = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit - , russian = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit - , schinese = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , tchinese = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , japanese = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , russian = \minimalist_bfseries:\g_minimalist_title_font_common_tl + , english = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textit + , french = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textit + , ngerman = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textit + , italian = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textit + , portuguese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textit + , brazilian = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textit + , spanish = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textit + , russian = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textit + , schinese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl + , tchinese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl + , japanese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl + , russian = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl } , numbering style = { - \minimalist_bfseries:\g_minimalist_title_font_common_tl + \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl } } } @@ -898,16 +943,17 @@ heading_suffix "}\n" } \RequirePackage { projlib-titlepage } - \renewcommand{\maketitle}{ - \LocallyStopLineNumbers - \ProjLibTitlePage [ style = simple ] - { - , title = \@title - , author = \@author - , date = \@date - } - \ResumeLineNumbers - } + \RenewDocumentCommand \maketitle { O{} } + { + \LocallyStopLineNumbers + \ProjLibTitlePage [ style = simple, #1 ] + { + , title = \@title + , author = \@author + , date = \@date + } + \ResumeLineNumbers + } } { \renewcommand{\@maketitle} @@ -915,7 +961,7 @@ heading_suffix "}\n" \LocallyStopLineNumbers \begin{center} \let\footnote\thanks - {\minimalist_bfseries:\sffamily\minimalist_scshape:\Large\@title}\\\bigskip + {\minimalist_bfseries:\minimalist_scshape:\sffamily\Large\@title}\\\bigskip \color{main-text!80!paper} {\small\minimalist_scshape:\@author} \par\smallskip\vspace{-\parskip} @@ -973,7 +1019,7 @@ heading_suffix "}\n" \LocallyStopLineNumbers \vspace{-.75\baselineskip} \begin{center} - {\minimalist_bfseries:\minimalist_scshape:\small\keywordname}\\ + { \g_minimalist_title_font_section_tl \minimalist_scshape: \small\keywordname}\\ \vspace{-.3\baselineskip} \begin{minipage}[t]{.833\textwidth} \vspace{0pt} diff --git a/macros/latex/contrib/minimalist/minimalist-stream.sty b/macros/latex/contrib/minimalist/minimalist-stream.sty index e9e94eda46..d81bcbd059 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/01/05} {} + {2023/03/07} {} {The "stream" style of minimalist} \IfPackageLoadedTF { minimalist } {} @@ -30,6 +30,19 @@ \endinput } +\bool_new:N \l__minimalist_colored_proof_bool +\bool_set_true:N \l__minimalist_colored_proof_bool +\tl_if_eq:NnTF \l__minimalist_colored_proof_tl { * } + { + \bool_set_false:N \l__minimalist_colored_proof_bool + } + { + \tl_if_eq:NnT \l__minimalist_colored_proof_tl { false } + { + \bool_set_false:N \l__minimalist_colored_proof_bool + } + } + %%================================ %% Title fonts %%================================ @@ -57,6 +70,14 @@ \cs_new:Nn \minimalist_bfseries: {} } +\bool_if:NTF \l__minimalist_use_sffamily_bool + { + \cs_new:Nn \minimalist_sffamily: { \sffamily } + } + { + \cs_new:Nn \minimalist_sffamily: {} + } + \bool_if:NTF \l__minimalist_use_scshape_bool { \cs_new:Nn \minimalist_scshape: { \scshape } @@ -74,12 +95,12 @@ \tl_new:N \g_minimalist_title_font_subsubsection_tl \tl_new:N \g_minimalist_title_font_paragraph_tl -\tl_gset:Nn \g_minimalist_title_font_part_tl { \minimalist_bfseries: \g_minimalist_title_font_common_tl } -\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: } +\tl_gset:Nn \g_minimalist_title_font_part_tl { \minimalist_bfseries:\minimalist_sffamily: \g_minimalist_title_font_common_tl } +\tl_gset:Nn \g_minimalist_title_font_chapter_tl { \minimalist_bfseries:\minimalist_sffamily: \g_minimalist_title_font_common_tl \minimalist_scshape: } +\tl_gset:Nn \g_minimalist_title_font_section_tl { \minimalist_bfseries:\minimalist_sffamily: \g_minimalist_title_font_common_tl \minimalist_scshape: } +\tl_gset:Nn \g_minimalist_title_font_subsection_tl { \minimalist_bfseries:\minimalist_sffamily: \g_minimalist_title_font_common_tl \minimalist_scshape: } \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: } +\tl_gset:Nn \g_minimalist_title_font_paragraph_tl { \minimalist_bfseries:\minimalist_sffamily: \g_minimalist_title_font_common_tl \minimalist_scshape: } \bool_if:NF \l__minimalist_fast_bool { @@ -272,7 +293,12 @@ \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 { .!39!paper } { \normalfont \l_tmpa_tl } + % \textcolor { .!39!paper } { \normalfont \l_tmpa_tl } + \bool_if:NF \l_minimalist_is_under_bfseries_bool + { + \colorlet{minimalist-temp-color}{.} + } + \textcolor { minimalist-temp-color!39!paper } { \normalfont \l_tmpa_tl } } \cs_new_protected:Nn \minimalist_apply_title_numbering_style:n @@ -284,10 +310,10 @@ \exp_args:Nnx \regex_count:nnN { \. } {#1} \l_tmpa_int \int_case:nn { \l_tmpa_int } { - { 0 } { \textcolor { .!39!paper } } - { 1 } { \textcolor { .!39!paper } } - { 2 } { \textcolor { .!39!paper } } - { 3 } { \smaller[2] \textcolor { .!24!paper } } + { 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 } } } \l_tmpa_tl \group_end: @@ -591,6 +617,7 @@ %%================================ %% Lists %%================================ +\PassOptionsToPackage { inline } { enumitem } \RequirePackage { enumitem } \setlistdepth{10} \setlist{noitemsep, topsep=.33\topsep-.5\parskip} @@ -601,7 +628,7 @@ ref = \normalfont\color{.!45!paper}\arabic{enumi}.\emph{\roman*}$\mskip-.5mu\big)$} \setlist[enumerate,3]{label = \normalfont\emph{\alph*}$\mskip-.5mu\big)$, ref = \normalfont\color{.!45!paper}\arabic{enumi}.\emph{\roman{enumii}}.\emph{\alph*}$\mskip-.5mu\big)$} -\setlist[description]{font=\normalfont\minimalist_bfseries:} +\setlist[description]{font=\normalfont\minimalist_bfseries:\minimalist_sffamily:} \renewlist{itemize}{itemize}{10} \setlist[itemize]{leftmargin=*,label=\textcolor{.!27!paper}{$\cdot$}} @@ -742,7 +769,7 @@ heading_suffix "}\n" \RequirePackage { mathtools } \RequirePackage { amsthm } -\def\tagform@#1{\maketag@@@{\textcolor{main-text!39!paper}{(\ignorespaces#1\unskip\@@italiccorr)}}} +\def\tagform@#1{\maketag@@@{\textcolor{.!39!paper}{(\ignorespaces#1\unskip\@@italiccorr)}}} \PassOptionsToPackage { nopatch = eqnum } { microtype } @@ -785,7 +812,7 @@ heading_suffix "}\n" \minimalist_apply_title_numbering_style:n { \thmnumber{#2} } \skip_horizontal:n { \l_minimalist_title_sep_dim } } - % \minimalist_bfseries: + % \minimalist_bfseries:\minimalist_sffamily: {\thmname{#1}} {\color{main-text!50!paper}\thmnote{\hspace{.4em}$($#3$)$}} . \hspace{.5em} @@ -842,10 +869,19 @@ heading_suffix "}\n" \renewcommand\Hy@numberline[1]{#1.~} % https://tex.stackexchange.com/a/1821 % Add the bookmark of ToC - \hook_gput_code:nnn { cmd/tableofcontents/before } { minimalist } + \bool_if:NTF \l__minimalist_is_book_bool { - \if@openright\cleardoublepage\else\clearpage\fi - \pdfbookmark[0]{\contentsname}{toc} + \hook_gput_code:nnn { cmd/tableofcontents/before } { minimalist } + { + \if@openright\cleardoublepage\else\clearpage\fi + \pdfbookmark[0]{\contentsname}{toc} + } + } + { + \hook_gput_code:nnn { cmd/tableofcontents/before } { minimalist } + { + \pdfbookmark[1]{\contentsname}{toc} + } } } @@ -856,6 +892,15 @@ heading_suffix "}\n" \SetTheorem { proof, proof* } { qed-symbol = { \customqedsymbol } } +\bool_if:NT \l__minimalist_colored_proof_bool + { + \hook_gput_code:nnn { env/proof/begin } { minimalist } + { + \Hy@SaveLastskip + \color{ \l__minimalist_colored_proof_tl } + \Hy@RestoreLastskip + } + } \exp_args:No \SetTheorem { \c_projlib_theorem_supported_clist, theorem-with-name, proof } { shared counter = subsection } @@ -863,17 +908,17 @@ heading_suffix "}\n" { name style = { , heading style = { - , english = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , french = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , ngerman = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , italian = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , portuguese = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , brazilian = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , spanish = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , schinese = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , tchinese = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , japanese = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , russian = \minimalist_bfseries:\g_minimalist_title_font_common_tl + , english = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , french = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , ngerman = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , italian = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , portuguese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , brazilian = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , spanish = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , schinese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl + , tchinese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl + , japanese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl + , russian = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl } , numbering style = { \minimalist_apply_title_numbering_style_static:n } } @@ -895,30 +940,30 @@ heading_suffix "}\n" { name style = { , crefname style = { - , english = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , french = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , ngerman = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , italian = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , portuguese = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , brazilian = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , spanish = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , schinese = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , tchinese = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , japanese = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , russian = \minimalist_bfseries:\g_minimalist_title_font_common_tl + , english = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , french = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , ngerman = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , italian = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , portuguese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , brazilian = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , spanish = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , schinese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl + , tchinese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl + , japanese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl + , russian = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl } , Crefname style = { - , english = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , french = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , ngerman = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , italian = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , portuguese = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , brazilian = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , spanish = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc - , schinese = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , tchinese = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , japanese = \minimalist_bfseries:\g_minimalist_title_font_common_tl - , russian = \minimalist_bfseries:\g_minimalist_title_font_common_tl + , english = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , french = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , ngerman = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , italian = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , portuguese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , brazilian = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , spanish = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl\textsc + , schinese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl + , tchinese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl + , japanese = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl + , russian = \minimalist_bfseries:\minimalist_sffamily:\g_minimalist_title_font_common_tl } , numbering style = { \minimalist_apply_title_numbering_style_static:n } } @@ -979,16 +1024,17 @@ heading_suffix "}\n" } \RequirePackage { projlib-titlepage } - \renewcommand{\maketitle}{ - \LocallyStopLineNumbers - \ProjLibTitlePage [ style = simple ] - { - , title = \@title - , author = \@author - , date = \@date - } - \ResumeLineNumbers - } + \RenewDocumentCommand \maketitle { O{} } + { + \LocallyStopLineNumbers + \ProjLibTitlePage [ style = simple, #1 ] + { + , title = \@title + , author = \@author + , date = \@date + } + \ResumeLineNumbers + } } { \renewcommand{\@maketitle} @@ -996,7 +1042,7 @@ heading_suffix "}\n" \LocallyStopLineNumbers \begin{center} \let\footnote\thanks - {\minimalist_bfseries:\sffamily\minimalist_scshape:\Large\@title}\\\bigskip + {\minimalist_bfseries:\minimalist_scshape:\sffamily\Large\@title}\\\bigskip \color{main-text!80!paper} {\small\minimalist_scshape:\@author} \par\smallskip\vspace{-\parskip} @@ -1054,7 +1100,7 @@ heading_suffix "}\n" \LocallyStopLineNumbers \vspace{-.75\baselineskip} \begin{center} - {\minimalist_bfseries:\minimalist_scshape:\small\keywordname}\\ + { \g_minimalist_title_font_section_tl \minimalist_scshape: \small\keywordname}\\ \vspace{-.3\baselineskip} \begin{minipage}[t]{.833\textwidth} \vspace{0pt} diff --git a/macros/latex/contrib/minimalist/minimalist.sty b/macros/latex/contrib/minimalist/minimalist.sty index 0266993cec..8eeb64e747 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/01/05} {} + {2023/03/07} {} {A simple and clear style for articles and books} \keys_define:nn { minimalist } @@ -33,6 +33,8 @@ , use~style .str_set:N = \l__minimalist_style_str , use style .str_set:N = \l__minimalist_style_str , classical .meta:n = { style = classical } + , flow .meta:n = { style = flow } + , stream .meta:n = { style = stream } , use-boldface .bool_set:N = \l__minimalist_use_boldface_bool , use-boldface .initial:n = { false } @@ -45,6 +47,14 @@ , title~in~bold .bool_set:N = \l__minimalist_use_boldface_bool , title in bold .bool_set:N = \l__minimalist_use_boldface_bool + , use-sffamily .bool_set:N = \l__minimalist_use_sffamily_bool + , use-sffamily .initial:n = { false } + , use~sffamily .bool_set:N = \l__minimalist_use_sffamily_bool + , use sffamily .bool_set:N = \l__minimalist_use_sffamily_bool + , title-in-sffamily .bool_set:N = \l__minimalist_use_sffamily_bool + , title~in~sffamily .bool_set:N = \l__minimalist_use_sffamily_bool + , title in sffamily .bool_set:N = \l__minimalist_use_sffamily_bool + , use-scshape .bool_set:N = \l__minimalist_use_scshape_bool , use-scshape .initial:n = { false } , use~scshape .bool_set:N = \l__minimalist_use_scshape_bool @@ -61,6 +71,16 @@ , 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 + , colored-proof .tl_set:N = \l__minimalist_colored_proof_tl + , colored-proof .initial:n = { * } + , colored-proof .default:n = { blue!50!cyan!55!main-text } + , colored~proof .tl_set:N = \l__minimalist_colored_proof_tl + , colored~proof .initial:n = { * } + , colored~proof .default:n = { blue!50!cyan!55!main-text } + , colored proof .tl_set:N = \l__minimalist_colored_proof_tl + , colored proof .initial:n = { * } + , colored proof .default:n = { blue!50!cyan!55!main-text } + , unknown .code:n = { \PassOptionsToPackage { \CurrentOption } { projlib-language } \PassOptionsToPackage { \CurrentOption } { projlib-author } diff --git a/macros/latex/contrib/minimalist/minimart.cls b/macros/latex/contrib/minimalist/minimart.cls index 14681ba41d..04e877e103 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/01/05} {} + {2023/03/07} {} {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 63d84a04a0..536a23fe55 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/01/05} {} + {2023/03/07} {} {A simple and clear book style} \tl_const:Nn \l__minimclass_base_class_tl { book } -- cgit v1.2.3