From c840f97520ba98156a0ed525d6b5d05ab6a324f6 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Thu, 1 Jul 2021 03:01:47 +0000 Subject: CTAN sync 202107010301 --- .../latex/beaulivre/beaulivre-doc-cn.pdf | Bin 309464 -> 308402 bytes .../latex/beaulivre/beaulivre-doc-cn.tex | 20 +++++++------- .../latex/beaulivre/beaulivre-doc-en.pdf | Bin 193582 -> 193478 bytes .../latex/beaulivre/beaulivre-doc-en.tex | 21 +++++++-------- macros/unicodetex/latex/beaulivre/beaulivre.cls | 30 ++++++++++++++------- macros/unicodetex/latex/einfart/einfart-doc-cn.pdf | Bin 239385 -> 238692 bytes macros/unicodetex/latex/einfart/einfart-doc-cn.tex | 24 +++++++++-------- macros/unicodetex/latex/einfart/einfart-doc-en.pdf | Bin 148100 -> 148163 bytes macros/unicodetex/latex/einfart/einfart-doc-en.tex | 26 +++++++++--------- macros/unicodetex/latex/einfart/einfart.cls | 30 ++++++++++++++------- macros/unicodetex/latex/lebhart/lebhart-doc-cn.pdf | Bin 286456 -> 285244 bytes macros/unicodetex/latex/lebhart/lebhart-doc-cn.tex | 24 ++++++++--------- macros/unicodetex/latex/lebhart/lebhart-doc-en.pdf | Bin 171812 -> 171730 bytes macros/unicodetex/latex/lebhart/lebhart-doc-en.tex | 22 +++++++-------- macros/unicodetex/latex/lebhart/lebhart.cls | 30 ++++++++++++++------- .../latex/simplivre/simplivre-doc-cn.pdf | Bin 289392 -> 288667 bytes .../latex/simplivre/simplivre-doc-cn.tex | 20 +++++++------- .../latex/simplivre/simplivre-doc-en.pdf | Bin 194551 -> 194593 bytes .../latex/simplivre/simplivre-doc-en.tex | 23 ++++++++-------- macros/unicodetex/latex/simplivre/simplivre.cls | 30 ++++++++++++++------- 20 files changed, 176 insertions(+), 124 deletions(-) (limited to 'macros/unicodetex') diff --git a/macros/unicodetex/latex/beaulivre/beaulivre-doc-cn.pdf b/macros/unicodetex/latex/beaulivre/beaulivre-doc-cn.pdf index be8d0073e0..25af416b7a 100644 Binary files a/macros/unicodetex/latex/beaulivre/beaulivre-doc-cn.pdf and b/macros/unicodetex/latex/beaulivre/beaulivre-doc-cn.pdf differ diff --git a/macros/unicodetex/latex/beaulivre/beaulivre-doc-cn.tex b/macros/unicodetex/latex/beaulivre/beaulivre-doc-cn.tex index cdef90570e..820bb86a05 100644 --- a/macros/unicodetex/latex/beaulivre/beaulivre-doc-cn.tex +++ b/macros/unicodetex/latex/beaulivre/beaulivre-doc-cn.tex @@ -1,5 +1,5 @@ %! TEX program = xelatex -\documentclass[Chinese,English,allowbf,puretext]{beaulivre} +\documentclass[Chinese,English,French,allowbf,puretext]{beaulivre} \theoremstyle{basic} \CreateTheorem{definition} @@ -46,7 +46,7 @@ } \providecommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$} \lstset{moretexcs=% - {subsubsection,href,color,NameTheorem,CreateTheorem,proofideanameCN,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,PJLdate,ProjLib + {subsubsection,href,color,NameTheorem,CreateTheorem,proofideanameCN,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,PLdate,ProjLib } } \lstnewenvironment{code}% @@ -104,7 +104,7 @@ \fill [cyan!90!black] ($(current page.south west)+(0,7)$) rectangle ($(current page.north west)+(25,-7)$); \fill [yellow] (current page.south west) rectangle ($(current page.north west)+(3,0)$); \node[text width=10cm] at ($(current page.north west)+(8.5,-6)$) {\huge\ProjLib}; - \node[text width=6cm,text height=3.5cm,scale=2.5] at ($(current page.north west)+(11,-10)$) {\textcolor{white}{\sffamily\beaulivre{}\\\hspace*{-.05em}以多彩的方式排版你的图书\\[10pt]\tiny 对应版本. \texttt{\beaulivre{} 2021/06/23}}}; + \node[text width=6cm,text height=3.5cm,scale=2.5] at ($(current page.north west)+(11,-10)$) {\textcolor{white}{\sffamily\beaulivre{}\\[5pt]\footnotesize\hspace*{-.05em}以多彩的方式排版你的图书\\[10pt]\tiny 对应版本. \texttt{\beaulivre{} 2021/06/30}}}; \node at ($(current page.south)+(1.5,3)$) {\fontsize{16pt}{0pt}\selectfont\textcolor{gray}{许锦文}}; \node at ($(current page.south)+(1.5,2)$) {\fontsize{12pt}{0pt}\selectfont\textcolor{gray}{2021年6月,北京}}; \end{tikzpicture}% @@ -155,6 +155,10 @@ \beaulivre{} 文档类有下面几个选项: \begin{itemize} + \item 语言选项 \texttt{EN} / \texttt{english} / \texttt{English}、\texttt{FR} / \texttt{french} / \texttt{French},等等 + \begin{itemize} + \item 具体选项名称可参见下一节的 \meta{language name}。第一个指定的语言将作为默认语言。 + \end{itemize} \item \texttt{draft} 或 \texttt{fast} \begin{itemize} \item 你可以使用选项 \verb|fast| 来启用快速但略微粗糙的样式,主要区别是: @@ -165,7 +169,7 @@ \end{itemize} \end{itemize} \begin{tip} - 在文章的撰写阶段,建议使用 \verb|fast| 选项以加快编译速度,改善写作时的流畅程度。在最后,可以把 \verb|fast| 标记去除,从而得到正式的版本。使用 \verb|fast| 模式时会有“DRAFT”字样的水印,以提示目前处于草稿阶段。 + 在文章的撰写阶段,建议使用 \verb|fast| 选项以加快编译速度,改善写作时的流畅度。使用 \verb|fast| 模式时会有“DRAFT”字样的水印,以提示目前处于草稿阶段。 \end{tip} \item \texttt{a4paper} 或 \texttt{b5paper} \begin{itemize} @@ -193,10 +197,6 @@ \begin{itemize} \item 定理类环境不编号。 \end{itemize} - \item 语言选项 \texttt{EN} / \texttt{english} / \texttt{English}、\texttt{FR} / \texttt{french} / \texttt{French},等等 - \begin{itemize} - \item 具体选项名称可参见下一节的 \meta{language name}。第一个指定的语言将作为默认语言。 - \end{itemize} \end{itemize} \bigskip @@ -500,7 +500,7 @@ \title{Le Titre} \author{Auteur} -\date{\PJLdate{2022-04-01}} +\date{\PLdate{2022-04-01}} \maketitle @@ -547,7 +547,7 @@ Référence du théorème: \cref{thm:abc} \author{Auteur 1} \address{Adresse 1} \email{\href{Courriel 2}{Courriel 2}} -\date{\PJLdate{2022-04-01}} +\date{\PLdate{2022-04-01}} \subjclass{*****} \keywords{...} diff --git a/macros/unicodetex/latex/beaulivre/beaulivre-doc-en.pdf b/macros/unicodetex/latex/beaulivre/beaulivre-doc-en.pdf index e03e93518e..a86048e001 100644 Binary files a/macros/unicodetex/latex/beaulivre/beaulivre-doc-en.pdf and b/macros/unicodetex/latex/beaulivre/beaulivre-doc-en.pdf differ diff --git a/macros/unicodetex/latex/beaulivre/beaulivre-doc-en.tex b/macros/unicodetex/latex/beaulivre/beaulivre-doc-en.tex index f056cd76a6..f177a9e556 100644 --- a/macros/unicodetex/latex/beaulivre/beaulivre-doc-en.tex +++ b/macros/unicodetex/latex/beaulivre/beaulivre-doc-en.tex @@ -44,7 +44,7 @@ } \providecommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$} \lstset{moretexcs=% - {subsubsection,href,color,NameTheorem,CreateTheorem,proofideanameEN,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,PJLdate,ProjLib + {subsubsection,href,color,NameTheorem,CreateTheorem,proofideanameEN,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,PLdate,ProjLib } } \lstnewenvironment{code}% @@ -102,7 +102,7 @@ \fill [cyan!90!black] ($(current page.south west)+(0,7)$) rectangle ($(current page.north west)+(25,-7)$); \fill [yellow] (current page.south west) rectangle ($(current page.north west)+(3,0)$); \node[text width=10cm] at ($(current page.north west)+(8.5,-6)$) {\huge\ProjLib}; - \node[text width=6cm,text height=3.5cm,scale=2.5] at ($(current page.north west)+(11,-10)$) {\textcolor{white}{\sffamily\beaulivre{}\\\textsc{Write your books in \\a colorful way}\\[10pt]\tiny Corresponding to: \texttt{\beaulivre{} 2021/06/23}}}; + \node[text width=6cm,text height=3.5cm,scale=2.5] at ($(current page.north west)+(11,-10)$) {\textcolor{white}{\sffamily\beaulivre{}\\[5pt]\footnotesize\textsc{Write your books in \\a colorful way}\\[10pt]\tiny Corresponding to: \texttt{\beaulivre{} 2021/06/30}}}; \node at ($(current page.south)+(1.5,3)$) {\fontsize{16pt}{0pt}\selectfont\textcolor{gray}{\scshape Jinwen XU}}; \node at ($(current page.south)+(1.5,2)$) {\fontsize{12pt}{0pt}\selectfont\textcolor{gray}{June 2021, Beijing}}; \end{tikzpicture}% @@ -151,17 +151,21 @@ as the first line to use the \beaulivre{} class. \beaulivre{} offers the following options: \begin{itemize} + \item The language options \texttt{EN} / \texttt{english} / \texttt{English}, \texttt{FR} / \texttt{french} / \texttt{French}, etc. + \begin{itemize} + \item For the option names of a specific language, please refer to \meta{language name} in the next section. The first specified language will be used as the default language. + \end{itemize} \item \texttt{draft} or \texttt{fast} \begin{itemize} \item The option \verb|fast| enables a faster but slightly rougher style, main differences are: \begin{itemize} \item Use simpler math font configuration; - \item Do not use hyperref; + \item Do not use \textsf{hyperref}; \item Enable the fast mode of \ProjLib{} toolkit. \end{itemize} \end{itemize} \begin{tip} - During the draft stage, it is recommended to use the \verb|fast| option to speed up compilation. At the end, one should remove the ``fast'' option to get the final version. When in \verb|fast| mode, there will be a watermark ``DRAFT'' to indicate that you are currently in the draft mode. + During the draft stage, it is recommended to use the \verb|fast| option to speed up compilation. When in \verb|fast| mode, there will be a watermark ``DRAFT'' to indicate that you are currently in the draft mode. \end{tip} \medskip \item \texttt{a4paper} or \texttt{b5paper} @@ -181,7 +185,6 @@ as the first line to use the \beaulivre{} class. \begin{itemize} \item Use the ``runin'' style for \lstinline|\subsubsection| \end{itemize} - \clearpage \item \texttt{puretext} or \texttt{nothms} \begin{itemize} \item Pure text mode. Does not load theorem-like environments. @@ -190,10 +193,6 @@ as the first line to use the \beaulivre{} class. \begin{itemize} \item Theorem-like environments will not be numbered. \end{itemize} - \item The language options \texttt{EN} / \texttt{english} / \texttt{English}, \texttt{FR} / \texttt{french} / \texttt{French}, etc. - \begin{itemize} - \item For the option names of a specific language, please refer to \meta{language name} in the next section. The first specified language will be used as the default language. - \end{itemize} \end{itemize} \bigskip @@ -491,7 +490,7 @@ If you want to write in the standard way, you can refer to the following example \title{Le Titre} \author{Auteur} -\date{\PJLdate{2022-04-01}} +\date{\PLdate{2022-04-01}} \maketitle @@ -538,7 +537,7 @@ If you intend to switch to the journal template in the future and thus want to u \author{Auteur 1} \address{Adresse 1} \email{\href{Courriel 2}{Courriel 2}} -\date{\PJLdate{2022-04-01}} +\date{\PLdate{2022-04-01}} \subjclass{*****} \keywords{...} diff --git a/macros/unicodetex/latex/beaulivre/beaulivre.cls b/macros/unicodetex/latex/beaulivre/beaulivre.cls index 0088213600..c5e5821c22 100644 --- a/macros/unicodetex/latex/beaulivre/beaulivre.cls +++ b/macros/unicodetex/latex/beaulivre/beaulivre.cls @@ -17,7 +17,7 @@ %% \NeedsTeXFormat{LaTeX2e}[2020-10-01] \ProvidesClass{beaulivre} - [2021/06/23 A colorful book style] + [2021/06/30 A colorful book style] \def\colorclass@baseclass{book} \RequirePackage{kvoptions} \RequirePackage{etoolbox} @@ -199,7 +199,7 @@ \setmathfont[range={up/{Latin,latin,Greek,greek}, bfup/{Latin,latin,Greek,greek}, cal, bfcal, frak, bffrak, - `(,`),`[,`],`\{,`\},`:,`=,`/,\backslash, + `(,`),`[,`],`\{,`\},`:,`=,\ne,\equiv,`/,\backslash, \in,\notin,\ni,\subset,\supset,\subseteq,\supseteq, \rightarrow,\leftarrow,\mapsto,\hookrightarrow,\hookleftarrow, \sum,\prod,\coprod, @@ -209,6 +209,9 @@ Scale = 1.05, ]{Neo Euler} }{} +\setmathfont[range={\leq,\geq,\ll,\gg,\lll,\ggg,\leqslant,\geqslant}, + Scale = 0.95, + ]{latinmodern-math.otf} \setmathfont[range={up/num, bfup/num} ]{texgyrepagella-math.otf} @@ -218,7 +221,7 @@ \setbox\xratbelow=\hbox{\ensuremath{\scriptstyle #1}}% \setbox\xratabove=\hbox{\ensuremath{\scriptstyle #2}}% \pgfmathsetlengthmacro{\xratlen}{max(\wd\xratbelow, \wd\xratabove) + .8em}% - \mathrel{\tikz [->, baseline=-.6ex, every node/.style={inner sep=0pt}] + \mathrel{\tikz [->, baseline=-.55ex, every node/.style={inner sep=0pt}] \draw (0,0) -- node[below=3pt] {\box\xratbelow} node[above=2pt] {\box\xratabove} (\xratlen,0) ;}} @@ -226,7 +229,7 @@ \setbox\xratbelow=\hbox{\ensuremath{\scriptstyle #1}}% \setbox\xratabove=\hbox{\ensuremath{\scriptstyle #2}}% \pgfmathsetlengthmacro{\xratlen}{max(\wd\xratbelow, \wd\xratabove) + .8em}% - \mathrel{\tikz [<-, baseline=-.6ex, every node/.style={inner sep=0pt}] + \mathrel{\tikz [<-, baseline=-.55ex, every node/.style={inner sep=0pt}] \draw (0,0) -- node[below=3pt] {\box\xratbelow} node[above=2pt] {\box\xratabove} (\xratlen,0) ;}} @@ -234,7 +237,7 @@ \setbox\xratbelow=\hbox{\ensuremath{\scriptstyle #1}}% \setbox\xratabove=\hbox{\ensuremath{\scriptstyle #2}}% \pgfmathsetlengthmacro{\xratlen}{max(\wd\xratbelow, \wd\xratabove) + .8em}% - \mathrel{\tikz [<->, baseline=-.6ex, every node/.style={inner sep=0pt}] + \mathrel{\tikz [<->, baseline=-.55ex, every node/.style={inner sep=0pt}] \draw (0,0) -- node[below=3pt] {\box\xratbelow} node[above=2pt] {\box\xratabove} (\xratlen,0) ;}} @@ -242,7 +245,7 @@ \setbox\xratbelow=\hbox{\ensuremath{\scriptstyle #1}}% \setbox\xratabove=\hbox{\ensuremath{\scriptstyle #2}}% \pgfmathsetlengthmacro{\xratlen}{max(\wd\xratbelow, \wd\xratabove) + .8em}% - \mathrel{\tikz [baseline=-.6ex, every node/.style={inner sep=0pt}] + \mathrel{\tikz [baseline=-.55ex, every node/.style={inner sep=0pt}] \draw (0,0) edge[commutative diagrams/hookrightarrow] node[below=3pt] {\box\xratbelow} node[above=2pt] {\box\xratabove} (\xratlen,0) ;}} @@ -250,7 +253,7 @@ \setbox\xratbelow=\hbox{\ensuremath{\scriptstyle #1}}% \setbox\xratabove=\hbox{\ensuremath{\scriptstyle #2}}% \pgfmathsetlengthmacro{\xratlen}{max(\wd\xratbelow, \wd\xratabove) + .8em}% - \mathrel{\tikz [baseline=-.6ex, every node/.style={inner sep=0pt}] + \mathrel{\tikz [baseline=-.55ex, every node/.style={inner sep=0pt}] \draw (0,0) edge[commutative diagrams/hookleftarrow] node[below=3pt] {\box\xratbelow} node[above=2pt] {\box\xratabove} (\xratlen,0) ;}} @@ -258,7 +261,7 @@ \setbox\xratbelow=\hbox{\ensuremath{\scriptstyle #1}}% \setbox\xratabove=\hbox{\ensuremath{\scriptstyle #2}}% \pgfmathsetlengthmacro{\xratlen}{max(\wd\xratbelow, \wd\xratabove) + .8em}% - \mathrel{\tikz [baseline=-.6ex, every node/.style={inner sep=0pt}] + \mathrel{\tikz [baseline=-.55ex, every node/.style={inner sep=0pt}] \draw (0,0) edge[commutative diagrams/mapsto] node[below=3pt] {\box\xratbelow} node[above=2pt] {\box\xratabove} (\xratlen,0) ;}} @@ -266,10 +269,19 @@ \setbox\xratbelow=\hbox{\ensuremath{\scriptstyle #1}}% \setbox\xratabove=\hbox{\ensuremath{\scriptstyle #2}}% \pgfmathsetlengthmacro{\xratlen}{max(\wd\xratbelow, \wd\xratabove) + .8em}% - \mathrel{\tikz [baseline=-.6ex, every node/.style={inner sep=0pt}] + \mathrel{\tikz [baseline=-.55ex, every node/.style={inner sep=0pt}] \draw (0,0) edge[commutative diagrams/equal] node[below=3pt] {\box\xratbelow} node[above=2pt] {\box\xratabove} (\xratlen,0) ;}} +\AtBeginDocument{ +\renewcommand{\twoheadrightarrow}{% + \mathrel{\tikz [baseline=-.55ex, every node/.style={inner sep=0pt}] + \draw (0,0) edge[commutative diagrams/twoheadrightarrow] (.8em,0) ;}} + +\renewcommand{\twoheadleftarrow}{% + \mathrel{\tikz [baseline=-.55ex, every node/.style={inner sep=0pt}] + \draw (0,0) edge[commutative diagrams/twoheadleftarrow] (.8em,0) ;}} +} \fi \fi diff --git a/macros/unicodetex/latex/einfart/einfart-doc-cn.pdf b/macros/unicodetex/latex/einfart/einfart-doc-cn.pdf index dccd7ba29b..735f56dba1 100644 Binary files a/macros/unicodetex/latex/einfart/einfart-doc-cn.pdf and b/macros/unicodetex/latex/einfart/einfart-doc-cn.pdf differ diff --git a/macros/unicodetex/latex/einfart/einfart-doc-cn.tex b/macros/unicodetex/latex/einfart/einfart-doc-cn.tex index a1265d2ff6..4b2c5a6f74 100644 --- a/macros/unicodetex/latex/einfart/einfart-doc-cn.tex +++ b/macros/unicodetex/latex/einfart/einfart-doc-cn.tex @@ -1,5 +1,5 @@ %! TEX program = xelatex -\documentclass[Chinese,English,puretext]{einfart} +\documentclass[Chinese,English,French,puretext]{einfart} \CreateTheorem{definition} \CreateTheorem{theorem} @@ -40,7 +40,7 @@ \providecommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$} \lstset{moretexcs=% {linenumbers,nolinenumbers,subsection,subsubsection,href, - color,NameTheorem,CreateTheorem,proofideanameCN,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,PJLdate,ProjLib + color,NameTheorem,CreateTheorem,proofideanameCN,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,PLdate,ProjLib } } \lstnewenvironment{code}% @@ -87,7 +87,7 @@ \title{\einfart{},以极简主义风格排版你的文章} \author{许锦文} -\thanks{对应版本. \texttt{\einfart{} 2021/06/23}} +\thanks{对应版本. \texttt{\einfart{} 2021/06/30}} \date{2021年6月,北京} \maketitle @@ -125,6 +125,10 @@ \einfart{} 文档类有下面几个选项: \begin{itemize} + \item 语言选项 \texttt{EN} / \texttt{english} / \texttt{English}、\texttt{FR} / \texttt{french} / \texttt{French},等等 + \begin{itemize} + \item 具体选项名称可参见下一节的 \meta{language name}。第一个指定的语言将作为默认语言。 + \end{itemize} \item \texttt{draft} 或 \texttt{fast} \begin{itemize} \item 你可以使用选项 \verb|fast| 来启用快速但略微粗糙的样式,主要区别是: @@ -135,7 +139,7 @@ \end{itemize} \end{itemize} \begin{tip} - 在文章的撰写阶段,建议使用 \verb|fast| 选项以加快编译速度,改善写作时的流畅程度。在最后,可以把 \verb|fast| 标记去除,从而得到正式的版本。使用 \verb|fast| 模式时会有“DRAFT”字样的水印,以提示目前处于草稿阶段。 + 在文章的撰写阶段,建议使用 \verb|fast| 选项以加快编译速度,改善写作时的流畅度。使用 \verb|fast| 模式时会有“DRAFT”字样的水印,以提示目前处于草稿阶段。 \end{tip} \item \texttt{a4paper} 或 \texttt{b5paper} \begin{itemize} @@ -157,10 +161,11 @@ \begin{tip} 如果你喜欢更加传统的样式,\texttt{allowbf} + \texttt{classical} 是一个不错的搭配。 \end{tip} - \item \texttt{useindent} + \item \texttt{useindent} \begin{itemize} \item 采用段首缩进而不是段间间距。 \end{itemize} + \clearpage \item \texttt{runin} \begin{itemize} \item \lstinline|\subsubsection| 采用 ``runin'' 风格。 @@ -173,10 +178,6 @@ \begin{itemize} \item 定理类环境不编号。 \end{itemize} - \item 语言选项 \texttt{EN} / \texttt{english} / \texttt{English}、\texttt{FR} / \texttt{french} / \texttt{French},等等 - \begin{itemize} - \item 具体选项名称可参见下一节的 \meta{language name}。第一个指定的语言将作为默认语言。 - \end{itemize} \end{itemize} @@ -260,6 +261,7 @@ \lstinline|\cref{def: strange}| 会显示为:\cref{def: strange}。 +\medskip 使用 \lstinline|\UseLanguage{English}| 后,定理会显示为: \UseLanguage{English} @@ -448,7 +450,7 @@ \title{Le Titre} \author{Auteur} -\date{\PJLdate{2022-04-01}} +\date{\PLdate{2022-04-01}} \maketitle @@ -502,7 +504,7 @@ Référence du théorème: \cref{thm:abc} \author{Auteur 1} \address{Adresse 1} \email{\href{Courriel 2}{Courriel 2}} -\date{\PJLdate{2022-04-01}} +\date{\PLdate{2022-04-01}} \subjclass{*****} \keywords{...} diff --git a/macros/unicodetex/latex/einfart/einfart-doc-en.pdf b/macros/unicodetex/latex/einfart/einfart-doc-en.pdf index 658da1098e..26af160f13 100644 Binary files a/macros/unicodetex/latex/einfart/einfart-doc-en.pdf and b/macros/unicodetex/latex/einfart/einfart-doc-en.pdf differ diff --git a/macros/unicodetex/latex/einfart/einfart-doc-en.tex b/macros/unicodetex/latex/einfart/einfart-doc-en.tex index d92668f4cd..e50c77ab28 100644 --- a/macros/unicodetex/latex/einfart/einfart-doc-en.tex +++ b/macros/unicodetex/latex/einfart/einfart-doc-en.tex @@ -4,6 +4,9 @@ \CreateTheorem{definition} \CreateTheorem{theorem} +% \setlist{nosep} +% \UseLanguage{English} + \linenumbers % Enable line numbers %%================================ @@ -38,7 +41,7 @@ \providecommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$} \lstset{moretexcs=% {linenumbers,nolinenumbers,subsection,subsubsection,href, - color,NameTheorem,CreateTheorem,proofideanameEN,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,PJLdate,ProjLib + color,NameTheorem,CreateTheorem,proofideanameEN,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,PLdate,ProjLib } } \lstnewenvironment{code}% @@ -85,7 +88,7 @@ \title{\einfart{}, write your articles in a simple and clear way} \author{Jinwen XU} -\thanks{Corresponding to: \texttt{\einfart{} 2021/06/23}} +\thanks{Corresponding to: \texttt{\einfart{} 2021/06/30}} \date{June 2021, Beijing} \maketitle @@ -121,17 +124,21 @@ as the first line to use the \einfart{} class. Please note that you need to use \einfart{} offers the following options: \begin{itemize} + \item The language options \texttt{EN} / \texttt{english} / \texttt{English}, \texttt{FR} / \texttt{french} / \texttt{French}, etc. + \begin{itemize} + \item For the option names of a specific language, please refer to \meta{language name} in the next section. The first specified language will be used as the default language. + \end{itemize} \item \texttt{draft} or \texttt{fast} \begin{itemize} \item The option \verb|fast| enables a faster but slightly rougher style, main differences are: \begin{itemize} \item Use simpler math font configuration; - \item Do not use hyperref; + \item Do not use \textsf{hyperref}; \item Enable the fast mode of \ProjLib{} toolkit. \end{itemize} \end{itemize} \begin{tip} - During the draft stage, it is recommended to use the \verb|fast| option to speed up compilation. At the end, one should remove the ``fast'' option to get the final version. When in \verb|fast| mode, there will be a watermark ``DRAFT'' to indicate that you are currently in the draft mode. + During the draft stage, it is recommended to use the \verb|fast| option to speed up compilation. When in \verb|fast| mode, there will be a watermark ``DRAFT'' to indicate that you are currently in the draft mode. \end{tip} \item \texttt{a4paper} or \texttt{b5paper} \begin{itemize} @@ -144,7 +151,7 @@ as the first line to use the \einfart{} class. Please note that you need to use \end{itemize} \item \texttt{allowbf} \begin{itemize} - \item Allow boldface. When this option is enabled, the title, titles of all levels and names of theorem-like environments will be bolded. + \item Allow boldface. When this option is enabled, the main title, the titles of all levels and the names of theorem-like environments will be bolded. \end{itemize} \item \texttt{classical} \begin{itemize} @@ -161,7 +168,6 @@ as the first line to use the \einfart{} class. Please note that you need to use \begin{itemize} \item Use the ``runin'' style for \lstinline|\subsubsection| \end{itemize} - \clearpage \item \texttt{puretext} or \texttt{nothms} \begin{itemize} \item Pure text mode. Does not load theorem-like environments. @@ -170,10 +176,6 @@ as the first line to use the \einfart{} class. Please note that you need to use \begin{itemize} \item Theorem-like environments will not be numbered. \end{itemize} - \item The language options \texttt{EN} / \texttt{english} / \texttt{English}, \texttt{FR} / \texttt{french} / \texttt{French}, etc. - \begin{itemize} - \item For the option names of a specific language, please refer to \meta{language name} in the next section. The first specified language will be used as the default language. - \end{itemize} \end{itemize} \section{On the default fonts} @@ -436,7 +438,7 @@ If you want to write in the standard way, you can refer to the following example \title{Le Titre} \author{Auteur} -\date{\PJLdate{2022-04-01}} +\date{\PLdate{2022-04-01}} \maketitle @@ -490,7 +492,7 @@ If you intend to switch to the journal template in the future and thus want to u \author{Auteur 1} \address{Adresse 1} \email{\href{Courriel 2}{Courriel 2}} -\date{\PJLdate{2022-04-01}} +\date{\PLdate{2022-04-01}} \subjclass{*****} \keywords{...} diff --git a/macros/unicodetex/latex/einfart/einfart.cls b/macros/unicodetex/latex/einfart/einfart.cls index f3d52b2bb3..b0c9ae23c3 100644 --- a/macros/unicodetex/latex/einfart/einfart.cls +++ b/macros/unicodetex/latex/einfart/einfart.cls @@ -17,7 +17,7 @@ %% \NeedsTeXFormat{LaTeX2e}[2020-10-01] \ProvidesClass{einfart} - [2021/06/23 A simple and clear article style] + [2021/06/30 A simple and clear article style] \def\minimclass@baseclass{article} \RequirePackage{kvoptions} \RequirePackage{etoolbox} @@ -220,7 +220,7 @@ \setmathfont[range={up/{Latin,latin,Greek,greek}, bfup/{Latin,latin,Greek,greek}, cal, bfcal, frak, bffrak, - `(,`),`[,`],`\{,`\},`:,`=,`/,\backslash, + `(,`),`[,`],`\{,`\},`:,`=,\ne,\equiv,`/,\backslash, \in,\notin,\ni,\subset,\supset,\subseteq,\supseteq, \rightarrow,\leftarrow,\mapsto,\hookrightarrow,\hookleftarrow, \sum,\prod,\coprod, @@ -230,6 +230,9 @@ Scale = 1.05, ]{Neo Euler} }{} +\setmathfont[range={\leq,\geq,\ll,\gg,\lll,\ggg,\leqslant,\geqslant}, + Scale = 0.95, + ]{latinmodern-math.otf} \setmathfont[range={up/num, bfup/num} ]{texgyrepagella-math.otf} @@ -239,7 +242,7 @@ \setbox\xratbelow=\hbox{\ensuremath{\scriptstyle #1}}% \setbox\xratabove=\hbox{\ensuremath{\scriptstyle #2}}% \pgfmathsetlengthmacro{\xratlen}{max(\wd\xratbelow, \wd\xratabove) + .8em}% - \mathrel{\tikz [->, baseline=-.6ex, every node/.style={inner sep=0pt}] + \mathrel{\tikz [->, baseline=-.55ex, every node/.style={inner sep=0pt}] \draw (0,0) -- node[below=3pt] {\box\xratbelow} node[above=2pt] {\box\xratabove} (\xratlen,0) ;}} @@ -247,7 +250,7 @@ \setbox\xratbelow=\hbox{\ensuremath{\scriptstyle #1}}% \setbox\xratabove=\hbox{\ensuremath{\scriptstyle #2}}% \pgfmathsetlengthmacro{\xratlen}{max(\wd\xratbelow, \wd\xratabove) + .8em}% - \mathrel{\tikz [<-, baseline=-.6ex, every node/.style={inner sep=0pt}] + \mathrel{\tikz [<-, baseline=-.55ex, every node/.style={inner sep=0pt}] \draw (0,0) -- node[below=3pt] {\box\xratbelow} node[above=2pt] {\box\xratabove} (\xratlen,0) ;}} @@ -255,7 +258,7 @@ \setbox\xratbelow=\hbox{\ensuremath{\scriptstyle #1}}% \setbox\xratabove=\hbox{\ensuremath{\scriptstyle #2}}% \pgfmathsetlengthmacro{\xratlen}{max(\wd\xratbelow, \wd\xratabove) + .8em}% - \mathrel{\tikz [<->, baseline=-.6ex, every node/.style={inner sep=0pt}] + \mathrel{\tikz [<->, baseline=-.55ex, every node/.style={inner sep=0pt}] \draw (0,0) -- node[below=3pt] {\box\xratbelow} node[above=2pt] {\box\xratabove} (\xratlen,0) ;}} @@ -263,7 +266,7 @@ \setbox\xratbelow=\hbox{\ensuremath{\scriptstyle #1}}% \setbox\xratabove=\hbox{\ensuremath{\scriptstyle #2}}% \pgfmathsetlengthmacro{\xratlen}{max(\wd\xratbelow, \wd\xratabove) + .8em}% - \mathrel{\tikz [baseline=-.6ex, every node/.style={inner sep=0pt}] + \mathrel{\tikz [baseline=-.55ex, every node/.style={inner sep=0pt}] \draw (0,0) edge[commutative diagrams/hookrightarrow] node[below=3pt] {\box\xratbelow} node[above=2pt] {\box\xratabove} (\xratlen,0) ;}} @@ -271,7 +274,7 @@ \setbox\xratbelow=\hbox{\ensuremath{\scriptstyle #1}}% \setbox\xratabove=\hbox{\ensuremath{\scriptstyle #2}}% \pgfmathsetlengthmacro{\xratlen}{max(\wd\xratbelow, \wd\xratabove) + .8em}% - \mathrel{\tikz [baseline=-.6ex, every node/.style={inner sep=0pt}] + \mathrel{\tikz [baseline=-.55ex, every node/.style={inner sep=0pt}] \draw (0,0) edge[commutative diagrams/hookleftarrow] node[below=3pt] {\box\xratbelow} node[above=2pt] {\box\xratabove} (\xratlen,0) ;}} @@ -279,7 +282,7 @@ \setbox\xratbelow=\hbox{\ensuremath{\scriptstyle #1}}% \setbox\xratabove=\hbox{\ensuremath{\scriptstyle #2}}% \pgfmathsetlengthmacro{\xratlen}{max(\wd\xratbelow, \wd\xratabove) + .8em}% - \mathrel{\tikz [baseline=-.6ex, every node/.style={inner sep=0pt}] + \mathrel{\tikz [baseline=-.55ex, every node/.style={inner sep=0pt}] \draw (0,0) edge[commutative diagrams/mapsto] node[below=3pt] {\box\xratbelow} node[above=2pt] {\box\xratabove} (\xratlen,0) ;}} @@ -287,10 +290,19 @@ \setbox\xratbelow=\hbox{\ensuremath{\scriptstyle #1}}% \setbox\xratabove=\hbox{\ensuremath{\scriptstyle #2}}% \pgfmathsetlengthmacro{\xratlen}{max(\wd\xratbelow, \wd\xratabove) + .8em}% - \mathrel{\tikz [baseline=-.6ex, every node/.style={inner sep=0pt}] + \mathrel{\tikz [baseline=-.55ex, every node/.style={inner sep=0pt}] \draw (0,0) edge[commutative diagrams/equal] node[below=3pt] {\box\xratbelow} node[above=2pt] {\box\xratabove} (\xratlen,0) ;}} +\AtBeginDocument{ +\renewcommand{\twoheadrightarrow}{% + \mathrel{\tikz [baseline=-.55ex, every node/.style={inner sep=0pt}] + \draw (0,0) edge[commutative diagrams/twoheadrightarrow] (.8em,0) ;}} + +\renewcommand{\twoheadleftarrow}{% + \mathrel{\tikz [baseline=-.55ex, every node/.style={inner sep=0pt}] + \draw (0,0) edge[commutative diagrams/twoheadleftarrow] (.8em,0) ;}} +} \fi \fi diff --git a/macros/unicodetex/latex/lebhart/lebhart-doc-cn.pdf b/macros/unicodetex/latex/lebhart/lebhart-doc-cn.pdf index aacdaf3644..19d522f008 100644 Binary files a/macros/unicodetex/latex/lebhart/lebhart-doc-cn.pdf and b/macros/unicodetex/latex/lebhart/lebhart-doc-cn.pdf differ diff --git a/macros/unicodetex/latex/lebhart/lebhart-doc-cn.tex b/macros/unicodetex/latex/lebhart/lebhart-doc-cn.tex index 8bd4523d44..8815d8f683 100644 --- a/macros/unicodetex/latex/lebhart/lebhart-doc-cn.tex +++ b/macros/unicodetex/latex/lebhart/lebhart-doc-cn.tex @@ -1,5 +1,5 @@ %! TEX program = xelatex -\documentclass[Chinese,English,allowbf,puretext]{lebhart} +\documentclass[Chinese,English,French,allowbf,puretext]{lebhart} \theoremstyle{basic} \CreateTheorem{definition} @@ -46,7 +46,7 @@ } \providecommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$} \lstset{moretexcs=% - {subsubsection,href,color,NameTheorem,CreateTheorem,proofideanameCN,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,PJLdate,ProjLib + {subsubsection,href,color,NameTheorem,CreateTheorem,proofideanameCN,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,PLdate,ProjLib } } \lstnewenvironment{code}% @@ -88,7 +88,7 @@ \title{{\normalfont\textbf{\textsf{lebhart}}},以多彩的方式排版你的文章} \author{许锦文} -\thanks{对应版本. \texttt{\lebhart{} 2021/06/23}} +\thanks{对应版本. \texttt{\lebhart{} 2021/06/30}} \date{2021年6月,北京} \maketitle @@ -103,7 +103,7 @@ \tableofcontents -\bigskip\bigskip +\vspace{2\baselineskip} \begin{tip} 多语言支持、定理类环境、未完成标记等功能是由 \ProjLib{} 工具箱提供的,这里只给出了将其与本文档类搭配使用的要点。如需获取更详细的信息,可以参阅 \ProjLib{} 的说明文档。 \end{tip} @@ -126,6 +126,10 @@ \lebhart{} 文档类有下面几个选项: \begin{itemize} + \item 语言选项 \texttt{EN} / \texttt{english} / \texttt{English}、\texttt{FR} / \texttt{french} / \texttt{French},等等 + \begin{itemize} + \item 具体选项名称可参见下一节的 \meta{language name}。第一个指定的语言将作为默认语言。 + \end{itemize} \item \texttt{draft} 或 \texttt{fast} \begin{itemize} \item 你可以使用选项 \verb|fast| 来启用快速但略微粗糙的样式,主要区别是: @@ -136,7 +140,7 @@ \end{itemize} \end{itemize} \begin{tip} - 在文章的撰写阶段,建议使用 \verb|fast| 选项以加快编译速度,改善写作时的流畅程度。在最后,可以把 \verb|fast| 标记去除,从而得到正式的版本。使用 \verb|fast| 模式时会有“DRAFT”字样的水印,以提示目前处于草稿阶段。 + 在文章的撰写阶段,建议使用 \verb|fast| 选项以加快编译速度,改善写作时的流畅度。使用 \verb|fast| 模式时会有“DRAFT”字样的水印,以提示目前处于草稿阶段。 \end{tip} \item \texttt{a4paper} 或 \texttt{b5paper} \begin{itemize} @@ -163,13 +167,9 @@ \begin{itemize} \item 定理类环境不编号。 \end{itemize} - \item 语言选项 \texttt{EN} / \texttt{english} / \texttt{English}、\texttt{FR} / \texttt{french} / \texttt{French},等等 - \begin{itemize} - \item 具体选项名称可参见下一节的 \meta{language name}。第一个指定的语言将作为默认语言。 - \end{itemize} \end{itemize} - +\clearpage \section{关于默认字体} \lebhart{} 默认使用 Palatino Linotype 作为英文字体,方正悠宋、悠黑GBK作为中文字体,并部分使用了 Neo Euler 作为数学字体。其中,Neo Euler可以在 \url{https://github.com/khaledhosny/euler-otf} 下载。其他字体不是免费的,需要自行购买使用,可在方正字库网站查询详细信息:\url{https://www.foundertype.com}。 @@ -471,7 +471,7 @@ \title{Le Titre} \author{Auteur} -\date{\PJLdate{2022-04-01}} +\date{\PLdate{2022-04-01}} \maketitle @@ -525,7 +525,7 @@ Référence du théorème: \cref{thm:abc} \author{Auteur 1} \address{Adresse 1} \email{\href{Courriel 2}{Courriel 2}} -\date{\PJLdate{2022-04-01}} +\date{\PLdate{2022-04-01}} \subjclass{*****} \keywords{...} diff --git a/macros/unicodetex/latex/lebhart/lebhart-doc-en.pdf b/macros/unicodetex/latex/lebhart/lebhart-doc-en.pdf index 2f76f1714f..6f8dfda1aa 100644 Binary files a/macros/unicodetex/latex/lebhart/lebhart-doc-en.pdf and b/macros/unicodetex/latex/lebhart/lebhart-doc-en.pdf differ diff --git a/macros/unicodetex/latex/lebhart/lebhart-doc-en.tex b/macros/unicodetex/latex/lebhart/lebhart-doc-en.tex index cab423c8c5..a7f38aaa36 100644 --- a/macros/unicodetex/latex/lebhart/lebhart-doc-en.tex +++ b/macros/unicodetex/latex/lebhart/lebhart-doc-en.tex @@ -44,7 +44,7 @@ } \providecommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$} \lstset{moretexcs=% - {subsubsection,href,color,NameTheorem,CreateTheorem,proofideanameEN,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,PJLdate,ProjLib + {subsubsection,href,color,NameTheorem,CreateTheorem,proofideanameEN,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,PLdate,ProjLib } } \lstnewenvironment{code}% @@ -86,7 +86,7 @@ \title{{\normalfont\textbf{\textsf{lebhart}}}, write your articles in a colorful way} \author{Jinwen XU} -\thanks{Corresponding to: \texttt{\lebhart{} 2021/06/23}} +\thanks{Corresponding to: \texttt{\lebhart{} 2021/06/30}} \date{June 2021, Beijing} \maketitle @@ -101,7 +101,7 @@ \tableofcontents -\bigskip +\vspace{2.5\baselineskip} \begin{tip} Multi-language support, theorem-like environments, draft marks and some other features are provided by the \ProjLib{} toolkit. Here we only briefly discuss how to use it with this document class. For more detailed information, you can refer to the documentation of \ProjLib{}. \end{tip} @@ -123,17 +123,21 @@ as the first line to use the \lebhart{} class. Please note that you need to use \lebhart{} offers the following options: \begin{itemize} + \item The language options \texttt{EN} / \texttt{english} / \texttt{English}, \texttt{FR} / \texttt{french} / \texttt{French}, etc. + \begin{itemize} + \item For the option names of a specific language, please refer to \meta{language name} in the next section. The first specified language will be used as the default language. + \end{itemize} \item \texttt{draft} or \texttt{fast} \begin{itemize} \item The option \verb|fast| enables a faster but slightly rougher style, main differences are: \begin{itemize} \item Use simpler math font configuration; - \item Do not use hyperref; + \item Do not use \textsf{hyperref}; \item Enable the fast mode of \ProjLib{} toolkit. \end{itemize} \end{itemize} \begin{tip} - During the draft stage, it is recommended to use the \verb|fast| option to speed up compilation. At the end, one should remove the ``fast'' option to get the final version. When in \verb|fast| mode, there will be a watermark ``DRAFT'' to indicate that you are currently in the draft mode. + During the draft stage, it is recommended to use the \verb|fast| option to speed up compilation. When in \verb|fast| mode, there will be a watermark ``DRAFT'' to indicate that you are currently in the draft mode. \end{tip} \medskip \item \texttt{a4paper} or \texttt{b5paper} @@ -161,10 +165,6 @@ as the first line to use the \lebhart{} class. Please note that you need to use \begin{itemize} \item Theorem-like environments will not be numbered. \end{itemize} - \item The language options \texttt{EN} / \texttt{english} / \texttt{English}, \texttt{FR} / \texttt{french} / \texttt{French}, etc. - \begin{itemize} - \item For the option names of a specific language, please refer to \meta{language name} in the next section. The first specified language will be used as the default language. - \end{itemize} \end{itemize} \clearpage @@ -456,7 +456,7 @@ If you want to write in the standard way, you can refer to the following example \title{Le Titre} \author{Auteur} -\date{\PJLdate{2022-04-01}} +\date{\PLdate{2022-04-01}} \maketitle @@ -510,7 +510,7 @@ If you intend to switch to the journal template in the future and thus want to u \author{Auteur 1} \address{Adresse 1} \email{\href{Courriel 2}{Courriel 2}} -\date{\PJLdate{2022-04-01}} +\date{\PLdate{2022-04-01}} \subjclass{*****} \keywords{...} diff --git a/macros/unicodetex/latex/lebhart/lebhart.cls b/macros/unicodetex/latex/lebhart/lebhart.cls index 65c479eaf9..29a4088e80 100644 --- a/macros/unicodetex/latex/lebhart/lebhart.cls +++ b/macros/unicodetex/latex/lebhart/lebhart.cls @@ -17,7 +17,7 @@ %% \NeedsTeXFormat{LaTeX2e}[2020-10-01] \ProvidesClass{lebhart} - [2021/06/23 A colorful article style] + [2021/06/30 A colorful article style] \def\colorclass@baseclass{article} \RequirePackage{kvoptions} \RequirePackage{etoolbox} @@ -199,7 +199,7 @@ \setmathfont[range={up/{Latin,latin,Greek,greek}, bfup/{Latin,latin,Greek,greek}, cal, bfcal, frak, bffrak, - `(,`),`[,`],`\{,`\},`:,`=,`/,\backslash, + `(,`),`[,`],`\{,`\},`:,`=,\ne,\equiv,`/,\backslash, \in,\notin,\ni,\subset,\supset,\subseteq,\supseteq, \rightarrow,\leftarrow,\mapsto,\hookrightarrow,\hookleftarrow, \sum,\prod,\coprod, @@ -209,6 +209,9 @@ Scale = 1.05, ]{Neo Euler} }{} +\setmathfont[range={\leq,\geq,\ll,\gg,\lll,\ggg,\leqslant,\geqslant}, + Scale = 0.95, + ]{latinmodern-math.otf} \setmathfont[range={up/num, bfup/num} ]{texgyrepagella-math.otf} @@ -218,7 +221,7 @@ \setbox\xratbelow=\hbox{\ensuremath{\scriptstyle #1}}% \setbox\xratabove=\hbox{\ensuremath{\scriptstyle #2}}% \pgfmathsetlengthmacro{\xratlen}{max(\wd\xratbelow, \wd\xratabove) + .8em}% - \mathrel{\tikz [->, baseline=-.6ex, every node/.style={inner sep=0pt}] + \mathrel{\tikz [->, baseline=-.55ex, every node/.style={inner sep=0pt}] \draw (0,0) -- node[below=3pt] {\box\xratbelow} node[above=2pt] {\box\xratabove} (\xratlen,0) ;}} @@ -226,7 +229,7 @@ \setbox\xratbelow=\hbox{\ensuremath{\scriptstyle #1}}% \setbox\xratabove=\hbox{\ensuremath{\scriptstyle #2}}% \pgfmathsetlengthmacro{\xratlen}{max(\wd\xratbelow, \wd\xratabove) + .8em}% - \mathrel{\tikz [<-, baseline=-.6ex, every node/.style={inner sep=0pt}] + \mathrel{\tikz [<-, baseline=-.55ex, every node/.style={inner sep=0pt}] \draw (0,0) -- node[below=3pt] {\box\xratbelow} node[above=2pt] {\box\xratabove} (\xratlen,0) ;}} @@ -234,7 +237,7 @@ \setbox\xratbelow=\hbox{\ensuremath{\scriptstyle #1}}% \setbox\xratabove=\hbox{\ensuremath{\scriptstyle #2}}% \pgfmathsetlengthmacro{\xratlen}{max(\wd\xratbelow, \wd\xratabove) + .8em}% - \mathrel{\tikz [<->, baseline=-.6ex, every node/.style={inner sep=0pt}] + \mathrel{\tikz [<->, baseline=-.55ex, every node/.style={inner sep=0pt}] \draw (0,0) -- node[below=3pt] {\box\xratbelow} node[above=2pt] {\box\xratabove} (\xratlen,0) ;}} @@ -242,7 +245,7 @@ \setbox\xratbelow=\hbox{\ensuremath{\scriptstyle #1}}% \setbox\xratabove=\hbox{\ensuremath{\scriptstyle #2}}% \pgfmathsetlengthmacro{\xratlen}{max(\wd\xratbelow, \wd\xratabove) + .8em}% - \mathrel{\tikz [baseline=-.6ex, every node/.style={inner sep=0pt}] + \mathrel{\tikz [baseline=-.55ex, every node/.style={inner sep=0pt}] \draw (0,0) edge[commutative diagrams/hookrightarrow] node[below=3pt] {\box\xratbelow} node[above=2pt] {\box\xratabove} (\xratlen,0) ;}} @@ -250,7 +253,7 @@ \setbox\xratbelow=\hbox{\ensuremath{\scriptstyle #1}}% \setbox\xratabove=\hbox{\ensuremath{\scriptstyle #2}}% \pgfmathsetlengthmacro{\xratlen}{max(\wd\xratbelow, \wd\xratabove) + .8em}% - \mathrel{\tikz [baseline=-.6ex, every node/.style={inner sep=0pt}] + \mathrel{\tikz [baseline=-.55ex, every node/.style={inner sep=0pt}] \draw (0,0) edge[commutative diagrams/hookleftarrow] node[below=3pt] {\box\xratbelow} node[above=2pt] {\box\xratabove} (\xratlen,0) ;}} @@ -258,7 +261,7 @@ \setbox\xratbelow=\hbox{\ensuremath{\scriptstyle #1}}% \setbox\xratabove=\hbox{\ensuremath{\scriptstyle #2}}% \pgfmathsetlengthmacro{\xratlen}{max(\wd\xratbelow, \wd\xratabove) + .8em}% - \mathrel{\tikz [baseline=-.6ex, every node/.style={inner sep=0pt}] + \mathrel{\tikz [baseline=-.55ex, every node/.style={inner sep=0pt}] \draw (0,0) edge[commutative diagrams/mapsto] node[below=3pt] {\box\xratbelow} node[above=2pt] {\box\xratabove} (\xratlen,0) ;}} @@ -266,10 +269,19 @@ \setbox\xratbelow=\hbox{\ensuremath{\scriptstyle #1}}% \setbox\xratabove=\hbox{\ensuremath{\scriptstyle #2}}% \pgfmathsetlengthmacro{\xratlen}{max(\wd\xratbelow, \wd\xratabove) + .8em}% - \mathrel{\tikz [baseline=-.6ex, every node/.style={inner sep=0pt}] + \mathrel{\tikz [baseline=-.55ex, every node/.style={inner sep=0pt}] \draw (0,0) edge[commutative diagrams/equal] node[below=3pt] {\box\xratbelow} node[above=2pt] {\box\xratabove} (\xratlen,0) ;}} +\AtBeginDocument{ +\renewcommand{\twoheadrightarrow}{% + \mathrel{\tikz [baseline=-.55ex, every node/.style={inner sep=0pt}] + \draw (0,0) edge[commutative diagrams/twoheadrightarrow] (.8em,0) ;}} + +\renewcommand{\twoheadleftarrow}{% + \mathrel{\tikz [baseline=-.55ex, every node/.style={inner sep=0pt}] + \draw (0,0) edge[commutative diagrams/twoheadleftarrow] (.8em,0) ;}} +} \fi \fi diff --git a/macros/unicodetex/latex/simplivre/simplivre-doc-cn.pdf b/macros/unicodetex/latex/simplivre/simplivre-doc-cn.pdf index 1f609aa520..329b435539 100644 Binary files a/macros/unicodetex/latex/simplivre/simplivre-doc-cn.pdf and b/macros/unicodetex/latex/simplivre/simplivre-doc-cn.pdf differ diff --git a/macros/unicodetex/latex/simplivre/simplivre-doc-cn.tex b/macros/unicodetex/latex/simplivre/simplivre-doc-cn.tex index 82c7ec769b..815bc8737a 100644 --- a/macros/unicodetex/latex/simplivre/simplivre-doc-cn.tex +++ b/macros/unicodetex/latex/simplivre/simplivre-doc-cn.tex @@ -1,5 +1,5 @@ %! TEX program = xelatex -\documentclass[puretext]{simplivre} +\documentclass[Chinese,English,French,puretext]{simplivre} \CreateTheorem{definition} \CreateTheorem{theorem} @@ -40,7 +40,7 @@ \providecommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$} \lstset{moretexcs=% {linenumbers,nolinenumbers,part,chapter,section,subsection,subsubsection,href, - color,NameTheorem,CreateTheorem,proofideanameCN,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,PJLdate,ProjLib,parttext + color,NameTheorem,CreateTheorem,proofideanameCN,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,PLdate,ProjLib,parttext } } \lstnewenvironment{code}% @@ -102,7 +102,7 @@ \fill [cyan!90!black] ($(current page.south west)+(0,7)$) rectangle ($(current page.north west)+(21,-7)$); \fill [yellow] (current page.south west) rectangle ($(current page.north west)+(3,0)$); \node[text width=10cm] at ($(current page.north west)+(8.5,-6)$) {\huge\ProjLib}; - \node[text width=6cm,text height=3.5cm,scale=2.5] at ($(current page.north west)+(11,-9)$) {\textcolor{white}{\sffamily\simplivre{}\\\hspace*{-.05em}以极简主义风格排版你的图书\\[10pt]\tiny 对应版本. \texttt{\simplivre{} 2021/06/23}}}; + \node[text width=6cm,text height=3.5cm,scale=2.5] at ($(current page.north west)+(11,-9)$) {\textcolor{white}{\sffamily\simplivre{}\\[5pt]\footnotesize\hspace*{-.05em}以极简主义风格排版你的图书\\[10pt]\tiny 对应版本. \texttt{\simplivre{} 2021/06/30}}}; \node at ($(current page.south)+(1.5,3)$) {\fontsize{16pt}{0pt}\selectfont\textcolor{gray}{许锦文}}; \node at ($(current page.south)+(1.5,2)$) {\fontsize{12pt}{0pt}\selectfont\textcolor{gray}{2021年6月,北京}}; \end{tikzpicture}% @@ -150,6 +150,10 @@ \simplivre{} 文档类有下面几个选项: \begin{itemize} + \item 语言选项 \texttt{EN} / \texttt{english} / \texttt{English}、\texttt{FR} / \texttt{french} / \texttt{French},等等 + \begin{itemize} + \item 具体选项名称可参见下一节的 \meta{language name}。第一个指定的语言将作为默认语言。 + \end{itemize} \item \texttt{draft} 或 \texttt{fast} \begin{itemize} \item 你可以使用选项 \verb|fast| 来启用快速但略微粗糙的样式,主要区别是: @@ -160,7 +164,7 @@ \end{itemize} \end{itemize} \begin{tip} - 在文章的撰写阶段,建议使用 \verb|fast| 选项以加快编译速度,改善写作时的流畅程度。在最后,可以把 \verb|fast| 标记去除,从而得到正式的版本。使用 \verb|fast| 模式时会有“DRAFT”字样的水印,以提示目前处于草稿阶段。 + 在文章的撰写阶段,建议使用 \verb|fast| 选项以加快编译速度,改善写作时的流畅度。使用 \verb|fast| 模式时会有“DRAFT”字样的水印,以提示目前处于草稿阶段。 \end{tip} \item \texttt{a4paper} 或 \texttt{b5paper} \begin{itemize} @@ -199,10 +203,6 @@ \begin{itemize} \item 定理类环境不编号。 \end{itemize} - \item 语言选项 \texttt{EN} / \texttt{english} / \texttt{English}、\texttt{FR} / \texttt{french} / \texttt{French},等等 - \begin{itemize} - \item 具体选项名称可参见下一节的 \meta{language name}。第一个指定的语言将作为默认语言。 - \end{itemize} \end{itemize} \bigskip @@ -481,7 +481,7 @@ \title{Le Titre} \author{Auteur} -\date{\PJLdate{2022-04-01}} +\date{\PLdate{2022-04-01}} \maketitle @@ -528,7 +528,7 @@ Référence du théorème: \cref{thm:abc} \author{Auteur 1} \address{Adresse 1} \email{\href{Courriel 2}{Courriel 2}} -\date{\PJLdate{2022-04-01}} +\date{\PLdate{2022-04-01}} \subjclass{*****} \keywords{...} diff --git a/macros/unicodetex/latex/simplivre/simplivre-doc-en.pdf b/macros/unicodetex/latex/simplivre/simplivre-doc-en.pdf index 5189455739..3da74b5301 100644 Binary files a/macros/unicodetex/latex/simplivre/simplivre-doc-en.pdf and b/macros/unicodetex/latex/simplivre/simplivre-doc-en.pdf differ diff --git a/macros/unicodetex/latex/simplivre/simplivre-doc-en.tex b/macros/unicodetex/latex/simplivre/simplivre-doc-en.tex index 426eab8e33..7566f60fd3 100644 --- a/macros/unicodetex/latex/simplivre/simplivre-doc-en.tex +++ b/macros/unicodetex/latex/simplivre/simplivre-doc-en.tex @@ -38,7 +38,7 @@ \providecommand{\meta}[1]{$\langle${\normalfont\itshape#1}$\rangle$} \lstset{moretexcs=% {linenumbers,nolinenumbers,part,chapter,section,subsection,subsubsection,href, - color,NameTheorem,CreateTheorem,proofideanameEN,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,PJLdate,ProjLib,parttext + color,NameTheorem,CreateTheorem,proofideanameEN,cref,dnf,needgraph,UseLanguage,UseOtherLanguage,AddLanguageSetting,maketitle,address,curraddr,email,keywords,subjclass,thanks,dedicatory,PLdate,ProjLib,parttext } } \lstnewenvironment{code}% @@ -101,7 +101,7 @@ \fill [cyan!90!black] ($(current page.south west)+(0,7)$) rectangle ($(current page.north west)+(21,-7)$); \fill [yellow] (current page.south west) rectangle ($(current page.north west)+(3,0)$); \node[text width=10cm] at ($(current page.north west)+(8.5,-6)$) {\huge\ProjLib}; - \node[text width=6cm,text height=3.5cm,scale=2.5] at ($(current page.north west)+(11,-9)$) {\textcolor{white}{\sffamily\simplivre{}\\\textsc{Write your books in \\a simple and clear way}\\[10pt]\tiny Corresponding to: \texttt{\simplivre{} 2021/06/23}}}; + \node[text width=6cm,text height=3.5cm,scale=2.5] at ($(current page.north west)+(11,-9)$) {\textcolor{white}{\sffamily\simplivre{}\\[5pt]\footnotesize\textsc{Write your books in \\a simple and clear way}\\[10pt]\tiny Corresponding to: \texttt{\simplivre{} 2021/06/30}}}; \node at ($(current page.south)+(1.5,3)$) {\fontsize{16pt}{0pt}\selectfont\textcolor{gray}{\scshape Jinwen XU}}; \node at ($(current page.south)+(1.5,2)$) {\fontsize{12pt}{0pt}\selectfont\textcolor{gray}{June 2021, Beijing}}; \end{tikzpicture}% @@ -147,22 +147,27 @@ as the first line to use the \simplivre{} class. \simplivre{} offers the following options: \begin{itemize} + \item The language options \texttt{EN} / \texttt{english} / \texttt{English}, \texttt{FR} / \texttt{french} / \texttt{French}, etc. + \begin{itemize} + \item For the option names of a specific language, please refer to \meta{language name} in the next section. The first specified language will be used as the default language. + \end{itemize} \item \texttt{draft} or \texttt{fast} \begin{itemize} \item The option \verb|fast| enables a faster but slightly rougher style, main differences are: \begin{itemize} \item Use simpler math font configuration; - \item Do not use hyperref; + \item Do not use \textsf{hyperref}; \item Enable the fast mode of \ProjLib{} toolkit. \end{itemize} \end{itemize} \begin{tip} - During the draft stage, it is recommended to use the \verb|fast| option to speed up compilation. At the end, one should remove the ``fast'' option to get the final version. When in \verb|fast| mode, there will be a watermark ``DRAFT'' to indicate that you are currently in the draft mode. + During the draft stage, it is recommended to use the \verb|fast| option to speed up compilation. When in \verb|fast| mode, there will be a watermark ``DRAFT'' to indicate that you are currently in the draft mode. \end{tip} \item \texttt{a4paper} or \texttt{b5paper} \begin{itemize} \item Optional paper size. The default paper size is 7in $\times$ 10in. \end{itemize} + \clearpage \item \texttt{palatino}, \texttt{times}, \texttt{garamond}, \texttt{biolinum} ~$|$~ \texttt{useosf} \begin{itemize} \item Font options. As the name suggest, font with corresponding name will be loaded. @@ -170,7 +175,7 @@ as the first line to use the \simplivre{} class. \end{itemize} \item \texttt{allowbf} \begin{itemize} - \item Allow boldface. When this option is enabled, the title, titles of all levels and names of theorem-like environments will be bolded. + \item Allow boldface. When this option is enabled, the main title, the titles of all levels and the names of theorem-like environments will be bolded. \end{itemize} \item \texttt{classical} \begin{itemize} @@ -195,10 +200,6 @@ as the first line to use the \simplivre{} class. \begin{itemize} \item Theorem-like environments will not be numbered. \end{itemize} - \item The language options \texttt{EN} / \texttt{english} / \texttt{English}, \texttt{FR} / \texttt{french} / \texttt{French}, etc. - \begin{itemize} - \item For the option names of a specific language, please refer to \meta{language name} in the next section. The first specified language will be used as the default language. - \end{itemize} \end{itemize} \bigskip @@ -470,7 +471,7 @@ If you want to write in the standard way, you can refer to the following example \title{Le Titre} \author{Auteur} -\date{\PJLdate{2022-04-01}} +\date{\PLdate{2022-04-01}} \maketitle @@ -517,7 +518,7 @@ If you intend to switch to the journal template in the future and thus want to u \author{Auteur 1} \address{Adresse 1} \email{\href{Courriel 2}{Courriel 2}} -\date{\PJLdate{2022-04-01}} +\date{\PLdate{2022-04-01}} \subjclass{*****} \keywords{...} diff --git a/macros/unicodetex/latex/simplivre/simplivre.cls b/macros/unicodetex/latex/simplivre/simplivre.cls index 7c1db4ff46..5f253fee23 100644 --- a/macros/unicodetex/latex/simplivre/simplivre.cls +++ b/macros/unicodetex/latex/simplivre/simplivre.cls @@ -17,7 +17,7 @@ %% \NeedsTeXFormat{LaTeX2e}[2020-10-01] \ProvidesClass{simplivre} - [2021/06/23 A simple and clear book style] + [2021/06/30 A simple and clear book style] \def\minimclass@baseclass{book} \RequirePackage{kvoptions} \RequirePackage{etoolbox} @@ -220,7 +220,7 @@ \setmathfont[range={up/{Latin,latin,Greek,greek}, bfup/{Latin,latin,Greek,greek}, cal, bfcal, frak, bffrak, - `(,`),`[,`],`\{,`\},`:,`=,`/,\backslash, + `(,`),`[,`],`\{,`\},`:,`=,\ne,\equiv,`/,\backslash, \in,\notin,\ni,\subset,\supset,\subseteq,\supseteq, \rightarrow,\leftarrow,\mapsto,\hookrightarrow,\hookleftarrow, \sum,\prod,\coprod, @@ -230,6 +230,9 @@ Scale = 1.05, ]{Neo Euler} }{} +\setmathfont[range={\leq,\geq,\ll,\gg,\lll,\ggg,\leqslant,\geqslant}, + Scale = 0.95, + ]{latinmodern-math.otf} \setmathfont[range={up/num, bfup/num} ]{texgyrepagella-math.otf} @@ -239,7 +242,7 @@ \setbox\xratbelow=\hbox{\ensuremath{\scriptstyle #1}}% \setbox\xratabove=\hbox{\ensuremath{\scriptstyle #2}}% \pgfmathsetlengthmacro{\xratlen}{max(\wd\xratbelow, \wd\xratabove) + .8em}% - \mathrel{\tikz [->, baseline=-.6ex, every node/.style={inner sep=0pt}] + \mathrel{\tikz [->, baseline=-.55ex, every node/.style={inner sep=0pt}] \draw (0,0) -- node[below=3pt] {\box\xratbelow} node[above=2pt] {\box\xratabove} (\xratlen,0) ;}} @@ -247,7 +250,7 @@ \setbox\xratbelow=\hbox{\ensuremath{\scriptstyle #1}}% \setbox\xratabove=\hbox{\ensuremath{\scriptstyle #2}}% \pgfmathsetlengthmacro{\xratlen}{max(\wd\xratbelow, \wd\xratabove) + .8em}% - \mathrel{\tikz [<-, baseline=-.6ex, every node/.style={inner sep=0pt}] + \mathrel{\tikz [<-, baseline=-.55ex, every node/.style={inner sep=0pt}] \draw (0,0) -- node[below=3pt] {\box\xratbelow} node[above=2pt] {\box\xratabove} (\xratlen,0) ;}} @@ -255,7 +258,7 @@ \setbox\xratbelow=\hbox{\ensuremath{\scriptstyle #1}}% \setbox\xratabove=\hbox{\ensuremath{\scriptstyle #2}}% \pgfmathsetlengthmacro{\xratlen}{max(\wd\xratbelow, \wd\xratabove) + .8em}% - \mathrel{\tikz [<->, baseline=-.6ex, every node/.style={inner sep=0pt}] + \mathrel{\tikz [<->, baseline=-.55ex, every node/.style={inner sep=0pt}] \draw (0,0) -- node[below=3pt] {\box\xratbelow} node[above=2pt] {\box\xratabove} (\xratlen,0) ;}} @@ -263,7 +266,7 @@ \setbox\xratbelow=\hbox{\ensuremath{\scriptstyle #1}}% \setbox\xratabove=\hbox{\ensuremath{\scriptstyle #2}}% \pgfmathsetlengthmacro{\xratlen}{max(\wd\xratbelow, \wd\xratabove) + .8em}% - \mathrel{\tikz [baseline=-.6ex, every node/.style={inner sep=0pt}] + \mathrel{\tikz [baseline=-.55ex, every node/.style={inner sep=0pt}] \draw (0,0) edge[commutative diagrams/hookrightarrow] node[below=3pt] {\box\xratbelow} node[above=2pt] {\box\xratabove} (\xratlen,0) ;}} @@ -271,7 +274,7 @@ \setbox\xratbelow=\hbox{\ensuremath{\scriptstyle #1}}% \setbox\xratabove=\hbox{\ensuremath{\scriptstyle #2}}% \pgfmathsetlengthmacro{\xratlen}{max(\wd\xratbelow, \wd\xratabove) + .8em}% - \mathrel{\tikz [baseline=-.6ex, every node/.style={inner sep=0pt}] + \mathrel{\tikz [baseline=-.55ex, every node/.style={inner sep=0pt}] \draw (0,0) edge[commutative diagrams/hookleftarrow] node[below=3pt] {\box\xratbelow} node[above=2pt] {\box\xratabove} (\xratlen,0) ;}} @@ -279,7 +282,7 @@ \setbox\xratbelow=\hbox{\ensuremath{\scriptstyle #1}}% \setbox\xratabove=\hbox{\ensuremath{\scriptstyle #2}}% \pgfmathsetlengthmacro{\xratlen}{max(\wd\xratbelow, \wd\xratabove) + .8em}% - \mathrel{\tikz [baseline=-.6ex, every node/.style={inner sep=0pt}] + \mathrel{\tikz [baseline=-.55ex, every node/.style={inner sep=0pt}] \draw (0,0) edge[commutative diagrams/mapsto] node[below=3pt] {\box\xratbelow} node[above=2pt] {\box\xratabove} (\xratlen,0) ;}} @@ -287,10 +290,19 @@ \setbox\xratbelow=\hbox{\ensuremath{\scriptstyle #1}}% \setbox\xratabove=\hbox{\ensuremath{\scriptstyle #2}}% \pgfmathsetlengthmacro{\xratlen}{max(\wd\xratbelow, \wd\xratabove) + .8em}% - \mathrel{\tikz [baseline=-.6ex, every node/.style={inner sep=0pt}] + \mathrel{\tikz [baseline=-.55ex, every node/.style={inner sep=0pt}] \draw (0,0) edge[commutative diagrams/equal] node[below=3pt] {\box\xratbelow} node[above=2pt] {\box\xratabove} (\xratlen,0) ;}} +\AtBeginDocument{ +\renewcommand{\twoheadrightarrow}{% + \mathrel{\tikz [baseline=-.55ex, every node/.style={inner sep=0pt}] + \draw (0,0) edge[commutative diagrams/twoheadrightarrow] (.8em,0) ;}} + +\renewcommand{\twoheadleftarrow}{% + \mathrel{\tikz [baseline=-.55ex, every node/.style={inner sep=0pt}] + \draw (0,0) edge[commutative diagrams/twoheadleftarrow] (.8em,0) ;}} +} \fi \fi -- cgit v1.2.3