From a19bf62ec5fa04167fc9480e22cd235ec53b3e41 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Thu, 12 Aug 2021 03:01:55 +0000 Subject: CTAN sync 202108120301 --- macros/latex/contrib/minimalist/minimalist-doc.pdf | Bin 97753 -> 98049 bytes macros/latex/contrib/minimalist/minimalist-doc.tex | 15 ++++++++----- macros/latex/contrib/minimalist/minimalist.sty | 25 ++++++++++++++------- macros/latex/contrib/minimalist/minimart.cls | 3 ++- macros/latex/contrib/minimalist/minimbook.cls | 3 ++- 5 files changed, 31 insertions(+), 15 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 151b45a41a..4beabecc19 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 b3ead54ad1..6238f7b93b 100644 --- a/macros/latex/contrib/minimalist/minimalist-doc.tex +++ b/macros/latex/contrib/minimalist/minimalist-doc.tex @@ -1,4 +1,4 @@ -\documentclass[English,Chinese,French,classical]{minimart} +\documentclass[classical]{minimart} \linenumbers % Enable line numbers @@ -98,7 +98,7 @@ \title{\minimalist{}, write your articles or books in a simple and clear way} \author{Jinwen XU} -\thanks{Corresponding to: \texttt{\minimalist{} 2021/08/08a}} +\thanks{Corresponding to: \texttt{\minimalist{} 2021/08/11}} \email{\href{mailto:ProjLib@outlook.com}{ProjLib@outlook.com}} \date{August 2021, Beijing} @@ -193,6 +193,7 @@ Référence du théorème: \cref{thm:abc} If you find this example a little complicated, don't worry. Let's now look at this example piece by piece. +\medskip \LevelThreeTitle{Initialization} \medskip @@ -391,11 +392,15 @@ In the next section, we will go through the options available. \end{itemize} \item \texttt{puretext} or \texttt{nothms} \begin{itemize} - \item Pure text mode. Does not load theorem-like environments. + \item Pure text mode. Do not load theorem-like environments. + \end{itemize} + \item \texttt{delaythms} + \begin{itemize} + \item Defer the definition of theorem-like environments to the end of the preamble. Use this option if you want the theorem-like environments to be numbered within a custom counter. \end{itemize} \item \texttt{nothmnum}, \texttt{thmnum} or \texttt{thmnum=}\meta{counter} \begin{itemize} - \item Theorem-like environments will not be numbered / numbered in order 1, 2, 3... / numbered within \meta{counter}. Here, \meta{counter} should be a built-in counter (such as \texttt{subsection}) or a custom counter defined in the preamble. If no option is used, they will be numbered within \texttt{chapter} (book) or \texttt{section} (article). + \item Theorem-like environments will not be numbered / numbered in order 1, 2, 3... / numbered within \meta{counter}. Here, \meta{counter} should be a built-in counter (such as \texttt{subsection}) or a custom counter defined in the preamble (with the option \texttt{delaythms} enabled). If no option is used, they will be numbered within \texttt{chapter} (book) or \texttt{section} (article). \end{itemize} \item \texttt{regionalref}, \texttt{originalref} \begin{itemize} @@ -404,7 +409,7 @@ In the next section, we will go through the options available. \end{itemize} \end{itemize} -\clearpage +\bigskip Additionally, \minimart{} and \minimbook{} offers the following options: \begin{itemize} \item \texttt{a4paper} or \texttt{b5paper} diff --git a/macros/latex/contrib/minimalist/minimalist.sty b/macros/latex/contrib/minimalist/minimalist.sty index 04aba94b43..1892b05e4a 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/08/08a A simple and clear style for articles and books] + [2021/08/11 A simple and clear style for articles and books] \RequirePackage{kvoptions} \RequirePackage{etoolbox} \SetupKeyvalOptions{% @@ -28,6 +28,7 @@ \DeclareBoolOption[false]{fast} \DeclareBoolOption[false]{puretext} \DeclareBoolOption[false]{nothms} +\DeclareBoolOption[false]{delaythms} \DeclareBoolOption[false]{nothmnum} \DeclareStringOption{thmnum}[minimalist@thmnum@default] \DeclareBoolOption[true]{regionalref} @@ -89,7 +90,7 @@ \newcommand{\chapfont}{\conditionalbfseries\minimalist@titlefontshape} \newcommand{\secfont}{\conditionalbfseries\minimalist@titlefontshape} \newcommand{\subsecfont}{\conditionalbfseries\minimalist@titlefontshape} -\newcommand{\subsubsecfont}{\conditionalbfseries\minimalist@titlefontshape\itshape} +\newcommand{\subsubsecfont}{\conditionalbfseries\minimalist@titlefontshape} \fi %%================================ @@ -252,13 +253,13 @@ \gappto{\PJLlang@langconfig@common}{% \renewcommand{\partstring}{\MakeUppercase{{\partname~\protect\thepart}}}% } -\gappto{\PJLlang@langconfig@schinese}{% +\gappto{\PJLlang@langconfig@CN}{% \renewcommand{\partstring}{第~\thepart~部分}% } -\gappto{\PJLlang@langconfig@tchinese}{% +\gappto{\PJLlang@langconfig@TC}{% \renewcommand{\partstring}{第~\thepart~部分}% } -\gappto{\PJLlang@langconfig@japanese}{% +\gappto{\PJLlang@langconfig@JP}{% \renewcommand{\partstring}{第~\thepart~部}% } @@ -491,7 +492,7 @@ \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}{---}}} +\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{*}}} @@ -702,8 +703,10 @@ \pretocmd{\remarknameES}{\itshape}{}{\FAIL} \pretocmd{\observationnameES}{\itshape}{}{\FAIL} -\AtEndPreamble{ + \theoremstyle{simple} + +\def\minimalist@definethms{ \if@minimalist@nothms\else \if@minimalist@nothmnum \CreateTheorem*{theorem} @@ -780,6 +783,12 @@ \fi } +\if@minimalist@delaythms + \AtEndPreamble{\minimalist@definethms} +\else + \minimalist@definethms +\fi + \ifbool{IsBook}{}{% %%================================ @@ -852,7 +861,7 @@ \LocallyStopLineNumbers% \vspace{-\baselineskip}% \begin{center}% - \textsc{\conditionalbfseries\small\abstractname}\\% + \textsc{\conditionalbfseries\minimalist@titlefontshape\small\abstractname}\\% \vspace{-.3\baselineskip}% \begin{minipage}[t]{.833\textwidth}% \vspace{0pt}% diff --git a/macros/latex/contrib/minimalist/minimart.cls b/macros/latex/contrib/minimalist/minimart.cls index 11d6858055..b35e37468c 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/08/08a A simple and clear article style] + [2021/08/11 A simple and clear article style] \def\minimclass@baseclass{article} \RequirePackage{kvoptions} \RequirePackage{etoolbox} @@ -36,6 +36,7 @@ \DeclareBoolOption[false]{noto} \DeclareBoolOption[false]{biolinum} \DeclareBoolOption[false]{customfont} +\DeclareStringOption{thmnum}[PJL@thmnum@default] \newif\if@minimclass@bfivepaper\@minimclass@bfivepaperfalse \DeclareVoidOption{b5paper}{\@minimclass@bfivepapertrue} diff --git a/macros/latex/contrib/minimalist/minimbook.cls b/macros/latex/contrib/minimalist/minimbook.cls index 6a3caba3a8..0c50b2bb81 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/08/08a A simple and clear book style] + [2021/08/11 A simple and clear book style] \def\minimclass@baseclass{book} \RequirePackage{kvoptions} \RequirePackage{etoolbox} @@ -36,6 +36,7 @@ \DeclareBoolOption[false]{noto} \DeclareBoolOption[false]{biolinum} \DeclareBoolOption[false]{customfont} +\DeclareStringOption{thmnum}[PJL@thmnum@default] \newif\if@minimclass@bfivepaper\@minimclass@bfivepaperfalse \DeclareVoidOption{b5paper}{\@minimclass@bfivepapertrue} -- cgit v1.2.3