minimalist (5jul21)

git-svn-id: svn://tug.org/texlive/trunk@59842 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 27 insertions, 19 deletions

diff --git a/Master/texmf-dist/tex/latex/minimalist/minimalist.sty b/Master/texmf-dist/tex/latex/minimalist/minimalist.sty
index e4bdbcd605d..6b11172530f 100644
--- a/Master/texmf-dist/tex/latex/minimalist/minimalist.sty
+++ b/Master/texmf-dist/tex/latex/minimalist/minimalist.sty
@@ -17,7 +17,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[2020-10-01]
 \ProvidesPackage{minimalist}
-    [2021/06/30 A simple and clear style for articles and books]
+    [2021/07/05 A simple and clear style for articles and books]
 \RequirePackage{kvoptions}
 \RequirePackage{etoolbox}
 \SetupKeyvalOptions{%
@@ -50,12 +50,13 @@
 \newif\ifIsBook
 \ifdefined\c@chapter\IsBooktrue\else\IsBookfalse\fi
 
-\def\minimalist@titlefontshape{}
-
 %%================================
 %% Title fonts
 %%================================
 \RequirePackage{anyfontsize}
+
+\def\minimalist@titlefontshape{}
+
 \if@minimalist@classical
 \newcommand{\partfont}{\conditionalbfseries\minimalist@titlefontshape}
 \newcommand{\chapfont}{\conditionalbfseries\minimalist@titlefontshape}
@@ -81,7 +82,9 @@
 \RequirePackage{geometry}
 \RequirePackage{fancyhdr}
 \RequirePackage{extramarks}
+
 \AtEndPreamble{\fancyhfoffset{0pt}}
+
 \fancypagestyle{fancy}{
     \fancyhf{}
     \if@twoside
@@ -97,6 +100,7 @@
     \renewcommand{\headrulewidth}{0pt}
 }
 \pagestyle{fancy}
+
 \fancypagestyle{plain}{
     \fancyhf{}
     \if@twoside
@@ -161,7 +165,7 @@
     \fi
 }
 %%================================
-%% Line spacing
+%% Languages and line spacing
 %%================================
 \RequirePackage{PJLlang}
 \PJLsetlinespacing{\setstretch{1.07}}
@@ -210,6 +214,7 @@
 \def\LocallyStopLineNumbers{\LNturnsONfalse%
     \ifLineNumbers\LNturnsONtrue\fi\nolinenumbers}
 \def\ResumeLineNumbers{\ifLNturnsON\linenumbers\fi}
+
 \pretocmd{\tableofcontents}{\LocallyStopLineNumbers}{}{\FAIL}
 \apptocmd{\tableofcontents}{\ResumeLineNumbers}{}{\FAIL}
 \pretocmd{\thebibliography}{\LocallyStopLineNumbers}{}{\FAIL}
@@ -453,11 +458,21 @@
 %% Lists
 %%================================
 \RequirePackage{enumitem}
-\setlist{noitemsep,leftmargin=2em}
-\gappto{\PJLlang@langconfig@common}{\renewcommand\labelitemi{\textcolor{maintext!25}{$\bullet$}}}
-\gappto{\PJLlang@langconfig@french}{\renewcommand\labelitemi{\textcolor{maintext!50}{---}}}
-\renewcommand\labelitemii{\textcolor{maintext!27}{--}}
-\renewcommand\labelitemiii{\textcolor{maintext!27}{\texttt{*}}}
+\setlist{noitemsep}
+\setlist[enumerate]{labelsep=*, leftmargin=*}
+\setlist[enumerate,1]{label = \arabic*.,
+    ref = \arabic*}
+\setlist[enumerate,2]{label = \emph{\alph*}),
+    ref = \theenumi.\emph{\alph*}}
+\setlist[enumerate,3]{label = (\roman*),
+    ref = \theenumii.\roman*}
+\setlist[description]{font=\normalfont\conditionalbfseries}
+
+\setlist[itemize]{leftmargin=*}
+\gappto{\PJLlang@langconfig@common}{\setlist[itemize,1]{label=\textcolor{maintext!25}{$\bullet$}}}
+\gappto{\PJLlang@langconfig@french}{\setlist[itemize,1]{label=\textcolor{maintext!50}{---}}}
+\setlist[itemize,2]{label=\textcolor{maintext!27}{--}}
+\setlist[itemize,3]{label=\textcolor{maintext!27}{\texttt{*}}}
 
 %%================================
 %% Blank page
