From 6827f87d3315fc677ae89a9260d455a312a90864 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Fri, 17 Dec 2021 03:01:00 +0000 Subject: CTAN sync 202112170300 --- macros/latex/contrib/minimalist/minimalist-doc.pdf | Bin 98036 -> 112379 bytes macros/latex/contrib/minimalist/minimalist-doc.tex | 4 +- macros/latex/contrib/minimalist/minimalist.sty | 45 ++++----------------- macros/latex/contrib/minimalist/minimart.cls | 6 +-- macros/latex/contrib/minimalist/minimbook.cls | 6 +-- 5 files changed, 12 insertions(+), 49 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 6e77ea33b0..4cf1db38d8 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 dc178f15b3..28577a6bcc 100644 --- a/macros/latex/contrib/minimalist/minimalist-doc.tex +++ b/macros/latex/contrib/minimalist/minimalist-doc.tex @@ -98,9 +98,9 @@ \title{\minimalist{}, write your articles or books in a simple and clear way} \author{Jinwen XU} -\thanks{Corresponding to: \texttt{\minimalist{} 2021/11/09}} +\thanks{Corresponding to: \texttt{\minimalist{} 2021/12/16}} \email{\href{mailto:ProjLib@outlook.com}{ProjLib@outlook.com}} -\date{November 2021, in Paris} +\date{December 2021, in Paris} \maketitle diff --git a/macros/latex/contrib/minimalist/minimalist.sty b/macros/latex/contrib/minimalist/minimalist.sty index 418ffb55e4..85a64926d6 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/11/09 A simple and clear style for articles and books] + [2021/12/16 A simple and clear style for articles and books] \RequirePackage{kvoptions} \RequirePackage{etoolbox} \SetupKeyvalOptions{% @@ -198,40 +198,10 @@ %% Line numbers %%================================ \PassOptionsToPackage{pagewise,mathlines}{lineno} -\RequirePackage{lineno} +\RequirePackage{linenoamsmath} \renewcommand\linenumberfont{\ttfamily\color{maintext!7!paper}\footnotesize} \setlength\linenumbersep{1em} -\RequirePackage{mathtools} - -\ifdefined\linenomathpatch\else -\newcommand*\linenomathpatch[1]{% - \cspreto{#1}{\linenomath}% - \cspreto{#1*}{\linenomath}% - \csappto{end#1}{\endlinenomath}% - \csappto{end#1*}{\endlinenomath}% -} -\newcommand*\linenomathpatchAMS[1]{% - \cspreto{#1}{\linenomathAMS}% - \cspreto{#1*}{\linenomathAMS}% - \csappto{end#1}{\endlinenomath}% - \csappto{end#1*}{\endlinenomath}% -} -\expandafter\ifx\linenomath\linenomathWithnumbers - \let\linenomathAMS\linenomathWithnumbers - \patchcmd\linenomathAMS{\advance\postdisplaypenalty\linenopenalty}{}{}{} -\else - \let\linenomathAMS\linenomathNonumbers -\fi - -\linenomathpatch{equation} -\linenomathpatchAMS{gather} -\linenomathpatchAMS{multline} -\linenomathpatchAMS{align} -\linenomathpatchAMS{alignat} -\linenomathpatchAMS{flalign} -\fi - \newif\ifLNturnsON \def\LocallyStopLineNumbers{\LNturnsONfalse% \ifLineNumbers\LNturnsONtrue\fi\nolinenumbers} @@ -490,7 +460,7 @@ ref = \arabic{enumi}.\emph{\roman{enumii}}.\emph{\alph*}$)$} \setlist[description]{font=\normalfont\conditionalbfseries} \if@minimalist@classical -\newcommand\desculine{\bgroup\markoverwith{\color{maintext!27!paper}% +\newcommand\desculine{\colorlet{currentcolor}{.}\bgroup\markoverwith{\color{currentcolor!50!paper}% \rule[-.45ex]{2pt}{.75pt}}\ULon} \renewcommand{\descriptionlabel}[1]{% \hspace{\labelsep}\normalfont\desculine{#1}% @@ -498,10 +468,10 @@ \fi \setlist[itemize]{leftmargin=*} -\gappto{\PJLlang@langconfig@common}{\setlist[itemize,1]{label=\textcolor{maintext!25}{$\bullet$}}} -\gappto{\PJLlang@langconfig@FR}{\setlist[itemize,1]{label=\textcolor{maintext!50}{---}}} -\setlist[itemize,2]{label=\textcolor{maintext!27}{--}} -\setlist[itemize,3]{label=\textcolor{maintext!27}{\texttt{*}}} +\gappto{\PJLlang@langconfig@common}{\setlist[itemize,1]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{$\bullet$}}} +\gappto{\PJLlang@langconfig@FR}{\setlist[itemize,1]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!50!paper}{---}}} +\setlist[itemize,2]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{--}} +\setlist[itemize,3]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{\texttt{*}}} %%================================ %% Blank page @@ -525,6 +495,7 @@ %%================================ %% Theorems %%================================ +\RequirePackage{mathtools} \RequirePackage{amsthm} \if@minimalist@classical \def\simpleqedsymbol{% diff --git a/macros/latex/contrib/minimalist/minimart.cls b/macros/latex/contrib/minimalist/minimart.cls index f3193c183b..e671b25d65 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/11/09 A simple and clear article style] + [2021/12/16 A simple and clear article style] \def\minimclass@baseclass{article} \RequirePackage{kvoptions} \RequirePackage{etoolbox} @@ -213,10 +213,6 @@ \PassOptionsToPackage{verbose=silent}{microtype} \RequirePackage{microtype} -\AtEndPreamble{\AtBeginDocument{\microtypesetup{deactivate}{\scshape}\microtypesetup{reactivate}}} -\AtEndPreamble{\AtBeginDocument{\microtypesetup{deactivate}{\bfseries\scshape}\microtypesetup{reactivate}}} -\AtEndPreamble{\AtBeginDocument{\microtypesetup{deactivate}{\sffamily\scshape}\microtypesetup{reactivate}}} -\AtEndPreamble{\AtBeginDocument{\microtypesetup{deactivate}{\ttfamily\scshape}\microtypesetup{reactivate}}} \PassOptionsToPackage{all}{nowidow} \RequirePackage{nowidow} \RequirePackage{embrac} diff --git a/macros/latex/contrib/minimalist/minimbook.cls b/macros/latex/contrib/minimalist/minimbook.cls index d67e657c15..384451f8f1 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/11/09 A simple and clear book style] + [2021/12/16 A simple and clear book style] \def\minimclass@baseclass{book} \RequirePackage{kvoptions} \RequirePackage{etoolbox} @@ -213,10 +213,6 @@ \PassOptionsToPackage{verbose=silent}{microtype} \RequirePackage{microtype} -\AtEndPreamble{\AtBeginDocument{\microtypesetup{deactivate}{\scshape}\microtypesetup{reactivate}}} -\AtEndPreamble{\AtBeginDocument{\microtypesetup{deactivate}{\bfseries\scshape}\microtypesetup{reactivate}}} -\AtEndPreamble{\AtBeginDocument{\microtypesetup{deactivate}{\sffamily\scshape}\microtypesetup{reactivate}}} -\AtEndPreamble{\AtBeginDocument{\microtypesetup{deactivate}{\ttfamily\scshape}\microtypesetup{reactivate}}} \PassOptionsToPackage{all}{nowidow} \RequirePackage{nowidow} \RequirePackage{embrac} -- cgit v1.2.3