diff options
Diffstat (limited to 'macros/latex/contrib/minimalist/minimalist-plain.sty')
-rw-r--r-- | macros/latex/contrib/minimalist/minimalist-plain.sty | 83 |
1 files changed, 59 insertions, 24 deletions
diff --git a/macros/latex/contrib/minimalist/minimalist-plain.sty b/macros/latex/contrib/minimalist/minimalist-plain.sty index 6afa15b14e..051a773624 100644 --- a/macros/latex/contrib/minimalist/minimalist-plain.sty +++ b/macros/latex/contrib/minimalist/minimalist-plain.sty @@ -15,11 +15,10 @@ %% and version 1.3c or later is part of all distributions of LaTeX version %% 2005/12/01 or later. %% -\NeedsTeXFormat{LaTeX2e}[2020-10-01] -\RequirePackage{l3keys2e} +\NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplPackage {minimalist-plain} - {2022/06/16} {} + {2022/09/03} {} {The plain style of minimalist} \IfPackageLoadedTF { minimalist } {} @@ -443,9 +442,15 @@ \titleformat{\paragraph}[runin] { \g_minimalist_title_font_paragraph_tl }{\theparagraph}{1em}{#1} -\titlespacing{\section}{0pt}{\baselineskip}{.6\baselineskip} -\titlespacing{\subsection}{0pt}{.75\baselineskip}{.4\baselineskip} -\titlespacing{\subsubsection}{0pt}{.5\baselineskip}{.3\baselineskip} +\titlespacing{\section}{0pt}{1\baselineskip plus .5\baselineskip minus .2\baselineskip}{.6\baselineskip plus .3\baselineskip minus .2\baselineskip} +\titlespacing{\subsection}{0pt}{.75\baselineskip plus .3\baselineskip minus .2\baselineskip}{.4\baselineskip plus .2\baselineskip minus .1\baselineskip} +\bool_if:NTF \l__minimalist_runin_bool + { + \titlespacing{\subsubsection}{0pt}{.5\baselineskip plus .2\baselineskip minus .1\baselineskip}{0pt} + } + { + \titlespacing{\subsubsection}{0pt}{.5\baselineskip plus .2\baselineskip minus .1\baselineskip}{.3\baselineskip plus .2\baselineskip minus .1\baselineskip} + } %%================================ %% ToC format @@ -514,21 +519,21 @@ \setlistdepth{10} \setlist{noitemsep, topsep=.33\topsep-.5\parskip} \setlist[enumerate]{labelsep=*, leftmargin=*} -\setlist[enumerate,1]{label=\arabic*$)$, - ref = \arabic*$)$} -\setlist[enumerate,2]{label=\emph{\roman*}$)$, - ref = \arabic{enumi}.\emph{\roman*}$)$} -\setlist[enumerate,3]{label=\emph{\alph*}$)$, - ref = \arabic{enumi}.\emph{\roman{enumii}}.\emph{\alph*}$)$} +\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)$} +\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:} \renewlist{itemize}{itemize}{10} -\setlist[itemize]{leftmargin=*,label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{$\cdot$}} -\AddLanguageSetting { \setlist[itemize,1]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{$\bullet$}} } -\AddLanguageSetting [french] { \setlist[itemize,1]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{\rule[.2\baselineskip]{.8em}{.75pt}}} } -\setlist[itemize,2]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{\rule[.2\baselineskip]{.5em}{.75pt}}} -\setlist[itemize,3]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{$\circ$}} -\setlist[itemize,4]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{$\ast$}} +\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}} } +\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$}} %%================================ %% Blank page @@ -595,8 +600,17 @@ heading_suffix "}\n" \newcommand*{\IndexDotfill} { - \leaders \hbox to .67em {\hss \textcolor{main-text!15!paper}{.} \hss} \hfill + \null\nobreak + \leaders \hbox to .67em {\hss \textcolor{main-text!15!paper}{.} \hss} \hskip1em plus1fill } +\newcommand*{\IndexLinebreak} + { + \nobreakspace\textcolor{main-text!50!paper}{\raisebox{.25ex}{.}\raisebox{.05ex}{.}} + \item\hspace*{\hangindent} + \textcolor{main-text!50!paper}{\raisebox{.35ex}{.}\raisebox{.15ex}{.}}\, + \unskip + } + \newcommand*{\IndexHeading}[1] { \str_if_eq:nnTF { #1 } { Symbols } @@ -611,7 +625,7 @@ heading_suffix "}\n" \renewcommand*{\indexspace} { \par - \vspace{2pc ~ plus ~ .5pc ~ minus ~ .3pc} + \vspace{2pc plus .5pc minus .3pc} } \bool_new:N \l__minimalist_if_first_subitem_bool @@ -648,11 +662,19 @@ heading_suffix "}\n" \RequirePackage { mathtools } \RequirePackage { amsthm } +\def\tagform@#1{\maketag@@@{\textcolor{main-text!39!paper}{(\ignorespaces#1\unskip\@@italiccorr)}}} + +\PassOptionsToPackage { nopatch = eqnum } { microtype } + \bool_if:NTF \l__minimalist_theorem_in_new_line_bool { \newtheoremstyle{simple} {.75\baselineskip}{} - {\normalfont}{} + { + \normalfont + \parindent=0pt + \parskip=.3333\baselineskip plus .0667\baselineskip minus .0833\baselineskip + }{} {\normalfont}{} {0pt} { @@ -665,7 +687,11 @@ heading_suffix "}\n" { \newtheoremstyle{simple} {}{} - {\normalfont}{} + { + \normalfont + \parindent=0pt + \parskip=.3333\baselineskip plus .0667\baselineskip minus .0833\baselineskip + }{} {\normalfont}{} {0pt} {{\thmname{#1}\thmnumber{\nobreakspace #2}} @@ -674,9 +700,9 @@ heading_suffix "}\n" \theoremstyle{simple} -\renewcommand{\qedsymbol}{ +\newcommand{\customqedsymbol}{ \makebox[1em]{\color{main-text!27!paper}\rule[-0.1em]{.95em}{.95em}}} -\let\qedsymbolOriginal\qedsymbol +\let\qedsymbol\customqedsymbol \bool_if:NTF \l__minimalist_fast_bool { @@ -691,10 +717,19 @@ heading_suffix "}\n" \hypersetup{ hidelinks, linktoc = all } \bookmarksetup{ numbered } \renewcommand\Hy@numberline[1]{#1.~} + % https://tex.stackexchange.com/a/1821 + % Add the bookmark of ToC + \hook_gput_code:nnn { cmd/tableofcontents/before } { minimalist } + { + \if@openright\cleardoublepage\else\clearpage\fi + \pdfbookmark[0]{\contentsname}{toc} + } } \RequirePackage { projlib-theorem } +\SetTheorem { proof, proof* } { qed-symbol = { \customqedsymbol } } + \exp_args:No \SetTheorem { \c_projlib_theorem_supported_clist, theorem-with-name } { name style = { |