texlive[62900] Master/texmf-dist: jxu (4apr22)
commits+karl at tug.org
commits+karl at tug.org
Mon Apr 4 22:54:49 CEST 2022
Revision: 62900
http://tug.org/svn/texlive?view=revision&revision=62900
Author: karl
Date: 2022-04-04 22:54:49 +0200 (Mon, 04 Apr 2022)
Log Message:
-----------
jxu (4apr22)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-cn.pdf
trunk/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-cn.tex
trunk/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-en.pdf
trunk/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-en.tex
trunk/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-fr.pdf
trunk/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-fr.tex
trunk/Master/texmf-dist/doc/latex/colorist/colorist-doc.pdf
trunk/Master/texmf-dist/doc/latex/colorist/colorist-doc.tex
trunk/Master/texmf-dist/doc/latex/einfart/einfart-doc-cn.pdf
trunk/Master/texmf-dist/doc/latex/einfart/einfart-doc-cn.tex
trunk/Master/texmf-dist/doc/latex/einfart/einfart-doc-en.pdf
trunk/Master/texmf-dist/doc/latex/einfart/einfart-doc-en.tex
trunk/Master/texmf-dist/doc/latex/einfart/einfart-doc-fr.pdf
trunk/Master/texmf-dist/doc/latex/einfart/einfart-doc-fr.tex
trunk/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-cn.pdf
trunk/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-cn.tex
trunk/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-en.pdf
trunk/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-en.tex
trunk/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-fr.pdf
trunk/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-fr.tex
trunk/Master/texmf-dist/doc/latex/minimalist/minimalist-doc.pdf
trunk/Master/texmf-dist/doc/latex/minimalist/minimalist-doc.tex
trunk/Master/texmf-dist/doc/latex/projlib/README.md
trunk/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-cn.pdf
trunk/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-cn.tex
trunk/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-en.pdf
trunk/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-en.tex
trunk/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-fr.pdf
trunk/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-fr.tex
trunk/Master/texmf-dist/source/latex/projlib/ProjLib.dtx
trunk/Master/texmf-dist/source/latex/projlib/ProjLib.ins
trunk/Master/texmf-dist/tex/latex/beaulivre/beaulivre.cls
trunk/Master/texmf-dist/tex/latex/colorist/colorart.cls
trunk/Master/texmf-dist/tex/latex/colorist/colorbook.cls
trunk/Master/texmf-dist/tex/latex/colorist/colorist-fancy.sty
trunk/Master/texmf-dist/tex/latex/colorist/colorist.sty
trunk/Master/texmf-dist/tex/latex/einfart/einfart.cls
trunk/Master/texmf-dist/tex/latex/lebhart/lebhart.cls
trunk/Master/texmf-dist/tex/latex/minimalist/minimalist-classical.sty
trunk/Master/texmf-dist/tex/latex/minimalist/minimalist-plain.sty
trunk/Master/texmf-dist/tex/latex/minimalist/minimalist.sty
trunk/Master/texmf-dist/tex/latex/minimalist/minimart.cls
trunk/Master/texmf-dist/tex/latex/minimalist/minimbook.cls
trunk/Master/texmf-dist/tex/latex/projlib/ProjLib.sty
trunk/Master/texmf-dist/tex/latex/projlib/projlib-author.sty
trunk/Master/texmf-dist/tex/latex/projlib/projlib-datetime.sty
trunk/Master/texmf-dist/tex/latex/projlib/projlib-draft.sty
trunk/Master/texmf-dist/tex/latex/projlib/projlib-font.sty
trunk/Master/texmf-dist/tex/latex/projlib/projlib-language.sty
trunk/Master/texmf-dist/tex/latex/projlib/projlib-logo.sty
trunk/Master/texmf-dist/tex/latex/projlib/projlib-math.sty
trunk/Master/texmf-dist/tex/latex/projlib/projlib-paper.sty
trunk/Master/texmf-dist/tex/latex/projlib/projlib-theorem.sty
trunk/Master/texmf-dist/tex/latex/simplivre/simplivre.cls
Added Paths:
-----------
trunk/Master/texmf-dist/tex/latex/projlib/projlib-titlepage.sty
Removed Paths:
-------------
trunk/Master/texmf-dist/tex/latex/projlib/old-modules/
Modified: trunk/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-cn.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-cn.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-cn.tex 2022-04-04 17:45:51 UTC (rev 62899)
+++ trunk/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-cn.tex 2022-04-04 20:54:49 UTC (rev 62900)
@@ -1,6 +1,5 @@
\documentclass[English,Chinese,French,JP,TC,use boldface,simple name]{beaulivre}
-
%%================================
%% Import toolkit
%%================================
@@ -38,7 +37,7 @@
\providecommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$}
\lstset{moretexcs=%
{part,parttext,chapter,section,subsection,subsubsection,frontmatter,mainmatter,backmatter,tableofcontents,href,
- color,NameTheorem,CreateTheorem,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,TheDate,ProjLib,qedhere
+ color,NameTheorem,CreateTheorem,cref,DNF,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,TheDate,ProjLib,qedhere
}
}
\lstnewenvironment{code}%
@@ -92,25 +91,22 @@
%%================================
\begin{document}
-\def\PackageVersion{2022/03/19}
+\def\PackageVersion{2022/04/03}
\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 [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,-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}%
+\TitlePage [ color = { main = forestgreen!75!black, back = forestgreen!10!yellow!30 } ]
+ {
+ , title = \beaulivre{}
+ , subtitle = {
+ \textsc{以多彩的方式排版你的图书}\\[10pt]
+ \tiny 对应版本. \texttt{\beaulivre{} \PackageVersion}
+ }
+ , author = 许锦文
+ , date = {\TheDate{\PackageVersion}[only-year-month]，巴黎}
+ }
-\setcounter{page}{0}
-
\chapter{前言}
\beaulivre{} 是 \colorist{} 文档类系列的成员之一，其名称取自于法文的beau (美丽)，以及livre (书)，由二者组合而成。整个 \colorist{} 系列包含用于排版文章的 \colorart{}、\lebhart{} 以及用于排版书的 \colorbook{}、\beaulivre{}。我设计这一系列的初衷是为了撰写草稿与笔记，使之多彩而不缭乱。
@@ -117,7 +113,7 @@
\beaulivre{} 支持英语、法语、德语、意大利语、葡萄牙语、巴西葡萄牙语、西班牙语、简体中文、繁体中文、日文、俄文，并且同一篇文档中这些语言可以很好地协调。由于采用了自定义字体，需要用 \hologo{XeLaTeX} 或 \hologo{LuaLaTeX} 引擎进行编译。
-这篇说明文档即是用 \beaulivre{} 排版的 (使用了参数 \texttt{allowbf})，你可以把它看作一份简短的说明与演示。
+这篇说明文档即是用 \beaulivre{} 排版的 (使用了参数 \texttt{use boldface})，你可以把它看作一份简短的说明与演示。
\bigskip
\begin{tip}
@@ -191,7 +187,7 @@
\section{(*\meta{section title}*)}
-\dnf<(*\meta{some hint}*)>
+\DNF<(*\meta{some hint}*)>
\begin{theorem}\label{thm:abc}
Ceci est un théorème.
@@ -230,7 +226,7 @@
\LevelThreeTitle{未完成标记}
\begin{code}
-\dnf<(*\meta{some hint}*)>
+\DNF<(*\meta{some hint}*)>
\end{code}
当你有一些地方尚未完成的时候，可以用这条指令标记出来，它在草稿阶段格外有用。
@@ -293,7 +289,7 @@
\item 字体选项。顾名思义，会加载相应名称的字体。
\item \texttt{useosf} 选项用来启用“旧式”数字。
\end{itemize}
- \item \texttt{allowbf}
+ \item \texttt{use boldface}
\begin{itemize}
\item 允许加粗。启用这一选项时，题目、各级标题、定理类环境名称会被加粗。
\end{itemize}
@@ -440,9 +436,9 @@
\LevelTwoTitle{未完成标记}
-你可以通过 \lstinline|\dnf| 来标记尚未完成的部分。例如：
+你可以通过 \lstinline|\DNF| 来标记尚未完成的部分。例如：
\begin{itemize}
- \item \lstinline|\dnf| 或 \lstinline|\dnf<...>|。效果为：\dnf~或 \dnf<...>。\\其提示文字与当前语言相对应，例如，在法语模式下将会显示为 \UseOtherLanguage{French}{\dnf}。
+ \item \lstinline|\DNF| 或 \lstinline|\DNF<...>|。效果为：\DNF~或 \DNF<...>。\\其提示文字与当前语言相对应，例如，在法语模式下将会显示为 \UseOtherLanguage{French}{\DNF}。
\end{itemize}
Modified: trunk/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-en.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-en.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-en.tex 2022-04-04 17:45:51 UTC (rev 62899)
+++ trunk/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-en.tex 2022-04-04 20:54:49 UTC (rev 62900)
@@ -1,6 +1,5 @@
\documentclass[English,Chinese,French,JP,TC,use boldface,simple name]{beaulivre}
-
%%================================
%% Import toolkit
%%================================
@@ -38,7 +37,7 @@
\providecommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$}
\lstset{moretexcs=%
{part,parttext,chapter,section,subsection,subsubsection,frontmatter,mainmatter,backmatter,tableofcontents,href,
- color,NameTheorem,CreateTheorem,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,TheDate,ProjLib,qedhere
+ color,NameTheorem,CreateTheorem,cref,DNF,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,TheDate,ProjLib,qedhere
}
}
\lstnewenvironment{code}%
@@ -92,25 +91,22 @@
%%================================
\begin{document}
-\def\PackageVersion{2022/03/19}
+\def\PackageVersion{2022/04/03}
\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 [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,-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}%
+\TitlePage [ color = { main = forestgreen!75!black, back = forestgreen!10!yellow!30 } ]
+ {
+ , title = \beaulivre{}
+ , subtitle = {
+ \textsc{Write your books in \\a colorful way}\\[10pt]
+ \tiny Corresponding to: \texttt{\beaulivre{} \PackageVersion}
+ }
+ , author = Jinwen XU
+ , date = {\TheDate{\PackageVersion}[only-year-month], in Paris}
+ }
-\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.
@@ -117,7 +113,7 @@
\beaulivre{} has multi-language support, including Chinese (simplified and traditional), English, French, German, Italian, Japanese, Portuguese (European and Brazilian), Russian and Spanish. These languages can be switched seamlessly in a single document. Due to the usage of custom fonts, \lebhart{} requires \hologo{XeLaTeX} or \hologo{LuaLaTeX} to compile.
-This documentation is typeset using \beaulivre{} (with the option \texttt{allowbf}). You can think of it as a short introduction and demonstration.
+This documentation is typeset using \beaulivre{} (with the option \texttt{use boldface}). You can think of it as a short introduction and demonstration.
\bigskip
\begin{tip}
@@ -191,7 +187,7 @@
\section{(*\meta{section title}*)}
-\dnf<(*\meta{some hint}*)>
+\DNF<(*\meta{some hint}*)>
\begin{theorem}\label{thm:abc}
Ceci est un théorème.
@@ -231,7 +227,7 @@
\LevelThreeTitle{Draft marks}
\begin{code}
-\dnf<(*\meta{some hint}*)>
+\DNF<(*\meta{some hint}*)>
\end{code}
When you have some places that have not yet been finished yet, you can mark them with this command, which is especially useful during the draft stage.
@@ -294,7 +290,7 @@
\item Font options. As the name suggest, font with corresponding name will be loaded.
\item The \texttt{useosf} option is used to enable the old-style figures.
\end{itemize}
- \item \texttt{allowbf}
+ \item \texttt{use boldface}
\begin{itemize}
\item Allow boldface. When this option is enabled, the main title, the titles of all levels and the names of theorem-like environments will be bolded.
\end{itemize}
@@ -436,9 +432,9 @@
% \clearpage
\LevelTwoTitle{Draft mark}
-You can use \lstinline|\dnf| to mark the unfinished part. For example:
+You can use \lstinline|\DNF| to mark the unfinished part. For example:
\begin{itemize}
- \item \lstinline|\dnf| or \lstinline|\dnf<...>|. The effect is: \dnf~ or \dnf<...>. \\The prompt text changes according to the current language. For example, it will be displayed as \UseOtherLanguage{French}{\dnf} in French mode.
+ \item \lstinline|\DNF| or \lstinline|\DNF<...>|. The effect is: \DNF~ or \DNF<...>. \\The prompt text changes according to the current language. For example, it will be displayed as \UseOtherLanguage{French}{\DNF} in French mode.
\end{itemize}
Modified: trunk/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-fr.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-fr.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-fr.tex 2022-04-04 17:45:51 UTC (rev 62899)
+++ trunk/Master/texmf-dist/doc/latex/beaulivre/beaulivre-doc-fr.tex 2022-04-04 20:54:49 UTC (rev 62900)
@@ -1,6 +1,5 @@
\documentclass[English,Chinese,French,JP,TC,use boldface,simple name]{beaulivre}
-
%%================================
%% Import toolkit
%%================================
@@ -38,7 +37,7 @@
\providecommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$}
\lstset{moretexcs=%
{part,parttext,chapter,section,subsection,subsubsection,frontmatter,mainmatter,backmatter,tableofcontents,href,
- color,NameTheorem,CreateTheorem,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,TheDate,ProjLib,qedhere
+ color,NameTheorem,CreateTheorem,cref,DNF,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,TheDate,ProjLib,qedhere
}
}
\lstnewenvironment{code}%
@@ -92,25 +91,22 @@
%%================================
\begin{document}
-\def\PackageVersion{2022/03/19}
+\def\PackageVersion{2022/04/03}
\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 [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,-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}%
+\TitlePage [ color = { main = forestgreen!75!black, back = forestgreen!10!yellow!30 } ]
+ {
+ , title = \beaulivre{}
+ , subtitle = {
+ \textsc{Écrivez vos livres \\de manière colorée}\\[10pt]
+ \tiny Correspondant à : \texttt{\beaulivre{} \PackageVersion}
+ }
+ , author = Jinwen XU
+ , date = {\TheDate{\PackageVersion}[only-year-month], à Paris}
+ }
-\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.
@@ -117,7 +113,7 @@
\beaulivre{} prend en charge plusieurs langues, notamment le chinois (simplifié et traditionnel), l'anglais, le français, l'allemand, l'italien, le japonais, le portugais (européen et brésilien), le russe et l'espagnol. Ces langues peuvent être commutées de manière transparente dans un seul document. En raison de l'utilisation de polices personnalisées, \beaulivre{} demande soit \hologo{XeLaTeX} soit \hologo{LuaLaTeX} pour la compilation.
-Cette documentation est composée à l'aide de \beaulivre{} (avec l'option \texttt{allowbf}). Vous pouvez le considérer comme une courte introduction et une démonstration.
+Cette documentation est composée à l'aide de \beaulivre{} (avec l'option \texttt{use boldface}). Vous pouvez le considérer comme une courte introduction et une démonstration.
\bigskip
\begin{tip}
@@ -192,7 +188,7 @@
\section{(*\meta{section title}*)}
-\dnf<(*\meta{some hint}*)>
+\DNF<(*\meta{some hint}*)>
\begin{theorem}\label{thm:abc}
Ceci est un théorème.
@@ -231,7 +227,7 @@
\LevelThreeTitle{Marques de brouillon}
\begin{code}
-\dnf<(*\meta{some hint}*)>
+\DNF<(*\meta{some hint}*)>
\end{code}
Lorsque vous avez des endroits qui ne sont pas encore finis, vous pouvez les marquer avec cette commande, ce qui est particulièrement utile lors de la phase de brouillon.
@@ -294,7 +290,7 @@
\item Options de police. Comme son nom l'indique, la police avec le nom correspondant sera utilisée.
\item L'option \texttt{useosf} est pour activer les chiffres à l'ancienne.
\end{itemize}
- \item \texttt{allowbf}
+ \item \texttt{use boldface}
\begin{itemize}
\item Afficher les titres en gras. Lorsque cette option est utilisée, le titre principal, les titres de tous les niveaux et les noms des environnements de type théorème seront en gras.
\end{itemize}
@@ -432,9 +428,9 @@
\LevelTwoTitle{Draft mark}
-Vous pouvez utiliser \lstinline|\dnf| pour marquer la partie inachevée. Par example :
+Vous pouvez utiliser \lstinline|\DNF| pour marquer la partie inachevée. Par example :
\begin{itemize}
- \item \lstinline|\dnf| ou \lstinline|\dnf<...>|. L'effet est : \dnf~ ou \dnf<...>. \\Le texte à l'intérieur changera en fonction de la langue actuelle. Par exemple, il sera affiché sous la forme \UseOtherLanguage{English}{\dnf} en mode anglais.
+ \item \lstinline|\DNF| ou \lstinline|\DNF<...>|. L'effet est : \DNF~ ou \DNF<...>. \\Le texte à l'intérieur changera en fonction de la langue actuelle. Par exemple, il sera affiché sous la forme \UseOtherLanguage{English}{\DNF} en mode anglais.
\end{itemize}
Modified: trunk/Master/texmf-dist/doc/latex/colorist/colorist-doc.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/colorist/colorist-doc.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/colorist/colorist-doc.tex 2022-04-04 17:45:51 UTC (rev 62899)
+++ trunk/Master/texmf-dist/doc/latex/colorist/colorist-doc.tex 2022-04-04 20:54:49 UTC (rev 62900)
@@ -1,13 +1,5 @@
\documentclass[English,Chinese,French,use boldface,simple name]{colorart}
-\setsansfont{texgyreheros}[
- Scale=MatchUppercase,
- UprightFont=*-regular,
- BoldFont=*-bold,
- ItalicFont=*-italic,
- BoldItalicFont=*-bolditalic,
-]
-
%%================================
%% Import toolkit
%%================================
@@ -45,7 +37,7 @@
\providecommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$}
\lstset{moretexcs=%
{part,parttext,chapter,section,subsection,subsubsection,frontmatter,mainmatter,backmatter,tableofcontents,href,
- color,NameTheorem,CreateTheorem,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,TheDate,ProjLib,qedhere
+ color,NameTheorem,CreateTheorem,cref,DNF,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,TheDate,ProjLib,qedhere
}
}
\lstnewenvironment{code}%
@@ -99,7 +91,7 @@
%%================================
\begin{document}
-\def\PackageVersion{2022/03/19}
+\def\PackageVersion{2022/04/03}
\title{{\normalfont\bfseries\color{main-text}\colorist{}}\\write your articles or books in a colorful way}
\author{Jinwen XU}
@@ -112,7 +104,7 @@
\begin{abstract}
\colorist{} is a series of styles and classes for you to typeset your articles or books in a colorful manner. The original intention in designing this series was to write drafts and notes that look colorful yet not dazzling. With the help of the \ProjLib{} toolkit, also developed by the author, the classes provided here have multi-language support, preset theorem-like environments with clever reference support, and many other functionalities. Notably, using these classes, one can organize the author information in the \AmS{} fashion, makes it easy to switch to journal classes later for publication.
- Finally, this documentation is typeset using the \colorart{} class (with the option \texttt{allowbf}). You can think of it as a short introduction and demonstration.
+ Finally, this documentation is typeset using the \colorart{} class (with the option \texttt{use boldface}). You can think of it as a short introduction and demonstration.
\end{abstract}
@@ -183,7 +175,7 @@
\maketitle
\begin{abstract}
- Ceci est un résumé. \dnf<(*\meta{some hint}*)>
+ Ceci est un résumé. \DNF<(*\meta{some hint}*)>
\end{abstract}
\begin{keyword}
AAA, BBB, CCC, DDD, EEE
@@ -275,7 +267,7 @@
\LevelThreeTitle{Draft marks}
\begin{code}
-\dnf<(*\meta{some hint}*)>
+\DNF<(*\meta{some hint}*)>
\end{code}
When you have some places that have not yet been finished yet, you can mark them with this command, which is especially useful during the draft stage.
@@ -388,7 +380,7 @@
\begin{tip}
During the draft stage, it is recommended to use the \verb|fast| option to speed up compilation. When in \verb|fast| mode, there will be a watermark ``DRAFT'' to indicate that you are currently in the draft mode.
\end{tip}
- \item \texttt{allowbf}
+ \item \texttt{use boldface}
\begin{itemize}
\item Allow boldface. When this option is enabled, the main title, the titles of all levels and the names of theorem-like environments will be bolded.
\end{itemize}
@@ -538,9 +530,9 @@
\LevelTwoTitle{Draft mark}
-You can use \lstinline|\dnf| to mark the unfinished part. For example:
+You can use \lstinline|\DNF| to mark the unfinished part. For example:
\begin{itemize}
- \item \lstinline|\dnf| or \lstinline|\dnf<...>|. The effect is: \dnf~ or \dnf<...>. \\The prompt text changes according to the current language. For example, it will be displayed as \UseOtherLanguage{French}{\dnf} in French mode.
+ \item \lstinline|\DNF| or \lstinline|\DNF<...>|. The effect is: \DNF~ or \DNF<...>. \\The prompt text changes according to the current language. For example, it will be displayed as \UseOtherLanguage{French}{\DNF} in French mode.
\end{itemize}
\LevelTwoTitle{Title, abstract and keywords}
Modified: trunk/Master/texmf-dist/doc/latex/einfart/einfart-doc-cn.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/einfart/einfart-doc-cn.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/einfart/einfart-doc-cn.tex 2022-04-04 17:45:51 UTC (rev 62899)
+++ trunk/Master/texmf-dist/doc/latex/einfart/einfart-doc-cn.tex 2022-04-04 20:54:49 UTC (rev 62900)
@@ -8,7 +8,6 @@
\usepackage{ProjLib}
\usepackage{longtable} % breakable tables
\usepackage{hologo} % more TeX logo
-\usetikzlibrary{calc}
\usepackage{blindtext}
@@ -39,7 +38,7 @@
\providecommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$}
\lstset{moretexcs=%
{linenumbers,nolinenumbers,part,parttext,chapter,section,subsection,subsubsection,frontmatter,mainmatter,backmatter,tableofcontents,href,
- color,NameTheorem,CreateTheorem,cref,dnf,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,TheDate,ProjLib,qedhere
+ color,NameTheorem,CreateTheorem,cref,DNF,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,TheDate,ProjLib,qedhere
}
}
\lstnewenvironment{code}%
@@ -96,7 +95,7 @@
%%================================
\begin{document}
-\def\PackageVersion{2022/03/19}
+\def\PackageVersion{2022/04/03}
\title{\einfart{}，以极简主义风格排版你的文章}
\author{许锦文}
@@ -164,7 +163,7 @@
\maketitle
\begin{abstract}
- Ceci est un résumé. \dnf<(*\meta{some hint}*)>
+ Ceci est un résumé. \DNF<(*\meta{some hint}*)>
\end{abstract}
\begin{keyword}
AAA, BBB, CCC, DDD, EEE
@@ -258,7 +257,7 @@
\medskip
\begin{code}
-\dnf<(*\meta{some hint}*)>
+\DNF<(*\meta{some hint}*)>
\end{code}
当你有一些地方尚未完成的时候，可以用这条指令标记出来，它在草稿阶段格外有用。
@@ -335,11 +334,10 @@
\item 字体选项。顾名思义，会加载相应名称的字体。
\item \texttt{useosf} 选项用来启用“旧式”数字。
\end{itemize}
- \item \texttt{allowbf}
+ \item \texttt{use boldface}
\begin{itemize}
\item 允许加粗。启用这一选项时，题目、各级标题、定理类环境名称会被加粗。
\end{itemize}
-% \clearpage
\item \texttt{classical}
\begin{itemize}
\item 经典模式。使用这一选项时，将会启用较为古色古香的风格，如同当前的这篇说明文档一样。
@@ -451,9 +449,9 @@
\LevelTwoTitle{未完成标记}
-你可以通过 \lstinline|\dnf| 来标记尚未完成的部分。例如：
+你可以通过 \lstinline|\DNF| 来标记尚未完成的部分。例如：
\begin{itemize}
- \item \lstinline|\dnf| 或 \lstinline|\dnf<...>|。效果为：\dnf~或 \dnf<...>。\\其提示文字与当前语言相对应，例如，在法语模式下将会显示为 \UseOtherLanguage{French}{\dnf}。
+ \item \lstinline|\DNF| 或 \lstinline|\DNF<...>|。效果为：\DNF~或 \DNF<...>。\\其提示文字与当前语言相对应，例如，在法语模式下将会显示为 \UseOtherLanguage{French}{\DNF}。
\end{itemize}
\LevelTwoTitle{文章标题、摘要与关键词}
@@ -522,7 +520,6 @@
\LevelThreeTitle{关于QED符号}
由于定理类环境中的字体和正文字体是一样的，为了方便看出定理类环境在哪里结束，在其结尾处放置了一个空心的QED符号。然而，如果你的定理是由公式或者列表结尾的，这个符号就无法自动地放在正确的位置。这时，你需要手动在公式或列表最后一个条目的后面加上 \lstinline|\qedhere|，以让QED符号显示到这一行的最后。
-% \clearpage
\LevelOneTitle{目前存在的问题}
\begin{itemize}[itemsep=.6em]
Modified: trunk/Master/texmf-dist/doc/latex/einfart/einfart-doc-en.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/einfart/einfart-doc-en.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/einfart/einfart-doc-en.tex 2022-04-04 17:45:51 UTC (rev 62899)
+++ trunk/Master/texmf-dist/doc/latex/einfart/einfart-doc-en.tex 2022-04-04 20:54:49 UTC (rev 62900)
@@ -8,7 +8,6 @@
\usepackage{ProjLib}
\usepackage{longtable} % breakable tables
\usepackage{hologo} % more TeX logo
-\usetikzlibrary{calc}
\usepackage{blindtext}
@@ -39,7 +38,7 @@
\providecommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$}
\lstset{moretexcs=%
{linenumbers,nolinenumbers,part,parttext,chapter,section,subsection,subsubsection,frontmatter,mainmatter,backmatter,tableofcontents,href,
- color,NameTheorem,CreateTheorem,cref,dnf,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,TheDate,ProjLib,qedhere
+ color,NameTheorem,CreateTheorem,cref,DNF,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,TheDate,ProjLib,qedhere
}
}
\lstnewenvironment{code}%
@@ -96,7 +95,7 @@
%%================================
\begin{document}
-\def\PackageVersion{2022/03/19}
+\def\PackageVersion{2022/04/03}
\title{\einfart{}, write your articles in a simple and clear way}
\author{Jinwen XU}
@@ -164,7 +163,7 @@
\maketitle
\begin{abstract}
- Ceci est un résumé. \dnf<(*\meta{some hint}*)>
+ Ceci est un résumé. \DNF<(*\meta{some hint}*)>
\end{abstract}
\begin{keyword}
AAA, BBB, CCC, DDD, EEE
@@ -259,7 +258,7 @@
\medskip
\begin{code}
-\dnf<(*\meta{some hint}*)>
+\DNF<(*\meta{some hint}*)>
\end{code}
When you have some places that have not yet been finished yet, you can mark them with this command, which is especially useful during the draft stage.
@@ -336,11 +335,10 @@
\item Font options. As the name suggest, font with corresponding name will be loaded.
\item The \texttt{useosf} option is used to enable the old-style figures.
\end{itemize}
- \item \texttt{allowbf}
+ \item \texttt{use boldface}
\begin{itemize}
\item Allow boldface. When this option is enabled, the main title, the titles of all levels and the names of theorem-like environments will be bolded.
\end{itemize}
-% \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.
@@ -448,9 +446,9 @@
\LevelTwoTitle{Draft mark}
-You can use \lstinline|\dnf| to mark the unfinished part. For example:
+You can use \lstinline|\DNF| to mark the unfinished part. For example:
\begin{itemize}
- \item \lstinline|\dnf| or \lstinline|\dnf<...>|. The effect is: \dnf~ or \dnf<...>. \\The prompt text changes according to the current language. For example, it will be displayed as \UseOtherLanguage{French}{\dnf} in French mode.
+ \item \lstinline|\DNF| or \lstinline|\DNF<...>|. The effect is: \DNF~ or \DNF<...>. \\The prompt text changes according to the current language. For example, it will be displayed as \UseOtherLanguage{French}{\DNF} in French mode.
\end{itemize}
\LevelTwoTitle{Title, abstract and keywords}
@@ -517,7 +515,6 @@
This is a disadvantage brought about by the underline decoration of the title.
-% \clearpage
\LevelOneTitle{Known issues}
\begin{itemize}[itemsep=.6em]
Modified: trunk/Master/texmf-dist/doc/latex/einfart/einfart-doc-fr.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/einfart/einfart-doc-fr.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/einfart/einfart-doc-fr.tex 2022-04-04 17:45:51 UTC (rev 62899)
+++ trunk/Master/texmf-dist/doc/latex/einfart/einfart-doc-fr.tex 2022-04-04 20:54:49 UTC (rev 62900)
@@ -8,7 +8,6 @@
\usepackage{ProjLib}
\usepackage{longtable} % breakable tables
\usepackage{hologo} % more TeX logo
-\usetikzlibrary{calc}
\usepackage{blindtext}
@@ -39,7 +38,7 @@
\providecommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$}
\lstset{moretexcs=%
{linenumbers,nolinenumbers,part,parttext,chapter,section,subsection,subsubsection,frontmatter,mainmatter,backmatter,tableofcontents,href,
- color,NameTheorem,CreateTheorem,cref,dnf,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,TheDate,ProjLib,qedhere
+ color,NameTheorem,CreateTheorem,cref,DNF,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,TheDate,ProjLib,qedhere
}
}
\lstnewenvironment{code}%
@@ -96,7 +95,7 @@
%%================================
\begin{document}
-\def\PackageVersion{2022/03/19}
+\def\PackageVersion{2022/04/03}
\title{\einfart{}, écrivez vos articles de manière simple et claire}
\author{Jinwen XU}
@@ -165,7 +164,7 @@
\maketitle
\begin{abstract}
- Ceci est un résumé. \dnf<(*\meta{some hint}*)>
+ Ceci est un résumé. \DNF<(*\meta{some hint}*)>
\end{abstract}
\begin{keyword}
AAA, BBB, CCC, DDD, EEE
@@ -259,7 +258,7 @@
\medskip
\begin{code}
-\dnf<(*\meta{some hint}*)>
+\DNF<(*\meta{some hint}*)>
\end{code}
Lorsque vous avez des endroits qui ne sont pas encore finis, vous pouvez les marquer avec cette commande, ce qui est particulièrement utile lors de la phase de brouillon.
@@ -335,7 +334,7 @@
\item Options de police. Comme son nom l'indique, la police avec le nom correspondant sera utilisée.
\item L'option \texttt{useosf} est pour activer les chiffres à l'ancienne.
\end{itemize}
- \item \texttt{allowbf}
+ \item \texttt{use boldface}
\begin{itemize}
\item Afficher les titres en gras. Lorsque cette option est utilisée, le titre principal, les titres de tous les niveaux et les noms des environnements de type théorème seront en gras.
\end{itemize}
@@ -366,7 +365,6 @@
\end{itemize}
\end{itemize}
-% \clearpage
\LevelOneTitle{Instructions par sujet}
\LevelTwoTitle{Configurer la langue}
@@ -445,9 +443,9 @@
\LevelTwoTitle{Draft mark}
-Vous pouvez utiliser \lstinline|\dnf| pour marquer la partie inachevée. Par example :
+Vous pouvez utiliser \lstinline|\DNF| pour marquer la partie inachevée. Par example :
\begin{itemize}
- \item \lstinline|\dnf| ou \lstinline|\dnf<...>|. L'effet est : \dnf~ ou \dnf<...>. \\Le texte à l'intérieur changera en fonction de la langue actuelle. Par exemple, il sera affiché sous la forme \UseOtherLanguage{English}{\dnf} en mode anglais.
+ \item \lstinline|\DNF| ou \lstinline|\DNF<...>|. L'effet est : \DNF~ ou \DNF<...>. \\Le texte à l'intérieur changera en fonction de la langue actuelle. Par exemple, il sera affiché sous la forme \UseOtherLanguage{English}{\DNF} en mode anglais.
\end{itemize}
\LevelTwoTitle{Titre, résumé et mots-clés}
@@ -500,7 +498,6 @@
Parmi eux, l'ordre mutuel de \lstinline|\address|, \lstinline|\curraddr|, \lstinline|\email| n'est pas important.
-% \clearpage
\LevelTwoTitle{Divers}
\LevelThreeTitle{Les numéros de ligne}
Modified: trunk/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-cn.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-cn.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-cn.tex 2022-04-04 17:45:51 UTC (rev 62899)
+++ trunk/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-cn.tex 2022-04-04 20:54:49 UTC (rev 62900)
@@ -1,6 +1,5 @@
\documentclass[English,Chinese,French,use boldface,simple name]{lebhart}
-
%%================================
%% Import toolkit
%%================================
@@ -38,7 +37,7 @@
\providecommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$}
\lstset{moretexcs=%
{part,parttext,chapter,section,subsection,subsubsection,frontmatter,mainmatter,backmatter,tableofcontents,href,
- color,NameTheorem,CreateTheorem,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,TheDate,ProjLib,qedhere
+ color,NameTheorem,CreateTheorem,cref,DNF,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,TheDate,ProjLib,qedhere
}
}
\lstnewenvironment{code}%
@@ -92,7 +91,7 @@
%%================================
\begin{document}
-\def\PackageVersion{2022/03/19}
+\def\PackageVersion{2022/04/03}
\title{{\normalfont\bfseries\color{main-text}\lebhart{}}\\以多彩的方式排版你的文章}
\author{许锦文}
@@ -107,7 +106,7 @@
\lebhart{} 支持英语、法语、德语、意大利语、葡萄牙语、巴西葡萄牙语、西班牙语、简体中文、繁体中文、日文、俄文，并且同一篇文档中这些语言可以很好地协调。由于采用了自定义字体，需要用 \hologo{XeLaTeX} 或 \hologo{LuaLaTeX} 引擎进行编译。
- 这篇说明文档即是用 \lebhart{} 排版的 (使用了参数 \texttt{allowbf})，你可以把它看作一份简短的说明与演示。
+ 这篇说明文档即是用 \lebhart{} 排版的 (使用了参数 \texttt{use boldface})，你可以把它看作一份简短的说明与演示。
\end{abstract}
@@ -160,7 +159,7 @@
\maketitle
\begin{abstract}
- Ceci est un résumé. \dnf<(*\meta{some hint}*)>
+ Ceci est un résumé. \DNF<(*\meta{some hint}*)>
\end{abstract}
\begin{keyword}
AAA, BBB, CCC, DDD, EEE
@@ -251,7 +250,7 @@
\LevelThreeTitle{未完成标记}
\begin{code}
-\dnf<(*\meta{some hint}*)>
+\DNF<(*\meta{some hint}*)>
\end{code}
当你有一些地方尚未完成的时候，可以用这条指令标记出来，它在草稿阶段格外有用。
@@ -336,7 +335,7 @@
\item 字体选项。顾名思义，会加载相应名称的字体。
\item \texttt{useosf} 选项用来启用“旧式”数字。
\end{itemize}
- \item \texttt{allowbf}
+ \item \texttt{use boldface}
\begin{itemize}
\item 允许加粗。启用这一选项时，题目、各级标题、定理类环境名称会被加粗。
\end{itemize}
@@ -480,9 +479,9 @@
\LevelTwoTitle{未完成标记}
-你可以通过 \lstinline|\dnf| 来标记尚未完成的部分。例如：
+你可以通过 \lstinline|\DNF| 来标记尚未完成的部分。例如：
\begin{itemize}
- \item \lstinline|\dnf| 或 \lstinline|\dnf<...>|。效果为：\dnf~或 \dnf<...>。\\其提示文字与当前语言相对应，例如，在法语模式下将会显示为 \UseOtherLanguage{French}{\dnf}。
+ \item \lstinline|\DNF| 或 \lstinline|\DNF<...>|。效果为：\DNF~或 \DNF<...>。\\其提示文字与当前语言相对应，例如，在法语模式下将会显示为 \UseOtherLanguage{French}{\DNF}。
\end{itemize}
\LevelTwoTitle{文章标题、摘要与关键词}
Modified: trunk/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-en.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-en.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-en.tex 2022-04-04 17:45:51 UTC (rev 62899)
+++ trunk/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-en.tex 2022-04-04 20:54:49 UTC (rev 62900)
@@ -1,6 +1,5 @@
\documentclass[English,Chinese,French,use boldface,simple name]{lebhart}
-
%%================================
%% Import toolkit
%%================================
@@ -38,7 +37,7 @@
\providecommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$}
\lstset{moretexcs=%
{part,parttext,chapter,section,subsection,subsubsection,frontmatter,mainmatter,backmatter,tableofcontents,href,
- color,NameTheorem,CreateTheorem,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,TheDate,ProjLib,qedhere
+ color,NameTheorem,CreateTheorem,cref,DNF,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,TheDate,ProjLib,qedhere
}
}
\lstnewenvironment{code}%
@@ -92,7 +91,7 @@
%%================================
\begin{document}
-\def\PackageVersion{2022/03/19}
+\def\PackageVersion{2022/04/03}
\title{{\normalfont\bfseries\color{main-text}\lebhart{}}\\write your articles in a colorful way}
\author{Jinwen XU}
@@ -107,7 +106,7 @@
\lebhart{} has multi-language support, including Chinese (simplified and traditional), English, French, German, Italian, Japanese, Portuguese (European and Brazilian), Russian and Spanish. These languages can be switched seamlessly in a single document. Due to the usage of custom fonts, \lebhart{} requires \hologo{XeLaTeX} or \hologo{LuaLaTeX} to compile.
- This documentation is typeset using \lebhart{} (with the option \texttt{allowbf}). You can think of it as a short introduction and demonstration.
+ This documentation is typeset using \lebhart{} (with the option \texttt{use boldface}). You can think of it as a short introduction and demonstration.
\end{abstract}
@@ -160,7 +159,7 @@
\maketitle
\begin{abstract}
- Ceci est un résumé. \dnf<(*\meta{some hint}*)>
+ Ceci est un résumé. \DNF<(*\meta{some hint}*)>
\end{abstract}
\begin{keyword}
AAA, BBB, CCC, DDD, EEE
@@ -251,7 +250,7 @@
\LevelThreeTitle{Draft marks}
\begin{code}
-\dnf<(*\meta{some hint}*)>
+\DNF<(*\meta{some hint}*)>
\end{code}
When you have some places that have not yet been finished yet, you can mark them with this command, which is especially useful during the draft stage.
@@ -335,7 +334,7 @@
\item Font options. As the name suggest, font with corresponding name will be loaded.
\item The \texttt{useosf} option is used to enable the old-style figures.
\end{itemize}
- \item \texttt{allowbf}
+ \item \texttt{use boldface}
\begin{itemize}
\item Allow boldface. When this option is enabled, the main title, the titles of all levels and the names of theorem-like environments will be bolded.
\end{itemize}
@@ -474,9 +473,9 @@
\LevelTwoTitle{Draft mark}
-You can use \lstinline|\dnf| to mark the unfinished part. For example:
+You can use \lstinline|\DNF| to mark the unfinished part. For example:
\begin{itemize}
- \item \lstinline|\dnf| or \lstinline|\dnf<...>|. The effect is: \dnf~ or \dnf<...>. \\The prompt text changes according to the current language. For example, it will be displayed as \UseOtherLanguage{French}{\dnf} in French mode.
+ \item \lstinline|\DNF| or \lstinline|\DNF<...>|. The effect is: \DNF~ or \DNF<...>. \\The prompt text changes according to the current language. For example, it will be displayed as \UseOtherLanguage{French}{\DNF} in French mode.
\end{itemize}
\LevelTwoTitle{Title, abstract and keywords}
Modified: trunk/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-fr.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-fr.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-fr.tex 2022-04-04 17:45:51 UTC (rev 62899)
+++ trunk/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-fr.tex 2022-04-04 20:54:49 UTC (rev 62900)
@@ -1,6 +1,5 @@
\documentclass[English,Chinese,French,use boldface,simple name]{lebhart}
-
%%================================
%% Import toolkit
%%================================
@@ -38,7 +37,7 @@
\providecommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$}
\lstset{moretexcs=%
{part,parttext,chapter,section,subsection,subsubsection,frontmatter,mainmatter,backmatter,tableofcontents,href,
- color,NameTheorem,CreateTheorem,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,TheDate,ProjLib,qedhere
+ color,NameTheorem,CreateTheorem,cref,DNF,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,TheDate,ProjLib,qedhere
}
}
\lstnewenvironment{code}%
@@ -92,7 +91,7 @@
%%================================
\begin{document}
-\def\PackageVersion{2022/03/19}
+\def\PackageVersion{2022/04/03}
\title{{\normalfont\bfseries\color{main-text}\lebhart{}}\\écrivez vos articles de manière colorée}
\author{Jinwen XU}
@@ -107,7 +106,7 @@
\lebhart{} prend en charge plusieurs langues, notamment le chinois (simplifié et traditionnel), l'anglais, le français, l'allemand, l'italien, le japonais, le portugais (européen et brésilien), le russe et l'espagnol. Ces langues peuvent être commutées de manière transparente dans un seul document. En raison de l'utilisation de polices personnalisées, \lebhart{} demande soit \hologo{XeLaTeX} soit \hologo{LuaLaTeX} pour la compilation.
- Cette documentation est composée à l'aide de \lebhart{} (avec l'option \texttt{allowbf}). Vous pouvez le considérer comme une courte introduction et une démonstration.
+ Cette documentation est composée à l'aide de \lebhart{} (avec l'option \texttt{use boldface}). Vous pouvez le considérer comme une courte introduction et une démonstration.
\end{abstract}
@@ -161,7 +160,7 @@
\maketitle
\begin{abstract}
- Ceci est un résumé. \dnf<(*\meta{some hint}*)>
+ Ceci est un résumé. \DNF<(*\meta{some hint}*)>
\end{abstract}
\begin{keyword}
AAA, BBB, CCC, DDD, EEE
@@ -252,7 +251,7 @@
\LevelThreeTitle{Marques de brouillon}
\begin{code}
-\dnf<(*\meta{some hint}*)>
+\DNF<(*\meta{some hint}*)>
\end{code}
Lorsque vous avez des endroits qui ne sont pas encore finis, vous pouvez les marquer avec cette commande, ce qui est particulièrement utile lors de la phase de brouillon.
@@ -336,7 +335,7 @@
\item Options de police. Comme son nom l'indique, la police avec le nom correspondant sera utilisée.
\item L'option \texttt{useosf} est pour activer les chiffres à l'ancienne.
\end{itemize}
- \item \texttt{allowbf}
+ \item \texttt{use boldface}
\begin{itemize}
\item Afficher les titres en gras. Lorsque cette option est utilisée, le titre principal, les titres de tous les niveaux et les noms des environnements de type théorème seront en gras.
\end{itemize}
@@ -473,9 +472,9 @@
\LevelTwoTitle{Draft mark}
-Vous pouvez utiliser \lstinline|\dnf| pour marquer la partie inachevée. Par example :
+Vous pouvez utiliser \lstinline|\DNF| pour marquer la partie inachevée. Par example :
\begin{itemize}
- \item \lstinline|\dnf| ou \lstinline|\dnf<...>|. L'effet est : \dnf~ ou \dnf<...>. \\Le texte à l'intérieur changera en fonction de la langue actuelle. Par exemple, il sera affiché sous la forme \UseOtherLanguage{English}{\dnf} en mode anglais.
+ \item \lstinline|\DNF| ou \lstinline|\DNF<...>|. L'effet est : \DNF~ ou \DNF<...>. \\Le texte à l'intérieur changera en fonction de la langue actuelle. Par exemple, il sera affiché sous la forme \UseOtherLanguage{English}{\DNF} en mode anglais.
\end{itemize}
\LevelTwoTitle{Titre, résumé et mots-clés}
Modified: trunk/Master/texmf-dist/doc/latex/minimalist/minimalist-doc.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/minimalist/minimalist-doc.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/minimalist/minimalist-doc.tex 2022-04-04 17:45:51 UTC (rev 62899)
+++ trunk/Master/texmf-dist/doc/latex/minimalist/minimalist-doc.tex 2022-04-04 20:54:49 UTC (rev 62900)
@@ -8,7 +8,6 @@
\usepackage{ProjLib}
\usepackage{longtable} % breakable tables
\usepackage{hologo} % more TeX logo
-\usetikzlibrary{calc}
\usepackage{blindtext}
@@ -39,7 +38,7 @@
\providecommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$}
\lstset{moretexcs=%
{linenumbers,nolinenumbers,part,parttext,chapter,section,subsection,subsubsection,frontmatter,mainmatter,backmatter,tableofcontents,href,
- color,NameTheorem,CreateTheorem,cref,dnf,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,TheDate,ProjLib,qedhere
+ color,NameTheorem,CreateTheorem,cref,DNF,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,TheDate,ProjLib,qedhere
}
}
\lstnewenvironment{code}%
@@ -96,7 +95,7 @@
%%================================
\begin{document}
-\def\PackageVersion{2022/03/19}
+\def\PackageVersion{2022/04/03}
\title{\minimalist{}, write your articles or books in a simple and clear way}
\author{Jinwen XU}
@@ -180,7 +179,7 @@
\maketitle
\begin{abstract}
- Ceci est un résumé. \dnf<(*\meta{some hint}*)>
+ Ceci est un résumé. \DNF<(*\meta{some hint}*)>
\end{abstract}
\begin{keyword}
AAA, BBB, CCC, DDD, EEE
@@ -277,7 +276,7 @@
\medskip
\begin{code}
-\dnf<(*\meta{some hint}*)>
+\DNF<(*\meta{some hint}*)>
\end{code}
When you have some places that have not yet been finished yet, you can mark them with this command, which is especially useful during the draft stage.
@@ -382,7 +381,7 @@
\begin{tip}
During the draft stage, it is recommended to use the \verb|fast| option to speed up compilation. When in \verb|fast| mode, there will be a watermark ``DRAFT'' to indicate that you are currently in the draft mode.
\end{tip}
- \item \texttt{allowbf}
+ \item \texttt{use boldface}
\begin{itemize}
\item Allow boldface. When this option is enabled, the main title, the titles of all levels and the names of theorem-like environments will be bolded.
\end{itemize}
@@ -507,12 +506,11 @@
\LevelTwoTitle{Draft mark}
-You can use \lstinline|\dnf| to mark the unfinished part. For example:
+You can use \lstinline|\DNF| to mark the unfinished part. For example:
\begin{itemize}
- \item \lstinline|\dnf| or \lstinline|\dnf<...>|. The effect is: \dnf~ or \dnf<...>. \\The prompt text changes according to the current language. For example, it will be displayed as \UseOtherLanguage{French}{\dnf} in French mode.
+ \item \lstinline|\DNF| or \lstinline|\DNF<...>|. The effect is: \DNF~ or \DNF<...>. \\The prompt text changes according to the current language. For example, it will be displayed as \UseOtherLanguage{French}{\DNF} in French mode.
\end{itemize}
-% \clearpage
\LevelTwoTitle{Title, abstract and keywords}
\minimart{} has both the features of standard classes and that of the \AmS{} classes.
Modified: trunk/Master/texmf-dist/doc/latex/projlib/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/projlib/README.md 2022-04-04 17:45:51 UTC (rev 62899)
+++ trunk/Master/texmf-dist/doc/latex/projlib/README.md 2022-04-04 20:54:49 UTC (rev 62900)
@@ -4,32 +4,13 @@
# The `ProjLib` Toolkit
-The bundle is dated 2022/03/21
+> **ProjLib** can be interpreted as "***Proj**ect **Lib**rary*" (in English), or as "***Proj**et **Lib**re*" (in French, meaning "*Free Project*").
-## **Important note**
+**This bundle is dated 2022/04/03. Please note that the documentations are not yet up-to-date.**
-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
-- projlib-datetime
-- projlib-draft
-- projlib-font
-- projlib-language
-- projlib-logo
-- projlib-math
-- projlib-paper
-- projlib-theorem
-
-Below is the old README.
-
----
-
-> **ProjLib** can be interpreted as "***Proj**ect **Lib**rary*" (in English), or as "***Proj**et **Lib**re*" (in French).
-
## Introduction
-`ProjLib` is a collection of tools that help you write LaTeX document. With the package `ProjLib` loaded (note that it is case-sensitive), you no longer need to set up the theorem-like environments nor to manually configure the appropriate multilingual settings. In addition, a series of auxiliary functionalities are introduced.
+`ProjLib` is a collection of tools that help you write LaTeX document. With the main package `ProjLib` loaded (note that it is *case-sensitive*), you no longer need to manually configure the appropriate multilingual settings nor to set up the theorem-like environments. In addition, a series of auxiliary functionalities are introduced.
To get started, simply put this line in your preamble:
```latex
@@ -37,38 +18,45 @@
```
> For the options and detailed usage, please refer to the documentation.
-## The components
-The components include:
-1. `PJLauthor.sty`
- - Enhanced author information block
- - Offers `\address`, `\curraddr` and `\email`
- - Write in the AMS fashion (with option `amsfashion`):
+
+## The modules
+
+> Each module correspond to a separate package, for example, the module `theorem` is `projlib-theorem.sty`.
+
+The modules include:
+1. module `author` - *Enhanced author information block*
+ - Offering `\address`, `\curraddr` and `\email`.
+ - Write in the AMS fashion (with option `ams-fashion`):
- Support `\dedicatory`, `\keywords` and `\subjclass`
- `\thanks` can be written outside `\author`;
- The `abstract` environment can be placed before `\maketitle`.
-1. `PJLdate.sty`
- - Offers a macro `\PLdate` (or `\PJLdate`) to convert `yyyy-mm-dd` to normal datetime format, with multi-language support
-1. `PJLdraft.sty`
- - Useful macros during the draft stage: `\dnf` and `\needgraph`, with multi-language support
-1. `PJLlang.sty`
- - Multi-language configuration based on `babel` or `polyglossia`
- - Offers `\UseLanguage`, `\UseOtherLanguage` and `\AddLanguageSetting`
- - Currently support Chinese (simplified and traditional), English, French, German, Italien, Japanese, Portuguese (European and Brazilian), Russian and Spanish
-1. `PJLlogo.sty`
- - Draw the ProjLib logo
-1. `PJLmath.sty`
- - Useful math macros and shortcuts
-1. `PJLpaper.sty`
- - Paper style configuration: yellow theme, dark theme and nord theme
-1. `PJLthm.sty`
- - Theorem setup and configuration
- - Offers a macro `\CreateTheorem` for creating theorem-like environments with multi-language support
- - Preset environments include: `assumption`, `axiom`, `conjecture`, `convention`, `corollary`, `definition`, `definition-proposition`, `definition-theorem`, `example`, `exercise`, `fact`, `hypothesis`, `lemma`, `notation`, `observation`, `problem`, `property`, `proposition`, `question`, `remark`, `theorem`, and the corresponding unnumbered version with an asterisk `*` in the name.
-1. `PJLtoolkit.sty` (this is the internal name of the `ProjLib` package)
- - A collective interface of ProjLib Toolkit, loading all the packages above
- - Provide some pre-defined font configuration
+1. module `datetime` - *Convert numeric date-time string to natural language*
+ - `\TheDate` and `\Thedate` for converting numeric date-time string to natural language, with multi-language support (if the command names `\TheDate` or `\Thedate` are occupied, then one can switch to the longer version `\ProjLibDate` and `\ProjLibdate`).
+ - `\ProjLibToday` and `\ProjLibToday` (with the module `language` enabled, `\today` is redefined into `\ProjLibToday`, and thus supports the arguments like `only-year-month`).
+ - Multiple input and output format available.
+1. module `draft` - *Useful commands during draft stage*
+ - `\DNF` for marking unfinished part. In addition, a report of all unfinished places shall be printed at the last of your document.
+1. module `font` - *Font selection and configuration*
+ - Supporting Palatino, Times, Garamond, Biolinum, Noto, etc.
+1. module `language` - *Multi-language configuration*
+ - `\UseLanguage`, `\UseOtherLanguage` for selecting languages, and `\AddLanguageSetting` for adding language-specific settings.
+ - `\DefineMultilingualText` for defining multilingual text strings.
+ - Currently support Chinese (simplified and traditional), English, French, German, Italien, Japanese, Portuguese (European and Brazilian), Russian and Spanish.
+1. module `logo` - *The ProjLib logo*
+ - Draw the `ProjLib` logo in colorful or colorless fashion.
+1. module `math` - *Efficient math setup*
+ - `\DefineOperator` and `\DefineShortcut` for setting up math macros efficiently
+ - `\ListOfSymbols` for printing list of symboks
+1. module `paper` - *Configuration of the paper style*
+ - Paper style configuration, with the themes `yellow`, `green`, `light gray`, `gray`, `dark`, etc.
+1. module `theorem` - *Configuration of theorem-like environments*
+ - `\CreateTheorem`, `\SetTheorem` and more: setting up theorem-like environments based on the package `create-theorem`, and in particular, supporting the modes `name as is` and `name as context` for referencing names
+ - Support options `simple name` and `complex name` for referencing names
+ - Preset environments include: `assertion`, `assumption`, `axiom`, `conclusion`, `conjecture`, `convention`, `corollary`, `definition`, `definition-proposition`, `definition-theorem`, `example`, `exercise`, `fact`, `hypothesis`, `lemma`, `notation`, `observation`, `postulate`, `problem`, `property`, `proposition`, `question`, `remark`, `theorem`, and the corresponding unnumbered version with an asterisk `*` in the name.
+1. module `titlepage` - *Commands for rendering the title page*
+ - Currently support two title page styles: `default` and `simple`.
-> Since `PJLthm.sty` (and thus `ProjLib.sty`) uses `cleveref`, it should be loaded after `varioref` and `hyperref`.
+> Since the module `theorem` uses `cleveref`, it should be loaded after `varioref` and `hyperref` (same for the main package `ProjLib`).
## How to get these files
You can get the `.sty` files mentioned above simply by compiling `ProjLib.ins`:
@@ -88,51 +76,6 @@
latexmk -xelatex ProjLib-doc-**.tex
```
-## An example
-```latex
-\documentclass{amsart}
-\usepackage[a4paper,margin=.75in]{geometry}
-\usepackage[hidelinks]{hyperref}
-\usepackage[palatino]{ProjLib}
-
-%% You can also comment the above lines and try the following (require xelatex or lualatex):
-% \documentclass[a4paper,allowbf]{lebhart}
-% \usepackage[amsfashion]{ProjLib}
-
-%% Using \UseLanguage to select language, by default "English" is selected
-\UseLanguage{French} % Use French from here
-
-\begin{document}
-
-\title{Le Titre}
-\author{Auteur 1}
-\address{Adresse 1}
-\email{\href{Courriel 1}{Courriel 1}}
-\author{Auteur 1}
-\address{Adresse 1}
-\email{\href{Courriel 2}{Courriel 2}}
-\date{\PLdate{2022-04-01}}
-\subjclass{*****}
-\keywords{...}
-
-\begin{abstract}
- Ceci est un résumé. \dnf<Some hint>
-\end{abstract}
-
-\maketitle
-
-\section{Un théorème}
-
-%% Theorem-like environments can be used directly
-\begin{theorem}\label{thm:abc}
- Ceci est un théorème.
-\end{theorem}
-
-Référence du théorème: \cref{thm:abc} % It is recommended to use clever reference
-
-\end{document}
-```
-
# License
This work is released under the LaTeX Project Public License, v1.3c or later.
Modified: trunk/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-cn.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-cn.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-cn.tex 2022-04-04 17:45:51 UTC (rev 62899)
+++ trunk/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-cn.tex 2022-04-04 20:54:49 UTC (rev 62900)
@@ -8,7 +8,6 @@
\usepackage{ProjLib}
\usepackage{longtable} % breakable tables
\usepackage{hologo} % more TeX logo
-\usetikzlibrary{calc}
\usepackage{blindtext}
@@ -39,7 +38,7 @@
\providecommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$}
\lstset{moretexcs=%
{linenumbers,nolinenumbers,part,parttext,chapter,section,subsection,subsubsection,frontmatter,mainmatter,backmatter,tableofcontents,href,
- color,NameTheorem,CreateTheorem,cref,dnf,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,TheDate,ProjLib,qedhere
+ color,NameTheorem,CreateTheorem,cref,DNF,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,TheDate,ProjLib,qedhere
}
}
\lstnewenvironment{code}%
@@ -96,22 +95,22 @@
%%================================
\begin{document}
-\def\PackageVersion{2022/03/19}
+\def\PackageVersion{2022/04/03}
\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 [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{} \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}%
+\TitlePage [ style = simple ]
+ {
+ , title = \simplivre{}
+ , subtitle = {
+ \textsc{以极简主义风格排版你的图书}\\[10pt]
+ \tiny 对应版本. \texttt{\simplivre{} \PackageVersion}
+ }
+ , author = 许锦文
+ , date = {\TheDate{\PackageVersion}[only-year-month]，巴黎}
+ }
-\setcounter{page}{0}
-
\ResumeLineNumbers
@@ -195,7 +194,7 @@
\section{(*\meta{section title}*)}
-\dnf<(*\meta{some hint}*)>
+\DNF<(*\meta{some hint}*)>
\begin{theorem}\label{thm:abc}
Ceci est un théorème.
@@ -237,7 +236,7 @@
\medskip
\begin{code}
-\dnf<(*\meta{some hint}*)>
+\DNF<(*\meta{some hint}*)>
\end{code}
当你有一些地方尚未完成的时候，可以用这条指令标记出来，它在草稿阶段格外有用。
@@ -301,7 +300,7 @@
\item 字体选项。顾名思义，会加载相应名称的字体。
\item \texttt{useosf} 选项用来启用“旧式”数字。
\end{itemize}
- \item \texttt{allowbf}
+ \item \texttt{use boldface}
\begin{itemize}
\item 允许加粗。启用这一选项时，题目、各级标题、定理类环境名称会被加粗。
\end{itemize}
@@ -313,7 +312,6 @@
\begin{itemize}
\item 采用段首缩进而不是段间间距。
\end{itemize}
-% \clearpage
\item \texttt{runin}
\begin{itemize}
\item \lstinline|\subsubsection| 采用 ``runin'' 风格。
@@ -419,9 +417,9 @@
\LevelTwoTitle{未完成标记}
-你可以通过 \lstinline|\dnf| 来标记尚未完成的部分。例如：
+你可以通过 \lstinline|\DNF| 来标记尚未完成的部分。例如：
\begin{itemize}
- \item \lstinline|\dnf| 或 \lstinline|\dnf<...>|。效果为：\dnf~或 \dnf<...>。\\其提示文字与当前语言相对应，例如，在法语模式下将会显示为 \UseOtherLanguage{French}{\dnf}。
+ \item \lstinline|\DNF| 或 \lstinline|\DNF<...>|。效果为：\DNF~或 \DNF<...>。\\其提示文字与当前语言相对应，例如，在法语模式下将会显示为 \UseOtherLanguage{French}{\DNF}。
\end{itemize}
Modified: trunk/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-en.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-en.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-en.tex 2022-04-04 17:45:51 UTC (rev 62899)
+++ trunk/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-en.tex 2022-04-04 20:54:49 UTC (rev 62900)
@@ -8,7 +8,6 @@
\usepackage{ProjLib}
\usepackage{longtable} % breakable tables
\usepackage{hologo} % more TeX logo
-\usetikzlibrary{calc}
\usepackage{blindtext}
@@ -39,7 +38,7 @@
\providecommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$}
\lstset{moretexcs=%
{linenumbers,nolinenumbers,part,parttext,chapter,section,subsection,subsubsection,frontmatter,mainmatter,backmatter,tableofcontents,href,
- color,NameTheorem,CreateTheorem,cref,dnf,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,TheDate,ProjLib,qedhere
+ color,NameTheorem,CreateTheorem,cref,DNF,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,TheDate,ProjLib,qedhere
}
}
\lstnewenvironment{code}%
@@ -96,23 +95,23 @@
%%================================
\begin{document}
-\def\PackageVersion{2022/03/19}
+\def\PackageVersion{2022/04/03}
\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 [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{} \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}%
+\TitlePage [ style = simple ]
+ {
+ , title = \simplivre{}
+ , subtitle = {
+ \textsc{Write your books in \\a simple and clear way}\\[10pt]
+ \tiny Corresponding to: \texttt{\simplivre{} \PackageVersion}
+ }
+ , author = Jinwen XU
+ , date = {\TheDate{\PackageVersion}[only-year-month], in Paris}
+ }
-\setcounter{page}{0}
-
\ResumeLineNumbers
@@ -196,7 +195,7 @@
\section{(*\meta{section title}*)}
-\dnf<(*\meta{some hint}*)>
+\DNF<(*\meta{some hint}*)>
\begin{theorem}\label{thm:abc}
Ceci est un théorème.
@@ -239,7 +238,7 @@
\medskip
\begin{code}
-\dnf<(*\meta{some hint}*)>
+\DNF<(*\meta{some hint}*)>
\end{code}
When you have some places that have not yet been finished yet, you can mark them with this command, which is especially useful during the draft stage.
@@ -303,7 +302,7 @@
\item Font options. As the name suggest, font with corresponding name will be loaded.
\item The \texttt{useosf} option is used to enable the old-style figures.
\end{itemize}
- \item \texttt{allowbf}
+ \item \texttt{use boldface}
\begin{itemize}
\item Allow boldface. When this option is enabled, the main title, the titles of all levels and the names of theorem-like environments will be bolded.
\end{itemize}
@@ -319,7 +318,6 @@
\begin{itemize}
\item Use the ``runin'' style for \lstinline|\subsubsection|
\end{itemize}
-% \clearpage
\item \texttt{nothms}
\begin{itemize}
\item Pure text mode. Do not load theorem-like environments.
@@ -415,12 +413,11 @@
Please refer to the documentation of the package \textsf{create-theorem} to see how to declare new theorem-like environments.
\end{tip}
-% \clearpage
\LevelTwoTitle{Draft mark}
-You can use \lstinline|\dnf| to mark the unfinished part. For example:
+You can use \lstinline|\DNF| to mark the unfinished part. For example:
\begin{itemize}
- \item \lstinline|\dnf| or \lstinline|\dnf<...>|. The effect is: \dnf~ or \dnf<...>. \\The prompt text changes according to the current language. For example, it will be displayed as \UseOtherLanguage{French}{\dnf} in French mode.
+ \item \lstinline|\DNF| or \lstinline|\DNF<...>|. The effect is: \DNF~ or \DNF<...>. \\The prompt text changes according to the current language. For example, it will be displayed as \UseOtherLanguage{French}{\DNF} in French mode.
\end{itemize}
Modified: trunk/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-fr.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-fr.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-fr.tex 2022-04-04 17:45:51 UTC (rev 62899)
+++ trunk/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-fr.tex 2022-04-04 20:54:49 UTC (rev 62900)
@@ -8,7 +8,6 @@
\usepackage{ProjLib}
\usepackage{longtable} % breakable tables
\usepackage{hologo} % more TeX logo
-\usetikzlibrary{calc}
\usepackage{blindtext}
@@ -39,7 +38,7 @@
\providecommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$}
\lstset{moretexcs=%
{linenumbers,nolinenumbers,part,parttext,chapter,section,subsection,subsubsection,frontmatter,mainmatter,backmatter,tableofcontents,href,
- color,NameTheorem,CreateTheorem,cref,dnf,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,TheDate,ProjLib,qedhere
+ color,NameTheorem,CreateTheorem,cref,DNF,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,TheDate,ProjLib,qedhere
}
}
\lstnewenvironment{code}%
@@ -96,22 +95,22 @@
%%================================
\begin{document}
-\def\PackageVersion{2022/03/19}
+\def\PackageVersion{2022/04/03}
\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 [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{} \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}%
+\TitlePage [ style = simple ]
+ {
+ , title = \simplivre{}
+ , subtitle = {
+ \textsc{Écrivez vos livres \\de manière simple et claire}\\[10pt]
+ \tiny Correspondant à : \texttt{\simplivre{} \PackageVersion}
+ }
+ , author = Jinwen XU
+ , date = {\TheDate{\PackageVersion}[only-year-month], à Paris}
+ }
-\setcounter{page}{0}
-
\ResumeLineNumbers
@@ -196,7 +195,7 @@
\section{(*\meta{section title}*)}
-\dnf<(*\meta{some hint}*)>
+\DNF<(*\meta{some hint}*)>
\begin{theorem}\label{thm:abc}
Ceci est un théorème.
@@ -238,7 +237,7 @@
\medskip
\begin{code}
-\dnf<(*\meta{some hint}*)>
+\DNF<(*\meta{some hint}*)>
\end{code}
Lorsque vous avez des endroits qui ne sont pas encore finis, vous pouvez les marquer avec cette commande, ce qui est particulièrement utile lors de la phase de brouillon.
@@ -301,7 +300,7 @@
\item Options de police. Comme son nom l'indique, la police avec le nom correspondant sera utilisée.
\item L'option \texttt{useosf} est pour activer les chiffres à l'ancienne.
\end{itemize}
- \item \texttt{allowbf}
+ \item \texttt{use boldface}
\begin{itemize}
\item Afficher les titres en gras. Lorsque cette option est utilisée, le titre principal, les titres de tous les niveaux et les noms des environnements de type théorème seront en gras.
\end{itemize}
@@ -313,7 +312,6 @@
\begin{itemize}
\item Utilisez l'indentation des paragraphes au lieu de l'espacement entre les paragraphes.
\end{itemize}
-% \clearpage
\item \texttt{runin}
\begin{itemize}
\item Utilisez le style «~runin~» pour \lstinline|\subsubsection|
@@ -413,9 +411,9 @@
\LevelTwoTitle{Draft mark}
-Vous pouvez utiliser \lstinline|\dnf| pour marquer la partie inachevée. Par example :
+Vous pouvez utiliser \lstinline|\DNF| pour marquer la partie inachevée. Par example :
\begin{itemize}
- \item \lstinline|\dnf| ou \lstinline|\dnf<...>|. L'effet est : \dnf~ ou \dnf<...>. \\Le texte à l'intérieur changera en fonction de la langue actuelle. Par exemple, il sera affiché sous la forme \UseOtherLanguage{English}{\dnf} en mode anglais.
+ \item \lstinline|\DNF| ou \lstinline|\DNF<...>|. L'effet est : \DNF~ ou \DNF<...>. \\Le texte à l'intérieur changera en fonction de la langue actuelle. Par exemple, il sera affiché sous la forme \UseOtherLanguage{English}{\DNF} en mode anglais.
\end{itemize}
Modified: trunk/Master/texmf-dist/source/latex/projlib/ProjLib.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/projlib/ProjLib.dtx 2022-04-04 17:45:51 UTC (rev 62899)
+++ trunk/Master/texmf-dist/source/latex/projlib/ProjLib.dtx 2022-04-04 20:54:49 UTC (rev 62900)
@@ -20,7 +20,7 @@
%<*ProjLib>
\ProvidesExplPackage
{ProjLib}
- {2022/03/21} {}
+ {2022/04/03} {}
{Collective interface of the ProjLib toolkit}
%</ProjLib>
%
@@ -27,7 +27,7 @@
%<*projlib-author>
\ProvidesExplPackage
{projlib-author}
- {2022/03/21} {}
+ {2022/04/03} {}
{Enhanced author information block}
%</projlib-author>
%
@@ -34,7 +34,7 @@
%<*projlib-datetime>
\ProvidesExplPackage
{projlib-datetime}
- {2022/03/21} {}
+ {2022/04/03} {}
{Convert numeric date-time string to natural language}
%</projlib-datetime>
%
@@ -41,7 +41,7 @@
%<*projlib-draft>
\ProvidesExplPackage
{projlib-draft}
- {2022/03/21} {}
+ {2022/04/03} {}
{Useful commands during draft stage}
%</projlib-draft>
%
@@ -48,7 +48,7 @@
%<*projlib-font>
\ProvidesExplPackage
{projlib-font}
- {2022/03/21} {}
+ {2022/04/03} {}
{Font selection and configuration}
%</projlib-font>
%
@@ -55,7 +55,7 @@
%<*projlib-language>
\ProvidesExplPackage
{projlib-language}
- {2022/03/21} {}
+ {2022/04/03} {}
{Multi-language configuration}
%</projlib-language>
%
@@ -62,7 +62,7 @@
%<*projlib-logo>
\ProvidesExplPackage
{projlib-logo}
- {2022/03/21} {}
+ {2022/04/03} {}
{The ProjLib logo}
%</projlib-logo>
%
@@ -69,7 +69,7 @@
%<*projlib-math>
\ProvidesExplPackage
{projlib-math}
- {2022/03/21} {}
+ {2022/04/03} {}
{Efficient math setup}
%</projlib-math>
%
@@ -76,7 +76,7 @@
%<*projlib-paper>
\ProvidesExplPackage
{projlib-paper}
- {2022/03/21} {}
+ {2022/04/03} {}
{Configuration of the paper style}
%</projlib-paper>
%
@@ -83,9 +83,16 @@
%<*projlib-theorem>
\ProvidesExplPackage
{projlib-theorem}
- {2022/03/21} {}
+ {2022/04/03} {}
{Configuration of theorem-like environments}
%</projlib-theorem>
+%
+%<*projlib-titlepage>
+\ProvidesExplPackage
+ {projlib-titlepage}
+ {2022/04/03} {}
+ {Commands for rendering the title page}
+%</projlib-titlepage>
%<*ProjLib>
\keys_define:nn { ProjLib }
@@ -99,6 +106,10 @@
, ams-fashion .initial:n = { false }
, ams~fashion .bool_set:N = \l__projlib_main_amsfashion_bool
, ams fashion .bool_set:N = \l__projlib_main_amsfashion_bool
+ , title-page .bool_set:N = \l__projlib_main_titlepage_bool
+ , title-page .initial:n = { false }
+ , title~page .bool_set:N = \l__projlib_main_titlepage_bool
+ , title page .bool_set:N = \l__projlib_main_titlepage_bool
, unknown .code:n = {
\PassOptionsToPackage { \CurrentOption } { projlib-language }
\PassOptionsToPackage { \CurrentOption } { projlib-author }
@@ -132,6 +143,11 @@
\RequirePackage { projlib-math }
\RequirePackage { projlib-paper }
+\bool_if:NT \l__projlib_main_titlepage_bool
+ {
+ \RequirePackage { projlib-titlepage }
+ }
+
\RequirePackage { projlib-theorem }
%</ProjLib>
%
@@ -483,10 +499,20 @@
, month-year .code:n = { \tl_set:Nn \g__projlib_datetime_input_format_tl { day-month-year } }
, day-month .code:n = { \tl_set:Nn \g__projlib_datetime_input_format_tl { day-month-year } }
, only-year-month .code:n = { \tl_set:Nn \l__projlib_datetime_output_format_tl { only-year-month } }
- , only-month-day .code:n = { \tl_set:Nn \l__projlib_datetime_output_format_tl { only-month-day } }
- , only-year .code:n = { \tl_set:Nn \l__projlib_datetime_output_format_tl { only-year } }
- , only-month .code:n = { \tl_set:Nn \l__projlib_datetime_output_format_tl { only-month } }
- , only-day .code:n = { \tl_set:Nn \l__projlib_datetime_output_format_tl { only-day } }
+ , only~year~month .meta:n = { only-year-month }
+ , only year month .meta:n = { only-year-month }
+ , only-month-day .code:n = { \tl_set:Nn \l__projlib_datetime_output_format_tl { only-month-day } }
+ , only~month~day .meta:n = { only-month-day }
+ , only month day .meta:n = { only-month-day }
+ , only-year .code:n = { \tl_set:Nn \l__projlib_datetime_output_format_tl { only-year } }
+ , only~year .meta:n = { only-year }
+ , only year .meta:n = { only-year }
+ , only-month .code:n = { \tl_set:Nn \l__projlib_datetime_output_format_tl { only-month } }
+ , only~month .meta:n = { only-month }
+ , only month .meta:n = { only-month }
+ , only-day .code:n = { \tl_set:Nn \l__projlib_datetime_output_format_tl { only-day } }
+ , only~day .meta:n = { only-day }
+ , only day .meta:n = { only-day }
, unknown .code:n = {}
}
@@ -2160,72 +2186,73 @@
}
-\projlib_langauge_define_multilingual_text:Nn \projlib_draft_dnf_text
+\projlib_langauge_define_multilingual_text:Nn \projlib_draft_DNF_text
{
- EN = To\ be\ finished ,
- FR = Pas\ encore\ fini ,
- DE = Nicht\ beendet ,
- IT = Per\ essere\ finito ,
- PT = Não\ terminou ,
- BR = Não\ terminou ,
- ES = Estar\ terminado ,
- CN = 这里尚未完成 ,
- TC = 這裡尚未完成 ,
- JP = 終わってない ,
- RU = Не\ закончен ,
+ EN = To ~ be ~ finished ,
+ FR = Pas ~ encore ~ fini ,
+ DE = Nicht ~ beendet ,
+ IT = Per ~ essere ~ finito ,
+ PT = Não ~ terminou ,
+ BR = Não ~ terminou ,
+ ES = Estar ~ terminado ,
+ CN = 这里尚未完成 ,
+ TC = 這裡尚未完成 ,
+ JP = 終わってない ,
+ RU = Не ~ закончен ,
}
-\projlib_langauge_define_multilingual_text:Nn \projlib_draft_dnf_report_text
+\projlib_langauge_define_multilingual_text:Nn \projlib_draft_DNF_report_text
{
- EN = { Below\ is\ a\ list\ of\ outstanding\ items,
- \ followed\ by\ the\ corresponding\ page\ numbers. } ,
- FR = { Voici\ la\ liste\ des\ éléments\ en\ suspens,
- \ suivie\ des\ numéros\ de\ page\ correspondants. } ,
- DE = { Unten\ ist\ eine\ Liste\ der\ ausstehenden\ Posten,
- \ gefolgt\ von\ den\ entsprechenden\ Seitenzahlen. } ,
- IT = { Qui\ sotto\ c'è\ una\ lista\ di\ voci\ in\ sospeso,
- \ seguita\ dai\ numeri\ di\ pagina\ corrispondenti. } ,
- PT = { Abaixo\ está\ uma\ lista\ de\ itens\ pendentes,
- \ seguida\ dos\ números\ de\ página\ correspondentes. } ,
- BR = { Abaixo\ está\ uma\ lista\ de\ itens\ pendentes,
- \ seguida\ dos\ números\ de\ página\ correspondentes. } ,
- ES = { Aquí está\ la\ lista\ de\ elementos\ pendientes,
- \ seguida\ de\ los\ números\ de\ página\ correspondientes. } ,
- CN = { 以下是未完成事项列表，括号内注明了对应的页码。 } ,
- TC = { 以下是未完成事項的列表，括號內註明了對應頁碼。 } ,
- JP = { 以下は、未解決の項目とそれに対応するページ番号の一覧です。 } ,
- RU = { Ниже\ приведен\ список\ невыполненных\ пунктов
- \ с\ соответствующими\ номерами\ страниц\ в\ скобках. } ,
+ EN = { Below ~ is ~ a ~ list ~ of ~ outstanding ~ items, ~
+ followed ~ by ~ the ~ corresponding ~ page ~ numbers. } ,
+ FR = { Voici ~ la ~ liste ~ des ~ éléments ~ en ~ suspens, ~
+ suivie ~ des ~ numéros ~ de ~ page ~ correspondants. } ,
+ DE = { Unten ~ ist ~ eine ~ Liste ~ der ~ ausstehenden ~ Posten, ~
+ gefolgt ~ von ~ den ~ entsprechenden ~ Seitenzahlen. } ,
+ IT = { Qui ~ sotto ~ c'è ~ una ~ lista ~ di ~ voci ~ in ~ sospeso, ~
+ seguita ~ dai ~ numeri ~ di ~ pagina ~ corrispondenti. } ,
+ PT = { Abaixo ~ está ~ uma ~ lista ~ de ~ itens ~ pendentes, ~
+ seguida ~ dos ~ números ~ de ~ página ~ correspondentes. } ,
+ BR = { Abaixo ~ está ~ uma ~ lista ~ de ~ itens ~ pendentes, ~
+ seguida ~ dos ~ números ~ de ~ página ~ correspondentes. } ,
+ ES = { Aquí está ~ la ~ lista ~ de ~ elementos ~ pendientes, ~
+ seguida ~ de ~ los ~ números ~ de ~ página ~ correspondientes. } ,
+ CN = { 以下是未完成事项列表，括号内注明了对应的页码。 } ,
+ TC = { 以下是未完成事項的列表，括號內註明了對應頁碼。 } ,
+ JP = { 以下は、未解決の項目とそれに対応するページ番号の一覧です。 } ,
+ RU = { Ниже ~ приведен ~ список ~ невыполненных ~ пунктов ~
+ с ~ соответствующими ~ номерами ~ страниц ~ в ~ скобках. } ,
}
-\tl_new:c { projlib_draft_dnf_font }
-\tl_gset:cn { projlib_draft_dnf_font } { \normalfont \ttfamily \bfseries \small }
+\tl_new:c { projlib_draft_DNF_font }
+\tl_gset:cn { projlib_draft_DNF_font } { \small \normalfont \bfseries \ttfamily \hyphenchar\font=`\-\spaceskip=.5em ~ plus ~ .5em\xspaceskip=.5em }
-\definecolor { projlib_draft_dnf_color } { RGB } { 21, 122, 20 }
+\definecolor { projlib_draft_DNF_color } { RGB } { 21, 122, 20 }
-\newcounter { projlib_draft_dnf_counter }
+\newcounter { projlib_draft_DNF_counter }
-\tl_new:N \g__projlib_draft_dnf_report_tl
+\tl_new:N \g__projlib_draft_DNF_report_tl
-\NewDocumentCommand \dnf { D<>{} }
+\NewDocumentCommand \DNF { D<>{} }
{
\noindent
\group_begin:
- \projlib_draft_dnf_font
- \stepcounter { projlib_draft_dnf_counter }
- \projlib_draft_plain_box:nn { projlib_draft_dnf_color }
+ \projlib_draft_DNF_font
+ \stepcounter { projlib_draft_DNF_counter }
+ \projlib_draft_plain_box:nn { projlib_draft_DNF_color }
{
- \projlib_draft_dnf_text
+ \projlib_draft_DNF_text
\nobreakspace
- \# \theprojlib_draft_dnf_counter
+ \# \theprojlib_draft_DNF_counter
\tl_if_blank:nF { #1 } { \, : ~ }
- #1
+ \tl_trim_spaces:n { #1 }
}
\group_end:
- \tl_gput_right:Nx \g__projlib_draft_dnf_report_tl
+ \tl_gput_right:Nx \g__projlib_draft_DNF_report_tl
{
+ \noindent
\# \,
- \int_value:w \theprojlib_draft_dnf_counter
+ \int_value:w \theprojlib_draft_DNF_counter
\c_space_tl \c_space_tl
$\langle$
\skip_horizontal:n { 0.1em }
@@ -2239,8 +2266,10 @@
\skip_horizontal:n { 0.1em }
$\rangle$
\nobreakspace
- \IfNoValueF { #1 } { : ~ }
- #1 \\
+ \exp_not:n { \tl_if_blank:nF { #1 } { : ~ } }
+ \exp_not:n { \tl_trim_spaces:n { #1 } }
+ \par \skip_vertical:n { -\parskip }
+ \skip_vertical:n { .15\baselineskip }
}
}
@@ -2248,15 +2277,16 @@
{
\hook_gput_code:nnn { enddocument } { projlib-draft }
{
- \tl_if_blank:VF \g__projlib_draft_dnf_report_tl
+ \tl_if_blank:VF \g__projlib_draft_DNF_report_tl
{
\clearpage
- \pagestyle{empty}
+ \pagestyle { empty }
+ \color { projlib_draft_DNF_color }
\noindent
- \color { projlib_draft_dnf_color }
- \projlib_draft_dnf_font
- \projlib_draft_dnf_report_text \\[0.75\baselineskip]
- \g__projlib_draft_dnf_report_tl
+ \projlib_draft_DNF_font
+ \projlib_draft_DNF_report_text
+ \par \bigskip
+ \g__projlib_draft_DNF_report_tl
}
}
}
@@ -3002,7 +3032,7 @@
{ % #1 = command name (with backslash)
% #2 = key-value name configuration
\keyval_parse:nnn
- {}
+ { \use_none:n }
{ \__projlib_langauge_define_multilingual_text_do:nnn { \cs_to_str:N #1 } }
{ #2 }
\tl_gset:Nn #1
@@ -3025,6 +3055,14 @@
{
\projlib_langauge_define_multilingual_text:Nn #1 { #2 }
}
+
+
+\PassOptionsToPackage { autostyle } { csquotes }
+\RequirePackage { csquotes }
+
+\DeclareQuoteStyle { schinese } {“} {”} {‘} {’}
+\DeclareQuoteStyle { tchinese } {“} {”} {‘} {’}
+\DeclareQuoteStyle { japanese } {「} {」} {『} {』}
%</projlib-language>
%
%<*projlib-logo>
@@ -3363,6 +3401,42 @@
\projlib_math_define_shortcut:nnn { #1 } { #3 } { #2 }
}
}
+
+
+\cs_new:Nn \__projlib_math_list_of_symbols_entry:nnnn
+ % #1 = column one width
+ % #2 = column two width
+ % #3 = symbol
+ % #4 = description
+ {
+ \noindent
+ \begin { tabular } { p{#1} p{#2} }
+ \parbox [t] { #1 } { #3 } & \parbox [t] { #2 } { #4 }
+ \end { tabular }
+ \par
+ \skip_vertical:n { -\parskip }
+ }
+
+\cs_new:Nn \projlib_math_list_of_symbols:nnn
+ % #1 = column one width
+ % #2 = column two width
+ % #3 = key-val list
+ {
+ \keyval_parse:nnn
+ { \use_none:n }
+ { \__projlib_math_list_of_symbols_entry:nnnn { #1 } { #2 } }
+ { #3 }
+ }
+
+\NewDocumentCommand \ProjLibListOfSymbols { O{0.17\textwidth} O{0.75\textwidth} m }
+ {
+ \projlib_math_list_of_symbols:nnn { #1 } { #2 } { #3 }
+ }
+
+\ProvideDocumentCommand \ListOfSymbols { O{0.17\textwidth} O{0.75\textwidth} m }
+ {
+ \projlib_math_list_of_symbols:nnn { #1 } { #2 } { #3 }
+ }
%</projlib-math>
%
%<*projlib-paper>
@@ -3578,7 +3652,7 @@
\cs_generate_variant:Nn \keyval_parse:nnn { nno }
\keyval_parse:nno
- { }
+ { \use_none:n }
{ \projlib_theorem_preset_theorem_style:nn }
{ \l__projlib_theorem_theorem_style_tl }
@@ -4750,5 +4824,96 @@
}
}
%</projlib-theorem>
+%
+%<*projlib-titlepage>
+\keys_define:nn { projlib-titlepage }
+ {
+ , unknown .code:n = {}
+ }
+\ProcessKeysOptions { projlib-titlepage }
+\RequirePackage { projlib-paper }
+
+\RequirePackage { tikz }
+\ExplSyntaxOff
+\usetikzlibrary { calc }
+\ExplSyntaxOn
+
+\tl_new:N \l_projlib_titlepage_logo_tl
+\tl_new:N \l_projlib_titlepage_title_tl
+\tl_new:N \l_projlib_titlepage_subtitle_tl
+\tl_new:N \l_projlib_titlepage_author_tl
+\tl_new:N \l_projlib_titlepage_date_tl
+\tl_new:N \l_projlib_titlepage_style_tl
+
+\NewDocumentCommand \ProjLibTitlePage { O{} m }
+ {
+ \keys_set:nn { projlib-titlepage-config } { #1 }
+ \projlib_titlepage_render:n { #2 }
+ }
+\ProvideDocumentCommand \TitlePage { O{} m }
+ {
+ \ProjLibTitlePage [ #1 ] { #2 }
+ }
+
+\cs_new_protected:Nn \projlib_titlepage_set_color:nn
+ {
+ \colorlet { titlepage- #1 } { #2 }
+ }
+
+\keys_define:nn { projlib-titlepage-config }
+ {
+ , logo .tl_set:N = \l_projlib_titlepage_logo_tl
+ , logo .initial:n = { \scalebox { 2 } { \ProjLib } }
+ , title .tl_set:N = \l_projlib_titlepage_title_tl
+ , subtitle .tl_set:N = \l_projlib_titlepage_subtitle_tl
+ , author .tl_set:N = \l_projlib_titlepage_author_tl
+ , date .tl_set:N = \l_projlib_titlepage_date_tl
+ , style .tl_set:N = \l_projlib_titlepage_style_tl
+ , style .initial:n = { default }
+ , color .code:n = {
+ \keyval_parse:nnn
+ { \use_none:n }
+ { \projlib_titlepage_set_color:nn }
+ { #1 }
+ }
+ , unknown .code:n = {}
+ }
+
+\colorlet { titlepage-main } { blue!50!cyan!50!black }
+\colorlet { titlepage-back } { blue!50!cyan!10!yellow!30 }
+
+\cs_new_protected:Nn \projlib_titlepage_render:n
+ {
+ \keys_set:nn { projlib-titlepage-config } { #1 }
+ \begin { titlepage }
+ \cs_if_exist_use:c { projlib_titlepage_render_with_style_ \l_projlib_titlepage_style_tl : }
+ \end { titlepage }
+ \setcounter { page } { 0 }
+ }
+
+\cs_new_protected:Nn \projlib_titlepage_render_with_style_default:
+ {
+ \begin{tikzpicture}[overlay,remember~picture]
+ \fill [color=titlepage-main] ($(current~page.south~west)$) rectangle ($(current~page.north~east)+(0,-.3\paperheight)$);
+ \fill [color=titlepage-back] ($(current~page.south~west)$) rectangle ($(current~page.north~west)+(.125\paperwidth,-.3\paperheight)$);
+ \fill [color=titlepage-main] ($(current~page.north~west)$) rectangle ($(current~page.north~west)+(.125\paperwidth,-.3\paperheight)$);
+ \fill [color=titlepage-back] ($(current~page.north~east)$) rectangle ($(current~page.north~west)+(.125\paperwidth,-.3\paperheight)$);
+ \node[text~width=.3\paperwidth,text~height=.2\paperheight] at ($(current~page.north~west)+(.32\paperwidth,-.17\paperheight)$) { \l_projlib_titlepage_logo_tl };
+ \node[text~width=.4\paperwidth,text~height=.3\paperheight,scale=2.5] at ($(current~page.north~west)+(.67\paperwidth,-.15\paperheight)$) {\textcolor{titlepage-back}{\sffamily\textsc{ \l_projlib_titlepage_title_tl }\\[.5em]\footnotesize{ \l_projlib_titlepage_subtitle_tl }}};
+ \node[text~width=.3\paperwidth,text~height=.3\paperheight] at ($(current~page.south)+(.2\paperwidth,.3\paperheight)$) {\color{titlepage-back}\begin{flushright}\fontsize{16pt}{0pt}\selectfont\textsc{ \l_projlib_titlepage_author_tl }\\[1em]\fontsize{12pt}{0pt}\selectfont \l_projlib_titlepage_date_tl \end{flushright} };
+ \end{tikzpicture}
+ }
+
+\cs_new_protected:Nn \projlib_titlepage_render_with_style_simple:
+ {
+ \begin{tikzpicture}[overlay,remember~picture]
+ \fill[color=titlepage-main] ($(current~page.south~west)$) rectangle ($(current~page.north~east)+(0,-.3\paperheight)$);
+ \node[text~width=.3\paperwidth,text~height=.2\paperheight] at ($(current~page.north~west)+(.28\paperwidth,-.15\paperheight)$) { \l_projlib_titlepage_logo_tl };
+ \node[text~width=.4\paperwidth,text~height=.3\paperheight,scale=2.5] at ($(current~page.north~west)+(.63\paperwidth,-.15\paperheight)$) {\textcolor{paper}{\sffamily\textsc{ \l_projlib_titlepage_title_tl }\\[.5em]\footnotesize{ \l_projlib_titlepage_subtitle_tl }}};
+ \node[text~width=.3\paperwidth,text~height=.3\paperheight] at ($(current~page.south)+(.2\paperwidth,.3\paperheight)$) {\color{paper}\begin{flushright}\fontsize{16pt}{0pt}\selectfont\textsc{ \l_projlib_titlepage_author_tl }\\[1em]\fontsize{12pt}{0pt}\selectfont \l_projlib_titlepage_date_tl \end{flushright} };
+ \end{tikzpicture}
+ }
+%</projlib-titlepage>
+
\endinput
\ No newline at end of file
Modified: trunk/Master/texmf-dist/source/latex/projlib/ProjLib.ins
===================================================================
--- trunk/Master/texmf-dist/source/latex/projlib/ProjLib.ins 2022-04-04 17:45:51 UTC (rev 62899)
+++ trunk/Master/texmf-dist/source/latex/projlib/ProjLib.ins 2022-04-04 20:54:49 UTC (rev 62900)
@@ -49,6 +49,7 @@
\generate{\file{projlib-math.sty}{\from{ProjLib.dtx}{projlib-math}}}
\generate{\file{projlib-paper.sty}{\from{ProjLib.dtx}{projlib-paper}}}
\generate{\file{projlib-theorem.sty}{\from{ProjLib.dtx}{projlib-theorem}}}
+\generate{\file{projlib-titlepage.sty}{\from{ProjLib.dtx}{projlib-titlepage}}}
\obeyspaces
\Msg{*************************************************************}
@@ -66,6 +67,7 @@
\Msg{* projlib-math.sty *}
\Msg{* projlib-paper.sty *}
\Msg{* projlib-theorem.sty *}
+\Msg{* projlib-titlepage.sty *}
\Msg{* *}
\Msg{* Happy TeXing! *}
\Msg{* *}
Modified: trunk/Master/texmf-dist/tex/latex/beaulivre/beaulivre.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/beaulivre/beaulivre.cls 2022-04-04 17:45:51 UTC (rev 62899)
+++ trunk/Master/texmf-dist/tex/latex/beaulivre/beaulivre.cls 2022-04-04 20:54:49 UTC (rev 62900)
@@ -19,7 +19,7 @@
\RequirePackage{l3keys2e}
\ProvidesExplClass
{beaulivre}
- {2022/03/19} {}
+ {2022/04/03} {}
{A colorful book style}
\tl_const:Nn \l__colorclass_base_class_tl { book }
@@ -180,6 +180,7 @@
\RequirePackage { colorist }
+\raggedbottom
\hfuzz=2pt
\vfuzz=2pt
@@ -548,7 +549,11 @@
\PassOptionsToPackage { warnings-off = { mathtools-colon, mathtools-overbracket } } { unicode-math }
\RequirePackage { unicode-math }
\unimathsetup { math-style = ISO, partial = upright, nabla = upright }
- \setmathfont { Asana-Math.otf }
+ \setmathfont { KpMath-Regular.otf }
+ \setmathfont { KpMath-Sans.otf }
+ [
+ range = { \sum, \prod, \coprod }
+ ]
\__colorclass_if_font_exist:nnn { Neo~Euler }
{
\setmathfont { Neo~Euler }
@@ -555,34 +560,18 @@
[
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,
+ range = { cal, bfcal, frak, bffrak }
]
\setmathfont { texgyrepagella-math.otf }
[
- range = { up / num, bfup / num }
+ range = { it / { Latin, latin }, bfit / { Latin, latin }, up / num, bfup / num }
]
\hook_gput_code:nnn { begindocument } { colorclass }
@@ -589,10 +578,10 @@
{
\NewCommandCopy \colorclass_backup_mid: \mid
\RenewDocumentCommand \mid {}
- { \skip_horizontal:n {-.15em} \colorclass_backup_mid: \skip_horizontal:n {-.15em} }
+ { \skip_horizontal:n {-.1em} \colorclass_backup_mid: \skip_horizontal:n {-.1em} }
\NewCommandCopy \colorclass_backup_nmid: \nmid
\RenewDocumentCommand \nmid {}
- { \skip_horizontal:n {-.15em} \colorclass_backup_nmid: \skip_horizontal:n {-.15em} }
+ { \skip_horizontal:n {-.1em} \colorclass_backup_nmid: \skip_horizontal:n {-.1em} }
}
\RequirePackage { tikz-cd }
@@ -607,10 +596,10 @@
\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 } }
+ { \dim_eval:n { \dim_max:nn { \box_wd:N \l__colorclass_xarrows_below_box } { \box_wd:N \l__colorclass_xarrows_above_box } + 1em } }
\mathrel
{
- \tikz [ #3, baseline = -.55ex, every~node/.style = { inner~sep = 0pt } ]
+ \tikz [ #3, line~width = .6pt, baseline = -.5ex, every~node/.style = { inner~sep = 0pt }, >={Stealth[round,length=3.4pt,width=6.15pt,inset=2.25pt]} ]
\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 }
Modified: trunk/Master/texmf-dist/tex/latex/colorist/colorart.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/colorist/colorart.cls 2022-04-04 17:45:51 UTC (rev 62899)
+++ trunk/Master/texmf-dist/tex/latex/colorist/colorart.cls 2022-04-04 20:54:49 UTC (rev 62900)
@@ -19,7 +19,7 @@
\RequirePackage{l3keys2e}
\ProvidesExplClass
{colorart}
- {2022/03/19} {}
+ {2022/04/03} {}
{A colorful article style}
\tl_const:Nn \l__colorclass_base_class_tl { article }
@@ -119,6 +119,7 @@
\RequirePackage { colorist }
+\raggedbottom
\hfuzz=2pt
\vfuzz=2pt
@@ -151,6 +152,17 @@
\RequirePackage { mathpazo }
\RequirePackage { newpxtext }
\RequirePackage { amssymb }
+ \sys_if_engine_pdftex:F
+ {
+ \setsansfont { texgyreheros }
+ [
+ Scale = MatchUppercase ,
+ UprightFont = *-regular ,
+ BoldFont = *-bold ,
+ ItalicFont = *-italic ,
+ BoldItalicFont = *-bolditalic ,
+ ]
+ }
}
}
Modified: trunk/Master/texmf-dist/tex/latex/colorist/colorbook.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/colorist/colorbook.cls 2022-04-04 17:45:51 UTC (rev 62899)
+++ trunk/Master/texmf-dist/tex/latex/colorist/colorbook.cls 2022-04-04 20:54:49 UTC (rev 62900)
@@ -19,7 +19,7 @@
\RequirePackage{l3keys2e}
\ProvidesExplClass
{colorbook}
- {2022/03/19} {}
+ {2022/04/03} {}
{A colorful book style}
\tl_const:Nn \l__colorclass_base_class_tl { book }
@@ -119,6 +119,7 @@
\RequirePackage { colorist }
+\raggedbottom
\hfuzz=2pt
\vfuzz=2pt
@@ -151,6 +152,17 @@
\RequirePackage { mathpazo }
\RequirePackage { newpxtext }
\RequirePackage { amssymb }
+ \sys_if_engine_pdftex:F
+ {
+ \setsansfont { texgyreheros }
+ [
+ Scale = MatchUppercase ,
+ UprightFont = *-regular ,
+ BoldFont = *-bold ,
+ ItalicFont = *-italic ,
+ BoldItalicFont = *-bolditalic ,
+ ]
+ }
}
}
Modified: trunk/Master/texmf-dist/tex/latex/colorist/colorist-fancy.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/colorist/colorist-fancy.sty 2022-04-04 17:45:51 UTC (rev 62899)
+++ trunk/Master/texmf-dist/tex/latex/colorist/colorist-fancy.sty 2022-04-04 20:54:49 UTC (rev 62900)
@@ -19,7 +19,7 @@
\RequirePackage{l3keys2e}
\ProvidesExplPackage
{colorist-fancy}
- {2022/03/19} {}
+ {2022/04/03} {}
{The fancy style of colorist}
\@ifpackageloaded { colorist } {}
@@ -99,34 +99,82 @@
\fancypagestyle { fancy }
{
- \fancyhf{}
+ \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 }}
+ \fancyfoot[RO]
+ {
+ \sffamily
+ \textcolor { main-text!30!paper } { \small \l_colorist_rightmark_tl }
+ \rlap
+ {
+ \nobreakspace \nobreakspace \nobreakspace \nobreakspace
+ \textcolor { main-text!75!paper } { \colorist_bfseries: \thepage }
+ }
+ }
+ \fancyfoot[LE]
+ {
+ \leavevmode
+ \sffamily
+ \llap
+ {
+ \textcolor { main-text!75!paper } { \colorist_bfseries: \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}}}}
+ \fancyfoot[R]
+ {
+ \sffamily
+ \textcolor { main-text!30!paper } { \small \l_colorist_rightmark_tl }
+ \rlap
+ {
+ \nobreakspace \nobreakspace \nobreakspace \nobreakspace
+ \textcolor { main-text!75!paper } { \colorist_bfseries: \thepage }
+ }
+ }
\fi
- \renewcommand{\headrulewidth}{0pt}
+ \renewcommand { \headrulewidth } { 0pt }
}
-\pagestyle{fancy}
+\pagestyle { fancy }
\fancypagestyle { plain }
{
- \fancyhf{}
+ \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}}
+ \fancyfoot[RO]
+ {
+ \sffamily
+ \nobreakspace
+ \rlap
+ {
+ \nobreakspace \nobreakspace \nobreakspace \nobreakspace
+ \textcolor { main-text!75!paper } { \colorist_bfseries: \thepage }
+ }
+ }
+ \fancyfoot[LE]
+ {
+ \leavevmode
+ \sffamily
+ \llap
+ {
+ \textcolor { main-text!75!paper } { \colorist_bfseries: \thepage }
+ \nobreakspace \nobreakspace \nobreakspace \nobreakspace
+ }
+ }
\else
- \fancyfoot[R]{\sffamily
- \nobreakspace\nobreakspace\nobreakspace\rlap{\textcolor{main-text!75!paper}{\textbf{\thepage}}}}
+ \fancyfoot[R]
+ {
+ \sffamily
+ \nobreakspace
+ \rlap
+ {
+ \nobreakspace \nobreakspace \nobreakspace \nobreakspace
+ \textcolor { main-text!75!paper } { \colorist_bfseries: \thepage }
+ }
+ }
\fi
- \renewcommand{\headrulewidth}{0pt}
+ \renewcommand { \headrulewidth } { 0pt }
}
\bool_if:NTF \l__colorist_is_book_bool
@@ -220,8 +268,10 @@
}
%% Chapter
- % Numbered chapter title: \TheChapter{<number>}{<title>}
- \newcommand{\TheChapter}[2]
+ % Numbered chapter title
+ \cs_new_protected:Nn \colorist_chapter_inner:nn
+ % #1 = number
+ % #2 = title
{
\tcbsidebyside[enhanced,sidebyside~adapt=right,sidebyside~align=bottom,
colback=paper,frame~hidden,
@@ -232,8 +282,9 @@
-- (segmentation.south);}
]{\filleft#2}{\normalfont\textcolor{maintheme}{\scalebox{4}{#1}}}
}
- % Numberless chapter title: \TheChapterSingle{<title>}
- \newcommand{\TheChapterSingle}[1]
+ % Numberless chapter title
+ \cs_new_protected:Nn \colorist_chapter_inner:n
+ % #1 = title
{
\begin{tcolorbox}[
enhanced,
@@ -254,7 +305,7 @@
{ \g_colorist_title_font_chapter_tl \scshape\huge} % Format
{} % Label
{0mm} % Sep
- {\TheChapter{\thechapter}{#1}} % Before-code
+ { \colorist_chapter_inner:nn { \thechapter } { #1 } } % Before-code
\titlespacing*{name=\chapter}
{0em}{*2}{0em} % {left}{before-sep}{after-sep}
@@ -262,7 +313,7 @@
{\filcenter \g_colorist_title_font_chapter_tl \scshape\huge}
{}
{0mm}
- {\TheChapterSingle{#1}}
+ { \colorist_chapter_inner:n { #1 } }
\titlespacing*{name=\chapter, numberless}
{0em}{*2}{0em}
@@ -352,10 +403,10 @@
{
\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}
+ {\addvspace{1pc} \color{maintheme} \normalfont \sffamily \colorist_bfseries: \scshape }
+ {\contentslabel[ \raisebox{-.03\baselineskip}{ \large \normalfont \sffamily \colorist_bfseries: \thecontentslabel } ]{2em}}
+ {\hspace*{-2em}}
+ {\titlerule*[10pt]{\parbox{3pt}{\hspace*{-.25pt}\textcolor{main-text!15!paper}{.}}}\color{maintheme}\normalfont\sffamily\contentspage}
\titlecontents{section}
[4em] % i.e., 2em (chapter) + 2em
{\addvspace{.3pc}\normalfont\color{maintheme}\sffamily}
@@ -378,10 +429,10 @@
{
\titlecontents{section}
[2em] % i.e., 0em (part) + 2em
- {\addvspace{.3pc}\normalfont\color{maintheme}\sffamily}
- {\contentslabel{1.75em}}
+ {\addvspace{.3pc} \color{maintheme} \normalfont \sffamily \scshape }
+ {\contentslabel[ { \normalfont \sffamily \thecontentslabel } ]{1.75em}}
{\hspace*{-1.75em}}
- {\titlerule*[10pt]{\parbox{3pt}{\textcolor{main-text!15!paper}{.}}}\color{maintheme}\contentspage}
+ {\titlerule*[10pt]{\parbox{3pt}{\textcolor{main-text!15!paper}{.}}}\color{maintheme}\normalfont\sffamily\contentspage}
\titlecontents{subsection}
[4.5em] % i.e., 2em (section) + 2.5em
{\addvspace{.15pc}\normalfont\sffamily}
@@ -419,7 +470,20 @@
%%================================
%% Blank page
%%================================
-\newcommand{\blinkpagetext}{This~page~is~intentionally~left~blank}
+\projlib_langauge_define_multilingual_text:Nn \bl at nkpagetext
+ {
+ , EN = This~page~is~intentionally~left~blank
+ , FR = Cette~page~a~été~intentionellement~laissée~vide
+ , DE = Diese~Seite~wurde~absichtlich~leer~gelassen
+ , IT = Questa~pagina~è~stata~lasciata~vuota~intenzionalmente
+ , PT = Esta~página~foi~intencionalmente~deixada~em~branco
+ , BR = Esta~página~foi~intencionalmente~deixada~em~branco
+ , ES = Esta~página~se~ha~dejado~intencionadamente~en~blanco
+ , CN = \ziju{0.2} 此页为有意留为空白
+ , TC = \ziju{0.2} 此頁為有意留為空白
+ , JP = このページは意図的に空白にしてあります
+ , RU = Эта~страница~намеренно~оставлена~пустой
+ }
\renewcommand{\cleardoublepage}{
\relax
\clearpage
@@ -428,12 +492,76 @@
\hook_gput_next_code:nn { shipout/background }
{
\put(0.5\paperwidth,-0.5\paperheight){
- \makebox[0pt]{\large\color{main-text!10!paper}\blinkpagetext}}
+ \makebox[0pt]{\large\color{main-text!10!paper}\g_colorist_title_font_common_tl\bl at nkpagetext}}
}
\null\newpage\fi\fi
}
%%================================
+%% Index
+%%================================
+\RequirePackage { imakeidx }
+\makeindex[intoc]
+
+\RequirePackage { silence }
+\ExplSyntaxOff
+\WarningFilter{latex}{Writing or overwriting file}
+\begin{filecontents*}[overwrite]{\jobname.mst}
+delim_0 "\\IndexDotfill " % Filler between section heading and page number
+delim_1 "\\IndexDotfill " % Filler between subsection heading and page number
+headings_flag 1
+heading_prefix "\\IndexHeading{"
+heading_suffix "}\n"
+\end{filecontents*}
+\ExplSyntaxOn
+
+\projlib_langauge_define_multilingual_text:Nn \index_symbols_name
+ {
+ , EN = Symbols
+ , FR = Symboles
+ , DE = Symbole
+ , IT = Simboli
+ , PT = Símbolos
+ , BR = Símbolos
+ , ES = Símbolos
+ , CN = 符号
+ , TC = 符號
+ , JP = 記号
+ , RU = Символы
+ }
+
+\newcommand*{\IndexDotfill}
+ {
+ \nobreakspace\nobreakspace
+ \titlerule*[.67em]{\textcolor{main-text!15!paper}{.}}
+ \nobreakspace\nobreakspace
+ }
+\newcommand*{\IndexHeading}[1]
+ {
+ \str_if_eq:nnTF { #1 } { Symbols }
+ { \tl_set:Nn \l_tmpa_tl { \index_symbols_name } }
+ { \tl_set:Nn \l_tmpa_tl { #1 } }
+ \tikz\node[
+ rounded~corners=5pt,
+ draw=maintheme,
+ fill=maintheme!10,
+ line~width=1pt,
+ inner~sep=5pt,
+ align=center,
+ font=\large\sffamily\colorist_bfseries:,
+ minimum~width=\linewidth-\pgflinewidth,
+ ] { \l_tmpa_tl };
+ \nopagebreak
+ \par
+ \vspace{.3\baselineskip}
+ }
+\renewcommand*{\indexspace}
+ {
+ \par
+ \vspace{2pc~plus~.5pc~minus~.3pc}
+ }
+
+%%================================
%% Draft mark
%%================================
\RequirePackage { projlib-draft }
@@ -441,8 +569,10 @@
%%================================
%% Icons
%%================================
-\RequirePackage{tikz}
-\newcommand{\ideabulb}[2][0.15]
+\RequirePackage { tikz }
+\NewDocumentCommand \colorist_icon_ideabulb:w { O{0.15} m }
+ % #1 = scale
+ % #2 = color
{
\scalebox{#1}{
\begin{tikzpicture}
@@ -459,7 +589,9 @@
\end{tikzpicture}}
}
-\newcommand{\questionmark}[2][0.15]
+\NewDocumentCommand \colorist_icon_questionmark:w { O{0.15} m }
+ % #1 = scale
+ % #2 = color
{
\scalebox{#1}{
\begin{tikzpicture}
@@ -543,12 +675,15 @@
{
\providecommand{\phantomsection}{}
\RequirePackage { url }
- \newcommand{\href}[2]{#2}
+ \providecommand{\href}[2]{#2}
+ \providecommand{\texorpdfstring}[2]{#1}
}
{
- \PassOptionsToPackage { hidelinks,linktoc=all } { hyperref }
+ \RequirePackage { hyperref }
\RequirePackage { bookmark }
- \RequirePackage { hyperref }
+ \hypersetup{ hidelinks, linktoc = all }
+ \bookmarksetup{ numbered }
+ \renewcommand\Hy at numberline[1]{#1.~}
}
@@ -747,7 +882,8 @@
\reversemarginpar
\fi
\mparadjust{-.25em}
- \marginnote{\ideabulb[0.3]{orange}
+ \marginnote{
+ \colorist_icon_ideabulb:w [0.3] {orange}
\bool_if:NTF \l__colorist_is_book_bool
{
\hspace*{-.2em}
@@ -766,7 +902,8 @@
\reversemarginpar
\fi
\mparadjust{-.25em}
- \marginnote{\questionmark[0.3]{purple}
+ \marginnote{
+ \colorist_icon_questionmark:w [0.3] {purple}
\bool_if:NTF \l__colorist_is_book_bool
{
\hspace*{-.2em}
@@ -963,55 +1100,81 @@
\theoremstyle{simple}
-\bool_if:NF \l__colorist_is_book_bool {
+\hook_gput_code:nnn { env/quote/begin } { colorist } { \small }
%%================================
%% 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
-}
+\bool_if:NTF \l__colorist_is_book_bool
+ {
+ \hook_gput_code:nnn { package/projlib-author/after } { colorist }
+ {
+ \tl_gset:Nn \g__projlib_author_font_author_tl { \normalfont \scshape }
+ \tl_gset:Nn \g__projlib_author_font_institute_tl { \large \normalfont }
+ \tl_gset:Nn \g__projlib_author_font_address_tl { \large \normalfont \itshape }
+ \tl_gset:Nn \g__projlib_author_font_curraddr_tl { \large \normalfont \itshape }
+ \tl_gset:Nn \g__projlib_author_font_email_tl { \large \normalfont \ttfamily }
+ }
-\hook_gput_code:nnn { cmd/maketitle/after } { colorist } { \thispagestyle{fancy} }
+ \RequirePackage { projlib-titlepage }
+ \renewcommand{\maketitle}{
+ \LocallyStopLineNumbers
+ \ProjLibTitlePage
+ {
+ , title = \@title
+ , author = \@author
+ , date = \@date
+ }
+ \ResumeLineNumbers
+ }
+ }
+ {
+ \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}
+ \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 = Ключевые~слова ,
- }
+ \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}
+ \newenvironment{keyword}
+ {\small\centerline{{ \colorist_bfseries: \keywordname}}\vspace{-0.3\baselineskip}
+ \color{main-text!80!paper}\begin{center}}
+ {\end{center}\medskip}
+ } % end of \bool_if:NTF \l__colorist_is_book_bool
%%================================
%% Simulate features of amsart
@@ -1019,8 +1182,6 @@
\PassOptionsToPackage { amsfashion } { projlib-author }
\RequirePackage { projlib-author }
-}
-
\endinput
%%
%% End of file `colorist/colorist-fancy.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/colorist/colorist.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/colorist/colorist.sty 2022-04-04 17:45:51 UTC (rev 62899)
+++ trunk/Master/texmf-dist/tex/latex/colorist/colorist.sty 2022-04-04 20:54:49 UTC (rev 62900)
@@ -19,7 +19,7 @@
\RequirePackage{l3keys2e}
\ProvidesExplPackage
{colorist}
- {2022/03/19} {}
+ {2022/04/03} {}
{A colorful style for articles and books}
\keys_define:nn { colorist }
Modified: trunk/Master/texmf-dist/tex/latex/einfart/einfart.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/einfart/einfart.cls 2022-04-04 17:45:51 UTC (rev 62899)
+++ trunk/Master/texmf-dist/tex/latex/einfart/einfart.cls 2022-04-04 20:54:49 UTC (rev 62900)
@@ -19,7 +19,7 @@
\RequirePackage{l3keys2e}
\ProvidesExplClass
{einfart}
- {2022/03/19} {}
+ {2022/04/03} {}
{A simple and clear article style}
\tl_const:Nn \l__minimclass_base_class_tl { article }
@@ -201,6 +201,10 @@
\RequirePackage { minimalist }
+\raggedbottom
+\hfuzz=2pt
+\vfuzz=2pt
+
%%================================
%% Fonts
%%================================
@@ -568,7 +572,11 @@
\PassOptionsToPackage { warnings-off = { mathtools-colon, mathtools-overbracket } } { unicode-math }
\RequirePackage { unicode-math }
\unimathsetup { math-style = ISO, partial = upright, nabla = upright }
- \setmathfont { Asana-Math.otf }
+ \setmathfont { KpMath-Regular.otf }
+ \setmathfont { KpMath-Sans.otf }
+ [
+ range = { \sum, \prod, \coprod }
+ ]
\__minimclass_if_font_exist:nnn { Neo~Euler }
{
\setmathfont { Neo~Euler }
@@ -575,34 +583,18 @@
[
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,
+ range = { cal, bfcal, frak, bffrak }
]
\setmathfont { texgyrepagella-math.otf }
[
- range = { up / num, bfup / num }
+ range = { it / { Latin, latin }, bfit / { Latin, latin }, up / num, bfup / num }
]
\hook_gput_code:nnn { begindocument } { minimclass }
@@ -609,10 +601,10 @@
{
\NewCommandCopy \minimclass_backup_mid: \mid
\RenewDocumentCommand \mid {}
- { \skip_horizontal:n {-.15em} \minimclass_backup_mid: \skip_horizontal:n {-.15em} }
+ { \skip_horizontal:n {-.1em} \minimclass_backup_mid: \skip_horizontal:n {-.1em} }
\NewCommandCopy \minimclass_backup_nmid: \nmid
\RenewDocumentCommand \nmid {}
- { \skip_horizontal:n {-.15em} \minimclass_backup_nmid: \skip_horizontal:n {-.15em} }
+ { \skip_horizontal:n {-.1em} \minimclass_backup_nmid: \skip_horizontal:n {-.1em} }
}
\RequirePackage { tikz-cd }
@@ -627,10 +619,10 @@
\hbox_set:Nn \l__minimclass_xarrows_below_box { \ensuremath { \scriptstyle #1 } }
\hbox_set:Nn \l__minimclass_xarrows_above_box { \ensuremath { \scriptstyle #2 } }
\dim_set:Nn \l__minimclass_xarrows_length_dim
- { \dim_eval:n { \dim_max:nn { \box_wd:N \l__minimclass_xarrows_below_box } { \box_wd:N \l__minimclass_xarrows_above_box } + .8em } }
+ { \dim_eval:n { \dim_max:nn { \box_wd:N \l__minimclass_xarrows_below_box } { \box_wd:N \l__minimclass_xarrows_above_box } + 1em } }
\mathrel
{
- \tikz [ #3, baseline = -.55ex, every~node/.style = { inner~sep = 0pt } ]
+ \tikz [ #3, line~width = .6pt, baseline = -.5ex, every~node/.style = { inner~sep = 0pt }, >={Stealth[round,length=3.4pt,width=6.15pt,inset=2.25pt]} ]
\draw (0,0) #4
node [ below = 3pt ] { \box_use:N \l__minimclass_xarrows_below_box }
node [ above = 2pt ] { \box_use:N \l__minimclass_xarrows_above_box }
Modified: trunk/Master/texmf-dist/tex/latex/lebhart/lebhart.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lebhart/lebhart.cls 2022-04-04 17:45:51 UTC (rev 62899)
+++ trunk/Master/texmf-dist/tex/latex/lebhart/lebhart.cls 2022-04-04 20:54:49 UTC (rev 62900)
@@ -19,7 +19,7 @@
\RequirePackage{l3keys2e}
\ProvidesExplClass
{lebhart}
- {2022/03/19} {}
+ {2022/04/03} {}
{A colorful article style}
\tl_const:Nn \l__colorclass_base_class_tl { article }
@@ -180,6 +180,7 @@
\RequirePackage { colorist }
+\raggedbottom
\hfuzz=2pt
\vfuzz=2pt
@@ -548,7 +549,11 @@
\PassOptionsToPackage { warnings-off = { mathtools-colon, mathtools-overbracket } } { unicode-math }
\RequirePackage { unicode-math }
\unimathsetup { math-style = ISO, partial = upright, nabla = upright }
- \setmathfont { Asana-Math.otf }
+ \setmathfont { KpMath-Regular.otf }
+ \setmathfont { KpMath-Sans.otf }
+ [
+ range = { \sum, \prod, \coprod }
+ ]
\__colorclass_if_font_exist:nnn { Neo~Euler }
{
\setmathfont { Neo~Euler }
@@ -555,34 +560,18 @@
[
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,
+ range = { cal, bfcal, frak, bffrak }
]
\setmathfont { texgyrepagella-math.otf }
[
- range = { up / num, bfup / num }
+ range = { it / { Latin, latin }, bfit / { Latin, latin }, up / num, bfup / num }
]
\hook_gput_code:nnn { begindocument } { colorclass }
@@ -589,10 +578,10 @@
{
\NewCommandCopy \colorclass_backup_mid: \mid
\RenewDocumentCommand \mid {}
- { \skip_horizontal:n {-.15em} \colorclass_backup_mid: \skip_horizontal:n {-.15em} }
+ { \skip_horizontal:n {-.1em} \colorclass_backup_mid: \skip_horizontal:n {-.1em} }
\NewCommandCopy \colorclass_backup_nmid: \nmid
\RenewDocumentCommand \nmid {}
- { \skip_horizontal:n {-.15em} \colorclass_backup_nmid: \skip_horizontal:n {-.15em} }
+ { \skip_horizontal:n {-.1em} \colorclass_backup_nmid: \skip_horizontal:n {-.1em} }
}
\RequirePackage { tikz-cd }
@@ -607,10 +596,10 @@
\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 } }
+ { \dim_eval:n { \dim_max:nn { \box_wd:N \l__colorclass_xarrows_below_box } { \box_wd:N \l__colorclass_xarrows_above_box } + 1em } }
\mathrel
{
- \tikz [ #3, baseline = -.55ex, every~node/.style = { inner~sep = 0pt } ]
+ \tikz [ #3, line~width = .6pt, baseline = -.5ex, every~node/.style = { inner~sep = 0pt }, >={Stealth[round,length=3.4pt,width=6.15pt,inset=2.25pt]} ]
\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 }
Modified: trunk/Master/texmf-dist/tex/latex/minimalist/minimalist-classical.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/minimalist/minimalist-classical.sty 2022-04-04 17:45:51 UTC (rev 62899)
+++ trunk/Master/texmf-dist/tex/latex/minimalist/minimalist-classical.sty 2022-04-04 20:54:49 UTC (rev 62900)
@@ -19,7 +19,7 @@
\RequirePackage{l3keys2e}
\ProvidesExplPackage
{minimalist-classical}
- {2022/03/19} {}
+ {2022/04/03} {}
{The classical style of minimalist}
\@ifpackageloaded { minimalist } {}
@@ -113,34 +113,91 @@
\fancypagestyle { fancy }
{
- \fancyhf{}
+ \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]
+ {
+ \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 }
+ }
\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]
+ {
+ \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
+ }
+ }
\fi
- \renewcommand{\headrulewidth}{0pt}
+ \renewcommand { \headrulewidth } { 0pt }
}
-\pagestyle{fancy}
+\pagestyle { fancy }
\fancypagestyle { plain }
{
- \fancyhf{}
+ \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]
+ {
+ \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 }
+ }
+ }
\else
- \fancyfoot[R]{\small
- \nobreakspace\rlap{\textcolor{main-text!27!paper}{ \l_minimalist_sep_bar }\nobreakspace\nobreakspace\thepage}}
+ \fancyfoot[R]
+ {
+ \small
+ \nobreakspace
+ \rlap
+ {
+ \textcolor { main-text!27!paper } { \l_minimalist_sep_bar }
+ \nobreakspace \nobreakspace
+ \thepage
+ }
+ }
\fi
- \renewcommand{\headrulewidth}{0pt}
+ \renewcommand { \headrulewidth } { 0pt }
}
\bool_if:NTF \l__minimalist_is_book_bool
@@ -150,35 +207,31 @@
\newcommand{ \minimalist_draw_help_line: }{}
}
{
- \newcommand{ \minimalist_draw_help_line: }{
+ \newcommand{ \minimalist_draw_help_line: }
+ {
\begin{tikzpicture}[remember~picture,overlay]
- \foreach\i in {0,1,...,5}{
- \fill[opacity=0.12-0.02*\i]
- ($(current~page~text~area.north~east)
- +(-\i*0.5em-.025em,-10pt+\i*1.1pt)$)
- rectangle ($(current~page~text~area.south~east)
- +(-\i*0.5em+.025em,10pt-\i*1.1pt)$);
- \shade[top~color=paper,bottom~color=main-text,opacity=0.12-0.02*\i]
- ($(current~page~text~area.north~east)
- +(-\i*0.5em-.025em,2pt)$)
- rectangle ($(current~page~text~area.north~east)
- +(-\i*0.5em+.025em,-10pt+\i*1.1pt)$);
- \shade[top~color=main-text,bottom~color=paper,opacity=0.12-0.02*\i]
- ($(current~page~text~area.south~east)
- +(-\i*0.5em-.025em,-2pt)$)
- rectangle ($(current~page~text~area.south~east)
- +(-\i*0.5em+.025em,10pt-\i*1.1pt)$);
- }
+ \foreach\i in {0,1,...,5}{
+ \fill[opacity=0.12-0.02*\i]
+ ($(current~page~text~area.north~east)+(-\i*0.5em-.025em,-10pt+\i*1.1pt)$)
+ rectangle ($(current~page~text~area.south~east)+(-\i*0.5em+.025em,10pt-\i*1.1pt)$);
+ \shade[top~color=paper,bottom~color=main-text,opacity=0.12-0.02*\i]
+ ($(current~page~text~area.north~east)+(-\i*0.5em-.025em,2pt)$)
+ rectangle ($(current~page~text~area.north~east)+(-\i*0.5em+.025em,-10pt+\i*1.1pt)$);
+ \shade[top~color=main-text,bottom~color=paper,opacity=0.12-0.02*\i]
+ ($(current~page~text~area.south~east)+(-\i*0.5em-.025em,-2pt)$)
+ rectangle ($(current~page~text~area.south~east)+(-\i*0.5em+.025em,10pt-\i*1.1pt)$);
+ }
\end{tikzpicture}
- }
+ }
}
- \fancypagestyle{part}{
- \fancyhf{}
- \renewcommand{\headrulewidth}{0pt}
- \fancyhead[C]{ \minimalist_draw_help_line: }
- }
- \addtolength{\headheight}{20pt}
- \addtolength{\topmargin}{-20pt}
+ \fancypagestyle { part }
+ {
+ \fancyhf { }
+ \renewcommand { \headrulewidth } { 0pt }
+ \fancyhead[C] { \minimalist_draw_help_line: }
+ }
+ \addtolength { \headheight } { 20pt }
+ \addtolength { \topmargin } { -20pt }
\if at twoside
\renewcommand{\chaptermark}[1]{\markboth{\textsc{#1}}{}}
\else
@@ -196,24 +249,6 @@
}
%%================================
-%% Line numbers
-%%================================
-\PassOptionsToPackage { pagewise,mathlines } { lineno }
-\RequirePackage { linenoamsmath }
-\renewcommand{\linenumberfont}{\ttfamily\color{main-text!7!paper}\footnotesize}
-\setlength{\linenumbersep}{1em}
-
-\newif\ifLNturnsON
-\def\LocallyStopLineNumbers{\LNturnsONfalse
- \ifLineNumbers\LNturnsONtrue\fi\nolinenumbers}
-\def\ResumeLineNumbers{\ifLNturnsON\linenumbers\fi}
-
-\hook_gput_code:nnn { cmd/tableofcontents/before } { minimalist } { \LocallyStopLineNumbers }
-\hook_gput_code:nnn { cmd/tableofcontents/after } { minimalist } { \ResumeLineNumbers }
-\hook_gput_code:nnn { env/bibliography/before } { minimalist } { \LocallyStopLineNumbers }
-\hook_gput_code:nnn { env/bibliography/after } { minimalist } { \ResumeLineNumbers }
-
-%%================================
%% Title format
%%================================
\RequirePackage [ explicit, newparttoc ] { titlesec }
@@ -221,7 +256,7 @@
\RequirePackage { ulem }
\cs_generate_variant:Nn \seq_set_split:Nnn { Nnx }
-\cs_new:Nn \minimalist_apply_title_numbering_style:N
+\cs_new:Nn \minimalist_apply_title_numbering_style:n
{
#1
}
@@ -234,11 +269,11 @@
}
\AddLanguageSetting [ schinese ]
{
- \renewcommand{\partstring}{第 \nobreakspace\thepart\nobreakspace 部分}
+ \renewcommand{\partstring}{第 \zhnumber{\arabic{part}} 部分}
}
\AddLanguageSetting [ tchinese ]
{
- \renewcommand{\partstring}{第 \nobreakspace\thepart\nobreakspace 部分}
+ \renewcommand{\partstring}{第 \zhnumber{\arabic{part}} 部分}
}
\AddLanguageSetting [ japanese ]
{
@@ -406,7 +441,7 @@
\titlecontents{part}
[0em]
{\addvspace{1.5pc}\filcenter\normalfont}
- {\thecontentslabel\nopagebreak\\\nopagebreak\uppercase}
+ { \minimalist_apply_title_numbering_style:n { \thecontentslabel } \nopagebreak\\\nopagebreak\uppercase}
{}
{} % without page number
[\addvspace{.5pc}]
@@ -416,25 +451,25 @@
\titlecontents{chapter}
[2em] % i.e., 0em (part) + 2em
{\addvspace{.5pc}\normalfont}
- {\contentslabel[ \minimalist_apply_title_numbering_style:N { \thecontentslabel } ]{2em}}
+ {\contentslabel[ \minimalist_apply_title_numbering_style:n { \thecontentslabel } ]{2em}}
{\hspace*{-2em}}
{\titlerule*[1em]{\textcolor{main-text!15!paper}{.}}\contentspage}
\titlecontents{section}
[4em] % i.e., 2em (chapter) + 2em
{\normalfont}
- {\contentslabel[\textcolor{main-text!27!paper}{\small\g_minimalist_section_decoration_char_tl}\,\textcolor{main-text!90!paper}{ \minimalist_apply_title_numbering_style:N { \thecontentslabel } }\,\textcolor{main-text!27!paper}{\small\g_minimalist_section_decoration_char_tl}]{2em}}
+ {\contentslabel[\textcolor{main-text!27!paper}{\small\g_minimalist_section_decoration_char_tl}\,\textcolor{main-text!90!paper}{ \minimalist_apply_title_numbering_style:n { \thecontentslabel } }\,\textcolor{main-text!27!paper}{\small\g_minimalist_section_decoration_char_tl}]{2em}}
{\hspace*{-2em}}
{\titlerule*[1em]{\textcolor{main-text!15!paper}{.}}\contentspage}
\titlecontents{subsection}
[7em] % i.e., 4em (section) + 3em
{\normalfont}
- {\contentslabel[ \minimalist_apply_title_numbering_style:N { \thecontentslabel } ]{2.75em}}
+ {\contentslabel[ \minimalist_apply_title_numbering_style:n { \thecontentslabel } ]{2.75em}}
{\hspace*{-2.75em}}
{\titlerule*[1em]{\textcolor{main-text!15!paper}{.}}\contentspage}
\titlecontents{subsubsection}
[9.5em] % i.e., 7em (subsection) + 3.5em
{\normalfont}
- {\contentslabel[ \minimalist_apply_title_numbering_style:N { \thecontentslabel } ]{3.25em}}
+ {\contentslabel[ \minimalist_apply_title_numbering_style:n { \thecontentslabel } ]{3.25em}}
{\hspace*{-3.25em}}
{\titlerule*[1em]{\textcolor{main-text!15!paper}{.}}\contentspage}
}
@@ -442,19 +477,19 @@
\titlecontents{section}
[2em] % i.e., 0em (part) + 2em
{\normalfont}
- {\contentslabel[ \minimalist_apply_title_numbering_style:N { \thecontentslabel } ]{1.75em}}
+ {\contentslabel[ \minimalist_apply_title_numbering_style:n { \thecontentslabel } ]{1.75em}}
{\hspace*{-1.75em}}
{\titlerule*[1em]{\textcolor{main-text!15!paper}{.}}\contentspage}
\titlecontents{subsection}
[4.5em] % i.e., 2em (section) + 2.5em
{\normalfont}
- {\contentslabel[ \minimalist_apply_title_numbering_style:N { \thecontentslabel } ]{2.25em}}
+ {\contentslabel[ \minimalist_apply_title_numbering_style:n { \thecontentslabel } ]{2.25em}}
{\hspace*{-2.25em}}
{\titlerule*[1em]{\textcolor{main-text!15!paper}{.}}\contentspage}
\titlecontents{subsubsection}
[7.5em] % i.e., 4.5em (subsection) + 3em
{\normalfont}
- {\contentslabel[ \minimalist_apply_title_numbering_style:N { \thecontentslabel } ]{2.75em}}
+ {\contentslabel[ \minimalist_apply_title_numbering_style:n { \thecontentslabel } ]{2.75em}}
{\hspace*{-2.75em}}
{\titlerule*[1em]{\textcolor{main-text!15!paper}{.}}\contentspage}
}
@@ -487,7 +522,20 @@
%%================================
%% Blank page
%%================================
-\newcommand{\blinkpagetext}{This~page~is~intentionally~left~blank}
+\projlib_langauge_define_multilingual_text:Nn \bl at nkpagetext
+ {
+ , EN = This~page~is~intentionally~left~blank
+ , FR = Cette~page~a~été~intentionellement~laissée~vide
+ , DE = Diese~Seite~wurde~absichtlich~leer~gelassen
+ , IT = Questa~pagina~è~stata~lasciata~vuota~intenzionalmente
+ , PT = Esta~página~foi~intencionalmente~deixada~em~branco
+ , BR = Esta~página~foi~intencionalmente~deixada~em~branco
+ , ES = Esta~página~se~ha~dejado~intencionadamente~en~blanco
+ , CN = \ziju{0.2} 此页为有意留为空白
+ , TC = \ziju{0.2} 此頁為有意留為空白
+ , JP = このページは意図的に空白にしてあります
+ , RU = Эта~страница~намеренно~оставлена~пустой
+ }
\renewcommand{\cleardoublepage}{
\relax
\clearpage
@@ -496,12 +544,73 @@
\hook_gput_next_code:nn { shipout/background }
{
\put(0.5\paperwidth,-0.5\paperheight){
- \makebox[0pt]{\large\color{main-text!10!paper}\blinkpagetext}}
+ \makebox[0pt]{\large\color{main-text!10!paper}\g_minimalist_title_font_common_tl\bl at nkpagetext}}
}
\null\newpage\fi\fi
}
%%================================
+%% Index
+%%================================
+\RequirePackage { imakeidx }
+\makeindex[intoc]
+
+\RequirePackage { silence }
+\ExplSyntaxOff
+\WarningFilter{latex}{Writing or overwriting file}
+\begin{filecontents*}[overwrite]{\jobname.mst}
+delim_0 "\\IndexDotfill " % Filler between section heading and page number
+delim_1 "\\IndexDotfill " % Filler between subsection heading and page number
+headings_flag 1
+heading_prefix "\\IndexHeading{"
+heading_suffix "}\n"
+\end{filecontents*}
+\ExplSyntaxOn
+
+\projlib_langauge_define_multilingual_text:Nn \index_symbols_name
+ {
+ , EN = Symbols
+ , FR = Symboles
+ , DE = Symbole
+ , IT = Simboli
+ , PT = Símbolos
+ , BR = Símbolos
+ , ES = Símbolos
+ , CN = 符号
+ , TC = 符號
+ , JP = 記号
+ , RU = Символы
+ }
+
+\newcommand*{\IndexDotfill}
+ {
+ \nobreakspace\nobreakspace
+ \titlerule*[.67em]{\textcolor{main-text!15!paper}{.}}
+ \nobreakspace\nobreakspace
+ }
+\newcommand*{\IndexHeading}[1]
+ {
+ \str_if_eq:nnTF { #1 } { Symbols }
+ { \tl_set:Nn \l_tmpa_tl { \index_symbols_name } }
+ { \tl_set:Nn \l_tmpa_tl { #1 } }
+ \centerline{ \g_minimalist_title_font_common_tl \minimalist_apply_title_numbering_style:n { \l_tmpa_tl } }
+ \nopagebreak
+ \par
+ \vspace{.3\baselineskip}
+ }
+\renewcommand*{\indexspace}
+ {
+ \par
+ \vspace{2pc~plus~.5pc~minus~.3pc}
+ }
+
+\hook_gput_code:nnn { begindocument/before } { minimalist }
+ {
+ \hook_gput_code:nnn { cmd/printindex/before } { minimalist } { \LocallyStopLineNumbers }
+ \hook_gput_code:nnn { cmd/printindex/after } { minimalist } { \ResumeLineNumbers }
+ }
+
+%%================================
%% Draft mark
%%================================
\RequirePackage { projlib-draft }
@@ -555,12 +664,15 @@
{
\providecommand{\phantomsection}{}
\RequirePackage { url }
- \newcommand{\href}[2]{#2}
+ \providecommand{\href}[2]{#2}
+ \providecommand{\texorpdfstring}[2]{#1}
}
{
- \PassOptionsToPackage { hidelinks,linktoc=all } { hyperref }
+ \RequirePackage { hyperref }
\RequirePackage { bookmark }
- \RequirePackage { hyperref }
+ \hypersetup{ hidelinks, linktoc = all }
+ \bookmarksetup{ numbered }
+ \renewcommand\Hy at numberline[1]{#1.~}
}
\RequirePackage { projlib-theorem }
@@ -718,8 +830,8 @@
top = 0pt, bottom = 0pt,
left = 0pt, right = 0pt,
boxrule = 0pt, boxsep = 0pt,
- before~skip = 1em+\parskip,
- after~skip = 1.2em+\parskip,
+ before~skip = \parskip+\topsep+.25\baselineskip,
+ after~skip = \parskip+\topsep+.25\baselineskip,
breakable, lines~before~break=3,
]
}
@@ -737,108 +849,124 @@
}
}
-%%================================
-%% Index
-%%================================
-\hook_gput_code:nnn { begindocument/before } { minimalist }
-{
- \hook_gput_code:nnn { cmd/printindex/before } { minimalist } { \LocallyStopLineNumbers }
- \hook_gput_code:nnn { cmd/printindex/after } { minimalist } { \ResumeLineNumbers }
-}
-\bool_if:NF \l__minimalist_is_book_bool {
-
%%================================
%% Title block style
%%================================
-\renewcommand{\@maketitle}{
- \LocallyStopLineNumbers
- \noindent
- {\textcolor{main-text!27!paper}{\rule{\textwidth}{0.75pt}}}
- % \vspace{-\parskip}
- \vspace{-.5\baselineskip}
- \begin{flushright}
- \let\footnote\thanks
- {\minimalist_bfseries:\@title}\\\medskip
- \color{main-text!80!paper}
- {\small\scshape\@author}
- \par\vspace{-\parskip}\vspace{2pt}
- {\small\@date}
- \end{flushright}
- % \vspace{-\parskip}
- \vspace{-.5\baselineskip}
- \ifx\@date\@empty
- \vspace{\baselineskip}
- \vspace{1.2\parskip}
- \else
- \vspace{-.5\baselineskip}
- \fi
- {\textcolor{main-text!27!paper}{\rule{\textwidth}{0.75pt}}\par}
- \ResumeLineNumbers
-}
+\bool_if:NTF \l__minimalist_is_book_bool
+ {
+ \hook_gput_code:nnn { package/projlib-author/after } { minimalist }
+ {
+ \tl_gset:Nn \g__projlib_author_font_author_tl { \normalfont \scshape }
+ \tl_gset:Nn \g__projlib_author_font_institute_tl { \large \normalfont }
+ \tl_gset:Nn \g__projlib_author_font_address_tl { \large \normalfont \itshape }
+ \tl_gset:Nn \g__projlib_author_font_curraddr_tl { \large \normalfont \itshape }
+ \tl_gset:Nn \g__projlib_author_font_email_tl { \large \normalfont \ttfamily }
+ }
-\hook_gput_code:nnn { cmd/maketitle/after } { minimalist } { \thispagestyle{fancy} }
+ \RequirePackage { projlib-titlepage }
+ \renewcommand{\maketitle}{
+ \LocallyStopLineNumbers
+ \ProjLibTitlePage [ style = simple ]
+ {
+ , title = \@title
+ , author = \@author
+ , date = \@date
+ }
+ \ResumeLineNumbers
+ }
+ }
+ {
+ \renewcommand{\@maketitle}
+ {
+ \LocallyStopLineNumbers
+ \noindent
+ {\textcolor{main-text!27!paper}{\rule{\textwidth}{0.75pt}}}
+ % \vspace{-\parskip}
+ \vspace{-.5\baselineskip}
+ \begin{flushright}
+ \let\footnote\thanks
+ {\minimalist_bfseries:\@title}\\\medskip
+ \color{main-text!80!paper}
+ {\small\scshape\@author}
+ \par\vspace{-\parskip}\vspace{2pt}
+ {\small\@date}
+ \end{flushright}
+ % \vspace{-\parskip}
+ \vspace{-.5\baselineskip}
+ \ifx\@date\@empty
+ \vspace{\baselineskip}
+ \vspace{1.2\parskip}
+ \else
+ \vspace{-.5\baselineskip}
+ \fi
+ {\textcolor{main-text!27!paper}{\rule{\textwidth}{0.75pt}}\par}
+ \ResumeLineNumbers
+ }
+ \hook_gput_code:nnn { cmd/maketitle/after } { minimalist } { \thispagestyle{fancy} }
+
%%================================
%% Abstract style
%%================================
-\renewenvironment{abstract}
- {
- \LocallyStopLineNumbers
- \begin{flushright}
- { \g_minimalist_title_font_section_tl \scshape \small\abstractname}\par
- \vspace{-\parskip}
- \vspace{-.25\baselineskip}
- \begin{minipage}[t]{.833\textwidth}
- \vspace{0pt}
- \color{main-text!80!paper}
- \footnotesize
- \parindent=2em
- }
- {
- \end{minipage}
- \end{flushright}
- \bigskip
- \ResumeLineNumbers
- }
+ \renewenvironment{abstract}
+ {
+ \LocallyStopLineNumbers
+ \begin{flushright}
+ { \g_minimalist_title_font_section_tl \scshape \small\abstractname}\par
+ \vspace{-\parskip}
+ \vspace{-.25\baselineskip}
+ \begin{minipage}[t]{.833\textwidth}
+ \vspace{0pt}
+ \color{main-text!80!paper}
+ \footnotesize
+ \parindent=2em
+ }
+ {
+ \end{minipage}
+ \end{flushright}
+ \bigskip
+ \ResumeLineNumbers
+ }
%%================================
%% 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 = Ключевые~слова ,
- }
+ \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}{
- \LocallyStopLineNumbers
- \vspace{-.5\baselineskip}
- \begin{flushright}
- {\minimalist_bfseries:\scshape\small\keywordname}\par
- \vspace{-\parskip}
- \vspace{-.30\baselineskip}
- \begin{minipage}[t]{.833\textwidth}
- \vspace{0pt}
- \color{main-text!80!paper}
- \footnotesize
- \parindent=2em
- \raggedleft
-}{
- \end{minipage}
- \end{flushright}
- \bigskip
- \ResumeLineNumbers
-}
+ \newenvironment{keyword}{
+ \LocallyStopLineNumbers
+ \vspace{-.5\baselineskip}
+ \begin{flushright}
+ {\minimalist_bfseries:\scshape\small\keywordname}\par
+ \vspace{-\parskip}
+ \vspace{-.30\baselineskip}
+ \begin{minipage}[t]{.833\textwidth}
+ \vspace{0pt}
+ \color{main-text!80!paper}
+ \footnotesize
+ \parindent=2em
+ \raggedleft
+ }{
+ \end{minipage}
+ \end{flushright}
+ \bigskip
+ \ResumeLineNumbers
+ }
+ } % end of \bool_if:NTF \l__minimalist_is_book_bool
%%================================
%% Simulate features of amsart
@@ -846,8 +974,6 @@
\PassOptionsToPackage { amsfashion } { projlib-author }
\RequirePackage { projlib-author }
-}
-
\endinput
%%
%% End of file `minimalist/minimalist-classical.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/minimalist/minimalist-plain.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/minimalist/minimalist-plain.sty 2022-04-04 17:45:51 UTC (rev 62899)
+++ trunk/Master/texmf-dist/tex/latex/minimalist/minimalist-plain.sty 2022-04-04 20:54:49 UTC (rev 62900)
@@ -19,7 +19,7 @@
\RequirePackage{l3keys2e}
\ProvidesExplPackage
{minimalist-plain}
- {2022/03/19} {}
+ {2022/04/03} {}
{The plain style of minimalist}
\@ifpackageloaded { minimalist } {}
@@ -54,7 +54,7 @@
\tl_new:N \g_minimalist_title_font_paragraph_tl
\tl_gset:Nn \g_minimalist_title_font_part_tl { \minimalist_bfseries: \g_minimalist_title_font_common_tl }
-\tl_gset:Nn \g_minimalist_title_font_chapter_tl { \minimalist_bfseries: \g_minimalist_title_font_common_tl }
+\tl_gset:Nn \g_minimalist_title_font_chapter_tl { \minimalist_bfseries: \g_minimalist_title_font_common_tl \scshape }
\tl_gset:Nn \g_minimalist_title_font_section_tl { \minimalist_bfseries: \g_minimalist_title_font_common_tl \scshape }
\tl_gset:Nn \g_minimalist_title_font_subsection_tl { \minimalist_bfseries: \g_minimalist_title_font_common_tl \scshape }
\tl_gset:Nn \g_minimalist_title_font_subsubsection_tl { \minimalist_bfseries: \g_minimalist_title_font_common_tl }
@@ -113,34 +113,77 @@
\fancypagestyle { fancy }
{
- \fancyhf{}
+ \fancyhf { }
\if at twoside
- \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 }}
+ \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 } { \small \l_minimalist_leftmark_tl }
+ }
\else
- \fancyfoot[R]{\textcolor{main-text!30!paper}{ \l_minimalist_rightmark_tl }
- \rlap{\nobreakspace\nobreakspace\nobreakspace\nobreakspace\textcolor{main-text!75!paper}{\minimalist_bfseries: \thepage}}}
+ \fancyfoot[R]
+ {
+ \textcolor { main-text!30!paper } { \small \l_minimalist_rightmark_tl }
+ \rlap
+ {
+ \nobreakspace \nobreakspace \nobreakspace \nobreakspace
+ \textcolor { main-text!75!paper } { \minimalist_bfseries: \thepage }
+ }
+ }
\fi
- \renewcommand{\headrulewidth}{0pt}
+ \renewcommand { \headrulewidth } { 0pt }
}
-\pagestyle{fancy}
+\pagestyle { fancy }
\fancypagestyle { plain }
{
- \fancyhf{}
+ \fancyhf { }
\if at twoside
- \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}}
+ \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 \nobreakspace \nobreakspace
+ }
+ \nobreakspace
+ }
\else
- \fancyfoot[R]{
- \nobreakspace\nobreakspace\nobreakspace\rlap{\textcolor{main-text!75!paper}{\minimalist_bfseries: \thepage}}}
+ \fancyfoot[R]
+ {
+ \nobreakspace
+ \rlap
+ {
+ \nobreakspace \nobreakspace \nobreakspace \nobreakspace
+ \textcolor { main-text!75!paper } { \minimalist_bfseries: \thepage }
+ }
+ }
\fi
- \renewcommand{\headrulewidth}{0pt}
+ \renewcommand { \headrulewidth } { 0pt }
}
\bool_if:NTF \l__minimalist_is_book_bool
@@ -150,35 +193,31 @@
\newcommand{ \minimalist_draw_help_line: }{}
}
{
- \newcommand{ \minimalist_draw_help_line: }{
+ \newcommand{ \minimalist_draw_help_line: }
+ {
\begin{tikzpicture}[remember~picture,overlay]
- \foreach\i in {0,1,...,5}{
- \fill[opacity=0.12-0.02*\i]
- ($(current~page~text~area.north~east)
- +(-\i*0.5em-.025em,-10pt+\i*1.1pt)$)
- rectangle ($(current~page~text~area.south~east)
- +(-\i*0.5em+.025em,10pt-\i*1.1pt)$);
- \shade[top~color=paper,bottom~color=main-text,opacity=0.12-0.02*\i]
- ($(current~page~text~area.north~east)
- +(-\i*0.5em-.025em,2pt)$)
- rectangle ($(current~page~text~area.north~east)
- +(-\i*0.5em+.025em,-10pt+\i*1.1pt)$);
- \shade[top~color=main-text,bottom~color=paper,opacity=0.12-0.02*\i]
- ($(current~page~text~area.south~east)
- +(-\i*0.5em-.025em,-2pt)$)
- rectangle ($(current~page~text~area.south~east)
- +(-\i*0.5em+.025em,10pt-\i*1.1pt)$);
- }
+ \foreach\i in {0,1,...,5}{
+ \fill[opacity=0.12-0.02*\i]
+ ($(current~page~text~area.north~east)+(-\i*0.5em-.025em,-10pt+\i*1.1pt)$)
+ rectangle ($(current~page~text~area.south~east)+(-\i*0.5em+.025em,10pt-\i*1.1pt)$);
+ \shade[top~color=paper,bottom~color=main-text,opacity=0.12-0.02*\i]
+ ($(current~page~text~area.north~east)+(-\i*0.5em-.025em,2pt)$)
+ rectangle ($(current~page~text~area.north~east)+(-\i*0.5em+.025em,-10pt+\i*1.1pt)$);
+ \shade[top~color=main-text,bottom~color=paper,opacity=0.12-0.02*\i]
+ ($(current~page~text~area.south~east)+(-\i*0.5em-.025em,-2pt)$)
+ rectangle ($(current~page~text~area.south~east)+(-\i*0.5em+.025em,10pt-\i*1.1pt)$);
+ }
\end{tikzpicture}
- }
+ }
}
- \fancypagestyle{part}{
- \fancyhf{}
- \renewcommand{\headrulewidth}{0pt}
- \fancyhead[C]{ \minimalist_draw_help_line: }
- }
- \addtolength{\headheight}{20pt}
- \addtolength{\topmargin}{-20pt}
+ \fancypagestyle { part }
+ {
+ \fancyhf { }
+ \renewcommand { \headrulewidth } { 0pt }
+ \fancyhead[C] { \minimalist_draw_help_line: }
+ }
+ \addtolength { \headheight } { 20pt }
+ \addtolength { \topmargin } { -20pt }
\if at twoside
\renewcommand{\chaptermark}[1]{\markboth{\textsc{#1}}{}}
\else
@@ -196,24 +235,6 @@
}
%%================================
-%% Line numbers
-%%================================
-\PassOptionsToPackage { pagewise,mathlines } { lineno }
-\RequirePackage { linenoamsmath }
-\renewcommand{\linenumberfont}{\ttfamily\color{main-text!7!paper}\footnotesize}
-\setlength{\linenumbersep}{1em}
-
-\newif\ifLNturnsON
-\def\LocallyStopLineNumbers{\LNturnsONfalse
- \ifLineNumbers\LNturnsONtrue\fi\nolinenumbers}
-\def\ResumeLineNumbers{\ifLNturnsON\linenumbers\fi}
-
-\hook_gput_code:nnn { cmd/tableofcontents/before } { minimalist } { \LocallyStopLineNumbers }
-\hook_gput_code:nnn { cmd/tableofcontents/after } { minimalist } { \ResumeLineNumbers }
-\hook_gput_code:nnn { env/bibliography/before } { minimalist } { \LocallyStopLineNumbers }
-\hook_gput_code:nnn { env/bibliography/after } { minimalist } { \ResumeLineNumbers }
-
-%%================================
%% Title format
%%================================
\RequirePackage [ explicit, newparttoc ] { titlesec }
@@ -221,11 +242,12 @@
\RequirePackage { ulem }
\cs_generate_variant:Nn \seq_set_split:Nnn { Nnx }
-\cs_new:Nn \minimalist_apply_title_numbering_style:N
+\cs_new:Nn \minimalist_apply_title_numbering_style:n
{
- \seq_set_split:Nnx \l_tmpa_seq { . } { #1 }
- \seq_set_map:NNn \l_tmpb_seq \l_tmpa_seq { \usefont{U}{zeur}{b}{n} ##1 }
- \textcolor{main-text!39!paper}{ \seq_use:Nn \l_tmpb_seq { $.$ } }
+ \tl_set:Nx \l_tmpa_tl { #1 }
+ \regex_replace_all:nnN { (\w) } { \c{textbf}{\1} } \l_tmpa_tl
+ \regex_replace_all:nnN { (\d) } { {\c{usefont}{U}{zeur}{b}{n}\1} } \l_tmpa_tl
+ \textcolor { main-text!39!paper } { \l_tmpa_tl }
}
\newcommand{\partstring}{\MakeUppercase{{\partname\nobreakspace\protect\thepart}}}
@@ -236,11 +258,11 @@
}
\AddLanguageSetting [ schinese ]
{
- \renewcommand{\partstring}{第 \nobreakspace\thepart\nobreakspace 部分}
+ \renewcommand{\partstring}{第 \zhnumber{\arabic{part}} 部分}
}
\AddLanguageSetting [ tchinese ]
{
- \renewcommand{\partstring}{第 \nobreakspace\thepart\nobreakspace 部分}
+ \renewcommand{\partstring}{第 \zhnumber{\arabic{part}} 部分}
}
\AddLanguageSetting [ japanese ]
{
@@ -290,16 +312,29 @@
{\thispagestyle{fancy}
\LocallyStopLineNumbers
\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\raisebox{-7pt}{\thechapter}}}#1}
+ {
+ \rlap
+ {
+ \hspace*{-.5em}
+ \color{main-text!10!paper}
+ \fontsize{90}{0}\selectfont\raisebox{-10pt}{ \usefont{U}{zeur}{b}{n} \thechapter }
+ }
+ #1
+ }
[\ResumeLineNumbers]
\titleformat{name=\chapter,numberless}
{\thispagestyle{fancy}
\LocallyStopLineNumbers
% \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}{\phantom{*}}}}#1}
+ \color{main-text!90!paper}\g_minimalist_title_font_chapter_tl\fontsize{16}{0}\selectfont}{}{0em}
+ {
+ \rlap
+ {
+ \hspace*{-.5em}
+ \fontsize{80}{0}\selectfont\raisebox{-10pt}{ \phantom{*} }
+ }
+ #1
+ }
[\ResumeLineNumbers]
}
{
@@ -336,7 +371,7 @@
\titleformat{\section}
{\LocallyStopLineNumbers
\g_minimalist_title_font_section_tl\centering}
- {\raisebox{-.02\baselineskip}{\large \minimalist_apply_title_numbering_style:N { \thesection } }}{1em}
+ {\raisebox{-.02\baselineskip}{\large \minimalist_apply_title_numbering_style:n { \thesection } }}{1em}
{#1}
[\ResumeLineNumbers]
@@ -344,7 +379,7 @@
\titleformat{\subsection}
{\LocallyStopLineNumbers
\g_minimalist_title_font_subsection_tl}
- { \minimalist_apply_title_numbering_style:N { \thesubsection } }{.75em}
+ { \minimalist_apply_title_numbering_style:n { \thesubsection } }{.75em}
{#1}
[\ResumeLineNumbers]
@@ -353,7 +388,7 @@
{
\titleformat{\subsubsection}[runin]
{\g_minimalist_title_font_subsubsection_tl}
- { \minimalist_apply_title_numbering_style:N { \thesection } }{.5em}
+ { \minimalist_apply_title_numbering_style:n { \thesection } }{.5em}
{#1.}[\hspace*{.3em}]
}
{
@@ -360,7 +395,7 @@
\titleformat{\subsubsection}
{\LocallyStopLineNumbers
\g_minimalist_title_font_subsubsection_tl}
- { \minimalist_apply_title_numbering_style:N { \thesubsubsection } }{.5em}
+ { \minimalist_apply_title_numbering_style:n { \thesubsubsection } }{.5em}
{#1}
[\ResumeLineNumbers]
}
@@ -380,7 +415,7 @@
\titlecontents{part}
[0em]
{\addvspace{1.5pc}\filcenter\normalfont}
- {\thecontentslabel\nopagebreak\\\nopagebreak\uppercase}
+ { \minimalist_apply_title_numbering_style:n { \thecontentslabel } \nopagebreak\\\nopagebreak\uppercase}
{}
{} % without page number
[\addvspace{.5pc}]
@@ -390,25 +425,25 @@
\titlecontents{chapter}
[2em] % i.e., 0em (part) + 2em
{\addvspace{.5pc}\normalfont}
- {\contentslabel[ \minimalist_apply_title_numbering_style:N { \thecontentslabel } ]{2em}}
+ {\contentslabel[ \minimalist_apply_title_numbering_style:n { \thecontentslabel } ]{2em}}
{\hspace*{-2em}}
{\titlerule*[1em]{\textcolor{main-text!15!paper}{.}}\contentspage}
\titlecontents{section}
[4em] % i.e., 2em (chapter) + 2em
{\normalfont}
- {\contentslabel[ \minimalist_apply_title_numbering_style:N { \thecontentslabel } ]{2em}}
+ {\contentslabel[ \minimalist_apply_title_numbering_style:n { \thecontentslabel } ]{2em}}
{\hspace*{-2em}}
{\titlerule*[1em]{\textcolor{main-text!15!paper}{.}}\contentspage}
\titlecontents{subsection}
[7em] % i.e., 4em (section) + 3em
{\normalfont}
- {\contentslabel[ \minimalist_apply_title_numbering_style:N { \thecontentslabel } ]{2.75em}}
+ {\contentslabel[ \minimalist_apply_title_numbering_style:n { \thecontentslabel } ]{2.75em}}
{\hspace*{-2.75em}}
{\titlerule*[1em]{\textcolor{main-text!15!paper}{.}}\contentspage}
\titlecontents{subsubsection}
[9.5em] % i.e., 7em (subsection) + 3.5em
{\normalfont}
- {\contentslabel[ \minimalist_apply_title_numbering_style:N { \thecontentslabel } ]{3.25em}}
+ {\contentslabel[ \minimalist_apply_title_numbering_style:n { \thecontentslabel } ]{3.25em}}
{\hspace*{-3.25em}}
{\titlerule*[1em]{\textcolor{main-text!15!paper}{.}}\contentspage}
}
@@ -416,19 +451,19 @@
\titlecontents{section}
[2em] % i.e., 0em (part) + 2em
{\normalfont}
- {\contentslabel[ \minimalist_apply_title_numbering_style:N { \thecontentslabel } ]{1.75em}}
+ {\contentslabel[ \minimalist_apply_title_numbering_style:n { \thecontentslabel } ]{1.75em}}
{\hspace*{-1.75em}}
{\titlerule*[1em]{\textcolor{main-text!15!paper}{.}}\contentspage}
\titlecontents{subsection}
[4.5em] % i.e., 2em (section) + 2.5em
{\normalfont}
- {\contentslabel[ \minimalist_apply_title_numbering_style:N { \thecontentslabel } ]{2.25em}}
+ {\contentslabel[ \minimalist_apply_title_numbering_style:n { \thecontentslabel } ]{2.25em}}
{\hspace*{-2.25em}}
{\titlerule*[1em]{\textcolor{main-text!15!paper}{.}}\contentspage}
\titlecontents{subsubsection}
[7.5em] % i.e., 4.5em (subsection) + 3em
{\normalfont}
- {\contentslabel[ \minimalist_apply_title_numbering_style:N { \thecontentslabel } ]{2.75em}}
+ {\contentslabel[ \minimalist_apply_title_numbering_style:n { \thecontentslabel } ]{2.75em}}
{\hspace*{-2.75em}}
{\titlerule*[1em]{\textcolor{main-text!15!paper}{.}}\contentspage}
}
@@ -456,7 +491,20 @@
%%================================
%% Blank page
%%================================
-\newcommand{\blinkpagetext}{This~page~is~intentionally~left~blank}
+\projlib_langauge_define_multilingual_text:Nn \bl at nkpagetext
+ {
+ , EN = This~page~is~intentionally~left~blank
+ , FR = Cette~page~a~été~intentionellement~laissée~vide
+ , DE = Diese~Seite~wurde~absichtlich~leer~gelassen
+ , IT = Questa~pagina~è~stata~lasciata~vuota~intenzionalmente
+ , PT = Esta~página~foi~intencionalmente~deixada~em~branco
+ , BR = Esta~página~foi~intencionalmente~deixada~em~branco
+ , ES = Esta~página~se~ha~dejado~intencionadamente~en~blanco
+ , CN = \ziju{0.2} 此页为有意留为空白
+ , TC = \ziju{0.2} 此頁為有意留為空白
+ , JP = このページは意図的に空白にしてあります
+ , RU = Эта~страница~намеренно~оставлена~пустой
+ }
\renewcommand{\cleardoublepage}{
\relax
\clearpage
@@ -465,12 +513,73 @@
\hook_gput_next_code:nn { shipout/background }
{
\put(0.5\paperwidth,-0.5\paperheight){
- \makebox[0pt]{\large\color{main-text!10!paper}\blinkpagetext}}
+ \makebox[0pt]{\large\color{main-text!10!paper}\g_minimalist_title_font_common_tl\bl at nkpagetext}}
}
\null\newpage\fi\fi
}
%%================================
+%% Index
+%%================================
+\RequirePackage { imakeidx }
+\makeindex[intoc]
+
+\RequirePackage { silence }
+\ExplSyntaxOff
+\WarningFilter{latex}{Writing or overwriting file}
+\begin{filecontents*}[overwrite]{\jobname.mst}
+delim_0 "\\IndexDotfill " % Filler between section heading and page number
+delim_1 "\\IndexDotfill " % Filler between subsection heading and page number
+headings_flag 1
+heading_prefix "\\IndexHeading{"
+heading_suffix "}\n"
+\end{filecontents*}
+\ExplSyntaxOn
+
+\projlib_langauge_define_multilingual_text:Nn \index_symbols_name
+ {
+ , EN = Symbols
+ , FR = Symboles
+ , DE = Symbole
+ , IT = Simboli
+ , PT = Símbolos
+ , BR = Símbolos
+ , ES = Símbolos
+ , CN = 符号
+ , TC = 符號
+ , JP = 記号
+ , RU = Символы
+ }
+
+\newcommand*{\IndexDotfill}
+ {
+ \nobreakspace\nobreakspace
+ \titlerule*[.67em]{\textcolor{main-text!15!paper}{.}}
+ \nobreakspace\nobreakspace
+ }
+\newcommand*{\IndexHeading}[1]
+ {
+ \str_if_eq:nnTF { #1 } { Symbols }
+ { \tl_set:Nn \l_tmpa_tl { \index_symbols_name } }
+ { \tl_set:Nn \l_tmpa_tl { #1 } }
+ \centerline{ \g_minimalist_title_font_common_tl \minimalist_apply_title_numbering_style:n { \l_tmpa_tl } }
+ \nopagebreak
+ \par
+ \vspace{.3\baselineskip}
+ }
+\renewcommand*{\indexspace}
+ {
+ \par
+ \vspace{2pc~plus~.5pc~minus~.3pc}
+ }
+
+\hook_gput_code:nnn { begindocument/before } { minimalist }
+ {
+ \hook_gput_code:nnn { cmd/printindex/before } { minimalist } { \LocallyStopLineNumbers }
+ \hook_gput_code:nnn { cmd/printindex/after } { minimalist } { \ResumeLineNumbers }
+ }
+
+%%================================
%% Draft mark
%%================================
\RequirePackage { projlib-draft }
@@ -511,12 +620,15 @@
{
\providecommand{\phantomsection}{}
\RequirePackage { url }
- \newcommand{\href}[2]{#2}
+ \providecommand{\href}[2]{#2}
+ \providecommand{\texorpdfstring}[2]{#1}
}
{
- \PassOptionsToPackage { hidelinks,linktoc=all } { hyperref }
+ \RequirePackage { hyperref }
\RequirePackage { bookmark }
- \RequirePackage { hyperref }
+ \hypersetup{ hidelinks, linktoc = all }
+ \bookmarksetup{ numbered }
+ \renewcommand\Hy at numberline[1]{#1.~}
}
\RequirePackage { projlib-theorem }
@@ -674,8 +786,8 @@
top = 0pt, bottom = 0pt,
left = 0pt, right = 0pt,
boxrule = 0pt, boxsep = 0pt,
- before~skip = 1em+\parskip,
- after~skip = 1.2em+\parskip,
+ before~skip = \parskip+\topsep+.25\baselineskip,
+ after~skip = \parskip+\topsep+.25\baselineskip,
breakable, lines~before~break=3,
]
}
@@ -693,97 +805,114 @@
}
}
-%%================================
-%% Index
-%%================================
-\hook_gput_code:nnn { begindocument/before } { minimalist }
-{
- \hook_gput_code:nnn { cmd/printindex/before } { minimalist } { \LocallyStopLineNumbers }
- \hook_gput_code:nnn { cmd/printindex/after } { minimalist } { \ResumeLineNumbers }
-}
+\hook_gput_code:nnn { env/quote/begin } { minimalist } { \small }
-\bool_if:NF \l__minimalist_is_book_bool {
-
%%================================
%% Title block style
%%================================
-\renewcommand{\@maketitle}{
- \LocallyStopLineNumbers
- \begin{center}
- \let\footnote\thanks
- {\minimalist_bfseries:\sffamily\scshape\Large\@title}\\\bigskip
- \color{main-text!80!paper}
- {\small\scshape\@author}
- \par\smallskip\vspace{-\parskip}
- {\small\@date}
- \end{center}
- \ifx\@date\@empty\medskip\fi
- \medskip\par
- \ResumeLineNumbers
-}
+\bool_if:NTF \l__minimalist_is_book_bool
+ {
+ \hook_gput_code:nnn { package/projlib-author/after } { minimalist }
+ {
+ \tl_gset:Nn \g__projlib_author_font_author_tl { \normalfont \scshape }
+ \tl_gset:Nn \g__projlib_author_font_institute_tl { \large \normalfont }
+ \tl_gset:Nn \g__projlib_author_font_address_tl { \large \normalfont \itshape }
+ \tl_gset:Nn \g__projlib_author_font_curraddr_tl { \large \normalfont \itshape }
+ \tl_gset:Nn \g__projlib_author_font_email_tl { \large \normalfont \ttfamily }
+ }
-\hook_gput_code:nnn { cmd/maketitle/after } { minimalist } { \thispagestyle{fancy} }
+ \RequirePackage { projlib-titlepage }
+ \renewcommand{\maketitle}{
+ \LocallyStopLineNumbers
+ \ProjLibTitlePage [ style = simple ]
+ {
+ , title = \@title
+ , author = \@author
+ , date = \@date
+ }
+ \ResumeLineNumbers
+ }
+ }
+ {
+ \renewcommand{\@maketitle}
+ {
+ \LocallyStopLineNumbers
+ \begin{center}
+ \let\footnote\thanks
+ {\minimalist_bfseries:\sffamily\scshape\Large\@title}\\\bigskip
+ \color{main-text!80!paper}
+ {\small\scshape\@author}
+ \par\smallskip\vspace{-\parskip}
+ {\small\@date}
+ \end{center}
+ \ifx\@date\@empty\medskip\fi
+ \medskip\par
+ \ResumeLineNumbers
+ }
+ \hook_gput_code:nnn { cmd/maketitle/after } { minimalist } { \thispagestyle{fancy} }
+
%%================================
%% Abstract style
%%================================
-\renewenvironment{abstract}
- {
- \LocallyStopLineNumbers
- \vspace{-.5\baselineskip}
- \begin{center}
- { \g_minimalist_title_font_section_tl \scshape \small\abstractname}\\
- \vspace{-.3\baselineskip}
- \begin{minipage}[t]{.833\textwidth}
- \vspace{0pt}
- \color{main-text!80!paper}
- \footnotesize
- \parindent=2em
- }
- {
- \end{minipage}
- \end{center}
- \medskip
- \ResumeLineNumbers
- }
+ \renewenvironment{abstract}
+ {
+ \LocallyStopLineNumbers
+ \vspace{-.5\baselineskip}
+ \begin{center}
+ { \g_minimalist_title_font_section_tl \scshape \small\abstractname}\\
+ \vspace{-.3\baselineskip}
+ \begin{minipage}[t]{.833\textwidth}
+ \vspace{0pt}
+ \color{main-text!80!paper}
+ \footnotesize
+ \parindent=2em
+ }
+ {
+ \end{minipage}
+ \end{center}
+ \medskip
+ \ResumeLineNumbers
+ }
%%================================
%% 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 = Ключевые~слова ,
- }
+ \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}{
- \LocallyStopLineNumbers
- \vspace{-.75\baselineskip}
- \begin{center}
- {\minimalist_bfseries:\scshape\small\keywordname}\\
- \vspace{-.3\baselineskip}
- \begin{minipage}[t]{.833\textwidth}
- \vspace{0pt}
- \color{main-text!80!paper}
- \footnotesize
- \parindent=2em
+ \newenvironment{keyword}{
+ \LocallyStopLineNumbers
+ \vspace{-.75\baselineskip}
\begin{center}
-}{
+ {\minimalist_bfseries:\scshape\small\keywordname}\\
+ \vspace{-.3\baselineskip}
+ \begin{minipage}[t]{.833\textwidth}
+ \vspace{0pt}
+ \color{main-text!80!paper}
+ \footnotesize
+ \parindent=2em
+ \begin{center}
+ }{
+ \end{center}
+ \end{minipage}
\end{center}
- \end{minipage}
- \end{center}
- \medskip
- \ResumeLineNumbers
-}
+ \medskip
+ \ResumeLineNumbers
+ }
+ } % end of \bool_if:NTF \l__minimalist_is_book_bool
%%================================
%% Simulate features of amsart
@@ -791,8 +920,6 @@
\PassOptionsToPackage { amsfashion } { projlib-author }
\RequirePackage { projlib-author }
-}
-
\endinput
%%
%% End of file `minimalist/minimalist-plain.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/minimalist/minimalist.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/minimalist/minimalist.sty 2022-04-04 17:45:51 UTC (rev 62899)
+++ trunk/Master/texmf-dist/tex/latex/minimalist/minimalist.sty 2022-04-04 20:54:49 UTC (rev 62900)
@@ -19,7 +19,7 @@
\RequirePackage{l3keys2e}
\ProvidesExplPackage
{minimalist}
- {2022/03/19} {}
+ {2022/04/03} {}
{A simple and clear style for articles and books}
\keys_define:nn { minimalist }
@@ -73,6 +73,24 @@
}
%%================================
+%% Line numbers
+%%================================
+\PassOptionsToPackage { pagewise,mathlines } { lineno }
+\RequirePackage { linenoamsmath }
+\renewcommand{\linenumberfont}{\ttfamily\color{main-text!7!paper}\footnotesize}
+\setlength{\linenumbersep}{1em}
+
+\newif\ifLNturnsON
+\def\LocallyStopLineNumbers{\LNturnsONfalse
+ \ifLineNumbers\LNturnsONtrue\fi\nolinenumbers}
+\def\ResumeLineNumbers{\ifLNturnsON\linenumbers\fi}
+
+\hook_gput_code:nnn { cmd/tableofcontents/before } { minimalist } { \LocallyStopLineNumbers }
+\hook_gput_code:nnn { cmd/tableofcontents/after } { minimalist } { \ResumeLineNumbers }
+\hook_gput_code:nnn { env/bibliography/before } { minimalist } { \LocallyStopLineNumbers }
+\hook_gput_code:nnn { env/bibliography/after } { minimalist } { \ResumeLineNumbers }
+
+%%================================
%% Paper configuration
%%================================
\RequirePackage { projlib-paper }
Modified: trunk/Master/texmf-dist/tex/latex/minimalist/minimart.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/minimalist/minimart.cls 2022-04-04 17:45:51 UTC (rev 62899)
+++ trunk/Master/texmf-dist/tex/latex/minimalist/minimart.cls 2022-04-04 20:54:49 UTC (rev 62900)
@@ -19,7 +19,7 @@
\RequirePackage{l3keys2e}
\ProvidesExplClass
{minimart}
- {2022/03/19} {}
+ {2022/04/03} {}
{A simple and clear article style}
\tl_const:Nn \l__minimclass_base_class_tl { article }
@@ -140,6 +140,10 @@
\RequirePackage { minimalist }
+\raggedbottom
+\hfuzz=2pt
+\vfuzz=2pt
+
%%================================
%% Fonts
%%================================
@@ -169,6 +173,17 @@
\RequirePackage { mathpazo }
\RequirePackage { newpxtext }
\RequirePackage { amssymb }
+ \sys_if_engine_pdftex:F
+ {
+ \setsansfont { texgyreheros }
+ [
+ Scale = MatchUppercase ,
+ UprightFont = *-regular ,
+ BoldFont = *-bold ,
+ ItalicFont = *-italic ,
+ BoldItalicFont = *-bolditalic ,
+ ]
+ }
}
}
Modified: trunk/Master/texmf-dist/tex/latex/minimalist/minimbook.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/minimalist/minimbook.cls 2022-04-04 17:45:51 UTC (rev 62899)
+++ trunk/Master/texmf-dist/tex/latex/minimalist/minimbook.cls 2022-04-04 20:54:49 UTC (rev 62900)
@@ -19,7 +19,7 @@
\RequirePackage{l3keys2e}
\ProvidesExplClass
{minimbook}
- {2022/03/19} {}
+ {2022/04/03} {}
{A simple and clear book style}
\tl_const:Nn \l__minimclass_base_class_tl { book }
@@ -140,6 +140,10 @@
\RequirePackage { minimalist }
+\raggedbottom
+\hfuzz=2pt
+\vfuzz=2pt
+
%%================================
%% Fonts
%%================================
@@ -169,6 +173,17 @@
\RequirePackage { mathpazo }
\RequirePackage { newpxtext }
\RequirePackage { amssymb }
+ \sys_if_engine_pdftex:F
+ {
+ \setsansfont { texgyreheros }
+ [
+ Scale = MatchUppercase ,
+ UprightFont = *-regular ,
+ BoldFont = *-bold ,
+ ItalicFont = *-italic ,
+ BoldItalicFont = *-bolditalic ,
+ ]
+ }
}
}
Modified: trunk/Master/texmf-dist/tex/latex/projlib/ProjLib.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/projlib/ProjLib.sty 2022-04-04 17:45:51 UTC (rev 62899)
+++ trunk/Master/texmf-dist/tex/latex/projlib/ProjLib.sty 2022-04-04 20:54:49 UTC (rev 62900)
@@ -19,7 +19,7 @@
\RequirePackage{l3keys2e}
\ProvidesExplPackage
{ProjLib}
- {2022/03/21} {}
+ {2022/04/03} {}
{Collective interface of the ProjLib toolkit}
\keys_define:nn { ProjLib }
@@ -33,6 +33,10 @@
, ams-fashion .initial:n = { false }
, ams~fashion .bool_set:N = \l__projlib_main_amsfashion_bool
, ams fashion .bool_set:N = \l__projlib_main_amsfashion_bool
+ , title-page .bool_set:N = \l__projlib_main_titlepage_bool
+ , title-page .initial:n = { false }
+ , title~page .bool_set:N = \l__projlib_main_titlepage_bool
+ , title page .bool_set:N = \l__projlib_main_titlepage_bool
, unknown .code:n = {
\PassOptionsToPackage { \CurrentOption } { projlib-language }
\PassOptionsToPackage { \CurrentOption } { projlib-author }
@@ -66,6 +70,11 @@
\RequirePackage { projlib-math }
\RequirePackage { projlib-paper }
+\bool_if:NT \l__projlib_main_titlepage_bool
+ {
+ \RequirePackage { projlib-titlepage }
+ }
+
\RequirePackage { projlib-theorem }
\endinput
Modified: trunk/Master/texmf-dist/tex/latex/projlib/projlib-author.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/projlib/projlib-author.sty 2022-04-04 17:45:51 UTC (rev 62899)
+++ trunk/Master/texmf-dist/tex/latex/projlib/projlib-author.sty 2022-04-04 20:54:49 UTC (rev 62900)
@@ -19,7 +19,7 @@
\RequirePackage{l3keys2e}
\ProvidesExplPackage
{projlib-author}
- {2022/03/21} {}
+ {2022/04/03} {}
{Enhanced author information block}
\keys_define:nn { projlib-author }
Modified: trunk/Master/texmf-dist/tex/latex/projlib/projlib-datetime.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/projlib/projlib-datetime.sty 2022-04-04 17:45:51 UTC (rev 62899)
+++ trunk/Master/texmf-dist/tex/latex/projlib/projlib-datetime.sty 2022-04-04 20:54:49 UTC (rev 62900)
@@ -19,7 +19,7 @@
\RequirePackage{l3keys2e}
\ProvidesExplPackage
{projlib-datetime}
- {2022/03/21} {}
+ {2022/04/03} {}
{Convert numeric date-time string to natural language}
\tl_new:N \g__projlib_datetime_input_format_tl
@@ -59,10 +59,20 @@
, month-year .code:n = { \tl_set:Nn \g__projlib_datetime_input_format_tl { day-month-year } }
, day-month .code:n = { \tl_set:Nn \g__projlib_datetime_input_format_tl { day-month-year } }
, only-year-month .code:n = { \tl_set:Nn \l__projlib_datetime_output_format_tl { only-year-month } }
- , only-month-day .code:n = { \tl_set:Nn \l__projlib_datetime_output_format_tl { only-month-day } }
- , only-year .code:n = { \tl_set:Nn \l__projlib_datetime_output_format_tl { only-year } }
- , only-month .code:n = { \tl_set:Nn \l__projlib_datetime_output_format_tl { only-month } }
- , only-day .code:n = { \tl_set:Nn \l__projlib_datetime_output_format_tl { only-day } }
+ , only~year~month .meta:n = { only-year-month }
+ , only year month .meta:n = { only-year-month }
+ , only-month-day .code:n = { \tl_set:Nn \l__projlib_datetime_output_format_tl { only-month-day } }
+ , only~month~day .meta:n = { only-month-day }
+ , only month day .meta:n = { only-month-day }
+ , only-year .code:n = { \tl_set:Nn \l__projlib_datetime_output_format_tl { only-year } }
+ , only~year .meta:n = { only-year }
+ , only year .meta:n = { only-year }
+ , only-month .code:n = { \tl_set:Nn \l__projlib_datetime_output_format_tl { only-month } }
+ , only~month .meta:n = { only-month }
+ , only month .meta:n = { only-month }
+ , only-day .code:n = { \tl_set:Nn \l__projlib_datetime_output_format_tl { only-day } }
+ , only~day .meta:n = { only-day }
+ , only day .meta:n = { only-day }
, unknown .code:n = {}
}
Modified: trunk/Master/texmf-dist/tex/latex/projlib/projlib-draft.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/projlib/projlib-draft.sty 2022-04-04 17:45:51 UTC (rev 62899)
+++ trunk/Master/texmf-dist/tex/latex/projlib/projlib-draft.sty 2022-04-04 20:54:49 UTC (rev 62900)
@@ -19,7 +19,7 @@
\RequirePackage{l3keys2e}
\ProvidesExplPackage
{projlib-draft}
- {2022/03/21} {}
+ {2022/04/03} {}
{Useful commands during draft stage}
\keys_define:nn { projlib-draft }
@@ -92,72 +92,73 @@
\group_end:
}
-\projlib_langauge_define_multilingual_text:Nn \projlib_draft_dnf_text
+\projlib_langauge_define_multilingual_text:Nn \projlib_draft_DNF_text
{
- EN = To\ be\ finished ,
- FR = Pas\ encore\ fini ,
- DE = Nicht\ beendet ,
- IT = Per\ essere\ finito ,
- PT = Não\ terminou ,
- BR = Não\ terminou ,
- ES = Estar\ terminado ,
- CN = 这里尚未完成 ,
- TC = 這裡尚未完成 ,
- JP = 終わってない ,
- RU = Не\ закончен ,
+ EN = To ~ be ~ finished ,
+ FR = Pas ~ encore ~ fini ,
+ DE = Nicht ~ beendet ,
+ IT = Per ~ essere ~ finito ,
+ PT = Não ~ terminou ,
+ BR = Não ~ terminou ,
+ ES = Estar ~ terminado ,
+ CN = 这里尚未完成 ,
+ TC = 這裡尚未完成 ,
+ JP = 終わってない ,
+ RU = Не ~ закончен ,
}
-\projlib_langauge_define_multilingual_text:Nn \projlib_draft_dnf_report_text
+\projlib_langauge_define_multilingual_text:Nn \projlib_draft_DNF_report_text
{
- EN = { Below\ is\ a\ list\ of\ outstanding\ items,
- \ followed\ by\ the\ corresponding\ page\ numbers. } ,
- FR = { Voici\ la\ liste\ des\ éléments\ en\ suspens,
- \ suivie\ des\ numéros\ de\ page\ correspondants. } ,
- DE = { Unten\ ist\ eine\ Liste\ der\ ausstehenden\ Posten,
- \ gefolgt\ von\ den\ entsprechenden\ Seitenzahlen. } ,
- IT = { Qui\ sotto\ c'è\ una\ lista\ di\ voci\ in\ sospeso,
- \ seguita\ dai\ numeri\ di\ pagina\ corrispondenti. } ,
- PT = { Abaixo\ está\ uma\ lista\ de\ itens\ pendentes,
- \ seguida\ dos\ números\ de\ página\ correspondentes. } ,
- BR = { Abaixo\ está\ uma\ lista\ de\ itens\ pendentes,
- \ seguida\ dos\ números\ de\ página\ correspondentes. } ,
- ES = { Aquí está\ la\ lista\ de\ elementos\ pendientes,
- \ seguida\ de\ los\ números\ de\ página\ correspondientes. } ,
- CN = { 以下是未完成事项列表，括号内注明了对应的页码。 } ,
- TC = { 以下是未完成事項的列表，括號內註明了對應頁碼。 } ,
- JP = { 以下は、未解決の項目とそれに対応するページ番号の一覧です。 } ,
- RU = { Ниже\ приведен\ список\ невыполненных\ пунктов
- \ с\ соответствующими\ номерами\ страниц\ в\ скобках. } ,
+ EN = { Below ~ is ~ a ~ list ~ of ~ outstanding ~ items, ~
+ followed ~ by ~ the ~ corresponding ~ page ~ numbers. } ,
+ FR = { Voici ~ la ~ liste ~ des ~ éléments ~ en ~ suspens, ~
+ suivie ~ des ~ numéros ~ de ~ page ~ correspondants. } ,
+ DE = { Unten ~ ist ~ eine ~ Liste ~ der ~ ausstehenden ~ Posten, ~
+ gefolgt ~ von ~ den ~ entsprechenden ~ Seitenzahlen. } ,
+ IT = { Qui ~ sotto ~ c'è ~ una ~ lista ~ di ~ voci ~ in ~ sospeso, ~
+ seguita ~ dai ~ numeri ~ di ~ pagina ~ corrispondenti. } ,
+ PT = { Abaixo ~ está ~ uma ~ lista ~ de ~ itens ~ pendentes, ~
+ seguida ~ dos ~ números ~ de ~ página ~ correspondentes. } ,
+ BR = { Abaixo ~ está ~ uma ~ lista ~ de ~ itens ~ pendentes, ~
+ seguida ~ dos ~ números ~ de ~ página ~ correspondentes. } ,
+ ES = { Aquí está ~ la ~ lista ~ de ~ elementos ~ pendientes, ~
+ seguida ~ de ~ los ~ números ~ de ~ página ~ correspondientes. } ,
+ CN = { 以下是未完成事项列表，括号内注明了对应的页码。 } ,
+ TC = { 以下是未完成事項的列表，括號內註明了對應頁碼。 } ,
+ JP = { 以下は、未解決の項目とそれに対応するページ番号の一覧です。 } ,
+ RU = { Ниже ~ приведен ~ список ~ невыполненных ~ пунктов ~
+ с ~ соответствующими ~ номерами ~ страниц ~ в ~ скобках. } ,
}
-\tl_new:c { projlib_draft_dnf_font }
-\tl_gset:cn { projlib_draft_dnf_font } { \normalfont \ttfamily \bfseries \small }
+\tl_new:c { projlib_draft_DNF_font }
+\tl_gset:cn { projlib_draft_DNF_font } { \small \normalfont \bfseries \ttfamily \hyphenchar\font=`\-\spaceskip=.5em ~ plus ~ .5em\xspaceskip=.5em }
-\definecolor { projlib_draft_dnf_color } { RGB } { 21, 122, 20 }
+\definecolor { projlib_draft_DNF_color } { RGB } { 21, 122, 20 }
-\newcounter { projlib_draft_dnf_counter }
+\newcounter { projlib_draft_DNF_counter }
-\tl_new:N \g__projlib_draft_dnf_report_tl
+\tl_new:N \g__projlib_draft_DNF_report_tl
-\NewDocumentCommand \dnf { D<>{} }
+\NewDocumentCommand \DNF { D<>{} }
{
\noindent
\group_begin:
- \projlib_draft_dnf_font
- \stepcounter { projlib_draft_dnf_counter }
- \projlib_draft_plain_box:nn { projlib_draft_dnf_color }
+ \projlib_draft_DNF_font
+ \stepcounter { projlib_draft_DNF_counter }
+ \projlib_draft_plain_box:nn { projlib_draft_DNF_color }
{
- \projlib_draft_dnf_text
+ \projlib_draft_DNF_text
\nobreakspace
- \# \theprojlib_draft_dnf_counter
+ \# \theprojlib_draft_DNF_counter
\tl_if_blank:nF { #1 } { \, : ~ }
- #1
+ \tl_trim_spaces:n { #1 }
}
\group_end:
- \tl_gput_right:Nx \g__projlib_draft_dnf_report_tl
+ \tl_gput_right:Nx \g__projlib_draft_DNF_report_tl
{
+ \noindent
\# \,
- \int_value:w \theprojlib_draft_dnf_counter
+ \int_value:w \theprojlib_draft_DNF_counter
\c_space_tl \c_space_tl
$\langle$
\skip_horizontal:n { 0.1em }
@@ -171,8 +172,10 @@
\skip_horizontal:n { 0.1em }
$\rangle$
\nobreakspace
- \IfNoValueF { #1 } { : ~ }
- #1 \\
+ \exp_not:n { \tl_if_blank:nF { #1 } { : ~ } }
+ \exp_not:n { \tl_trim_spaces:n { #1 } }
+ \par \skip_vertical:n { -\parskip }
+ \skip_vertical:n { .15\baselineskip }
}
}
@@ -180,15 +183,16 @@
{
\hook_gput_code:nnn { enddocument } { projlib-draft }
{
- \tl_if_blank:VF \g__projlib_draft_dnf_report_tl
+ \tl_if_blank:VF \g__projlib_draft_DNF_report_tl
{
\clearpage
- \pagestyle{empty}
+ \pagestyle { empty }
+ \color { projlib_draft_DNF_color }
\noindent
- \color { projlib_draft_dnf_color }
- \projlib_draft_dnf_font
- \projlib_draft_dnf_report_text \\[0.75\baselineskip]
- \g__projlib_draft_dnf_report_tl
+ \projlib_draft_DNF_font
+ \projlib_draft_DNF_report_text
+ \par \bigskip
+ \g__projlib_draft_DNF_report_tl
}
}
}
Modified: trunk/Master/texmf-dist/tex/latex/projlib/projlib-font.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/projlib/projlib-font.sty 2022-04-04 17:45:51 UTC (rev 62899)
+++ trunk/Master/texmf-dist/tex/latex/projlib/projlib-font.sty 2022-04-04 20:54:49 UTC (rev 62900)
@@ -19,7 +19,7 @@
\RequirePackage{l3keys2e}
\ProvidesExplPackage
{projlib-font}
- {2022/03/21} {}
+ {2022/04/03} {}
{Font selection and configuration}
\keys_define:nn { projlib-font }
Modified: trunk/Master/texmf-dist/tex/latex/projlib/projlib-language.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/projlib/projlib-language.sty 2022-04-04 17:45:51 UTC (rev 62899)
+++ trunk/Master/texmf-dist/tex/latex/projlib/projlib-language.sty 2022-04-04 20:54:49 UTC (rev 62900)
@@ -19,7 +19,7 @@
\RequirePackage{l3keys2e}
\ProvidesExplPackage
{projlib-language}
- {2022/03/21} {}
+ {2022/04/03} {}
{Multi-language configuration}
\clist_const:Nn \c__projlib_language_supported_clist
@@ -494,7 +494,7 @@
{ % #1 = command name (with backslash)
% #2 = key-value name configuration
\keyval_parse:nnn
- {}
+ { \use_none:n }
{ \__projlib_langauge_define_multilingual_text_do:nnn { \cs_to_str:N #1 } }
{ #2 }
\tl_gset:Nn #1
@@ -518,6 +518,13 @@
\projlib_langauge_define_multilingual_text:Nn #1 { #2 }
}
+\PassOptionsToPackage { autostyle } { csquotes }
+\RequirePackage { csquotes }
+
+\DeclareQuoteStyle { schinese } {“} {”} {‘} {’}
+\DeclareQuoteStyle { tchinese } {“} {”} {‘} {’}
+\DeclareQuoteStyle { japanese } {「} {」} {『} {』}
+
\endinput
%%
%% End of file `projlib-language.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/projlib/projlib-logo.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/projlib/projlib-logo.sty 2022-04-04 17:45:51 UTC (rev 62899)
+++ trunk/Master/texmf-dist/tex/latex/projlib/projlib-logo.sty 2022-04-04 20:54:49 UTC (rev 62900)
@@ -19,7 +19,7 @@
\RequirePackage{l3keys2e}
\ProvidesExplPackage
{projlib-logo}
- {2022/03/21} {}
+ {2022/04/03} {}
{The ProjLib logo}
\keys_define:nn { projlib-logo }
Modified: trunk/Master/texmf-dist/tex/latex/projlib/projlib-math.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/projlib/projlib-math.sty 2022-04-04 17:45:51 UTC (rev 62899)
+++ trunk/Master/texmf-dist/tex/latex/projlib/projlib-math.sty 2022-04-04 20:54:49 UTC (rev 62900)
@@ -19,7 +19,7 @@
\RequirePackage{l3keys2e}
\ProvidesExplPackage
{projlib-math}
- {2022/03/21} {}
+ {2022/04/03} {}
{Efficient math setup}
\keys_define:nn { projlib-math }
@@ -205,6 +205,41 @@
}
}
+\cs_new:Nn \__projlib_math_list_of_symbols_entry:nnnn
+ % #1 = column one width
+ % #2 = column two width
+ % #3 = symbol
+ % #4 = description
+ {
+ \noindent
+ \begin { tabular } { p{#1} p{#2} }
+ \parbox [t] { #1 } { #3 } & \parbox [t] { #2 } { #4 }
+ \end { tabular }
+ \par
+ \skip_vertical:n { -\parskip }
+ }
+
+\cs_new:Nn \projlib_math_list_of_symbols:nnn
+ % #1 = column one width
+ % #2 = column two width
+ % #3 = key-val list
+ {
+ \keyval_parse:nnn
+ { \use_none:n }
+ { \__projlib_math_list_of_symbols_entry:nnnn { #1 } { #2 } }
+ { #3 }
+ }
+
+\NewDocumentCommand \ProjLibListOfSymbols { O{0.17\textwidth} O{0.75\textwidth} m }
+ {
+ \projlib_math_list_of_symbols:nnn { #1 } { #2 } { #3 }
+ }
+
+\ProvideDocumentCommand \ListOfSymbols { O{0.17\textwidth} O{0.75\textwidth} m }
+ {
+ \projlib_math_list_of_symbols:nnn { #1 } { #2 } { #3 }
+ }
+
\endinput
%%
%% End of file `projlib-math.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/projlib/projlib-paper.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/projlib/projlib-paper.sty 2022-04-04 17:45:51 UTC (rev 62899)
+++ trunk/Master/texmf-dist/tex/latex/projlib/projlib-paper.sty 2022-04-04 20:54:49 UTC (rev 62900)
@@ -19,7 +19,7 @@
\RequirePackage{l3keys2e}
\ProvidesExplPackage
{projlib-paper}
- {2022/03/21} {}
+ {2022/04/03} {}
{Configuration of the paper style}
\keys_define:nn { projlib-paper }
Modified: trunk/Master/texmf-dist/tex/latex/projlib/projlib-theorem.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/projlib/projlib-theorem.sty 2022-04-04 17:45:51 UTC (rev 62899)
+++ trunk/Master/texmf-dist/tex/latex/projlib/projlib-theorem.sty 2022-04-04 20:54:49 UTC (rev 62900)
@@ -19,7 +19,7 @@
\RequirePackage{l3keys2e}
\ProvidesExplPackage
{projlib-theorem}
- {2022/03/21} {}
+ {2022/04/03} {}
{Configuration of theorem-like environments}
\keys_define:nn { projlib-theorem }
@@ -119,7 +119,7 @@
\cs_generate_variant:Nn \keyval_parse:nnn { nno }
\keyval_parse:nno
- { }
+ { \use_none:n }
{ \projlib_theorem_preset_theorem_style:nn }
{ \l__projlib_theorem_theorem_style_tl }
Added: trunk/Master/texmf-dist/tex/latex/projlib/projlib-titlepage.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/projlib/projlib-titlepage.sty (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/projlib/projlib-titlepage.sty 2022-04-04 20:54:49 UTC (rev 62900)
@@ -0,0 +1,116 @@
+%%
+%% This is file `projlib-titlepage.sty',
+%% generated with the docstrip utility.
+
+%% Copyright (C) 2021-2022 by Jinwen XU
+%%
+%% This is part of the ProjLib Toolkit.
+%%
+%% 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
+ {projlib-titlepage}
+ {2022/04/03} {}
+ {Commands for rendering the title page}
+
+\keys_define:nn { projlib-titlepage }
+ {
+ , unknown .code:n = {}
+ }
+\ProcessKeysOptions { projlib-titlepage }
+
+\RequirePackage { projlib-paper }
+
+\RequirePackage { tikz }
+\ExplSyntaxOff
+\usetikzlibrary { calc }
+\ExplSyntaxOn
+
+\tl_new:N \l_projlib_titlepage_logo_tl
+\tl_new:N \l_projlib_titlepage_title_tl
+\tl_new:N \l_projlib_titlepage_subtitle_tl
+\tl_new:N \l_projlib_titlepage_author_tl
+\tl_new:N \l_projlib_titlepage_date_tl
+\tl_new:N \l_projlib_titlepage_style_tl
+
+\NewDocumentCommand \ProjLibTitlePage { O{} m }
+ {
+ \keys_set:nn { projlib-titlepage-config } { #1 }
+ \projlib_titlepage_render:n { #2 }
+ }
+\ProvideDocumentCommand \TitlePage { O{} m }
+ {
+ \ProjLibTitlePage [ #1 ] { #2 }
+ }
+
+\cs_new_protected:Nn \projlib_titlepage_set_color:nn
+ {
+ \colorlet { titlepage- #1 } { #2 }
+ }
+
+\keys_define:nn { projlib-titlepage-config }
+ {
+ , logo .tl_set:N = \l_projlib_titlepage_logo_tl
+ , logo .initial:n = { \scalebox { 2 } { \ProjLib } }
+ , title .tl_set:N = \l_projlib_titlepage_title_tl
+ , subtitle .tl_set:N = \l_projlib_titlepage_subtitle_tl
+ , author .tl_set:N = \l_projlib_titlepage_author_tl
+ , date .tl_set:N = \l_projlib_titlepage_date_tl
+ , style .tl_set:N = \l_projlib_titlepage_style_tl
+ , style .initial:n = { default }
+ , color .code:n = {
+ \keyval_parse:nnn
+ { \use_none:n }
+ { \projlib_titlepage_set_color:nn }
+ { #1 }
+ }
+ , unknown .code:n = {}
+ }
+
+\colorlet { titlepage-main } { blue!50!cyan!50!black }
+\colorlet { titlepage-back } { blue!50!cyan!10!yellow!30 }
+
+\cs_new_protected:Nn \projlib_titlepage_render:n
+ {
+ \keys_set:nn { projlib-titlepage-config } { #1 }
+ \begin { titlepage }
+ \cs_if_exist_use:c { projlib_titlepage_render_with_style_ \l_projlib_titlepage_style_tl : }
+ \end { titlepage }
+ \setcounter { page } { 0 }
+ }
+
+\cs_new_protected:Nn \projlib_titlepage_render_with_style_default:
+ {
+ \begin{tikzpicture}[overlay,remember~picture]
+ \fill [color=titlepage-main] ($(current~page.south~west)$) rectangle ($(current~page.north~east)+(0,-.3\paperheight)$);
+ \fill [color=titlepage-back] ($(current~page.south~west)$) rectangle ($(current~page.north~west)+(.125\paperwidth,-.3\paperheight)$);
+ \fill [color=titlepage-main] ($(current~page.north~west)$) rectangle ($(current~page.north~west)+(.125\paperwidth,-.3\paperheight)$);
+ \fill [color=titlepage-back] ($(current~page.north~east)$) rectangle ($(current~page.north~west)+(.125\paperwidth,-.3\paperheight)$);
+ \node[text~width=.3\paperwidth,text~height=.2\paperheight] at ($(current~page.north~west)+(.32\paperwidth,-.17\paperheight)$) { \l_projlib_titlepage_logo_tl };
+ \node[text~width=.4\paperwidth,text~height=.3\paperheight,scale=2.5] at ($(current~page.north~west)+(.67\paperwidth,-.15\paperheight)$) {\textcolor{titlepage-back}{\sffamily\textsc{ \l_projlib_titlepage_title_tl }\\[.5em]\footnotesize{ \l_projlib_titlepage_subtitle_tl }}};
+ \node[text~width=.3\paperwidth,text~height=.3\paperheight] at ($(current~page.south)+(.2\paperwidth,.3\paperheight)$) {\color{titlepage-back}\begin{flushright}\fontsize{16pt}{0pt}\selectfont\textsc{ \l_projlib_titlepage_author_tl }\\[1em]\fontsize{12pt}{0pt}\selectfont \l_projlib_titlepage_date_tl \end{flushright} };
+ \end{tikzpicture}
+ }
+
+\cs_new_protected:Nn \projlib_titlepage_render_with_style_simple:
+ {
+ \begin{tikzpicture}[overlay,remember~picture]
+ \fill[color=titlepage-main] ($(current~page.south~west)$) rectangle ($(current~page.north~east)+(0,-.3\paperheight)$);
+ \node[text~width=.3\paperwidth,text~height=.2\paperheight] at ($(current~page.north~west)+(.28\paperwidth,-.15\paperheight)$) { \l_projlib_titlepage_logo_tl };
+ \node[text~width=.4\paperwidth,text~height=.3\paperheight,scale=2.5] at ($(current~page.north~west)+(.63\paperwidth,-.15\paperheight)$) {\textcolor{paper}{\sffamily\textsc{ \l_projlib_titlepage_title_tl }\\[.5em]\footnotesize{ \l_projlib_titlepage_subtitle_tl }}};
+ \node[text~width=.3\paperwidth,text~height=.3\paperheight] at ($(current~page.south)+(.2\paperwidth,.3\paperheight)$) {\color{paper}\begin{flushright}\fontsize{16pt}{0pt}\selectfont\textsc{ \l_projlib_titlepage_author_tl }\\[1em]\fontsize{12pt}{0pt}\selectfont \l_projlib_titlepage_date_tl \end{flushright} };
+ \end{tikzpicture}
+ }
+
+\endinput
+%%
+%% End of file `projlib-titlepage.sty'.
Property changes on: trunk/Master/texmf-dist/tex/latex/projlib/projlib-titlepage.sty
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/tex/latex/simplivre/simplivre.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/simplivre/simplivre.cls 2022-04-04 17:45:51 UTC (rev 62899)
+++ trunk/Master/texmf-dist/tex/latex/simplivre/simplivre.cls 2022-04-04 20:54:49 UTC (rev 62900)
@@ -19,7 +19,7 @@
\RequirePackage{l3keys2e}
\ProvidesExplClass
{simplivre}
- {2022/03/19} {}
+ {2022/04/03} {}
{A simple and clear book style}
\tl_const:Nn \l__minimclass_base_class_tl { book }
@@ -201,6 +201,10 @@
\RequirePackage { minimalist }
+\raggedbottom
+\hfuzz=2pt
+\vfuzz=2pt
+
%%================================
%% Fonts
%%================================
@@ -568,7 +572,11 @@
\PassOptionsToPackage { warnings-off = { mathtools-colon, mathtools-overbracket } } { unicode-math }
\RequirePackage { unicode-math }
\unimathsetup { math-style = ISO, partial = upright, nabla = upright }
- \setmathfont { Asana-Math.otf }
+ \setmathfont { KpMath-Regular.otf }
+ \setmathfont { KpMath-Sans.otf }
+ [
+ range = { \sum, \prod, \coprod }
+ ]
\__minimclass_if_font_exist:nnn { Neo~Euler }
{
\setmathfont { Neo~Euler }
@@ -575,34 +583,18 @@
[
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,
+ range = { cal, bfcal, frak, bffrak }
]
\setmathfont { texgyrepagella-math.otf }
[
- range = { up / num, bfup / num }
+ range = { it / { Latin, latin }, bfit / { Latin, latin }, up / num, bfup / num }
]
\hook_gput_code:nnn { begindocument } { minimclass }
@@ -609,10 +601,10 @@
{
\NewCommandCopy \minimclass_backup_mid: \mid
\RenewDocumentCommand \mid {}
- { \skip_horizontal:n {-.15em} \minimclass_backup_mid: \skip_horizontal:n {-.15em} }
+ { \skip_horizontal:n {-.1em} \minimclass_backup_mid: \skip_horizontal:n {-.1em} }
\NewCommandCopy \minimclass_backup_nmid: \nmid
\RenewDocumentCommand \nmid {}
- { \skip_horizontal:n {-.15em} \minimclass_backup_nmid: \skip_horizontal:n {-.15em} }
+ { \skip_horizontal:n {-.1em} \minimclass_backup_nmid: \skip_horizontal:n {-.1em} }
}
\RequirePackage { tikz-cd }
@@ -627,10 +619,10 @@
\hbox_set:Nn \l__minimclass_xarrows_below_box { \ensuremath { \scriptstyle #1 } }
\hbox_set:Nn \l__minimclass_xarrows_above_box { \ensuremath { \scriptstyle #2 } }
\dim_set:Nn \l__minimclass_xarrows_length_dim
- { \dim_eval:n { \dim_max:nn { \box_wd:N \l__minimclass_xarrows_below_box } { \box_wd:N \l__minimclass_xarrows_above_box } + .8em } }
+ { \dim_eval:n { \dim_max:nn { \box_wd:N \l__minimclass_xarrows_below_box } { \box_wd:N \l__minimclass_xarrows_above_box } + 1em } }
\mathrel
{
- \tikz [ #3, baseline = -.55ex, every~node/.style = { inner~sep = 0pt } ]
+ \tikz [ #3, line~width = .6pt, baseline = -.5ex, every~node/.style = { inner~sep = 0pt }, >={Stealth[round,length=3.4pt,width=6.15pt,inset=2.25pt]} ]
\draw (0,0) #4
node [ below = 3pt ] { \box_use:N \l__minimclass_xarrows_below_box }
node [ above = 2pt ] { \box_use:N \l__minimclass_xarrows_above_box }
More information about the tex-live-commits
mailing list.