0.10

patch for newtx v1.7 or later

.gitignore

@@ -11,9 +11,11 @@
 *.cb
 *.cb2
 .*.lb
-delete-temp-files.bat
-elegantpaper-cn.pdf
-elegantpaper-en.pdf
+.DS_Store
+clean.bat
+elegant*-cn.pdf
+elegant*-en.pdf
+*.dates
 
 ## Intermediate documents:
 *.dvi

elegantpaper-cn.tex

@@ -1,30 +1,44 @@
 %!TEX program = xelatex
-% 完整编译: xelatex -> bibtex -> xelatex -> xelatex
+% 完整编译: 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.08}
+\version{0.10}
 \date{\zhtoday}
 
+
+% 本文档命令
+\usepackage{array}
+\newcommand{\ccr}[1]{\makecell{{\color{#1}\rule{1cm}{1cm}}}}
+
 \begin{document}
 
 \maketitle
 
 \begin{abstract}
-本文为 \href{https://github.com/ElegantLaTeX/ElegantPaper/}{ElegantPaper} 的说明文档。此模板基于 \LaTeX{} 的 article 类，专为工作论文写作而设计。设计这个模板的初衷是让作者不用关心工作论文的格式，专心写作，从而有更加舒心的写作体验。如果你有其他问题、建议或者报告 bug，可以在 \href{https://github.com/ElegantLaTeX/ElegantPaper/issues}{Github::ElegantPaper/issues} 留言。如果你想了解更多 Elegant\LaTeX{} 项目组设计的模板，请访问 \href{https://github.com/ElegantLaTeX/}{Github::ElegantLaTeX}。
+本文为 \href{https://github.com/ElegantLaTeX/ElegantPaper/}{ElegantPaper} 的说明文档。此模板基于 \LaTeX{} 的 article 类，专为工作论文写作而设计。设计这个模板的初衷是让作者不用关心工作论文的格式，专心写作，从而有更加舒心的写作体验。如果你有其他问题、建议或者报告 bug，可以在 \href{https://github.com/ElegantLaTeX/ElegantPaper/issues}{GitHub::ElegantPaper/issues} 留言。如果你想了解更多 Elegant\LaTeX{} 项目组设计的模板，请访问 \href{https://github.com/ElegantLaTeX/}{GitHub::ElegantLaTeX}。
 \keywords{Elegant\LaTeX{}，工作论文，模板}
 \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}
@@ -45,12 +59,49 @@
 \usepackage[UTF8,scheme=plain]{ctex}
 \end{lstlisting}
 
-\subsection{英文与数学字体}
+\subsection{数学字体选项}
+
+本模板定义了一个数学字体选项（\lstinline{math}），可选项有三个：
+\begin{enumerate}
+  \item \lstinline{math=cm}（默认），使用 \LaTeX{} 默认数学字体（推荐，无需声明）；
+  \item \lstinline{math=newtx}，使用 \lstinline{newtxmath} 设置数学字体（潜在问题比较多）。
+  \item \lstinline{math=mtpro2}，使用 \lstinline{mtpro2} 宏包设置数学字体，要求用户已经成功安装此宏包。
+\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}：方正字体选项（\textbf{需要安装方正字体}），后台调用 \lstinline{ctex} 宏包并且使用 \lstinline{fontset=none} 选项，然后设置字体为方正四款免费字体，方正字体下载注意事项见后文，用户只需要安装方正字体即可使用该选项。
+  \item \lstinline{nofont}：后台会调用 \lstinline{ctex} 宏包并且使用 \lstinline{fontset=none} 选项，不设定中文字体，用户可以自行设置中文字体，具体见后文。
+\end{enumerate}
+
+\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 用户请右键选择为全部用户安装，否则会找不到字体。}
+
+\begin{figure}[!htb]
+\centering
+\includegraphics[width=0.9\textwidth]{founder.png}
+\end{figure}
+
+\subsubsection{其他中文字体}
+如果你想完全自定义字体\footnote{这里仍然以方正字体为例。}，你可以选择 \lstinline{chinesefont=nofont}，然后在导言区设置即可，可以参考下方代码：
+\begin{lstlisting}
+\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}
+
 
-本模板使用 \lstinline{newtxtext} 和 \lstinline{newtxmath} 分别设置全文的英文文本字体和数学字体。数学字体的效果如下：
-\begin{equation}
-(a+3b)^{n} = \sum_{k=0}^{n} C_{n}^{k} a^{n-k} (3b)^k\label{eq:binom}
-\end{equation}
 
 \subsection{自定义命令}
 此模板并没有修改任何默认的 \LaTeX{} 命令或者环境\footnote{目的是保证代码的可复用性，请用户关注内容，不要太在意格式，这才是本工作论文模板的意义。}。另外，我自定义了 4 个命令：
@@ -62,74 +113,64 @@
 \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}
 
-在此感谢他们无私的奉献！
+如果需要添加排序方式，可以在导言区加入
+\begin{lstlisting}
+  \ExecuteBibliographyOptions{sorting=ynt}
+\end{lstlisting}
+
+启用国标之后，可以加入 \lstinline{sorting=gb7714-2015}。
 
 
-\section{致谢}
-截止到 2019 年 10 月 17 日，ElegantPaper v0.08 版本发布，ElegantPaper 模板在 Github 上的收藏数（star）达到了 164。在此特别感谢 China\TeX{} 以及 \href{http://www.latexstudio.net/}{\LaTeX{} 工作室}对于本系列模板的大力宣传与推广。
+\section{使用 newtx 系列字体}
 
-如果你喜欢我们的模板，你可以在 Github 上收藏（Star）我们的模板。
-\begin{figure}[htbp]
-  \centering
-  \includegraphics[width=\textwidth]{star.png}
-  \caption{一键三连求赞}
-\end{figure}
+如果需要使用原先版本的 \lstinline{newtx} 系列字体，可以通过显示声明数学字体：
 
-\section{捐赠}
-如果您非常喜爱我们的模板，你还可以选择捐赠以表达您对我们模板和我的支持！
+\begin{lstlisting}
+\documentclass[math=newtx]{elegantpaper}
+\end{lstlisting}
 
-\begin{figure}[htbp]
-  \centering
-  \includegraphics[width=0.5\textwidth]{donate.jpg}
-\end{figure}
+\subsection{连字符}
 
-\textbf{赞赏费用的使用解释权归 Elegant\LaTeX{} 所有，并且不接受监督，请自愿理性打赏}。10 元以上的赞赏，我们将列入捐赠榜，谢谢各位金主！
+如果使用 \lstinline{newtx} 系列字体宏包，需要注意下连字符的问题。
+\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}
+\end{equation}
+\end{lstlisting}
+
+\subsection{宏包冲突}
+
+有用户反馈模板在使用 \lstinline{yhmath} 以及 \lstinline{esvect} 等宏包时会报错：
+\begin{lstlisting}
+LaTeX Error:
+   Too many symbol fonts declared.
+\end{lstlisting}
+
+原因是在使用 \lstinline{newtxmath} 宏包时，重新定义了数学字体用于大型操作符，达到了 {\heiti 最多 16 个数学字体} 的上限，在调用其他宏包的时候，无法新增数学字体。为了减少调用非常用宏包，在此给出如何调用 \lstinline{yhmath} 以及 \lstinline{esvect} 宏包的方法。
+
+请在 \lstinline{elegantpaper.cls} 内搜索 \lstinline{yhmath} 或者 \lstinline{esvect}，将你所需要的宏包加载语句\textit{取消注释}即可。
 
-\begin{table}[!htbp]
-  \centering
-  \caption{Elegant\LaTeX{} 系列模板捐赠榜}
-  \begin{tabular}{crcc}
-    \toprule
-    捐赠者   & 金额 & 时间 & 渠道 \\
-    \midrule
-    Lerh  & 10 元  & 2019/05/15 & 微信 \\
-    越过地平线 & 10 元    & 2019/05/15 & 微信 \\
-    大熊 &  20 元 & 2019/05/27 & 微信 \\
-    * 空 & 10 元 & 2019/05/30 & 微信\\
-    \href{http://www.latexstudio.net/}{latexstudio.net} & 666 元 & 2019/06/05 & 支付宝\\
-    Cassis & 11 元 & 2019/06/30 & 微信\\
-    * 君 & 10 元 & 2019/07/23 & 微信\\
-    * 萌 & 19 元 & 2019/08/28 & 微信 \\
-    曲豆豆 & 10 元 & 2019/08/28 & 微信 \\
-    李博 & 100 元 & 2019/10/06 & 微信\\
-    Njustsll & 10 元 & 2019/10/11 & 微信 \\
-  \bottomrule
-  \end{tabular}%
-\end{table}%
 
 \section{常见问题 FAQ}
 
@@ -141,55 +182,26 @@
   \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}
+    在 \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}
+    请参考 \href{https://github.com/ElegantLaTeX/ElegantPaper/issues/5}{GitHub::ElegantPaper/issues/5}
 \end{enumerate}
 
-\section{示例}
 
-为了让大家更加清楚最终的论文效果，如下给出两篇使用 ElegantPaper 模板排版的工作论文示例，也欢迎大家“投稿”！
+\section{致谢}
 
-\begin{enumerate}
-  \item \href{https://github.com/EthanDeng/bank-custody}{银行存管、投资者决策与 P2P 网络借贷规范发展}；
-  \item \href{https://github.com/EthanDeng/risk-awareness}{互联网金融风险与投资者风险意识 —— 来自网贷平台交易数据的证据}。
-\end{enumerate}
+特别感谢 \href{https://github.com/sikouhjw}{sikouhjw} 和 \href{https://github.com/syvshc}{syvshc}  长期以来对于 Github 上 issue 的快速回应，以及各个社区论坛对于 ElegantLaTeX 相关问题的回复。特别感谢 ChinaTeX 以及 \href{http://www.latexstudio.net/}{LaTeX 工作室} 对于本系列模板的大力宣传与推广。
 
-这是一个最小示例文档（Minimal Example）：
-\begin{lstlisting}
-\documentclass[lang=cn,a4paper,11pt]{elegantpaper}
-
-% title information
-\title{Working Paper Example}
-\author{Author Name} 
-\institute{Elegant\LaTeX{} Group}
-
-\version{1.00}
-\date{\today}
-
-\begin{document}
-
-\maketitle
-
-\begin{abstract}
-Your abstract goes here.
-\keywords{keyword1, keyword2}
-\end{abstract}
-
-\section{Introduction}
-The content of introduction section.
-
-\section{Conclusion}
-The content of conclusion section.
-
-\bibliography{wpref}
-
-\end{document}
-\end{lstlisting}
+如果你喜欢我们的模板，你可以在 Github 上收藏我们的模板。
 
 \nocite{*}
-\bibliography{wpref}
+\printbibliography[heading=bibintoc, title=\ebibname]
+
+\appendix
+%\appendixpage
+\addappheadtotoc
 
 \end{document}

elegantpaper-en.tex

@@ -1,25 +1,36 @@
 %!TEX program = pdflatex
-% Full chain: pdflatex -> bibtex -> pdflatex -> pdflatex
-\documentclass[11pt,en,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.08}
+\version{0.10}
 \date{\today}
 
+% cmd for this doc
+\usepackage{array}
+\newcommand{\ccr}[1]{\makecell{{\color{#1}\rule{1cm}{1cm}}}}
 
 \begin{document}
 
 \maketitle
 
 \begin{abstract}
-This documentation illustrates the usage of the \href{https://github.com/ElegantLaTeX/ElegantPaper}{ElegantPaper} template. This template is based on the standard \LaTeX{} article class, which is designed for working paper writing. With this template, you can get rid of all the worries about the format and merely focus on writing. For any question, please leave a message on \href{https://github.com/ElegantLaTeX/ElegantPaper/issues}{Github::ElegantPaper/issues}. Want to know more about Elegant\LaTeX{} Templates? Please visit: \href{https://github.com/ElegantLaTeX}{https://github.com/ElegantLaTeX}.\par
+This documentation illustrates the usage of the \href{https://github.com/ElegantLaTeX/ElegantPaper}{ElegantPaper} template. This template is based on the standard \LaTeX{} article class, which is designed for working paper writing. With this template, you can get rid of all the worries about the format and merely focus on writing. For any question, please leave a message on \href{https://github.com/ElegantLaTeX/ElegantPaper/issues}{GitHub::ElegantPaper/issues}. Want to know more about Elegant\LaTeX{} Templates? Please visit: \href{https://github.com/ElegantLaTeX}{https://github.com/ElegantLaTeX}.\par
 \keywords{Elegant\LaTeX{}, Working Paper, Template}
 \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}.
@@ -40,90 +51,78 @@ Language mode option \lstinline{lang} allows two alternative inputs, \lstinline{
 \usepackage[UTF8,scheme=plain]{ctex}
 \end{lstlisting}
 
-\subsection{Fonts}
-This template sets \lstinline{newtxtext} and \lstinline{newtxmath} for English and math fonts respectively.
-\begin{equation}
-(a+3b)^{n} = \sum_{k=0}^{n} C_{n}^{k} a^{n-k} (3b)^k\label{eq:binom}
-\end{equation}
+\subsection{Math Fonts}
+
+This template defines a new option (\lstinline{math}), with three options:
+
+\begin{enumerate}
+  \item \lstinline{math=cm} (default), use \LaTeX{} default math font (recommended).
+  \item \lstinline{math=newtx}, use \lstinline{newtxmath} math font (may bring about bugs).
+  \item \lstinline{math=mtpro2}, use \lstinline{mtpro2} package to set math font.
+\end{enumerate}
+
 
 \subsection{Custom Commands}
 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: ~\cite{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}. 
+
+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 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
 
-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}
-
-\documentclass[cite=authoryear]{elegantpaper} % author-year ref style
-\documentclass[authoryear]{elegantpaper}
+\documentclass[citestyle=numeric-comp, bibstyle=authoryear]{elegantpaper} 
 \end{lstlisting}
 
-\section{Recruit Support Members}
+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.
 
-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[bibtex]{elegantpaper} % or
+\documentclass[bibend=bibtex]{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}
 
-Thank them all!!!
 
-\section{Acknowledgement}
-The number of stars on Github for ElegantPaper reached 164 on Oct 17, 2019 at the release of ElegantPaper v0.08.
-Thank China\TeX{} and \href{http://www.latexstudio.net/}{\LaTeX{} studio} for their promotion. 
+\subsection{Use newtx fonts}
+If you use \lstinline{newtx} fonts, you can use the \lstinline{math} option as 
+\begin{lstlisting}
+\documentclass[math=newtx]{elegantpaper}
+\end{lstlisting}
 
-If you like our templates, star 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}
+\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}
+\end{equation}
 
-\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!
+The corresponding code is: 
+\begin{lstlisting}
+\begin{equation}
+\int_{R^q} f(x,y) dy.\emph{of \kern0pt f}
+\end{equation}
+\end{lstlisting}
+
+\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:
+Too many symbol fonts declared.
+\end{lstlisting}
+
+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{table}[htbp]
-	\centering
-	\caption{Donation List}
-	\begin{tabular}{cccc}
-		\toprule
-		Tipper   & Amount & Date & Channel \\
-		\midrule
-		Lerh  & 10 RMB  & 2019/05/15 & Wechat \\
-		Yueguodipingxian & 10 RMB   & 2019/05/15 & Wechat \\
-		Dapeng & 20 RMB & 2019/05/27 & Wechat\\
-		Anonymous & 10 RMB & 2019/05/30 & Wechat \\
-		\href{http://www.latexstudio.net/}{latexstudio.net} & 666 RMB & 2019/06/05 & Alipay \\
-		Cassis & 11 RMB & 2019/06/30 & Wechat \\
-		Some Jun & 10 RMB & 2019/07/23 & Wechat \\
-		Some 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 \\
-		\bottomrule
-	\end{tabular}%
-\end{table}%
 
 \section{FAQ}
 
@@ -138,43 +137,20 @@ To express your love for our templates and/or our developers, please do not hesi
   \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}
+  Please refer to \href{https://github.com/ElegantLaTeX/ElegantPaper/issues/5}{GitHub::ElegantPaper/issues/5}
 \end{enumerate}
 
-\section{Minimal Example}
-A minimal example is as follows:
-\begin{lstlisting}
-\documentclass[a4paper,11pt]{elegantpaper}
+\section{Acknowledgement}
 
-% title information
-\title{Working Paper Example}
-\author{Author Name} 
-\institute{Elegant\LaTeX{} Group}
+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. 
 
-\version{1.00}
-\date{\today}
 
-\begin{document}
 
-\maketitle
+\printbibliography[heading=bibintoc, title=\ebibname]
 
-\begin{abstract}
-Your abstract goes here.
-\keywords{keyword1, keyword2}
-\end{abstract}
+\appendix
+%\appendixpage
+\addappheadtotoc
 
-\section{Introduction}
-The content of introduction section.
-
-\section{Conclusion}
-The content of conclusion section.
-
-\bibliography{wpref}
-
-\end{document}
-\end{lstlisting}
-
-\nocite{en1,en2}
-\bibliography{wpref}
 
 \end{document}

elegantpaper.cls

@@ -4,12 +4,11 @@
 % Lastest Version: https://github.com/ElegantLaTeX/ElegantPaper
 
 % --- Class structure: identification part
-\ProvidesClass{elegantpaper}[2019/10/17 v0.08 ElegantLaTeX Paper class]
+\ProvidesClass{elegantpaper}[2022/04/09 v0.10 ElegantLaTeX Paper class]
 \NeedsTeXFormat{LaTeX2e} 
 
+%%%
 \RequirePackage{kvoptions}
-\RequirePackage{ifthen}
-\RequirePackage{ifxetex}
 \RequirePackage{etoolbox}
 \RequirePackage{calc}
 
@@ -17,60 +16,32 @@
 \newcommand{\ekv}[1]{\kvsetkeys{ELEGANT}{#1}}
 
 \DeclareStringOption[en]{lang}
-\DeclareVoidOption{cn}{\ekv{lang = cn}}
-\DeclareVoidOption{en}{\ekv{lang = en}}
+\DeclareVoidOption{cn}{\ekv{lang=cn}}
+\DeclareVoidOption{en}{\ekv{lang=en}}
 
-\DeclareStringOption[numbers]{cite}
-\DeclareVoidOption{numbers}{\ekv{cite=numbers}}
-\DeclareVoidOption{authoryear}{\ekv{cite=authoryear}}
-\DeclareVoidOption{super}{\ekv{cite=super}}
+\DeclareStringOption[cm]{math}
+
+\DeclareStringOption[numeric-comp]{citestyle}
+\DeclareStringOption[numeric]{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}}
+\DeclareVoidOption{nofont}{\ekv{chinesefont=nofont}}
+
+\DeclareVoidOption{newtx}{\ekv{math=newtx}}
+\DeclareVoidOption{mtpro2}{\ekv{math=mtpro2}}
+\DeclareVoidOption{cm}{\ekv{math=cm}}
 
 \DeclareDefaultOption{\PassOptionsToClass{\CurrentOption}{article}}
 \ProcessKeyvalOptions*\relax
 \LoadClass{article}
 
-
-
-\RequirePackage{amsthm}
-\RequirePackage{amsmath}
-\RequirePackage{amssymb}
-\RequirePackage{indentfirst}
-\RequirePackage{booktabs}
-\RequirePackage{multicol}
-\RequirePackage{multirow}
-\RequirePackage{linegoal}
-\RequirePackage{xcolor}
-\RequirePackage{graphicx}
-\RequirePackage{fancyvrb}
-\RequirePackage{abstract}
-\RequirePackage{hologo}
-
-\linespread{1.35}
-\graphicspath{{image/}{figure/}{fig/}{img/}}
-
-% caption settings 
-\RequirePackage[font=small,labelfont={bf}]{caption} 
-\captionsetup[table]{skip=3pt}
-\captionsetup[figure]{skip=3pt}
-
-% list/itemize/enumerate setting
-\RequirePackage[shortlabels,inline]{enumitem}
-\setlist{nolistsep}
-
-\RequirePackage[\ELEGANT@cite,sort&compress]{natbib}
-% \PassOptionsToPackage{\ELEGANT@cite}{natbib}
-\setlength{\bibsep}{0.0pt}
-\def\bibfont{\footnotesize}
-
-% define the hyperref color 
-\RequirePackage{xcolor}
-\definecolor{winered}{rgb}{0.5,0,0}
-
-\definecolor{lightgrey}{rgb}{0.95,0.95,0.95}
-\definecolor{commentcolor}{RGB}{0,100,0}
-\definecolor{frenchplum}{RGB}{190,20,83}
-
-% settings for the hyperref and geometry
 \RequirePackage{hyperref}
 \hypersetup{
   pdfborder={0 0 0},
@@ -81,51 +52,160 @@
   citecolor={winered},
   linktoc=all,
 }
-\RequirePackage[left=1in, right=1in, top=1in, bottom=1in,headheight=0pt,headsep=0pt]{geometry}
+% settings for the hyperref and geometry
+\RequirePackage[
+  left=1in,
+  right=1in,
+  top=1in,
+  bottom=1in,
+  headheight=0pt,
+  headsep=0pt]{geometry}
 \setlength{\headsep}{5pt}
 
-% add the \email cmd 
+\RequirePackage{amsthm}
+\RequirePackage{amsmath}
+\RequirePackage{amssymb}
+\RequirePackage{indentfirst}
+\RequirePackage{booktabs}
+\RequirePackage{multicol}
+\RequirePackage{multirow}
+% \RequirePackage{linegoal}
+\RequirePackage{xcolor}
+\RequirePackage{graphicx}
+\RequirePackage{fancyvrb}
+\RequirePackage{abstract}
+\RequirePackage{hologo}
+
+\linespread{1.35}
+\graphicspath{{image/}{figure/}{fig/}{img/}}
+
+% caption settings 
+\RequirePackage[labelfont={bf}]{caption}
+\captionsetup[table]{skip=3pt}
+\captionsetup[figure]{skip=3pt}
+
+% list/itemize/enumerate setting
+\RequirePackage[shortlabels,inline]{enumitem}
+\setlist{nolistsep}
+
+
+% define the hyperref color 
+\RequirePackage{xcolor}
+\definecolor{winered}{rgb}{0.5,0,0}
+
+\definecolor{lightgrey}{rgb}{0.95,0.95,0.95}
+\definecolor{commentcolor}{RGB}{0,100,0}
+\definecolor{frenchplum}{RGB}{190,20,83}
+
+
+% add the email cmd 
 \newcommand\email[1]{\href{mailto:#1}{\nolinkurl{#1}}}
 
 % font settings
+
+
 \PassOptionsToPackage{no-math}{fontspec}
+\PassOptionsToPackage{quiet}{fontspec}
+\RequirePackage{iftex}
 
-\ifdefstring{\ELEGANT@lang}{cn}{%
-  \RequirePackage[UTF8, scheme=plain]{ctex}
-}
+\ifXeTeX
+  \RequirePackage[no-math]{fontspec}
+  \setmainfont{texgyretermes}[
+    UprightFont = *-regular ,
+    BoldFont = *-bold ,
+    ItalicFont = *-italic ,
+    BoldItalicFont = *-bolditalic ,
+    Extension = .otf ,
+    Scale = 1.0]
     
-\ifxetex
-  \RequirePackage{fontenc}
+  \setsansfont{texgyreheros}[
+    UprightFont = *-regular ,
+    BoldFont = *-bold ,
+    ItalicFont = *-italic ,
+    BoldItalicFont = *-bolditalic ,
+    Extension = .otf ,
+    Scale = 0.9]
 \else
-  \RequirePackage[T1]{fontenc}
-  \AtEndOfClass{%
-    \RequirePackage{microtype}}
+  \RequirePackage{newtxtext}
+  \RequirePackage[scaled=.90]{helvet}
 \fi
 
-% newtxtext and newtxmath pkg
-\RequirePackage{newtxtext}
-\RequirePackage{newtxmath}
-\RequirePackage{esint}
+\ifdefstring{\ELEGANT@lang}{cn}{
+  \ifdefstring{\ELEGANT@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}
   
-%%% use yhmath pkg, uncomment following code
-% \let\oldwidering\widering
-% \let\widering\undefined
-% \RequirePackage{yhmath}
-% \let\widering\oldwidering
+  \ifdefstring{\ELEGANT@chinesefont}{nofont}{
+    \RequirePackage[UTF8,scheme=plain,fontset=none]{ctex}}{\relax}
 
-%%% use esvect pkg, uncomment following code
-% \RequirePackage{esvect}
+  \ifdefstring{\ELEGANT@chinesefont}{ctexfont}{
+    \RequirePackage[UTF8,scheme=plain]{ctex}}{\relax}
   
-\DeclareSymbolFont{CMlargesymbols}{OMX}{cmex}{m}{n}
-\let\sumop\relax\let\prodop\relax
-\DeclareMathSymbol{\sumop}{\mathop}{CMlargesymbols}{"50}
-\DeclareMathSymbol{\prodop}{\mathop}{CMlargesymbols}{"51}
+  \AfterEndPreamble{
+    \setlength\parindent{2\ccwd}}
+}{\relax}
+
+
+\ifcsname kaishu\endcsname
+  \newcommand{\citshape}{\kaishu}
+\else
+  \newcommand{\citshape}{\itshape}
+\fi
+\ifcsname kaishu\endcsname
+  \newcommand{\cnormal}{\kaishu}
+\else
+  \newcommand{\cnormal}{\normalfont}
+\fi
+
+\ifcsname fangsong\endcsname
+  \newcommand{\cfs}{\fangsong}
+\else
+  \newcommand{\cfs}{\normalfont}
+\fi
+
+\ifdefstring{\ELEGANT@math}{newtx}{
+  \RequirePackage{newtxmath}
+  \let\Bbbk\relax
+  \RequirePackage{esint}
+  %%% 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}
+
+  \DeclareSymbolFont{CMlargesymbols}{OMX}{cmex}{m}{n}
+  \let\sumop\relax\let\prodop\relax
+  \DeclareMathSymbol{\sumop}{\mathop}{CMlargesymbols}{"50}
+  \DeclareMathSymbol{\prodop}{\mathop}{CMlargesymbols}{"51}
+}{\relax}
+
+
+\RequirePackage[
+  backend=\ELEGANT@bibend,
+  citestyle=\ELEGANT@citestyle,
+  bibstyle=\ELEGANT@bibstyle]{biblatex}
+\defbibheading{elegantbook}[\ebibname]{#1}
+
+\RequirePackage{appendix}
 
 \ifdefstring{\ELEGANT@lang}{cn}{
   \theoremstyle{plain}% default
   \newtheorem{theorem}{定理}[section] %
   \newtheorem{lemma}[theorem]{引理} %
-  \newtheorem{proposition}[theorem]{性质} %
+  \newtheorem{proposition}[theorem]{命题} %
   \newtheorem*{corollary}{推论} %
   \theoremstyle{definition} %
   \newtheorem{definition}{定义}[section] %
@@ -142,15 +222,16 @@
   \renewcommand\tablename{表}%
   \newcommand\versiontext{版本：}%
   \newcommand\updatetext{日期：}%
+  \newcommand{\ebibname}{参考文献}
   \renewcommand\abstractname{摘\hspace{2em}要}
   \setlength\parindent{2\ccwd}
-  \renewcommand{\abstracttextfont}{\small\sffamily\kaishu\noindent\ignorespaces}
+  \renewcommand{\abstracttextfont}{\small\citshape\noindent\ignorespaces}
   % 新定义命令
   \newcommand{\keywords}[1]{\vskip2ex\par\noindent\normalfont{\bfseries 关键词: } #1}
   \newcommand\figref[1]{{\bfseries 图~\ref{#1}}}
   \newcommand\tabref[1]{{\bfseries 表~\ref{#1}}}
-  \RequirePackage[\ELEGANT@cite]{gbt7714}
-}{\relax}
+  \renewcommand{\appendixtocname}{附录}
+  \renewcommand{\appendixpagename}{附录}}{\relax}
 
 \ifdefstring{\ELEGANT@lang}{en}{
   \theoremstyle{plain}% default
@@ -172,11 +253,13 @@
   \setlength\parindent{2em}
   \renewcommand{\abstracttextfont}{\sffamily\small\noindent\ignorespaces}
   % newcommands defined in this template.
-  \newcommand{\keywords}[1]{\vskip2ex\par\noindent\normalfont{\bfseries Keywords: } #1}
+  \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}}}
-  \bibliographystyle{aer}
-}{\relax}
+  \newcommand{\ebibname}{Bibliography}}{\relax}
+
+
+\def\bibfont{\footnotesize}
 
 \AtBeginEnvironment{verbatim}{\microtypesetup{activate=false}}
 \BeforeBeginEnvironment{tabular}{\small}
@@ -186,8 +269,7 @@
   \setlength{\abovedisplayskip}{3pt}
   \setlength{\belowdisplayskip}{3pt}
   \RequirePackage[flushmargin]{footmisc}
-  \setlength{\footnotesep}{12pt}
-}
+  \setlength{\footnotesep}{12pt}}
 
 \def\IfEmpty#1{%
   \edef\1{\the#1}
@@ -248,12 +330,12 @@
 \vskip 0.5ex%
 \IfEmpty\version
 \else 
-{\small\normalfont\ifdefstring{\ELEGANT@lang}{en}{\itshape}{\kaishu}\versiontext\the\version}
+{\small\normalfont\citshape\versiontext\the\version}
 \fi
 \ifx\@date\empty
 \else
 \vskip 0.1em%
- {\small\normalfont\ifdefstring{\ELEGANT@lang}{en}{\itshape}{\kaishu}\updatetext\@date}%
+ {\small\normalfont\citshape\updatetext\@date}%
 \fi
   \end{center}%
   \par
@@ -284,6 +366,7 @@
 	backgroundcolor=\color{lightgrey}
 }
 
+\addbibresource[location=local]{reference.bib}
 
-
-
+% restore the tt default family to lmodern tt family
+\renewcommand\ttdefault{lmtt}

figure/scatter.py

@@ -1,27 +0,0 @@
-# This file is the source file of the scatter.pdf
-# source page: https://matplotlib.org/gallery/shapes_and_collections/scatter.html
-import numpy as np
-import matplotlib.pyplot as plt
-
-# Fixing random state for reproducibility
-np.random.seed(19680801)
-
-
-N = 50
-x = np.random.rand(N)
-y = np.random.rand(N)
-colors = np.random.rand(N)
-area = (30 * np.random.rand(N))**2  # 0 to 15 point radii
-
-ax = plt.subplot(111)
-ax.scatter(x, y, s=area, c=colors, alpha=0.5)
-
-# Hide the right and top spines
-ax.spines['right'].set_visible(False)
-ax.spines['top'].set_visible(False)
-
-# Only show ticks on the left and bottom spines
-ax.yaxis.set_ticks_position('left')
-ax.xaxis.set_ticks_position('bottom')
-
-plt.savefig('scatter.pdf', transparent=True)