From 3cd1d85cb7521f6e36b5797788adae39e07b5635 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 30 Jun 2021 21:19:11 +0000 Subject: simplivre (30jun21) git-svn-id: svn://tug.org/texlive/trunk@59781 c570f23f-e606-0410-a88d-b1316a301751 --- .../doc/latex/simplivre/simplivre-doc-cn.pdf | Bin 289392 -> 288667 bytes .../doc/latex/simplivre/simplivre-doc-cn.tex | 20 +++++++------- .../doc/latex/simplivre/simplivre-doc-en.pdf | Bin 194551 -> 194593 bytes .../doc/latex/simplivre/simplivre-doc-en.tex | 23 ++++++++-------- .../texmf-dist/tex/latex/simplivre/simplivre.cls | 30 ++++++++++++++------- 5 files changed, 43 insertions(+), 30 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-cn.pdf b/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-cn.pdf index 1f609aa5206..329b4355393 100644 Binary files a/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-cn.pdf and b/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-cn.pdf differ diff --git a/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-cn.tex b/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-cn.tex index 82c7ec769bc..815bc8737ae 100644 --- a/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-cn.tex +++ b/Master/texmf-dist/doc/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/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-en.pdf b/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-en.pdf index 51894557394..3da74b53016 100644 Binary files a/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-en.pdf and b/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-en.pdf differ diff --git a/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-en.tex b/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-en.tex index 426eab8e334..7566f60fd3e 100644 --- a/Master/texmf-dist/doc/latex/simplivre/simplivre-doc-en.tex +++ b/Master/texmf-dist/doc/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/Master/texmf-dist/tex/latex/simplivre/simplivre.cls b/Master/texmf-dist/tex/latex/simplivre/simplivre.cls index 7c1db4ff464..5f253fee234 100644 --- a/Master/texmf-dist/tex/latex/simplivre/simplivre.cls +++ b/Master/texmf-dist/tex/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