summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/latex/einfart/einfart-doc-cn.pdfbin239385 -> 238692 bytes
-rw-r--r--Master/texmf-dist/doc/latex/einfart/einfart-doc-cn.tex24
-rw-r--r--Master/texmf-dist/doc/latex/einfart/einfart-doc-en.pdfbin148100 -> 148163 bytes
-rw-r--r--Master/texmf-dist/doc/latex/einfart/einfart-doc-en.tex26
-rw-r--r--Master/texmf-dist/tex/latex/einfart/einfart.cls30
5 files changed, 48 insertions, 32 deletions
diff --git a/Master/texmf-dist/doc/latex/einfart/einfart-doc-cn.pdf b/Master/texmf-dist/doc/latex/einfart/einfart-doc-cn.pdf
index dccd7ba29b9..735f56dba17 100644
--- a/Master/texmf-dist/doc/latex/einfart/einfart-doc-cn.pdf
+++ b/Master/texmf-dist/doc/latex/einfart/einfart-doc-cn.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/einfart/einfart-doc-cn.tex b/Master/texmf-dist/doc/latex/einfart/einfart-doc-cn.tex
index a1265d2ff66..4b2c5a6f749 100644
--- a/Master/texmf-dist/doc/latex/einfart/einfart-doc-cn.tex
+++ b/Master/texmf-dist/doc/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}<highest>
\CreateTheorem{theorem}<highest>
@@ -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/Master/texmf-dist/doc/latex/einfart/einfart-doc-en.pdf b/Master/texmf-dist/doc/latex/einfart/einfart-doc-en.pdf
index 658da1098ef..26af160f139 100644
--- a/Master/texmf-dist/doc/latex/einfart/einfart-doc-en.pdf
+++ b/Master/texmf-dist/doc/latex/einfart/einfart-doc-en.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/einfart/einfart-doc-en.tex b/Master/texmf-dist/doc/latex/einfart/einfart-doc-en.tex
index d92668f4cdd..e50c77ab289 100644
--- a/Master/texmf-dist/doc/latex/einfart/einfart-doc-en.tex
+++ b/Master/texmf-dist/doc/latex/einfart/einfart-doc-en.tex
@@ -4,6 +4,9 @@
\CreateTheorem{definition}<highest>
\CreateTheorem{theorem}<highest>
+% \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/Master/texmf-dist/tex/latex/einfart/einfart.cls b/Master/texmf-dist/tex/latex/einfart/einfart.cls
index f3d52b2bb37..b0c9ae23c34 100644
--- a/Master/texmf-dist/tex/latex/einfart/einfart.cls
+++ b/Master/texmf-dist/tex/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