summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/minimalist
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2021-07-31 03:00:52 +0000
committerNorbert Preining <norbert@preining.info>2021-07-31 03:00:52 +0000
commit6476d9b56070f64c62d6a81514c0c9b25aad1eda (patch)
treebbcbbc5af76f023abb6d36c84ae8a2c2e46dc601 /macros/latex/contrib/minimalist
parent83b88676e8526454a292a894c5f30451eb75b828 (diff)
CTAN sync 202107310300
Diffstat (limited to 'macros/latex/contrib/minimalist')
-rw-r--r--macros/latex/contrib/minimalist/minimalist-doc.pdfbin97030 -> 98659 bytes
-rw-r--r--macros/latex/contrib/minimalist/minimalist-doc.tex20
-rw-r--r--macros/latex/contrib/minimalist/minimalist.sty36
-rw-r--r--macros/latex/contrib/minimalist/minimart.cls16
-rw-r--r--macros/latex/contrib/minimalist/minimbook.cls16
5 files changed, 68 insertions, 20 deletions
diff --git a/macros/latex/contrib/minimalist/minimalist-doc.pdf b/macros/latex/contrib/minimalist/minimalist-doc.pdf
index c5aeb079d6..b8120a55aa 100644
--- a/macros/latex/contrib/minimalist/minimalist-doc.pdf
+++ b/macros/latex/contrib/minimalist/minimalist-doc.pdf
Binary files differ
diff --git a/macros/latex/contrib/minimalist/minimalist-doc.tex b/macros/latex/contrib/minimalist/minimalist-doc.tex
index be388ef8c8..f0d643ab63 100644
--- a/macros/latex/contrib/minimalist/minimalist-doc.tex
+++ b/macros/latex/contrib/minimalist/minimalist-doc.tex
@@ -1,7 +1,4 @@
-\documentclass[English,Chinese,French,puretext]{minimart}
-
-\CreateTheorem{definition}<highest>
-\CreateTheorem{theorem}[definition]
+\documentclass[English,Chinese,French]{minimart}
\linenumbers % Enable line numbers
@@ -101,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/07/27}}
+\thanks{Corresponding to: \texttt{\minimalist{} 2021/07/30}}
\email{\href{mailto:ProjLib@outlook.com}{ProjLib@outlook.com}}
\date{July 2021, Beijing}
@@ -405,9 +402,14 @@ In the next section, we will go through the options available.
\begin{itemize}
\item Pure text mode. Does not load theorem-like environments.
\end{itemize}
- \item \texttt{nothmnum}
+ \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).
+ \end{itemize}
+ \item \texttt{regionalref}, \texttt{originalref}
\begin{itemize}
- \item Theorem-like environments will not be numbered.
+ \item When referencing, whether the name of the theorem-like environment changes with the current language. The default is \texttt{regionalref}, \emph{i.e.}, the name corresponding to the current language is used; for example, when referencing a theorem-like environment in English context, the names "Theorem, Definition..." will be used no matter which language context the original environment is in. If \texttt{originalref} is enabled, then the name will always remain the same as the original place; for example, when referencing a theorem written in the French context, even if one is currently in the English context, it will still be displayed as ``Théorème''.
+ \item In \texttt{fast} mode, the option \texttt{originalref} will have no effect.
\end{itemize}
\end{itemize}
@@ -417,7 +419,7 @@ Additionally, \minimart{} and \minimbook{} offers the following options:
\begin{itemize}
\item Optional paper size. The default paper size is 7in $\times$ 10in.
\end{itemize}
- \item \texttt{palatino}, \texttt{times}, \texttt{garamond}, \texttt{biolinum} ~$|$~ \texttt{useosf}
+ \item \texttt{palatino}, \texttt{times}, \texttt{garamond}, \texttt{noto}, \texttt{biolinum} ~$|$~ \texttt{useosf}
\begin{itemize}
\item Font options. As the name suggest, font with corresponding name will be loaded.
\item The \texttt{useosf} option is used to enable the old-style figures.
@@ -497,7 +499,7 @@ After using \lstinline|\UseLanguage{French}|, a theorem will be displayed as:
Un théorème en français.
\end{theorem}
-By default, when referenced, the name of the theorem always matches the language of the context in which the theorem is located. For example, the definition above is still displayed in English in the current French mode: \cref{def: strange} and \cref{thm}. If you want the name of the theorem to match the current context when referencing, you can add \texttt{regionalref} to the global options.
+By default, when referenced, the name of the theorem matches the current context. For example, the definition above will be displayed in French in the current French context: \cref{def: strange,thm}. If you want the name of the theorem to always match the language of the context in which the theorem is located, you can add \texttt{originalref} to the global options.
\end{tip}
\UseLanguage{English}
diff --git a/macros/latex/contrib/minimalist/minimalist.sty b/macros/latex/contrib/minimalist/minimalist.sty
index 9ae2e948b5..9f972f569d 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/07/27 A simple and clear style for articles and books]
+ [2021/07/30 A simple and clear style for articles and books]
\RequirePackage{kvoptions}
\RequirePackage{etoolbox}
\SetupKeyvalOptions{%
@@ -29,11 +29,17 @@
\DeclareBoolOption[false]{puretext}
\DeclareBoolOption[false]{nothms}
\DeclareBoolOption[false]{nothmnum}
+\DeclareStringOption{thmnum}[minimalist@thmnum@default]
+\DeclareBoolOption[true]{regionalref}
+\DeclareBoolOption[false]{originalref}
\DeclareBoolOption[false]{allowbf}
\DeclareBoolOption[false]{classical}
\DeclareBoolOption[false]{runin}
\ProcessKeyvalOptions*\relax
+\if@minimalist@originalref
+ \@minimalist@regionalreffalse
+\fi
\if@minimalist@draft
\@minimalist@fasttrue
\fi
@@ -41,6 +47,21 @@
\@minimalist@nothmstrue
\fi
+\if@minimalist@fast
+ \PassOptionsToPackage{fast}{PJLdraft}
+ \PassOptionsToPackage{fast}{PJLthm}
+\fi
+\expandafter\ifstrempty\expandafter{\@minimalist@thmnum}{}{
+ \expandafter\ifstrequal\expandafter{\@minimalist@thmnum}{minimalist@thmnum@default}{
+ \PassOptionsToPackage{thmnum}{PJLthm}
+ }{
+ \PassOptionsToPackage{thmnum=\@minimalist@thmnum}{PJLthm}
+ }
+}
+\if@minimalist@regionalref\else
+ \PassOptionsToPackage{originalref}{PJLthm}
+\fi
+
\if@minimalist@allowbf
\newcommand{\conditionalbfseries}{\bfseries\colorlet{PJLtempcolor}{.}\color{PJLtempcolor!83!paper}}
\else
@@ -681,12 +702,8 @@
\pretocmd{\remarknameES}{\itshape}{}{\FAIL}
\pretocmd{\observationnameES}{\itshape}{}{\FAIL}
+\AtEndPreamble{
\theoremstyle{simple}
-\ifbool{IsBook}{
- \newaliascnt{highest}{chapter}
-}{
- \newaliascnt{highest}{section}
-}
\if@minimalist@nothms\else
\if@minimalist@nothmnum
\CreateTheorem*{theorem}
@@ -699,7 +716,7 @@
\CreateTheorem*{fact}
\CreateTheorem*{conjecture}
\else
-\CreateTheorem{theorem}<highest>
+\CreateTheorem@thmnum{theorem}
\CreateTheorem{lemma}[theorem]
\CreateTheorem{proposition}[theorem]
\CreateTheorem{corollary}[theorem]
@@ -755,12 +772,13 @@
\CreateTheorem*{remark}
\CreateTheorem*{observation}
\else
-\CreateTheorem{remark}<highest>
-\CreateTheorem{observation}<highest>
+\CreateTheorem@thmnum{remark}
+\CreateTheorem@thmnum{observation}
\fi
\CreateTheorem*{remark*}
\CreateTheorem*{observation*}
\fi
+}
\ifbool{IsBook}{}{%
diff --git a/macros/latex/contrib/minimalist/minimart.cls b/macros/latex/contrib/minimalist/minimart.cls
index 8953e92b7c..a8c8ae4754 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/07/27 A simple and clear article style]
+ [2021/07/30 A simple and clear article style]
\def\minimclass@baseclass{article}
\RequirePackage{kvoptions}
\RequirePackage{etoolbox}
@@ -33,6 +33,7 @@
\DeclareBoolOption[false]{palatino}
\DeclareBoolOption[false]{times}
\DeclareBoolOption[false]{garamond}
+\DeclareBoolOption[false]{noto}
\DeclareBoolOption[false]{biolinum}
\DeclareBoolOption[false]{customfont}
@@ -60,6 +61,9 @@
\if@minimclass@garamond
\@minimclass@customfonttrue
\fi
+\if@minimclass@noto
+ \@minimclass@customfonttrue
+\fi
\if@minimclass@biolinum
\@minimclass@customfonttrue
\fi
@@ -154,6 +158,16 @@
\PJLsetlinespacing{\setstretch{1.00}}
\fi
+\if@minimclass@noto
+ \RequirePackage{amssymb}
+ \if@minimclass@useosf
+ \PassOptionsToPackage{oldstyle}{notomath}
+ \fi
+ \RequirePackage{anyfontsize}
+ \RequirePackage{notomath}
+ \PJLsetlinespacing{\setstretch{1.00}}
+\fi
+
\if@minimclass@biolinum
\RequirePackage{amssymb}
% \RequirePackage{mathpazo}
diff --git a/macros/latex/contrib/minimalist/minimbook.cls b/macros/latex/contrib/minimalist/minimbook.cls
index 83a16c03f4..68c787254a 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/07/27 A simple and clear book style]
+ [2021/07/30 A simple and clear book style]
\def\minimclass@baseclass{book}
\RequirePackage{kvoptions}
\RequirePackage{etoolbox}
@@ -33,6 +33,7 @@
\DeclareBoolOption[false]{palatino}
\DeclareBoolOption[false]{times}
\DeclareBoolOption[false]{garamond}
+\DeclareBoolOption[false]{noto}
\DeclareBoolOption[false]{biolinum}
\DeclareBoolOption[false]{customfont}
@@ -60,6 +61,9 @@
\if@minimclass@garamond
\@minimclass@customfonttrue
\fi
+\if@minimclass@noto
+ \@minimclass@customfonttrue
+\fi
\if@minimclass@biolinum
\@minimclass@customfonttrue
\fi
@@ -154,6 +158,16 @@
\PJLsetlinespacing{\setstretch{1.00}}
\fi
+\if@minimclass@noto
+ \RequirePackage{amssymb}
+ \if@minimclass@useosf
+ \PassOptionsToPackage{oldstyle}{notomath}
+ \fi
+ \RequirePackage{anyfontsize}
+ \RequirePackage{notomath}
+ \PJLsetlinespacing{\setstretch{1.00}}
+\fi
+
\if@minimclass@biolinum
\RequirePackage{amssymb}
% \RequirePackage{mathpazo}