texlive[62834] branches/branch2021.final/Master/texmf-dist: jxu
commits+karl at tug.org
commits+karl at tug.org
Sun Mar 20 22:14:51 CET 2022
Revision: 62834
http://tug.org/svn/texlive?view=revision&revision=62834
Author: karl
Date: 2022-03-20 22:14:50 +0100 (Sun, 20 Mar 2022)
Log Message:
-----------
jxu (20mar22) (branch)
Modified Paths:
--------------
branches/branch2021.final/Master/texmf-dist/doc/latex/beaulivre/README.md
branches/branch2021.final/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-cn.pdf
branches/branch2021.final/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-cn.tex
branches/branch2021.final/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-en.pdf
branches/branch2021.final/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-en.tex
branches/branch2021.final/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-fr.pdf
branches/branch2021.final/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-fr.tex
branches/branch2021.final/Master/texmf-dist/doc/latex/colorist/README.md
branches/branch2021.final/Master/texmf-dist/doc/latex/colorist/colorist-doc.pdf
branches/branch2021.final/Master/texmf-dist/doc/latex/colorist/colorist-doc.tex
branches/branch2021.final/Master/texmf-dist/doc/latex/einfart/README.md
branches/branch2021.final/Master/texmf-dist/doc/latex/einfart/einfart-doc-cn.pdf
branches/branch2021.final/Master/texmf-dist/doc/latex/einfart/einfart-doc-cn.tex
branches/branch2021.final/Master/texmf-dist/doc/latex/einfart/einfart-doc-en.pdf
branches/branch2021.final/Master/texmf-dist/doc/latex/einfart/einfart-doc-en.tex
branches/branch2021.final/Master/texmf-dist/doc/latex/einfart/einfart-doc-fr.pdf
branches/branch2021.final/Master/texmf-dist/doc/latex/einfart/einfart-doc-fr.tex
branches/branch2021.final/Master/texmf-dist/doc/latex/lebhart/README.md
branches/branch2021.final/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-cn.pdf
branches/branch2021.final/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-cn.tex
branches/branch2021.final/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-en.pdf
branches/branch2021.final/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-en.tex
branches/branch2021.final/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-fr.pdf
branches/branch2021.final/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-fr.tex
branches/branch2021.final/Master/texmf-dist/doc/latex/minimalist/minimalist-doc.pdf
branches/branch2021.final/Master/texmf-dist/doc/latex/minimalist/minimalist-doc.tex
branches/branch2021.final/Master/texmf-dist/doc/latex/projlib/README.md
branches/branch2021.final/Master/texmf-dist/doc/latex/simplivre/README.md
branches/branch2021.final/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-cn.pdf
branches/branch2021.final/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-cn.tex
branches/branch2021.final/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-en.pdf
branches/branch2021.final/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-en.tex
branches/branch2021.final/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-fr.pdf
branches/branch2021.final/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-fr.tex
branches/branch2021.final/Master/texmf-dist/source/latex/projlib/ProjLib.dtx
branches/branch2021.final/Master/texmf-dist/tex/latex/beaulivre/beaulivre.cls
branches/branch2021.final/Master/texmf-dist/tex/latex/colorist/colorart.cls
branches/branch2021.final/Master/texmf-dist/tex/latex/colorist/colorbook.cls
branches/branch2021.final/Master/texmf-dist/tex/latex/colorist/colorist.sty
branches/branch2021.final/Master/texmf-dist/tex/latex/einfart/einfart.cls
branches/branch2021.final/Master/texmf-dist/tex/latex/lebhart/lebhart.cls
branches/branch2021.final/Master/texmf-dist/tex/latex/minimalist/minimalist-classical.sty
branches/branch2021.final/Master/texmf-dist/tex/latex/minimalist/minimalist-plain.sty
branches/branch2021.final/Master/texmf-dist/tex/latex/minimalist/minimalist.sty
branches/branch2021.final/Master/texmf-dist/tex/latex/minimalist/minimart.cls
branches/branch2021.final/Master/texmf-dist/tex/latex/minimalist/minimbook.cls
branches/branch2021.final/Master/texmf-dist/tex/latex/projlib/ProjLib.sty
branches/branch2021.final/Master/texmf-dist/tex/latex/projlib/projlib-author.sty
branches/branch2021.final/Master/texmf-dist/tex/latex/projlib/projlib-datetime.sty
branches/branch2021.final/Master/texmf-dist/tex/latex/projlib/projlib-draft.sty
branches/branch2021.final/Master/texmf-dist/tex/latex/projlib/projlib-font.sty
branches/branch2021.final/Master/texmf-dist/tex/latex/projlib/projlib-language.sty
branches/branch2021.final/Master/texmf-dist/tex/latex/projlib/projlib-logo.sty
branches/branch2021.final/Master/texmf-dist/tex/latex/projlib/projlib-math.sty
branches/branch2021.final/Master/texmf-dist/tex/latex/projlib/projlib-paper.sty
branches/branch2021.final/Master/texmf-dist/tex/latex/projlib/projlib-theorem.sty
branches/branch2021.final/Master/texmf-dist/tex/latex/simplivre/simplivre.cls
Added Paths:
-----------
branches/branch2021.final/Master/texmf-dist/tex/latex/colorist/colorist-fancy.sty
Modified: branches/branch2021.final/Master/texmf-dist/doc/latex/beaulivre/README.md
===================================================================
--- branches/branch2021.final/Master/texmf-dist/doc/latex/beaulivre/README.md 2022-03-20 21:13:02 UTC (rev 62833)
+++ branches/branch2021.final/Master/texmf-dist/doc/latex/beaulivre/README.md 2022-03-20 21:14:50 UTC (rev 62834)
@@ -1,7 +1,9 @@
-<!-- Copyright (C) 2021 by Jinwen XU -->
+<!-- Copyright (C) 2021-2022 by Jinwen XU -->
# `beaulivre` : write you books in a colorful way
+**The current document class have been rewritten with `expl3`. Please note that the documentations are not yet up-to-date. The syntax of some commands have been changed since the last version, especially the declaration of theorem-like environments by `\CreateTheorem`. For the moment, you can refer to the documentation of the package `create-theorem`.**
+
`beaulivre` is a LaTeX class for typesetting books, which has a colorful
design.
Modified: branches/branch2021.final/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-cn.pdf
===================================================================
(Binary files differ)
Modified: branches/branch2021.final/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-cn.tex
===================================================================
--- branches/branch2021.final/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-cn.tex 2022-03-20 21:13:02 UTC (rev 62833)
+++ branches/branch2021.final/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-cn.tex 2022-03-20 21:14:50 UTC (rev 62834)
@@ -1,5 +1,6 @@
-\documentclass[English,Chinese,French,JP,TC,allowbf]{beaulivre}
+\documentclass[English,Chinese,French,JP,TC,use boldface,simple name]{beaulivre}
+
%%================================
%% Import toolkit
%%================================
@@ -37,7 +38,7 @@
\providecommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$}
\lstset{moretexcs=%
{part,parttext,chapter,section,subsection,subsubsection,frontmatter,mainmatter,backmatter,tableofcontents,href,
- color,NameTheorem,CreateTheorem,proofideanameEN,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,PLdate,ProjLib,qedhere
+ color,NameTheorem,CreateTheorem,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,TheDate,ProjLib,qedhere
}
}
\lstnewenvironment{code}%
@@ -91,21 +92,25 @@
%%================================
\begin{document}
+\def\PackageVersion{2022/03/19}
+
\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)$);
+ \fill [forestgreen!75!black] ($(current page.south west)$) rectangle ($(current page.north east)+(0,-7)$);
+ \fill [forestgreen!10!yellow!30] ($(current page.south west)$) rectangle ($(current page.north west)+(2.5,-7)$);
+ \fill [forestgreen!75!black] ($(current page.north west)$) rectangle ($(current page.north west)+(2.5,-7)$);
+ \fill [forestgreen!10!yellow!30] ($(current page.north east)$) rectangle ($(current page.north west)+(2.5,-7)$);
\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/12/16}}};
- \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年12月，巴黎}};
+ \node[text width=6cm,text height=3.5cm,scale=2.5] at ($(current page.north west)+(11,-9)$) {\textcolor{forestgreen!10!yellow!30}{\sffamily\beaulivre{}\\[5pt]\footnotesize\hspace*{-.05em}以多彩的方式排版你的图书\\[10pt]\tiny 对应版本. \texttt{\beaulivre{} \PackageVersion}}};
+ \node[text width=15em] at ($(current page.south)+(5,4)$) {\color{forestgreen!10!yellow!30}\hfill\fontsize{16pt}{0pt}\selectfont{许锦文}\\[1em]\hfill\fontsize{12pt}{0pt}\selectfont\TheDate{\PackageVersion}[only-year-month]，巴黎};
\end{tikzpicture}%
\end{titlepage}%
-\cleardoublepage%
+\setcounter{page}{0}
+
\chapter{前言}
\beaulivre{} 是 \colorist{} 文档类系列的成员之一，其名称取自于法文的beau (美丽)，以及livre (书)，由二者组合而成。整个 \colorist{} 系列包含用于排版文章的 \colorart{}、\lebhart{} 以及用于排版书的 \colorbook{}、\beaulivre{}。我设计这一系列的初衷是为了撰写草稿与笔记，使之多彩而不缭乱。
@@ -119,6 +124,10 @@
多语言支持、定理类环境、未完成标记等功能是由 \ProjLib{} 工具箱提供的，这里只给出了将其与本文档类搭配使用的要点。如需获取更详细的信息，可以参阅 \ProjLib{} 的说明文档。
\end{tip}
+\begin{tip}
+ This documentation has not been fully up-to-date with the new \texttt{expl3} version of this class series. Some options or commands introduced here might be obsolete.
+\end{tip}
+
\tableofcontents
\mainmatter
@@ -292,18 +301,14 @@
\begin{itemize}
\item \lstinline|\subsubsection| 采用 ``runin'' 风格。
\end{itemize}
- \item \texttt{puretext} 或 \texttt{nothms}
+ \item \texttt{nothms}
\begin{itemize}
\item 纯文本模式，不加载定理类环境。
\end{itemize}
-\clearpage
- \item \texttt{delaythms}
- \begin{itemize}
- \item 将定理类环境设定推迟到导言结尾。如果你希望定理类环境跟随自定义计数器编号，则应考虑这一选项。
- \end{itemize}
+% \clearpage
\item \texttt{nothmnum}、\texttt{thmnum} 或 \texttt{thmnum=}\meta{counter}
\begin{itemize}
- \item 定理类环境均不编号 / 按照 1、2、3 顺序编号 / 在 \meta{counter} 内编号。其中 \meta{counter} 应该是自带的计数器 (如 \texttt{subsection}) 或在导言部分自定义的计数器 (在启用 \texttt{delaythms} 选项的情况下)。在没有使用任何选项的情况下将按照 \texttt{chapter} (书) 或 \texttt{section} (文章) 编号。
+ \item 定理类环境均不编号 / 按照 1、2、3 顺序编号 / 在 \meta{counter} 内编号。在没有使用任何选项的情况下将按照 \texttt{chapter} (书) 或 \texttt{section} (文章) 编号。
\end{itemize}
\item \texttt{regionalref}、\texttt{originalref}
\begin{itemize}
@@ -419,7 +424,7 @@
\end{problem}
\medskip
-\clearpage
+% \clearpage
为了美观，相邻的定义环境会自动连在一起：
\begin{definition}
First definition.
@@ -429,71 +434,10 @@
Second definition.
\end{definition}
-\LevelTwoTitle{定义新的定理型环境}
-
-若需要定义新的定理类环境，首先要定义这个环境在所用语言下的名称：
-\begin{itemize}
- \item \lstinline|\NameTheorem[|\meta{language name}\lstinline|]{|\meta{name of environment}\lstinline|}{|\meta{name string}\lstinline|}|
-\end{itemize}
-其中，\meta{language name} 可参阅关于语言设置的小节。当不指定 \meta{language name}时，则会将该名称设置为所有支持语言下的名称。另外，带星号与不带星号的同名环境共用一个名称，因此 \lstinline|\NameTheorem{envname*}{...}| 与 \lstinline|\NameTheorem{envname}{...}| 效果相同。
-
-然后用下面五种方式之一定义这一环境：
-\begin{itemize}
- \item \lstinline|\CreateTheorem*{|\meta{name of environment}\lstinline|}|
- \begin{itemize}
- \item 定义不编号的环境 \meta{name of environment}
- \end{itemize}
- \item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}|
- \begin{itemize}
- \item 定义编号环境 \meta{name of environment}，按顺序编号
- \end{itemize}
- \item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}[|\meta{numbered like}\lstinline|]|
- \begin{itemize}
- \item 定义编号环境 \meta{name of environment}，与 \meta{numbered like} 计数器共用编号
- \end{itemize}
- \item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}<|\meta{numbered within}\lstinline|>|
- \begin{itemize}
- \item 定义编号环境 \meta{name of environment}，在 \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 将 \meta{name of environment} 与 \meta{existed environment} 或 \meta{existed environment}\lstinline|*| 等同。
- \item 这种方式通常在两种情况下比较有用：
- \begin{enumerate}
- \item 希望定义更简洁的名称。例如，使用 \lstinline|\CreateTheorem{thm}(theorem)|，便可以直接用名称 \texttt{thm} 来撰写定理。
- \item 希望去除某些环境的编号。例如，使用 \lstinline|\CreateTheorem{remark}(remark*)|，便可以去除 \texttt{remark} 环境的编号。
- \end{enumerate}
- \end{itemize}
-\end{itemize}
-
\begin{tip}
- 其内部使用了 \textsf{amsthm}，因此传统的 \texttt{theoremstyle} 对其也是适用的，只需在相关定义前标明即可。
+ 请参阅 \textsf{create-theorem} 的说明文档以获知如何定义新的定理类环境。
\end{tip}
-\NameTheorem[CN]{proofidea}{思路}
-\CreateTheorem*{proofidea*}
-\CreateTheorem{proofidea}<section>
-
-\bigskip
-下面提供一个例子。这三行代码：
-
-\begin{code}
-\NameTheorem[CN]{proofidea}{思路}
-\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}
-
\LevelTwoTitle{未完成标记}
你可以通过 \lstinline|\dnf| 来标记尚未完成的部分。例如：
@@ -501,15 +445,10 @@
\item \lstinline|\dnf| 或 \lstinline|\dnf<...>|。效果为：\dnf~或 \dnf<...>。\\其提示文字与当前语言相对应，例如，在法语模式下将会显示为 \UseOtherLanguage{French}{\dnf}。
\end{itemize}
-类似的，还有 \lstinline|\needgraph| ：
-\begin{itemize}
- \item \lstinline|\needgraph| 或 \lstinline|\needgraph<...>|。效果为：\needgraph~或 \needgraph<...>其提示文字与当前语言相对应，例如，在法语模式下将会显示为 \UseOtherLanguage{French}{\needgraph}
-\end{itemize}
-
\bigskip
\LevelOneTitle{目前存在的问题}
-\begin{itemize}[itemsep=.6em]
+\begin{itemize}
\item 对于字体的设置仍然不够完善。
\item 目录的设计还不够美观。
\item 由于很多核心功能建立在 \ProjLib{} 工具箱的基础上，因此 \colorist{} (进而 \colorart{}、\lebhart{} 与 \colorbook{}、\beaulivre{}) 自然继承了其所有问题。详情可以参阅 \ProjLib{} 用户文档的“目前存在的问题”这一小节。
Modified: branches/branch2021.final/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-en.pdf
===================================================================
(Binary files differ)
Modified: branches/branch2021.final/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-en.tex
===================================================================
--- branches/branch2021.final/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-en.tex 2022-03-20 21:13:02 UTC (rev 62833)
+++ branches/branch2021.final/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-en.tex 2022-03-20 21:14:50 UTC (rev 62834)
@@ -1,5 +1,6 @@
-\documentclass[English,Chinese,French,JP,TC,allowbf]{beaulivre}
+\documentclass[English,Chinese,French,JP,TC,use boldface,simple name]{beaulivre}
+
%%================================
%% Import toolkit
%%================================
@@ -37,7 +38,7 @@
\providecommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$}
\lstset{moretexcs=%
{part,parttext,chapter,section,subsection,subsubsection,frontmatter,mainmatter,backmatter,tableofcontents,href,
- color,NameTheorem,CreateTheorem,proofideanameEN,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,PLdate,ProjLib,qedhere
+ color,NameTheorem,CreateTheorem,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,TheDate,ProjLib,qedhere
}
}
\lstnewenvironment{code}%
@@ -91,22 +92,25 @@
%%================================
\begin{document}
+\def\PackageVersion{2022/03/19}
\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)$);
+ \fill [forestgreen!75!black] ($(current page.south west)$) rectangle ($(current page.north east)+(0,-7)$);
+ \fill [forestgreen!10!yellow!30] ($(current page.south west)$) rectangle ($(current page.north west)+(2.5,-7)$);
+ \fill [forestgreen!75!black] ($(current page.north west)$) rectangle ($(current page.north west)+(2.5,-7)$);
+ \fill [forestgreen!10!yellow!30] ($(current page.north east)$) rectangle ($(current page.north west)+(2.5,-7)$);
\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/12/16}}};
- \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}{December 2021, in Paris}};
+ \node[text width=6cm,text height=3.5cm,scale=2.5] at ($(current page.north west)+(11,-9)$) {\textcolor{forestgreen!10!yellow!30}{\sffamily\beaulivre{}\\[5pt]\footnotesize\textsc{Write your books in \\a colorful way}\\[10pt]\tiny Corresponding to: \texttt{\beaulivre{} \PackageVersion}}};
+ \node[text width=15em] at ($(current page.south)+(5,4)$) {\color{forestgreen!10!yellow!30}\hfill\fontsize{16pt}{0pt}\selectfont{\scshape Jinwen XU}\\[1em]\hfill\fontsize{12pt}{0pt}\selectfont\TheDate{\PackageVersion}[only-year-month], in Paris};
\end{tikzpicture}%
\end{titlepage}%
-\cleardoublepage%
+\setcounter{page}{0}
+
\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.
@@ -120,6 +124,10 @@
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}
+\begin{tip}
+ This documentation has not been fully up-to-date with the new \texttt{expl3} version of this class series. Some options or commands introduced here might be obsolete.
+\end{tip}
+
\tableofcontents
\mainmatter
@@ -134,7 +142,7 @@
\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 download and install the required fonts, see the section "On the default fonts".
- \item be familiar with the basic usage of \LaTeX{}, and knows how to compile your document with \hologo{pdfLaTeX}, \hologo{XeLaTeX} or \hologo{LuaLaTeX}.
+ \item be familiar with the basic usage of \LaTeX{}, and know how to compile your document with \hologo{pdfLaTeX}, \hologo{XeLaTeX} or \hologo{LuaLaTeX}.
\end{itemize}
@@ -294,17 +302,13 @@
\begin{itemize}
\item Use the ``runin'' style for \lstinline|\subsubsection|
\end{itemize}
- \item \texttt{puretext} or \texttt{nothms}
+ \item \texttt{nothms}
\begin{itemize}
\item Pure text mode. Do not load theorem-like environments.
\end{itemize}
- \item \texttt{delaythms}
- \begin{itemize}
- \item Defer the definition of theorem-like environments to the end of the preamble. Use this option if you want the theorem-like environments to be numbered within a custom counter.
- \end{itemize}
\item \texttt{nothmnum}, \texttt{thmnum} or \texttt{thmnum=}\meta{counter}
\begin{itemize}
- \item Theorem-like environments will not be numbered / numbered in order 1, 2, 3... / numbered within \meta{counter}. Here, \meta{counter} should be a built-in counter (such as \texttt{subsection}) or a custom counter defined in the preamble (with the option \texttt{delaythms} enabled). If no option is used, they will be numbered within \texttt{chapter} (book) or \texttt{section} (article).
+ \item Theorem-like environments will not be numbered / numbered in order 1, 2, 3... / numbered within \meta{counter}. If no option is used, they will be numbered within \texttt{chapter} (book) or \texttt{section} (article).
\end{itemize}
\item \texttt{regionalref}, \texttt{originalref}
\begin{itemize}
@@ -415,7 +419,7 @@
\end{problem}
\medskip
-\clearpage
+% \clearpage
For aesthetics, adjacent definitions will be connected together automatically:
\begin{definition}
First definition.
@@ -425,76 +429,11 @@
Second definition.
\end{definition}
-\LevelTwoTitle{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}
-
-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
-And then define this environment in one of following five ways:
-\begin{itemize}
- \item \lstinline|\CreateTheorem*{|\meta{name of environment}\lstinline|}|
- \begin{itemize}
- \item Define an unnumbered environment \meta{name of environment}
- \end{itemize}
- \item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}|
- \begin{itemize}
- \item Define a numbered environment \meta{name of environment}, numbered in order 1,2,3,\dots
- \end{itemize}
- \item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}[|\meta{numbered like}\lstinline|]|
- \begin{itemize}
- \item Define a numbered environment \meta{name of environment}, which shares the counter \meta{numbered like}
- \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}
- \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 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}(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}
-
\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.
+ Please refer to the documentation of the package \textsf{create-theorem} to see how to declare new theorem-like environments.
\end{tip}
-\NameTheorem[EN]{proofidea}{Idea}
-\CreateTheorem*{proofidea*}
-\CreateTheorem{proofidea}<section>
-
-\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:
-
-\vspace{-0.3\baselineskip}
-\begin{proofidea*}
- The \lstinline|proofidea*| environment.
-\end{proofidea*}
-
-\vspace{-\baselineskip}
-\begin{proofidea}
- The \lstinline|proofidea| environment.
-\end{proofidea}
-
-\clearpage
+% \clearpage
\LevelTwoTitle{Draft mark}
You can use \lstinline|\dnf| to mark the unfinished part. For example:
@@ -502,17 +441,11 @@
\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| :
-\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}
-
\bigskip
\LevelOneTitle{Known issues}
-\begin{itemize}[itemsep=.6em]
+\begin{itemize}
\item The font settings are still not perfect.
\item The TOC design does not look very nice.
\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.
Modified: branches/branch2021.final/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-fr.pdf
===================================================================
(Binary files differ)
Modified: branches/branch2021.final/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-fr.tex
===================================================================
--- branches/branch2021.final/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-fr.tex 2022-03-20 21:13:02 UTC (rev 62833)
+++ branches/branch2021.final/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-fr.tex 2022-03-20 21:14:50 UTC (rev 62834)
@@ -1,5 +1,6 @@
-\documentclass[English,Chinese,French,JP,TC,allowbf]{beaulivre}
+\documentclass[English,Chinese,French,JP,TC,use boldface,simple name]{beaulivre}
+
%%================================
%% Import toolkit
%%================================
@@ -37,7 +38,7 @@
\providecommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$}
\lstset{moretexcs=%
{part,parttext,chapter,section,subsection,subsubsection,frontmatter,mainmatter,backmatter,tableofcontents,href,
- color,NameTheorem,CreateTheorem,proofideanameEN,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,PLdate,ProjLib,qedhere
+ color,NameTheorem,CreateTheorem,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,TheDate,ProjLib,qedhere
}
}
\lstnewenvironment{code}%
@@ -91,21 +92,25 @@
%%================================
\begin{document}
+\def\PackageVersion{2022/03/19}
+
\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)$);
+ \fill [forestgreen!75!black] ($(current page.south west)$) rectangle ($(current page.north east)+(0,-7)$);
+ \fill [forestgreen!10!yellow!30] ($(current page.south west)$) rectangle ($(current page.north west)+(2.5,-7)$);
+ \fill [forestgreen!75!black] ($(current page.north west)$) rectangle ($(current page.north west)+(2.5,-7)$);
+ \fill [forestgreen!10!yellow!30] ($(current page.north east)$) rectangle ($(current page.north west)+(2.5,-7)$);
\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/12/16}}};
- \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}{Décembre 2021, à Paris}};
+ \node[text width=6cm,text height=3.5cm,scale=2.5] at ($(current page.north west)+(11,-9)$) {\textcolor{forestgreen!10!yellow!30}{\sffamily\beaulivre{}\\[5pt]\footnotesize\textsc{Écrivez vos livres \\de manière colorée}\\[10pt]\tiny Correspondant à : \texttt{\beaulivre{} \PackageVersion}}};
+ \node[text width=15em] at ($(current page.south)+(5,4)$) {\color{forestgreen!10!yellow!30}\hfill\fontsize{16pt}{0pt}\selectfont{\scshape Jinwen XU}\\[1em]\hfill\fontsize{12pt}{0pt}\selectfont\TheDate{\PackageVersion}[only-year-month], à Paris};
\end{tikzpicture}%
\end{titlepage}%
-\cleardoublepage%
+\setcounter{page}{0}
+
\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.
@@ -119,6 +124,10 @@
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}
+\begin{tip}
+ This documentation has not been fully up-to-date with the new \texttt{expl3} version of this class series. Some options or commands introduced here might be obsolete.
+\end{tip}
+
\tableofcontents
\mainmatter
@@ -293,18 +302,13 @@
\begin{itemize}
\item Utilisez le style «~runin~» pour \lstinline|\subsubsection|
\end{itemize}
- \item \texttt{puretext} ou \texttt{nothms}
+ \item \texttt{nothms}
\begin{itemize}
\item Mode texte pur. Ne pas définir les environnements de type théorème.
\end{itemize}
-\clearpage
- \item \texttt{delaythms}
- \begin{itemize}
- \item Reportez la définition des environnements de type théorème à la fin du préambule. Utilisez cette option si vous souhaitez que les environnements soient numérotés dans un compteur personnalisé.
- \end{itemize}
\item \texttt{nothmnum}, \texttt{thmnum} ou \texttt{thmnum=}\meta{counter}
\begin{itemize}
- \item Les environnements de type théorème ne seront pas numérotés / numérotés dans l'ordre 1, 2, 3... / numérotés dans \meta{counter}. Ici, \meta{counter} doit être un compteur intégré (tel que \texttt{subsection}) ou un compteur défini dans le préambule (avec l'option \texttt{delaythms} activée). Si aucune option n'est utilisée, ils seront numérotés dans \texttt{chapter} (livre) ou \texttt{section} (article).
+ \item Les environnements de type théorème ne seront pas numérotés / numérotés dans l'ordre 1, 2, 3... / numérotés dans \meta{counter}. Si aucune option n'est utilisée, ils seront numérotés dans \texttt{chapter} (livre) ou \texttt{section} (article).
\end{itemize}
\item \texttt{regionalref}, \texttt{originalref}
\begin{itemize}
@@ -422,73 +426,10 @@
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 \meta{name of environment} non numéroté
- \end{itemize}
- \item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}|
- \begin{itemize}
- \item Définir un environnement \meta{name of environment} numéroté dans l'ordre 1, 2, 3, \dots
- \end{itemize}
- \item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}[|\meta{numbered like}\lstinline|]|
- \begin{itemize}
- \item Définir un environnement \meta{name of environment} numéroté, qui partage le compteur \meta{numbered like}
- \end{itemize}
- \item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}<|\meta{numbered within}\lstinline|>|
- \begin{itemize}
- \item Définir un environnement \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.
+ Veuillez consulter la documentation du paquet \textsf{create-theorem} pour voir comment déclarer de nouveaux environnements de type théorème.
\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 :
@@ -496,16 +437,11 @@
\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}
-
\bigskip
\LevelOneTitle{Problèmes connus}
-\begin{itemize}[itemsep=.6em]
+\begin{itemize}
\item Les paramètres de police ne sont pas encore parfaits.
\item La conception de la table des matières est pas si belle.
\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{}.
Modified: branches/branch2021.final/Master/texmf-dist/doc/latex/colorist/README.md
===================================================================
--- branches/branch2021.final/Master/texmf-dist/doc/latex/colorist/README.md 2022-03-20 21:13:02 UTC (rev 62833)
+++ branches/branch2021.final/Master/texmf-dist/doc/latex/colorist/README.md 2022-03-20 21:14:50 UTC (rev 62834)
@@ -1,7 +1,9 @@
-<!-- Copyright (C) 2021 by Jinwen XU -->
+<!-- Copyright (C) 2021-2022 by Jinwen XU -->
# `colorist` bundle: write you documents in a colorful way
+**The whole series have been rewritten with `expl3`. Please note that the documentations are not yet up-to-date. The syntax of some commands have been changed since the last version, especially the declaration of theorem-like environments by `\CreateTheorem`. For the moment, you can refer to the documentation of the package `create-theorem`.**
+
## Introduction
`colorist` is a collection of styles and classes that helps you typesetting articles and books
@@ -8,7 +10,8 @@
with a colorful design. It mainly consists of two parts.
- Main part:
- - `colorist.sty` : the main style
+ - `colorist.sty` : interface of the main style
+ - `colorist-fancy.sty` : the fancy style
- `colorart.cls` : class for typesetting articles
- `colorbook.cls` : class for typesetting books
Modified: branches/branch2021.final/Master/texmf-dist/doc/latex/colorist/colorist-doc.pdf
===================================================================
(Binary files differ)
Modified: branches/branch2021.final/Master/texmf-dist/doc/latex/colorist/colorist-doc.tex
===================================================================
--- branches/branch2021.final/Master/texmf-dist/doc/latex/colorist/colorist-doc.tex 2022-03-20 21:13:02 UTC (rev 62833)
+++ branches/branch2021.final/Master/texmf-dist/doc/latex/colorist/colorist-doc.tex 2022-03-20 21:14:50 UTC (rev 62834)
@@ -1,7 +1,7 @@
-\documentclass[English,Chinese,French,allowbf]{colorart}
+\documentclass[English,Chinese,French,use boldface,simple name]{colorart}
\setsansfont{texgyreheros}[
- Scale=MatchLowercase,
+ Scale=MatchUppercase,
UprightFont=*-regular,
BoldFont=*-bold,
ItalicFont=*-italic,
@@ -45,7 +45,7 @@
\providecommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$}
\lstset{moretexcs=%
{part,parttext,chapter,section,subsection,subsubsection,frontmatter,mainmatter,backmatter,tableofcontents,href,
- color,NameTheorem,CreateTheorem,proofideanameEN,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,PLdate,ProjLib,qedhere
+ color,NameTheorem,CreateTheorem,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,TheDate,ProjLib,qedhere
}
}
\lstnewenvironment{code}%
@@ -99,11 +99,13 @@
%%================================
\begin{document}
-\title{{\normalfont\bfseries\color{maintext}\colorist{}}\\write your articles or books in a colorful way}
+\def\PackageVersion{2022/03/19}
+
+\title{{\normalfont\bfseries\color{main-text}\colorist{}}\\write your articles or books in a colorful way}
\author{Jinwen XU}
-\thanks{Corresponding to: \texttt{\colorist{} 2021/12/16}}
+\thanks{Corresponding to: \texttt{\colorist{} \PackageVersion}}
\email{\href{mailto:ProjLib at outlook.com}{ProjLib at outlook.com}}
-\date{December 2021, in Paris}
+\date{\TheDate{\PackageVersion}[only-year-month], in Paris}
\maketitle
@@ -114,6 +116,10 @@
\end{abstract}
+\begin{tip}
+ This documentation has not been fully up-to-date with the new \texttt{expl3} version of this class series. Some options or commands introduced here might be obsolete.
+\end{tip}
+
\setcounter{tocdepth}{2}
\tableofcontents
@@ -125,7 +131,7 @@
\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 download and install the required fonts if needed.
- \item be familiar with the basic usage of \LaTeX{}, and knows how to compile your document with \hologo{pdfLaTeX}, \hologo{XeLaTeX} or \hologo{LuaLaTeX}.
+ \item be familiar with the basic usage of \LaTeX{}, and know how to compile your document with \hologo{pdfLaTeX}, \hologo{XeLaTeX} or \hologo{LuaLaTeX}.
\end{itemize}
\LevelOneTitle{Introduction}
@@ -172,7 +178,7 @@
\title{(*\meta{title}*)}
\author{(*\meta{author}*)}
-\date{\PLdate{2022-04-01}}
+\date{\TheDate{2022-04-01}}
\maketitle
@@ -222,7 +228,7 @@
\begin{code}
\title{(*\meta{title}*)}
\author{(*\meta{author}*)}
-\date{\PLdate{2022-04-01}}
+\date{\TheDate{2022-04-01}}
\maketitle
\begin{abstract}
@@ -255,7 +261,7 @@
\author{(*\meta{author 2}*)}
\address{(*\meta{address 2}*)}
\email{(*\meta{email 2}*)}
-\date{\PLdate{2022-04-01}}
+\date{\TheDate{2022-04-01}}
\subjclass{*****}
\keywords{(*\meta{keywords}*)}
@@ -359,7 +365,7 @@
In the next section, we will go through the options available.
-\clearpage
+% \clearpage
\LevelOneTitle{The options}
\colorist{} offers the following options:
@@ -390,17 +396,13 @@
\begin{itemize}
\item Use the ``runin'' style for \lstinline|\subsubsection|
\end{itemize}
- \item \texttt{puretext} or \texttt{nothms}
+ \item \texttt{nothms}
\begin{itemize}
\item Pure text mode. Do not load theorem-like environments.
\end{itemize}
- \item \texttt{delaythms}
- \begin{itemize}
- \item Defer the definition of theorem-like environments to the end of the preamble. Use this option if you want the theorem-like environments to be numbered within a custom counter.
- \end{itemize}
\item \texttt{nothmnum}, \texttt{thmnum} or \texttt{thmnum=}\meta{counter}
\begin{itemize}
- \item Theorem-like environments will not be numbered / numbered in order 1, 2, 3... / numbered within \meta{counter}. Here, \meta{counter} should be a built-in counter (such as \texttt{subsection}) or a custom counter defined in the preamble (with the option \texttt{delaythms} enabled). If no option is used, they will be numbered within \texttt{chapter} (book) or \texttt{section} (article).
+ \item Theorem-like environments will not be numbered / numbered in order 1, 2, 3... / numbered within \meta{counter}. If no option is used, they will be numbered within \texttt{chapter} (book) or \texttt{section} (article).
\end{itemize}
\item \texttt{regionalref}, \texttt{originalref}
\begin{itemize}
@@ -530,75 +532,10 @@
Second definition.
\end{definition}
-\LevelTwoTitle{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}
-
-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
-And then define this environment in one of following five ways:
-\begin{itemize}
- \item \lstinline|\CreateTheorem*{|\meta{name of environment}\lstinline|}|
- \begin{itemize}
- \item Define an unnumbered environment \meta{name of environment}
- \end{itemize}
- \item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}|
- \begin{itemize}
- \item Define a numbered environment \meta{name of environment}, numbered in order 1,2,3,\dots
- \end{itemize}
- \item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}[|\meta{numbered like}\lstinline|]|
- \begin{itemize}
- \item Define a numbered environment \meta{name of environment}, which shares the counter \meta{numbered like}
- \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}
- \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 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}(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}
-
\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.
+ Please refer to the documentation of the package \textsf{create-theorem} to see how to declare new theorem-like environments.
\end{tip}
-\NameTheorem[EN]{proofidea}{Idea}
-\CreateTheorem*{proofidea*}
-\CreateTheorem{proofidea}<subsection>
-
-\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:
-
-\vspace{-0.3\baselineskip}
-\begin{proofidea*}
- The \lstinline|proofidea*| environment.
-\end{proofidea*}
-
-\vspace{-\baselineskip}
-\begin{proofidea}
- The \lstinline|proofidea| environment.
-\end{proofidea}
-
\LevelTwoTitle{Draft mark}
You can use \lstinline|\dnf| to mark the unfinished part. For example:
@@ -606,13 +543,6 @@
\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| :
-\begin{itemize}
- \item \lstinline|\needgraph| or \lstinline|\needgraph<...>|. The effect is: \needgraph or \needgraph<...>
-\clearpage
- The prompt text changes according to the current language. For example, in French mode, it will be displayed as \UseOtherLanguage{French}{\needgraph}
-\end{itemize}
-
\LevelTwoTitle{Title, abstract and keywords}
\colorart{} has both the features of standard classes and that of the \AmS{} classes.
@@ -664,10 +594,10 @@
Among them, the mutual order of \lstinline|\address|, \lstinline|\curraddr|, \lstinline|\email| is not important.
\bigskip
-\clearpage
+% \clearpage
\LevelOneTitle{Known issues}
-\begin{itemize}[itemsep=.6em]
+\begin{itemize}
\item The font settings are still not perfect.
\item The TOC design does not look very nice.
\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.
Modified: branches/branch2021.final/Master/texmf-dist/doc/latex/einfart/README.md
===================================================================
--- branches/branch2021.final/Master/texmf-dist/doc/latex/einfart/README.md 2022-03-20 21:13:02 UTC (rev 62833)
+++ branches/branch2021.final/Master/texmf-dist/doc/latex/einfart/README.md 2022-03-20 21:14:50 UTC (rev 62834)
@@ -1,4 +1,4 @@
-<!-- Copyright (C) 2021 by Jinwen XU -->
+<!-- Copyright (C) 2021-2022 by Jinwen XU -->
# `einfart` : write you articles in a simple and clear way
Modified: branches/branch2021.final/Master/texmf-dist/doc/latex/einfart/einfart-doc-cn.pdf
===================================================================
(Binary files differ)
Modified: branches/branch2021.final/Master/texmf-dist/doc/latex/einfart/einfart-doc-cn.tex
===================================================================
--- branches/branch2021.final/Master/texmf-dist/doc/latex/einfart/einfart-doc-cn.tex 2022-03-20 21:13:02 UTC (rev 62833)
+++ branches/branch2021.final/Master/texmf-dist/doc/latex/einfart/einfart-doc-cn.tex 2022-03-20 21:14:50 UTC (rev 62834)
@@ -1,4 +1,4 @@
-\documentclass[classical]{einfart}
+\documentclass[classical, simple name]{einfart}
\linenumbers % Enable line numbers
@@ -39,7 +39,7 @@
\providecommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$}
\lstset{moretexcs=%
{linenumbers,nolinenumbers,part,parttext,chapter,section,subsection,subsubsection,frontmatter,mainmatter,backmatter,tableofcontents,href,
- color,NameTheorem,CreateTheorem,proofideanameEN,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,PLdate,ProjLib,qedhere
+ color,NameTheorem,CreateTheorem,cref,dnf,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,TheDate,ProjLib,qedhere
}
}
\lstnewenvironment{code}%
@@ -96,11 +96,13 @@
%%================================
\begin{document}
+\def\PackageVersion{2022/03/19}
+
\title{\einfart{}，以极简主义风格排版你的文章}
\author{许锦文}
-\thanks{对应版本. \texttt{\einfart{} 2021/12/16}}
+\thanks{对应版本. \texttt{\einfart{} \PackageVersion}}
\email{\href{mailto:ProjLib at outlook.com}{ProjLib at outlook.com}}
-\date{2021年12月，巴黎}
+\date{\TheDate{\PackageVersion}[only-year-month]，巴黎}
\maketitle
@@ -113,6 +115,10 @@
\end{abstract}
+\begin{tip}
+ This documentation has not been fully up-to-date with the new \texttt{expl3} version of this class series. Some options or commands introduced here might be obsolete.
+\end{tip}
+
\setcounter{tocdepth}{2}
{\setstretch{1.07}\tableofcontents}
@@ -153,7 +159,7 @@
\title{(*\meta{title}*)}
\author{(*\meta{author}*)}
-\date{\PLdate{2022-04-01}}
+\date{\TheDate{2022-04-01}}
\maketitle
@@ -177,7 +183,6 @@
如果你觉得这个例子有些复杂，不要担心。现在我们来一点点地观察这个例子。
-\clearpage
\LevelThreeTitle{初始化部分}
\medskip
@@ -205,7 +210,7 @@
\begin{code}
\title{(*\meta{title}*)}
\author{(*\meta{author}*)}
-\date{\PLdate{2022-04-01}}
+\date{\TheDate{2022-04-01}}
\maketitle
\begin{abstract}
@@ -238,7 +243,7 @@
\author{(*\meta{author 2}*)}
\address{(*\meta{address 2}*)}
\email{(*\meta{email 2}*)}
-\date{\PLdate{2022-04-01}}
+\date{\TheDate{2022-04-01}}
\subjclass{*****}
\keywords{(*\meta{keywords}*)}
@@ -334,7 +339,7 @@
\begin{itemize}
\item 允许加粗。启用这一选项时，题目、各级标题、定理类环境名称会被加粗。
\end{itemize}
-\clearpage
+% \clearpage
\item \texttt{classical}
\begin{itemize}
\item 经典模式。使用这一选项时，将会启用较为古色古香的风格，如同当前的这篇说明文档一样。
@@ -347,17 +352,13 @@
\begin{itemize}
\item \lstinline|\subsubsection| 采用 ``runin'' 风格。
\end{itemize}
- \item \texttt{puretext} 或 \texttt{nothms}
+ \item \texttt{nothms}
\begin{itemize}
\item 纯文本模式，不加载定理类环境。
\end{itemize}
- \item \texttt{delaythms}
- \begin{itemize}
- \item 将定理类环境设定推迟到导言结尾。如果你希望定理类环境跟随自定义计数器编号，则应考虑这一选项。
- \end{itemize}
\item \texttt{nothmnum}、\texttt{thmnum} 或 \texttt{thmnum=}\meta{counter}
\begin{itemize}
- \item 定理类环境均不编号 / 按照 1、2、3 顺序编号 / 在 \meta{counter} 内编号。其中 \meta{counter} 应该是自带的计数器 (如 \texttt{subsection}) 或在导言部分自定义的计数器 (在启用 \texttt{delaythms} 选项的情况下)。在没有使用任何选项的情况下将按照 \texttt{chapter} (书) 或 \texttt{section} (文章) 编号。
+ \item 定理类环境均不编号 / 按照 1、2、3 顺序编号 / 在 \meta{counter} 内编号。在没有使用任何选项的情况下将按照 \texttt{chapter} (书) 或 \texttt{section} (文章) 编号。
\end{itemize}
\item \texttt{regionalref}、\texttt{originalref}
\begin{itemize}
@@ -444,72 +445,10 @@
\UseLanguage{Chinese}
-\LevelTwoTitle{定义新的定理型环境}
-
-若需要定义新的定理类环境，首先要定义这个环境在所用语言下的名称：
-\begin{itemize}
- \item \lstinline|\NameTheorem[|\meta{language name}\lstinline|]{|\meta{name of environment}\lstinline|}{|\meta{name string}\lstinline|}|
-\end{itemize}
-其中，\meta{language name} 可参阅关于语言设置的小节。当不指定 \meta{language name}时，则会将该名称设置为所有支持语言下的名称。另外，带星号与不带星号的同名环境共用一个名称，因此 \lstinline|\NameTheorem{envname*}{...}| 与 \lstinline|\NameTheorem{envname}{...}| 效果相同。
-
-然后用下面五种方式之一定义这一环境：
-\begin{itemize}
- \item \lstinline|\CreateTheorem*{|\meta{name of environment}\lstinline|}|
- \begin{itemize}
- \item 定义不编号的环境 \meta{name of environment}
- \end{itemize}
- \item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}|
- \begin{itemize}
- \item 定义编号环境 \meta{name of environment}，按顺序编号
- \end{itemize}
- \item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}[|\meta{numbered like}\lstinline|]|
- \begin{itemize}
- \item 定义编号环境 \meta{name of environment}，与 \meta{numbered like} 计数器共用编号
- \end{itemize}
- \item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}<|\meta{numbered within}\lstinline|>|
- \begin{itemize}
- \item 定义编号环境 \meta{name of environment}，在 \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 将 \meta{name of environment} 与 \meta{existed environment} 或 \meta{existed environment}\lstinline|*| 等同。
- \item 这种方式通常在两种情况下比较有用：
- \begin{enumerate}
- \item 希望定义更简洁的名称。例如，使用 \lstinline|\CreateTheorem{thm}(theorem)|，便可以直接用名称 \texttt{thm} 来撰写定理。
- \item 希望去除某些环境的编号。例如，使用 \lstinline|\CreateTheorem{remark}(remark*)|，便可以去除 \texttt{remark} 环境的编号。
- \end{enumerate}
- \end{itemize}
-\end{itemize}
-
\begin{tip}
- 其内部使用了 \textsf{amsthm}，因此传统的 \texttt{theoremstyle} 对其也是适用的，只需在相关定义前标明即可。
+ 请参阅 \textsf{create-theorem} 的说明文档以获知如何定义新的定理类环境。
\end{tip}
-\NameTheorem[CN]{proofidea}{思路}
-\CreateTheorem*{proofidea*}
-\CreateTheorem{proofidea}<subsection>
-
-\clearpage
-下面提供一个例子。这三行代码：
-
-\begin{code}
-\NameTheorem[CN]{proofidea}{思路}
-\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}
-
\LevelTwoTitle{未完成标记}
你可以通过 \lstinline|\dnf| 来标记尚未完成的部分。例如：
@@ -517,11 +456,6 @@
\item \lstinline|\dnf| 或 \lstinline|\dnf<...>|。效果为：\dnf~或 \dnf<...>。\\其提示文字与当前语言相对应，例如，在法语模式下将会显示为 \UseOtherLanguage{French}{\dnf}。
\end{itemize}
-类似的，还有 \lstinline|\needgraph| ：
-\begin{itemize}
- \item \lstinline|\needgraph| 或 \lstinline|\needgraph<...>|。效果为：\needgraph~或 \needgraph<...>其提示文字与当前语言相对应，例如，在法语模式下将会显示为 \UseOtherLanguage{French}{\needgraph}
-\end{itemize}
-
\LevelTwoTitle{文章标题、摘要与关键词}
\einfart{} 同时具有标准文档类与\AmS{} 文档类的一些特性。
@@ -588,7 +522,7 @@
\LevelThreeTitle{关于QED符号}
由于定理类环境中的字体和正文字体是一样的，为了方便看出定理类环境在哪里结束，在其结尾处放置了一个空心的QED符号。然而，如果你的定理是由公式或者列表结尾的，这个符号就无法自动地放在正确的位置。这时，你需要手动在公式或列表最后一个条目的后面加上 \lstinline|\qedhere|，以让QED符号显示到这一行的最后。
-\clearpage
+% \clearpage
\LevelOneTitle{目前存在的问题}
\begin{itemize}[itemsep=.6em]
Modified: branches/branch2021.final/Master/texmf-dist/doc/latex/einfart/einfart-doc-en.pdf
===================================================================
(Binary files differ)
Modified: branches/branch2021.final/Master/texmf-dist/doc/latex/einfart/einfart-doc-en.tex
===================================================================
--- branches/branch2021.final/Master/texmf-dist/doc/latex/einfart/einfart-doc-en.tex 2022-03-20 21:13:02 UTC (rev 62833)
+++ branches/branch2021.final/Master/texmf-dist/doc/latex/einfart/einfart-doc-en.tex 2022-03-20 21:14:50 UTC (rev 62834)
@@ -1,4 +1,4 @@
-\documentclass[classical]{einfart}
+\documentclass[classical, simple name]{einfart}
\linenumbers % Enable line numbers
@@ -39,7 +39,7 @@
\providecommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$}
\lstset{moretexcs=%
{linenumbers,nolinenumbers,part,parttext,chapter,section,subsection,subsubsection,frontmatter,mainmatter,backmatter,tableofcontents,href,
- color,NameTheorem,CreateTheorem,proofideanameEN,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,PLdate,ProjLib,qedhere
+ color,NameTheorem,CreateTheorem,cref,dnf,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,TheDate,ProjLib,qedhere
}
}
\lstnewenvironment{code}%
@@ -96,11 +96,13 @@
%%================================
\begin{document}
+\def\PackageVersion{2022/03/19}
+
\title{\einfart{}, write your articles in a simple and clear way}
\author{Jinwen XU}
-\thanks{Corresponding to: \texttt{\einfart{} 2021/12/16}}
+\thanks{Corresponding to: \texttt{\einfart{} \PackageVersion}}
\email{\href{mailto:ProjLib at outlook.com}{ProjLib at outlook.com}}
-\date{December 2021, in Paris}
+\date{\TheDate{\PackageVersion}[only-year-month], in Paris}
\maketitle
@@ -113,6 +115,10 @@
\end{abstract}
+\begin{tip}
+ This documentation has not been fully up-to-date with the new \texttt{expl3} version of this class series. Some options or commands introduced here might be obsolete.
+\end{tip}
+
\setcounter{tocdepth}{2}
\tableofcontents
@@ -124,7 +130,7 @@
\begin{itemize}
\item install TeX Live or MikTeX of the latest possible version, and make sure that \texttt{minimalist} and \texttt{projlib} are correctly installed in your \TeX{} system.
\item download and install the required fonts, see the section "On the default fonts".
- \item be familiar with the basic usage of \LaTeX{}, and knows how to compile your document with \hologo{pdfLaTeX}, \hologo{XeLaTeX} or \hologo{LuaLaTeX}.
+ \item be familiar with the basic usage of \LaTeX{}, and know how to compile your document with \hologo{pdfLaTeX}, \hologo{XeLaTeX} or \hologo{LuaLaTeX}.
\end{itemize}
@@ -153,7 +159,7 @@
\title{(*\meta{title}*)}
\author{(*\meta{author}*)}
-\date{\PLdate{2022-04-01}}
+\date{\TheDate{2022-04-01}}
\maketitle
@@ -177,7 +183,6 @@
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
@@ -206,7 +211,7 @@
\begin{code}
\title{(*\meta{title}*)}
\author{(*\meta{author}*)}
-\date{\PLdate{2022-04-01}}
+\date{\TheDate{2022-04-01}}
\maketitle
\begin{abstract}
@@ -239,7 +244,7 @@
\author{(*\meta{author 2}*)}
\address{(*\meta{address 2}*)}
\email{(*\meta{email 2}*)}
-\date{\PLdate{2022-04-01}}
+\date{\TheDate{2022-04-01}}
\subjclass{*****}
\keywords{(*\meta{keywords}*)}
@@ -335,7 +340,7 @@
\begin{itemize}
\item Allow boldface. When this option is enabled, the main title, the titles of all levels and the names of theorem-like environments will be bolded.
\end{itemize}
-\clearpage
+% \clearpage
\item \texttt{classical}
\begin{itemize}
\item Classic mode. An antique-looking style will be used when this option is enabled, like in the current documentation.
@@ -348,17 +353,13 @@
\begin{itemize}
\item Use the ``runin'' style for \lstinline|\subsubsection|
\end{itemize}
- \item \texttt{puretext} or \texttt{nothms}
+ \item \texttt{nothms}
\begin{itemize}
\item Pure text mode. Do not load theorem-like environments.
\end{itemize}
- \item \texttt{delaythms}
- \begin{itemize}
- \item Defer the definition of theorem-like environments to the end of the preamble. Use this option if you want the theorem-like environments to be numbered within a custom counter.
- \end{itemize}
\item \texttt{nothmnum}, \texttt{thmnum} or \texttt{thmnum=}\meta{counter}
\begin{itemize}
- \item Theorem-like environments will not be numbered / numbered in order 1, 2, 3... / numbered within \meta{counter}. Here, \meta{counter} should be a built-in counter (such as \texttt{subsection}) or a custom counter defined in the preamble (with the option \texttt{delaythms} enabled). If no option is used, they will be numbered within \texttt{chapter} (book) or \texttt{section} (article).
+ \item Theorem-like environments will not be numbered / numbered in order 1, 2, 3... / numbered within \meta{counter}. If no option is used, they will be numbered within \texttt{chapter} (book) or \texttt{section} (article).
\end{itemize}
\item \texttt{regionalref}, \texttt{originalref}
\begin{itemize}
@@ -441,75 +442,10 @@
\UseLanguage{English}
-\LevelTwoTitle{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}
-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
-And then define this environment in one of following five ways:
-\begin{itemize}
- \item \lstinline|\CreateTheorem*{|\meta{name of environment}\lstinline|}|
- \begin{itemize}
- \item Define an unnumbered environment \meta{name of environment}
- \end{itemize}
- \item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}|
- \begin{itemize}
- \item Define a numbered environment \meta{name of environment}, numbered in order 1,2,3,\dots
- \end{itemize}
- \item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}[|\meta{numbered like}\lstinline|]|
- \begin{itemize}
- \item Define a numbered environment \meta{name of environment}, which shares the counter \meta{numbered like}
- \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}
- \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 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}(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}
-
\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.
+ Please refer to the documentation of the package \textsf{create-theorem} to see how to declare new theorem-like environments.
\end{tip}
-\NameTheorem[EN]{proofidea}{Idea}
-\CreateTheorem*{proofidea*}
-\CreateTheorem{proofidea}<subsection>
-
-\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:
-
-\vspace{-0.3\baselineskip}
-\begin{proofidea*}
- The \lstinline|proofidea*| environment.
-\end{proofidea*}
-
-\vspace{-\baselineskip}
-\begin{proofidea}
- The \lstinline|proofidea| environment.
-\end{proofidea}
-
\LevelTwoTitle{Draft mark}
You can use \lstinline|\dnf| to mark the unfinished part. For example:
@@ -517,11 +453,6 @@
\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| :
-\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}
-
\LevelTwoTitle{Title, abstract and keywords}
\einfart{} has both the features of standard classes and that of the \AmS{} classes.
@@ -585,10 +516,8 @@
\end{itemize}
This is a disadvantage brought about by the underline decoration of the title.
-\LevelThreeTitle{On the QED symbols}
-Since the font in the theorem-like environments is the same as that of the main text, in order to indicate where the environments end, a hollow QED symbol \simpleqedsymbol{} is placed at the end of the theorem-like environments. However, if your theorem ends with an equation or list (itemize, enumerate, description, etc.), this symbol cannot be automatically placed in the correct position. In this case, you need to manually add a \lstinline|\qedhere| at the end of your equation or the last entry of your list to make the QED symbol appear at the end of the line.
-\clearpage
+% \clearpage
\LevelOneTitle{Known issues}
\begin{itemize}[itemsep=.6em]
Modified: branches/branch2021.final/Master/texmf-dist/doc/latex/einfart/einfart-doc-fr.pdf
===================================================================
(Binary files differ)
Modified: branches/branch2021.final/Master/texmf-dist/doc/latex/einfart/einfart-doc-fr.tex
===================================================================
--- branches/branch2021.final/Master/texmf-dist/doc/latex/einfart/einfart-doc-fr.tex 2022-03-20 21:13:02 UTC (rev 62833)
+++ branches/branch2021.final/Master/texmf-dist/doc/latex/einfart/einfart-doc-fr.tex 2022-03-20 21:14:50 UTC (rev 62834)
@@ -1,4 +1,4 @@
-\documentclass[classical]{einfart}
+\documentclass[classical, simple name]{einfart}
\linenumbers % Enable line numbers
@@ -39,7 +39,7 @@
\providecommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$}
\lstset{moretexcs=%
{linenumbers,nolinenumbers,part,parttext,chapter,section,subsection,subsubsection,frontmatter,mainmatter,backmatter,tableofcontents,href,
- color,NameTheorem,CreateTheorem,proofideanameEN,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,PLdate,ProjLib,qedhere
+ color,NameTheorem,CreateTheorem,cref,dnf,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,TheDate,ProjLib,qedhere
}
}
\lstnewenvironment{code}%
@@ -96,11 +96,13 @@
%%================================
\begin{document}
+\def\PackageVersion{2022/03/19}
+
\title{\einfart{}, écrivez vos articles de manière simple et claire}
\author{Jinwen XU}
-\thanks{Correspondant à : \texttt{\einfart{} 2021/12/16}}
+\thanks{Correspondant à : \texttt{\einfart{} \PackageVersion}}
\email{\href{mailto:ProjLib at outlook.com}{ProjLib at outlook.com}}
-\date{Décembre 2021, à Paris}
+\date{\TheDate{\PackageVersion}[only-year-month], à Paris}
\maketitle
@@ -113,6 +115,10 @@
\end{abstract}
+\begin{tip}
+ This documentation has not been fully up-to-date with the new \texttt{expl3} version of this class series. Some options or commands introduced here might be obsolete.
+\end{tip}
+
\setcounter{tocdepth}{2}
\tableofcontents
@@ -154,7 +160,7 @@
\title{(*\meta{title}*)}
\author{(*\meta{author}*)}
-\date{\PLdate{2022-04-01}}
+\date{\TheDate{2022-04-01}}
\maketitle
@@ -178,7 +184,6 @@
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
@@ -206,7 +211,7 @@
\begin{code}
\title{(*\meta{title}*)}
\author{(*\meta{author}*)}
-\date{\PLdate{2022-04-01}}
+\date{\TheDate{2022-04-01}}
\maketitle
\begin{abstract}
@@ -239,7 +244,7 @@
\author{(*\meta{author 2}*)}
\address{(*\meta{address 2}*)}
\email{(*\meta{email 2}*)}
-\date{\PLdate{2022-04-01}}
+\date{\TheDate{2022-04-01}}
\subjclass{*****}
\keywords{(*\meta{keywords}*)}
@@ -346,17 +351,13 @@
\begin{itemize}
\item Utilisez le style «~runin~» pour \lstinline|\subsubsection|
\end{itemize}
- \item \texttt{puretext} ou \texttt{nothms}
+ \item \texttt{nothms}
\begin{itemize}
\item Mode texte pur. Ne pas définir les environnements de type théorème.
\end{itemize}
- \item \texttt{delaythms}
- \begin{itemize}
- \item Reportez la définition des environnements de type théorème à la fin du préambule. Utilisez cette option si vous souhaitez que les environnements soient numérotés dans un compteur personnalisé.
- \end{itemize}
\item \texttt{nothmnum}, \texttt{thmnum} ou \texttt{thmnum=}\meta{counter}
\begin{itemize}
- \item Les environnements de type théorème ne seront pas numérotés / numérotés dans l'ordre 1, 2, 3... / numérotés dans \meta{counter}. Ici, \meta{counter} doit être un compteur intégré (tel que \texttt{subsection}) ou un compteur défini dans le préambule (avec l'option \texttt{delaythms} activée). Si aucune option n'est utilisée, ils seront numérotés dans \texttt{chapter} (livre) ou \texttt{section} (article).
+ \item Les environnements de type théorème ne seront pas numérotés / numérotés dans l'ordre 1, 2, 3... / numérotés dans \meta{counter}. Si aucune option n'est utilisée, ils seront numérotés dans \texttt{chapter} (livre) ou \texttt{section} (article).
\end{itemize}
\item \texttt{regionalref}, \texttt{originalref}
\begin{itemize}
@@ -365,7 +366,7 @@
\end{itemize}
\end{itemize}
-\clearpage
+% \clearpage
\LevelOneTitle{Instructions par sujet}
\LevelTwoTitle{Configurer la langue}
@@ -438,75 +439,10 @@
\UseLanguage{French}
-\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 \meta{name of environment} non numéroté
- \end{itemize}
- \item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}|
- \begin{itemize}
- \item Définir un environnement \meta{name of environment} numéroté dans l'ordre 1, 2, 3, \dots
- \end{itemize}
- \item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}[|\meta{numbered like}\lstinline|]|
- \begin{itemize}
- \item Définir un environnement \meta{name of environment} numéroté, qui partage le compteur \meta{numbered like}
- \end{itemize}
-\clearpage
- \item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}<|\meta{numbered within}\lstinline|>|
- \begin{itemize}
- \item Définir un environnement \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.
+ Veuillez consulter la documentation du paquet \textsf{create-theorem} pour voir comment déclarer de nouveaux environnements de type théorème.
\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 :
@@ -514,11 +450,6 @@
\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}
\einfart{} possède à la fois les caractéristiques des classes standard et celles des classes \AmS{}.
@@ -569,7 +500,7 @@
Parmi eux, l'ordre mutuel de \lstinline|\address|, \lstinline|\curraddr|, \lstinline|\email| n'est pas important.
-\clearpage
+% \clearpage
\LevelTwoTitle{Divers}
\LevelThreeTitle{Les numéros de ligne}
@@ -583,8 +514,6 @@
\end{itemize}
C'est un inconvénient provoqué par la décoration de soulignement du titre.
-\LevelThreeTitle{Les symboles QED}
-Puisque la police dans les environnements de type théorème est la même que celle du texte principal, afin d'indiquer où se terminent les environnements, un symbole QED creux \simpleqedsymbol{} est placé à la fin des environnements de type théorème. Cependant, si votre théorème se termine par une équation ou une liste (itemize, énumérer, description, etc.), ce symbole ne peut pas être automatiquement placé à la bonne position. Dans ce cas, vous devez ajouter manuellement un \lstinline|\qedhere| à la fin de votre équation ou la dernière entrée de votre liste pour faire apparaître le symbole QED en fin de ligne.
\LevelOneTitle{Problèmes connus}
Modified: branches/branch2021.final/Master/texmf-dist/doc/latex/lebhart/README.md
===================================================================
--- branches/branch2021.final/Master/texmf-dist/doc/latex/lebhart/README.md 2022-03-20 21:13:02 UTC (rev 62833)
+++ branches/branch2021.final/Master/texmf-dist/doc/latex/lebhart/README.md 2022-03-20 21:14:50 UTC (rev 62834)
@@ -1,7 +1,9 @@
-<!-- Copyright (C) 2021 by Jinwen XU -->
+<!-- Copyright (C) 2021-2022 by Jinwen XU -->
# `lebhart` : write you articles in a colorful way
+**The current document class have been rewritten with `expl3`. Please note that the documentations are not yet up-to-date. The syntax of some commands have been changed since the last version, especially the declaration of theorem-like environments by `\CreateTheorem`. For the moment, you can refer to the documentation of the package `create-theorem`.**
+
`lebhart` is a LaTeX class for typesetting articles, which has a colorful
design.
Modified: branches/branch2021.final/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-cn.pdf
===================================================================
(Binary files differ)
Modified: branches/branch2021.final/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-cn.tex
===================================================================
--- branches/branch2021.final/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-cn.tex 2022-03-20 21:13:02 UTC (rev 62833)
+++ branches/branch2021.final/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-cn.tex 2022-03-20 21:14:50 UTC (rev 62834)
@@ -1,5 +1,6 @@
-\documentclass[English,Chinese,French,allowbf]{lebhart}
+\documentclass[English,Chinese,French,use boldface,simple name]{lebhart}
+
%%================================
%% Import toolkit
%%================================
@@ -37,7 +38,7 @@
\providecommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$}
\lstset{moretexcs=%
{part,parttext,chapter,section,subsection,subsubsection,frontmatter,mainmatter,backmatter,tableofcontents,href,
- color,NameTheorem,CreateTheorem,proofideanameEN,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,PLdate,ProjLib,qedhere
+ color,NameTheorem,CreateTheorem,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,TheDate,ProjLib,qedhere
}
}
\lstnewenvironment{code}%
@@ -91,11 +92,13 @@
%%================================
\begin{document}
-\title{{\normalfont\bfseries\color{maintext}\lebhart{}}\\以多彩的方式排版你的文章}
+\def\PackageVersion{2022/03/19}
+
+\title{{\normalfont\bfseries\color{main-text}\lebhart{}}\\以多彩的方式排版你的文章}
\author{许锦文}
-\thanks{对应版本. \texttt{\lebhart{} 2021/12/16}}
+\thanks{对应版本. \texttt{\lebhart{} \PackageVersion}}
\email{\href{mailto:ProjLib at outlook.com}{ProjLib at outlook.com}}
-\date{2021年12月，巴黎}
+\date{\TheDate{\PackageVersion}[only-year-month]，巴黎}
\maketitle
@@ -108,6 +111,10 @@
\end{abstract}
+\begin{tip}
+ This documentation has not been fully up-to-date with the new \texttt{expl3} version of this class series. Some options or commands introduced here might be obsolete.
+\end{tip}
+
\setcounter{tocdepth}{2}
\tableofcontents
@@ -148,7 +155,7 @@
\title{(*\meta{title}*)}
\author{(*\meta{author}*)}
-\date{\PLdate{2022-04-01}}
+\date{\TheDate{2022-04-01}}
\maketitle
@@ -197,7 +204,7 @@
\begin{code}
\title{(*\meta{title}*)}
\author{(*\meta{author}*)}
-\date{\PLdate{2022-04-01}}
+\date{\TheDate{2022-04-01}}
\maketitle
\begin{abstract}
@@ -230,7 +237,7 @@
\author{(*\meta{author 2}*)}
\address{(*\meta{address 2}*)}
\email{(*\meta{email 2}*)}
-\date{\PLdate{2022-04-01}}
+\date{\TheDate{2022-04-01}}
\subjclass{*****}
\keywords{(*\meta{keywords}*)}
@@ -297,7 +304,7 @@
-\clearpage
+% \clearpage
\LevelOneTitle{选项}
\lebhart{} 文档类有下面几个选项：
@@ -337,17 +344,13 @@
\begin{itemize}
\item \lstinline|\subsubsection| 采用 ``runin'' 风格。
\end{itemize}
- \item \texttt{puretext} 或 \texttt{nothms}
+ \item \texttt{nothms}
\begin{itemize}
\item 纯文本模式，不加载定理类环境。
\end{itemize}
- \item \texttt{delaythms}
- \begin{itemize}
- \item 将定理类环境设定推迟到导言结尾。如果你希望定理类环境跟随自定义计数器编号，则应考虑这一选项。
- \end{itemize}
\item \texttt{nothmnum}、\texttt{thmnum} 或 \texttt{thmnum=}\meta{counter}
\begin{itemize}
- \item 定理类环境均不编号 / 按照 1、2、3 顺序编号 / 在 \meta{counter} 内编号。其中 \meta{counter} 应该是自带的计数器 (如 \texttt{subsection}) 或在导言部分自定义的计数器 (在启用 \texttt{delaythms} 选项的情况下)。在没有使用任何选项的情况下将按照 \texttt{chapter} (书) 或 \texttt{section} (文章) 编号。
+ \item 定理类环境均不编号 / 按照 1、2、3 顺序编号 / 在 \meta{counter} 内编号。在没有使用任何选项的情况下将按照 \texttt{chapter} (书) 或 \texttt{section} (文章) 编号。
\end{itemize}
\item \texttt{regionalref}、\texttt{originalref}
\begin{itemize}
@@ -356,7 +359,7 @@
\end{itemize}
\end{itemize}
-\clearpage
+% \clearpage
\LevelOneTitle{具体说明}
\LevelTwoTitle{语言设置}
@@ -471,71 +474,10 @@
Second definition.
\end{definition}
-\LevelTwoTitle{定义新的定理型环境}
-
-若需要定义新的定理类环境，首先要定义这个环境在所用语言下的名称：
-\begin{itemize}
- \item \lstinline|\NameTheorem[|\meta{language name}\lstinline|]{|\meta{name of environment}\lstinline|}{|\meta{name string}\lstinline|}|
-\end{itemize}
-其中，\meta{language name} 可参阅关于语言设置的小节。当不指定 \meta{language name}时，则会将该名称设置为所有支持语言下的名称。另外，带星号与不带星号的同名环境共用一个名称，因此 \lstinline|\NameTheorem{envname*}{...}| 与 \lstinline|\NameTheorem{envname}{...}| 效果相同。
-
-然后用下面五种方式之一定义这一环境：
-\begin{itemize}
- \item \lstinline|\CreateTheorem*{|\meta{name of environment}\lstinline|}|
- \begin{itemize}
- \item 定义不编号的环境 \meta{name of environment}
- \end{itemize}
- \item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}|
- \begin{itemize}
- \item 定义编号环境 \meta{name of environment}，按顺序编号
- \end{itemize}
- \item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}[|\meta{numbered like}\lstinline|]|
- \begin{itemize}
- \item 定义编号环境 \meta{name of environment}，与 \meta{numbered like} 计数器共用编号
- \end{itemize}
- \item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}<|\meta{numbered within}\lstinline|>|
- \begin{itemize}
- \item 定义编号环境 \meta{name of environment}，在 \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 将 \meta{name of environment} 与 \meta{existed environment} 或 \meta{existed environment}\lstinline|*| 等同。
- \item 这种方式通常在两种情况下比较有用：
- \begin{enumerate}
- \item 希望定义更简洁的名称。例如，使用 \lstinline|\CreateTheorem{thm}(theorem)|，便可以直接用名称 \texttt{thm} 来撰写定理。
- \item 希望去除某些环境的编号。例如，使用 \lstinline|\CreateTheorem{remark}(remark*)|，便可以去除 \texttt{remark} 环境的编号。
- \end{enumerate}
- \end{itemize}
-\end{itemize}
-
\begin{tip}
- 其内部使用了 \textsf{amsthm}，因此传统的 \texttt{theoremstyle} 对其也是适用的，只需在相关定义前标明即可。
+ 请参阅 \textsf{create-theorem} 的说明文档以获知如何定义新的定理类环境。
\end{tip}
-\NameTheorem[CN]{proofidea}{思路}
-\CreateTheorem*{proofidea*}
-\CreateTheorem{proofidea}<subsection>
-
-\bigskip
-下面提供一个例子。这三行代码：
-
-\begin{code}
-\NameTheorem[CN]{proofidea}{思路}
-\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}
-
\LevelTwoTitle{未完成标记}
你可以通过 \lstinline|\dnf| 来标记尚未完成的部分。例如：
@@ -543,11 +485,6 @@
\item \lstinline|\dnf| 或 \lstinline|\dnf<...>|。效果为：\dnf~或 \dnf<...>。\\其提示文字与当前语言相对应，例如，在法语模式下将会显示为 \UseOtherLanguage{French}{\dnf}。
\end{itemize}
-类似的，还有 \lstinline|\needgraph| ：
-\begin{itemize}
- \item \lstinline|\needgraph| 或 \lstinline|\needgraph<...>|。效果为：\needgraph~或 \needgraph<...>其提示文字与当前语言相对应，例如，在法语模式下将会显示为 \UseOtherLanguage{French}{\needgraph}
-\end{itemize}
-
\LevelTwoTitle{文章标题、摘要与关键词}
\lebhart{} 同时具有标准文档类与\AmS{} 文档类的一些特性。
@@ -600,7 +537,7 @@
\bigskip
\LevelOneTitle{目前存在的问题}
-\begin{itemize}[itemsep=.6em]
+\begin{itemize}
\item 对于字体的设置仍然不够完善。
\item 目录的设计还不够美观。
\item 由于很多核心功能建立在 \ProjLib{} 工具箱的基础上，因此 \colorist{} (进而 \colorart{}、\lebhart{} 与 \colorbook{}、\beaulivre{}) 自然继承了其所有问题。详情可以参阅 \ProjLib{} 用户文档的“目前存在的问题”这一小节。
Modified: branches/branch2021.final/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-en.pdf
===================================================================
(Binary files differ)
Modified: branches/branch2021.final/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-en.tex
===================================================================
--- branches/branch2021.final/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-en.tex 2022-03-20 21:13:02 UTC (rev 62833)
+++ branches/branch2021.final/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-en.tex 2022-03-20 21:14:50 UTC (rev 62834)
@@ -1,5 +1,6 @@
-\documentclass[English,Chinese,French,allowbf]{lebhart}
+\documentclass[English,Chinese,French,use boldface,simple name]{lebhart}
+
%%================================
%% Import toolkit
%%================================
@@ -37,7 +38,7 @@
\providecommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$}
\lstset{moretexcs=%
{part,parttext,chapter,section,subsection,subsubsection,frontmatter,mainmatter,backmatter,tableofcontents,href,
- color,NameTheorem,CreateTheorem,proofideanameEN,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,PLdate,ProjLib,qedhere
+ color,NameTheorem,CreateTheorem,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,TheDate,ProjLib,qedhere
}
}
\lstnewenvironment{code}%
@@ -91,11 +92,13 @@
%%================================
\begin{document}
-\title{{\normalfont\bfseries\color{maintext}\lebhart{}}\\write your articles in a colorful way}
+\def\PackageVersion{2022/03/19}
+
+\title{{\normalfont\bfseries\color{main-text}\lebhart{}}\\write your articles in a colorful way}
\author{Jinwen XU}
-\thanks{Corresponding to: \texttt{\lebhart{} 2021/12/16}}
+\thanks{Corresponding to: \texttt{\lebhart{} \PackageVersion}}
\email{\href{mailto:ProjLib at outlook.com}{ProjLib at outlook.com}}
-\date{December 2021, in Paris}
+\date{\TheDate{\PackageVersion}[only-year-month], in Paris}
\maketitle
@@ -108,6 +111,10 @@
\end{abstract}
+\begin{tip}
+ This documentation has not been fully up-to-date with the new \texttt{expl3} version of this class series. Some options or commands introduced here might be obsolete.
+\end{tip}
+
\setcounter{tocdepth}{2}
\tableofcontents
@@ -119,7 +126,7 @@
\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 download and install the required fonts, see the section "On the default fonts".
- \item be familiar with the basic usage of \LaTeX{}, and knows how to compile your document with \hologo{pdfLaTeX}, \hologo{XeLaTeX} or \hologo{LuaLaTeX}.
+ \item be familiar with the basic usage of \LaTeX{}, and know how to compile your document with \hologo{pdfLaTeX}, \hologo{XeLaTeX} or \hologo{LuaLaTeX}.
\end{itemize}
@@ -148,7 +155,7 @@
\title{(*\meta{title}*)}
\author{(*\meta{author}*)}
-\date{\PLdate{2022-04-01}}
+\date{\TheDate{2022-04-01}}
\maketitle
@@ -172,7 +179,6 @@
If you find this example a little complicated, don't worry. Let's now look at this example piece by piece.
-\clearpage
\LevelThreeTitle{Initialization}
\begin{code}
@@ -198,7 +204,7 @@
\begin{code}
\title{(*\meta{title}*)}
\author{(*\meta{author}*)}
-\date{\PLdate{2022-04-01}}
+\date{\TheDate{2022-04-01}}
\maketitle
\begin{abstract}
@@ -231,7 +237,7 @@
\author{(*\meta{author 2}*)}
\address{(*\meta{address 2}*)}
\email{(*\meta{email 2}*)}
-\date{\PLdate{2022-04-01}}
+\date{\TheDate{2022-04-01}}
\subjclass{*****}
\keywords{(*\meta{keywords}*)}
@@ -291,7 +297,7 @@
\end{tip}
-\clearpage
+% \clearpage
\LevelOneTitle{On the default fonts}
By default, this document class uses Palatino Linotype as the English main font; Source Han Serif, Source Han Sans and Source Han Mono as the Chinese main font, sans serif font and typewriter font; and partially uses Neo Euler as the math font. You need to download and install these fonts by yourself. The Source Han font series can be downloaded at \url{https://github.com/adobe-fonts} (It is recommended to download the Super-OTC version, so that the download size is smaller). Neo Euler can be downloaded at \url{https://github.com/khaledhosny/euler-otf}. When the corresponding font is not installed, the font that comes with TeX Live will be used instead, and the effect may be discounted.
@@ -337,18 +343,14 @@
\begin{itemize}
\item Use the ``runin'' style for \lstinline|\subsubsection|
\end{itemize}
- \item \texttt{puretext} or \texttt{nothms}
+ \item \texttt{nothms}
\begin{itemize}
\item Pure text mode. Do not load theorem-like environments.
\end{itemize}
- \item \texttt{delaythms}
- \begin{itemize}
- \item Defer the definition of theorem-like environments to the end of the preamble. Use this option if you want the theorem-like environments to be numbered within a custom counter.
- \end{itemize}
-\clearpage
+% \clearpage
\item \texttt{nothmnum}, \texttt{thmnum} or \texttt{thmnum=}\meta{counter}
\begin{itemize}
- \item Theorem-like environments will not be numbered / numbered in order 1, 2, 3... / numbered within \meta{counter}. Here, \meta{counter} should be a built-in counter (such as \texttt{subsection}) or a custom counter defined in the preamble (with the option \texttt{delaythms} enabled). If no option is used, they will be numbered within \texttt{chapter} (book) or \texttt{section} (article).
+ \item Theorem-like environments will not be numbered / numbered in order 1, 2, 3... / numbered within \meta{counter}. If no option is used, they will be numbered within \texttt{chapter} (book) or \texttt{section} (article).
\end{itemize}
\item \texttt{regionalref}, \texttt{originalref}
\begin{itemize}
@@ -466,75 +468,10 @@
Second definition.
\end{definition}
-\LevelTwoTitle{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}
-
-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
-And then define this environment in one of following five ways:
-\begin{itemize}
- \item \lstinline|\CreateTheorem*{|\meta{name of environment}\lstinline|}|
- \begin{itemize}
- \item Define an unnumbered environment \meta{name of environment}
- \end{itemize}
- \item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}|
- \begin{itemize}
- \item Define a numbered environment \meta{name of environment}, numbered in order 1,2,3,\dots
- \end{itemize}
- \item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}[|\meta{numbered like}\lstinline|]|
- \begin{itemize}
- \item Define a numbered environment \meta{name of environment}, which shares the counter \meta{numbered like}
- \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}
- \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 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}(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}
-
\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.
+ Please refer to the documentation of the package \textsf{create-theorem} to see how to declare new theorem-like environments.
\end{tip}
-\NameTheorem[EN]{proofidea}{Idea}
-\CreateTheorem*{proofidea*}
-\CreateTheorem{proofidea}<subsection>
-
-\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:
-
-\vspace{-0.3\baselineskip}
-\begin{proofidea*}
- The \lstinline|proofidea*| environment.
-\end{proofidea*}
-
-\vspace{-\baselineskip}
-\begin{proofidea}
- The \lstinline|proofidea| environment.
-\end{proofidea}
-
\LevelTwoTitle{Draft mark}
You can use \lstinline|\dnf| to mark the unfinished part. For example:
@@ -542,12 +479,6 @@
\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| :
-\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}
-
\LevelTwoTitle{Title, abstract and keywords}
\lebhart{} has both the features of standard classes and that of the \AmS{} classes.
@@ -584,7 +515,7 @@
\maketitle
\end{code}
-\clearpage
+% \clearpage
The author information can contain multiple groups, written as:
\begin{code}
@@ -602,7 +533,7 @@
\bigskip
\LevelOneTitle{Known issues}
-\begin{itemize}[itemsep=.6em]
+\begin{itemize}
\item The font settings are still not perfect.
\item The TOC design does not look very nice.
\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.
Modified: branches/branch2021.final/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-fr.pdf
===================================================================
(Binary files differ)
Modified: branches/branch2021.final/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-fr.tex
===================================================================
--- branches/branch2021.final/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-fr.tex 2022-03-20 21:13:02 UTC (rev 62833)
+++ branches/branch2021.final/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-fr.tex 2022-03-20 21:14:50 UTC (rev 62834)
@@ -1,5 +1,6 @@
-\documentclass[English,Chinese,French,allowbf]{lebhart}
+\documentclass[English,Chinese,French,use boldface,simple name]{lebhart}
+
%%================================
%% Import toolkit
%%================================
@@ -37,7 +38,7 @@
\providecommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$}
\lstset{moretexcs=%
{part,parttext,chapter,section,subsection,subsubsection,frontmatter,mainmatter,backmatter,tableofcontents,href,
- color,NameTheorem,CreateTheorem,proofideanameEN,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,PLdate,ProjLib,qedhere
+ color,NameTheorem,CreateTheorem,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,TheDate,ProjLib,qedhere
}
}
\lstnewenvironment{code}%
@@ -91,11 +92,13 @@
%%================================
\begin{document}
-\title{{\normalfont\bfseries\color{maintext}\lebhart{}}\\écrivez vos articles de manière colorée}
+\def\PackageVersion{2022/03/19}
+
+\title{{\normalfont\bfseries\color{main-text}\lebhart{}}\\écrivez vos articles de manière colorée}
\author{Jinwen XU}
-\thanks{Correspondant à : \texttt{\lebhart{} 2021/12/16}}
+\thanks{Correspondant à : \texttt{\lebhart{} \PackageVersion}}
\email{\href{mailto:ProjLib at outlook.com}{ProjLib at outlook.com}}
-\date{Décembre 2021, à Paris}
+\date{\TheDate{\PackageVersion}[only-year-month], à Paris}
\maketitle
@@ -108,6 +111,10 @@
\end{abstract}
+\begin{tip}
+ This documentation has not been fully up-to-date with the new \texttt{expl3} version of this class series. Some options or commands introduced here might be obsolete.
+\end{tip}
+
\setcounter{tocdepth}{2}
\tableofcontents
@@ -149,7 +156,7 @@
\title{(*\meta{title}*)}
\author{(*\meta{author}*)}
-\date{\PLdate{2022-04-01}}
+\date{\TheDate{2022-04-01}}
\maketitle
@@ -198,7 +205,7 @@
\begin{code}
\title{(*\meta{title}*)}
\author{(*\meta{author}*)}
-\date{\PLdate{2022-04-01}}
+\date{\TheDate{2022-04-01}}
\maketitle
\begin{abstract}
@@ -231,7 +238,7 @@
\author{(*\meta{author 2}*)}
\address{(*\meta{address 2}*)}
\email{(*\meta{email 2}*)}
-\date{\PLdate{2022-04-01}}
+\date{\TheDate{2022-04-01}}
\subjclass{*****}
\keywords{(*\meta{keywords}*)}
@@ -337,17 +344,13 @@
\begin{itemize}
\item Utilisez le style «~runin~» pour \lstinline|\subsubsection|
\end{itemize}
- \item \texttt{puretext} ou \texttt{nothms}
+ \item \texttt{nothms}
\begin{itemize}
\item Mode texte pur. Ne pas définir les environnements de type théorème.
\end{itemize}
- \item \texttt{delaythms}
- \begin{itemize}
- \item Reportez la définition des environnements de type théorème à la fin du préambule. Utilisez cette option si vous souhaitez que les environnements soient numérotés dans un compteur personnalisé.
- \end{itemize}
\item \texttt{nothmnum}, \texttt{thmnum} ou \texttt{thmnum=}\meta{counter}
\begin{itemize}
- \item Les environnements de type théorème ne seront pas numérotés / numérotés dans l'ordre 1, 2, 3... / numérotés dans \meta{counter}. Ici, \meta{counter} doit être un compteur intégré (tel que \texttt{subsection}) ou un compteur défini dans le préambule (avec l'option \texttt{delaythms} activée). Si aucune option n'est utilisée, ils seront numérotés dans \texttt{chapter} (livre) ou \texttt{section} (article).
+ \item Les environnements de type théorème ne seront pas numérotés / numérotés dans l'ordre 1, 2, 3... / numérotés dans \meta{counter}. Si aucune option n'est utilisée, ils seront numérotés dans \texttt{chapter} (livre) ou \texttt{section} (article).
\end{itemize}
\item \texttt{regionalref}, \texttt{originalref}
\begin{itemize}
@@ -464,73 +467,10 @@
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 \meta{name of environment} non numéroté
- \end{itemize}
- \item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}|
- \begin{itemize}
- \item Définir un environnement \meta{name of environment} numéroté dans l'ordre 1, 2, 3, \dots
- \end{itemize}
- \item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}[|\meta{numbered like}\lstinline|]|
- \begin{itemize}
- \item Définir un environnement \meta{name of environment} numéroté, qui partage le compteur \meta{numbered like}
- \end{itemize}
- \item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}<|\meta{numbered within}\lstinline|>|
- \begin{itemize}
- \item Définir un environnement \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.
+ Veuillez consulter la documentation du paquet \textsf{create-theorem} pour voir comment déclarer de nouveaux environnements de type théorème.
\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 :
@@ -538,11 +478,6 @@
\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{}.
@@ -579,7 +514,7 @@
\maketitle
\end{code}
-\clearpage
+% \clearpage
Les informations sur l'auteur peuvent contenir plusieurs groupes, écrits comme suit :
\begin{code}
@@ -597,7 +532,7 @@
\bigskip
\LevelOneTitle{Problèmes connus}
-\begin{itemize}[itemsep=.6em]
+\begin{itemize}
\item Les paramètres de police ne sont pas encore parfaits.
\item La conception de la table des matières est pas si belle.
\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{}.
Modified: branches/branch2021.final/Master/texmf-dist/doc/latex/minimalist/minimalist-doc.pdf
===================================================================
(Binary files differ)
Modified: branches/branch2021.final/Master/texmf-dist/doc/latex/minimalist/minimalist-doc.tex
===================================================================
--- branches/branch2021.final/Master/texmf-dist/doc/latex/minimalist/minimalist-doc.tex 2022-03-20 21:13:02 UTC (rev 62833)
+++ branches/branch2021.final/Master/texmf-dist/doc/latex/minimalist/minimalist-doc.tex 2022-03-20 21:14:50 UTC (rev 62834)
@@ -1,4 +1,4 @@
-\documentclass[classical]{minimart}
+\documentclass[classical, simple name]{minimart}
\linenumbers % Enable line numbers
@@ -39,7 +39,7 @@
\providecommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$}
\lstset{moretexcs=%
{linenumbers,nolinenumbers,part,parttext,chapter,section,subsection,subsubsection,frontmatter,mainmatter,backmatter,tableofcontents,href,
- color,NameTheorem,CreateTheorem,proofideanameEN,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,PLdate,ProjLib,qedhere
+ color,NameTheorem,CreateTheorem,cref,dnf,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,TheDate,ProjLib,qedhere
}
}
\lstnewenvironment{code}%
@@ -96,11 +96,13 @@
%%================================
\begin{document}
+\def\PackageVersion{2022/03/19}
+
\title{\minimalist{}, write your articles or books in a simple and clear way}
\author{Jinwen XU}
-\thanks{Corresponding to: \texttt{\minimalist{} 2021/12/16}}
+\thanks{Corresponding to: \texttt{\minimalist{} \PackageVersion}}
\email{\href{mailto:ProjLib at outlook.com}{ProjLib at outlook.com}}
-\date{December 2021, in Paris}
+\date{\TheDate{\PackageVersion}[only-year-month], in Paris}
\maketitle
@@ -111,6 +113,10 @@
\end{abstract}
+\begin{tip}
+ This documentation has not been fully up-to-date with the new \texttt{expl3} version of this class series. Some options or commands introduced here might be obsolete.
+\end{tip}
+
\setcounter{tocdepth}{2}
\tableofcontents
@@ -122,7 +128,7 @@
\begin{itemize}
\item install TeX Live or MikTeX of the latest possible version, and make sure that \texttt{minimalist} and \texttt{projlib} are correctly installed in your \TeX{} system.
\item download and install the required fonts if needed.
- \item be familiar with the basic usage of \LaTeX{}, and knows how to compile your document with \hologo{pdfLaTeX}, \hologo{XeLaTeX} or \hologo{LuaLaTeX}.
+ \item be familiar with the basic usage of \LaTeX{}, and know how to compile your document with \hologo{pdfLaTeX}, \hologo{XeLaTeX} or \hologo{LuaLaTeX}.
\end{itemize}
\LevelOneTitle{Introduction}
@@ -169,7 +175,7 @@
\title{(*\meta{title}*)}
\author{(*\meta{author}*)}
-\date{\PLdate{2022-04-01}}
+\date{\TheDate{2022-04-01}}
\maketitle
@@ -223,7 +229,7 @@
\begin{code}
\title{(*\meta{title}*)}
\author{(*\meta{author}*)}
-\date{\PLdate{2022-04-01}}
+\date{\TheDate{2022-04-01}}
\maketitle
\begin{abstract}
@@ -256,7 +262,7 @@
\author{(*\meta{author 2}*)}
\address{(*\meta{address 2}*)}
\email{(*\meta{email 2}*)}
-\date{\PLdate{2022-04-01}}
+\date{\TheDate{2022-04-01}}
\subjclass{*****}
\keywords{(*\meta{keywords}*)}
@@ -310,7 +316,6 @@
\end{tip}
-\clearpage
\LevelTwoTitle{Example - \minimbook}
Now let's look at an example of \minimbook{} (the same works for \simplivre{}).
@@ -353,7 +358,6 @@
\bigskip
In the next section, we will go through the options available.
-\clearpage
\LevelOneTitle{The options}
@@ -390,17 +394,13 @@
\begin{itemize}
\item Use the ``runin'' style for \lstinline|\subsubsection|
\end{itemize}
- \item \texttt{puretext} or \texttt{nothms}
+ \item \texttt{nothms}
\begin{itemize}
\item Pure text mode. Do not load theorem-like environments.
\end{itemize}
- \item \texttt{delaythms}
- \begin{itemize}
- \item Defer the definition of theorem-like environments to the end of the preamble. Use this option if you want the theorem-like environments to be numbered within a custom counter.
- \end{itemize}
\item \texttt{nothmnum}, \texttt{thmnum} or \texttt{thmnum=}\meta{counter}
\begin{itemize}
- \item Theorem-like environments will not be numbered / numbered in order 1, 2, 3... / numbered within \meta{counter}. Here, \meta{counter} should be a built-in counter (such as \texttt{subsection}) or a custom counter defined in the preamble (with the option \texttt{delaythms} enabled). If no option is used, they will be numbered within \texttt{chapter} (book) or \texttt{section} (article).
+ \item Theorem-like environments will not be numbered / numbered in order 1, 2, 3... / numbered within \meta{counter}. If no option is used, they will be numbered within \texttt{chapter} (book) or \texttt{section} (article).
\end{itemize}
\item \texttt{regionalref}, \texttt{originalref}
\begin{itemize}
@@ -427,7 +427,7 @@
\end{itemize}
\end{itemize}
-\clearpage
+% \clearpage
\LevelOneTitle{Instructions by topic}
\LevelTwoTitle{Language configuration}
@@ -501,76 +501,10 @@
\UseLanguage{English}
-\LevelTwoTitle{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}
-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
-And then define this environment in one of following five ways:
-\begin{itemize}
- \item \lstinline|\CreateTheorem*{|\meta{name of environment}\lstinline|}|
- \begin{itemize}
- \item Define an unnumbered environment \meta{name of environment}
- \end{itemize}
- \item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}|
- \begin{itemize}
- \item Define a numbered environment \meta{name of environment}, numbered in order 1,2,3,\dots
- \end{itemize}
- \item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}[|\meta{numbered like}\lstinline|]|
- \begin{itemize}
- \item Define a numbered environment \meta{name of environment}, which shares the counter \meta{numbered like}
- \end{itemize}
-\clearpage
- \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}
- \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 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}(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}
-
\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.
+ Please refer to the documentation of the package \textsf{create-theorem} to see how to declare new theorem-like environments.
\end{tip}
-\NameTheorem[EN]{proofidea}{Idea}
-\CreateTheorem*{proofidea*}
-\CreateTheorem{proofidea}<subsection>
-
-\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:
-
-\vspace{-0.3\baselineskip}
-\begin{proofidea*}
- The \lstinline|proofidea*| environment.
-\end{proofidea*}
-
-\vspace{-\baselineskip}
-\begin{proofidea}
- The \lstinline|proofidea| environment.
-\end{proofidea}
-
\LevelTwoTitle{Draft mark}
You can use \lstinline|\dnf| to mark the unfinished part. For example:
@@ -578,12 +512,7 @@
\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| :
-\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}
-
-\clearpage
+% \clearpage
\LevelTwoTitle{Title, abstract and keywords}
\minimart{} has both the features of standard classes and that of the \AmS{} classes.
@@ -634,7 +563,7 @@
Among them, the mutual order of \lstinline|\address|, \lstinline|\curraddr|, \lstinline|\email| is not important.
-\clearpage
+% \clearpage
\LevelTwoTitle{Miscellaneous}
\LevelThreeTitle{On the line numbers}
@@ -648,8 +577,6 @@
\end{itemize}
This is a disadvantage brought about by the underline decoration of the title.
-\LevelThreeTitle{On the QED symbols}
-Since the font in the theorem-like environments is the same as that of the main text, in order to indicate where the environments end, a hollow QED symbol \simpleqedsymbol{} is placed at the end of the theorem-like environments. However, if your theorem ends with an equation or list (itemize, enumerate, description, etc.), this symbol cannot be automatically placed in the correct position. In this case, you need to manually add a \lstinline|\qedhere| at the end of your equation or the last entry of your list to make the QED symbol appear at the end of the line.
\LevelOneTitle{Known issues}
Modified: branches/branch2021.final/Master/texmf-dist/doc/latex/projlib/README.md
===================================================================
--- branches/branch2021.final/Master/texmf-dist/doc/latex/projlib/README.md 2022-03-20 21:13:02 UTC (rev 62833)
+++ branches/branch2021.final/Master/texmf-dist/doc/latex/projlib/README.md 2022-03-20 21:14:50 UTC (rev 62834)
@@ -2,11 +2,13 @@
# ProjLib Toolkit
-The bundle is dated 2022/03/17
+The bundle is dated 2022/03/19
+
+
## **Important note**
-The whole project is being rewritten with `expl3`. The new modules are basically finished but are not yet documented. They have the names with prefix "projlib-", and they are in many ways better and more powerful than their predecessors. The most important thing to be noticed is that these new modules are not compatible with the old ones, and thus they cannot appear simultaneously in the same document, which, unfortunately, means that (for now) they cannot be used in classes like `lebhart`, `beaulivre` (these are the classes with which the author produced the old documentations), etc.
+The whole project is being rewritten with `expl3`. The new modules are basically finished but are **not yet documented**. They have filenames with the prefix "projlib-", and they are in many ways better and more powerful than their predecessors.
The new modules are:
- projlib-author
@@ -19,7 +21,7 @@
- projlib-paper
- projlib-theorem
-Below are the old README.
+Below is the old README.
---
Modified: branches/branch2021.final/Master/texmf-dist/doc/latex/simplivre/README.md
===================================================================
--- branches/branch2021.final/Master/texmf-dist/doc/latex/simplivre/README.md 2022-03-20 21:13:02 UTC (rev 62833)
+++ branches/branch2021.final/Master/texmf-dist/doc/latex/simplivre/README.md 2022-03-20 21:14:50 UTC (rev 62834)
@@ -1,4 +1,4 @@
-<!-- Copyright (C) 2021 by Jinwen XU -->
+<!-- Copyright (C) 2021-2022 by Jinwen XU -->
# `simplivre` : write you books in a simple and clear way
Modified: branches/branch2021.final/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-cn.pdf
===================================================================
(Binary files differ)
Modified: branches/branch2021.final/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-cn.tex
===================================================================
--- branches/branch2021.final/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-cn.tex 2022-03-20 21:13:02 UTC (rev 62833)
+++ branches/branch2021.final/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-cn.tex 2022-03-20 21:14:50 UTC (rev 62834)
@@ -1,4 +1,4 @@
-\documentclass[classical]{simplivre}
+\documentclass[use boldface, simple name]{simplivre}
\linenumbers % Enable line numbers
@@ -39,7 +39,7 @@
\providecommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$}
\lstset{moretexcs=%
{linenumbers,nolinenumbers,part,parttext,chapter,section,subsection,subsubsection,frontmatter,mainmatter,backmatter,tableofcontents,href,
- color,NameTheorem,CreateTheorem,proofideanameEN,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,PLdate,ProjLib,qedhere
+ color,NameTheorem,CreateTheorem,cref,dnf,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,TheDate,ProjLib,qedhere
}
}
\lstnewenvironment{code}%
@@ -96,21 +96,25 @@
%%================================
\begin{document}
+\def\PackageVersion{2022/03/19}
+
\frontmatter
+\LocallyStopLineNumbers
\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)+(21,-7)$);
- \fill [yellow] (current page.south west) rectangle ($(current page.north west)+(3,0)$);
+ \fill [blue!50!cyan!50!black] ($(current page.south west)$) rectangle ($(current page.north west)+(21,-7)$);
\node[text width=10cm] at ($(current page.north west)+(8.5,-6)$) {\huge\ProjLib};
- \node[text width=6cm,text height=3.5cm,scale=2.5] at ($(current page.north west)+(11,-9)$) {\textcolor{white}{\sffamily\simplivre{}\\[5pt]\footnotesize\hspace*{-.05em}以极简主义风格排版你的图书\\[10pt]\tiny 对应版本. \texttt{\simplivre{} 2021/12/16}}};
- \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年12月，巴黎}};
+ \node[text width=6cm,text height=3.5cm,scale=2.5] at ($(current page.north west)+(11,-9)$) {\textcolor{white}{\sffamily\simplivre{}\\[5pt]\footnotesize\hspace*{-.05em}以极简主义风格排版你的图书\\[10pt]\tiny 对应版本. \texttt{\simplivre{} \PackageVersion}}};
+ \node[text width=15em] at ($(current page.south)+(3.5,3)$) {\color{white}\hfill\fontsize{16pt}{0pt}\selectfont{许锦文}\\[1em]\hfill\fontsize{12pt}{0pt}\selectfont\TheDate{\PackageVersion}[only-year-month]，巴黎};
\end{tikzpicture}%
\end{titlepage}%
-\cleardoublepage%
+\setcounter{page}{0}
+\ResumeLineNumbers
+
+
\chapter{前言}
\simplivre{} 是 \minimalist{} 文档类系列的成员之一，其名称取自于法文的 simple (“简约”)，以及 livre (“书”)，由二者组合而成。整个 \minimalist{} 系列包含用于排版文章的 \minimart{}、\einfart{} 以及用于排版书的 \minimbook{}、\simplivre{}。我设计这一系列的初衷是为了撰写草稿与笔记，使之看上去简朴而不简陋。
@@ -117,7 +121,7 @@
\simplivre{} 支持英语、法语、德语、意大利语、葡萄牙语、巴西葡萄牙语、西班牙语、简体中文、繁体中文、日文、俄文，并且同一篇文档中这些语言可以很好地协调。由于采用了自定义字体，需要用 \hologo{XeLaTeX} 或 \hologo{LuaLaTeX} 引擎进行编译。
-这篇说明文档即是用 \simplivre{} 排版的 (使用了参数 \texttt{classical})，你可以把它看作一份简短的说明与演示。
+这篇说明文档即是用 \simplivre{} 排版的 (使用了参数 \texttt{use boldface})，你可以把它看作一份简短的说明与演示。
\bigskip
\begin{tip}
@@ -124,6 +128,10 @@
多语言支持、定理类环境、未完成标记等功能是由 \ProjLib{} 工具箱提供的，这里只给出了将其与本文档类搭配使用的要点。如需获取更详细的信息，可以参阅 \ProjLib{} 的说明文档。
\end{tip}
+\begin{tip}
+ This documentation has not been fully up-to-date with the new \texttt{expl3} version of this class series. Some options or commands introduced here might be obsolete.
+\end{tip}
+
\tableofcontents
\mainmatter
@@ -305,22 +313,18 @@
\begin{itemize}
\item 采用段首缩进而不是段间间距。
\end{itemize}
-\clearpage
+% \clearpage
\item \texttt{runin}
\begin{itemize}
\item \lstinline|\subsubsection| 采用 ``runin'' 风格。
\end{itemize}
- \item \texttt{puretext} 或 \texttt{nothms}
+ \item \texttt{nothms}
\begin{itemize}
\item 纯文本模式，不加载定理类环境。
\end{itemize}
- \item \texttt{delaythms}
- \begin{itemize}
- \item 将定理类环境设定推迟到导言结尾。如果你希望定理类环境跟随自定义计数器编号，则应考虑这一选项。
- \end{itemize}
\item \texttt{nothmnum}、\texttt{thmnum} 或 \texttt{thmnum=}\meta{counter}
\begin{itemize}
- \item 定理类环境均不编号 / 按照 1、2、3 顺序编号 / 在 \meta{counter} 内编号。其中 \meta{counter} 应该是自带的计数器 (如 \texttt{subsection}) 或在导言部分自定义的计数器 (在启用 \texttt{delaythms} 选项的情况下)。在没有使用任何选项的情况下将按照 \texttt{chapter} (书) 或 \texttt{section} (文章) 编号。
+ \item 定理类环境均不编号 / 按照 1、2、3 顺序编号 / 在 \meta{counter} 内编号。在没有使用任何选项的情况下将按照 \texttt{chapter} (书) 或 \texttt{section} (文章) 编号。
\end{itemize}
\item \texttt{regionalref}、\texttt{originalref}
\begin{itemize}
@@ -409,73 +413,10 @@
\UseLanguage{Chinese}
-\LevelTwoTitle{定义新的定理型环境}
-
-若需要定义新的定理类环境，首先要定义这个环境在所用语言下的名称：
-\begin{itemize}
- \item \lstinline|\NameTheorem[|\meta{language name}\lstinline|]{|\meta{name of environment}\lstinline|}{|\meta{name string}\lstinline|}|
-\end{itemize}
-其中，\meta{language name} 可参阅关于语言设置的小节。当不指定 \meta{language name}时，则会将该名称设置为所有支持语言下的名称。另外，带星号与不带星号的同名环境共用一个名称，因此 \lstinline|\NameTheorem{envname*}{...}| 与 \lstinline|\NameTheorem{envname}{...}| 效果相同。
-
-\clearpage
-然后用下面五种方式之一定义这一环境：
-\begin{itemize}
- \item \lstinline|\CreateTheorem*{|\meta{name of environment}\lstinline|}|
- \begin{itemize}
- \item 定义不编号的环境 \meta{name of environment}
- \end{itemize}
- \item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}|
- \begin{itemize}
- \item 定义编号环境 \meta{name of environment}，按顺序编号
- \end{itemize}
- \item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}[|\meta{numbered like}\lstinline|]|
- \begin{itemize}
- \item 定义编号环境 \meta{name of environment}，与 \meta{numbered like} 计数器共用编号
- \end{itemize}
- \item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}<|\meta{numbered within}\lstinline|>|
- \begin{itemize}
- \item 定义编号环境 \meta{name of environment}，在 \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 将 \meta{name of environment} 与 \meta{existed environment} 或 \meta{existed environment}\lstinline|*| 等同。
- \item 这种方式通常在两种情况下比较有用：
- \begin{enumerate}
- \item 希望定义更简洁的名称。例如，使用 \lstinline|\CreateTheorem{thm}(theorem)|，便可以直接用名称 \texttt{thm} 来撰写定理。
- \item 希望去除某些环境的编号。例如，使用 \lstinline|\CreateTheorem{remark}(remark*)|，便可以去除 \texttt{remark} 环境的编号。
- \end{enumerate}
- \end{itemize}
-\end{itemize}
-
\begin{tip}
- 其内部使用了 \textsf{amsthm}，因此传统的 \texttt{theoremstyle} 对其也是适用的，只需在相关定义前标明即可。
+ 请参阅 \textsf{create-theorem} 的说明文档以获知如何定义新的定理类环境。
\end{tip}
-\NameTheorem[CN]{proofidea}{思路}
-\CreateTheorem*{proofidea*}
-\CreateTheorem{proofidea}<section>
-
-\clearpage
-下面提供一个例子。这三行代码：
-
-\begin{code}
-\NameTheorem[CN]{proofidea}{思路}
-\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}
-
\LevelTwoTitle{未完成标记}
你可以通过 \lstinline|\dnf| 来标记尚未完成的部分。例如：
@@ -483,12 +424,7 @@
\item \lstinline|\dnf| 或 \lstinline|\dnf<...>|。效果为：\dnf~或 \dnf<...>。\\其提示文字与当前语言相对应，例如，在法语模式下将会显示为 \UseOtherLanguage{French}{\dnf}。
\end{itemize}
-类似的，还有 \lstinline|\needgraph| ：
-\begin{itemize}
- \item \lstinline|\needgraph| 或 \lstinline|\needgraph<...>|。效果为：\needgraph~或 \needgraph<...>其提示文字与当前语言相对应，例如，在法语模式下将会显示为 \UseOtherLanguage{French}{\needgraph}
-\end{itemize}
-
\LevelTwoTitle{其他}
\LevelThreeTitle{关于行号}
Modified: branches/branch2021.final/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-en.pdf
===================================================================
(Binary files differ)
Modified: branches/branch2021.final/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-en.tex
===================================================================
--- branches/branch2021.final/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-en.tex 2022-03-20 21:13:02 UTC (rev 62833)
+++ branches/branch2021.final/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-en.tex 2022-03-20 21:14:50 UTC (rev 62834)
@@ -1,4 +1,4 @@
-\documentclass[classical]{simplivre}
+\documentclass[use boldface, simple name]{simplivre}
\linenumbers % Enable line numbers
@@ -39,7 +39,7 @@
\providecommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$}
\lstset{moretexcs=%
{linenumbers,nolinenumbers,part,parttext,chapter,section,subsection,subsubsection,frontmatter,mainmatter,backmatter,tableofcontents,href,
- color,NameTheorem,CreateTheorem,proofideanameEN,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,PLdate,ProjLib,qedhere
+ color,NameTheorem,CreateTheorem,cref,dnf,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,TheDate,ProjLib,qedhere
}
}
\lstnewenvironment{code}%
@@ -96,22 +96,26 @@
%%================================
\begin{document}
+\def\PackageVersion{2022/03/19}
+\LocallyStopLineNumbers
+
\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)+(21,-7)$);
- \fill [yellow] (current page.south west) rectangle ($(current page.north west)+(3,0)$);
+ \fill [blue!50!cyan!50!black] ($(current page.south west)$) rectangle ($(current page.north west)+(21,-7)$);
\node[text width=10cm] at ($(current page.north west)+(8.5,-6)$) {\huge\ProjLib};
- \node[text width=6cm,text height=3.5cm,scale=2.5] at ($(current page.north west)+(11,-9)$) {\textcolor{white}{\sffamily\simplivre{}\\[5pt]\footnotesize\textsc{Write your books in \\a simple and clear way}\\[10pt]\tiny Corresponding to: \texttt{\simplivre{} 2021/12/16}}};
- \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}{December 2021, in Paris}};
+ \node[text width=6cm,text height=3.5cm,scale=2.5] at ($(current page.north west)+(11,-9)$) {\textcolor{white}{\sffamily\simplivre{}\\[5pt]\footnotesize\textsc{Write your books in \\a simple and clear way}\\[10pt]\tiny Corresponding to: \texttt{\simplivre{} \PackageVersion}}};
+ \node[text width=15em] at ($(current page.south)+(3.5,3)$) {\color{white}\hfill\fontsize{16pt}{0pt}\selectfont{\scshape Jinwen XU}\\[1em]\hfill\fontsize{12pt}{0pt}\selectfont\TheDate{\PackageVersion}[only-year-month], in Paris};
\end{tikzpicture}%
\end{titlepage}%
-\cleardoublepage%
+\setcounter{page}{0}
+\ResumeLineNumbers
+
+
\chapter{Preface}
\simplivre{} is part of the \minimalist{} class series. Its name is taken from French words ``simple'' and ``livre'' (for ``book''). The entire collection includes \minimart{} and \einfart{} for typesetting articles, and \minimbook{} and \simplivre{} for typesetting books. My original intention in designing them was to write drafts and notes that look simple yet not shabby.
@@ -118,7 +122,7 @@
\simplivre{} 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, \einfart{} requires \hologo{XeLaTeX} or \hologo{LuaLaTeX} to compile.
-This documentation is typeset using \simplivre{} (with the option \texttt{classical}). You can think of it as a short introduction and demonstration.
+This documentation is typeset using \simplivre{} (with the option \texttt{use boldface}). You can think of it as a short introduction and demonstration.
\bigskip
\begin{tip}
@@ -125,6 +129,10 @@
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}
+\begin{tip}
+ This documentation has not been fully up-to-date with the new \texttt{expl3} version of this class series. Some options or commands introduced here might be obsolete.
+\end{tip}
+
\tableofcontents
\mainmatter
@@ -139,7 +147,7 @@
\begin{itemize}
\item install TeX Live or MikTeX of the latest possible version, and make sure that \texttt{minimalist} and \texttt{projlib} are correctly installed in your \TeX{} system.
\item download and install the required fonts, see the section "On the default fonts".
- \item be familiar with the basic usage of \LaTeX{}, and knows how to compile your document with \hologo{pdfLaTeX}, \hologo{XeLaTeX} or \hologo{LuaLaTeX}.
+ \item be familiar with the basic usage of \LaTeX{}, and know how to compile your document with \hologo{pdfLaTeX}, \hologo{XeLaTeX} or \hologo{LuaLaTeX}.
\end{itemize}
@@ -311,18 +319,14 @@
\begin{itemize}
\item Use the ``runin'' style for \lstinline|\subsubsection|
\end{itemize}
-\clearpage
- \item \texttt{puretext} or \texttt{nothms}
+% \clearpage
+ \item \texttt{nothms}
\begin{itemize}
\item Pure text mode. Do not load theorem-like environments.
\end{itemize}
- \item \texttt{delaythms}
- \begin{itemize}
- \item Defer the definition of theorem-like environments to the end of the preamble. Use this option if you want the theorem-like environments to be numbered within a custom counter.
- \end{itemize}
\item \texttt{nothmnum}, \texttt{thmnum} or \texttt{thmnum=}\meta{counter}
\begin{itemize}
- \item Theorem-like environments will not be numbered / numbered in order 1, 2, 3... / numbered within \meta{counter}. Here, \meta{counter} should be a built-in counter (such as \texttt{subsection}) or a custom counter defined in the preamble (with the option \texttt{delaythms} enabled). If no option is used, they will be numbered within \texttt{chapter} (book) or \texttt{section} (article).
+ \item Theorem-like environments will not be numbered / numbered in order 1, 2, 3... / numbered within \meta{counter}. If no option is used, they will be numbered within \texttt{chapter} (book) or \texttt{section} (article).
\end{itemize}
\item \texttt{regionalref}, \texttt{originalref}
\begin{itemize}
@@ -407,76 +411,11 @@
\UseLanguage{English}
-\LevelTwoTitle{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}
-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
-And then define this environment in one of following five ways:
-\begin{itemize}
- \item \lstinline|\CreateTheorem*{|\meta{name of environment}\lstinline|}|
- \begin{itemize}
- \item Define an unnumbered environment \meta{name of environment}
- \end{itemize}
- \item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}|
- \begin{itemize}
- \item Define a numbered environment \meta{name of environment}, numbered in order 1,2,3,\dots
- \end{itemize}
- \item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}[|\meta{numbered like}\lstinline|]|
- \begin{itemize}
- \item Define a numbered environment \meta{name of environment}, which shares the counter \meta{numbered like}
- \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}
- \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 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}(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}
-
\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.
+ Please refer to the documentation of the package \textsf{create-theorem} to see how to declare new theorem-like environments.
\end{tip}
-\NameTheorem[EN]{proofidea}{Idea}
-\CreateTheorem*{proofidea*}
-\CreateTheorem{proofidea}<section>
-
-\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:
-
-\vspace{-0.3\baselineskip}
-\begin{proofidea*}
- The \lstinline|proofidea*| environment.
-\end{proofidea*}
-
-\vspace{-\baselineskip}
-\begin{proofidea}
- The \lstinline|proofidea| environment.
-\end{proofidea}
-
-\clearpage
+% \clearpage
\LevelTwoTitle{Draft mark}
You can use \lstinline|\dnf| to mark the unfinished part. For example:
@@ -484,12 +423,7 @@
\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| :
-\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}
-
\LevelTwoTitle{Miscellaneous}
\LevelThreeTitle{On the line numbers}
@@ -503,8 +437,6 @@
\end{itemize}
This is a disadvantage brought about by the underline decoration of the title.
-\LevelThreeTitle{On the QED symbols}
-Since the font in the theorem-like environments is the same as that of the main text, in order to indicate where the environments end, a hollow QED symbol \simpleqedsymbol{} is placed at the end of the theorem-like environments. However, if your theorem ends with an equation or list (itemize, enumerate, description, etc.), this symbol cannot be automatically placed in the correct position. In this case, you need to manually add a \lstinline|\qedhere| at the end of your equation or the last entry of your list to make the QED symbol appear at the end of the line.
\LevelOneTitle{Known issues}
Modified: branches/branch2021.final/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-fr.pdf
===================================================================
(Binary files differ)
Modified: branches/branch2021.final/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-fr.tex
===================================================================
--- branches/branch2021.final/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-fr.tex 2022-03-20 21:13:02 UTC (rev 62833)
+++ branches/branch2021.final/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-fr.tex 2022-03-20 21:14:50 UTC (rev 62834)
@@ -1,4 +1,4 @@
-\documentclass[classical]{simplivre}
+\documentclass[use boldface, simple name]{simplivre}
\linenumbers % Enable line numbers
@@ -39,7 +39,7 @@
\providecommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$}
\lstset{moretexcs=%
{linenumbers,nolinenumbers,part,parttext,chapter,section,subsection,subsubsection,frontmatter,mainmatter,backmatter,tableofcontents,href,
- color,NameTheorem,CreateTheorem,proofideanameEN,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,PLdate,ProjLib,qedhere
+ color,NameTheorem,CreateTheorem,cref,dnf,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,TheDate,ProjLib,qedhere
}
}
\lstnewenvironment{code}%
@@ -96,21 +96,25 @@
%%================================
\begin{document}
+\def\PackageVersion{2022/03/19}
+
\frontmatter
+\LocallyStopLineNumbers
\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)+(21,-7)$);
- \fill [yellow] (current page.south west) rectangle ($(current page.north west)+(3,0)$);
+ \fill [blue!50!cyan!50!black] ($(current page.south west)$) rectangle ($(current page.north west)+(21,-7)$);
\node[text width=10cm] at ($(current page.north west)+(8.5,-6)$) {\huge\ProjLib};
- \node[text width=6cm,text height=3.5cm,scale=2.5] at ($(current page.north west)+(11,-9)$) {\textcolor{white}{\sffamily\simplivre{}\\[5pt]\footnotesize\textsc{Écrivez vos livres \\de manière simple et claire}\\[10pt]\tiny Correspondant à : \texttt{\simplivre{} 2021/12/16}}};
- \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}{Décembre 2021, à Paris}};
+ \node[text width=6cm,text height=3.5cm,scale=2.5] at ($(current page.north west)+(11,-9)$) {\textcolor{white}{\sffamily\simplivre{}\\[5pt]\footnotesize\textsc{Écrivez vos livres \\de manière simple et claire}\\[10pt]\tiny Correspondant à : \texttt{\simplivre{} \PackageVersion}}};
+ \node[text width=15em] at ($(current page.south)+(3.5,3)$) {\color{white}\hfill\fontsize{16pt}{0pt}\selectfont{\scshape Jinwen XU}\\[1em]\hfill\fontsize{12pt}{0pt}\selectfont\TheDate{\PackageVersion}[only-year-month], à Paris};
\end{tikzpicture}%
\end{titlepage}%
-\cleardoublepage%
+\setcounter{page}{0}
+\ResumeLineNumbers
+
+
\chapter{Préface}
\simplivre{} fait partie de la série de classes \minimalist{}, dont le nom est tiré des mots «~simple~» et «~livre~». L'ensemble de la collection comprend \minimart{} et \einfart{} pour la composition d'articles, et \minimbook{} et \simplivre{} pour celle des livres. Mon intention initiale en les concevant était d'écrire des brouillons et des notes qui semblent simples mais pas grossières.
@@ -117,7 +121,7 @@
\simplivre{} 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, \simplivre{} demande soit \hologo{XeLaTeX} soit \hologo{LuaLaTeX} pour la compilation.
-Cette documentation est composée à l'aide de \simplivre{} (avec l'option \texttt{classical}). Vous pouvez le considérer comme une courte introduction et une démonstration.
+Cette documentation est composée à l'aide de \simplivre{} (avec l'option \texttt{use boldface}). Vous pouvez le considérer comme une courte introduction et une démonstration.
\bigskip
\begin{tip}
@@ -124,6 +128,10 @@
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}
+\begin{tip}
+ This documentation has not been fully up-to-date with the new \texttt{expl3} version of this class series. Some options or commands introduced here might be obsolete.
+\end{tip}
+
\tableofcontents
\mainmatter
@@ -305,22 +313,18 @@
\begin{itemize}
\item Utilisez l'indentation des paragraphes au lieu de l'espacement entre les paragraphes.
\end{itemize}
-\clearpage
+% \clearpage
\item \texttt{runin}
\begin{itemize}
\item Utilisez le style «~runin~» pour \lstinline|\subsubsection|
\end{itemize}
- \item \texttt{puretext} ou \texttt{nothms}
+ \item \texttt{nothms}
\begin{itemize}
\item Mode texte pur. Ne pas définir les environnements de type théorème.
\end{itemize}
- \item \texttt{delaythms}
- \begin{itemize}
- \item Reportez la définition des environnements de type théorème à la fin du préambule. Utilisez cette option si vous souhaitez que les environnements soient numérotés dans un compteur personnalisé.
- \end{itemize}
\item \texttt{nothmnum}, \texttt{thmnum} ou \texttt{thmnum=}\meta{counter}
\begin{itemize}
- \item Les environnements de type théorème ne seront pas numérotés / numérotés dans l'ordre 1, 2, 3... / numérotés dans \meta{counter}. Ici, \meta{counter} doit être un compteur intégré (tel que \texttt{subsection}) ou un compteur défini dans le préambule (avec l'option \texttt{delaythms} activée). Si aucune option n'est utilisée, ils seront numérotés dans \texttt{chapter} (livre) ou \texttt{section} (article).
+ \item Les environnements de type théorème ne seront pas numérotés / numérotés dans l'ordre 1, 2, 3... / numérotés dans \meta{counter}. Si aucune option n'est utilisée, ils seront numérotés dans \texttt{chapter} (livre) ou \texttt{section} (article).
\end{itemize}
\item \texttt{regionalref}, \texttt{originalref}
\begin{itemize}
@@ -403,74 +407,10 @@
\UseLanguage{French}
-\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 \meta{name of environment} non numéroté
- \end{itemize}
- \item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}|
- \begin{itemize}
- \item Définir un environnement \meta{name of environment} numéroté dans l'ordre 1, 2, 3, \dots
- \end{itemize}
- \item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}[|\meta{numbered like}\lstinline|]|
- \begin{itemize}
- \item Définir un environnement \meta{name of environment} numéroté, qui partage le compteur \meta{numbered like}
- \end{itemize}
- \item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}<|\meta{numbered within}\lstinline|>|
- \begin{itemize}
- \item Définir un environnement \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.
+ Veuillez consulter la documentation du paquet \textsf{create-theorem} pour voir comment déclarer de nouveaux environnements de type théorème.
\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 :
@@ -478,12 +418,7 @@
\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{Divers}
\LevelThreeTitle{Les numéros de ligne}
@@ -497,8 +432,6 @@
\end{itemize}
C'est un inconvénient provoqué par la décoration de soulignement du titre.
-\LevelThreeTitle{Les symboles QED}
-Puisque la police dans les environnements de type théorème est la même que celle du texte principal, afin d'indiquer où se terminent les environnements, un symbole QED creux \simpleqedsymbol{} est placé à la fin des environnements de type théorème. Cependant, si votre théorème se termine par une équation ou une liste (itemize, énumérer, description, etc.), ce symbole ne peut pas être automatiquement placé à la bonne position. Dans ce cas, vous devez ajouter manuellement un \lstinline|\qedhere| à la fin de votre équation ou la dernière entrée de votre liste pour faire apparaître le symbole QED en fin de ligne.
\LevelOneTitle{Problèmes connus}
Modified: branches/branch2021.final/Master/texmf-dist/source/latex/projlib/ProjLib.dtx
===================================================================
--- branches/branch2021.final/Master/texmf-dist/source/latex/projlib/ProjLib.dtx 2022-03-20 21:13:02 UTC (rev 62833)
+++ branches/branch2021.final/Master/texmf-dist/source/latex/projlib/ProjLib.dtx 2022-03-20 21:14:50 UTC (rev 62834)
@@ -20,7 +20,7 @@
%<*ProjLib>
\ProvidesExplPackage
{ProjLib}
- {2022/03/17} {}
+ {2022/03/19} {}
{Collective interface of the ProjLib toolkit}
%</ProjLib>
%
@@ -27,7 +27,7 @@
%<*projlib-author>
\ProvidesExplPackage
{projlib-author}
- {2022/03/17} {}
+ {2022/03/19} {}
{Enhanced author information block}
%</projlib-author>
%
@@ -34,7 +34,7 @@
%<*projlib-datetime>
\ProvidesExplPackage
{projlib-datetime}
- {2022/03/17} {}
+ {2022/03/19} {}
{Convert numeric date-time string to natural language}
%</projlib-datetime>
%
@@ -41,7 +41,7 @@
%<*projlib-draft>
\ProvidesExplPackage
{projlib-draft}
- {2022/03/17} {}
+ {2022/03/19} {}
{Useful commands during draft stage}
%</projlib-draft>
%
@@ -48,7 +48,7 @@
%<*projlib-font>
\ProvidesExplPackage
{projlib-font}
- {2022/03/17} {}
+ {2022/03/19} {}
{Font selection and configuration}
%</projlib-font>
%
@@ -55,7 +55,7 @@
%<*projlib-language>
\ProvidesExplPackage
{projlib-language}
- {2022/03/17} {}
+ {2022/03/19} {}
{Multi-language configuration}
%</projlib-language>
%
@@ -62,7 +62,7 @@
%<*projlib-logo>
\ProvidesExplPackage
{projlib-logo}
- {2022/03/17} {}
+ {2022/03/19} {}
{The ProjLib logo}
%</projlib-logo>
%
@@ -69,7 +69,7 @@
%<*projlib-math>
\ProvidesExplPackage
{projlib-math}
- {2022/03/17} {}
+ {2022/03/19} {}
{Efficient math setup}
%</projlib-math>
%
@@ -76,7 +76,7 @@
%<*projlib-paper>
\ProvidesExplPackage
{projlib-paper}
- {2022/03/17} {}
+ {2022/03/19} {}
{Configuration of the paper style}
%</projlib-paper>
%
@@ -83,7 +83,7 @@
%<*projlib-theorem>
\ProvidesExplPackage
{projlib-theorem}
- {2022/03/17} {}
+ {2022/03/19} {}
{Configuration of theorem-like environments}
%</projlib-theorem>
@@ -190,7 +190,7 @@
{
\hook_gput_code:nnn { cmd/@author/after } { projlib-author }
{
- \phantom {A} \\[-.85\baselineskip]
+ \phantom {A} \\[-.9\baselineskip]
\bool_if:NF \g__projlib_author_affil_already_exist_bool
{
\skip_vertical:n { \g__projlib_author_length_innersep_dim }
@@ -250,6 +250,8 @@
{
\RequirePackage{ projlib-language }
+ \tl_const:Nn \c_projlib_author_dot_tl { . }
+
\tl_new:N \g_projlib_author_keywordsname_style_tl
\tl_gset:Nn \g_projlib_author_keywordsname_style_tl { \itshape }
@@ -280,38 +282,39 @@
\tl_gset:Nn \g__projlib_author_dedicatory_tl { #1 }
}
- \hook_gput_code:nnn { begindocument/before } { projlib-author }
- {
- \NewCommandCopy \projlib_author_backup_footnotemark: \footnotemark
- \tl_gset:Nn \footnotemark {}
- \NewCommandCopy \projlib_author_backup_thanks:w \thanks
- \cs_undefine:N \thanks
+ \NewCommandCopy \projlib_author_backup_footnotemark: \footnotemark
+ \tl_gset:Nn \footnotemark {}
- % measure the width of "*"
- \hbox_set:Nn \l_tmpa_box { * }
- \dim_const:Nn \c__projlib_author_length_width_of_asterisk_dim { \box_wd:N \l_tmpa_box }
+ \NewCommandCopy \projlib_author_backup_thanks:w \thanks
+ \cs_undefine:N \thanks
- \cs_new_nopar:Nn \projlib_author_pre_thanks:n
+ % measure the width of "*"
+ \hbox_set:Nn \l_tmpa_box { * }
+ \dim_const:Nn \c__projlib_author_length_width_of_asterisk_dim { \box_wd:N \l_tmpa_box }
+
+ \cs_new_nopar:Nn \projlib_author_pre_thanks:n
+ {
+ \projlib_author_backup_thanks:w
{
- \projlib_author_backup_thanks:w
- {
- \skip_horizontal:n { - \c__projlib_author_length_width_of_asterisk_dim }
- #1
- }
+ \skip_horizontal:n { - \c__projlib_author_length_width_of_asterisk_dim }
+ #1
}
+ }
- \NewDocumentCommand \thanks { m }
+ \NewDocumentCommand \thanks { m }
+ {
+ \tl_if_blank:nF { #1 }
{
- \tl_if_blank:nF { #1 }
+ \hook_gput_code:nnn { cmd/@title/after } { projlib-author }
{
- \hook_gput_code:nnn { cmd/@title/after } { projlib-author }
- {
- \projlib_author_pre_thanks:n { #1 }
- }
+ \projlib_author_pre_thanks:n { #1 }
}
}
+ }
+ \hook_gput_code:nnn { begindocument/before } { projlib-author }
+ {
\NewCommandCopy \projlib_author_backup_my_author:w \author
\RenewDocumentCommand \author { m }
{
@@ -320,7 +323,7 @@
\RenewCommandCopy \footnotemark \projlib_author_backup_footnotemark:
\RenewCommandCopy \thanks \projlib_author_backup_thanks:w
#1
- \cs_undefine:N \footnotemark
+ \tl_gset:Nn \footnotemark {}
}
}
}
@@ -384,7 +387,7 @@
{
\group_begin:
\g_projlib_author_keywordsname_style_tl
- \keywordsname .
+ \keywordsname \c_projlib_author_dot_tl
\group_end:
\c_space_tl
\g__projlib_author_keywords_tl
@@ -430,7 +433,7 @@
}
\projlib_author_pre_thanks:n
{
- \textit{ \l_projlib_author_subjclassname_tl . }
+ \textit{ \l_projlib_author_subjclassname_tl \c_projlib_author_dot_tl }
\enspace
\l_projlib_author_subjclass_tl .
}
@@ -2744,35 +2747,35 @@
\tl_gput_right:Nn \g_projlib_language_settings_schinese_tl
{
\g_projlib_language_settings_common_tl
- \tl_gset:Nn \languagename { schinese }
- \tl_gset:cn { abstractname } { 摘要 }
- \tl_gset:cn { proofname } { 证明 }
- \tl_gset:cn { contentsname } { 目录 }
- \tl_gset:cn { listfigurename } { 插图 }
- \tl_gset:cn { listtablename } { 表格 }
- \tl_gset:cn { figurename } { 图 }
- \tl_gset:cn { tablename } { 表 }
- \tl_gset:cn { indexname } { 索引 }
- \tl_gset:cn { appendixname } { 附录 }
- \tl_gset:cn { refname } { 参考文献 }
- \tl_gset:cn { bibname } { 参考文献 }
+ \tl_set:Nn \languagename { schinese }
+ \tl_set:cn { abstractname } { 摘要 }
+ \tl_set:cn { proofname } { 证明 }
+ \tl_set:cn { contentsname } { 目录 }
+ \tl_set:cn { listfigurename } { 插图 }
+ \tl_set:cn { listtablename } { 表格 }
+ \tl_set:cn { figurename } { 图 }
+ \tl_set:cn { tablename } { 表 }
+ \tl_set:cn { indexname } { 索引 }
+ \tl_set:cn { appendixname } { 附录 }
+ \tl_set:cn { refname } { 参考文献 }
+ \tl_set:cn { bibname } { 参考文献 }
}
\tl_gput_right:Nn \g_projlib_language_settings_tchinese_tl
{
\g_projlib_language_settings_common_tl
- \tl_gset:Nn \languagename { tchinese }
- \tl_gset:cn { abstractname } { 摘要 }
- \tl_gset:cn { proofname } { 證明 }
- \tl_gset:cn { contentsname } { 目錄 }
- \tl_gset:cn { listfigurename } { 插圖 }
- \tl_gset:cn { listtablename } { 表格 }
- \tl_gset:cn { figurename } { 圖 }
- \tl_gset:cn { tablename } { 表 }
- \tl_gset:cn { indexname } { 索引 }
- \tl_gset:cn { appendixname } { 附錄 }
- \tl_gset:cn { refname } { 參考文獻 }
- \tl_gset:cn { bibname } { 參考文獻 }
+ \tl_set:Nn \languagename { tchinese }
+ \tl_set:cn { abstractname } { 摘要 }
+ \tl_set:cn { proofname } { 證明 }
+ \tl_set:cn { contentsname } { 目錄 }
+ \tl_set:cn { listfigurename } { 插圖 }
+ \tl_set:cn { listtablename } { 表格 }
+ \tl_set:cn { figurename } { 圖 }
+ \tl_set:cn { tablename } { 表 }
+ \tl_set:cn { indexname } { 索引 }
+ \tl_set:cn { appendixname } { 附錄 }
+ \tl_set:cn { refname } { 參考文獻 }
+ \tl_set:cn { bibname } { 參考文獻 }
}
\tl_gput_right:Nn \g_projlib_language_settings_japanese_tl
@@ -3005,6 +3008,7 @@
\endinput
}
+%<*projlib-logo-old>
\cs_if_exist:cTF { fontspec }
{
\newfontface \__projlib_logo_font: { LinBiolinum_R.otf }
@@ -3034,19 +3038,20 @@
}
}
-% \RequirePackage { xcolor }
% \cs_new_protected:Nn \projlib_logo_generic:n
% {
% \group_begin:
% \normalfont
% \__projlib_logo_font:
-% \textcolor { blue!55!cyan } { P }
-% \textcolor { blue!45!cyan } { r }
-% \textcolor { blue!30!cyan } { o }
-% \textcolor { green!70!black!70 } { #1 }
-% \textcolor { red!20!yellow } { L }
-% \textcolor { red!40!yellow } { i }
-% \textcolor { red!55!yellow } { b }
+% \color_group_begin:
+% \color_select:n { blue!60!cyan } { P }
+% \color_select:n { blue!45!cyan } { r }
+% \color_select:n { blue!30!cyan } { o }
+% \color_select:n { green!70!black!70 } { #1 }
+% \color_select:n { red!20!yellow } { L }
+% \color_select:n { red!40!yellow } { i }
+% \color_select:n { red!60!yellow } { b }
+% \color_group_end:
% \group_end:
% }
\cs_new_protected:Nn \projlib_logo_generic:n
@@ -3055,13 +3060,13 @@
\normalfont
\__projlib_logo_font:
\color_group_begin:
- \color_select:n { blue!60!cyan } { P }
- \color_select:n { blue!45!cyan } { r }
- \color_select:n { blue!30!cyan } { o }
- \color_select:n { green!70!black!70 } { #1 }
- \color_select:n { red!20!yellow } { L }
- \color_select:n { red!40!yellow } { i }
- \color_select:n { red!60!yellow } { b }
+ \color_select:n { blue!50!cyan!30!black } { P }
+ \color_select:n { blue!50!cyan!55!black } { r }
+ \color_select:n { blue!50!cyan!75!black } { o }
+ \color_select:n { blue!50!cyan!90!black } { #1 }
+ \color_select:n { blue!50!cyan!75!black } { L }
+ \color_select:n { blue!50!cyan!55!black } { i }
+ \color_select:n { blue!50!cyan!30!black } { b }
\color_group_end:
\group_end:
}
@@ -3074,6 +3079,50 @@
{
\projlib_logo_generic:n { j }
}
+%</projlib-logo-old>
+
+\RequirePackage { tikz }
+
+\cs_new_protected:Nn \projlib_logo_generic:
+ {
+ \skip_horizontal:n { .2em }
+ \begin{tikzpicture}[line~width=.1em, baseline=0]
+ \begin{scope}[color=blue!50!cyan!30!black]
+ \draw (0.22em,.5em) circle (.22em);
+ \draw (0em,0em) -- (0em,.5em);
+ \end{scope}
+ \begin{scope}[color=blue!50!cyan!40!black, xshift=.65em]
+ \draw (0em,0em) -- (0em,.25em) arc [start~angle=180, end~angle=90, radius=.2em];
+ \end{scope}
+ \begin{scope}[color=blue!50!cyan!45!black, xshift=1.0em]
+ \draw (0.2em,.24em) circle (.2em);
+ \end{scope}
+ \begin{scope}[color=blue!50!cyan!50!black, xshift=1.65em]
+ \draw (0em,-.25em) -- (0em,.5em);
+ \begin{scope}[yshift=.75em]
+ % \draw[line~width=.032em, color=orange!60!yellow, xshift=.01em, yshift=-.003em] (0,0) circle (.13em);
+ % \node[rotate=-15,scale=0.45, xshift=.033em] { \usefont{U}{zeur}{b}{n} \symbol{"02} };
+ \draw[line~width=.06em, color=orange!60!yellow] (0,0) circle (.13em);
+ \end{scope}
+ \end{scope}
+ \begin{scope}[color=blue!50!cyan!67!black, xshift=2.0em]
+ \draw (0em,0em) -- (0em,.75em);
+ \end{scope}
+ \begin{scope}[color=blue!50!cyan!75!black, xshift=2.35em]
+ \draw (0em,0em) -- (0em,.5em);
+ \end{scope}
+ \begin{scope}[color=blue!50!cyan!90!black, xshift=2.63em]
+ \draw (0.2em,.24em) circle (.2em);
+ \draw (0em,0.24em) -- (0em,.75em);
+ \end{scope}
+ \end{tikzpicture}
+ \skip_horizontal:n { .2em }
+ }
+
+\DeclareRobustCommand * \ProjLib
+ {
+ \projlib_logo_generic:
+ }
%</projlib-logo>
%
%<*projlib-math>
@@ -3395,6 +3444,13 @@
, theorem numbering .default:n = { * }
, thmnum .tl_set:N = \l__projlib_theorem_theorem_numbering_tl
, thmnum .default:n = { * }
+ , theorem-style .tl_set:N = \l__projlib_theorem_theorem_style_tl
+ , theorem-style .initial:n = { }
+ , theorem-style .value_required:n = true
+ , theorem~style .tl_set:N = \l__projlib_theorem_theorem_style_tl
+ , theorem~style .value_required:n = true
+ , theorem style .tl_set:N = \l__projlib_theorem_theorem_style_tl
+ , theorem style .value_required:n = true
, complex-name .bool_set:N = \l__projlib_theorem_complexname_bool
, complex-name .initial:n = { true }
, complex~name .bool_set:N = \l__projlib_theorem_complexname_bool
@@ -3462,6 +3518,17 @@
% \PassOptionsToPackage { no preset names } { create-theorem }
% }
+\cs_new_protected:Nn \projlib_theorem_preset_theorem_style:nn
+ {
+ \tl_const:cn { c_crthm_theorem_style_preset_ #1 _tl } { #2 }
+ }
+
+\cs_generate_variant:Nn \keyval_parse:nnn { nno }
+\keyval_parse:nno
+ { }
+ { \projlib_theorem_preset_theorem_style:nn }
+ { \l__projlib_theorem_theorem_style_tl }
+
\RequirePackage { amsthm }
\RequirePackage { create-theorem }
Modified: branches/branch2021.final/Master/texmf-dist/tex/latex/beaulivre/beaulivre.cls
===================================================================
--- branches/branch2021.final/Master/texmf-dist/tex/latex/beaulivre/beaulivre.cls 2022-03-20 21:13:02 UTC (rev 62833)
+++ branches/branch2021.final/Master/texmf-dist/tex/latex/beaulivre/beaulivre.cls 2022-03-20 21:14:50 UTC (rev 62834)
@@ -2,7 +2,7 @@
%% This is file `beaulivre/beaulivre.cls',
%% generated with the docstrip utility.
-%% Copyright (C) 2021 by Jinwen XU
+%% Copyright (C) 2021-2022 by Jinwen XU
%%
%% This is part of the colorist class series.
%%
@@ -16,551 +16,665 @@
%% 2005/12/01 or later.
%%
\NeedsTeXFormat{LaTeX2e}[2020-10-01]
-\ProvidesClass{beaulivre}
- [2021/12/16 A colorful book style]
-\def\colorclass at baseclass{book}
-\RequirePackage{kvoptions}
-\RequirePackage{etoolbox}
-\SetupKeyvalOptions{
- family = @colorclass,
- prefix = @colorclass@,
-}
-\DeclareBoolOption[false]{draft}
-\DeclareBoolOption[false]{fast}
-\DeclareBoolOption[false]{useosf}
-\DeclareBoolOption[false]{lmodern}
-\DeclareBoolOption[false]{palatino}
-\DeclareBoolOption[false]{times}
-\DeclareBoolOption[false]{garamond}
-\DeclareBoolOption[false]{noto}
-\DeclareBoolOption[false]{biolinum}
-\DeclareBoolOption[false]{customfont}
-\DeclareStringOption{thmnum}[PJL at thmnum@default]
+\RequirePackage{l3keys2e}
+\ProvidesExplClass
+ {beaulivre}
+ {2022/03/19} {}
+ {A colorful book style}
-\newif\if at colorclass@bfivepaper\@colorclass at bfivepaperfalse
-\DeclareVoidOption{b5paper}{\@colorclass at bfivepapertrue}
-\newif\if at colorclass@afourpaper\@colorclass at afourpaperfalse
-\DeclareVoidOption{a4paper}{\@colorclass at afourpapertrue}
+\tl_const:Nn \l__colorclass_base_class_tl { book }
-\DeclareDefaultOption{\PassOptionsToClass{\CurrentOption}{\colorclass at baseclass}}
-\ProcessKeyvalOptions*\relax
-\LoadClass{\colorclass at baseclass}
-\if at colorclass@draft
- \@colorclass at fasttrue
-\fi
-\if at colorclass@lmodern
- \@colorclass at customfonttrue
-\fi
-\if at colorclass@palatino
- \@colorclass at customfonttrue
-\fi
-\if at colorclass@times
- \@colorclass at customfonttrue
-\fi
-\if at colorclass@garamond
- \@colorclass at customfonttrue
-\fi
-\if at colorclass@noto
- \@colorclass at customfonttrue
-\fi
-\if at colorclass@biolinum
- \@colorclass at customfonttrue
-\fi
+\bool_new:N \l__colorclass_load_custom_font_file_bool
+\bool_set_false:N \l__colorclass_load_custom_font_file_bool
-%%================================
-%% Page layout
-%%================================
-\RequirePackage{silence}
-\WarningFilter{geometry}{Over-specification in}
-\RequirePackage[heightrounded]{geometry}
-\geometry{
- papersize={8.5in,11in},
- % total={47em,66em},
- total={6.500in,9.130in},
- hmarginratio=1:1,
- vmarginratio=1:1,
- footnotesep=2em plus 2pt minus 2pt,
-}
-\if at colorclass@bfivepaper
-\geometry{
- b5paper,
- % total={40em,59em},
- total={5.535in,8.160in},
- hmarginratio=1:1,
- vmarginratio=1:1,
- footnotesep=2em plus 2pt minus 2pt,
-}
-\fi
-\if at colorclass@afourpaper
-\geometry{
- a4paper,
- % total={47em,70em},
- total={6.500in,9.685in},
- hmarginratio=1:1,
- vmarginratio=1:1,
- footnotesep=2em plus 2pt minus 2pt,
-}
-\fi
+\bool_new:N \l__colorclass_load_custom_font_file_latin_bool
+\bool_set_false:N \l__colorclass_load_custom_font_file_latin_bool
-\RequirePackage{indentfirst}
+\bool_new:N \l__colorclass_load_custom_font_file_cjk_bool
+\bool_set_false:N \l__colorclass_load_custom_font_file_cjk_bool
-\if at colorclass@fast
- \PassOptionsToPackage{fast}{colorist}
- \RequirePackage{draftwatermark}
- \DraftwatermarkOptions{text={\normalfont DRAFT},color=paper!95!-paper}
-\fi
+\bool_new:N \l__colorclass_load_custom_font_file_math_bool
+\bool_set_false:N \l__colorclass_load_custom_font_file_math_bool
-\RequirePackage{colorist}
+\keys_define:nn { colorclass }
+ {
+ , draft .bool_set:N = \l__colorclass_fast_bool
+ , draft .initial:n = { false }
+ , fast .bool_set:N = \l__colorclass_fast_bool
+
+ , load custom font file .code:n = {
+ \bool_set_true:N \l__colorclass_load_custom_font_file_bool
+ \str_set:Nn \l__colorclass_custom_font_file_str { #1 }
+ \bool_set_true:N \l__colorclass_load_custom_font_file_latin_bool
+ \str_set:Nn \l__colorclass_custom_font_file_latin_str { colorist.font.latin }
+ \bool_set_true:N \l__colorclass_load_custom_font_file_cjk_bool
+ \str_set:Nn \l__colorclass_custom_font_file_cjk_str { colorist.font.cjk }
+ \bool_set_true:N \l__colorclass_load_custom_font_file_math_bool
+ \str_set:Nn \l__colorclass_custom_font_file_math_str { colorist.font.math }
+ }
+ , load custom font file .default:n = { colorist.font }
+ , load~custom~font~file .code:n = {
+ \bool_set_true:N \l__colorclass_load_custom_font_file_bool
+ \str_set:Nn \l__colorclass_custom_font_file_str { #1 }
+ }
+ , load~custom~font~file .default:n = { colorist.font }
+ , load-custom-font-file .code:n = {
+ \bool_set_true:N \l__colorclass_load_custom_font_file_bool
+ \str_set:Nn \l__colorclass_custom_font_file_str { #1 }
+ }
+ , load-custom-font-file .default:n = { colorist.font }
+
+ , load custom latin font file .code:n = {
+ \bool_set_true:N \l__colorclass_load_custom_font_file_latin_bool
+ \str_set:Nn \l__colorclass_custom_font_file_latin_str { #1 }
+ }
+ , load custom latin font file .default:n = { colorist.font.latin }
+ , load~custom~latin~font~file .code:n = {
+ \bool_set_true:N \l__colorclass_load_custom_font_file_latin_bool
+ \str_set:Nn \l__colorclass_custom_font_file_latin_str { #1 }
+ }
+ , load~custom~latin~font~file .default:n = { colorist.font.latin }
+ , load-custom-latin-font-file .code:n = {
+ \bool_set_true:N \l__colorclass_load_custom_font_file_latin_bool
+ \str_set:Nn \l__colorclass_custom_font_file_latin_str { #1 }
+ }
+ , load-custom-latin-font-file .default:n = { colorist.font.latin }
+
+ , load custom cjk font file .code:n = {
+ \bool_set_true:N \l__colorclass_load_custom_font_file_cjk_bool
+ \str_set:Nn \l__colorclass_custom_font_file_cjk_str { #1 }
+ }
+ , load custom cjk font file .default:n = { colorist.font.cjk }
+ , load~custom~cjk~font~file .code:n = {
+ \bool_set_true:N \l__colorclass_load_custom_font_file_cjk_bool
+ \str_set:Nn \l__colorclass_custom_font_file_cjk_str { #1 }
+ }
+ , load~custom~cjk~font~file .default:n = { colorist.font.cjk }
+ , load-custom-cjk-font-file .code:n = {
+ \bool_set_true:N \l__colorclass_load_custom_font_file_cjk_bool
+ \str_set:Nn \l__colorclass_custom_font_file_cjk_str { #1 }
+ }
+ , load-custom-cjk-font-file .default:n = { colorist.font.cjk }
+
+ , load custom math font file .code:n = {
+ \bool_set_true:N \l__colorclass_load_custom_font_file_math_bool
+ \str_set:Nn \l__colorclass_custom_font_file_math_str { #1 }
+ }
+ , load custom math font file .default:n = { colorist.font.math }
+ , load~custom~math~font~file .code:n = {
+ \bool_set_true:N \l__colorclass_load_custom_font_file_math_bool
+ \str_set:Nn \l__colorclass_custom_font_file_math_str { #1 }
+ }
+ , load~custom~math~font~file .default:n = { colorist.font.math }
+ , load-custom-math-font-file .code:n = {
+ \bool_set_true:N \l__colorclass_load_custom_font_file_math_bool
+ \str_set:Nn \l__colorclass_custom_font_file_math_str { #1 }
+ }
+ , load-custom-math-font-file .default:n = { colorist.font.math }
+
+ , a4paper .bool_set:N = \l__colorclass_a_four_paper_bool
+ , a4paper .initial:n = { false }
+ , b5paper .bool_set:N = \l__colorclass_b_five_paper_bool
+ , b5paper .initial:n = { false }
+
+ , 11pt .code:n = { \PassOptionsToClass { \CurrentOption } { \l__colorclass_base_class_tl } }
+ , 12pt .code:n = { \PassOptionsToClass { \CurrentOption } { \l__colorclass_base_class_tl } }
+
+ , unknown .code:n = {
+ \PassOptionsToPackage { \CurrentOption } { colorist }
+ }
+ }
+\ProcessKeysOptions { colorclass }
+
+\LoadClass{\l__colorclass_base_class_tl}
+
%%================================
-%% Fonts
+%% Page layout
%%================================
-\if at colorclass@customfont\else
- \if at colorclass@fast
- \RequirePackage{mathpazo}
- \fi
-\fi
+\RequirePackage { silence }
+\WarningFilter { geometry } { Over-specification }
-\PassOptionsToPackage{no-math,quiet}{fontspec}
-\RequirePackage{fontspec}
+\PassOptionsToPackage { heightrounded } { geometry }
+\RequirePackage { geometry }
-\IfFileExists{colorist-font.tex}{
- \input{colorist-font.tex}
-}{
-\IfFontExistsTF{Palatino Linotype}{%
- \setmainfont{Palatino Linotype}
- [\if at colorclass@useosf Numbers = OldStyle\fi]
-}{
- \setmainfont{TeXGyrePagellaX-Regular.otf}[
- BoldFont = TeXGyrePagellaX-Bold.otf ,
- ItalicFont = TeXGyrePagellaX-Italic.otf ,
- BoldItalicFont = TeXGyrePagellaX-BoldItalic.otf,
- \if at colorclass@useosf Numbers = OldStyle\fi ]
-}
- \setsansfont{SourceSansPro-Regular.otf}[
- Scale = MatchLowercase ,
- BoldFont = SourceSansPro-Bold.otf ,
- ItalicFont = SourceSansPro-RegularIt.otf ,
- BoldItalicFont = SourceSansPro-BoldIt.otf ]
- \setmonofont{NewCMMono10-Regular.otf}[
- Scale = 1.05 ,
- BoldFont = NewCMMono10-Bold.otf ,
- ItalicFont = NewCMMono10-Italic.otf ,
- BoldItalicFont = NewCMMono10-BoldOblique.otf ]
-}
+\geometry
+ {
+ papersize = { 8.5in, 11in },
+ total = { 6.500in, 9.130in },
+ centering,
+ footnotesep = 2em plus 2pt minus 2pt,
+ }
-\PassOptionsToPackage{fontset=none,scheme=plain}{ctex}
-\RequirePackage{ctex}
+\bool_if:NT \l__colorclass_b_five_paper_bool
+ {
+ \geometry
+ {
+ b5paper,
+ total = { 5.535in, 8.160in },
+ centering,
+ footnotesep = 2em plus 2pt minus 2pt,
+ }
+ }
-\IfFileExists{colorist-font.cjk.tex}{
- \input{colorist-font.cjk.tex}
-}{
-\IfFontExistsTF{SourceHanSerifSC-Regular}{%
- \setCJKmainfont{SourceHanSerifSC-Regular}[
- BoldFont = SourceHanSerifSC-Bold ,
- ItalicFont = * ,
- BoldItalicFont = SourceHanSerifSC-Bold ]
-}{
- \setCJKmainfont{FandolSong-Regular.otf}[
- BoldFont = FandolSong-Bold.otf ,
- ItalicFont = FandolKai-Regular.otf ,
- BoldItalicFont = FandolKai-Regular.otf ,
- BoldItalicFeatures = {FakeBold=4} ]
-}
+\bool_if:NT \l__colorclass_a_four_paper_bool
+ {
+ \geometry
+ {
+ a4paper,
+ total = { 6.500in, 9.685in },
+ centering,
+ footnotesep = 2em plus 2pt minus 2pt,
+ }
+ }
-\IfFontExistsTF{SourceHanSansSC-Regular}{%
- \setCJKsansfont{SourceHanSansSC-Regular}[
- BoldFont = SourceHanSansSC-Bold ,
- ItalicFont = * ,
- BoldItalicFont = SourceHanSansSC-Bold ]
-}{
- \setCJKsansfont{FandolHei-Regular.otf}[
- BoldFont = FandolHei-Bold.otf ,
- ItalicFont = * ,
- BoldItalicFont = FandolHei-Bold.otf ]
-}
+\bool_if:NT \l__colorclass_fast_bool
+ {
+ \PassOptionsToPackage { fast } { colorist }
+ \RequirePackage { draftwatermark }
+ \DraftwatermarkOptions { text = { \normalfont DRAFT }, color = paper!97!-paper }
+ }
-\IfFontExistsTF{SourceHanMonoSC-Regular}{%
- \setCJKmonofont{SourceHanMonoSC-Regular}[
- BoldFont = SourceHanMonoSC-Medium ,
- ItalicFont = * ,
- BoldItalicFont = SourceHanMonoSC-Medium ]
-}{
- \setCJKmonofont{FandolFang-Regular.otf}[
- BoldFont = * ,
- BoldFeatures = {FakeBold=4} ,
- ItalicFont = * ,
- BoldItalicFont = * ,
- BoldItalicFeatures = {FakeBold=4} ]
-}
+\RequirePackage { indentfirst }
-\if at PJLlang@enable at CN
-\IfFontExistsTF{SourceHanSerifSC-Regular}{%
- \setCJKfamilyfont{SCmain}{SourceHanSerifSC-Regular}[
- BoldFont = SourceHanSerifSC-Bold ,
- ItalicFont = * ,
- BoldItalicFont = SourceHanSerifSC-Bold ]
-}{
- \setCJKfamilyfont{SCmain}{FandolSong-Regular.otf}[
- BoldFont = FandolSong-Bold.otf ,
- ItalicFont = FandolKai-Regular.otf ,
- BoldItalicFont = FandolKai-Regular.otf ,
- BoldItalicFeatures = {FakeBold=4} ]
-}
-\IfFontExistsTF{SourceHanSansSC-Regular}{%
- \setCJKfamilyfont{SCsans}{SourceHanSansSC-Regular}[
- BoldFont = SourceHanSansSC-Bold ,
- ItalicFont = * ,
- BoldItalicFont = SourceHanSansSC-Bold ]
-}{
- \setCJKfamilyfont{SCsans}{FandolHei-Regular.otf}[
- BoldFont = FandolHei-Bold.otf ,
- ItalicFont = * ,
- BoldItalicFont = FandolHei-Bold.otf ]
-}
-\IfFontExistsTF{SourceHanMonoSC-Regular}{%
- \setCJKfamilyfont{SCmono}{SourceHanMonoSC-Regular}[
- BoldFont = SourceHanMonoSC-Medium ,
- ItalicFont = * ,
- BoldItalicFont = SourceHanMonoSC-Medium ]
-}{
- \setCJKfamilyfont{SCmono}{FandolFang-Regular.otf}[
- BoldFont = * ,
- BoldFeatures = {FakeBold=4} ,
- ItalicFont = * ,
- BoldItalicFont = * ,
- BoldItalicFeatures = {FakeBold=4} ]
-}
-\fi
+\RequirePackage { colorist }
-\if at PJLlang@enable at TC
-\IfFontExistsTF{SourceHanSerifTC-Regular}{%
- \setCJKfamilyfont{TCmain}{SourceHanSerifTC-Regular}[
- BoldFont = SourceHanSerifTC-Bold ,
- ItalicFont = * ,
- BoldItalicFont = SourceHanSerifTC-Bold ]
-}{
- \setCJKfamilyfont{TCmain}{FandolSong-Regular.otf}[
- BoldFont = FandolSong-Bold.otf ,
- ItalicFont = FandolKai-Regular.otf ,
- BoldItalicFont = FandolKai-Regular.otf ,
- BoldItalicFeatures = {FakeBold=4} ]
-}
-\IfFontExistsTF{SourceHanSansTC-Regular}{%
- \setCJKfamilyfont{TCsans}{SourceHanSansTC-Regular}[
- BoldFont = SourceHanSansTC-Bold ,
- ItalicFont = * ,
- BoldItalicFont = SourceHanSansTC-Bold ]
-}{
- \setCJKfamilyfont{TCsans}{FandolHei-Regular.otf}[
- BoldFont = FandolHei-Bold.otf ,
- ItalicFont = * ,
- BoldItalicFont = FandolHei-Bold.otf ]
-}
-\IfFontExistsTF{SourceHanMonoTC-Regular}{%
- \setCJKfamilyfont{TCmono}{SourceHanMonoTC-Regular}[
- BoldFont = SourceHanMonoTC-Medium ,
- ItalicFont = * ,
- BoldItalicFont = SourceHanMonoTC-Medium ]
-}{
- \setCJKfamilyfont{TCmono}{FandolFang-Regular.otf}[
- BoldFont = * ,
- BoldFeatures = {FakeBold=4} ,
- ItalicFont = * ,
- BoldItalicFont = * ,
- BoldItalicFeatures = {FakeBold=4} ]
-}
-\fi
+\hfuzz=2pt
+\vfuzz=2pt
-\if at PJLlang@enable at JP
-\IfFontExistsTF{SourceHanSerif-Regular}{%
- \setCJKfamilyfont{JPmain}{SourceHanSerif-Regular}[
- BoldFont = SourceHanSerif-Bold ,
- ItalicFont = * ,
- BoldItalicFont = SourceHanSerif-Bold ]
-}{
- \setCJKfamilyfont{JPmain}{FandolSong-Regular.otf}[
- BoldFont = FandolSong-Bold.otf ,
- ItalicFont = FandolKai-Regular.otf ,
- BoldItalicFont = FandolKai-Regular.otf ,
- BoldItalicFeatures = {FakeBold=4} ]
-}
-\IfFontExistsTF{SourceHanSans-Regular}{%
- \setCJKfamilyfont{JPsans}{SourceHanSans-Regular}[
- BoldFont = SourceHanSans-Bold ,
- ItalicFont = * ,
- BoldItalicFont = SourceHanSans-Bold ]
-}{
- \setCJKfamilyfont{JPsans}{FandolHei-Regular.otf}[
- BoldFont = FandolHei-Bold.otf ,
- ItalicFont = * ,
- BoldItalicFont = FandolHei-Bold.otf ]
-}
-\IfFontExistsTF{SourceHanMono-Regular}{%
- \setCJKfamilyfont{JPmono}{SourceHanMono-Regular}[
- BoldFont = SourceHanMono-Medium ,
- ItalicFont = * ,
- BoldItalicFont = SourceHanMono-Medium ]
-}{
- \setCJKfamilyfont{JPmono}{FandolFang-Regular.otf}[
- BoldFont = * ,
- BoldFeatures = {FakeBold=4} ,
- ItalicFont = * ,
- BoldItalicFont = * ,
- BoldItalicFeatures = {FakeBold=4} ]
-}
-\fi
+%%================================
+%% Fonts
+%%================================
+\WarningFilter { latexfont } { Font~shape }
+\WarningFilter { latexfont } { Some~font }
-\WarningFilter{latexfont}{Font shape}
-\WarningFilter{latexfont}{Some font}
+\cs_new_protected:Nn \__colorclass_load_file_or_config:Nnn
+ {
+ \bool_if:NT #1
+ {
+ \exp_args:Nx \file_if_exist:nT { #2 }
+ {
+ \exp_args:Nx \file_input:n { #2 }
+ \use_none:nn
+ }
+ }
+ \use:n { #3 }
+ }
-\def\CJKsffamily{}
-\def\CJKttfamily{}
+\cs_new_protected:Nn \__colorclass_if_font_exist:nnn
+ {
+ \bool_if:NTF \l__colorclass_fast_bool
+ { #3 }
+ { \fontspec_font_if_exist:nTF { #1 } { #2 } { #3 } }
+ }
-\apptocmd{\sffamily}{\CJKsffamily}{}{\FAIL}
-\apptocmd{\ttfamily}{\CJKttfamily}{}{\FAIL}
+\__colorclass_load_file_or_config:Nnn \l__colorclass_load_custom_font_file_bool { \l__colorclass_custom_font_file_str }
+ {
+ \RequirePackage { projlib-font }
-\if at PJLlang@enable at CN
-\gappto{\PJLlang at langconfig@CN}{%
- \def\CJKsffamily{\CJKfamily{SCsans}}%
- \def\CJKttfamily{\CJKfamily{SCmono}}%
- \CJKfamily{SCmain}%
-}
-\fi
+ \bool_if:NF \g_projlib_font_already_set_bool
+ {
+ \bool_if:NT \l__colorclass_fast_bool
+ {
+ \RequirePackage { mathpazo }
+ }
-\if at PJLlang@enable at TC
-\gappto{\PJLlang at langconfig@TC}{%
- \def\CJKsffamily{\CJKfamily{TCsans}}%
- \def\CJKttfamily{\CJKfamily{TCmono}}%
- \CJKfamily{TCmain}%
-}
-\fi
+ \PassOptionsToPackage { no-math,quiet } { fontspec }
+ \RequirePackage { fontspec }
-\if at PJLlang@enable at JP
-\gappto{\PJLlang at langconfig@JP}{%
- \def\CJKsffamily{\CJKfamily{JPsans}}%
- \def\CJKttfamily{\CJKfamily{JPmono}}%
- \CJKfamily{JPmain}%
-}
-\fi
-}
+ \__colorclass_load_file_or_config:Nnn \l__colorclass_load_custom_font_file_latin_bool { \l__colorclass_custom_font_file_latin_str }
+ {
+ \__colorclass_if_font_exist:nnn { Palatino~Linotype }
+ {
+ \bool_if:NTF \l__projlib_font_useosf_bool
+ {
+ \setmainfont { Palatino~Linotype } [ Numbers = OldStyle ]
+ }
+ {
+ \setmainfont { Palatino~Linotype }
+ }
+ }
+ {
+ \bool_if:NTF \l__projlib_font_useosf_bool
+ {
+ \setmainfont { TeXGyrePagellaX-Regular.otf }
+ [
+ BoldFont = TeXGyrePagellaX-Bold.otf ,
+ ItalicFont = TeXGyrePagellaX-Italic.otf ,
+ BoldItalicFont = TeXGyrePagellaX-BoldItalic.otf ,
+ Numbers = OldStyle ,
+ ]
+ }
+ {
+ \setmainfont { TeXGyrePagellaX-Regular.otf }
+ [
+ BoldFont = TeXGyrePagellaX-Bold.otf ,
+ ItalicFont = TeXGyrePagellaX-Italic.otf ,
+ BoldItalicFont = TeXGyrePagellaX-BoldItalic.otf ,
+ ]
+ }
+ }
+ \setsansfont { SourceSansPro-Regular.otf }
+ [
+ Scale = MatchLowercase ,
+ BoldFont = SourceSansPro-Bold.otf ,
+ ItalicFont = SourceSansPro-RegularIt.otf ,
+ BoldItalicFont = SourceSansPro-BoldIt.otf ,
+ ]
+ \setmonofont { NewCMMono10-Regular.otf }
+ [
+ Scale = 1.05 ,
+ BoldFont = NewCMMono10-Bold.otf ,
+ ItalicFont = NewCMMono10-Italic.otf ,
+ BoldItalicFont = NewCMMono10-BoldOblique.otf ,
+ ]
-\if at colorclass@customfont\else
-\if at colorclass@fast
-\RequirePackage{amssymb}
-\else
-\PassOptionsToPackage
- {warnings-off={mathtools-colon,mathtools-overbracket}}{unicode-math}
-\RequirePackage{unicode-math}
-\unimathsetup{math-style=ISO, partial=upright, nabla=upright}
-\setmathfont{Asana-Math.otf}
-\IfFontExistsTF{Neo Euler}{%
-\setmathfont[range={up/{Latin,latin,Greek,greek},
- bfup/{Latin,latin,Greek,greek},
- cal, bfcal, frak, bffrak,
- `(,`),`[,`],`\{,`\},`:,`=,\ne,\equiv,`/,\backslash,
- \in,\notin,\ni,\subset,\supset,\subseteq,\supseteq,
- \rightarrow,\leftarrow,\mapsto,\hookrightarrow,\hookleftarrow,
- \sum,\prod,\coprod,
- \sqrt,\int,\iint,\iiint,\oint},
- script-features={},
- sscript-features={},
- Scale = 1.05,
- ]{Neo Euler}
-}{}
-\setmathfont[range={\leq,\geq,\ll,\gg,\lll,\ggg,\leqslant,\geqslant},
- Scale = 0.95,
- ]{latinmodern-math.otf}
-\setmathfont[range={up/num, bfup/num}
- ]{texgyrepagella-math.otf}
+ \projlib_language_set_linespacing_latin:n { \setstretch { 1.07 } }
+ }
+ }
-\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}}
-\renewcommand{\frac}[2]{\genfrac{}{}{}{}{
- \mathchoice
- {\raisebox{-.15em}{$\displaystyle #1$}}
- {\raisebox{-.15em}{$\textstyle #1$}}
- {\raisebox{-.08em}{$\scriptstyle #1$}}
- {\scriptscriptstyle #1}
-}{
- \mathchoice
- {\raisebox{.08em}{$\displaystyle #2$}}
- {\raisebox{.08em}{$\textstyle #2$}}
- {\raisebox{.05em}{$\scriptstyle #2$}}
- {\scriptscriptstyle #2}
-}}
-}
+ \PassOptionsToPackage { fontset = none, scheme = plain } { ctex }
+ \RequirePackage { ctex }
-\RequirePackage{tikz-cd}
-\newbox\xratbelow
-\newbox\xratabove
-\renewcommand{\xrightarrow}[2][]{%
- \setbox\xratbelow=\hbox{\ensuremath{\scriptstyle #1}}%
- \setbox\xratabove=\hbox{\ensuremath{\scriptstyle #2}}%
- \pgfmathsetlengthmacro{\xratlen}{max(\wd\xratbelow, \wd\xratabove) + .8em}%
- \mathrel{\tikz [->, baseline=-.55ex, every node/.style={inner sep=0pt}]
- \draw (0,0) -- node[below=3pt] {\box\xratbelow}
- node[above=2pt] {\box\xratabove}
- (\xratlen,0) ;}}
-\renewcommand{\xleftarrow}[2][]{%
- \setbox\xratbelow=\hbox{\ensuremath{\scriptstyle #1}}%
- \setbox\xratabove=\hbox{\ensuremath{\scriptstyle #2}}%
- \pgfmathsetlengthmacro{\xratlen}{max(\wd\xratbelow, \wd\xratabove) + .8em}%
- \mathrel{\tikz [<-, baseline=-.55ex, every node/.style={inner sep=0pt}]
- \draw (0,0) -- node[below=3pt] {\box\xratbelow}
- node[above=2pt] {\box\xratabove}
- (\xratlen,0) ;}}
-\renewcommand{\xleftrightarrow}[2][]{%
- \setbox\xratbelow=\hbox{\ensuremath{\scriptstyle #1}}%
- \setbox\xratabove=\hbox{\ensuremath{\scriptstyle #2}}%
- \pgfmathsetlengthmacro{\xratlen}{max(\wd\xratbelow, \wd\xratabove) + .8em}%
- \mathrel{\tikz [<->, baseline=-.55ex, every node/.style={inner sep=0pt}]
- \draw (0,0) -- node[below=3pt] {\box\xratbelow}
- node[above=2pt] {\box\xratabove}
- (\xratlen,0) ;}}
-\renewcommand{\xhookrightarrow}[2][]{%
- \setbox\xratbelow=\hbox{\ensuremath{\scriptstyle #1}}%
- \setbox\xratabove=\hbox{\ensuremath{\scriptstyle #2}}%
- \pgfmathsetlengthmacro{\xratlen}{max(\wd\xratbelow, \wd\xratabove) + .8em}%
- \mathrel{\tikz [baseline=-.55ex, every node/.style={inner sep=0pt}]
- \draw (0,0) edge[commutative diagrams/hookrightarrow] node[below=3pt] {\box\xratbelow}
- node[above=2pt] {\box\xratabove}
- (\xratlen,0) ;}}
-\renewcommand{\xhookleftarrow}[2][]{%
- \setbox\xratbelow=\hbox{\ensuremath{\scriptstyle #1}}%
- \setbox\xratabove=\hbox{\ensuremath{\scriptstyle #2}}%
- \pgfmathsetlengthmacro{\xratlen}{max(\wd\xratbelow, \wd\xratabove) + .8em}%
- \mathrel{\tikz [baseline=-.55ex, every node/.style={inner sep=0pt}]
- \draw (0,0) edge[commutative diagrams/hookleftarrow] node[below=3pt] {\box\xratbelow}
- node[above=2pt] {\box\xratabove}
- (\xratlen,0) ;}}
-\renewcommand{\xmapsto}[2][]{%
- \setbox\xratbelow=\hbox{\ensuremath{\scriptstyle #1}}%
- \setbox\xratabove=\hbox{\ensuremath{\scriptstyle #2}}%
- \pgfmathsetlengthmacro{\xratlen}{max(\wd\xratbelow, \wd\xratabove) + .8em}%
- \mathrel{\tikz [baseline=-.55ex, every node/.style={inner sep=0pt}]
- \draw (0,0) edge[commutative diagrams/mapsto] node[below=3pt] {\box\xratbelow}
- node[above=2pt] {\box\xratabove}
- (\xratlen,0) ;}}
-\newcommand{\xlongequal}[2][]{%
- \setbox\xratbelow=\hbox{\ensuremath{\scriptstyle #1}}%
- \setbox\xratabove=\hbox{\ensuremath{\scriptstyle #2}}%
- \pgfmathsetlengthmacro{\xratlen}{max(\wd\xratbelow, \wd\xratabove) + .8em}%
- \mathrel{\tikz [baseline=-.55ex, every node/.style={inner sep=0pt}]
- \draw (0,0) edge[commutative diagrams/equal] node[below=3pt] {\box\xratbelow}
- node[above=2pt] {\box\xratabove}
- (\xratlen,0) ;}}
+ \__colorclass_load_file_or_config:Nnn \l__colorclass_load_custom_font_file_cjk_bool { \l__colorclass_custom_font_file_cjk_str }
+ {
+ \__colorclass_if_font_exist:nnn { SourceHanSerifSC-Regular }
+ {
+ \setCJKmainfont { SourceHanSerifSC-Regular }
+ [
+ BoldFont = SourceHanSerifSC-Bold ,
+ ItalicFont = * ,
+ BoldItalicFont = SourceHanSerifSC-Bold ,
+ ]
+ }
+ {
+ \setCJKmainfont { FandolSong-Regular.otf }
+ [
+ BoldFont = FandolSong-Bold.otf ,
+ ItalicFont = FandolKai-Regular.otf ,
+ BoldItalicFont = FandolKai-Regular.otf ,
+ BoldItalicFeatures = { FakeBold = 4 } ,
+ ]
+ }
-\AtBeginDocument{
-\renewcommand{\twoheadrightarrow}{%
- \mathrel{\tikz [baseline=-.55ex, every node/.style={inner sep=0pt}]
- \draw (0,0) edge[commutative diagrams/twoheadrightarrow] (.8em,0) ;}}
+ \__colorclass_if_font_exist:nnn { SourceHanSansSC-Regular }
+ {
+ \setCJKsansfont{SourceHanSansSC-Regular}
+ [
+ BoldFont = SourceHanSansSC-Bold ,
+ ItalicFont = * ,
+ BoldItalicFont = SourceHanSansSC-Bold ,
+ ]
+ }
+ {
+ \setCJKsansfont { FandolHei-Regular.otf }
+ [
+ BoldFont = FandolHei-Bold.otf ,
+ ItalicFont = * ,
+ BoldItalicFont = FandolHei-Bold.otf ,
+ ]
+ }
-\renewcommand{\twoheadleftarrow}{%
- \mathrel{\tikz [baseline=-.55ex, every node/.style={inner sep=0pt}]
- \draw (0,0) edge[commutative diagrams/twoheadleftarrow] (.8em,0) ;}}
-}
-\fi
-\fi
+ \__colorclass_if_font_exist:nnn { SourceHanMonoSC-Regular }
+ {
+ \setCJKmonofont { SourceHanMonoSC-Regular }
+ [
+ BoldFont = SourceHanMonoSC-Medium ,
+ ItalicFont = * ,
+ BoldItalicFont = SourceHanMonoSC-Medium ,
+ ]
+ }
+ {
+ \setCJKmonofont { FandolFang-Regular.otf }
+ [
+ BoldFont = * ,
+ BoldFeatures = { FakeBold = 4 } ,
+ ItalicFont = * ,
+ BoldItalicFont = * ,
+ BoldItalicFeatures = { FakeBold = 4 } ,
+ ]
+ }
-\if at colorclass@lmodern
- \RequirePackage{amssymb}
- \if at colorclass@useosf
- \RequirePackage{cfr-lm}
- \else
- \RequirePackage{lmodern}
- \fi
- \PJLsetlinespacing{\setstretch{1.00}}
-\fi
+ \bool_if:NT \g__projlib_language_enabled_schinese_bool
+ {
+ \__colorclass_if_font_exist:nnn { SourceHanSerifSC-Regular }
+ {
+ \setCJKfamilyfont { SCmain } { SourceHanSerifSC-Regular }
+ [
+ BoldFont = SourceHanSerifSC-Bold ,
+ ItalicFont = * ,
+ BoldItalicFont = SourceHanSerifSC-Bold ,
+ ]
+ }
+ {
+ \setCJKfamilyfont { SCmain } { FandolSong-Regular.otf }
+ [
+ BoldFont = FandolSong-Bold.otf ,
+ ItalicFont = FandolKai-Regular.otf ,
+ BoldItalicFont = FandolKai-Regular.otf ,
+ BoldItalicFeatures = { FakeBold = 4 } ,
+ ]
+ }
+ \__colorclass_if_font_exist:nnn { SourceHanSansSC-Regular }
+ {
+ \setCJKfamilyfont { SCsans } { SourceHanSansSC-Regular }
+ [
+ BoldFont = SourceHanSansSC-Bold ,
+ ItalicFont = * ,
+ BoldItalicFont = SourceHanSansSC-Bold ,
+ ]
+ }
+ {
+ \setCJKfamilyfont { SCsans } { FandolHei-Regular.otf }
+ [
+ BoldFont = FandolHei-Bold.otf ,
+ ItalicFont = * ,
+ BoldItalicFont = FandolHei-Bold.otf ,
+ ]
+ }
+ \__colorclass_if_font_exist:nnn { SourceHanMonoSC-Regular }
+ {
+ \setCJKfamilyfont { SCmono } { SourceHanMonoSC-Regular }
+ [
+ BoldFont = SourceHanMonoSC-Medium ,
+ ItalicFont = * ,
+ BoldItalicFont = SourceHanMonoSC-Medium ,
+ ]
+ }
+ {
+ \setCJKfamilyfont { SCmono } { FandolFang-Regular.otf }
+ [
+ BoldFont = * ,
+ BoldFeatures = { FakeBold = 4 } ,
+ ItalicFont = * ,
+ BoldItalicFont = * ,
+ BoldItalicFeatures = { FakeBold = 4 } ,
+ ]
+ }
+ }
-\if at colorclass@palatino
- \RequirePackage{amssymb}
- \RequirePackage{mathpazo}
- \PassOptionsToPackage{defaultsups}{newpxtext}
- \RequirePackage{newpxtext}
- % \RequirePackage{newpxmath}
- \let\openbox\relax
- \PJLsetlinespacing{\setstretch{1.07}}
- \if at colorclass@useosf\useosf\fi
-\fi
+ \bool_if:NT \g__projlib_language_enabled_tchinese_bool
+ {
+ \__colorclass_if_font_exist:nnn { SourceHanSerifTC-Regular }
+ {
+ \setCJKfamilyfont { TCmain } { SourceHanSerifTC-Regular }
+ [
+ BoldFont = SourceHanSerifTC-Bold ,
+ ItalicFont = * ,
+ BoldItalicFont = SourceHanSerifTC-Bold ,
+ ]
+ }
+ {
+ \setCJKfamilyfont { TCmain } { FandolSong-Regular.otf }
+ [
+ BoldFont = FandolSong-Bold.otf ,
+ ItalicFont = FandolKai-Regular.otf ,
+ BoldItalicFont = FandolKai-Regular.otf ,
+ BoldItalicFeatures = { FakeBold = 4 } ,
+ ]
+ }
+ \__colorclass_if_font_exist:nnn { SourceHanSansTC-Regular }
+ {
+ \setCJKfamilyfont { TCsans } { SourceHanSansTC-Regular }
+ [
+ BoldFont = SourceHanSansTC-Bold ,
+ ItalicFont = * ,
+ BoldItalicFont = SourceHanSansTC-Bold ,
+ ]
+ }
+ {
+ \setCJKfamilyfont { TCsans } { FandolHei-Regular.otf }
+ [
+ BoldFont = FandolHei-Bold.otf ,
+ ItalicFont = * ,
+ BoldItalicFont = FandolHei-Bold.otf ,
+ ]
+ }
+ \__colorclass_if_font_exist:nnn { SourceHanMonoTC-Regular }
+ {
+ \setCJKfamilyfont { TCmono } { SourceHanMonoTC-Regular }
+ [
+ BoldFont = SourceHanMonoTC-Medium ,
+ ItalicFont = * ,
+ BoldItalicFont = SourceHanMonoTC-Medium ,
+ ]
+ }
+ {
+ \setCJKfamilyfont { TCmono } { FandolFang-Regular.otf }
+ [
+ BoldFont = * ,
+ BoldFeatures = { FakeBold = 4 } ,
+ ItalicFont = * ,
+ BoldItalicFont = * ,
+ BoldItalicFeatures = { FakeBold = 4 } ,
+ ]
+ }
+ }
-\if at colorclass@times
- \RequirePackage{amssymb}
- \PassOptionsToPackage{defaultsups}{newtxtext}
- \RequirePackage{newtxtext}
- \RequirePackage{newtxmath}
- \let\openbox\relax
- \PJLsetlinespacing{\setstretch{1.00}}
- \if at colorclass@useosf\useosf\fi
- \let\colorist at sffamily\relax
-\fi
+ \bool_if:NT \g__projlib_language_enabled_japanese_bool
+ {
+ \__colorclass_if_font_exist:nnn { SourceHanSerif-Regular }
+ {
+ \setCJKfamilyfont { JPmain } { SourceHanSerif-Regular }
+ [
+ BoldFont = SourceHanSerif-Bold ,
+ ItalicFont = * ,
+ BoldItalicFont = SourceHanSerif-Bold ,
+ ]
+ }
+ {
+ \setCJKfamilyfont { JPmain } { FandolSong-Regular.otf }
+ [
+ BoldFont = FandolSong-Bold.otf ,
+ ItalicFont = FandolKai-Regular.otf ,
+ BoldItalicFont = FandolKai-Regular.otf ,
+ BoldItalicFeatures = { FakeBold = 4 } ,
+ ]
+ }
+ \__colorclass_if_font_exist:nnn { SourceHanSans-Regular }
+ {
+ \setCJKfamilyfont { JPsans } { SourceHanSans-Regular }
+ [
+ BoldFont = SourceHanSans-Bold ,
+ ItalicFont = * ,
+ BoldItalicFont = SourceHanSans-Bold ,
+ ]
+ }
+ {
+ \setCJKfamilyfont { JPsans } { FandolHei-Regular.otf }
+ [
+ BoldFont = FandolHei-Bold.otf ,
+ ItalicFont = * ,
+ BoldItalicFont = FandolHei-Bold.otf ,
+ ]
+ }
+ \__colorclass_if_font_exist:nnn { SourceHanMono-Regular }
+ {
+ \setCJKfamilyfont { JPmono } { SourceHanMono-Regular }
+ [
+ BoldFont = SourceHanMono-Medium ,
+ ItalicFont = * ,
+ BoldItalicFont = SourceHanMono-Medium ,
+ ]
+ }
+ {
+ \setCJKfamilyfont { JPmono } { FandolFang-Regular.otf }
+ [
+ BoldFont = * ,
+ BoldFeatures = { FakeBold = 4 } ,
+ ItalicFont = * ,
+ BoldItalicFont = * ,
+ BoldItalicFeatures = { FakeBold = 4 } ,
+ ]
+ }
+ }
-\if at colorclass@garamond
- \RequirePackage{amssymb}
- \if at colorclass@useosf\else
- \PassOptionsToPackage{lining}{ebgaramond}
- \fi
- \RequirePackage{ebgaramond-maths}
- \RequirePackage{ebgaramond}
- % \RequirePackage{garamondlibre}
- \PJLsetlinespacing{\setstretch{1.00}}
- \let\colorist at sffamily\relax
-\fi
+ \cs_new:Nn \colorclass_cjk_sffamily: {}
+ \cs_new:Nn \colorclass_cjk_ttfamily: {}
-\if at colorclass@noto
- \RequirePackage{amssymb}
- \if at colorclass@useosf
- \PassOptionsToPackage{oldstyle}{notomath}
- \fi
- \RequirePackage{anyfontsize}
- \RequirePackage{notomath}
- \PJLsetlinespacing{\setstretch{1.00}}
-\fi
+ \hook_gput_code:nnn { cmd/sffamily/after } { colorclass } { \colorclass_cjk_sffamily: }
+ \hook_gput_code:nnn { cmd/ttfamily/after } { colorclass } { \colorclass_cjk_ttfamily: }
-\if at colorclass@biolinum
- \RequirePackage{amssymb}
- % \RequirePackage{mathpazo}
- % \RequirePackage[sansmath]{libertinust1math}
- \ifPDFTeX
- \if at colorclass@useosf
- \PassOptionsToPackage{osf}{biolinum}
- \fi
- \RequirePackage{biolinum}
- \renewcommand*\familydefault{\biolinum at family}
- \else
- \PassOptionsToPackage{no-math}{fontspec}
- \RequirePackage{fontspec}
- \setmainfont{LinBiolinum_R.otf}[
- BoldFont = LinBiolinum_RB.otf ,
- ItalicFont = LinBiolinum_RI.otf ,
- BoldItalicFont = LinBiolinum_RBO.otf,
- \if at colorclass@useosf Numbers = OldStyle\fi ]
- \fi
- \PJLsetlinespacing{\setstretch{1.05}}
- \RequirePackage[italic,defaultmathsizes]{mathastext}
-\fi
+ \AddLanguageSetting [schinese]
+ {
+ \cs_set:Nn \colorclass_cjk_sffamily: { \CJKfamily { SCsans } }
+ \cs_set:Nn \colorclass_cjk_ttfamily: { \CJKfamily { SCmono } }
+ \CJKfamily { SCmain }
+ }
+ \AddLanguageSetting [tchinese]
+ {
+ \cs_set:Nn \colorclass_cjk_sffamily: { \CJKfamily { TCsans } }
+ \cs_set:Nn \colorclass_cjk_ttfamily: { \CJKfamily { TCmono } }
+ \CJKfamily { TCmain }
+ }
+ \AddLanguageSetting [japanese]
+ {
+ \cs_set:Nn \colorclass_cjk_sffamily: { \CJKfamily { JPsans } }
+ \cs_set:Nn \colorclass_cjk_ttfamily: { \CJKfamily { JPmono } }
+ \CJKfamily { JPmain }
+ }
+ }
-\def\PJL at font@alreadyset{}
+ \__colorclass_load_file_or_config:Nnn \l__colorclass_load_custom_font_file_math_bool { \l__colorclass_custom_font_file_math_str }
+ {
+ \bool_if:NF \g_projlib_font_already_set_bool
+ {
+ \bool_if:NTF \l__colorclass_fast_bool
+ {
+ \RequirePackage { amssymb }
+ }
+ {
+ \PassOptionsToPackage { warnings-off = { mathtools-colon, mathtools-overbracket } } { unicode-math }
+ \RequirePackage { unicode-math }
+ \unimathsetup { math-style = ISO, partial = upright, nabla = upright }
+ \setmathfont { Asana-Math.otf }
+ \__colorclass_if_font_exist:nnn { Neo~Euler }
+ {
+ \setmathfont { Neo~Euler }
+ [
+ range = { up / { Latin, latin, Greek, greek },
+ bfup / { Latin, latin, Greek, greek },
+ cal, bfcal, frak, bffrak,
+ `(, `), `[, `], `\{, `\}, `:, `=, \ne, \equiv, `/, \backslash,
+ \in, \notin, \ni, \subset, \supset, \subseteq, \supseteq,
+ \rightarrow, \leftarrow, \leftrightarrow,
+ \longleftarrow, \longrightarrow, \longleftrightarrow,
+ \Leftarrow, \Rightarrow, \Leftrightarrow,
+ \Longleftarrow, \Longrightarrow, \Longleftrightarrow,
+ \nrightarrow, \nleftarrow, \nleftrightarrow,
+ \nLeftarrow, \nRightarrow, \nLeftrightarrow,
+ \mapsto, \hookrightarrow, \hookleftarrow,
+ \leftharpoonup, \rightharpoonup, \leftharpoondown, \rightharpoondown,
+ \rightleftharpoons, \leftrightharpoons,
+ \sum, \prod, \coprod,
+ \sqrt, \int, \iint, \iiint, \oint
+ },
+ script-features = {},
+ sscript-features = {},
+ Scale = 1.05,
+ ]
+ }{}
+ \setmathfont { latinmodern-math.otf }
+ [
+ range = { \leq, \geq, \ll, \gg, \lll, \ggg, \leqslant, \geqslant },
+ Scale = 0.95,
+ ]
+ \setmathfont { texgyrepagella-math.otf }
+ [
+ range = { up / num, bfup / num }
+ ]
-\PassOptionsToPackage{verbose=silent}{microtype}
-\RequirePackage{microtype}
-\PassOptionsToPackage{all}{nowidow}
-\RequirePackage{nowidow}
-\RequirePackage{embrac}
+ \hook_gput_code:nnn { begindocument } { colorclass }
+ {
+ \NewCommandCopy \colorclass_backup_mid: \mid
+ \RenewDocumentCommand \mid {}
+ { \skip_horizontal:n {-.15em} \colorclass_backup_mid: \skip_horizontal:n {-.15em} }
+ \NewCommandCopy \colorclass_backup_nmid: \nmid
+ \RenewDocumentCommand \nmid {}
+ { \skip_horizontal:n {-.15em} \colorclass_backup_nmid: \skip_horizontal:n {-.15em} }
+ }
+ \RequirePackage { tikz-cd }
+
+ \box_new:N \l__colorclass_xarrows_above_box
+ \box_new:N \l__colorclass_xarrows_below_box
+ \dim_new:N \l__colorclass_xarrows_length_dim
+ \cs_new_protected:Nn \colorclass_xarrows_generic:nnnn
+ % #3 = option of \tikz
+ % #4 = edge of \draw
+ {
+ \hbox_set:Nn \l__colorclass_xarrows_below_box { \ensuremath { \scriptstyle #1 } }
+ \hbox_set:Nn \l__colorclass_xarrows_above_box { \ensuremath { \scriptstyle #2 } }
+ \dim_set:Nn \l__colorclass_xarrows_length_dim
+ { \dim_eval:n { \dim_max:nn { \box_wd:N \l__colorclass_xarrows_below_box } { \box_wd:N \l__colorclass_xarrows_above_box } + .8em } }
+ \mathrel
+ {
+ \tikz [ #3, baseline = -.55ex, every~node/.style = { inner~sep = 0pt } ]
+ \draw (0,0) #4
+ node [ below = 3pt ] { \box_use:N \l__colorclass_xarrows_below_box }
+ node [ above = 2pt ] { \box_use:N \l__colorclass_xarrows_above_box }
+ ( \l__colorclass_xarrows_length_dim ,0) ;
+ }
+ }
+
+ \RenewDocumentCommand \xrightarrow { O{} m }
+ {
+ \colorclass_xarrows_generic:nnnn { #1 } { #2 } { -> } { -- }
+ }
+ \RenewDocumentCommand \xleftarrow { O{} m }
+ {
+ \colorclass_xarrows_generic:nnnn { #1 } { #2 } { <- } { -- }
+ }
+ \RenewDocumentCommand \xleftrightarrow { O{} m }
+ {
+ \colorclass_xarrows_generic:nnnn { #1 } { #2 } { <-> } { -- }
+ }
+ \RenewDocumentCommand \xhookrightarrow { O{} m }
+ {
+ \colorclass_xarrows_generic:nnnn { #1 } { #2 } {} { edge [ commutative~diagrams/hookrightarrow ] }
+ }
+ \RenewDocumentCommand \xhookleftarrow { O{} m }
+ {
+ \colorclass_xarrows_generic:nnnn { #1 } { #2 } {} { edge [ commutative~diagrams/hookleftarrow ] }
+ }
+ \RenewDocumentCommand \xmapsto { O{} m }
+ {
+ \colorclass_xarrows_generic:nnnn { #1 } { #2 } {} { edge [ commutative~diagrams/mapsto ] }
+ }
+ \NewDocumentCommand \xlongequal { O{} m }
+ {
+ \colorclass_xarrows_generic:nnnn { #1 } { #2 } {} { edge [ commutative~diagrams/equal ] }
+ }
+ \hook_gput_code:nnn { begindocument/end } { colorclass }
+ {
+ \RenewDocumentCommand \twoheadrightarrow {}
+ {
+ \colorclass_xarrows_generic:nnnn { \,\, } {} {} { edge [ commutative~diagrams/twoheadrightarrow ] }
+ }
+ \RenewDocumentCommand \twoheadleftarrow {}
+ {
+ \colorclass_xarrows_generic:nnnn { \,\, } {} {} { edge [ commutative~diagrams/twoheadleftarrow ] }
+ }
+ }
+ }
+ }
+ }
+ }
+
+\PassOptionsToPackage { all } { nowidow }
+\RequirePackage { nowidow }
+\RequirePackage { embrac }
+
%%================================
-%% Graphics
+%% Graphics
%%================================
-\RequirePackage{graphicx}
-\graphicspath{{images/}}
-\RequirePackage{wrapfig}
-\RequirePackage{float}
-\RequirePackage{caption}
-\captionsetup{font=small}
+\RequirePackage { graphicx }
+\graphicspath { { images/ } }
+\RequirePackage { wrapfig }
+\RequirePackage { float }
+\RequirePackage { caption }
+\captionsetup { font = small }
\endinput
%%
Modified: branches/branch2021.final/Master/texmf-dist/tex/latex/colorist/colorart.cls
===================================================================
--- branches/branch2021.final/Master/texmf-dist/tex/latex/colorist/colorart.cls 2022-03-20 21:13:02 UTC (rev 62833)
+++ branches/branch2021.final/Master/texmf-dist/tex/latex/colorist/colorart.cls 2022-03-20 21:14:50 UTC (rev 62834)
@@ -2,7 +2,7 @@
%% This is file `colorist/colorart.cls',
%% generated with the docstrip utility.
-%% Copyright (C) 2021 by Jinwen XU
+%% Copyright (C) 2021-2022 by Jinwen XU
%%
%% This is part of the colorist class series.
%%
@@ -16,212 +16,158 @@
%% 2005/12/01 or later.
%%
\NeedsTeXFormat{LaTeX2e}[2020-10-01]
-\ProvidesClass{colorart}
- [2021/12/16 A colorful article style]
-\def\colorclass at baseclass{article}
-\RequirePackage{kvoptions}
-\RequirePackage{etoolbox}
-\SetupKeyvalOptions{
- family = @colorclass,
- prefix = @colorclass@,
-}
-\DeclareBoolOption[false]{draft}
-\DeclareBoolOption[false]{fast}
-\DeclareBoolOption[false]{useosf}
-\DeclareBoolOption[false]{lmodern}
-\DeclareBoolOption[false]{palatino}
-\DeclareBoolOption[false]{times}
-\DeclareBoolOption[false]{garamond}
-\DeclareBoolOption[false]{noto}
-\DeclareBoolOption[false]{biolinum}
-\DeclareBoolOption[false]{customfont}
-\DeclareStringOption{thmnum}[PJL at thmnum@default]
+\RequirePackage{l3keys2e}
+\ProvidesExplClass
+ {colorart}
+ {2022/03/19} {}
+ {A colorful article style}
-\newif\if at colorclass@bfivepaper\@colorclass at bfivepaperfalse
-\DeclareVoidOption{b5paper}{\@colorclass at bfivepapertrue}
-\newif\if at colorclass@afourpaper\@colorclass at afourpaperfalse
-\DeclareVoidOption{a4paper}{\@colorclass at afourpapertrue}
+\tl_const:Nn \l__colorclass_base_class_tl { article }
-\DeclareDefaultOption{\PassOptionsToClass{\CurrentOption}{\colorclass at baseclass}}
-\ProcessKeyvalOptions*\relax
-\LoadClass{\colorclass at baseclass}
-\if at colorclass@draft
- \@colorclass at fasttrue
-\fi
-\if at colorclass@lmodern
- \@colorclass at customfonttrue
-\fi
-\if at colorclass@palatino
- \@colorclass at customfonttrue
-\fi
-\if at colorclass@times
- \@colorclass at customfonttrue
-\fi
-\if at colorclass@garamond
- \@colorclass at customfonttrue
-\fi
-\if at colorclass@noto
- \@colorclass at customfonttrue
-\fi
-\if at colorclass@biolinum
- \@colorclass at customfonttrue
-\fi
+\bool_new:N \l__colorclass_load_custom_font_file_bool
+\bool_set_false:N \l__colorclass_load_custom_font_file_bool
-%%================================
-%% Page layout
-%%================================
-\RequirePackage{silence}
-\WarningFilter{geometry}{Over-specification in}
-\RequirePackage[heightrounded]{geometry}
-\geometry{
- papersize={8.5in,11in},
- % total={47em,66em},
- total={6.500in,9.130in},
- hmarginratio=1:1,
- vmarginratio=1:1,
- footnotesep=2em plus 2pt minus 2pt,
-}
-\if at colorclass@bfivepaper
-\geometry{
- b5paper,
- % total={40em,59em},
- total={5.535in,8.160in},
- hmarginratio=1:1,
- vmarginratio=1:1,
- footnotesep=2em plus 2pt minus 2pt,
-}
-\fi
-\if at colorclass@afourpaper
-\geometry{
- a4paper,
- % total={47em,70em},
- total={6.500in,9.685in},
- hmarginratio=1:1,
- vmarginratio=1:1,
- footnotesep=2em plus 2pt minus 2pt,
-}
-\fi
-\RequirePackage{indentfirst}
+\keys_define:nn { colorclass }
+ {
+ , draft .bool_set:N = \l__colorclass_fast_bool
+ , draft .initial:n = { false }
+ , fast .bool_set:N = \l__colorclass_fast_bool
-\if at colorclass@fast
- \PassOptionsToPackage{fast}{colorist}
- \RequirePackage{draftwatermark}
- \DraftwatermarkOptions{text={\normalfont DRAFT},color=paper!95!-paper}
-\fi
-\RequirePackage{colorist}
+ , load custom font file .code:n = {
+ \bool_set_true:N \l__colorclass_load_custom_font_file_bool
+ \str_set:Nn \l__colorclass_custom_font_file_str { #1 }
+ }
+ , load custom font file .default:n = { colorist.font }
+ , load~custom~font~file .code:n = {
+ \bool_set_true:N \l__colorclass_load_custom_font_file_bool
+ \str_set:Nn \l__colorclass_custom_font_file_str { #1 }
+ }
+ , load~custom~font~file .default:n = { colorist.font }
+ , load-custom-font-file .code:n = {
+ \bool_set_true:N \l__colorclass_load_custom_font_file_bool
+ \str_set:Nn \l__colorclass_custom_font_file_str { #1 }
+ }
+ , load-custom-font-file .default:n = { colorist.font }
+
+ , a4paper .bool_set:N = \l__colorclass_a_four_paper_bool
+ , a4paper .initial:n = { false }
+ , b5paper .bool_set:N = \l__colorclass_b_five_paper_bool
+ , b5paper .initial:n = { false }
+
+ , 11pt .code:n = { \PassOptionsToClass { \CurrentOption } { \l__colorclass_base_class_tl } }
+ , 12pt .code:n = { \PassOptionsToClass { \CurrentOption } { \l__colorclass_base_class_tl } }
+
+ , unknown .code:n = {
+ \PassOptionsToPackage { \CurrentOption } { colorist }
+ }
+ }
+\ProcessKeysOptions { colorclass }
+
+\LoadClass{\l__colorclass_base_class_tl}
+
%%================================
-%% Fonts
+%% Page layout
%%================================
-\RequirePackage{iftex}
-\ifPDFTeX
-\RequirePackage[T1]{fontenc}
-\RequirePackage{inputenc}
-\fi
-\if at colorclass@customfont\else
-\RequirePackage{mathpazo}
-\RequirePackage{newpxtext}
-\fi
-\RequirePackage{amssymb}
+\RequirePackage { silence }
+\WarningFilter { geometry } { Over-specification }
-\if at colorclass@lmodern
- \RequirePackage{amssymb}
- \if at colorclass@useosf
- \RequirePackage{cfr-lm}
- \else
- \RequirePackage{lmodern}
- \fi
- \PJLsetlinespacing{\setstretch{1.00}}
-\fi
+\PassOptionsToPackage { heightrounded } { geometry }
+\RequirePackage { geometry }
-\if at colorclass@palatino
- \RequirePackage{amssymb}
- \RequirePackage{mathpazo}
- \PassOptionsToPackage{defaultsups}{newpxtext}
- \RequirePackage{newpxtext}
- % \RequirePackage{newpxmath}
- \let\openbox\relax
- \PJLsetlinespacing{\setstretch{1.07}}
- \if at colorclass@useosf\useosf\fi
-\fi
+\geometry
+ {
+ papersize = { 8.5in, 11in },
+ total = { 6.500in, 9.130in },
+ centering,
+ footnotesep = 2em plus 2pt minus 2pt,
+ }
-\if at colorclass@times
- \RequirePackage{amssymb}
- \PassOptionsToPackage{defaultsups}{newtxtext}
- \RequirePackage{newtxtext}
- \RequirePackage{newtxmath}
- \let\openbox\relax
- \PJLsetlinespacing{\setstretch{1.00}}
- \if at colorclass@useosf\useosf\fi
- \let\colorist at textsc\relax
-\fi
+\bool_if:NT \l__colorclass_b_five_paper_bool
+ {
+ \geometry
+ {
+ b5paper,
+ total = { 5.535in, 8.160in },
+ centering,
+ footnotesep = 2em plus 2pt minus 2pt,
+ }
+ }
-\if at colorclass@garamond
- \RequirePackage{amssymb}
- \if at colorclass@useosf\else
- \PassOptionsToPackage{lining}{ebgaramond}
- \fi
- \RequirePackage{ebgaramond-maths}
- \RequirePackage{ebgaramond}
- % \RequirePackage{garamondlibre}
- \PJLsetlinespacing{\setstretch{1.00}}
- \let\colorist at textsc\relax
-\fi
+\bool_if:NT \l__colorclass_a_four_paper_bool
+ {
+ \geometry
+ {
+ a4paper,
+ total = { 6.500in, 9.685in },
+ centering,
+ footnotesep = 2em plus 2pt minus 2pt,
+ }
+ }
-\if at colorclass@noto
- \RequirePackage{amssymb}
- \if at colorclass@useosf
- \PassOptionsToPackage{oldstyle}{notomath}
- \fi
- \RequirePackage{anyfontsize}
- \RequirePackage{notomath}
- \PJLsetlinespacing{\setstretch{1.00}}
-\fi
+\bool_if:NT \l__colorclass_fast_bool
+ {
+ \PassOptionsToPackage { fast } { colorist }
+ \RequirePackage { draftwatermark }
+ \DraftwatermarkOptions { text = { \normalfont DRAFT }, color = paper!97!-paper }
+ }
-\if at colorclass@biolinum
- \RequirePackage{amssymb}
- % \RequirePackage{mathpazo}
- % \RequirePackage[sansmath]{libertinust1math}
- \ifPDFTeX
- \if at colorclass@useosf
- \PassOptionsToPackage{osf}{biolinum}
- \fi
- \RequirePackage{biolinum}
- \renewcommand*\familydefault{\biolinum at family}
- \else
- \PassOptionsToPackage{no-math}{fontspec}
- \RequirePackage{fontspec}
- \setmainfont{LinBiolinum_R.otf}[
- BoldFont = LinBiolinum_RB.otf ,
- ItalicFont = LinBiolinum_RI.otf ,
- BoldItalicFont = LinBiolinum_RBO.otf,
- \if at colorclass@useosf Numbers = OldStyle\fi ]
- \fi
- \PJLsetlinespacing{\setstretch{1.05}}
- \RequirePackage[italic,defaultmathsizes]{mathastext}
-\fi
+\RequirePackage { indentfirst }
-\def\PJL at font@alreadyset{}
+\RequirePackage { colorist }
-\PassOptionsToPackage{verbose=silent}{microtype}
-\RequirePackage{microtype}
-\PassOptionsToPackage{all}{nowidow}
-\RequirePackage{nowidow}
-\RequirePackage{embrac}
+\hfuzz=2pt
+\vfuzz=2pt
%%================================
-%% Graphics
+%% Fonts
%%================================
-\RequirePackage{graphicx}
-\graphicspath{{images/}}
-\RequirePackage{wrapfig}
-\RequirePackage{float}
-\RequirePackage{caption}
-\captionsetup{font=small}
+\WarningFilter { latexfont } { Font~shape }
+\WarningFilter { latexfont } { Some~font }
+\cs_new_protected:Nn \__colorclass_load_file_or_config:Nnn
+ {
+ \bool_if:NT #1
+ {
+ \exp_args:Nx \file_if_exist:nT { #2 }
+ {
+ \exp_args:Nx \file_input:n { #2 }
+ \use_none:nn
+ }
+ }
+ \use:n { #3 }
+ }
+
+
+\__colorclass_load_file_or_config:Nnn \l__colorclass_load_custom_font_file_bool { \l__colorclass_custom_font_file_str }
+ {
+ \RequirePackage { projlib-font }
+
+ \bool_if:NF \g_projlib_font_already_set_bool
+ {
+ \RequirePackage { mathpazo }
+ \RequirePackage { newpxtext }
+ \RequirePackage { amssymb }
+ }
+ }
+
+\PassOptionsToPackage { all } { nowidow }
+\RequirePackage { nowidow }
+\RequirePackage { embrac }
+
+%%================================
+%% Graphics
+%%================================
+\RequirePackage { graphicx }
+\graphicspath { { images/ } }
+\RequirePackage { wrapfig }
+\RequirePackage { float }
+\RequirePackage { caption }
+\captionsetup { font = small }
+
\endinput
%%
%% End of file `colorist/colorart.cls'.
Modified: branches/branch2021.final/Master/texmf-dist/tex/latex/colorist/colorbook.cls
===================================================================
--- branches/branch2021.final/Master/texmf-dist/tex/latex/colorist/colorbook.cls 2022-03-20 21:13:02 UTC (rev 62833)
+++ branches/branch2021.final/Master/texmf-dist/tex/latex/colorist/colorbook.cls 2022-03-20 21:14:50 UTC (rev 62834)
@@ -2,7 +2,7 @@
%% This is file `colorist/colorbook.cls',
%% generated with the docstrip utility.
-%% Copyright (C) 2021 by Jinwen XU
+%% Copyright (C) 2021-2022 by Jinwen XU
%%
%% This is part of the colorist class series.
%%
@@ -16,212 +16,158 @@
%% 2005/12/01 or later.
%%
\NeedsTeXFormat{LaTeX2e}[2020-10-01]
-\ProvidesClass{colorbook}
- [2021/12/16 A colorful book style]
-\def\colorclass at baseclass{book}
-\RequirePackage{kvoptions}
-\RequirePackage{etoolbox}
-\SetupKeyvalOptions{
- family = @colorclass,
- prefix = @colorclass@,
-}
-\DeclareBoolOption[false]{draft}
-\DeclareBoolOption[false]{fast}
-\DeclareBoolOption[false]{useosf}
-\DeclareBoolOption[false]{lmodern}
-\DeclareBoolOption[false]{palatino}
-\DeclareBoolOption[false]{times}
-\DeclareBoolOption[false]{garamond}
-\DeclareBoolOption[false]{noto}
-\DeclareBoolOption[false]{biolinum}
-\DeclareBoolOption[false]{customfont}
-\DeclareStringOption{thmnum}[PJL at thmnum@default]
+\RequirePackage{l3keys2e}
+\ProvidesExplClass
+ {colorbook}
+ {2022/03/19} {}
+ {A colorful book style}
-\newif\if at colorclass@bfivepaper\@colorclass at bfivepaperfalse
-\DeclareVoidOption{b5paper}{\@colorclass at bfivepapertrue}
-\newif\if at colorclass@afourpaper\@colorclass at afourpaperfalse
-\DeclareVoidOption{a4paper}{\@colorclass at afourpapertrue}
+\tl_const:Nn \l__colorclass_base_class_tl { book }
-\DeclareDefaultOption{\PassOptionsToClass{\CurrentOption}{\colorclass at baseclass}}
-\ProcessKeyvalOptions*\relax
-\LoadClass{\colorclass at baseclass}
-\if at colorclass@draft
- \@colorclass at fasttrue
-\fi
-\if at colorclass@lmodern
- \@colorclass at customfonttrue
-\fi
-\if at colorclass@palatino
- \@colorclass at customfonttrue
-\fi
-\if at colorclass@times
- \@colorclass at customfonttrue
-\fi
-\if at colorclass@garamond
- \@colorclass at customfonttrue
-\fi
-\if at colorclass@noto
- \@colorclass at customfonttrue
-\fi
-\if at colorclass@biolinum
- \@colorclass at customfonttrue
-\fi
+\bool_new:N \l__colorclass_load_custom_font_file_bool
+\bool_set_false:N \l__colorclass_load_custom_font_file_bool
-%%================================
-%% Page layout
-%%================================
-\RequirePackage{silence}
-\WarningFilter{geometry}{Over-specification in}
-\RequirePackage[heightrounded]{geometry}
-\geometry{
- papersize={8.5in,11in},
- % total={47em,66em},
- total={6.500in,9.130in},
- hmarginratio=1:1,
- vmarginratio=1:1,
- footnotesep=2em plus 2pt minus 2pt,
-}
-\if at colorclass@bfivepaper
-\geometry{
- b5paper,
- % total={40em,59em},
- total={5.535in,8.160in},
- hmarginratio=1:1,
- vmarginratio=1:1,
- footnotesep=2em plus 2pt minus 2pt,
-}
-\fi
-\if at colorclass@afourpaper
-\geometry{
- a4paper,
- % total={47em,70em},
- total={6.500in,9.685in},
- hmarginratio=1:1,
- vmarginratio=1:1,
- footnotesep=2em plus 2pt minus 2pt,
-}
-\fi
-\RequirePackage{indentfirst}
+\keys_define:nn { colorclass }
+ {
+ , draft .bool_set:N = \l__colorclass_fast_bool
+ , draft .initial:n = { false }
+ , fast .bool_set:N = \l__colorclass_fast_bool
-\if at colorclass@fast
- \PassOptionsToPackage{fast}{colorist}
- \RequirePackage{draftwatermark}
- \DraftwatermarkOptions{text={\normalfont DRAFT},color=paper!95!-paper}
-\fi
-\RequirePackage{colorist}
+ , load custom font file .code:n = {
+ \bool_set_true:N \l__colorclass_load_custom_font_file_bool
+ \str_set:Nn \l__colorclass_custom_font_file_str { #1 }
+ }
+ , load custom font file .default:n = { colorist.font }
+ , load~custom~font~file .code:n = {
+ \bool_set_true:N \l__colorclass_load_custom_font_file_bool
+ \str_set:Nn \l__colorclass_custom_font_file_str { #1 }
+ }
+ , load~custom~font~file .default:n = { colorist.font }
+ , load-custom-font-file .code:n = {
+ \bool_set_true:N \l__colorclass_load_custom_font_file_bool
+ \str_set:Nn \l__colorclass_custom_font_file_str { #1 }
+ }
+ , load-custom-font-file .default:n = { colorist.font }
+
+ , a4paper .bool_set:N = \l__colorclass_a_four_paper_bool
+ , a4paper .initial:n = { false }
+ , b5paper .bool_set:N = \l__colorclass_b_five_paper_bool
+ , b5paper .initial:n = { false }
+
+ , 11pt .code:n = { \PassOptionsToClass { \CurrentOption } { \l__colorclass_base_class_tl } }
+ , 12pt .code:n = { \PassOptionsToClass { \CurrentOption } { \l__colorclass_base_class_tl } }
+
+ , unknown .code:n = {
+ \PassOptionsToPackage { \CurrentOption } { colorist }
+ }
+ }
+\ProcessKeysOptions { colorclass }
+
+\LoadClass{\l__colorclass_base_class_tl}
+
%%================================
-%% Fonts
+%% Page layout
%%================================
-\RequirePackage{iftex}
-\ifPDFTeX
-\RequirePackage[T1]{fontenc}
-\RequirePackage{inputenc}
-\fi
-\if at colorclass@customfont\else
-\RequirePackage{mathpazo}
-\RequirePackage{newpxtext}
-\fi
-\RequirePackage{amssymb}
+\RequirePackage { silence }
+\WarningFilter { geometry } { Over-specification }
-\if at colorclass@lmodern
- \RequirePackage{amssymb}
- \if at colorclass@useosf
- \RequirePackage{cfr-lm}
- \else
- \RequirePackage{lmodern}
- \fi
- \PJLsetlinespacing{\setstretch{1.00}}
-\fi
+\PassOptionsToPackage { heightrounded } { geometry }
+\RequirePackage { geometry }
-\if at colorclass@palatino
- \RequirePackage{amssymb}
- \RequirePackage{mathpazo}
- \PassOptionsToPackage{defaultsups}{newpxtext}
- \RequirePackage{newpxtext}
- % \RequirePackage{newpxmath}
- \let\openbox\relax
- \PJLsetlinespacing{\setstretch{1.07}}
- \if at colorclass@useosf\useosf\fi
-\fi
+\geometry
+ {
+ papersize = { 8.5in, 11in },
+ total = { 6.500in, 9.130in },
+ centering,
+ footnotesep = 2em plus 2pt minus 2pt,
+ }
-\if at colorclass@times
- \RequirePackage{amssymb}
- \PassOptionsToPackage{defaultsups}{newtxtext}
- \RequirePackage{newtxtext}
- \RequirePackage{newtxmath}
- \let\openbox\relax
- \PJLsetlinespacing{\setstretch{1.00}}
- \if at colorclass@useosf\useosf\fi
- \let\colorist at textsc\relax
-\fi
+\bool_if:NT \l__colorclass_b_five_paper_bool
+ {
+ \geometry
+ {
+ b5paper,
+ total = { 5.535in, 8.160in },
+ centering,
+ footnotesep = 2em plus 2pt minus 2pt,
+ }
+ }
-\if at colorclass@garamond
- \RequirePackage{amssymb}
- \if at colorclass@useosf\else
- \PassOptionsToPackage{lining}{ebgaramond}
- \fi
- \RequirePackage{ebgaramond-maths}
- \RequirePackage{ebgaramond}
- % \RequirePackage{garamondlibre}
- \PJLsetlinespacing{\setstretch{1.00}}
- \let\colorist at textsc\relax
-\fi
+\bool_if:NT \l__colorclass_a_four_paper_bool
+ {
+ \geometry
+ {
+ a4paper,
+ total = { 6.500in, 9.685in },
+ centering,
+ footnotesep = 2em plus 2pt minus 2pt,
+ }
+ }
-\if at colorclass@noto
- \RequirePackage{amssymb}
- \if at colorclass@useosf
- \PassOptionsToPackage{oldstyle}{notomath}
- \fi
- \RequirePackage{anyfontsize}
- \RequirePackage{notomath}
- \PJLsetlinespacing{\setstretch{1.00}}
-\fi
+\bool_if:NT \l__colorclass_fast_bool
+ {
+ \PassOptionsToPackage { fast } { colorist }
+ \RequirePackage { draftwatermark }
+ \DraftwatermarkOptions { text = { \normalfont DRAFT }, color = paper!97!-paper }
+ }
-\if at colorclass@biolinum
- \RequirePackage{amssymb}
- % \RequirePackage{mathpazo}
- % \RequirePackage[sansmath]{libertinust1math}
- \ifPDFTeX
- \if at colorclass@useosf
- \PassOptionsToPackage{osf}{biolinum}
- \fi
- \RequirePackage{biolinum}
- \renewcommand*\familydefault{\biolinum at family}
- \else
- \PassOptionsToPackage{no-math}{fontspec}
- \RequirePackage{fontspec}
- \setmainfont{LinBiolinum_R.otf}[
- BoldFont = LinBiolinum_RB.otf ,
- ItalicFont = LinBiolinum_RI.otf ,
- BoldItalicFont = LinBiolinum_RBO.otf,
- \if at colorclass@useosf Numbers = OldStyle\fi ]
- \fi
- \PJLsetlinespacing{\setstretch{1.05}}
- \RequirePackage[italic,defaultmathsizes]{mathastext}
-\fi
+\RequirePackage { indentfirst }
-\def\PJL at font@alreadyset{}
+\RequirePackage { colorist }
-\PassOptionsToPackage{verbose=silent}{microtype}
-\RequirePackage{microtype}
-\PassOptionsToPackage{all}{nowidow}
-\RequirePackage{nowidow}
-\RequirePackage{embrac}
+\hfuzz=2pt
+\vfuzz=2pt
%%================================
-%% Graphics
+%% Fonts
%%================================
-\RequirePackage{graphicx}
-\graphicspath{{images/}}
-\RequirePackage{wrapfig}
-\RequirePackage{float}
-\RequirePackage{caption}
-\captionsetup{font=small}
+\WarningFilter { latexfont } { Font~shape }
+\WarningFilter { latexfont } { Some~font }
+\cs_new_protected:Nn \__colorclass_load_file_or_config:Nnn
+ {
+ \bool_if:NT #1
+ {
+ \exp_args:Nx \file_if_exist:nT { #2 }
+ {
+ \exp_args:Nx \file_input:n { #2 }
+ \use_none:nn
+ }
+ }
+ \use:n { #3 }
+ }
+
+
+\__colorclass_load_file_or_config:Nnn \l__colorclass_load_custom_font_file_bool { \l__colorclass_custom_font_file_str }
+ {
+ \RequirePackage { projlib-font }
+
+ \bool_if:NF \g_projlib_font_already_set_bool
+ {
+ \RequirePackage { mathpazo }
+ \RequirePackage { newpxtext }
+ \RequirePackage { amssymb }
+ }
+ }
+
+\PassOptionsToPackage { all } { nowidow }
+\RequirePackage { nowidow }
+\RequirePackage { embrac }
+
+%%================================
+%% Graphics
+%%================================
+\RequirePackage { graphicx }
+\graphicspath { { images/ } }
+\RequirePackage { wrapfig }
+\RequirePackage { float }
+\RequirePackage { caption }
+\captionsetup { font = small }
+
\endinput
%%
%% End of file `colorist/colorbook.cls'.
Added: branches/branch2021.final/Master/texmf-dist/tex/latex/colorist/colorist-fancy.sty
===================================================================
--- branches/branch2021.final/Master/texmf-dist/tex/latex/colorist/colorist-fancy.sty (rev 0)
+++ branches/branch2021.final/Master/texmf-dist/tex/latex/colorist/colorist-fancy.sty 2022-03-20 21:14:50 UTC (rev 62834)
@@ -0,0 +1,1026 @@
+%%
+%% This is file `colorist/colorist-fancy.sty',
+%% generated with the docstrip utility.
+
+%% Copyright (C) 2021-2022 by Jinwen XU
+%%
+%% This is part of the colorist class series.
+%%
+%% This work may be distributed and/or modified under the conditions of the
+%% LaTeX Project Public License, either version 1.3c of this license or (at
+%% your option) any later version. The latest version of this license is in
+%%
+%% http://www.latex-project.org/lppl.txt
+%%
+%% and version 1.3c or later is part of all distributions of LaTeX version
+%% 2005/12/01 or later.
+%%
+\NeedsTeXFormat{LaTeX2e}[2020-10-01]
+\RequirePackage{l3keys2e}
+\ProvidesExplPackage
+ {colorist-fancy}
+ {2022/03/19} {}
+ {The fancy style of colorist}
+
+\@ifpackageloaded { colorist } {}
+ {
+ \msg_new:nnn { \@currname }
+ { colorist-not-loaded }
+ { "#1"~is~an~internal~style~of~"colorist".~To~use~it,~you~must~load~the~package~"colorist"~first. }
+ \msg_warning:nnx { \@currname } { colorist-not-loaded } { \@currname }
+ \endinput
+ }
+
+%%================================
+%% Title fonts
+%%================================
+\RequirePackage { anyfontsize }
+
+\bool_if:NTF \l__colorist_use_boldface_bool
+ {
+ \cs_new:Nn \colorist_bfseries: { \bfseries \colorlet{colorist-temp-color}{.} \color{colorist-temp-color!90!paper} }
+ }
+ {
+ \cs_new:Nn \colorist_bfseries: {}
+ }
+
+\tl_new:N \g_colorist_title_font_common_tl
+
+\tl_new:N \g_colorist_title_font_part_tl
+\tl_new:N \g_colorist_title_font_chapter_tl
+\tl_new:N \g_colorist_title_font_section_tl
+\tl_new:N \g_colorist_title_font_subsection_tl
+\tl_new:N \g_colorist_title_font_subsubsection_tl
+\tl_new:N \g_colorist_title_font_paragraph_tl
+
+\tl_gset:Nn \g_colorist_title_font_common_tl { \sffamily }
+\tl_gset:Nn \g_colorist_title_font_part_tl { \colorist_bfseries: \g_colorist_title_font_common_tl }
+\tl_gset:Nn \g_colorist_title_font_chapter_tl { \colorist_bfseries: \g_colorist_title_font_common_tl }
+\tl_gset:Nn \g_colorist_title_font_section_tl { \colorist_bfseries: \g_colorist_title_font_common_tl }
+\tl_gset:Nn \g_colorist_title_font_subsection_tl { \colorist_bfseries: \g_colorist_title_font_common_tl }
+\tl_gset:Nn \g_colorist_title_font_subsubsection_tl { \colorist_bfseries: \g_colorist_title_font_common_tl }
+\tl_gset:Nn \g_colorist_title_font_paragraph_tl { \colorist_bfseries: \g_colorist_title_font_common_tl }
+
+%%================================
+%% Color
+%%================================
+\definecolor{maintheme}{RGB}{70,130,180}
+\definecolor{forestgreen}{RGB}{21,122,81}
+\definecolor{lightorange}{RGB}{255,185,88}
+
+%%================================
+%% Footer
+%%================================
+\RequirePackage { geometry }
+\RequirePackage { fancyhdr }
+\RequirePackage { extramarks }
+
+\hook_gput_code:nnn { begindocument/before } { colorist }
+ {
+ \fancyhfoffset { 0pt }
+ }
+
+\tl_new:N \l_colorist_leftmark_tl
+\tl_new:N \l_colorist_rightmark_tl
+
+\tl_set:Nn \l_colorist_leftmark_tl
+ {
+ \begin{minipage}[t]{.833\textwidth}
+ \lastleftmark
+ \end{minipage}
+ }
+\tl_set:Nn \l_colorist_rightmark_tl
+ {
+ \begin{minipage}[t]{.833\textwidth}
+ \filleft
+ \lastrightmark
+ \end{minipage}
+ }
+
+\fancypagestyle { fancy }
+ {
+ \fancyhf{}
+ \if at twoside
+ \fancyfoot[RO]{\sffamily\textcolor{main-text!30!paper}{ \small \l_colorist_rightmark_tl }
+ \rlap{\nobreakspace\nobreakspace\nobreakspace\nobreakspace\textcolor{main-text!75!paper}{\textbf{\thepage}}}}
+ \fancyfoot[LE]{\leavevmode\sffamily\llap{\textcolor{main-text!75!paper}{\textbf{\thepage}}
+ \nobreakspace\nobreakspace\nobreakspace\nobreakspace}
+ \textcolor{main-text!30!paper}{ \l_colorist_leftmark_tl }}
+ \else
+ \fancyfoot[R]{\textcolor{main-text!30!paper}{ \l_colorist_rightmark_tl }
+ \rlap{\nobreakspace\nobreakspace\nobreakspace\nobreakspace\textcolor{main-text!75!paper}{\textbf{\thepage}}}}
+ \fi
+ \renewcommand{\headrulewidth}{0pt}
+ }
+\pagestyle{fancy}
+
+\fancypagestyle { plain }
+ {
+ \fancyhf{}
+ \if at twoside
+ \fancyfoot[RO]{\sffamily
+ \nobreakspace\rlap{\nobreakspace\nobreakspace\nobreakspace\nobreakspace\textcolor{main-text!75!paper}{\textbf{\thepage}}}}
+ \fancyfoot[LE]{\leavevmode\sffamily\llap{\textcolor{main-text!75!paper}{\textbf{\thepage}}
+ \nobreakspace\nobreakspace}}
+ \else
+ \fancyfoot[R]{\sffamily
+ \nobreakspace\nobreakspace\nobreakspace\rlap{\textcolor{main-text!75!paper}{\textbf{\thepage}}}}
+ \fi
+ \renewcommand{\headrulewidth}{0pt}
+ }
+
+\bool_if:NTF \l__colorist_is_book_bool
+ {
+ \if at twoside
+ \renewcommand{\chaptermark}[1]{\markboth{\textsc{#1}}{}}
+ \else
+ \renewcommand{\chaptermark}[1]{\markboth{\textsc{#1}}{\textsc{#1}}}
+ \fi
+ \renewcommand*{\sectionmark}[1]{
+ \markright{\thesection\nobreakspace\nobreakspace#1}}
+ }
+ {
+ \if at twoside
+ \renewcommand*{\sectionmark}[1]{\markboth{\textsc{#1}}{}}
+ \else
+ \renewcommand*{\sectionmark}[1]{\markboth{\textsc{#1}}{\textsc{#1}}}
+ \fi
+ }
+
+%%================================
+%% Title format
+%%================================
+\RequirePackage [ explicit, newparttoc ] { titlesec }
+\PassOptionsToPackage { normalem } { ulem }
+\RequirePackage { ulem }
+
+\PassOptionsToPackage { many } { tcolorbox }
+\RequirePackage { tcolorbox }
+\bool_if:NT \l__colorist_fast_bool { \tcbstartdraftmode }
+
+\newcommand{\partstring}{\MakeUppercase{{\partname\nobreakspace\protect\thepart}}}
+
+\AddLanguageSetting
+ {
+ \renewcommand{\partstring}{\MakeUppercase{{\partname\nobreakspace\protect\thepart}}}
+ }
+\AddLanguageSetting [ schinese ]
+ {
+ \renewcommand{\partstring}{第 \nobreakspace\thepart\nobreakspace 部分}
+ }
+\AddLanguageSetting [ tchinese ]
+ {
+ \renewcommand{\partstring}{第 \nobreakspace\thepart\nobreakspace 部分}
+ }
+\AddLanguageSetting [ japanese ]
+ {
+ \renewcommand{\partstring}{第 \nobreakspace\thepart\nobreakspace 部}
+ }
+
+\bool_if:NTF \l__colorist_is_book_bool
+ {
+ \setcounter{secnumdepth}{3}
+
+ %% Part
+ \titleclass{\part}{top} % make part like a chapter
+ \titleformat{\part}[display]
+ { \g_colorist_title_font_part_tl \filleft}
+ {
+ \thispagestyle{empty}
+ \begin{tikzpicture}[remember~picture,overlay]
+ \fill[maintheme!10!paper] (current~page.north~west) rectangle (current~page.south~east);
+ \node at ($(current~page.north~west)+(15em,-15em)$) {\normalfont\textcolor{maintheme}{\scalebox{12}{\thepart}}};
+ \end{tikzpicture}
+ }
+ {1em}
+ {\fontsize{20}{0}\selectfont\MakeUppercase{#1}}
+ \titleformat{name=\part,numberless}[display]
+ {% \phantomsection\addcontentsline{toc}{part}{#1}%
+ \g_colorist_title_font_part_tl \filleft}
+ {
+ \thispagestyle{empty}
+ \begin{tikzpicture}[remember~picture,overlay]
+ \fill[maintheme!10!paper] (current~page.north~west) rectangle (current~page.south~east);
+ \node at ($(current~page.north~west)+(15em,-15em)$) {\normalfont\textcolor{maintheme}{\scalebox{12}{$*$}}};
+ \end{tikzpicture}
+ }
+ {1em}
+ {\fontsize{20}{0}\selectfont\MakeUppercase{#1}}
+ \titlespacing*{\part}{0pt}{5em}{6em}
+ %% Text after part
+ \newcommand{\parttext}[1]{
+ \vfill
+ \begin{flushright}
+ \begin{minipage}{0.833\textwidth}
+ \color{main-text!80!paper}\raggedleft#1
+ \end{minipage}
+ \end{flushright}
+ \vfill\vfill
+ \cleardoublepage
+ }
+
+ %% Chapter
+ % Numbered chapter title: \TheChapter{<number>}{<title>}
+ \newcommand{\TheChapter}[2]
+ {
+ \tcbsidebyside[enhanced,sidebyside~adapt=right,sidebyside~align=bottom,
+ colback=paper,frame~hidden,
+ segmentation~code={
+ \filldraw[maintheme] (segmentation.north)
+ -- ($(segmentation.east)-(12pt,0)$)
+ -- ($(segmentation.west)+(12pt,0)$)
+ -- (segmentation.south);}
+ ]{\filleft#2}{\normalfont\textcolor{maintheme}{\scalebox{4}{#1}}}
+ }
+ % Numberless chapter title: \TheChapterSingle{<title>}
+ \newcommand{\TheChapterSingle}[1]
+ {
+ \begin{tcolorbox}[
+ enhanced,
+ width = 0.67\textwidth,
+ colback=paper,frame~hidden,
+ halign=center]
+ #1
+ \vspace{-.6em}
+ \begin{center}
+ \begin{tikzpicture}
+ \filldraw[maintheme] (-4em,0) -- (4em,0) -- (0,-.1em) -- (0,.1em);
+ \end{tikzpicture}
+ \end{center}
+ \end{tcolorbox}
+ }
+
+ \titleformat{name=\chapter}
+ { \g_colorist_title_font_chapter_tl \scshape\huge} % Format
+ {} % Label
+ {0mm} % Sep
+ {\TheChapter{\thechapter}{#1}} % Before-code
+ \titlespacing*{name=\chapter}
+ {0em}{*2}{0em} % {left}{before-sep}{after-sep}
+
+ \titleformat{name=\chapter, numberless}
+ {\filcenter \g_colorist_title_font_chapter_tl \scshape\huge}
+ {}
+ {0mm}
+ {\TheChapterSingle{#1}}
+ \titlespacing*{name=\chapter, numberless}
+ {0em}{*2}{0em}
+
+ %% Section
+ \titleformat{\section}
+ {\color{maintheme} \g_colorist_title_font_section_tl \large}
+ {\thesection}{.75em}{#1}
+
+ %% Subsection
+ \titleformat{\subsection}
+ { \g_colorist_title_font_subsection_tl }{\thesubsection}{.75em}
+ {#1}
+ }
+ {
+ %% Part
+ \titleformat{\part}[display]
+ { \g_colorist_title_font_part_tl \filleft}
+ {\partstring}
+ {.3em}
+ {\fontsize{16}{0}\selectfont\MakeUppercase{#1}}
+ \titleformat{name=\part,numberless}[display]
+ {% \phantomsection\addcontentsline{toc}{part}{#1}
+ \g_colorist_title_font_part_tl \filleft}
+ {\phantom{\MakeUppercase{\partname}}}
+ {.3em}
+ {\fontsize{16}{0}\selectfont\MakeUppercase{#1}}
+ %% Text after part
+ \newcommand{\parttext}[1]
+ {
+ \begin{flushright}
+ \begin{minipage}{0.833\textwidth}
+ \color{main-text!80!paper}\raggedleft#1
+ \end{minipage}
+ \end{flushright}
+ }
+
+ %% Section
+ \titleformat{\section}
+ {\color{maintheme} \g_colorist_title_font_section_tl \large}
+ {\thesection}{.75em}{\scshape #1}
+
+ %% Subsection
+ \titleformat{\subsection}
+ { \g_colorist_title_font_subsection_tl }{\thesubsection}{.75em}
+ {#1}
+ }
+
+%% Subsubsection
+\bool_if:NTF \l__colorist_runin_bool
+ {
+ \titleformat{\subsubsection}[runin]
+ {\color{main-text!70!paper} \g_colorist_title_font_subsubsection_tl }
+ {\thesubsubsection}
+ {.5em}
+ {#1.}
+ [\hspace*{.3em}]
+ }
+ {
+ \titleformat{\subsubsection}
+ {\color{main-text!70!paper} \g_colorist_title_font_subsubsection_tl }
+ {\thesubsubsection}
+ {.5em}
+ {#1}
+ }
+
+%% Paragraph
+\titleformat{\paragraph}[runin]
+ { \g_colorist_title_font_paragraph_tl }{\theparagraph}{1em}{#1}
+
+\titlespacing{\section}{0pt}{\baselineskip}{.6\baselineskip}
+\titlespacing{\subsection}{0pt}{.75\baselineskip}{.4\baselineskip}
+\titlespacing{\subsubsection}{0pt}{.5\baselineskip}{.3\baselineskip}
+
+%%================================
+%% ToC format
+%%================================
+\RequirePackage { titletoc }
+\titlecontents{part}
+ [0em]
+ {\addvspace{1.5pc}\large\filcenter\sffamily \colorist_bfseries: }
+ {\textcolor{maintheme}{\bfseries\thecontentslabel}\nopagebreak\\\nopagebreak\uppercase}
+ {}
+ {} % without page number
+ [\addvspace{.5pc}]
+
+\bool_if:NTF \l__colorist_is_book_bool
+ {
+ \titlecontents{chapter}
+ [2em] % i.e., 0em (part) + 2em
+ {\addvspace{1pc}\normalfont\color{maintheme}\sffamily \colorist_bfseries: }
+ {\contentslabel{2em}}
+ {\scshape\hspace*{-2em}}
+ {\titlerule*[10pt]{\parbox{3pt}{\hspace*{-.25pt}\textcolor{main-text!15!paper}{.}}}\color{maintheme}\contentspage}
+ \titlecontents{section}
+ [4em] % i.e., 2em (chapter) + 2em
+ {\addvspace{.3pc}\normalfont\color{maintheme}\sffamily}
+ {\contentslabel{1.75em}}
+ {\hspace*{-1.75em}}
+ {\titlerule*[10pt]{\parbox{3pt}{\textcolor{main-text!15!paper}{.}}}\color{maintheme}\contentspage}
+ \titlecontents{subsection}
+ [7em] % i.e., 4em (section) + 3em
+ {\addvspace{.15pc}\normalfont\sffamily}
+ {\contentslabel{2.75em}}
+ {\hspace*{-2.75em}}
+ {\titlerule*[10pt]{\parbox{3pt}{\textcolor{main-text!15!paper}{.}}}\color{main-text!45!paper}\contentspage}
+ \titlecontents{subsubsection}
+ [10em] % i.e., 7em (subsection) + 3em
+ {\normalfont\sffamily}
+ {\contentslabel{3.25em}}
+ {\hspace*{-3.25em}}
+ {\titlerule*[10pt]{\parbox{3pt}{\textcolor{main-text!15!paper}{.}}}\color{main-text!45!paper}\contentspage}
+ }
+ {
+ \titlecontents{section}
+ [2em] % i.e., 0em (part) + 2em
+ {\addvspace{.3pc}\normalfont\color{maintheme}\sffamily}
+ {\contentslabel{1.75em}}
+ {\hspace*{-1.75em}}
+ {\titlerule*[10pt]{\parbox{3pt}{\textcolor{main-text!15!paper}{.}}}\color{maintheme}\contentspage}
+ \titlecontents{subsection}
+ [4.5em] % i.e., 2em (section) + 2.5em
+ {\addvspace{.15pc}\normalfont\sffamily}
+ {\contentslabel{2.15em}}
+ {\hspace*{-2.15em}}
+ {\titlerule*[10pt]{\parbox{3pt}{\textcolor{main-text!15!paper}{.}}}\color{main-text!45!paper}\contentspage}
+ \titlecontents{subsubsection}
+ [7.75em] % i.e., 5em (subsection) + 3.25em
+ {\normalfont\sffamily}
+ {\contentslabel{2.75em}}
+ {\hspace*{-2.75em}}
+ {\titlerule*[10pt]{\parbox{3pt}{\textcolor{main-text!15!paper}{.}}}\color{main-text!45!paper}\contentspage}
+ }
+
+%%================================
+%% Lists
+%%================================
+\RequirePackage { enumitem }
+\setlist{noitemsep}
+\setlist[enumerate]{labelsep=*, leftmargin=*}
+\setlist[enumerate,1]{label=\arabic*$)$,
+ ref = \arabic*$)$}
+\setlist[enumerate,2]{label=\emph{\roman*}$)$,
+ ref = \arabic{enumi}.\emph{\roman*}$)$}
+\setlist[enumerate,3]{label=\emph{\alph*}$)$,
+ ref = \arabic{enumi}.\emph{\roman{enumii}}.\emph{\alph*}$)$}
+\setlist[description]{font=\normalfont\colorist_bfseries:}
+
+\setlist[itemize]{leftmargin=*}
+\AddLanguageSetting { \setlist[itemize,1]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{$\bullet$}} }
+\AddLanguageSetting [french] { \setlist[itemize,1]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!55!paper}{---}} }
+\setlist[itemize,2]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{--}}
+\setlist[itemize,3]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{\texttt{*}}}
+
+%%================================
+%% Blank page
+%%================================
+\newcommand{\blinkpagetext}{This~page~is~intentionally~left~blank}
+\renewcommand{\cleardoublepage}{
+ \relax
+ \clearpage
+ \if at twoside\ifodd\c at page\relax\else
+ \thispagestyle{empty}
+ \hook_gput_next_code:nn { shipout/background }
+ {
+ \put(0.5\paperwidth,-0.5\paperheight){
+ \makebox[0pt]{\large\color{main-text!10!paper}\blinkpagetext}}
+ }
+ \null\newpage\fi\fi
+}
+
+%%================================
+%% Draft mark
+%%================================
+\RequirePackage { projlib-draft }
+
+%%================================
+%% Icons
+%%================================
+\RequirePackage{tikz}
+\newcommand{\ideabulb}[2][0.15]
+ {
+ \scalebox{#1}{
+ \begin{tikzpicture}
+ \filldraw[draw=#2,fill=#2] (0,0) circle [radius=1cm];
+ \filldraw[draw=paper,fill=paper,rounded~corners=0.8pt]
+ [rotate=20] (-0.26,-0.66) rectangle (-0.06,-0.6)
+ [xshift=-0.4mm,yshift=1mm] (-0.26,-0.66) rectangle (0.02,-0.6)
+ [xshift=0.4mm,yshift=1mm] (-0.26,-0.66) rectangle (-0.06,-0.6);
+ \draw[draw=paper,line~width=0.7mm] (-0.18,-0.46)
+ .. controls (-0.18,-0.28) and (-0.28,-0.12) ..(-0.4,0.1)
+ .. controls (-0.55,0.4) and (-0.3,0.64) ..(0,0.64)
+ .. controls (0.3,0.64) and (0.55,0.4) ..(0.4,0.1)
+ .. controls (0.28,-0.12) and (0.18,-0.28) ..(0.18,-0.46);
+ \end{tikzpicture}}
+ }
+
+\newcommand{\questionmark}[2][0.15]
+ {
+ \scalebox{#1}{
+ \begin{tikzpicture}
+ \filldraw[draw=#2,fill=#2] (0,0) circle [radius=1cm];
+ \filldraw[paper,yshift=0.5mm,scale=0.9] (-0.4,0.1) circle [radius=0.77mm];
+ \draw[draw=paper,line~width=1.5mm,yshift=0.5mm,scale=0.9] (-0.4,0.1)
+ .. controls (-0.55,0.4) and (-0.3,0.64) ..(0,0.64)
+ .. controls (0.3,0.64) and (0.55,0.4) ..(0.4,0.1)
+ .. controls (0.28,-0.12) and (0.05,-0.28) ..(0.05,-0.3)
+ .. controls (0,-0.36) and (0.0,-0.45) ..(0.0,-0.5);
+ \fill[fill=paper,rounded~corners=0.6mm]
+ (-0.09,-0.75) rectangle (0.09,-0.53);
+ \end{tikzpicture}}
+ }
+
+%%================================
+%% Theorems
+%%================================
+\RequirePackage { mathtools }
+\RequirePackage { amsthm }
+
+\bool_if:NTF \l__colorist_theorem_in_new_line_bool
+ {
+ \newtheoremstyle{simple}
+ {}{}
+ {\normalfont}{}
+ {\normalfont}{}
+ {\newline}
+ {{\thmname{#1}\nobreakspace\thmnumber{#2}}
+ {\color{main-text!50!paper}\thmnote{\hspace{.4em}\ensuremath{(\text{#3})}}}\smallskip}
+ }
+ {
+ \newtheoremstyle{simple}
+ {}{}
+ {\normalfont}{}
+ {\normalfont}{}
+ {0pt}
+ {{\thmname{#1}\nobreakspace\thmnumber{#2}}
+ {\color{main-text!50!paper}\thmnote{\hspace{.4em}\ensuremath{(\text{#3})}}}\nobreakspace\nobreakspace{\normalfont\textcolor{main-text!27!paper}{---}}\nobreakspace\nobreakspace}
+ }
+
+\renewcommand{\qedsymbol}{
+ \makebox[1em]{\color{main-text!27!paper}\rule[-0.1em]{.95em}{.95em}}}
+\let\qedsymbolOriginal\qedsymbol
+
+\bool_if:NTF \l__colorist_theorem_in_new_line_bool
+ {
+ \newtheoremstyle{basic}
+ {0pt}{0pt}{\normalfont}{0pt}
+ {}{\;}{\newline}
+ {{\thmname{#1}\nobreakspace\thmnumber{\textup{#2}}}
+ \thmnote{\normalfont\sffamily\color{main-text}\nobreakspace(#3)}\smallskip}
+ }
+ {
+ \newtheoremstyle{basic}
+ {0pt}{0pt}{\normalfont}{0pt}
+ {}{\;}{0.25em}
+ {{\thmname{#1}\nobreakspace\thmnumber{\textup{#2}}}
+ \thmnote{\normalfont\sffamily\color{main-text}\nobreakspace(#3)}}
+ }
+
+\theoremstyle{basic}
+
+\newtheoremstyle{emphasis}
+ {0pt}{0pt}{\itshape}{0pt}{}{}{0pt}
+ {\thmnote{\normalfont\sffamily\color{main-text}#3\hspace*{0.5em}}}
+
+\renewenvironment{proof}[1][\proofname]{\par
+ \pushQED{\qed}
+ \normalfont \topsep6\p@\@plus6\p@\relax
+ \trivlist
+ \item[\hskip\labelsep
+ \itshape \sffamily \colorist_bfseries:
+ #1\hspace{.4em}
+ \textcolor{main-text!27!paper}{$|$}]\ignorespaces
+}{%
+ \popQED\endtrivlist\@endpefalse
+}
+
+\bool_if:NTF \l__colorist_fast_bool
+ {
+ \providecommand{\phantomsection}{}
+ \RequirePackage { url }
+ \newcommand{\href}[2]{#2}
+ }
+ {
+ \PassOptionsToPackage { hidelinks,linktoc=all } { hyperref }
+ \RequirePackage { bookmark }
+ \RequirePackage { hyperref }
+ }
+
+
+\PassOptionsToPackage
+ {
+ theorem style = {
+ , remark = emphasis
+ , observation = emphasis
+ }
+ }
+ { projlib-theorem }
+
+\RequirePackage { projlib-theorem }
+
+\SetTheorem { theorem, lemma, proposition, corollary, property, axiom, definition-theorem, definition-proposition }
+ {
+ name style = {
+ heading style = { \color{orange}\colorist_bfseries:\g_colorist_title_font_common_tl\textsc }
+ }
+ }
+
+\SetTheorem { definition, assumption, convention, hypothesis, notation }
+ {
+ name style = {
+ heading style = { \color{forestgreen}\colorist_bfseries:\g_colorist_title_font_common_tl\textsc }
+ }
+ }
+
+\SetTheorem { fact, example, problem, question, exercise }
+ {
+ name style = {
+ heading style = { \color{main-text}\colorist_bfseries:\g_colorist_title_font_common_tl\textsc }
+ }
+ }
+
+\SetTheorem { conjecture }
+ {
+ name style = {
+ heading style = { \color{purple}\colorist_bfseries:\g_colorist_title_font_common_tl\textsc }
+ }
+ }
+
+\SetTheorem { definition-proposition }
+ {
+ name = {
+ heading = {
+ , english = \color{forestgreen}Definition\color{main-text}-\color{orange}Proposition
+ , french = \color{forestgreen}Définition\color{main-text}-\color{orange}Proposition
+ , ngerman = \color{forestgreen}Definition\color{main-text}-\color{orange}Proposition
+ , italian = \color{forestgreen}Definizione\color{main-text}-\color{orange}Proposizione
+ , portuguese = \color{forestgreen}Definição\color{main-text}-\color{orange}Proposição
+ , brazilian = \color{forestgreen}Definição\color{main-text}-\color{orange}Proposição
+ , spanish = \color{forestgreen}Definición\color{main-text}-\color{orange}Proposición
+ , schinese = \color{forestgreen}定义\color{main-text}-\color{orange}命题
+ , tchinese = \color{forestgreen}定義\color{main-text}-\color{orange}命題
+ , japanese = \color{forestgreen}定義\color{main-text}-\color{orange}命題
+ , russian = \color{forestgreen}Определение\color{main-text}-\color{orange}Предложение
+ }
+ }
+ }
+
+\SetTheorem { definition-theorem }
+ {
+ name = {
+ heading = {
+ , english = \color{forestgreen}Definition\color{main-text}-\color{orange}Theorem
+ , french = \color{forestgreen}Définition\color{main-text}-\color{orange}Théorème
+ , ngerman = \color{forestgreen}Definition\color{main-text}-\color{orange}Satz
+ , italian = \color{forestgreen}Definizione\color{main-text}-\color{orange}Teorema
+ , portuguese = \color{forestgreen}Definição\color{main-text}-\color{orange}Teorema
+ , brazilian = \color{forestgreen}Definição\color{main-text}-\color{orange}Teorema
+ , spanish = \color{forestgreen}Definición\color{main-text}-\color{orange}Teorema
+ , schinese = \color{forestgreen}定义\color{main-text}-\color{orange}定理
+ , tchinese = \color{forestgreen}定義\color{main-text}-\color{orange}定理
+ , japanese = \color{forestgreen}定義\color{main-text}-\color{orange}定理
+ , russian = \color{forestgreen}Определение\color{main-text}-\color{orange}Теорема
+ }
+ }
+ }
+
+\bool_if:NF \l__projlib_theorem_complexname_bool
+ {
+ \SetTheorem { theorem, lemma, proposition, corollary, property, axiom, definition-theorem, definition-proposition }
+ {
+ name style = {
+ , crefname style = { \color{orange}\colorist_bfseries:\g_colorist_title_font_common_tl\textsc }
+ , Crefname style = { \color{orange}\colorist_bfseries:\g_colorist_title_font_common_tl\textsc }
+ , numbering style = { \color{orange}\colorist_bfseries:\g_colorist_title_font_common_tl }
+ }
+ }
+
+ \SetTheorem { definition, assumption, convention, hypothesis, notation }
+ {
+ name style = {
+ , crefname style = { \color{forestgreen}\colorist_bfseries:\g_colorist_title_font_common_tl\textsc }
+ , Crefname style = { \color{forestgreen}\colorist_bfseries:\g_colorist_title_font_common_tl\textsc }
+ , numbering style = { \color{forestgreen}\colorist_bfseries:\g_colorist_title_font_common_tl }
+ }
+ }
+
+ \SetTheorem { fact, example, problem, question, exercise }
+ {
+ name style = {
+ , crefname style = { \color{main-text}\colorist_bfseries:\g_colorist_title_font_common_tl\textsc }
+ , Crefname style = { \color{main-text}\colorist_bfseries:\g_colorist_title_font_common_tl\textsc }
+ , numbering style = { \color{main-text}\colorist_bfseries:\g_colorist_title_font_common_tl }
+ }
+ }
+
+ \SetTheorem { conjecture }
+ {
+ name style = {
+ , crefname style = { \color{purple}\colorist_bfseries:\g_colorist_title_font_common_tl\textsc }
+ , Crefname style = { \color{purple}\colorist_bfseries:\g_colorist_title_font_common_tl\textsc }
+ , numbering style = { \color{purple}\colorist_bfseries:\g_colorist_title_font_common_tl }
+ }
+ }
+
+ \SetTheorem { definition-proposition }
+ {
+ name = {
+ , crefname = {
+ , english = {\color{forestgreen}Definition\color{main-text}-\color{orange}Proposition}{\color{forestgreen}Definition\color{main-text}-\color{orange}Proposition}
+ , french = [la]{\color{forestgreen}Définition\color{main-text}-\color{orange}Proposition}[les]{\color{forestgreen}Définition\color{main-text}-\color{orange}Proposition}
+ , ngerman = {\color{forestgreen}Definition\color{main-text}-\color{orange}Proposition}{\color{forestgreen}Definition\color{main-text}-\color{orange}Proposition}
+ , italian = [la]{\color{forestgreen}Definizione\color{main-text}-\color{orange}Proposizione}[le]{\color{forestgreen}Definizione\color{main-text}-\color{orange}Proposizione}
+ , portuguese = [a]{\color{forestgreen}Definição\color{main-text}-\color{orange}Proposição}[as]{\color{forestgreen}Definição\color{main-text}-\color{orange}Proposição}
+ , brazilian = [a]{\color{forestgreen}Definição\color{main-text}-\color{orange}Proposição}[as]{\color{forestgreen}Definição\color{main-text}-\color{orange}Proposição}
+ , spanish = [la]{\color{forestgreen}Definición\color{main-text}-\color{orange}Proposición}[las]{\color{forestgreen}Definición\color{main-text}-\color{orange}Proposición}
+ , schinese = {\color{forestgreen}定义\color{main-text}-\color{orange}命题}{\color{forestgreen}定义\color{main-text}-\color{orange}命题}
+ , tchinese = {\color{forestgreen}定義\color{main-text}-\color{orange}命題}{\color{forestgreen}定義\color{main-text}-\color{orange}命題}
+ , japanese = {\color{forestgreen}定義\color{main-text}-\color{orange}命題}{\color{forestgreen}定義\color{main-text}-\color{orange}命題}
+ , russian = {\color{forestgreen}Определение\color{main-text}-\color{orange}Предложение}{\color{forestgreen}Определение\color{main-text}-\color{orange}Предложение}
+ }
+ , Crefname = {
+ , english = {\color{forestgreen}Definition\color{main-text}-\color{orange}Proposition}{\color{forestgreen}Definition\color{main-text}-\color{orange}Proposition}
+ , french = [la]{\color{forestgreen}Définition\color{main-text}-\color{orange}Proposition}[les]{\color{forestgreen}Définition\color{main-text}-\color{orange}Proposition}
+ , ngerman = {\color{forestgreen}Definition\color{main-text}-\color{orange}Proposition}{\color{forestgreen}Definition\color{main-text}-\color{orange}Proposition}
+ , italian = [la]{\color{forestgreen}Definizione\color{main-text}-\color{orange}Proposizione}[le]{\color{forestgreen}Definizione\color{main-text}-\color{orange}Proposizione}
+ , portuguese = [a]{\color{forestgreen}Definição\color{main-text}-\color{orange}Proposição}[as]{\color{forestgreen}Definição\color{main-text}-\color{orange}Proposição}
+ , brazilian = [a]{\color{forestgreen}Definição\color{main-text}-\color{orange}Proposição}[as]{\color{forestgreen}Definição\color{main-text}-\color{orange}Proposição}
+ , spanish = [la]{\color{forestgreen}Definición\color{main-text}-\color{orange}Proposición}[las]{\color{forestgreen}Definición\color{main-text}-\color{orange}Proposición}
+ , schinese = {\color{forestgreen}定义\color{main-text}-\color{orange}命题}{\color{forestgreen}定义\color{main-text}-\color{orange}命题}
+ , tchinese = {\color{forestgreen}定義\color{main-text}-\color{orange}命題}{\color{forestgreen}定義\color{main-text}-\color{orange}命題}
+ , japanese = {\color{forestgreen}定義\color{main-text}-\color{orange}命題}{\color{forestgreen}定義\color{main-text}-\color{orange}命題}
+ , russian = {\color{forestgreen}Определение\color{main-text}-\color{orange}Предложение}{\color{forestgreen}Определение\color{main-text}-\color{orange}Предложение}
+ }
+ }
+ }
+
+ \SetTheorem { definition-theorem }
+ {
+ name = {
+ , crefname = {
+ , english = {\color{forestgreen}Definition\color{main-text}-\color{orange}Theorem}{\color{forestgreen}Definition\color{main-text}-\color{orange}Theorem}
+ , french = [la]{\color{forestgreen}Définition\color{main-text}-\color{orange}Théorème}[les]{\color{forestgreen}Définition\color{main-text}-\color{orange}Théorème}
+ , ngerman = {\color{forestgreen}Definition\color{main-text}-\color{orange}Satz}{\color{forestgreen}Definition\color{main-text}-\color{orange}Satz}
+ , italian = [la]{\color{forestgreen}Definizione\color{main-text}-\color{orange}Teorema}[le]{\color{forestgreen}Definizione\color{main-text}-\color{orange}Teorema}
+ , portuguese = [a]{\color{forestgreen}Definição\color{main-text}-\color{orange}Teorema}[as]{\color{forestgreen}Definição\color{main-text}-\color{orange}Teorema}
+ , brazilian = [a]{\color{forestgreen}Definição\color{main-text}-\color{orange}Teorema}[as]{\color{forestgreen}Definição\color{main-text}-\color{orange}Teorema}
+ , spanish = [la]{\color{forestgreen}Definición\color{main-text}-\color{orange}Teorema}[las]{\color{forestgreen}Definición\color{main-text}-\color{orange}Teorema}
+ , schinese = {\color{forestgreen}定义\color{main-text}-\color{orange}定理}{\color{forestgreen}定义\color{main-text}-\color{orange}定理}
+ , tchinese = {\color{forestgreen}定義\color{main-text}-\color{orange}定理}{\color{forestgreen}定義\color{main-text}-\color{orange}定理}
+ , japanese = {\color{forestgreen}定義\color{main-text}-\color{orange}定理}{\color{forestgreen}定義\color{main-text}-\color{orange}定理}
+ , russian = {\color{forestgreen}Определение\color{main-text}-\color{orange}Теорема}{\color{forestgreen}Определение\color{main-text}-\color{orange}Теорема}
+ }
+ , Crefname = {
+ , english = {\color{forestgreen}Definition\color{main-text}-\color{orange}Theorem}{\color{forestgreen}Definition\color{main-text}-\color{orange}Theorem}
+ , french = [La]{\color{forestgreen}Définition\color{main-text}-\color{orange}Théorème}[Les]{\color{forestgreen}Définition\color{main-text}-\color{orange}Théorème}
+ , ngerman = {\color{forestgreen}Definition\color{main-text}-\color{orange}Satz}{\color{forestgreen}Definition\color{main-text}-\color{orange}Satz}
+ , italian = [La]{\color{forestgreen}Definizione\color{main-text}-\color{orange}Teorema}[Le]{\color{forestgreen}Definizione\color{main-text}-\color{orange}Teorema}
+ , portuguese = [A]{\color{forestgreen}Definição\color{main-text}-\color{orange}Teorema}[As]{\color{forestgreen}Definição\color{main-text}-\color{orange}Teorema}
+ , brazilian = [A]{\color{forestgreen}Definição\color{main-text}-\color{orange}Teorema}[As]{\color{forestgreen}Definição\color{main-text}-\color{orange}Teorema}
+ , spanish = [La]{\color{forestgreen}Definición\color{main-text}-\color{orange}Teorema}[Las]{\color{forestgreen}Definición\color{main-text}-\color{orange}Teorema}
+ , schinese = {\color{forestgreen}定义\color{main-text}-\color{orange}定理}{\color{forestgreen}定义\color{main-text}-\color{orange}定理}
+ , tchinese = {\color{forestgreen}定義\color{main-text}-\color{orange}定理}{\color{forestgreen}定義\color{main-text}-\color{orange}定理}
+ , japanese = {\color{forestgreen}定義\color{main-text}-\color{orange}定理}{\color{forestgreen}定義\color{main-text}-\color{orange}定理}
+ , russian = {\color{forestgreen}Определение\color{main-text}-\color{orange}Теорема}{\color{forestgreen}Определение\color{main-text}-\color{orange}Теорема}
+ }
+ }
+ }
+ }
+
+\RequirePackage { marginnote }
+\RequirePackage { ifoddpage }
+\newcommand{\mparadjust}[1]{\renewcommand*{\marginnotevadjust}{#1}}
+\hook_gput_code:nnn { begindocument/before } { colorist }
+{
+ %
+}
+\hook_gput_code:nnn { env/remark/begin } { colorist }
+ {
+ \if at twoside\checkoddpage
+ \ifoddpage\reversemarginpar\fi
+ \else
+ \reversemarginpar
+ \fi
+ \mparadjust{-.25em}
+ \marginnote{\ideabulb[0.3]{orange}
+ \bool_if:NTF \l__colorist_is_book_bool
+ {
+ \hspace*{-.2em}
+ }
+ {
+ \hspace*{-.5em}
+ }
+ }
+ \normalmarginpar
+ }
+\hook_gput_code:nnn { env/conjecture/begin } { colorist }
+ {
+ \if at twoside\checkoddpage
+ \ifoddpage\reversemarginpar\fi
+ \else
+ \reversemarginpar
+ \fi
+ \mparadjust{-.25em}
+ \marginnote{\questionmark[0.3]{purple}
+ \bool_if:NTF \l__colorist_is_book_bool
+ {
+ \hspace*{-.2em}
+ }
+ {
+ \hspace*{-.5em}
+ }
+ }
+ \normalmarginpar
+ }
+
+\ExplSyntaxOff
+\RequirePackage{iftex}
+\ifXeTeX
+\def\pgfsys at hboxsynced#1{%
+{%
+ \pgfsys at beginscope%
+ \setbox\pgf at hbox=\hbox{%
+ \hskip\pgf at pt@x%
+ \raise\pgf at pt@y\hbox{%
+ \pgf at pt@x=0pt%
+ \pgf at pt@y=0pt%
+ \special{pdf: content q}%
+ \pgflowlevelsynccm%
+ \pgfsys at invoke{q -1 0 0 -1 0 0 cm}%
+ \special{pdf: content -1 0 0 -1 0 0 cm q}
+ % translate to original coordinate system
+ \pgfsys at invoke{0 J [] 0 d}% reset line cap and dash
+ \wd#1=0pt%
+ \ht#1=0pt%
+ \dp#1=0pt%
+ \box#1%
+ \pgfsys at invoke{n Q Q Q}%
+ }%
+ \hss%
+ }%
+ \wd\pgf at hbox=0pt%
+ \ht\pgf at hbox=0pt%
+ \dp\pgf at hbox=0pt%
+ \pgfsys at hbox\pgf at hbox%
+ \pgfsys at endscope%
+}}
+\fi
+\ExplSyntaxOn
+
+\cs_new_protected:Nn \colorist_add_colorbox:nn
+ % #1 = list of environments
+ % #2 = settings of tcolorbox
+ {
+ \clist_map_inline:nn { #1 }
+ {
+ \__colorist_add_colorbox_do:nn { ##1 } { #2 }
+ \__colorist_add_colorbox_do:nn { ##1* } { #2 }
+ }
+ }
+\cs_new_protected:Nn \__colorist_add_colorbox_do:nn
+ % #1 = name of environment
+ % #2 = settings of tcolorbox
+ {
+ \tcolorboxenvironment { #1 } { #2 }
+ }
+
+\colorist_add_colorbox:nn { theorem, lemma, proposition, corollary, property, axiom, definition-proposition, definition-theorem }
+ {
+ enhanced~jigsaw, pad~at~break*=1mm, breakable, lines~before~break=3,
+ left=3.5mm, right=3.5mm,
+ before=\par\medskip\noindent,
+ colback=main-text!3!paper,
+ opacityframe=0.9, colframe=orange, arc=.7mm
+ }
+
+\colorist_add_colorbox:nn { definition, assumption, convention, hypothesis, notation }
+ {
+ enhanced~jigsaw, pad~at~break*=1mm, breakable, lines~before~break=3,
+ left=4mm, right=4mm, top=1mm, bottom=1mm,
+ before=\par\medskip\noindent,
+ colback=lightorange!10!paper, boxrule=0pt, frame~hidden,
+ borderline~west={1.5mm}{0mm}{forestgreen}, arc=.7mm
+ }
+
+\colorist_add_colorbox:nn { fact, example }
+ {
+ enhanced~jigsaw, pad~at~break*=1mm, breakable, lines~before~break=3,
+ colback=main-text!5!paper,
+ before=\par\medskip\noindent,
+ boxrule=0pt, frame~hidden, arc=.7mm
+ }
+
+\colorist_add_colorbox:nn { conjecture }
+ {
+ enhanced~jigsaw, pad~at~break*=1mm, breakable, lines~before~break=3,
+ left=3.5mm, right=3.5mm,
+ before=\par\medskip\noindent,
+ colback=main-text!3!paper,
+ opacityframe=0.7, colframe=purple, arc=.7mm
+ }
+
+\colorist_add_colorbox:nn { problem }
+ {
+ enhanced~jigsaw, pad~at~break*=1mm, breakable, lines~before~break=3,
+ colback=yellow!25!paper,
+ before=\par\medskip\noindent,
+ boxrule=0pt, frame~hidden, arc=.7mm
+ }
+
+\colorist_add_colorbox:nn { question, exercise, remark, observation }
+ {
+ enhanced~jigsaw, pad~at~break*=1mm, breakable, lines~before~break=3,
+ oversize,
+ top=0mm, bottom=0mm,
+ before=\par\medskip\noindent,
+ opacityframe=0, opacityback=0
+ }
+
+\NewDocumentCommand \AfterEnvEnd { +m }
+ { \colorist_after_env_end:nw { #1 } }
+\cs_new_protected:Npn \colorist_after_env_end:nw #1 #2
+ \if at ignore\@ignorefalse\ignorespaces\fi
+ { #2 \if at ignore\@ignorefalse\ignorespaces\fi #1 }
+\NewDocumentCommand \ScanEnv { s m +m +m }
+ {
+ \IfBooleanTF { #1 }
+ { \colorist_scan_env_ignore_par:nTF }
+ { \colorist_scan_env:nTF }
+ { #2 } { #3 } { #4 }
+ }
+\cs_new_protected:Npn \colorist_scan_env:nTF
+ { \__colorist_scan_env:NnTF \c_false_bool }
+\cs_new_protected:Npn \colorist_scan_env_ignore_par:nTF
+ { \__colorist_scan_env:NnTF \c_true_bool }
+\tl_new:N \l__colorist_collected_tl
+\cs_new_protected:Npn \__colorist_scan_env:NnTF #1 #2 #3 #4
+ {
+ \tl_clear:N \l__colorist_collected_tl
+ \peek_analysis_map_inline:n
+ {
+ \tl_put_right:Nn \l__colorist_collected_tl { ##1 }
+ \int_compare:nNnTF { "##3 } = { 0 }
+ {
+ \exp_args:No \token_if_eq_meaning:NNTF { ##1 } \begin
+ { \peek_analysis_map_break:n { \__colorist_chk_env:nTFn { #2 } { #3 } { #4 } } }
+ {
+ \bool_lazy_and:nnF { #1 }
+ { \exp_args:No \token_if_eq_meaning_p:NN { ##1 } \par }
+ { \__colorist_scan_env_end:n { #4 } }
+ }
+ }
+ { \int_compare:nNnF { "##3 } = { 10 } { \__colorist_scan_env_end:n { #4 } } }
+ }
+ }
+\cs_new_protected:Npn \__colorist_scan_env_end:n #1
+ { \peek_analysis_map_break:n { \__colorist_reinsert_tokens:nn { #1 } { } } }
+\cs_new_protected:Npn \__colorist_reinsert_tokens:nn #1 #2
+ {
+ \use:x
+ {
+ \tl_clear:N \exp_not:N \l__colorist_collected_tl
+ \exp_not:n { #1 } \l__colorist_collected_tl #2
+ }
+ }
+\cs_new_protected:Npn \__colorist_chk_env:nTFn #1 #2 #3 #4
+ {
+ \exp_args:Nx \__colorist_reinsert_tokens:nn
+ { \str_if_eq:nnTF { #1 } { #4 } { \exp_not:n { #2 } } { \exp_not:n { #3 } } } { { #4 } }
+ }
+
+\cs_new_protected:Nn \colorist_add_scan_env:n
+ {
+ \clist_map_inline:nn { #1 }
+ {
+ \__colorist_add_scan_env_do:n { ##1 }
+ }
+ }
+\cs_new_protected:Nn \__colorist_add_scan_env_do:n
+ {
+ \tl_const:cn { l__colorist_scan_env_ #1 }
+ {
+ \AfterEnvEnd
+ {
+ \ScanEnv* { #1 }
+ { \skip_vertical:n { -0.9\baselineskip } }
+ {
+ \ScanEnv* { #1* }
+ { \skip_vertical:n { -0.9\baselineskip } }
+ {}
+ }
+ }
+ }
+ \hook_gput_code:nnn { env/#1/end } { colorist } { \tl_use:c { l__colorist_scan_env_ #1 } }
+ \hook_gput_code:nnn { env/#1*/end } { colorist } { \tl_use:c { l__colorist_scan_env_ #1 } }
+ }
+
+\colorist_add_scan_env:n { definition, assumption, convention, hypothesis, notation }
+
+\theoremstyle{simple}
+
+\bool_if:NF \l__colorist_is_book_bool {
+
+%%================================
+%% Title block style
+%%================================
+\renewcommand{\@maketitle}{
+\begin{center}
+ \color{maintheme}
+ {\Large\sffamily\scshape \colorist_bfseries: \@title}\\\bigskip
+ \color{main-text!80!paper}
+ {\scshape\@author}\par\smallskip
+ {\@date}
+\end{center}
+\ifx\@date\@empty\bigskip\fi
+\medskip
+}
+
+\hook_gput_code:nnn { cmd/maketitle/after } { colorist } { \thispagestyle{fancy} }
+
+%%================================
+%% Abstract style
+%%================================
+\renewenvironment{abstract}
+{\small{\centerline{\textsc{ \colorist_bfseries: \sffamily\abstractname}}\vspace{-0.3\baselineskip}}
+ \color{main-text!80!paper}\begin{quotation}}
+{\end{quotation}\medskip}
+
+%%================================
+%% Keyword environment
+%%================================
+\DefineMultilingualText { \keywordname }
+ {
+ EN = Keywords ,
+ FR = Mots~clés ,
+ DE = Schlüsselwörter ,
+ IT = Parole~chiave ,
+ PT = Palavras~chave ,
+ BR = Palavras~chave ,
+ ES = Palabras~clave ,
+ CN = 关键词 ,
+ TC = 關鍵詞 ,
+ JP = キーワード ,
+ RU = Ключевые~слова ,
+ }
+
+\newenvironment{keyword}
+{\small\centerline{{ \colorist_bfseries: \keywordname}}\vspace{-0.3\baselineskip}
+ \color{main-text!80!paper}\begin{center}}
+{\end{center}\medskip}
+
+%%================================
+%% Simulate features of amsart
+%%================================
+\PassOptionsToPackage { amsfashion } { projlib-author }
+\RequirePackage { projlib-author }
+
+}
+
+\endinput
+%%
+%% End of file `colorist/colorist-fancy.sty'.
Property changes on: branches/branch2021.final/Master/texmf-dist/tex/latex/colorist/colorist-fancy.sty
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: branches/branch2021.final/Master/texmf-dist/tex/latex/colorist/colorist.sty
===================================================================
--- branches/branch2021.final/Master/texmf-dist/tex/latex/colorist/colorist.sty 2022-03-20 21:13:02 UTC (rev 62833)
+++ branches/branch2021.final/Master/texmf-dist/tex/latex/colorist/colorist.sty 2022-03-20 21:14:50 UTC (rev 62834)
@@ -2,7 +2,7 @@
%% This is file `colorist/colorist.sty',
%% generated with the docstrip utility.
-%% Copyright (C) 2021 by Jinwen XU
+%% Copyright (C) 2021-2022 by Jinwen XU
%%
%% This is part of the colorist class series.
%%
@@ -16,1485 +16,77 @@
%% 2005/12/01 or later.
%%
\NeedsTeXFormat{LaTeX2e}[2020-10-01]
-\ProvidesPackage{colorist}
- [2021/12/16 A colorful style for articles and books]
-\RequirePackage{kvoptions}
-\RequirePackage{etoolbox}
-\SetupKeyvalOptions{%
- family = @colorist,
- prefix = @colorist@
-}
-\DeclareBoolOption[false]{draft}
-\DeclareBoolOption[false]{fast}
-\DeclareBoolOption[false]{puretext}
-\DeclareBoolOption[false]{nothms}
-\DeclareBoolOption[false]{delaythms}
-\DeclareBoolOption[false]{nothmnum}
-\DeclareStringOption{thmnum}[colorist at thmnum@default]
-\DeclareBoolOption[true]{regionalref}
-\DeclareBoolOption[false]{originalref}
-\DeclareBoolOption[false]{allowbf}
-\DeclareBoolOption[false]{runin}
-\ProcessKeyvalOptions*\relax
+\RequirePackage{l3keys2e}
+\ProvidesExplPackage
+ {colorist}
+ {2022/03/19} {}
+ {A colorful style for articles and books}
-\if at colorist@originalref
- \@colorist at regionalreffalse
-\fi
-\if at colorist@draft
- \@colorist at fasttrue
-\fi
-\if at colorist@puretext
- \@colorist at nothmstrue
-\fi
+\keys_define:nn { colorist }
+ {
+ , draft .bool_set:N = \l__colorist_fast_bool
+ , draft .initial:n = { false }
+ , fast .bool_set:N = \l__colorist_fast_bool
-\if at colorist@fast
- \PassOptionsToPackage{fast}{PJLdraft}
- \PassOptionsToPackage{fast}{PJLthm}
-\fi
-\expandafter\ifstrempty\expandafter{\@colorist at thmnum}{}{
- \expandafter\ifstrequal\expandafter{\@colorist at thmnum}{colorist at thmnum@default}{
- \PassOptionsToPackage{thmnum}{PJLthm}
- }{
- \PassOptionsToPackage{thmnum=\@colorist at thmnum}{PJLthm}
- }
-}
-\if at colorist@regionalref\else
- \PassOptionsToPackage{originalref}{PJLthm}
-\fi
+ , style .str_set:N = \l__colorist_style_str
+ , style .initial:n = { fancy }
+ , fancy .meta:n = { style = fancy }
-\if at colorist@allowbf
- \newcommand{\conditionalbfseries}{\bfseries\colorlet{PJLtempcolor}{.}\color{PJLtempcolor!90!paper}}
-\else
- \newcommand{\conditionalbfseries}{}
-\fi
+ , use-boldface .bool_set:N = \l__colorist_use_boldface_bool
+ , use-boldface .initial:n = { false }
+ , use~boldface .bool_set:N = \l__colorist_use_boldface_bool
+ , use boldface .bool_set:N = \l__colorist_use_boldface_bool
+ , usebf .bool_set:N = \l__colorist_use_boldface_bool
+ , allow-boldface .bool_set:N = \l__colorist_use_boldface_bool
+ , allow~boldface .bool_set:N = \l__colorist_use_boldface_bool
+ , allow boldface .bool_set:N = \l__colorist_use_boldface_bool
+ , allowbf .bool_set:N = \l__colorist_use_boldface_bool
+ , runin .bool_set:N = \l__colorist_runin_bool
+ , runin .initial:n = { false }
-\newif\ifIsBook
-\ifdefined\c at chapter\IsBooktrue\else\IsBookfalse\fi
+ , theorem-in-new-line .bool_set:N = \l__colorist_theorem_in_new_line_bool
+ , theorem-in-new-line .initial:n = { false }
+ , theorem~in~new~line .bool_set:N = \l__colorist_theorem_in_new_line_bool
+ , theorem in new line .bool_set:N = \l__colorist_theorem_in_new_line_bool
-\let\colorist at sffamily\sffamily
-\let\colorist at scshape\scshape
-\let\colorist at textsc\textsc
+ , unknown .code:n = {
+ \PassOptionsToPackage { \CurrentOption } { projlib-language }
+ \PassOptionsToPackage { \CurrentOption } { projlib-author }
+ \PassOptionsToPackage { \CurrentOption } { projlib-datetime }
+ \PassOptionsToPackage { \CurrentOption } { projlib-draft }
+ \PassOptionsToPackage { \CurrentOption } { projlib-font }
+ \PassOptionsToPackage { \CurrentOption } { projlib-logo }
+ \PassOptionsToPackage { \CurrentOption } { projlib-math }
+ \PassOptionsToPackage { \CurrentOption } { projlib-paper }
+ \PassOptionsToPackage { \CurrentOption } { projlib-theorem }
+ }
+ }
+\ProcessKeysOptions { colorist }
-%%================================
-%% Title fonts
-%%================================
-\RequirePackage{anyfontsize}
-
-\newcommand{\partfont}{\conditionalbfseries\colorist at sffamily}
-\newcommand{\chapfont}{\conditionalbfseries\colorist at sffamily\colorist at scshape}
-\newcommand{\secfont}{\conditionalbfseries\colorist at sffamily}
-\newcommand{\subsecfont}{\conditionalbfseries\colorist at sffamily}
-\newcommand{\subsubsecfont}{\conditionalbfseries\colorist at sffamily}
-
-%%================================
-%% Paper configuration
-%%================================
-\RequirePackage{PJLpaper}
-
-%%================================
-%% Color
-%%================================
-\definecolor{maintheme}{RGB}{70,130,180}
-\definecolor{forestgreen}{RGB}{21,122,81}
-\definecolor{lightorange}{RGB}{255,185,88}
-
-%%================================
-%% Footer
-%%================================
-\RequirePackage{geometry}
-\RequirePackage{fancyhdr}
-\RequirePackage{extramarks}
-
-\AtEndPreamble{\fancyhfoffset{0pt}}
-
-\fancypagestyle{fancy}{
- \fancyhf{}
- \if at twoside
- \fancyfoot[RO]{\sffamily\textcolor{maintext!30!paper}{\small\lastrightmark}%
- \rlap{~~~~\textcolor{maintext!75!paper}{\textbf{\thepage}}}}
- \fancyfoot[LE]{\leavevmode\sffamily\llap{\textcolor{maintext!75!paper}{\textbf{\thepage}}%
- ~~~~}%
- \textcolor{maintext!30!paper}{\small\lastleftmark}}
- \else
- \fancyfoot[R]{\sffamily\textcolor{maintext!30!paper}{\small\lastrightmark}%
- \rlap{~~~~\textcolor{maintext!75!paper}{\textbf{\thepage}}}}
- \fi
- \renewcommand{\headrulewidth}{0pt}
-}
-\pagestyle{fancy}
-
-\fancypagestyle{plain}{
- \fancyhf{}
- \if at twoside
- \fancyfoot[RO]{%
- \sffamily~\rlap{~~~~\textcolor{maintext!75!paper}{\textbf{\thepage}}}}
- \fancyfoot[LE]{\leavevmode\sffamily\llap{\textcolor{maintext!75!paper}{\textbf{\thepage}}%
- ~~~}}
- \else
- \fancyfoot[R]{%
- ~\rlap{~~~~\textcolor{maintext!75!paper}{\textbf{\thepage}}}}
- \fi
- \renewcommand{\headrulewidth}{0pt}
-}
-
-\ifbool{IsBook}{
- \if at twoside
- \renewcommand{\chaptermark}[1]{\markboth{\textsc{#1}}{}}
- \else
- \renewcommand{\chaptermark}[1]{\markboth{\textsc{#1}}{\textsc{#1}}}
- \fi
- \renewcommand*{\sectionmark}[1]{%
- \markright{\thesection~~#1}}
-}{
- \if at twoside
- \renewcommand*{\sectionmark}[1]{\markboth{\textsc{#1}}{}}
- \else
- \renewcommand*{\sectionmark}[1]{\markboth{\textsc{#1}}{\textsc{#1}}}
- \fi
-}
-%%================================
-%% Languages and line spacing
-%%================================
-\RequirePackage{PJLlang}
-\PJLsetlinespacing{\setstretch{1.07}}
-\PJLsetCJKlinespacing{\onehalfspacing}
-\raggedbottom
-
-%%================================
-%% Title format
-%%================================
-\RequirePackage[explicit,newparttoc]{titlesec}
-\PassOptionsToPackage{normalem}{ulem}
-\RequirePackage{ulem}
-
-\newcommand{\partstring}{\MakeUppercase{{\partname~\protect\thepart}}}
-\gappto{\PJLlang at langconfig@common}{%
-\renewcommand{\partstring}{\MakeUppercase{{\partname~\protect\thepart}}}%
-}
-\gappto{\PJLlang at langconfig@CN}{%
-\renewcommand{\partstring}{第~\thepart~部分}%
-}
-\gappto{\PJLlang at langconfig@TC}{%
-\renewcommand{\partstring}{第~\thepart~部分}%
-}
-\gappto{\PJLlang at langconfig@JP}{%
-\renewcommand{\partstring}{第~\thepart~部}%
-}
-
-\ifbool{IsBook}{
- %% Part
- \titleclass{\part}{top} % make part like a chapter
- \titleformat{\part}[display]
- {\partfont\filleft}
- {%
- \thispagestyle{empty}%
- \begin{tikzpicture}[remember picture,overlay]
- \fill[maintheme!10!paper] (current page.north west) rectangle (current page.south east);
- \node at ($(current page.north west)+(15em,-15em)$) {\normalfont\textcolor{maintheme}{\scalebox{12}{\thepart}}};
- \end{tikzpicture}%
- }
- {1em}
- {\fontsize{20}{0}\selectfont\MakeUppercase{#1}}
- \titleformat{name=\part,numberless}[display]
- {% \phantomsection\addcontentsline{toc}{part}{#1}%
- \partfont\filleft}
- {%
- \thispagestyle{empty}%
- \begin{tikzpicture}[remember picture,overlay]
- \fill[maintheme!10!paper] (current page.north west) rectangle (current page.south east);
- \node at ($(current page.north west)+(15em,-15em)$) {\normalfont\textcolor{maintheme}{\scalebox{12}{$*$}}};
- \end{tikzpicture}%
- }
- {1em}
- {\fontsize{20}{0}\selectfont\MakeUppercase{#1}}
- \titlespacing*{\part}{0pt}{5em}{6em}
- %% Text after part
- \newcommand{\parttext}[1]{%
- \vfill%
- \begin{flushright}%
- \begin{minipage}{0.833\textwidth}%
- \color{maintext!80!paper}\raggedleft#1%
- \end{minipage}%
- \end{flushright}%
- \vfill\vfill%
- \cleardoublepage%
- }
-
- %% Chapter
- \newcommand{\TheChapter}[2]{%
- \tcbsidebyside[enhanced,sidebyside adapt=right,sidebyside align=bottom,
- colback=paper,frame hidden,
- segmentation code={
- \filldraw[maintheme] (segmentation.north)
- -- ($(segmentation.east)-(12pt,0)$)
- -- ($(segmentation.west)+(12pt,0)$)
- -- (segmentation.south);}
- ]{\filleft#2}{\normalfont\textcolor{maintheme}{\scalebox{4}{#1}}}
- }
-
- \newcommand{\TheChapterSingle}[1]{%
- \begin{tcolorbox}[
- enhanced,
- width = 0.67\textwidth,
- colback=paper,frame hidden,
- halign=center]
- #1
- \vspace{-.6em}
- \begin{center}
- \begin{tikzpicture}
- \filldraw[maintheme] (-4em,0) -- (4em,0) -- (0,-.1em) -- (0,.1em);
- \end{tikzpicture}
- \end{center}
- \end{tcolorbox}
- }
-
- \titleformat{name=\chapter}
- {\chapfont\huge} % Format
- {} % Label
- {0mm} % Sep
- {\TheChapter{\thechapter}{#1}} % Before-code
- \titlespacing*{name=\chapter}
- {0em}{*2}{0em} % {left}{before-sep}{after-sep}
-
- \titleformat{name=\chapter, numberless}
- {\filcenter\chapfont\huge}
- {}
- {0mm}
- {\TheChapterSingle{#1}}
- \titlespacing*{name=\chapter, numberless}
- {0em}{*2}{0em}
-
- %% Section
- \titleformat{\section}
- {\color{maintheme}\secfont\large}
- {\thesection}{.75em}{#1}
- % [{\titlerule[.75pt]}]
-
- %% Subsection
- \titleformat{\subsection}
- {\subsecfont}{\thesubsection}{.75em}
- {#1}
-}{
- %% Part
- \titleformat{\part}[display]
- {%
- \partfont\filleft}
- {\partstring}
- {.3em}
- {\fontsize{16}{0}\selectfont\MakeUppercase{#1}}
- \titleformat{name=\part,numberless}[display]
- {% \phantomsection\addcontentsline{toc}{part}{#1}%
- \partfont\filleft}
- {\phantom{\MakeUppercase{\partname}}}
- {.3em}
- {\fontsize{16}{0}\selectfont\MakeUppercase{#1}}
- %% Text after part
- \newcommand{\parttext}[1]{%
- \begin{flushright}%
- \begin{minipage}{0.833\textwidth}%
- \color{maintext!80!paper}\raggedleft#1%
- \end{minipage}%
- \end{flushright}%
- }
-
- %% Section
- \titleformat{\section}
- {\color{maintheme}\secfont\large}
- {\thesection}{.75em}{\scshape #1}
- % [{\titlerule[.75pt]}]
-
- %% Subsection
- \titleformat{\subsection}
- {\subsecfont}{\thesubsection}{.75em}
- {\scshape #1}
-}
-
-%% Subsubsection
-\if at colorist@runin
-\titleformat{\subsubsection}[runin]
- {\color{maintext!70!paper}\subsubsecfont}{\thesubsubsection}{.5em}
- {#1.}[\hspace*{.3em}]
-\else
-\titleformat{\subsubsection}
- {\color{maintext!70!paper}\subsubsecfont}{\thesubsubsection}{.5em}
- {#1}
-\fi
-
-%% Paragraph
-\titleformat{\paragraph}[runin]
- {\conditionalbfseries\scshape}{\theparagraph}{1em}{#1}
-
-\titlespacing{\section}{0pt}{\baselineskip}{.6\baselineskip}
-\titlespacing{\subsection}{0pt}{.75\baselineskip}{.4\baselineskip}
-\titlespacing{\subsubsection}{0pt}{.6\baselineskip}{.3\baselineskip}
-
-%%================================
-%% TOC format
-%%================================
-\RequirePackage{titletoc}
-\titlecontents{part}
- [0em]
- {\addvspace{1.5pc}\large\filcenter\colorist at sffamily\conditionalbfseries}
- {\textcolor{maintheme}{\bfseries\thecontentslabel}\nopagebreak\\\nopagebreak\uppercase}
- {}
- {} % without page number
- [\addvspace{.5pc}]
-\ifbool{IsBook}{
- \titlecontents{chapter}
- [2em] % i.e., 0em (part) + 2em
- {\addvspace{1pc}\normalfont\color{maintheme}\colorist at sffamily\conditionalbfseries}
- {\contentslabel{2em}}
- {\colorist at scshape\hspace*{-2em}}
- {\titlerule*[10pt]{\parbox{2pt}{\hspace*{-.25pt}\textcolor{maintext!15!paper}{.}}}\color{maintheme}\contentspage}
- \titlecontents{section}
- [4em] % i.e., 2em (chapter) + 2em
- {\addvspace{.3pc}\normalfont\color{maintheme}\colorist at sffamily}
- {\contentslabel{1.75em}}
- {\hspace*{-1.75em}}
- {\titlerule*[10pt]{\parbox{2pt}{\textcolor{maintext!15!paper}{.}}}\color{maintheme}\contentspage}
- \titlecontents{subsection}
- [7em] % i.e., 4em (section) + 3em
- {\addvspace{.15pc}\normalfont\colorist at sffamily}
- {\contentslabel{2.75em}}
- {\hspace*{-2.75em}}
- {\titlerule*[10pt]{\parbox{2pt}{\textcolor{maintext!15!paper}{.}}}\color{maintext!45!paper}\contentspage}
- \titlecontents{subsubsection}
- [10em] % i.e., 7em (subsection) + 3em
- {\normalfont\colorist at sffamily}
- {\contentslabel{3.25em}}
- {\hspace*{-3.25em}}
- {\titlerule*[10pt]{\parbox{2pt}{\textcolor{maintext!15!paper}{.}}}\color{maintext!45!paper}\contentspage}
-}{
- \titlecontents{section}
- [2em] % i.e., 0em (part) + 2em
- {\addvspace{.3pc}\normalfont\color{maintheme}\colorist at sffamily}
- {\contentslabel{1.75em}}
- {\hspace*{-1.75em}}
- {\titlerule*[10pt]{\parbox{2pt}{\textcolor{maintext!15!paper}{.}}}\color{maintheme}\contentspage}
- \titlecontents{subsection}
- [4.5em] % i.e., 2em (section) + 2.5em
- {\addvspace{.15pc}\normalfont\colorist at sffamily}
- {\contentslabel{2.15em}}
- {\hspace*{-2.15em}}
- {\titlerule*[10pt]{\parbox{2pt}{\textcolor{maintext!15!paper}{.}}}\color{maintext!45!paper}\contentspage}
- \titlecontents{subsubsection}
- [7.75em] % i.e., 5em (subsection) + 3.25em
- {\normalfont\colorist at sffamily}
- {\contentslabel{2.75em}}
- {\hspace*{-2.75em}}
- {\titlerule*[10pt]{\parbox{2pt}{\textcolor{maintext!15!paper}{.}}}\color{maintext!45!paper}\contentspage}
-}
-
-%%================================
-%% Lists
-%%================================
-\RequirePackage{enumitem}
-\setlist{noitemsep}
-\setlist[enumerate]{labelsep=*, leftmargin=*}
-\setlist[enumerate,1]{label=\arabic*$)$,
- ref = \arabic*$)$}
-\setlist[enumerate,2]{label=\emph{\roman*}$)$,
- ref = \arabic{enumi}.\emph{\roman*}$)$}
-\setlist[enumerate,3]{label=\emph{\alph*}$)$,
- ref = \arabic{enumi}.\emph{\roman{enumii}}.\emph{\alph*}$)$}
-\setlist[description]{font=\normalfont\conditionalbfseries}
-
-\setlist[itemize]{leftmargin=*}
-\gappto{\PJLlang at langconfig@common}{\setlist[itemize,1]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{$\bullet$}}}
-\gappto{\PJLlang at langconfig@FR}{\setlist[itemize,1]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!50!paper}{---}}}
-\setlist[itemize,2]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{--}}
-\setlist[itemize,3]{label=\colorlet{currentcolor}{.}\textcolor{currentcolor!27!paper}{\texttt{*}}}
-
-%%================================
-%% Blank page
-%%================================
-\newcommand{\blinkpagetext}{This page is intentionally left blank}
-\renewcommand{\cleardoublepage}{\relax
- \clearpage
- \if at twoside\ifodd\c at page\relax\else
- \thispagestyle{empty}
- \AddToHookNext{shipout/background}
- {%
- \put(0.5\paperwidth,-0.5\paperheight){%
- \makebox[0pt]{\large\color{maintext!10!paper}\blinkpagetext}}}
- \null\newpage\fi\fi}
-
-%%================================
-%% Draft mark
-%%================================
-\RequirePackage{PJLdraft}
-
-%%================================
-%% Icons
-%%================================
-\RequirePackage{tikz}
-\newcommand{\ideabulb}[2][0.15]{%
- \scalebox{#1}{%
- \begin{tikzpicture}
- \filldraw[draw=#2,fill=#2] (0,0) circle [radius=1cm];
- \filldraw[draw=paper,fill=paper,rounded corners=0.8pt]
- [rotate=20] (-0.26,-0.66) rectangle (-0.06,-0.6)
- [xshift=-0.4mm,yshift=1mm] (-0.26,-0.66) rectangle (0.02,-0.6)
- [xshift=0.4mm,yshift=1mm] (-0.26,-0.66) rectangle (-0.06,-0.6);
- \draw[draw=paper,line width=0.7mm] (-0.18,-0.46)
- .. controls (-0.18,-0.28) and (-0.28,-0.12) ..(-0.4,0.1)
- .. controls (-0.55,0.4) and (-0.3,0.64) ..(0,0.64)
- .. controls (0.3,0.64) and (0.55,0.4) ..(0.4,0.1)
- .. controls (0.28,-0.12) and (0.18,-0.28) ..(0.18,-0.46);
- \end{tikzpicture}}}
-
-\newcommand{\questionmark}[2][0.15]{%
- \scalebox{#1}{%
- \begin{tikzpicture}
- \filldraw[draw=#2,fill=#2] (0,0) circle [radius=1cm];
- \filldraw[paper,yshift=0.5mm,scale=0.9] (-0.4,0.1) circle [radius=0.77mm];
- \draw[draw=paper,line width=1.5mm,yshift=0.5mm,scale=0.9] (-0.4,0.1)
- .. controls (-0.55,0.4) and (-0.3,0.64) ..(0,0.64)
- .. controls (0.3,0.64) and (0.55,0.4) ..(0.4,0.1)
- .. controls (0.28,-0.12) and (0.05,-0.28) ..(0.05,-0.3)
- .. controls (0,-0.36) and (0.0,-0.45) ..(0.0,-0.5);
- \fill[fill=paper,rounded corners=0.6mm]
- (-0.09,-0.75) rectangle (0.09,-0.53);
- \end{tikzpicture}}}
-
-%%================================
-%% Theorems
-%%================================
-\RequirePackage{mathtools}
-\RequirePackage{amsthm}
-\def\simpleqedsymbol{%
- \makebox[1em]{\rlap{\textcolor{maintext!12!paper}{\rule[-0.1em]{.95em}{.95em}}}{\kern.07em\raisebox{.07em}{\textcolor{paper}{\rule[-0.1em]{.81em}{.81em}}}\kern.07em}}}
-\newtheoremstyle{simple}%
- {}{}%
- {\normalfont}{}%
- {\normalfont}{}%
- {0pt}%
- {\global\let\qedsymbol\simpleqedsymbol%
- {\conditionalbfseries\thmname{#1}\thmnumber{ #2}}\hspace{.4em}%
- \textcolor{maintext!27!paper}{$|$}\hspace{.4em}%
- \color{maintext!50!paper}\thmnote{\ensuremath{(\text{#3})}~~}%
- \pushQED{\qed}%
- }
-\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}}}
-\let\qedsymbolOriginal\qedsymbol
-
-\newtheoremstyle{basic}
- {0pt}{0pt}{\normalfont}{0pt}
- {}{\;}{0.25em}
- {{\thmname{#1}~\thmnumber{\textup{#2}}}
- \thmnote{\normalfont\colorist at sffamily\color{maintext}~(#3)}}
-
-\newtheoremstyle{emphasis}
- {0pt}{0pt}{\itshape}{0pt}{}{}{0pt}
- {\thmnote{\normalfont\colorist at sffamily\color{maintext}#3\hspace*{0.5em}}}
-
-\if at colorist@fast
- \providecommand{\phantomsection}{}
- \RequirePackage{url}
- \newcommand{\href}[2]{#2}
-\else
- \PassOptionsToPackage{hidelinks,linktoc=all}{hyperref}
- \RequirePackage{bookmark}
- \RequirePackage{hyperref}
-\fi
-
-\PassOptionsToPackage{nothms,simplename}{PJLthm}
-\RequirePackage{PJLthm}
-
-\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}
-\pretocmd{\corollarynameEN}{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\propertynameEN}{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\factnameEN}{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\conjecturenameEN}{\normalfont\colorist at sffamily\color{purple}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\definitionnameEN}{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\axiomnameEN}{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\assumptionnameEN}{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\conventionnameEN}{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\hypothesisnameEN}{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\notationnameEN}{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\examplenameEN}{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\problemnameEN}{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\questionnameEN}{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\exercisenameEN}{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\remarknameEN}{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\observationnameEN}{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\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}
-
-\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}
-\pretocmd{\corollarynameFR}{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\propertynameFR}{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\factnameFR}{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\conjecturenameFR}{\normalfont\colorist at sffamily\color{purple}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\definitionnameFR}{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\axiomnameFR}{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\assumptionnameFR}{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\conventionnameFR}{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\hypothesisnameFR}{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\notationnameFR}{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\examplenameFR}{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\problemnameFR}{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\questionnameFR}{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\exercisenameFR}{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\remarknameFR}{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\observationnameFR}{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\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}
-
-\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}
-\pretocmd{\corollarynameDE}{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\propertynameDE}{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\factnameDE}{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\conjecturenameDE}{\normalfont\colorist at sffamily\color{purple}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\definitionnameDE}{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\axiomnameDE}{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\assumptionnameDE}{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\conventionnameDE}{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\hypothesisnameDE}{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\notationnameDE}{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\examplenameDE}{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\problemnameDE}{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\questionnameDE}{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\exercisenameDE}{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\remarknameDE}{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\observationnameDE}{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\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}
-
-\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}
-\pretocmd{\corollarynameIT}{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\propertynameIT}{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\factnameIT}{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\conjecturenameIT}{\normalfont\colorist at sffamily\color{purple}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\definitionnameIT}{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\axiomnameIT}{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\assumptionnameIT}{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\conventionnameIT}{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\hypothesisnameIT}{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\notationnameIT}{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\examplenameIT}{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\problemnameIT}{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\questionnameIT}{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\exercisenameIT}{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\remarknameIT}{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\observationnameIT}{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\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}
-
-\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}
-\pretocmd{\corollarynamePT}{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\propertynamePT}{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\factnamePT}{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\conjecturenamePT}{\normalfont\colorist at sffamily\color{purple}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\definitionnamePT}{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\axiomnamePT}{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\assumptionnamePT}{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\conventionnamePT}{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\hypothesisnamePT}{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\notationnamePT}{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\examplenamePT}{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\problemnamePT}{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\questionnamePT}{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\exercisenamePT}{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\remarknamePT}{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\observationnamePT}{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\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}
-
-\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}
-\pretocmd{\corollarynameBR}{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\propertynameBR}{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\factnameBR}{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\conjecturenameBR}{\normalfont\colorist at sffamily\color{purple}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\definitionnameBR}{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\axiomnameBR}{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\assumptionnameBR}{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\conventionnameBR}{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\hypothesisnameBR}{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\notationnameBR}{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\examplenameBR}{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\problemnameBR}{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\questionnameBR}{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\exercisenameBR}{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\remarknameBR}{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\observationnameBR}{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\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}
-
-\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}
-\pretocmd{\corollarynameES}{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\propertynameES}{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\factnameES}{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\conjecturenameES}{\normalfont\colorist at sffamily\color{purple}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\definitionnameES}{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\axiomnameES}{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\assumptionnameES}{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\conventionnameES}{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\hypothesisnameES}{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\notationnameES}{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\examplenameES}{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\problemnameES}{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\questionnameES}{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\exercisenameES}{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\remarknameES}{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\pretocmd{\observationnameES}{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries\colorist at textsc}{}{\FAIL}
-\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}
-
-\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}
-\pretocmd{\corollarynameCN}{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\propertynameCN}{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\factnameCN}{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\conjecturenameCN}{\normalfont\colorist at sffamily\color{purple}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\definitionnameCN}{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\axiomnameCN}{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\assumptionnameCN}{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\conventionnameCN}{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\hypothesisnameCN}{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\notationnameCN}{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\examplenameCN}{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\problemnameCN}{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\questionnameCN}{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\exercisenameCN}{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\remarknameCN}{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\observationnameCN}{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries}{}{\FAIL}
-\expandafter\def\csname definition-propositionnameCN\endcsname{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries{定义}-\propositionnameCN}
-\expandafter\def\csname definition-theoremnameCN\endcsname{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries{定义}-\theoremnameCN}
-
-\pretocmd{\theoremnameTC}{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\lemmanameTC}{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\propositionnameTC}{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\corollarynameTC}{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\propertynameTC}{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\factnameTC}{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\conjecturenameTC}{\normalfont\colorist at sffamily\color{purple}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\definitionnameTC}{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\axiomnameTC}{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\assumptionnameTC}{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\conventionnameTC}{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\hypothesisnameTC}{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\notationnameTC}{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\examplenameTC}{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\problemnameTC}{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\questionnameTC}{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\exercisenameTC}{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\remarknameTC}{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\observationnameTC}{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries}{}{\FAIL}
-\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}
-
-\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}
-\pretocmd{\corollarynameJP}{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\propertynameJP}{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\factnameJP}{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\conjecturenameJP}{\normalfont\colorist at sffamily\color{purple}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\definitionnameJP}{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\axiomnameJP}{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\assumptionnameJP}{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\conventionnameJP}{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\hypothesisnameJP}{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\notationnameJP}{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\examplenameJP}{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\problemnameJP}{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\questionnameJP}{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\exercisenameJP}{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\remarknameJP}{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\observationnameJP}{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries}{}{\FAIL}
-\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}
-
-\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}
-\pretocmd{\corollarynameRU}{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\propertynameRU}{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\factnameRU}{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\conjecturenameRU}{\normalfont\colorist at sffamily\color{purple}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\definitionnameRU}{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\axiomnameRU}{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\assumptionnameRU}{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\conventionnameRU}{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\hypothesisnameRU}{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\notationnameRU}{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\examplenameRU}{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\problemnameRU}{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\questionnameRU}{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\exercisenameRU}{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\remarknameRU}{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries}{}{\FAIL}
-\pretocmd{\observationnameRU}{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries}{}{\FAIL}
-\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}
-
-\def\colorist at definethms{
-\if at colorist@nothms\else
-\theoremstyle{basic}
-\if at colorist@nothmnum
-\CreateTheorem*{theorem}
-\CreateTheorem*{lemma}
-\CreateTheorem*{proposition}
-\CreateTheorem*{corollary}
-\CreateTheorem*{definition-proposition}
-\CreateTheorem*{definition-theorem}
-\CreateTheorem*{property}
-\CreateTheorem*{fact}
-\CreateTheorem*{conjecture}
-\else
-\CreateTheorem at thmnum{theorem}
-\CreateTheorem{lemma}[theorem]
-\CreateTheorem{proposition}[theorem]
-\CreateTheorem{corollary}[theorem]
-\CreateTheorem{definition-proposition}[theorem]
-\CreateTheorem{definition-theorem}[theorem]
-\CreateTheorem{property}[theorem]
-\CreateTheorem{fact}[theorem]
-\CreateTheorem{conjecture}[theorem]
-\fi
-\CreateTheorem*{theorem*}
-\CreateTheorem*{lemma*}
-\CreateTheorem*{proposition*}
-\CreateTheorem*{corollary*}
-\CreateTheorem*{definition-proposition*}
-\CreateTheorem*{definition-theorem*}
-\CreateTheorem*{property*}
-\CreateTheorem*{fact*}
-\CreateTheorem*{conjecture*}
-\if at colorist@nothmnum
-\CreateTheorem*{definition}
-\CreateTheorem*{axiom}
-\CreateTheorem*{assumption}
-\CreateTheorem*{convention}
-\CreateTheorem*{hypothesis}
-\CreateTheorem*{notation}
-\CreateTheorem*{example}
-\CreateTheorem*{problem}
-\CreateTheorem*{question}
-\CreateTheorem*{exercise}
-\else
-\CreateTheorem{definition}[theorem]
-\CreateTheorem{axiom}[theorem]
-\CreateTheorem{assumption}[theorem]
-\CreateTheorem{convention}[theorem]
-\CreateTheorem{hypothesis}[theorem]
-\CreateTheorem{notation}[theorem]
-\CreateTheorem{example}[theorem]
-\CreateTheorem{problem}[theorem]
-\CreateTheorem{question}[theorem]
-\CreateTheorem{exercise}[theorem]
-\fi
-\CreateTheorem*{definition*}
-\CreateTheorem*{axiom*}
-\CreateTheorem*{assumption*}
-\CreateTheorem*{convention*}
-\CreateTheorem*{hypothesis*}
-\CreateTheorem*{notation*}
-\CreateTheorem*{example*}
-\CreateTheorem*{problem*}
-\CreateTheorem*{question*}
-\CreateTheorem*{exercise*}
-
-\theoremstyle{emphasis}
-\if at colorist@nothmnum
-\CreateTheorem*{remark}
-\CreateTheorem*{observation}
-\else
-\CreateTheorem at thmnum{remark}
-\CreateTheorem at thmnum{observation}
-\fi
-\CreateTheorem*{remark*}
-\CreateTheorem*{observation*}
-
-\theoremstyle{simple}
-\fi
-}
-
-\if at colorist@delaythms
- \AtEndPreamble{\colorist at definethms}
-\else
- \colorist at definethms
-\fi
-
-\theoremstyle{simple}
-
-\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}
-\creflabelformat{PJLcorollary}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{PJLproperty}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{PJLfact}{#2{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries#1}#3}
-\creflabelformat{PJLconjecture}{#2{\normalfont\colorist at sffamily\color{purple}\conditionalbfseries#1}#3}
-\creflabelformat{PJLdefinition}{#2{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries#1}#3}
-\creflabelformat{PJLaxiom}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{PJLassumption}{#2{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries#1}#3}
-\creflabelformat{PJLconvention}{#2{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries#1}#3}
-\creflabelformat{PJLhypothesis}{#2{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries#1}#3}
-\creflabelformat{PJLnotation}{#2{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries#1}#3}
-\creflabelformat{PJLexample}{#2{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries#1}#3}
-\creflabelformat{PJLproblem}{#2{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries#1}#3}
-\creflabelformat{PJLquestion}{#2{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries#1}#3}
-\creflabelformat{PJLexercise}{#2{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries#1}#3}
-\creflabelformat{PJLdefinition-theorem}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{PJLdefinition-proposition}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-
-\creflabelformat{theoremEN}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{lemmaEN}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{propositionEN}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{corollaryEN}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{propertyEN}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{factEN}{#2{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries#1}#3}
-\creflabelformat{conjectureEN}{#2{\normalfont\colorist at sffamily\color{purple}\conditionalbfseries#1}#3}
-\creflabelformat{definitionEN}{#2{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries#1}#3}
-\creflabelformat{axiomEN}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{assumptionEN}{#2{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries#1}#3}
-\creflabelformat{conventionEN}{#2{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries#1}#3}
-\creflabelformat{hypothesisEN}{#2{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries#1}#3}
-\creflabelformat{notationEN}{#2{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries#1}#3}
-\creflabelformat{exampleEN}{#2{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries#1}#3}
-\creflabelformat{problemEN}{#2{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries#1}#3}
-\creflabelformat{questionEN}{#2{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries#1}#3}
-\creflabelformat{exerciseEN}{#2{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries#1}#3}
-\creflabelformat{definition-theoremEN}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{definition-propositionEN}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-
-\creflabelformat{theoremFR}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{lemmaFR}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{propositionFR}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{corollaryFR}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{propertyFR}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{factFR}{#2{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries#1}#3}
-\creflabelformat{conjectureFR}{#2{\normalfont\colorist at sffamily\color{purple}\conditionalbfseries#1}#3}
-\creflabelformat{definitionFR}{#2{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries#1}#3}
-\creflabelformat{axiomFR}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{assumptionFR}{#2{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries#1}#3}
-\creflabelformat{conventionFR}{#2{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries#1}#3}
-\creflabelformat{hypothesisFR}{#2{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries#1}#3}
-\creflabelformat{notationFR}{#2{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries#1}#3}
-\creflabelformat{exampleFR}{#2{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries#1}#3}
-\creflabelformat{problemFR}{#2{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries#1}#3}
-\creflabelformat{questionFR}{#2{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries#1}#3}
-\creflabelformat{exerciseFR}{#2{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries#1}#3}
-\creflabelformat{definition-theoremFR}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{definition-propositionFR}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-
-\creflabelformat{theoremDE}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{lemmaDE}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{propositionDE}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{corollaryDE}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{propertyDE}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{factDE}{#2{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries#1}#3}
-\creflabelformat{conjectureDE}{#2{\normalfont\colorist at sffamily\color{purple}\conditionalbfseries#1}#3}
-\creflabelformat{definitionDE}{#2{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries#1}#3}
-\creflabelformat{axiomDE}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{assumptionDE}{#2{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries#1}#3}
-\creflabelformat{conventionDE}{#2{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries#1}#3}
-\creflabelformat{hypothesisDE}{#2{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries#1}#3}
-\creflabelformat{notationDE}{#2{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries#1}#3}
-\creflabelformat{exampleDE}{#2{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries#1}#3}
-\creflabelformat{problemDE}{#2{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries#1}#3}
-\creflabelformat{questionDE}{#2{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries#1}#3}
-\creflabelformat{exerciseDE}{#2{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries#1}#3}
-\creflabelformat{definition-theoremDE}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{definition-propositionDE}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-
-\creflabelformat{theoremIT}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{lemmaIT}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{propositionIT}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{corollaryIT}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{propertyIT}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{factIT}{#2{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries#1}#3}
-\creflabelformat{conjectureIT}{#2{\normalfont\colorist at sffamily\color{purple}\conditionalbfseries#1}#3}
-\creflabelformat{definitionIT}{#2{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries#1}#3}
-\creflabelformat{axiomIT}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{assumptionIT}{#2{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries#1}#3}
-\creflabelformat{conventionIT}{#2{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries#1}#3}
-\creflabelformat{hypothesisIT}{#2{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries#1}#3}
-\creflabelformat{notationIT}{#2{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries#1}#3}
-\creflabelformat{exampleIT}{#2{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries#1}#3}
-\creflabelformat{problemIT}{#2{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries#1}#3}
-\creflabelformat{questionIT}{#2{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries#1}#3}
-\creflabelformat{exerciseIT}{#2{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries#1}#3}
-\creflabelformat{definition-theoremIT}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{definition-propositionIT}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-
-\creflabelformat{theoremPT}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{lemmaPT}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{propositionPT}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{corollaryPT}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{propertyPT}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{factPT}{#2{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries#1}#3}
-\creflabelformat{conjecturePT}{#2{\normalfont\colorist at sffamily\color{purple}\conditionalbfseries#1}#3}
-\creflabelformat{definitionPT}{#2{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries#1}#3}
-\creflabelformat{axiomPT}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{assumptionPT}{#2{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries#1}#3}
-\creflabelformat{conventionPT}{#2{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries#1}#3}
-\creflabelformat{hypothesisPT}{#2{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries#1}#3}
-\creflabelformat{notationPT}{#2{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries#1}#3}
-\creflabelformat{examplePT}{#2{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries#1}#3}
-\creflabelformat{problemPT}{#2{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries#1}#3}
-\creflabelformat{questionPT}{#2{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries#1}#3}
-\creflabelformat{exercisePT}{#2{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries#1}#3}
-\creflabelformat{definition-theoremPT}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{definition-propositionPT}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-
-\creflabelformat{theoremBR}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{lemmaBR}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{propositionBR}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{corollaryBR}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{propertyBR}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{factBR}{#2{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries#1}#3}
-\creflabelformat{conjectureBR}{#2{\normalfont\colorist at sffamily\color{purple}\conditionalbfseries#1}#3}
-\creflabelformat{definitionBR}{#2{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries#1}#3}
-\creflabelformat{axiomBR}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{assumptionBR}{#2{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries#1}#3}
-\creflabelformat{conventionBR}{#2{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries#1}#3}
-\creflabelformat{hypothesisBR}{#2{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries#1}#3}
-\creflabelformat{notationBR}{#2{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries#1}#3}
-\creflabelformat{exampleBR}{#2{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries#1}#3}
-\creflabelformat{problemBR}{#2{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries#1}#3}
-\creflabelformat{questionBR}{#2{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries#1}#3}
-\creflabelformat{exerciseBR}{#2{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries#1}#3}
-\creflabelformat{definition-theoremBR}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{definition-propositionBR}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-
-\creflabelformat{theoremES}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{lemmaES}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{propositionES}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{corollaryES}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{propertyES}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{factES}{#2{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries#1}#3}
-\creflabelformat{conjectureES}{#2{\normalfont\colorist at sffamily\color{purple}\conditionalbfseries#1}#3}
-\creflabelformat{definitionES}{#2{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries#1}#3}
-\creflabelformat{axiomES}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{assumptionES}{#2{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries#1}#3}
-\creflabelformat{conventionES}{#2{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries#1}#3}
-\creflabelformat{hypothesisES}{#2{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries#1}#3}
-\creflabelformat{notationES}{#2{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries#1}#3}
-\creflabelformat{exampleES}{#2{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries#1}#3}
-\creflabelformat{problemES}{#2{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries#1}#3}
-\creflabelformat{questionES}{#2{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries#1}#3}
-\creflabelformat{exerciseES}{#2{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries#1}#3}
-\creflabelformat{definition-theoremES}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{definition-propositionES}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-
-\creflabelformat{theoremCN}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{lemmaCN}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{propositionCN}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{corollaryCN}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{propertyCN}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{factCN}{#2{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries#1}#3}
-\creflabelformat{conjectureCN}{#2{\normalfont\colorist at sffamily\color{purple}\conditionalbfseries#1}#3}
-\creflabelformat{definitionCN}{#2{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries#1}#3}
-\creflabelformat{axiomCN}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{assumptionCN}{#2{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries#1}#3}
-\creflabelformat{conventionCN}{#2{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries#1}#3}
-\creflabelformat{hypothesisCN}{#2{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries#1}#3}
-\creflabelformat{notationCN}{#2{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries#1}#3}
-\creflabelformat{exampleCN}{#2{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries#1}#3}
-\creflabelformat{problemCN}{#2{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries#1}#3}
-\creflabelformat{questionCN}{#2{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries#1}#3}
-\creflabelformat{exerciseCN}{#2{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries#1}#3}
-\creflabelformat{definition-theoremCN}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{definition-propositionCN}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-
-\creflabelformat{theoremTC}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{lemmaTC}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{propositionTC}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{corollaryTC}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{propertyTC}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{factTC}{#2{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries#1}#3}
-\creflabelformat{conjectureTC}{#2{\normalfont\colorist at sffamily\color{purple}\conditionalbfseries#1}#3}
-\creflabelformat{definitionTC}{#2{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries#1}#3}
-\creflabelformat{axiomTC}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{assumptionTC}{#2{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries#1}#3}
-\creflabelformat{conventionTC}{#2{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries#1}#3}
-\creflabelformat{hypothesisTC}{#2{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries#1}#3}
-\creflabelformat{notationTC}{#2{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries#1}#3}
-\creflabelformat{exampleTC}{#2{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries#1}#3}
-\creflabelformat{problemTC}{#2{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries#1}#3}
-\creflabelformat{questionTC}{#2{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries#1}#3}
-\creflabelformat{exerciseTC}{#2{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries#1}#3}
-\creflabelformat{definition-theoremTC}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{definition-propositionTC}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-
-\creflabelformat{theoremJP}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{lemmaJP}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{propositionJP}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{corollaryJP}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{propertyJP}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{factJP}{#2{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries#1}#3}
-\creflabelformat{conjectureJP}{#2{\normalfont\colorist at sffamily\color{purple}\conditionalbfseries#1}#3}
-\creflabelformat{definitionJP}{#2{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries#1}#3}
-\creflabelformat{axiomJP}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{assumptionJP}{#2{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries#1}#3}
-\creflabelformat{conventionJP}{#2{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries#1}#3}
-\creflabelformat{hypothesisJP}{#2{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries#1}#3}
-\creflabelformat{notationJP}{#2{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries#1}#3}
-\creflabelformat{exampleJP}{#2{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries#1}#3}
-\creflabelformat{problemJP}{#2{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries#1}#3}
-\creflabelformat{questionJP}{#2{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries#1}#3}
-\creflabelformat{exerciseJP}{#2{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries#1}#3}
-\creflabelformat{definition-theoremJP}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{definition-propositionJP}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-
-\creflabelformat{theoremRU}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{lemmaRU}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{propositionRU}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{corollaryRU}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{propertyRU}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{factRU}{#2{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries#1}#3}
-\creflabelformat{conjectureRU}{#2{\normalfont\colorist at sffamily\color{purple}\conditionalbfseries#1}#3}
-\creflabelformat{definitionRU}{#2{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries#1}#3}
-\creflabelformat{axiomRU}{#2{\normalfont\colorist at sffamily\color{orange}\conditionalbfseries#1}#3}
-\creflabelformat{assumptionRU}{#2{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries#1}#3}
-\creflabelformat{conventionRU}{#2{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries#1}#3}
-\creflabelformat{hypothesisRU}{#2{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries#1}#3}
-\creflabelformat{notationRU}{#2{\normalfont\colorist at sffamily\color{forestgreen}\conditionalbfseries#1}#3}
-\creflabelformat{exampleRU}{#2{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries#1}#3}
-\creflabelformat{problemRU}{#2{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries#1}#3}
-\creflabelformat{questionRU}{#2{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries#1}#3}
-\creflabelformat{exerciseRU}{#2{\normalfont\colorist at sffamily\color{maintext}\conditionalbfseries#1}#3}
-\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}
-
-\RequirePackage{marginnote}
-\RequirePackage{ifoddpage}
-\newcommand{\mparadjust}[1]{\renewcommand*{\marginnotevadjust}{#1}}
-\AtEndPreamble{ % For puretext mode
-\pretocmd{\remark}{%
- \if at twoside\checkoddpage%
- \ifoddpage\reversemarginpar\fi%
- \else%
- \reversemarginpar%
- \fi%
- \mparadjust{-.25em}%
- \marginnote{\ideabulb[0.3]{orange}%
- \ifIsBook%
- \hspace*{-.2em}%
- \else%
- \hspace*{-.5em}%
- \fi%
- }\normalmarginpar%
-}{}{}
-\pretocmd{\conjecture}{%
- \if at twoside\checkoddpage%
- \ifoddpage\reversemarginpar\fi%
- \else%
- \reversemarginpar%
- \fi%
- \mparadjust{-.25em}%
- \marginnote{\questionmark[0.3]{purple}%
- \ifIsBook%
- \hspace*{-.2em}%
- \else%
- \hspace*{-.5em}%
- \fi%
- }\normalmarginpar%
-}{}{}
-}
-
-\RequirePackage{iftex}
-\ifXeTeX
-\def\pgfsys at hboxsynced#1{%
-{%
- \pgfsys at beginscope%
- \setbox\pgf at hbox=\hbox{%
- \hskip\pgf at pt@x%
- \raise\pgf at pt@y\hbox{%
- \pgf at pt@x=0pt%
- \pgf at pt@y=0pt%
- \special{pdf: content q}%
- \pgflowlevelsynccm%
- \pgfsys at invoke{q -1 0 0 -1 0 0 cm}%
- \special{pdf: content -1 0 0 -1 0 0 cm q}
- % translate to original coordinate system
- \pgfsys at invoke{0 J [] 0 d}% reset line cap and dash
- \wd#1=0pt%
- \ht#1=0pt%
- \dp#1=0pt%
- \box#1%
- \pgfsys at invoke{n Q Q Q}%
- }%
- \hss%
- }%
- \wd\pgf at hbox=0pt%
- \ht\pgf at hbox=0pt%
- \dp\pgf at hbox=0pt%
- \pgfsys at hbox\pgf at hbox%
- \pgfsys at endscope%
-}}
-\fi
-
-\renewenvironment{proof}[1][\proofname]{\par
- \pushQED{\qed}%
- \normalfont \topsep6\p@\@plus6\p@\relax
- \trivlist
- \item[\hskip\labelsep
- \itshape
- #1\hspace{.4em}%
- \textcolor{maintext!27!paper}{$|$}]\ignorespaces
-}{%
- \popQED\endtrivlist\@endpefalse
-}
-
-\RequirePackage[many]{tcolorbox}
-\if at colorist@fast
- \tcbstartdraftmode
-\fi
-\tcolorboxenvironment{theorem}
- {enhanced jigsaw,pad at break*=1mm,breakable,colback=maintext!3!paper,
- left=3.5mm,right=3.5mm,
- opacityframe=0.9,colframe=orange,arc=.7mm}
-\tcolorboxenvironment{theorem*}
- {enhanced jigsaw,pad at break*=1mm,breakable,colback=maintext!3!paper,
- left=3.5mm,right=3.5mm,
- opacityframe=0.9,colframe=orange,arc=.7mm}
-\tcolorboxenvironment{lemma}
- {enhanced jigsaw,pad at break*=1mm,breakable,colback=maintext!3!paper,
- left=3.5mm,right=3.5mm,
- opacityframe=0.9,colframe=orange,arc=.7mm}
-\tcolorboxenvironment{lemma*}
- {enhanced jigsaw,pad at break*=1mm,breakable,colback=maintext!3!paper,
- left=3.5mm,right=3.5mm,
- opacityframe=0.9,colframe=orange,arc=.7mm}
-\tcolorboxenvironment{proposition}
- {enhanced jigsaw,pad at break*=1mm,breakable,colback=maintext!3!paper,
- left=3.5mm,right=3.5mm,
- opacityframe=0.9,colframe=orange,arc=.7mm}
-\tcolorboxenvironment{proposition*}
- {enhanced jigsaw,pad at break*=1mm,breakable,colback=maintext!3!paper,
- left=3.5mm,right=3.5mm,
- opacityframe=0.9,colframe=orange,arc=.7mm}
-\tcolorboxenvironment{corollary}
- {enhanced jigsaw,pad at break*=1mm,breakable,colback=maintext!3!paper,
- left=3.5mm,right=3.5mm,
- opacityframe=0.9,colframe=orange,arc=.7mm}
-\tcolorboxenvironment{corollary*}
- {enhanced jigsaw,pad at break*=1mm,breakable,colback=maintext!3!paper,
- left=3.5mm,right=3.5mm,
- opacityframe=0.9,colframe=orange,arc=.7mm}
-\tcolorboxenvironment{property}
- {enhanced jigsaw,pad at break*=1mm,breakable,colback=maintext!3!paper,
- left=3.5mm,right=3.5mm,
- opacityframe=0.9,colframe=orange,arc=.7mm}
-\tcolorboxenvironment{property*}
- {enhanced jigsaw,pad at break*=1mm,breakable,colback=maintext!3!paper,
- left=3.5mm,right=3.5mm,
- opacityframe=0.9,colframe=orange,arc=.7mm}
-\tcolorboxenvironment{axiom}
- {enhanced jigsaw,pad at break*=1mm,breakable,colback=maintext!3!paper,
- left=3.5mm,right=3.5mm,
- opacityframe=0.9,colframe=orange,arc=.7mm}
-\tcolorboxenvironment{axiom*}
- {enhanced jigsaw,pad at break*=1mm,breakable,colback=maintext!3!paper,
- left=3.5mm,right=3.5mm,
- opacityframe=0.9,colframe=orange,arc=.7mm}
-\tcolorboxenvironment{definition-proposition}
- {enhanced jigsaw,pad at break*=1mm,breakable,colback=maintext!3!paper,
- left=3.5mm,right=3.5mm,
- opacityframe=0.9,colframe=orange,arc=.7mm}
-\tcolorboxenvironment{definition-proposition*}
- {enhanced jigsaw,pad at break*=1mm,breakable,colback=maintext!3!paper,
- left=3.5mm,right=3.5mm,
- opacityframe=0.9,colframe=orange,arc=.7mm}
-\tcolorboxenvironment{definition-theorem}
- {enhanced jigsaw,pad at break*=1mm,breakable,colback=maintext!3!paper,
- left=3.5mm,right=3.5mm,
- opacityframe=0.9,colframe=orange,arc=.7mm}
-\tcolorboxenvironment{definition-theorem*}
- {enhanced jigsaw,pad at break*=1mm,breakable,colback=maintext!3!paper,
- left=3.5mm,right=3.5mm,
- opacityframe=0.9,colframe=orange,arc=.7mm}
-
-\tcolorboxenvironment{fact}
- {enhanced jigsaw,pad at break*=1mm,breakable,colback=maintext!5!paper,
- boxrule=0pt,frame hidden,arc=.7mm}
-\tcolorboxenvironment{fact*}
- {enhanced jigsaw,pad at break*=1mm,breakable,colback=maintext!5!paper,
- boxrule=0pt,frame hidden,arc=.7mm}
-
-\tcolorboxenvironment{conjecture}
- {enhanced jigsaw,pad at break*=1mm,breakable,colback=maintext!3!paper,
- left=3.5mm,right=3.5mm,
- opacityframe=0.7,colframe=purple,arc=.7mm}
-\tcolorboxenvironment{conjecture*}
- {enhanced jigsaw,pad at break*=1mm,breakable,colback=maintext!3!paper,
- left=3.5mm,right=3.5mm,
- opacityframe=0.7,colframe=purple,arc=.7mm}
-
-\tcolorboxenvironment{definition}
- {enhanced jigsaw,pad at break*=1mm,breakable,
- left=4mm,right=4mm,top=1mm,bottom=1mm,
- colback=lightorange!10!paper,boxrule=0pt,frame hidden,
- borderline west={1.5mm}{0mm}{forestgreen},arc=.7mm}
-\tcolorboxenvironment{definition*}
- {enhanced jigsaw,pad at break*=1mm,breakable,
- left=4mm,right=4mm,top=1mm,bottom=1mm,
- colback=lightorange!10!paper,boxrule=0pt,frame hidden,
- borderline west={1.5mm}{0mm}{forestgreen},arc=.7mm}
-\tcolorboxenvironment{assumption}
- {enhanced jigsaw,pad at break*=1mm,breakable,
- left=4mm,right=4mm,top=1mm,bottom=1mm,
- colback=lightorange!10!paper,boxrule=0pt,frame hidden,
- borderline west={1.5mm}{0mm}{forestgreen},arc=.7mm}
-\tcolorboxenvironment{assumption*}
- {enhanced jigsaw,pad at break*=1mm,breakable,
- left=4mm,right=4mm,top=1mm,bottom=1mm,
- colback=lightorange!10!paper,boxrule=0pt,frame hidden,
- borderline west={1.5mm}{0mm}{forestgreen},arc=.7mm}
-\tcolorboxenvironment{convention}
- {enhanced jigsaw,pad at break*=1mm,breakable,
- left=4mm,right=4mm,top=1mm,bottom=1mm,
- colback=lightorange!10!paper,boxrule=0pt,frame hidden,
- borderline west={1.5mm}{0mm}{forestgreen},arc=.7mm}
-\tcolorboxenvironment{convention*}
- {enhanced jigsaw,pad at break*=1mm,breakable,
- left=4mm,right=4mm,top=1mm,bottom=1mm,
- colback=lightorange!10!paper,boxrule=0pt,frame hidden,
- borderline west={1.5mm}{0mm}{forestgreen},arc=.7mm}
-\tcolorboxenvironment{hypothesis}
- {enhanced jigsaw,pad at break*=1mm,breakable,
- left=4mm,right=4mm,top=1mm,bottom=1mm,
- colback=lightorange!10!paper,boxrule=0pt,frame hidden,
- borderline west={1.5mm}{0mm}{forestgreen},arc=.7mm}
-\tcolorboxenvironment{hypothesis*}
- {enhanced jigsaw,pad at break*=1mm,breakable,
- left=4mm,right=4mm,top=1mm,bottom=1mm,
- colback=lightorange!10!paper,boxrule=0pt,frame hidden,
- borderline west={1.5mm}{0mm}{forestgreen},arc=.7mm}
-\tcolorboxenvironment{notation}
- {enhanced jigsaw,pad at break*=1mm,breakable,
- left=4mm,right=4mm,top=1mm,bottom=1mm,
- colback=lightorange!10!paper,boxrule=0pt,frame hidden,
- borderline west={1.5mm}{0mm}{forestgreen},arc=.7mm}
-\tcolorboxenvironment{notation*}
- {enhanced jigsaw,pad at break*=1mm,breakable,
- left=4mm,right=4mm,top=1mm,bottom=1mm,
- colback=lightorange!10!paper,boxrule=0pt,frame hidden,
- borderline west={1.5mm}{0mm}{forestgreen},arc=.7mm}
-
-\tcolorboxenvironment{example}
- {enhanced jigsaw,pad at break*=1mm,breakable,colback=maintext!5!paper,
- boxrule=0pt,frame hidden,arc=.7mm,lines before break=3}
-\tcolorboxenvironment{example*}
- {enhanced jigsaw,pad at break*=1mm,breakable,colback=maintext!5!paper,
- boxrule=0pt,frame hidden,arc=.7mm,lines before break=3}
-
-\tcolorboxenvironment{problem}
- {enhanced jigsaw,pad at break*=1mm,breakable,colback=yellow!25!paper,
- boxrule=0pt,frame hidden,arc=.7mm}
-\tcolorboxenvironment{problem*}
- {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,
- top=0mm,bottom=0mm,
- opacityframe=0,opacityback=0,lines before break=3}
-\tcolorboxenvironment{question*}
- {enhanced jigsaw,pad at break*=1mm,breakable,oversize,
- top=0mm,bottom=0mm,
- opacityframe=0,opacityback=0,lines before break=3}
-\tcolorboxenvironment{exercise}
- {enhanced jigsaw,pad at break*=1mm,breakable,oversize,
- top=0mm,bottom=0mm,
- opacityframe=0,opacityback=0,lines before break=3}
-\tcolorboxenvironment{exercise*}
- {enhanced jigsaw,pad at break*=1mm,breakable,oversize,
- top=0mm,bottom=0mm,
- opacityframe=0,opacityback=0,lines before break=3}
-\tcolorboxenvironment{remark}
- {enhanced jigsaw,pad at break*=1mm,breakable,oversize,
- top=0mm,bottom=0mm,
- opacityframe=0,opacityback=0,lines before break=3}
-\tcolorboxenvironment{remark*}
- {enhanced jigsaw,pad at break*=1mm,breakable,oversize,
- top=0mm,bottom=0mm,
- opacityframe=0,opacityback=0,lines before break=3}
-\tcolorboxenvironment{observation}
- {enhanced jigsaw,pad at break*=1mm,breakable,oversize,
- top=0mm,bottom=0mm,
- opacityframe=0,opacityback=0,lines before break=3}
-\tcolorboxenvironment{observation*}
- {enhanced jigsaw,pad at break*=1mm,breakable,oversize,
- top=0mm,bottom=0mm,
- opacityframe=0,opacityback=0,lines before break=3}
-
-\ExplSyntaxOn
-\NewDocumentCommand \AfterEnvEnd { +m }
- { \colorist_after_env_end:nw {#1} }
-\cs_new_protected:Npn \colorist_after_env_end:nw #1 #2
- \if at ignore\@ignorefalse\ignorespaces\fi
- { #2 \if at ignore\@ignorefalse\ignorespaces\fi #1 }
- \NewDocumentCommand \ScanEnv { s m +m+m }
+\bool_new:N \l__colorist_is_book_bool
+\cs_if_exist:cTF { c at chapter }
{
- \IfBooleanTF {#1}
- { \jinwen_scan_env_ignore_par:nTF }
- { \jinwen_scan_env:nTF }
- {#2} {#3} {#4}
+ \bool_set_true:N \l__colorist_is_book_bool
}
-\cs_new_protected:Npn \jinwen_scan_env:nTF
- { \__jinwen_scan_env:NnTF \c_false_bool }
-\cs_new_protected:Npn \jinwen_scan_env_ignore_par:nTF
- { \__jinwen_scan_env:NnTF \c_true_bool }
-\tl_new:N \l__jinwen_collected_tl
-\cs_new_protected:Npn \__jinwen_scan_env:NnTF #1 #2 #3 #4
{
- \tl_clear:N \l__jinwen_collected_tl
- \peek_analysis_map_inline:n
- {
- \tl_put_right:Nn \l__jinwen_collected_tl {##1}
- \int_compare:nNnTF { "##3 } = { 0 }
- {
- \exp_args:No \token_if_eq_meaning:NNTF {##1} \begin
- { \peek_analysis_map_break:n { \__jinwen_chk_env:nTFn {#2} {#3} {#4} } }
- {
- \bool_lazy_and:nnF {#1}
- { \exp_args:No \token_if_eq_meaning_p:NN {##1} \par }
- { \__jinwen_scan_env_end:n {#4} }
- }
- }
- { \int_compare:nNnF { "##3 } = { 10 } { \__jinwen_scan_env_end:n {#4} } }
- }
+ \bool_set_false:N \l__colorist_is_book_bool
}
-\cs_new_protected:Npn \__jinwen_scan_env_end:n #1
- { \peek_analysis_map_break:n { \__jinwen_reinsert_tokens:nn {#1} { } } }
-\cs_new_protected:Npn \__jinwen_reinsert_tokens:nn #1 #2
- {
- \use:x
- {
- \tl_clear:N \exp_not:N \l__jinwen_collected_tl
- \exp_not:n {#1} \l__jinwen_collected_tl #2
- }
- }
-\cs_new_protected:Npn \__jinwen_chk_env:nTFn #1 #2 #3 #4
- {
- \exp_args:Nx \__jinwen_reinsert_tokens:nn
- { \str_if_eq:nnTF {#1} {#4} { \exp_not:n {#2} } { \exp_not:n {#3} } } { {#4} }
- }
-\ExplSyntaxOff
-\def\scandefinitionenv{%
- \AfterEnvEnd{%
- \ScanEnv*{definition}%
- {\vspace{-1.05\baselineskip}}%
- {\ScanEnv*{definition*}%
- {\vspace{-1.05\baselineskip}}%
- {}}}}
-\AddToHook{env/definition/end}{\scandefinitionenv}%
-\AddToHook{env/definition*/end}{\scandefinitionenv}%
-
-\def\scanassumptionenv{%
- \AfterEnvEnd{%
- \ScanEnv*{assumption}%
- {\vspace{-1.05\baselineskip}}%
- {\ScanEnv*{assumption*}%
- {\vspace{-1.05\baselineskip}}%
- {}}}}
-\AddToHook{env/assumption/end}{\scanassumptionenv}%
-\AddToHook{env/assumption*/end}{\scanassumptionenv}%
-
-\def\scanconventionenv{%
- \AfterEnvEnd{%
- \ScanEnv*{convention}%
- {\vspace{-1.05\baselineskip}}%
- {\ScanEnv*{convention*}%
- {\vspace{-1.05\baselineskip}}%
- {}}}}
-\AddToHook{env/convention/end}{\scanconventionenv}%
-\AddToHook{env/convention*/end}{\scanconventionenv}%
-
-\def\scanhypothesisenv{%
- \AfterEnvEnd{%
- \ScanEnv*{hypothesis}%
- {\vspace{-1.05\baselineskip}}%
- {\ScanEnv*{hypothesis*}%
- {\vspace{-1.05\baselineskip}}%
- {}}}}
-\AddToHook{env/hypothesis/end}{\scanhypothesisenv}%
-\AddToHook{env/hypothesis*/end}{\scanhypothesisenv}%
-
-\def\scannotationenv{%
- \AfterEnvEnd{%
- \ScanEnv*{notation}%
- {\vspace{-1.05\baselineskip}}%
- {\ScanEnv*{notation*}%
- {\vspace{-1.05\baselineskip}}%
- {}}}}
-\AddToHook{env/notation/end}{\scannotationenv}%
-\AddToHook{env/notation*/end}{\scannotationenv}%
-
-\ifbool{IsBook}{}{%
-
%%================================
-%% Title block style
+%% Paper configuration
%%================================
-\renewcommand{\@maketitle}{%
-\begin{center}%
- \color{maintheme}%
- {\Large\colorist at sffamily\scshape\conditionalbfseries\@title}\\\bigskip%
- \color{maintext!80!paper}%
- {\scshape\@author}\\\smallskip%
- {\@date}%
-\end{center}%
-\ifx\@date\@empty\bigskip\fi%
-\medskip%
-}
-\apptocmd{\maketitle}{\thispagestyle{fancy}}{}{\FAIL}
+\RequirePackage { projlib-paper }
%%================================
-%% Abstract style
+%% Multi-language support
%%================================
-\renewenvironment{abstract}
-{\small{\centerline{\textsc{\conditionalbfseries\sffamily\abstractname}}\vspace{-0.3\baselineskip}}
- \color{maintext!80!paper}\begin{quotation}}
-{\end{quotation}\medskip}
+\RequirePackage { projlib-language }
%%================================
-%% Keyword
+%% Loading the style
%%================================
-\def\keywordnameEN{\textsc{Keywords}}
-\def\keywordnameFR{\textsc{Mots clés}}
-\def\keywordnameDE{\textsc{Schlüsselwörter}}
-\def\keywordnameCN{关键词}
-\def\keywordnameTC{關鍵詞}
-\def\keywordnameJP{キーワード}
-\def\keywordnameRU{Ключевые слова}
+\exp_args:No \RequirePackage { colorist- \l__colorist_style_str }
-\newenvironment{keyword}
-{\small{\centerline{{\conditionalbfseries\csname keywordname\csname\languagename ABBR\endcsname\endcsname}}\vspace{-0.3\baselineskip}}
- \color{maintext!80!paper}\begin{center}}
-{\end{center}\medskip}
-
-%%================================
-%% Simulate features of amsart
-%%================================
-\PassOptionsToPackage{amsfashion}{PJLauthor}
-\RequirePackage{PJLauthor}
-
-}
-
\endinput
%%
%% End of file `colorist/colorist.sty'.
Modified: branches/branch2021.final/Master/texmf-dist/tex/latex/einfart/einfart.cls
===================================================================
--- branches/branch2021.final/Master/texmf-dist/tex/latex/einfart/einfart.cls 2022-03-20 21:13:02 UTC (rev 62833)
+++ branches/branch2021.final/Master/texmf-dist/tex/latex/einfart/einfart.cls 2022-03-20 21:14:50 UTC (rev 62834)
@@ -19,7 +19,7 @@
\RequirePackage{l3keys2e}
\ProvidesExplClass
{einfart}
- {2022/03/17} {}
+ {2022/03/19} {}
{A simple and clear article style}
\tl_const:Nn \l__minimclass_base_class_tl { article }
Modified: branches/branch2021.final/Master/texmf-dist/tex/latex/lebhart/lebhart.cls
===================================================================
--- branches/branch2021.final/Master/texmf-dist/tex/latex/lebhart/lebhart.cls 2022-03-20 21:13:02 UTC (rev 62833)
+++ branches/branch2021.final/Master/texmf-dist/tex/latex/lebhart/lebhart.cls 2022-03-20 21:14:50 UTC (rev 62834)
@@ -2,7 +2,7 @@
%% This is file `lebhart/lebhart.cls',
%% generated with the docstrip utility.
-%% Copyright (C) 2021 by Jinwen XU
+%% Copyright (C) 2021-2022 by Jinwen XU
%%
%% This is part of the colorist class series.
%%
@@ -16,551 +16,665 @@
%% 2005/12/01 or later.
%%
\NeedsTeXFormat{LaTeX2e}[2020-10-01]
-\ProvidesClass{lebhart}
- [2021/12/16 A colorful article style]
-\def\colorclass at baseclass{article}
-\RequirePackage{kvoptions}
-\RequirePackage{etoolbox}
-\SetupKeyvalOptions{
- family = @colorclass,
- prefix = @colorclass@,
-}
-\DeclareBoolOption[false]{draft}
-\DeclareBoolOption[false]{fast}
-\DeclareBoolOption[false]{useosf}
-\DeclareBoolOption[false]{lmodern}
-\DeclareBoolOption[false]{palatino}
-\DeclareBoolOption[false]{times}
-\DeclareBoolOption[false]{garamond}
-\DeclareBoolOption[false]{noto}
-\DeclareBoolOption[false]{biolinum}
-\DeclareBoolOption[false]{customfont}
-\DeclareStringOption{thmnum}[PJL at thmnum@default]
+\RequirePackage{l3keys2e}
+\ProvidesExplClass
+ {lebhart}
+ {2022/03/19} {}
+ {A colorful article style}
-\newif\if at colorclass@bfivepaper\@colorclass at bfivepaperfalse
-\DeclareVoidOption{b5paper}{\@colorclass at bfivepapertrue}
-\newif\if at colorclass@afourpaper\@colorclass at afourpaperfalse
-\DeclareVoidOption{a4paper}{\@colorclass at afourpapertrue}
+\tl_const:Nn \l__colorclass_base_class_tl { article }
-\DeclareDefaultOption{\PassOptionsToClass{\CurrentOption}{\colorclass at baseclass}}
-\ProcessKeyvalOptions*\relax
-\LoadClass{\colorclass at baseclass}
-\if at colorclass@draft
- \@colorclass at fasttrue
-\fi
-\if at colorclass@lmodern
- \@colorclass at customfonttrue
-\fi
-\if at colorclass@palatino
- \@colorclass at customfonttrue
-\fi
-\if at colorclass@times
- \@colorclass at customfonttrue
-\fi
-\if at colorclass@garamond
- \@colorclass at customfonttrue
-\fi
-\if at colorclass@noto
- \@colorclass at customfonttrue
-\fi
-\if at colorclass@biolinum
- \@colorclass at customfonttrue
-\fi
+\bool_new:N \l__colorclass_load_custom_font_file_bool
+\bool_set_false:N \l__colorclass_load_custom_font_file_bool
-%%================================
-%% Page layout
-%%================================
-\RequirePackage{silence}
-\WarningFilter{geometry}{Over-specification in}
-\RequirePackage[heightrounded]{geometry}
-\geometry{
- papersize={8.5in,11in},
- % total={47em,66em},
- total={6.500in,9.130in},
- hmarginratio=1:1,
- vmarginratio=1:1,
- footnotesep=2em plus 2pt minus 2pt,
-}
-\if at colorclass@bfivepaper
-\geometry{
- b5paper,
- % total={40em,59em},
- total={5.535in,8.160in},
- hmarginratio=1:1,
- vmarginratio=1:1,
- footnotesep=2em plus 2pt minus 2pt,
-}
-\fi
-\if at colorclass@afourpaper
-\geometry{
- a4paper,
- % total={47em,70em},
- total={6.500in,9.685in},
- hmarginratio=1:1,
- vmarginratio=1:1,
- footnotesep=2em plus 2pt minus 2pt,
-}
-\fi
+\bool_new:N \l__colorclass_load_custom_font_file_latin_bool
+\bool_set_false:N \l__colorclass_load_custom_font_file_latin_bool
-\RequirePackage{indentfirst}
+\bool_new:N \l__colorclass_load_custom_font_file_cjk_bool
+\bool_set_false:N \l__colorclass_load_custom_font_file_cjk_bool
-\if at colorclass@fast
- \PassOptionsToPackage{fast}{colorist}
- \RequirePackage{draftwatermark}
- \DraftwatermarkOptions{text={\normalfont DRAFT},color=paper!95!-paper}
-\fi
+\bool_new:N \l__colorclass_load_custom_font_file_math_bool
+\bool_set_false:N \l__colorclass_load_custom_font_file_math_bool
-\RequirePackage{colorist}
+\keys_define:nn { colorclass }
+ {
+ , draft .bool_set:N = \l__colorclass_fast_bool
+ , draft .initial:n = { false }
+ , fast .bool_set:N = \l__colorclass_fast_bool
+
+ , load custom font file .code:n = {
+ \bool_set_true:N \l__colorclass_load_custom_font_file_bool
+ \str_set:Nn \l__colorclass_custom_font_file_str { #1 }
+ \bool_set_true:N \l__colorclass_load_custom_font_file_latin_bool
+ \str_set:Nn \l__colorclass_custom_font_file_latin_str { colorist.font.latin }
+ \bool_set_true:N \l__colorclass_load_custom_font_file_cjk_bool
+ \str_set:Nn \l__colorclass_custom_font_file_cjk_str { colorist.font.cjk }
+ \bool_set_true:N \l__colorclass_load_custom_font_file_math_bool
+ \str_set:Nn \l__colorclass_custom_font_file_math_str { colorist.font.math }
+ }
+ , load custom font file .default:n = { colorist.font }
+ , load~custom~font~file .code:n = {
+ \bool_set_true:N \l__colorclass_load_custom_font_file_bool
+ \str_set:Nn \l__colorclass_custom_font_file_str { #1 }
+ }
+ , load~custom~font~file .default:n = { colorist.font }
+ , load-custom-font-file .code:n = {
+ \bool_set_true:N \l__colorclass_load_custom_font_file_bool
+ \str_set:Nn \l__colorclass_custom_font_file_str { #1 }
+ }
+ , load-custom-font-file .default:n = { colorist.font }
+
+ , load custom latin font file .code:n = {
+ \bool_set_true:N \l__colorclass_load_custom_font_file_latin_bool
+ \str_set:Nn \l__colorclass_custom_font_file_latin_str { #1 }
+ }
+ , load custom latin font file .default:n = { colorist.font.latin }
+ , load~custom~latin~font~file .code:n = {
+ \bool_set_true:N \l__colorclass_load_custom_font_file_latin_bool
+ \str_set:Nn \l__colorclass_custom_font_file_latin_str { #1 }
+ }
+ , load~custom~latin~font~file .default:n = { colorist.font.latin }
+ , load-custom-latin-font-file .code:n = {
+ \bool_set_true:N \l__colorclass_load_custom_font_file_latin_bool
+ \str_set:Nn \l__colorclass_custom_font_file_latin_str { #1 }
+ }
+ , load-custom-latin-font-file .default:n = { colorist.font.latin }
+
+ , load custom cjk font file .code:n = {
+ \bool_set_true:N \l__colorclass_load_custom_font_file_cjk_bool
+ \str_set:Nn \l__colorclass_custom_font_file_cjk_str { #1 }
+ }
+ , load custom cjk font file .default:n = { colorist.font.cjk }
+ , load~custom~cjk~font~file .code:n = {
+ \bool_set_true:N \l__colorclass_load_custom_font_file_cjk_bool
+ \str_set:Nn \l__colorclass_custom_font_file_cjk_str { #1 }
+ }
+ , load~custom~cjk~font~file .default:n = { colorist.font.cjk }
+ , load-custom-cjk-font-file .code:n = {
+ \bool_set_true:N \l__colorclass_load_custom_font_file_cjk_bool
+ \str_set:Nn \l__colorclass_custom_font_file_cjk_str { #1 }
+ }
+ , load-custom-cjk-font-file .default:n = { colorist.font.cjk }
+
+ , load custom math font file .code:n = {
+ \bool_set_true:N \l__colorclass_load_custom_font_file_math_bool
+ \str_set:Nn \l__colorclass_custom_font_file_math_str { #1 }
+ }
+ , load custom math font file .default:n = { colorist.font.math }
+ , load~custom~math~font~file .code:n = {
+ \bool_set_true:N \l__colorclass_load_custom_font_file_math_bool
+ \str_set:Nn \l__colorclass_custom_font_file_math_str { #1 }
+ }
+ , load~custom~math~font~file .default:n = { colorist.font.math }
+ , load-custom-math-font-file .code:n = {
+ \bool_set_true:N \l__colorclass_load_custom_font_file_math_bool
+ \str_set:Nn \l__colorclass_custom_font_file_math_str { #1 }
+ }
+ , load-custom-math-font-file .default:n = { colorist.font.math }
+
+ , a4paper .bool_set:N = \l__colorclass_a_four_paper_bool
+ , a4paper .initial:n = { false }
+ , b5paper .bool_set:N = \l__colorclass_b_five_paper_bool
+ , b5paper .initial:n = { false }
+
+ , 11pt .code:n = { \PassOptionsToClass { \CurrentOption } { \l__colorclass_base_class_tl } }
+ , 12pt .code:n = { \PassOptionsToClass { \CurrentOption } { \l__colorclass_base_class_tl } }
+
+ , unknown .code:n = {
+ \PassOptionsToPackage { \CurrentOption } { colorist }
+ }
+ }
+\ProcessKeysOptions { colorclass }
+
+\LoadClass{\l__colorclass_base_class_tl}
+
%%================================
-%% Fonts
+%% Page layout
%%================================
-\if at colorclass@customfont\else
- \if at colorclass@fast
- \RequirePackage{mathpazo}
- \fi
-\fi
+\RequirePackage { silence }
+\WarningFilter { geometry } { Over-specification }
-\PassOptionsToPackage{no-math,quiet}{fontspec}
-\RequirePackage{fontspec}
+\PassOptionsToPackage { heightrounded } { geometry }
+\RequirePackage { geometry }
-\IfFileExists{colorist-font.tex}{
- \input{colorist-font.tex}
-}{
-\IfFontExistsTF{Palatino Linotype}{%
- \setmainfont{Palatino Linotype}
- [\if at colorclass@useosf Numbers = OldStyle\fi]
-}{
- \setmainfont{TeXGyrePagellaX-Regular.otf}[
- BoldFont = TeXGyrePagellaX-Bold.otf ,
- ItalicFont = TeXGyrePagellaX-Italic.otf ,
- BoldItalicFont = TeXGyrePagellaX-BoldItalic.otf,
- \if at colorclass@useosf Numbers = OldStyle\fi ]
-}
- \setsansfont{SourceSansPro-Regular.otf}[
- Scale = MatchLowercase ,
- BoldFont = SourceSansPro-Bold.otf ,
- ItalicFont = SourceSansPro-RegularIt.otf ,
- BoldItalicFont = SourceSansPro-BoldIt.otf ]
- \setmonofont{NewCMMono10-Regular.otf}[
- Scale = 1.05 ,
- BoldFont = NewCMMono10-Bold.otf ,
- ItalicFont = NewCMMono10-Italic.otf ,
- BoldItalicFont = NewCMMono10-BoldOblique.otf ]
-}
+\geometry
+ {
+ papersize = { 8.5in, 11in },
+ total = { 6.500in, 9.130in },
+ centering,
+ footnotesep = 2em plus 2pt minus 2pt,
+ }
-\PassOptionsToPackage{fontset=none,scheme=plain}{ctex}
-\RequirePackage{ctex}
+\bool_if:NT \l__colorclass_b_five_paper_bool
+ {
+ \geometry
+ {
+ b5paper,
+ total = { 5.535in, 8.160in },
+ centering,
+ footnotesep = 2em plus 2pt minus 2pt,
+ }
+ }
-\IfFileExists{colorist-font.cjk.tex}{
- \input{colorist-font.cjk.tex}
-}{
-\IfFontExistsTF{SourceHanSerifSC-Regular}{%
- \setCJKmainfont{SourceHanSerifSC-Regular}[
- BoldFont = SourceHanSerifSC-Bold ,
- ItalicFont = * ,
- BoldItalicFont = SourceHanSerifSC-Bold ]
-}{
- \setCJKmainfont{FandolSong-Regular.otf}[
- BoldFont = FandolSong-Bold.otf ,
- ItalicFont = FandolKai-Regular.otf ,
- BoldItalicFont = FandolKai-Regular.otf ,
- BoldItalicFeatures = {FakeBold=4} ]
-}
+\bool_if:NT \l__colorclass_a_four_paper_bool
+ {
+ \geometry
+ {
+ a4paper,
+ total = { 6.500in, 9.685in },
+ centering,
+ footnotesep = 2em plus 2pt minus 2pt,
+ }
+ }
-\IfFontExistsTF{SourceHanSansSC-Regular}{%
- \setCJKsansfont{SourceHanSansSC-Regular}[
- BoldFont = SourceHanSansSC-Bold ,
- ItalicFont = * ,
- BoldItalicFont = SourceHanSansSC-Bold ]
-}{
- \setCJKsansfont{FandolHei-Regular.otf}[
- BoldFont = FandolHei-Bold.otf ,
- ItalicFont = * ,
- BoldItalicFont = FandolHei-Bold.otf ]
-}
+\bool_if:NT \l__colorclass_fast_bool
+ {
+ \PassOptionsToPackage { fast } { colorist }
+ \RequirePackage { draftwatermark }
+ \DraftwatermarkOptions { text = { \normalfont DRAFT }, color = paper!97!-paper }
+ }
-\IfFontExistsTF{SourceHanMonoSC-Regular}{%
- \setCJKmonofont{SourceHanMonoSC-Regular}[
- BoldFont = SourceHanMonoSC-Medium ,
- ItalicFont = * ,
- BoldItalicFont = SourceHanMonoSC-Medium ]
-}{
- \setCJKmonofont{FandolFang-Regular.otf}[
- BoldFont = * ,
- BoldFeatures = {FakeBold=4} ,
- ItalicFont = * ,
- BoldItalicFont = * ,
- BoldItalicFeatures = {FakeBold=4} ]
-}
+\RequirePackage { indentfirst }
-\if at PJLlang@enable at CN
-\IfFontExistsTF{SourceHanSerifSC-Regular}{%
- \setCJKfamilyfont{SCmain}{SourceHanSerifSC-Regular}[
- BoldFont = SourceHanSerifSC-Bold ,
- ItalicFont = * ,
- BoldItalicFont = SourceHanSerifSC-Bold ]
-}{
- \setCJKfamilyfont{SCmain}{FandolSong-Regular.otf}[
- BoldFont = FandolSong-Bold.otf ,
- ItalicFont = FandolKai-Regular.otf ,
- BoldItalicFont = FandolKai-Regular.otf ,
- BoldItalicFeatures = {FakeBold=4} ]
-}
-\IfFontExistsTF{SourceHanSansSC-Regular}{%
- \setCJKfamilyfont{SCsans}{SourceHanSansSC-Regular}[
- BoldFont = SourceHanSansSC-Bold ,
- ItalicFont = * ,
- BoldItalicFont = SourceHanSansSC-Bold ]
-}{
- \setCJKfamilyfont{SCsans}{FandolHei-Regular.otf}[
- BoldFont = FandolHei-Bold.otf ,
- ItalicFont = * ,
- BoldItalicFont = FandolHei-Bold.otf ]
-}
-\IfFontExistsTF{SourceHanMonoSC-Regular}{%
- \setCJKfamilyfont{SCmono}{SourceHanMonoSC-Regular}[
- BoldFont = SourceHanMonoSC-Medium ,
- ItalicFont = * ,
- BoldItalicFont = SourceHanMonoSC-Medium ]
-}{
- \setCJKfamilyfont{SCmono}{FandolFang-Regular.otf}[
- BoldFont = * ,
- BoldFeatures = {FakeBold=4} ,
- ItalicFont = * ,
- BoldItalicFont = * ,
- BoldItalicFeatures = {FakeBold=4} ]
-}
-\fi
+\RequirePackage { colorist }
-\if at PJLlang@enable at TC
-\IfFontExistsTF{SourceHanSerifTC-Regular}{%
- \setCJKfamilyfont{TCmain}{SourceHanSerifTC-Regular}[
- BoldFont = SourceHanSerifTC-Bold ,
- ItalicFont = * ,
- BoldItalicFont = SourceHanSerifTC-Bold ]
-}{
- \setCJKfamilyfont{TCmain}{FandolSong-Regular.otf}[
- BoldFont = FandolSong-Bold.otf ,
- ItalicFont = FandolKai-Regular.otf ,
- BoldItalicFont = FandolKai-Regular.otf ,
- BoldItalicFeatures = {FakeBold=4} ]
-}
-\IfFontExistsTF{SourceHanSansTC-Regular}{%
- \setCJKfamilyfont{TCsans}{SourceHanSansTC-Regular}[
- BoldFont = SourceHanSansTC-Bold ,
- ItalicFont = * ,
- BoldItalicFont = SourceHanSansTC-Bold ]
-}{
- \setCJKfamilyfont{TCsans}{FandolHei-Regular.otf}[
- BoldFont = FandolHei-Bold.otf ,
- ItalicFont = * ,
- BoldItalicFont = FandolHei-Bold.otf ]
-}
-\IfFontExistsTF{SourceHanMonoTC-Regular}{%
- \setCJKfamilyfont{TCmono}{SourceHanMonoTC-Regular}[
- BoldFont = SourceHanMonoTC-Medium ,
- ItalicFont = * ,
- BoldItalicFont = SourceHanMonoTC-Medium ]
-}{
- \setCJKfamilyfont{TCmono}{FandolFang-Regular.otf}[
- BoldFont = * ,
- BoldFeatures = {FakeBold=4} ,
- ItalicFont = * ,
- BoldItalicFont = * ,
- BoldItalicFeatures = {FakeBold=4} ]
-}
-\fi
+\hfuzz=2pt
+\vfuzz=2pt
-\if at PJLlang@enable at JP
-\IfFontExistsTF{SourceHanSerif-Regular}{%
- \setCJKfamilyfont{JPmain}{SourceHanSerif-Regular}[
- BoldFont = SourceHanSerif-Bold ,
- ItalicFont = * ,
- BoldItalicFont = SourceHanSerif-Bold ]
-}{
- \setCJKfamilyfont{JPmain}{FandolSong-Regular.otf}[
- BoldFont = FandolSong-Bold.otf ,
- ItalicFont = FandolKai-Regular.otf ,
- BoldItalicFont = FandolKai-Regular.otf ,
- BoldItalicFeatures = {FakeBold=4} ]
-}
-\IfFontExistsTF{SourceHanSans-Regular}{%
- \setCJKfamilyfont{JPsans}{SourceHanSans-Regular}[
- BoldFont = SourceHanSans-Bold ,
- ItalicFont = * ,
- BoldItalicFont = SourceHanSans-Bold ]
-}{
- \setCJKfamilyfont{JPsans}{FandolHei-Regular.otf}[
- BoldFont = FandolHei-Bold.otf ,
- ItalicFont = * ,
- BoldItalicFont = FandolHei-Bold.otf ]
-}
-\IfFontExistsTF{SourceHanMono-Regular}{%
- \setCJKfamilyfont{JPmono}{SourceHanMono-Regular}[
- BoldFont = SourceHanMono-Medium ,
- ItalicFont = * ,
- BoldItalicFont = SourceHanMono-Medium ]
-}{
- \setCJKfamilyfont{JPmono}{FandolFang-Regular.otf}[
- BoldFont = * ,
- BoldFeatures = {FakeBold=4} ,
- ItalicFont = * ,
- BoldItalicFont = * ,
- BoldItalicFeatures = {FakeBold=4} ]
-}
-\fi
+%%================================
+%% Fonts
+%%================================
+\WarningFilter { latexfont } { Font~shape }
+\WarningFilter { latexfont } { Some~font }
-\WarningFilter{latexfont}{Font shape}
-\WarningFilter{latexfont}{Some font}
+\cs_new_protected:Nn \__colorclass_load_file_or_config:Nnn
+ {
+ \bool_if:NT #1
+ {
+ \exp_args:Nx \file_if_exist:nT { #2 }
+ {
+ \exp_args:Nx \file_input:n { #2 }
+ \use_none:nn
+ }
+ }
+ \use:n { #3 }
+ }
-\def\CJKsffamily{}
-\def\CJKttfamily{}
+\cs_new_protected:Nn \__colorclass_if_font_exist:nnn
+ {
+ \bool_if:NTF \l__colorclass_fast_bool
+ { #3 }
+ { \fontspec_font_if_exist:nTF { #1 } { #2 } { #3 } }
+ }
-\apptocmd{\sffamily}{\CJKsffamily}{}{\FAIL}
-\apptocmd{\ttfamily}{\CJKttfamily}{}{\FAIL}
+\__colorclass_load_file_or_config:Nnn \l__colorclass_load_custom_font_file_bool { \l__colorclass_custom_font_file_str }
+ {
+ \RequirePackage { projlib-font }
-\if at PJLlang@enable at CN
-\gappto{\PJLlang at langconfig@CN}{%
- \def\CJKsffamily{\CJKfamily{SCsans}}%
- \def\CJKttfamily{\CJKfamily{SCmono}}%
- \CJKfamily{SCmain}%
-}
-\fi
+ \bool_if:NF \g_projlib_font_already_set_bool
+ {
+ \bool_if:NT \l__colorclass_fast_bool
+ {
+ \RequirePackage { mathpazo }
+ }
-\if at PJLlang@enable at TC
-\gappto{\PJLlang at langconfig@TC}{%
- \def\CJKsffamily{\CJKfamily{TCsans}}%
- \def\CJKttfamily{\CJKfamily{TCmono}}%
- \CJKfamily{TCmain}%
-}
-\fi
+ \PassOptionsToPackage { no-math,quiet } { fontspec }
+ \RequirePackage { fontspec }
-\if at PJLlang@enable at JP
-\gappto{\PJLlang at langconfig@JP}{%
- \def\CJKsffamily{\CJKfamily{JPsans}}%
- \def\CJKttfamily{\CJKfamily{JPmono}}%
- \CJKfamily{JPmain}%
-}
-\fi
-}
+ \__colorclass_load_file_or_config:Nnn \l__colorclass_load_custom_font_file_latin_bool { \l__colorclass_custom_font_file_latin_str }
+ {
+ \__colorclass_if_font_exist:nnn { Palatino~Linotype }
+ {
+ \bool_if:NTF \l__projlib_font_useosf_bool
+ {
+ \setmainfont { Palatino~Linotype } [ Numbers = OldStyle ]
+ }
+ {
+ \setmainfont { Palatino~Linotype }
+ }
+ }
+ {
+ \bool_if:NTF \l__projlib_font_useosf_bool
+ {
+ \setmainfont { TeXGyrePagellaX-Regular.otf }
+ [
+ BoldFont = TeXGyrePagellaX-Bold.otf ,
+ ItalicFont = TeXGyrePagellaX-Italic.otf ,
+ BoldItalicFont = TeXGyrePagellaX-BoldItalic.otf ,
+ Numbers = OldStyle ,
+ ]
+ }
+ {
+ \setmainfont { TeXGyrePagellaX-Regular.otf }
+ [
+ BoldFont = TeXGyrePagellaX-Bold.otf ,
+ ItalicFont = TeXGyrePagellaX-Italic.otf ,
+ BoldItalicFont = TeXGyrePagellaX-BoldItalic.otf ,
+ ]
+ }
+ }
+ \setsansfont { SourceSansPro-Regular.otf }
+ [
+ Scale = MatchLowercase ,
+ BoldFont = SourceSansPro-Bold.otf ,
+ ItalicFont = SourceSansPro-RegularIt.otf ,
+ BoldItalicFont = SourceSansPro-BoldIt.otf ,
+ ]
+ \setmonofont { NewCMMono10-Regular.otf }
+ [
+ Scale = 1.05 ,
+ BoldFont = NewCMMono10-Bold.otf ,
+ ItalicFont = NewCMMono10-Italic.otf ,
+ BoldItalicFont = NewCMMono10-BoldOblique.otf ,
+ ]
-\if at colorclass@customfont\else
-\if at colorclass@fast
-\RequirePackage{amssymb}
-\else
-\PassOptionsToPackage
- {warnings-off={mathtools-colon,mathtools-overbracket}}{unicode-math}
-\RequirePackage{unicode-math}
-\unimathsetup{math-style=ISO, partial=upright, nabla=upright}
-\setmathfont{Asana-Math.otf}
-\IfFontExistsTF{Neo Euler}{%
-\setmathfont[range={up/{Latin,latin,Greek,greek},
- bfup/{Latin,latin,Greek,greek},
- cal, bfcal, frak, bffrak,
- `(,`),`[,`],`\{,`\},`:,`=,\ne,\equiv,`/,\backslash,
- \in,\notin,\ni,\subset,\supset,\subseteq,\supseteq,
- \rightarrow,\leftarrow,\mapsto,\hookrightarrow,\hookleftarrow,
- \sum,\prod,\coprod,
- \sqrt,\int,\iint,\iiint,\oint},
- script-features={},
- sscript-features={},
- Scale = 1.05,
- ]{Neo Euler}
-}{}
-\setmathfont[range={\leq,\geq,\ll,\gg,\lll,\ggg,\leqslant,\geqslant},
- Scale = 0.95,
- ]{latinmodern-math.otf}
-\setmathfont[range={up/num, bfup/num}
- ]{texgyrepagella-math.otf}
+ \projlib_language_set_linespacing_latin:n { \setstretch { 1.07 } }
+ }
+ }
-\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}}
-\renewcommand{\frac}[2]{\genfrac{}{}{}{}{
- \mathchoice
- {\raisebox{-.15em}{$\displaystyle #1$}}
- {\raisebox{-.15em}{$\textstyle #1$}}
- {\raisebox{-.08em}{$\scriptstyle #1$}}
- {\scriptscriptstyle #1}
-}{
- \mathchoice
- {\raisebox{.08em}{$\displaystyle #2$}}
- {\raisebox{.08em}{$\textstyle #2$}}
- {\raisebox{.05em}{$\scriptstyle #2$}}
- {\scriptscriptstyle #2}
-}}
-}
+ \PassOptionsToPackage { fontset = none, scheme = plain } { ctex }
+ \RequirePackage { ctex }
-\RequirePackage{tikz-cd}
-\newbox\xratbelow
-\newbox\xratabove
-\renewcommand{\xrightarrow}[2][]{%
- \setbox\xratbelow=\hbox{\ensuremath{\scriptstyle #1}}%
- \setbox\xratabove=\hbox{\ensuremath{\scriptstyle #2}}%
- \pgfmathsetlengthmacro{\xratlen}{max(\wd\xratbelow, \wd\xratabove) + .8em}%
- \mathrel{\tikz [->, baseline=-.55ex, every node/.style={inner sep=0pt}]
- \draw (0,0) -- node[below=3pt] {\box\xratbelow}
- node[above=2pt] {\box\xratabove}
- (\xratlen,0) ;}}
-\renewcommand{\xleftarrow}[2][]{%
- \setbox\xratbelow=\hbox{\ensuremath{\scriptstyle #1}}%
- \setbox\xratabove=\hbox{\ensuremath{\scriptstyle #2}}%
- \pgfmathsetlengthmacro{\xratlen}{max(\wd\xratbelow, \wd\xratabove) + .8em}%
- \mathrel{\tikz [<-, baseline=-.55ex, every node/.style={inner sep=0pt}]
- \draw (0,0) -- node[below=3pt] {\box\xratbelow}
- node[above=2pt] {\box\xratabove}
- (\xratlen,0) ;}}
-\renewcommand{\xleftrightarrow}[2][]{%
- \setbox\xratbelow=\hbox{\ensuremath{\scriptstyle #1}}%
- \setbox\xratabove=\hbox{\ensuremath{\scriptstyle #2}}%
- \pgfmathsetlengthmacro{\xratlen}{max(\wd\xratbelow, \wd\xratabove) + .8em}%
- \mathrel{\tikz [<->, baseline=-.55ex, every node/.style={inner sep=0pt}]
- \draw (0,0) -- node[below=3pt] {\box\xratbelow}
- node[above=2pt] {\box\xratabove}
- (\xratlen,0) ;}}
-\renewcommand{\xhookrightarrow}[2][]{%
- \setbox\xratbelow=\hbox{\ensuremath{\scriptstyle #1}}%
- \setbox\xratabove=\hbox{\ensuremath{\scriptstyle #2}}%
- \pgfmathsetlengthmacro{\xratlen}{max(\wd\xratbelow, \wd\xratabove) + .8em}%
- \mathrel{\tikz [baseline=-.55ex, every node/.style={inner sep=0pt}]
- \draw (0,0) edge[commutative diagrams/hookrightarrow] node[below=3pt] {\box\xratbelow}
- node[above=2pt] {\box\xratabove}
- (\xratlen,0) ;}}
-\renewcommand{\xhookleftarrow}[2][]{%
- \setbox\xratbelow=\hbox{\ensuremath{\scriptstyle #1}}%
- \setbox\xratabove=\hbox{\ensuremath{\scriptstyle #2}}%
- \pgfmathsetlengthmacro{\xratlen}{max(\wd\xratbelow, \wd\xratabove) + .8em}%
- \mathrel{\tikz [baseline=-.55ex, every node/.style={inner sep=0pt}]
- \draw (0,0) edge[commutative diagrams/hookleftarrow] node[below=3pt] {\box\xratbelow}
- node[above=2pt] {\box\xratabove}
- (\xratlen,0) ;}}
-\renewcommand{\xmapsto}[2][]{%
- \setbox\xratbelow=\hbox{\ensuremath{\scriptstyle #1}}%
- \setbox\xratabove=\hbox{\ensuremath{\scriptstyle #2}}%
- \pgfmathsetlengthmacro{\xratlen}{max(\wd\xratbelow, \wd\xratabove) + .8em}%
- \mathrel{\tikz [baseline=-.55ex, every node/.style={inner sep=0pt}]
- \draw (0,0) edge[commutative diagrams/mapsto] node[below=3pt] {\box\xratbelow}
- node[above=2pt] {\box\xratabove}
- (\xratlen,0) ;}}
-\newcommand{\xlongequal}[2][]{%
- \setbox\xratbelow=\hbox{\ensuremath{\scriptstyle #1}}%
- \setbox\xratabove=\hbox{\ensuremath{\scriptstyle #2}}%
- \pgfmathsetlengthmacro{\xratlen}{max(\wd\xratbelow, \wd\xratabove) + .8em}%
- \mathrel{\tikz [baseline=-.55ex, every node/.style={inner sep=0pt}]
- \draw (0,0) edge[commutative diagrams/equal] node[below=3pt] {\box\xratbelow}
- node[above=2pt] {\box\xratabove}
- (\xratlen,0) ;}}
+ \__colorclass_load_file_or_config:Nnn \l__colorclass_load_custom_font_file_cjk_bool { \l__colorclass_custom_font_file_cjk_str }
+ {
+ \__colorclass_if_font_exist:nnn { SourceHanSerifSC-Regular }
+ {
+ \setCJKmainfont { SourceHanSerifSC-Regular }
+ [
+ BoldFont = SourceHanSerifSC-Bold ,
+ ItalicFont = * ,
+ BoldItalicFont = SourceHanSerifSC-Bold ,
+ ]
+ }
+ {
+ \setCJKmainfont { FandolSong-Regular.otf }
+ [
+ BoldFont = FandolSong-Bold.otf ,
+ ItalicFont = FandolKai-Regular.otf ,
+ BoldItalicFont = FandolKai-Regular.otf ,
+ BoldItalicFeatures = { FakeBold = 4 } ,
+ ]
+ }
-\AtBeginDocument{
-\renewcommand{\twoheadrightarrow}{%
- \mathrel{\tikz [baseline=-.55ex, every node/.style={inner sep=0pt}]
- \draw (0,0) edge[commutative diagrams/twoheadrightarrow] (.8em,0) ;}}
+ \__colorclass_if_font_exist:nnn { SourceHanSansSC-Regular }
+ {
+ \setCJKsansfont{SourceHanSansSC-Regular}
+ [
+ BoldFont = SourceHanSansSC-Bold ,
+ ItalicFont = * ,
+ BoldItalicFont = SourceHanSansSC-Bold ,
+ ]
+ }
+ {
+ \setCJKsansfont { FandolHei-Regular.otf }
+ [
+ BoldFont = FandolHei-Bold.otf ,
+ ItalicFont = * ,
+ BoldItalicFont = FandolHei-Bold.otf ,
+ ]
+ }
-\renewcommand{\twoheadleftarrow}{%
- \mathrel{\tikz [baseline=-.55ex, every node/.style={inner sep=0pt}]
- \draw (0,0) edge[commutative diagrams/twoheadleftarrow] (.8em,0) ;}}
-}
-\fi
-\fi
+ \__colorclass_if_font_exist:nnn { SourceHanMonoSC-Regular }
+ {
+ \setCJKmonofont { SourceHanMonoSC-Regular }
+ [
+ BoldFont = SourceHanMonoSC-Medium ,
+ ItalicFont = * ,
+ BoldItalicFont = SourceHanMonoSC-Medium ,
+ ]
+ }
+ {
+ \setCJKmonofont { FandolFang-Regular.otf }
+ [
+ BoldFont = * ,
+ BoldFeatures = { FakeBold = 4 } ,
+ ItalicFont = * ,
+ BoldItalicFont = * ,
+ BoldItalicFeatures = { FakeBold = 4 } ,
+ ]
+ }
-\if at colorclass@lmodern
- \RequirePackage{amssymb}
- \if at colorclass@useosf
- \RequirePackage{cfr-lm}
- \else
- \RequirePackage{lmodern}
- \fi
- \PJLsetlinespacing{\setstretch{1.00}}
-\fi
+ \bool_if:NT \g__projlib_language_enabled_schinese_bool
+ {
+ \__colorclass_if_font_exist:nnn { SourceHanSerifSC-Regular }
+ {
+ \setCJKfamilyfont { SCmain } { SourceHanSerifSC-Regular }
+ [
+ BoldFont = SourceHanSerifSC-Bold ,
+ ItalicFont = * ,
+ BoldItalicFont = SourceHanSerifSC-Bold ,
+ ]
+ }
+ {
+ \setCJKfamilyfont { SCmain } { FandolSong-Regular.otf }
+ [
+ BoldFont = FandolSong-Bold.otf ,
+ ItalicFont = FandolKai-Regular.otf ,
+ BoldItalicFont = FandolKai-Regular.otf ,
+ BoldItalicFeatures = { FakeBold = 4 } ,
+ ]
+ }
+ \__colorclass_if_font_exist:nnn { SourceHanSansSC-Regular }
+ {
+ \setCJKfamilyfont { SCsans } { SourceHanSansSC-Regular }
+ [
+ BoldFont = SourceHanSansSC-Bold ,
+ ItalicFont = * ,
+ BoldItalicFont = SourceHanSansSC-Bold ,
+ ]
+ }
+ {
+ \setCJKfamilyfont { SCsans } { FandolHei-Regular.otf }
+ [
+ BoldFont = FandolHei-Bold.otf ,
+ ItalicFont = * ,
+ BoldItalicFont = FandolHei-Bold.otf ,
+ ]
+ }
+ \__colorclass_if_font_exist:nnn { SourceHanMonoSC-Regular }
+ {
+ \setCJKfamilyfont { SCmono } { SourceHanMonoSC-Regular }
+ [
+ BoldFont = SourceHanMonoSC-Medium ,
+ ItalicFont = * ,
+ BoldItalicFont = SourceHanMonoSC-Medium ,
+ ]
+ }
+ {
+ \setCJKfamilyfont { SCmono } { FandolFang-Regular.otf }
+ [
+ BoldFont = * ,
+ BoldFeatures = { FakeBold = 4 } ,
+ ItalicFont = * ,
+ BoldItalicFont = * ,
+ BoldItalicFeatures = { FakeBold = 4 } ,
+ ]
+ }
+ }
-\if at colorclass@palatino
- \RequirePackage{amssymb}
- \RequirePackage{mathpazo}
- \PassOptionsToPackage{defaultsups}{newpxtext}
- \RequirePackage{newpxtext}
- % \RequirePackage{newpxmath}
- \let\openbox\relax
- \PJLsetlinespacing{\setstretch{1.07}}
- \if at colorclass@useosf\useosf\fi
-\fi
+ \bool_if:NT \g__projlib_language_enabled_tchinese_bool
+ {
+ \__colorclass_if_font_exist:nnn { SourceHanSerifTC-Regular }
+ {
+ \setCJKfamilyfont { TCmain } { SourceHanSerifTC-Regular }
+ [
+ BoldFont = SourceHanSerifTC-Bold ,
+ ItalicFont = * ,
+ BoldItalicFont = SourceHanSerifTC-Bold ,
+ ]
+ }
+ {
+ \setCJKfamilyfont { TCmain } { FandolSong-Regular.otf }
+ [
+ BoldFont = FandolSong-Bold.otf ,
+ ItalicFont = FandolKai-Regular.otf ,
+ BoldItalicFont = FandolKai-Regular.otf ,
+ BoldItalicFeatures = { FakeBold = 4 } ,
+ ]
+ }
+ \__colorclass_if_font_exist:nnn { SourceHanSansTC-Regular }
+ {
+ \setCJKfamilyfont { TCsans } { SourceHanSansTC-Regular }
+ [
+ BoldFont = SourceHanSansTC-Bold ,
+ ItalicFont = * ,
+ BoldItalicFont = SourceHanSansTC-Bold ,
+ ]
+ }
+ {
+ \setCJKfamilyfont { TCsans } { FandolHei-Regular.otf }
+ [
+ BoldFont = FandolHei-Bold.otf ,
+ ItalicFont = * ,
+ BoldItalicFont = FandolHei-Bold.otf ,
+ ]
+ }
+ \__colorclass_if_font_exist:nnn { SourceHanMonoTC-Regular }
+ {
+ \setCJKfamilyfont { TCmono } { SourceHanMonoTC-Regular }
+ [
+ BoldFont = SourceHanMonoTC-Medium ,
+ ItalicFont = * ,
+ BoldItalicFont = SourceHanMonoTC-Medium ,
+ ]
+ }
+ {
+ \setCJKfamilyfont { TCmono } { FandolFang-Regular.otf }
+ [
+ BoldFont = * ,
+ BoldFeatures = { FakeBold = 4 } ,
+ ItalicFont = * ,
+ BoldItalicFont = * ,
+ BoldItalicFeatures = { FakeBold = 4 } ,
+ ]
+ }
+ }
-\if at colorclass@times
- \RequirePackage{amssymb}
- \PassOptionsToPackage{defaultsups}{newtxtext}
- \RequirePackage{newtxtext}
- \RequirePackage{newtxmath}
- \let\openbox\relax
- \PJLsetlinespacing{\setstretch{1.00}}
- \if at colorclass@useosf\useosf\fi
- \let\colorist at sffamily\relax
-\fi
+ \bool_if:NT \g__projlib_language_enabled_japanese_bool
+ {
+ \__colorclass_if_font_exist:nnn { SourceHanSerif-Regular }
+ {
+ \setCJKfamilyfont { JPmain } { SourceHanSerif-Regular }
+ [
+ BoldFont = SourceHanSerif-Bold ,
+ ItalicFont = * ,
+ BoldItalicFont = SourceHanSerif-Bold ,
+ ]
+ }
+ {
+ \setCJKfamilyfont { JPmain } { FandolSong-Regular.otf }
+ [
+ BoldFont = FandolSong-Bold.otf ,
+ ItalicFont = FandolKai-Regular.otf ,
+ BoldItalicFont = FandolKai-Regular.otf ,
+ BoldItalicFeatures = { FakeBold = 4 } ,
+ ]
+ }
+ \__colorclass_if_font_exist:nnn { SourceHanSans-Regular }
+ {
+ \setCJKfamilyfont { JPsans } { SourceHanSans-Regular }
+ [
+ BoldFont = SourceHanSans-Bold ,
+ ItalicFont = * ,
+ BoldItalicFont = SourceHanSans-Bold ,
+ ]
+ }
+ {
+ \setCJKfamilyfont { JPsans } { FandolHei-Regular.otf }
+ [
+ BoldFont = FandolHei-Bold.otf ,
+ ItalicFont = * ,
+ BoldItalicFont = FandolHei-Bold.otf ,
+ ]
+ }
+ \__colorclass_if_font_exist:nnn { SourceHanMono-Regular }
+ {
+ \setCJKfamilyfont { JPmono } { SourceHanMono-Regular }
+ [
+ BoldFont = SourceHanMono-Medium ,
+ ItalicFont = * ,
+ BoldItalicFont = SourceHanMono-Medium ,
+ ]
+ }
+ {
+ \setCJKfamilyfont { JPmono } { FandolFang-Regular.otf }
+ [
+ BoldFont = * ,
+ BoldFeatures = { FakeBold = 4 } ,
+ ItalicFont = * ,
+ BoldItalicFont = * ,
+ BoldItalicFeatures = { FakeBold = 4 } ,
+ ]
+ }
+ }
-\if at colorclass@garamond
- \RequirePackage{amssymb}
- \if at colorclass@useosf\else
- \PassOptionsToPackage{lining}{ebgaramond}
- \fi
- \RequirePackage{ebgaramond-maths}
- \RequirePackage{ebgaramond}
- % \RequirePackage{garamondlibre}
- \PJLsetlinespacing{\setstretch{1.00}}
- \let\colorist at sffamily\relax
-\fi
+ \cs_new:Nn \colorclass_cjk_sffamily: {}
+ \cs_new:Nn \colorclass_cjk_ttfamily: {}
-\if at colorclass@noto
- \RequirePackage{amssymb}
- \if at colorclass@useosf
- \PassOptionsToPackage{oldstyle}{notomath}
- \fi
- \RequirePackage{anyfontsize}
- \RequirePackage{notomath}
- \PJLsetlinespacing{\setstretch{1.00}}
-\fi
+ \hook_gput_code:nnn { cmd/sffamily/after } { colorclass } { \colorclass_cjk_sffamily: }
+ \hook_gput_code:nnn { cmd/ttfamily/after } { colorclass } { \colorclass_cjk_ttfamily: }
-\if at colorclass@biolinum
- \RequirePackage{amssymb}
- % \RequirePackage{mathpazo}
- % \RequirePackage[sansmath]{libertinust1math}
- \ifPDFTeX
- \if at colorclass@useosf
- \PassOptionsToPackage{osf}{biolinum}
- \fi
- \RequirePackage{biolinum}
- \renewcommand*\familydefault{\biolinum at family}
- \else
- \PassOptionsToPackage{no-math}{fontspec}
- \RequirePackage{fontspec}
- \setmainfont{LinBiolinum_R.otf}[
- BoldFont = LinBiolinum_RB.otf ,
- ItalicFont = LinBiolinum_RI.otf ,
- BoldItalicFont = LinBiolinum_RBO.otf,
- \if at colorclass@useosf Numbers = OldStyle\fi ]
- \fi
- \PJLsetlinespacing{\setstretch{1.05}}
- \RequirePackage[italic,defaultmathsizes]{mathastext}
-\fi
+ \AddLanguageSetting [schinese]
+ {
+ \cs_set:Nn \colorclass_cjk_sffamily: { \CJKfamily { SCsans } }
+ \cs_set:Nn \colorclass_cjk_ttfamily: { \CJKfamily { SCmono } }
+ \CJKfamily { SCmain }
+ }
+ \AddLanguageSetting [tchinese]
+ {
+ \cs_set:Nn \colorclass_cjk_sffamily: { \CJKfamily { TCsans } }
+ \cs_set:Nn \colorclass_cjk_ttfamily: { \CJKfamily { TCmono } }
+ \CJKfamily { TCmain }
+ }
+ \AddLanguageSetting [japanese]
+ {
+ \cs_set:Nn \colorclass_cjk_sffamily: { \CJKfamily { JPsans } }
+ \cs_set:Nn \colorclass_cjk_ttfamily: { \CJKfamily { JPmono } }
+ \CJKfamily { JPmain }
+ }
+ }
-\def\PJL at font@alreadyset{}
+ \__colorclass_load_file_or_config:Nnn \l__colorclass_load_custom_font_file_math_bool { \l__colorclass_custom_font_file_math_str }
+ {
+ \bool_if:NF \g_projlib_font_already_set_bool
+ {
+ \bool_if:NTF \l__colorclass_fast_bool
+ {
+ \RequirePackage { amssymb }
+ }
+ {
+ \PassOptionsToPackage { warnings-off = { mathtools-colon, mathtools-overbracket } } { unicode-math }
+ \RequirePackage { unicode-math }
+ \unimathsetup { math-style = ISO, partial = upright, nabla = upright }
+ \setmathfont { Asana-Math.otf }
+ \__colorclass_if_font_exist:nnn { Neo~Euler }
+ {
+ \setmathfont { Neo~Euler }
+ [
+ range = { up / { Latin, latin, Greek, greek },
+ bfup / { Latin, latin, Greek, greek },
+ cal, bfcal, frak, bffrak,
+ `(, `), `[, `], `\{, `\}, `:, `=, \ne, \equiv, `/, \backslash,
+ \in, \notin, \ni, \subset, \supset, \subseteq, \supseteq,
+ \rightarrow, \leftarrow, \leftrightarrow,
+ \longleftarrow, \longrightarrow, \longleftrightarrow,
+ \Leftarrow, \Rightarrow, \Leftrightarrow,
+ \Longleftarrow, \Longrightarrow, \Longleftrightarrow,
+ \nrightarrow, \nleftarrow, \nleftrightarrow,
+ \nLeftarrow, \nRightarrow, \nLeftrightarrow,
+ \mapsto, \hookrightarrow, \hookleftarrow,
+ \leftharpoonup, \rightharpoonup, \leftharpoondown, \rightharpoondown,
+ \rightleftharpoons, \leftrightharpoons,
+ \sum, \prod, \coprod,
+ \sqrt, \int, \iint, \iiint, \oint
+ },
+ script-features = {},
+ sscript-features = {},
+ Scale = 1.05,
+ ]
+ }{}
+ \setmathfont { latinmodern-math.otf }
+ [
+ range = { \leq, \geq, \ll, \gg, \lll, \ggg, \leqslant, \geqslant },
+ Scale = 0.95,
+ ]
+ \setmathfont { texgyrepagella-math.otf }
+ [
+ range = { up / num, bfup / num }
+ ]
-\PassOptionsToPackage{verbose=silent}{microtype}
-\RequirePackage{microtype}
-\PassOptionsToPackage{all}{nowidow}
-\RequirePackage{nowidow}
-\RequirePackage{embrac}
+ \hook_gput_code:nnn { begindocument } { colorclass }
+ {
+ \NewCommandCopy \colorclass_backup_mid: \mid
+ \RenewDocumentCommand \mid {}
+ { \skip_horizontal:n {-.15em} \colorclass_backup_mid: \skip_horizontal:n {-.15em} }
+ \NewCommandCopy \colorclass_backup_nmid: \nmid
+ \RenewDocumentCommand \nmid {}
+ { \skip_horizontal:n {-.15em} \colorclass_backup_nmid: \skip_horizontal:n {-.15em} }
+ }
+ \RequirePackage { tikz-cd }
+
+ \box_new:N \l__colorclass_xarrows_above_box
+ \box_new:N \l__colorclass_xarrows_below_box
+ \dim_new:N \l__colorclass_xarrows_length_dim
+ \cs_new_protected:Nn \colorclass_xarrows_generic:nnnn
+ % #3 = option of \tikz
+ % #4 = edge of \draw
+ {
+ \hbox_set:Nn \l__colorclass_xarrows_below_box { \ensuremath { \scriptstyle #1 } }
+ \hbox_set:Nn \l__colorclass_xarrows_above_box { \ensuremath { \scriptstyle #2 } }
+ \dim_set:Nn \l__colorclass_xarrows_length_dim
+ { \dim_eval:n { \dim_max:nn { \box_wd:N \l__colorclass_xarrows_below_box } { \box_wd:N \l__colorclass_xarrows_above_box } + .8em } }
+ \mathrel
+ {
+ \tikz [ #3, baseline = -.55ex, every~node/.style = { inner~sep = 0pt } ]
+ \draw (0,0) #4
+ node [ below = 3pt ] { \box_use:N \l__colorclass_xarrows_below_box }
+ node [ above = 2pt ] { \box_use:N \l__colorclass_xarrows_above_box }
+ ( \l__colorclass_xarrows_length_dim ,0) ;
+ }
+ }
+
+ \RenewDocumentCommand \xrightarrow { O{} m }
+ {
+ \colorclass_xarrows_generic:nnnn { #1 } { #2 } { -> } { -- }
+ }
+ \RenewDocumentCommand \xleftarrow { O{} m }
+ {
+ \colorclass_xarrows_generic:nnnn { #1 } { #2 } { <- } { -- }
+ }
+ \RenewDocumentCommand \xleftrightarrow { O{} m }
+ {
+ \colorclass_xarrows_generic:nnnn { #1 } { #2 } { <-> } { -- }
+ }
+ \RenewDocumentCommand \xhookrightarrow { O{} m }
+ {
+ \colorclass_xarrows_generic:nnnn { #1 } { #2 } {} { edge [ commutative~diagrams/hookrightarrow ] }
+ }
+ \RenewDocumentCommand \xhookleftarrow { O{} m }
+ {
+ \colorclass_xarrows_generic:nnnn { #1 } { #2 } {} { edge [ commutative~diagrams/hookleftarrow ] }
+ }
+ \RenewDocumentCommand \xmapsto { O{} m }
+ {
+ \colorclass_xarrows_generic:nnnn { #1 } { #2 } {} { edge [ commutative~diagrams/mapsto ] }
+ }
+ \NewDocumentCommand \xlongequal { O{} m }
+ {
+ \colorclass_xarrows_generic:nnnn { #1 } { #2 } {} { edge [ commutative~diagrams/equal ] }
+ }
+ \hook_gput_code:nnn { begindocument/end } { colorclass }
+ {
+ \RenewDocumentCommand \twoheadrightarrow {}
+ {
+ \colorclass_xarrows_generic:nnnn { \,\, } {} {} { edge [ commutative~diagrams/twoheadrightarrow ] }
+ }
+ \RenewDocumentCommand \twoheadleftarrow {}
+ {
+ \colorclass_xarrows_generic:nnnn { \,\, } {} {} { edge [ commutative~diagrams/twoheadleftarrow ] }
+ }
+ }
+ }
+ }
+ }
+ }
+
+\PassOptionsToPackage { all } { nowidow }
+\RequirePackage { nowidow }
+\RequirePackage { embrac }
+
%%================================
-%% Graphics
+%% Graphics
%%================================
-\RequirePackage{graphicx}
-\graphicspath{{images/}}
-\RequirePackage{wrapfig}
-\RequirePackage{float}
-\RequirePackage{caption}
-\captionsetup{font=small}
+\RequirePackage { graphicx }
+\graphicspath { { images/ } }
+\RequirePackage { wrapfig }
+\RequirePackage { float }
+\RequirePackage { caption }
+\captionsetup { font = small }
\endinput
%%
Modified: branches/branch2021.final/Master/texmf-dist/tex/latex/minimalist/minimalist-classical.sty
===================================================================
--- branches/branch2021.final/Master/texmf-dist/tex/latex/minimalist/minimalist-classical.sty 2022-03-20 21:13:02 UTC (rev 62833)
+++ branches/branch2021.final/Master/texmf-dist/tex/latex/minimalist/minimalist-classical.sty 2022-03-20 21:14:50 UTC (rev 62834)
@@ -19,7 +19,7 @@
\RequirePackage{l3keys2e}
\ProvidesExplPackage
{minimalist-classical}
- {2022/03/17} {}
+ {2022/03/19} {}
{The classical style of minimalist}
\@ifpackageloaded { minimalist } {}
@@ -185,7 +185,7 @@
\renewcommand{\chaptermark}[1]{\markboth{\textsc{#1}}{\textsc{#1}}}
\fi
\renewcommand*{\sectionmark}[1]{
- \markright{\g_minimalist_section_decoration_char_tl\nobreakspace\arabic{section}\nobreakspace\g_minimalist_section_decoration_char_tl\nobreakspace\nobreakspace\nobreakspace#1}}
+ \markright{\protect\g_minimalist_section_decoration_char_tl\nobreakspace\arabic{section}\nobreakspace\protect\g_minimalist_section_decoration_char_tl\nobreakspace\nobreakspace\nobreakspace#1}}
}
{
\if at twoside
@@ -565,24 +565,50 @@
\RequirePackage { projlib-theorem }
+\exp_args:No \SetTheorem { \c_projlib_theorem_supported_clist }
+ {
+ name style = {
+ , heading style = {
+ , english = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc
+ , french = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc
+ , ngerman = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc
+ , italian = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc
+ , portuguese = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc
+ , brazilian = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc
+ , spanish = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc
+ , schinese = \minimalist_bfseries:\g_minimalist_title_font_common_tl
+ , tchinese = \minimalist_bfseries:\g_minimalist_title_font_common_tl
+ , japanese = \minimalist_bfseries:\g_minimalist_title_font_common_tl
+ , russian = \minimalist_bfseries:\g_minimalist_title_font_common_tl
+ }
+ }
+ }
+
+\SetTheorem { remark }
+ {
+ name style = {
+ , heading style = {
+ , english = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit
+ , french = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit
+ , ngerman = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit
+ , italian = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit
+ , portuguese = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit
+ , brazilian = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit
+ , spanish = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit
+ , russian = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit
+ , schinese = \minimalist_bfseries:\g_minimalist_title_font_common_tl
+ , tchinese = \minimalist_bfseries:\g_minimalist_title_font_common_tl
+ , japanese = \minimalist_bfseries:\g_minimalist_title_font_common_tl
+ , russian = \minimalist_bfseries:\g_minimalist_title_font_common_tl
+ }
+ }
+ }
+
\bool_if:NF \l__projlib_theorem_complexname_bool
{
\exp_args:No \SetTheorem { \c_projlib_theorem_supported_clist }
{
name style = {
- , heading style = {
- , english = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc
- , french = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc
- , ngerman = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc
- , italian = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc
- , portuguese = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc
- , brazilian = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc
- , spanish = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc
- , schinese = \minimalist_bfseries:\g_minimalist_title_font_common_tl
- , tchinese = \minimalist_bfseries:\g_minimalist_title_font_common_tl
- , japanese = \minimalist_bfseries:\g_minimalist_title_font_common_tl
- , russian = \minimalist_bfseries:\g_minimalist_title_font_common_tl
- }
, crefname style = {
, english = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc
, french = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc
@@ -628,20 +654,6 @@
\SetTheorem { remark }
{
name style = {
- , heading style = {
- , english = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit
- , french = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit
- , ngerman = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit
- , italian = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit
- , portuguese = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit
- , brazilian = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit
- , spanish = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit
- , russian = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit
- , schinese = \minimalist_bfseries:\g_minimalist_title_font_common_tl
- , tchinese = \minimalist_bfseries:\g_minimalist_title_font_common_tl
- , japanese = \minimalist_bfseries:\g_minimalist_title_font_common_tl
- , russian = \minimalist_bfseries:\g_minimalist_title_font_common_tl
- }
, crefname style = {
, english = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit
, french = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit
@@ -656,7 +668,7 @@
, japanese = \minimalist_bfseries:\g_minimalist_title_font_common_tl
, russian = \minimalist_bfseries:\g_minimalist_title_font_common_tl
}
- , crefname style = {
+ , Crefname style = {
, english = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit
, french = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit
, ngerman = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit
Modified: branches/branch2021.final/Master/texmf-dist/tex/latex/minimalist/minimalist-plain.sty
===================================================================
--- branches/branch2021.final/Master/texmf-dist/tex/latex/minimalist/minimalist-plain.sty 2022-03-20 21:13:02 UTC (rev 62833)
+++ branches/branch2021.final/Master/texmf-dist/tex/latex/minimalist/minimalist-plain.sty 2022-03-20 21:14:50 UTC (rev 62834)
@@ -19,7 +19,7 @@
\RequirePackage{l3keys2e}
\ProvidesExplPackage
{minimalist-plain}
- {2022/03/17} {}
+ {2022/03/19} {}
{The plain style of minimalist}
\@ifpackageloaded { minimalist } {}
@@ -115,14 +115,14 @@
{
\fancyhf{}
\if at twoside
- \fancyfoot[RO]{\small\textcolor{main-text!30!paper}{ \l_minimalist_rightmark_tl }
- \nobreakspace\nobreakspace\rlap{\textcolor{main-text!27!paper}{ \l_minimalist_sep_bar }\nobreakspace\nobreakspace\thepage}}
- \fancyfoot[LE]{\small\leavevmode\llap{\thepage
- \nobreakspace\nobreakspace\textcolor{main-text!27!paper}{ \l_minimalist_sep_bar }}
- \nobreakspace\nobreakspace\textcolor{main-text!30!paper}{ \l_minimalist_leftmark_tl }}
+ \fancyfoot[RO]{\textcolor{main-text!30!paper}{ \small \l_minimalist_rightmark_tl }
+ \rlap{\nobreakspace\nobreakspace\nobreakspace\nobreakspace\textcolor{main-text!75!paper}{\minimalist_bfseries: \thepage}}}
+ \fancyfoot[LE]{\leavevmode\llap{\textcolor{main-text!75!paper}{\minimalist_bfseries: \thepage}
+ \nobreakspace\nobreakspace\nobreakspace\nobreakspace}
+ \textcolor{main-text!30!paper}{ \l_minimalist_leftmark_tl }}
\else
- \fancyfoot[R]{\small\textcolor{main-text!30!paper}{ \l_minimalist_rightmark_tl }
- \nobreakspace\nobreakspace\rlap{\textcolor{main-text!27!paper}{ \l_minimalist_sep_bar }\nobreakspace\nobreakspace\thepage}}
+ \fancyfoot[R]{\textcolor{main-text!30!paper}{ \l_minimalist_rightmark_tl }
+ \rlap{\nobreakspace\nobreakspace\nobreakspace\nobreakspace\textcolor{main-text!75!paper}{\minimalist_bfseries: \thepage}}}
\fi
\renewcommand{\headrulewidth}{0pt}
}
@@ -132,13 +132,13 @@
{
\fancyhf{}
\if at twoside
- \fancyfoot[RO]{\small
- \nobreakspace\rlap{\textcolor{main-text!27!paper}{ \l_minimalist_sep_bar }\nobreakspace\nobreakspace\thepage}}
- \fancyfoot[LE]{\small\leavevmode\llap{\thepage
- \nobreakspace\nobreakspace\textcolor{main-text!27!paper}{ \l_minimalist_sep_bar }}}
+ \fancyfoot[RO]{
+ \nobreakspace\rlap{\nobreakspace\nobreakspace\nobreakspace\nobreakspace\textcolor{main-text!75!paper}{\minimalist_bfseries: \thepage}}}
+ \fancyfoot[LE]{\leavevmode\llap{\textcolor{main-text!75!paper}{\minimalist_bfseries: \thepage}
+ \nobreakspace\nobreakspace}}
\else
- \fancyfoot[R]{\small
- \nobreakspace\rlap{\textcolor{main-text!27!paper}{ \l_minimalist_sep_bar }\nobreakspace\nobreakspace\thepage}}
+ \fancyfoot[R]{
+ \nobreakspace\nobreakspace\nobreakspace\rlap{\textcolor{main-text!75!paper}{\minimalist_bfseries: \thepage}}}
\fi
\renewcommand{\headrulewidth}{0pt}
}
@@ -185,7 +185,7 @@
\renewcommand{\chaptermark}[1]{\markboth{\textsc{#1}}{\textsc{#1}}}
\fi
\renewcommand*{\sectionmark}[1]{
- \markright{\g_minimalist_section_decoration_char_tl\nobreakspace\arabic{section}\nobreakspace\g_minimalist_section_decoration_char_tl\nobreakspace\nobreakspace\nobreakspace#1}}
+ \markright{\protect\g_minimalist_section_decoration_char_tl\nobreakspace\arabic{section}\nobreakspace\protect\g_minimalist_section_decoration_char_tl\nobreakspace\nobreakspace\nobreakspace#1}}
}
{
\if at twoside
@@ -299,7 +299,7 @@
% \phantomsection\addcontentsline{toc}{chapter}{#1}
\color{main-text!80!paper}\g_minimalist_title_font_chapter_tl\fontsize{16}{0}\selectfont}{}{0em}
{\rlap{\hspace*{-.5em}{\color{main-text!12!paper}
- \fontsize{80}{0}\selectfont\normalfont\raisebox{-7pt}{*}}}#1}
+ \fontsize{80}{0}\selectfont\normalfont\raisebox{-7pt}{\phantom{*}}}}#1}
[\ResumeLineNumbers]
}
{
@@ -521,24 +521,50 @@
\RequirePackage { projlib-theorem }
+\exp_args:No \SetTheorem { \c_projlib_theorem_supported_clist }
+ {
+ name style = {
+ , heading style = {
+ , english = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc
+ , french = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc
+ , ngerman = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc
+ , italian = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc
+ , portuguese = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc
+ , brazilian = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc
+ , spanish = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc
+ , schinese = \minimalist_bfseries:\g_minimalist_title_font_common_tl
+ , tchinese = \minimalist_bfseries:\g_minimalist_title_font_common_tl
+ , japanese = \minimalist_bfseries:\g_minimalist_title_font_common_tl
+ , russian = \minimalist_bfseries:\g_minimalist_title_font_common_tl
+ }
+ }
+ }
+
+\SetTheorem { remark }
+ {
+ name style = {
+ , heading style = {
+ , english = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit
+ , french = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit
+ , ngerman = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit
+ , italian = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit
+ , portuguese = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit
+ , brazilian = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit
+ , spanish = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit
+ , russian = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit
+ , schinese = \minimalist_bfseries:\g_minimalist_title_font_common_tl
+ , tchinese = \minimalist_bfseries:\g_minimalist_title_font_common_tl
+ , japanese = \minimalist_bfseries:\g_minimalist_title_font_common_tl
+ , russian = \minimalist_bfseries:\g_minimalist_title_font_common_tl
+ }
+ }
+ }
+
\bool_if:NF \l__projlib_theorem_complexname_bool
{
\exp_args:No \SetTheorem { \c_projlib_theorem_supported_clist }
{
name style = {
- , heading style = {
- , english = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc
- , french = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc
- , ngerman = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc
- , italian = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc
- , portuguese = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc
- , brazilian = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc
- , spanish = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc
- , schinese = \minimalist_bfseries:\g_minimalist_title_font_common_tl
- , tchinese = \minimalist_bfseries:\g_minimalist_title_font_common_tl
- , japanese = \minimalist_bfseries:\g_minimalist_title_font_common_tl
- , russian = \minimalist_bfseries:\g_minimalist_title_font_common_tl
- }
, crefname style = {
, english = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc
, french = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textsc
@@ -584,20 +610,6 @@
\SetTheorem { remark }
{
name style = {
- , heading style = {
- , english = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit
- , french = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit
- , ngerman = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit
- , italian = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit
- , portuguese = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit
- , brazilian = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit
- , spanish = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit
- , russian = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit
- , schinese = \minimalist_bfseries:\g_minimalist_title_font_common_tl
- , tchinese = \minimalist_bfseries:\g_minimalist_title_font_common_tl
- , japanese = \minimalist_bfseries:\g_minimalist_title_font_common_tl
- , russian = \minimalist_bfseries:\g_minimalist_title_font_common_tl
- }
, crefname style = {
, english = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit
, french = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit
@@ -612,7 +624,7 @@
, japanese = \minimalist_bfseries:\g_minimalist_title_font_common_tl
, russian = \minimalist_bfseries:\g_minimalist_title_font_common_tl
}
- , crefname style = {
+ , Crefname style = {
, english = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit
, french = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit
, ngerman = \minimalist_bfseries:\g_minimalist_title_font_common_tl\textit
Modified: branches/branch2021.final/Master/texmf-dist/tex/latex/minimalist/minimalist.sty
===================================================================
--- branches/branch2021.final/Master/texmf-dist/tex/latex/minimalist/minimalist.sty 2022-03-20 21:13:02 UTC (rev 62833)
+++ branches/branch2021.final/Master/texmf-dist/tex/latex/minimalist/minimalist.sty 2022-03-20 21:14:50 UTC (rev 62834)
@@ -19,7 +19,7 @@
\RequirePackage{l3keys2e}
\ProvidesExplPackage
{minimalist}
- {2022/03/17} {}
+ {2022/03/19} {}
{A simple and clear style for articles and books}
\keys_define:nn { minimalist }
Modified: branches/branch2021.final/Master/texmf-dist/tex/latex/minimalist/minimart.cls
===================================================================
--- branches/branch2021.final/Master/texmf-dist/tex/latex/minimalist/minimart.cls 2022-03-20 21:13:02 UTC (rev 62833)
+++ branches/branch2021.final/Master/texmf-dist/tex/latex/minimalist/minimart.cls 2022-03-20 21:14:50 UTC (rev 62834)
@@ -19,7 +19,7 @@
\RequirePackage{l3keys2e}
\ProvidesExplClass
{minimart}
- {2022/03/17} {}
+ {2022/03/19} {}
{A simple and clear article style}
\tl_const:Nn \l__minimclass_base_class_tl { article }
Modified: branches/branch2021.final/Master/texmf-dist/tex/latex/minimalist/minimbook.cls
===================================================================
--- branches/branch2021.final/Master/texmf-dist/tex/latex/minimalist/minimbook.cls 2022-03-20 21:13:02 UTC (rev 62833)
+++ branches/branch2021.final/Master/texmf-dist/tex/latex/minimalist/minimbook.cls 2022-03-20 21:14:50 UTC (rev 62834)
@@ -19,7 +19,7 @@
\RequirePackage{l3keys2e}
\ProvidesExplClass
{minimbook}
- {2022/03/17} {}
+ {2022/03/19} {}
{A simple and clear book style}
\tl_const:Nn \l__minimclass_base_class_tl { book }
Modified: branches/branch2021.final/Master/texmf-dist/tex/latex/projlib/ProjLib.sty
===================================================================
--- branches/branch2021.final/Master/texmf-dist/tex/latex/projlib/ProjLib.sty 2022-03-20 21:13:02 UTC (rev 62833)
+++ branches/branch2021.final/Master/texmf-dist/tex/latex/projlib/ProjLib.sty 2022-03-20 21:14:50 UTC (rev 62834)
@@ -19,7 +19,7 @@
\RequirePackage{l3keys2e}
\ProvidesExplPackage
{ProjLib}
- {2022/03/17} {}
+ {2022/03/19} {}
{Collective interface of the ProjLib toolkit}
\keys_define:nn { ProjLib }
Modified: branches/branch2021.final/Master/texmf-dist/tex/latex/projlib/projlib-author.sty
===================================================================
--- branches/branch2021.final/Master/texmf-dist/tex/latex/projlib/projlib-author.sty 2022-03-20 21:13:02 UTC (rev 62833)
+++ branches/branch2021.final/Master/texmf-dist/tex/latex/projlib/projlib-author.sty 2022-03-20 21:14:50 UTC (rev 62834)
@@ -19,7 +19,7 @@
\RequirePackage{l3keys2e}
\ProvidesExplPackage
{projlib-author}
- {2022/03/17} {}
+ {2022/03/19} {}
{Enhanced author information block}
\keys_define:nn { projlib-author }
@@ -75,7 +75,7 @@
{
\hook_gput_code:nnn { cmd/@author/after } { projlib-author }
{
- \phantom {A} \\[-.85\baselineskip]
+ \phantom {A} \\[-.9\baselineskip]
\bool_if:NF \g__projlib_author_affil_already_exist_bool
{
\skip_vertical:n { \g__projlib_author_length_innersep_dim }
@@ -135,6 +135,8 @@
{
\RequirePackage{ projlib-language }
+ \tl_const:Nn \c_projlib_author_dot_tl { . }
+
\tl_new:N \g_projlib_author_keywordsname_style_tl
\tl_gset:Nn \g_projlib_author_keywordsname_style_tl { \itshape }
@@ -165,38 +167,38 @@
\tl_gset:Nn \g__projlib_author_dedicatory_tl { #1 }
}
- \hook_gput_code:nnn { begindocument/before } { projlib-author }
- {
- \NewCommandCopy \projlib_author_backup_footnotemark: \footnotemark
- \tl_gset:Nn \footnotemark {}
+ \NewCommandCopy \projlib_author_backup_footnotemark: \footnotemark
+ \tl_gset:Nn \footnotemark {}
- \NewCommandCopy \projlib_author_backup_thanks:w \thanks
- \cs_undefine:N \thanks
+ \NewCommandCopy \projlib_author_backup_thanks:w \thanks
+ \cs_undefine:N \thanks
- % measure the width of "*"
- \hbox_set:Nn \l_tmpa_box { * }
- \dim_const:Nn \c__projlib_author_length_width_of_asterisk_dim { \box_wd:N \l_tmpa_box }
+ % measure the width of "*"
+ \hbox_set:Nn \l_tmpa_box { * }
+ \dim_const:Nn \c__projlib_author_length_width_of_asterisk_dim { \box_wd:N \l_tmpa_box }
- \cs_new_nopar:Nn \projlib_author_pre_thanks:n
+ \cs_new_nopar:Nn \projlib_author_pre_thanks:n
+ {
+ \projlib_author_backup_thanks:w
{
- \projlib_author_backup_thanks:w
- {
- \skip_horizontal:n { - \c__projlib_author_length_width_of_asterisk_dim }
- #1
- }
+ \skip_horizontal:n { - \c__projlib_author_length_width_of_asterisk_dim }
+ #1
}
+ }
- \NewDocumentCommand \thanks { m }
+ \NewDocumentCommand \thanks { m }
+ {
+ \tl_if_blank:nF { #1 }
{
- \tl_if_blank:nF { #1 }
+ \hook_gput_code:nnn { cmd/@title/after } { projlib-author }
{
- \hook_gput_code:nnn { cmd/@title/after } { projlib-author }
- {
- \projlib_author_pre_thanks:n { #1 }
- }
+ \projlib_author_pre_thanks:n { #1 }
}
}
+ }
+ \hook_gput_code:nnn { begindocument/before } { projlib-author }
+ {
\NewCommandCopy \projlib_author_backup_my_author:w \author
\RenewDocumentCommand \author { m }
{
@@ -205,7 +207,7 @@
\RenewCommandCopy \footnotemark \projlib_author_backup_footnotemark:
\RenewCommandCopy \thanks \projlib_author_backup_thanks:w
#1
- \cs_undefine:N \footnotemark
+ \tl_gset:Nn \footnotemark {}
}
}
}
@@ -269,7 +271,7 @@
{
\group_begin:
\g_projlib_author_keywordsname_style_tl
- \keywordsname .
+ \keywordsname \c_projlib_author_dot_tl
\group_end:
\c_space_tl
\g__projlib_author_keywords_tl
@@ -315,7 +317,7 @@
}
\projlib_author_pre_thanks:n
{
- \textit{ \l_projlib_author_subjclassname_tl . }
+ \textit{ \l_projlib_author_subjclassname_tl \c_projlib_author_dot_tl }
\enspace
\l_projlib_author_subjclass_tl .
}
Modified: branches/branch2021.final/Master/texmf-dist/tex/latex/projlib/projlib-datetime.sty
===================================================================
--- branches/branch2021.final/Master/texmf-dist/tex/latex/projlib/projlib-datetime.sty 2022-03-20 21:13:02 UTC (rev 62833)
+++ branches/branch2021.final/Master/texmf-dist/tex/latex/projlib/projlib-datetime.sty 2022-03-20 21:14:50 UTC (rev 62834)
@@ -19,7 +19,7 @@
\RequirePackage{l3keys2e}
\ProvidesExplPackage
{projlib-datetime}
- {2022/03/17} {}
+ {2022/03/19} {}
{Convert numeric date-time string to natural language}
\tl_new:N \g__projlib_datetime_input_format_tl
Modified: branches/branch2021.final/Master/texmf-dist/tex/latex/projlib/projlib-draft.sty
===================================================================
--- branches/branch2021.final/Master/texmf-dist/tex/latex/projlib/projlib-draft.sty 2022-03-20 21:13:02 UTC (rev 62833)
+++ branches/branch2021.final/Master/texmf-dist/tex/latex/projlib/projlib-draft.sty 2022-03-20 21:14:50 UTC (rev 62834)
@@ -19,7 +19,7 @@
\RequirePackage{l3keys2e}
\ProvidesExplPackage
{projlib-draft}
- {2022/03/17} {}
+ {2022/03/19} {}
{Useful commands during draft stage}
\keys_define:nn { projlib-draft }
Modified: branches/branch2021.final/Master/texmf-dist/tex/latex/projlib/projlib-font.sty
===================================================================
--- branches/branch2021.final/Master/texmf-dist/tex/latex/projlib/projlib-font.sty 2022-03-20 21:13:02 UTC (rev 62833)
+++ branches/branch2021.final/Master/texmf-dist/tex/latex/projlib/projlib-font.sty 2022-03-20 21:14:50 UTC (rev 62834)
@@ -19,7 +19,7 @@
\RequirePackage{l3keys2e}
\ProvidesExplPackage
{projlib-font}
- {2022/03/17} {}
+ {2022/03/19} {}
{Font selection and configuration}
\keys_define:nn { projlib-font }
Modified: branches/branch2021.final/Master/texmf-dist/tex/latex/projlib/projlib-language.sty
===================================================================
--- branches/branch2021.final/Master/texmf-dist/tex/latex/projlib/projlib-language.sty 2022-03-20 21:13:02 UTC (rev 62833)
+++ branches/branch2021.final/Master/texmf-dist/tex/latex/projlib/projlib-language.sty 2022-03-20 21:14:50 UTC (rev 62834)
@@ -19,7 +19,7 @@
\RequirePackage{l3keys2e}
\ProvidesExplPackage
{projlib-language}
- {2022/03/17} {}
+ {2022/03/19} {}
{Multi-language configuration}
\clist_const:Nn \c__projlib_language_supported_clist
@@ -282,35 +282,35 @@
\tl_gput_right:Nn \g_projlib_language_settings_schinese_tl
{
\g_projlib_language_settings_common_tl
- \tl_gset:Nn \languagename { schinese }
- \tl_gset:cn { abstractname } { 摘要 }
- \tl_gset:cn { proofname } { 证明 }
- \tl_gset:cn { contentsname } { 目录 }
- \tl_gset:cn { listfigurename } { 插图 }
- \tl_gset:cn { listtablename } { 表格 }
- \tl_gset:cn { figurename } { 图 }
- \tl_gset:cn { tablename } { 表 }
- \tl_gset:cn { indexname } { 索引 }
- \tl_gset:cn { appendixname } { 附录 }
- \tl_gset:cn { refname } { 参考文献 }
- \tl_gset:cn { bibname } { 参考文献 }
+ \tl_set:Nn \languagename { schinese }
+ \tl_set:cn { abstractname } { 摘要 }
+ \tl_set:cn { proofname } { 证明 }
+ \tl_set:cn { contentsname } { 目录 }
+ \tl_set:cn { listfigurename } { 插图 }
+ \tl_set:cn { listtablename } { 表格 }
+ \tl_set:cn { figurename } { 图 }
+ \tl_set:cn { tablename } { 表 }
+ \tl_set:cn { indexname } { 索引 }
+ \tl_set:cn { appendixname } { 附录 }
+ \tl_set:cn { refname } { 参考文献 }
+ \tl_set:cn { bibname } { 参考文献 }
}
\tl_gput_right:Nn \g_projlib_language_settings_tchinese_tl
{
\g_projlib_language_settings_common_tl
- \tl_gset:Nn \languagename { tchinese }
- \tl_gset:cn { abstractname } { 摘要 }
- \tl_gset:cn { proofname } { 證明 }
- \tl_gset:cn { contentsname } { 目錄 }
- \tl_gset:cn { listfigurename } { 插圖 }
- \tl_gset:cn { listtablename } { 表格 }
- \tl_gset:cn { figurename } { 圖 }
- \tl_gset:cn { tablename } { 表 }
- \tl_gset:cn { indexname } { 索引 }
- \tl_gset:cn { appendixname } { 附錄 }
- \tl_gset:cn { refname } { 參考文獻 }
- \tl_gset:cn { bibname } { 參考文獻 }
+ \tl_set:Nn \languagename { tchinese }
+ \tl_set:cn { abstractname } { 摘要 }
+ \tl_set:cn { proofname } { 證明 }
+ \tl_set:cn { contentsname } { 目錄 }
+ \tl_set:cn { listfigurename } { 插圖 }
+ \tl_set:cn { listtablename } { 表格 }
+ \tl_set:cn { figurename } { 圖 }
+ \tl_set:cn { tablename } { 表 }
+ \tl_set:cn { indexname } { 索引 }
+ \tl_set:cn { appendixname } { 附錄 }
+ \tl_set:cn { refname } { 參考文獻 }
+ \tl_set:cn { bibname } { 參考文獻 }
}
\tl_gput_right:Nn \g_projlib_language_settings_japanese_tl
Modified: branches/branch2021.final/Master/texmf-dist/tex/latex/projlib/projlib-logo.sty
===================================================================
--- branches/branch2021.final/Master/texmf-dist/tex/latex/projlib/projlib-logo.sty 2022-03-20 21:13:02 UTC (rev 62833)
+++ branches/branch2021.final/Master/texmf-dist/tex/latex/projlib/projlib-logo.sty 2022-03-20 21:14:50 UTC (rev 62834)
@@ -19,7 +19,7 @@
\RequirePackage{l3keys2e}
\ProvidesExplPackage
{projlib-logo}
- {2022/03/17} {}
+ {2022/03/19} {}
{The ProjLib logo}
\keys_define:nn { projlib-logo }
@@ -42,60 +42,49 @@
\endinput
}
-\cs_if_exist:cTF { fontspec }
- {
- \newfontface \__projlib_logo_font: { LinBiolinum_R.otf }
- }
- {
- \RequirePackage [T1] { fontenc }
- \cs_gset:Nn \__projlib_logo_font:
- { \fontfamily { LinuxBiolinumT-TLF } \selectfont }
- }
-\tl_new:N \g__projlib_logo_sigma_j_tl
-\tl_gset:Nn \g__projlib_logo_sigma_j_tl
- {
- \vbox:n
- {
- \offinterlineskip
- \hbox_overlap_center:n
- {
- \skip_horizontal:n { 0.75ex }
- \hbox_set:Nn \l_tmpa_box { \usefont{U}{zeur}{b}{n} \symbol{"06} }
- \box_rotate:Nn \l_tmpa_box { -10 }
- \box_scale:Nnn \l_tmpa_box {.4} {.4}
- \box_use:N \l_tmpa_box
- }
- \skip_vertical:n { 0.15ex }
- \hbox:n { \j }
- }
- }
+\RequirePackage { tikz }
-\cs_new_protected:Nn \projlib_logo_generic:n
+\cs_new_protected:Nn \projlib_logo_generic:
{
- \group_begin:
- \normalfont
- \__projlib_logo_font:
- \color_group_begin:
- \color_select:n { blue!60!cyan } { P }
- \color_select:n { blue!45!cyan } { r }
- \color_select:n { blue!30!cyan } { o }
- \color_select:n { green!70!black!70 } { #1 }
- \color_select:n { red!20!yellow } { L }
- \color_select:n { red!40!yellow } { i }
- \color_select:n { red!60!yellow } { b }
- \color_group_end:
- \group_end:
+ \skip_horizontal:n { .2em }
+ \begin{tikzpicture}[line~width=.1em, baseline=0]
+ \begin{scope}[color=blue!50!cyan!30!black]
+ \draw (0.22em,.5em) circle (.22em);
+ \draw (0em,0em) -- (0em,.5em);
+ \end{scope}
+ \begin{scope}[color=blue!50!cyan!40!black, xshift=.65em]
+ \draw (0em,0em) -- (0em,.25em) arc [start~angle=180, end~angle=90, radius=.2em];
+ \end{scope}
+ \begin{scope}[color=blue!50!cyan!45!black, xshift=1.0em]
+ \draw (0.2em,.24em) circle (.2em);
+ \end{scope}
+ \begin{scope}[color=blue!50!cyan!50!black, xshift=1.65em]
+ \draw (0em,-.25em) -- (0em,.5em);
+ \begin{scope}[yshift=.75em]
+ % \draw[line~width=.032em, color=orange!60!yellow, xshift=.01em, yshift=-.003em] (0,0) circle (.13em);
+ % \node[rotate=-15,scale=0.45, xshift=.033em] { \usefont{U}{zeur}{b}{n} \symbol{"02} };
+ \draw[line~width=.06em, color=orange!60!yellow] (0,0) circle (.13em);
+ \end{scope}
+ \end{scope}
+ \begin{scope}[color=blue!50!cyan!67!black, xshift=2.0em]
+ \draw (0em,0em) -- (0em,.75em);
+ \end{scope}
+ \begin{scope}[color=blue!50!cyan!75!black, xshift=2.35em]
+ \draw (0em,0em) -- (0em,.5em);
+ \end{scope}
+ \begin{scope}[color=blue!50!cyan!90!black, xshift=2.63em]
+ \draw (0.2em,.24em) circle (.2em);
+ \draw (0em,0.24em) -- (0em,.75em);
+ \end{scope}
+ \end{tikzpicture}
+ \skip_horizontal:n { .2em }
}
\DeclareRobustCommand * \ProjLib
{
- \projlib_logo_generic:n { \g__projlib_logo_sigma_j_tl }
+ \projlib_logo_generic:
}
-\DeclareRobustCommand * \ProjLibText
- {
- \projlib_logo_generic:n { j }
- }
\endinput
%%
Modified: branches/branch2021.final/Master/texmf-dist/tex/latex/projlib/projlib-math.sty
===================================================================
--- branches/branch2021.final/Master/texmf-dist/tex/latex/projlib/projlib-math.sty 2022-03-20 21:13:02 UTC (rev 62833)
+++ branches/branch2021.final/Master/texmf-dist/tex/latex/projlib/projlib-math.sty 2022-03-20 21:14:50 UTC (rev 62834)
@@ -19,7 +19,7 @@
\RequirePackage{l3keys2e}
\ProvidesExplPackage
{projlib-math}
- {2022/03/17} {}
+ {2022/03/19} {}
{Efficient math setup}
\keys_define:nn { projlib-math }
Modified: branches/branch2021.final/Master/texmf-dist/tex/latex/projlib/projlib-paper.sty
===================================================================
--- branches/branch2021.final/Master/texmf-dist/tex/latex/projlib/projlib-paper.sty 2022-03-20 21:13:02 UTC (rev 62833)
+++ branches/branch2021.final/Master/texmf-dist/tex/latex/projlib/projlib-paper.sty 2022-03-20 21:14:50 UTC (rev 62834)
@@ -19,7 +19,7 @@
\RequirePackage{l3keys2e}
\ProvidesExplPackage
{projlib-paper}
- {2022/03/17} {}
+ {2022/03/19} {}
{Configuration of the paper style}
\keys_define:nn { projlib-paper }
Modified: branches/branch2021.final/Master/texmf-dist/tex/latex/projlib/projlib-theorem.sty
===================================================================
--- branches/branch2021.final/Master/texmf-dist/tex/latex/projlib/projlib-theorem.sty 2022-03-20 21:13:02 UTC (rev 62833)
+++ branches/branch2021.final/Master/texmf-dist/tex/latex/projlib/projlib-theorem.sty 2022-03-20 21:14:50 UTC (rev 62834)
@@ -19,7 +19,7 @@
\RequirePackage{l3keys2e}
\ProvidesExplPackage
{projlib-theorem}
- {2022/03/17} {}
+ {2022/03/19} {}
{Configuration of theorem-like environments}
\keys_define:nn { projlib-theorem }
@@ -42,6 +42,13 @@
, theorem numbering .default:n = { * }
, thmnum .tl_set:N = \l__projlib_theorem_theorem_numbering_tl
, thmnum .default:n = { * }
+ , theorem-style .tl_set:N = \l__projlib_theorem_theorem_style_tl
+ , theorem-style .initial:n = { }
+ , theorem-style .value_required:n = true
+ , theorem~style .tl_set:N = \l__projlib_theorem_theorem_style_tl
+ , theorem~style .value_required:n = true
+ , theorem style .tl_set:N = \l__projlib_theorem_theorem_style_tl
+ , theorem style .value_required:n = true
, complex-name .bool_set:N = \l__projlib_theorem_complexname_bool
, complex-name .initial:n = { true }
, complex~name .bool_set:N = \l__projlib_theorem_complexname_bool
@@ -105,6 +112,17 @@
\RequirePackage { projlib-language }
+\cs_new_protected:Nn \projlib_theorem_preset_theorem_style:nn
+ {
+ \tl_const:cn { c_crthm_theorem_style_preset_ #1 _tl } { #2 }
+ }
+
+\cs_generate_variant:Nn \keyval_parse:nnn { nno }
+\keyval_parse:nno
+ { }
+ { \projlib_theorem_preset_theorem_style:nn }
+ { \l__projlib_theorem_theorem_style_tl }
+
\RequirePackage { amsthm }
\RequirePackage { create-theorem }
Modified: branches/branch2021.final/Master/texmf-dist/tex/latex/simplivre/simplivre.cls
===================================================================
--- branches/branch2021.final/Master/texmf-dist/tex/latex/simplivre/simplivre.cls 2022-03-20 21:13:02 UTC (rev 62833)
+++ branches/branch2021.final/Master/texmf-dist/tex/latex/simplivre/simplivre.cls 2022-03-20 21:14:50 UTC (rev 62834)
@@ -19,7 +19,7 @@
\RequirePackage{l3keys2e}
\ProvidesExplClass
{simplivre}
- {2022/03/17} {}
+ {2022/03/19} {}
{A simple and clear book style}
\tl_const:Nn \l__minimclass_base_class_tl { book }
More information about the tex-live-commits
mailing list.