diff options
Diffstat (limited to 'macros/latex/contrib/minimalist/minimalist-stream.sty')
-rw-r--r-- | macros/latex/contrib/minimalist/minimalist-stream.sty | 64 |
1 files changed, 55 insertions, 9 deletions
diff --git a/macros/latex/contrib/minimalist/minimalist-stream.sty b/macros/latex/contrib/minimalist/minimalist-stream.sty index 3f84aaedc5..7baa983b3e 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/07/14} {} + {2023/09/21} {} {The "stream" style of minimalist} \IfPackageLoadedTF { minimalist } {} @@ -634,17 +634,21 @@ \setlist{noitemsep, topsep=.33\topsep-.5\parskip} \setlist[enumerate]{labelsep=*, leftmargin=*} \setlist[enumerate,1]{label = \normalfont\arabic*$\mskip-.5mu\big)$, - ref = \normalfont\color{.!45!paper}\arabic*$\mskip-.5mu\big)$} -\setlist[enumerate,2]{label = \normalfont\emph{\roman*}$\mskip-.5mu\big)$, - ref = \normalfont\color{.!45!paper}\arabic{enumi}.\emph{\roman*}$\mskip-.5mu\big)$} + ref = \normalfont\color{.!45!paper}\arabic*$\mskip-.5mu\big)$, + leftmargin= \l__minimalist_item_indentation_dim + \maxof{\parindent}{1.5em} } + % labelindent= \l__minimalist_item_indentation_dim } +\setlist[enumerate,2]{label = \normalfont\roman*$\mskip-.5mu\big)$, + ref = \normalfont\color{.!45!paper}\arabic{enumi}.\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:\minimalist_sffamily:} + ref = \normalfont\color{.!45!paper}\arabic{enumi}.\roman{enumii}.\emph{\alph*}$\mskip-.5mu\big)$} + +\setlist[description]{font=\normalfont\minimalist_bfseries:\minimalist_sffamily: , + labelindent= \l__minimalist_item_indentation_dim } \renewlist{itemize}{itemize}{10} \setlist[itemize]{leftmargin=*,label=\textcolor{.!27!paper}{$\cdot$}} -\AddLanguageSetting { \setlist[itemize,1]{label=\textcolor{.!27!paper}{$\bullet$},leftmargin=\maxof{\parindent}{1.5em}} } -\AddLanguageSetting [french] { \setlist[itemize,1]{label=\textcolor{.!39!paper}{\rule[.2\baselineskip]{.8em}{.75pt}},leftmargin=\maxof{\parindent}{1.5em}} } +\AddLanguageSetting { \setlist[itemize,1]{label=\textcolor{.!27!paper}{$\bullet$},leftmargin= \l__minimalist_item_indentation_dim + \maxof{\parindent}{1.5em}} } +\AddLanguageSetting [french] { \setlist[itemize,1]{label=\textcolor{.!39!paper}{\rule[.2\baselineskip]{.8em}{.75pt}},leftmargin= \l__minimalist_item_indentation_dim + \maxof{\parindent}{1.5em} } } \setlist[itemize,2]{label=\textcolor{.!27!paper}{\rule[.2\baselineskip]{.55em}{.75pt}}} \setlist[itemize,3]{label=\textcolor{.!27!paper}{$\circ$}} \setlist[itemize,4]{label=\textcolor{.!27!paper}{$\ast$}} @@ -802,6 +806,24 @@ heading_suffix "}\n" \phantom{q} % To provide something below the baseline }}\hbox{\strut}\vspace{0pt}}} } +\newtheoremstyle{simple-newline-var} + {-.2\baselineskip plus 2pt minus .1\baselineskip}{.3\baselineskip plus 2pt minus .1\baselineskip} + { \bool_if:NTF \l__minimalist_emphasis_theorem_bool { \itshape } { \normalfont } }{} + {\normalfont}{} + {0pt} + { + \rlap{\vbox{\hbox{\parbox{\linewidth}{ + \llap{ + \phantom{\rule{0pt}{\baselineskip}} + \minimalist_apply_title_numbering_style:n { \thmnumber{#2} } + \skip_horizontal:n { \l_minimalist_title_sep_dim } + } + \vspace*{-\baselineskip} + {\thmname{#1}} + {\color{main-text!50!paper}\thmnote{\hspace{.4em}$($#3$)$}} + \phantom{q} % To provide something below the baseline + }}\hbox{\strut}\vspace{0pt}}} + } \dim_new:N \l_minimalist_space_before_inline_theorem_dim \AtBeginDocument @@ -828,6 +850,22 @@ heading_suffix "}\n" {\color{main-text!50!paper}\thmnote{\hspace{.4em}$($#3$)$}} . \hspace{.5em} } +\newtheoremstyle{simple-inline-var} + % {.3\baselineskip plus 2pt minus .1\baselineskip}{.3\baselineskip plus 2pt minus .1\baselineskip} + {\l_minimalist_space_before_inline_theorem_dim}{\l_minimalist_space_before_inline_theorem_dim} + { \bool_if:NTF \l__minimalist_emphasis_theorem_bool { \itshape } { \normalfont } }{} + {\normalfont}{} + {0pt} + { + \llap{ + \minimalist_apply_title_numbering_style:n { \thmnumber{#2} } + \skip_horizontal:n { \l_minimalist_title_sep_dim } + } + % \minimalist_bfseries:\minimalist_sffamily: + {\thmname{#1}} + {\color{main-text!50!paper}\thmnote{\hspace{.4em}$($#3$)$}} + . \hspace{.5em} + } \bool_if:NTF \l__minimalist_theorem_in_new_line_bool { @@ -897,7 +935,15 @@ heading_suffix "}\n" } -\PassOptionsToPackage { theorem-style = { remark = simple-inline, proof = proof } } { projlib-theorem } +\bool_if:NTF \l__minimalist_theorem_in_new_line_bool + { + \PassOptionsToPackage { theorem-style = { remark = simple-inline, proof = proof, + theorem = simple-newline-var, lemma = simple-newline-var, proposition = simple-newline-var, corollary = simple-newline-var, property = simple-newline-var, axiom = simple-newline-var, construction = simple-newline-var, theorem-with-name = simple-newline-var } } { projlib-theorem } + } + { + \PassOptionsToPackage { theorem-style = { remark = simple-inline, proof = proof, + theorem = simple-inline-var, lemma = simple-inline-var, proposition = simple-inline-var, corollary = simple-inline-var, property = simple-inline-var, axiom = simple-inline-var, construction = simple-inline-var, theorem-with-name = simple-inline-var } } { projlib-theorem } + } \RequirePackage { projlib-theorem } |