summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-cn.pdfbin330793 -> 331915 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-cn.tex10
-rw-r--r--Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-en.pdfbin215647 -> 215836 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-en.tex16
-rw-r--r--Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-fr.pdfbin219700 -> 219755 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-fr.tex20
-rw-r--r--Master/texmf-dist/doc/latex/colorist/colorist-doc.pdfbin93925 -> 93927 bytes
-rw-r--r--Master/texmf-dist/doc/latex/colorist/colorist-doc.tex20
-rw-r--r--Master/texmf-dist/doc/latex/einfart/einfart-doc-cn.pdfbin248788 -> 250392 bytes
-rw-r--r--Master/texmf-dist/doc/latex/einfart/einfart-doc-cn.tex12
-rw-r--r--Master/texmf-dist/doc/latex/einfart/einfart-doc-en.pdfbin155937 -> 156965 bytes
-rw-r--r--Master/texmf-dist/doc/latex/einfart/einfart-doc-en.tex13
-rw-r--r--Master/texmf-dist/doc/latex/einfart/einfart-doc-fr.pdfbin162595 -> 162102 bytes
-rw-r--r--Master/texmf-dist/doc/latex/einfart/einfart-doc-fr.tex21
-rw-r--r--Master/texmf-dist/doc/latex/lebhart/lebhart-doc-cn.pdfbin278224 -> 279341 bytes
-rw-r--r--Master/texmf-dist/doc/latex/lebhart/lebhart-doc-cn.tex13
-rw-r--r--Master/texmf-dist/doc/latex/lebhart/lebhart-doc-en.pdfbin156507 -> 156264 bytes
-rw-r--r--Master/texmf-dist/doc/latex/lebhart/lebhart-doc-en.tex17
-rw-r--r--Master/texmf-dist/doc/latex/lebhart/lebhart-doc-fr.pdfbin159598 -> 159384 bytes
-rw-r--r--Master/texmf-dist/doc/latex/lebhart/lebhart-doc-fr.tex21
-rw-r--r--Master/texmf-dist/doc/latex/minimalist/minimalist-doc.pdfbin97753 -> 98049 bytes
-rw-r--r--Master/texmf-dist/doc/latex/minimalist/minimalist-doc.tex15
-rw-r--r--Master/texmf-dist/doc/latex/simplivre/simplivre-doc-cn.pdfbin307539 -> 309221 bytes
-rw-r--r--Master/texmf-dist/doc/latex/simplivre/simplivre-doc-cn.tex11
-rw-r--r--Master/texmf-dist/doc/latex/simplivre/simplivre-doc-en.pdfbin210279 -> 210494 bytes
-rw-r--r--Master/texmf-dist/doc/latex/simplivre/simplivre-doc-en.tex12
-rw-r--r--Master/texmf-dist/doc/latex/simplivre/simplivre-doc-fr.pdfbin212710 -> 212933 bytes
-rw-r--r--Master/texmf-dist/doc/latex/simplivre/simplivre-doc-fr.tex18
-rw-r--r--Master/texmf-dist/tex/latex/beaulivre/beaulivre.cls9
-rw-r--r--Master/texmf-dist/tex/latex/colorist/colorart.cls3
-rw-r--r--Master/texmf-dist/tex/latex/colorist/colorbook.cls3
-rw-r--r--Master/texmf-dist/tex/latex/colorist/colorist.sty19
-rw-r--r--Master/texmf-dist/tex/latex/einfart/einfart.cls9
-rw-r--r--Master/texmf-dist/tex/latex/lebhart/lebhart.cls9
-rw-r--r--Master/texmf-dist/tex/latex/minimalist/minimalist.sty25
-rw-r--r--Master/texmf-dist/tex/latex/minimalist/minimart.cls3
-rw-r--r--Master/texmf-dist/tex/latex/minimalist/minimbook.cls3
-rw-r--r--Master/texmf-dist/tex/latex/simplivre/simplivre.cls9
38 files changed, 201 insertions, 110 deletions
diff --git a/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-cn.pdf b/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-cn.pdf
index 2406947a036..347daef679c 100644
--- a/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-cn.pdf
+++ b/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-cn.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-cn.tex b/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-cn.tex
index bcb60d01563..fb2ca4db0fe 100644
--- a/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-cn.tex
+++ b/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-cn.tex
@@ -98,7 +98,7 @@
\fill [cyan!90!black] ($(current page.south west)+(0,7)$) rectangle ($(current page.north west)+(25,-7)$);
\fill [yellow] (current page.south west) rectangle ($(current page.north west)+(3,0)$);
\node[text width=10cm] at ($(current page.north west)+(8.5,-6)$) {\huge\ProjLib};
- \node[text width=6cm,text height=3.5cm,scale=2.5] at ($(current page.north west)+(11,-10)$) {\textcolor{white}{\sffamily\beaulivre{}\\[5pt]\footnotesize\hspace*{-.05em}以多彩的方式排版你的图书\\[10pt]\tiny 对应版本. \texttt{\beaulivre{} 2021/08/09}}};
+ \node[text width=6cm,text height=3.5cm,scale=2.5] at ($(current page.north west)+(11,-10)$) {\textcolor{white}{\sffamily\beaulivre{}\\[5pt]\footnotesize\hspace*{-.05em}以多彩的方式排版你的图书\\[10pt]\tiny 对应版本. \texttt{\beaulivre{} 2021/08/11}}};
\node at ($(current page.south)+(1.5,3)$) {\fontsize{16pt}{0pt}\selectfont\textcolor{gray}{许锦文}};
\node at ($(current page.south)+(1.5,2)$) {\fontsize{12pt}{0pt}\selectfont\textcolor{gray}{2021年8月,北京}};
\end{tikzpicture}%
@@ -297,9 +297,13 @@ Référence du théorème: \cref{thm:abc}
\item 纯文本模式,不加载定理类环境。
\end{itemize}
\clearpage
+ \item \texttt{delaythms}
+ \begin{itemize}
+ \item 将定理类环境设定推迟到导言结尾。如果你希望定理类环境跟随自定义计数器编号,则应考虑这一选项。
+ \end{itemize}
\item \texttt{nothmnum}、\texttt{thmnum} 或 \texttt{thmnum=}\meta{counter}
\begin{itemize}
- \item 定理类环境均不编号 / 按照 1、2、3 顺序编号 / 在 \meta{counter} 内编号。其中 \meta{counter} 应该是自带的计数器 (如 \texttt{subsection}) 或在导言部分自定义的计数器。在没有使用任何选项的情况下将按照 \texttt{chapter} (书) 或 \texttt{section} (文章) 编号。
+ \item 定理类环境均不编号 / 按照 1、2、3 顺序编号 / 在 \meta{counter} 内编号。其中 \meta{counter} 应该是自带的计数器 (如 \texttt{subsection}) 或在导言部分自定义的计数器 (在启用 \texttt{delaythms} 选项的情况下)。在没有使用任何选项的情况下将按照 \texttt{chapter} (书) 或 \texttt{section} (文章) 编号。
\end{itemize}
\item \texttt{regionalref}、\texttt{originalref}
\begin{itemize}
@@ -503,7 +507,7 @@ Référence du théorème: \cref{thm:abc}
\end{itemize}
-\clearpage
+\bigskip
\LevelOneTitle{目前存在的问题}
\begin{itemize}[itemsep=.6em]
\item 对于字体的设置仍然不够完善。
diff --git a/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-en.pdf b/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-en.pdf
index 0002d7484e4..a9a3f0c80c5 100644
--- a/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-en.pdf
+++ b/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-en.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-en.tex b/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-en.tex
index dd4f7268b16..286ccbcc043 100644
--- a/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-en.tex
+++ b/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-en.tex
@@ -99,7 +99,7 @@
\fill [cyan!90!black] ($(current page.south west)+(0,7)$) rectangle ($(current page.north west)+(25,-7)$);
\fill [yellow] (current page.south west) rectangle ($(current page.north west)+(3,0)$);
\node[text width=10cm] at ($(current page.north west)+(8.5,-6)$) {\huge\ProjLib};
- \node[text width=6cm,text height=3.5cm,scale=2.5] at ($(current page.north west)+(11,-10)$) {\textcolor{white}{\sffamily\beaulivre{}\\[5pt]\footnotesize\textsc{Write your books in \\a colorful way}\\[10pt]\tiny Corresponding to: \texttt{\beaulivre{} 2021/08/09}}};
+ \node[text width=6cm,text height=3.5cm,scale=2.5] at ($(current page.north west)+(11,-10)$) {\textcolor{white}{\sffamily\beaulivre{}\\[5pt]\footnotesize\textsc{Write your books in \\a colorful way}\\[10pt]\tiny Corresponding to: \texttt{\beaulivre{} 2021/08/11}}};
\node at ($(current page.south)+(1.5,3)$) {\fontsize{16pt}{0pt}\selectfont\textcolor{gray}{\scshape Jinwen XU}};
\node at ($(current page.south)+(1.5,2)$) {\fontsize{12pt}{0pt}\selectfont\textcolor{gray}{August 2021, Beijing}};
\end{tikzpicture}%
@@ -296,13 +296,16 @@ In addition, Source Code Pro is used as the English sans serif font, New Compute
\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}
-\clearpage
\item \texttt{regionalref}, \texttt{originalref}
\begin{itemize}
\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''.
@@ -501,11 +504,12 @@ You can use \lstinline|\dnf| to mark the unfinished part. For example:
Similarly, there is \lstinline|\needgraph| :
\begin{itemize}
- \item \lstinline|\needgraph| or \lstinline|\needgraph<...>|. The effect is: \needgraph or \needgraph<...>The prompt text changes according to the current language. For example, in French mode, it will be displayed as \UseOtherLanguage{French}{\needgraph}
+ \item \lstinline|\needgraph| or \lstinline|\needgraph<...>|. The effect is: \needgraph or \needgraph<...>
+ The prompt text changes according to the current language. For example, in French mode, it will be displayed as \UseOtherLanguage{French}{\needgraph}
\end{itemize}
-\clearpage
+\bigskip
\LevelOneTitle{Known issues}
\begin{itemize}[itemsep=.6em]
diff --git a/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-fr.pdf b/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-fr.pdf
index 96a00f9bdc5..a7d8dc2d7ba 100644
--- a/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-fr.pdf
+++ b/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-fr.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-fr.tex b/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-fr.tex
index 67624156d39..425725f0cb8 100644
--- a/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-fr.tex
+++ b/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-fr.tex
@@ -98,7 +98,7 @@
\fill [cyan!90!black] ($(current page.south west)+(0,7)$) rectangle ($(current page.north west)+(25,-7)$);
\fill [yellow] (current page.south west) rectangle ($(current page.north west)+(3,0)$);
\node[text width=10cm] at ($(current page.north west)+(8.5,-6)$) {\huge\ProjLib};
- \node[text width=6cm,text height=3.5cm,scale=2.5] at ($(current page.north west)+(11,-10)$) {\textcolor{white}{\sffamily\beaulivre{}\\[5pt]\footnotesize\textsc{Écrivez vos livres \\de manière colorée}\\[10pt]\tiny Correspondant à : \texttt{\beaulivre{} 2021/08/09}}};
+ \node[text width=6cm,text height=3.5cm,scale=2.5] at ($(current page.north west)+(11,-10)$) {\textcolor{white}{\sffamily\beaulivre{}\\[5pt]\footnotesize\textsc{Écrivez vos livres \\de manière colorée}\\[10pt]\tiny Correspondant à : \texttt{\beaulivre{} 2021/08/11}}};
\node at ($(current page.south)+(1.5,3)$) {\fontsize{16pt}{0pt}\selectfont\textcolor{gray}{\scshape Jinwen XU}};
\node at ($(current page.south)+(1.5,2)$) {\fontsize{12pt}{0pt}\selectfont\textcolor{gray}{Août 2021, à Pékin}};
\end{tikzpicture}%
@@ -256,6 +256,7 @@ De plus, Source Code Pro est utilisé comme police anglaise sans empattement, Ne
\LevelOneTitle{Les options}
+\beaulivre{} propose les options suivantes :
\begin{itemize}
\item Les options de langue \texttt{EN} / \texttt{english} / \texttt{English}, \texttt{FR} / \texttt{french} / \texttt{French}, etc.
@@ -296,9 +297,14 @@ De plus, Source Code Pro est utilisé comme police anglaise sans empattement, Ne
\begin{itemize}
\item Mode texte pur. Ne pas définir les environnements de type théorème.
\end{itemize}
+\clearpage
+ \item \texttt{delaythms}
+ \begin{itemize}
+ \item Reportez la définition des environnements de type théorème à la fin du préambule. Utilisez cette option si vous souhaitez que les environnements soient numérotés dans un compteur personnalisé.
+ \end{itemize}
\item \texttt{nothmnum}, \texttt{thmnum} ou \texttt{thmnum=}\meta{counter}
\begin{itemize}
- \item Les environnements de type théorème ne seront pas numérotés / numérotés dans l'ordre 1, 2, 3... / numérotés dans \meta{counter}. Ici, \meta{counter} doit être un compteur intégré (tel que \texttt{subsection}) ou un compteur défini dans le préambule. Si aucune option n'est utilisée, ils seront numérotés dans \texttt{chapter} (livre) ou \texttt{section} (article).
+ \item Les environnements de type théorème ne seront pas numérotés / numérotés dans l'ordre 1, 2, 3... / numérotés dans \meta{counter}. Ici, \meta{counter} doit être un compteur intégré (tel que \texttt{subsection}) ou un compteur défini dans le préambule (avec l'option \texttt{delaythms} activée). Si aucune option n'est utilisée, ils seront numérotés dans \texttt{chapter} (livre) ou \texttt{section} (article).
\end{itemize}
\item \texttt{regionalref}, \texttt{originalref}
\begin{itemize}
@@ -429,19 +435,19 @@ Ensuite, créez cet environnement de l'une des cinq manières suivantes :
\begin{itemize}
\item \lstinline|\CreateTheorem*{|\meta{name of environment}\lstinline|}|
\begin{itemize}
- \item Définir un environnement non numéroté \meta{name of environment}
+ \item Définir un environnement \meta{name of environment} non numéroté
\end{itemize}
\item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}|
\begin{itemize}
- \item Définir un environnement numéroté \meta{name of environment}, numéroté dans l'ordre 1, 2, 3, \dots
+ \item Définir un environnement \meta{name of environment} numéroté dans l'ordre 1, 2, 3, \dots
\end{itemize}
\item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}[|\meta{numbered like}\lstinline|]|
\begin{itemize}
- \item Définir un environnement numéroté \meta{name of environment}, qui partage le compteur \meta{numbered like}
+ \item Définir un environnement \meta{name of environment} numéroté, qui partage le compteur \meta{numbered like}
\end{itemize}
\item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}<|\meta{numbered within}\lstinline|>|
\begin{itemize}
- \item Définir un environnement numéroté \meta{name of environment}, numéroté dans le compteur \meta{numbered within}
+ \item Définir un environnement \meta{name of environment} numéroté dans le compteur \meta{numbered within}
\end{itemize}
\item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}(|\meta{existed environment}\lstinline|)|\\
\lstinline|\CreateTheorem*{|\meta{name of environment}\lstinline|}(|\meta{existed environment}\lstinline|)|
@@ -496,7 +502,7 @@ De même, il y a aussi \lstinline|\needgraph| :
\end{itemize}
-\clearpage
+\bigskip
\LevelOneTitle{Problèmes connus}
\begin{itemize}[itemsep=.6em]
diff --git a/Master/texmf-dist/doc/latex/colorist/colorist-doc.pdf b/Master/texmf-dist/doc/latex/colorist/colorist-doc.pdf
index bf1291a619a..b803b850103 100644
--- a/Master/texmf-dist/doc/latex/colorist/colorist-doc.pdf
+++ b/Master/texmf-dist/doc/latex/colorist/colorist-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/colorist/colorist-doc.tex b/Master/texmf-dist/doc/latex/colorist/colorist-doc.tex
index dfebcdfda3b..c6da8832a03 100644
--- a/Master/texmf-dist/doc/latex/colorist/colorist-doc.tex
+++ b/Master/texmf-dist/doc/latex/colorist/colorist-doc.tex
@@ -91,9 +91,9 @@
%%================================
\begin{document}
-\title{\colorist{}, write your articles or books in a colorful way}
+\title{{\normalfont\bfseries\color{maintext}\colorist{}}\\write your articles or books in a colorful way}
\author{Jinwen XU}
-\thanks{Corresponding to: \texttt{\colorist{} 2021/08/09}}
+\thanks{Corresponding to: \texttt{\colorist{} 2021/08/11}}
\email{\href{mailto:ProjLib@outlook.com}{ProjLib@outlook.com}}
\date{August 2021, Beijing}
@@ -384,11 +384,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}
@@ -410,7 +414,6 @@ Additionally, \colorart{} and \colorbook{} offers the following options:
\end{itemize}
\end{itemize}
-\clearpage
\LevelOneTitle{Instructions by topic}
\LevelTwoTitle{Language configuration}
@@ -597,10 +600,11 @@ You can use \lstinline|\dnf| to mark the unfinished part. For example:
Similarly, there is \lstinline|\needgraph| :
\begin{itemize}
- \item \lstinline|\needgraph| or \lstinline|\needgraph<...>|. The effect is: \needgraph or \needgraph<...>The prompt text changes according to the current language. For example, in French mode, it will be displayed as \UseOtherLanguage{French}{\needgraph}
+ \item \lstinline|\needgraph| or \lstinline|\needgraph<...>|. The effect is: \needgraph or \needgraph<...>
+\clearpage
+ The prompt text changes according to the current language. For example, in French mode, it will be displayed as \UseOtherLanguage{French}{\needgraph}
\end{itemize}
-\clearpage
\LevelTwoTitle{Title, abstract and keywords}
\colorart{} has both the features of standard classes and that of the \AmS{} classes.
@@ -651,7 +655,7 @@ The author information can contain multiple groups, written as:
Among them, the mutual order of \lstinline|\address|, \lstinline|\curraddr|, \lstinline|\email| is not important.
-\clearpage
+\bigskip
\LevelOneTitle{Known issues}
\begin{itemize}[itemsep=.6em]
diff --git a/Master/texmf-dist/doc/latex/einfart/einfart-doc-cn.pdf b/Master/texmf-dist/doc/latex/einfart/einfart-doc-cn.pdf
index 2d79e9987ce..90d7c7c9a27 100644
--- a/Master/texmf-dist/doc/latex/einfart/einfart-doc-cn.pdf
+++ b/Master/texmf-dist/doc/latex/einfart/einfart-doc-cn.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/einfart/einfart-doc-cn.tex b/Master/texmf-dist/doc/latex/einfart/einfart-doc-cn.tex
index cb896b420e6..43f93808311 100644
--- a/Master/texmf-dist/doc/latex/einfart/einfart-doc-cn.tex
+++ b/Master/texmf-dist/doc/latex/einfart/einfart-doc-cn.tex
@@ -1,4 +1,4 @@
-\documentclass[English,Chinese,French,classical]{einfart}
+\documentclass[classical]{einfart}
\linenumbers % Enable line numbers
@@ -98,7 +98,7 @@
\title{\einfart{},以极简主义风格排版你的文章}
\author{许锦文}
-\thanks{对应版本. \texttt{\einfart{} 2021/08/08a}}
+\thanks{对应版本. \texttt{\einfart{} 2021/08/11}}
\email{\href{mailto:ProjLib@outlook.com}{ProjLib@outlook.com}}
\date{2021年8月,北京}
@@ -351,9 +351,13 @@ Référence du théorème: \cref{thm:abc}
\begin{itemize}
\item 纯文本模式,不加载定理类环境。
\end{itemize}
+ \item \texttt{delaythms}
+ \begin{itemize}
+ \item 将定理类环境设定推迟到导言结尾。如果你希望定理类环境跟随自定义计数器编号,则应考虑这一选项。
+ \end{itemize}
\item \texttt{nothmnum}、\texttt{thmnum} 或 \texttt{thmnum=}\meta{counter}
\begin{itemize}
- \item 定理类环境均不编号 / 按照 1、2、3 顺序编号 / 在 \meta{counter} 内编号。其中 \meta{counter} 应该是自带的计数器 (如 \texttt{subsection}) 或在导言部分自定义的计数器。在没有使用任何选项的情况下将按照 \texttt{chapter} (书) 或 \texttt{section} (文章) 编号。
+ \item 定理类环境均不编号 / 按照 1、2、3 顺序编号 / 在 \meta{counter} 内编号。其中 \meta{counter} 应该是自带的计数器 (如 \texttt{subsection}) 或在导言部分自定义的计数器 (在启用 \texttt{delaythms} 选项的情况下)。在没有使用任何选项的情况下将按照 \texttt{chapter} (书) 或 \texttt{section} (文章) 编号。
\end{itemize}
\item \texttt{regionalref}、\texttt{originalref}
\begin{itemize}
@@ -486,6 +490,7 @@ Référence du théorème: \cref{thm:abc}
\CreateTheorem*{proofidea*}
\CreateTheorem{proofidea}<subsection>
+\clearpage
下面提供一个例子。这三行代码:
\begin{code}
@@ -583,6 +588,7 @@ Référence du théorème: \cref{thm:abc}
\LevelThreeTitle{关于QED符号}
由于定理类环境中的字体和正文字体是一样的,为了方便看出定理类环境在哪里结束,在其结尾处放置了一个空心的QED符号。然而,如果你的定理是由公式或者列表结尾的,这个符号就无法自动地放在正确的位置。这时,你需要手动在公式或列表最后一个条目的后面加上 \lstinline|\qedhere|,以让QED符号显示到这一行的最后。
+\clearpage
\LevelOneTitle{目前存在的问题}
\begin{itemize}[itemsep=.6em]
diff --git a/Master/texmf-dist/doc/latex/einfart/einfart-doc-en.pdf b/Master/texmf-dist/doc/latex/einfart/einfart-doc-en.pdf
index e6607ae6523..ebf652ea5d0 100644
--- a/Master/texmf-dist/doc/latex/einfart/einfart-doc-en.pdf
+++ b/Master/texmf-dist/doc/latex/einfart/einfart-doc-en.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/einfart/einfart-doc-en.tex b/Master/texmf-dist/doc/latex/einfart/einfart-doc-en.tex
index 7e030fed157..83a421637d7 100644
--- a/Master/texmf-dist/doc/latex/einfart/einfart-doc-en.tex
+++ b/Master/texmf-dist/doc/latex/einfart/einfart-doc-en.tex
@@ -1,4 +1,4 @@
-\documentclass[English,Chinese,French,classical]{einfart}
+\documentclass[classical]{einfart}
\linenumbers % Enable line numbers
@@ -98,7 +98,7 @@
\title{\einfart{}, write your articles in a simple and clear way}
\author{Jinwen XU}
-\thanks{Corresponding to: \texttt{\einfart{} 2021/08/08a}}
+\thanks{Corresponding to: \texttt{\einfart{} 2021/08/11}}
\email{\href{mailto:ProjLib@outlook.com}{ProjLib@outlook.com}}
\date{August 2021, Beijing}
@@ -350,11 +350,15 @@ In addition, Source Code Pro is used as the English sans serif font, New Compute
\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}
@@ -584,6 +588,7 @@ This is a disadvantage brought about by the underline decoration of the title.
\LevelThreeTitle{On the QED symbols}
Since the font in the theorem-like environments is the same as that of the main text, in order to indicate where the environments end, a hollow QED symbol \simpleqedsymbol{} is placed at the end of the theorem-like environments. However, if your theorem ends with an equation or list (itemize, enumerate, description, etc.), this symbol cannot be automatically placed in the correct position. In this case, you need to manually add a \lstinline|\qedhere| at the end of your equation or the last entry of your list to make the QED symbol appear at the end of the line.
+\clearpage
\LevelOneTitle{Known issues}
\begin{itemize}[itemsep=.6em]
diff --git a/Master/texmf-dist/doc/latex/einfart/einfart-doc-fr.pdf b/Master/texmf-dist/doc/latex/einfart/einfart-doc-fr.pdf
index 15e82ad2537..e66f64e7a7a 100644
--- a/Master/texmf-dist/doc/latex/einfart/einfart-doc-fr.pdf
+++ b/Master/texmf-dist/doc/latex/einfart/einfart-doc-fr.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/einfart/einfart-doc-fr.tex b/Master/texmf-dist/doc/latex/einfart/einfart-doc-fr.tex
index 05f0395d8e3..f0217a97b61 100644
--- a/Master/texmf-dist/doc/latex/einfart/einfart-doc-fr.tex
+++ b/Master/texmf-dist/doc/latex/einfart/einfart-doc-fr.tex
@@ -1,4 +1,4 @@
-\documentclass[English,Chinese,French,classical]{einfart}
+\documentclass[classical]{einfart}
\linenumbers % Enable line numbers
@@ -98,7 +98,7 @@
\title{\einfart{}, écrivez vos articles de manière simple et claire}
\author{Jinwen XU}
-\thanks{Correspondant à : \texttt{\einfart{} 2021/08/08a}}
+\thanks{Correspondant à : \texttt{\einfart{} 2021/08/11}}
\email{\href{mailto:ProjLib@outlook.com}{ProjLib@outlook.com}}
\date{Août 2021, à Pékin}
@@ -350,9 +350,13 @@ De plus, Source Code Pro est utilisé comme police anglaise sans empattement, Ne
\begin{itemize}
\item Mode texte pur. Ne pas définir les environnements de type théorème.
\end{itemize}
+ \item \texttt{delaythms}
+ \begin{itemize}
+ \item Reportez la définition des environnements de type théorème à la fin du préambule. Utilisez cette option si vous souhaitez que les environnements soient numérotés dans un compteur personnalisé.
+ \end{itemize}
\item \texttt{nothmnum}, \texttt{thmnum} ou \texttt{thmnum=}\meta{counter}
\begin{itemize}
- \item Les environnements de type théorème ne seront pas numérotés / numérotés dans l'ordre 1, 2, 3... / numérotés dans \meta{counter}. Ici, \meta{counter} doit être un compteur intégré (tel que \texttt{subsection}) ou un compteur défini dans le préambule. Si aucune option n'est utilisée, ils seront numérotés dans \texttt{chapter} (livre) ou \texttt{section} (article).
+ \item Les environnements de type théorème ne seront pas numérotés / numérotés dans l'ordre 1, 2, 3... / numérotés dans \meta{counter}. Ici, \meta{counter} doit être un compteur intégré (tel que \texttt{subsection}) ou un compteur défini dans le préambule (avec l'option \texttt{delaythms} activée). Si aucune option n'est utilisée, ils seront numérotés dans \texttt{chapter} (livre) ou \texttt{section} (article).
\end{itemize}
\item \texttt{regionalref}, \texttt{originalref}
\begin{itemize}
@@ -361,6 +365,7 @@ De plus, Source Code Pro est utilisé comme police anglaise sans empattement, Ne
\end{itemize}
\end{itemize}
+\clearpage
\LevelOneTitle{Instructions par sujet}
\LevelTwoTitle{Configurer la langue}
@@ -446,19 +451,20 @@ Ensuite, créez cet environnement de l'une des cinq manières suivantes :
\begin{itemize}
\item \lstinline|\CreateTheorem*{|\meta{name of environment}\lstinline|}|
\begin{itemize}
- \item Définir un environnement non numéroté \meta{name of environment}
+ \item Définir un environnement \meta{name of environment} non numéroté
\end{itemize}
\item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}|
\begin{itemize}
- \item Définir un environnement numéroté \meta{name of environment}, numéroté dans l'ordre 1, 2, 3, \dots
+ \item Définir un environnement \meta{name of environment} numéroté dans l'ordre 1, 2, 3, \dots
\end{itemize}
\item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}[|\meta{numbered like}\lstinline|]|
\begin{itemize}
- \item Définir un environnement numéroté \meta{name of environment}, qui partage le compteur \meta{numbered like}
+ \item Définir un environnement \meta{name of environment} numéroté, qui partage le compteur \meta{numbered like}
\end{itemize}
+\clearpage
\item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}<|\meta{numbered within}\lstinline|>|
\begin{itemize}
- \item Définir un environnement numéroté \meta{name of environment}, numéroté dans le compteur \meta{numbered within}
+ \item Définir un environnement \meta{name of environment} numéroté dans le compteur \meta{numbered within}
\end{itemize}
\item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}(|\meta{existed environment}\lstinline|)|\\
\lstinline|\CreateTheorem*{|\meta{name of environment}\lstinline|}(|\meta{existed environment}\lstinline|)|
@@ -563,6 +569,7 @@ Les informations sur l'auteur peuvent contenir plusieurs groupes, écrits comme
Parmi eux, l'ordre mutuel de \lstinline|\address|, \lstinline|\curraddr|, \lstinline|\email| n'est pas important.
+\clearpage
\LevelTwoTitle{Divers}
\LevelThreeTitle{Les numéros de ligne}
diff --git a/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-cn.pdf b/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-cn.pdf
index abf1eb4dc95..d170416dea6 100644
--- a/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-cn.pdf
+++ b/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-cn.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-cn.tex b/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-cn.tex
index d78e25efc1c..c307fda6b63 100644
--- a/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-cn.tex
+++ b/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-cn.tex
@@ -91,9 +91,9 @@
%%================================
\begin{document}
-\title{\lebhart{},以多彩的方式排版你的文章}
+\title{{\normalfont\bfseries\color{maintext}\lebhart{}}\\以多彩的方式排版你的文章}
\author{许锦文}
-\thanks{对应版本. \texttt{\lebhart{} 2021/08/09}}
+\thanks{对应版本. \texttt{\lebhart{} 2021/08/11}}
\email{\href{mailto:ProjLib@outlook.com}{ProjLib@outlook.com}}
\date{2021年8月,北京}
@@ -341,10 +341,13 @@ Référence du théorème: \cref{thm:abc}
\begin{itemize}
\item 纯文本模式,不加载定理类环境。
\end{itemize}
-\clearpage
+ \item \texttt{delaythms}
+ \begin{itemize}
+ \item 将定理类环境设定推迟到导言结尾。如果你希望定理类环境跟随自定义计数器编号,则应考虑这一选项。
+ \end{itemize}
\item \texttt{nothmnum}、\texttt{thmnum} 或 \texttt{thmnum=}\meta{counter}
\begin{itemize}
- \item 定理类环境均不编号 / 按照 1、2、3 顺序编号 / 在 \meta{counter} 内编号。其中 \meta{counter} 应该是自带的计数器 (如 \texttt{subsection}) 或在导言部分自定义的计数器。在没有使用任何选项的情况下将按照 \texttt{chapter} (书) 或 \texttt{section} (文章) 编号。
+ \item 定理类环境均不编号 / 按照 1、2、3 顺序编号 / 在 \meta{counter} 内编号。其中 \meta{counter} 应该是自带的计数器 (如 \texttt{subsection}) 或在导言部分自定义的计数器 (在启用 \texttt{delaythms} 选项的情况下)。在没有使用任何选项的情况下将按照 \texttt{chapter} (书) 或 \texttt{section} (文章) 编号。
\end{itemize}
\item \texttt{regionalref}、\texttt{originalref}
\begin{itemize}
@@ -595,7 +598,7 @@ Référence du théorème: \cref{thm:abc}
其中 \lstinline|\address|、\lstinline|\curraddr|、\lstinline|\email| 的相互顺序是不重要的。
-\clearpage
+\bigskip
\LevelOneTitle{目前存在的问题}
\begin{itemize}[itemsep=.6em]
\item 对于字体的设置仍然不够完善。
diff --git a/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-en.pdf b/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-en.pdf
index 516ae85344e..1bf78a225f3 100644
--- a/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-en.pdf
+++ b/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-en.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-en.tex b/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-en.tex
index c6c4b1038f1..0b983789d57 100644
--- a/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-en.tex
+++ b/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-en.tex
@@ -91,9 +91,9 @@
%%================================
\begin{document}
-\title{\lebhart{}, write your articles in a colorful way}
+\title{{\normalfont\bfseries\color{maintext}\lebhart{}}\\write your articles in a colorful way}
\author{Jinwen XU}
-\thanks{Corresponding to: \texttt{\lebhart{} 2021/08/09}}
+\thanks{Corresponding to: \texttt{\lebhart{} 2021/08/11}}
\email{\href{mailto:ProjLib@outlook.com}{ProjLib@outlook.com}}
\date{August 2021, Beijing}
@@ -339,12 +339,16 @@ In addition, Source Code Pro is used as the English sans serif font, New Compute
\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}
\clearpage
\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}
@@ -540,7 +544,8 @@ You can use \lstinline|\dnf| to mark the unfinished part. For example:
Similarly, there is \lstinline|\needgraph| :
\begin{itemize}
- \item \lstinline|\needgraph| or \lstinline|\needgraph<...>|. The effect is: \needgraph or \needgraph<...>The prompt text changes according to the current language. For example, in French mode, it will be displayed as \UseOtherLanguage{French}{\needgraph}
+ \item \lstinline|\needgraph| or \lstinline|\needgraph<...>|. The effect is: \needgraph or \needgraph<...>
+ The prompt text changes according to the current language. For example, in French mode, it will be displayed as \UseOtherLanguage{French}{\needgraph}
\end{itemize}
\LevelTwoTitle{Title, abstract and keywords}
@@ -594,7 +599,7 @@ The author information can contain multiple groups, written as:
Among them, the mutual order of \lstinline|\address|, \lstinline|\curraddr|, \lstinline|\email| is not important.
-\clearpage
+\bigskip
\LevelOneTitle{Known issues}
\begin{itemize}[itemsep=.6em]
diff --git a/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-fr.pdf b/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-fr.pdf
index 06557cb2f91..f6b06a01a46 100644
--- a/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-fr.pdf
+++ b/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-fr.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-fr.tex b/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-fr.tex
index 5c63e62ee95..1a1b43ecf40 100644
--- a/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-fr.tex
+++ b/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-fr.tex
@@ -91,9 +91,9 @@
%%================================
\begin{document}
-\title{\lebhart{}, écrivez vos articles de manière colorée}
+\title{{\normalfont\bfseries\color{maintext}\lebhart{}}\\écrivez vos articles de manière colorée}
\author{Jinwen XU}
-\thanks{Correspondant à : \texttt{\lebhart{} 2021/08/09}}
+\thanks{Correspondant à : \texttt{\lebhart{} 2021/08/11}}
\email{\href{mailto:ProjLib@outlook.com}{ProjLib@outlook.com}}
\date{Août 2021, à Pékin}
@@ -300,6 +300,7 @@ De plus, Source Code Pro est utilisé comme police anglaise sans empattement, Ne
\LevelOneTitle{Les options}
+\lebhart{} propose les options suivantes :
\begin{itemize}
\item Les options de langue \texttt{EN} / \texttt{english} / \texttt{English}, \texttt{FR} / \texttt{french} / \texttt{French}, etc.
@@ -340,9 +341,13 @@ De plus, Source Code Pro est utilisé comme police anglaise sans empattement, Ne
\begin{itemize}
\item Mode texte pur. Ne pas définir les environnements de type théorème.
\end{itemize}
+ \item \texttt{delaythms}
+ \begin{itemize}
+ \item Reportez la définition des environnements de type théorème à la fin du préambule. Utilisez cette option si vous souhaitez que les environnements soient numérotés dans un compteur personnalisé.
+ \end{itemize}
\item \texttt{nothmnum}, \texttt{thmnum} ou \texttt{thmnum=}\meta{counter}
\begin{itemize}
- \item Les environnements de type théorème ne seront pas numérotés / numérotés dans l'ordre 1, 2, 3... / numérotés dans \meta{counter}. Ici, \meta{counter} doit être un compteur intégré (tel que \texttt{subsection}) ou un compteur défini dans le préambule. Si aucune option n'est utilisée, ils seront numérotés dans \texttt{chapter} (livre) ou \texttt{section} (article).
+ \item Les environnements de type théorème ne seront pas numérotés / numérotés dans l'ordre 1, 2, 3... / numérotés dans \meta{counter}. Ici, \meta{counter} doit être un compteur intégré (tel que \texttt{subsection}) ou un compteur défini dans le préambule (avec l'option \texttt{delaythms} activée). Si aucune option n'est utilisée, ils seront numérotés dans \texttt{chapter} (livre) ou \texttt{section} (article).
\end{itemize}
\item \texttt{regionalref}, \texttt{originalref}
\begin{itemize}
@@ -472,19 +477,19 @@ Ensuite, créez cet environnement de l'une des cinq manières suivantes :
\begin{itemize}
\item \lstinline|\CreateTheorem*{|\meta{name of environment}\lstinline|}|
\begin{itemize}
- \item Définir un environnement non numéroté \meta{name of environment}
+ \item Définir un environnement \meta{name of environment} non numéroté
\end{itemize}
\item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}|
\begin{itemize}
- \item Définir un environnement numéroté \meta{name of environment}, numéroté dans l'ordre 1, 2, 3, \dots
+ \item Définir un environnement \meta{name of environment} numéroté dans l'ordre 1, 2, 3, \dots
\end{itemize}
\item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}[|\meta{numbered like}\lstinline|]|
\begin{itemize}
- \item Définir un environnement numéroté \meta{name of environment}, qui partage le compteur \meta{numbered like}
+ \item Définir un environnement \meta{name of environment} numéroté, qui partage le compteur \meta{numbered like}
\end{itemize}
\item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}<|\meta{numbered within}\lstinline|>|
\begin{itemize}
- \item Définir un environnement numéroté \meta{name of environment}, numéroté dans le compteur \meta{numbered within}
+ \item Définir un environnement \meta{name of environment} numéroté dans le compteur \meta{numbered within}
\end{itemize}
\item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}(|\meta{existed environment}\lstinline|)|\\
\lstinline|\CreateTheorem*{|\meta{name of environment}\lstinline|}(|\meta{existed environment}\lstinline|)|
@@ -589,7 +594,7 @@ Les informations sur l'auteur peuvent contenir plusieurs groupes, écrits comme
Parmi eux, l'ordre mutuel de \lstinline|\address|, \lstinline|\curraddr|, \lstinline|\email| n'est pas important.
-\clearpage
+\bigskip
\LevelOneTitle{Problèmes connus}
\begin{itemize}[itemsep=.6em]
diff --git a/Master/texmf-dist/doc/latex/minimalist/minimalist-doc.pdf b/Master/texmf-dist/doc/latex/minimalist/minimalist-doc.pdf
index 151b45a41a3..4beabecc199 100644
--- a/Master/texmf-dist/doc/latex/minimalist/minimalist-doc.pdf
+++ b/Master/texmf-dist/doc/latex/minimalist/minimalist-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/minimalist/minimalist-doc.tex b/Master/texmf-dist/doc/latex/minimalist/minimalist-doc.tex
index b3ead54ad14..6238f7b93b1 100644
--- a/Master/texmf-dist/doc/latex/minimalist/minimalist-doc.tex
+++ b/Master/texmf-dist/doc/latex/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/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-cn.pdf b/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-cn.pdf
index d5c2f75f37b..eb643640651 100644
--- a/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-cn.pdf
+++ b/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-cn.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-cn.tex b/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-cn.tex
index 1d130479ae2..d7b6bf459e9 100644
--- a/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-cn.tex
+++ b/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-cn.tex
@@ -1,4 +1,4 @@
-\documentclass[English,Chinese,French,JP,TC,classical]{simplivre}
+\documentclass[classical]{simplivre}
\linenumbers % Enable line numbers
@@ -103,7 +103,7 @@
\fill [cyan!90!black] ($(current page.south west)+(0,7)$) rectangle ($(current page.north west)+(21,-7)$);
\fill [yellow] (current page.south west) rectangle ($(current page.north west)+(3,0)$);
\node[text width=10cm] at ($(current page.north west)+(8.5,-6)$) {\huge\ProjLib};
- \node[text width=6cm,text height=3.5cm,scale=2.5] at ($(current page.north west)+(11,-9)$) {\textcolor{white}{\sffamily\simplivre{}\\[5pt]\footnotesize\hspace*{-.05em}以极简主义风格排版你的图书\\[10pt]\tiny 对应版本. \texttt{\simplivre{} 2021/08/08a}}};
+ \node[text width=6cm,text height=3.5cm,scale=2.5] at ($(current page.north west)+(11,-9)$) {\textcolor{white}{\sffamily\simplivre{}\\[5pt]\footnotesize\hspace*{-.05em}以极简主义风格排版你的图书\\[10pt]\tiny 对应版本. \texttt{\simplivre{} 2021/08/11}}};
\node at ($(current page.south)+(1.5,3)$) {\fontsize{16pt}{0pt}\selectfont\textcolor{gray}{许锦文}};
\node at ($(current page.south)+(1.5,2)$) {\fontsize{12pt}{0pt}\selectfont\textcolor{gray}{2021年8月,北京}};
\end{tikzpicture}%
@@ -314,9 +314,13 @@ Référence du théorème: \cref{thm:abc}
\begin{itemize}
\item 纯文本模式,不加载定理类环境。
\end{itemize}
+ \item \texttt{delaythms}
+ \begin{itemize}
+ \item 将定理类环境设定推迟到导言结尾。如果你希望定理类环境跟随自定义计数器编号,则应考虑这一选项。
+ \end{itemize}
\item \texttt{nothmnum}、\texttt{thmnum} 或 \texttt{thmnum=}\meta{counter}
\begin{itemize}
- \item 定理类环境均不编号 / 按照 1、2、3 顺序编号 / 在 \meta{counter} 内编号。其中 \meta{counter} 应该是自带的计数器 (如 \texttt{subsection}) 或在导言部分自定义的计数器。在没有使用任何选项的情况下将按照 \texttt{chapter} (书) 或 \texttt{section} (文章) 编号。
+ \item 定理类环境均不编号 / 按照 1、2、3 顺序编号 / 在 \meta{counter} 内编号。其中 \meta{counter} 应该是自带的计数器 (如 \texttt{subsection}) 或在导言部分自定义的计数器 (在启用 \texttt{delaythms} 选项的情况下)。在没有使用任何选项的情况下将按照 \texttt{chapter} (书) 或 \texttt{section} (文章) 编号。
\end{itemize}
\item \texttt{regionalref}、\texttt{originalref}
\begin{itemize}
@@ -452,6 +456,7 @@ Référence du théorème: \cref{thm:abc}
\CreateTheorem*{proofidea*}
\CreateTheorem{proofidea}<section>
+\clearpage
下面提供一个例子。这三行代码:
\begin{code}
diff --git a/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-en.pdf b/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-en.pdf
index afe4b55bf05..66babbedbb6 100644
--- a/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-en.pdf
+++ b/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-en.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-en.tex b/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-en.tex
index 1acd75eb7c8..aa00414e138 100644
--- a/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-en.tex
+++ b/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-en.tex
@@ -1,4 +1,4 @@
-\documentclass[English,Chinese,French,JP,TC,classical]{simplivre}
+\documentclass[classical]{simplivre}
\linenumbers % Enable line numbers
@@ -104,7 +104,7 @@
\fill [cyan!90!black] ($(current page.south west)+(0,7)$) rectangle ($(current page.north west)+(21,-7)$);
\fill [yellow] (current page.south west) rectangle ($(current page.north west)+(3,0)$);
\node[text width=10cm] at ($(current page.north west)+(8.5,-6)$) {\huge\ProjLib};
- \node[text width=6cm,text height=3.5cm,scale=2.5] at ($(current page.north west)+(11,-9)$) {\textcolor{white}{\sffamily\simplivre{}\\[5pt]\footnotesize\textsc{Write your books in \\a simple and clear way}\\[10pt]\tiny Corresponding to: \texttt{\simplivre{} 2021/08/08a}}};
+ \node[text width=6cm,text height=3.5cm,scale=2.5] at ($(current page.north west)+(11,-9)$) {\textcolor{white}{\sffamily\simplivre{}\\[5pt]\footnotesize\textsc{Write your books in \\a simple and clear way}\\[10pt]\tiny Corresponding to: \texttt{\simplivre{} 2021/08/11}}};
\node at ($(current page.south)+(1.5,3)$) {\fontsize{16pt}{0pt}\selectfont\textcolor{gray}{\scshape Jinwen XU}};
\node at ($(current page.south)+(1.5,2)$) {\fontsize{12pt}{0pt}\selectfont\textcolor{gray}{August 2021, Beijing}};
\end{tikzpicture}%
@@ -314,11 +314,15 @@ In addition, Source Code Pro is used as the English sans serif font, New Compute
\clearpage
\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}
diff --git a/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-fr.pdf b/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-fr.pdf
index 91a7d315dcf..45a25ef1db5 100644
--- a/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-fr.pdf
+++ b/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-fr.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-fr.tex b/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-fr.tex
index 584a6dfcc0c..d8cfcc840e0 100644
--- a/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-fr.tex
+++ b/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-fr.tex
@@ -1,4 +1,4 @@
-\documentclass[English,Chinese,French,JP,TC,classical]{simplivre}
+\documentclass[classical]{simplivre}
\linenumbers % Enable line numbers
@@ -103,7 +103,7 @@
\fill [cyan!90!black] ($(current page.south west)+(0,7)$) rectangle ($(current page.north west)+(21,-7)$);
\fill [yellow] (current page.south west) rectangle ($(current page.north west)+(3,0)$);
\node[text width=10cm] at ($(current page.north west)+(8.5,-6)$) {\huge\ProjLib};
- \node[text width=6cm,text height=3.5cm,scale=2.5] at ($(current page.north west)+(11,-9)$) {\textcolor{white}{\sffamily\simplivre{}\\[5pt]\footnotesize\textsc{Écrivez vos livres \\de manière simple et claire}\\[10pt]\tiny Correspondant à : \texttt{\simplivre{} 2021/08/08a}}};
+ \node[text width=6cm,text height=3.5cm,scale=2.5] at ($(current page.north west)+(11,-9)$) {\textcolor{white}{\sffamily\simplivre{}\\[5pt]\footnotesize\textsc{Écrivez vos livres \\de manière simple et claire}\\[10pt]\tiny Correspondant à : \texttt{\simplivre{} 2021/08/11}}};
\node at ($(current page.south)+(1.5,3)$) {\fontsize{16pt}{0pt}\selectfont\textcolor{gray}{\scshape Jinwen XU}};
\node at ($(current page.south)+(1.5,2)$) {\fontsize{12pt}{0pt}\selectfont\textcolor{gray}{Août 2021, à Pékin}};
\end{tikzpicture}%
@@ -314,9 +314,13 @@ De plus, Source Code Pro est utilisé comme police anglaise sans empattement, Ne
\begin{itemize}
\item Mode texte pur. Ne pas définir les environnements de type théorème.
\end{itemize}
+ \item \texttt{delaythms}
+ \begin{itemize}
+ \item Reportez la définition des environnements de type théorème à la fin du préambule. Utilisez cette option si vous souhaitez que les environnements soient numérotés dans un compteur personnalisé.
+ \end{itemize}
\item \texttt{nothmnum}, \texttt{thmnum} ou \texttt{thmnum=}\meta{counter}
\begin{itemize}
- \item Les environnements de type théorème ne seront pas numérotés / numérotés dans l'ordre 1, 2, 3... / numérotés dans \meta{counter}. Ici, \meta{counter} doit être un compteur intégré (tel que \texttt{subsection}) ou un compteur défini dans le préambule. Si aucune option n'est utilisée, ils seront numérotés dans \texttt{chapter} (livre) ou \texttt{section} (article).
+ \item Les environnements de type théorème ne seront pas numérotés / numérotés dans l'ordre 1, 2, 3... / numérotés dans \meta{counter}. Ici, \meta{counter} doit être un compteur intégré (tel que \texttt{subsection}) ou un compteur défini dans le préambule (avec l'option \texttt{delaythms} activée). Si aucune option n'est utilisée, ils seront numérotés dans \texttt{chapter} (livre) ou \texttt{section} (article).
\end{itemize}
\item \texttt{regionalref}, \texttt{originalref}
\begin{itemize}
@@ -412,19 +416,19 @@ Ensuite, créez cet environnement de l'une des cinq manières suivantes :
\begin{itemize}
\item \lstinline|\CreateTheorem*{|\meta{name of environment}\lstinline|}|
\begin{itemize}
- \item Définir un environnement non numéroté \meta{name of environment}
+ \item Définir un environnement \meta{name of environment} non numéroté
\end{itemize}
\item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}|
\begin{itemize}
- \item Définir un environnement numéroté \meta{name of environment}, numéroté dans l'ordre 1, 2, 3, \dots
+ \item Définir un environnement \meta{name of environment} numéroté dans l'ordre 1, 2, 3, \dots
\end{itemize}
\item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}[|\meta{numbered like}\lstinline|]|
\begin{itemize}
- \item Définir un environnement numéroté \meta{name of environment}, qui partage le compteur \meta{numbered like}
+ \item Définir un environnement \meta{name of environment} numéroté, qui partage le compteur \meta{numbered like}
\end{itemize}
\item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}<|\meta{numbered within}\lstinline|>|
\begin{itemize}
- \item Définir un environnement numéroté \meta{name of environment}, numéroté dans le compteur \meta{numbered within}
+ \item Définir un environnement \meta{name of environment} numéroté dans le compteur \meta{numbered within}
\end{itemize}
\item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}(|\meta{existed environment}\lstinline|)|\\
\lstinline|\CreateTheorem*{|\meta{name of environment}\lstinline|}(|\meta{existed environment}\lstinline|)|
diff --git a/Master/texmf-dist/tex/latex/beaulivre/beaulivre.cls b/Master/texmf-dist/tex/latex/beaulivre/beaulivre.cls
index 4da4aadc4fe..b7dcdc06fb3 100644
--- a/Master/texmf-dist/tex/latex/beaulivre/beaulivre.cls
+++ b/Master/texmf-dist/tex/latex/beaulivre/beaulivre.cls
@@ -17,7 +17,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[2020-10-01]
\ProvidesClass{beaulivre}
- [2021/08/09 A colorful book style]
+ [2021/08/11 A colorful book style]
\def\colorclass@baseclass{book}
\RequirePackage{kvoptions}
\RequirePackage{etoolbox}
@@ -34,6 +34,7 @@
\DeclareBoolOption[false]{noto}
\DeclareBoolOption[false]{biolinum}
\DeclareBoolOption[false]{customfont}
+\DeclareStringOption{thmnum}[PJL@thmnum@default]
\newif\if@colorclass@bfivepaper\@colorclass@bfivepaperfalse
\DeclareVoidOption{b5paper}{\@colorclass@bfivepapertrue}
@@ -314,7 +315,7 @@
\apptocmd{\ttfamily}{\CJKttfamily}{}{\FAIL}
\if@PJLlang@enable@CN
-\gappto{\PJLlang@langconfig@schinese}{%
+\gappto{\PJLlang@langconfig@CN}{%
\def\CJKsffamily{\CJKfamily{SCsans}}%
\def\CJKttfamily{\CJKfamily{SCmono}}%
\CJKfamily{SCmain}%
@@ -322,7 +323,7 @@
\fi
\if@PJLlang@enable@TC
-\gappto{\PJLlang@langconfig@tchinese}{%
+\gappto{\PJLlang@langconfig@TC}{%
\def\CJKsffamily{\CJKfamily{TCsans}}%
\def\CJKttfamily{\CJKfamily{TCmono}}%
\CJKfamily{TCmain}%
@@ -330,7 +331,7 @@
\fi
\if@PJLlang@enable@JP
-\gappto{\PJLlang@langconfig@japanese}{%
+\gappto{\PJLlang@langconfig@JP}{%
\def\CJKsffamily{\CJKfamily{JPsans}}%
\def\CJKttfamily{\CJKfamily{JPmono}}%
\CJKfamily{JPmain}%
diff --git a/Master/texmf-dist/tex/latex/colorist/colorart.cls b/Master/texmf-dist/tex/latex/colorist/colorart.cls
index 446fa868add..e44367a8cab 100644
--- a/Master/texmf-dist/tex/latex/colorist/colorart.cls
+++ b/Master/texmf-dist/tex/latex/colorist/colorart.cls
@@ -17,7 +17,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[2020-10-01]
\ProvidesClass{colorart}
- [2021/08/09 A colorful article style]
+ [2021/08/11 A colorful article style]
\def\colorclass@baseclass{article}
\RequirePackage{kvoptions}
\RequirePackage{etoolbox}
@@ -34,6 +34,7 @@
\DeclareBoolOption[false]{noto}
\DeclareBoolOption[false]{biolinum}
\DeclareBoolOption[false]{customfont}
+\DeclareStringOption{thmnum}[PJL@thmnum@default]
\newif\if@colorclass@bfivepaper\@colorclass@bfivepaperfalse
\DeclareVoidOption{b5paper}{\@colorclass@bfivepapertrue}
diff --git a/Master/texmf-dist/tex/latex/colorist/colorbook.cls b/Master/texmf-dist/tex/latex/colorist/colorbook.cls
index 711916d8998..e07b345a91a 100644
--- a/Master/texmf-dist/tex/latex/colorist/colorbook.cls
+++ b/Master/texmf-dist/tex/latex/colorist/colorbook.cls
@@ -17,7 +17,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[2020-10-01]
\ProvidesClass{colorbook}
- [2021/08/09 A colorful book style]
+ [2021/08/11 A colorful book style]
\def\colorclass@baseclass{book}
\RequirePackage{kvoptions}
\RequirePackage{etoolbox}
@@ -34,6 +34,7 @@
\DeclareBoolOption[false]{noto}
\DeclareBoolOption[false]{biolinum}
\DeclareBoolOption[false]{customfont}
+\DeclareStringOption{thmnum}[PJL@thmnum@default]
\newif\if@colorclass@bfivepaper\@colorclass@bfivepaperfalse
\DeclareVoidOption{b5paper}{\@colorclass@bfivepapertrue}
diff --git a/Master/texmf-dist/tex/latex/colorist/colorist.sty b/Master/texmf-dist/tex/latex/colorist/colorist.sty
index 0374aec6142..348f23ee1a7 100644
--- a/Master/texmf-dist/tex/latex/colorist/colorist.sty
+++ b/Master/texmf-dist/tex/latex/colorist/colorist.sty
@@ -17,7 +17,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[2020-10-01]
\ProvidesPackage{colorist}
- [2021/08/09 A colorful style for articles and books]
+ [2021/08/11 A colorful 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}[colorist@thmnum@default]
\DeclareBoolOption[true]{regionalref}
@@ -170,13 +171,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~部}%
}
@@ -400,7 +401,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{*}}}
@@ -747,7 +748,7 @@
\expandafter\def\csname definition-propositionnameRU\endcsname{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries{Определение}-\propositionnameRU}
\expandafter\def\csname definition-theoremnameRU\endcsname{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries{Определение}-\theoremnameRU}
-\AtEndPreamble{
+\def\colorist@definethms{
\if@colorist@nothms\else
\theoremstyle{basic}
\if@colorist@nothmnum
@@ -829,6 +830,12 @@
\fi
}
+\if@colorist@delaythms
+ \AtEndPreamble{\colorist@definethms}
+\else
+ \colorist@definethms
+\fi
+
\theoremstyle{simple}
\creflabelformat{PJLtheorem}{#2{\normalfont\colorist@sffamily\color{orange}\conditionalbfseries#1}#3}
diff --git a/Master/texmf-dist/tex/latex/einfart/einfart.cls b/Master/texmf-dist/tex/latex/einfart/einfart.cls
index 9ac16f3b9af..27363074fa0 100644
--- a/Master/texmf-dist/tex/latex/einfart/einfart.cls
+++ b/Master/texmf-dist/tex/latex/einfart/einfart.cls
@@ -17,7 +17,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[2020-10-01]
\ProvidesClass{einfart}
- [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}
@@ -321,7 +322,7 @@
\apptocmd{\ttfamily}{\CJKttfamily}{}{\FAIL}
\if@PJLlang@enable@CN
-\gappto{\PJLlang@langconfig@schinese}{%
+\gappto{\PJLlang@langconfig@CN}{%
\def\CJKsffamily{\CJKfamily{SCsans}}%
\def\CJKttfamily{\CJKfamily{SCmono}}%
\CJKfamily{SCmain}%
@@ -329,7 +330,7 @@
\fi
\if@PJLlang@enable@TC
-\gappto{\PJLlang@langconfig@tchinese}{%
+\gappto{\PJLlang@langconfig@TC}{%
\def\CJKsffamily{\CJKfamily{TCsans}}%
\def\CJKttfamily{\CJKfamily{TCmono}}%
\CJKfamily{TCmain}%
@@ -337,7 +338,7 @@
\fi
\if@PJLlang@enable@JP
-\gappto{\PJLlang@langconfig@japanese}{%
+\gappto{\PJLlang@langconfig@JP}{%
\def\CJKsffamily{\CJKfamily{JPsans}}%
\def\CJKttfamily{\CJKfamily{JPmono}}%
\CJKfamily{JPmain}%
diff --git a/Master/texmf-dist/tex/latex/lebhart/lebhart.cls b/Master/texmf-dist/tex/latex/lebhart/lebhart.cls
index e4688e8c6e3..a3a18edaabc 100644
--- a/Master/texmf-dist/tex/latex/lebhart/lebhart.cls
+++ b/Master/texmf-dist/tex/latex/lebhart/lebhart.cls
@@ -17,7 +17,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[2020-10-01]
\ProvidesClass{lebhart}
- [2021/08/09 A colorful article style]
+ [2021/08/11 A colorful article style]
\def\colorclass@baseclass{article}
\RequirePackage{kvoptions}
\RequirePackage{etoolbox}
@@ -34,6 +34,7 @@
\DeclareBoolOption[false]{noto}
\DeclareBoolOption[false]{biolinum}
\DeclareBoolOption[false]{customfont}
+\DeclareStringOption{thmnum}[PJL@thmnum@default]
\newif\if@colorclass@bfivepaper\@colorclass@bfivepaperfalse
\DeclareVoidOption{b5paper}{\@colorclass@bfivepapertrue}
@@ -314,7 +315,7 @@
\apptocmd{\ttfamily}{\CJKttfamily}{}{\FAIL}
\if@PJLlang@enable@CN
-\gappto{\PJLlang@langconfig@schinese}{%
+\gappto{\PJLlang@langconfig@CN}{%
\def\CJKsffamily{\CJKfamily{SCsans}}%
\def\CJKttfamily{\CJKfamily{SCmono}}%
\CJKfamily{SCmain}%
@@ -322,7 +323,7 @@
\fi
\if@PJLlang@enable@TC
-\gappto{\PJLlang@langconfig@tchinese}{%
+\gappto{\PJLlang@langconfig@TC}{%
\def\CJKsffamily{\CJKfamily{TCsans}}%
\def\CJKttfamily{\CJKfamily{TCmono}}%
\CJKfamily{TCmain}%
@@ -330,7 +331,7 @@
\fi
\if@PJLlang@enable@JP
-\gappto{\PJLlang@langconfig@japanese}{%
+\gappto{\PJLlang@langconfig@JP}{%
\def\CJKsffamily{\CJKfamily{JPsans}}%
\def\CJKttfamily{\CJKfamily{JPmono}}%
\CJKfamily{JPmain}%
diff --git a/Master/texmf-dist/tex/latex/minimalist/minimalist.sty b/Master/texmf-dist/tex/latex/minimalist/minimalist.sty
index 04aba94b439..1892b05e4a8 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/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/Master/texmf-dist/tex/latex/minimalist/minimart.cls b/Master/texmf-dist/tex/latex/minimalist/minimart.cls
index 11d68580552..b35e37468c6 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/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/Master/texmf-dist/tex/latex/minimalist/minimbook.cls b/Master/texmf-dist/tex/latex/minimalist/minimbook.cls
index 6a3caba3a89..0c50b2bb81d 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/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}
diff --git a/Master/texmf-dist/tex/latex/simplivre/simplivre.cls b/Master/texmf-dist/tex/latex/simplivre/simplivre.cls
index 58a56303150..84c21b30bb5 100644
--- a/Master/texmf-dist/tex/latex/simplivre/simplivre.cls
+++ b/Master/texmf-dist/tex/latex/simplivre/simplivre.cls
@@ -17,7 +17,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[2020-10-01]
\ProvidesClass{simplivre}
- [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}
@@ -321,7 +322,7 @@
\apptocmd{\ttfamily}{\CJKttfamily}{}{\FAIL}
\if@PJLlang@enable@CN
-\gappto{\PJLlang@langconfig@schinese}{%
+\gappto{\PJLlang@langconfig@CN}{%
\def\CJKsffamily{\CJKfamily{SCsans}}%
\def\CJKttfamily{\CJKfamily{SCmono}}%
\CJKfamily{SCmain}%
@@ -329,7 +330,7 @@
\fi
\if@PJLlang@enable@TC
-\gappto{\PJLlang@langconfig@tchinese}{%
+\gappto{\PJLlang@langconfig@TC}{%
\def\CJKsffamily{\CJKfamily{TCsans}}%
\def\CJKttfamily{\CJKfamily{TCmono}}%
\CJKfamily{TCmain}%
@@ -337,7 +338,7 @@
\fi
\if@PJLlang@enable@JP
-\gappto{\PJLlang@langconfig@japanese}{%
+\gappto{\PJLlang@langconfig@JP}{%
\def\CJKsffamily{\CJKfamily{JPsans}}%
\def\CJKttfamily{\CJKfamily{JPmono}}%
\CJKfamily{JPmain}%