@@ -504,8 +519,9 @@
             \color{maintext!50!paper}\thmnote{\ensuremath{(\text{#3})}~~}%
             \pushQED{\qed}%
         }
-    \def\@endtheorem{\popQED\endtrivlist\@endpefalse
-    \global\let\qedsymbol\qedsymbolOriginal}
+    \def\@endtheorem{\global\let\qedsymbol\simpleqedsymbol%
+        \popQED\endtrivlist\@endpefalse
+        \global\let\qedsymbol\qedsymbolOriginal}
 \fi
 
 \renewcommand{\qedsymbol}{%
@@ -525,7 +541,6 @@
 \PassOptionsToPackage{nothms}{PJLthm}
 \RequirePackage{PJLthm}
 
-%% Adjust English theorems names
 \pretocmd{\theoremnameEN}{\textsc}{}{\FAIL}
 \pretocmd{\lemmanameEN}{\textsc}{}{\FAIL}
 \pretocmd{\propositionnameEN}{\textsc}{}{\FAIL}
@@ -546,7 +561,6 @@
 \pretocmd{\remarknameEN}{\itshape}{}{\FAIL}
 \pretocmd{\observationnameEN}{\itshape}{}{\FAIL}
 
-%% Adjust French theorems names
 \pretocmd{\theoremnameFR}{\textsc}{}{\FAIL}
 \pretocmd{\lemmanameFR}{\textsc}{}{\FAIL}
 \pretocmd{\propositionnameFR}{\textsc}{}{\FAIL}
@@ -567,7 +581,6 @@
 \pretocmd{\remarknameFR}{\itshape}{}{\FAIL}
 \pretocmd{\observationnameFR}{\itshape}{}{\FAIL}
 
-%% Adjust German theorems names
 \pretocmd{\theoremnameDE}{\textsc}{}{\FAIL}
 \pretocmd{\lemmanameDE}{\textsc}{}{\FAIL}
 \pretocmd{\propositionnameDE}{\textsc}{}{\FAIL}
@@ -588,7 +601,6 @@
 \pretocmd{\remarknameDE}{\itshape}{}{\FAIL}
 \pretocmd{\observationnameDE}{\itshape}{}{\FAIL}
 
-%% Adjust Italian theorems names
 \pretocmd{\theoremnameIT}{\textsc}{}{\FAIL}
 \pretocmd{\lemmanameIT}{\textsc}{}{\FAIL}
 \pretocmd{\propositionnameIT}{\textsc}{}{\FAIL}
@@ -609,7 +621,6 @@
 \pretocmd{\remarknameIT}{\itshape}{}{\FAIL}
 \pretocmd{\observationnameIT}{\itshape}{}{\FAIL}
 
-%% Adjust Portuguese theorems names
 \pretocmd{\theoremnamePT}{\textsc}{}{\FAIL}
 \pretocmd{\lemmanamePT}{\textsc}{}{\FAIL}
 \pretocmd{\propositionnamePT}{\textsc}{}{\FAIL}
@@ -630,7 +641,6 @@
 \pretocmd{\remarknamePT}{\itshape}{}{\FAIL}
 \pretocmd{\observationnamePT}{\itshape}{}{\FAIL}
 
-%% Adjust Brazilian theorems names
 \pretocmd{\theoremnameBR}{\textsc}{}{\FAIL}
 \pretocmd{\lemmanameBR}{\textsc}{}{\FAIL}
 \pretocmd{\propositionnameBR}{\textsc}{}{\FAIL}
@@ -651,7 +661,6 @@
 \pretocmd{\remarknameBR}{\itshape}{}{\FAIL}
 \pretocmd{\observationnameBR}{\itshape}{}{\FAIL}
 
-%% Adjust Spanish theorems names
 \pretocmd{\theoremnameES}{\textsc}{}{\FAIL}
 \pretocmd{\lemmanameES}{\textsc}{}{\FAIL}
 \pretocmd{\propositionnameES}{\textsc}{}{\FAIL}
@@ -672,7 +681,6 @@
 \pretocmd{\remarknameES}{\itshape}{}{\FAIL}
 \pretocmd{\observationnameES}{\itshape}{}{\FAIL}
 
-%% Theorem environments
 \theoremstyle{simple}
 \ifbool{IsBook}{
     \newaliascnt{highest}{chapter}