modify md

fix link typo

README-CN.md

@@ -0,0 +1,32 @@
+<!-- Author : Dongsheng Deng & Liam Huang-->
+<!-- Program Email: elegantlatex2e@gmail.com -->
+
+[Homepage](https://elegantlatex.org/) | [Github](https://github.com/ElegantLaTeX/ElegantBook) | [CTAN](https://ctan.org/pkg/elegantbook) | [Download](https://github.com/ElegantLaTeX/ElegantBook/releases) | [Wiki](https://github.com/ElegantLaTeX/ElegantBook/wiki) | [Weibo](https://weibo.com/elegantlatex)
+
+![License](https://img.shields.io/ctan/l/elegantbook.svg) ![CTAN Version](https://img.shields.io/ctan/v/elegantbook.svg) ![Github Version](https://img.shields.io/github/release/ElegantLaTeX/ElegantBook.svg) ![Repo Size](https://img.shields.io/github/repo-size/ElegantLaTeX/ElegantBook.svg)
+
+---
+
+# ElegantBook 优美的 LaTeX 书籍模板
+
+ElegantBook 是为 LaTeX 书籍写作而设计的模板，由 [Dongsheng Deng](https://ddswhu.me/) 和 [Liam Huang](https://liam.page/) 创立，模板创立的初衷是方便我们自己做笔记 :smile:。如果你有其他问题、建议或者报告 bug，可以提交 issues 或者给我们发邮件：elegantlatex2e@gmail.com。QQ 用户交流群：692108391，欢迎加入。
+
+## 重要提示
+
+**重要提示**：ElegantLaTeX 项目 **不接受** 任何非预授权的提交（pull requests）！
+
+## 致谢
+
+特别感谢 ChinaTeX 以及 [LaTeX 工作室](http://www.latexstudio.net/)对于本系列模板的大力宣传与推广。
+
+如果你喜欢我们的模板，你可以在 Github 上收藏我们的模板。
+
+## 协议
+
+本模板发布遵循 LaTeX 项目公共许可证 1.3 c 或更高版本。如果是衍生作品，请务必加入协议声明和模板信息（github、CTAN 地址）。
+
+## 衍生作
+
++ [ElegantBookdown](https://github.com/XiangyunHuang/ElegantBookdown)：[XiangyunHuang](https://github.com/XiangyunHuang) 开发并维护的基于 ElegantBook 的 Bookdown 模板。
++ [bookdownplus](https://github.com/pzhaonet/bookdownplus)：应网友要求，[pzhaonet](https://github.com/pzhaonet) 在 bookdownplus 收录了 ElegantPaper 模板，并为 Mac 做了字体适配。
++ [PanBook](https://github.com/annProg/PanBook)：[annProg](https://github.com/annProg) 开发并维护的基于 Markdown 写作的工作流，收录了 ElegantBook 和 ElegantPaper 模板。

README.md

@@ -5,82 +5,6 @@
 
 ![License](https://img.shields.io/ctan/l/elegantbook.svg) ![CTAN Version](https://img.shields.io/ctan/v/elegantbook.svg) ![Github Version](https://img.shields.io/github/release/ElegantLaTeX/ElegantBook.svg) ![Repo Size](https://img.shields.io/github/repo-size/ElegantLaTeX/ElegantBook.svg)
 
----
-
-# ElegantBook 优美的 LaTeX 书籍模板
-
-ElegantBook 是为 LaTeX 书籍写作而设计的模板，由 [Dongsheng Deng](https://ddswhu.me/) 和 [Liam Huang](https://liam.page/) 创立，模板创立的初衷是方便我们自己做笔记 :smile:。如果你有其他问题、建议或者报告 bug，可以提交 issues 或者给我们发邮件：elegantlatex2e@gmail.com。QQ 用户交流群：692108391，欢迎加入。
-
-## 重要提示
-
-**版本提醒：** 由于新版本进行了重构，并且 3.06 版本对于封面进行了改版，3.06 以后的版本并不兼容之前版本，如果你想把之前版本的文件转为 3.06 以后的版本，请查看[跨版本转换](https://github.com/ElegantLaTeX/ElegantBook/wiki/convert)。我们强烈建议你使用最新版。
-
-**重要提示**：ElegantLaTeX 项目 **不接受** 任何非作者预约提交（pull requests）！
-
-## 致谢
-
-2019 年 5 月 20 日，ElegantBook 模板在 Github 上的 Star 数达到了 100，这对于 ElegantLaTeX 系列模板是一个非常重要的里程碑！在此特别感谢 ChinaTeX 以及 [LaTeX 工作室](http://www.latexstudio.net/)对于本系列模板的大力宣传与推广。LaTeX 工作室网站上有很多精彩的帖子和精致的模板，欢迎大家去挖掘里面的宝藏。这也是我所见到的国内最全面的 LaTeX 相关的网站。
-
-如果你喜欢我们的模板，你可以在 Github 上收藏我们的模板。
-
-## 捐赠
-
-如果您非常喜爱我们的模板或者我，你还可以选择捐赠以表达您对我们模板和我的支持。本模板自 3.08 版本发布了捐赠信息之后，收到了超过千元的捐赠（四舍五入就是一个亿），非常感谢！
-
-![](https://github.com/ElegantLaTeX/ElegantBook/wiki/donate.jpg)
-
-**赞赏费用的使用解释权归 ElegantLaTeX 所有，并且不接受监督，请自愿理性打赏**。10 元以上的赞赏，我们将列入捐赠榜，谢谢各位金主！（如果有遗漏，请务必联系我们，这对我们很重要）
-
-
-| 捐赠者   | 金额 |  时间  | 渠道 |
-| :------:   | :----:   | :----: | :------:   |
-| Lerh   | 10 RMB |   2019/05/15   | 微信 |
-| 越过地平线  | 10 RMB | 2019/05/15   | 微信 |
-| 银桑 | 20 RMB | 2019/05/27  | 微信 |
-| *空 | 10 RMB | 2019/05/30 | 微信 |
-| [latexstudio.net](http://www.latexstudio.net) | 666 RMB | 2019/06/05 | 支付宝 |
-| 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 | 微信 |
-
-
-再次感谢大家对于模板的喜爱！
-
-## 协议
-
-本模板发布遵循 LaTeX 项目公共许可证 1.3 c 或更高版本。如果是衍生作品，请务必加入协议声明和模板信息（github、CTAN 地址）。
-
-## 衍生作
-
-+ [ElegantBookdown](https://github.com/XiangyunHuang/ElegantBookdown)：[XiangyunHuang](https://github.com/XiangyunHuang) 开发并维护的基于 ElegantBook 的 Bookdown 模板。
-+ [bookdownplus](https://github.com/pzhaonet/bookdownplus)：应网友要求，[pzhaonet](https://github.com/pzhaonet) 在 bookdownplus 收录了 ElegantPaper 模板，并为 Mac 做了字体适配。
-+ [PanBook](https://github.com/annProg/PanBook)：[annProg](https://github.com/annProg) 开发并维护的基于 Markdown 写作的工作流，收录了 ElegantBook 和 ElegantPaper 模板。
-
 -------
 
 # ElegantBook: An Elegant LaTeX Template for Books
@@ -89,48 +13,11 @@ ElegantBook is designed for writing books, created by [Dongsheng Deng](https://d
 
 ## Important Notes
 
-**Version Note**: Users for 2.x, please refer to [Version Convert](https://github.com/ElegantLaTeX/ElegantBook/wiki/convert). We strongly recommend that you use the latest version.
-
-**Important Info**: For some reasons, __unauthorial__ pull requests are **UNACCEPTABLE** since May 20, 2019. For those who want to help revise the templates, submit issues or clone to your own repository to modify under the LPPL-1.3c.
+For some reasons, __unauthorized__ pull requests are **UNACCEPTABLE** since May 20, 2019. For those who want to help revise the templates, submit issues or clone to your own repository to modify under the LPPL-1.3c.
 
 ## Acknowledgement
 
-_News_: _The number of stars on Github for ElegantBook reached 100 on May 20, 2019_.
-
-Thank ChinaTeX and [LaTeX Studio](http://www.latexstudio.net/) for their promotion. LaTeX studio offers tons of valuable posts and templates for discovery. It is the most comprehensive website on LaTeX in China. If you like our template, star on Github for supporting us.
-
-## Donation
-
-To express your love for our templates and/or our developers, please do not hesitate to tip us. Since last release of 3.08, we have received about a thousand RMB! (The emergence of a millionaire is on the way. Loading... )
-
-![](https://github.com/ElegantLaTeX/ElegantBook/wiki/donate.jpg)
-
-The explanation right of the tip usage belongs to ElegantLaTeX 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! Thank you all.
-
-
-|      Tipper      | Amount     |   Date     | Channel |
-| :--------------: | :----:     | :-------:  | :-----: |
-| Lerh             | 10 RMB     | 2019/5/15  | Wechat  |
-| YueGuoDiPingXian | 10 RMB     | 2019/5/15  | Wechat  |
-| YinSang          | 20 RMB     | 2019/5/27  | Wechat  |
-| * Kong		       | 10 RMB     | 2019/05/30 | Wechat  |
-| [latexstudio.net](http://www.latexstudio.net) | 666 RMB | 2019/06/05 | Alipay |
-| 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  |
-| QuDouDou 	       | 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  |
-| ChiHong          | 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/03 | Alipay  |
-| DuShuZhiChong    | 20 RMB     | 2019/11/18 | Wechat  |
-| * Deng           | 10 RMB     | 2019/11/18 | Wechat  |
-| * Zhe            | 20 RMB     | 2019/11/18 | Wechat  |
+Thank ChinaTeX and [LaTeX Studio](http://www.latexstudio.net/) for their promotion. 
 
 
 ## License

elegantbook.cls

@@ -1,6 +1,6 @@
 %%%%%%%%%%%%%%%%%%%%%%
 %% start of file `elegantbook.cls'.
-%% Copyright 2013-2020 ElegantLaTeX (elegantlatex2e@gmail.com)
+%% Copyright 2013-2021 ElegantLaTeX (elegantlatex2e@gmail.com)
 %%
 %% This work may be distributed and/or modified freely
 %% available at https://github.com/ElegantLaTeX/ElegantBook
@@ -8,7 +8,7 @@
 %%%%%%%%%%%%%%%%%%%%%
 % % !Mode:: "TeX:UTF-8"
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{elegantbook}[2020/02/10 v3.10 ElegantBook document class]
+\ProvidesClass{elegantbook}[2021/05/02 v4.1 ElegantBook document class]
 
 \RequirePackage{kvoptions}
 \RequirePackage{etoolbox}
@@ -20,7 +20,6 @@
 \DeclareStringOption[en]{lang}
 \DeclareStringOption[answer]{result}
 \DeclareStringOption[fancy]{mode}
-\DeclareStringOption[show]{base}
 \DeclareStringOption[normal]{device}
 \DeclareStringOption[cm]{math}
 \DeclareStringOption[marginfalse]{marginpar}
@@ -43,6 +42,7 @@
 
 \DeclareVoidOption{en}{\ekv{lang=en}}
 \DeclareVoidOption{cn}{\ekv{lang=cn}}
+\DeclareVoidOption{it}{\ekv{lang=it}}
 
 \DeclareVoidOption{fancy}{\ekv{mode=fancy}}
 \DeclareVoidOption{simple}{\ekv{mode=simple}}
@@ -50,18 +50,12 @@
 \DeclareVoidOption{answer}{\ekv{result=answer}}
 \DeclareVoidOption{noanswer}{\ekv{result=noanswer}}
 
-\DeclareVoidOption{hide}{\ekv{base=hide}}
-\DeclareVoidOption{show}{\ekv{base=show}}
-
 \DeclareVoidOption{normal}{\ekv{device=normal}}
 \DeclareVoidOption{pad}{\ekv{device=pad}}
 
-\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}
 
 \DeclareVoidOption{newtx}{\ekv{math=newtx}}
 \DeclareVoidOption{mtpro2}{\ekv{math=mtpro2}}
@@ -70,9 +64,11 @@
 \DeclareVoidOption{margintrue}{\ekv{marginpar=margintrue}}
 \DeclareVoidOption{marginfalse}{\ekv{marginpar=marginfalse}}
 
+
 \DeclareVoidOption{onecol}{\ekv{toc=onecol}}
 \DeclareVoidOption{twocol}{\ekv{toc=twocol}}
 
+
 % ----- Math option -----
 \newcommand\mailto[1]{\href{mailto:#1}{\nolinkurl{#1}}}
 
@@ -88,12 +84,36 @@
 % \ProcessOptions*\relax
 \LoadClass[a4paper,oneside]{book}
 
+\RequirePackage{setspace}
+
+\RequirePackage{csquotes}
+
+
+\RequirePackage{hyperref}
+\hypersetup{
+  breaklinks,
+  unicode,
+  linktoc=all,
+  bookmarksnumbered=true,
+  bookmarksopen=true,
+  pdfkeywords={ElegantBook},
+  colorlinks,
+  linkcolor=winered,
+  citecolor=winered,
+  urlcolor=winered,
+  plainpages=false,
+  pdfstartview=FitH,
+  pdfborder={0 0 0},
+  linktocpage
+}
+
 %% device settings
 \RequirePackage{geometry}
 \ifdefstring{\ELEGANT@device}{normal}{
   \geometry{
     a4paper,
     top=25.4mm, bottom=25.4mm,
+    left=20mm, right=20mm,
     headheight=2.17cm,
     headsep=4mm,
     footskip=12mm
@@ -121,6 +141,7 @@
 }{\relax}
 
 \setcounter{tocdepth}{1}
+\renewcommand{\baselinestretch}{1.2}
 
 \PassOptionsToPackage{no-math}{fontspec}
 \RequirePackage{iftex}
@@ -151,13 +172,26 @@
   \fi
   \AfterEndPreamble{
     % \renewcommand{\itshape}{\kaishu}
-    \setlength\parindent{2\ccwd}}}{\relax}
+    \setlength\parindent{2\ccwd}}
+}{\relax}
+
+\ifcsname heiti\endcsname
+  \newcommand{\cbfseries}{\heiti}
+\else
+  \newcommand{\cbfseries}{\bfseries}
+\fi
+
 
 \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}
@@ -189,7 +223,7 @@
 % ----- Handle Colors -----
 %% 章节以及页脚图形
 
-\RequirePackage{xcolor}
+\RequirePackage[table]{xcolor}
 \ifdefstring{\ELEGANT@color}{green}{
   \definecolor{structurecolor}{RGB}{0,120,2}%
   \definecolor{main}{RGB}{0,120,2}%
@@ -250,22 +284,9 @@
 % corlor definition
 \definecolor{winered}{rgb}{0.5,0,0}
 \definecolor{bule}{RGB}{18,29,57}
+\colorlet{coverlinecolor}{second}
 
 
-\newcommand{\base}[2]{%
-  \nointerlineskip \vspace{0.1\baselineskip}\hspace{\fill}
-  {\color{#1}
-    \resizebox{0.3\linewidth}{1.5ex}
-    {{%
-        {\begin{tikzpicture}
-          \node  (C) at (0,0) {};
-          \node (D) at (4,0) {};
-          \path (C) to [ornament=#2] (D);
-          \end{tikzpicture}}}}}%
-  \hspace{\fill}
-  \par\nointerlineskip \vspace{0.1\baselineskip}
-}
-
 % ----- Title Style -----
 \ifdefstring{\ELEGANT@titlestyle}{hang}{\def\style{hang}}{\relax}
 \ifdefstring{\ELEGANT@titlestyle}{display}{\def\style{display}}{\relax}
@@ -289,16 +310,12 @@
 
 \newcommand{\question}[1]{{\par\citshape #1}\\[0.2ex]}
 
-\RequirePackage[\ELEGANT@cite,sort&compress]{natbib}
-\setlength{\bibsep}{0.0pt}
-\def\bibfont{\footnotesize}
-
 \RequirePackage{enumerate}
 % list/itemize/enumerate setting
 \RequirePackage[shortlabels,inline]{enumitem}
 \setlist{nolistsep}
 
-\RequirePackage[font=small,labelfont={bf,color=structurecolor}]{caption} 
+\RequirePackage[labelfont={bf,color=structurecolor}]{caption} 
 \captionsetup[table]{skip=3pt}
 \captionsetup[figure]{skip=3pt}
 
@@ -309,31 +326,33 @@
   \setlength{\footnotesep}{12pt}
 }
 
-\ifdefstring{\ELEGANT@toc}{twocol}{
-\renewcommand{\tableofcontents}{%
-\setlength{\columnsep}{2em}
-%\setlength{\columnseprule}{.8pt}
-\begin{multicols}{2}[\chapter*{\contentsname}]%
-  \@starttoc{toc}%
-\end{multicols}}
-}{\relax}
 
 
-%% 常用宏包
-\linespread{1.3}
-
 \RequirePackage{graphicx}
 %\RequirePackage{enumerate}
 \RequirePackage{amsmath,mathrsfs,amsfonts,amssymb}
-
+% \providecommand\qed{}
+% \renewcommand{\qed}{\hfill\ensuremath{\square}}
 \RequirePackage{booktabs}
 \RequirePackage{multicol,multirow}
-\RequirePackage{xcolor}
-\RequirePackage{fancyvrb}
-\RequirePackage{makecell,lipsum,hologo,setspace}
 
+\RequirePackage{fancyvrb}
+\RequirePackage{makecell,lipsum,hologo}
 %%中文结构名字
+
+\RequirePackage[
+  backend=biber,
+  citestyle=\ELEGANT@citestyle,
+  bibstyle=\ELEGANT@bibstyle]{biblatex}
+
+
+
+%%   章节设置
+
+\RequirePackage{appendix}
+
 \ifdefstring{\ELEGANT@lang}{cn}{
+  \renewcommand{\baselinestretch}{1.3}
   \renewcommand{\contentsname}{目录}
   \renewcommand{\figurename}{图}
   \renewcommand{\tablename}{表}
@@ -342,21 +361,19 @@
   \renewcommand{\listfigurename}{插图目录}
   \renewcommand{\listtablename}{表格目录}
   \renewcommand{\bibname}{参考文献}
-  \renewcommand{\appendixname}{附录~\thechapter}
+  \renewcommand{\appendixname}{附录}
   \renewcommand{\indexname}{索\hspace{2em}引}
   \newcommand\figref[1]{\textbf{图}~\ref{#1}}
   \newcommand\tabref[1]{\textbf{表}~\ref{#1}}
   \ifdefstring{\ELEGANT@scheme}{chinese}{
-    \renewcommand{\chaptername}{第~\zhnumber{\arabic{chapter}}~章}}{
-    \renewcommand{\chaptername}{第~\thechapter{}~章}}
-  \newcommand{\authorname}{\textit{作者：}}
-  \newcommand{\institutename}{\textit{组织：}}
-  \newcommand{\datename}{\textit{时间：}}
-  \newcommand{\versionname}{\textit{版本：}}
-  \RequirePackage[\ELEGANT@cite]{gbt7714}
+    \renewcommand{\chaptername}{第\zhnumber{\arabic{chapter}}章}}{
+    \renewcommand{\chaptername}{第 \thechapter{} 章}}
+  \newcommand{\authorname}{\citshape 作者：}
+  \newcommand{\institutename}{\citshape 组织：}
+  \newcommand{\datename}{\citshape 时间：}
+  \newcommand{\versionname}{\citshape 版本：}
   \newcommand{\notename}{笔记}
   \renewcommand*{\proofname}{证明}
-  \newcommand{\problemname}{例题}
   \newcommand{\definitionname}{定义}
   \newcommand{\theoremname}{定理}
   \newcommand{\axiomname}{公理}
@@ -364,29 +381,30 @@
   \newcommand{\lemmaname}{引理}
   \newcommand{\propositionname}{命题}
   \newcommand{\corollaryname}{推论}
-  \newcommand{\examplename}{例}
-  \newcommand{\exercisename}{练习}
+  \newcommand{\examplename}{例题} %
+  \newcommand{\instancename}{示例} %
+  \newcommand{\problemname}{问题} % 问题
+  \newcommand{\exercisename}{练习} % 练习=习题
   \newcommand{\remarkname}{注}
   \newcommand{\assumptionname}{假设}
   \newcommand{\conclusionname}{结论}
   \newcommand{\solutionname}{解}
   \newcommand{\propertyname}{性质}
   \newcommand{\introductionname}{内容提要}
-  \newcommand{\problemsetname}{习题}
-  \newcommand\bioinfo[2]{\gdef\@bioinfo{\textit{#1}：\textit{#2}}}
+  \newcommand\bioinfo[2]{\gdef\@bioinfo{{\citshape #1}：#2}}
   \newcommand{\updatename}{更新：}
   \newcommand{\historyname}{版本更新历史}
-}{\relax}
+  }{\relax}
 \ifdefstring{\ELEGANT@lang}{en}{
   \setlength\parindent{2em}
   \newcommand\figref[1]{\textbf{Figure}~\ref{#1}}
   \newcommand\tabref[1]{\textbf{Table}~\ref{#1}}
   \renewcommand{\chaptername}{Chapter \thechapter}
+  \renewcommand{\partname}{\color{structurecolor} Part}
   \newcommand{\authorname}{\textbf{Author: }}
   \newcommand{\institutename}{\textbf{Institute: }}
   \newcommand{\datename}{\textbf{Date: }}
   \newcommand{\versionname}{\textbf{Version: }}
-  \bibliographystyle{\ELEGANT@bibstyle}
   \newcommand{\notename}{Note}
   \newcommand{\proofname}{Proof}
   \newcommand{\problemname}{Problem}
@@ -405,24 +423,266 @@
   \newcommand{\solutionname}{Solution}
   \newcommand{\propertyname}{Property}
   \newcommand{\introductionname}{Introduction}
-  \newcommand{\problemsetname}{Exercise}
+  \renewcommand{\appendixname}{Appendix}
+  % \newcommand{\problemsetname}{Exercise}
   \newcommand\bioinfo[2]{\gdef\@bioinfo{\textbf{#1}: #2}}
   \newcommand{\updatename}{Updates:}
   \newcommand{\historyname}{Version History}
 }{\relax}
 
-\RequirePackage{xpatch}
-\xpatchcmd{\part}{
-  \thispagestyle{plain}}{
-  \thispagestyle{plain}}{}{}
-\xpatchcmd{\@endpart}{
-  \vfil\newpage}{
-  \vfil\newpage}{}{}
+\ifdefstring{\ELEGANT@lang}{it}{
+  % \RequirePackage[utf8]{inputenc}
+  \RequirePackage[italian]{babel}
+  % \RequirePackage[T1]{fontenc}
+  \setlength\parindent{2em}
+  \newcommand\figref[1]{\textbf{Figura}~\ref{#1}}
+  \newcommand\tabref[1]{\textbf{Tabella}~\ref{#1}}
+  \renewcommand{\chaptername}{Chapter \thechapter}
+  \newcommand{\authorname}{\textbf{Autore: }}
+  \newcommand{\institutename}{\textbf{Istituto: }}
+  \newcommand{\datename}{\textbf{Data: }}
+  \newcommand{\versionname}{\textbf{Versione: }}
+  \newcommand{\notename}{Nota}
+  \newcommand{\proofname}{Dimostrazione}
+  \newcommand{\problemname}{Problema}
+  \newcommand{\definitionname}{Definizione}
+  \newcommand{\theoremname}{Teorema}
+  \newcommand{\axiomname}{Assioma}
+  \newcommand{\postulatename}{Postulato}
+  \newcommand{\lemmaname}{Lemma}
+  \newcommand{\propositionname}{Proposizione}
+  \newcommand{\corollaryname}{Corollario}
+  \newcommand{\examplename}{Esempio}
+  \newcommand{\exercisename}{Esercizio}
+  \newcommand{\remarkname}{Commento}
+  \newcommand{\assumptionname}{Assunto}
+  \newcommand{\conclusionname}{Conclusione}
+  \newcommand{\solutionname}{Soluzione}
+  \newcommand{\propertyname}{Proprietà}
+  \newcommand{\introductionname}{Introduzione}
+  \newcommand\bioinfo[2]{\gdef\@bioinfo{\textbf{#1}: #2}}
+  \newcommand{\updatename}{Aggiornamenti:}
+  \newcommand{\historyname}{Cronologia delle versioni}
+}{\relax}
+
+\ifdefstring{\ELEGANT@lang}{fr}{
+  \RequirePackage[utf8]{inputenc}
+  \RequirePackage[T1]{fontenc}
+  \RequirePackage[french]{babel}
+  \setlength\parindent{2em}
+  \renewcommand\figref[1]{\textbf{Figure}\ref{#1}}
+  \renewcommand\tabref[1]{\textbf{Tableau}\ref{#1}}
+  \renewcommand{\chaptername}{Chapitre \thechapter}
+  \renewcommand{\authorname}{\textbf{Auteur: }}
+  \renewcommand{\institutename}{\textbf{Institut: }}
+  \renewcommand{\datename}{\textbf{Date: }}
+  \renewcommand{\versionname}{\textbf{Version: }}
+  \renewcommand{\notename}{Note}
+  \renewcommand{\proofname}{Démonstration}
+  \renewcommand{\problemname}{Problème}
+  \renewcommand{\definitionname}{Définition}
+  \renewcommand{\theoremname}{Théorème}
+  \renewcommand{\axiomname}{Axiôme}
+  \renewcommand{\postulatename}{Postulat}
+  \renewcommand{\lemmaname}{Lemme}
+  \renewcommand{\propositionname}{Proposition}
+  \renewcommand{\corollaryname}{Corollaire}
+  \renewcommand{\examplename}{Exemple}
+  \renewcommand{\exercisename}{Exercice}
+  \renewcommand{\remarkname}{Remarque}
+  \renewcommand{\assumptionname}{Supposition}
+  \renewcommand{\conclusionname}{Conclusion}
+  \renewcommand{\solutionname}{Solution}
+  \renewcommand{\propertyname}{Propriété}
+  \renewcommand{\introductionname}{Introduction}
+  \renewcommand{\problemsetname}{Exercice}
+  \renewcommand{\updatename}{Mises à jour:}
+  \renewcommand{\historyname}{Historique des versions}
+}{\relax}
+
+
+\ifdefstring{\ELEGANT@lang}{nl}{
+  \RequirePackage[dutch]{babel}
+  \setlength\parindent{2em}
+  \newcommand\figref[1]{\textbf{Figuur}~\ref{#1}}
+  \newcommand\tabref[1]{\textbf{Tabel}~\ref{#1}}
+  \renewcommand{\chaptername}{Hoofdstuk \arabic{chapter}}
+  \newcommand{\authorname}{\textbf{Auteur: }}
+  \newcommand{\institutename}{\textbf{Instituut: }}
+  \newcommand{\datename}{\textbf{Datum: }}
+  \newcommand{\versionname}{\textbf{Versie: }}
+  \newcommand{\notename}{Opmerking}
+  \newcommand{\proofname}{Bewijs}
+  \newcommand{\problemname}{Probleem}
+  \newcommand{\definitionname}{Definitie}
+  \newcommand{\theoremname}{Stelling}
+  \newcommand{\axiomname}{Uitgangspunt}
+  \newcommand{\postulatename}{Hypothese}
+  \newcommand{\lemmaname}{Lemma}
+  \newcommand{\propositionname}{Voorstel}
+  \newcommand{\corollaryname}{Gevolgtrekking}
+  \newcommand{\examplename}{Voorbeeld}
+  \newcommand{\exercisename}{Oefening}
+  \newcommand{\remarkname}{Commentaar}
+  \newcommand{\assumptionname}{Veronderstelling}
+  \newcommand{\conclusionname}{Besluit}
+  \newcommand{\solutionname}{Oplossing}
+  \newcommand{\propertyname}{Eigenschap}
+  \newcommand{\introductionname}{Introductie}
+  \newcommand{\problemsetname}{Probleemcomplex}
+  \newcommand\bioinfo[2]{\gdef\@bioinfo{\textbf{#1}: #2}}
+  \newcommand{\updatename}{Update:}
+  \newcommand{\historyname}{Versie Geschiedenis}
+}{\relax}
+
+
+\ifdefstring{\ELEGANT@lang}{hu}{
+  \RequirePackage[magyar]{babel}
+  \setlength\parindent{2em}
+  \newcommand\figref[1]{\ref{#1}~\textbf{Ábra}}
+  \newcommand\tabref[1]{\ref{#1}~\textbf{Táblázat}}
+  \renewcommand{\chaptername}{\thechapter ~ fejezet}
+  \newcommand{\authorname}{\textbf{Szerző: }}
+  \newcommand{\institutename}{\textbf{Intézmény: }}
+  \newcommand{\datename}{\textbf{Dátum: }}
+  \newcommand{\versionname}{\textbf{Verziószám: }}
+  \newcommand{\notename}{Jegyzet}
+  \newcommand{\proofname}{Bizonyítás}
+  \newcommand{\problemname}{Probléma}
+  \newcommand{\definitionname}{Definíció}
+  \newcommand{\theoremname}{Tétel}
+  \newcommand{\axiomname}{Axióma}
+  \newcommand{\postulatename}{Követelmény}
+  \newcommand{\lemmaname}{Lemma}
+  \newcommand{\propositionname}{Előzmény}
+  \newcommand{\corollaryname}{Következmény}
+  \newcommand{\examplename}{Példa}
+  \newcommand{\exercisename}{Feladat}
+  \newcommand{\remarkname}{Megjegyzés}
+  \newcommand{\assumptionname}{Sejtés}
+  \newcommand{\conclusionname}{Összefoglalás}
+  \newcommand{\solutionname}{Megoldás}
+  \newcommand{\propertyname}{Tulajdonság}
+  \newcommand{\introductionname}{Bevezetés}
+  \newcommand{\problemsetname}{Feladatok}
+  \newcommand\bioinfo[2]{\gdef\@bioinfo{\textbf{#1}: #2}}
+  \newcommand{\updatename}{Frissítve:}
+  \newcommand{\historyname}{Korábbi verziók}
+}{\relax}
+
+\ifdefstring{\ELEGANT@lang}{de}{
+  \setlength\parindent{2em}
+  \renewcommand{\contentsname}{Inhaltsverzeichnis}
+  \newcommand\figref[1]{\textbf{Figur}~\ref{#1}}
+  \newcommand\tabref[1]{\textbf{Tabelle}~\ref{#1}}
+  \renewcommand{\partname}{\color{structurecolor} Teil}
+  \renewcommand{\listfigurename}{Abbildungsverzeichnis}
+  \renewcommand{\listtablename}{Tabellenverzeichnis}
+  \renewcommand{\bibname}{Bibliographie}
+  \renewcommand{\appendixname}{Anhang}
+  \renewcommand{\chaptername}{Kapitel \thechapter}
+  \newcommand{\authorname}{\textbf{Autor: }}
+  \newcommand{\institutename}{\textbf{Institut: }}
+  \newcommand{\datename}{\textbf{Datum: }}
+  \newcommand{\versionname}{\textbf{Version: }}
+  \newcommand{\notename}{Notiz}
+  \newcommand{\proofname}{Beweis}
+  \newcommand{\problemname}{Problem}
+  \newcommand{\definitionname}{Definition}
+  \newcommand{\theoremname}{Theorem}
+  \newcommand{\axiomname}{Axiom}
+  \newcommand{\postulatename}{Postulat}
+  \newcommand{\lemmaname}{Lemma}
+  \newcommand{\propositionname}{Behauptung}
+  \newcommand{\corollaryname}{Corollary}
+  \newcommand{\examplename}{Beispiel}
+  \newcommand{\instancename}{Beispiel} %
+  \newcommand{\exercisename}{\"{U}bung}
+  \newcommand{\remarkname}{Anmerkung}
+  \newcommand{\assumptionname}{Annahme}
+  \newcommand{\conclusionname}{Abschluss}
+  \newcommand{\solutionname}{Aufl\"{o}sung}
+  \newcommand{\propertyname}{Property}
+  \newcommand{\introductionname}{Einleitung}
+  \newcommand\bioinfo[2]{\gdef\@bioinfo{\textbf{#1}: #2}}
+  \newcommand{\updatename}{Updates:}
+  \newcommand{\historyname}{Version der Geschichte}
+}{\relax}
+
+\ifdefstring{\ELEGANT@lang}{es}{
+  \RequirePackage[spanish]{babel}
+  \setlength\parindent{2em}
+  \newcommand\figref[1]{\textbf{Figura}~\ref{#1}}
+  \newcommand\tabref[1]{\textbf{Tabla}~\ref{#1}}
+  \renewcommand{\spanishchaptername}{Capítulo \thechapter}
+  \newcommand{\authorname}{\textbf{Autor: }}
+  \newcommand{\institutename}{\textbf{Instituto: }}
+  \newcommand{\datename}{\textbf{Fecha: }}
+  \newcommand{\versionname}{\textbf{Versión: }}
+  \newcommand{\notename}{Nota}
+  \newcommand{\proofname}{Demostración}
+  \newcommand{\problemname}{Problema}
+  \newcommand{\definitionname}{Definición}
+  \newcommand{\theoremname}{Teorema}
+  \newcommand{\axiomname}{Axioma}
+  \newcommand{\postulatename}{Postulado}
+  \newcommand{\lemmaname}{Lema}
+  \newcommand{\propositionname}{Proposición}
+  \newcommand{\corollaryname}{Corolario}
+  \newcommand{\examplename}{Ejemplo}
+  \newcommand{\exercisename}{Ejercicio}
+  \newcommand{\remarkname}{Comentario}
+  \newcommand{\assumptionname}{Asunto}
+  \newcommand{\conclusionname}{Conclusión}
+  \newcommand{\solutionname}{Solución}
+  \newcommand{\propertyname}{Propiedad}
+  \newcommand{\introductionname}{Introducción}
+  \newcommand{\problemsetname}{Ejercicio}
+  \newcommand\bioinfo[2]{\gdef\@bioinfo{\textbf{#1}: #2}}
+  \newcommand{\updatename}{Actualización:}
+  \newcommand{\historyname}{Historial de versiones}
+}{\relax}
+
+\ifdefstring{\ELEGANT@lang}{mn}{
+  \RequirePackage[mongolian]{babel}
+  \RequirePackage[utf8]{inputenc}
+  \RequirePackage[T2A]{fontenc}
+  \setlength\parindent{2em}
+  \newcommand\figref[1]{\textbf{Зураг}\ref{#1}}
+  \newcommand\tabref[1]{\textbf{Хүснэгт}\ref{#1}}
+  \renewcommand{\chaptername}{Бүлэг \thechapter}
+  \newcommand{\authorname}{\textbf{Зохиогч: }}
+  \newcommand{\institutename}{\textbf{Сургууль: }}
+  \newcommand{\datename}{\textbf{Огноо: }}
+  \newcommand{\versionname}{\textbf{Хувилбар: }}
+  \newcommand{\notename}{Тэмдэглэл}
+  \newcommand{\proofname}{Баталгаа}
+  \newcommand{\problemname}{Бодлого}
+  \newcommand{\definitionname}{Тодорхойлолт}
+  \newcommand{\theoremname}{Томьёо}
+  \newcommand{\axiomname}{Аксиом}
+  \newcommand{\postulatename}{Постулат}
+  \newcommand{\lemmaname}{Лемма}
+  \newcommand{\propositionname}{Таамаглал}
+  \newcommand{\corollaryname}{Үр дүн}
+  \newcommand{\examplename}{Жишээ}
+  \newcommand{\exercisename}{Дасгал}
+  \newcommand{\remarkname}{Тайлбар}
+  \newcommand{\assumptionname}{Урьдчилсан нөхцөл}
+  \newcommand{\conclusionname}{Дүгнэлт}
+  \newcommand{\solutionname}{Хариулт}
+  \newcommand{\propertyname}{Шинж чанар}
+  \newcommand{\introductionname}{Удиртгал}
+  \newcommand{\problemsetname}{Бодлогууд}
+  \newcommand\bioinfo[2]{\gdef@bioinfo{\textbf{#1}: #2}}
+  \newcommand{\updatename}{Шинэчлэлтүүд:}
+  \newcommand{\historyname}{Хувилбарын түүх}
+}{\relax}
 
 \graphicspath{{./figure/}{./figures/}{./image/}{./images/}{./graphics/}{./graphic/}{./pictures/}{./picture/}}
 
-\usepackage{pgfornament} %% load tikz without tikz
-\usetikzlibrary{backgrounds,calc,shadows}
+\RequirePackage{tikz} %% load tikz without tikz
+\usetikzlibrary{backgrounds,calc,shadows,positioning,fit}
 \newcommand*\circled[1]{\tikz[baseline=(char.base)]{
             \node[shape=circle,draw,inner sep=1pt] (char) {#1};}}
 %  https://tex.stackexchange.com/questions/7032/good-way-to-make-textcircled-numbers
@@ -439,34 +699,12 @@
 \setlist[itemize,3]{label={\eitemiii}}
 
 
-\RequirePackage{hyperref}
-\hypersetup{
-  breaklinks,
-  unicode,
-  linktoc=all,
-  bookmarksnumbered=true,
-  bookmarksopen=true,
-  pdfkeywords={ElegantBook},
-  colorlinks,
-  linkcolor=winered,
-  citecolor=winered,
-  urlcolor=winered,
-  plainpages=false,
-  pdfstartview=FitH,
-  pdfborder={0 0 0},
-  linktocpage
-}
-
-%%   章节设置
 \RequirePackage[center,pagestyles]{titlesec}
 \RequirePackage{apptools}
-\RequirePackage[toc,page,title,titletoc]{appendix}
-
 \setcounter{secnumdepth}{5}
-
-\titleformat{\chapter}[\style]{\bfseries}
-{\filcenter\LARGE\enspace\bfseries{\color{structurecolor}\IfAppendix{\appendixname}{\chaptername}\enspace}}{1pt}{\bfseries\color{structurecolor}\LARGE\filcenter}[\ifdefstring{\ELEGANT@base}{hide}{}{\filcenter\base{structurecolor}{88}}]
-
+\titleformat{\chapter}[\style]{\bfseries}{
+  \filcenter\LARGE\enspace\bfseries{\color{structurecolor} \IfAppendix{\appendixname\;\thechapter}{\chaptername}\;}}{1pt}{
+  \LARGE\bfseries\color{structurecolor}\filcenter}[]
 \titleformat{\section}[hang]{\bfseries}{
   \Large\bfseries{\color{structurecolor}\thesection}\enspace}{1pt}{%
   \color{structurecolor}\Large\bfseries\filright}
@@ -477,15 +715,15 @@
   \large\bfseries\color{structurecolor}\thesubsubsection\enspace}{1pt}{%
   \color{structurecolor}\large\bfseries\filright}
 
-
 \titlespacing{\chapter}{0pt}{-20pt}{1.3\baselineskip}
 %\titlespacing{\subsection}{0pt}{0.5\baselineskip}{-\baselineskip}
 
+
+
+
 %%define the note and proof environment
 \RequirePackage{pifont,manfnt,bbding}
-
 \RequirePackage[many]{tcolorbox}
-
 % \newlength{\normalparindent}
 % \setlength{\normalparindent}{\parindent}
 \ifdefstring{\ELEGANT@mode}{fancy}{
@@ -535,15 +773,42 @@
       overlay unbroken and last={
         \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 }{
+    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 }{
+    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 }{
+    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 }{
+    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 }{
+    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 }{
+    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 }{
+    common,propstyle,
+    IfValueTF={#1}{title={\propositionname~\thetcbcounter\ (#1)}}{title=\propositionname~\thetcbcounter},
+    IfBooleanTF={#2}{label=#3}{}}}{\relax}
 
-  \newtcbtheorem[auto counter,number within=chapter]{definition}{\definitionname}{defstyle}{def}
-  \newtcbtheorem[auto counter,number within=chapter]{theorem}{\theoremname}{thmstyle}{thm}
-  \newtcbtheorem[auto counter,number within=chapter]{postulate}{\postulatename}{thmstyle}{pos}
-  \newtcbtheorem[auto counter,number within=chapter]{axiom}{\axiomname}{thmstyle}{axi}
-  \newtcbtheorem[auto counter,number within=chapter]{proposition}{\propositionname}{propstyle}{pro}
-  \newtcbtheorem[auto counter,number within=chapter]{corollary}{\corollaryname}{thmstyle}{cor}
-  \newtcbtheorem[auto counter,number within=chapter]{lemma}{\lemmaname}{thmstyle}{lem}
-}{\relax}
 
 \ifdefstring{\ELEGANT@mode}{simple}{
   \let\openbox\relax
@@ -551,56 +816,28 @@
   \let\proof\relax
   % \let\proofname\relax
   \let\endproof\relax
-  
+
   % declare a new theorem style
-  \newtheoremstyle{edefstyle}{3pt}{3pt}{\citshape}{-3pt}{
+  \newtheoremstyle{defstyle}{3pt}{3pt}{\citshape}{-3pt}{
     \bfseries\color{main}}{}{0.5em}{\thmname{#1} \thmnumber{#2} \thmnote{(#3)}}
-  \newtheoremstyle{ethmstyle}{3pt}{3pt}{\citshape}{-3pt}{
+  \newtheoremstyle{thmstyle}{3pt}{3pt}{\citshape}{-3pt}{
     \bfseries\color{second}}{}{0.5em}{\thmname{#1} \thmnumber{#2} \thmnote{(#3)}}
-  \newtheoremstyle{eprostyle}{3pt}{3pt}{\citshape}{-3pt}{
+  \newtheoremstyle{prostyle}{3pt}{3pt}{\citshape}{-3pt}{
     \bfseries\color{third}}{}{0.5em}{\thmname{#1} \thmnumber{#2} \thmnote{(#3)}}
 
 
-  \theoremstyle{edefstyle} % definition style
+  \theoremstyle{defstyle} % definition style
+  \newtheorem{definition}{\definitionname}[chapter]
 
-  \newtheorem{edefinition}{\definitionname}[chapter]
-  \newenvironment{definition}[2]{
-    \ifstrempty{#1}{\edefinition}{\edefinition[#1]}\ifstrempty{#2}{}{\label{def:#2}}}{
-    \endedefinition}
+  \theoremstyle{thmstyle} %theorem style
+  \newtheorem{theorem}{\theoremname}[chapter]
+  \newtheorem{lemma}{\lemmaname}[chapter]
+  \newtheorem{corollary}{\corollaryname}[chapter]
+  \newtheorem{postulate}{\postulatename}[chapter]
+  \newtheorem{axiom}{\axiomname}[chapter]
 
-
-  \theoremstyle{ethmstyle} %theorem style
-  
-  \newtheorem{etheorem}{\theoremname}[chapter]
-  \newenvironment{theorem}[2]{
-    \ignorespaces\ifstrempty{#1}{\etheorem}{\etheorem[#1]}\ifstrempty{#2}{}{\label{thm:#2}}}{
-    \endetheorem}
-
-  \newtheorem{elemma}{\lemmaname}[chapter]
-  \newenvironment{lemma}[2]{
-    \ignorespaces\ifstrempty{#1}{\elemma}{\elemma[#1]}\ifstrempty{#2}{}{\label{lem:#2}}}{
-    \endelemma}
-  
-  \newtheorem{ecorollary}{\corollaryname}[chapter]
-  \newenvironment{corollary}[2]{
-    \ignorespaces\ifstrempty{#1}{\ecorollary}{\ecorollary[#1]}\ifstrempty{#2}{}{\label{cor:#2}}}{
-    \endecorollary}
-  
-  \newtheorem{epostulate}{\postulatename}[chapter]
-  \newenvironment{postulate}[2]{
-    \ifstrempty{#1}{\epostulate}{\epostulate[#1]}\ifstrempty{#2}{}{\label{pos:#2}}}{
-    \endepostulate}
-  
-  \newtheorem{eaxiom}{\axiomname}[chapter]
-  \newenvironment{axiom}[2]{
-    \ifstrempty{#1}{\eaxiom}{\eaxiom[#1]}\ifstrempty{#2}{}{\label{axi:#2}}}{
-    \endaxiom}
-
-  \theoremstyle{eprostyle}
-  \newtheorem{eproposition}{\propositionname}[chapter]
-  \newenvironment{proposition}[2]{
-    \ifstrempty{#1}{\eproposition}{\eproposition[#1]}\ifstrempty{#2}{}{\label{pro:#2}}}{
-    \endeproposition}
+  \theoremstyle{prostyle} % proposition style
+  \newtheorem{proposition}{\propositionname}[chapter]
 }{\relax}
 
 % main（green-def): example exercise problem solution
@@ -613,7 +850,7 @@
 \renewcommand{\theexam}{\thechapter.\arabic{exam}}
 \newenvironment{example}[1][]{
   \refstepcounter{exam}
-  \par\noindent\textbf{\color{main}{\examplename}\theexam #1 }\rmfamily}{
+  \par\noindent\textbf{\color{main}{\examplename} \theexam #1 }\rmfamily}{
   \par\ignorespacesafterend}
 
 %% Exercise with counter
@@ -624,7 +861,7 @@
   \refstepcounter{exer}
   \par\noindent\makebox[-3pt][r]{
     \scriptsize\color{red!90}\HandPencilLeft\quad}
-    \textbf{\color{main}{\exercisename}\theexer #1 }\rmfamily}{
+    \textbf{\color{main}{\exercisename} \theexer #1 }\rmfamily}{
     \par\ignorespacesafterend}
 
 %% Problem with counter
@@ -633,7 +870,7 @@
 \renewcommand{\theprob}{\thechapter.\arabic{prob}}
 \newenvironment{problem}[1][]{
   \refstepcounter{prob}
-  \par\noindent\textbf{\color{main}{\problemname}\theprob #1 }\rmfamily}{
+  \par\noindent\textbf{\color{main}{\problemname} \theprob #1 }\rmfamily}{
   \par\ignorespacesafterend}
 
 \newenvironment{note}{
@@ -683,9 +920,12 @@
   \end{tcolorbox}}
 
 \RequirePackage{adforn}
-\newenvironment{problemset}[1][\chaptername~\problemsetname]{
+
+\newenvironment{problemset}[1][\chaptername~\;\exercisename]{
   \begin{center}
-    \phantomsection\addcontentsline{toc}{section}{\texorpdfstring{\chaptername\;\problemsetname}{\problemsetname}}
+    \phantomsection\addcontentsline{toc}{section}{\texorpdfstring{\chaptername\;\exercisename}{\exercisename}}
+    % \markboth{#1}{\rightmark}
+    \markright{#1}
     \textcolor{structurecolor}{\Large\bfseries\adftripleflourishleft~#1~\adftripleflourishright}
   \end{center}
   \begin{enumerate}}{
@@ -707,39 +947,24 @@
 \RequirePackage{fancyhdr}
 \fancyhf{}
 
-\ifdefstring{\ELEGANT@base}{hide}{
-  \fancyfoot[c]{\color{structurecolor}\scriptsize\thepage}
-  \if@twoside
-  \fancyhead[ER]{\color{structurecolor}\citshape\leftmark}
-  \fancyhead[OL]{\color{structurecolor}\citshape\rightmark}
-  \else
-  \fancyhead[R]{\color{structurecolor}\citshape\rightmark}
-  \fi
-}{\relax}
-
-
-\ifdefstring{\ELEGANT@base}{show}{
-  \fancyfoot[c]{\catcode`\$=3\relax\base{structurecolor}{88}}
-  \if@twoside
-  \fancyhead[EL,OR]{\color{structurecolor}--\;\thepage\;--}
-  \fancyhead[ER]{\color{structurecolor}\citshape\leftmark}
-  \fancyhead[OL]{\color{structurecolor}\citshape\rightmark}
-  \else
-  \fancyhead[R]{\color{structurecolor}--\;\thepage\;--}
-  \fancyhead[L]{\color{structurecolor}\citshape\rightmark}
-  \fi
-}{\relax}
 
+\fancyfoot[c]{\color{structurecolor}\scriptsize\thepage}
+\if@twoside
+  \fancyhead[EL]{\color{structurecolor}\cnormal\leftmark}
+  \fancyhead[OR]{\color{structurecolor}\cnormal\rightmark}
+\else
+  \fancyhead[R]{\color{structurecolor}\cnormal\rightmark}
+\fi
 
 \renewcommand{\headrule}{\color{structurecolor}\hrule width\textwidth}
 \pagestyle{fancy}
 \renewcommand{\headrulewidth}{1pt}
 % \renewcommand{\headrule}{}
 \fancypagestyle{plain}{\renewcommand{\headrulewidth}{0pt}\fancyhf{}\renewcommand{\headrule}{}}
-\renewcommand{\sectionmark}[1]{\markright{\thesection\, #1}{} }
-\renewcommand{\chaptermark}[1]{\markboth{\chaptername \, #1\,}{}}
+\renewcommand{\sectionmark}[1]{\markright{\thesection\, #1}{}}
+\renewcommand{\chaptermark}[1]{\markboth{\chaptername\, #1}{}}
+
 
-\renewcommand{\baselinestretch}{1.35} 
 
 \renewcommand*{\maketitle}{%
 \hypersetup{pageanchor=false}
@@ -762,7 +987,7 @@
     \fi
   }{\relax}
   \setlength{\fboxsep}{0pt}
-  \colorbox{second}{\makebox[\linewidth][c]{\shortstack[c]{\vspace{0.5in}}}}
+  \colorbox{coverlinecolor}{\makebox[\linewidth][c]{\shortstack[c]{\vspace{0.5in}}}}
   \vfill
   \vskip-2ex
   \hspace{2em}
@@ -781,12 +1006,12 @@
     {\renewcommand{\arraystretch}{0.618}
     \begin{tabular}{l}
       % \ifcsname @author\endcsname \authorname \@author\\\fi
-      \ifx\@author\empty\else\authorname\@author\\ \fi
-      \ifcsname @institute\endcsname \institutename \@institute\\ \fi
+      \ifx\@author\empty\else\authorname\cnormal\@author\\ \fi
+      \ifcsname @institute\endcsname \institutename \cnormal\@institute\\ \fi
       % \ifcsname @date\endcsname  \@date\\\fi
-      \ifx\@date\empty\else\datename\@date \\ \fi
-      \ifcsname @version\endcsname \versionname \@version\\ \fi
-      \ifcsname @bioinfo\endcsname \@bioinfo\\ \fi
+      \ifx\@date\empty\else\datename\cnormal\@date \\ \fi
+      \ifcsname @version\endcsname \cnormal\versionname\@version\\ \fi
+      \ifcsname @bioinfo\endcsname \cnormal\@bioinfo\\ \fi
     \end{tabular}}
   \end{minipage}
   \begin{minipage}[c]{0.27\linewidth}
@@ -803,7 +1028,7 @@
   \vfill
   \begin{center}
     \setstretch{1.3}
-    \parbox[t]{0.7\textwidth}{\centering \itshape 
+    \parbox[t]{0.7\textwidth}{\centering \citshape 
       \ifcsname @extrainfo\endcsname\@extrainfo\fi}
   \end{center}
   \vfill
@@ -812,6 +1037,7 @@
 \thispagestyle{empty}}
 
 
+\newcommand{\dollar}{\mbox{\textdollar}}
 
 \RequirePackage{listings}
 \renewcommand{\ttdefault}{cmtt}
@@ -828,11 +1054,11 @@
 \lstset{language=[LaTeX]TeX,
   texcsstyle=*\color{winered},
   numbers=none,
-  mathescape,
+  mathescape=false,
   breaklines=true,
   keywordstyle=\color{winered},
   commentstyle=\color{gray},
-  emph={elegantpaper,fontenc,fontspec,xeCJK,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,gbt7714,natbib},
+  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},
   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,
@@ -849,8 +1075,9 @@
 % add the list of change history
 \newcommand{\dateinfoline}[2]{
   \noindent\makebox[0pt][r]{%
-  \makebox[-5em][r]{%
-    \textbf{\textcolor{structurecolor}{#1}}}\quad}%
+  \makebox[-3em][r]{%
+    \small
+    \textbf{\textcolor{structurecolor}{#1}}}\;\;}%
   {\citshape\updatename\ignorespaces#2}}
 
 \newcommand{\datechange}[2]{%
@@ -870,4 +1097,31 @@
 
 \newenvironment{change}{
   \begin{enumerate}[label=\small\protect\circled{\arabic*}]}{
-  \end{enumerate}}
+  \end{enumerate}}
+
+\addbibresource[location=local]{reference.bib}
+
+\renewcommand\tableofcontents{%
+  \hypersetup{linktoc=all, linkcolor=black}
+    \if@twocolumn
+      \@restonecoltrue\onecolumn
+    \else
+      \@restonecolfalse
+    \fi
+    \chapter*{\contentsname
+        \@mkboth{%
+           \MakeUppercase\contentsname}{\MakeUppercase\contentsname}}%
+    \ifdefstring{\ELEGANT@toc}{twocol}{
+      \setlength{\columnsep}{2em}
+      \begin{multicols}{2}%
+        \@starttoc{toc}
+      \end{multicols}}{
+      \@starttoc{toc}}
+    \if@restonecol\twocolumn\fi}
+
+
+\renewcommand*{\cleardoublepage}{\clearpage\if@twoside \ifodd\c@page\else
+\hbox{}%
+\thispagestyle{empty}%
+\newpage%
+\if@twocolumn\hbox{}\newpage\fi\fi\fi}

image/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)