From 19ec3a90133b7827c16b0ffde16152fb4d566138 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Tue, 8 Jun 2021 03:02:17 +0000 Subject: CTAN sync 202106080302 --- macros/latex/contrib/minimalist/minimalist-doc.pdf | Bin 81352 -> 81350 bytes macros/latex/contrib/minimalist/minimalist-doc.tex | 2 +- macros/latex/contrib/minimalist/minimalist.sty | 33 ++++++++++++++++----- macros/latex/contrib/minimalist/minimart.cls | 2 +- macros/latex/contrib/minimalist/minimbook.cls | 2 +- 5 files changed, 29 insertions(+), 10 deletions(-) (limited to 'macros/latex/contrib/minimalist') diff --git a/macros/latex/contrib/minimalist/minimalist-doc.pdf b/macros/latex/contrib/minimalist/minimalist-doc.pdf index 969688dff0..8835eef229 100644 Binary files a/macros/latex/contrib/minimalist/minimalist-doc.pdf and b/macros/latex/contrib/minimalist/minimalist-doc.pdf differ diff --git a/macros/latex/contrib/minimalist/minimalist-doc.tex b/macros/latex/contrib/minimalist/minimalist-doc.tex index 1ba08ae37f..0d1fc5d29f 100644 --- a/macros/latex/contrib/minimalist/minimalist-doc.tex +++ b/macros/latex/contrib/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/macros/latex/contrib/minimalist/minimalist.sty b/macros/latex/contrib/minimalist/minimalist.sty index 11d2e62035..fdea2527fb 100644 --- a/macros/latex/contrib/minimalist/minimalist.sty +++ b/macros/latex/contrib/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/macros/latex/contrib/minimalist/minimart.cls b/macros/latex/contrib/minimalist/minimart.cls index cf4f084590..e3babb2c3d 100644 --- a/macros/latex/contrib/minimalist/minimart.cls +++ b/macros/latex/contrib/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/macros/latex/contrib/minimalist/minimbook.cls b/macros/latex/contrib/minimalist/minimbook.cls index ec1c656a15..5091782a7d 100644 --- a/macros/latex/contrib/minimalist/minimbook.cls +++ b/macros/latex/contrib/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} -- cgit v1.2.3