diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/minimalist/minimalist-stream.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/minimalist/minimalist-stream.sty | 170 |
1 files changed, 108 insertions, 62 deletions
diff --git a/Master/texmf-dist/tex/latex/minimalist/minimalist-stream.sty b/Master/texmf-dist/tex/latex/minimalist/minimalist-stream.sty index e9e94eda465..d81bcbd0593 100644 --- a/Master/texmf-dist/tex/latex/minimalist/minimalist-stream.sty +++ b/Master/texmf-dist/tex/latex/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} |