CTAN sync 202204100300

7 files changed, 152 insertions, 257 deletions

diff --git a/macros/latex/contrib/elegantnote/elegantnote-cn.pdf b/macros/latex/contrib/elegantnote/elegantnote-cn.pdf
index 7968f10162..0270e665ce 100644
--- a/macros/latex/contrib/elegantnote/elegantnote-cn.pdf
+++ b/macros/latex/contrib/elegantnote/elegantnote-cn.pdf
diff --git a/macros/latex/contrib/elegantnote/elegantnote-cn.tex b/macros/latex/contrib/elegantnote/elegantnote-cn.tex
index 35f7325446..e36b203605 100644
--- a/macros/latex/contrib/elegantnote/elegantnote-cn.tex
+++ b/macros/latex/contrib/elegantnote/elegantnote-cn.tex
@@ -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,83 +229,11 @@ Let $z$ be some element of $xH \cap yH$.  Then $z = xa$ for some $a \in H$, and
 回归分析（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）我们的模板。
-
-\begin{figure}[htbp]
-  \centering
-  \includegraphics[width=\textwidth]{star.png}
-  \caption{一键三连求赞}
-\end{figure}
-
-
-\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}%
+特别感谢 \href{https://github.com/sikouhjw}{sikouhjw} 和 \href{https://github.com/syvshc}{syvshc}  长期以来对于 Github 上 issue 的快速回应，以及各个社区论坛对于 ElegantLaTeX 相关问题的回复。特别感谢 ChinaTeX 以及 \href{http://www.latexstudio.net/}{LaTeX 工作室} 对于本系列模板的大力宣传与推广。
 
+如果你喜欢我们的模板，你可以在 Github 上收藏我们的模板。
 
 \section{常见问题 FAQ}
 
@@ -326,4 +251,6 @@ Let $z$ be some element of $xH \cap yH$.  Then $z = xa$ for some $a \in H$, and
     \end{lstlisting}
 \end{enumerate}
 
+%\printbibliography[heading=bibintoc, title=\ebibname]
+
 \end{document}
diff --git a/macros/latex/contrib/elegantnote/elegantnote-en.pdf b/macros/latex/contrib/elegantnote/elegantnote-en.pdf
index 7269b9a2d4..271eeeeecf 100644
--- a/macros/latex/contrib/elegantnote/elegantnote-en.pdf
+++ b/macros/latex/contrib/elegantnote/elegantnote-en.pdf
diff --git a/macros/latex/contrib/elegantnote/elegantnote-en.tex b/macros/latex/contrib/elegantnote/elegantnote-en.tex
index 198c0530a9..3da57d2b29 100644
--- a/macros/latex/contrib/elegantnote/elegantnote-en.tex
+++ b/macros/latex/contrib/elegantnote/elegantnote-en.tex
@@ -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 @@ The new template has the following features:
   \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,79 +204,9 @@ Let's continue using our application training example. In this case, we'd want t
 \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}
-
-\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}%
+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{FAQ}
@@ -296,4 +224,6 @@ To express your love for our templates and/or our developers, please do not hesi
 \end{enumerate}
 
 
+%\printbibliography[heading=bibintoc, title=\ebibname]
+
 \end{document}
diff --git a/macros/latex/contrib/elegantnote/elegantnote.cls b/macros/latex/contrib/elegantnote/elegantnote.cls
index fac84ea40d..872e4ff188 100644
--- a/macros/latex/contrib/elegantnote/elegantnote.cls
+++ b/macros/latex/contrib/elegantnote/elegantnote.cls
@@ -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,18 +37,20 @@
 \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}}
 \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[biber]{bibend}
+\DeclareVoidOption{biber}{\ekv{bibend=biber}}
+\DeclareVoidOption{bibtex}{\ekv{bibend=bibtex}}
 
-\DeclareStringOption[apalike]{bibstyle}
 
 \DeclareStringOption[11pt]{fontsize}
 \DeclareVoidOption{10pt}{\ekv{fontsize=10pt}}
@@ -66,41 +70,60 @@
 \LoadClass{article}
 
 \PassOptionsToPackage{no-math}{fontspec}
+\PassOptionsToPackage{quiet}{fontspec}
 \RequirePackage{amsmath,amsthm}
 
 \RequirePackage{iftex}
 
-\ifdefstring{\ELEGANT@lang}{cn}{%
 \ifXeTeX
-    \ifdefstring{\ELEGANT@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@chinesefont}{nofont}{
-      \RequirePackage[UTF8,scheme=plain,fontset=none]{ctex}}{\relax}
-
-    \ifdefstring{\ELEGANT@chinesefont}{ctexfont}{
-      \RequirePackage[UTF8,scheme=plain]{ctex}}{\relax}
-  \else
-    \ifdefstring{\ELEGANT@chinesefont}{ctexfont}{
-      \RequirePackage[UTF8,scheme=plain]{ctex}}{\relax}
-  \fi
-  \AfterEndPreamble{
-  % \renewcommand{\itshape}{\kaishu}
-  \setlength\parindent{2\ccwd}}
-  }{\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@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}
+  
+  \ifdefstring{\ELEGANT@chinesefont}{nofont}{
+    \RequirePackage[UTF8,scheme=plain,fontset=none]{ctex}}{\relax}
+
+  \ifdefstring{\ELEGANT@chinesefont}{ctexfont}{
+    \RequirePackage[UTF8,scheme=plain]{ctex}}{\relax}
+  
+  \AfterEndPreamble{
+    \setlength\parindent{2\ccwd}}
+}{\relax}
+
 \ifcsname kaishu\endcsname
   \newcommand{\citshape}{\kaishu}
 \else
@@ -118,7 +141,6 @@
 \fi
 
 
-\RequirePackage{newtxtext}
 \ifdefstring{\ELEGANT@math}{newtx}{
   \RequirePackage{newtxmath}
   \let\Bbbk\relax
@@ -139,6 +161,61 @@
 }{\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*{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@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@mode}{sepia}{
+  \definecolor{geyecolor}{RGB}{250,237,225}%
+  \pagecolor{geyecolor}
+}{\relax}
 
 
 % graphics path
@@ -242,11 +323,15 @@
 \ifdefstring{\ELEGANT@color}{black}{
   \definecolor{ecolor}{RGB}{0,0,0}%
 }{\relax}
+\ifdefstring{\ELEGANT@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@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@cite}{authoryear}{
-    \bibliographystyle{gbt7714-author-year}}{
-    \bibliographystyle{gbt7714-numerical}}
-  \ifdefstring{\ELEGANT@cite}{numbers}{
-    \citestyle{numbers}}{\relax}
-  }{\relax}
-
-\ifdefstring{\ELEGANT@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@cite,sort&compress]{natbib}
-  \bibliographystyle{\ELEGANT@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}
diff --git a/macros/latex/contrib/elegantnote/image/donate.jpg b/macros/latex/contrib/elegantnote/image/donate.jpg
deleted file mode 100644
index 60741efcde..0000000000
--- a/macros/latex/contrib/elegantnote/image/donate.jpg
+++ /dev/null
diff --git a/macros/latex/contrib/elegantnote/image/star.png b/macros/latex/contrib/elegantnote/image/star.png
deleted file mode 100644
index 26fbd607df..0000000000
--- a/macros/latex/contrib/elegantnote/image/star.png
+++ /dev/null