texlive[62989] Master: elegant* from deng (9apr22)
commits+karl at tug.org
commits+karl at tug.org
Sat Apr 9 22:32:59 CEST 2022
Revision: 62989
http://tug.org/svn/texlive?view=revision&revision=62989
Author: karl
Date: 2022-04-09 22:32:58 +0200 (Sat, 09 Apr 2022)
Log Message:
-----------
elegant* from deng (9apr22)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/elegantbook/README-CN.md
trunk/Master/texmf-dist/doc/latex/elegantbook/README.md
trunk/Master/texmf-dist/doc/latex/elegantbook/elegantbook-cn.pdf
trunk/Master/texmf-dist/doc/latex/elegantbook/elegantbook-cn.tex
trunk/Master/texmf-dist/doc/latex/elegantbook/elegantbook-en.pdf
trunk/Master/texmf-dist/doc/latex/elegantbook/elegantbook-en.tex
trunk/Master/texmf-dist/doc/latex/elegantnote/elegantnote-cn.pdf
trunk/Master/texmf-dist/doc/latex/elegantnote/elegantnote-cn.tex
trunk/Master/texmf-dist/doc/latex/elegantnote/elegantnote-en.pdf
trunk/Master/texmf-dist/doc/latex/elegantnote/elegantnote-en.tex
trunk/Master/texmf-dist/doc/latex/elegantpaper/elegantpaper-cn.pdf
trunk/Master/texmf-dist/doc/latex/elegantpaper/elegantpaper-cn.tex
trunk/Master/texmf-dist/doc/latex/elegantpaper/elegantpaper-en.pdf
trunk/Master/texmf-dist/doc/latex/elegantpaper/elegantpaper-en.tex
trunk/Master/texmf-dist/tex/latex/elegantbook/elegantbook.cls
trunk/Master/texmf-dist/tex/latex/elegantnote/elegantnote.cls
trunk/Master/texmf-dist/tex/latex/elegantpaper/elegantpaper.cls
trunk/Master/tlpkg/bin/c2lx
Added Paths:
-----------
trunk/Master/texmf-dist/doc/latex/elegantpaper/reference.bib
Removed Paths:
-------------
trunk/Master/texmf-dist/doc/latex/elegantbook/image/cert.pdf
trunk/Master/texmf-dist/doc/latex/elegantbook/image/donate.jpg
trunk/Master/texmf-dist/doc/latex/elegantnote/image/donate.jpg
trunk/Master/texmf-dist/doc/latex/elegantnote/image/star.png
trunk/Master/texmf-dist/doc/latex/elegantpaper/image/donate.jpg
trunk/Master/texmf-dist/doc/latex/elegantpaper/image/star.png
trunk/Master/texmf-dist/doc/latex/elegantpaper/wpref.bib
Modified: trunk/Master/texmf-dist/doc/latex/elegantbook/README-CN.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/elegantbook/README-CN.md 2022-04-09 20:30:34 UTC (rev 62988)
+++ trunk/Master/texmf-dist/doc/latex/elegantbook/README-CN.md 2022-04-09 20:32:58 UTC (rev 62989)
@@ -17,6 +17,8 @@
## 致谢
+特别感谢 [sikouhjw](https://github.com/sikouhjw) 长期以来对于 Github 上 issue 的快速回应，以及各个社区论坛对于 ElegantLaTeX 相关问题的回复。
+
特别感谢 ChinaTeX 以及 [LaTeX 工作室](http://www.latexstudio.net/)对于本系列模板的大力宣传与推广。
如果你喜欢我们的模板，你可以在 Github 上收藏我们的模板。
Modified: trunk/Master/texmf-dist/doc/latex/elegantbook/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/elegantbook/README.md 2022-04-09 20:30:34 UTC (rev 62988)
+++ trunk/Master/texmf-dist/doc/latex/elegantbook/README.md 2022-04-09 20:32:58 UTC (rev 62989)
@@ -17,6 +17,8 @@
## Acknowledgement
+Thank [sikouhjw](https://github.com/sikouhjw) for his quick response to Github issues and continuously support work for ElegantLaTeX.
+
Thank ChinaTeX and [LaTeX Studio](http://www.latexstudio.net/) for their promotion.
Modified: trunk/Master/texmf-dist/doc/latex/elegantbook/elegantbook-cn.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/elegantbook/elegantbook-cn.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/elegantbook/elegantbook-cn.tex 2022-04-09 20:30:34 UTC (rev 62988)
+++ trunk/Master/texmf-dist/doc/latex/elegantbook/elegantbook-cn.tex 2022-04-09 20:32:58 UTC (rev 62989)
@@ -1,4 +1,4 @@
-\documentclass[cn,10pt,math=newtx,citestyle=gb7714-2015,bibstyle=gb7714-2015]{elegantbook}
+\documentclass[lang=cn,10pt]{elegantbook}
\title{ElegantBook：优美的 \LaTeX{} 书籍模板}
\subtitle{Elegant\LaTeX{} 经典之作}
@@ -5,11 +5,11 @@
\author{Ethan Deng \& Liam Huang}
\institute{Elegant\LaTeX{} Program}
-\date{May 2, 2021}
-\version{4.1}
+\date{April 9, 2022}
+\version{4.3}
\bioinfo{自定义}{信息}
-\extrainfo{各人自扫门前雪，休管他人瓦上霜。—— 陈元靓}
+\extrainfo{不要以为抹消过去，重新来过，即可发生什么改变。—— 比企谷八幡}
\setcounter{tocdepth}{3}
@@ -20,8 +20,9 @@
\usepackage{array}
\newcommand{\ccr}[1]{\makecell{{\color{#1}\rule{1cm}{1cm}}}}
-\definecolor{customcolor}{RGB}{32,178,170}
-\colorlet{coverlinecolor}{customcolor}
+% 修改标题页的橙色带
+% \definecolor{customcolor}{RGB}{32,178,170}
+% \colorlet{coverlinecolor}{customcolor}
\begin{document}
@@ -28,29 +29,6 @@
\maketitle
\frontmatter
-\chapter*{特别声明}
-
-\markboth{Introduction}{前言}
-
-自 2019 年 Elegant\LaTeX{} 系列模板上线 GitHub、CTAN 以来，受到很多用户的喜爱。
-
-2020 年，我打算做 Elegant\LaTeX{} 的最后一个版本，也就是原定计划 ElegantBook 4.x 版本为 Elegant\LaTeX{} 系列模板的终止符。基于我想把 4.x 做成一个最终版本，我计划了很多事情，包括将代码转为 dtx，将三个模板的文档打包进 dtx 里面，然后重新设计封面，补充各种页面，增加元素等等。我想的很多，但是做起来并不是很顺利，中间也发生了很多事情，不想解释。直至今年 4 月，我决定，不论如何，先把 4.1 发布出来。
-
-\vskip 0.5cm
-
-另外，在临近 Elegant\LaTeX{} 模板告别之际，我想和各位用户说：多分享，多奉献。
-
-\vskip 0.5cm
-
-\underline{如果你无法认同我的想法，建议直接删除本模板。}
-
-\vskip 1.5cm
-
-\begin{flushright}
-Ethan Deng\\
-May 2, 2021
-\end{flushright}
-
\tableofcontents
\mainmatter
@@ -61,34 +39,17 @@
我们的联系方式如下，建议加入用户 QQ 群提问，这样能更快获得准确的反馈，加群时请备注 \LaTeX{} 或者 Elegant\LaTeX{} 相关内容。
\begin{itemize}
- \item 官网：\href{https://elegantlatex.org/}{https://elegantlatex.org/}
- \item GitHub 网址：\href{https://github.com/ElegantLaTeX/}{https://github.com/ElegantLaTeX/}
+ \item 官网：\href{https://elegantlatex.org/}{https://elegantlatex.org/}（暂时歇业）
+ \item GitHub 地址：\href{https://github.com/ElegantLaTeX/}{https://github.com/ElegantLaTeX/}
+ \item Gitee 地址：\href{https://gitee.com/ElegantLaTeX}{https://gitee.com/ElegantLaTeX}
\item CTAN 地址：\href{https://ctan.org/pkg/elegantbook}{https://ctan.org/pkg/elegantbook}
\item 下载地址：\href{https://github.com/ElegantLaTeX/ElegantBook/releases}{正式发行版}，\href{https://github.com/ElegantLaTeX/ElegantBook/archive/master.zip}{最新版}
- \item 微博：Elegant\LaTeX{}
- \item 微信公众号：Elegant\LaTeX{}
- \item 用户 QQ 群：692108391
+ \item 微博：Elegant\LaTeX{}（密码有点忘了）
+ \item 微信公众号：Elegant\LaTeX{}（不定期更新）
+ \item 用户 QQ 群：692108391（建议加群）
\item 邮件：\email{elegantlatex2e at gmail.com}
\end{itemize}
-
-\section{ElegantBook 更新说明}
-
-此次为 4.x 第一个版本，在 3.x 基础上，主要更新了定理以及参考文献的支持方式，具体内容有：
-
-\begin{enumerate}
- \item \textbf{重要改动}：由原先的 \hologo{BibTeX} 改为 biblatex 编译方式（后端为 \lstinline{biber}），请注意两者之间的差异；
- \item \textbf{重要改进}：修改对于定理写法兼容方式，提高数学公式代码的兼容性；
- \item 页面设置改动，默认页面更宽；方便书写和阅读；
- \item 支持目录文字以及页码跳转；
- \item 不再维护 \hologo{pdfLaTeX} 中文支持方式，请务必使用 \hologo{XeLaTeX} 编译中文文稿。
- \item 增加多语言选项，法语 \lstinline{lang=fr}、德语 \lstinline{lang=de}、荷兰语 \lstinline{lang=nl}、匈牙利语 \lstinline{lang=hu}、西班牙语 \lstinline{lang=es}、蒙古语 \lstinline{lang=mn} 等。
-\end{enumerate}
-
-\begin{note}
-如果你使用旧版本切换到新版本时，遇到问题时，请核对文档中是否有 \lstinline{pageanchor} 字样。如果有，请删除文档中的 \lstinline|\hypersetup{pageanchor=true}|，并且在 \lstinline{\maketitle} 和 \lstinline{\tableofcontents} 之间添加 \lstinline{\frontmatter}。2.x 版本的用户请仔细查看\href{https://github.com/ElegantLaTeX/ElegantBook/wiki/convert}{跨版本转换}。
-\end{note}
-
\section{模板安装与更新}
你可以通过免安装的方式使用本模板，包括在线使用和本地（文件夹内）使用两种方式，也可以通过 \TeX{} 发行版安装使用。
@@ -95,29 +56,29 @@
\subsection{在线使用模板}
-我们把三套模板全部上传到 \href{https://www.overleaf.com/}{Overleaf} 上了，网络便利的用户可以直接通过 Overleaf 在线使用我们的模板。使用 Overleaf 的好处是无需安装 \TeX{} Live 2020，可以随时随地访问自己的文件。查找模板，请在 Overleaf 模板库里面搜索 \lstinline{elegantlatex} 即可，你也可以直接访问\href{https://www.overleaf.com/latex/templates?addsearch=elegantlatex}{搜索结果}。选择适当的模板之后，将其 \lstinline{Open as Template}，即可把模板存到自己账户下，然后可以自由编辑以及与别人一起协作。更多关于 Overleaf 的介绍和使用，请参考 Overleaf 的\href{https://www.overleaf.com/learn}{官方文档}。
+我们把三套模板全部上传到 \href{https://www.overleaf.com/}{Overleaf} 上了，网络便利的用户可以直接通过 Overleaf 在线使用我们的模板。使用 Overleaf 的好处是无需安装 \TeX{} Live，可以随时随地访问自己的文件。查找模板，请在 Overleaf 模板库里面搜索 \lstinline{elegantlatex} 即可，你也可以直接访问\href{https://www.overleaf.com/latex/templates?addsearch=elegantlatex}{搜索结果}。选择适当的模板之后，将其 \lstinline{Open as Template}，即可把模板存到自己账户下，然后可以自由编辑以及与别人一起协作。更多关于 Overleaf 的介绍和使用，请参考 Overleaf 的\href{https://www.overleaf.com/learn}{官方文档}。
-\begin{remark}
-Overleaf 上，中文需要使用 \hologo{XeLaTeX} 进行编译，英文建议使用 \hologo{pdfLaTeX} 编译。
-\end{remark}
-
\subsection{本地免安装使用}
-\textbf{免安装}使用方法如下，从 GitHub 或者 CTAN 下载最新版，严格意义上只需要类文件 \lstinline{elegantbook.cls}。然后将模板文件放在你的工作目录下即可使用。这样使用的好处是，无需安装，简便；缺点是，当模板更新之后，你需要手动替换 \lstinline{cls} 文件。
+\textbf{免安装}使用方法如下：从 GitHub 或者 CTAN 下载最新版，严格意义上只需要类文件 \lstinline{elegantbook.cls}。然后将模板文件放在你的工作目录下即可使用。这样使用的好处是，无需安装，简便；缺点是，当模板更新之后，你需要手动替换 \lstinline{cls} 文件。
-\subsection{发行版安装使用}
+\subsection{发行版安装与更新}
-本模板测试环境为 Win10 和 TeX Live 2021，如果你刚安装 \TeX{} Live 2021 用户，安装后建议升级全部宏包，升级方法：使用 cmd 运行 \lstinline{tlmgr update --all}，如果 tlmgr 需要更新，请使用 cmd 运行 \lstinline{tlmgr update --self}，如果更新过程中出现了中断，请改用 \lstinline{tlmgr update --self --all --reinstall-forcibly-removed} 更新。
+本模板测试环境为
+\begin{enumerate}
+ \item Win10 + \TeX{} Live 2022；
+ \item Ubuntu 20.04 + \TeX{} Live 2022；
+ \item macOS Monterey + Mac\TeX{} 2022。
+\end{enumerate}
-\subsection{更新问题}
+\TeX Live/Mac\TeX{} 的安装请参考啸行的\href{https://github.com/OsbertWang/install-latex-guide-zh-cn/releases/}{一份简短的关于安装 \LaTeX{} 安装的介绍}。
-如果使用 \lstinline{tlshell} 无法更新模板，请使用命令行全部更新全部宏包或者使用免安装的方法使用本模板。
+安装 \TeX{} Live 之后，安装后建议升级全部宏包，升级方法：使用 cmd 或 terminal 运行 \lstinline{tlmgr update --all}，如果 tlmgr 需要更新，请使用 cmd 运行 \lstinline{tlmgr update --self}，如果更新过程中出现了中断，请改用 \lstinline{tlmgr update --self --all --reinstall-forcibly-removed} 更新，也即
-通过命令行（管理员权限）输入下面的命令对 tlmgr 自身和全部宏包进行更新。
-
\begin{lstlisting}
- tlmgr update --self
- tlmgr update --all
+tlmgr update --self
+tlmgr update --all
+tlmgr update --self --all --reinstall-forcibly-removed
\end{lstlisting}
更多的内容请参考 \href{https://tex.stackexchange.com/questions/55437/how-do-i-update-my-tex-distribution}{How do I update my \TeX{} distribution?}
@@ -124,7 +85,7 @@
\subsection{其他发行版本}
-由于宏包版本问题，本模板不支持 C\TeX{} 套装，请务必安装 TeX Live。更多关于 \TeX{} Live 的安装使用以及 C\TeX{} 与 \TeX{} Live 的兼容、系统路径问题，请参考官方文档以及啸行的\href{https://github.com/OsbertWang/install_latex/releases}{一份简短的安装 \LaTeX{} 的介绍}。
+由于宏包版本问题，本模板不支持 C\TeX{} 套装，请务必安装 TeX Live/Mac\TeX{}。更多关于 \TeX{} Live 的安装使用以及 C\TeX{} 与 \TeX{} Live 的兼容、系统路径问题，请参考官方文档以及啸行的\href{https://github.com/OsbertWang/install-latex-guide-zh-cn/releases/}{一份简短的关于安装 \LaTeX{} 安装的介绍}。
\section{关于提交}
@@ -134,7 +95,7 @@
\chapter{ElegantBook 设置说明}
-本模板基于基础的 book 文类，所以 book 的选项对于本模板也是有效的（纸张无效，因为模板有设备选项）。默认编码为 UTF-8，推荐使用 \TeX{} Live 编译。本文编写环境为 Win10 (64bit) + \TeX{} Live 2021，英文支持 \hologo{pdfLaTeX}，中文仅支持 \hologo{XeLaTeX} 编译。
+本模板基于基础的 book 文类，所以 book 的选项对于本模板也是有效的（纸张无效，因为模板有设备选项）。默认编码为 UTF-8，推荐使用 \TeX{} Live 编译。
\section{语言模式}
本模板内含两套基础语言环境 \lstinline{lang=cn}、\lstinline{lang=en}。改变语言环境会改变图表标题的引导词（图，表），文章结构词（比如目录，参考文献等），以及定理环境中的引导词（比如定理，引理等）。不同语言模式的启用如下：
@@ -143,7 +104,7 @@
\documentclass[lang=cn]{elegantbook}
\end{lstlisting}
-除模板自带的两套语言设定之外，由网友提供的其他语言环境设置如下：
+除模板自带的两套语言设定之外，由\textbf{网友}提供的其他语言环境设置如下：
\begin{itemize}
\item 由 \href{https://github.com/VincentMVV}{VincentMVV} 提供的意大利语翻译 \lstinline{lang=it}，相关讨论见 \href{https://github.com/ElegantLaTeX/ElegantBook/issues/85}{Italian translation}；
\item 由 \href{https://github.com/abfek66}{abfek66} 提供的法语翻译 \lstinline{lang=fr}，相关讨论见 \href{https://github.com/ElegantLaTeX/ElegantBook/issues/85}{Italian translation}；
@@ -152,7 +113,8 @@
\item 由 \href{https://github.com/palkotamas}{palkotamas} 提供的匈牙利语翻译 \lstinline{lang=hu}，相关讨论见 \href{https://github.com/ElegantLaTeX/ElegantBook/issues/111}{Hungarian translation}；
\item 由 Lisa 提供的德语翻译 \lstinline{lang=de}，相关讨论见 \href{https://github.com/ElegantLaTeX/ElegantBook/issues/113}{Deutsch translation}；
\item 由 Gustavo A. Corradi 提供的西班牙语的翻译 \lstinline{lang=es}，相关讨论见 \href{https://github.com/ElegantLaTeX/ElegantBook/issues/133}{Spanish translation}；
- \item 由 \href{https://github.com/Altantsooj}{Altantsooj} 提供的蒙古语的翻译 \lstinline{lang=mn}，相关讨论见 \href{https://github.com/ElegantLaTeX/ElegantBook/issues/137}{Mongolian translation}。
+ \item 由 \href{https://github.com/Altantsooj}{Altantsooj} 提供的蒙古语的翻译 \lstinline{lang=mn}，相关讨论见 \href{https://github.com/ElegantLaTeX/ElegantBook/issues/137}{Mongolian translation}；
+ \item 由 \href{https://github.com/inusturbo}{inusturbo} 提供的日本语的翻译 \lstinline{lang=jp}，相关讨论见 \href{https://github.com/ElegantLaTeX/ElegantBook/issues/172}{Japanese Translation}。
\end{itemize}
@@ -176,6 +138,7 @@
\documentclass[color=green]{elegantbook}
\end{lstlisting}
+
\begin{table}[htbp]
\caption{ElegantBook 模板中的颜色主题\label{tab:color thm}}
\centering
@@ -251,8 +214,8 @@
封面中间位置的色块的颜色可以使用下面命令进行修改：
\begin{lstlisting}
- \definecolor{customcolor}{RGB}{32,178,170}
- \colorlet{coverlinecolor}{customcolor}
+\definecolor{customcolor}{RGB}{32,178,170}
+\colorlet{coverlinecolor}{customcolor}
\end{lstlisting}
\subsection{封面图}
@@ -374,6 +337,17 @@
% \caption{disjoint decomposition}\label{algo_disjdecomp}
% \end{algorithm}
+
+\subsection{修改计数器}
+
+当前定理等环境计数器按章计数，如果想修改定理类环境按节计数，可以修改计数器选项 thmcnt：
+
+\begin{lstlisting}
+ \documentclass[section]{elegantbook} %or
+ \documentclass[thmcnt=section]{elegantbook}
+\end{lstlisting}
+
+
\subsection{其他环境的使用}
其他三种环境没有选项，可以直接使用，比如 \lstinline{example} 环境的使用方法与效果：
@@ -423,12 +397,18 @@
\end{minipage}
\section{参考文献}
+文献部分，本模板调用了 biblatex 宏包，并提供了 biber（默认） 和 bibtex 两个后端选项，可以使用 \lstinline{bibend} 进行修改：
-此模板使用了 \hologo{biber} 来生成参考文献，也即使用 \lstinline{biblatex} 宏包，在中文示例中，使用了 \lstinline{gbt7714} 宏包。参考文献示例：\cite{cn1,en2,en3} 使用了中国一个大型的 P2P 平台（人人贷）的数据来检验男性投资者和女性投资者在投资表现上是否有显著差异。
+\begin{lstlisting}
+ \documentclass[bibtex]{elegantbook}
+ \documentclass[bibend=bibtex]{elegantbook}
+\end{lstlisting}
-你可以在谷歌学术，Mendeley，Endnote 中获得文献条目（bib item），然后把它们添加到 \lstinline{reference.bib} 中。在文中引用的时候，引用它们的键值（bib key）即可。注意需要在编译的过程中添加 \hologo{biber} 编译。
+关于文献条目（bib item），你可以在谷歌学术，Mendeley，Endnote 中取，然后把它们添加到 \lstinline{reference.bib} 中。在文中引用的时候，引用它们的键值（bib key）即可。
-为了方便文献样式修改，模板引入了 \lstinline{bibstyle} 和 \lstinline{citestyle} 选项，默认均为数字格式（numeric），如果需要设置为国标 GB7714-2015，需要使用：
+为了方便文献样式修改，模板引入了 \lstinline{bibstyle} 和 \lstinline{citestyle} 选项，默认均为数字格式（numeric），参考文献示例：\cite{cn1,en2,en3} 使用了中国一个大型的 P2P 平台（人人贷）的数据来检验男性投资者和女性投资者在投资表现上是否有显著差异。
+
+如果需要设置为国标 GB7714-2015，需要使用：
\begin{lstlisting}
\documentclass[citestyle=gb7714-2015, bibstyle=gb7714-2015]{elegantbook}
\end{lstlisting}
@@ -623,8 +603,8 @@
模板从 3.10 版本提供中文字体选项 \lstinline{chinesefont}，可选项有
\begin{enumerate}
\item \lstinline{ctexfont}：默认选项，使用 \lstinline{ctex} 宏包根据系统自行选择字体，可能存在字体缺失的问题，更多内容参考 \lstinline{ctex} 宏包\href{https://ctan.org/pkg/ctex}{官方文档}\footnote{可以使用命令提示符，输入 \lstinline{texdoc ctex} 调出本地 \lstinline{ctex} 宏包文档}。
-\item \lstinline{founder}：方正字体选项，调用 \lstinline{ctex} 宏包并且使用 \lstinline{fontset=none} 选项，然后设置字体为方正四款免费字体，方正字体下载注意事项见后文。
-\item \lstinline{nofont}：调用 \lstinline{ctex} 宏包并且使用 \lstinline{fontset=none} 选项，不设定中文字体，用户可以自行设置中文字体，具体见后文。
+\item \lstinline{founder}：方正字体选项（\textbf{需要安装方正字体}），后台调用 \lstinline{ctex} 宏包并且使用 \lstinline{fontset=none} 选项，然后设置字体为方正四款免费字体，方正字体下载注意事项见后文，用户只需要安装方正字体即可使用该选项。
+\item \lstinline{nofont}：后台会调用 \lstinline{ctex} 宏包并且使用 \lstinline{fontset=none} 选项，不设定中文字体，用户可以自行设置中文字体，具体见后文。
\end{enumerate}
\begin{remark}
@@ -643,12 +623,12 @@
如果你想完全自定义字体\footnote{这里仍然以方正字体为例。}，你可以选择 \lstinline{chinesefont=nofont}，然后在导言区设置
\begin{lstlisting}
\setCJKmainfont[BoldFont={FZHei-B01},ItalicFont={FZKai-Z03}]{FZShuSong-Z01}
-\setCJKsansfont[BoldFont={FZHei-B01},ItalicFont={FZHei-B01}]{FZHei-B01}
-\setCJKmonofont[BoldFont={FZHei-B01},ItalicFont={FZHei-B01}]{FZFangSong-Z02}
+\setCJKsansfont[BoldFont={FZHei-B01}]{FZKai-Z03}
+\setCJKmonofont[BoldFont={FZHei-B01}]{FZFangSong-Z02}
\setCJKfamilyfont{zhsong}{FZShuSong-Z01}
\setCJKfamilyfont{zhhei}{FZHei-B01}
-\setCJKfamilyfont{zhkai}{FZKai-Z03}
-\setCJKfamilyfont{zhfs}{FZFangSong-Z02}
+\setCJKfamilyfont{zhkai}[BoldFont={FZHei-B01}]{FZKai-Z03}
+\setCJKfamilyfont{zhfs}[BoldFont={FZHei-B01}]{FZFangSong-Z02}
\newcommand*{\songti}{\CJKfamily{zhsong}}
\newcommand*{\heiti}{\CJKfamily{zhhei}}
\newcommand*{\kaishu}{\CJKfamily{zhkai}}
@@ -677,7 +657,7 @@
我们将通过三个步骤定义可测函数的积分。首先定义非负简单函数的积分。以下设 $E$ 是 $\mathcal{R}^n$ 中的可测集。
\begin{definition}[可积性] \label{def:int}
-设 $ f(x)=\sum\limits_{i=1}^{k} a_i \chi_{A_i}(x)$ 是 $E$ 上的非负简单函数，其中 $\{A_1,A_2,\ldots,A_k\}$ 是 $E$ 上的一个可测分割，$a_1,a_2,\ldots,a_k$ 是非负实数。定义 $f$ 在 $E$ 上的积分为 $\int_{a}^b f(x)$
+设 $ f(x)=\sum\limits_{i=1}^{k} a_i \chi_{A_i}(x)$ 是 $E$ 上的\textbf{非负简单函数}，中文其中 $\{A_1,A_2,\ldots,A_k\}$ 是 $E$ 上的一个可测分割，$a_1,a_2,\ldots,a_k$ 是非负实数。定义 $f$ 在 $E$ 上的积分为 $\int_{a}^b f(x)$
\begin{equation}
\label{inter}
\int_{E} f dx = \sum_{i=1}^k a_i m(A_i) \pi \alpha\beta\sigma\gamma\nu\xi\epsilon\varepsilon. \oint_{a}^b\ointop_{a}^b\prod_{i=1}^n
@@ -771,10 +751,10 @@
见前文介绍，可以使用 \lstinline{scheme=chinese} 设置。
\item \question{大佬，我想把正文字体改为亮色，背景色改为黑灰色。}
页面颜色可以使用 \lstinline{\pagecolor} 命令设置，文本命令可以参考\href{https://tex.stackexchange.com/questions/278544/xcolor-what-is-the-equivalent-of-default-text-color}{这里}进行设置。
- \item \question{\lstinline[breaklines]{Package ctex Error: CTeX fontset `Mac' is unavailable.}}
+ \item \question{\lstinline[breaklines]{Package ctex Error: CTeX fontset 'Mac' is unavailable.}}
在 Mac 系统下，中文编译请使用 \hologo{XeLaTeX}。
- \item \question{\lstinline{! LaTeX Error: Unknown option `scheme=plain' for package `ctex'.}}
- 你用的 C\TeX{} 套装吧？这个里面的 \lstinline{ctex} 宏包已经是已经是 10 年前的了，与本模板使用的 \lstinline{ctex} 宏集有很大区别。不建议 C\TeX{} 套装了，请卸载并安装 \TeX{} Live 2021。
+ \item \question{\lstinline{! LaTeX Error: Unknown option 'scheme=plain' for package 'ctex'.}}
+ 你用的 C\TeX{} 套装吧？这个里面的 \lstinline{ctex} 宏包已经是已经是 10 年前的了，与本模板使用的 \lstinline{ctex} 宏集有很大区别。不建议 C\TeX{} 套装了，请卸载并安装 \TeX{} Live 2022。
\item \question{我该使用什么版本？}
请务必使用\href{https://github.com/ElegantLaTeX/ElegantBook/releases}{最新正式发行版}，发行版间不定期可能会有更新（修复 bug 或者改进之类），如果你在使用过程中没有遇到问题，不需要每次更新\href{https://github.com/ElegantLaTeX/ElegantBook/archive/master.zip}{最新版}，但是在发行版更新之后，请尽可能使用最新版（发行版）！最新发行版可以在 GitHub 或者 \TeX{} Live 2021 内获取。
\item \question{我该使用什么编辑器？}
@@ -783,8 +763,6 @@
模板的使用修改都是自由的，你们声明模板来源以及模板地址（GitHub 地址）即可，其他未尽事宜按照开源协议 LPPL-1.3c。做好之后，如果方便的话，可以给我们一个链接，我把你们的教材放在 Elegant\LaTeX{} 用户作品集里。
\item \question{请问交叉引用是什么？}
本群和本模板适合有一定 \LaTeX{} 基础的用户使用，新手请先学习 \LaTeX{} 的基础，理解各种概念，否则你将寸步难行。
- \item \question{定义等环境中无法使用加粗命令么？}
- 是这样的，默认中文并没加粗命令，如果你想在定义等环境中使用加粗命令，请使用 \lstinline{\heiti} 等字体命令，而不要使用 \lstinline{\textbf}。或者，你可以将 \lstinline|\textbf| 重新定义为 \lstinline|\heiti|。英文模式不存在这个问题。
\item \question{代码高亮环境能用其他语言吗？}
可以的，ElegantBook 模板用的是 \lstinline{listings} 宏包，你可以在环境（\lstinline{lstlisting}）之后加上语言（比如 Python 使用 \lstinline{language=Python} 选项），全局语言修改请使用 \lstinline{lsset} 命令，更多信息请参考宏包文档。
\item \question{群主，什么时候出 Beamer 的模板（主题），ElegantSlide 或者 ElegantBeamer？}
@@ -793,9 +771,30 @@
\chapter{版本更新历史}
-根据用户的反馈，我们不断修正和完善模板。截止到此次更新，ElegantBook 模板在 GitHub 上有将近 100 次提交，正式发行版本（release）有 17 次。由于 3.00 之前版本与现在版本差异非常大，在此不列出 3.00 之前的更新内容。
+根据用户的反馈，我们不断修正和完善模板。由于 3.00 之前版本与现在版本差异非常大，在此不列出 3.00 之前的更新内容。
+\datechange{2022/04/09}{版本 4.3 正式发布。}
+
+\begin{change}
+ \item 放弃 newtx 系列宏包的设置，改用 TeX Gyre Terms，并设置其他字体；
+ \item 修改定理类环境内部字体设置，修复环境内部中文无法加粗问题；
+ \item 增加定理类环境的计数器选项 \lstinline{thmcnt}，可选 \lstinline{chapter} 和 \lstinline{section}；
+ \item 增加 \lstinline{bibend} 选项，可选 \lstinline{bibend=biber}（默认）和 \lstinline{bibend=bibtex}。
+\end{change}
+
+
+
+\datechange{2022/03/08}{版本 4.2 正式发布。}
+
+\begin{change}
+ \item 对于 newtx 系列宏包更新导致的字体 bug 的修复；
+ \item 修缮目录格式，为了达到这个目的，重新改写 \lstinline{\chaptername} 的重定义语句；
+ \item 增加日语 \lstinline{lang=jp} 设定。
+ \item 这个版本为一个临时性版本，在 \TeX Live 2022 发布之后，将尽快发布 4.3 版本，由于对于中文的改动比较大，可能会出现预期之外的 bug，有问题可以在 QQ 群或者 Github 反馈。
+\end{change}
+
+
\datechange{2021/05/02}{版本 4.1 正式发布。}
\begin{change}
@@ -933,8 +932,8 @@
\item 颜色名字重命名。
\end{change}
-\nocite{*}
-\printbibliography
+\nocite{*}
+\printbibliography[heading=bibintoc, title=\ebibname]
\appendix
\chapter{基本数学工具}
Modified: trunk/Master/texmf-dist/doc/latex/elegantbook/elegantbook-en.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/elegantbook/elegantbook-en.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/elegantbook/elegantbook-en.tex 2022-04-09 20:30:34 UTC (rev 62988)
+++ trunk/Master/texmf-dist/doc/latex/elegantbook/elegantbook-en.tex 2022-04-09 20:32:58 UTC (rev 62989)
@@ -1,4 +1,4 @@
-\documentclass[11pt,fancy]{elegantbook}
+\documentclass[11pt]{elegantbook}
\title{An Elegant \LaTeX{} Template for Books}
\subtitle{Classic Elegant\LaTeX{} Template}
@@ -5,8 +5,8 @@
\author{Ethan Deng \& Liam Huang}
\institute{Elegant\LaTeX{} Program}
-\date{May. 2, 2021}
-\version{4.1}
+\date{April 9, 2022}
+\version{4.3}
\bioinfo{Bio}{Information}
\extrainfo{Victory won\rq t come to us unless we go to it. }
@@ -14,10 +14,10 @@
\logo{logo-blue.png}
\cover{cover.jpg}
+% modify the color in the middle of titlepage
\definecolor{customcolor}{RGB}{32,178,170}
\colorlet{coverlinecolor}{customcolor}
-
\begin{document}
\maketitle
@@ -32,50 +32,22 @@
Contact Infos:
\begin{itemize}
- \item Homepage: \href{https://elegantlatex.org/}{https://elegantlatex.org/}
\item GitHub: \href{https://github.com/ElegantLaTeX/}{https://github.com/ElegantLaTeX/}
\item CTAN: \href{https://ctan.org/pkg/elegantbook}{https://ctan.org/pkg/elegantbook}
- \item Wiki: \href{https://github.com/ElegantLaTeX/ElegantBook/wiki}{https://github.com/ElegantLaTeX/ElegantBook/wiki}
\item Download: \href{https://github.com/ElegantLaTeX/ElegantBook/releases}{release}, \href{https://github.com/ElegantLaTeX/ElegantBook/archive/master.zip}{latest version}
- \item Weibo: Elegant\LaTeX{}
- \item Wechat: Elegant\LaTeX{}
- \item QQ: 692108391
- \item Email: \email{elegantlatex2e at gmail.com}
\end{itemize}
+\section{Online Usage}
+You can visit \href{https://www.overleaf.com/}{Overleaf} to use our template online anywhere and anytime without local installation. To find our template, search \lstinline{elegantlatex} in the \lstinline{templates} or simply visit \href{https://www.overleaf.com/latex/templates?addsearch=elegantlatex}{search result}, choose the template you prefer and \lstinline{Open as Template} to own a copy yourself to edit freely. To learn more about Overleaf, please refer to \href{https://www.overleaf.com/learn}{Documentation}.
-\section{ElegantBook Updates}
-Version 4.1 is the first version of 3.x, we add support for biblatex, theorem, and multilingual translation. What\rq s new in this version:
-
-\begin{enumerate}
- \item \textbf{! Big Change}: Change the bibliography method from \hologo{BibTeX} to biblatex(with backend \lstinline{biber});
- \item \textbf{! Big Change}: Add support for the default theorem writing method (with optional name and label);
- \item Add left and right space;
- \item Support hyperlink from the text of TOC;
- \item Remove the \hologo{pdfLaTeX} compatiblity check for Chinese.
- \item Add multilingual support, for french \lstinline{lang=fr}, dutch \lstinline{lang=nl}, Hungarian \lstinline{lang=hu}, Spanish \lstinline{lang=es}, Mongolian \lstinline{lang=mn} etc.
-\end{enumerate}
-
-\section{Installation and Update}
-Both portable version and installation package are available, online usage is optional as well.
-
-\subsection{To Use Templates Online}
-Visit \href{https://www.overleaf.com/}{Overleaf} to use our template online anywhere and anytime without local installation. To find our template, search \lstinline{elegantlatex} in the \lstinline{templates} or simply visit \href{https://www.overleaf.com/latex/templates?addsearch=elegantlatex}{search result}, choose the template you prefer and \lstinline{Open as Template} to own a copy yourself to edit freely. To learn more about Overleaf, please refer to \href{https://www.overleaf.com/learn}{Documentation}.
-
-\begin{remark}
- On Overleaf, please use \hologo{XeLaTeX} to compile articles in Chinese and \hologo{pdfLaTeX} to compile articles in English.
-\end{remark}
-
-\subsection{To Use Portable Version}
+\section{Portable Version}
For portable version, simply download lastest ElegantBook-master from GitHub or CTAN (to be more accurate, download \lstinline{elegantbook.cls}) and save the file(s) under your working directory. This way of installation is simple and convenient, but you have to manually update \lstinline{cls} now and then.
-\subsection{Update Templates}
-If you fail to update templates using \lstinline{tlshell}, please use cmd to update all the packages or switch to portable version instead.
-
-Use the following commands(administrator privileges) to update:
+\section{Update Templates}
+You can use cmd/terminal to update the tlmgr itself and all the packages, the commands are:
\begin{lstlisting}
tlmgr update --self
tlmgr update --all
@@ -83,16 +55,14 @@
To learn more, please refer to \href{https://tex.stackexchange.com/questions/55437/how-do-i-update-my-tex-distribution}{How do I update my \TeX{} distribution?}
-\subsection{Other Release Versions}
-If you are a \TeX{} Live 2018/2019/2020 user and would like to update, the official solution is to uninstall the previous version. If you want to save the bother of uninstallation and re-installation, please copy \lstinline{elegantbook.cls} to the installation directory of \TeX{} Live 2021 (default: \lstinline|C:\texlive\2021\texmf-dist\tex\latex\elegantbook| ), run \lstinline{texhash} in cmd.
+\section{Other Release Versions}
+If you are a \TeX{} Live 2018/2019/2020/2021 user and would like to update, the official solution is to uninstall the previous version. If you want to save the bother of uninstallation and re-installation, please copy \lstinline{elegantbook.cls} to the installation directory of \TeX{} Live 2022 (default: \lstinline|C:\texlive\2022\texmf-dist\tex\latex\elegantbook| ), run \lstinline{texhash} in cmd.
-\section{About Pull Request}
-For some reasons, pull requests will NOT by accepted since May 20, 2019. For those who want to help improve the templates, submit issues or clone to your own repository to modify under LPPL-1.3c.
\chapter{ElegantBook Settings}
-This template is based on the Standard \LaTeX{} book class, so the options of book class work as well (Note that the option of papersize has no effect due to \lstinline{device} option). The default encoding is UTF-8 while \TeX{} Live is recommended. The test environment is Win10 + \TeX{} Live 2021, either \hologo{pdfLaTeX} or \hologo{XeLaTeX} works fine. \hologo{XeLaTeX} is preferred for Chinese articles.
+This template is based on the Standard \LaTeX{} book class, so the options of book class work as well (Note that the option of papersize has no effect due to \lstinline{device} option). The default encoding is UTF-8 while \TeX{} Live is recommended. The test environment is Win10/Ubuntu 20.04/macOS + \TeX{} Live 2022/ Mac\TeX{} 2022, either \hologo{pdfLaTeX} or \hologo{XeLaTeX} works fine.
\section{Languages}
We defined one option named \lstinline{lang} which has two basic values, \lstinline{lang=en} (default) , \lstinline{lang=cn}. Different values will alter the captions of figure/table, abstract name, refname, etc. You can use this option as
@@ -110,7 +80,8 @@
\item Hungarian translation \lstinline{lang=hu}, provided by \href{https://github.com/palkotamas}{palkotamas}, please refer to \href{https://github.com/ElegantLaTeX/ElegantBook/issues/111}{Hungarian translation};
\item Deutsch translation \lstinline{lang=de}, provided by Lisa, please refer to\href{https://github.com/ElegantLaTeX/ElegantBook/issues/113}{Deutsch translation};
\item Spanish translation \lstinline{lang=es}, provided by Gustavo A. Corradi, please refer to \href{https://github.com/ElegantLaTeX/ElegantBook/issues/133}{Spanish translation};
- \item Mongolian translation \lstinline{lang=mn}, provided by \href{https://github.com/Altantsooj}{Altantsooj}, please refer to \href{https://github.com/ElegantLaTeX/ElegantBook/issues/137}{Mongolian translation}.
+ \item Mongolian translation \lstinline{lang=mn}, provided by \href{https://github.com/Altantsooj}{Altantsooj}, please refer to \href{https://github.com/ElegantLaTeX/ElegantBook/issues/137}{Mongolian translation};
+ \item Japanese translation \lstinline{lang=jp}, provided by \href{https://github.com/inusturbo}{inusturbo}, please refer to \href{https://github.com/ElegantLaTeX/ElegantBook/issues/172}{Japanese translation}.
\end{itemize}
\begin{remark}
@@ -236,15 +207,15 @@
In this template, we defined four different theorem class environments
\begin{itemize}
-\item \textit{Theorem Environment}, including title and content, numbering corresponding to chapter. Three types depending on the format:
+\item \textit{Theorem Environments}, including title and content, numbering corresponding to chapter. Three types depending on the format:
\begin{itemize}
\item \textcolor{main}{\textbf{definition}} environment, the color is \textcolor{main}{main};
\item \textcolor{second}{\textbf{theorem, lemma, corollary}} environment, the color is \textcolor{second} {second};
\item \textcolor{third}{\textbf{proposition}} environment, the color is \textcolor{third}{third}.
\end{itemize}
-\item \textit{Example Environments}, including \textbf{example, exercise, problem} environment, auto numbering corresponding to chapter.
+\item \textit{Example Environment}, including \textbf{example, exercise, problem} environment, auto numbering according to chapter.
\item \textit{Proof Environment}, including \textbf{proof, note} environment containing introductory symbol (\textbf{note} environment) or ending symbol (\textbf{proof} environment).
-\item \textit{Conclusion Environments}, including \textbf{conclusion, assumption, property, remark and solution}\footnote{We also define an option \lstinline{result}, which can hide the \lstinline{solution} and \lstinline{proof} environments. You can switch between \lstinline{result=answer} and \lstinline{result=noanswer}.} environments, all of which begin with boldfaced words, with format consistent with normal paragraphs.
+\item \textit{Conclusion Environment}, including \textbf{conclusion, assumption, property, remark and solution}\footnote{We also define an option \lstinline{result}, which can hide the \lstinline{solution} and \lstinline{proof} environments. You can switch between \lstinline{result=answer} and \lstinline{result=noanswer}.} environments, all of which begin with boldfaced words, with format consistent with normal paragraphs.
\end{itemize}
\subsection{Theorem Class Environments}
@@ -271,23 +242,33 @@
Other theorem class environments with the same usage includes:
\begin{table}[htbp]
- \centering
- \caption{Theorem Class Environments}
- \begin{tabular}{llll}
- \toprule
- Environment & Label text & Prefix & Cross-reference \\
- \midrule
- definition & label & def & \lstinline|\ref{def:label}| \\
- theorem & label & thm & \lstinline|\ref{thm:label}| \\
- lemma & label & lem & \lstinline|\ref{lem:label}| \\
- corrlary & label & cor & \lstinline|\ref{cor:label}| \\
- proposition & label & pro & \lstinline|\ref{pro:label}| \\
- \bottomrule
- \end{tabular}%
- \label{tab:theorem-class}%
+ \centering
+ \caption{Theorem Class Environments}
+ \begin{tabular}{llll}
+ \toprule
+ Environment & Label text & Prefix & Cross-reference \\
+ \midrule
+ definition & label & def & \lstinline|\ref{def:label}| \\
+ theorem & label & thm & \lstinline|\ref{thm:label}| \\
+ lemma & label & lem & \lstinline|\ref{lem:label}| \\
+ corrlary & label & cor & \lstinline|\ref{cor:label}| \\
+ proposition & label & pro & \lstinline|\ref{pro:label}| \\
+ \bottomrule
+ \end{tabular}%
+ \label{tab:theorem-class}%
\end{table}%
+\subsection{Counter for Theorem Environments}
+You can use \lstinline{thmcnt} option to control the theorem counter/number display style for the theorem environments, the acceptable options are \lstinline{chapter} (default) and \lstinline{section}.
+
+\begin{lstlisting}
+\documentclass[section]{elegantbook} % turn the Theorem 4.1 to Theorem 4.1.1
+\documentclass[thmcnt=section]{elegantbook}
+\end{lstlisting}
+
+
+
\subsection{Other Customized Environments}
The other three math environments can be called directly since there are no additional option for them, e.g. \lstinline{example}:
\begin{lstlisting}
@@ -395,11 +376,19 @@
If you want to use biblatex, you must create a file named \lstinline{reference.bib}, add bib items (from Google Scholar, Mendeley, EndNote, and etc.) to \lstinline{reference.bib} file, then cite the bibkey in the \lstinline{tex} file. The biber will automatically generate the bibliography for the reference you cited.
-To change the bibliography style, this version introduces \lstinline{citestyle} and \lstinline{bibstyle}, please refer to \href{https://ctan.org/pkg/biblatex}{CTAN:biblatex} for more detail about these options. You can change your bibliography style as
+To change the bibliography style, this version introduces two options: \lstinline{citestyle} and \lstinline{bibstyle}, please refer to \href{https://ctan.org/pkg/biblatex}{CTAN:biblatex} for more detail about these options. You can change your bibliography style as
+
\begin{lstlisting}
\documentclass[citestyle=numeric-comp, bibstyle=authoryear]{elegantbook}
\end{lstlisting}
+We also add the \lstinline{bibend} option to this template, you can choose \lstinline{biber} (default) or \lstinline{bibtex} as you like, \lstinline{biber} is recommended.
+
+\begin{lstlisting}
+\documentclass[bibtex]{elegantbook} % or
+\documentclass[bibend=bibtex]{elegantbook}
+\end{lstlisting}
+
\section{Preface}
If you want to add a preface before the first chapter with the number of chapter unchanged, please add the preface in the following way:
@@ -533,7 +522,7 @@
We will define the integral of a measurable function in three steps. First, we define the integral of a nonnegative simple function. Let $E$ be the measurable set in $\mathcal{R}^N$.
\begin{definition}[Left Coset]
-Let $H$ be a subgroup of a group~$G$. A \emph{left coset} of $H$ in $G$ is a subset of $G$ that is of the form $xH$, where $x \in G$ and $xH = \{ xh : h \in H \}$. Similarly a \emph{right coset} of $H$ in $G$ is a subset of $G$ that is of the form $Hx$, where $Hx = \{ hx : h \in H \}$ $\hbar$
+Let $H$ be a subgroup of a group~$G$. A \emph{left coset} of $H$ in $G$ is a subset of $G$ that is of the form $xH$, where $x \in G$ and $xH = \{ xh : h \in H \}$. Similarly a \emph{right coset} of $H$ in $G$ is a subset of $G$ that is of the form $Hx$, where $Hx = \{ hx : h \in H \} \hbar$
\end{definition}
\begin{note}
@@ -623,11 +612,11 @@
\item \question{I want to customize font and background color.}
Please use \lstinline{pagecolor} to change background color, refer to \href{https://tex.stackexchange.com/questions/278544/xcolor-what-is-the-equivalent-of-default-text-color}{this} to customize font.
\item \question{Which version should I choose?}
- Please use \href{https://github.com/ElegantLaTeX/ElegantBook/releases}{Latest Release} via GitHub or \TeX{} Live 2021.
+ Please use \href{https://github.com/ElegantLaTeX/ElegantBook/releases}{Latest Release} via GitHub or \TeX{} Live 2022.
\item \question{Which editor should I choose?}
- You can use \TeX{} Live 2021 built-in \TeX works or \TeX Studio. You may refer to \href{https://github.com/EthanDeng/texworks-autocomplete}{\TeX{}works autocomplete}. \TeX{} Live 2021 + \TeX{}studio is strongly recommended. I myself use VS Code and Sublime Text. Related configurations can be found at \href{https://github.com/EthanDeng/vscode-latex}{vscode-latex} and \href{https://github.com/EthanDeng/sublime-text-latex}{sublime-text-latex}.
+ You can use \TeX{} Live 2022 built-in \TeX works or \TeX Studio. You may refer to \href{https://github.com/EthanDeng/texworks-autocomplete}{\TeX{}works autocomplete}. \TeX{} Live 2022 + \TeX{}studio is strongly recommended. Related configurations can be found at \href{https://github.com/EthanDeng/vscode-latex}{vscode-latex} and \href{https://github.com/EthanDeng/sublime-text-latex}{sublime-text-latex}.
\item \question{Hello, we want to use ElegantBook to write a book about machine learning and would like your authorization.}
- Feel free to use our templates by pointing out our copyright. For other issues, please refer to LPPL-1.3c. If you want to show us your work, share the URL with us afterwards.
+ Feel free to use our templates by pointing out our copyright. For other issues, please refer to LPPL-1.3c. If you want to show us your work, you can share the URL with us afterwards.
\item \question{What is cross reference?}
This template is aimed at who are not a complete beginner for \LaTeX{}. Please learn more about \LaTeX{} before using this template.
\item \question{Is the language for code highlighting optional?}
@@ -637,9 +626,30 @@
\end{enumerate}
\chapter{Version History}
-We revised our templates now and then. This section shows the version story of ElegantBook. We have nearly 100 submits and 17 releases on GitHub since uploaded.
+We revised our templates now and then. This section shows the version story of ElegantBook.
+\datechange{2022/04/09}{release of v4.3.}
+
+\begin{change}
+ \item Remove part newtx settings, set TeX Gyre Terms/Heros fonts under \hologo{XeLaTeX}.
+ \item Fix Chinese fonts in the theorem environments.
+ \item Add theorem counter option, \lstinline{thmcnt=section}.
+ \item Add bib option \lstinline{bibend}, which can take value of biber and bibtex.
+ \item \textbf{! Warnings}: The multilingual option may cause some unexpected errors, you can report in this \href{https://github.com/ElegantLaTeX/ElegantBook/issues/170}{issue}.
+\end{change}
+
+
+
+\datechange{2022/03/08}{release of v4.2.}
+
+\begin{change}
+ \item Bug fix due to the update of newtx fonts;
+ \item Add `Chapter' in TOC, and redefine \lstinline{\chaptername} to unify the logic under different languages;
+ \item Add language option for Japanese, \lstinline{lang=jp}.
+\end{change}
+
+
\datechange{2021/05/02}{release of v4.1.}
\begin{change}
@@ -688,8 +698,9 @@
\end{change}
\nocite{en2,en3}
-\printbibliography
+\printbibliography[heading=bibintoc, title=\ebibname]
+
\appendix
% \renewcommand\chaptername{\eappendix \thechapter}
Deleted: trunk/Master/texmf-dist/doc/latex/elegantbook/image/cert.pdf
===================================================================
(Binary files differ)
Deleted: trunk/Master/texmf-dist/doc/latex/elegantbook/image/donate.jpg
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/elegantnote/elegantnote-cn.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/elegantnote/elegantnote-cn.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/elegantnote/elegantnote-cn.tex 2022-04-09 20:30:34 UTC (rev 62988)
+++ trunk/Master/texmf-dist/doc/latex/elegantnote/elegantnote-cn.tex 2022-04-09 20:32:58 UTC (rev 62989)
@@ -5,7 +5,7 @@
\author{邓东升}
\institute{Elegant\LaTeX{} Program}
-\version{2.30}
+\version{2.40}
\date{\zhtoday}
\usepackage{array}
@@ -18,10 +18,9 @@
\includegraphics[width=0.2\textwidth]{logo-blue.png}
}
-
\section{ElegantNote 使用说明}
-新版 ElegantNote 是基于标准的 \LaTeX{} 文类 article 重新设计的，格式更加简化的笔记模板！本模板支持两种编译方式，\hologo{pdfLaTeX} 和 \hologo{XeLaTeX}，英文模式下请使用 \hologo{pdfLaTeX} 进行编译，中文模式下推荐使用 \hologo{XeLaTeX}。
+新版 ElegantNote 是基于标准的 \LaTeX{} 文类 article 重新设计的，格式更加简化的笔记模板！本模板支持两种编译方式，\hologo{pdfLaTeX} 和 \hologo{XeLaTeX}，英文模式下请使用 \hologo{pdfLaTeX} 进行编译，中文模式下务必使用 \hologo{XeLaTeX}。
新模板有下面几个特性：
@@ -39,8 +38,6 @@
\item 支持参考格式显示格式修改 \lstinline{cite} 可选为 \lstinline{authoryear}、\lstinline{numbers} （默认）和 \lstinline{super}。
\end{itemize}
-本次更新：修复 \TeX{} Live 2020 更新之后因 \lstinline{gbt7714} 宏包更新用法导致模板出错的问题。
-
\subsection{模板模式}
本模板增加了模式选项，分别有护眼模式（\lstinline{mode=geye}）和朦胧模式（\lstinline{mode=hazy}）。其中护眼模式设置纸张底色为绿豆沙颜色，而朦胧模式为淡蓝色，开启的方法如下：
@@ -104,7 +101,7 @@
模板提供中文字体选项 \lstinline{chinesefont}，可选项有
\begin{enumerate}
\item \lstinline{ctexfont}：默认选项，使用 \lstinline{ctex} 宏包根据系统自行选择字体，可能存在字体缺失的问题，更多内容参考 \lstinline{ctex} 宏包\href{https://ctan.org/pkg/ctex}{官方文档}\footnote{可以使用命令提示符，输入 \lstinline{texdoc ctex} 调出本地 \lstinline{ctex} 宏包文档}。
-\item \lstinline{founder}：方正字体选项，调用 \lstinline{ctex} 宏包并且使用 \lstinline{fontset=none} 选项，然后设置字体为方正四款免费字体，方正字体下载注意事项见后文。
+\item \lstinline{founder}：方正字体选项（需要用户安装字体），调用 \lstinline{ctex} 宏包并且使用 \lstinline{fontset=none} 选项，然后设置字体为方正四款免费字体，方正字体下载注意事项见后文。
\item \lstinline{nofont}：调用 \lstinline{ctex} 宏包并且使用 \lstinline{fontset=none} 选项，不设定中文字体，用户可以自行设置中文字体，具体见后文。
\end{enumerate}
@@ -119,19 +116,19 @@
\end{figure}
\subsubsection{其他中文字体}
-如果你想完全自定义字体\footnote{这里仍然以方正字体为例。}，你可以选择 \lstinline{chinesefont=nofont}，然后在导言区设置
+如果你想完全自定义字体\footnote{这里仍然以方正字体为例。}，你可以选择 \lstinline{chinesefont=nofont}，然后在导言区设置，参考代码如下：
\begin{lstlisting}
-\setCJKmainfont[BoldFont={FZHei-B01},ItalicFont={FZKai-Z03}]{FZShuSong-Z01}
-\setCJKsansfont[BoldFont={FZHei-B01},ItalicFont={FZHei-B01}]{FZHei-B01}
-\setCJKmonofont[BoldFont={FZHei-B01},ItalicFont={FZHei-B01}]{FZFangSong-Z02}
-\setCJKfamilyfont{zhsong}{FZShuSong-Z01}
-\setCJKfamilyfont{zhhei}{FZHei-B01}
-\setCJKfamilyfont{zhkai}{FZKai-Z03}
-\setCJKfamilyfont{zhfs}{FZFangSong-Z02}
-\newcommand*{\songti}{\CJKfamily{zhsong}}
-\newcommand*{\heiti}{\CJKfamily{zhhei}}
-\newcommand*{\kaishu}{\CJKfamily{zhkai}}
-\newcommand*{\fangsong}{\CJKfamily{zhfs}}
+ \setCJKmainfont[BoldFont={FZHei-B01},ItalicFont={FZKai-Z03}]{FZShuSong-Z01}
+ \setCJKsansfont[BoldFont={FZHei-B01}]{FZKai-Z03}
+ \setCJKmonofont[BoldFont={FZHei-B01}]{FZFangSong-Z02}
+ \setCJKfamilyfont{zhsong}{FZShuSong-Z01}
+ \setCJKfamilyfont{zhhei}{FZHei-B01}
+ \setCJKfamilyfont{zhkai}[BoldFont={FZHei-B01}]{FZKai-Z03}
+ \setCJKfamilyfont{zhfs}[BoldFont={FZHei-B01}]{FZFangSong-Z02}
+ \newcommand*{\songti}{\CJKfamily{zhsong}}
+ \newcommand*{\heiti}{\CJKfamily{zhhei}}
+ \newcommand*{\kaishu}{\CJKfamily{zhkai}}
+ \newcommand*{\fangsong}{\CJKfamily{zhfs}}
\end{lstlisting}
@@ -232,84 +229,12 @@
回归分析（regression analysis) 是确定两种或两种以上变量间相互依赖的定量关系的一种统计分析方法。根据定理~\ref{thm:fubi}，其运用十分广泛，回归分析按照涉及的变量的多少，分为一元回归和多元回归分析；按照因变量的多少，可分为简单回归分析和多重回归分析；按照自变量和因变量之间的关系类型，可分为线性回归分析和非线性回归分析。
-\section{协作人员招募}
-
-招募 Elegant\LaTeX{} 的协作人员，没有工资。工作内容：翻译 Elegant\LaTeX{} 系列模板相关的文稿（中翻英），维护模板的 wiki（主要涉及 Markdown），如果有公众号文稿写作经历的话，也可以帮忙写微信稿。本公告长期有效。
-
-目前 ElegantLaTeX 共有 4 名协作人员，分别是
-\begin{itemize}
- \item 官方文档翻译: \href{https://github.com/peggy2006xzyz}{YPY};
- \item GitHub 维基维护: \href{https://github.com/izinngo}{Ingo Zinngo}、\href{https://github.com/xiaohao890809}{追寻原风景};
- \item QQ 群管理员: \href{https://github.com/sikouhjw}{Sikouhjw}.
-\end{itemize}
-
-在此感谢他们无私的奉献！
-
-
\section{致谢}
-截止到 2020 年 04 月 12 日，ElegantNote 2.30 版本发布，ElegantNote 模板在 GitHub 上的收藏数（star）达到了 263。在此特别感谢 China\TeX{} 以及 \href{http://www.latexstudio.net/}{\LaTeX{} 工作室}对于本系列模板的大力宣传与推广。如果你喜欢我们的模板，你可以在 GitHub 上收藏（Star）我们的模板。
+特别感谢 \href{https://github.com/sikouhjw}{sikouhjw} 和 \href{https://github.com/syvshc}{syvshc} 长期以来对于 Github 上 issue 的快速回应，以及各个社区论坛对于 ElegantLaTeX 相关问题的回复。特别感谢 ChinaTeX 以及 \href{http://www.latexstudio.net/}{LaTeX 工作室} 对于本系列模板的大力宣传与推广。
-\begin{figure}[htbp]
- \centering
- \includegraphics[width=\textwidth]{star.png}
- \caption{一键三连求赞}
-\end{figure}
+如果你喜欢我们的模板，你可以在 Github 上收藏我们的模板。
-
-\section{捐赠}
-
-如果您非常喜爱我们的模板，你还可以选择捐赠以表达您对我们模板和我的支持！
-
-\begin{figure}[htbp]
- \centering
- \includegraphics[width=0.4\textwidth]{donate.jpg}
-\end{figure}
-
-\textbf{赞赏费用的使用解释权归 Elegant\LaTeX{} 所有，并且不接受监督，请自愿理性打赏}。10 元以上的赞赏，我们将列入捐赠榜，并且发放捐赠纪念证（全部），谢谢各位金主！
-
-\begin{table}[htbp]
- \scriptsize
- \centering
- \caption{Elegant\LaTeX{} 系列模板捐赠榜}
- \begin{tabular}{*{8}{>{\scriptsize}c}}
- \toprule
- \textbf{捐赠者} & \textbf{金额} & \textbf{时间} & \textbf{渠道} & \textbf{捐赠者} & \textbf{金额} & \textbf{时间} & \textbf{渠道} \\
- \midrule
- Lerh & 10 RMB & 2019/05/15 & 微信 & 越过地平线 & 10 RMB & 2019/05/15 & 微信 \\
- 银桑 & 20 RMB & 2019/05/27 & 微信 & *空 & 10 RMB & 2019/05/30 & 微信 \\
- latexstudio.net & 666 RMB & 2019/06/05 & 支付宝 & A*n & 40 RMB & 2019/06/15 & 微信 \\
- * 夏 & 22 RMB & 2019/06/15 & 微信 & * 倩 & 21 RMB & 2019/06/15 & 微信 \\
- Cassis & 11 RMB & 2019/06/30 & 微信 & *君 & 10 RMB & 2019/07/23 & 微信 \\
- P*u & 50 RMB & 2019/07/30 & 微信 & *萌 & 19 RMB & 2019/08/28 & 微信 \\
- 曲豆豆 & 10 RMB & 2019/08/28 & 微信 & 李博 & 100 RMB & 2019/10/06 & 微信 \\
- Njustsll & 10 RMB & 2019/10/11 & 微信 & 刘志阔 & 99.99 RMB & 2019/10/15 & 支付宝 \\
- * 韬 & 16 RMB & 2019/10/17 & 微信 & 赤霓 & 12 RMB & 2019/10/17 & 支付宝 \\
- 追寻原风景 & 10 RMB & 2019/10/28 & 微信 & 郭德良 & 88 RMB & 2019/11/03 & 微信 \\
- 自强不息 & 20 RMB & 2019/11/04 & 支付宝 & 读书之虫 & 20 RMB & 2019/11/18 & 微信 \\
- *等 & 10 RMB & 2019/11/18 & 微信 & *哲 & 20 RMB & 2019/11/18 & 微信 \\
- 佚名 & 10 RMB & 2019/11/24 & 微信 & Jiye Qian & 66 RMB & 2019/12/04 & 微信 \\
- * 阳 & 20 RMB & 2019/12/05 & 微信 & Catcher & 11 RMB & 2019/12/08 & 支付宝 \\
- 希尔波特门徒 & 10 RMB & 2019/12/09 & 支付宝 & * 伟 & 10 RMB & 2019/12/09 & 微信 \\
- Simon & 20 RMB & 2019/12/11 & 支付宝 & 流殇丶浅忆 & 66.60 RMB & 2019/12/18 & 支付宝 \\
- 羽 & 10 RMB & 2019/12/20 & 支付宝 & * 琛 & 15 RMB & 2019/12/20 & 微信 \\
- 随风 & 20 RMB & 2019/12/27 & 支付宝 & Ws & 23.30 RMB & 2019/12/28 & 微信 \\
- 初八 & 100 RMB & 2020/01/02 & 支付宝 & p*e & 20 RMB & 2020/01/03 & 微信 \\
- Shunmx & 100 RMB & 2020/01/03 & 微信 & hj & 10 RMB & 2020/01/03 & 微信 \\
- F*5 & 10 RMB & 2020/01/03 & 微信 & S*m & 20.20 RMB & 2020/01/03 & 微信 \\
- 二代青雉 & 13 RMB & 2020/01/14 & 支付宝 & *? & 66 RMB & 2020/01/15 & 微信 \\
- Mr. Xiong & 20 RMB & 2020/01/17 & 微信 & *博 & 15 RMB & 2020/01/18 & 微信 \\
- * 者 & 10 RMB & 2020/02/02 & 微信 & Jackie & 88.80 RMB & 2020/02/09 & 微信 \\
- Henry\_Sun、 & 50 RMB & 2020/02/14 & 支付宝 & * 桥 & 50 RMB & 2020/02/21 & 微信 \\
- 昀琏 & 10 RMB & 2020/03/02 & 支付宝 & S*y & 10 RMB & 2020/03/15 & 微信 \\
- * 哥 & 66.66 RMB & 2020/03/17 & 微信 & K*e & 30 RMB & 2020/03/30 & 微信\\
- * 阳 & 20 RMB & 2020/04/02 & 微信 & 士*n & 30 RMB & 2020/04/11 & 微信 \\
- \bottomrule
- \end{tabular}%
- \label{tab:donation}%
-\end{table}%
-
-
\section{常见问题 FAQ}
\begin{enumerate}[label=\arabic*).]
@@ -326,4 +251,6 @@
\end{lstlisting}
\end{enumerate}
+%\printbibliography[heading=bibintoc, title=\ebibname]
+
\end{document}
Modified: trunk/Master/texmf-dist/doc/latex/elegantnote/elegantnote-en.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/elegantnote/elegantnote-en.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/elegantnote/elegantnote-en.tex 2022-04-09 20:30:34 UTC (rev 62988)
+++ trunk/Master/texmf-dist/doc/latex/elegantnote/elegantnote-en.tex 2022-04-09 20:32:58 UTC (rev 62989)
@@ -5,7 +5,7 @@
\author{Dongsheng Deng}
\institute{Elegant\LaTeX{} Program}
-\version{2.30}
+\version{2.40}
\date{\today}
\begin{document}
@@ -15,7 +15,7 @@
\section{ElegantNote Instructions}
\thispagestyle{empty}
-The brand new ElegantNote is redesigned on the basis of \LaTeX{} article, a more elegant note template! You can use either \hologo{pdfLaTeX} or \hologo{XeLaTeX} to compile\footnote{The test environment is Win10 + \TeX{} Live 2019.}. It is recommended that \hologo{pdfLaTeX} be used for notes in English while \hologo{XeLaTeX} be used for notes in Chinese.
+The brand new ElegantNote is redesigned on the basis of \LaTeX{} article, a more elegant note template! You can use either \hologo{pdfLaTeX} or \hologo{XeLaTeX} to compile. It is recommended that \hologo{pdfLaTeX} be used for notes in English while \hologo{XeLaTeX} be used for notes in Chinese.
The new template has the following features:
\begin{itemize}
@@ -31,8 +31,6 @@
\item change the citation style with \lstinline{cite} option: \lstinline{authoryear}, \lstinline{numbers} and \lstinline{super}.
\end{itemize}
-This update is to resolve \TeX{} Live 2020 compilation errors caused by \lstinline{gbt7714} compatibility issues.
-
\subsection{Optional Modes}
This template provides optional modes: good for eye mode (geye) and hazy mode, while the paper color is green for the former and light blue for the latter. you can use the following code to activate the desired mode:
@@ -206,81 +204,11 @@
\end{itemize}
-\section{Recruit Support Members}
-
-Recruit support members for Elegant\LaTeX{} to translate template official guide, maintain wiki entries, update Wechat articles. No deadline for this recruitment.
-
-So far, Elegant\LaTeX{} has four support members:
-\begin{itemize}
- \item OG Translator: \href{https://github.com/peggy2006xzyz}{YPY};
- \item Wiki Maintainer: \href{https://github.com/izinngo}{Ingo Zinngo}, \href{https://github.com/xiaohao890809}{Xiaohao890809};
- \item QQ Group Manager: \href{https://github.com/sikouhjw}{Sikouhjw}.
-\end{itemize}
-
-Thank them all!!!
-
\section{Acknowledgement}
-The number of stars on GitHub for ElegantPaper reached 176 on April 12, 2020 at the release of ElegantNote v2.20.
-Thank China\TeX{} and \href{http://www.latexstudio.net/}{\LaTeX{} studio} for their promotion.
-If you like our templates, star on GitHub.
-\begin{figure}[!ht]
- \centering
- \includegraphics[width=\textwidth]{star.png}
- \caption{Twinkle, Twinkle, Little Star}
-\end{figure}
+Thank \href{https://github.com/sikouhjw}{sikouhjw} and \href{https://github.com/syvshc}{syvshc} for their quick response to Github issues and continuously support work for ElegantLaTeX. Thank ChinaTeX and \href{http://www.latexstudio.net/}{LaTeX Studio} for their promotion.
-\section{Donation}
-To express your love for our templates and/or our developers, please do not hesitate to tip us.
-\begin{figure}[!htbp]
- \centering
- \includegraphics[width=0.4\textwidth]{donate.jpg}
-\end{figure}
-\textbf{The explanation right of the tip usage belongs to Elegant\LaTeX{} with no supervision. Feel free to tip us.} Those who donate more than 10 RMB will be recorded in the donation list and will receive a donation certificate. Thank all the tippers!
-
-\begin{table}[htbp]
- \centering
- \scriptsize
- \caption{Donation List}
- \begin{tabular}{cccccccc}
- \toprule
- \textbf{Tipper} & \textbf{Amount} & \textbf{Date} & \textbf{Channel} & \textbf{Tipper} & \textbf{Amount} & \textbf{Date} & \textbf{Channel} \\
- \midrule
- Lerh & 10 RMB & 2019/05/15 & Wechat & yueguodipingxian & 10 RMB & 2019/05/15 & Wechat \\
- yinsang & 20 RMB & 2019/05/27 & Wechat & *kong & 10 RMB & 2019/05/30 & Wechat \\
- latexstudio.net & 666 RMB & 2019/06/05 & Alipay & A*n & 40 RMB & 2019/06/15 & Wechat \\
- * xia & 22 RMB & 2019/06/15 & Wechat & * qian & 21 RMB & 2019/06/15 & Wechat \\
- Cassis & 11 RMB & 2019/06/30 & Wechat & * jun & 10 RMB & 2019/07/23 & Wechat \\
- P*u & 50 RMB & 2019/07/30 & Wechat & * meng & 19 RMB & 2019/08/28 & Wechat \\
- Qu Doudou & 10 RMB & 2019/08/28 & Wechat & Li Bo & 100 RMB & 2019/10/06 & Wechat \\
- Njustsll & 10 RMB & 2019/10/11 & Wechat & Liu Zhikuo & 99.99 RMB & 2019/10/15 & Alipay \\
- * tao & 16 RMB & 2019/10/17 & Wechat & Chini & 12 RMB & 2019/10/17 & Alipay \\
- yuanfengjing & 10 RMB & 2019/10/28 & Wechat & Guo Deliang & 88 RMB & 2019/11/03 & Wechat \\
- ziqiangbuxi & 20 RMB & 2019/11/04 & Alipay & dushuzhichong & 20 RMB & 2019/11/18 & Wechat \\
- * deng & 10 RMB & 2019/11/18 & Wechat & * zhe & 20 RMB & 2019/11/18 & Wechat \\
- anonymous & 10 RMB & 2019/11/24 & Wechat & Jiye Qian & 66 RMB & 2019/12/04 & Wechat \\
- * yang & 20 RMB & 2019/12/05 & Wechat & Catcher & 11 RMB & 2019/12/08 & Alipay \\
- xierbotementu & 10 RMB & 2019/12/09 & Alipay & * wei & 10 RMB & 2019/12/09 & Wechat \\
- Simon & 20 RMB & 2019/12/11 & Alipay & liushangqianyi & 66.60 RMB & 2019/12/18 & Alipay \\
- yu & 10 RMB & 2019/12/20 & Alipay & *chen & 15 RMB & 2019/12/20 & Wechat \\
- suifeng & 20 RMB & 2019/12/27 & Alipay & Ws & 23.30 RMB & 2019/12/28 & Wechat \\
- chuba & 100 RMB & 2020/01/02 & Alipay & p*e & 20 RMB & 2020/01/03 & Wechat \\
- Shunmx & 100 RMB & 2020/01/03 & Wechat & hj & 10 RMB & 2020/01/03 & Wechat \\
- F*5 & 10 RMB & 2020/01/03 & Wechat & S*m & 20.20 RMB & 2020/01/03 & Wechat \\
- erdaiqingzhi & 13 RMB & 2020/01/14 & Alipay & *? & 66 RMB & 2020/01/15 & Wechat \\
- Mr. Xiong & 20 RMB & 2020/01/17 & Wechat & *bo & 15 RMB & 2020/01/18 & Wechat \\
- *Zhe & 10 RMB & 2020/02/02 & Wechat & Jackie & 88.80 RMB & 2020/02/09 & Wechat \\
- Henry\_Sun & 50 RMB & 2020/02/14 & Alipay & * Qiao & 50 RMB & 2020/02/21 & Wechat \\
- YunLian & 10 RMB & 2020/03/02 & Alipay & S*y & 10 RMB & 2020/03/15 & Wechat \\
- * Ge & 66.66 RMB & 2020/03/17 & Wechat & K*e & 30 RMB & 2020/03/30 & Wechat\\
- * Yang & 20 RMB & 2020/04/02 & Wechat & Shi*n & 30 RMB & 2020/04/11 & Wechat \\
-\bottomrule
-\end{tabular}%
- \label{tab:donation}%
-\end{table}%
-
-
\section{FAQ}
\begin{enumerate}[label=\arabic*).]
@@ -296,4 +224,6 @@
\end{enumerate}
+%\printbibliography[heading=bibintoc, title=\ebibname]
+
\end{document}
Deleted: trunk/Master/texmf-dist/doc/latex/elegantnote/image/donate.jpg
===================================================================
(Binary files differ)
Deleted: trunk/Master/texmf-dist/doc/latex/elegantnote/image/star.png
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/elegantpaper/elegantpaper-cn.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/elegantpaper/elegantpaper-cn.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/elegantpaper/elegantpaper-cn.tex 2022-04-09 20:30:34 UTC (rev 62988)
+++ trunk/Master/texmf-dist/doc/latex/elegantpaper/elegantpaper-cn.tex 2022-04-09 20:32:58 UTC (rev 62989)
@@ -1,12 +1,12 @@
%!TEX program = xelatex
-% 完整编译: xelatex -> bibtex -> xelatex -> xelatex
-\documentclass[lang=cn,11pt,a4paper,cite=authoryear]{elegantpaper}
+% 完整编译: xelatex -> biber/bibtex -> xelatex -> xelatex
+\documentclass[lang=cn,11pt,a4paper]{elegantpaper}
\title{ElegantPaper: 一个优美的 \LaTeX{} 工作论文模板}
\author{Ethan DENG \\ Fudan University \and Dongsheng DENG \\ PA Technology}
\institute{\href{https://elegantlatex.org/}{Elegant\LaTeX{} 项目组}}
-\version{0.09}
+\version{0.10}
\date{\zhtoday}
@@ -24,12 +24,21 @@
\end{abstract}
-
\section{模板使用须知}
+\subsection{注意事项}
+
+时隔两年，本模板迎来更新，中间发生了很多变化，两个主要变化是参考文献与字体设定，\textbf{使用前请务必仔细阅读本文档}。
+
+\textbf{文献部分}：我们将 bibtex 的默认文献编译方式改为 biblatex，不过我们也提供了两个后端，\lstinline{bibend=biber} 和 \lstinline{bibend=bibtex}。特别需要注意的是，从 0.10 开始，文献文件改为 \lstinline{reference.bib}，与 ElegantBook 保持一致，而参考文献的引文样式等更多格式，请参考后文参考文献部分，更多样式可以参考 biblatex 文档。
+
+\textbf{字体部分}，我们将 newtxtext 宏包的支持方式改为了字体名称设定方式，设定英文字体为 TeX Gyre Terms/Heros，，英文字体部分，根据编译方式选择不同字体。对于一般用户而言，不太需要关心这部分内容。
+
+另外，中文请务必使用 \hologo{XeLaTeX} 编译。
+
\subsection{模板介绍}
-此模板基于 \LaTeX{} 的标准文类 article 设计，所以 article 文类的选项也能传递给本模板，比如 \lstinline{a4paper, 11pt} 等等。本模板支持 \hologo{pdfLaTeX} 和 \hologo{XeLaTeX} 编译。
+此模板基于 \LaTeX{} 的标准文类 article 设计，所以 article 文类的选项也能传递给本模板，比如 \lstinline{a4paper, 11pt} 等等。
\begin{lstlisting}
\documentclass[a4paper,11pt]{elegantpaper}
@@ -60,15 +69,14 @@
\end{enumerate}
\subsection{中文字体选项}
+
模板提供中文字体选项 \lstinline{chinesefont}，可选项有
\begin{enumerate}
-\item \lstinline{ctexfont}：默认选项，使用 \lstinline{ctex} 宏包根据系统自行选择字体，可能存在字体缺失的问题，更多内容参考 \lstinline{ctex} 宏包\href{https://ctan.org/pkg/ctex}{官方文档}\footnote{可以使用命令提示符，输入 \lstinline{texdoc ctex} 调出本地 \lstinline{ctex} 宏包文档}。
-\item \lstinline{founder}：方正字体选项，调用 \lstinline{ctex} 宏包并且使用 \lstinline{fontset=none} 选项，然后设置字体为方正四款免费字体，方正字体下载注意事项见后文。
-\item \lstinline{nofont}：调用 \lstinline{ctex} 宏包并且使用 \lstinline{fontset=none} 选项，不设定中文字体，用户可以自行设置中文字体，具体见后文。
+ \item \lstinline{ctexfont}：默认选项，使用 \lstinline{ctex} 宏包根据系统自行选择字体，可能存在字体缺失的问题，更多内容参考 \lstinline{ctex} 宏包\href{https://ctan.org/pkg/ctex}{官方文档}\footnote{可以使用命令提示符，输入 \lstinline{texdoc ctex} 调出本地 \lstinline{ctex} 宏包文档}。
+ \item \lstinline{founder}：方正字体选项（\textbf{需要安装方正字体}），后台调用 \lstinline{ctex} 宏包并且使用 \lstinline{fontset=none} 选项，然后设置字体为方正四款免费字体，方正字体下载注意事项见后文，用户只需要安装方正字体即可使用该选项。
+ \item \lstinline{nofont}：后台会调用 \lstinline{ctex} 宏包并且使用 \lstinline{fontset=none} 选项，不设定中文字体，用户可以自行设置中文字体，具体见后文。
\end{enumerate}
-\noindent \textbf{注意：} 使用 \lstinline{founder} 选项或者 \lstinline{nofont} 时，必须使用 \hologo{XeLaTeX} 进行编译。
-
\subsubsection{方正字体选项}
由于使用 \lstinline{ctex} 宏包默认调用系统已有的字体，部分系统字体缺失严重，因此，用户希望能够使用其它字体，我们推荐使用方正字体。方正的{\songti 方正书宋}、{\heiti 方正黑体}、{\kaishu 方正楷体}、{\fangsong 方正仿宋}四款字体均可免费试用，且可用于商业用途。用户可以自行从\href{http://www.foundertype.com/}{方正字体官网}下载此四款字体，在下载的时候请\textbf{务必}注意选择 GBK 字符集，也可以使用 \href{https://www.latexstudio.net/}{\LaTeX{} 工作室}提供的\href{https://pan.baidu.com/s/1BgbQM7LoinY7m8yeP25Y7Q}{方正字体，提取码为：njy9} 进行安装。安装时，{\kaishu Win 10 用户请右键选择为全部用户安装，否则会找不到字体。}
@@ -78,15 +86,15 @@
\end{figure}
\subsubsection{其他中文字体}
-如果你想完全自定义字体\footnote{这里仍然以方正字体为例。}，你可以选择 \lstinline{chinesefont=nofont}，然后在导言区设置
+如果你想完全自定义字体\footnote{这里仍然以方正字体为例。}，你可以选择 \lstinline{chinesefont=nofont}，然后在导言区设置即可，可以参考下方代码：
\begin{lstlisting}
\setCJKmainfont[BoldFont={FZHei-B01},ItalicFont={FZKai-Z03}]{FZShuSong-Z01}
-\setCJKsansfont[BoldFont={FZHei-B01},ItalicFont={FZHei-B01}]{FZHei-B01}
-\setCJKmonofont[BoldFont={FZHei-B01},ItalicFont={FZHei-B01}]{FZFangSong-Z02}
+\setCJKsansfont[BoldFont={FZHei-B01}]{FZKai-Z03}
+\setCJKmonofont[BoldFont={FZHei-B01}]{FZFangSong-Z02}
\setCJKfamilyfont{zhsong}{FZShuSong-Z01}
\setCJKfamilyfont{zhhei}{FZHei-B01}
-\setCJKfamilyfont{zhkai}{FZKai-Z03}
-\setCJKfamilyfont{zhfs}{FZFangSong-Z02}
+\setCJKfamilyfont{zhkai}[BoldFont={FZHei-B01}]{FZKai-Z03}
+\setCJKfamilyfont{zhfs}[BoldFont={FZHei-B01}]{FZFangSong-Z02}
\newcommand*{\songti}{\CJKfamily{zhsong}}
\newcommand*{\heiti}{\CJKfamily{zhhei}}
\newcommand*{\kaishu}{\CJKfamily{zhkai}}
@@ -94,6 +102,7 @@
\end{lstlisting}
+
\subsection{自定义命令}
此模板并没有修改任何默认的 \LaTeX{} 命令或者环境\footnote{目的是保证代码的可复用性，请用户关注内容，不要太在意格式，这才是本工作论文模板的意义。}。另外，我自定义了 4 个命令：
\begin{enumerate}
@@ -104,131 +113,37 @@
\end{enumerate}
\subsection{参考文献}
-此模板使用 \hologo{BibTeX} 来生成参考文献，中文模式下默认使用的文献样式（bib style）是 \lstinline{GB/T 7714-2015}\footnote{通过调用 \href{https://ctan.org/pkg/gbt7714}{\lstinline{gbt7714}} 宏包}。参考文献示例：~\cite{en3} 使用了中国一个大型的 P2P 平台（人人贷）的数据来检验男性投资者和女性投资者在投资表现上是否有显著差异。
-你可以在谷歌学术，Mendeley，Endnote 中获得文献条目（bib item），然后把它们添加到 \lstinline{wpref.bib} 中。在文中引用的时候，引用它们的键值（bib key）即可。注意需要在编译的过程中添加 \hologo{BibTeX} 编译。
+文献部分，本模板调用了 biblatex 宏包，并提供了 biber（默认） 和 bibtex 两个后端选项，可以使用 \lstinline{bibend} 进行修改：
-本模板还添加了 \lstinline{cite=numbers} 、\lstinline{cite=super} 和 \lstinline{cite=authoryear} 三个参考文献选项，用于设置参考文献格式的设置，默认为 \lstinline{numbers}。理工科类一般使用数字形式 \lstinline{numbers} 或者上标形式 \lstinline{super}，而文科类多使用作者-年份 \lstinline{authoryear} 比较多。如果需要改为 \lstinline{cite=numbers} 或者 \lstinline{authoryear} ，可以使用
\begin{lstlisting}
-\documentclass[cite=super]{elegantpaper} % super style ref style
-\documentclass[super]{elegantpaper}
-
-\documentclass[cite=authoryear]{elegantpaper} % author-year ref style
-\documentclass[authoryear]{elegantpaper}
+ \documentclass[bibtex]{elegantpaper}
+ \documentclass[bibend=bibtex]{elegantpaper}
\end{lstlisting}
+关于文献条目（bib item），你可以在谷歌学术，Mendeley，Endnote 中取，然后把它们添加到 \lstinline{reference.bib} 中。在文中引用的时候，引用它们的键值（bib key）即可。
-\section{协作人员招募}
-招募 Elegant\LaTeX{} 的协作人员，没有工资。工作内容：翻译 Elegant\LaTeX{} 系列模板相关的文稿（中翻英），维护模板的 wiki（主要涉及 Markdown），如果有公众号文稿写作经历的话，也可以帮忙写微信稿。本公告长期有效。
+为了方便文献样式修改，模板引入了 \lstinline{bibstyle} 和 \lstinline{citestyle} 选项，默认均为数字格式（numeric），参考文献示例：\cite{cn1,en2,en3} 使用了中国一个大型的 P2P 平台（人人贷）的数据来检验男性投资者和女性投资者在投资表现上是否有显著差异。
-目前 ElegantLaTeX 共有 4 名协作人员，分别是
-\begin{itemize}
- \item 官方文档翻译: \href{https://github.com/peggy2006xzyz}{YPY};
- \item GitHub 维基维护: \href{https://github.com/izinngo}{Ingo Zinngo}、\href{https://github.com/xiaohao890809}{追寻原风景};
- \item QQ 群管理员: \href{https://github.com/sikouhjw}{Sikouhjw}.
-\end{itemize}
+如果需要设置为国标 GB7714-2015，需要使用：
+\begin{lstlisting}
+ \documentclass[citestyle=gb7714-2015, bibstyle=gb7714-2015]{elegantpaper}
+\end{lstlisting}
-在此感谢他们无私的奉献！
-
-
-\section{致谢}
-截止到 2020 年 04 月 12 日，ElegantPaper v0.09 版本发布，ElegantPaper 模板在 GitHub 上的收藏数（star）达到了 277。在此特别感谢 China\TeX{} 以及 \href{http://www.latexstudio.net/}{\LaTeX{} 工作室}对于本系列模板的大力宣传与推广。如果你喜欢我们的模板，你可以在 GitHub 上收藏（Star）我们的模板。
-\begin{figure}[htbp]
- \centering
- \includegraphics[width=\textwidth]{star.png}
- \caption{一键三连求赞}
-\end{figure}
-
-\section{捐赠}
-如果您非常喜爱我们的模板，你还可以选择捐赠以表达您对我们模板和我的支持！
-
-\begin{figure}[htbp]
- \centering
- \includegraphics[width=0.5\textwidth]{donate.jpg}
-\end{figure}
-
-\textbf{赞赏费用的使用解释权归 Elegant\LaTeX{} 所有，并且不接受监督，请自愿理性打赏}。10 元以上的赞赏，我们将列入捐赠榜，谢谢各位金主！
-
-
-\begin{table}[!htb]
- \centering
- \caption{Elegant\LaTeX{} 系列模板捐赠榜}
- \begin{tabular}{*{4}{>{\scriptsize}c}|*{4}{>{\scriptsize}c}}
- \hline
- \textbf{捐赠者} & \textbf{金额} & \textbf{时间} & \textbf{渠道} & \textbf{捐赠者} & \textbf{金额} & \textbf{时间} & \textbf{渠道} \\
- \hline
- Lerh & 10 RMB & 2019/05/15 & 微信 & 越过地平线 & 10 RMB & 2019/05/15 & 微信 \\
- 银桑 & 20 RMB & 2019/05/27 & 微信 & *空 & 10 RMB & 2019/05/30 & 微信 \\
- latexstudio.net & 666 RMB & 2019/06/05 & 支付宝 & A*n & 40 RMB & 2019/06/15 & 微信 \\
- * 夏 & 22 RMB & 2019/06/15 & 微信 & * 倩 & 21 RMB & 2019/06/15 & 微信 \\
- Cassis & 11 RMB & 2019/06/30 & 微信 & *君 & 10 RMB & 2019/07/23 & 微信 \\
- P*u & 50 RMB & 2019/07/30 & 微信 & *萌 & 19 RMB & 2019/08/28 & 微信 \\
- 曲豆豆 & 10 RMB & 2019/08/28 & 微信 & 李博 & 100 RMB & 2019/10/06 & 微信 \\
- Njustsll & 10 RMB & 2019/10/11 & 微信 & 刘志阔 & 99.99 RMB & 2019/10/15 & 支付宝 \\
- * 韬 & 16 RMB & 2019/10/17 & 微信 & 赤霓 & 12 RMB & 2019/10/17 & 支付宝 \\
- 追寻原风景 & 10 RMB & 2019/10/28 & 微信 & 郭德良 & 88 RMB & 2019/11/03 & 微信 \\
- 自强不息 & 20 RMB & 2019/11/04 & 支付宝 & 读书之虫 & 20 RMB & 2019/11/18 & 微信 \\
- *等 & 10 RMB & 2019/11/18 & 微信 & *哲 & 20 RMB & 2019/11/18 & 微信 \\
- 佚名 & 10 RMB & 2019/11/24 & 微信 & Jiye Qian & 66 RMB & 2019/12/04 & 微信 \\
- * 阳 & 20 RMB & 2019/12/05 & 微信 & Catcher & 11 RMB & 2019/12/08 & 支付宝 \\
- 希尔波特门徒 & 10 RMB & 2019/12/09 & 支付宝 & * 伟 & 10 RMB & 2019/12/09 & 微信 \\
- Simon & 20 RMB & 2019/12/11 & 支付宝 & 流殇丶浅忆 & 66.60 RMB & 2019/12/18 & 支付宝 \\
- 羽 & 10 RMB & 2019/12/20 & 支付宝 & * 琛 & 15 RMB & 2019/12/20 & 微信 \\
- 随风 & 20 RMB & 2019/12/27 & 支付宝 & Ws & 23.30 RMB & 2019/12/28 & 微信 \\
- 初八 & 100 RMB & 2020/01/02 & 支付宝 & p*e & 20 RMB & 2020/01/03 & 微信 \\
- Shunmx & 100 RMB & 2020/01/03 & 微信 & hj & 10 RMB & 2020/01/03 & 微信 \\
- F*5 & 10 RMB & 2020/01/03 & 微信 & S*m & 20.20 RMB & 2020/01/03 & 微信 \\
- 二代青雉 & 13 RMB & 2020/01/14 & 支付宝 & *? & 66 RMB & 2020/01/15 & 微信 \\
- Mr. Xiong & 20 RMB & 2020/01/17 & 微信 & *博 & 15 RMB & 2020/01/18 & 微信 \\
- * 者 & 10 RMB & 2020/02/02 & 微信 & Jackie & 88.80 RMB & 2020/02/09 & 微信 \\
- Henry\_Sun、 & 50 RMB & 2020/02/14 & 支付宝 & * 桥 & 50 RMB & 2020/02/21 & 微信 \\
- 昀琏 & 10 RMB & 2020/03/02 & 支付宝 & S*y & 10 RMB & 2020/03/15 & 微信 \\
- * 哥 & 66.66 RMB & 2020/03/17 & 微信 & K*e & 30 RMB & 2020/03/30 & 微信\\
- * 阳 & 20 RMB & 2020/04/02 & 微信 & 士*n & 30 RMB & 2020/04/11 & 微信 \\
- \hline
- \end{tabular}%
- \label{tab:donation}%
-\end{table}%
-
-\section{常见问题 FAQ}
-
-\begin{enumerate}[label=\arabic*).]
- \item \textit{如何删除版本信息？}\\
- 导言区不写 \lstinline|\version{x.xx}| 即可。
- \item \textit{如何删除日期？}\\
- 需要注意的是，与版本 \lstinline{\version} 不同的是，导言区不写或注释 \lstinline{\date} 的话，仍然会打印出当日日期，原因是 \lstinline{\date} 有默认参数。如果不需要日期的话，日期可以留空即可，也即 \lstinline|\date{}|。
- \item \textit{如何获得中文日期？}\\
- 为了获得中文日期，必须在中文模式下\footnote{英文模式下，由于未加载中文宏包，无法输入中文。}，使用 \lstinline|\date{\zhdate{2019/10/11}}|，如果需要当天的汉化日期，可以使用 \lstinline|\date{\zhtoday}|，这两个命令都来源于 \href{https://ctan.org/pkg/zhnumber}{\lstinline{zhnumber}} 宏包。
- \item \textit{如何添加多个作者？}\\
- 在 \lstinline{\author} 里面使用 \lstinline{\and}，作者单位可以用 \lstinline{\\} 换行。\begin{lstlisting}
-\author{author 1\\ org. 1 \and author 2 \\ org. 2 }
+如果需要添加排序方式，可以在导言区加入
+\begin{lstlisting}
+ \ExecuteBibliographyOptions{sorting=ynt}
\end{lstlisting}
- \item \textit{如何添加中英文摘要？}\\
- 请参考 \href{https://github.com/ElegantLaTeX/ElegantPaper/issues/5}{GitHub::ElegantPaper/issues/5}
-\end{enumerate}
-\section{示例}
+启用国标之后，可以加入 \lstinline{sorting=gb7714-2015}。
-为了让大家更加清楚最终的论文效果，如下给出两篇使用 ElegantPaper 模板排版的工作论文示例，也欢迎大家“投稿”！
-\begin{enumerate}
- \item \href{https://github.com/EthanDeng/bank-custody}{银行存管、投资者决策与 P2P 网络借贷规范发展}；
- \item \href{https://github.com/EthanDeng/risk-awareness}{互联网金融风险与投资者风险意识 —— 来自网贷平台交易数据的证据}。
-\end{enumerate}
-
-
-\nocite{*}
-\bibliography{wpref}
-
-\appendix
-%\appendixpage
-\addappheadtotoc
\section{使用 newtx 系列字体}
如果需要使用原先版本的 \lstinline{newtx} 系列字体，可以通过显示声明数学字体：
\begin{lstlisting}
-\documentclass[math=newtx]{elegantbook}
+\documentclass[math=newtx]{elegantpaper}
\end{lstlisting}
\subsection{连字符}
@@ -237,7 +152,7 @@
\begin{equation}
\int_{R^q} f(x,y) dy.\emph{of\kern0pt f}
\end{equation}
-的代码为
+
\begin{lstlisting}
\begin{equation}
\int_{R^q} f(x,y) dy.\emph{of \kern0pt f}
@@ -246,7 +161,7 @@
\subsection{宏包冲突}
-另外在 ElegantBook 模板中，有用户反馈模板在使用 \lstinline{yhmath} 以及 \lstinline{esvect} 等宏包时会报错：
+有用户反馈模板在使用 \lstinline{yhmath} 以及 \lstinline{esvect} 等宏包时会报错：
\begin{lstlisting}
LaTeX Error:
Too many symbol fonts declared.
@@ -255,16 +170,38 @@
原因是在使用 \lstinline{newtxmath} 宏包时，重新定义了数学字体用于大型操作符，达到了 {\heiti 最多 16 个数学字体} 的上限，在调用其他宏包的时候，无法新增数学字体。为了减少调用非常用宏包，在此给出如何调用 \lstinline{yhmath} 以及 \lstinline{esvect} 宏包的方法。
请在 \lstinline{elegantpaper.cls} 内搜索 \lstinline{yhmath} 或者 \lstinline{esvect}，将你所需要的宏包加载语句\textit{取消注释}即可。
-\begin{lstlisting}
-%%% use yhmath pkg, uncomment following code
-% \let\oldwidering\widering
-% \let\widering\undefined
-% \RequirePackage{yhmath}
-% \let\widering\oldwidering
-%%% use esvect pkg, uncomment following code
-% \RequirePackage{esvect}
-\end{lstlisting}
+\section{常见问题 FAQ}
+\begin{enumerate}[label=\arabic*).]
+ \item \textit{如何删除版本信息？}\\
+ 导言区不写 \lstinline|\version{x.xx}| 即可。
+ \item \textit{如何删除日期？}\\
+ 需要注意的是，与版本 \lstinline{\version} 不同的是，导言区不写或注释 \lstinline{\date} 的话，仍然会打印出当日日期，原因是 \lstinline{\date} 有默认参数。如果不需要日期的话，日期可以留空即可，也即 \lstinline|\date{}|。
+ \item \textit{如何获得中文日期？}\\
+ 为了获得中文日期，必须在中文模式下\footnote{英文模式下，由于未加载中文宏包，无法输入中文。}，使用 \lstinline|\date{\zhdate{2019/10/11}}|，如果需要当天的汉化日期，可以使用 \lstinline|\date{\zhtoday}|，这两个命令都来源于 \href{https://ctan.org/pkg/zhnumber}{\lstinline{zhnumber}} 宏包。
+ \item \textit{如何添加多个作者？}\\
+ 在 \lstinline{\author} 里面使用 \lstinline{\and}，作者单位可以用 \lstinline{\\} 换行。
+ \begin{lstlisting}
+ \author{author 1\\ org. 1 \and author 2 \\ org. 2 }
+ \end{lstlisting}
+ \item \textit{如何添加中英文摘要？}\\
+ 请参考 \href{https://github.com/ElegantLaTeX/ElegantPaper/issues/5}{GitHub::ElegantPaper/issues/5}
+\end{enumerate}
+
+
+\section{致谢}
+
+特别感谢 \href{https://github.com/sikouhjw}{sikouhjw} 和 \href{https://github.com/syvshc}{syvshc} 长期以来对于 Github 上 issue 的快速回应，以及各个社区论坛对于 ElegantLaTeX 相关问题的回复。特别感谢 ChinaTeX 以及 \href{http://www.latexstudio.net/}{LaTeX 工作室} 对于本系列模板的大力宣传与推广。
+
+如果你喜欢我们的模板，你可以在 Github 上收藏我们的模板。
+
+\nocite{*}
+\printbibliography[heading=bibintoc, title=\ebibname]
+
+\appendix
+%\appendixpage
+\addappheadtotoc
+
\end{document}
Modified: trunk/Master/texmf-dist/doc/latex/elegantpaper/elegantpaper-en.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/elegantpaper/elegantpaper-en.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/elegantpaper/elegantpaper-en.tex 2022-04-09 20:30:34 UTC (rev 62988)
+++ trunk/Master/texmf-dist/doc/latex/elegantpaper/elegantpaper-en.tex 2022-04-09 20:32:58 UTC (rev 62989)
@@ -1,12 +1,12 @@
%!TEX program = pdflatex
-% Full chain: pdflatex -> bibtex -> pdflatex -> pdflatex
-\documentclass[11pt,en,cite=authoryear]{elegantpaper}
+% Full chain: pdflatex -> biber/bibtex -> pdflatex -> pdflatex
+\documentclass[11pt,en]{elegantpaper}
\title{ElegantPaper: An Elegant \LaTeX{} Template for Working Papers}
\author{Ethan DENG \\ Fudan University \and Dongsheng DENG \\ PA Technology}
\institute{\href{https://github.com/ElegantLaTeX}{Elegant\LaTeX{} Program}}
-\version{0.09}
+\version{0.10}
\date{\today}
% cmd for this doc
@@ -23,6 +23,14 @@
\end{abstract}
+\section*{Update Notes}
+
+This version changes two important parts: fonts and bibliography.
+
+\textbf{Fonts}: Due to the newtx package updates, we change the font settings for all the templates of ElegantLaTeX. Under \hologo{XeLaTeX}, we use \lstinline{fontspec} package to set the font to TeX Gyre Terms/Heros.
+
+\textbf{Bibliography}: The bib file is no longer \lstinline{wpref.bib}, it's same with ElegantBook bibfile, \lstinline{reference.bib}. Besides, we use biblatex/biber rather than bibtex to handler bibliography, you can use bibstyle and citestyle to set the styles. For convenience, we offer a \lstinline{bibend} option, which can take values of \lstinline{biber} (default) and \lstinline{bibtex}, please refer to Bibliography section and biblatex package document for more information.
+
\section{Introduction}
This template is based on the standard \LaTeX{} article class, hence the arguments of article class are acceptable (\lstinline{a4paper}, \lstinline{10pt} and etc.). Alternative engines are \hologo{pdfLaTeX} and \hologo{XeLaTeX}.
@@ -58,132 +66,42 @@
Default \LaTeX{} commands and environments are all the same in this template\footnote{To ensure the codes are replicatable. We recommend users pay more attention to the contents other than formats. This is the meaning of the existence of the template.}. We created four new commands:
\begin{enumerate}
\item \lstinline{\email}: create the hyperlink to email address.
- \item \lstinline{\figref}: same usage as \lstinline{\ref}, but start with label text <\textbf{Figure n}>.
- \item \lstinline{\tabref}: same usage as \lstinline{\ref}, but start with label text <\textbf{Table n}>.
+ \item \lstinline{\figref}: same usage as \lstinline{\ref}, but start with label text \textbf{Figure n}.
+ \item \lstinline{\tabref}: same usage as \lstinline{\ref}, but start with label text \textbf{Table n}.
\item \lstinline{\keywords}: create the keywords in the abstract section.
\end{enumerate}
\subsection{Bibliography}
-This template used \hologo{BibTeX} to generate the bibliography, the default bibliography style is \lstinline{aer} under the option \lstinline{lang=en}. Citation example: ~\citep{en1,en2,en3} used data from a major peer-to-peer lending marketplace in China to study whether female and male investors evaluate loan performance differently.
-If you want to use \hologo{BibTeX}, you must create a file named \lstinline{wpref.bib}, and add bib items (from Google Scholar, Mendeley, EndNote, and etc.) to \lstinline{wpref.bib} file, and cite the bibkey in the \lstinline{tex} file. Note that \hologo{BibTeX} has to be added.
+This template uses biblatex to generate the bibliography, the default citestyle and bibliography style are both \lstinline{numeric}. Let's take a glance at the citation effect. ~\cite{en1} use data from a major peer-to-peer lending \cite{en3} marketplace in China to study whether female and male investors evaluate loan performance differently \parencite{en2}.
-Three options for the references, \lstinline{cite=numbers} (default), \lstinline{cite=super} and \lstinline{cite=authoryear}. Those who major in science and engineering use \lstinline{numbers} and \lstinline{super} more often, while those who major in arts use \lstinline{authoryear} more frequently. To switch different options, use
-\begin{lstlisting}
-\documentclass[cite=super]{elegantpaper} % super style ref style
-\documentclass[super]{elegantpaper}
+If you want to use biblatex, you must create a file named \lstinline{reference.bib}, add bib items (from Google Scholar, Mendeley, EndNote, and etc.) to \lstinline{reference.bib} file, then cite the bibkey in the \lstinline{tex} file. The biber will automatically generate the bibliography for the reference you cited.
-\documentclass[cite=authoryear]{elegantpaper} % author-year ref style
-\documentclass[authoryear]{elegantpaper}
-\end{lstlisting}
-\section{Recruit Support Members}
+To change the bibliography style, this version introduces two options: \lstinline{citestyle} and \lstinline{bibstyle}, please refer to \href{https://ctan.org/pkg/biblatex}{CTAN:biblatex} for more detail about these options. You can change your bibliography style as
-Recruit support members for Elegant\LaTeX{} to translate template official guide, maintain wiki entries(Markdown), update Wechat articles. No deadline for this recruitment.
+\begin{lstlisting}
+\documentclass[citestyle=numeric-comp, bibstyle=authoryear]{elegantpaper}
+\end{lstlisting}
-So far, Elegant\LaTeX{} has four support members:
-\begin{itemize}
- \item OG Translator: \href{https://github.com/peggy2006xzyz}{YPY};
- \item Wiki Maintainer: \href{https://github.com/izinngo}{Ingo Zinngo}, \href{https://github.com/xiaohao890809}{Xiaohao890809};
- \item QQ Group Manager: \href{https://github.com/sikouhjw}{Sikouhjw}.
-\end{itemize}
+We also add the \lstinline{bibend} option to this template, you can choose \lstinline{biber} (default) or \lstinline{bibtex} as you like, \lstinline{biber} is recommended.
-Thank them all!!!
+\begin{lstlisting}
+\documentclass[bibtex]{elegantpaper} % or
+\documentclass[bibend=bibtex]{elegantpaper}
+\end{lstlisting}
-\section{Acknowledgement}
-The number of stars on GitHub for ElegantPaper reached 277 on April 12, 2020 at the release of ElegantPaper v0.09. Thank China\TeX{} and \href{http://www.latexstudio.net/}{\LaTeX{} studio} for their promotion. If you like our templates, you can star it on GitHub.
-\begin{figure}[!ht]
- \centering
- \includegraphics[width=\textwidth]{star.png}
- \caption{Twinkle, Twinkle, Little Star}
-\end{figure}
-\section{Donation}
-To express your love for our templates and/or our developers, please do not hesitate to tip us.
-\begin{figure}[!htbp]
- \centering
- \includegraphics[width=0.4\textwidth]{donate.jpg}
-\end{figure}
-\textbf{The explanation right of the tip usage belongs to Elegant\LaTeX{} with no supervision. Feel free to tip us.} Those who donate more than 10 RMB will be recorded in the donation list. Thank all the tippers!
-
-
-\begin{table}[!htb]
- \centering
- \caption{Donation List}
- \begin{tabular}{*{4}{>{\scriptsize}c}|*{4}{>{\scriptsize}c}}
- \toprule
- \textbf{Tipper} & \textbf{Amount} & \textbf{Date} & \textbf{Channel} & \textbf{Tipper} & \textbf{Amount} & \textbf{Date} & \textbf{Channel} \\
- \midrule
- Lerh & 10 RMB & 2019/05/15 & Wechat & yueguodipingxian & 10 RMB & 2019/05/15 & Wechat \\
- yinsang & 20 RMB & 2019/05/27 & Wechat & *kong & 10 RMB & 2019/05/30 & Wechat \\
- latexstudio.net & 666 RMB & 2019/06/05 & Alipay & A*n & 40 RMB & 2019/06/15 & Wechat \\
- * xia & 22 RMB & 2019/06/15 & Wechat & * qian & 21 RMB & 2019/06/15 & Wechat \\
- Cassis & 11 RMB & 2019/06/30 & Wechat & * jun & 10 RMB & 2019/07/23 & Wechat \\
- P*u & 50 RMB & 2019/07/30 & Wechat & * meng & 19 RMB & 2019/08/28 & Wechat \\
- Qu Doudou & 10 RMB & 2019/08/28 & Wechat & Li Bo & 100 RMB & 2019/10/06 & Wechat \\
- Njustsll & 10 RMB & 2019/10/11 & Wechat & Liu Zhikuo & 99.99 RMB & 2019/10/15 & Alipay \\
- * tao & 16 RMB & 2019/10/17 & Wechat & Chini & 12 RMB & 2019/10/17 & Alipay \\
- yuanfengjing & 10 RMB & 2019/10/28 & Wechat & Guo Deliang & 88 RMB & 2019/11/03 & Wechat \\
- ziqiangbuxi & 20 RMB & 2019/11/04 & Alipay & dushuzhichong & 20 RMB & 2019/11/18 & Wechat \\
- * deng & 10 RMB & 2019/11/18 & Wechat & * zhe & 20 RMB & 2019/11/18 & Wechat \\
- anonymous & 10 RMB & 2019/11/24 & Wechat & Jiye Qian & 66 RMB & 2019/12/04 & Wechat \\
- * yang & 20 RMB & 2019/12/05 & Wechat & Catcher & 11 RMB & 2019/12/08 & Alipay \\
- xierbotementu & 10 RMB & 2019/12/09 & Alipay & * wei & 10 RMB & 2019/12/09 & Wechat \\
- Simon & 20 RMB & 2019/12/11 & Alipay & liushangqianyi & 66.60 RMB & 2019/12/18 & Alipay \\
- yu & 10 RMB & 2019/12/20 & Alipay & *chen & 15 RMB & 2019/12/20 & Wechat \\
- suifeng & 20 RMB & 2019/12/27 & Alipay & Ws & 23.30 RMB & 2019/12/28 & Wechat \\
- chuba & 100 RMB & 2020/01/02 & Alipay & p*e & 20 RMB & 2020/01/03 & Wechat \\
- Shunmx & 100 RMB & 2020/01/03 & Wechat & hj & 10 RMB & 2020/01/03 & Wechat \\
- F*5 & 10 RMB & 2020/01/03 & Wechat & S*m & 20.20 RMB & 2020/01/03 & Wechat \\
- erdaiqingzhi & 13 RMB & 2020/01/14 & Alipay & *? & 66 RMB & 2020/01/15 & Wechat \\
- Mr. Xiong & 20 RMB & 2020/01/17 & Wechat & *bo & 15 RMB & 2020/01/18 & Wechat \\
- *Zhe & 10 RMB & 2020/02/02 & Wechat & Jackie & 88.80 RMB & 2020/02/09 & Wechat \\
- Henry\_Sun & 50 RMB & 2020/02/14 & Alipay & * Qiao & 50 RMB & 2020/02/21 & Wechat \\
- YunLian & 10 RMB & 2020/03/02 & Alipay & S*y & 10 RMB & 2020/03/15 & Wechat \\
- * Ge & 66.66 RMB & 2020/03/17 & Wechat & K*e & 30 RMB & 2020/03/30 & Wechat\\
- * Yang & 20 RMB & 2020/04/02 & Wechat & Shi*n & 30 RMB & 2020/04/11 & Wechat \\
- \bottomrule
- \end{tabular}%
- \label{tab:donation}%
- \end{table}%
-
-\section{FAQ}
-
-\begin{enumerate}[label=\arabic*).]
- \item \textit{How to remove the information of version?}\\
- Please comment \lstinline|\version{x.xx}|.
- \item \textit{How to remove the information of date?}\\
- Please type in \lstinline|\date{}|.
- \item \textit{How to add several authors?}\\
- Use \lstinline{\and} in \lstinline{\author} and use \lstinline{\\} to start a new line.
- \begin{lstlisting}
- \author{author 1\\ org. 1 \and author 2 \\ org. 2 }
- \end{lstlisting}
- \item \textit{How to display bilingual abstracts?}\\
- Please refer to \href{https://github.com/ElegantLaTeX/ElegantPaper/issues/5}{GitHub::ElegantPaper/issues/5}
-\end{enumerate}
-
-
-\nocite{en1,en2}
-
-\bibliography{wpref}
-
-\appendix
-%\appendixpage
-\addappheadtotoc
-
-
-\section{Use newtx fonts}
-If you use \lstinline{newtx} fonts, type in:
-
+\subsection{Use newtx fonts}
+If you use \lstinline{newtx} fonts, you can use the \lstinline{math} option as
\begin{lstlisting}
-\documentclass[math=newtx]{elegantbook}
+\documentclass[math=newtx]{elegantpaper}
\end{lstlisting}
-\subsection{Hyphens}
+\subsubsection{Hyphens}
Since the template uses \lstinline{newtx}, please pay attention to the hyphens. For instance,
\begin{equation}
\int_{R^q} f(x,y) dy.\emph{of\kern0pt f}
@@ -196,7 +114,7 @@
\end{equation}
\end{lstlisting}
-\subsection{Symbol Fonts}
+\subsubsection{Symbol Fonts}
Feedback from ElegantBook users claims that error occurs when using our templates with \lstinline{yhmath}, \lstinline{esvect} and other packages.
\begin{lstlisting}
LaTeX Error:
@@ -205,15 +123,34 @@
The reason is that the template redefines font for math so that no new math font is allowed to be added. To use \lstinline{yhmath} and/or \lstinline{esvect}, please locate \lstinline{yhmath} or \lstinline{esvect} in \lstinline{elegantpaper.cls}, uncomment corresponding related code.
-\begin{lstlisting}
-%%% use yhmath pkg, uncomment following code
-% \let\oldwidering\widering
-% \let\widering\undefined
-% \RequirePackage{yhmath}
-% \let\widering\oldwidering
-%%% use esvect pkg, uncomment following code
-% \RequirePackage{esvect}
-\end{lstlisting}
+\section{FAQ}
+\begin{enumerate}[label=\arabic*).]
+ \item \textit{How to remove the information of version?}\\
+ Please comment \lstinline|\version{x.xx}|.
+ \item \textit{How to remove the information of date?}\\
+ Please type in \lstinline|\date{}|.
+ \item \textit{How to add several authors?}\\
+ Use \lstinline{\and} in \lstinline{\author} and use \lstinline{\\} to start a new line.
+ \begin{lstlisting}
+ \author{author 1\\ org. 1 \and author 2 \\ org. 2 }
+ \end{lstlisting}
+ \item \textit{How to display bilingual abstracts?}\\
+ Please refer to \href{https://github.com/ElegantLaTeX/ElegantPaper/issues/5}{GitHub::ElegantPaper/issues/5}
+\end{enumerate}
+
+\section{Acknowledgement}
+
+Thank \href{https://github.com/sikouhjw}{sikouhjw} and \href{https://github.com/syvshc}{syvshc} for their quick response to Github issues and continuously support work for ElegantLaTeX. Thank ChinaTeX and \href{http://www.latexstudio.net/}{LaTeX Studio} for their promotion.
+
+
+
+\printbibliography[heading=bibintoc, title=\ebibname]
+
+\appendix
+%\appendixpage
+\addappheadtotoc
+
+
\end{document}
Deleted: trunk/Master/texmf-dist/doc/latex/elegantpaper/image/donate.jpg
===================================================================
(Binary files differ)
Deleted: trunk/Master/texmf-dist/doc/latex/elegantpaper/image/star.png
===================================================================
(Binary files differ)
Added: trunk/Master/texmf-dist/doc/latex/elegantpaper/reference.bib
===================================================================
--- trunk/Master/texmf-dist/doc/latex/elegantpaper/reference.bib (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/elegantpaper/reference.bib 2022-04-09 20:32:58 UTC (rev 62989)
@@ -0,0 +1,71 @@
+
+ at article{en3,
+ title={{The Mechanism and Effectiveness of Credit Scoring of P2P Lending Platform: Evidence from Renrendai.com}},
+ author={Li, Qiang and Chen, Liwen and Zeng, Yong},
+ journal={China Finance Review International},
+ volume={8},
+ number={3},
+ pages={256--274},
+ year={2018},
+ publisher={Emerald Publishing Limited}
+}
+
+
+ at article{en2,
+ author = {Carlstrom, Charles T and Fuerst, Timothy S},
+ title = {{Agency Costs, Net Worth, and Business Fluctuations: A Computable General Equilibrium Analysis}},
+ journal = {The American Economic Review},
+ pages = {893-910},
+ ISSN = {0002-8282},
+ year = {1997},
+ type = {Journal Article}
+}
+
+ at article{en1,
+ author = {Quadrini, Vincenzo},
+ title = {{Financial Frictions in Macroeconomic Fluctuations}},
+ journal = {FRB Richmond Economic Quarterly},
+ volume = {97},
+ number = {3},
+ pages = {209-254},
+ year = {2011},
+ type = {Journal Article}
+}
+
+ at article{cn1,
+ author = {方军雄},
+ key = {fang1 jun1 xiong2},
+ title = {{所有制、制度环境与信贷资金配置}},
+ journal = {经济研究},
+ number = {12},
+ pages = {82-92},
+ ISSN = {0577-9154},
+ year = {2007},
+ type = {Journal Article}
+}
+
+ at article{cn2,
+ author = {刘凤良 and 章潇萌 and 于泽},
+ key = {liu2 feng4 liang2 zhang1 xiao1 meng2 yu2 ze2},
+ title = {{高投资、结构失衡与价格指数二元分化}},
+ journal = {金融研究},
+ number = {02},
+ pages = {54-69},
+ ISSN = {1002-7246},
+ year = {2017},
+ type = {Journal Article}
+}
+
+ at article{cn3,
+ author = {吕捷 and 王高望},
+ key = {lv3 jie2 wang2 gao1 wang4},
+ title = {{CPI 与 PPI “背离”的结构性解释}},
+ journal = {经济研究},
+ volume = {50},
+ number = {04},
+ pages = {136-149},
+ ISSN = {0577-9154},
+ year = {2015},
+ type = {Journal Article}
+}
+
Property changes on: trunk/Master/texmf-dist/doc/latex/elegantpaper/reference.bib
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Deleted: trunk/Master/texmf-dist/doc/latex/elegantpaper/wpref.bib
===================================================================
--- trunk/Master/texmf-dist/doc/latex/elegantpaper/wpref.bib 2022-04-09 20:30:34 UTC (rev 62988)
+++ trunk/Master/texmf-dist/doc/latex/elegantpaper/wpref.bib 2022-04-09 20:32:58 UTC (rev 62989)
@@ -1,71 +0,0 @@
-
- at article{en3,
- title={{The Mechanism and Effectiveness of Credit Scoring of P2P Lending Platform: Evidence from Renrendai.com}},
- author={Li, Qiang and Chen, Liwen and Zeng, Yong},
- journal={China Finance Review International},
- volume={8},
- number={3},
- pages={256--274},
- year={2018},
- publisher={Emerald Publishing Limited}
-}
-
-
- at article{en2,
- author = {Carlstrom, Charles T and Fuerst, Timothy S},
- title = {{Agency Costs, Net Worth, and Business Fluctuations: A Computable General Equilibrium Analysis}},
- journal = {The American Economic Review},
- pages = {893-910},
- ISSN = {0002-8282},
- year = {1997},
- type = {Journal Article}
-}
-
- at article{en1,
- author = {Quadrini, Vincenzo},
- title = {{Financial Frictions in Macroeconomic Fluctuations}},
- journal = {FRB Richmond Economic Quarterly},
- volume = {97},
- number = {3},
- pages = {209-254},
- year = {2011},
- type = {Journal Article}
-}
-
- at article{cn1,
- author = {方军雄},
- key = {fang1 jun1 xiong2},
- title = {{所有制、制度环境与信贷资金配置}},
- journal = {经济研究},
- number = {12},
- pages = {82-92},
- ISSN = {0577-9154},
- year = {2007},
- type = {Journal Article}
-}
-
- at article{cn2,
- author = {刘凤良 and 章潇萌 and 于泽},
- key = {liu2 feng4 liang2 zhang1 xiao1 meng2 yu2 ze2},
- title = {{高投资、结构失衡与价格指数二元分化}},
- journal = {金融研究},
- number = {02},
- pages = {54-69},
- ISSN = {1002-7246},
- year = {2017},
- type = {Journal Article}
-}
-
- at article{cn3,
- author = {吕捷 and 王高望},
- key = {lv3 jie2 wang2 gao1 wang4},
- title = {{CPI 与 PPI “背离”的结构性解释}},
- journal = {经济研究},
- volume = {50},
- number = {04},
- pages = {136-149},
- ISSN = {0577-9154},
- year = {2015},
- type = {Journal Article}
-}
-
Modified: trunk/Master/texmf-dist/tex/latex/elegantbook/elegantbook.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/elegantbook/elegantbook.cls 2022-04-09 20:30:34 UTC (rev 62988)
+++ trunk/Master/texmf-dist/tex/latex/elegantbook/elegantbook.cls 2022-04-09 20:32:58 UTC (rev 62989)
@@ -1,6 +1,6 @@
%%%%%%%%%%%%%%%%%%%%%%
%% start of file `elegantbook.cls'.
-%% Copyright 2013-2021 ElegantLaTeX (elegantlatex2e at gmail.com)
+%% Copyright 2013-2022 ElegantLaTeX (elegantlatex2e at gmail.com)
%%
%% This work may be distributed and/or modified freely
%% available at https://github.com/ElegantLaTeX/ElegantBook
@@ -8,8 +8,10 @@
%%%%%%%%%%%%%%%%%%%%%
% % !Mode:: "TeX:UTF-8"
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{elegantbook}[2021/05/02 v4.1 ElegantBook document class]
+\ProvidesClass{elegantbook}[2022/04/09 v4.3 ElegantBook document class]
+
+%%%
\RequirePackage{kvoptions}
\RequirePackage{etoolbox}
\SetupKeyvalOptions{family=ELEGANT, prefix=ELEGANT@, setkeys=\kvsetkeys}
@@ -25,6 +27,7 @@
\DeclareStringOption[marginfalse]{marginpar}
\DeclareStringOption[onecol]{toc}
\DeclareStringOption{scheme}
+
% ----- backward compatibility
\DeclareVoidOption{green}{\ekv{color=green}}
\DeclareVoidOption{cyan}{\ekv{color=cyan}}
@@ -32,10 +35,10 @@
\DeclareVoidOption{gray}{\ekv{color=gray}}
\DeclareVoidOption{black}{\ekv{color=black}}
\DeclareVoidOption{nocolor}{\ekv{color=none}}
-\DeclareStringOption[ctexfont]{chinesefont}
\DeclareVoidOption{chinese}{\ekv{scheme=chinese}}
+\DeclareStringOption[ctexfont]{chinesefont}
\DeclareVoidOption{ctexfont}{\ekv{chinesefont=ctexfont}}
\DeclareVoidOption{founder}{\ekv{chinesefont=founder}}
\DeclareVoidOption{nofont}{\ekv{chinesefont=nofont}}
@@ -43,6 +46,13 @@
\DeclareVoidOption{en}{\ekv{lang=en}}
\DeclareVoidOption{cn}{\ekv{lang=cn}}
\DeclareVoidOption{it}{\ekv{lang=it}}
+\DeclareVoidOption{fr}{\ekv{lang=fr}}
+\DeclareVoidOption{nl}{\ekv{lang=nl}}
+\DeclareVoidOption{hu}{\ekv{lang=hu}}
+\DeclareVoidOption{de}{\ekv{lang=de}}
+\DeclareVoidOption{mn}{\ekv{lang=mn}}
+\DeclareVoidOption{pt}{\ekv{lang=pt}}
+\DeclareVoidOption{jp}{\ekv{lang=jp}}
\DeclareVoidOption{fancy}{\ekv{mode=fancy}}
\DeclareVoidOption{simple}{\ekv{mode=simple}}
@@ -56,7 +66,6 @@
\DeclareStringOption[numeric-comp]{citestyle}
\DeclareStringOption[numeric]{bibstyle}
-
\DeclareVoidOption{newtx}{\ekv{math=newtx}}
\DeclareVoidOption{mtpro2}{\ekv{math=mtpro2}}
\DeclareVoidOption{cm}{\ekv{math=cm}}
@@ -68,7 +77,15 @@
\DeclareVoidOption{onecol}{\ekv{toc=onecol}}
\DeclareVoidOption{twocol}{\ekv{toc=twocol}}
+\DeclareStringOption[chapter]{thmcnt}
+\DeclareVoidOption{chapter}{\ekv{thmcnt=chapter}}
+\DeclareVoidOption{section}{\ekv{thmcnt=section}}
+\DeclareStringOption[biber]{bibend}
+\DeclareVoidOption{biber}{\ekv{bibend=biber}}
+\DeclareVoidOption{bibtex}{\ekv{bibend=bibtex}}
+
+
% ----- Math option -----
\newcommand\mailto[1]{\href{mailto:#1}{\nolinkurl{#1}}}
@@ -133,6 +150,7 @@
footskip=4mm
}}{\relax}
+
\RequirePackage{indentfirst,comment}
% fontsetting
\ifdefstring{\ELEGANT at math}{mtpro2}{
@@ -144,34 +162,53 @@
\renewcommand{\baselinestretch}{1.2}
\PassOptionsToPackage{no-math}{fontspec}
+\PassOptionsToPackage{quiet}{fontspec}
\RequirePackage{iftex}
-\ifdefstring{\ELEGANT at lang}{cn}{
- \ifXeTeX
- \ifdefstring{\ELEGANT at chinesefont}{founder}{
- \RequirePackage[UTF8,scheme=plain,fontset=none]{ctex}
- \setCJKmainfont[BoldFont={FZHei-B01},ItalicFont={FZKai-Z03}]{FZShuSong-Z01}
- \setCJKsansfont[BoldFont={FZHei-B01},ItalicFont={FZHei-B01}]{FZHei-B01}
- \setCJKmonofont[BoldFont={FZHei-B01},ItalicFont={FZHei-B01}]{FZFangSong-Z02}
- \setCJKfamilyfont{zhsong}{FZShuSong-Z01}
- \setCJKfamilyfont{zhhei}{FZHei-B01}
- \setCJKfamilyfont{zhkai}{FZKai-Z03}
- \setCJKfamilyfont{zhfs}{FZFangSong-Z02}
- \newcommand*{\songti}{\CJKfamily{zhsong}}
- \newcommand*{\heiti}{\CJKfamily{zhhei}}
- \newcommand*{\kaishu}{\CJKfamily{zhkai}}
- \newcommand*{\fangsong}{\CJKfamily{zhfs}}}{\relax}
+
+\ifXeTeX
+ \RequirePackage[no-math]{fontspec}
+ \setmainfont{texgyretermes}[
+ UprightFont = *-regular ,
+ BoldFont = *-bold ,
+ ItalicFont = *-italic ,
+ BoldItalicFont = *-bolditalic ,
+ Extension = .otf ,
+ Scale = 1.0]
- \ifdefstring{\ELEGANT at chinesefont}{nofont}{
- \RequirePackage[UTF8,scheme=plain,fontset=none]{ctex}}{\relax}
+ \setsansfont{texgyreheros}[
+ UprightFont = *-regular ,
+ BoldFont = *-bold ,
+ ItalicFont = *-italic ,
+ BoldItalicFont = *-bolditalic ,
+ Extension = .otf ,
+ Scale = 0.9]
+\else
+ \RequirePackage{newtxtext}
+ \RequirePackage[scaled=.90]{helvet}
+\fi
- \ifdefstring{\ELEGANT at chinesefont}{ctexfont}{
- \RequirePackage[UTF8,scheme=plain]{ctex}}{\relax}
- \else
- \ifdefstring{\ELEGANT at chinesefont}{ctexfont}{
- \RequirePackage[UTF8,scheme=plain]{ctex}}{\relax}
- \fi
+\ifdefstring{\ELEGANT at lang}{cn}{
+ \ifdefstring{\ELEGANT at chinesefont}{founder}{
+ \RequirePackage[UTF8,scheme=plain,fontset=none]{ctex}
+ \setCJKmainfont[BoldFont={FZHei-B01},ItalicFont={FZKai-Z03}]{FZShuSong-Z01}
+ \setCJKsansfont[BoldFont={FZHei-B01}]{FZKai-Z03}
+ \setCJKmonofont[BoldFont={FZHei-B01}]{FZFangSong-Z02}
+ \setCJKfamilyfont{zhsong}{FZShuSong-Z01}
+ \setCJKfamilyfont{zhhei}{FZHei-B01}
+ \setCJKfamilyfont{zhkai}[BoldFont={FZHei-B01}]{FZKai-Z03}
+ \setCJKfamilyfont{zhfs}[BoldFont={FZHei-B01}]{FZFangSong-Z02}
+ \newcommand*{\songti}{\CJKfamily{zhsong}}
+ \newcommand*{\heiti}{\CJKfamily{zhhei}}
+ \newcommand*{\kaishu}{\CJKfamily{zhkai}}
+ \newcommand*{\fangsong}{\CJKfamily{zhfs}}}{\relax}
+
+ \ifdefstring{\ELEGANT at chinesefont}{nofont}{
+ \RequirePackage[UTF8,scheme=plain,fontset=none]{ctex}}{\relax}
+
+ \ifdefstring{\ELEGANT at chinesefont}{ctexfont}{
+ \RequirePackage[UTF8,scheme=plain]{ctex}}{\relax}
+
\AfterEndPreamble{
- % \renewcommand{\itshape}{\kaishu}
\setlength\parindent{2\ccwd}}
}{\relax}
@@ -199,7 +236,6 @@
\newcommand{\cfs}{\normalfont}
\fi
-\RequirePackage{newtxtext}
\RequirePackage{anyfontsize}
\ifdefstring{\ELEGANT at math}{newtx}{
\RequirePackage{newtxmath}
@@ -220,6 +256,7 @@
\DeclareMathSymbol{\prodop}{\mathop}{CMlargesymbols}{"51}
}{\relax}
+
% ----- Handle Colors -----
%% 章节以及页脚图形
@@ -340,17 +377,18 @@
\RequirePackage{makecell,lipsum,hologo}
%%中文结构名字
+
+%% 章节设置
+\RequirePackage[center,pagestyles]{titlesec}
+\RequirePackage[title,titletoc,header]{appendix}
+
+
\RequirePackage[
- backend=biber,
+ backend=\ELEGANT at bibend,
citestyle=\ELEGANT at citestyle,
bibstyle=\ELEGANT at bibstyle]{biblatex}
+\defbibheading{elegantbook}[\ebibname]{#1}
-
-
-%% 章节设置
-
-\RequirePackage{appendix}
-
\ifdefstring{\ELEGANT at lang}{cn}{
\renewcommand{\baselinestretch}{1.3}
\renewcommand{\contentsname}{目录}
@@ -361,13 +399,12 @@
\renewcommand{\listfigurename}{插图目录}
\renewcommand{\listtablename}{表格目录}
\renewcommand{\bibname}{参考文献}
+ \newcommand{\ebibname}{参考文献}
\renewcommand{\appendixname}{附录}
+ \renewcommand{\appendixtocname}{附录}
\renewcommand{\indexname}{索\hspace{2em}引}
\newcommand\figref[1]{\textbf{图}~\ref{#1}}
\newcommand\tabref[1]{\textbf{表}~\ref{#1}}
- \ifdefstring{\ELEGANT at scheme}{chinese}{
- \renewcommand{\chaptername}{第\zhnumber{\arabic{chapter}}章}}{
- \renewcommand{\chaptername}{第 \thechapter{} 章}}
\newcommand{\authorname}{\citshape 作者：}
\newcommand{\institutename}{\citshape 组织：}
\newcommand{\datename}{\citshape 时间：}
@@ -394,12 +431,16 @@
\newcommand\bioinfo[2]{\gdef\@bioinfo{{\citshape #1}：#2}}
\newcommand{\updatename}{更新：}
\newcommand{\historyname}{版本更新历史}
- }{\relax}
+ \newcommand{\beforechap}{第}
+ \newcommand{\afterchap}{章}
+}{\relax}
+
+
\ifdefstring{\ELEGANT at lang}{en}{
\setlength\parindent{2em}
\newcommand\figref[1]{\textbf{Figure}~\ref{#1}}
\newcommand\tabref[1]{\textbf{Table}~\ref{#1}}
- \renewcommand{\chaptername}{Chapter \thechapter}
+ \renewcommand{\chaptername}{Chapter}
\renewcommand{\partname}{\color{structurecolor} Part}
\newcommand{\authorname}{\textbf{Author: }}
\newcommand{\institutename}{\textbf{Institute: }}
@@ -424,6 +465,7 @@
\newcommand{\propertyname}{Property}
\newcommand{\introductionname}{Introduction}
\renewcommand{\appendixname}{Appendix}
+ \newcommand{\ebibname}{Bibliography}
% \newcommand{\problemsetname}{Exercise}
\newcommand\bioinfo[2]{\gdef\@bioinfo{\textbf{#1}: #2}}
\newcommand{\updatename}{Updates:}
@@ -437,7 +479,7 @@
\setlength\parindent{2em}
\newcommand\figref[1]{\textbf{Figura}~\ref{#1}}
\newcommand\tabref[1]{\textbf{Tabella}~\ref{#1}}
- \renewcommand{\chaptername}{Chapter \thechapter}
+ \renewcommand{\chaptername}{Chapter}
\newcommand{\authorname}{\textbf{Autore: }}
\newcommand{\institutename}{\textbf{Istituto: }}
\newcommand{\datename}{\textbf{Data: }}
@@ -462,6 +504,7 @@
\newcommand{\introductionname}{Introduzione}
\newcommand\bioinfo[2]{\gdef\@bioinfo{\textbf{#1}: #2}}
\newcommand{\updatename}{Aggiornamenti:}
+ \newcommand{\ebibname}{Bibliografia}
\newcommand{\historyname}{Cronologia delle versioni}
}{\relax}
@@ -472,7 +515,7 @@
\setlength\parindent{2em}
\renewcommand\figref[1]{\textbf{Figure}\ref{#1}}
\renewcommand\tabref[1]{\textbf{Tableau}\ref{#1}}
- \renewcommand{\chaptername}{Chapitre \thechapter}
+ \renewcommand{\chaptername}{Chapitre}
\renewcommand{\authorname}{\textbf{Auteur: }}
\renewcommand{\institutename}{\textbf{Institut: }}
\renewcommand{\datename}{\textbf{Date: }}
@@ -497,6 +540,7 @@
\renewcommand{\introductionname}{Introduction}
\renewcommand{\problemsetname}{Exercice}
\renewcommand{\updatename}{Mises à jour:}
+ \newcommand{\ebibname}{Bibliographie}
\renewcommand{\historyname}{Historique des versions}
}{\relax}
@@ -506,7 +550,7 @@
\setlength\parindent{2em}
\newcommand\figref[1]{\textbf{Figuur}~\ref{#1}}
\newcommand\tabref[1]{\textbf{Tabel}~\ref{#1}}
- \renewcommand{\chaptername}{Hoofdstuk \arabic{chapter}}
+ \renewcommand{\chaptername}{Hoofdstuk}
\newcommand{\authorname}{\textbf{Auteur: }}
\newcommand{\institutename}{\textbf{Instituut: }}
\newcommand{\datename}{\textbf{Datum: }}
@@ -532,6 +576,7 @@
\newcommand{\problemsetname}{Probleemcomplex}
\newcommand\bioinfo[2]{\gdef\@bioinfo{\textbf{#1}: #2}}
\newcommand{\updatename}{Update:}
+ \newcommand{\ebibname}{Bibliographie}
\newcommand{\historyname}{Versie Geschiedenis}
}{\relax}
@@ -541,7 +586,7 @@
\setlength\parindent{2em}
\newcommand\figref[1]{\ref{#1}~\textbf{Ábra}}
\newcommand\tabref[1]{\ref{#1}~\textbf{Táblázat}}
- \renewcommand{\chaptername}{\thechapter ~ fejezet}
+ \renewcommand{\chaptername}{Fejezet}
\newcommand{\authorname}{\textbf{Szerző: }}
\newcommand{\institutename}{\textbf{Intézmény: }}
\newcommand{\datename}{\textbf{Dátum: }}
@@ -567,6 +612,7 @@
\newcommand{\problemsetname}{Feladatok}
\newcommand\bioinfo[2]{\gdef\@bioinfo{\textbf{#1}: #2}}
\newcommand{\updatename}{Frissítve:}
+ \newcommand{\ebibname}{Bibliográfia}
\newcommand{\historyname}{Korábbi verziók}
}{\relax}
@@ -580,7 +626,7 @@
\renewcommand{\listtablename}{Tabellenverzeichnis}
\renewcommand{\bibname}{Bibliographie}
\renewcommand{\appendixname}{Anhang}
- \renewcommand{\chaptername}{Kapitel \thechapter}
+ \renewcommand{\chaptername}{Kapitel}
\newcommand{\authorname}{\textbf{Autor: }}
\newcommand{\institutename}{\textbf{Institut: }}
\newcommand{\datename}{\textbf{Datum: }}
@@ -606,6 +652,7 @@
\newcommand{\introductionname}{Einleitung}
\newcommand\bioinfo[2]{\gdef\@bioinfo{\textbf{#1}: #2}}
\newcommand{\updatename}{Updates:}
+ \renewcommand{\ebibname}{Bibliographie}
\newcommand{\historyname}{Version der Geschichte}
}{\relax}
@@ -614,7 +661,7 @@
\setlength\parindent{2em}
\newcommand\figref[1]{\textbf{Figura}~\ref{#1}}
\newcommand\tabref[1]{\textbf{Tabla}~\ref{#1}}
- \renewcommand{\spanishchaptername}{Capítulo \thechapter}
+ \renewcommand{\spanishchaptername}{Capítulo}
\newcommand{\authorname}{\textbf{Autor: }}
\newcommand{\institutename}{\textbf{Instituto: }}
\newcommand{\datename}{\textbf{Fecha: }}
@@ -640,6 +687,7 @@
\newcommand{\problemsetname}{Ejercicio}
\newcommand\bioinfo[2]{\gdef\@bioinfo{\textbf{#1}: #2}}
\newcommand{\updatename}{Actualización:}
+ \newcommand{\ebibname}{Bibliografía}
\newcommand{\historyname}{Historial de versiones}
}{\relax}
@@ -650,7 +698,7 @@
\setlength\parindent{2em}
\newcommand\figref[1]{\textbf{Зураг}\ref{#1}}
\newcommand\tabref[1]{\textbf{Хүснэгт}\ref{#1}}
- \renewcommand{\chaptername}{Бүлэг \thechapter}
+ \renewcommand{\chaptername}{Бүлэг}
\newcommand{\authorname}{\textbf{Зохиогч: }}
\newcommand{\institutename}{\textbf{Сургууль: }}
\newcommand{\datename}{\textbf{Огноо: }}
@@ -676,9 +724,89 @@
\newcommand{\problemsetname}{Бодлогууд}
\newcommand\bioinfo[2]{\gdef at bioinfo{\textbf{#1}: #2}}
\newcommand{\updatename}{Шинэчлэлтүүд:}
+ \newcommand{\ebibname}{Ном зүй}
\newcommand{\historyname}{Хувилбарын түүх}
}{\relax}
+
+\ifdefstring{\ELEGANT at lang}{pt}{
+ \RequirePackage[portuguese]{babel}
+ \setlength\parindent{2em}
+ \newcommand\figref[1]{\textbf{Figura}~\ref{#1}}
+ \newcommand\tabref[1]{\textbf{Tabela}~\ref{#1}}
+ \renewcommand{\chaptername}{Capítulo}
+ \newcommand{\authorname}{\textbf{Autor: }}
+ \newcommand{\institutename}{\textbf{Instituição: }}
+ \newcommand{\datename}{\textbf{Data: }}
+ \newcommand{\versionname}{\textbf{Versão: }}
+ \newcommand{\notename}{Observação}
+ \newcommand{\proofname}{Demostração}
+ \newcommand{\problemname}{Problema}
+ \newcommand{\definitionname}{Definição}
+ \newcommand{\theoremname}{Teorema}
+ \newcommand{\axiomname}{Axioma}
+ \newcommand{\postulatename}{Postulado}
+ \newcommand{\lemmaname}{Lema}
+ \newcommand{\propositionname}{Proposição}
+ \newcommand{\corollaryname}{Corolário}
+ \newcommand{\examplename}{Exemplo}
+ \newcommand{\exercisename}{Exercício}
+ \newcommand{\remarkname}{Comentário}
+ \newcommand{\assumptionname}{Assunto}
+ \newcommand{\conclusionname}{Conclusão}
+ \newcommand{\solutionname}{Soluções}
+ \newcommand{\propertyname}{Propiedade}
+ \newcommand{\introductionname}{Introdução}
+ \newcommand{\problemsetname}{Questão}
+ \newcommand\bioinfo[2]{\gdef\@bioinfo{\textbf{#1}: #2}}
+ \newcommand{\updatename}{Atualização: }
+ \newcommand{\ebibname}{Bibliografia}
+ \newcommand{\historyname}{Histórico de versões}
+}{\relax}
+
+
+\ifdefstring{\ELEGANT at lang}{jp}{
+ \RequirePackage{luatexja}
+ \setlength\parindent{2em}
+ \renewcommand{\contentsname}{目次}
+ \newcommand\figref[1]{\textbf{図}~\ref{#1}}
+ \newcommand\tabref[1]{\textbf{表}~\ref{#1}}
+ \renewcommand{\partname}{\color{structurecolor}}
+ \renewcommand{\listfigurename}{イラストカタログ}
+ \renewcommand{\listtablename}{表カタログ}
+ \renewcommand{\bibname}{参考文献}
+ \renewcommand{\appendixname}{付録}
+ \renewcommand{\chaptername}{第 \thechapter 章}
+ \newcommand{\authorname}{\textbf{著者：}}
+ \newcommand{\institutename}{\textbf{組織団体：}}
+ \newcommand{\datename}{\textbf{日付：}}
+ \newcommand{\versionname}{\textbf{\citshape バージョン：}}
+ \newcommand{\notename}{ノート}
+ \newcommand{\proofname}{証明}
+ \newcommand{\problemname}{問題}
+ \newcommand{\definitionname}{定義}
+ \newcommand{\theoremname}{定理}
+ \newcommand{\axiomname}{公理}
+ \newcommand{\postulatename}{公準}
+ \newcommand{\lemmaname}{補題}
+ \newcommand{\propositionname}{命題}
+ \newcommand{\corollaryname}{系}
+ \newcommand{\examplename}{例題}
+ \newcommand{\instancename}{例}
+ \newcommand{\exercisename}{練習}
+ \newcommand{\remarkname}{注}
+ \newcommand{\assumptionname}{仮設}
+ \newcommand{\conclusionname}{結論}
+ \newcommand{\solutionname}{解答}
+ \newcommand{\propertyname}{性質}
+ \newcommand{\introductionname}{内容概要}
+ \newcommand\bioinfo[2]{\gdef\@bioinfo{\textbf{#1}: #2}}
+ \newcommand{\updatename}{更新：}
+ \newcommand{\ebibname}{参考文献}
+ \newcommand{\historyname}{バージョン更新履歴}
+}{\relax}
+
+
\graphicspath{{./figure/}{./figures/}{./image/}{./images/}{./graphics/}{./graphic/}{./pictures/}{./picture/}}
\RequirePackage{tikz} %% load tikz without tikz
@@ -698,12 +826,19 @@
\setlist[itemize,2]{label={\eitemii}}
\setlist[itemize,3]{label={\eitemiii}}
+\RequirePackage{apptools}
-\RequirePackage[center,pagestyles]{titlesec}
-\RequirePackage{apptools}
+% appendix chapter:
+
+\ifdefstring{\ELEGANT at lang}{cn}{
+ \ifdefstring{\ELEGANT at scheme}{chinese}{
+ \newcommand{\xchaptertitle}{第\zhnumber{\arabic{chapter}}章} }{
+ \newcommand{\xchaptertitle}{第 \thechapter{} 章}} }{
+ \newcommand{\xchaptertitle}{\chaptername~\thechapter~}}
+
\setcounter{secnumdepth}{5}
\titleformat{\chapter}[\style]{\bfseries}{
- \filcenter\LARGE\enspace\bfseries{\color{structurecolor} \IfAppendix{\appendixname\;\thechapter}{\chaptername}\;}}{1pt}{
+ \filcenter\LARGE\enspace\bfseries{\color{structurecolor} \IfAppendix{\appendixname\;\thechapter\;}{\xchaptertitle\;}}}{1pt}{
\LARGE\bfseries\color{structurecolor}\filcenter}[]
\titleformat{\section}[hang]{\bfseries}{
\Large\bfseries{\color{structurecolor}\thesection}\enspace}{1pt}{%
@@ -720,7 +855,6 @@
-
%%define the note and proof environment
\RequirePackage{pifont,manfnt,bbding}
\RequirePackage[many]{tcolorbox}
@@ -774,37 +908,37 @@
\node[anchor=south east, outer sep=0pt] at (\linewidth-width,0) {
\textcolor{third}{$\spadesuit$}};}},}
% \newtcbtheorem[auto counter,number within=chapter]{definition}{\definitionname}{defstyle}{def}
- \DeclareTColorBox[auto counter,number within=chapter]{definition}{ o t\label g }{
+ \DeclareTColorBox[auto counter,number within=\ELEGANT at thmcnt]{definition}{ o t\label g }{
common,defstyle,
IfValueTF={#1}{title={\definitionname~\thetcbcounter\ (#1)}}{title=\definitionname~\thetcbcounter},
IfBooleanTF={#2}{label=#3}{}}
% \newtcbtheorem[auto counter,number within=chapter]{theorem}{\theoremname}{thmstyle}{thm}
- \DeclareTColorBox[auto counter,number within=chapter]{theorem}{ o t\label g }{
+ \DeclareTColorBox[auto counter,number within=\ELEGANT at thmcnt]{theorem}{ o t\label g }{
common,thmstyle,
IfValueTF={#1}{title={\theoremname~\thetcbcounter\ (#1)}}{title=\theoremname~\thetcbcounter},
IfBooleanTF={#2}{label=#3}{}}
% \newtcbtheorem[auto counter,number within=chapter]{postulate}{\postulatename}{thmstyle}{pos}
- \DeclareTColorBox[auto counter,number within=chapter]{postulate}{ o t\label g }{
+ \DeclareTColorBox[auto counter,number within=\ELEGANT at thmcnt]{postulate}{ o t\label g }{
common,thmstyle,
IfValueTF={#1}{title={\postulatename~\thetcbcounter\ (#1)}}{title=\postulatename~\thetcbcounter},
IfBooleanTF={#2}{label=#3}{}}
% \newtcbtheorem[auto counter,number within=chapter]{axiom}{\axiomname}{thmstyle}{axi}
- \DeclareTColorBox[auto counter,number within=chapter]{axiom}{ o t\label g }{
+ \DeclareTColorBox[auto counter,number within=\ELEGANT at thmcnt]{axiom}{ o t\label g }{
common,thmstyle,
IfValueTF={#1}{title={\axiomname~\thetcbcounter\ (#1)}}{title=\axiomname~\thetcbcounter},
IfBooleanTF={#2}{label=#3}{}}
% \newtcbtheorem[auto counter,number within=chapter]{corollary}{\corollaryname}{thmstyle}{cor}
- \DeclareTColorBox[auto counter,number within=chapter]{corollary}{ o t\label g }{
+ \DeclareTColorBox[auto counter,number within=\ELEGANT at thmcnt]{corollary}{ o t\label g }{
common,thmstyle,
IfValueTF={#1}{title={\corollaryname~\thetcbcounter\ (#1)}}{title=\corollaryname~\thetcbcounter},
IfBooleanTF={#2}{label=#3}{}}
% \newtcbtheorem[auto counter,number within=chapter]{lemma}{\lemmaname}{thmstyle}{lem}
- \DeclareTColorBox[auto counter,number within=chapter]{lemma}{ o t\label g }{
+ \DeclareTColorBox[auto counter,number within=\ELEGANT at thmcnt]{lemma}{ o t\label g }{
common,thmstyle,
IfValueTF={#1}{title={\lemmaname~\thetcbcounter\ (#1)}}{title=\lemmaname~\thetcbcounter},
IfBooleanTF={#2}{label=#3}{}}
% \newtcbtheorem[auto counter,number within=chapter]{proposition}{\propositionname}{propstyle}{pro}
- \DeclareTColorBox[auto counter,number within=chapter]{proposition}{ o t\label g }{
+ \DeclareTColorBox[auto counter,number within=\ELEGANT at thmcnt]{proposition}{ o t\label g }{
common,propstyle,
IfValueTF={#1}{title={\propositionname~\thetcbcounter\ (#1)}}{title=\propositionname~\thetcbcounter},
IfBooleanTF={#2}{label=#3}{}}}{\relax}
@@ -827,17 +961,17 @@
\theoremstyle{defstyle} % definition style
- \newtheorem{definition}{\definitionname}[chapter]
+ \newtheorem{definition}{\definitionname}[\ELEGANT at thmcnt]
\theoremstyle{thmstyle} %theorem style
- \newtheorem{theorem}{\theoremname}[chapter]
- \newtheorem{lemma}{\lemmaname}[chapter]
- \newtheorem{corollary}{\corollaryname}[chapter]
- \newtheorem{postulate}{\postulatename}[chapter]
- \newtheorem{axiom}{\axiomname}[chapter]
+ \newtheorem{theorem}{\theoremname}[\ELEGANT at thmcnt]
+ \newtheorem{lemma}{\lemmaname}[\ELEGANT at thmcnt]
+ \newtheorem{corollary}{\corollaryname}[\ELEGANT at thmcnt]
+ \newtheorem{postulate}{\postulatename}[\ELEGANT at thmcnt]
+ \newtheorem{axiom}{\axiomname}[\ELEGANT at thmcnt]
\theoremstyle{prostyle} % proposition style
- \newtheorem{proposition}{\propositionname}[chapter]
+ \newtheorem{proposition}{\propositionname}[\ELEGANT at thmcnt]
}{\relax}
% main（green-def): example exercise problem solution
@@ -921,9 +1055,10 @@
\RequirePackage{adforn}
-\newenvironment{problemset}[1][\chaptername~\;\exercisename]{
+\newenvironment{problemset}[1][\xchaptertitle~\exercisename]{
+ \vspace*{10pt}
\begin{center}
- \phantomsection\addcontentsline{toc}{section}{\texorpdfstring{\chaptername\;\exercisename}{\exercisename}}
+ \phantomsection\addcontentsline{toc}{section}{\texorpdfstring{\xchaptertitle~\exercisename}{\exercisename}}
% \markboth{#1}{\rightmark}
\markright{#1}
\textcolor{structurecolor}{\Large\bfseries\adftripleflourishleft~#1~\adftripleflourishright}
@@ -948,7 +1083,7 @@
\fancyhf{}
-\fancyfoot[c]{\color{structurecolor}\scriptsize\thepage}
+\fancyfoot[c]{\color{structurecolor}\small\thepage}
\if at twoside
\fancyhead[EL]{\color{structurecolor}\cnormal\leftmark}
\fancyhead[OR]{\color{structurecolor}\cnormal\rightmark}
@@ -962,10 +1097,9 @@
% \renewcommand{\headrule}{}
\fancypagestyle{plain}{\renewcommand{\headrulewidth}{0pt}\fancyhf{}\renewcommand{\headrule}{}}
\renewcommand{\sectionmark}[1]{\markright{\thesection\, #1}{}}
-\renewcommand{\chaptermark}[1]{\markboth{\chaptername\, #1}{}}
+\renewcommand{\chaptermark}[1]{\markboth{\xchaptertitle\, #1}{}}
-
\renewcommand*{\maketitle}{%
\hypersetup{pageanchor=false}
\pagenumbering{Alph}
@@ -1058,7 +1192,7 @@
breaklines=true,
keywordstyle=\color{winered},
commentstyle=\color{gray},
- emph={elegantpaper,fontenc,fontspec,xeCJK,citestyle,FiraMono,xunicode,newtxmath,figure,fig,image,img,table,itemize,enumerate,newtxtext,newtxtt,ctex,microtype,description,times,booktabs,tabular,PDFLaTeX,XeLaTeX,type1cm,BibTeX,device,color,mode,lang,amsthm,tcolorbox,titlestyle,cite,ctex,listings,base,math,scheme,toc,esint,chinesefont,amsmath,bibstyle,natbib,pgfornament},
+ emph={elegantpaper,fontenc,fontspec,xeCJK,citestyle,FiraMono,xunicode,figure,fig,image,img,table,itemize,enumerate,ctex,microtype,description,times,booktabs,tabular,PDFLaTeX,XeLaTeX,type1cm,BibTeX,device,color,mode,lang,amsthm,tcolorbox,titlestyle,cite,ctex,listings,base,math,scheme,toc,esint,chinesefont,amsmath,bibstyle,natbib,pgfornament},
emphstyle={\color{frenchplum}},
morekeywords={DeclareSymbolFont,SetSymbolFont,toprule,midrule,bottomrule,institute,version,includegraphics,setmainfont,setsansfont,setmonofont ,setCJKmainfont,setCJKsansfont,setCJKmonofont,RequirePackage,figref,tabref,email,maketitle,keywords,definecolor,extrainfo,logo,cover,subtitle,appendix,chapter,hypersetup,mainmatter,frontmatter,tableofcontents,elegantpar,heiti,kaishu,lstset,pagecolor,zhnumber,marginpar,part,equote,marginnote,bioinfo,datechange,listofchange,lvert,lastpage,songti,heiti,fangsong,setCJKfamilyfont,textbf},
frame=single,
@@ -1125,3 +1259,33 @@
\thispagestyle{empty}%
\newpage%
\if at twocolumn\hbox{}\newpage\fi\fi\fi}
+
+
+% https://tex.stackexchange.com/questions/56839/chaptername-is-used-even-for-appendix-chapters-in-toc
+\usepackage{calc}
+\usepackage[titles]{tocloft}
+\ifdefstring{\ELEGANT at lang}{cn}{
+ \renewcommand{\cftchappresnum}{\beforechap\space}
+ \renewcommand{\cftchapaftersnum}{\space\afterchap}
+ \setlength{\cftchapnumwidth}{\widthof{\textbf{附录~999}}}
+ \g at addto@macro\appendix{%
+ \addtocontents{toc}{%
+ \protect\renewcommand{\protect\cftchappresnum}{\appendixname\space}%
+ \protect\renewcommand{\protect\cftchapaftersnum}{}%
+ }%
+ }
+}{
+ \renewcommand{\cftchappresnum}{\chaptername\space}
+ \renewcommand{\cftchapaftersnum}{\space}
+ \setlength{\cftchapnumwidth}{\widthof{\textbf{Appendix~9}}}
+ \g at addto@macro\appendix{%
+ \addtocontents{toc}{%
+ \protect\renewcommand{\protect\cftchappresnum}{\appendixname\space}%
+ \protect\renewcommand{\protect\cftchapaftersnum}{}%
+ \setlength{\cftchapnumwidth}{\widthof{\textbf{Appendix~999}}}
+ }%
+ }
+}
+
+% restore the tt default family to lmodern tt family
+\renewcommand\ttdefault{lmtt}
\ No newline at end of file
Modified: trunk/Master/texmf-dist/tex/latex/elegantnote/elegantnote.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/elegantnote/elegantnote.cls 2022-04-09 20:30:34 UTC (rev 62988)
+++ trunk/Master/texmf-dist/tex/latex/elegantnote/elegantnote.cls 2022-04-09 20:32:58 UTC (rev 62989)
@@ -4,9 +4,10 @@
% Lastest Version: https://github.com/ElegantLaTeX/ElegantNote
% --- Class structure: identification part
-\ProvidesClass{elegantnote}[2020/04/12 ElegantNote v2.30 class]
+\ProvidesClass{elegantnote}[2022/04/09 ElegantNote v2.40 class]
\NeedsTeXFormat{LaTeX2e}
+
\RequirePackage{kvoptions}
\RequirePackage{etoolbox}
\RequirePackage{calc}
@@ -20,6 +21,7 @@
\DeclareVoidOption{blue}{\ekv{color=blue}}
\DeclareVoidOption{sakura}{\ekv{color=sakura}}
\DeclareVoidOption{black}{\ekv{color=black}}
+\DeclareVoidOption{brown}{\ekv{color=brown}}
\DeclareStringOption[pad]{device}
\DeclareVoidOption{pc}{\ekv{device=pc}}
@@ -35,6 +37,7 @@
\DeclareStringOption{mode}
\DeclareVoidOption{geye}{\ekv{mode=geye}}
\DeclareVoidOption{hazy}{\ekv{mode=hazy}}
+\DeclareVoidOption{sepia}{\ekv{mode=sepia}}
\DeclareStringOption[ctexfont]{chinesefont}
\DeclareVoidOption{ctexfont}{\ekv{chinesefont=ctexfont}}
@@ -41,13 +44,14 @@
\DeclareVoidOption{founder}{\ekv{chinesefont=founder}}
\DeclareVoidOption{nofont}{\ekv{chinesefont=nofont}}
-\DeclareStringOption[numbers]{cite}
-\DeclareVoidOption{numbers}{\ekv{cite=numbers}}
-\DeclareVoidOption{authoryear}{\ekv{cite=authoryear}}
-\DeclareVoidOption{super}{\ekv{cite=super}}
+\DeclareStringOption[numeric-comp]{citestyle}
+\DeclareStringOption[numeric]{bibstyle}
-\DeclareStringOption[apalike]{bibstyle}
+\DeclareStringOption[biber]{bibend}
+\DeclareVoidOption{biber}{\ekv{bibend=biber}}
+\DeclareVoidOption{bibtex}{\ekv{bibend=bibtex}}
+
\DeclareStringOption[11pt]{fontsize}
\DeclareVoidOption{10pt}{\ekv{fontsize=10pt}}
\DeclareVoidOption{11pt}{\ekv{fontsize=11pt}}
@@ -66,41 +70,60 @@
\LoadClass{article}
\PassOptionsToPackage{no-math}{fontspec}
+\PassOptionsToPackage{quiet}{fontspec}
\RequirePackage{amsmath,amsthm}
\RequirePackage{iftex}
-\ifdefstring{\ELEGANT at lang}{cn}{%
\ifXeTeX
- \ifdefstring{\ELEGANT at chinesefont}{founder}{
- \RequirePackage[UTF8,scheme=plain,fontset=none]{ctex}
- \setCJKmainfont[BoldFont={FZHei-B01},ItalicFont={FZKai-Z03}]{FZShuSong-Z01}
- \setCJKsansfont[BoldFont={FZHei-B01},ItalicFont={FZHei-B01}]{FZHei-B01}
- \setCJKmonofont[BoldFont={FZHei-B01},ItalicFont={FZHei-B01}]{FZFangSong-Z02}
- \setCJKfamilyfont{zhsong}{FZShuSong-Z01}
- \setCJKfamilyfont{zhhei}{FZHei-B01}
- \setCJKfamilyfont{zhkai}{FZKai-Z03}
- \setCJKfamilyfont{zhfs}{FZFangSong-Z02}
- \newcommand*{\songti}{\CJKfamily{zhsong}}
- \newcommand*{\heiti}{\CJKfamily{zhhei}}
- \newcommand*{\kaishu}{\CJKfamily{zhkai}}
- \newcommand*{\fangsong}{\CJKfamily{zhfs}}}{\relax}
+ \RequirePackage[no-math]{fontspec}
+ \setmainfont{texgyretermes}[
+ UprightFont = *-regular ,
+ BoldFont = *-bold ,
+ ItalicFont = *-italic ,
+ BoldItalicFont = *-bolditalic ,
+ Extension = .otf ,
+ Scale = 1.0]
- \ifdefstring{\ELEGANT at chinesefont}{nofont}{
- \RequirePackage[UTF8,scheme=plain,fontset=none]{ctex}}{\relax}
+ \setsansfont{texgyreheros}[
+ UprightFont = *-regular ,
+ BoldFont = *-bold ,
+ ItalicFont = *-italic ,
+ BoldItalicFont = *-bolditalic ,
+ Extension = .otf ,
+ Scale = 0.9]
+\else
+ \RequirePackage{newtxtext}
+ \RequirePackage[scaled=.90]{helvet}
+\fi
- \ifdefstring{\ELEGANT at chinesefont}{ctexfont}{
- \RequirePackage[UTF8,scheme=plain]{ctex}}{\relax}
- \else
- \ifdefstring{\ELEGANT at chinesefont}{ctexfont}{
- \RequirePackage[UTF8,scheme=plain]{ctex}}{\relax}
- \fi
+
+
+\ifdefstring{\ELEGANT at lang}{cn}{
+ \ifdefstring{\ELEGANT at chinesefont}{founder}{
+ \RequirePackage[UTF8,scheme=plain,fontset=none]{ctex}
+ \setCJKmainfont[BoldFont={FZHei-B01},ItalicFont={FZKai-Z03}]{FZShuSong-Z01}
+ \setCJKsansfont[BoldFont={FZHei-B01}]{FZKai-Z03}
+ \setCJKmonofont[BoldFont={FZHei-B01}]{FZFangSong-Z02}
+ \setCJKfamilyfont{zhsong}{FZShuSong-Z01}
+ \setCJKfamilyfont{zhhei}{FZHei-B01}
+ \setCJKfamilyfont{zhkai}[BoldFont={FZHei-B01}]{FZKai-Z03}
+ \setCJKfamilyfont{zhfs}[BoldFont={FZHei-B01}]{FZFangSong-Z02}
+ \newcommand*{\songti}{\CJKfamily{zhsong}}
+ \newcommand*{\heiti}{\CJKfamily{zhhei}}
+ \newcommand*{\kaishu}{\CJKfamily{zhkai}}
+ \newcommand*{\fangsong}{\CJKfamily{zhfs}}}{\relax}
+
+ \ifdefstring{\ELEGANT at chinesefont}{nofont}{
+ \RequirePackage[UTF8,scheme=plain,fontset=none]{ctex}}{\relax}
+
+ \ifdefstring{\ELEGANT at chinesefont}{ctexfont}{
+ \RequirePackage[UTF8,scheme=plain]{ctex}}{\relax}
+
\AfterEndPreamble{
- % \renewcommand{\itshape}{\kaishu}
- \setlength\parindent{2\ccwd}}
- }{\relax}
+ \setlength\parindent{2\ccwd}}
+}{\relax}
-
\ifcsname kaishu\endcsname
\newcommand{\citshape}{\kaishu}
\else
@@ -118,7 +141,6 @@
\fi
-\RequirePackage{newtxtext}
\ifdefstring{\ELEGANT at math}{newtx}{
\RequirePackage{newtxmath}
\let\Bbbk\relax
@@ -139,6 +161,61 @@
}{\relax}
+\RequirePackage[
+ backend=\ELEGANT at bibend,
+ citestyle=\ELEGANT at citestyle,
+ bibstyle=\ELEGANT at bibstyle]{biblatex}
+\defbibheading{elegantbook}[\ebibname]{#1}
+
+\RequirePackage{appendix}
+
+\ifdefstring{\ELEGANT at lang}{cn}{%
+ \theoremstyle{plain}% default
+ \newtheorem{theorem}{定理}[section] %
+ \newtheorem{lemma}[theorem]{引理} %
+ \newtheorem{proposition}[theorem]{命题} %
+ \newtheorem*{corollary}{推论} %
+ \theoremstyle{definition} %
+ \newtheorem{definition}{定义}[section] %
+ \newtheorem{conjecture}{猜想}[section] %
+ \newtheorem{example}{例}[section] %
+ \theoremstyle{remark} %
+ \newtheorem*{remark}{\normalfont\bfseries 评论} %
+ \newtheorem*{note}{\normalfont\bfseries 注} %
+ \newtheorem{case}{\normalfont\bfseries 案例} %
+ \renewcommand*{\proofname}{\normalfont\bfseries\color{ecolor}证明} %
+ \renewcommand\contentsname{\color{ecolor}目录}
+ \renewcommand\refname{\color{ecolor}参考文献} %
+ \renewcommand\figurename{图} %
+ \renewcommand\tablename{表}
+ \newcommand\versiontext{版本：}%
+ \newcommand\updatetext{更新：}%
+ \newcommand\ebibname{参考文献}
+ \setlength{\parindent}{2em}
+ \newcommand{\keywords}[1]{%
+ \vskip2ex\par\noindent\normalfont{\bfseries 关键词: } #1}
+ }{\relax}
+
+\ifdefstring{\ELEGANT at lang}{en}{
+ \theoremstyle{plain}% default
+ \newtheorem{theorem}{Theorem}[section] %
+ \newtheorem{lemma}[theorem]{Lemma} %
+ \newtheorem{proposition}[theorem]{Proposition} %
+ \newtheorem*{corollary}{Corollary} %
+ \theoremstyle{definition} %
+ \newtheorem{definition}{Definition}[section] %
+ \newtheorem{conjecture}{Conjecture}[section] %
+ \newtheorem{example}{Example}[section] %
+ \theoremstyle{remark} %
+ \newtheorem*{remark}{Remark} %
+ \newtheorem*{note}{Note} %
+ \newcommand\ebibname{Bibliography}
+ \newtheorem{case}{Case}
+ \renewcommand*{\proofname}{%
+ \normalfont\bfseries\color{ecolor} Proof}
+ \newcommand\versiontext{Version: }%
+ \newcommand\updatetext{Update: }}{\relax}
+
\RequirePackage{indentfirst}
\RequirePackage{anyfontsize}
@@ -180,6 +257,10 @@
\definecolor{geyecolor}{RGB}{251,250,248}%
\pagecolor{geyecolor}
}{\relax}
+\ifdefstring{\ELEGANT at mode}{sepia}{
+ \definecolor{geyecolor}{RGB}{250,237,225}%
+ \pagecolor{geyecolor}
+}{\relax}
% graphics path
@@ -242,11 +323,15 @@
\ifdefstring{\ELEGANT at color}{black}{
\definecolor{ecolor}{RGB}{0,0,0}%
}{\relax}
+\ifdefstring{\ELEGANT at color}{brown}{
+ \definecolor{ecolor}{RGB}{109,62,18}%
+}{\relax}
\definecolor{egreen}{RGB}{0,120,2}
\definecolor{ecyan}{RGB}{0,175,152}
\definecolor{eblue}{RGB}{20,50,104}
\definecolor{sakura}{RGB}{255,183,197}
+\definecolor{brown}{RGB}{109,62,18}
%% device settings
%% default=pad
@@ -312,61 +397,7 @@
\pagestyle{fancy-note}
-\ifdefstring{\ELEGANT at lang}{cn}{%
- \theoremstyle{plain}% default
- \newtheorem{theorem}{定理}[section] %
- \newtheorem{lemma}[theorem]{引理} %
- \newtheorem{proposition}[theorem]{命题} %
- \newtheorem*{corollary}{推论} %
- \theoremstyle{definition} %
- \newtheorem{definition}{定义}[section] %
- \newtheorem{conjecture}{猜想}[section] %
- \newtheorem{example}{例}[section] %
- \theoremstyle{remark} %
- \newtheorem*{remark}{\normalfont\bfseries 评论} %
- \newtheorem*{note}{\normalfont\bfseries 注} %
- \newtheorem{case}{\normalfont\bfseries 案例} %
- \renewcommand*{\proofname}{\normalfont\bfseries\color{ecolor}证明} %
- \renewcommand\contentsname{\color{ecolor}目录}
- \renewcommand\refname{\color{ecolor}参考文献} %
- \renewcommand\figurename{图} %
- \renewcommand\tablename{表}
- \newcommand\versiontext{版本：}%
- \newcommand\updatetext{更新：}%
- \setlength{\parindent}{2em}
- \newcommand{\keywords}[1]{%
- \vskip2ex\par\noindent\normalfont{\bfseries 关键词: } #1}
- \RequirePackage{gbt7714}
- \ifdefstring{\ELEGANT at cite}{authoryear}{
- \bibliographystyle{gbt7714-author-year}}{
- \bibliographystyle{gbt7714-numerical}}
- \ifdefstring{\ELEGANT at cite}{numbers}{
- \citestyle{numbers}}{\relax}
- }{\relax}
-\ifdefstring{\ELEGANT at lang}{en}{
- \theoremstyle{plain}% default
- \newtheorem{theorem}{Theorem}[section] %
- \newtheorem{lemma}[theorem]{Lemma} %
- \newtheorem{proposition}[theorem]{Proposition} %
- \newtheorem*{corollary}{Corollary} %
- \theoremstyle{definition} %
- \newtheorem{definition}{Definition}[section] %
- \newtheorem{conjecture}{Conjecture}[section] %
- \newtheorem{example}{Example}[section] %
- \theoremstyle{remark} %
- \newtheorem*{remark}{Remark} %
- \newtheorem*{note}{Note} %
- \newtheorem{case}{Case}
- \renewcommand*{\proofname}{%
- \normalfont\bfseries\color{ecolor} Proof}
- \newcommand\versiontext{Version: }%
- \newcommand\updatetext{Update: }%
- \RequirePackage[\ELEGANT at cite,sort&compress]{natbib}
- \bibliographystyle{\ELEGANT at bibstyle}}{%
- \relax}
-
-\setlength{\bibsep}{0.0pt}
\def\bibfont{\footnotesize}
\def\IfEmpty#1{%
@@ -426,8 +457,10 @@
\large
\lineskip .5em%
\begin{tabular}[t]{c}%
- \@author\\
- \the\institute
+ \@author
+ \end{tabular}\\
+ \begin{tabular}[t]{c}%
+ \the\institute
\end{tabular}\par}%
\IfEmpty\version
@@ -548,3 +581,8 @@
keywords},
frame=none,
tabsize=2}
+
+\addbibresource[location=local]{reference.bib}
+
+% restore the tt default family to lmodern tt family
+\renewcommand\ttdefault{lmtt}
Modified: trunk/Master/texmf-dist/tex/latex/elegantpaper/elegantpaper.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/elegantpaper/elegantpaper.cls 2022-04-09 20:30:34 UTC (rev 62988)
+++ trunk/Master/texmf-dist/tex/latex/elegantpaper/elegantpaper.cls 2022-04-09 20:32:58 UTC (rev 62989)
@@ -4,9 +4,10 @@
% Lastest Version: https://github.com/ElegantLaTeX/ElegantPaper
% --- Class structure: identification part
-\ProvidesClass{elegantpaper}[2020/04/12 v0.09 ElegantLaTeX Paper class]
+\ProvidesClass{elegantpaper}[2022/04/09 v0.10 ElegantLaTeX Paper class]
\NeedsTeXFormat{LaTeX2e}
+%%%
\RequirePackage{kvoptions}
\RequirePackage{etoolbox}
\RequirePackage{calc}
@@ -20,13 +21,14 @@
\DeclareStringOption[cm]{math}
-\DeclareStringOption[numbers]{cite}
-\DeclareVoidOption{numbers}{\ekv{cite=numbers}}
-\DeclareVoidOption{authoryear}{\ekv{cite=authoryear}}
-\DeclareVoidOption{super}{\ekv{cite=super}}
+\DeclareStringOption[numeric-comp]{citestyle}
+\DeclareStringOption[numeric]{bibstyle}
-\DeclareStringOption[apalike]{bibstyle}
+\DeclareStringOption[biber]{bibend}
+\DeclareVoidOption{biber}{\ekv{bibend=biber}}
+\DeclareVoidOption{bibtex}{\ekv{bibend=bibtex}}
+
\DeclareStringOption[ctexfont]{chinesefont}
\DeclareVoidOption{ctexfont}{\ekv{chinesefont=ctexfont}}
\DeclareVoidOption{founder}{\ekv{chinesefont=founder}}
@@ -78,7 +80,7 @@
\graphicspath{{image/}{figure/}{fig/}{img/}}
% caption settings
-\RequirePackage[font=small,labelfont={bf}]{caption}
+\RequirePackage[labelfont={bf}]{caption}
\captionsetup[table]{skip=3pt}
\captionsetup[figure]{skip=3pt}
@@ -101,36 +103,59 @@
% font settings
+
\PassOptionsToPackage{no-math}{fontspec}
-\ifdefstring{\ELEGANT at lang}{cn}{
- \ifXeTeX
- \ifdefstring{\ELEGANT at chinesefont}{founder}{
- \RequirePackage[UTF8,scheme=plain,fontset=none]{ctex}
- \setCJKmainfont[BoldFont={FZHei-B01},ItalicFont={FZKai-Z03}]{FZShuSong-Z01}
- \setCJKsansfont[BoldFont={FZHei-B01},ItalicFont={FZHei-B01}]{FZHei-B01}
- \setCJKmonofont[BoldFont={FZHei-B01},ItalicFont={FZHei-B01}]{FZFangSong-Z02}
- \setCJKfamilyfont{zhsong}{FZShuSong-Z01}
- \setCJKfamilyfont{zhhei}{FZHei-B01}
- \setCJKfamilyfont{zhkai}{FZKai-Z03}
- \setCJKfamilyfont{zhfs}{FZFangSong-Z02}
- \newcommand*{\songti}{\CJKfamily{zhsong}}
- \newcommand*{\heiti}{\CJKfamily{zhhei}}
- \newcommand*{\kaishu}{\CJKfamily{zhkai}}
- \newcommand*{\fangsong}{\CJKfamily{zhfs}}}{\relax}
+\PassOptionsToPackage{quiet}{fontspec}
+\RequirePackage{iftex}
+
+\ifXeTeX
+ \RequirePackage[no-math]{fontspec}
+ \setmainfont{texgyretermes}[
+ UprightFont = *-regular ,
+ BoldFont = *-bold ,
+ ItalicFont = *-italic ,
+ BoldItalicFont = *-bolditalic ,
+ Extension = .otf ,
+ Scale = 1.0]
- \ifdefstring{\ELEGANT at chinesefont}{nofont}{
- \RequirePackage[UTF8,scheme=plain,fontset=none]{ctex}}{\relax}
+ \setsansfont{texgyreheros}[
+ UprightFont = *-regular ,
+ BoldFont = *-bold ,
+ ItalicFont = *-italic ,
+ BoldItalicFont = *-bolditalic ,
+ Extension = .otf ,
+ Scale = 0.9]
+\else
+ \RequirePackage{newtxtext}
+ \RequirePackage[scaled=.90]{helvet}
+\fi
- \ifdefstring{\ELEGANT at chinesefont}{ctexfont}{
- \RequirePackage[UTF8,scheme=plain]{ctex}}{\relax}
- \else
- \ifdefstring{\ELEGANT at chinesefont}{ctexfont}{
- \RequirePackage[UTF8,scheme=plain]{ctex}}{\relax}
- \fi
+\ifdefstring{\ELEGANT at lang}{cn}{
+ \ifdefstring{\ELEGANT at chinesefont}{founder}{
+ \RequirePackage[UTF8,scheme=plain,fontset=none]{ctex}
+ \setCJKmainfont[BoldFont={FZHei-B01},ItalicFont={FZKai-Z03}]{FZShuSong-Z01}
+ \setCJKsansfont[BoldFont={FZHei-B01}]{FZKai-Z03}
+ \setCJKmonofont[BoldFont={FZHei-B01}]{FZFangSong-Z02}
+ \setCJKfamilyfont{zhsong}{FZShuSong-Z01}
+ \setCJKfamilyfont{zhhei}{FZHei-B01}
+ \setCJKfamilyfont{zhkai}[BoldFont={FZHei-B01}]{FZKai-Z03}
+ \setCJKfamilyfont{zhfs}[BoldFont={FZHei-B01}]{FZFangSong-Z02}
+ \newcommand*{\songti}{\CJKfamily{zhsong}}
+ \newcommand*{\heiti}{\CJKfamily{zhhei}}
+ \newcommand*{\kaishu}{\CJKfamily{zhkai}}
+ \newcommand*{\fangsong}{\CJKfamily{zhfs}}}{\relax}
+
+ \ifdefstring{\ELEGANT at chinesefont}{nofont}{
+ \RequirePackage[UTF8,scheme=plain,fontset=none]{ctex}}{\relax}
+
+ \ifdefstring{\ELEGANT at chinesefont}{ctexfont}{
+ \RequirePackage[UTF8,scheme=plain]{ctex}}{\relax}
+
\AfterEndPreamble{
- % \renewcommand{\itshape}{\kaishu}
- \setlength\parindent{2\ccwd}}}{\relax}
+ \setlength\parindent{2\ccwd}}
+}{\relax}
+
\ifcsname kaishu\endcsname
\newcommand{\citshape}{\kaishu}
\else
@@ -148,7 +173,6 @@
\newcommand{\cfs}{\normalfont}
\fi
-\RequirePackage{newtxtext}
\ifdefstring{\ELEGANT at math}{newtx}{
\RequirePackage{newtxmath}
\let\Bbbk\relax
@@ -168,6 +192,13 @@
\DeclareMathSymbol{\prodop}{\mathop}{CMlargesymbols}{"51}
}{\relax}
+
+\RequirePackage[
+ backend=\ELEGANT at bibend,
+ citestyle=\ELEGANT at citestyle,
+ bibstyle=\ELEGANT at bibstyle]{biblatex}
+\defbibheading{elegantbook}[\ebibname]{#1}
+
\RequirePackage{appendix}
\ifdefstring{\ELEGANT at lang}{cn}{
@@ -191,6 +222,7 @@
\renewcommand\tablename{表}%
\newcommand\versiontext{版本：}%
\newcommand\updatetext{日期：}%
+ \newcommand{\ebibname}{参考文献}
\renewcommand\abstractname{摘\hspace{2em}要}
\setlength\parindent{2\ccwd}
\renewcommand{\abstracttextfont}{\small\citshape\noindent\ignorespaces}
@@ -198,12 +230,6 @@
\newcommand{\keywords}[1]{\vskip2ex\par\noindent\normalfont{\bfseries 关键词: } #1}
\newcommand\figref[1]{{\bfseries 图~\ref{#1}}}
\newcommand\tabref[1]{{\bfseries 表~\ref{#1}}}
- \RequirePackage{gbt7714}
- \ifdefstring{\ELEGANT at cite}{authoryear}{
- \bibliographystyle{gbt7714-author-year}}{
- \bibliographystyle{gbt7714-numerical}}
- \ifdefstring{\ELEGANT at cite}{numbers}{
- \citestyle{numbers}}{\relax}
\renewcommand{\appendixtocname}{附录}
\renewcommand{\appendixpagename}{附录}}{\relax}
@@ -230,10 +256,9 @@
\newcommand{\keywords}[1]{\vskip 2ex\par\noindent\normalfont{\bfseries Keywords: } #1}
\newcommand\figref[1]{{\bfseries Figure~\ref{#1}}}
\newcommand\tabref[1]{{\bfseries Table~\ref{#1}}}
- \RequirePackage[\ELEGANT at cite,sort&compress]{natbib}
- \bibliographystyle{\ELEGANT at bibstyle}}{\relax}
+ \newcommand{\ebibname}{Bibliography}}{\relax}
-\setlength{\bibsep}{0.0pt}
+
\def\bibfont{\footnotesize}
\AtBeginEnvironment{verbatim}{\microtypesetup{activate=false}}
@@ -341,7 +366,7 @@
backgroundcolor=\color{lightgrey}
}
+\addbibresource[location=local]{reference.bib}
-
-
-
+% restore the tt default family to lmodern tt family
+\renewcommand\ttdefault{lmtt}
Modified: trunk/Master/tlpkg/bin/c2lx
===================================================================
--- trunk/Master/tlpkg/bin/c2lx 2022-04-09 20:30:34 UTC (rev 62988)
+++ trunk/Master/tlpkg/bin/c2lx 2022-04-09 20:32:58 UTC (rev 62989)
@@ -27,6 +27,9 @@
elif test "x$1" = x3; then
shift; label=l3
pkgs="l3kernel l3packages l3experimental l3build l3backend l3build"
+elif test "x$1" = xdeng; then
+ shift; label=deng
+ pkgs="elegantbook elegantnote elegantpaper"
elif test "x$1" = xjxu; then
shift; label=jxu
pkgs="beaulivre colorist einfart lebhart mindflow minimalist simplivre"
@@ -39,7 +42,7 @@
pkgs="minim-hatching minim-math minim-mp minim-pdf minim-xmp minim"
else
echo "$0: unknown latex or group type: $1" >&2
- echo "$0: must be one of: e dev 3 jxu qyi minimal-all" >&2
+ echo "$0: must be one of: e dev 3 deng jxu qyi minim-all" >&2
exit 1
fi
More information about the tex-live-commits
mailing list.