From 8f4ee8d038215a1830cecf5d5a0c6895acabe0fc Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 7 Mar 2023 22:19:49 +0000 Subject: jxu (7mar23) git-svn-id: svn://tug.org/texlive/trunk@66434 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/minimalist/minimalist-classical.sty | 233 ++++++++++++--------- 1 file changed, 137 insertions(+), 96 deletions(-) (limited to 'Master/texmf-dist/tex/latex/minimalist/minimalist-classical.sty') diff --git a/Master/texmf-dist/tex/latex/minimalist/minimalist-classical.sty b/Master/texmf-dist/tex/latex/minimalist/minimalist-classical.sty index 0ea75181ce4..31bbbdf00b9 100644 --- a/Master/texmf-dist/tex/latex/minimalist/minimalist-classical.sty +++ b/Master/texmf-dist/tex/latex/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} -- cgit v1.2.3