summaryrefslogtreecommitdiff
path: root/macros/unicodetex
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2022-04-05 03:01:24 +0000
committerNorbert Preining <norbert@preining.info>2022-04-05 03:01:24 +0000
commita4e931576165d0a4a143915f4725399272e06fee (patch)
treeef5b6d71c2223b9f58e61fbb25423d4042430198 /macros/unicodetex
parent7548e4d37c2aaefd32fe0a9bcd83f8e71326dde1 (diff)
CTAN sync 202204050301
Diffstat (limited to 'macros/unicodetex')
-rw-r--r--macros/unicodetex/latex/beaulivre/beaulivre-doc-cn.pdfbin317958 -> 320663 bytes
-rw-r--r--macros/unicodetex/latex/beaulivre/beaulivre-doc-cn.tex16
-rw-r--r--macros/unicodetex/latex/beaulivre/beaulivre-doc-en.pdfbin208707 -> 208770 bytes
-rw-r--r--macros/unicodetex/latex/beaulivre/beaulivre-doc-en.tex16
-rw-r--r--macros/unicodetex/latex/beaulivre/beaulivre-doc-fr.pdfbin213506 -> 213759 bytes
-rw-r--r--macros/unicodetex/latex/beaulivre/beaulivre-doc-fr.tex16
-rw-r--r--macros/unicodetex/latex/beaulivre/beaulivre.cls3
-rw-r--r--macros/unicodetex/latex/einfart/einfart-doc-cn.pdfbin246732 -> 248999 bytes
-rw-r--r--macros/unicodetex/latex/einfart/einfart-doc-cn.tex14
-rw-r--r--macros/unicodetex/latex/einfart/einfart-doc-en.pdfbin154292 -> 154480 bytes
-rw-r--r--macros/unicodetex/latex/einfart/einfart-doc-en.tex14
-rw-r--r--macros/unicodetex/latex/einfart/einfart-doc-fr.pdfbin160763 -> 160964 bytes
-rw-r--r--macros/unicodetex/latex/einfart/einfart-doc-fr.tex14
-rw-r--r--macros/unicodetex/latex/einfart/einfart.cls6
-rw-r--r--macros/unicodetex/latex/lebhart/lebhart-doc-cn.pdfbin264079 -> 266431 bytes
-rw-r--r--macros/unicodetex/latex/lebhart/lebhart-doc-cn.tex16
-rw-r--r--macros/unicodetex/latex/lebhart/lebhart-doc-en.pdfbin146177 -> 146477 bytes
-rw-r--r--macros/unicodetex/latex/lebhart/lebhart-doc-en.tex16
-rw-r--r--macros/unicodetex/latex/lebhart/lebhart-doc-fr.pdfbin150569 -> 150602 bytes
-rw-r--r--macros/unicodetex/latex/lebhart/lebhart-doc-fr.tex16
-rw-r--r--macros/unicodetex/latex/lebhart/lebhart.cls3
-rw-r--r--macros/unicodetex/latex/nwafuthesis/README.md12
-rwxr-xr-x[-rw-r--r--]macros/unicodetex/latex/nwafuthesis/build-win.bat0
-rw-r--r--macros/unicodetex/latex/nwafuthesis/logo/workflow.pdfbin0 -> 33865 bytes
-rw-r--r--macros/unicodetex/latex/nwafuthesis/nwafuthesis-doc.dtx2
-rw-r--r--macros/unicodetex/latex/nwafuthesis/nwafuthesis.dtx222
-rw-r--r--macros/unicodetex/latex/nwafuthesis/nwafuthesis.pdfbin2276200 -> 2323852 bytes
-rw-r--r--macros/unicodetex/latex/simplivre/simplivre-doc-cn.pdfbin333063 -> 336010 bytes
-rw-r--r--macros/unicodetex/latex/simplivre/simplivre-doc-cn.tex14
-rw-r--r--macros/unicodetex/latex/simplivre/simplivre-doc-en.pdfbin230296 -> 230392 bytes
-rw-r--r--macros/unicodetex/latex/simplivre/simplivre-doc-en.tex14
-rw-r--r--macros/unicodetex/latex/simplivre/simplivre-doc-fr.pdfbin231898 -> 231959 bytes
-rw-r--r--macros/unicodetex/latex/simplivre/simplivre-doc-fr.tex14
-rw-r--r--macros/unicodetex/latex/simplivre/simplivre.cls6
34 files changed, 273 insertions, 161 deletions
diff --git a/macros/unicodetex/latex/beaulivre/beaulivre-doc-cn.pdf b/macros/unicodetex/latex/beaulivre/beaulivre-doc-cn.pdf
index e5c6359089..5a1335922a 100644
--- a/macros/unicodetex/latex/beaulivre/beaulivre-doc-cn.pdf
+++ b/macros/unicodetex/latex/beaulivre/beaulivre-doc-cn.pdf
Binary files differ
diff --git a/macros/unicodetex/latex/beaulivre/beaulivre-doc-cn.tex b/macros/unicodetex/latex/beaulivre/beaulivre-doc-cn.tex
index 39819feb11..d33c948560 100644
--- a/macros/unicodetex/latex/beaulivre/beaulivre-doc-cn.tex
+++ b/macros/unicodetex/latex/beaulivre/beaulivre-doc-cn.tex
@@ -37,7 +37,7 @@
\providecommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$}
\lstset{moretexcs=%
{part,parttext,chapter,section,subsection,subsubsection,frontmatter,mainmatter,backmatter,tableofcontents,href,
- color,NameTheorem,CreateTheorem,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,TheDate,ProjLib,qedhere
+ color,NameTheorem,CreateTheorem,cref,DNF,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,TheDate,ProjLib,qedhere
}
}
\lstnewenvironment{code}%
@@ -91,7 +91,7 @@
%%================================
\begin{document}
-\def\PackageVersion{2022/03/28}
+\def\PackageVersion{2022/04/03}
\frontmatter
@@ -113,7 +113,7 @@
\beaulivre{} 支持英语、法语、德语、意大利语、葡萄牙语、巴西葡萄牙语、西班牙语、简体中文、繁体中文、日文、俄文,并且同一篇文档中这些语言可以很好地协调。由于采用了自定义字体,需要用 \hologo{XeLaTeX} 或 \hologo{LuaLaTeX} 引擎进行编译。
-这篇说明文档即是用 \beaulivre{} 排版的 (使用了参数 \texttt{allowbf}),你可以把它看作一份简短的说明与演示。
+这篇说明文档即是用 \beaulivre{} 排版的 (使用了参数 \texttt{use boldface}),你可以把它看作一份简短的说明与演示。
\bigskip
\begin{tip}
@@ -187,7 +187,7 @@
\section{(*\meta{section title}*)}
-\dnf<(*\meta{some hint}*)>
+\DNF<(*\meta{some hint}*)>
\begin{theorem}\label{thm:abc}
Ceci est un théorème.
@@ -226,7 +226,7 @@ Référence du théorème: \cref{thm:abc}
\LevelThreeTitle{未完成标记}
\begin{code}
-\dnf<(*\meta{some hint}*)>
+\DNF<(*\meta{some hint}*)>
\end{code}
当你有一些地方尚未完成的时候,可以用这条指令标记出来,它在草稿阶段格外有用。
@@ -289,7 +289,7 @@ Référence du théorème: \cref{thm:abc}
\item 字体选项。顾名思义,会加载相应名称的字体。
\item \texttt{useosf} 选项用来启用“旧式”数字。
\end{itemize}
- \item \texttt{allowbf}
+ \item \texttt{use boldface}
\begin{itemize}
\item 允许加粗。启用这一选项时,题目、各级标题、定理类环境名称会被加粗。
\end{itemize}
@@ -436,9 +436,9 @@ Référence du théorème: \cref{thm:abc}
\LevelTwoTitle{未完成标记}
-你可以通过 \lstinline|\dnf| 来标记尚未完成的部分。例如:
+你可以通过 \lstinline|\DNF| 来标记尚未完成的部分。例如:
\begin{itemize}
- \item \lstinline|\dnf| 或 \lstinline|\dnf<...>|。效果为:\dnf~或 \dnf<...>。\\其提示文字与当前语言相对应,例如,在法语模式下将会显示为 \UseOtherLanguage{French}{\dnf}。
+ \item \lstinline|\DNF| 或 \lstinline|\DNF<...>|。效果为:\DNF~或 \DNF<...>。\\其提示文字与当前语言相对应,例如,在法语模式下将会显示为 \UseOtherLanguage{French}{\DNF}。
\end{itemize}
diff --git a/macros/unicodetex/latex/beaulivre/beaulivre-doc-en.pdf b/macros/unicodetex/latex/beaulivre/beaulivre-doc-en.pdf
index 50a11df329..8de496a03e 100644
--- a/macros/unicodetex/latex/beaulivre/beaulivre-doc-en.pdf
+++ b/macros/unicodetex/latex/beaulivre/beaulivre-doc-en.pdf
Binary files differ
diff --git a/macros/unicodetex/latex/beaulivre/beaulivre-doc-en.tex b/macros/unicodetex/latex/beaulivre/beaulivre-doc-en.tex
index 790879cf5d..8b674f7985 100644
--- a/macros/unicodetex/latex/beaulivre/beaulivre-doc-en.tex
+++ b/macros/unicodetex/latex/beaulivre/beaulivre-doc-en.tex
@@ -37,7 +37,7 @@
\providecommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$}
\lstset{moretexcs=%
{part,parttext,chapter,section,subsection,subsubsection,frontmatter,mainmatter,backmatter,tableofcontents,href,
- color,NameTheorem,CreateTheorem,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,TheDate,ProjLib,qedhere
+ color,NameTheorem,CreateTheorem,cref,DNF,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,TheDate,ProjLib,qedhere
}
}
\lstnewenvironment{code}%
@@ -91,7 +91,7 @@
%%================================
\begin{document}
-\def\PackageVersion{2022/03/28}
+\def\PackageVersion{2022/04/03}
\frontmatter
@@ -113,7 +113,7 @@
\beaulivre{} has multi-language support, including Chinese (simplified and traditional), English, French, German, Italian, Japanese, Portuguese (European and Brazilian), Russian and Spanish. These languages can be switched seamlessly in a single document. Due to the usage of custom fonts, \lebhart{} requires \hologo{XeLaTeX} or \hologo{LuaLaTeX} to compile.
-This documentation is typeset using \beaulivre{} (with the option \texttt{allowbf}). You can think of it as a short introduction and demonstration.
+This documentation is typeset using \beaulivre{} (with the option \texttt{use boldface}). You can think of it as a short introduction and demonstration.
\bigskip
\begin{tip}
@@ -187,7 +187,7 @@ Let's first look at a complete document.
\section{(*\meta{section title}*)}
-\dnf<(*\meta{some hint}*)>
+\DNF<(*\meta{some hint}*)>
\begin{theorem}\label{thm:abc}
Ceci est un théorème.
@@ -227,7 +227,7 @@ For detailed description of this command and more related commands, please refer
\LevelThreeTitle{Draft marks}
\begin{code}
-\dnf<(*\meta{some hint}*)>
+\DNF<(*\meta{some hint}*)>
\end{code}
When you have some places that have not yet been finished yet, you can mark them with this command, which is especially useful during the draft stage.
@@ -290,7 +290,7 @@ In addition, Source Code Pro is used as the English sans serif font, New Compute
\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.
\end{itemize}
- \item \texttt{allowbf}
+ \item \texttt{use boldface}
\begin{itemize}
\item Allow boldface. When this option is enabled, the main title, the titles of all levels and the names of theorem-like environments will be bolded.
\end{itemize}
@@ -432,9 +432,9 @@ For aesthetics, adjacent definitions will be connected together automatically:
% \clearpage
\LevelTwoTitle{Draft mark}
-You can use \lstinline|\dnf| to mark the unfinished part. For example:
+You can use \lstinline|\DNF| to mark the unfinished part. For example:
\begin{itemize}
- \item \lstinline|\dnf| or \lstinline|\dnf<...>|. The effect is: \dnf~ or \dnf<...>. \\The prompt text changes according to the current language. For example, it will be displayed as \UseOtherLanguage{French}{\dnf} in French mode.
+ \item \lstinline|\DNF| or \lstinline|\DNF<...>|. The effect is: \DNF~ or \DNF<...>. \\The prompt text changes according to the current language. For example, it will be displayed as \UseOtherLanguage{French}{\DNF} in French mode.
\end{itemize}
diff --git a/macros/unicodetex/latex/beaulivre/beaulivre-doc-fr.pdf b/macros/unicodetex/latex/beaulivre/beaulivre-doc-fr.pdf
index c57f8cebc8..1bd8eebfd4 100644
--- a/macros/unicodetex/latex/beaulivre/beaulivre-doc-fr.pdf
+++ b/macros/unicodetex/latex/beaulivre/beaulivre-doc-fr.pdf
Binary files differ
diff --git a/macros/unicodetex/latex/beaulivre/beaulivre-doc-fr.tex b/macros/unicodetex/latex/beaulivre/beaulivre-doc-fr.tex
index 0c8439d562..e1b2e630b0 100644
--- a/macros/unicodetex/latex/beaulivre/beaulivre-doc-fr.tex
+++ b/macros/unicodetex/latex/beaulivre/beaulivre-doc-fr.tex
@@ -37,7 +37,7 @@
\providecommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$}
\lstset{moretexcs=%
{part,parttext,chapter,section,subsection,subsubsection,frontmatter,mainmatter,backmatter,tableofcontents,href,
- color,NameTheorem,CreateTheorem,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,TheDate,ProjLib,qedhere
+ color,NameTheorem,CreateTheorem,cref,DNF,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,TheDate,ProjLib,qedhere
}
}
\lstnewenvironment{code}%
@@ -91,7 +91,7 @@
%%================================
\begin{document}
-\def\PackageVersion{2022/03/28}
+\def\PackageVersion{2022/04/03}
\frontmatter
@@ -113,7 +113,7 @@
\beaulivre{} prend en charge plusieurs langues, notamment le chinois (simplifié et traditionnel), l'anglais, le français, l'allemand, l'italien, le japonais, le portugais (européen et brésilien), le russe et l'espagnol. Ces langues peuvent être commutées de manière transparente dans un seul document. En raison de l'utilisation de polices personnalisées, \beaulivre{} demande soit \hologo{XeLaTeX} soit \hologo{LuaLaTeX} pour la compilation.
-Cette documentation est composée à l'aide de \beaulivre{} (avec l'option \texttt{allowbf}). Vous pouvez le considérer comme une courte introduction et une démonstration.
+Cette documentation est composée à l'aide de \beaulivre{} (avec l'option \texttt{use boldface}). Vous pouvez le considérer comme une courte introduction et une démonstration.
\bigskip
\begin{tip}
@@ -188,7 +188,7 @@ Regardons d'abord un document complet.
\section{(*\meta{section title}*)}
-\dnf<(*\meta{some hint}*)>
+\DNF<(*\meta{some hint}*)>
\begin{theorem}\label{thm:abc}
Ceci est un théorème.
@@ -227,7 +227,7 @@ Pour une description détaillée de cette commande et d'autres commandes associ
\LevelThreeTitle{Marques de brouillon}
\begin{code}
-\dnf<(*\meta{some hint}*)>
+\DNF<(*\meta{some hint}*)>
\end{code}
Lorsque vous avez des endroits qui ne sont pas encore finis, vous pouvez les marquer avec cette commande, ce qui est particulièrement utile lors de la phase de brouillon.
@@ -290,7 +290,7 @@ De plus, Source Code Pro est utilisé comme police anglaise sans empattement, Ne
\item Options de police. Comme son nom l'indique, la police avec le nom correspondant sera utilisée.
\item L'option \texttt{useosf} est pour activer les chiffres à l'ancienne.
\end{itemize}
- \item \texttt{allowbf}
+ \item \texttt{use boldface}
\begin{itemize}
\item Afficher les titres en gras. Lorsque cette option est utilisée, le titre principal, les titres de tous les niveaux et les noms des environnements de type théorème seront en gras.
\end{itemize}
@@ -428,9 +428,9 @@ Pour l'esthétique, les définitions adjacentes seront reliées entre elles auto
\LevelTwoTitle{Draft mark}
-Vous pouvez utiliser \lstinline|\dnf| pour marquer la partie inachevée. Par example :
+Vous pouvez utiliser \lstinline|\DNF| pour marquer la partie inachevée. Par example :
\begin{itemize}
- \item \lstinline|\dnf| ou \lstinline|\dnf<...>|. L'effet est : \dnf~ ou \dnf<...>. \\Le texte à l'intérieur changera en fonction de la langue actuelle. Par exemple, il sera affiché sous la forme \UseOtherLanguage{English}{\dnf} en mode anglais.
+ \item \lstinline|\DNF| ou \lstinline|\DNF<...>|. L'effet est : \DNF~ ou \DNF<...>. \\Le texte à l'intérieur changera en fonction de la langue actuelle. Par exemple, il sera affiché sous la forme \UseOtherLanguage{English}{\DNF} en mode anglais.
\end{itemize}
diff --git a/macros/unicodetex/latex/beaulivre/beaulivre.cls b/macros/unicodetex/latex/beaulivre/beaulivre.cls
index b56b03e2b9..7a7ba60d6d 100644
--- a/macros/unicodetex/latex/beaulivre/beaulivre.cls
+++ b/macros/unicodetex/latex/beaulivre/beaulivre.cls
@@ -19,7 +19,7 @@
\RequirePackage{l3keys2e}
\ProvidesExplClass
{beaulivre}
- {2022/03/28} {}
+ {2022/04/03} {}
{A colorful book style}
\tl_const:Nn \l__colorclass_base_class_tl { book }
@@ -180,6 +180,7 @@
\RequirePackage { colorist }
+\raggedbottom
\hfuzz=2pt
\vfuzz=2pt
diff --git a/macros/unicodetex/latex/einfart/einfart-doc-cn.pdf b/macros/unicodetex/latex/einfart/einfart-doc-cn.pdf
index 9496bb9c42..248a122a8c 100644
--- a/macros/unicodetex/latex/einfart/einfart-doc-cn.pdf
+++ b/macros/unicodetex/latex/einfart/einfart-doc-cn.pdf
Binary files differ
diff --git a/macros/unicodetex/latex/einfart/einfart-doc-cn.tex b/macros/unicodetex/latex/einfart/einfart-doc-cn.tex
index eac43ce78a..8338f4c417 100644
--- a/macros/unicodetex/latex/einfart/einfart-doc-cn.tex
+++ b/macros/unicodetex/latex/einfart/einfart-doc-cn.tex
@@ -38,7 +38,7 @@
\providecommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$}
\lstset{moretexcs=%
{linenumbers,nolinenumbers,part,parttext,chapter,section,subsection,subsubsection,frontmatter,mainmatter,backmatter,tableofcontents,href,
- color,NameTheorem,CreateTheorem,cref,dnf,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,TheDate,ProjLib,qedhere
+ color,NameTheorem,CreateTheorem,cref,DNF,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,TheDate,ProjLib,qedhere
}
}
\lstnewenvironment{code}%
@@ -95,7 +95,7 @@
%%================================
\begin{document}
-\def\PackageVersion{2022/03/28}
+\def\PackageVersion{2022/04/03}
\title{\einfart{},以极简主义风格排版你的文章}
\author{许锦文}
@@ -163,7 +163,7 @@
\maketitle
\begin{abstract}
- Ceci est un résumé. \dnf<(*\meta{some hint}*)>
+ Ceci est un résumé. \DNF<(*\meta{some hint}*)>
\end{abstract}
\begin{keyword}
AAA, BBB, CCC, DDD, EEE
@@ -257,7 +257,7 @@ Référence du théorème: \cref{thm:abc}
\medskip
\begin{code}
-\dnf<(*\meta{some hint}*)>
+\DNF<(*\meta{some hint}*)>
\end{code}
当你有一些地方尚未完成的时候,可以用这条指令标记出来,它在草稿阶段格外有用。
@@ -334,7 +334,7 @@ Référence du théorème: \cref{thm:abc}
\item 字体选项。顾名思义,会加载相应名称的字体。
\item \texttt{useosf} 选项用来启用“旧式”数字。
\end{itemize}
- \item \texttt{allowbf}
+ \item \texttt{use boldface}
\begin{itemize}
\item 允许加粗。启用这一选项时,题目、各级标题、定理类环境名称会被加粗。
\end{itemize}
@@ -449,9 +449,9 @@ Référence du théorème: \cref{thm:abc}
\LevelTwoTitle{未完成标记}
-你可以通过 \lstinline|\dnf| 来标记尚未完成的部分。例如:
+你可以通过 \lstinline|\DNF| 来标记尚未完成的部分。例如:
\begin{itemize}
- \item \lstinline|\dnf| 或 \lstinline|\dnf<...>|。效果为:\dnf~或 \dnf<...>。\\其提示文字与当前语言相对应,例如,在法语模式下将会显示为 \UseOtherLanguage{French}{\dnf}。
+ \item \lstinline|\DNF| 或 \lstinline|\DNF<...>|。效果为:\DNF~或 \DNF<...>。\\其提示文字与当前语言相对应,例如,在法语模式下将会显示为 \UseOtherLanguage{French}{\DNF}。
\end{itemize}
\LevelTwoTitle{文章标题、摘要与关键词}
diff --git a/macros/unicodetex/latex/einfart/einfart-doc-en.pdf b/macros/unicodetex/latex/einfart/einfart-doc-en.pdf
index 64be68fff9..8a0aa6c4db 100644
--- a/macros/unicodetex/latex/einfart/einfart-doc-en.pdf
+++ b/macros/unicodetex/latex/einfart/einfart-doc-en.pdf
Binary files differ
diff --git a/macros/unicodetex/latex/einfart/einfart-doc-en.tex b/macros/unicodetex/latex/einfart/einfart-doc-en.tex
index 03e6b6056f..43fc9cebbb 100644
--- a/macros/unicodetex/latex/einfart/einfart-doc-en.tex
+++ b/macros/unicodetex/latex/einfart/einfart-doc-en.tex
@@ -38,7 +38,7 @@
\providecommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$}
\lstset{moretexcs=%
{linenumbers,nolinenumbers,part,parttext,chapter,section,subsection,subsubsection,frontmatter,mainmatter,backmatter,tableofcontents,href,
- color,NameTheorem,CreateTheorem,cref,dnf,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,TheDate,ProjLib,qedhere
+ color,NameTheorem,CreateTheorem,cref,DNF,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,TheDate,ProjLib,qedhere
}
}
\lstnewenvironment{code}%
@@ -95,7 +95,7 @@
%%================================
\begin{document}
-\def\PackageVersion{2022/03/28}
+\def\PackageVersion{2022/04/03}
\title{\einfart{}, write your articles in a simple and clear way}
\author{Jinwen XU}
@@ -163,7 +163,7 @@ Let's first look at a complete document.
\maketitle
\begin{abstract}
- Ceci est un résumé. \dnf<(*\meta{some hint}*)>
+ Ceci est un résumé. \DNF<(*\meta{some hint}*)>
\end{abstract}
\begin{keyword}
AAA, BBB, CCC, DDD, EEE
@@ -258,7 +258,7 @@ In addition, you may also write in the \AmS{} fashion, i.e.:
\medskip
\begin{code}
-\dnf<(*\meta{some hint}*)>
+\DNF<(*\meta{some hint}*)>
\end{code}
When you have some places that have not yet been finished yet, you can mark them with this command, which is especially useful during the draft stage.
@@ -335,7 +335,7 @@ In addition, Source Code Pro is used as the English sans serif font, New Compute
\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.
\end{itemize}
- \item \texttt{allowbf}
+ \item \texttt{use boldface}
\begin{itemize}
\item Allow boldface. When this option is enabled, the main title, the titles of all levels and the names of theorem-like environments will be bolded.
\end{itemize}
@@ -446,9 +446,9 @@ By default, when referenced, the name of the theorem matches the current context
\LevelTwoTitle{Draft mark}
-You can use \lstinline|\dnf| to mark the unfinished part. For example:
+You can use \lstinline|\DNF| to mark the unfinished part. For example:
\begin{itemize}
- \item \lstinline|\dnf| or \lstinline|\dnf<...>|. The effect is: \dnf~ or \dnf<...>. \\The prompt text changes according to the current language. For example, it will be displayed as \UseOtherLanguage{French}{\dnf} in French mode.
+ \item \lstinline|\DNF| or \lstinline|\DNF<...>|. The effect is: \DNF~ or \DNF<...>. \\The prompt text changes according to the current language. For example, it will be displayed as \UseOtherLanguage{French}{\DNF} in French mode.
\end{itemize}
\LevelTwoTitle{Title, abstract and keywords}
diff --git a/macros/unicodetex/latex/einfart/einfart-doc-fr.pdf b/macros/unicodetex/latex/einfart/einfart-doc-fr.pdf
index 16dc2c0b41..f22cd43c74 100644
--- a/macros/unicodetex/latex/einfart/einfart-doc-fr.pdf
+++ b/macros/unicodetex/latex/einfart/einfart-doc-fr.pdf
Binary files differ
diff --git a/macros/unicodetex/latex/einfart/einfart-doc-fr.tex b/macros/unicodetex/latex/einfart/einfart-doc-fr.tex
index 126ad83f68..ca40ea64b6 100644
--- a/macros/unicodetex/latex/einfart/einfart-doc-fr.tex
+++ b/macros/unicodetex/latex/einfart/einfart-doc-fr.tex
@@ -38,7 +38,7 @@
\providecommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$}
\lstset{moretexcs=%
{linenumbers,nolinenumbers,part,parttext,chapter,section,subsection,subsubsection,frontmatter,mainmatter,backmatter,tableofcontents,href,
- color,NameTheorem,CreateTheorem,cref,dnf,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,TheDate,ProjLib,qedhere
+ color,NameTheorem,CreateTheorem,cref,DNF,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,TheDate,ProjLib,qedhere
}
}
\lstnewenvironment{code}%
@@ -95,7 +95,7 @@
%%================================
\begin{document}
-\def\PackageVersion{2022/03/28}
+\def\PackageVersion{2022/04/03}
\title{\einfart{}, écrivez vos articles de manière simple et claire}
\author{Jinwen XU}
@@ -164,7 +164,7 @@ Regardons d'abord un document complet.
\maketitle
\begin{abstract}
- Ceci est un résumé. \dnf<(*\meta{some hint}*)>
+ Ceci est un résumé. \DNF<(*\meta{some hint}*)>
\end{abstract}
\begin{keyword}
AAA, BBB, CCC, DDD, EEE
@@ -258,7 +258,7 @@ De plus, vous pouvez également écrire à la manière \AmS{}, c'est-à-dire :
\medskip
\begin{code}
-\dnf<(*\meta{some hint}*)>
+\DNF<(*\meta{some hint}*)>
\end{code}
Lorsque vous avez des endroits qui ne sont pas encore finis, vous pouvez les marquer avec cette commande, ce qui est particulièrement utile lors de la phase de brouillon.
@@ -334,7 +334,7 @@ De plus, Source Code Pro est utilisé comme police anglaise sans empattement, Ne
\item Options de police. Comme son nom l'indique, la police avec le nom correspondant sera utilisée.
\item L'option \texttt{useosf} est pour activer les chiffres à l'ancienne.
\end{itemize}
- \item \texttt{allowbf}
+ \item \texttt{use boldface}
\begin{itemize}
\item Afficher les titres en gras. Lorsque cette option est utilisée, le titre principal, les titres de tous les niveaux et les noms des environnements de type théorème seront en gras.
\end{itemize}
@@ -443,9 +443,9 @@ Par défaut, lors du référencement, le nom du théorème correspond au context
\LevelTwoTitle{Draft mark}
-Vous pouvez utiliser \lstinline|\dnf| pour marquer la partie inachevée. Par example :
+Vous pouvez utiliser \lstinline|\DNF| pour marquer la partie inachevée. Par example :
\begin{itemize}
- \item \lstinline|\dnf| ou \lstinline|\dnf<...>|. L'effet est : \dnf~ ou \dnf<...>. \\Le texte à l'intérieur changera en fonction de la langue actuelle. Par exemple, il sera affiché sous la forme \UseOtherLanguage{English}{\dnf} en mode anglais.
+ \item \lstinline|\DNF| ou \lstinline|\DNF<...>|. L'effet est : \DNF~ ou \DNF<...>. \\Le texte à l'intérieur changera en fonction de la langue actuelle. Par exemple, il sera affiché sous la forme \UseOtherLanguage{English}{\DNF} en mode anglais.
\end{itemize}
\LevelTwoTitle{Titre, résumé et mots-clés}
diff --git a/macros/unicodetex/latex/einfart/einfart.cls b/macros/unicodetex/latex/einfart/einfart.cls
index c56165e6b9..ab1be42047 100644
--- a/macros/unicodetex/latex/einfart/einfart.cls
+++ b/macros/unicodetex/latex/einfart/einfart.cls
@@ -19,7 +19,7 @@
\RequirePackage{l3keys2e}
\ProvidesExplClass
{einfart}
- {2022/03/28} {}
+ {2022/04/03} {}
{A simple and clear article style}
\tl_const:Nn \l__minimclass_base_class_tl { article }
@@ -201,6 +201,10 @@
\RequirePackage { minimalist }
+\raggedbottom
+\hfuzz=2pt
+\vfuzz=2pt
+
%%================================
%% Fonts
%%================================
diff --git a/macros/unicodetex/latex/lebhart/lebhart-doc-cn.pdf b/macros/unicodetex/latex/lebhart/lebhart-doc-cn.pdf
index fb99a6d618..fbc8a1cc54 100644
--- a/macros/unicodetex/latex/lebhart/lebhart-doc-cn.pdf
+++ b/macros/unicodetex/latex/lebhart/lebhart-doc-cn.pdf
Binary files differ
diff --git a/macros/unicodetex/latex/lebhart/lebhart-doc-cn.tex b/macros/unicodetex/latex/lebhart/lebhart-doc-cn.tex
index 9b80d1283e..7b5b014c2e 100644
--- a/macros/unicodetex/latex/lebhart/lebhart-doc-cn.tex
+++ b/macros/unicodetex/latex/lebhart/lebhart-doc-cn.tex
@@ -37,7 +37,7 @@
\providecommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$}
\lstset{moretexcs=%
{part,parttext,chapter,section,subsection,subsubsection,frontmatter,mainmatter,backmatter,tableofcontents,href,
- color,NameTheorem,CreateTheorem,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,TheDate,ProjLib,qedhere
+ color,NameTheorem,CreateTheorem,cref,DNF,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,TheDate,ProjLib,qedhere
}
}
\lstnewenvironment{code}%
@@ -91,7 +91,7 @@
%%================================
\begin{document}
-\def\PackageVersion{2022/03/28}
+\def\PackageVersion{2022/04/03}
\title{{\normalfont\bfseries\color{main-text}\lebhart{}}\\以多彩的方式排版你的文章}
\author{许锦文}
@@ -106,7 +106,7 @@
\lebhart{} 支持英语、法语、德语、意大利语、葡萄牙语、巴西葡萄牙语、西班牙语、简体中文、繁体中文、日文、俄文,并且同一篇文档中这些语言可以很好地协调。由于采用了自定义字体,需要用 \hologo{XeLaTeX} 或 \hologo{LuaLaTeX} 引擎进行编译。
- 这篇说明文档即是用 \lebhart{} 排版的 (使用了参数 \texttt{allowbf}),你可以把它看作一份简短的说明与演示。
+ 这篇说明文档即是用 \lebhart{} 排版的 (使用了参数 \texttt{use boldface}),你可以把它看作一份简短的说明与演示。
\end{abstract}
@@ -159,7 +159,7 @@
\maketitle
\begin{abstract}
- Ceci est un résumé. \dnf<(*\meta{some hint}*)>
+ Ceci est un résumé. \DNF<(*\meta{some hint}*)>
\end{abstract}
\begin{keyword}
AAA, BBB, CCC, DDD, EEE
@@ -250,7 +250,7 @@ Référence du théorème: \cref{thm:abc}
\LevelThreeTitle{未完成标记}
\begin{code}
-\dnf<(*\meta{some hint}*)>
+\DNF<(*\meta{some hint}*)>
\end{code}
当你有一些地方尚未完成的时候,可以用这条指令标记出来,它在草稿阶段格外有用。
@@ -335,7 +335,7 @@ Référence du théorème: \cref{thm:abc}
\item 字体选项。顾名思义,会加载相应名称的字体。
\item \texttt{useosf} 选项用来启用“旧式”数字。
\end{itemize}
- \item \texttt{allowbf}
+ \item \texttt{use boldface}
\begin{itemize}
\item 允许加粗。启用这一选项时,题目、各级标题、定理类环境名称会被加粗。
\end{itemize}
@@ -479,9 +479,9 @@ Référence du théorème: \cref{thm:abc}
\LevelTwoTitle{未完成标记}
-你可以通过 \lstinline|\dnf| 来标记尚未完成的部分。例如:
+你可以通过 \lstinline|\DNF| 来标记尚未完成的部分。例如:
\begin{itemize}
- \item \lstinline|\dnf| 或 \lstinline|\dnf<...>|。效果为:\dnf~或 \dnf<...>。\\其提示文字与当前语言相对应,例如,在法语模式下将会显示为 \UseOtherLanguage{French}{\dnf}。
+ \item \lstinline|\DNF| 或 \lstinline|\DNF<...>|。效果为:\DNF~或 \DNF<...>。\\其提示文字与当前语言相对应,例如,在法语模式下将会显示为 \UseOtherLanguage{French}{\DNF}。
\end{itemize}
\LevelTwoTitle{文章标题、摘要与关键词}
diff --git a/macros/unicodetex/latex/lebhart/lebhart-doc-en.pdf b/macros/unicodetex/latex/lebhart/lebhart-doc-en.pdf
index 41a71f9dea..12dfd4d9cd 100644
--- a/macros/unicodetex/latex/lebhart/lebhart-doc-en.pdf
+++ b/macros/unicodetex/latex/lebhart/lebhart-doc-en.pdf
Binary files differ
diff --git a/macros/unicodetex/latex/lebhart/lebhart-doc-en.tex b/macros/unicodetex/latex/lebhart/lebhart-doc-en.tex
index 540f300b0c..b9de98ea01 100644
--- a/macros/unicodetex/latex/lebhart/lebhart-doc-en.tex
+++ b/macros/unicodetex/latex/lebhart/lebhart-doc-en.tex
@@ -37,7 +37,7 @@
\providecommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$}
\lstset{moretexcs=%
{part,parttext,chapter,section,subsection,subsubsection,frontmatter,mainmatter,backmatter,tableofcontents,href,
- color,NameTheorem,CreateTheorem,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,TheDate,ProjLib,qedhere
+ color,NameTheorem,CreateTheorem,cref,DNF,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,TheDate,ProjLib,qedhere
}
}
\lstnewenvironment{code}%
@@ -91,7 +91,7 @@
%%================================
\begin{document}
-\def\PackageVersion{2022/03/28}
+\def\PackageVersion{2022/04/03}
\title{{\normalfont\bfseries\color{main-text}\lebhart{}}\\write your articles in a colorful way}
\author{Jinwen XU}
@@ -106,7 +106,7 @@
\lebhart{} has multi-language support, including Chinese (simplified and traditional), English, French, German, Italian, Japanese, Portuguese (European and Brazilian), Russian and Spanish. These languages can be switched seamlessly in a single document. Due to the usage of custom fonts, \lebhart{} requires \hologo{XeLaTeX} or \hologo{LuaLaTeX} to compile.
- This documentation is typeset using \lebhart{} (with the option \texttt{allowbf}). You can think of it as a short introduction and demonstration.
+ This documentation is typeset using \lebhart{} (with the option \texttt{use boldface}). You can think of it as a short introduction and demonstration.
\end{abstract}
@@ -159,7 +159,7 @@ Let's first look at a complete document.
\maketitle
\begin{abstract}
- Ceci est un résumé. \dnf<(*\meta{some hint}*)>
+ Ceci est un résumé. \DNF<(*\meta{some hint}*)>
\end{abstract}
\begin{keyword}
AAA, BBB, CCC, DDD, EEE
@@ -250,7 +250,7 @@ In addition, you may also write in the \AmS{} fashion, i.e.:
\LevelThreeTitle{Draft marks}
\begin{code}
-\dnf<(*\meta{some hint}*)>
+\DNF<(*\meta{some hint}*)>
\end{code}
When you have some places that have not yet been finished yet, you can mark them with this command, which is especially useful during the draft stage.
@@ -334,7 +334,7 @@ In addition, Source Code Pro is used as the English sans serif font, New Compute
\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.
\end{itemize}
- \item \texttt{allowbf}
+ \item \texttt{use boldface}
\begin{itemize}
\item Allow boldface. When this option is enabled, the main title, the titles of all levels and the names of theorem-like environments will be bolded.
\end{itemize}
@@ -473,9 +473,9 @@ For aesthetics, adjacent definitions will be connected together automatically:
\LevelTwoTitle{Draft mark}
-You can use \lstinline|\dnf| to mark the unfinished part. For example:
+You can use \lstinline|\DNF| to mark the unfinished part. For example:
\begin{itemize}
- \item \lstinline|\dnf| or \lstinline|\dnf<...>|. The effect is: \dnf~ or \dnf<...>. \\The prompt text changes according to the current language. For example, it will be displayed as \UseOtherLanguage{French}{\dnf} in French mode.
+ \item \lstinline|\DNF| or \lstinline|\DNF<...>|. The effect is: \DNF~ or \DNF<...>. \\The prompt text changes according to the current language. For example, it will be displayed as \UseOtherLanguage{French}{\DNF} in French mode.
\end{itemize}
\LevelTwoTitle{Title, abstract and keywords}
diff --git a/macros/unicodetex/latex/lebhart/lebhart-doc-fr.pdf b/macros/unicodetex/latex/lebhart/lebhart-doc-fr.pdf
index 8f5006b150..0d6d5ed374 100644
--- a/macros/unicodetex/latex/lebhart/lebhart-doc-fr.pdf
+++ b/macros/unicodetex/latex/lebhart/lebhart-doc-fr.pdf
Binary files differ
diff --git a/macros/unicodetex/latex/lebhart/lebhart-doc-fr.tex b/macros/unicodetex/latex/lebhart/lebhart-doc-fr.tex
index 402d05b32c..fa5a1e40e4 100644
--- a/macros/unicodetex/latex/lebhart/lebhart-doc-fr.tex
+++ b/macros/unicodetex/latex/lebhart/lebhart-doc-fr.tex
@@ -37,7 +37,7 @@
\providecommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$}
\lstset{moretexcs=%
{part,parttext,chapter,section,subsection,subsubsection,frontmatter,mainmatter,backmatter,tableofcontents,href,
- color,NameTheorem,CreateTheorem,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,TheDate,ProjLib,qedhere
+ color,NameTheorem,CreateTheorem,cref,DNF,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,TheDate,ProjLib,qedhere
}
}
\lstnewenvironment{code}%
@@ -91,7 +91,7 @@
%%================================
\begin{document}
-\def\PackageVersion{2022/03/28}
+\def\PackageVersion{2022/04/03}
\title{{\normalfont\bfseries\color{main-text}\lebhart{}}\\écrivez vos articles de manière colorée}
\author{Jinwen XU}
@@ -106,7 +106,7 @@
\lebhart{} prend en charge plusieurs langues, notamment le chinois (simplifié et traditionnel), l'anglais, le français, l'allemand, l'italien, le japonais, le portugais (européen et brésilien), le russe et l'espagnol. Ces langues peuvent être commutées de manière transparente dans un seul document. En raison de l'utilisation de polices personnalisées, \lebhart{} demande soit \hologo{XeLaTeX} soit \hologo{LuaLaTeX} pour la compilation.
- Cette documentation est composée à l'aide de \lebhart{} (avec l'option \texttt{allowbf}). Vous pouvez le considérer comme une courte introduction et une démonstration.
+ Cette documentation est composée à l'aide de \lebhart{} (avec l'option \texttt{use boldface}). Vous pouvez le considérer comme une courte introduction et une démonstration.
\end{abstract}
@@ -160,7 +160,7 @@ Regardons d'abord un document complet.
\maketitle
\begin{abstract}
- Ceci est un résumé. \dnf<(*\meta{some hint}*)>
+ Ceci est un résumé. \DNF<(*\meta{some hint}*)>
\end{abstract}
\begin{keyword}
AAA, BBB, CCC, DDD, EEE
@@ -251,7 +251,7 @@ De plus, vous pouvez également écrire à la manière \AmS{}, c'est-à-dire :
\LevelThreeTitle{Marques de brouillon}
\begin{code}
-\dnf<(*\meta{some hint}*)>
+\DNF<(*\meta{some hint}*)>
\end{code}
Lorsque vous avez des endroits qui ne sont pas encore finis, vous pouvez les marquer avec cette commande, ce qui est particulièrement utile lors de la phase de brouillon.
@@ -335,7 +335,7 @@ De plus, Source Code Pro est utilisé comme police anglaise sans empattement, Ne
\item Options de police. Comme son nom l'indique, la police avec le nom correspondant sera utilisée.
\item L'option \texttt{useosf} est pour activer les chiffres à l'ancienne.
\end{itemize}
- \item \texttt{allowbf}
+ \item \texttt{use boldface}
\begin{itemize}
\item Afficher les titres en gras. Lorsque cette option est utilisée, le titre principal, les titres de tous les niveaux et les noms des environnements de type théorème seront en gras.
\end{itemize}
@@ -472,9 +472,9 @@ Pour l'esthétique, les définitions adjacentes seront reliées entre elles auto
\LevelTwoTitle{Draft mark}
-Vous pouvez utiliser \lstinline|\dnf| pour marquer la partie inachevée. Par example :
+Vous pouvez utiliser \lstinline|\DNF| pour marquer la partie inachevée. Par example :
\begin{itemize}
- \item \lstinline|\dnf| ou \lstinline|\dnf<...>|. L'effet est : \dnf~ ou \dnf<...>. \\Le texte à l'intérieur changera en fonction de la langue actuelle. Par exemple, il sera affiché sous la forme \UseOtherLanguage{English}{\dnf} en mode anglais.
+ \item \lstinline|\DNF| ou \lstinline|\DNF<...>|. L'effet est : \DNF~ ou \DNF<...>. \\Le texte à l'intérieur changera en fonction de la langue actuelle. Par exemple, il sera affiché sous la forme \UseOtherLanguage{English}{\DNF} en mode anglais.
\end{itemize}
\LevelTwoTitle{Titre, résumé et mots-clés}
diff --git a/macros/unicodetex/latex/lebhart/lebhart.cls b/macros/unicodetex/latex/lebhart/lebhart.cls
index 956a4a9c43..314e8dff23 100644
--- a/macros/unicodetex/latex/lebhart/lebhart.cls
+++ b/macros/unicodetex/latex/lebhart/lebhart.cls
@@ -19,7 +19,7 @@
\RequirePackage{l3keys2e}
\ProvidesExplClass
{lebhart}
- {2022/03/28} {}
+ {2022/04/03} {}
{A colorful article style}
\tl_const:Nn \l__colorclass_base_class_tl { article }
@@ -180,6 +180,7 @@
\RequirePackage { colorist }
+\raggedbottom
\hfuzz=2pt
\vfuzz=2pt
diff --git a/macros/unicodetex/latex/nwafuthesis/README.md b/macros/unicodetex/latex/nwafuthesis/README.md
index 0d1d0d0a36..c1faa1af66 100644
--- a/macros/unicodetex/latex/nwafuthesis/README.md
+++ b/macros/unicodetex/latex/nwafuthesis/README.md
@@ -1,7 +1,7 @@
-## The nwafuthesis Class
-LaTeX thesis template for Northwest A&F University, China, v1.10
+The nwafuthesis Class
+LaTeX thesis template for Northwest A&F University, China, v1.11
-## Overview
+Overview
This template supports doctoral or master dissertion and undergraduate thesis in Chinese. With the help of modern LaTeX3 technology, nwafuthesis aims to create a simple interface, a normative format, as well as a hackable class for the users.
At present, nwafuthesis only supports XeTeX and LuaTEX engines. nwafuthesis only allows UTF-8 encoding.
@@ -10,7 +10,7 @@ The documentation can be found in nwafuthesis.pdf (in Chinese).
Gitee re­pos­i­tory: https://gitee.com/nwafu_nan/nwafuthesis-l3.
-## Installation
+Installation
To install nwafuthesis, you can use one of the following methods:
If you are running TeX Live or MikTeX, the simplest way is to use that distribution's package manager.
@@ -24,10 +24,10 @@ For permanent installation, you may move the following files into a directory wh
nwafuthesis.cls
Do not forget to update the filename database afterwards.
-## Contributing
+Contributing
Issues and pull requests are always welcome.
-## License
+License
This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3c of this license or (at your option) any later version.
Copyright (C) 2017–2022 by Nan Geng <nangeng@nwafu.edu.cn>.
diff --git a/macros/unicodetex/latex/nwafuthesis/build-win.bat b/macros/unicodetex/latex/nwafuthesis/build-win.bat
index e8f223950b..e8f223950b 100644..100755
--- a/macros/unicodetex/latex/nwafuthesis/build-win.bat
+++ b/macros/unicodetex/latex/nwafuthesis/build-win.bat
diff --git a/macros/unicodetex/latex/nwafuthesis/logo/workflow.pdf b/macros/unicodetex/latex/nwafuthesis/logo/workflow.pdf
new file mode 100644
index 0000000000..a44c1ea945
--- /dev/null
+++ b/macros/unicodetex/latex/nwafuthesis/logo/workflow.pdf
Binary files differ
diff --git a/macros/unicodetex/latex/nwafuthesis/nwafuthesis-doc.dtx b/macros/unicodetex/latex/nwafuthesis/nwafuthesis-doc.dtx
index ded7e6aa8f..22ae9f6d9d 100644
--- a/macros/unicodetex/latex/nwafuthesis/nwafuthesis-doc.dtx
+++ b/macros/unicodetex/latex/nwafuthesis/nwafuthesis-doc.dtx
@@ -93,7 +93,7 @@
% 载入宏包和文档类。
% \begin{macrocode}
\LoadClass[a4paper, full]{l3doc}
-\RequirePackage[UTF8, heading, sub3section]{ctex}
+\RequirePackage[heading, sub3section]{ctex}
% \end{macrocode}
% 与 \pkg{hypdoc}(由 \cls{l3doc} 调用)冲突,导致脚注超链接
% 无法正常跳转。暂时禁用。
diff --git a/macros/unicodetex/latex/nwafuthesis/nwafuthesis.dtx b/macros/unicodetex/latex/nwafuthesis/nwafuthesis.dtx
index 37bb596074..100a1cc039 100644
--- a/macros/unicodetex/latex/nwafuthesis/nwafuthesis.dtx
+++ b/macros/unicodetex/latex/nwafuthesis/nwafuthesis.dtx
@@ -110,7 +110,7 @@
%<class|doc>\NeedsTeXFormat{LaTeX2e}
%<class|doc>\RequirePackage{expl3}
%<*!(driver|install)>
-%<!readme>\GetIdInfo $Id: nwafuthesis.dtx 1.10 2022-03-17 Nan Geng <nangeng@nwafu.edu.cn> $
+%<!readme>\GetIdInfo $Id: nwafuthesis.dtx 1.11 2022-04-03 Nan Geng <nangeng@nwafu.edu.cn> $
%<class> {Thesis template for Northwest A\&F University}
%<class>\ProvidesExplClass{\ExplFileName}
%<definition> {Definition file for nwafuthesis}
@@ -143,7 +143,7 @@
\textbf{\nwafuthesis: 西北农林科技大学学位论文
\xpinyin[font=\sffamily,format=\color{MaterialIndigo800}]{模}{mu2}板}}}
\author{耿楠}
-\date{\today\quad v1.10%
+\date{\today\quad v1.11%
\thanks{\url{https://gitee.com/nwafu_nan/nwafuthesis-l3}.}}
\begin{document}
@@ -242,9 +242,9 @@
%
% \subsection*{\LaTeX{} 入门}
%
-% 本文档并非是一份 \LaTeX{} 零基础教程。如果是完完全全的新手,
+% 本文档并非一份 \LaTeX{} 零基础教程。如果是完完全全的新手,
% 建议先阅读相关入门文档,如刘海洋编著的《\LaTeX{} 入门》
-% \scite{刘海洋2013latex入门} 第一章,或大名鼎鼎的“\pkg{lshort}”
+% \scite{刘海洋2013latex入门} ,或大名鼎鼎的“\pkg{lshort}”
% \scite{lshort} 及其中文翻译版 \scite{lshort-zh-cn}。当然,
% 网络上诸如耿楠录制的\LaTeX{}教学系列视频等入门教程多如牛毛,
% 可以自行选取学习。
@@ -254,22 +254,47 @@
% 本文采用不同字体表示不同内容。无衬线字体表示宏包名称,如
% \pkg{xeCJK} 宏包、\cls{nwafuthesis} 文档类等;等宽字体表示代码或
% 文件名,如 \cs{nwafuset} 命令、\env{abstract} 环境、\TeX{} 文档
-% \file{thesis.tex} 等;带有尖括号的楷体(或西文斜体)表示命令参数,
-% 如 \meta{模板选项}、\meta{English title} 等。在使用时,不必输入参数两侧
+% \file{main.tex} 等;带有尖括号的楷体(或西文斜体)表示命令参数,
+% 如 \meta{模板选项}、\meta{English title} 等。使用时,不必输入参数两侧
% 的尖括号。示例代码进行了语法高亮处理,以方便阅读。
%
% 在用户手册中,带有蓝色侧边线的为 \LaTeX{} 代码,而带有粉色侧边线
-% 的则为电脑命令行代码,请注意区分。模板提供的选项、命令、环境等,
-% 均用横线框起,同时给出使用语法和相关说明。
-%
-% 手册中的代码实现部分主要面向对 \LaTeX{} 宏包开发感兴趣的用户。
-% 如果有任何改进意见或者功能需求,欢迎前往 Gitee 仓库提交issue。
+% 的则为命令行代码,请注意区分。模板提供的选项、命令、环境等,
+% 均用横线框起,同时给出语法和相关说明。
%
+% 手册中代码实现部分主要面向对 \LaTeX{} 模板开发感兴趣的用户。
% 文档的最后还提供了版本历史和代码索引,以供查阅。
%
% \section{安装}
%
-% \changes{v1.00}{2021/08/05}{修改安装说明,提交ctan。}
+% \subsection{模板工作流}
+%
+% 使用{\nwafuthesis}模板排版学位论文的工作流如图\ref{fig:workflow}所示。
+%
+% \begin{figure}[!htb]
+% \centering
+% \includegraphics[width=0.85\textwidth]{logo/workflow}
+% \caption{模板工作流}
+% \label{fig:workflow}
+% \end{figure}
+%
+% 作为普通用户,仅需要通过{\LaTeX}发行版安装和更新模板,完成安装后,即可使用%
+% \verb|\documentclass{nwafuthesis}|载入该模板进行工作了。作为普通用户,
+% 强烈建议只关心学位论文内容,通过与导师的反复沟通修改与完善论文内容即可。
+% 关于学位论文排版格式问题应该交由开发者根据根据相关学校%
+% \emph{指南/规范}进行设计和调整。开发者完成模板开发及功能完善后,会上传到
+% CTAN(\url{www.ctan.org}),然后模板会被部署于{\LaTeX}发行版,此时普通
+% 用户仅需要通过{\LaTeX}发行版的管理工具更新模板即可得到更新后的模板,
+% 模板更新再次编译学位论文即可按最新的格式要求完成排版。
+%
+% 关于{\nwafuthesis}模板的使用的详细说明,一方面可以通过阅读其使用说明书和
+% 写作样例进行学习,另一方面也可以参阅耿楠在B站发布的教学视频%
+% \url{https://www.bilibili.com/video/BV1tY4y1q7RT#reply107826496032}进行学习。
+%
+% 如果有任何改进意见或者功能需求,欢迎前往 Gitee 仓库提交issue。
+% {\nwafuthesis}模板的源代码托管于\url{https://gitee.com/nwafu_nan/nwafuthesis-l3},
+% 欢迎大家多提 issue/PR,以便进一步完善和美化我校学位论文\LaTeX{}模板。
+%
% \subsection{获取 \cls{nwafuthesis}}
%
% \subsubsection{标准安装}
@@ -1330,6 +1355,13 @@
% \cs{dateen} 命令用于输出英文格式的当前月,年。
% \end{function}
%
+% \begin{function}[added=2022-04-04]{\fakebold}
+% \begin{nwafusyntax}[deletetexcs={\fakebold},morekeywords={\fakebold}]
+% \fakebold(*\oarg{加粗系数}\marg{文字内容}*)
+% \end{nwafusyntax}
+% 使用PDF literal通过缩放笔画实现的伪粗命令。
+% \end{function}
+%
% \begin{function}[added=2021-05-12,updated=2021-5-28]{\makecoveri,
% \makecoverii,\makecoveriii, \makecoveriv,
% \makecoverv,\makecovervi,\makecovervii}
@@ -1394,17 +1426,6 @@
% \cs{makefront}命令自动排版。
% \end{function}
%
-% \begin{function}[added=2021-05-29]{\frontmatter,\frontmatter*}
-% \begin{nwafusyntax}[deletetexcs={\frontmatter,\frontmatter*},
-% morekeywords={\frontmatter,\frontmatter*}]
-% \frontmatter(*\oarg{编号格式|(Roman)}*)
-% \frontmatter*(*\oarg{编号格式|(Roman)}*)
-% \end{nwafusyntax}
-% \cs{frontmatter} 为前置区命令,章标题不编号,
-% 页码可设置为例如 \opt{roman}、\opt{Alph} 等格式,
-% 带有星号的命令 \cs{frontmatter*} 不使用清双页命令 \tn{cleardoublepage}。
-% \end{function}
-%
% \begin{function}[added=2021-05-12]{\cleardoublepage}
% \begin{nwafusyntax}[deletetexcs={\cleardoublepage},morekeywords={\cleardoublepage}]
% \cleardoublepage(*\oarg{页面风格|(empty)}*)
@@ -1628,6 +1649,8 @@
% marginpar = 2.25 in
% }
%
+% \changes{v1.11}{2022/04/03}{取消本科黑体加粗。}
+%
% \section{实现细节}
%
% 本模板使用 \LaTeX3 语法编写,依赖 \pkg{expl3} 环境,
@@ -1832,6 +1855,27 @@
% \end{macrocode}
% \end{macro}
%
+% \changes{v1.11}{2022/04/03}{添加PDF literal实现的伪粗命令。}
+%
+% \begin{macro}{\@@_fake_bold:nn,\fakebold}
+% 利用PDF literal实现的伪粗命令。
+% 参考\url{https://zhuanlan.zhihu.com/p/60262200}实现。
+% \#1 加粗系数
+% \#2 加粗内容
+% \begin{macrocode}
+\cs_new:Npn \@@_fake_bold:nn #1#2
+ {
+ \special{pdf:code~q~2~Tr~0~G~#1~w}%
+ #2%
+ \special{pdf:code~Q}%
+ }
+\NewDocumentCommand \fakebold {O{0.2} m }
+ {
+ \@@_fake_bold:nn { #1 }{ #2 }
+ }
+% \end{macrocode}
+% \end{macro}
+%
% \changes{v1.10}{2022/03/17}{统一使用 \LaTeX{} 2020/10/01 新钩子机制。}
%
% \begin{macro}{\@@_gadd_ltxhook:nn}
@@ -3432,6 +3476,8 @@
\pagestyle { fancy }
% \end{macrocode}
%
+% \changes{v1.11}{2022/04/02}{删除本科生目录页眉,并修正单面模式目录页眉。}
+%
% \begin{macro}{\frontmatter,\mainmatter}
% 重定义 \tn{frontmatter}和\tn{frontmatter},
% 以根据学校要求定制摘要、目录、主要符号对照表等前置部分的页眉页脚。
@@ -3457,13 +3503,13 @@
% \begin{macrocode}
\bool_if:NTF \g_@@_twoside_bool
{
-% \end{macrocode}
-% 奇数页页眉
-% \begin{macrocode}
- \nwafuhead[OC]{\small \nouppercase{ \leftmark } }
\int_compare:nNnTF { \g_@@_thesis_type_int } < { 3 }
{
% \end{macrocode}
+% 研究生奇数页页眉
+% \begin{macrocode}
+ \nwafuhead[OC]{\small \nouppercase{ \leftmark } }
+% \end{macrocode}
% 研究生偶数页页眉
% \begin{macrocode}
\nwafuhead[EC]{\small \nouppercase{
@@ -3473,17 +3519,22 @@
}
}{
% \end{macrocode}
-% 本科生偶数页页眉
+% 本科生目录无页眉
% \begin{macrocode}
- \nwafuhead[EC]{\small \nouppercase{ \leftmark } }
+ \renewcommand{\headrulewidth}{0.0pt}
}
}{
% \end{macrocode}
-% 单面模式,奇偶页设成一样
+% 单面模式,研究生奇偶页设成一样,本科生无页眉
% \begin{macrocode}
- \nwafuhead [ C ]
+ \int_compare:nNnTF { \g_@@_thesis_type_int } < { 3 }
{
- \small \nouppercase { \l_@@_header_center_mark_tl }
+ \nwafuhead [ C ]
+ {
+ \small \nouppercase { \l_@@_header_center_mark_tl }
+ }
+ }{
+ \renewcommand{\headrulewidth}{0.0pt}
}
}
\nwafufoot[C]{\small\thepage}
@@ -3525,12 +3576,14 @@
% \end{macrocode}
% 本科生偶数页页眉
% \begin{macrocode}
+ \renewcommand{\headrulewidth}{0.4pt}
\nwafuhead[EC]{\small \nouppercase{ \l__@@_info_title_tl } }
}
}{
% \end{macrocode}
% 单面模式
% \begin{macrocode}
+ \renewcommand{\headrulewidth}{0.4pt}
\nwafuhead [ C ]
{
\int_if_odd:nTF \c@page
@@ -3770,6 +3823,8 @@
%
% \subsection{章节标题设置}
%
+% \changes{v1.11}{2022/04/02}{修订本科生subsubsection编号两端括号为中文全角括号。}
+%
% |\keys_set:nn{ctex}| 实际相当于调用 \cs{ctexset}。
%
% 设置章(chapter)、节(section)与小节(sub-section)标题样式。
@@ -3832,7 +3887,7 @@
\bool_if:NT \l_@@_withchap_bool {章} },
number = \@@_arabic:n { chapter },
aftername = \hspace*{\ccwd},
- format = \zihao{3} \normalfont \nwafu@hei \bfseries \centering,
+ format = \zihao{3} \normalfont \nwafu@hei \centering,
beforeskip = 0.25\baselineskip,
afterskip = 0.65\baselineskip,
fixskip = true
@@ -3840,7 +3895,7 @@
section =
{
aftername = \hspace*{0.5\ccwd},
- format = \zihao{4} \normalfont \nwafu@hei \bfseries \raggedright,
+ format = \zihao{4} \normalfont \nwafu@hei \raggedright,
beforeskip = 0.60\baselineskip,
afterskip = 0.65\baselineskip,
fixskip = true,
@@ -3849,7 +3904,7 @@
subsection =
{
aftername = \hspace*{0.5\ccwd},
- format = \zihao{-4} \normalfont \nwafu@hei \bfseries,
+ format = \zihao{-4} \normalfont \nwafu@hei ,
beforeskip = 0.60\baselineskip,
afterskip = 0.65\baselineskip,
fixskip = true,
@@ -3858,8 +3913,8 @@
},
subsubsection =
{
- name = {(,)},
- aftername = \hspace*{0.5\ccwd},
+ name = {(,)},
+ aftername = \hspace*{0.0pt},
number = \@@_arabic:n { subsubsection },
format = \zihao{-4} \normalfont,
beforeskip = 0.60\baselineskip,
@@ -4394,8 +4449,8 @@
% \begin{macrocode}
\DeclareCaptionLabelSeparator{ccwd}{\hspace{0.5\ccwd}}
\DeclareCaptionLabelFormat{parens}{\bothIfFirst{#1}{~}(#2)}
-\DeclareCaptionFont{nwafu@table@font}{\sffamily\small}
-\DeclareCaptionFont{nwafu@figure@font}{\sffamily\small}
+\DeclareCaptionFont{nwafu@table@font}{\nwafu@hei\small}
+\DeclareCaptionFont{nwafu@figure@font}{\nwafu@hei\small}
\DeclareCaptionFont{nwafu@subtable@font}{\small}
\DeclareCaptionFont{nwafu@subfigure@font}{\small}
% \end{macrocode}
@@ -5073,6 +5128,8 @@
% \end{macrocode}
% \end{macro}
%
+% \changes{v1.11}{2022/04/03}{利用PDF literal添加本科楷体伪粗。}
+%
% \begin{macro}{\@@_cover_type:}
% 论文类型。
% \begin{macrocode}
@@ -5097,13 +5154,20 @@
% \begin{macrocode}
\@@_get_text_width:NV \l__@@_tmpa_dim \l__@@_info_grade_tl
\@@_center_box:Vn \l__@@_tmpa_dim { \l__@@_info_grade_tl }
- \@@_spread_box:nn { 0.50 \textwidth }{
- 届
- \l_@@_tmpa_tl
% \end{macrocode}
-% 本科的论文或设计。
+% 利用PDF literal伪粗显示楷体。
% \begin{macrocode}
- \clist_item:Nn \c__@@_bachelor_type_clist { \l__@@_info_bachelor_type_int }
+ \@@_fake_bold:nn {0.20}
+ {
+ \@@_spread_box:nn { 0.50 \textwidth }
+ {
+ 届
+ \l_@@_tmpa_tl
+% \end{macrocode}
+% 本科的论文或设计选择。
+% \begin{macrocode}
+ \clist_item:Nn \c__@@_bachelor_type_clist { \l__@@_info_bachelor_type_int }
+ }
}
}
}
@@ -6162,13 +6226,12 @@
logo / bottom-skip = -30 pt,% plus 0.3 fill,
logo / align = center,
type / content = \@@_cover_type:,
- type / format = \bfseries\nwafu@kai\zihao { 1 },
+ type / format = \nwafu@kai\zihao { 1 },
type / bottom-skip = -20 pt plus 0.3 fill,
type / align = center,
- title / content =
- \@@_fixed_width_center_box:nn
- { 0.9 \textwidth } { \l_@@_info_title_tl },
- title / format = \nwafu@hei \bfseries\zihao { 2 },
+ title / content = \@@_fixed_width_center_box:nn
+ { 0.9 \textwidth } { \l_@@_info_title_tl },
+ title / format = \nwafu@hei \zihao { 2 },
title / bottom-skip = 80 pt plus 0.3 fill,
title / align = center,
info / content = \@@_cover_info:,
@@ -6510,6 +6573,8 @@
% \end{macrocode}
% \end{macro}
%
+% \changes{v1.11}{2022/04/02}{修复摘要后的所有页面尺寸。}
+%
% \begin{macro}{\makefront}
% 排版摘要、目录等前料。
% \begin{macrocode}
@@ -6518,6 +6583,18 @@
\int_compare:nNnTF { \g_@@_thesis_type_int } < { 3 }
{
% \end{macrocode}
+% 恢复研究生页面尺寸
+% \begin{macrocode}
+ \newgeometry{
+ top = 3.1cm,
+ bottom = 3.3cm,
+ left = 2.6cm,
+ right = 2.6cm,
+ headheight = 0.8cm,
+ headsep = 0.7cm,
+ footskip = 1.4cm,
+ }
+% \end{macrocode}
% 研究生,\cs{frontmatter}命令用于设置页眉页脚,页码格式
% 并于奇数页起排。
% \begin{macrocode}
@@ -6549,7 +6626,6 @@
% \end{macrocode}
% 排版主要符号对照表,需要在奇数页起排。
% \begin{macrocode}
- % \frontmatter
\tl_if_empty:NF \l_@@_notation_file_tl
{
% \end{macrocode}
@@ -6561,6 +6637,18 @@
}
}{
% \end{macrocode}
+% 恢复本科生页面尺寸
+% \begin{macrocode}
+ \newgeometry{
+ top = 3.14cm,
+ bottom = 3.80cm,
+ left = 2.45cm,
+ right = 2.45cm,
+ headheight = 0.80cm,
+ headsep = 0.63cm,
+ footskip = 2.30cm,
+ }
+% \end{macrocode}
% 本科生,无页眉页脚
% \begin{macrocode}
\cleardoublepage
@@ -6680,7 +6768,7 @@
%
% 目录格式设置,研究生与本科生需设置不同参数
% \begin{macrocode}
-\tl_set:Nn \@@_toc_chapter_format_tl { \addvspace{1pt}\nwafu@hei \bfseries }
+\tl_set:Nn \@@_toc_chapter_format_tl { \addvspace{1pt}\nwafu@hei }
\tl_set:Nn \@@_toc_chapter_indent_tl {0pc}
\tl_set:Nn \@@_toc_chapter_rule_tl {\tocrule{$\cdot$}}
\tl_set:Nn \@@_toc_chapter_numsep_tl {0.5\ccwd}
@@ -6945,9 +7033,10 @@
\@@_chapter:V \c_@@_name_abstract_tl
}{
\par \mode_leave_vertical: \par
- \begin{center}\nwafu@hei\bfseries\zihao{3}\l_@@_info_title_tl\end{center}
+ \begin{center}\nwafu@hei\zihao{3}\l_@@_info_title_tl\end{center}
}
}
+\cs_set_eq:NN \my_uppercase:n \uppercase
\cs_new_protected:Npn \@@_abstract_en_begin:
{
\int_compare:nNnTF { \g_@@_thesis_type_int } < { 3 }
@@ -6955,7 +7044,10 @@
\@@_chapter:n \c_@@_name_abstract_en_tl
}{
\par \mode_leave_vertical: \par
- \begin{center}\bfseries\zihao{3}\l_@@_info_title_en_tl\end{center}
+ \begin{center}\bfseries\zihao{3}
+ % \exp_args:Nx \my_uppercase:n {\l_@@_info_title_en_tl}
+ \l_@@_info_title_en_tl
+ \end{center}
}
}
% \end{macrocode}
@@ -7157,7 +7249,14 @@
% \end{macrocode}
% 参考文献引用与著录样式。
% \begin{macrocode}
- \@@_pass_options_to_biblatex:n { style = gb7714-NWAFU }
+ \@@_pass_options_to_biblatex:n { style = gb7714-NWAFU,
+ sortlocale=zh__pinyin, gbtype=false,
+ maxbibnames=99, maxcitenames=2, mincitenames=1,
+ gbpub=false, uniquename=false, uniquelist=false,
+ gbnamefmt=lowercase,
+ doi=false, isbn=false,
+ gbfieldtype=true, gbpunctin=false,
+ }
% \end{macrocode}
% 其它参数。
% \begin{macrocode}
@@ -7214,6 +7313,8 @@
}
% \end{macrocode}
%
+% \changes{v1.11}{2022/04/02}{修订本科生enumerate编号两端括号为中文全角括号。}
+%
% \subsection{\env{enumerate}列表环境设置}
%
% \begin{macrocode}
@@ -7224,10 +7325,10 @@
{ bullet } { \textbullet },
{ endash } { \normalfont\bfseries\textendash },
{ asterisk } { \textasteriskcentered },
- { arabic } { (\arabic*) },
- { alph } { (\alph*) },
- { roman } { (\roman*) },
- { alph } { (\alph*) },
+ { arabic } { (\arabic*) },
+ { alph } { (\alph*) },
+ { roman } { (\roman*) },
+ { alph } { (\alph*) },
{ roman } { \roman*. },
{ outline } { \upshape\ding{111} }
}
@@ -7238,9 +7339,10 @@
\setlist
{
nosep,
- leftmargin = *,
+ leftmargin = *,
labelindent = \dimexpr\parindent+0pt\relax,
- wide=\parindent,
+ labelsep = 0pt,
+ wide = \parindent,
}
\setlist[itemize,1]{label = bullet}
\setlist[itemize,2]{label = endash}
diff --git a/macros/unicodetex/latex/nwafuthesis/nwafuthesis.pdf b/macros/unicodetex/latex/nwafuthesis/nwafuthesis.pdf
index 17858a0099..5fdeb65580 100644
--- a/macros/unicodetex/latex/nwafuthesis/nwafuthesis.pdf
+++ b/macros/unicodetex/latex/nwafuthesis/nwafuthesis.pdf
Binary files differ
diff --git a/macros/unicodetex/latex/simplivre/simplivre-doc-cn.pdf b/macros/unicodetex/latex/simplivre/simplivre-doc-cn.pdf
index 0ffa265fed..23c6001784 100644
--- a/macros/unicodetex/latex/simplivre/simplivre-doc-cn.pdf
+++ b/macros/unicodetex/latex/simplivre/simplivre-doc-cn.pdf
Binary files differ
diff --git a/macros/unicodetex/latex/simplivre/simplivre-doc-cn.tex b/macros/unicodetex/latex/simplivre/simplivre-doc-cn.tex
index c3fece3e59..4121fadf9e 100644
--- a/macros/unicodetex/latex/simplivre/simplivre-doc-cn.tex
+++ b/macros/unicodetex/latex/simplivre/simplivre-doc-cn.tex
@@ -38,7 +38,7 @@
\providecommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$}
\lstset{moretexcs=%
{linenumbers,nolinenumbers,part,parttext,chapter,section,subsection,subsubsection,frontmatter,mainmatter,backmatter,tableofcontents,href,
- color,NameTheorem,CreateTheorem,cref,dnf,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,TheDate,ProjLib,qedhere
+ color,NameTheorem,CreateTheorem,cref,DNF,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,TheDate,ProjLib,qedhere
}
}
\lstnewenvironment{code}%
@@ -95,7 +95,7 @@
%%================================
\begin{document}
-\def\PackageVersion{2022/03/28}
+\def\PackageVersion{2022/04/03}
\frontmatter
\LocallyStopLineNumbers
@@ -194,7 +194,7 @@
\section{(*\meta{section title}*)}
-\dnf<(*\meta{some hint}*)>
+\DNF<(*\meta{some hint}*)>
\begin{theorem}\label{thm:abc}
Ceci est un théorème.
@@ -236,7 +236,7 @@ Référence du théorème: \cref{thm:abc}
\medskip
\begin{code}
-\dnf<(*\meta{some hint}*)>
+\DNF<(*\meta{some hint}*)>
\end{code}
当你有一些地方尚未完成的时候,可以用这条指令标记出来,它在草稿阶段格外有用。
@@ -300,7 +300,7 @@ Référence du théorème: \cref{thm:abc}
\item 字体选项。顾名思义,会加载相应名称的字体。
\item \texttt{useosf} 选项用来启用“旧式”数字。
\end{itemize}
- \item \texttt{allowbf}
+ \item \texttt{use boldface}
\begin{itemize}
\item 允许加粗。启用这一选项时,题目、各级标题、定理类环境名称会被加粗。
\end{itemize}
@@ -417,9 +417,9 @@ Référence du théorème: \cref{thm:abc}
\LevelTwoTitle{未完成标记}
-你可以通过 \lstinline|\dnf| 来标记尚未完成的部分。例如:
+你可以通过 \lstinline|\DNF| 来标记尚未完成的部分。例如:
\begin{itemize}
- \item \lstinline|\dnf| 或 \lstinline|\dnf<...>|。效果为:\dnf~或 \dnf<...>。\\其提示文字与当前语言相对应,例如,在法语模式下将会显示为 \UseOtherLanguage{French}{\dnf}。
+ \item \lstinline|\DNF| 或 \lstinline|\DNF<...>|。效果为:\DNF~或 \DNF<...>。\\其提示文字与当前语言相对应,例如,在法语模式下将会显示为 \UseOtherLanguage{French}{\DNF}。
\end{itemize}
diff --git a/macros/unicodetex/latex/simplivre/simplivre-doc-en.pdf b/macros/unicodetex/latex/simplivre/simplivre-doc-en.pdf
index ff4ee07f77..0b2522cc78 100644
--- a/macros/unicodetex/latex/simplivre/simplivre-doc-en.pdf
+++ b/macros/unicodetex/latex/simplivre/simplivre-doc-en.pdf
Binary files differ
diff --git a/macros/unicodetex/latex/simplivre/simplivre-doc-en.tex b/macros/unicodetex/latex/simplivre/simplivre-doc-en.tex
index 997cdc3e54..e54d796b84 100644
--- a/macros/unicodetex/latex/simplivre/simplivre-doc-en.tex
+++ b/macros/unicodetex/latex/simplivre/simplivre-doc-en.tex
@@ -38,7 +38,7 @@
\providecommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$}
\lstset{moretexcs=%
{linenumbers,nolinenumbers,part,parttext,chapter,section,subsection,subsubsection,frontmatter,mainmatter,backmatter,tableofcontents,href,
- color,NameTheorem,CreateTheorem,cref,dnf,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,TheDate,ProjLib,qedhere
+ color,NameTheorem,CreateTheorem,cref,DNF,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,TheDate,ProjLib,qedhere
}
}
\lstnewenvironment{code}%
@@ -95,7 +95,7 @@
%%================================
\begin{document}
-\def\PackageVersion{2022/03/28}
+\def\PackageVersion{2022/04/03}
\LocallyStopLineNumbers
@@ -195,7 +195,7 @@ Let's first look at a complete document.
\section{(*\meta{section title}*)}
-\dnf<(*\meta{some hint}*)>
+\DNF<(*\meta{some hint}*)>
\begin{theorem}\label{thm:abc}
Ceci est un théorème.
@@ -238,7 +238,7 @@ For detailed description of this command and more related commands, please refer
\medskip
\begin{code}
-\dnf<(*\meta{some hint}*)>
+\DNF<(*\meta{some hint}*)>
\end{code}
When you have some places that have not yet been finished yet, you can mark them with this command, which is especially useful during the draft stage.
@@ -302,7 +302,7 @@ In addition, Source Code Pro is used as the English sans serif font, New Compute
\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.
\end{itemize}
- \item \texttt{allowbf}
+ \item \texttt{use boldface}
\begin{itemize}
\item Allow boldface. When this option is enabled, the main title, the titles of all levels and the names of theorem-like environments will be bolded.
\end{itemize}
@@ -415,9 +415,9 @@ By default, when referenced, the name of the theorem matches the current context
\LevelTwoTitle{Draft mark}
-You can use \lstinline|\dnf| to mark the unfinished part. For example:
+You can use \lstinline|\DNF| to mark the unfinished part. For example:
\begin{itemize}
- \item \lstinline|\dnf| or \lstinline|\dnf<...>|. The effect is: \dnf~ or \dnf<...>. \\The prompt text changes according to the current language. For example, it will be displayed as \UseOtherLanguage{French}{\dnf} in French mode.
+ \item \lstinline|\DNF| or \lstinline|\DNF<...>|. The effect is: \DNF~ or \DNF<...>. \\The prompt text changes according to the current language. For example, it will be displayed as \UseOtherLanguage{French}{\DNF} in French mode.
\end{itemize}
diff --git a/macros/unicodetex/latex/simplivre/simplivre-doc-fr.pdf b/macros/unicodetex/latex/simplivre/simplivre-doc-fr.pdf
index c0cb64b901..3e3fe8b650 100644
--- a/macros/unicodetex/latex/simplivre/simplivre-doc-fr.pdf
+++ b/macros/unicodetex/latex/simplivre/simplivre-doc-fr.pdf
Binary files differ
diff --git a/macros/unicodetex/latex/simplivre/simplivre-doc-fr.tex b/macros/unicodetex/latex/simplivre/simplivre-doc-fr.tex
index 94407ff1fa..f75a5e8179 100644
--- a/macros/unicodetex/latex/simplivre/simplivre-doc-fr.tex
+++ b/macros/unicodetex/latex/simplivre/simplivre-doc-fr.tex
@@ -38,7 +38,7 @@
\providecommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$}
\lstset{moretexcs=%
{linenumbers,nolinenumbers,part,parttext,chapter,section,subsection,subsubsection,frontmatter,mainmatter,backmatter,tableofcontents,href,
- color,NameTheorem,CreateTheorem,cref,dnf,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,TheDate,ProjLib,qedhere
+ color,NameTheorem,CreateTheorem,cref,DNF,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,TheDate,ProjLib,qedhere
}
}
\lstnewenvironment{code}%
@@ -95,7 +95,7 @@
%%================================
\begin{document}
-\def\PackageVersion{2022/03/28}
+\def\PackageVersion{2022/04/03}
\frontmatter
\LocallyStopLineNumbers
@@ -195,7 +195,7 @@ Regardons d'abord un document complet.
\section{(*\meta{section title}*)}
-\dnf<(*\meta{some hint}*)>
+\DNF<(*\meta{some hint}*)>
\begin{theorem}\label{thm:abc}
Ceci est un théorème.
@@ -237,7 +237,7 @@ Pour une description détaillée de cette commande et d'autres commandes associ
\medskip
\begin{code}
-\dnf<(*\meta{some hint}*)>
+\DNF<(*\meta{some hint}*)>
\end{code}
Lorsque vous avez des endroits qui ne sont pas encore finis, vous pouvez les marquer avec cette commande, ce qui est particulièrement utile lors de la phase de brouillon.
@@ -300,7 +300,7 @@ De plus, Source Code Pro est utilisé comme police anglaise sans empattement, Ne
\item Options de police. Comme son nom l'indique, la police avec le nom correspondant sera utilisée.
\item L'option \texttt{useosf} est pour activer les chiffres à l'ancienne.
\end{itemize}
- \item \texttt{allowbf}
+ \item \texttt{use boldface}
\begin{itemize}
\item Afficher les titres en gras. Lorsque cette option est utilisée, le titre principal, les titres de tous les niveaux et les noms des environnements de type théorème seront en gras.
\end{itemize}
@@ -411,9 +411,9 @@ Par défaut, lors du référencement, le nom du théorème correspond au context
\LevelTwoTitle{Draft mark}
-Vous pouvez utiliser \lstinline|\dnf| pour marquer la partie inachevée. Par example :
+Vous pouvez utiliser \lstinline|\DNF| pour marquer la partie inachevée. Par example :
\begin{itemize}
- \item \lstinline|\dnf| ou \lstinline|\dnf<...>|. L'effet est : \dnf~ ou \dnf<...>. \\Le texte à l'intérieur changera en fonction de la langue actuelle. Par exemple, il sera affiché sous la forme \UseOtherLanguage{English}{\dnf} en mode anglais.
+ \item \lstinline|\DNF| ou \lstinline|\DNF<...>|. L'effet est : \DNF~ ou \DNF<...>. \\Le texte à l'intérieur changera en fonction de la langue actuelle. Par exemple, il sera affiché sous la forme \UseOtherLanguage{English}{\DNF} en mode anglais.
\end{itemize}
diff --git a/macros/unicodetex/latex/simplivre/simplivre.cls b/macros/unicodetex/latex/simplivre/simplivre.cls
index 7056e45b17..7dd6f4b592 100644
--- a/macros/unicodetex/latex/simplivre/simplivre.cls
+++ b/macros/unicodetex/latex/simplivre/simplivre.cls
@@ -19,7 +19,7 @@
\RequirePackage{l3keys2e}
\ProvidesExplClass
{simplivre}
- {2022/03/28} {}
+ {2022/04/03} {}
{A simple and clear book style}
\tl_const:Nn \l__minimclass_base_class_tl { book }
@@ -201,6 +201,10 @@
\RequirePackage { minimalist }
+\raggedbottom
+\hfuzz=2pt
+\vfuzz=2pt
+
%%================================
%% Fonts
%%================================