summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/minimalist/minimalist-classical.sty
diff options
context:
space:
mode:
Diffstat (limited to 'macros/latex/contrib/minimalist/minimalist-classical.sty')
-rw-r--r--macros/latex/contrib/minimalist/minimalist-classical.sty56
1 files changed, 38 insertions, 18 deletions
diff --git a/macros/latex/contrib/minimalist/minimalist-classical.sty b/macros/latex/contrib/minimalist/minimalist-classical.sty
index 43e69a81ff..b552a460ef 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/07/14} {}
+ {2023/09/21} {}
{The "classical" style of minimalist}
\IfPackageLoadedTF { minimalist } {}
@@ -312,7 +312,7 @@
\PassOptionsToPackage { normalem } { ulem }
\RequirePackage { ulem }
-\cs_new:Nn \minimalist_title_numbering_apply_font:n { { \usefont{U}{zeur}{b}{n} #1 } }
+\cs_new:Nn \minimalist_title_numbering_apply_font:n { #1 }
\cs_new_protected:Nn \minimalist_apply_title_numbering_style_static:n
{
@@ -570,12 +570,16 @@
\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 }
\newcommand\desculine{\bgroup\markoverwith{\color{.!55!paper}
\rule[-.45ex]{2pt}{.75pt}}\ULon}
\renewcommand{\descriptionlabel}[1]{
@@ -584,8 +588,8 @@
\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$}}
@@ -741,6 +745,18 @@ heading_suffix "}\n"
}}\hbox{\strut}\vspace{0pt}}}\vspace{-2\parskip}
\pushQED{\qed}
}
+ \newtheoremstyle{simple-var}
+ {.5\baselineskip}{.5\baselineskip}
+ { \bool_if:NTF \l__minimalist_emphasis_theorem_bool { \itshape } { \normalfont } }{}
+ {\normalfont}{}
+ {\newline}
+ { \global\let\qedsymbol\simpleqedsymbol
+ \rlap{\vbox{\hbox{\parbox{\linewidth}{
+ {\thmname{#1}\thmnumber{\nobreakspace #2}}
+ \thmnote{\hspace{.4em}\textcolor{main-text!27!paper}{ \l_minimalist_sep_bar }\hspace{.4em}\color{main-text!50!paper}$($#3$)$}
+ }}\hbox{\strut}\vspace{0pt}}}\vspace{-2\parskip}
+ \pushQED{\qed}
+ }
}
{
\newtheoremstyle{simple}
@@ -754,10 +770,21 @@ heading_suffix "}\n"
\color{main-text!50!paper}\thmnote{$($#3$)$\nobreakspace\nobreakspace}
\pushQED{\qed}
}
+ \newtheoremstyle{simple-var}
+ {.5\baselineskip}{.5\baselineskip}
+ { \bool_if:NTF \l__minimalist_emphasis_theorem_bool { \itshape } { \normalfont } }{}
+ {\normalfont}{}
+ {0pt}
+ { \global\let\qedsymbol\simpleqedsymbol
+ {\thmname{#1}\thmnumber{\nobreakspace #2}}\hspace{.4em}
+ \textcolor{main-text!27!paper}{ \l_minimalist_sep_bar }\hspace{.4em}
+ \color{main-text!50!paper}\thmnote{$($#3$)$\nobreakspace\nobreakspace}
+ \pushQED{\qed}
+ }
}
\def\@endtheorem{\global\let\qedsymbol\simpleqedsymbol
\popQED\endtrivlist\@endpefalse
- \global\let\qedsymbol\qedsymbolOriginal}
+ \global\let\qedsymbol\customqedsymbol}
\theoremstyle{simple}
@@ -795,6 +822,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 }
@@ -1078,14 +1106,6 @@ heading_suffix "}\n"
%%================================
%% Special adjustment
%%================================
-\crefformat { chapter } { \nobreak \crefthemark { \crefthe_retrieve_space: } \nobreak #2 \minimalist_apply_title_numbering_style_static:n {#1} #3 }
-\labelcrefformat { chapter } { #2 \minimalist_apply_title_numbering_style_static:n {#1} #3 }
-\crefformat { section } { \nobreak \crefthemark { \crefthe_retrieve_space: } \nobreak #2 \minimalist_apply_title_numbering_style_static:n {#1} #3 }
-\labelcrefformat { section } { #2 \minimalist_apply_title_numbering_style_static:n {#1} #3 }
-\crefformat { subsection } { \nobreak \crefthemark { \crefthe_retrieve_space: } \nobreak #2 \minimalist_apply_title_numbering_style_static:n {#1} #3 }
-\labelcrefformat { subsection } { #2 \minimalist_apply_title_numbering_style_static:n {#1} #3 }
-\crefformat { subsubsection } { \nobreak \crefthemark { \crefthe_retrieve_space: } \nobreak #2 \minimalist_apply_title_numbering_style_static:n {#1} #3 }
-\labelcrefformat { subsubsection } { #2 \minimalist_apply_title_numbering_style_static:n {#1} #3 }
\endinput
%%