texlive[59941] Master/texmf-dist: jxu (15jul21)
commits+karl at tug.org
commits+karl at tug.org
Thu Jul 15 22:01:19 CEST 2021
Revision: 59941
http://tug.org/svn/texlive?view=revision&revision=59941
Author: karl
Date: 2021-07-15 22:01:19 +0200 (Thu, 15 Jul 2021)
Log Message:
-----------
jxu (15jul21)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-cn.pdf
trunk/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-cn.tex
trunk/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-en.pdf
trunk/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-en.tex
trunk/Master/texmf-dist/doc/latex/colorist/colorist-doc.pdf
trunk/Master/texmf-dist/doc/latex/colorist/colorist-doc.tex
trunk/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-cn.pdf
trunk/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-cn.tex
trunk/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-en.pdf
trunk/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-en.tex
trunk/Master/texmf-dist/tex/latex/beaulivre/beaulivre.cls
trunk/Master/texmf-dist/tex/latex/colorist/colorart.cls
trunk/Master/texmf-dist/tex/latex/colorist/colorbook.cls
trunk/Master/texmf-dist/tex/latex/colorist/colorist.sty
trunk/Master/texmf-dist/tex/latex/lebhart/lebhart.cls
Added Paths:
-----------
trunk/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-fr.pdf
trunk/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-fr.tex
trunk/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-fr.pdf
trunk/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-fr.tex
Modified: trunk/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-cn.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-cn.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-cn.tex 2021-07-15 19:59:12 UTC (rev 59940)
+++ trunk/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-cn.tex 2021-07-15 20:01:19 UTC (rev 59941)
@@ -1,12 +1,11 @@
-%! TEX program = xelatex
-\documentclass[Chinese,English,French,allowbf,puretext]{beaulivre}
+\documentclass[English,Chinese,French,allowbf,puretext]{beaulivre}
\theoremstyle{basic}
\CreateTheorem{definition}<highest>
-\CreateTheorem{theorem}<highest>
-\CreateTheorem{conjecture}<highest>
+\CreateTheorem{theorem}[definition]
+\CreateTheorem{conjecture}[definition]
\CreateTheorem*{example*}
-\CreateTheorem{problem}<highest>
+\CreateTheorem{problem}[definition]
\theoremstyle{emphasis}
\CreateTheorem{remark}<highest>
@@ -14,16 +13,19 @@
\theoremstyle{simple}
%%================================
-%% 引入工具集
+%% Import toolkit
%%================================
\usepackage{ProjLib}
\usepackage{longtable} % breakable tables
\usepackage{hologo} % more TeX logo
+\usetikzlibrary{calc}
+\usepackage{blindtext}
+
\UseLanguage{Chinese}
%%================================
-%% 排版代码
+%% For typesetting code
%%================================
\usepackage{listings}
\definecolor{maintheme}{RGB}{70,130,180}
@@ -42,19 +44,27 @@
escapeinside={(*}{*)},
% numbers=left,
numberstyle=\scriptsize, stepnumber=1, numbersep=5pt,
- firstnumber=last,
-}
+ % firstnumber=last,
+}
\providecommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$}
\lstset{moretexcs=%
- {subsubsection,href,color,NameTheorem,CreateTheorem,proofideanameCN,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,PLdate,ProjLib
+ {part,parttext,chapter,section,subsection,subsubsection,frontmatter,mainmatter,backmatter,tableofcontents,href,
+ color,NameTheorem,CreateTheorem,proofideanameEN,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,PLdate,ProjLib,qedhere
}
}
-\lstnewenvironment{code}%
-{\setkeys{lst}{columns=fullflexible,keepspaces=true}}{}
+\lstnewenvironment{code}%
+{\setstretch{1.07}%
+\setkeys{lst}{columns=fullflexible,keepspaces=true}%
+}{}
+\lstnewenvironment{code*}%
+{\setstretch{1.07}%
+\setkeys{lst}{numbers=left,columns=fullflexible,keepspaces=true}%
+}{}
%%================================
%% tip
%%================================
+\usepackage[many]{tcolorbox}
\newenvironment{tip}[1][提示]{%
\begin{tcolorbox}[breakable,
enhanced,
@@ -69,34 +79,30 @@
after skip = 0.3cm,
top = 3mm,
bottom = 3mm,
- title={\sffamily #1}]%
+ title={\scshape\sffamily #1}]%
}{\end{tcolorbox}}
%%================================
-%% 名称
+%% Names
%%================================
-\providecommand{\colorist}{{\normalfont\textsf{colorist}}}
-\providecommand{\colorart}{{\normalfont\textsf{colorart}}}
-\providecommand{\colorbook}{{\normalfont\textsf{colorbook}}}
-\providecommand{\lebhart}{{\normalfont\textsf{lebhart}}}
-\providecommand{\beaulivre}{{\normalfont\textsf{beaulivre}}}
+\providecommand{\colorist}{\textsf{colorist}}
+\providecommand{\colorart}{\textsf{colorart}}
+\providecommand{\colorbook}{\textsf{colorbook}}
+\providecommand{\lebhart}{\textsf{lebhart}}
+\providecommand{\beaulivre}{\textsf{beaulivre}}
-\usetikzlibrary{calc}
+%%================================
+%% Titles
+%%================================
+\let\LevelOneTitle\chapter
+\let\LevelTwoTitle\section
+\let\LevelThreeTitle\subsection
-\usepackage{blindtext}
-
%%================================
-%% 正文
+%% Main text
%%================================
\begin{document}
-% \title{\beaulivre{}，以多彩的方式排版你的图书}
-% \author{许锦文}
-% \thanks{对应版本. \texttt{\beaulivre{} 2021/06/07}}
-% \date{2021年6月，北京}
-
-% \maketitle
-
\frontmatter
\begin{titlepage} % Suppresses displaying the page number on the title page and the subsequent page counts as page 1
@@ -104,9 +110,9 @@
\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/06/30}}};
+ \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/07/15}}};
\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年6月，北京}};
+ \node at ($(current page.south)+(1.5,2)$) {\fontsize{12pt}{0pt}\selectfont\textcolor{gray}{2021年7月，北京}};
\end{tikzpicture}%
\end{titlepage}%
\cleardoublepage%
@@ -116,16 +122,11 @@
\beaulivre{} 是 \colorist{} 文档类系列的成员之一，其名称取自于法文的beau (美丽)，以及livre (书)，由二者组合而成。整个 \colorist{} 系列包含用于排版文章的 \colorart{}、\lebhart{} 以及用于排版书的 \colorbook{}、\beaulivre{}。我设计这一系列的初衷是为了撰写草稿与笔记，使之多彩而不缭乱。
-\beaulivre{} 英语、法语、德语、意大利语、葡萄牙语、巴西葡萄牙语、西班牙语、简体中文、繁体中文、日文、俄文，并且同一篇文档中这些语言可以很好地协调。由于采用了自定义字体，需要用 \hologo{XeLaTeX} 或 \hologo{LuaLaTeX} 引擎进行编译。
+\beaulivre{} 支持英语、法语、德语、意大利语、葡萄牙语、巴西葡萄牙语、西班牙语、简体中文、繁体中文、日文、俄文，并且同一篇文档中这些语言可以很好地协调。由于采用了自定义字体，需要用 \hologo{XeLaTeX} 或 \hologo{LuaLaTeX} 引擎进行编译。
这篇说明文档即是用 \beaulivre{} 排版的 (使用了参数 \texttt{allowbf})，你可以把它看作一份简短的说明与演示。
\bigskip
-\begin{tcolorbox}[enhanced jigsaw,pad at break*=1mm,breakable,colback=yellow!25!paper,boxrule=0pt,frame hidden]
- 由于\colorist{}主体是从\textsf{minimalist}系列修改而来的，因而一些页面元素还未完全重新设计，特别是目录、part和chapter的样式。这些内容会在将来逐渐加入。
-\end{tcolorbox}
-
-\bigskip
\begin{tip}
多语言支持、定理类环境、未完成标记等功能是由 \ProjLib{} 工具箱提供的，这里只给出了将其与本文档类搭配使用的要点。如需获取更详细的信息，可以参阅 \ProjLib{} 的说明文档。
\end{tip}
@@ -134,10 +135,22 @@
\mainmatter
-\chapter{初始化}
+\part{说明}
+\parttext{可以通过 \lstinline|\\parttext|\meta{text} 在这里添加一些说明}
-\section{如何载入}
+\medskip
+\LevelOneTitle*{开始之前}
+为了使用这篇文档中提到的文档类，你需要：
+\begin{itemize}
+ \item 安装一个尽可能新版本的 TeX Live 或 MikTeX 套装，并确保 \texttt{colorist} 和 \texttt{projlib} 被正确安装在你的 \TeX 封装中。
+ \item 熟悉 \LaTeX{} 的基本使用方式，并且知道如何用 \hologo{pdfLaTeX}、\hologo{XeLaTeX} 或 \hologo{LuaLaTeX} 编译你的文档。
+\end{itemize}
+
+\LevelOneTitle{使用示例}
+
+\LevelTwoTitle{如何加载}
+
只需要在第一行写：
\begin{code}
@@ -150,8 +163,111 @@
要使用 \hologo{XeLaTeX} 或 \hologo{LuaLaTeX} 引擎才能编译。
\end{tip}
-\section{选项}
+\LevelTwoTitle{一篇完整的文档示例}
+首先来看一段完整的示例。
+
+
+\begin{code*}
+\documentclass{colorbook}
+\usepackage{ProjLib}
+
+\UseLanguage{French}
+
+\begin{document}
+
+\frontmatter
+
+\begin{titlepage}
+ (*\meta{code for titlepage}*)
+\end{titlepage}
+
+\tableofcontents
+
+\mainmatter
+
+\part{(*\meta{part title}*)}
+\parttext{(*\meta{text after part title}*)}
+
+\chapter{(*\meta{chapter title}*)}
+
+\section{(*\meta{section title}*)}
+
+\dnf<Plus de contenu est nécessaire.>
+
+\begin{theorem}\label{thm:abc}
+ Ceci est un théorème.
+\end{theorem}
+Référence du théorème: \cref{thm:abc}
+
+\backmatter
+
+...
+
+\end{document}
+\end{code*}
+
+如果你觉得这个例子有些复杂，不要担心。现在我们来一点点地观察这个例子。
+
+\LevelThreeTitle{初始化部分}
+
+\medskip
+\begin{code}
+\documentclass{beaulivre}
+\usepackage{ProjLib}
+\end{code}
+
+初始化部分很简单：第一行加载文档类 \beaulivre{}，第二行加载 \ProjLib{} 工具箱，以便使用一些附加功能。
+
+\LevelThreeTitle{设定语言}
+
+\medskip
+\begin{code}
+\UseLanguage{French}
+\end{code}
+
+这一行表明文档中将使用法语（如果你的文章中只出现英语，那么可以不需要设定语言）。你也可以在文章中间用同样的方式再次切换语言。支持的语言包括简体中文、繁体中文、日文、英语、法语、德语、西班牙语、葡萄牙语、巴西葡萄牙语、俄语。
+
+对于这一命令的详细说明以及更多相关命令，可以参考后面关于多语言支持的小节。
+
+
+\LevelThreeTitle{未完成标记}
+
+\medskip
+\begin{code}
+\dnf<(*\meta{some hint}*)>
+\end{code}
+当你有一些地方尚未完成的时候，可以用这条指令标记出来，它在草稿阶段格外有用。
+
+\LevelThreeTitle{定理类环境}
+
+\medskip
+\begin{code}
+\begin{theorem}\label{thm:abc}
+ Ceci est un théorème.
+\end{theorem}
+Référence du théorème: \cref{thm:abc}
+\end{code}
+
+常见的定理类环境可以直接使用。在引用的时候，建议采用智能引用 \lstinline|\cref{|\meta{label}\lstinline|}|——这样就不必每次都写上相应环境的名称了。
+
+
+
+
+\LevelOneTitle{关于默认字体}
+\lebhart{} 默认使用 Palatino Linotype 作为英文字体，方正悠宋、悠黑GBK作为中文字体，并部分使用了 Neo Euler 作为数学字体。其中，Neo Euler可以在 \url{https://github.com/khaledhosny/euler-otf} 下载。其他字体不是免费字体，需要自行购买使用。可以在方正字库网站查询详细资料：\url{https://www.foundertype.com}。
+
+\begin{itemize}
+ \item English main font. \textsf{English sans serif font}.
+ \item 中文主要字体，\textsf{中文无衬线字体}
+ \item 数学示例： \( \alpha, \beta, \gamma, \delta, 1,2,3,4, a,b,c,d \), \[\mathrm{li}(x)\coloneqq \int_2^{\infty} \frac{1}{\log t}\,\mathrm{d}t \]
+\end{itemize}
+
+在没有安装相应的字体时，将采用TeX Live中自带的字体来代替，效果可能会有所折扣。
+
+
+\LevelOneTitle{选项}
+
\beaulivre{} 文档类有下面几个选项：
\begin{itemize}
@@ -158,6 +274,7 @@
\item 语言选项 \texttt{EN} / \texttt{english} / \texttt{English}、\texttt{FR} / \texttt{french} / \texttt{French}，等等
\begin{itemize}
\item 具体选项名称可参见下一节的 \meta{language name}。第一个指定的语言将作为默认语言。
+ \item 语言选项不是必需的，其主要用途是提高编译速度。不添加语言选项时效果是一样的，只是会更慢一些。
\end{itemize}
\item \texttt{draft} 或 \texttt{fast}
\begin{itemize}
@@ -168,9 +285,9 @@
\item 启用 \ProjLib{} 工具箱的快速模式。
\end{itemize}
\end{itemize}
-\begin{tip}
- 在文章的撰写阶段，建议使用 \verb|fast| 选项以加快编译速度，改善写作时的流畅度。使用 \verb|fast| 模式时会有“DRAFT”字样的水印，以提示目前处于草稿阶段。
-\end{tip}
+ \begin{tip}
+ 在文章的撰写阶段，建议使用 \verb|fast| 选项以加快编译速度，改善写作时的流畅度。使用 \verb|fast| 模式时会有“DRAFT”字样的水印，以提示目前处于草稿阶段。
+ \end{tip}
\item \texttt{a4paper} 或 \texttt{b5paper}
\begin{itemize}
\item 可选的纸张大小。默认的纸张大小为 8.5in $\times$ 11in。
@@ -180,7 +297,6 @@
\item 字体选项。顾名思义，会加载相应名称的字体。
\item \texttt{useosf} 选项用来启用“旧式”数字。
\end{itemize}
- \clearpage
\item \texttt{allowbf}
\begin{itemize}
\item 允许加粗。启用这一选项时，题目、各级标题、定理类环境名称会被加粗。
@@ -189,7 +305,7 @@
\begin{itemize}
\item \lstinline|\subsubsection| 采用 ``runin'' 风格。
\end{itemize}
- \item \texttt{puretext} or \texttt{nothms}
+ \item \texttt{puretext} 或 \texttt{nothms}
\begin{itemize}
\item 纯文本模式，不加载定理类环境。
\end{itemize}
@@ -198,31 +314,13 @@
\item 定理类环境不编号。
\end{itemize}
\end{itemize}
-
\bigskip
另外，排版图书时常用的 \texttt{oneside}、\texttt{twoside} 选项也是可以使用的。默认采用双页排版。
-\chapter{关于默认字体}
-\beaulivre{} 默认使用 Palatino Linotype 作为英文字体，方正悠宋、悠黑GBK作为中文字体，并部分使用了 Neo Euler 作为数学字体。其中，Neo Euler可以在 \url{https://github.com/khaledhosny/euler-otf} 下载。其他字体不是免费字体，需要自行购买使用。可以在方正字库网站查询详细资料：\url{https://www.foundertype.com}。
+\LevelOneTitle{具体说明}
-\begin{tip}[字体演示]
- \begin{itemize}
- \item English main font. \textsf{English sans serif font}. \texttt{English typewriter font}.
- \item 中文主要字体，\textsf{中文无衬线字体}
- \item 数学示例： \( \alpha, \beta, \gamma, \delta, 1,2,3,4, a,b,c,d \), \[\mathrm{li}(x)\coloneqq \int_2^{\infty} \frac{1}{\log t}\,\mathrm{d}t \]
- \end{itemize}
-\end{tip}
+\LevelTwoTitle{语言设置}
-\bigskip
-在没有安装相应的字体时，将采用TeX Live中自带的字体来代替，效果可能会有所折扣。
-
-
-\chapter{使用说明}
-
-接下来介绍的许多功能是由 \ProjLib{} 工具箱提供的。这里只介绍了基本使用方法，更多细节可以直接参阅其用户文档。
-
-\section{语言设置}
-
\beaulivre{} 提供了多语言支持，包括英语、法语、德语、意大利语、葡萄牙语、巴西葡萄牙语、西班牙语、简体中文、繁体中文、日文、俄文。可以通过下列命令来选定语言：
\begin{itemize}
\item \lstinline|\UseLanguage{|\meta{language name}\lstinline|}|，用于指定语言，在其后将使用对应的语言设定。
@@ -236,7 +334,7 @@
\end{itemize}
\meta{language name} 有下列选择 (不区分大小写，如 \texttt{French} 或 \texttt{french} 均可)：
-\begin{itemize}\setstretch{1.15}
+\begin{itemize}
\item 简体中文：\texttt{CN}、\texttt{Chinese}、\texttt{SChinese} 或 \texttt{SimplifiedChinese}
\item 繁体中文：\texttt{TC}、\texttt{TChinese} 或 \texttt{TraditionalChinese}
\item 英文：\texttt{EN} 或 \texttt{English}
@@ -263,9 +361,8 @@
\end{itemize}
例如，\lstinline|\AddLanguageSetting(German){\color{orange}}| 可以让所有德语以橙色显示（当然，还需要再加上 \lstinline|\AddLanguageSetting{\color{black}}| 来修正其他语言的颜色）。
+\LevelTwoTitle{定理类环境及其引用}
-\section{定理类环境及其引用}
-
定义、定理等环境已经被预定义，可以直接使用。
具体来说，预设的定理类环境包括：
@@ -273,6 +370,7 @@
在引用定理类环境时，建议使用智能引用 \lstinline|\cref{|\meta{label}\lstinline|}|。这样就不必每次都写上相应环境的名称了。
+\medskip
\begin{tip}[例子]
\begin{code}
\begin{definition}[奇异物品] \label{def: strange} ...
@@ -279,11 +377,12 @@
\end{code}
将会生成
\begin{definition}[奇异物品]\label{def: strange}
- 这是奇异物品的定义。
+ 这是奇异物品的定义。定理类环境的前后有一行左右的间距。在定义结束的时候会有一个符号来标记。
\end{definition}
\lstinline|\cref{def: strange}| 会显示为：\cref{def: strange}。
+\medskip
使用 \lstinline|\UseLanguage{English}| 后，定理会显示为：
\UseLanguage{English}
@@ -294,7 +393,9 @@
默认情况下，引用时，定理的名称总是与定理所在区域的语言匹配，例如，上面的定义在现在的英文模式下依然显示为中文：\cref{def: strange} 和 \cref{thm}。如果在引用时想让定理的名称与当前语境相匹配，可以在全局选项中加入 \texttt{regionalref}。
\end{tip}
-\medskip
+\UseLanguage{Chinese}
+
+\bigskip
下面是定理类环境的几种主要样式：
\begin{theorem}
Theorem style: theorem, proposition, lemma, corollary, ...
@@ -304,8 +405,6 @@
Proof style
\end{proof}
-\vspace{-\baselineskip}
-
\begin{remark}
Remark style
\end{remark}
@@ -323,6 +422,7 @@
\end{problem}
\medskip
+\clearpage
为了美观，相邻的定义环境会自动连在一起：
\begin{definition}
First definition.
@@ -332,20 +432,14 @@
Second definition.
\end{definition}
-\UseLanguage{Chinese}
+\LevelTwoTitle{定义新的定理型环境}
-
-\section{定义新的定理型环境}
-
若需要定义新的定理类环境，首先要定义这个环境在所用语言下的名称：
-% \vspace{-.15\baselineskip}%
\begin{itemize}
\item \lstinline|\NameTheorem[|\meta{language name}\lstinline|]{|\meta{name of environment}\lstinline|}{|\meta{name string}\lstinline|}|
\end{itemize}
-% \vspace{-.15\baselineskip}%
其中，\meta{language name} 可参阅关于语言设置的小节。当不指定 \meta{language name}时，则会将该名称设置为所有支持语言下的名称。另外，带星号与不带星号的同名环境共用一个名称，因此 \lstinline|\NameTheorem{envname*}{...}| 与 \lstinline|\NameTheorem{envname}{...}| 效果相同。
-\medskip
然后用下面五种方式之一定义这一环境：
\begin{itemize}
\item \lstinline|\CreateTheorem*{|\meta{name of environment}\lstinline|}|
@@ -380,7 +474,6 @@
其内部使用了 \textsf{amsthm}，因此传统的 \texttt{theoremstyle} 对其也是适用的，只需在相关定义前标明即可。
\end{tip}
-% \def\proofideanameCN{思路}
\NameTheorem[CN]{proofidea}{思路}
\CreateTheorem*{proofidea*}
\CreateTheorem{proofidea}<section>
@@ -393,18 +486,18 @@
\CreateTheorem*{proofidea*}
\CreateTheorem{proofidea}<section>
\end{code}
-
可以分别定义不编号的环境 \lstinline|proofidea*| 和编号的环境 \lstinline|proofidea| (在 section 内编号)，它们支持在简体中文语境中使用，效果如下所示:
+\vspace{-.3\baselineskip}
\begin{proofidea*}
\lstinline|proofidea*| 环境。
\end{proofidea*}
-
+\vspace{-.5\baselineskip}
\begin{proofidea}
\lstinline|proofidea| 环境。
\end{proofidea}
-\section{未完成标记}
+\LevelTwoTitle{未完成标记}
你可以通过 \lstinline|\dnf| 来标记尚未完成的部分。例如：
\begin{itemize}
@@ -417,164 +510,19 @@
\end{itemize}
-% \section{关于文章标题、摘要与关键词}
+\LevelOneTitle{目前存在的问题}
-% % 由于引入了 \ProjLib{} 工具箱的 \textsf{PJLamssim} 组件，
-% \beaulivre{} 同时具有标准文档类与\AmS{} 文档类的一些特性。
-
-% 因此，文章的标题部分既可以按照标准文档类 \textsf{article} 的写法来写：
-
-% \begin{code}
-% \title{(*\meta{title}*)}
-% \author{(*\meta{author}*)}
-% \date{(*\meta{date}*)}
-% \maketitle
-% \begin{abstract}
-% (*\meta{abstract}*)
-% \end{abstract}
-% \begin{keyword}
-% (*\meta{keywords}*)
-% \end{keyword}
-% \end{code}
-
-% 也可以按照 \AmS{} 文档类的方式来写：
-
-% \begin{code}
-% \title{(*\meta{title}*)}
-% \author{(*\meta{author}*)}
-% \address{(*\meta{address}*)}
-% \email{(*\meta{email}*)}
-% \date{(*\meta{date}*)}
-% \keywords{(*\meta{keywords}*)}
-% \subjclass{(*\meta{subjclass}*)}
-% \begin{abstract}
-% (*\meta{abstract}*)
-% \end{abstract}
-% \maketitle
-% \end{code}
-
-% 作者信息可以包含多组，输入方式为：
-
-% \begin{code}
-% \author{(*\meta{author 1}*)}
-% \address{(*\meta{address 1}*)}
-% \email{(*\meta{email 1}*)}
-% \author{(*\meta{author 2}*)}
-% \address{(*\meta{address 2}*)}
-% \email{(*\meta{email 2}*)}
-% ...
-% \end{code}
-
-% 其中 \lstinline|\address|、\lstinline|\curraddr|、\lstinline|\email| 的相互顺序是不重要的。
-
-
-\section{目前存在的问题}
-
\begin{itemize}[itemsep=.6em]
- \item 目录、part、chapter 的设计依然有待改良。
\item 对于字体的设置仍然不够完善。
- \item 由于很多核心功能建立在 \ProjLib{} 工具箱的基础上，因此 \beaulivre{} 自然继承了其所有问题。详情可以参阅 \ProjLib{} 用户文档的“目前存在的问题”这一小节。
+ \item 由于很多核心功能建立在 \ProjLib{} 工具箱的基础上，因此 \lebhart{} 自然继承了其所有问题。详情可以参阅 \ProjLib{} 用户文档的“目前存在的问题”这一小节。
\item 错误处理功能不完善，在出现一些问题时没有相应的错误提示。
\item 代码中仍有许多可优化之处。
\end{itemize}
-
-\UseLanguage{English}
-
-
-\chapter{文档示例}
-
-\vspace*{-1.5\baselineskip}
-
-\section{标准文档类写法}
-
-如果想采用标准文档类中的写法，可以参考下面的例子：
-
-\begin{code}
-\documentclass{beaulivre}
-\usepackage{ProjLib} % Load ProjLib toolkit
-
-\UseLanguage{French} % Use French from here
-
-\begin{document}
-
-\title{Le Titre}
-\author{Auteur}
-\date{\PLdate{2022-04-01}}
-
-\maketitle
-
-\chapter{Un théorème}
-
-%% Theorem-like environments can be used directly
-\begin{theorem}\label{thm:abc}
- Ceci est un théorème.
-\end{theorem}
-
-Référence du théorème: \cref{thm:abc}
- % It is recommended to use clever reference
-
-\end{document}
-\end{code}
-
-如果以后想切换到标准文档类，只需要将前两行换为：
-
-\begin{code}
-\documentclass{book}
-\usepackage[a4paper,margin=1in]{geometry}
-\usepackage[hidelinks]{hyperref}
-\usepackage[palatino]{ProjLib} % Load ProjLib toolkit
-\end{code}
-
-
-\clearpage
-\section{\texorpdfstring{\AmS{}}{AMS} 文档类写法}
-
-如果日后有意切换到期刊模版，想采用 \AmS{} 文档类中的写法，可以参考下面的例子：
-
-\begin{code}
-\documentclass{beaulivre}
-\usepackage{ProjLib} % Load ProjLib toolkit
-
-\UseLanguage{French} % Use French from here
-
-\begin{document}
-
-\title{Le Titre}
-\author{Auteur 1}
-\address{Adresse 1}
-\email{\href{Courriel 1}{Courriel 1}}
-\author{Auteur 1}
-\address{Adresse 1}
-\email{\href{Courriel 2}{Courriel 2}}
-\date{\PLdate{2022-04-01}}
-\subjclass{*****}
-\keywords{...}
-
-\maketitle
-
-\section{Première section}
-
-%% Theorem-like environments can be used directly
-\begin{theorem}\label{thm:abc}
- Ceci est un théorème.
-\end{theorem}
-
-Référence du théorème: \cref{thm:abc}
- % It is recommended to use clever reference
-
-\end{document}
-\end{code}
-
-这样，若想切换到 \AmS{} 文档类，只需要将前两行换为：
-
-\begin{code}
-\documentclass{amsbook}
-\usepackage[a4paper,margin=1in]{geometry}
-\usepackage[hidelinks]{hyperref}
-\usepackage[palatino]{ProjLib} % Load ProjLib toolkit
-\end{code}
-
+\part{演示}
\blinddocument
\end{document}
+\endinput
+%%
+%% End of file `beaulivre/beaulivre-doc-cn.tex'.
Modified: trunk/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-en.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-en.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-en.tex 2021-07-15 19:59:12 UTC (rev 59940)
+++ trunk/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-en.tex 2021-07-15 20:01:19 UTC (rev 59941)
@@ -1,12 +1,11 @@
-%! TEX program = xelatex
-\documentclass[English,French,allowbf,puretext]{beaulivre}
+\documentclass[English,Chinese,French,allowbf,puretext]{beaulivre}
\theoremstyle{basic}
\CreateTheorem{definition}<highest>
-\CreateTheorem{theorem}<highest>
-\CreateTheorem{conjecture}<highest>
+\CreateTheorem{theorem}[definition]
+\CreateTheorem{conjecture}[definition]
\CreateTheorem*{example*}
-\CreateTheorem{problem}<highest>
+\CreateTheorem{problem}[definition]
\theoremstyle{emphasis}
\CreateTheorem{remark}<highest>
@@ -19,9 +18,14 @@
\usepackage{ProjLib}
\usepackage{longtable} % breakable tables
\usepackage{hologo} % more TeX logo
+\usetikzlibrary{calc}
+\usepackage{blindtext}
+
+\UseLanguage{English}
+
%%================================
-%% For typestting code
+%% For typesetting code
%%================================
\usepackage{listings}
\definecolor{maintheme}{RGB}{70,130,180}
@@ -40,19 +44,27 @@
escapeinside={(*}{*)},
% numbers=left,
numberstyle=\scriptsize, stepnumber=1, numbersep=5pt,
- firstnumber=last,
-}
+ % firstnumber=last,
+}
\providecommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$}
\lstset{moretexcs=%
- {subsubsection,href,color,NameTheorem,CreateTheorem,proofideanameEN,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,PLdate,ProjLib
+ {part,parttext,chapter,section,subsection,subsubsection,frontmatter,mainmatter,backmatter,tableofcontents,href,
+ color,NameTheorem,CreateTheorem,proofideanameEN,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,PLdate,ProjLib,qedhere
}
}
-\lstnewenvironment{code}%
-{\setkeys{lst}{columns=fullflexible,keepspaces=true}}{}
+\lstnewenvironment{code}%
+{\setstretch{1.07}%
+\setkeys{lst}{columns=fullflexible,keepspaces=true}%
+}{}
+\lstnewenvironment{code*}%
+{\setstretch{1.07}%
+\setkeys{lst}{numbers=left,columns=fullflexible,keepspaces=true}%
+}{}
%%================================
%% tip
%%================================
+\usepackage[many]{tcolorbox}
\newenvironment{tip}[1][Tip]{%
\begin{tcolorbox}[breakable,
enhanced,
@@ -73,28 +85,25 @@
%%================================
%% Names
%%================================
-\providecommand{\colorist}{{\normalfont\textsf{colorist}}}
-\providecommand{\colorart}{{\normalfont\textsf{colorart}}}
-\providecommand{\colorbook}{{\normalfont\textsf{colorbook}}}
-\providecommand{\lebhart}{{\normalfont\textsf{lebhart}}}
-\providecommand{\beaulivre}{{\normalfont\textsf{beaulivre}}}
+\providecommand{\colorist}{\textsf{colorist}}
+\providecommand{\colorart}{\textsf{colorart}}
+\providecommand{\colorbook}{\textsf{colorbook}}
+\providecommand{\lebhart}{\textsf{lebhart}}
+\providecommand{\beaulivre}{\textsf{beaulivre}}
-\usetikzlibrary{calc}
+%%================================
+%% Titles
+%%================================
+\let\LevelOneTitle\chapter
+\let\LevelTwoTitle\section
+\let\LevelThreeTitle\subsection
-\usepackage{blindtext}
-
%%================================
%% Main text
%%================================
\begin{document}
-% \title{\beaulivre{}, write your books in a colorful way}
-% \author{Jinwen XU}
-% \thanks{Corresponding to: \texttt{\beaulivre{} 2021/06/07}}
-% \date{June 2021, Beijing}
-% \maketitle
-
\frontmatter
\begin{titlepage} % Suppresses displaying the page number on the title page and the subsequent page counts as page 1
@@ -102,28 +111,23 @@
\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/06/30}}};
+ \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/07/15}}};
\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}{June 2021, Beijing}};
+ \node at ($(current page.south)+(1.5,2)$) {\fontsize{12pt}{0pt}\selectfont\textcolor{gray}{July 2021, Beijing}};
\end{tikzpicture}%
\end{titlepage}%
\cleardoublepage%
-\frontmatter
+
\chapter*{Preface}
\beaulivre{} is a member of the \colorist{} class series. Its name is taken from French words ``beau'' (for ``beautiful'') and ``livre'' (for ``book''). The entire collection includes \colorart{} and \lebhart{} for typesetting articles and \colorbook{} and \beaulivre{} for typesetting books. My original intention in designing this series was to write drafts and notes that look colorful yet not dazzling.
-\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, \beaulivre{} requires \hologo{XeLaTeX} or \hologo{LuaLaTeX} to compile.
+\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.
\bigskip
-\begin{tcolorbox}[enhanced jigsaw,pad at break*=1mm,breakable,colback=yellow!25!paper,boxrule=0pt,frame hidden]
- Since the main body of \colorist{} is modified from the \textsf{minimalist} series, some elements have not been completely redesigned yet, especially the TOC, part and chapter style. These will be added gradually in the future versions.
-\end{tcolorbox}
-
-\bigskip
\begin{tip}
Multi-language support, theorem-like environments, draft marks and some other features are provided by the \ProjLib{} toolkit. Here we only briefly discuss how to use it with this document class. For more detailed information, you can refer to the documentation of \ProjLib{}.
\end{tip}
@@ -132,11 +136,25 @@
\mainmatter
-\chapter{Initialization}
+\part{Instruction}
+\parttext{You can add some introductory text here via \lstinline|\\parttext|\meta{text}.}
-\section{How to load it}
+\medskip
+\LevelOneTitle*{Before you start}
+\addcontentsline{toc}{chapter}{Before you start}
+In order to use the package or classes described here, you need to:
+\begin{itemize}
+ \item install TeX Live or MikTeX of the latest possible version, and make sure that \texttt{colorist} and \texttt{projlib} are correctly installed in your \TeX{} system.
+ \item be familiar with the basic usage of \LaTeX{}, and knows how to compile your document with \hologo{pdfLaTeX}, \hologo{XeLaTeX} or \hologo{LuaLaTeX}.
+\end{itemize}
+
+\LevelOneTitle{Usage and examples}
+
+\LevelTwoTitle{How to load it}
+
One only needs to put
+
\begin{code}
\documentclass{beaulivre}
\end{code}
@@ -146,40 +164,144 @@
You need to use either \hologo{XeLaTeX} or \hologo{LuaLaTeX} engine to compile.
\end{tip}
-\section{Options}
+\LevelTwoTitle{Example - A complete document}
-\beaulivre{} offers the following options:
+Let's first look at a complete document.
+
+\begin{code*}
+\documentclass{colorbook}
+\usepackage{ProjLib}
+
+\UseLanguage{French}
+
+\begin{document}
+
+\frontmatter
+
+\begin{titlepage}
+ (*\meta{code for titlepage}*)
+\end{titlepage}
+
+\tableofcontents
+
+\mainmatter
+
+\part{(*\meta{part title}*)}
+\parttext{(*\meta{text after part title}*)}
+
+\chapter{(*\meta{chapter title}*)}
+
+\section{(*\meta{section title}*)}
+
+\dnf<Plus de contenu est nécessaire.>
+
+\begin{theorem}\label{thm:abc}
+ Ceci est un théorème.
+\end{theorem}
+Référence du théorème: \cref{thm:abc}
+
+\backmatter
+
+...
+
+\end{document}
+\end{code*}
+
+If you find this example a little complicated, don't worry. Let's now look at this example piece by piece.
+
+\LevelThreeTitle{Initialization}
+
+\medskip
+\begin{code}
+\documentclass{beaulivre}
+\usepackage{ProjLib}
+\end{code}
+
+Initialization is straightforward. The first line loads the document class \beaulivre{}, and the second line loads the \ProjLib{} toolkit to obtain some additional functionalities.
+
+\LevelThreeTitle{Set the language}
+
+\medskip
+\begin{code}
+\UseLanguage{French}
+\end{code}
+
+This line indicates that French will be used in the document (by the way, if only English appears in your article, then there is no need to set the language). You can also switch the language in the same way later in the middle of the text. Supported languages include Simplified Chinese, Traditional Chinese, Japanese, English, French, German, Spanish, Portuguese, Brazilian Portuguese and Russian%
+.%
+
+For detailed description of this command and more related commands, please refer to the section on the multi-language support.
+
+
+\LevelThreeTitle{Draft marks}
+
+\medskip
+\begin{code}
+\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.
+
+\LevelThreeTitle{Theorem-like environments}
+
+\medskip
+\begin{code}
+\begin{theorem}\label{thm:abc}
+ Ceci est un théorème.
+\end{theorem}
+Référence du théorème: \cref{thm:abc}
+\end{code}
+
+Commonly used theorem-like environments have been pre-defined. Also, when referencing a theorem-like environment, it is recommended to use \lstinline|\cref{|\meta{label}\texttt{\}} --- in this way, there is no need to explicitly write down the name of the corresponding environment every time.
+
+
+
+
+\LevelOneTitle{On the default fonts}
+By default, \lebhart{} uses Palatino Linotype as the English font, FounderType's YouSong and YouHei GBK as the Chinese fonts\footnote{For detail, pleaser visit FounderType's website: \url{https://www.foundertype.com}.}, and partially uses Neo Euler as the math font. Among them, Neo Euler can be downloaded at \url{https://github.com/khaledhosny/euler-otf}. The other fonts are not free, you need to purchase and install them on your own.
+
\begin{itemize}
+ \item English main font. \textsf{English sans serif font}.
+ \item 中文主要字体, \textsf{中文无衬线字体}
+ \item Math demonstration: \( \alpha, \beta, \gamma, \delta, 1,2,3,4, a,b,c,d \), \[\mathrm{li}(x)\coloneqq \int_2^{\infty} \frac{1}{\log t}\,\mathrm{d}t \]
+\end{itemize}
+
+When the corresponding font is not installed, fonts that comes with TeX Live will be used instead. In this case, the experience might be reduced.
+
+\LevelOneTitle{The options}
+
+\beaulivre{} offers the following options:
+
+\begin{itemize}
\item The language options \texttt{EN} / \texttt{english} / \texttt{English}, \texttt{FR} / \texttt{french} / \texttt{French}, etc.
\begin{itemize}
\item For the option names of a specific language, please refer to \meta{language name} in the next section. The first specified language will be used as the default language.
+ \item The language options are optional, mainly for increasing the compilation speed. Without them the result would be the same, only slower.
\end{itemize}
\item \texttt{draft} or \texttt{fast}
\begin{itemize}
\item The option \verb|fast| enables a faster but slightly rougher style, main differences are:
\begin{itemize}
- \item Use simpler math font configuration;
- \item Do not use \textsf{hyperref};
+ \item Use simpler math font configuration;
+ \item Do not use \textsf{hyperref};
\item Enable the fast mode of \ProjLib{} toolkit.
\end{itemize}
\end{itemize}
-\begin{tip}
- During the draft stage, it is recommended to use the \verb|fast| option to speed up compilation. When in \verb|fast| mode, there will be a watermark ``DRAFT'' to indicate that you are currently in the draft mode.
-\end{tip}
-\medskip
+ \begin{tip}
+ During the draft stage, it is recommended to use the \verb|fast| option to speed up compilation. When in \verb|fast| mode, there will be a watermark ``DRAFT'' to indicate that you are currently in the draft mode.
+ \end{tip}
\item \texttt{a4paper} or \texttt{b5paper}
\begin{itemize}
- \item Optional paper size. The default paper size is 8.5in $\times$ 11in.
+ \item Paper size options. The default paper size is 8.5in $\times$ 11in.
\end{itemize}
\item \texttt{palatino}, \texttt{times}, \texttt{garamond}, \texttt{biolinum} ~$|$~ \texttt{useosf}
\begin{itemize}
- \item Font options. As the name suggest, font with corresponding name will be loaded.
+ \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}
\begin{itemize}
- \item Allow boldface. When this option is enabled, the title, titles of all levels and names of theorem-like environments will be bolded.
+ \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}
\item \texttt{runin}
\begin{itemize}
@@ -198,29 +320,10 @@
\bigskip
In addition, the commonly used \texttt{oneside} and \texttt{twoside} options are also available. Two-page layout is used by default.
-\chapter{On the default fonts}
-By default, \beaulivre{} uses Palatino Linotype as the English font, FounderType's YouSong and YouHei GBK as the Chinese fonts, and partially uses Neo Euler as the math font. Among them, Neo Euler can be downloaded at \url{https://github.com/khaledhosny/euler-otf}. The other fonts are not free, you need to purchase and install them on your own. (For the Chinese fonts, visit FounderType's website for detail: \url{https://www.foundertype.com} ).
+\LevelOneTitle{Instructions by topic}
-\medskip
-\begin{tip}[Font demonstration]
- \begin{itemize}
- \item English main font. \textsf{English sans serif font}. \texttt{English typewriter font}.
- \item 中文主要字体，\textsf{中文无衬线字体}
- \item 数学示例: \( \alpha, \beta, \gamma, \delta, 1,2,3,4, a,b,c,d \), \[\mathrm{li}(x)\coloneqq \int_2^{\infty} \frac{1}{\log t}\,\mathrm{d}t \]
- \end{itemize}
-\end{tip}
+\LevelTwoTitle{Language configuration}
-\bigskip
-When the corresponding font is not installed, fonts that comes with TeX Live will be used instead. In this case, the experience might be reduced.
-
-
-\chapter{Some instructions}
-
-% \vspace{-\baselineskip}
-Many of the features described next are provided by the \ProjLib{} toolkit. Only the basic usage is mentioned here. For more details, please refer to its user documentation.
-
-\section{Language configuration}
-
\beaulivre{} has multi-language support, including Chinese (simplified and traditional), English, French, German, Italian, Japanese, Portuguese (European and Brazilian), Russian and Spanish. The language can be selected by the following macros:
\begin{itemize}
@@ -257,15 +360,13 @@
\end{itemize}
For example, \lstinline|\AddLanguageSetting(German){\color{orange}}| can make all German text displayed in orange (of course, one then need to add \lstinline|\AddLanguageSetting{\color{black}}| in order to correct the color of the text in other languages).
+\LevelTwoTitle{Theorems and how to reference them}
-\section{Theorems and how to reference them}
+Environments such as \texttt{definition} and \texttt{theorem} have been preset and can be used directly.
-Environments such as \texttt{definition} and \texttt{theorem} have been pre-defined and can be used directly.
-
-More specifically, preset environments include:
+More specifically, preset environments include:
\texttt{assumption}, \texttt{axiom}, \texttt{conjecture}, \texttt{convention}, \texttt{corollary}, \texttt{definition}, \texttt{definition-proposition}, \texttt{definition-theorem}, \texttt{example}, \texttt{exercise}, \texttt{fact}, \texttt{hypothesis}, \texttt{lemma}, \texttt{notation}, \texttt{observation}, \texttt{problem}, \texttt{property}, \texttt{proposition}, \texttt{question}, \texttt{remark}, \texttt{theorem}, and the corresponding unnumbered version with an asterisk \lstinline|*| in the name. The titles will change with the current language. For example, \texttt{theorem} will be displayed as ``Theorem" in English mode and ``Théorème" in French mode.
-\medskip
When referencing a theorem-like environment, it is recommended to use \lstinline|\cref{|\meta{label}\texttt{\}}. In this way, there is no need to explicitly write down the name of the corresponding environment every time.
\begin{tip}[Example]
@@ -275,7 +376,7 @@
will produce
\begin{definition}[Strange things]\label{def: strange}
- This is the definition of some strange objects.
+ This is the definition of some strange objects. There is approximately an one-line space before and after the theorem environment, and there will be a symbol to mark the end of the environment.
\end{definition}
\lstinline|\cref{def: strange}| will be displayed as: \cref{def: strange}.
@@ -290,7 +391,9 @@
By default, when referenced, the name of the theorem always matches the language of the context in which the theorem is located. For example, the definition above is still displayed in English in the current French mode: \cref{def: strange} and \cref{thm}. If you want the name of the theorem to match the current context when referencing, you can add \texttt{regionalref} to the global options.
\end{tip}
-\medskip
+\UseLanguage{English}
+
+\bigskip
The following are the main styles of theorem-like environments:
\begin{theorem}
Theorem style: theorem, proposition, lemma, corollary, ...
@@ -300,12 +403,10 @@
Proof style
\end{proof}
-\vspace{-\baselineskip}
\begin{remark}
Remark style
\end{remark}
-\vspace{-.7\baselineskip}
\begin{conjecture}
Conjecture style
\end{conjecture}
@@ -328,11 +429,8 @@
Second definition.
\end{definition}
-\UseLanguage{English}
+\LevelTwoTitle{Define a new theorem-like environment}
-\bigskip
-\section{Define a new theorem-like environment}
-
If you need to define a new theorem-like environment, you must first define the name of the environment in the language to use:
\begin{itemize}
\item \lstinline|\NameTheorem[|\meta{language name}\lstinline|]{|\meta{name of environment}\lstinline|}{|\meta{name string}\lstinline|}|
@@ -356,7 +454,7 @@
\end{itemize}
\item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}<|\meta{numbered within}\lstinline|>|
\begin{itemize}
- \item Define a numbered environment \meta{name of environment}, numbered within the \\counter \meta{numbered within}
+ \item Define a numbered environment \meta{name of environment}, numbered within the counter \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|)|
@@ -364,8 +462,8 @@
\item Identify \meta{name of environment} with \meta{existed environment} or \meta{existed environment}\lstinline|*|.
\item This method is usually useful in the following two situations:
\begin{enumerate}
- \item To use a more concise name. For example, with \lstinline|\CreateTheorem{thm}|\\\lstinline|(theorem)|, one can then use the name \texttt{thm} to write theorem.
- \item To remove the numbering. For example, one can remove the numbering of the \texttt{remark} environment with \lstinline|\CreateTheorem{remark}(remark*)|.
+ \item To use a more concise name. For example, with \lstinline|\CreateTheorem{thm}(theorem)|, one can then use the name \texttt{thm} to write theorem.
+ \item To remove the numbering of some environments. For example, one can remove the numbering of the \texttt{remark} environment with \lstinline|\CreateTheorem{remark}(remark*)|.
\end{enumerate}
\end{itemize}
\end{itemize}
@@ -374,7 +472,6 @@
This macro utilizes the feature of \textsf{amsthm} internally, so the traditional \texttt{theoremstyle} is also applicable to it. One only needs declare the style before the relevant definitions.
\end{tip}
-% \def\proofideanameEN{Idea}
\NameTheorem[EN]{proofidea}{Idea}
\CreateTheorem*{proofidea*}
\CreateTheorem{proofidea}<section>
@@ -381,23 +478,27 @@
\bigskip
Here is an example. The following code:
+
\begin{code}
\NameTheorem[EN]{proofidea}{Idea}
\CreateTheorem*{proofidea*}
\CreateTheorem{proofidea}<section>
\end{code}
-defines an unnumbered environment \lstinline|proofidea*| and a numbered environment \lstinline|proofidea| (numbered within section) respectively. They can be used in English context. The effect is as follows:
+defines an unnumbered environment \lstinline|proofidea*| and a numbered environment \lstinline|proofidea| (numbered within section) respectively. They can be used in English context.
+The effect is as follows:
+\vspace{-0.3\baselineskip}
\begin{proofidea*}
The \lstinline|proofidea*| environment.
\end{proofidea*}
+\vspace{-\baselineskip}
\begin{proofidea}
The \lstinline|proofidea| environment.
\end{proofidea}
\clearpage
-\section{Draft mark}
+\LevelTwoTitle{Draft mark}
You can use \lstinline|\dnf| to mark the unfinished part. For example:
\begin{itemize}
@@ -404,168 +505,25 @@
\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}
-Similarly, there is \lstinline|\needgraph| :
+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}
\end{itemize}
-% \vspace{-.5\baselineskip}
-% \section{On the title, abstract and keywords}
-% \beaulivre{} has both the features of standard classes and that of the \AmS{} classes.
+\LevelOneTitle{Known issues}
-% Therefore, the title part can either be written in the usual way, in accordance with the standard class \textsf{article}:
-
-% \begin{code}
-% \title{(*\meta{title}*)}
-% \author{(*\meta{author}*)}
-% \date{(*\meta{date}*)}
-% \maketitle
-% \begin{abstract}
-% (*\meta{abstract}*)
-% \end{abstract}
-% \begin{keyword}
-% (*\meta{keywords}*)
-% \end{keyword}
-% \end{code}
-
-% \vspace{-.5\baselineskip}
-% or written in the way of \AmS{} classes:
-
-% \begin{code}
-% \title{(*\meta{title}*)}
-% \author{(*\meta{author}*)}
-% \address{(*\meta{address}*)}
-% \email{(*\meta{email}*)}
-% \date{(*\meta{date}*)}
-% \keywords{(*\meta{keywords}*)}
-% \subjclass{(*\meta{subjclass}*)}
-% \begin{abstract}
-% (*\meta{abstract}*)
-% \end{abstract}
-% \maketitle
-% \end{code}
-
-% \medskip
-% The author information can contain multiple groups, written as:
-
-% \begin{code}
-% \author{(*\meta{author 1}*)}
-% \address{(*\meta{address 1}*)}
-% \email{(*\meta{email 1}*)}
-% \author{(*\meta{author 2}*)}
-% \address{(*\meta{address 2}*)}
-% \email{(*\meta{email 2}*)}
-% ...
-% \end{code}
-
-% Among them, the mutual order of \lstinline|\address|, \lstinline|\curraddr|, \lstinline|\email| is not important.
-
-
-\section{Known issues}
-
\begin{itemize}[itemsep=.6em]
\item The font settings are still not perfect.
- \item Since many features are based on the \ProjLib{} toolkit, \beaulivre{} inherits all its problems. For details, please refer to the "Known Issues" section of the \ProjLib{} documentation.
+ \item Since many features are based on the \ProjLib{} toolkit, \colorist{} (and hence \colorart{}, \lebhart{} and \colorbook{}, \beaulivre{}) inherits all its problems. For details, please refer to the ``Known Issues'' section of the \ProjLib{} documentation.
\item The error handling mechanism is incomplete: there is no corresponding error prompt when some problems occur.
\item There are still many things that can be optimized in the code.
\end{itemize}
-
-\chapter{Document templates}
-
-% \vspace*{-1.5\baselineskip}
-
-\section{The standard way}
-
-If you want to write in the standard way, you can refer to the following example:
-
-\begin{code}
-\documentclass{beaulivre}
-\usepackage{ProjLib} % Load ProjLib toolkit
-
-\UseLanguage{French} % Use French from here
-
-\begin{document}
-
-\title{Le Titre}
-\author{Auteur}
-\date{\PLdate{2022-04-01}}
-
-\maketitle
-
-\chapter{Un théorème}
-
-%% Theorem-like environments can be used directly
-\begin{theorem}\label{thm:abc}
- Ceci est un théorème.
-\end{theorem}
-
-Référence du théorème: \cref{thm:abc}
- % It is recommended to use clever reference
-
-\end{document}
-\end{code}
-
-If you wish to switch to the standard class later, just replace the first two lines with:
-
-\begin{code}
-\documentclass{article}
-\usepackage[a4paper,margin=1in]{geometry}
-\usepackage[hidelinks]{hyperref}
-\usepackage[palatino]{ProjLib} % Load ProjLib toolkit
-\end{code}
-
-
-\clearpage
-\section{The \texorpdfstring{\AmS{}}{AMS} way}
-
-If you intend to switch to the journal template in the future and thus want to use the writing style as in the \AmS{} classes, you can refer to the following example:
-
-\begin{code}
-\documentclass{beaulivre}
-\usepackage{ProjLib} % Load ProjLib toolkit
-
-\UseLanguage{French} % Use French from here
-
-\begin{document}
-
-\title{Le Titre}
-\author{Auteur 1}
-\address{Adresse 1}
-\email{\href{Courriel 1}{Courriel 1}}
-\author{Auteur 1}
-\address{Adresse 1}
-\email{\href{Courriel 2}{Courriel 2}}
-\date{\PLdate{2022-04-01}}
-\subjclass{*****}
-\keywords{...}
-
-\maketitle
-
-\chapter{Première section}
-
-%% Theorem-like environments can be used directly
-\begin{theorem}\label{thm:abc}
- Ceci est un théorème.
-\end{theorem}
-
-Référence du théorème: \cref{thm:abc}
- % It is recommended to use clever reference
-
-\end{document}
-\end{code}
-
-\vspace{-0.3\baselineskip}
-In this way, if you wish to switch to \AmS{} class later, just replace the first two lines with:
-
-\begin{code}
-\documentclass{amsart}
-\usepackage[a4paper,margin=1in]{geometry}
-\usepackage[hidelinks]{hyperref}
-\usepackage[palatino]{ProjLib} % Load ProjLib toolkit
-\end{code}
-
+\part{Demonstration}
\blinddocument
\end{document}
+\endinput
+%%
+%% End of file `beaulivre/beaulivre-doc-en.tex'.
Added: trunk/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-fr.pdf
===================================================================
(Binary files differ)
Index: trunk/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-fr.pdf
===================================================================
--- trunk/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-fr.pdf 2021-07-15 19:59:12 UTC (rev 59940)
+++ trunk/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-fr.pdf 2021-07-15 20:01:19 UTC (rev 59941)
Property changes on: trunk/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-fr.pdf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/pdf
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-fr.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-fr.tex (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-fr.tex 2021-07-15 20:01:19 UTC (rev 59941)
@@ -0,0 +1,523 @@
+\documentclass[English,Chinese,French,allowbf,puretext]{beaulivre}
+
+\theoremstyle{basic}
+\CreateTheorem{definition}<highest>
+\CreateTheorem{theorem}[definition]
+\CreateTheorem{conjecture}[definition]
+\CreateTheorem*{example*}
+\CreateTheorem{problem}[definition]
+
+\theoremstyle{emphasis}
+\CreateTheorem{remark}<highest>
+
+\theoremstyle{simple}
+
+%%================================
+%% Import toolkit
+%%================================
+\usepackage{ProjLib}
+\usepackage{longtable} % breakable tables
+\usepackage{hologo} % more TeX logo
+\usetikzlibrary{calc}
+
+\usepackage{blindtext}
+
+\UseLanguage{French}
+
+%%================================
+%% For typesetting code
+%%================================
+\usepackage{listings}
+\definecolor{maintheme}{RGB}{70,130,180}
+\definecolor{forestgreen}{RGB}{21,122,81}
+\definecolor{lightergray}{gray}{0.99}
+\lstset{language=[LaTeX]TeX,
+ keywordstyle=\color{maintheme},
+ basicstyle=\ttfamily,
+ commentstyle=\color{forestgreen}\ttfamily,
+ stringstyle=\rmfamily,
+ showstringspaces=false,
+ breaklines=true,
+ frame=lines,
+ backgroundcolor=\color{lightergray},
+ flexiblecolumns=true,
+ escapeinside={(*}{*)},
+ % numbers=left,
+ numberstyle=\scriptsize, stepnumber=1, numbersep=5pt,
+ % firstnumber=last,
+}
+\providecommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$}
+\lstset{moretexcs=%
+ {part,parttext,chapter,section,subsection,subsubsection,frontmatter,mainmatter,backmatter,tableofcontents,href,
+ color,NameTheorem,CreateTheorem,proofideanameEN,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,PLdate,ProjLib,qedhere
+ }
+}
+\lstnewenvironment{code}%
+{\setstretch{1.07}%
+\setkeys{lst}{columns=fullflexible,keepspaces=true}%
+}{}
+\lstnewenvironment{code*}%
+{\setstretch{1.07}%
+\setkeys{lst}{numbers=left,columns=fullflexible,keepspaces=true}%
+}{}
+
+%%================================
+%% tip
+%%================================
+\usepackage[many]{tcolorbox}
+\newenvironment{tip}[1][Astuce]{%
+ \begin{tcolorbox}[breakable,
+ enhanced,
+ width = \textwidth,
+ colback = paper, colbacktitle = paper,
+ colframe = gray!50, boxrule=0.2mm,
+ coltitle = black,
+ fonttitle = \sffamily,
+ attach boxed title to top left = {yshift=-\tcboxedtitleheight/2, xshift=.5cm},
+ boxed title style = {boxrule=0pt, colframe=paper},
+ before skip = 0.3cm,
+ after skip = 0.3cm,
+ top = 3mm,
+ bottom = 3mm,
+ title={\scshape\sffamily #1}]%
+}{\end{tcolorbox}}
+
+%%================================
+%% Names
+%%================================
+\providecommand{\colorist}{\textsf{colorist}}
+\providecommand{\colorart}{\textsf{colorart}}
+\providecommand{\colorbook}{\textsf{colorbook}}
+\providecommand{\lebhart}{\textsf{lebhart}}
+\providecommand{\beaulivre}{\textsf{beaulivre}}
+
+%%================================
+%% Titles
+%%================================
+\let\LevelOneTitle\chapter
+\let\LevelTwoTitle\section
+\let\LevelThreeTitle\subsection
+
+%%================================
+%% Main text
+%%================================
+\begin{document}
+
+\frontmatter
+
+\begin{titlepage} % Suppresses displaying the page number on the title page and the subsequent page counts as page 1
+\begin{tikzpicture}[overlay,remember picture]
+ \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/07/15}}};
+ \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}{juillet 2021, à Pékin}};
+\end{tikzpicture}%
+\end{titlepage}%
+\cleardoublepage%
+
+
+\chapter*{Préface}
+
+\beaulivre{} fait partie de la série de classes \colorist{}, dont le nom est tiré des mots « beau » et « livre ». L'ensemble de la collection comprend \colorart{} et \lebhart{} pour la composition d'articles, et \colorbook{} et \beaulivre{} pour celle des livres. Mon intention initiale en les concevant était d'écrire des brouillons et des notes qui ont l'air coloré mais pas éblouissant.
+
+\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.
+
+\bigskip
+\begin{tip}
+ La prise en charge multilingue, les environnements de type théorème, les marques de brouillon et quelques autres fonctionnalités sont fournis par la boîte à outils \ProjLib{}. Ici, nous ne discutons que brièvement de la façon de l'utiliser avec cette classe de document. Pour plus d'informations, veuillez vous référer à la documentation de \ProjLib{}.
+\end{tip}
+
+\tableofcontents
+
+\mainmatter
+
+\part{Instruction}
+\parttext{Vous pouvez ajouter quelque texte d'introduction ici via \lstinline|\\parttext|\meta{text}.}
+
+\LevelOneTitle*{Avant de commencer}
+\addcontentsline{toc}{chapter}{Avant de commencer}
+
+Pour utiliser les classes de documents décrites ici, vous devez :
+\begin{itemize}
+ \item installer TeX Live ou MikTeX de la dernière version possible, et vous assurer que \texttt{colorist} et \texttt{projlib} sont correctement installés dans votre système \TeX{}.
+ \item être familiarisé avec l'utilisation de base de \LaTeX{}, et savoir comment compiler vos documents avec \hologo{pdfLaTeX}, \hologo{XeLaTeX} ou \hologo{LuaLaTeX}.
+\end{itemize}
+
+
+\LevelOneTitle{Utilisation et exemples}
+
+\LevelTwoTitle{Comment l'ajouter}
+
+Il suffit simplement de mettre
+
+\begin{code}
+ \documentclass{beaulivre}
+\end{code}
+
+comme première ligne pour utiliser la classe \beaulivre{}.
+
+\begin{tip}[Attention]
+ Vous devez utiliser le moteur \hologo{XeLaTeX} ou \hologo{LuaLaTeX} pour compiler.
+\end{tip}
+
+\LevelTwoTitle{Exemple - Un document complet}
+
+Regardons d'abord un document complet.
+
+
+\begin{code*}
+\documentclass{colorbook}
+\usepackage{ProjLib}
+
+\UseLanguage{French}
+
+\begin{document}
+
+\frontmatter
+
+\begin{titlepage}
+ (*\meta{code for titlepage}*)
+\end{titlepage}
+
+\tableofcontents
+
+\mainmatter
+
+\part{(*\meta{part title}*)}
+\parttext{(*\meta{text after part title}*)}
+
+\chapter{(*\meta{chapter title}*)}
+
+\section{(*\meta{section title}*)}
+
+\dnf<Plus de contenu est nécessaire.>
+
+\begin{theorem}\label{thm:abc}
+ Ceci est un théorème.
+\end{theorem}
+Référence du théorème: \cref{thm:abc}
+
+\backmatter
+
+...
+
+\end{document}
+\end{code*}
+
+Si vous trouvez cela un peu compliqué, ne vous inquiétez pas. Examinons maintenant cet exemple pièce par pièce.
+
+\LevelThreeTitle{Initialisation}
+
+\medskip
+\begin{code}
+\documentclass{beaulivre}
+\usepackage{ProjLib}
+\end{code}
+
+L'initialisation est simple. La première ligne ajoute la classe de document \beaulivre{}, et la deuxième ligne ajoute la boîte à outils \ProjLib{} pour obtenir des fonctionnalités supplémentaires.
+
+\LevelThreeTitle{Choisir la langue}
+
+\medskip
+\begin{code}
+\UseLanguage{French}
+\end{code}
+
+Cette ligne indique que le français sera utilisé dans le document (d'ailleurs, si seul l'anglais apparaît dans votre article, alors il n'est pas nécessaire de choisir la langue). Vous pouvez également changer de langue de la même manière plus tard au milieu du texte. Les langues prises en charge sont les suivantes : chinois simplifié, chinois traditionnel, japonais, anglais, français, allemand, espagnol, portugais, portugais brésilien et russe.
+
+Pour une description détaillée de cette commande et d'autres commandes associées, veuillez vous référer à la section sur le support multilingue.
+
+
+\LevelThreeTitle{Marques de brouillon}
+
+\medskip
+\begin{code}
+\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.
+
+\LevelThreeTitle{Environnements de type théorème}
+
+\medskip
+\begin{code}
+\begin{theorem}\label{thm:abc}
+ Ceci est un théorème.
+\end{theorem}
+Référence du théorème: \cref{thm:abc}
+\end{code}
+
+Les environnements de type théorème couramment utilisés ont été prédéfinis. De plus, lors du référencement d'un environnement de type théorème, il est recommandé d'utiliser \lstinline|\cref{|\meta{label}\texttt{\}} --- de cette manière, il ne serait pas nécessaire d'écrire explicitement le nom de l'environnement correspondant à chaque fois.
+
+
+
+
+\LevelOneTitle{À propos des polices par défaut}
+Par défaut, cette classe de document utilise Palatino Linotype comme police anglaise, YouSong et YouHei GBK de FounderType comme polices chinoises\footnote{Pour plus de détails, veuillez visiter le site web de FounderType : \url{https://www.foundertype.com}.}, et utilise partiellement Neo Euler comme police mathématique. Parmi eux, Neo Euler peut être téléchargé sur \url{https://github.com/khaledhosny/euler-otf}. Les autres polices ne sont pas gratuites, vous devez les acheter et les installer vous-même.
+
+\begin{itemize}
+ \item English main font. \textsf{English sans serif font}.
+ \item 中文主要字体, \textsf{中文无衬线字体}
+ \item Démonstration de maths : \( \alpha, \beta, \gamma, \delta, 1,2,3,4, a,b,c,d \), \[\mathrm{li}(x)\coloneqq \int_2^{\infty} \frac{1}{\log t}\,\mathrm{d}t \]
+\end{itemize}
+
+Lorsque la police correspondante n'est pas installée, les polices fournies avec TeX Live seront utilisées à la place. Dans ce cas, l'expérience peut être réduite.
+
+
+\LevelOneTitle{Les options}
+
+
+\begin{itemize}
+ \item Les options de langue \texttt{EN} / \texttt{english} / \texttt{English}, \texttt{FR} / \texttt{french} / \texttt{French}, etc.
+ \begin{itemize}
+ \item Pour les noms d'options d'une langue spécifique, veuillez vous référer à \meta{language name} dans la section suivante. La première langue spécifiée sera considérée comme la langue par défaut.
+ \item Les options de langue ne sont pas nécessaires, elles servent principalement à augmenter la vitesse de compilation. Sans eux, le résultat serait le même, justement plus lent.
+ \end{itemize}
+ \item \texttt{draft} ou \texttt{fast}
+ \begin{itemize}
+ \item L'option \verb|fast| permet un style plus rapide mais légèrement plus rugueux, les principales différences sont :
+ \begin{itemize}
+ \item Utilisez une configuration de police mathématique plus simple ;
+ \item N'utilisez pas \textsf{hyperref} ;
+ \item Activez le mode rapide de la boîte à outils \ProjLib{}.
+ \end{itemize}
+ \end{itemize}
+ \begin{tip}
+ Pendant la phase de brouillon, il est recommandé d'utiliser le \verb|fast| option pour accélérer la compilation. Quand dans \verb|fast| mode, il y aura un filigrane ``DRAFT'' pour indiquer que vous êtes actuellement en mode brouillon.
+ \end{tip}
+ \item \texttt{a4paper} ou \texttt{b5paper}
+ \begin{itemize}
+ \item Options de format de papier. Le format de papier par défaut est 8.5 pouces $\times$ 11 pouces.
+ \end{itemize}
+ \item \texttt{palatino}, \texttt{times}, \texttt{garamond}, \texttt{biolinum} ~$|$~ \texttt{useosf}
+ \begin{itemize}
+ \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}
+ \begin{itemize}
+ \item Pour activer 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}
+ \item \texttt{runin}
+ \begin{itemize}
+ \item Utilisez le style « runin » pour \lstinline|\subsubsection|
+ \end{itemize}
+ \item \texttt{puretext} ou \texttt{nothms}
+ \begin{itemize}
+ \item Mode texte pur. Ne pas définir les environnements de type théorème.
+ \end{itemize}
+ \item \texttt{nothmnum}
+ \begin{itemize}
+ \item Ne pas numéroter les environnements de type théorème.
+ \end{itemize}
+\end{itemize}
+\bigskip
+De plus, les options \texttt{oneside} et \texttt{twoside} couramment utilisées lors de la composition de livres sont également disponibles. La disposition recto-verso est utilisée par défaut.
+
+\LevelOneTitle{Instructions par sujet}
+
+\LevelTwoTitle{Configurer la langue}
+
+\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. La langue peut être sélectionnée par les macros suivantes :
+
+\begin{itemize}
+ \item \lstinline|\UseLanguage{|\meta{language name}\lstinline|}| est utilisé pour spécifier la langue. Le réglage correspondant de la langue sera appliqué après celui-ci. Il peut être utilisé soit dans le préambule ou dans le texte. Lorsqu'aucune langue n'est spécifiée, « English » est sélectionné par défaut.
+ \item \lstinline|\UseOtherLanguage{|\meta{language name}\lstinline|}{|\meta{content}\lstinline|}|, qui utilise les paramètres de langue spécifiés pour composer \meta{content}. Par rapport à \lstinline|\UseLanguage|, il ne modifiera pas l'interligne, donc l'interligne restera stable lorsque le texte CJK et occidental sont mélangés.
+\end{itemize}
+
+\meta{language name} peut être (il n'est pas sensible à la casse, par exemple, \texttt{French} et \texttt{french} ont le même effet) :
+\begin{itemize}
+ \item chinois simplifié : \texttt{CN}, \texttt{Chinese}, \texttt{SChinese} ou \texttt{SimplifiedChinese}
+ \item chinois traditionnel : \texttt{TC}, \texttt{TChinese} ou \texttt{TraditionalChinese}
+ \item anglais : \texttt{EN} ou \texttt{English}
+ \item français : \texttt{FR} ou \texttt{French}
+ \item allemand : \texttt{DE}, \texttt{German} ou \texttt{ngerman}
+ \item italien : \texttt{IT} ou \texttt{Italian}
+ \item portugais : \texttt{PT} ou \texttt{Portuguese}
+ \item portugais (brésilien) : \texttt{BR} ou \texttt{Brazilian}
+ \item espagnol : \texttt{ES} ou \texttt{Spanish}
+ \item japonais : \texttt{JP} ou \texttt{Japanese}
+ \item russe : \texttt{RU} ou \texttt{Russian}
+\end{itemize}
+
+\medskip
+De plus, vous pouvez également ajouter de nouveaux paramètres à la langue sélectionnée :
+\begin{itemize}
+ \item \lstinline|\AddLanguageSetting{|\meta{settings}\lstinline|}|
+ \begin{itemize}
+ \item Ajoutez \meta{settings} à toutes les langues prises en charge.
+ \end{itemize}
+ \item \lstinline|\AddLanguageSetting(|\meta{language name}\lstinline|){|\meta{settings}\lstinline|}|
+ \begin{itemize}
+ \item Ajoutez \meta{settings} à la langue \meta{language name} sélectionnée.
+ \end{itemize}
+\end{itemize}
+Par exemple, \lstinline|\AddLanguageSetting(German){\color{orange}}| peut rendre tout le texte allemand affiché en orange (bien sûr, il faut alors ajouter \lstinline|\AddLanguageSetting{\color{black}}| afin de corriger la couleur du texte dans d'autres langues).
+
+\LevelTwoTitle{Théorèmes et comment les référencer}
+
+Des environnements tels que \texttt{definition} et \texttt{theorem} ont été prédéfinis et peuvent être utilisés directement.
+
+Plus précisement, les environnements prédéfinis incluent : \texttt{assumption}, \texttt{axiom}, \texttt{conjecture}, \texttt{convention}, \texttt{corollary}, \texttt{definition}, \texttt{definition-proposition}, \texttt{definition-theorem}, \texttt{example}, \texttt{exercise}, \texttt{fact}, \texttt{hypothesis}, \texttt{lemma}, \texttt{notation}, \texttt{observation}, \texttt{problem}, \texttt{property}, \texttt{proposition}, \texttt{question}, \texttt{remark}, \texttt{theorem}, et la version non numérotée correspondante avec un astérisque \lstinline|*| dans le nom. Les titres changeront avec la langue actuelle. Par exemple, \texttt{theorem} sera affiché comme « Theorem » en mode anglais et « Théorème » en mode français.
+
+Lors du référencement d'un environnement de type théorème, il est recommandé d'utiliser \lstinline|\cref{|\meta{label}\texttt{\}}. De cette façon, il n'est pas nécessaire d'écrire explicitement le nom de l'environnement correspondant à chaque fois.
+
+\begin{tip}[Exemple]
+\begin{code}
+ \begin{definition}[Des choses étranges] \label{def: strange} ...
+\end{code}
+
+will produce
+\begin{definition}[Des choses étranges]\label{def: strange}
+ C'est la définition de certains objets étranges. Il y a approximativement un espace d'une ligne avant et après l'environnement de type théorème, et il y aura un symbole pour marquer la fin de l'environnement.
+\end{definition}
+
+\lstinline|\cref{def: strange}| s'affichera sous la forme : \cref{def: strange}.
+
+Après avoir utilisé \lstinline|\UseLanguage{French}|, un théorème s'affichera sous la forme :
+
+\UseLanguage{English}
+\begin{theorem}[Useless]\label{thm}
+ A theorem in English.
+\end{theorem}
+
+Par défaut, lorsqu'il est référencé, le nom de l'environnement de type théorème correspond toujours à la langue du contexte dans lequel se trouve l'environnement. Par exemple, la définition ci-dessus est toujours affichée en français dans le mode anglais courant : \cref{def: strange} et \cref{thm}. Si vous voulez que le nom du théorème corresponde au contexte actuel lors du référencement, vous pouvez ajouter \texttt{regionalref} aux options globales.
+\end{tip}
+
+\UseLanguage{French}
+
+\bigskip
+Voici les principaux styles d'environnements de type théorème :
+\begin{theorem}
+ Style de théorème : theorem, proposition, lemma, corollary, ...
+\end{theorem}
+
+\begin{proof}
+ Style d'épreuve
+\end{proof}
+
+\begin{remark}
+ Style de remarque
+\end{remark}
+
+\begin{conjecture}
+ Style de conjecture
+\end{conjecture}
+
+\begin{example*}
+ Style d'exemple : example, fact, ...
+\end{example*}
+
+\begin{problem}
+ Style de problème : problem, question, ...
+\end{problem}
+
+\medskip
+Pour l'esthétique, les définitions adjacentes seront reliées entre elles automatiquement :
+\begin{definition}
+ Première définition.
+\end{definition}
+
+\begin{definition}
+ Deuxième définition.
+\end{definition}
+
+\LevelTwoTitle{Définir un nouvel environnement de type théorème}
+
+Si vous avez besoin de définir un nouvel environnement de type théorème, vous devez d'abord définir le nom de l'environnement dans le langage à utiliser :
+\begin{itemize}
+ \item \lstinline|\NameTheorem[|\meta{language name}\lstinline|]{|\meta{name of environment}\lstinline|}{|\meta{name string}\lstinline|}|
+\end{itemize}
+Pour \meta{language name}, veuillez vous référer à la section sur la configuration de la langue. Lorsqu'il n'est pas spécifié, le nom sera défini pour toutes les langues prises en charge. De plus, les environnements avec ou sans astérisque partagent le même nom, donc \lstinline|\NameTheorem{envname*}{...}| a le même effet que \lstinline|\NameTheorem{envname}{...}| .
+
+\medskip
+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}
+ \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
+ \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}
+ \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}
+ \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|)|
+ \begin{itemize}
+ \item Identifiez \meta{name of environment} avec \meta{existed environment} ou \meta{existed environment}\lstinline|*|.
+ \item Cette méthode est généralement utile dans les deux situations suivantes :
+ \begin{enumerate}
+ \item Pour utiliser un nom plus concis. Par exemple, avec \lstinline|\CreateTheorem{thm}(theorem)|, on peut alors utiliser le nom \texttt{thm} pour écrire le théorème.
+ \item Pour supprimer la numérotation de certains environnements. Par exemple, on peut supprimer la numérotation de l'environnement \texttt{remark} avec \lstinline|\CreateTheorem{remark}(remark*)|.
+ \end{enumerate}
+ \end{itemize}
+\end{itemize}
+
+\begin{tip}
+ Cette macro utilise la fonctionnalité de \textsf{amsthm} en interne, donc le traditionnel \texttt{theoremstyle} lui est également applicable. Il suffit de déclarer le style avant les définitions pertinentes.
+\end{tip}
+
+\NameTheorem[FR]{proofidea}{Idée}
+\CreateTheorem*{proofidea*}
+\CreateTheorem{proofidea}<section>
+
+\bigskip
+Voici un exemple. Le code suivant :
+
+\begin{code}
+ \NameTheorem[FR]{proofidea}{Idée}
+ \CreateTheorem*{proofidea*}
+ \CreateTheorem{proofidea}<section>
+\end{code}
+définit un environnement non numéroté \lstinline|proofidea*| et un environnement numéroté \lstinline|proofidea| (numérotés dans la section) respectivement. Ils peuvent être utilisés dans le contexte français. L'effet est le suivant :
+
+\vspace{-0.3\baselineskip}
+\begin{proofidea*}
+ La environnement \lstinline|proofidea*| .
+\end{proofidea*}
+
+\vspace{-\baselineskip}
+\begin{proofidea}
+ La environnement \lstinline|proofidea| .
+\end{proofidea}
+
+\LevelTwoTitle{Draft mark}
+
+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.
+\end{itemize}
+
+De même, il y a aussi \lstinline|\needgraph| :
+\begin{itemize}
+ \item \lstinline|\needgraph| ou \lstinline|\needgraph<...>|. L'effet est : \needgraph ou \needgraph<...>Le texte de l'invite change en fonction de la langue actuelle. Par exemple, en mode anglais, il sera affiché sous la forme \UseOtherLanguage{English}{\needgraph}
+\end{itemize}
+
+
+\LevelOneTitle{Problèmes connus}
+
+\begin{itemize}[itemsep=.6em]
+ \item Les paramètres de police ne sont pas encore parfaits.
+ \item Comme de nombreuses fonctionnalités sont basées sur la boîte à outils \ProjLib{}, \colorist{} (et donc \colorart{}, \lebhart{} et \colorbook{}, \beaulivre{}) hérite de tous ses problèmes. Pour plus de détails, veuillez vous référer à la section « Problèmes connus » de la documentation de \ProjLib{}.
+ \item Le mécanisme de gestion des erreurs est incomplet : pas de messages correspondants lorsque certains problèmes surviennent.
+ \item Il y a encore beaucoup de choses qui peuvent être optimisées dans le code.
+\end{itemize}
+
+\part{Démonstration}
+\blinddocument
+
+\end{document}
+\endinput
+%%
+%% End of file `beaulivre/beaulivre-doc-fr.tex'.
Property changes on: trunk/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-fr.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/doc/latex/colorist/colorist-doc.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/colorist/colorist-doc.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/colorist/colorist-doc.tex 2021-07-15 19:59:12 UTC (rev 59940)
+++ trunk/Master/texmf-dist/doc/latex/colorist/colorist-doc.tex 2021-07-15 20:01:19 UTC (rev 59941)
@@ -1,12 +1,11 @@
-%! TEX program = xelatex
-\documentclass[English,French,allowbf,puretext]{colorart}
+\documentclass[English,Chinese,French,allowbf,puretext]{colorart}
\theoremstyle{basic}
\CreateTheorem{definition}<highest>
-\CreateTheorem{theorem}<highest>
-\CreateTheorem{conjecture}<highest>
+\CreateTheorem{theorem}[definition]
+\CreateTheorem{conjecture}[definition]
\CreateTheorem*{example*}
-\CreateTheorem{problem}<highest>
+\CreateTheorem{problem}[definition]
\theoremstyle{emphasis}
\CreateTheorem{remark}<highest>
@@ -19,9 +18,14 @@
\usepackage{ProjLib}
\usepackage{longtable} % breakable tables
\usepackage{hologo} % more TeX logo
+\usetikzlibrary{calc}
+\usepackage{blindtext}
+
+\UseLanguage{English}
+
%%================================
-%% For typestting code
+%% For typesetting code
%%================================
\usepackage{listings}
\definecolor{maintheme}{RGB}{70,130,180}
@@ -40,20 +44,27 @@
escapeinside={(*}{*)},
% numbers=left,
numberstyle=\scriptsize, stepnumber=1, numbersep=5pt,
- firstnumber=last,
-}
+ % firstnumber=last,
+}
\providecommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$}
\lstset{moretexcs=%
- {linenumbers,nolinenumbers,subsection,subsubsection,href,
- color,NameTheorem,CreateTheorem,proofideanameEN,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,PLdate,ProjLib
+ {part,parttext,chapter,section,subsection,subsubsection,frontmatter,mainmatter,backmatter,tableofcontents,href,
+ color,NameTheorem,CreateTheorem,proofideanameEN,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,PLdate,ProjLib,qedhere
}
}
-\lstnewenvironment{code}%
-{\setkeys{lst}{columns=fullflexible,keepspaces=true}}{}
+\lstnewenvironment{code}%
+{\setstretch{1.07}%
+\setkeys{lst}{columns=fullflexible,keepspaces=true}%
+}{}
+\lstnewenvironment{code*}%
+{\setstretch{1.07}%
+\setkeys{lst}{numbers=left,columns=fullflexible,keepspaces=true}%
+}{}
%%================================
%% tip
%%================================
+\usepackage[many]{tcolorbox}
\newenvironment{tip}[1][Tip]{%
\begin{tcolorbox}[breakable,
enhanced,
@@ -74,12 +85,18 @@
%%================================
%% Names
%%================================
-\providecommand{\colorist}{{\normalfont\textsf{colorist}}}
-\providecommand{\colorart}{{\normalfont\textsf{colorart}}}
-\providecommand{\colorbook}{{\normalfont\textsf{colorbook}}}
-\providecommand{\lebhart}{{\normalfont\textsf{lebhart}}}
-\providecommand{\beaulivre}{{\normalfont\textsf{beaulivre}}}
+\providecommand{\colorist}{\textsf{colorist}}
+\providecommand{\colorart}{\textsf{colorart}}
+\providecommand{\colorbook}{\textsf{colorbook}}
+\providecommand{\lebhart}{\textsf{lebhart}}
+\providecommand{\beaulivre}{\textsf{beaulivre}}
+%%================================
+%% Titles
+%%================================
+\let\LevelOneTitle\section
+\let\LevelTwoTitle\subsection
+\let\LevelThreeTitle\subsubsection
%%================================
%% Main text
@@ -86,34 +103,47 @@
%%================================
\begin{document}
-\title{{\normalfont\textbf{\textsf{colorist}}}, write your articles or books in a colorful way}
+\title{\colorist{}, write your articles or books in a colorful way}
\author{Jinwen XU}
-\thanks{Corresponding to: \texttt{\colorist{} 2021/06/30}}
-\date{June 2021, Beijing}
+\thanks{Corresponding to: \texttt{\colorist{} 2021/07/15}}
+\email{\href{mailto:ProjLib at outlook.com}{ProjLib at outlook.com}}
+\date{July 2021, Beijing}
\maketitle
\begin{abstract}
- \colorist{} is a series of styles and classes for you to typeset your articles or books in a colorful manner. My original intention in designing this series is to write drafts and notes that look colorful yet not dazzling.
+ \colorist{} is a series of styles and classes for you to typeset your articles or books in a colorful manner. The original intention in designing this series was to write drafts and notes that look colorful yet not dazzling. With the help of the \ProjLib{} toolkit, also developed by the author, the classes provided here have multi-language support, preset theorem-like environments with clever reference support, and many other functionalities. Notably, using these classes, one can organize the author information in the \AmS{} fashion, makes it easy to switch to journal classes later for publication.
- The entire collection includes \verb|colorist.sty|, which is the main style shared by all of the following classes; \verb|colorart.cls| for typesetting articles and \verb|colorbook.cls| for typesetting books. They compile with any major \TeX{} engine, with native support to English, French, German, Italian, Portuguese (European and Brazilian) and Spanish typesetting via \lstinline|\UseLanguage| (see the instruction below for detail).
-
- You can also found \lebhart{} and \beaulivre{} on CTAN. They are the enhanced version of \colorart{} and \colorbook{} with unicode support. With this, they can access to more beautiful fonts, and also have native support for Chinese, Japanese and Russian typesetting. On the other hand, they need to be compiled with \hologo{XeLaTeX} or \hologo{LuaLaTeX} (not pdf\LaTeX).
-
- This documentation is typeset using \colorart{} (with the option \texttt{allowbf}). You can think of it as a short introduction and demonstration.
+ Finally, this documentation is typeset using the \colorart{} class (with the option \texttt{allowbf}). You can think of it as a short introduction and demonstration.
\end{abstract}
+
+\setcounter{tocdepth}{2}
\tableofcontents
-\vspace{2.5\baselineskip}
-\begin{tip}
- Multi-language support, theorem-like environments, draft marks and some other features are provided by the \ProjLib{} toolkit. Here we only briefly discuss how to use it with this document class. For more detailed information, you can refer to the documentation of \ProjLib{}.
-\end{tip}
-\clearpage
-\section{Initialization}
+\medskip
+\LevelOneTitle*{Before you start}
+\addcontentsline{toc}{section}{Before you start}
+In order to use the package or classes described here, you need to:
+\begin{itemize}
+ \item install TeX Live or MikTeX of the latest possible version, and make sure that \texttt{colorist} and \texttt{projlib} are correctly installed in your \TeX{} system.
+ \item be familiar with the basic usage of \LaTeX{}, and knows how to compile your document with \hologo{pdfLaTeX}, \hologo{XeLaTeX} or \hologo{LuaLaTeX}.
+\end{itemize}
-\subsection{How to load it}
+\LevelOneTitle{Introduction}
+
+\colorist{} is a series of styles and classes for you to typeset your articles or books in a colorful manner. The original intention in designing this series was to write drafts and notes that look colorful yet not dazzling.
+
+The entire collection includes \verb|colorist.sty|, which is the main style shared by all of the following classes; \verb|colorart.cls| for typesetting articles and \verb|colorbook.cls| for typesetting books. They compile with any major \TeX{} engine, with native support to English, French, German, Italian, Portuguese (European and Brazilian) and Spanish typesetting via \lstinline|\UseLanguage| (see the instruction below for detail).
+
+You can also found \lebhart{} and \beaulivre{} on CTAN. They are the enhanced version of \colorart{} and \colorbook{} with unicode support. With this, they can access to more beautiful fonts, and additionally have native support for Chinese, Japanese and Russian typesetting. On the other hand, they need to be compiled with \hologo{XeLaTeX} or \hologo{LuaLaTeX} (not \hologo{pdfLaTeX}).
+
+With the help of the \ProjLib{} toolkit, also developed by the author, the classes provided here have multi-language support, preset theorem-like environments with clever reference support, and many other functionalities such as draft marks, enhanced author information block, mathematical symbols and shortcuts, etc. Notably, using these classes, one can organize the author information in the \AmS{} fashion, makes it easy to switch to journal classes later for publication. For more detailed information, you can refer to the documentation of \ProjLib{} by running \lstinline|texdoc projlib| in the command line.
+
+\LevelOneTitle{Usage and examples}
+
+\LevelTwoTitle{How to load it}
You can directly use \colorart{} or \colorbook{} as your document class. In this way, you can directly begin writing your document, without having to worry about the configurations.
\begin{code}
@@ -120,32 +150,247 @@
\documentclass{colorart} (*{\normalfont or}*) \documentclass{colorbook}
\end{code}
-And of course, you can also use the default classes \textsf{article} or \textsf{book}, and load the \colorist{} package. This way, only the basic styles are set, and you can thus use your preferred fonts and page layout. All the features mentioned in this article are provided.
+\begin{tip}
+ You may wish to use \lebhart{} or \beaulivre{} instead, which should produce better result. All the examples later using \colorart{} or \colorbook{} can be adopted to \lebhart{} and \beaulivre{} respectively, without further modification.
+\end{tip}
+
+You can also use the default classes \textsf{article} or \textsf{book}, and load the \colorist{} package. This way, only the basic styles are set, and you can thus use your preferred fonts and page layout. All the features mentioned in this article are provided.
+
\begin{code}
+ \documentclass{article} (*{\normalfont or}*) \documentclass{book}
\usepackage{colorist}
\end{code}
-\subsection{Options}
+\LevelTwoTitle{Example - \colorart}
-\colorist{} offers the following options:
+Let's first look at a complete example of \colorart{} (the same works for \lebhart{}).
+\begin{code*}
+\documentclass{colorart}
+\usepackage{ProjLib}
+
+\UseLanguage{French}
+
+\begin{document}
+
+\title{(*\meta{title}*)}
+\author{(*\meta{author}*)}
+\date{\PLdate{2022-04-01}}
+
+\maketitle
+
+\begin{abstract}
+ Ceci est un résumé. \dnf<Plus de contenu est nécessaire.>
+\end{abstract}
+\begin{keyword}
+ AAA, BBB, CCC, DDD, EEE
+\end{keyword}
+
+\section{Un théorème}
+
+\begin{theorem}\label{thm:abc}
+ Ceci est un théorème.
+\end{theorem}
+Référence du théorème: \cref{thm:abc}
+
+\end{document}
+\end{code*}
+
+
+If you find this example a little complicated, don't worry. Let's now look at this example piece by piece.
+
+\LevelThreeTitle{Initialization}
+
+\medskip
+\begin{code}
+\documentclass{colorart}
+\usepackage{ProjLib}
+\end{code}
+
+Initialization is straightforward. The first line loads the document class \colorart{}, and the second line loads the \ProjLib{} toolkit to obtain some additional functionalities.
+
+\LevelThreeTitle{Set the language}
+
+\medskip
+\begin{code}
+\UseLanguage{French}
+\end{code}
+
+This line indicates that French will be used in the document (by the way, if only English appears in your article, then there is no need to set the language). You can also switch the language in the same way later in the middle of the text. Supported languages include Simplified Chinese, Traditional Chinese, Japanese, English, French, German, Spanish, Portuguese, Brazilian Portuguese and Russian%
+\footnote{The language Simplified Chinese, Traditional Chinese, Japanese and Russian requires Unicode support, thus the classes \lebhart{} or \beaulivre{}.}%
+.%
+
+For detailed description of this command and more related commands, please refer to the section on the multi-language support.
+
+\LevelThreeTitle{Title, author information, abstract and keywords}
+
+\medskip
+\begin{code}
+\title{(*\meta{title}*)}
+\author{(*\meta{author}*)}
+\date{\PLdate{2022-04-01}}
+\maketitle
+
+\begin{abstract}
+ (*\meta{abstract}*)
+\end{abstract}
+\begin{keyword}
+ (*\meta{keywords}*)
+\end{keyword}
+\end{code}
+
+This part begins with the title and author information block. The example shows the basic usage, but in fact, you can also write:
+
+\begin{code}
+\author{(*\meta{author 1}*)}
+\address{(*\meta{address 1}*)}
+\email{(*\meta{email 1}*)}
+\author{(*\meta{author 2}*)}
+\address{(*\meta{address 2}*)}
+\email{(*\meta{email 2}*)}
+...
+\end{code}
+
+In addition, you may also write in the \AmS{} fashion, i.e.:
+
+\begin{code}
+\title{(*\meta{title}*)}
+\author{(*\meta{author 1}*)}
+\address{(*\meta{address 1}*)}
+\email{(*\meta{email 1}*)}
+\author{(*\meta{author 2}*)}
+\address{(*\meta{address 2}*)}
+\email{(*\meta{email 2}*)}
+\date{\PLdate{2022-04-01}}
+\subjclass{*****}
+\keywords{(*\meta{keywords}*)}
+
+\begin{abstract}
+ (*\meta{abstract}*)
+\end{abstract}
+
+\maketitle
+\end{code}
+
+\LevelThreeTitle{Draft marks}
+
+\medskip
+\begin{code}
+\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.
+
+\LevelThreeTitle{Theorem-like environments}
+
+\medskip
+\begin{code}
+\begin{theorem}\label{thm:abc}
+ Ceci est un théorème.
+\end{theorem}
+Référence du théorème: \cref{thm:abc}
+\end{code}
+
+Commonly used theorem-like environments have been pre-defined. Also, when referencing a theorem-like environment, it is recommended to use \lstinline|\cref{|\meta{label}\texttt{\}} --- in this way, there is no need to explicitly write down the name of the corresponding environment every time.
+
+\begin{tip}
+If you wish to switch to the standard class later, just replace the first two lines with:
+
+\begin{code}
+\documentclass{article}
+\usepackage[a4paper,margin=1in]{geometry}
+\usepackage[hidelinks]{hyperref}
+\usepackage[palatino,amsfashion]{ProjLib}
+\end{code}
+
+or to use the \AmS{} class:
+
+\begin{code}
+\documentclass{amsart}
+\usepackage[a4paper,margin=1in]{geometry}
+\usepackage[hidelinks]{hyperref}
+\usepackage[palatino]{ProjLib}
+\end{code}
+
+\end{tip}
+
+\begin{tip}
+If you like the current document class, but want a more ``plain'' style, then you can use the option \texttt{classical}, like this:
+
+\begin{code}
+\documentclass[classical]{colorart}
+\end{code}
+\end{tip}
+
+\LevelTwoTitle{Example - \colorbook}
+
+Now let's look at an example of \colorbook{} (the same works for \beaulivre{}).
+
+\begin{code*}
+\documentclass{colorbook}
+\usepackage{ProjLib}
+
+\UseLanguage{French}
+
+\begin{document}
+
+\frontmatter
+
+\begin{titlepage}
+ (*\meta{code for titlepage}*)
+\end{titlepage}
+
+\tableofcontents
+
+\mainmatter
+
+\part{(*\meta{part title}*)}
+\parttext{(*\meta{text after part title}*)}
+
+\chapter{(*\meta{chapter title}*)}
+
+\section{(*\meta{section title}*)}
+
+...
+
+\backmatter
+
+...
+
+\end{document}
+\end{code*}
+
+There is no much differences with \colorart{}, only that the title and author information should be typeset within the \texttt{titlepage} environment. Currently no default titlepage style is given, since the design of the title page is a highly personalized thing, and it is difficult to achieve a result that satisfies everyone.
+
+\bigskip
+In the next section, we will go through the options available.
+
+
+\LevelOneTitle{The options}
+
+\colorist{} offers the following options:
+
\begin{itemize}
\item The language options \texttt{EN} / \texttt{english} / \texttt{English}, \texttt{FR} / \texttt{french} / \texttt{French}, etc.
\begin{itemize}
\item For the option names of a specific language, please refer to \meta{language name} in the next section. The first specified language will be used as the default language.
+ \item The language options are optional, mainly for increasing the compilation speed. Without them the result would be the same, only slower.
\end{itemize}
\item \texttt{draft} or \texttt{fast}
\begin{itemize}
\item The option \verb|fast| enables a faster but slightly rougher style, main differences are:
\begin{itemize}
- \item Use simpler math font configuration;
- \item Do not use \textsf{hyperref};
+ \item Use simpler math font configuration;
+ \item Do not use \textsf{hyperref};
\item Enable the fast mode of \ProjLib{} toolkit.
\end{itemize}
\end{itemize}
+ \begin{tip}
+ During the draft stage, it is recommended to use the \verb|fast| option to speed up compilation. When in \verb|fast| mode, there will be a watermark ``DRAFT'' to indicate that you are currently in the draft mode.
+ \end{tip}
\item \texttt{allowbf}
\begin{itemize}
- \item Allow boldface. When this option is enabled, the title, titles of all levels and names of theorem-like environments will be bolded.
+ \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}
\item \texttt{runin}
\begin{itemize}
@@ -161,14 +406,7 @@
\end{itemize}
\end{itemize}
-\begin{tip}
- \begin{itemize}
- \item During the draft stage, it is recommended to use the \verb|fast| option to speed up compilation. When in \verb|fast| mode, there will be a watermark "DRAFT" to indicate that you are currently in the draft mode.
- \end{itemize}
-\end{tip}
-
-\bigskip
-Additionally, \colorart{} and \colorbook{} offers the following options:
+Additionally, \colorart{} and \colorbook{} offers the following options:
\begin{itemize}
\item \texttt{a4paper} or \texttt{b5paper}
\begin{itemize}
@@ -176,20 +414,18 @@
\end{itemize}
\item \texttt{palatino}, \texttt{times}, \texttt{garamond}, \texttt{biolinum} ~$|$~ \texttt{useosf}
\begin{itemize}
- \item Font options. As the name suggest, font with corresponding name will be loaded.
+ \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}
\end{itemize}
+\clearpage
+\LevelOneTitle{Instructions by topic}
-\section{Some instructions}
+\LevelTwoTitle{Language configuration}
-Many of the features described next are provided by the \ProjLib{} toolkit. Only the basic usage is mentioned here. For more details, please refer to its user documentation.
+\colorart{} has multi-language support, including English, French, German, Italian, Portuguese (European and Brazilian) and Spanish. The language can be selected by the following macros:
-\subsection{Language configuration}
-
-\colorist{} has multi-language support, including English, French, German, Italian, Portuguese (European and Brazilian) and Spanish. The language can be selected by the following macros:
-
\begin{itemize}
\item \lstinline|\UseLanguage{|\meta{language name}\lstinline|}| is used to specify the language. The corresponding setting of the language will be applied after it. It can be used either in the preamble or in the main body. When no language is specified, ``English'' is selected by default.
\item \lstinline|\UseOtherLanguage{|\meta{language name}\lstinline|}{|\meta{content}\lstinline|}|, which uses the specified language settings to typeset \meta{content}. Compared with \lstinline|\UseLanguage|, it will not modify the line spacing, so line spacing would remain stable when CJK and Western texts are mixed.
@@ -224,15 +460,13 @@
\end{itemize}
For example, \lstinline|\AddLanguageSetting(German){\color{orange}}| can make all German text displayed in orange (of course, one then need to add \lstinline|\AddLanguageSetting{\color{black}}| in order to correct the color of the text in other languages).
+\LevelTwoTitle{Theorems and how to reference them}
-\subsection{Theorems and how to reference them}
+Environments such as \texttt{definition} and \texttt{theorem} have been preset and can be used directly.
-Environments such as \texttt{definition} and \texttt{theorem} have been pre-defined and can be used directly.
-
-More specifically, preset environments include:
+More specifically, preset environments include:
\texttt{assumption}, \texttt{axiom}, \texttt{conjecture}, \texttt{convention}, \texttt{corollary}, \texttt{definition}, \texttt{definition-proposition}, \texttt{definition-theorem}, \texttt{example}, \texttt{exercise}, \texttt{fact}, \texttt{hypothesis}, \texttt{lemma}, \texttt{notation}, \texttt{observation}, \texttt{problem}, \texttt{property}, \texttt{proposition}, \texttt{question}, \texttt{remark}, \texttt{theorem}, and the corresponding unnumbered version with an asterisk \lstinline|*| in the name. The titles will change with the current language. For example, \texttt{theorem} will be displayed as ``Theorem" in English mode and ``Théorème" in French mode.
-\medskip
When referencing a theorem-like environment, it is recommended to use \lstinline|\cref{|\meta{label}\texttt{\}}. In this way, there is no need to explicitly write down the name of the corresponding environment every time.
\begin{tip}[Example]
@@ -242,12 +476,11 @@
will produce
\begin{definition}[Strange things]\label{def: strange}
- This is the definition of some strange objects.
+ This is the definition of some strange objects. There is approximately an one-line space before and after the theorem environment, and there will be a symbol to mark the end of the environment.
\end{definition}
\lstinline|\cref{def: strange}| will be displayed as: \cref{def: strange}.
-\medskip
After using \lstinline|\UseLanguage{French}|, a theorem will be displayed as:
\UseLanguage{French}
@@ -258,6 +491,7 @@
By default, when referenced, the name of the theorem always matches the language of the context in which the theorem is located. For example, the definition above is still displayed in English in the current French mode: \cref{def: strange} and \cref{thm}. If you want the name of the theorem to match the current context when referencing, you can add \texttt{regionalref} to the global options.
\end{tip}
+\UseLanguage{English}
\bigskip
The following are the main styles of theorem-like environments:
@@ -295,11 +529,8 @@
Second definition.
\end{definition}
-\UseLanguage{English}
+\LevelTwoTitle{Define a new theorem-like environment}
-% \clearpage
-\subsection{Define a new theorem-like environment}
-
If you need to define a new theorem-like environment, you must first define the name of the environment in the language to use:
\begin{itemize}
\item \lstinline|\NameTheorem[|\meta{language name}\lstinline|]{|\meta{name of environment}\lstinline|}{|\meta{name string}\lstinline|}|
@@ -323,7 +554,7 @@
\end{itemize}
\item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}<|\meta{numbered within}\lstinline|>|
\begin{itemize}
- \item Define a numbered environment \meta{name of environment}, numbered within the \\counter \meta{numbered within}
+ \item Define a numbered environment \meta{name of environment}, numbered within the counter \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|)|
@@ -331,41 +562,42 @@
\item Identify \meta{name of environment} with \meta{existed environment} or \meta{existed environment}\lstinline|*|.
\item This method is usually useful in the following two situations:
\begin{enumerate}
- \item To use a more concise name. For example, with \lstinline|\CreateTheorem{thm}|\\\lstinline|(theorem)|, one can then use the name \texttt{thm} to write theorem.
- \item To remove the numbering. For example, one can remove the numbering of the \texttt{remark} environment with \lstinline|\CreateTheorem{remark}(remark*)|.
+ \item To use a more concise name. For example, with \lstinline|\CreateTheorem{thm}(theorem)|, one can then use the name \texttt{thm} to write theorem.
+ \item To remove the numbering of some environments. For example, one can remove the numbering of the \texttt{remark} environment with \lstinline|\CreateTheorem{remark}(remark*)|.
\end{enumerate}
\end{itemize}
\end{itemize}
-% \medskip
\begin{tip}
This macro utilizes the feature of \textsf{amsthm} internally, so the traditional \texttt{theoremstyle} is also applicable to it. One only needs declare the style before the relevant definitions.
\end{tip}
-% \def\proofideanameEN{Idea}
\NameTheorem[EN]{proofidea}{Idea}
\CreateTheorem*{proofidea*}
\CreateTheorem{proofidea}<subsection>
-\medskip
+\bigskip
Here is an example. The following code:
+
\begin{code}
\NameTheorem[EN]{proofidea}{Idea}
\CreateTheorem*{proofidea*}
\CreateTheorem{proofidea}<subsection>
\end{code}
-defines an unnumbered environment \lstinline|proofidea*| and a numbered environment \lstinline|proofidea| (numbered within subsection) respectively. They can be used in English context. The effect is as follows:
+defines an unnumbered environment \lstinline|proofidea*| and a numbered environment \lstinline|proofidea| (numbered within subsection) respectively. They can be used in English context.
+The effect is as follows:
+\vspace{-0.3\baselineskip}
\begin{proofidea*}
The \lstinline|proofidea*| environment.
\end{proofidea*}
+\vspace{-\baselineskip}
\begin{proofidea}
The \lstinline|proofidea| environment.
\end{proofidea}
-\smallskip
-\subsection{Draft mark}
+\LevelTwoTitle{Draft mark}
You can use \lstinline|\dnf| to mark the unfinished part. For example:
\begin{itemize}
@@ -372,13 +604,13 @@
\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}
-Similarly, there is \lstinline|\needgraph| :
+Similarly, there is \lstinline|\needgraph| :
\begin{itemize}
- \item \lstinline|\needgraph| or \lstinline|\needgraph<...>|. The effect is: \vspace{-.3\baselineskip}\needgraph \vspace{-.5\baselineskip} or \vspace{-.5\baselineskip} \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
-\subsection{On the title, abstract and keywords}
+\clearpage
+\LevelTwoTitle{Title, abstract and keywords}
\colorart{} has both the features of standard classes and that of the \AmS{} classes.
@@ -414,7 +646,6 @@
\maketitle
\end{code}
-\medskip
The author information can contain multiple groups, written as:
\begin{code}
@@ -429,118 +660,17 @@
Among them, the mutual order of \lstinline|\address|, \lstinline|\curraddr|, \lstinline|\email| is not important.
+\LevelOneTitle{Known issues}
-\section{Known issues}
-
\begin{itemize}[itemsep=.6em]
\item The font settings are still not perfect.
- \item Since many features are based on the \ProjLib{} toolkit, \colorist{} inherits all its problems. For details, please refer to the ``Known Issues'' section of the \ProjLib{} documentation.
+ \item Since many features are based on the \ProjLib{} toolkit, \colorist{} (and hence \colorart{}, \lebhart{} and \colorbook{}, \beaulivre{}) inherits all its problems. For details, please refer to the ``Known Issues'' section of the \ProjLib{} documentation.
\item The error handling mechanism is incomplete: there is no corresponding error prompt when some problems occur.
\item There are still many things that can be optimized in the code.
\end{itemize}
-% \clearpage
-\medskip
-\section{Document templates}
-\subsection{The standard way}
-
-If you want to write in the standard way, you can refer to the following example:
-
-\begin{code}
-\documentclass{colorart}
-\usepackage{ProjLib} % Load ProjLib toolkit
-
-\UseLanguage{French} % Use French from here
-
-\begin{document}
-
-\title{Le Titre}
-\author{Auteur}
-\date{\PLdate{2022-04-01}}
-
-\maketitle
-
-\begin{abstract}
- Ceci est un résumé. \dnf<Plus de contenu est nécessaire.>
-\end{abstract}
-\begin{keyword}
- AAA, BBB, CCC, DDD, EEE
-\end{keyword}
-
-\section{Un théorème}
-
-%% Theorem-like environments can be used directly
-\begin{theorem}\label{thm:abc}
- Ceci est un théorème.
-\end{theorem}
-
-Référence du théorème: \cref{thm:abc}
- % It is recommended to use clever reference
-
\end{document}
-\end{code}
-
-If you wish to switch to the standard class later, just replace the first two lines with:
-
-\begin{code}
-\documentclass{article}
-\usepackage[a4paper,margin=1in]{geometry}
-\usepackage[hidelinks]{hyperref}
-\usepackage[palatino]{ProjLib} % Load ProjLib toolkit
-\end{code}
-
-
-\clearpage
-\subsection{The \texorpdfstring{\AmS{}}{AMS} way}
-
-If you intend to switch to the journal template in the future and thus want to use the writing style as in the \AmS{} classes, you can refer to the following example:
-
-\begin{code}
-\documentclass{colorart}
-\usepackage{ProjLib} % Load ProjLib toolkit
-
-\UseLanguage{French} % Use French from here
-
-\begin{document}
-
-\title{Le Titre}
-\author{Auteur 1}
-\address{Adresse 1}
-\email{\href{Courriel 1}{Courriel 1}}
-\author{Auteur 1}
-\address{Adresse 1}
-\email{\href{Courriel 2}{Courriel 2}}
-\date{\PLdate{2022-04-01}}
-\subjclass{*****}
-\keywords{...}
-
-\begin{abstract}
- Ceci est un résumé. \dnf<Plus de contenu est nécessaire.>
-\end{abstract}
-
-\maketitle
-
-\section{Première section}
-
-%% Theorem-like environments can be used directly
-\begin{theorem}\label{thm:abc}
- Ceci est un théorème.
-\end{theorem}
-
-Référence du théorème: \cref{thm:abc}
- % It is recommended to use clever reference
-
-\end{document}
-\end{code}
-
-In this way, if you wish to switch to \AmS{} class later, just replace the first two lines with:
-
-\begin{code}
-\documentclass{amsart}
-\usepackage[a4paper,margin=1in]{geometry}
-\usepackage[hidelinks]{hyperref}
-\usepackage[palatino]{ProjLib} % Load ProjLib toolkit
-\end{code}
-
-\end{document}
+\endinput
+%%
+%% End of file `colorist/colorist-doc.tex'.
Modified: trunk/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-cn.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-cn.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-cn.tex 2021-07-15 19:59:12 UTC (rev 59940)
+++ trunk/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-cn.tex 2021-07-15 20:01:19 UTC (rev 59941)
@@ -1,12 +1,11 @@
-%! TEX program = xelatex
-\documentclass[Chinese,English,French,allowbf,puretext]{lebhart}
+\documentclass[English,Chinese,French,allowbf,puretext]{lebhart}
\theoremstyle{basic}
\CreateTheorem{definition}<highest>
-\CreateTheorem{theorem}<highest>
-\CreateTheorem{conjecture}<highest>
+\CreateTheorem{theorem}[definition]
+\CreateTheorem{conjecture}[definition]
\CreateTheorem*{example*}
-\CreateTheorem{problem}<highest>
+\CreateTheorem{problem}[definition]
\theoremstyle{emphasis}
\CreateTheorem{remark}<highest>
@@ -14,16 +13,19 @@
\theoremstyle{simple}
%%================================
-%% 引入工具集
+%% Import toolkit
%%================================
\usepackage{ProjLib}
\usepackage{longtable} % breakable tables
\usepackage{hologo} % more TeX logo
+\usetikzlibrary{calc}
+\usepackage{blindtext}
+
\UseLanguage{Chinese}
%%================================
-%% 排版代码
+%% For typesetting code
%%================================
\usepackage{listings}
\definecolor{maintheme}{RGB}{70,130,180}
@@ -42,19 +44,27 @@
escapeinside={(*}{*)},
% numbers=left,
numberstyle=\scriptsize, stepnumber=1, numbersep=5pt,
- firstnumber=last,
-}
+ % firstnumber=last,
+}
\providecommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$}
\lstset{moretexcs=%
- {subsubsection,href,color,NameTheorem,CreateTheorem,proofideanameCN,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,PLdate,ProjLib
+ {part,parttext,chapter,section,subsection,subsubsection,frontmatter,mainmatter,backmatter,tableofcontents,href,
+ color,NameTheorem,CreateTheorem,proofideanameEN,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,PLdate,ProjLib,qedhere
}
}
-\lstnewenvironment{code}%
-{\setkeys{lst}{columns=fullflexible,keepspaces=true}}{}
+\lstnewenvironment{code}%
+{\setstretch{1.07}%
+\setkeys{lst}{columns=fullflexible,keepspaces=true}%
+}{}
+\lstnewenvironment{code*}%
+{\setstretch{1.07}%
+\setkeys{lst}{numbers=left,columns=fullflexible,keepspaces=true}%
+}{}
%%================================
%% tip
%%================================
+\usepackage[many]{tcolorbox}
\newenvironment{tip}[1][提示]{%
\begin{tcolorbox}[breakable,
enhanced,
@@ -69,27 +79,35 @@
after skip = 0.3cm,
top = 3mm,
bottom = 3mm,
- title={\sffamily #1}]%
+ title={\scshape\sffamily #1}]%
}{\end{tcolorbox}}
%%================================
-%% 名称
+%% Names
%%================================
-\providecommand{\colorist}{{\normalfont\textsf{colorist}}}
-\providecommand{\colorart}{{\normalfont\textsf{colorart}}}
-\providecommand{\colorbook}{{\normalfont\textsf{colorbook}}}
-\providecommand{\lebhart}{{\normalfont\textsf{lebhart}}}
-\providecommand{\beaulivre}{{\normalfont\textsf{beaulivre}}}
+\providecommand{\colorist}{\textsf{colorist}}
+\providecommand{\colorart}{\textsf{colorart}}
+\providecommand{\colorbook}{\textsf{colorbook}}
+\providecommand{\lebhart}{\textsf{lebhart}}
+\providecommand{\beaulivre}{\textsf{beaulivre}}
%%================================
-%% 正文
+%% Titles
%%================================
+\let\LevelOneTitle\section
+\let\LevelTwoTitle\subsection
+\let\LevelThreeTitle\subsubsection
+
+%%================================
+%% Main text
+%%================================
\begin{document}
-\title{{\normalfont\textbf{\textsf{lebhart}}}，以多彩的方式排版你的文章}
+\title{\lebhart{}，以多彩的方式排版你的文章}
\author{许锦文}
-\thanks{对应版本. \texttt{\lebhart{} 2021/06/30}}
-\date{2021年6月，北京}
+\thanks{对应版本. \texttt{\lebhart{} 2021/07/15}}
+\email{\href{mailto:ProjLib at outlook.com}{ProjLib at outlook.com}}
+\date{2021年7月，北京}
\maketitle
@@ -97,22 +115,28 @@
\lebhart{} 是 \colorist{} 文档类系列的成员之一，其名称取自于德文的lebhaft (活泼)，并取了artikel (文章)的前三个字母组合而成。整个 \colorist{} 系列包含用于排版文章的 \colorart{}、\lebhart{} 以及用于排版书的 \colorbook{}、\beaulivre{}。我设计这一系列的初衷是为了撰写草稿与笔记，使之多彩而不缭乱。
\lebhart{} 支持英语、法语、德语、意大利语、葡萄牙语、巴西葡萄牙语、西班牙语、简体中文、繁体中文、日文、俄文，并且同一篇文档中这些语言可以很好地协调。由于采用了自定义字体，需要用 \hologo{XeLaTeX} 或 \hologo{LuaLaTeX} 引擎进行编译。
-
+
这篇说明文档即是用 \lebhart{} 排版的 (使用了参数 \texttt{allowbf})，你可以把它看作一份简短的说明与演示。
\end{abstract}
+
+\setcounter{tocdepth}{2}
\tableofcontents
-\vspace{2\baselineskip}
-\begin{tip}
- 多语言支持、定理类环境、未完成标记等功能是由 \ProjLib{} 工具箱提供的，这里只给出了将其与本文档类搭配使用的要点。如需获取更详细的信息，可以参阅 \ProjLib{} 的说明文档。
-\end{tip}
-\clearpage
-\section{初始化}
+\medskip
+\LevelOneTitle*{开始之前}
+为了使用这篇文档中提到的文档类，你需要：
+\begin{itemize}
+ \item 安装一个尽可能新版本的 TeX Live 或 MikTeX 套装，并确保 \texttt{colorist} 和 \texttt{projlib} 被正确安装在你的 \TeX 封装中。
+ \item 熟悉 \LaTeX{} 的基本使用方式，并且知道如何用 \hologo{pdfLaTeX}、\hologo{XeLaTeX} 或 \hologo{LuaLaTeX} 编译你的文档。
+\end{itemize}
-\subsection{如何载入}
+\LevelOneTitle{使用示例}
+
+\LevelTwoTitle{如何加载}
+
只需要在第一行写：
\begin{code}
@@ -121,8 +145,176 @@
即可使用 \lebhart{} 文档类。请注意，要使用 \hologo{XeLaTeX} 或 \hologo{LuaLaTeX} 引擎才能编译。
-\subsection{选项}
+\LevelTwoTitle{一篇完整的文档示例}
+首先来看一段完整的示例。
+
+\begin{code*}
+\documentclass{lebhart}
+\usepackage{ProjLib}
+
+\UseLanguage{French}
+
+\begin{document}
+
+\title{(*\meta{title}*)}
+\author{(*\meta{author}*)}
+\date{\PLdate{2022-04-01}}
+
+\maketitle
+
+\begin{abstract}
+ Ceci est un résumé. \dnf<Plus de contenu est nécessaire.>
+\end{abstract}
+\begin{keyword}
+ AAA, BBB, CCC, DDD, EEE
+\end{keyword}
+
+\section{Un théorème}
+
+\begin{theorem}\label{thm:abc}
+ Ceci est un théorème.
+\end{theorem}
+Référence du théorème: \cref{thm:abc}
+
+\end{document}
+\end{code*}
+
+
+如果你觉得这个例子有些复杂，不要担心。现在我们来一点点地观察这个例子。
+
+\clearpage
+\LevelThreeTitle{初始化部分}
+
+\medskip
+\begin{code}
+\documentclass{lebhart}
+\usepackage{ProjLib}
+\end{code}
+
+初始化部分很简单：第一行加载文档类 \lebhart{}，第二行加载 \ProjLib{} 工具箱，以便使用一些附加功能。
+
+\LevelThreeTitle{设定语言}
+
+\medskip
+\begin{code}
+\UseLanguage{French}
+\end{code}
+
+这一行表明文档中将使用法语（如果你的文章中只出现英语，那么可以不需要设定语言）。你也可以在文章中间用同样的方式再次切换语言。支持的语言包括简体中文、繁体中文、日文、英语、法语、德语、西班牙语、葡萄牙语、巴西葡萄牙语、俄语。
+
+对于这一命令的详细说明以及更多相关命令，可以参考后面关于多语言支持的小节。
+
+\LevelThreeTitle{标题，作者信息，摘要与关键词}
+
+\medskip
+\begin{code}
+\title{(*\meta{title}*)}
+\author{(*\meta{author}*)}
+\date{\PLdate{2022-04-01}}
+\maketitle
+
+\begin{abstract}
+ (*\meta{abstract}*)
+\end{abstract}
+\begin{keyword}
+ (*\meta{keywords}*)
+\end{keyword}
+\end{code}
+
+开头部分是标题和作者信息块。这个例子中给出的是最基本的形式，事实上你还可以这样写：
+
+\begin{code}
+\author{(*\meta{author 1}*)}
+\address{(*\meta{address 1}*)}
+\email{(*\meta{email 1}*)}
+\author{(*\meta{author 2}*)}
+\address{(*\meta{address 2}*)}
+\email{(*\meta{email 2}*)}
+...
+\end{code}
+
+另外，你还可以采用 \AmS{} 文档类的写法：
+
+\begin{code}
+\title{(*\meta{title}*)}
+\author{(*\meta{author 1}*)}
+\address{(*\meta{address 1}*)}
+\email{(*\meta{email 1}*)}
+\author{(*\meta{author 2}*)}
+\address{(*\meta{address 2}*)}
+\email{(*\meta{email 2}*)}
+\date{\PLdate{2022-04-01}}
+\subjclass{*****}
+\keywords{(*\meta{keywords}*)}
+
+\begin{abstract}
+ (*\meta{abstract}*)
+\end{abstract}
+
+\maketitle
+\end{code}
+
+\LevelThreeTitle{未完成标记}
+
+\medskip
+\begin{code}
+\dnf<(*\meta{some hint}*)>
+\end{code}
+当你有一些地方尚未完成的时候，可以用这条指令标记出来，它在草稿阶段格外有用。
+
+\LevelThreeTitle{定理类环境}
+
+\medskip
+\begin{code}
+\begin{theorem}\label{thm:abc}
+ Ceci est un théorème.
+\end{theorem}
+Référence du théorème: \cref{thm:abc}
+\end{code}
+
+常见的定理类环境可以直接使用。在引用的时候，建议采用智能引用 \lstinline|\cref{|\meta{label}\lstinline|}|——这样就不必每次都写上相应环境的名称了。
+
+\begin{tip}
+如果你之后想要切换到标准文档类，只需要把前两行换为：
+
+\begin{code}
+\documentclass{article}
+\usepackage[a4paper,margin=1in]{geometry}
+\usepackage[hidelinks]{hyperref}
+\usepackage[palatino,amsfashion]{ProjLib}
+\end{code}
+
+或者使用 \AmS{} 文档类：
+
+\begin{code}
+\documentclass{amsart}
+\usepackage[a4paper,margin=1in]{geometry}
+\usepackage[hidelinks]{hyperref}
+\usepackage[palatino]{ProjLib}
+\end{code}
+
+\end{tip}
+
+\begin{tip}
+如果你喜欢这个文档类，但又希望使用一种更加中规中矩的样式，那么不妨使用 \texttt{classical} 选项，就像这样：
+
+\begin{code}
+\documentclass[classical]{lebhart}
+\end{code}
+\end{tip}
+
+
+\clearpage
+\LevelOneTitle{关于默认字体}
+\lebhart{} 默认使用 Palatino Linotype 作为英文字体，方正悠宋、悠黑GBK作为中文字体，并部分使用了 Neo Euler 作为数学字体。其中，Neo Euler可以在 \url{https://github.com/khaledhosny/euler-otf} 下载。其他字体不是免费字体，需要自行购买使用。可以在方正字库网站查询详细资料：\url{https://www.foundertype.com}。
+
+
+在没有安装相应的字体时，将采用TeX Live中自带的字体来代替，效果可能会有所折扣。
+
+
+\LevelOneTitle{选项}
+
\lebhart{} 文档类有下面几个选项：
\begin{itemize}
@@ -129,6 +321,7 @@
\item 语言选项 \texttt{EN} / \texttt{english} / \texttt{English}、\texttt{FR} / \texttt{french} / \texttt{French}，等等
\begin{itemize}
\item 具体选项名称可参见下一节的 \meta{language name}。第一个指定的语言将作为默认语言。
+ \item 语言选项不是必需的，其主要用途是提高编译速度。不添加语言选项时效果是一样的，只是会更慢一些。
\end{itemize}
\item \texttt{draft} 或 \texttt{fast}
\begin{itemize}
@@ -139,9 +332,9 @@
\item 启用 \ProjLib{} 工具箱的快速模式。
\end{itemize}
\end{itemize}
-\begin{tip}
- 在文章的撰写阶段，建议使用 \verb|fast| 选项以加快编译速度，改善写作时的流畅度。使用 \verb|fast| 模式时会有“DRAFT”字样的水印，以提示目前处于草稿阶段。
-\end{tip}
+ \begin{tip}
+ 在文章的撰写阶段，建议使用 \verb|fast| 选项以加快编译速度，改善写作时的流畅度。使用 \verb|fast| 模式时会有“DRAFT”字样的水印，以提示目前处于草稿阶段。
+ \end{tip}
\item \texttt{a4paper} 或 \texttt{b5paper}
\begin{itemize}
\item 可选的纸张大小。默认的纸张大小为 8.5in $\times$ 11in。
@@ -159,7 +352,7 @@
\begin{itemize}
\item \lstinline|\subsubsection| 采用 ``runin'' 风格。
\end{itemize}
- \item \texttt{puretext} or \texttt{nothms}
+ \item \texttt{puretext} 或 \texttt{nothms}
\begin{itemize}
\item 纯文本模式，不加载定理类环境。
\end{itemize}
@@ -170,27 +363,10 @@
\end{itemize}
\clearpage
-\section{关于默认字体}
-\lebhart{} 默认使用 Palatino Linotype 作为英文字体，方正悠宋、悠黑GBK作为中文字体，并部分使用了 Neo Euler 作为数学字体。其中，Neo Euler可以在 \url{https://github.com/khaledhosny/euler-otf} 下载。其他字体不是免费的，需要自行购买使用，可在方正字库网站查询详细信息：\url{https://www.foundertype.com}。
+\LevelOneTitle{具体说明}
-\begin{tip}[字体演示]
- \begin{itemize}\setstretch{1.15}
- \item English main font. \textsf{English sans serif font}. \texttt{English typewriter font}.
- \item 中文主要字体，\textsf{中文无衬线字体}
- \item 数学示例： \( \alpha, \beta, \gamma, \delta, 1,2,3,4, a,b,c,d \), \[\mathrm{li}(x)\coloneqq \int_2^{\infty} \frac{1}{\log t}\,\mathrm{d}t \]
- \end{itemize}
-\end{tip}
+\LevelTwoTitle{语言设置}
-在没有安装相应的字体时，将采用TeX Live中自带的字体来代替，效果可能会有所折扣。
-
-
-\section{使用说明}
-
-接下来介绍的许多功能是由 \ProjLib{} 工具箱提供的。这里只介绍了基本使用方法，更多细节可以直接参阅其用户文档。
-
-\medskip
-\subsection{语言设置}
-
\lebhart{} 提供了多语言支持，包括英语、法语、德语、意大利语、葡萄牙语、巴西葡萄牙语、西班牙语、简体中文、繁体中文、日文、俄文。可以通过下列命令来选定语言：
\begin{itemize}
\item \lstinline|\UseLanguage{|\meta{language name}\lstinline|}|，用于指定语言，在其后将使用对应的语言设定。
@@ -204,7 +380,7 @@
\end{itemize}
\meta{language name} 有下列选择 (不区分大小写，如 \texttt{French} 或 \texttt{french} 均可)：
-\begin{itemize}\setstretch{1.15}
+\begin{itemize}
\item 简体中文：\texttt{CN}、\texttt{Chinese}、\texttt{SChinese} 或 \texttt{SimplifiedChinese}
\item 繁体中文：\texttt{TC}、\texttt{TChinese} 或 \texttt{TraditionalChinese}
\item 英文：\texttt{EN} 或 \texttt{English}
@@ -218,7 +394,6 @@
\item 俄文：\texttt{RU} 或 \texttt{Russian}
\end{itemize}
-\clearpage
另外，还可以通过下面的方式来填加相应语言的设置：
\begin{itemize}
\item \lstinline|\AddLanguageSetting{|\meta{settings}\lstinline|}|
@@ -232,8 +407,7 @@
\end{itemize}
例如，\lstinline|\AddLanguageSetting(German){\color{orange}}| 可以让所有德语以橙色显示（当然，还需要再加上 \lstinline|\AddLanguageSetting{\color{black}}| 来修正其他语言的颜色）。
-\medskip
-\subsection{定理类环境及其引用}
+\LevelTwoTitle{定理类环境及其引用}
定义、定理等环境已经被预定义，可以直接使用。
@@ -240,9 +414,9 @@
具体来说，预设的定理类环境包括：
\texttt{assumption}、\texttt{axiom}、\texttt{conjecture}、\texttt{convention}、\texttt{corollary}、\texttt{definition}、\texttt{definition-proposition}、\texttt{definition-theorem}、\texttt{example}、\texttt{exercise}、\texttt{fact}、\texttt{hypothesis}、\texttt{lemma}、\texttt{notation}、\texttt{observation}、\texttt{problem}、\texttt{property}、\texttt{proposition}、\texttt{question}、\texttt{remark}、\texttt{theorem}，以及相应的带有星号 \lstinline|*| 的无编号版本。
-\medskip
在引用定理类环境时，建议使用智能引用 \lstinline|\cref{|\meta{label}\lstinline|}|。这样就不必每次都写上相应环境的名称了。
+\medskip
\begin{tip}[例子]
\begin{code}
\begin{definition}[奇异物品] \label{def: strange} ...
@@ -249,7 +423,7 @@
\end{code}
将会生成
\begin{definition}[奇异物品]\label{def: strange}
- 这是奇异物品的定义。
+ 这是奇异物品的定义。定理类环境的前后有一行左右的间距。在定义结束的时候会有一个符号来标记。
\end{definition}
\lstinline|\cref{def: strange}| 会显示为：\cref{def: strange}。
@@ -265,6 +439,8 @@
默认情况下，引用时，定理的名称总是与定理所在区域的语言匹配，例如，上面的定义在现在的英文模式下依然显示为中文：\cref{def: strange} 和 \cref{thm}。如果在引用时想让定理的名称与当前语境相匹配，可以在全局选项中加入 \texttt{regionalref}。
\end{tip}
+\UseLanguage{Chinese}
+
\bigskip
下面是定理类环境的几种主要样式：
\begin{theorem}
@@ -301,20 +477,14 @@
Second definition.
\end{definition}
-\UseLanguage{Chinese}
+\LevelTwoTitle{定义新的定理型环境}
-
-\subsection{定义新的定理型环境}
-
若需要定义新的定理类环境，首先要定义这个环境在所用语言下的名称：
-% \vspace{-.15\baselineskip}%
\begin{itemize}
\item \lstinline|\NameTheorem[|\meta{language name}\lstinline|]{|\meta{name of environment}\lstinline|}{|\meta{name string}\lstinline|}|
\end{itemize}
-% \vspace{-.15\baselineskip}%
其中，\meta{language name} 可参阅关于语言设置的小节。当不指定 \meta{language name}时，则会将该名称设置为所有支持语言下的名称。另外，带星号与不带星号的同名环境共用一个名称，因此 \lstinline|\NameTheorem{envname*}{...}| 与 \lstinline|\NameTheorem{envname}{...}| 效果相同。
-\medskip
然后用下面五种方式之一定义这一环境：
\begin{itemize}
\item \lstinline|\CreateTheorem*{|\meta{name of environment}\lstinline|}|
@@ -349,13 +519,11 @@
其内部使用了 \textsf{amsthm}，因此传统的 \texttt{theoremstyle} 对其也是适用的，只需在相关定义前标明即可。
\end{tip}
-% \def\proofideanameCN{思路}
\NameTheorem[CN]{proofidea}{思路}
\CreateTheorem*{proofidea*}
\CreateTheorem{proofidea}<subsection>
-% \bigskip
-\clearpage
+\bigskip
下面提供一个例子。这三行代码：
\begin{code}
@@ -363,18 +531,18 @@
\CreateTheorem*{proofidea*}
\CreateTheorem{proofidea}<subsection>
\end{code}
-
可以分别定义不编号的环境 \lstinline|proofidea*| 和编号的环境 \lstinline|proofidea| (在 subsection 内编号)，它们支持在简体中文语境中使用，效果如下所示:
+\vspace{-.3\baselineskip}
\begin{proofidea*}
\lstinline|proofidea*| 环境。
\end{proofidea*}
-
+\vspace{-.5\baselineskip}
\begin{proofidea}
\lstinline|proofidea| 环境。
\end{proofidea}
-\subsection{未完成标记}
+\LevelTwoTitle{未完成标记}
你可以通过 \lstinline|\dnf| 来标记尚未完成的部分。例如：
\begin{itemize}
@@ -386,10 +554,8 @@
\item \lstinline|\needgraph| 或 \lstinline|\needgraph<...>|。效果为：\needgraph~或 \needgraph<...>其提示文字与当前语言相对应，例如，在法语模式下将会显示为 \UseOtherLanguage{French}{\needgraph}
\end{itemize}
+\LevelTwoTitle{文章标题、摘要与关键词}
-\subsection{关于文章标题、摘要与关键词}
-
-% 由于引入了 \ProjLib{} 工具箱的 \textsf{PJLamssim} 组件，
\lebhart{} 同时具有标准文档类与\AmS{} 文档类的一些特性。
因此，文章的标题部分既可以按照标准文档类 \textsf{article} 的写法来写：
@@ -407,7 +573,6 @@
\end{keyword}
\end{code}
-\clearpage
也可以按照 \AmS{} 文档类的方式来写：
\begin{code}
@@ -439,12 +604,9 @@
其中 \lstinline|\address|、\lstinline|\curraddr|、\lstinline|\email| 的相互顺序是不重要的。
+\LevelOneTitle{目前存在的问题}
-\medskip
-\section{目前存在的问题}
-
\begin{itemize}[itemsep=.6em]
- \item 目录、part 的设计依然有待改良。
\item 对于字体的设置仍然不够完善。
\item 由于很多核心功能建立在 \ProjLib{} 工具箱的基础上，因此 \lebhart{} 自然继承了其所有问题。详情可以参阅 \ProjLib{} 用户文档的“目前存在的问题”这一小节。
\item 错误处理功能不完善，在出现一些问题时没有相应的错误提示。
@@ -452,109 +614,7 @@
\end{itemize}
-\UseLanguage{English}
-
-\clearpage
-\section{文档示例}
-
-\subsection{标准文档类写法}
-
-如果想采用标准文档类中的写法，可以参考下面的例子：
-
-\begin{code}
-\documentclass{lebhart}
-\usepackage{ProjLib} % Load ProjLib toolkit
-
-\UseLanguage{French} % Use French from here
-
-\begin{document}
-
-\title{Le Titre}
-\author{Auteur}
-\date{\PLdate{2022-04-01}}
-
-\maketitle
-
-\begin{abstract}
- Ceci est un résumé. \dnf<Plus de contenu est nécessaire.>
-\end{abstract}
-\begin{keyword}
- AAA, BBB, CCC, DDD, EEE
-\end{keyword}
-
-\section{Un théorème}
-
-%% Theorem-like environments can be used directly
-\begin{theorem}\label{thm:abc}
- Ceci est un théorème.
-\end{theorem}
-
-Référence du théorème: \cref{thm:abc}
- % It is recommended to use clever reference
-
\end{document}
-\end{code}
-
-如果以后想切换到标准文档类，只需要将前两行换为：
-
-\begin{code}
-\documentclass{article}
-\usepackage[a4paper,margin=1in]{geometry}
-\usepackage[hidelinks]{hyperref}
-\usepackage[palatino]{ProjLib} % Load ProjLib toolkit
-\end{code}
-
-
-\clearpage
-\subsection{\texorpdfstring{\AmS{}}{AMS} 文档类写法}
-
-如果日后有意切换到期刊模版，想采用 \AmS{} 文档类中的写法，可以参考下面的例子：
-
-\begin{code}
-\documentclass{lebhart}
-\usepackage{ProjLib} % Load ProjLib toolkit
-
-\UseLanguage{French} % Use French from here
-
-\begin{document}
-
-\title{Le Titre}
-\author{Auteur 1}
-\address{Adresse 1}
-\email{\href{Courriel 1}{Courriel 1}}
-\author{Auteur 1}
-\address{Adresse 1}
-\email{\href{Courriel 2}{Courriel 2}}
-\date{\PLdate{2022-04-01}}
-\subjclass{*****}
-\keywords{...}
-
-\begin{abstract}
- Ceci est un résumé. \dnf<Plus de contenu est nécessaire.>
-\end{abstract}
-
-\maketitle
-
-\section{Première section}
-
-%% Theorem-like environments can be used directly
-\begin{theorem}\label{thm:abc}
- Ceci est un théorème.
-\end{theorem}
-
-Référence du théorème: \cref{thm:abc}
- % It is recommended to use clever reference
-
-\end{document}
-\end{code}
-
-这样，若想切换到 \AmS{} 文档类，只需要将前两行换为：
-
-\begin{code}
-\documentclass{amsart}
-\usepackage[a4paper,margin=1in]{geometry}
-\usepackage[hidelinks]{hyperref}
-\usepackage[palatino]{ProjLib} % Load ProjLib toolkit
-\end{code}
-
-\end{document}
+\endinput
+%%
+%% End of file `lebhart/lebhart-doc-cn.tex'.
Modified: trunk/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-en.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-en.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-en.tex 2021-07-15 19:59:12 UTC (rev 59940)
+++ trunk/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-en.tex 2021-07-15 20:01:19 UTC (rev 59941)
@@ -1,12 +1,11 @@
-%! TEX program = xelatex
-\documentclass[English,French,allowbf,puretext]{lebhart}
+\documentclass[English,Chinese,French,allowbf,puretext]{lebhart}
\theoremstyle{basic}
\CreateTheorem{definition}<highest>
-\CreateTheorem{theorem}<highest>
-\CreateTheorem{conjecture}<highest>
+\CreateTheorem{theorem}[definition]
+\CreateTheorem{conjecture}[definition]
\CreateTheorem*{example*}
-\CreateTheorem{problem}<highest>
+\CreateTheorem{problem}[definition]
\theoremstyle{emphasis}
\CreateTheorem{remark}<highest>
@@ -19,9 +18,14 @@
\usepackage{ProjLib}
\usepackage{longtable} % breakable tables
\usepackage{hologo} % more TeX logo
+\usetikzlibrary{calc}
+\usepackage{blindtext}
+
+\UseLanguage{English}
+
%%================================
-%% For typestting code
+%% For typesetting code
%%================================
\usepackage{listings}
\definecolor{maintheme}{RGB}{70,130,180}
@@ -40,19 +44,27 @@
escapeinside={(*}{*)},
% numbers=left,
numberstyle=\scriptsize, stepnumber=1, numbersep=5pt,
- firstnumber=last,
-}
+ % firstnumber=last,
+}
\providecommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$}
\lstset{moretexcs=%
- {subsubsection,href,color,NameTheorem,CreateTheorem,proofideanameEN,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,PLdate,ProjLib
+ {part,parttext,chapter,section,subsection,subsubsection,frontmatter,mainmatter,backmatter,tableofcontents,href,
+ color,NameTheorem,CreateTheorem,proofideanameEN,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,PLdate,ProjLib,qedhere
}
}
-\lstnewenvironment{code}%
-{\setkeys{lst}{columns=fullflexible,keepspaces=true}}{}
+\lstnewenvironment{code}%
+{\setstretch{1.07}%
+\setkeys{lst}{columns=fullflexible,keepspaces=true}%
+}{}
+\lstnewenvironment{code*}%
+{\setstretch{1.07}%
+\setkeys{lst}{numbers=left,columns=fullflexible,keepspaces=true}%
+}{}
%%================================
%% tip
%%================================
+\usepackage[many]{tcolorbox}
\newenvironment{tip}[1][Tip]{%
\begin{tcolorbox}[breakable,
enhanced,
@@ -73,21 +85,29 @@
%%================================
%% Names
%%================================
-\providecommand{\colorist}{{\normalfont\textsf{colorist}}}
-\providecommand{\colorart}{{\normalfont\textsf{colorart}}}
-\providecommand{\colorbook}{{\normalfont\textsf{colorbook}}}
-\providecommand{\lebhart}{{\normalfont\textsf{lebhart}}}
-\providecommand{\beaulivre}{{\normalfont\textsf{beaulivre}}}
+\providecommand{\colorist}{\textsf{colorist}}
+\providecommand{\colorart}{\textsf{colorart}}
+\providecommand{\colorbook}{\textsf{colorbook}}
+\providecommand{\lebhart}{\textsf{lebhart}}
+\providecommand{\beaulivre}{\textsf{beaulivre}}
%%================================
+%% Titles
+%%================================
+\let\LevelOneTitle\section
+\let\LevelTwoTitle\subsection
+\let\LevelThreeTitle\subsubsection
+
+%%================================
%% Main text
%%================================
\begin{document}
-\title{{\normalfont\textbf{\textsf{lebhart}}}, write your articles in a colorful way}
+\title{\lebhart{}, write your articles in a colorful way}
\author{Jinwen XU}
-\thanks{Corresponding to: \texttt{\lebhart{} 2021/06/30}}
-\date{June 2021, Beijing}
+\thanks{Corresponding to: \texttt{\lebhart{} 2021/07/15}}
+\email{\href{mailto:ProjLib at outlook.com}{ProjLib at outlook.com}}
+\date{July 2021, Beijing}
\maketitle
@@ -95,63 +115,238 @@
\lebhart{} is a member of the \colorist{} class series. Its name is taken from German word ``lebhaft'' (``vividly''), combined with the first three letters of ``artikel'' (``article''). The entire collection includes \colorart{} and \lebhart{} for typesetting articles and \colorbook{} and \beaulivre{} for typesetting books. My original intention in designing this series was to write drafts and notes that look colorful yet not dazzling.
\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.
\end{abstract}
+
+\setcounter{tocdepth}{2}
\tableofcontents
-\vspace{2.5\baselineskip}
-\begin{tip}
- Multi-language support, theorem-like environments, draft marks and some other features are provided by the \ProjLib{} toolkit. Here we only briefly discuss how to use it with this document class. For more detailed information, you can refer to the documentation of \ProjLib{}.
-\end{tip}
+\medskip
+\LevelOneTitle*{Before you start}
+\addcontentsline{toc}{section}{Before you start}
+In order to use the package or classes described here, you need to:
+\begin{itemize}
+ \item install TeX Live or MikTeX of the latest possible version, and make sure that \texttt{colorist} and \texttt{projlib} are correctly installed in your \TeX{} system.
+ \item be familiar with the basic usage of \LaTeX{}, and knows how to compile your document with \hologo{pdfLaTeX}, \hologo{XeLaTeX} or \hologo{LuaLaTeX}.
+\end{itemize}
-\clearpage
-\section{Initialization}
-\subsection{How to load it}
+\LevelOneTitle{Usage and examples}
+\LevelTwoTitle{How to load it}
+
One only needs to put
+
\begin{code}
\documentclass{lebhart}
\end{code}
as the first line to use the \lebhart{} class. Please note that you need to use either \hologo{XeLaTeX} or \hologo{LuaLaTeX} engine to compile.
-\subsection{Options}
+\LevelTwoTitle{Example - A complete document}
-\lebhart{} offers the following options:
+Let's first look at a complete document.
+\begin{code*}
+\documentclass{lebhart}
+\usepackage{ProjLib}
+
+\UseLanguage{French}
+
+\begin{document}
+
+\title{(*\meta{title}*)}
+\author{(*\meta{author}*)}
+\date{\PLdate{2022-04-01}}
+
+\maketitle
+
+\begin{abstract}
+ Ceci est un résumé. \dnf<Plus de contenu est nécessaire.>
+\end{abstract}
+\begin{keyword}
+ AAA, BBB, CCC, DDD, EEE
+\end{keyword}
+
+\section{Un théorème}
+
+\begin{theorem}\label{thm:abc}
+ Ceci est un théorème.
+\end{theorem}
+Référence du théorème: \cref{thm:abc}
+
+\end{document}
+\end{code*}
+
+
+If you find this example a little complicated, don't worry. Let's now look at this example piece by piece.
+
+\clearpage
+\LevelThreeTitle{Initialization}
+
+\medskip
+\begin{code}
+\documentclass{lebhart}
+\usepackage{ProjLib}
+\end{code}
+
+Initialization is straightforward. The first line loads the document class \lebhart{}, and the second line loads the \ProjLib{} toolkit to obtain some additional functionalities.
+
+\LevelThreeTitle{Set the language}
+
+\medskip
+\begin{code}
+\UseLanguage{French}
+\end{code}
+
+This line indicates that French will be used in the document (by the way, if only English appears in your article, then there is no need to set the language). You can also switch the language in the same way later in the middle of the text. Supported languages include Simplified Chinese, Traditional Chinese, Japanese, English, French, German, Spanish, Portuguese, Brazilian Portuguese and Russian%
+.%
+
+For detailed description of this command and more related commands, please refer to the section on the multi-language support.
+
+\LevelThreeTitle{Title, author information, abstract and keywords}
+
+\medskip
+\begin{code}
+\title{(*\meta{title}*)}
+\author{(*\meta{author}*)}
+\date{\PLdate{2022-04-01}}
+\maketitle
+
+\begin{abstract}
+ (*\meta{abstract}*)
+\end{abstract}
+\begin{keyword}
+ (*\meta{keywords}*)
+\end{keyword}
+\end{code}
+
+This part begins with the title and author information block. The example shows the basic usage, but in fact, you can also write:
+
+\begin{code}
+\author{(*\meta{author 1}*)}
+\address{(*\meta{address 1}*)}
+\email{(*\meta{email 1}*)}
+\author{(*\meta{author 2}*)}
+\address{(*\meta{address 2}*)}
+\email{(*\meta{email 2}*)}
+...
+\end{code}
+
+In addition, you may also write in the \AmS{} fashion, i.e.:
+
+\begin{code}
+\title{(*\meta{title}*)}
+\author{(*\meta{author 1}*)}
+\address{(*\meta{address 1}*)}
+\email{(*\meta{email 1}*)}
+\author{(*\meta{author 2}*)}
+\address{(*\meta{address 2}*)}
+\email{(*\meta{email 2}*)}
+\date{\PLdate{2022-04-01}}
+\subjclass{*****}
+\keywords{(*\meta{keywords}*)}
+
+\begin{abstract}
+ (*\meta{abstract}*)
+\end{abstract}
+
+\maketitle
+\end{code}
+
+\LevelThreeTitle{Draft marks}
+
+\medskip
+\begin{code}
+\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.
+
+\LevelThreeTitle{Theorem-like environments}
+
+\medskip
+\begin{code}
+\begin{theorem}\label{thm:abc}
+ Ceci est un théorème.
+\end{theorem}
+Référence du théorème: \cref{thm:abc}
+\end{code}
+
+Commonly used theorem-like environments have been pre-defined. Also, when referencing a theorem-like environment, it is recommended to use \lstinline|\cref{|\meta{label}\texttt{\}} --- in this way, there is no need to explicitly write down the name of the corresponding environment every time.
+
+\begin{tip}
+If you wish to switch to the standard class later, just replace the first two lines with:
+
+\begin{code}
+\documentclass{article}
+\usepackage[a4paper,margin=1in]{geometry}
+\usepackage[hidelinks]{hyperref}
+\usepackage[palatino,amsfashion]{ProjLib}
+\end{code}
+
+or to use the \AmS{} class:
+
+\begin{code}
+\documentclass{amsart}
+\usepackage[a4paper,margin=1in]{geometry}
+\usepackage[hidelinks]{hyperref}
+\usepackage[palatino]{ProjLib}
+\end{code}
+
+\end{tip}
+
+\begin{tip}
+If you like the current document class, but want a more ``plain'' style, then you can use the option \texttt{classical}, like this:
+
+\begin{code}
+\documentclass[classical]{lebhart}
+\end{code}
+\end{tip}
+
+
+\LevelOneTitle{On the default fonts}
+By default, \lebhart{} uses Palatino Linotype as the English font, FounderType's YouSong and YouHei GBK as the Chinese fonts\footnote{For detail, pleaser visit FounderType's website: \url{https://www.foundertype.com}.}, and partially uses Neo Euler as the math font. Among them, Neo Euler can be downloaded at \url{https://github.com/khaledhosny/euler-otf}. The other fonts are not free, you need to purchase and install them on your own.
+
+
+When the corresponding font is not installed, fonts that comes with TeX Live will be used instead. In this case, the experience might be reduced.
+
+\LevelOneTitle{The options}
+
+\lebhart{} offers the following options:
+
\begin{itemize}
\item The language options \texttt{EN} / \texttt{english} / \texttt{English}, \texttt{FR} / \texttt{french} / \texttt{French}, etc.
\begin{itemize}
\item For the option names of a specific language, please refer to \meta{language name} in the next section. The first specified language will be used as the default language.
+ \item The language options are optional, mainly for increasing the compilation speed. Without them the result would be the same, only slower.
\end{itemize}
\item \texttt{draft} or \texttt{fast}
\begin{itemize}
\item The option \verb|fast| enables a faster but slightly rougher style, main differences are:
\begin{itemize}
- \item Use simpler math font configuration;
- \item Do not use \textsf{hyperref};
+ \item Use simpler math font configuration;
+ \item Do not use \textsf{hyperref};
\item Enable the fast mode of \ProjLib{} toolkit.
\end{itemize}
\end{itemize}
-\begin{tip}
- During the draft stage, it is recommended to use the \verb|fast| option to speed up compilation. When in \verb|fast| mode, there will be a watermark ``DRAFT'' to indicate that you are currently in the draft mode.
-\end{tip}
-\medskip
+ \begin{tip}
+ During the draft stage, it is recommended to use the \verb|fast| option to speed up compilation. When in \verb|fast| mode, there will be a watermark ``DRAFT'' to indicate that you are currently in the draft mode.
+ \end{tip}
\item \texttt{a4paper} or \texttt{b5paper}
\begin{itemize}
- \item Optional paper size. The default paper size is 8.5in $\times$ 11in.
+ \item Paper size options. The default paper size is 8.5in $\times$ 11in.
\end{itemize}
\item \texttt{palatino}, \texttt{times}, \texttt{garamond}, \texttt{biolinum} ~$|$~ \texttt{useosf}
\begin{itemize}
- \item Font options. As the name suggest, font with corresponding name will be loaded.
+ \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}
\begin{itemize}
- \item Allow boldface. When this option is enabled, the title, titles of all levels and names of theorem-like environments will be bolded.
+ \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}
\item \texttt{runin}
\begin{itemize}
@@ -167,27 +362,11 @@
\end{itemize}
\end{itemize}
-\clearpage
-\section{On the default fonts}
-By default, \lebhart{} uses Palatino Linotype as the English font, FounderType's YouSong and YouHei GBK as the Chinese fonts, and partially uses Neo Euler as the math font. Among them, Neo Euler can be downloaded at \url{https://github.com/khaledhosny/euler-otf}. The other fonts are not free, you need to purchase and install them on your own. (For the Chinese fonts, visit FounderType's website for detail: \url{https://www.foundertype.com} ).
-\begin{tip}[Font demonstration]
- \begin{itemize}
- \item English main font. \textsf{English sans serif font}. \texttt{English typewriter font}.
- \item 中文主要字体，\textsf{中文无衬线字体}
- \item 数学示例: \( \alpha, \beta, \gamma, \delta, 1,2,3,4, a,b,c,d \), \[\mathrm{li}(x)\coloneqq \int_2^{\infty} \frac{1}{\log t}\,\mathrm{d}t \]
- \end{itemize}
-\end{tip}
+\LevelOneTitle{Instructions by topic}
-When the corresponding font is not installed, fonts that comes with TeX Live will be used instead. In this case, the experience might be reduced.
+\LevelTwoTitle{Language configuration}
-\section{Some instructions}
-
-Many of the features described next are provided by the \ProjLib{} toolkit. Only the basic usage is mentioned here. For more details, please refer to its user documentation.
-
-\bigskip
-\subsection{Language configuration}
-
\lebhart{} has multi-language support, including Chinese (simplified and traditional), English, French, German, Italian, Japanese, Portuguese (European and Brazilian), Russian and Spanish. The language can be selected by the following macros:
\begin{itemize}
@@ -210,8 +389,7 @@
\item Russian: \texttt{RU} or \texttt{Russian}
\end{itemize}
-% \medskip
-\clearpage
+\medskip
In addition, you can also add new settings to selected language:
\begin{itemize}
\item \lstinline|\AddLanguageSetting{|\meta{settings}\lstinline|}|
@@ -225,15 +403,13 @@
\end{itemize}
For example, \lstinline|\AddLanguageSetting(German){\color{orange}}| can make all German text displayed in orange (of course, one then need to add \lstinline|\AddLanguageSetting{\color{black}}| in order to correct the color of the text in other languages).
-\bigskip
-\subsection{Theorems and how to reference them}
+\LevelTwoTitle{Theorems and how to reference them}
-Environments such as \texttt{definition} and \texttt{theorem} have been pre-defined and can be used directly.
+Environments such as \texttt{definition} and \texttt{theorem} have been preset and can be used directly.
-More specifically, preset environments include:
+More specifically, preset environments include:
\texttt{assumption}, \texttt{axiom}, \texttt{conjecture}, \texttt{convention}, \texttt{corollary}, \texttt{definition}, \texttt{definition-proposition}, \texttt{definition-theorem}, \texttt{example}, \texttt{exercise}, \texttt{fact}, \texttt{hypothesis}, \texttt{lemma}, \texttt{notation}, \texttt{observation}, \texttt{problem}, \texttt{property}, \texttt{proposition}, \texttt{question}, \texttt{remark}, \texttt{theorem}, and the corresponding unnumbered version with an asterisk \lstinline|*| in the name. The titles will change with the current language. For example, \texttt{theorem} will be displayed as ``Theorem" in English mode and ``Théorème" in French mode.
-\medskip
When referencing a theorem-like environment, it is recommended to use \lstinline|\cref{|\meta{label}\texttt{\}}. In this way, there is no need to explicitly write down the name of the corresponding environment every time.
\begin{tip}[Example]
@@ -243,12 +419,11 @@
will produce
\begin{definition}[Strange things]\label{def: strange}
- This is the definition of some strange objects.
+ This is the definition of some strange objects. There is approximately an one-line space before and after the theorem environment, and there will be a symbol to mark the end of the environment.
\end{definition}
\lstinline|\cref{def: strange}| will be displayed as: \cref{def: strange}.
-\medskip
After using \lstinline|\UseLanguage{French}|, a theorem will be displayed as:
\UseLanguage{French}
@@ -259,6 +434,7 @@
By default, when referenced, the name of the theorem always matches the language of the context in which the theorem is located. For example, the definition above is still displayed in English in the current French mode: \cref{def: strange} and \cref{thm}. If you want the name of the theorem to match the current context when referencing, you can add \texttt{regionalref} to the global options.
\end{tip}
+\UseLanguage{English}
\bigskip
The following are the main styles of theorem-like environments:
@@ -296,15 +472,13 @@
Second definition.
\end{definition}
-\UseLanguage{English}
+\LevelTwoTitle{Define a new theorem-like environment}
-
-\subsection{Define a new theorem-like environment}
-
If you need to define a new theorem-like environment, you must first define the name of the environment in the language to use:
\begin{itemize}
\item \lstinline|\NameTheorem[|\meta{language name}\lstinline|]{|\meta{name of environment}\lstinline|}{|\meta{name string}\lstinline|}|
\end{itemize}
+\clearpage
For \meta{language name}, please refer to the section on language configuration. When \meta{language name} is not specified, the name will be set for all supported languages. In addition, environments with or without asterisk share the same name, therefore, \lstinline|\NameTheorem{envname*}{...}| has the same effect as \lstinline|\NameTheorem{envname}{...}| .
\medskip
@@ -324,7 +498,7 @@
\end{itemize}
\item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}<|\meta{numbered within}\lstinline|>|
\begin{itemize}
- \item Define a numbered environment \meta{name of environment}, numbered within the \\counter \meta{numbered within}
+ \item Define a numbered environment \meta{name of environment}, numbered within the counter \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|)|
@@ -332,8 +506,8 @@
\item Identify \meta{name of environment} with \meta{existed environment} or \meta{existed environment}\lstinline|*|.
\item This method is usually useful in the following two situations:
\begin{enumerate}
- \item To use a more concise name. For example, with \lstinline|\CreateTheorem{thm}|\\\lstinline|(theorem)|, one can then use the name \texttt{thm} to write theorem.
- \item To remove the numbering. For example, one can remove the numbering of the \texttt{remark} environment with \lstinline|\CreateTheorem{remark}(remark*)|.
+ \item To use a more concise name. For example, with \lstinline|\CreateTheorem{thm}(theorem)|, one can then use the name \texttt{thm} to write theorem.
+ \item To remove the numbering of some environments. For example, one can remove the numbering of the \texttt{remark} environment with \lstinline|\CreateTheorem{remark}(remark*)|.
\end{enumerate}
\end{itemize}
\end{itemize}
@@ -342,31 +516,32 @@
This macro utilizes the feature of \textsf{amsthm} internally, so the traditional \texttt{theoremstyle} is also applicable to it. One only needs declare the style before the relevant definitions.
\end{tip}
-% \def\proofideanameEN{Idea}
\NameTheorem[EN]{proofidea}{Idea}
\CreateTheorem*{proofidea*}
\CreateTheorem{proofidea}<subsection>
-% \bigskip
-\clearpage
+\bigskip
Here is an example. The following code:
+
\begin{code}
\NameTheorem[EN]{proofidea}{Idea}
\CreateTheorem*{proofidea*}
\CreateTheorem{proofidea}<subsection>
\end{code}
-defines an unnumbered environment \lstinline|proofidea*| and a numbered environment \lstinline|proofidea| (numbered within subsection) respectively. They can be used in English context. The effect is as follows:
+defines an unnumbered environment \lstinline|proofidea*| and a numbered environment \lstinline|proofidea| (numbered within subsection) respectively. They can be used in English context.
+The effect is as follows:
+\vspace{-0.3\baselineskip}
\begin{proofidea*}
The \lstinline|proofidea*| environment.
\end{proofidea*}
+\vspace{-\baselineskip}
\begin{proofidea}
The \lstinline|proofidea| environment.
\end{proofidea}
-\medskip
-\subsection{Draft mark}
+\LevelTwoTitle{Draft mark}
You can use \lstinline|\dnf| to mark the unfinished part. For example:
\begin{itemize}
@@ -373,12 +548,12 @@
\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}
-Similarly, there is \lstinline|\needgraph| :
+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}
\end{itemize}
-\subsection{On the title, abstract and keywords}
+\LevelTwoTitle{Title, abstract and keywords}
\lebhart{} has both the features of standard classes and that of the \AmS{} classes.
@@ -396,7 +571,7 @@
(*\meta{keywords}*)
\end{keyword}
\end{code}
-\clearpage
+
or written in the way of \AmS{} classes:
\begin{code}
@@ -414,7 +589,6 @@
\maketitle
\end{code}
-\medskip
The author information can contain multiple groups, written as:
\begin{code}
@@ -429,117 +603,17 @@
Among them, the mutual order of \lstinline|\address|, \lstinline|\curraddr|, \lstinline|\email| is not important.
+\LevelOneTitle{Known issues}
-\section{Known issues}
-
\begin{itemize}[itemsep=.6em]
\item The font settings are still not perfect.
- \item Since many features are based on the \ProjLib{} toolkit, \lebhart{} inherits all its problems. For details, please refer to the "Known Issues" section of the \ProjLib{} documentation.
+ \item Since many features are based on the \ProjLib{} toolkit, \colorist{} (and hence \colorart{}, \lebhart{} and \colorbook{}, \beaulivre{}) inherits all its problems. For details, please refer to the ``Known Issues'' section of the \ProjLib{} documentation.
\item The error handling mechanism is incomplete: there is no corresponding error prompt when some problems occur.
\item There are still many things that can be optimized in the code.
\end{itemize}
-\clearpage
-\section{Document templates}
-\subsection{The standard way}
-
-If you want to write in the standard way, you can refer to the following example:
-
-\begin{code}
-\documentclass{lebhart}
-\usepackage{ProjLib} % Load ProjLib toolkit
-
-\UseLanguage{French} % Use French from here
-
-\begin{document}
-
-\title{Le Titre}
-\author{Auteur}
-\date{\PLdate{2022-04-01}}
-
-\maketitle
-
-\begin{abstract}
- Ceci est un résumé. \dnf<Plus de contenu est nécessaire.>
-\end{abstract}
-\begin{keyword}
- AAA, BBB, CCC, DDD, EEE
-\end{keyword}
-
-\section{Un théorème}
-
-%% Theorem-like environments can be used directly
-\begin{theorem}\label{thm:abc}
- Ceci est un théorème.
-\end{theorem}
-
-Référence du théorème: \cref{thm:abc}
- % It is recommended to use clever reference
-
\end{document}
-\end{code}
-
-If you wish to switch to the standard class later, just replace the first two lines with:
-
-\begin{code}
-\documentclass{article}
-\usepackage[a4paper,margin=1in]{geometry}
-\usepackage[hidelinks]{hyperref}
-\usepackage[palatino]{ProjLib} % Load ProjLib toolkit
-\end{code}
-
-
-\clearpage
-\subsection{The \texorpdfstring{\AmS{}}{AMS} way}
-
-If you intend to switch to the journal template in the future and thus want to use the writing style as in the \AmS{} classes, you can refer to the following example:
-
-\begin{code}
-\documentclass{lebhart}
-\usepackage{ProjLib} % Load ProjLib toolkit
-
-\UseLanguage{French} % Use French from here
-
-\begin{document}
-
-\title{Le Titre}
-\author{Auteur 1}
-\address{Adresse 1}
-\email{\href{Courriel 1}{Courriel 1}}
-\author{Auteur 1}
-\address{Adresse 1}
-\email{\href{Courriel 2}{Courriel 2}}
-\date{\PLdate{2022-04-01}}
-\subjclass{*****}
-\keywords{...}
-
-\begin{abstract}
- Ceci est un résumé. \dnf<Plus de contenu est nécessaire.>
-\end{abstract}
-
-\maketitle
-
-\section{Première section}
-
-%% Theorem-like environments can be used directly
-\begin{theorem}\label{thm:abc}
- Ceci est un théorème.
-\end{theorem}
-
-Référence du théorème: \cref{thm:abc}
- % It is recommended to use clever reference
-
-\end{document}
-\end{code}
-
-In this way, if you wish to switch to \AmS{} class later, just replace the first two lines with:
-
-\begin{code}
-\documentclass{amsart}
-\usepackage[a4paper,margin=1in]{geometry}
-\usepackage[hidelinks]{hyperref}
-\usepackage[palatino]{ProjLib} % Load ProjLib toolkit
-\end{code}
-
-\end{document}
+\endinput
+%%
+%% End of file `lebhart/lebhart-doc-en.tex'.
Added: trunk/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-fr.pdf
===================================================================
(Binary files differ)
Index: trunk/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-fr.pdf
===================================================================
--- trunk/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-fr.pdf 2021-07-15 19:59:12 UTC (rev 59940)
+++ trunk/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-fr.pdf 2021-07-15 20:01:19 UTC (rev 59941)
Property changes on: trunk/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-fr.pdf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/pdf
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-fr.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-fr.tex (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-fr.tex 2021-07-15 20:01:19 UTC (rev 59941)
@@ -0,0 +1,616 @@
+\documentclass[English,Chinese,French,allowbf,puretext]{lebhart}
+
+\theoremstyle{basic}
+\CreateTheorem{definition}<highest>
+\CreateTheorem{theorem}[definition]
+\CreateTheorem{conjecture}[definition]
+\CreateTheorem*{example*}
+\CreateTheorem{problem}[definition]
+
+\theoremstyle{emphasis}
+\CreateTheorem{remark}<highest>
+
+\theoremstyle{simple}
+
+%%================================
+%% Import toolkit
+%%================================
+\usepackage{ProjLib}
+\usepackage{longtable} % breakable tables
+\usepackage{hologo} % more TeX logo
+\usetikzlibrary{calc}
+
+\usepackage{blindtext}
+
+\UseLanguage{French}
+
+%%================================
+%% For typesetting code
+%%================================
+\usepackage{listings}
+\definecolor{maintheme}{RGB}{70,130,180}
+\definecolor{forestgreen}{RGB}{21,122,81}
+\definecolor{lightergray}{gray}{0.99}
+\lstset{language=[LaTeX]TeX,
+ keywordstyle=\color{maintheme},
+ basicstyle=\ttfamily,
+ commentstyle=\color{forestgreen}\ttfamily,
+ stringstyle=\rmfamily,
+ showstringspaces=false,
+ breaklines=true,
+ frame=lines,
+ backgroundcolor=\color{lightergray},
+ flexiblecolumns=true,
+ escapeinside={(*}{*)},
+ % numbers=left,
+ numberstyle=\scriptsize, stepnumber=1, numbersep=5pt,
+ % firstnumber=last,
+}
+\providecommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$}
+\lstset{moretexcs=%
+ {part,parttext,chapter,section,subsection,subsubsection,frontmatter,mainmatter,backmatter,tableofcontents,href,
+ color,NameTheorem,CreateTheorem,proofideanameEN,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,PLdate,ProjLib,qedhere
+ }
+}
+\lstnewenvironment{code}%
+{\setstretch{1.07}%
+\setkeys{lst}{columns=fullflexible,keepspaces=true}%
+}{}
+\lstnewenvironment{code*}%
+{\setstretch{1.07}%
+\setkeys{lst}{numbers=left,columns=fullflexible,keepspaces=true}%
+}{}
+
+%%================================
+%% tip
+%%================================
+\usepackage[many]{tcolorbox}
+\newenvironment{tip}[1][Astuce]{%
+ \begin{tcolorbox}[breakable,
+ enhanced,
+ width = \textwidth,
+ colback = paper, colbacktitle = paper,
+ colframe = gray!50, boxrule=0.2mm,
+ coltitle = black,
+ fonttitle = \sffamily,
+ attach boxed title to top left = {yshift=-\tcboxedtitleheight/2, xshift=.5cm},
+ boxed title style = {boxrule=0pt, colframe=paper},
+ before skip = 0.3cm,
+ after skip = 0.3cm,
+ top = 3mm,
+ bottom = 3mm,
+ title={\scshape\sffamily #1}]%
+}{\end{tcolorbox}}
+
+%%================================
+%% Names
+%%================================
+\providecommand{\colorist}{\textsf{colorist}}
+\providecommand{\colorart}{\textsf{colorart}}
+\providecommand{\colorbook}{\textsf{colorbook}}
+\providecommand{\lebhart}{\textsf{lebhart}}
+\providecommand{\beaulivre}{\textsf{beaulivre}}
+
+%%================================
+%% Titles
+%%================================
+\let\LevelOneTitle\section
+\let\LevelTwoTitle\subsection
+\let\LevelThreeTitle\subsubsection
+
+%%================================
+%% Main text
+%%================================
+\begin{document}
+
+\title{\lebhart{}, écrivez vos articles de manière colorée}
+\author{Jinwen XU}
+\thanks{Correspondant à : \texttt{\lebhart{} 2021/07/15}}
+\email{\href{mailto:ProjLib at outlook.com}{ProjLib at outlook.com}}
+\date{juillet 2021, à Pékin}
+
+\maketitle
+
+\begin{abstract}
+ \lebhart{} fait partie de la série de classes \colorist{}, dont le nom est tiré du mot allemand « lebhaft » (animé), combiné avec les trois premières lettres de « artikel » (article) . L'ensemble de la collection comprend \colorart{} et \lebhart{} pour la composition d'articles, et \colorbook{} et \beaulivre{} pour celle des livres. Mon intention initiale en les concevant était d'écrire des brouillons et des notes qui ont l'air coloré mais pas éblouissant.
+
+ \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.
+\end{abstract}
+
+
+\setcounter{tocdepth}{2}
+\tableofcontents
+
+
+\LevelOneTitle*{Avant de commencer}
+\addcontentsline{toc}{section}{Avant de commencer}
+
+Pour utiliser les classes de documents décrites ici, vous devez :
+\begin{itemize}
+ \item installer TeX Live ou MikTeX de la dernière version possible, et vous assurer que \texttt{colorist} et \texttt{projlib} sont correctement installés dans votre système \TeX{}.
+ \item être familiarisé avec l'utilisation de base de \LaTeX{}, et savoir comment compiler vos documents avec \hologo{pdfLaTeX}, \hologo{XeLaTeX} ou \hologo{LuaLaTeX}.
+\end{itemize}
+
+
+\LevelOneTitle{Utilisation et exemples}
+
+\LevelTwoTitle{Comment l'ajouter}
+
+Il suffit simplement de mettre
+
+\begin{code}
+ \documentclass{lebhart}
+\end{code}
+
+comme première ligne pour utiliser la classe \lebhart{}. Veuillez noter que vous devez utiliser le moteur \hologo{XeLaTeX} ou \hologo{LuaLaTeX} pour compiler.
+
+\LevelTwoTitle{Exemple - Un document complet}
+
+Regardons d'abord un document complet.
+
+\begin{code*}
+\documentclass{lebhart}
+\usepackage{ProjLib}
+
+\UseLanguage{French}
+
+\begin{document}
+
+\title{(*\meta{title}*)}
+\author{(*\meta{author}*)}
+\date{\PLdate{2022-04-01}}
+
+\maketitle
+
+\begin{abstract}
+ Ceci est un résumé. \dnf<Plus de contenu est nécessaire.>
+\end{abstract}
+\begin{keyword}
+ AAA, BBB, CCC, DDD, EEE
+\end{keyword}
+
+\section{Un théorème}
+
+\begin{theorem}\label{thm:abc}
+ Ceci est un théorème.
+\end{theorem}
+Référence du théorème: \cref{thm:abc}
+
+\end{document}
+\end{code*}
+
+
+Si vous trouvez cela un peu compliqué, ne vous inquiétez pas. Examinons maintenant cet exemple pièce par pièce.
+
+\clearpage
+\LevelThreeTitle{Initialisation}
+
+\medskip
+\begin{code}
+\documentclass{lebhart}
+\usepackage{ProjLib}
+\end{code}
+
+L'initialisation est simple. La première ligne ajoute la classe de document \lebhart{}, et la deuxième ligne ajoute la boîte à outils \ProjLib{} pour obtenir des fonctionnalités supplémentaires.
+
+\LevelThreeTitle{Choisir la langue}
+
+\medskip
+\begin{code}
+\UseLanguage{French}
+\end{code}
+
+Cette ligne indique que le français sera utilisé dans le document (d'ailleurs, si seul l'anglais apparaît dans votre article, alors il n'est pas nécessaire de choisir la langue). Vous pouvez également changer de langue de la même manière plus tard au milieu du texte. Les langues prises en charge sont les suivantes : chinois simplifié, chinois traditionnel, japonais, anglais, français, allemand, espagnol, portugais, portugais brésilien et russe.
+
+Pour une description détaillée de cette commande et d'autres commandes associées, veuillez vous référer à la section sur le support multilingue.
+
+\LevelThreeTitle{Titre, informations sur l'auteur, résumé et mots-clés}
+
+\medskip
+\begin{code}
+\title{(*\meta{title}*)}
+\author{(*\meta{author}*)}
+\date{\PLdate{2022-04-01}}
+\maketitle
+
+\begin{abstract}
+ (*\meta{abstract}*)
+\end{abstract}
+\begin{keyword}
+ (*\meta{keywords}*)
+\end{keyword}
+\end{code}
+
+Cette partie commence par le titre et le bloc d'informations sur l'auteur. L'exemple montre l'utilisation de base, mais en fait, vous pouvez également écrire comme :
+
+\begin{code}
+\author{(*\meta{author 1}*)}
+\address{(*\meta{address 1}*)}
+\email{(*\meta{email 1}*)}
+\author{(*\meta{author 2}*)}
+\address{(*\meta{address 2}*)}
+\email{(*\meta{email 2}*)}
+...
+\end{code}
+
+De plus, vous pouvez également écrire à la manière \AmS{}, c'est-à-dire :
+
+\begin{code}
+\title{(*\meta{title}*)}
+\author{(*\meta{author 1}*)}
+\address{(*\meta{address 1}*)}
+\email{(*\meta{email 1}*)}
+\author{(*\meta{author 2}*)}
+\address{(*\meta{address 2}*)}
+\email{(*\meta{email 2}*)}
+\date{\PLdate{2022-04-01}}
+\subjclass{*****}
+\keywords{(*\meta{keywords}*)}
+
+\begin{abstract}
+ (*\meta{abstract}*)
+\end{abstract}
+
+\maketitle
+\end{code}
+
+\LevelThreeTitle{Marques de brouillon}
+
+\medskip
+\begin{code}
+\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.
+
+\LevelThreeTitle{Environnements de type théorème}
+
+\medskip
+\begin{code}
+\begin{theorem}\label{thm:abc}
+ Ceci est un théorème.
+\end{theorem}
+Référence du théorème: \cref{thm:abc}
+\end{code}
+
+Les environnements de type théorème couramment utilisés ont été prédéfinis. De plus, lors du référencement d'un environnement de type théorème, il est recommandé d'utiliser \lstinline|\cref{|\meta{label}\texttt{\}} --- de cette manière, il ne serait pas nécessaire d'écrire explicitement le nom de l'environnement correspondant à chaque fois.
+
+\begin{tip}
+Si vous souhaitez utiliser la classe standard à la place plus tard, remplacez simplement les deux premières lignes par :
+
+\begin{code}
+\documentclass{article}
+\usepackage[a4paper,margin=1in]{geometry}
+\usepackage[hidelinks]{hyperref}
+\usepackage[palatino,amsfashion]{ProjLib}
+\end{code}
+
+ou utilisez la classe \AmS{} :
+
+\begin{code}
+\documentclass{amsart}
+\usepackage[a4paper,margin=1in]{geometry}
+\usepackage[hidelinks]{hyperref}
+\usepackage[palatino]{ProjLib}
+\end{code}
+\vspace{-.5\baselineskip}
+\end{tip}
+
+\begin{tip}
+Si vous aimez la classe de document actuelle, mais que vous souhaitez un style plus « simple », vous pouvez utiliser l'option \texttt{classical}, comme ceci :
+
+\begin{code}
+\documentclass[classical]{lebhart}
+\end{code}
+\vspace{-.5\baselineskip}
+\end{tip}
+
+
+\LevelOneTitle{À propos des polices par défaut}
+Par défaut, cette classe de document utilise Palatino Linotype comme police anglaise, YouSong et YouHei GBK de FounderType comme polices chinoises\footnote{Pour plus de détails, veuillez visiter le site web de FounderType : \url{https://www.foundertype.com}.}, et utilise partiellement Neo Euler comme police mathématique. Parmi eux, Neo Euler peut être téléchargé sur \url{https://github.com/khaledhosny/euler-otf}. Les autres polices ne sont pas gratuites, vous devez les acheter et les installer vous-même.
+
+
+Lorsque la police correspondante n'est pas installée, les polices fournies avec TeX Live seront utilisées à la place. Dans ce cas, l'expérience peut être réduite.
+
+
+\LevelOneTitle{Les options}
+
+
+\begin{itemize}
+ \item Les options de langue \texttt{EN} / \texttt{english} / \texttt{English}, \texttt{FR} / \texttt{french} / \texttt{French}, etc.
+ \begin{itemize}
+ \item Pour les noms d'options d'une langue spécifique, veuillez vous référer à \meta{language name} dans la section suivante. La première langue spécifiée sera considérée comme la langue par défaut.
+ \item Les options de langue ne sont pas nécessaires, elles servent principalement à augmenter la vitesse de compilation. Sans eux, le résultat serait le même, justement plus lent.
+ \end{itemize}
+ \item \texttt{draft} ou \texttt{fast}
+ \begin{itemize}
+ \item L'option \verb|fast| permet un style plus rapide mais légèrement plus rugueux, les principales différences sont :
+ \begin{itemize}
+ \item Utilisez une configuration de police mathématique plus simple ;
+ \item N'utilisez pas \textsf{hyperref} ;
+ \item Activez le mode rapide de la boîte à outils \ProjLib{}.
+ \end{itemize}
+ \end{itemize}
+ \begin{tip}
+ Pendant la phase de brouillon, il est recommandé d'utiliser le \verb|fast| option pour accélérer la compilation. Quand dans \verb|fast| mode, il y aura un filigrane ``DRAFT'' pour indiquer que vous êtes actuellement en mode brouillon.
+ \end{tip}
+ \item \texttt{a4paper} ou \texttt{b5paper}
+ \begin{itemize}
+ \item Options de format de papier. Le format de papier par défaut est 8.5 pouces $\times$ 11 pouces.
+ \end{itemize}
+ \item \texttt{palatino}, \texttt{times}, \texttt{garamond}, \texttt{biolinum} ~$|$~ \texttt{useosf}
+ \begin{itemize}
+ \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}
+ \begin{itemize}
+ \item Pour activer 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}
+ \item \texttt{runin}
+ \begin{itemize}
+ \item Utilisez le style « runin » pour \lstinline|\subsubsection|
+ \end{itemize}
+ \item \texttt{puretext} ou \texttt{nothms}
+ \begin{itemize}
+ \item Mode texte pur. Ne pas définir les environnements de type théorème.
+ \end{itemize}
+ \item \texttt{nothmnum}
+ \begin{itemize}
+ \item Ne pas numéroter les environnements de type théorème.
+ \end{itemize}
+\end{itemize}
+
+\LevelOneTitle{Instructions par sujet}
+
+\LevelTwoTitle{Configurer la langue}
+
+\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. La langue peut être sélectionnée par les macros suivantes :
+
+\begin{itemize}
+ \item \lstinline|\UseLanguage{|\meta{language name}\lstinline|}| est utilisé pour spécifier la langue. Le réglage correspondant de la langue sera appliqué après celui-ci. Il peut être utilisé soit dans le préambule ou dans le texte. Lorsqu'aucune langue n'est spécifiée, « English » est sélectionné par défaut.
+ \item \lstinline|\UseOtherLanguage{|\meta{language name}\lstinline|}{|\meta{content}\lstinline|}|, qui utilise les paramètres de langue spécifiés pour composer \meta{content}. Par rapport à \lstinline|\UseLanguage|, il ne modifiera pas l'interligne, donc l'interligne restera stable lorsque le texte CJK et occidental sont mélangés.
+\end{itemize}
+
+
+\meta{language name} peut être (il n'est pas sensible à la casse, par exemple, \texttt{French} et \texttt{french} ont le même effet) :
+\begin{itemize}
+ \item chinois simplifié : \texttt{CN}, \texttt{Chinese}, \texttt{SChinese} ou \texttt{SimplifiedChinese}
+ \item chinois traditionnel : \texttt{TC}, \texttt{TChinese} ou \texttt{TraditionalChinese}
+ \item anglais : \texttt{EN} ou \texttt{English}
+ \item français : \texttt{FR} ou \texttt{French}
+ \item allemand : \texttt{DE}, \texttt{German} ou \texttt{ngerman}
+ \item italien : \texttt{IT} ou \texttt{Italian}
+ \item portugais : \texttt{PT} ou \texttt{Portuguese}
+ \item portugais (brésilien) : \texttt{BR} ou \texttt{Brazilian}
+ \item espagnol : \texttt{ES} ou \texttt{Spanish}
+ \item japonais : \texttt{JP} ou \texttt{Japanese}
+ \item russe : \texttt{RU} ou \texttt{Russian}
+\end{itemize}
+
+\medskip
+De plus, vous pouvez également ajouter de nouveaux paramètres à la langue sélectionnée :
+\begin{itemize}
+ \item \lstinline|\AddLanguageSetting{|\meta{settings}\lstinline|}|
+ \begin{itemize}
+ \item Ajoutez \meta{settings} à toutes les langues prises en charge.
+ \end{itemize}
+ \item \lstinline|\AddLanguageSetting(|\meta{language name}\lstinline|){|\meta{settings}\lstinline|}|
+ \begin{itemize}
+ \item Ajoutez \meta{settings} à la langue \meta{language name} sélectionnée.
+ \end{itemize}
+\end{itemize}
+Par exemple, \lstinline|\AddLanguageSetting(German){\color{orange}}| peut rendre tout le texte allemand affiché en orange (bien sûr, il faut alors ajouter \lstinline|\AddLanguageSetting{\color{black}}| afin de corriger la couleur du texte dans d'autres langues).
+
+\LevelTwoTitle{Théorèmes et comment les référencer}
+
+Des environnements tels que \texttt{definition} et \texttt{theorem} ont été prédéfinis et peuvent être utilisés directement.
+
+Plus précisement, les environnements prédéfinis incluent : \texttt{assumption}, \texttt{axiom}, \texttt{conjecture}, \texttt{convention}, \texttt{corollary}, \texttt{definition}, \texttt{definition-proposition}, \texttt{definition-theorem}, \texttt{example}, \texttt{exercise}, \texttt{fact}, \texttt{hypothesis}, \texttt{lemma}, \texttt{notation}, \texttt{observation}, \texttt{problem}, \texttt{property}, \texttt{proposition}, \texttt{question}, \texttt{remark}, \texttt{theorem}, et la version non numérotée correspondante avec un astérisque \lstinline|*| dans le nom. Les titres changeront avec la langue actuelle. Par exemple, \texttt{theorem} sera affiché comme « Theorem » en mode anglais et « Théorème » en mode français.
+
+Lors du référencement d'un environnement de type théorème, il est recommandé d'utiliser \lstinline|\cref{|\meta{label}\texttt{\}}. De cette façon, il n'est pas nécessaire d'écrire explicitement le nom de l'environnement correspondant à chaque fois.
+
+\begin{tip}[Exemple]
+\begin{code}
+ \begin{definition}[Des choses étranges] \label{def: strange} ...
+\end{code}
+
+will produce
+\begin{definition}[Des choses étranges]\label{def: strange}
+ C'est la définition de certains objets étranges. Il y a approximativement un espace d'une ligne avant et après l'environnement de type théorème, et il y aura un symbole pour marquer la fin de l'environnement.
+\end{definition}
+
+\lstinline|\cref{def: strange}| s'affichera sous la forme : \cref{def: strange}.
+
+Après avoir utilisé \lstinline|\UseLanguage{French}|, un théorème s'affichera sous la forme :
+
+\UseLanguage{English}
+\begin{theorem}[Useless]\label{thm}
+ A theorem in English.
+\end{theorem}
+
+Par défaut, lorsqu'il est référencé, le nom de l'environnement de type théorème correspond toujours à la langue du contexte dans lequel se trouve l'environnement. Par exemple, la définition ci-dessus est toujours affichée en français dans le mode anglais courant : \cref{def: strange} et \cref{thm}. Si vous voulez que le nom du théorème corresponde au contexte actuel lors du référencement, vous pouvez ajouter \texttt{regionalref} aux options globales.
+\end{tip}
+
+\UseLanguage{French}
+
+\bigskip
+Voici les principaux styles d'environnements de type théorème :
+\begin{theorem}
+ Style de théorème : theorem, proposition, lemma, corollary, ...
+\end{theorem}
+
+\begin{proof}
+ Style d'épreuve
+\end{proof}
+
+\begin{remark}
+ Style de remarque
+\end{remark}
+
+\begin{conjecture}
+ Style de conjecture
+\end{conjecture}
+
+\begin{example*}
+ Style d'exemple : example, fact, ...
+\end{example*}
+
+\begin{problem}
+ Style de problème : problem, question, ...
+\end{problem}
+
+\medskip
+Pour l'esthétique, les définitions adjacentes seront reliées entre elles automatiquement :
+\begin{definition}
+ Première définition.
+\end{definition}
+
+\begin{definition}
+ Deuxième définition.
+\end{definition}
+
+\LevelTwoTitle{Définir un nouvel environnement de type théorème}
+
+Si vous avez besoin de définir un nouvel environnement de type théorème, vous devez d'abord définir le nom de l'environnement dans le langage à utiliser :
+\begin{itemize}
+ \item \lstinline|\NameTheorem[|\meta{language name}\lstinline|]{|\meta{name of environment}\lstinline|}{|\meta{name string}\lstinline|}|
+\end{itemize}
+Pour \meta{language name}, veuillez vous référer à la section sur la configuration de la langue. Lorsqu'il n'est pas spécifié, le nom sera défini pour toutes les langues prises en charge. De plus, les environnements avec ou sans astérisque partagent le même nom, donc \lstinline|\NameTheorem{envname*}{...}| a le même effet que \lstinline|\NameTheorem{envname}{...}| .
+
+\medskip
+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}
+ \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
+ \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}
+ \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}
+ \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|)|
+ \begin{itemize}
+ \item Identifiez \meta{name of environment} avec \meta{existed environment} ou \meta{existed environment}\lstinline|*|.
+ \item Cette méthode est généralement utile dans les deux situations suivantes :
+ \begin{enumerate}
+ \item Pour utiliser un nom plus concis. Par exemple, avec \lstinline|\CreateTheorem{thm}(theorem)|, on peut alors utiliser le nom \texttt{thm} pour écrire le théorème.
+ \item Pour supprimer la numérotation de certains environnements. Par exemple, on peut supprimer la numérotation de l'environnement \texttt{remark} avec \lstinline|\CreateTheorem{remark}(remark*)|.
+ \end{enumerate}
+ \end{itemize}
+\end{itemize}
+
+\begin{tip}
+ Cette macro utilise la fonctionnalité de \textsf{amsthm} en interne, donc le traditionnel \texttt{theoremstyle} lui est également applicable. Il suffit de déclarer le style avant les définitions pertinentes.
+\end{tip}
+
+\NameTheorem[FR]{proofidea}{Idée}
+\CreateTheorem*{proofidea*}
+\CreateTheorem{proofidea}<subsection>
+
+\bigskip
+Voici un exemple. Le code suivant :
+
+\begin{code}
+ \NameTheorem[FR]{proofidea}{Idée}
+ \CreateTheorem*{proofidea*}
+ \CreateTheorem{proofidea}<subsection>
+\end{code}
+définit un environnement non numéroté \lstinline|proofidea*| et un environnement numéroté \lstinline|proofidea| (numérotés dans la sous-section) respectivement. Ils peuvent être utilisés dans le contexte français. L'effet est le suivant :
+
+\vspace{-0.3\baselineskip}
+\begin{proofidea*}
+ La environnement \lstinline|proofidea*| .
+\end{proofidea*}
+
+\vspace{-\baselineskip}
+\begin{proofidea}
+ La environnement \lstinline|proofidea| .
+\end{proofidea}
+
+\LevelTwoTitle{Draft mark}
+
+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.
+\end{itemize}
+
+De même, il y a aussi \lstinline|\needgraph| :
+\begin{itemize}
+ \item \lstinline|\needgraph| ou \lstinline|\needgraph<...>|. L'effet est : \needgraph ou \needgraph<...>Le texte de l'invite change en fonction de la langue actuelle. Par exemple, en mode anglais, il sera affiché sous la forme \UseOtherLanguage{English}{\needgraph}
+\end{itemize}
+
+\LevelTwoTitle{Titre, résumé et mots-clés}
+
+\lebhart{} possède à la fois les caractéristiques des classes standard et celles des classes \AmS{}.
+
+Par conséquent, le titre et les informations sur l'auteur peuvent être soit écrits de la manière habituelle, conformément à la classe standard \textsf{article} :
+
+\begin{code}
+ \title{(*\meta{title}*)}
+ \author{(*\meta{author}*)\thanks{(*\meta{text}*)}}
+ \date{(*\meta{date}*)}
+ \maketitle
+ \begin{abstract}
+ (*\meta{abstract}*)
+ \end{abstract}
+ \begin{keyword}
+ (*\meta{keywords}*)
+ \end{keyword}
+\end{code}
+
+ou écrit à la manière des classes \AmS{} :
+
+\begin{code}
+ \title{(*\meta{title}*)}
+ \author{(*\meta{author}*)}
+ \thanks{(*\meta{text}*)}
+ \address{(*\meta{address}*)}
+ \email{(*\meta{email}*)}
+ \date{(*\meta{date}*)}
+ \keywords{(*\meta{keywords}*)}
+ \subjclass{(*\meta{subjclass}*)}
+ \begin{abstract}
+ (*\meta{abstract}*)
+ \end{abstract}
+ \maketitle
+\end{code}
+
+Les informations sur l'auteur peuvent contenir plusieurs groupes, écrits comme suit :
+
+\begin{code}
+ \author{(*\meta{author 1}*)}
+ \address{(*\meta{address 1}*)}
+ \email{(*\meta{email 1}*)}
+ \author{(*\meta{author 2}*)}
+ \address{(*\meta{address 2}*)}
+ \email{(*\meta{email 2}*)}
+ ...
+\end{code}
+
+Parmi eux, l'ordre mutuel de \lstinline|\address|, \lstinline|\curraddr|, \lstinline|\email| n'est pas important.
+
+\LevelOneTitle{Problèmes connus}
+
+\begin{itemize}[itemsep=.6em]
+ \item Les paramètres de police ne sont pas encore parfaits.
+ \item Comme de nombreuses fonctionnalités sont basées sur la boîte à outils \ProjLib{}, \colorist{} (et donc \colorart{}, \lebhart{} et \colorbook{}, \beaulivre{}) hérite de tous ses problèmes. Pour plus de détails, veuillez vous référer à la section « Problèmes connus » de la documentation de \ProjLib{}.
+ \item Le mécanisme de gestion des erreurs est incomplet : pas de messages correspondants lorsque certains problèmes surviennent.
+ \item Il y a encore beaucoup de choses qui peuvent être optimisées dans le code.
+\end{itemize}
+
+
+\end{document}
+\endinput
+%%
+%% End of file `lebhart/lebhart-doc-fr.tex'.
Property changes on: trunk/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-fr.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/tex/latex/beaulivre/beaulivre.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/beaulivre/beaulivre.cls 2021-07-15 19:59:12 UTC (rev 59940)
+++ trunk/Master/texmf-dist/tex/latex/beaulivre/beaulivre.cls 2021-07-15 20:01:19 UTC (rev 59941)
@@ -17,7 +17,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[2020-10-01]
\ProvidesClass{beaulivre}
- [2021/06/30 A colorful book style]
+ [2021/07/15 A colorful book style]
\def\colorclass at baseclass{book}
\RequirePackage{kvoptions}
\RequirePackage{etoolbox}
@@ -42,6 +42,7 @@
\DeclareDefaultOption{\PassOptionsToClass{\CurrentOption}{\colorclass at baseclass}}
\ProcessKeyvalOptions*\relax
\LoadClass{\colorclass at baseclass}
+
\if at colorclass@draft
\@colorclass at fasttrue
\fi
@@ -97,12 +98,12 @@
\RequirePackage{draftwatermark}
\DraftwatermarkOptions{text={\normalfont DRAFT},color=paper!95!-paper}
\fi
+
\RequirePackage{colorist}
%%================================
%% Fonts
%%================================
-%% Math fonts in fast mode
\if at colorclass@customfont\else
\if at colorclass@fast
\RequirePackage{mathpazo}
@@ -109,7 +110,6 @@
\fi
\fi
-%% English fonts
\PassOptionsToPackage{no-math}{fontspec}
\RequirePackage{fontspec}
\IfFontExistsTF{Palatino Linotype}{%
@@ -133,7 +133,6 @@
ItalicFont = cmunst.otf ,
BoldItalicFont = cmuntb.otf ]
-%% Chinese fonts
\PassOptionsToPackage{fontset=none,scheme=plain}{ctex}
\RequirePackage{ctex}
\WarningFilter{everysel}{Everysel is no longer required}
@@ -185,7 +184,6 @@
SmallCapsFont = * ]
}
-%% Math font
\if at colorclass@customfont\else
\if at colorclass@fast
\RequirePackage{amssymb}
@@ -215,6 +213,14 @@
\setmathfont[range={up/num, bfup/num}
]{texgyrepagella-math.otf}
+\AtBeginDocument{
+\let\mid at original\mid
+\renewcommand{\mid}{\hspace{-.2em}\mid at original\hspace{-.2em}}
+\let\nmid at original\nmid
+\renewcommand{\nmid}{\hspace{-.2em}\nmid at original\hspace{-.2em}}
+}
+
+\RequirePackage{tikz-cd}
\newbox\xratbelow
\newbox\xratabove
\renewcommand{\xrightarrow}[2][]{%
@@ -273,6 +279,7 @@
\draw (0,0) edge[commutative diagrams/equal] node[below=3pt] {\box\xratbelow}
node[above=2pt] {\box\xratabove}
(\xratlen,0) ;}}
+
\AtBeginDocument{
\renewcommand{\twoheadrightarrow}{%
\mathrel{\tikz [baseline=-.55ex, every node/.style={inner sep=0pt}]
@@ -344,7 +351,6 @@
\def\PJL at font@alreadyset{}
-%% Minor improvements
\PassOptionsToPackage{verbose=silent}{microtype}
\RequirePackage{microtype}
\PassOptionsToPackage{all}{nowidow}
Modified: trunk/Master/texmf-dist/tex/latex/colorist/colorart.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/colorist/colorart.cls 2021-07-15 19:59:12 UTC (rev 59940)
+++ trunk/Master/texmf-dist/tex/latex/colorist/colorart.cls 2021-07-15 20:01:19 UTC (rev 59941)
@@ -17,7 +17,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[2020-10-01]
\ProvidesClass{colorart}
- [2021/06/30 A colorful article style]
+ [2021/07/15 A colorful article style]
\def\colorclass at baseclass{article}
\RequirePackage{kvoptions}
\RequirePackage{etoolbox}
@@ -42,6 +42,7 @@
\DeclareDefaultOption{\PassOptionsToClass{\CurrentOption}{\colorclass at baseclass}}
\ProcessKeyvalOptions*\relax
\LoadClass{\colorclass at baseclass}
+
\if at colorclass@draft
\@colorclass at fasttrue
\fi
@@ -97,6 +98,7 @@
\RequirePackage{draftwatermark}
\DraftwatermarkOptions{text={\normalfont DRAFT},color=paper!95!-paper}
\fi
+
\RequirePackage{colorist}
%%================================
@@ -172,7 +174,6 @@
\def\PJL at font@alreadyset{}
-%% Minor improvements
\PassOptionsToPackage{verbose=silent}{microtype}
\RequirePackage{microtype}
\PassOptionsToPackage{all}{nowidow}
Modified: trunk/Master/texmf-dist/tex/latex/colorist/colorbook.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/colorist/colorbook.cls 2021-07-15 19:59:12 UTC (rev 59940)
+++ trunk/Master/texmf-dist/tex/latex/colorist/colorbook.cls 2021-07-15 20:01:19 UTC (rev 59941)
@@ -17,7 +17,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[2020-10-01]
\ProvidesClass{colorbook}
- [2021/06/30 A colorful book style]
+ [2021/07/15 A colorful book style]
\def\colorclass at baseclass{book}
\RequirePackage{kvoptions}
\RequirePackage{etoolbox}
@@ -42,6 +42,7 @@
\DeclareDefaultOption{\PassOptionsToClass{\CurrentOption}{\colorclass at baseclass}}
\ProcessKeyvalOptions*\relax
\LoadClass{\colorclass at baseclass}
+
\if at colorclass@draft
\@colorclass at fasttrue
\fi
@@ -97,6 +98,7 @@
\RequirePackage{draftwatermark}
\DraftwatermarkOptions{text={\normalfont DRAFT},color=paper!95!-paper}
\fi
+
\RequirePackage{colorist}
%%================================
@@ -172,7 +174,6 @@
\def\PJL at font@alreadyset{}
-%% Minor improvements
\PassOptionsToPackage{verbose=silent}{microtype}
\RequirePackage{microtype}
\PassOptionsToPackage{all}{nowidow}
Modified: trunk/Master/texmf-dist/tex/latex/colorist/colorist.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/colorist/colorist.sty 2021-07-15 19:59:12 UTC (rev 59940)
+++ trunk/Master/texmf-dist/tex/latex/colorist/colorist.sty 2021-07-15 20:01:19 UTC (rev 59941)
@@ -17,7 +17,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[2020-10-01]
\ProvidesPackage{colorist}
- [2021/06/30 A colorful style for articles and books]
+ [2021/07/15 A colorful style for articles and books]
\RequirePackage{kvoptions}
\RequirePackage{etoolbox}
\SetupKeyvalOptions{%
@@ -56,6 +56,7 @@
%% Title fonts
%%================================
\RequirePackage{anyfontsize}
+
\newcommand{\partfont}{\conditionalbfseries\colorist at sffamily}
\newcommand{\chapfont}{\conditionalbfseries\colorist at sffamily}
\newcommand{\secfont}{\conditionalbfseries\colorist at sffamily}
@@ -80,7 +81,9 @@
\RequirePackage{geometry}
\RequirePackage{fancyhdr}
\RequirePackage{extramarks}
+
\AtEndPreamble{\fancyhfoffset{0pt}}
+
\fancypagestyle{fancy}{
\fancyhf{}
\if at twoside
@@ -96,6 +99,7 @@
\renewcommand{\headrulewidth}{0pt}
}
\pagestyle{fancy}
+
\fancypagestyle{plain}{
\fancyhf{}
\if at twoside
@@ -109,6 +113,7 @@
\fi
\renewcommand{\headrulewidth}{0pt}
}
+
\ifbool{IsBook}{
\if at twoside
\renewcommand{\chaptermark}[1]{\markboth{\textsc{#1}}{}}
@@ -125,7 +130,7 @@
\fi
}
%%================================
-%% Line spacing
+%% Languages and line spacing
%%================================
\RequirePackage{PJLlang}
\PJLsetlinespacing{\setstretch{1.07}}
@@ -310,7 +315,7 @@
\titlecontents{part}
[0em]
{\addvspace{1.5pc}\filcenter\colorist at sffamily}
- {\thecontentslabel\\\uppercase}
+ {\thecontentslabel\nopagebreak\\\nopagebreak\uppercase}
{}
{} % without page number
[\addvspace{.5pc}]
@@ -364,12 +369,22 @@
%% Lists
%%================================
\RequirePackage{enumitem}
-\setlist{noitemsep,leftmargin=2em}
-\gappto{\PJLlang at langconfig@common}{\renewcommand\labelitemi{\textcolor{maintext!25}{$\bullet$}}}
-\gappto{\PJLlang at langconfig@french}{\renewcommand\labelitemi{\textcolor{maintext!50}{---}}}
-\renewcommand\labelitemii{\textcolor{maintext!27}{--}}
-\renewcommand\labelitemiii{\textcolor{maintext!27}{\texttt{*}}}
+\setlist{noitemsep}
+\setlist[enumerate]{labelsep=*, leftmargin=*}
+\setlist[enumerate,1]{label = \arabic*.,
+ ref = \arabic*}
+\setlist[enumerate,2]{label = \emph{\alph*}),
+ ref = \theenumi.\emph{\alph*}}
+\setlist[enumerate,3]{label = (\roman*),
+ ref = \theenumii.\roman*}
+\setlist[description]{font=\normalfont\conditionalbfseries}
+\setlist[itemize]{leftmargin=*}
+\gappto{\PJLlang at langconfig@common}{\setlist[itemize,1]{label=\textcolor{maintext!25}{$\bullet$}}}
+\gappto{\PJLlang at langconfig@french}{\setlist[itemize,1]{label=\textcolor{maintext!50}{---}}}
+\setlist[itemize,2]{label=\textcolor{maintext!27}{--}}
+\setlist[itemize,3]{label=\textcolor{maintext!27}{\texttt{*}}}
+
%%================================
%% Blank page
%%================================
@@ -440,8 +455,9 @@
\color{maintext!50!paper}\thmnote{\ensuremath{(\text{#3})}~~}%
\pushQED{\qed}%
}
-\def\@endtheorem{\popQED\endtrivlist\@endpefalse
-\global\let\qedsymbol\qedsymbolOriginal}
+\def\@endtheorem{\global\let\qedsymbol\simpleqedsymbol%
+ \popQED\endtrivlist\@endpefalse
+ \global\let\qedsymbol\qedsymbolOriginal}
\renewcommand{\qedsymbol}{%
\makebox[1em]{\color{maintext!27!paper}\rule[-0.1em]{.95em}{.95em}}}
@@ -470,7 +486,6 @@
\PassOptionsToPackage{nothms}{PJLthm}
\RequirePackage{PJLthm}
-%% Adjust English theorems names
\pretocmd{\theoremnameEN}{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries\colorist at textsc}{}{\FAIL}
\pretocmd{\lemmanameEN}{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries\colorist at textsc}{}{\FAIL}
\pretocmd{\propositionnameEN}{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries\colorist at textsc}{}{\FAIL}
@@ -493,7 +508,6 @@
\expandafter\def\csname definition-propositionnameEN\endcsname{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries\colorist at textsc{Definition}-\propositionnameEN}
\expandafter\def\csname definition-theoremnameEN\endcsname{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries\colorist at textsc{Definition}-\theoremnameEN}
-%% Adjust French theorems names
\pretocmd{\theoremnameFR}{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries\colorist at textsc}{}{\FAIL}
\pretocmd{\lemmanameFR}{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries\colorist at textsc}{}{\FAIL}
\pretocmd{\propositionnameFR}{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries\colorist at textsc}{}{\FAIL}
@@ -516,7 +530,6 @@
\expandafter\def\csname definition-propositionnameFR\endcsname{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries\colorist at textsc{Définition}-\propositionnameFR}
\expandafter\def\csname definition-theoremnameFR\endcsname{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries\colorist at textsc{Définition}-\theoremnameFR}
-%% Adjust German theorems names
\pretocmd{\theoremnameDE}{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries\colorist at textsc}{}{\FAIL}
\pretocmd{\lemmanameDE}{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries\colorist at textsc}{}{\FAIL}
\pretocmd{\propositionnameDE}{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries\colorist at textsc}{}{\FAIL}
@@ -539,7 +552,6 @@
\expandafter\def\csname definition-propositionnameDE\endcsname{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries\colorist at textsc{Definition}-\propositionnameDE}
\expandafter\def\csname definition-theoremnameDE\endcsname{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries\colorist at textsc{Definition}-\theoremnameDE}
-%% Adjust Italian theorems names
\pretocmd{\theoremnameIT}{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries\colorist at textsc}{}{\FAIL}
\pretocmd{\lemmanameIT}{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries\colorist at textsc}{}{\FAIL}
\pretocmd{\propositionnameIT}{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries\colorist at textsc}{}{\FAIL}
@@ -562,7 +574,6 @@
\expandafter\def\csname definition-propositionnameIT\endcsname{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries\colorist at textsc{Definizione}-\propositionnameIT}
\expandafter\def\csname definition-theoremnameIT\endcsname{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries\colorist at textsc{Definizione}-\theoremnameIT}
-%% Adjust Portuguese theorems names
\pretocmd{\theoremnamePT}{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries\colorist at textsc}{}{\FAIL}
\pretocmd{\lemmanamePT}{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries\colorist at textsc}{}{\FAIL}
\pretocmd{\propositionnamePT}{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries\colorist at textsc}{}{\FAIL}
@@ -585,7 +596,6 @@
\expandafter\def\csname definition-propositionnamePT\endcsname{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries\colorist at textsc{Definição}-\propositionnamePT}
\expandafter\def\csname definition-theoremnamePT\endcsname{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries\colorist at textsc{Definição}-\theoremnamePT}
-%% Adjust Brazilian theorems names
\pretocmd{\theoremnameBR}{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries\colorist at textsc}{}{\FAIL}
\pretocmd{\lemmanameBR}{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries\colorist at textsc}{}{\FAIL}
\pretocmd{\propositionnameBR}{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries\colorist at textsc}{}{\FAIL}
@@ -608,7 +618,6 @@
\expandafter\def\csname definition-propositionnameBR\endcsname{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries\colorist at textsc{Definição}-\propositionnameBR}
\expandafter\def\csname definition-theoremnameBR\endcsname{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries\colorist at textsc{Definição}-\theoremnameBR}
-%% Adjust Spanish theorems names
\pretocmd{\theoremnameES}{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries\colorist at textsc}{}{\FAIL}
\pretocmd{\lemmanameES}{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries\colorist at textsc}{}{\FAIL}
\pretocmd{\propositionnameES}{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries\colorist at textsc}{}{\FAIL}
@@ -631,7 +640,6 @@
\expandafter\def\csname definition-propositionnameES\endcsname{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries\colorist at textsc{Definição}-\propositionnameES}
\expandafter\def\csname definition-theoremnameES\endcsname{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries\colorist at textsc{Definição}-\theoremnameES}
-%% Adjust Chinese theorems names
\pretocmd{\theoremnameCN}{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries}{}{\FAIL}
\pretocmd{\lemmanameCN}{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries}{}{\FAIL}
\pretocmd{\propositionnameCN}{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries}{}{\FAIL}
@@ -676,7 +684,6 @@
\expandafter\def\csname definition-propositionnameTC\endcsname{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries{定義}-\propositionnameTC}
\expandafter\def\csname definition-theoremnameTC\endcsname{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries{定義}-\theoremnameTC}
-%% Adjust Japanese theorems names
\pretocmd{\theoremnameJP}{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries}{}{\FAIL}
\pretocmd{\lemmanameJP}{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries}{}{\FAIL}
\pretocmd{\propositionnameJP}{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries}{}{\FAIL}
@@ -699,7 +706,6 @@
\expandafter\def\csname definition-propositionnameJP\endcsname{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries{定義}-\propositionnameJP}
\expandafter\def\csname definition-theoremnameJP\endcsname{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries{定義}-\theoremnameJP}
-%% Adjust Russian theorems names
\pretocmd{\theoremnameRU}{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries}{}{\FAIL}
\pretocmd{\lemmanameRU}{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries}{}{\FAIL}
\pretocmd{\propositionnameRU}{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries}{}{\FAIL}
@@ -722,7 +728,6 @@
\expandafter\def\csname definition-propositionnameRU\endcsname{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries{Определение}-\propositionnameRU}
\expandafter\def\csname definition-theoremnameRU\endcsname{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries{Определение}-\theoremnameRU}
-%% Theorem environments
\theoremstyle{basic}
\ifbool{IsBook}{
\newaliascnt{highest}{chapter}
@@ -808,7 +813,6 @@
\numberwithin{equation}{highest}
-%% Cref label format
\creflabelformat{PJLtheorem}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
\creflabelformat{PJLlemma}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
\creflabelformat{PJLproposition}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
@@ -1049,7 +1053,6 @@
\creflabelformat{definition-theoremRU}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
\creflabelformat{definition-propositionRU}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-%% Icons on the margin
\RequirePackage{marginnote}
\RequirePackage{ifoddpage}
\newcommand{\mparadjust}[1]{\renewcommand*{\marginnotevadjust}{#1}}
@@ -1282,6 +1285,18 @@
{enhanced jigsaw,pad at break*=1mm,breakable,colback=yellow!25!paper,
boxrule=0pt,frame hidden,arc=.7mm}
+\tcolorboxenvironment{question}
+ {enhanced jigsaw,pad at break*=1mm,breakable,oversize,
+ opacityframe=0,opacityback=0,lines before break=3}
+\tcolorboxenvironment{question*}
+ {enhanced jigsaw,pad at break*=1mm,breakable,oversize,
+ opacityframe=0,opacityback=0,lines before break=3}
+\tcolorboxenvironment{exercise}
+ {enhanced jigsaw,pad at break*=1mm,breakable,oversize,
+ opacityframe=0,opacityback=0,lines before break=3}
+\tcolorboxenvironment{exercise*}
+ {enhanced jigsaw,pad at break*=1mm,breakable,oversize,
+ opacityframe=0,opacityback=0,lines before break=3}
\tcolorboxenvironment{remark}
{enhanced jigsaw,pad at break*=1mm,breakable,oversize,
opacityframe=0,opacityback=0,lines before break=3}
@@ -1288,6 +1303,12 @@
\tcolorboxenvironment{remark*}
{enhanced jigsaw,pad at break*=1mm,breakable,oversize,
opacityframe=0,opacityback=0,lines before break=3}
+\tcolorboxenvironment{observation}
+ {enhanced jigsaw,pad at break*=1mm,breakable,oversize,
+ opacityframe=0,opacityback=0,lines before break=3}
+\tcolorboxenvironment{observation*}
+ {enhanced jigsaw,pad at break*=1mm,breakable,oversize,
+ opacityframe=0,opacityback=0,lines before break=3}
\ExplSyntaxOn
\NewDocumentCommand \AfterEnvEnd { +m }
Modified: trunk/Master/texmf-dist/tex/latex/lebhart/lebhart.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lebhart/lebhart.cls 2021-07-15 19:59:12 UTC (rev 59940)
+++ trunk/Master/texmf-dist/tex/latex/lebhart/lebhart.cls 2021-07-15 20:01:19 UTC (rev 59941)
@@ -17,7 +17,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[2020-10-01]
\ProvidesClass{lebhart}
- [2021/06/30 A colorful article style]
+ [2021/07/15 A colorful article style]
\def\colorclass at baseclass{article}
\RequirePackage{kvoptions}
\RequirePackage{etoolbox}
@@ -42,6 +42,7 @@
\DeclareDefaultOption{\PassOptionsToClass{\CurrentOption}{\colorclass at baseclass}}
\ProcessKeyvalOptions*\relax
\LoadClass{\colorclass at baseclass}
+
\if at colorclass@draft
\@colorclass at fasttrue
\fi
@@ -97,12 +98,12 @@
\RequirePackage{draftwatermark}
\DraftwatermarkOptions{text={\normalfont DRAFT},color=paper!95!-paper}
\fi
+
\RequirePackage{colorist}
%%================================
%% Fonts
%%================================
-%% Math fonts in fast mode
\if at colorclass@customfont\else
\if at colorclass@fast
\RequirePackage{mathpazo}
@@ -109,7 +110,6 @@
\fi
\fi
-%% English fonts
\PassOptionsToPackage{no-math}{fontspec}
\RequirePackage{fontspec}
\IfFontExistsTF{Palatino Linotype}{%
@@ -133,7 +133,6 @@
ItalicFont = cmunst.otf ,
BoldItalicFont = cmuntb.otf ]
-%% Chinese fonts
\PassOptionsToPackage{fontset=none,scheme=plain}{ctex}
\RequirePackage{ctex}
\WarningFilter{everysel}{Everysel is no longer required}
@@ -185,7 +184,6 @@
SmallCapsFont = * ]
}
-%% Math font
\if at colorclass@customfont\else
\if at colorclass@fast
\RequirePackage{amssymb}
@@ -215,6 +213,14 @@
\setmathfont[range={up/num, bfup/num}
]{texgyrepagella-math.otf}
+\AtBeginDocument{
+\let\mid at original\mid
+\renewcommand{\mid}{\hspace{-.2em}\mid at original\hspace{-.2em}}
+\let\nmid at original\nmid
+\renewcommand{\nmid}{\hspace{-.2em}\nmid at original\hspace{-.2em}}
+}
+
+\RequirePackage{tikz-cd}
\newbox\xratbelow
\newbox\xratabove
\renewcommand{\xrightarrow}[2][]{%
@@ -273,6 +279,7 @@
\draw (0,0) edge[commutative diagrams/equal] node[below=3pt] {\box\xratbelow}
node[above=2pt] {\box\xratabove}
(\xratlen,0) ;}}
+
\AtBeginDocument{
\renewcommand{\twoheadrightarrow}{%
\mathrel{\tikz [baseline=-.55ex, every node/.style={inner sep=0pt}]
@@ -344,7 +351,6 @@
\def\PJL at font@alreadyset{}
-%% Minor improvements
\PassOptionsToPackage{verbose=silent}{microtype}
\RequirePackage{microtype}
\PassOptionsToPackage{all}{nowidow}
More information about the tex-live-commits
mailing list.