From 985f93b75af495f4d4249b3641248ea34fb5bc03 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 30 Jun 2021 21:18:58 +0000 Subject: lebhart (30jun21) git-svn-id: svn://tug.org/texlive/trunk@59780 c570f23f-e606-0410-a88d-b1316a301751 --- .../doc/latex/lebhart/lebhart-doc-cn.pdf | Bin 286456 -> 285244 bytes .../doc/latex/lebhart/lebhart-doc-cn.tex | 24 ++++++++--------- .../doc/latex/lebhart/lebhart-doc-en.pdf | Bin 171812 -> 171730 bytes .../doc/latex/lebhart/lebhart-doc-en.tex | 22 +++++++-------- Master/texmf-dist/tex/latex/lebhart/lebhart.cls | 30 ++++++++++++++------- 5 files changed, 44 insertions(+), 32 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-cn.pdf b/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-cn.pdf index aacdaf3644e..19d522f0085 100644 Binary files a/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-cn.pdf and b/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-cn.pdf differ diff --git a/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-cn.tex b/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-cn.tex index 8bd4523d44a..8815d8f6834 100644 --- a/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-cn.tex +++ b/Master/texmf-dist/doc/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/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-en.pdf b/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-en.pdf index 2f76f1714ff..6f8dfda1aa6 100644 Binary files a/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-en.pdf and b/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-en.pdf differ diff --git a/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-en.tex b/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-en.tex index cab423c8c55..a7f38aaa36f 100644 --- a/Master/texmf-dist/doc/latex/lebhart/lebhart-doc-en.tex +++ b/Master/texmf-dist/doc/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/Master/texmf-dist/tex/latex/lebhart/lebhart.cls b/Master/texmf-dist/tex/latex/lebhart/lebhart.cls index 65c479eaf91..29a4088e809 100644 --- a/Master/texmf-dist/tex/latex/lebhart/lebhart.cls +++ b/Master/texmf-dist/tex/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 -- cgit v1.2.3