summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/minimalist/minimalist-flow.sty
diff options
context:
space:
mode:
Diffstat (limited to 'macros/latex/contrib/minimalist/minimalist-flow.sty')
-rw-r--r--macros/latex/contrib/minimalist/minimalist-flow.sty48
1 files changed, 40 insertions, 8 deletions
diff --git a/macros/latex/contrib/minimalist/minimalist-flow.sty b/macros/latex/contrib/minimalist/minimalist-flow.sty
index 5eabb82c3b..051e444da9 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/07/14} {}
+ {2023/09/21} {}
{The "flow" style of minimalist}
\IfPackageLoadedTF { minimalist } {}
@@ -313,6 +313,7 @@
{ 0 } { \textcolor { main-text!39!paper } }
{ 1 } { \textcolor { main-text!39!paper } }
{ 2 } { \textcolor { main-text!39!paper } }
+ { 3 } { \textcolor { main-text!39!paper } }
}
\l_tmpa_tl
\group_end:
@@ -564,17 +565,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$}}
@@ -731,6 +736,21 @@ heading_suffix "}\n"
{\color{main-text!50!paper}\thmnote{\hspace{.4em}$($#3$)$}}
}}\hbox{\strut}\vspace{0pt}}}
}
+ \newtheoremstyle{simple-var}
+ {.75\baselineskip}{}
+ {
+ \bool_if:NTF \l__minimalist_emphasis_theorem_bool { \itshape } { \normalfont }
+ \parindent=0pt
+ \parskip=.3333\baselineskip plus .0667\baselineskip minus .0833\baselineskip
+ }{}
+ {\normalfont}{}
+ {0pt}
+ {
+ \rlap{\vbox{\hbox{\parbox{\linewidth}{
+ {\thmnumber{ \minimalist_apply_title_numbering_style:n { #2 } \hspace{.75em} }\thmname{#1}}
+ {\color{main-text!50!paper}\thmnote{\hspace{.4em}$($#3$)$}}
+ }}\hbox{\strut}\vspace{0pt}}}
+ }
}
{
\newtheoremstyle{simple}
@@ -744,6 +764,17 @@ heading_suffix "}\n"
{0pt}
{{\thmnumber{ \minimalist_apply_title_numbering_style:n { #2 } \hspace{.75em} }\thmname{#1}}
{\color{main-text!50!paper}\thmnote{\hspace{.4em}$($#3$)$}}\nobreakspace\nobreakspace{\normalfont\textcolor{main-text!27!paper}{---}}\nobreakspace\nobreakspace}
+ \newtheoremstyle{simple-var}
+ {}{}
+ {
+ \bool_if:NTF \l__minimalist_emphasis_theorem_bool { \itshape } { \normalfont }
+ \parindent=0pt
+ \parskip=.3333\baselineskip plus .0667\baselineskip minus .0833\baselineskip
+ }{}
+ {\normalfont}{}
+ {0pt}
+ {{\thmnumber{ \minimalist_apply_title_numbering_style:n { #2 } \hspace{.75em} }\thmname{#1}}
+ {\color{main-text!50!paper}\thmnote{\hspace{.4em}$($#3$)$}}\nobreakspace\nobreakspace{\normalfont\textcolor{main-text!27!paper}{---}}\nobreakspace\nobreakspace}
}
\theoremstyle{simple}
@@ -782,6 +813,7 @@ heading_suffix "}\n"
}
+\PassOptionsToPackage { theorem-style = { theorem = simple-var, lemma = simple-var, proposition = simple-var, corollary = simple-var, property = simple-var, axiom = simple-var, construction = simple-var, theorem-with-name = simple-var } } { projlib-theorem }
\RequirePackage { projlib-theorem }