minimalist (7jun21)

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

5 files changed, 29 insertions, 10 deletions

diff --git a/Master/texmf-dist/doc/latex/minimalist/minimalist-doc.pdf b/Master/texmf-dist/doc/latex/minimalist/minimalist-doc.pdf
index 969688dff07..8835eef2299 100644
--- a/Master/texmf-dist/doc/latex/minimalist/minimalist-doc.pdf
+++ b/Master/texmf-dist/doc/latex/minimalist/minimalist-doc.pdf
diff --git a/Master/texmf-dist/doc/latex/minimalist/minimalist-doc.tex b/Master/texmf-dist/doc/latex/minimalist/minimalist-doc.tex
index 1ba08ae37f5..0d1fc5d29fb 100644
--- a/Master/texmf-dist/doc/latex/minimalist/minimalist-doc.tex
+++ b/Master/texmf-dist/doc/latex/minimalist/minimalist-doc.tex
@@ -85,7 +85,7 @@
 
 \title{\minimalist{}, write your articles or books in a simple and clear way}
 \author{Jinwen XU}
-\thanks{Corresponding to: \texttt{\minimalist{} 2021/06/07}}
+\thanks{Corresponding to: \texttt{\minimalist{} 2021/06/07a}}
 \date{June 2021, Beijing}
 
 \maketitle
diff --git a/Master/texmf-dist/tex/latex/minimalist/minimalist.sty b/Master/texmf-dist/tex/latex/minimalist/minimalist.sty
index 11d2e62035c..fdea2527fb6 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/07 A simple and clear style for articles and books]
+    [2021/06/07a A simple and clear style for articles and books]
 \RequirePackage{kvoptions}
 \RequirePackage{etoolbox}
 \SetupKeyvalOptions{%
@@ -370,7 +370,7 @@
 %% Subsubsection
 \titleformat{\subsubsection}
     {\LocallyStopLineNumbers%
-    \color{paper!30!-paper}\subsubsecfont}{\thesubsubsection}{1em}
+    \color{paper!30!-paper}\subsubsecfont}{\thesubsubsection}{.6em}
     {#1}
     [\ResumeLineNumbers]
 
@@ -408,6 +408,12 @@
         {\contentslabel{2.75em}}
         {\hspace*{-2.75em}}
         {\titlerule*[1em]{\textcolor{gray!30!paper}{.}}\contentspage}
+    \titlecontents{subsubsection}
+        [9em] % i.e., 7em (subsection) + 2em
+        {\normalfont}
+        {\contentslabel{2.75em}}
+        {\hspace*{-2.75em}}
+        {\titlerule*[1em]{\textcolor{gray!30!paper}{.}}\contentspage}
 }{
     \titlecontents{section}
         [2em] % i.e., 0em (part) + 2em
@@ -421,6 +427,12 @@
         {\contentslabel{2.75em}}
         {\hspace*{-2.75em}}
         {\titlerule*[1em]{\textcolor{gray!30!paper}{.}}\contentspage}
+    \titlecontents{subsubsection}
+        [7em] % i.e., 5em (subsection) + 2em
+        {\normalfont}
+        {\contentslabel{2.75em}}
+        {\hspace*{-2.75em}}
+        {\titlerule*[1em]{\textcolor{gray!30!paper}{.}}\contentspage}
 }
 
 %%================================
@@ -476,20 +488,26 @@
             {\color{gray}\thmnote{\ensuremath{(\text{#3})}~~}}}
     \fi
 \else
-\def\simpleqed{\hfill\makebox[1em]{\rlap{\textcolor{gray!25!paper}{\rule[-0.1em]{.95em}{.95em}}}{\kern.07em\raisebox{.07em}{\textcolor{paper}{\rule[-0.1em]{.81em}{.81em}}}\kern.07em}}}
+\def\simpleqedsymbol{%
+    \makebox[1em]{\rlap{\textcolor{gray!25!paper}{\rule[-0.1em]{.95em}{.95em}}}{\kern.07em\raisebox{.07em}{\textcolor{paper}{\rule[-0.1em]{.81em}{.81em}}}\kern.07em}}}
 \newtheoremstyle{simple}%
     {}{}%
     {\normalfont}{}%
     {\normalfont}{}%
     {0pt}%
-    {{\conditionalbfseries\thmname{#1}\thmnumber{ #2}}\hspace{.4em}%
+    {\global\let\qedsymbol\simpleqedsymbol%
+        {\conditionalbfseries\thmname{#1}\thmnumber{ #2}}\hspace{.4em}%
         \textcolor{gray!55!paper}{$|$}\hspace{.4em}%
-        \color{gray}\thmnote{\ensuremath{(\text{#3})}~~}\pushQED{\simpleqed}}
-\def\@endtheorem{\popQED\endtrivlist\@endpefalse }
+        \color{gray}\thmnote{\ensuremath{(\text{#3})}~~}%
+        \pushQED{\qed}%
+    }
+\def\@endtheorem{\popQED\endtrivlist\@endpefalse
+\global\let\qedsymbol\qedsymbolOriginal}
 \fi
 
 \renewcommand{\qedsymbol}{%
     \makebox[1em]{\color{gray!55!paper}\rule[-0.1em]{.95em}{.95em}}}
+\let\qedsymbolOriginal\qedsymbol
 
 \if@minimalist@fast
     \providecommand{\phantomsection}{}
@@ -719,6 +737,7 @@
         {\small\scshape\@author}\\[2pt]%
         {\small\@date}%
     \end{center}%
+    \ifx\@date\@empty\bigskip\fi%
     \bigskip\par%
     \ResumeLineNumbers%
 }
@@ -739,7 +758,7 @@
     % \vspace{-\parskip}%
     \vspace{-.5\baselineskip}%
     \ifx\@date\@empty%
-        \vspace{-.2\baselineskip}%
+        \vspace{1.6\baselineskip}%
     \else%
         \vspace{-.5\baselineskip}%
     \fi%
diff --git a/Master/texmf-dist/tex/latex/minimalist/minimart.cls b/Master/texmf-dist/tex/latex/minimalist/minimart.cls
index cf4f084590a..e3babb2c3d4 100644
--- a/Master/texmf-dist/tex/latex/minimalist/minimart.cls
+++ b/Master/texmf-dist/tex/latex/minimalist/minimart.cls
@@ -17,7 +17,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[2020-10-01]
 \ProvidesClass{minimart}
-    [2021/06/07 A simple and clear article style]
+    [2021/06/07a A simple and clear article style]
 \def\minimclass@baseclass{article}
 \RequirePackage{kvoptions}
 \RequirePackage{etoolbox}
diff --git a/Master/texmf-dist/tex/latex/minimalist/minimbook.cls b/Master/texmf-dist/tex/latex/minimalist/minimbook.cls
index ec1c656a15e..5091782a7d6 100644
--- a/Master/texmf-dist/tex/latex/minimalist/minimbook.cls
+++ b/Master/texmf-dist/tex/latex/minimalist/minimbook.cls
@@ -17,7 +17,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[2020-10-01]
 \ProvidesClass{minimbook}
-    [2021/06/07 A simple and clear book style]
+    [2021/06/07a A simple and clear book style]
 \def\minimclass@baseclass{book}
 \RequirePackage{kvoptions}
 \RequirePackage{etoolbox}