elegantbook (28may19)

git-svn-id: svn://tug.org/texlive/trunk@51246 c570f23f-e606-0410-a88d-b1316a301751

10 files changed, 855 insertions, 203 deletions

diff --git a/Master/texmf-dist/doc/latex/elegantbook/README.md b/Master/texmf-dist/doc/latex/elegantbook/README.md
index 0ac400959cf..574386973bf 100644
--- a/Master/texmf-dist/doc/latex/elegantbook/README.md
+++ b/Master/texmf-dist/doc/latex/elegantbook/README.md
@@ -10,11 +10,13 @@
 ![Github Version](https://img.shields.io/github/release/ElegantLaTeX/ElegantBook.svg)
 ![Repo Size](https://img.shields.io/github/repo-size/ElegantLaTeX/ElegantBook.svg)
 
-ElegantBook is designed for books. Just enjoy it! If you have any questions, suggestions or bug reports, you can create issues, pull requests or contact us at elegantlatex2e@gmail.com.
+ElegantBook is designed for books. Just enjoy it! If you have any questions, suggestions or bug reports, you can create issues or contact us at elegantlatex2e@gmail.com.
 
-如果你有其他问题、建议或者报告 bug，可以提交 issues 或者给我们发邮件：elegantlatex2e@gmail.com。
+如果你有其他问题、建议或者报告 bug，可以提交 issues 或者给我们发邮件：elegantlatex2e@gmail.com。最近我们新建了一个 QQ 用户交流群（Q 群：692108391），欢迎加入。
 
-**注意：** 由于新版本进行了重构，3.x 版本并不兼容 2.x 版本，如果你想把 2.x 版本的文件转为 3.x 版本，请查看[跨版本转换](https://github.com/ElegantLaTeX/ElegantBook/wiki/%E8%BD%AC%E6%8D%A2)。
+**注意：** 由于新版本进行了重构，并且 3.6 版本对于封面进行了改版，3.6 以后的版本并不兼容之前版本，如果你想把之前版本的文件转为 3.6 以后的版本，请查看[跨版本转换](https://github.com/ElegantLaTeX/ElegantBook/wiki/convert)。
+
+**重要提示：出于某些因素的考虑，ElegantLaTeX 项目自 2019 年 5 月 20 日开始，不再接受任何非作者预约性质的提交（pull request)！如果你想改进模板，你可以给我们提交 issue，或者可以在遵循协议的情况下，克隆到自己仓库下进行修改**。
 
 # License
 
diff --git a/Master/texmf-dist/doc/latex/elegantbook/elegantbook-cn.pdf b/Master/texmf-dist/doc/latex/elegantbook/elegantbook-cn.pdf
index ea564b0daf5..161a1fe7f12 100644
--- a/Master/texmf-dist/doc/latex/elegantbook/elegantbook-cn.pdf
+++ b/Master/texmf-dist/doc/latex/elegantbook/elegantbook-cn.pdf
diff --git a/Master/texmf-dist/doc/latex/elegantbook/elegantbook-cn.tex b/Master/texmf-dist/doc/latex/elegantbook/elegantbook-cn.tex
index f24298b2331..6132899e278 100644
--- a/Master/texmf-dist/doc/latex/elegantbook/elegantbook-cn.tex
+++ b/Master/texmf-dist/doc/latex/elegantbook/elegantbook-cn.tex
@@ -1,5 +1,4 @@
-\documentclass[cn,fancy,blue,11pt]{elegantbook}
-
+\documentclass[cn,11pt]{elegantbook}
 
 \title{ElegantBook：优美的 \LaTeX{} 书籍模板}
 \subtitle{Elegant\LaTeX{} 经典之作}
@@ -7,16 +6,17 @@
 \author{Ethan Deng \& Liam Huang}
 \institute{Elegant\LaTeX{} Program}
 \date{\today}
-\version{3.07}
+\version{3.08}
 
-\equote{Victory won\rq t come to us unless we go to it. --- M. Moore}
+\extrainfo{Victory won\rq t come to us unless we go to it. --- M. Moore}
 
 \logo{logo.png}
 \cover{cover.jpg}
 
-\usepackage[authoryear]{gbt7714}
+
 
 \begin{document}
+
 \maketitle
 \tableofcontents
 
@@ -26,39 +26,120 @@
 \hypersetup{pageanchor=true}
 
 \chapter{Elegant\LaTeX{} 系列模板介绍}
-Elegant\LaTeX{} 项目组致力于打造一系列美观、优雅、简便的模板方便用户使用。Elegant\LaTeX{} 系列模板目前由 \href{https://github.com/ElegantLaTeX/ElegantNote}{ElegantNote}，\href{https://github.com/ElegantLaTeX/ElegantBook}{ElegantBook}，\href{https://github.com/ElegantLaTeX/ElegantPaper}{ElegantPaper} 组成，分别用于排版笔记，书籍和工作论文。如果你在使用本模板，推荐最新版本！最新正式版下载地址：\href{https://github.com/ElegantLaTeX/ElegantBook/releases}{Github}。本文将介绍本模板的一些设置内容以及基本使用方法。如果您有其他问题，建议或者意见，欢迎在 Github 上给我们提交 \href{https://github.com/ElegantLaTeX/ElegantBook/issues}{issues} 或者邮件\footnote{\email{elegantlatex2e@gmail.com}.}联系我们。
 
 
+Elegant\LaTeX{} 项目组致力于打造一系列美观、优雅、简便的模板方便用户使用。目前由 \href{https://github.com/ElegantLaTeX/ElegantNote}{ElegantNote}，\href{https://github.com/ElegantLaTeX/ElegantBook}{ElegantBook}，\href{https://github.com/ElegantLaTeX/ElegantPaper}{ElegantPaper} 组成，分别用于排版笔记，书籍和工作论文。强烈推荐使用最新正式版本！本文将介绍本模板的一些设置内容以及基本使用方法。如果您有其他问题，建议或者意见，欢迎在 Github 上给我们提交 \href{https://github.com/ElegantLaTeX/ElegantBook/issues}{issues} 或者邮件联系我们。
+
+我们的相关联系方式：
+\begin{itemize}
+\item 官网：\href{https://elegantlatex.org/}{https://elegantlatex.org/}
+\item Github 网址：\href{https://github.com/ElegantLaTeX/}{https://github.com/ElegantLaTeX/}
+\item CTAN 地址：\href{https://ctan.org/pkg/elegantbook}{https://ctan.org/pkg/elegantbook}
+\item 文档 Wiki：\href{https://github.com/ElegantLaTeX/ElegantBook/wiki}{https://github.com/ElegantLaTeX/ElegantBook/wiki}
+\item 下载地址：\href{https://github.com/ElegantLaTeX/ElegantBook/releases}{正式发行版}，\href{https://github.com/ElegantLaTeX/ElegantBook/archive/master.zip}{最新版}
+\item 微博：ElegantLaTeX
+\item 微信公众号：ElegantLaTeX
+\item 用户 QQ 群：692108391 
+\item 邮件：\email{elegantlatex2e@gmail.com}
+\end{itemize}
 
-\section{ElegantBook 更新说明}
-在这几年间，我们收到了很多用户的反馈，主要的问题涉及到字体安装，编码支持，定理浮动，定理跨页，交叉引用等等。我们思前想后，原先让用户安装字体以追求视觉上的美观并不完美，用户陷入了巨大的麻烦，这违背了我们的模板初衷。因此我们在新版中删除了这部分，用户无需安装任何字体。ElegantBook 3.x 版本更新的主要内容有：
 
+\section{ElegantBook 更新说明}
+此次更新主要涉及
 \begin{enumerate}
-   \item 删除了自定义字体设置，改用 \lstinline{ctex} 宏包支持中文；
-   \item 模板拆分为中英文模式（\lstinline{lang=cn/en}）；
-   \item 支持 \lstinline{PDFLaTeX} 与 \lstinline{XeLaTeX}；
-   \item 使用 \lstinline{tcolorbox} 宏包改写定理类环境，可跨页；
-   \item 定理类环境名字更新，修复定理环境交叉引用；
-   \item 更新颜色主题，增加灰色和黑色主题；
-   \item 颜色名字更新，统一链接颜色；
-   \item 重新绘制 Elegant\LaTeX{} 的 Logo；
-   \item 更新封面与装饰物，删除水印；
-   \item 修正附录相关内容；
-   \item 增加代码高亮；
-   \item 美化列表环境；
-   \item 增加简化模式；
-   \item 增加 base 隐藏选项。
+\item 修复 \lstinline|\part| 命令；
+\item 增加 pad 模式；
+\item 增加 mtpro2 宏包选项支持；
+\item 修改参考文献默认为 numbers 格式；
+\item 增加章节介绍 introduction 环境；
+\item 增加章节习题 problemset 环境；
+\item 增加旁注，\lstinline{\elegantpar} 命令（测试）；
+\item 减少公式前后距离；
+\item \lstinline{\equote} 改为 \lstinline{\extrainfo}，并且多行显示；
+\item 完善文档，增加致谢等部分。
 \end{enumerate}
 
 \begin{note}
-由于新版本进行了重构，3.x 版本并不兼容 2.x 版本，如果你想把 2.x 版本的文件转为 3.x 版本，请查看\href{https://github.com/ElegantLaTeX/ElegantBook/wiki/convert}{跨版本转换}。今后不再回答关于 2.x 版本的问题。
+由于新版本进行了重构，3.x 版本并不兼容 2.x 版本，并且在 3.06 版本更新过封面，如果你想把 3.06 版本（包括 2.x 版本）之前的文件转为最新版本兼容的文件，请仔细查看\href{https://github.com/ElegantLaTeX/ElegantBook/wiki/convert}{跨版本转换}。今后不再回答关于 2.x 版本的问题。
 \end{note}
 
-\chapter{ElegantBook 设置说明}
+\section{模板安装与更新}
+你可以通过免安装的方式使用本模板，也可以通过安装模板的方式使用。
+
+免安装使用方法如下，从 Github 或者 CTAN 下载最新（正式）版文件，严格意义上只需要类文件 \lstinline{elegantbook.cls}。然后将模板文件放在你的工作目录下即可使用。这样使用的好处是，无需安装，简便；缺点是，当模板进行更新之后，你需要手动替换 \lstinline{cls} 文件。
+
+如果你是 \TeX{} Live 2019 用户，我们非常推荐你直接进行安装和更新。你可以通过 \TeX{} Live 2019 自带的 \lstinline{tlshell}\footnote{也叫 \TeX{} Live Manager} 进行安装。安装非常简单，步骤如下，搜索并打开 \lstinline{tlshell}，然后通过 \lstinline{File -> Load Default Repository} 加载远程仓库，如果你不想使用默认的仓库，你可以通过 \lstinline{Options} 下的菜单设置远程仓库。设置好仓库之后，等待仓库加载完毕，你可以在下面的搜索栏搜索 \lstinline{elegantbook}，然后选择进行安装与更新。
+
+\begin{figure}[htbp]
+\centering
+\includegraphics[width=0.7\textwidth]{tlshell.png}
+\caption{使用 \TeX{} Live Shell 安装 ElegantBook 模板}
+\end{figure}
+
+如果你是 \TeX{} Live 2018 的用户，由于 2018 无法直接更新到 2019，所以你想更新的话，需要卸载 2018 重装 2019。如果你实在不想折腾，那么你仍然可以使用本模板。你可以手动安装模板，将 \lstinline{elegantbook.cls} 复制到你的 \TeX{} Live 目录下，默认安装目录为 \lstinline|C:\texlive\2019\texmf-dist\tex\latex\elegantbook|，然后通过命令行（管理员权限），运行 \lstinline{texhash} 即可。
+
+啥？你是 C\TeX{} 用户？Sorry，本模板不提供支持。
+
+更多关于 \TeX{} Live 2019 的安装使用以及 C\TeX{} 与 \TeX{} Live 的兼容、系统路径问题，请参考官方文档以及啸行的\href{https://github.com/OsbertWang/install_latex/releases}{一份简短的安装 \LaTeX{} 的介绍}。
 
-\section{编译方式}
+\section{在线使用模板}
+考虑到用户的在线合作需求，我们把三套模板全部上传到 \href{https://www.overleaf.com/}{Overleaf} 上了，网络通畅的用户可以直接通过 Overleaf 在线使用我们的模板。这样的好处是无需安装 \TeX{} Live 2019，可以随时随地访问自己的文件。查找模板，请在 Overleaf 模板库里面搜索 \lstinline{elegantlatex} 即可，你也可以直接访问\href{https://www.overleaf.com/latex/templates?addsearch=elegantlatex}{搜索结果}。选择适当的模板之后，将其 \lstinline{Open as Template}，即可把模板存到自己账户下，然后可以自由编辑以及与别人一起协作。更多关于 Overleaf 的介绍和使用，请参考 Overleaf 的\href{https://www.overleaf.com/learn}{官方文档}。
 
-本模板基于基础的 book 文类，所以 book 的选项对于本模板也是有效的。默认编码为 UTF-8，推荐使用 \TeX{} Live 编译。本文编写环境为 Win10 (64bit) + \TeX{} Live 2018，支持 \lstinline{PDFLaTeX} 以及 \lstinline{XeLaTeX} 编译。
+\begin{remark}
+Overleaf 上，中文需要使用 \lstinline{XeLaTeX} 进行编译，英文可以使用 \lstinline{PDFLaTeX} 与 \lstinline{XeLaTeX} 进行编译。
+\end{remark}
+
+\section{用户作品计划}
+Elegant\LaTeX{} 系列模板从创立至今已经有 8 年了，我们的模板也受到了很多用户的喜爱，在此，为了促进模板用户之间的交流，了解用户需求，完善本模板，我们将建立一个区域专门展示用户的文档，包括但不限于 Github 和官网等。如果你愿意将自己的作品展示出来，请邮件或者其他方式联系我们。如果自己代码已经传到 Github 或者 Gitee 等网站，可以提供对应网址。
+
+\section{关于提交}
+出于某些因素的考虑，Elegant\LaTeX{} 项目自 2019 年 5 月 20 日开始，\textbf{不再接受任何非作者预约性质的提交}（pull request)！如果你想改进模板，你可以给我们提交 issues，或者可以在遵循协议（LPPL-1.3c）的情况下，克隆到自己仓库下进行修改。
+
+\section{协作人员招募}
+招募 Elegant\LaTeX{} 的协作人员，没有工资。工作内容：翻译 Elegant\LaTeX{} 系列模板相关的文稿（中文->英文），维护模板的 wiki（主要涉及 Markdown 语法），如果有公众号文稿写作经历的话，也可以帮忙写微信稿。本公告长期有效。
+
+\section{致谢}
+2019 年 5 月 20 日，ElegantBook 模板在 Github 上的 star 数达到了 100，并且 21 日上了 Github 网站 \TeX{} 语言的\href{https://github.com/trending/tex?since=daily}{日趋势榜单}。这对于 Elegant\LaTeX{} 系列模板都是一个里程碑！
+
+在此特别感谢 China\TeX{} 以及 \href{http://www.latexstudio.net/}{\LaTeX{} 工作室}对于本系列模板的大力宣传与推广。\LaTeX{} 工作室网站上有很多精彩的帖子和精致的模板，欢迎大家去挖掘里面的宝藏。这也是国内最全面的 \LaTeX{} 相关的网站。
+
+特别感谢 \href{https://github.com/muzimuzhi}{muzimuzhi} 对于模板的完善。
+
+如果你喜欢我们的模板，你可以在 Github 上收藏我们的模板。
+\begin{figure}[htbp]
+\centering
+\includegraphics[width=\textwidth]{star.png}
+\caption{一键三连求赞}
+\end{figure}
+
+之前我们模板从未发布过捐赠/打赏信息，近期有用户反映他们对我们模板非常喜爱，想打赏没有支付码，不禁感叹，这世道变了啊，还有主动打赏的，那么我们就“勉为其难”地发布我们的打赏二维码吧！
+
+\begin{figure}[htbp]
+\centering
+\includegraphics[width=0.5\textwidth]{donate.jpg}
+\end{figure}
+
+赞赏费用的使用解释权归 Elegant\LaTeX{} 所有，并且不接受监督，请自愿理性打赏，10 元以上的赞赏，我们将列入捐赠榜，谢谢各位金主！
+
+\begin{table}[htbp]
+  \centering
+  \caption{捐赠榜}
+    \begin{tabular}{cccc}
+    \toprule
+    捐赠者   & 金额 & 时间 & 渠道 \\
+    \midrule
+    Lerh  & 10 元  & 2019/5/15 & 微信 \\
+    越过地平线 & 10 元    & 2019/5/15 & 微信 \\
+	大熊 &  20 元 & 2019/5/27 & 微信 \\
+    \bottomrule
+    \end{tabular}%
+\end{table}%
+
+再次感谢大家对于模板的喜爱！
+
+\chapter{ElegantBook 设置说明}
+
+本模板基于基础的 book 文类，所以 book 的选项对于本模板也是有效的。默认编码为 UTF-8，推荐使用 \TeX{} Live 编译。本文编写环境为 Win10 (64bit) + \TeX{} Live 2019，支持 \lstinline{PDFLaTeX} 以及 \lstinline{XeLaTeX} 编译。
 
 
 \section{语言模式}
@@ -69,12 +150,18 @@ Elegant\LaTeX{} 项目组致力于打造一系列美观、优雅、简便的模�
 \end{lstlisting}
 
 \begin{remark}
-不管选用中文环境（\lstinline{lang=cn}）还是英文环境（\lstinline{lang=en}）均可输入中文。另外如果在笔记中使用了抄录环境（\lstinline{lstlisting}），并抄录代码中有中文，请务必使用 \lstinline{XeLaTeX} 编译。
+只有中文环境（\lstinline{lang=cn}）才可以输入中文。另外如果抄录环境（\lstinline{lstlisting}）中有中文字符，请务必使用 \lstinline{XeLaTeX} 编译。
 \end{remark}
 
+\section{设备选项}
+最早我们在 ElegantNote 模板中加入了设备选项（\lstinline{device}），后来，我们觉得这个设备选项的设置可以应用到 ElegantBook 中\footnote{不过因为 ElegantBook 模板封面图片的存在，在修改页面设计时，需要对图片进行裁剪。}，而且 Book 一般内容比较多，如果在 iPad 上看无需切边，放大，那用户的阅读体验将会得到巨大提升。你可以使用下面的选项将版面设置为 iPad 设备模式\footnote{默认为 normal 模式，也即 A4 纸张大小。}
+\begin{lstlisting}
+\documentclass[pad]{elegantbook} %or
+\documentclass[device=pad]{elegantbook}
+\end{lstlisting}
 
 \section{颜色主题}
-本模板内置 5 组颜色主题，分别为 \textcolor{main1}{\lstinline{green}}\footnote{为原先默认主题}、\textcolor{main2}{\lstinline{cyan}}、\textcolor{main3}{\lstinline{blue}}（默认）、\textcolor{main4}{\lstinline{gray}}、\textcolor{main5}{\lstinline{black}}。另外还有一个自定义的选项  \lstinline{nocolor}。调用颜色主题 \lstinline{green} 的方法为 
+本模板内置 5 组颜色主题，分别为 \textcolor{structure1}{\lstinline{green}}\footnote{为原先默认主题。}、\textcolor{structure2}{\lstinline{cyan}}、\textcolor{structure3}{\lstinline{blue}}（默认）、\textcolor{structure4}{\lstinline{gray}}、\textcolor{structure5}{\lstinline{black}}。另外还有一个自定义的选项  \lstinline{nocolor}。调用颜色主题 \lstinline{green} 的方法为 
 \begin{lstlisting}
 \documentclass[green]{elegantbook} %or
 \documentclass[color=green]{elegantbook}
@@ -85,11 +172,11 @@ Elegant\LaTeX{} 项目组致力于打造一系列美观、优雅、简便的模�
 \centering
 \begin{tabular}{ccccccc}
 \toprule
-	        & \textcolor{main1}{green} 
-	        & \textcolor{main2}{cyan} 
-	        & \textcolor{main3}{blue}
-	        & \textcolor{main4}{gray} 
-	        & \textcolor{main5}{black} 
+	        & \textcolor{structure1}{green} 
+	        & \textcolor{structure2}{cyan} 
+	        & \textcolor{structure3}{blue}
+	        & \textcolor{structure4}{gray} 
+	        & \textcolor{structure5}{black} 
 	        & 主要使用的环境\\
 \midrule
 structure & \makecell{{\color{structure1}\rule{1cm}{1cm}}}
@@ -104,7 +191,7 @@ main      & \makecell{{\color{main1}\rule{1cm}{1cm}}}
 				& \makecell{{\color{main3}\rule{1cm}{1cm}}}
 				& \makecell{{\color{main4}\rule{1cm}{1cm}}}
 				& \makecell{{\color{main5}\rule{1cm}{1cm}}}
-				& definition \ exercise \ problem \ solution \\
+				& definition \ exercise \ problem \\
 
 second    & \makecell{{\color{second1}\rule{1cm}{1cm}}}
 				& \makecell{{\color{second2}\rule{1cm}{1cm}}}
@@ -123,7 +210,7 @@ third     & \makecell{{\color{third1}\rule{1cm}{1cm}}}
 \end{tabular}
 \end{table}
 
-如果需要自定义颜色的话请选择 \lstinline{nocolor} 选项或者使用 \lstinline{color=none}，然后在导言区定义 structure、main、second、third 颜色，具体方法如下：
+如果需要自定义颜色的话请选择 \lstinline{nocolor} 选项或者使用 \lstinline{color=none}，然后在导言区定义 structurecolor、main、second、third 颜色，具体方法如下：
 \begin{lstlisting}
 \definecolor{structurecolor}{RGB}{0,0,0}
 \definecolor{main}{RGB}{70,70,70}    
@@ -165,12 +252,12 @@ third     & \makecell{{\color{third1}\rule{1cm}{1cm}}}
 \subsection{定理类环境的使用}
 由于本模板使用了 \lstinline{tcolorbox} 宏包来定制定理类环境，所以和普通的定理环境的使用有些许区别，定理的使用方法如下：
 \begin{lstlisting}
-\begin{theorem}{<theorem name>}{<label>}
+\begin{theorem}{theorem name}{label}
 The content of theorem.
 \end{theorem}
 \end{lstlisting}
 
-第一个必选项 \lstinline{<theorem name>} 是定理的名字，第二个必选项 \lstinline{<label>} 是交叉引用时所用到的标签，交叉引用的方法为 \verb|\ref{thm:label}|。请注意，交叉引用时必须加上前缀 \lstinline{thm:}。
+第一个必选项 \lstinline{theorem name} 是定理的名字，第二个必选项 \lstinline{label} 是交叉引用时所用到的标签，交叉引用的方法为 \verb|\ref{thm:label}|。请注意，交叉引用时必须加上前缀 \lstinline{thm:}。
 
 其他相同用法的定理类环境有：
 
@@ -204,6 +291,7 @@ The content of theorem.
 This is the content of example environment.
 \end{example}
 
+
 这几个都是同一类环境，区别在于
 
 \begin{itemize}
@@ -259,17 +347,23 @@ This is the content of example environment.
 
 \section{参考文献}
 
-此模板使用了 \BibTeX{} 来生成参考文献，在中文示例中，使用了 \lstinline{gbt7714} 宏包。参考文献示例：~\cite{en1} 使用了中国一个大型的 P2P 平台（人人贷）的数据来检验男性投资者和女性投资者在投资表现上是否有显著差异。
+此模板使用了 \hologo{BibTeX} 来生成参考文献，在中文示例中，使用了 \lstinline{gbt7714} 宏包。参考文献示例：\cite{en1,en2,en3} 使用了中国一个大型的 P2P 平台（人人贷）的数据来检验男性投资者和女性投资者在投资表现上是否有显著差异。
 
-你可以在谷歌学术，Mendeley，Endnote 中获得文献条目（bib item），然后把它们添加到 \lstinline{reference.bib} 中。在文中引用的时候，引用它们的键值（bib key）即可。注意需要在编译的过程中添加 \BibTeX{} 编译。如果你想在参考文献中添加未引用的文献，可以使用
+你可以在谷歌学术，Mendeley，Endnote 中获得文献条目（bib item），然后把它们添加到 \lstinline{reference.bib} 中。在文中引用的时候，引用它们的键值（bib key）即可。注意需要在编译的过程中添加 \hologo{BibTeX} 编译。如果你想添加未引用的文献，可以使用
 \begin{lstlisting}[frame=single]
 \nocite{EINAV2010,Havrylchyk2018} %or include some bibitems
 \nocite{*} %include all the bibitems
 \end{lstlisting}
 
+本模板还添加了 \lstinline{cite=numbers} 和 \lstinline{cite=authoryear} 两个参考文献选项，用于设置参考文献格式的设置，默认为 \lstinline{numbers}。据我们所知，理工科类一般使用 \lstinline{numbers}，而文科类使用 \lstinline{authoryear} 比较多，所以我们将 \lstinline{numbers} 作为默认格式。如果需要改为  \lstinline{authoryear} ，可以使用
+\begin{lstlisting}
+\documentclass[cite=authoryear]{elegantbook} %or
+\documentclass[authoryear]{elegantbook}
+\end{lstlisting}
+
 \section{添加序章}
 
-如果你想在第一章前面添序章，不改变原本章节序号，你可以在第一章内容前面使用 
+如果你想在第一章前面添序章，不改变原本章节序号，可以在第一章内容前面使用 
 \begin{lstlisting}
 \chapter*{Introduction}
 \addcontentsline{toc}{chapter}{Introduction} 
@@ -277,8 +371,67 @@ This is the content of example environment.
 The content of introduction.
 \end{lstlisting}
 
+\section{章节摘要}
+模板新增了一个章节摘要环境（introduction），使用示例
+\begin{lstlisting}
+\begin{introduction}
+	\item Definition of Theorem
+	\item Ask for help
+	\item Optimization Problem
+	\item Property of Cauchy Series
+	\item Angle of Corner
+\end{introduction}
+\end{lstlisting}
+效果如下：
+\begin{introduction}
+	\item Definition of Theorem
+	\item Ask for help
+	\item Optimization Problem
+	\item Property of Cauchy Series
+	\item Angle of Corner
+\end{introduction}
+
+环境的标题文字可以通过这个环境的可选参数进行修改，修改方法为：
+\begin{lstlisting}
+\begin{introduction}[Brief Introduction]
+...
+\end{introduction}
+\end{lstlisting}
+
+
+\section{章后习题}
+前面我们介绍了例题和练习两个环境，这里我们再加一个，章后习题（\lstinline{problemset}）环境，用于在每一章结尾，显示本章的练习。使用方法如下
+
+\begin{lstlisting}
+\begin{problemset}
+	\item exercise 1
+	\item exercise 2
+	\item exercise 3
+\end{problemset}
+\end{lstlisting}
+
+
+效果如下：
+\begin{problemset}
+	\item exercise 1
+	\item exercise 2
+	\item exercise 3
+\end{problemset}
+
+\begin{remark}
+如果你想把 \lstinline{problemset} 环境的标题改为其他文字，你可以类似于 introduction 环境修改 problemset 的可选参数。
+\end{remark}
+
 \chapter{ElegantBook 写作示例}
 
+\begin{introduction}
+\item 积分定义~\ref{def:int}
+\item Fubini 定理~\ref{thm:fubi}
+\item 最优性原理~\ref{pro:max}
+\item 柯西列性质~\ref{property:cauchy}
+\item 韦达定理
+\end{introduction}
+
 \section{Lebesgue 积分}
 在前面各章做了必要的准备后，本章开始介绍新的积分。在 Lebesgue 测度理论的基础上建立了 Lebesgue 积分，其被积函数和积分域更一般，可以对有界函数和无界函数统一处理。正是由于 Lebesgue 积分的这些特点，使得 Lebesgue 积分比 Riemann 积分具有在更一般条件下的极限定理和累次积分交换积分顺序的定理，这使得 Lebesgue 积分不仅在理论上更完善，而且在计算上更灵活有效。
 
@@ -292,10 +445,10 @@ Lebesgue 积分有几种不同的定义方式。我们将采用逐步定义非�
 
 
 \begin{definition}{可积性}{int}
-设 $ f(x)=\sum\limits_{i=1}^{k} a_i \chi_{A_i}(x)$ 是 $E$ 上的非负简单函数，其中 $\{A_1,A_2,\ldots,A_k\}$ 是 $E$ 上的一个可测分割，$a_1,a_2,\ldots,a_k$ 是非负实数。定义 $f$ 在 $E$ 上的积分为 $\int_{a}^b f(x)$
+设 $ f(x)=\sum\limits_{i=1}^{k} a_i \chi_{A_i}(x)\oint_{a}^b\ointop_{a}^b\prod_{i=1}^n$ 是 $E$ 上的非负简单函数，其中 $\{A_1,A_2,\ldots,A_k\}$ 是 $E$ 上的一个可测分割，$a_1,a_2,\ldots,a_k$ 是非负实数。定义 $f$ 在 $E$ 上的积分为 $\int_{a}^b f(x)$
 \begin{equation}
    \label{inter}
-   \int_{E} f dx = \sum_{i=1}^k a_i m(A_i) \pi \alpha\beta\sigma\gamma\nu\xi\epsilon\varepsilon. 
+   \int_{E} f dx = \sum_{i=1}^k a_i m(A_i) \pi \alpha\beta\sigma\gamma\nu\xi\epsilon\varepsilon. \oint_{a}^b\ointop_{a}^b\prod_{i=1}^n
 \end{equation}
 一般情况下 $0 \leq \int_{E} f dx \leq \infty$。若 $\int_{E} f dx < \infty$，则称 $f$ 在 $E$ 上可积。
 \end{definition}
@@ -357,7 +510,7 @@ Lebesgue 积分有几种不同的定义方式。我们将采用逐步定义非�
 
 以最简单的一元线性模型来解释最小二乘法。什么是一元线性模型呢？监督学习中，如果预测的变量是离散的，我们称其为分类（如决策树，支持向量机等），如果预测的变量是连续的，我们称其为回归。回归分析中，如果只包括一个自变量和一个因变量，且二者的关系可用一条直线近似表示，这种回归分析称为一元线性回归分析。如果回归分析中包括两个或两个以上的自变量，且因变量和自变量之间是线性关系，则称为多元线性回归分析。对于二维空间线性是一条直线；对于三维空间线性是一个平面，对于多维空间线性是一个超平面。
 
-\begin{property}
+\begin{property}\label{property:cauchy}
 柯西列的性质
 \begin{enumerate}
 \item $\{x_k\}$ 是柯西列，则其子列 $\{x_k^i\}$ 也是柯西列。
@@ -369,6 +522,155 @@ Lebesgue 积分有几种不同的定义方式。我们将采用逐步定义非�
 回归分析（regression analysis) 是确定两种或两种以上变量间相互依赖的定量关系的一种统计分析方法。运用十分广泛，回归分析按照涉及的变量的多少，分为一元回归和多元回归分析；按照因变量的多少，可分为简单回归分析和多重回归分析；按照自变量和因变量之间的关系类型，可分为线性回归分析和非线性回归分析。
 \end{conclusion}
 
+\begin{problemset}
+\item 设 $A$ 为数域 $K$ 上的 $n$ 级矩阵。证明：如果 $K^n$ 中任意非零列向量都是 $A$ 的特征向量，则 $A$ 一定是数量矩阵。
+\item 证明：不为零矩阵的幂零矩阵不能对角化。
+\item 设 $A = (a_{ij})$ 是数域 $K$ 上的一个 $n$ 级上三角矩阵，证明：如果 $a_{11} = a_{22} = \cdots = a_{nn}$，并且至少有一个 $a_{kl} \not = 0 (k < l)$，则 $A$ 一定不能对角化。
+\end{problemset}
+
+\chapter{旁注}
+在 3.08 版本，我们加入了旁注（边注）等设置以及 \lstinline{\elegantpar} 命令，不过目前处于测试阶段。如果你想整个文档都加入旁注，一般的方法是，重新设置旁注的大小。本模板加入了一个旁注选项 \lstinline{marginpar}，如果加入旁注 \lstinline{marginpar=margintrue}，则会减少版芯两边的宽度（减少至 1.5cm），如果不加入旁注 \lstinline{marginpar=marginfalse}（默认），则维持两边距离不变。旁注选项仅对 \lstinline{device=normal} 试用，pad 模式并不支持。
+
+旁注命令可以使用 \LaTeX{} 自带的 \lstinline{\marginpar} 命令或者 \lstinline{marginnote}  宏包的  \lstinline{\marginnote}  命令，旁注的使用，请参考维基百科：\href{https://en.wikibooks.org/wiki/LaTeX/Footnotes_and_Margin_Notes#Margin_Notes}{旁注}或者 \LaTeX {}书籍。
+
+本模板还添加了一个 \lstinline{\elegantpar} 命令，需要注意的是，由于这个命令使用了 TikZ 中的层叠效果（overlay），所以为了得到正确的旁注显示，你需要多次编译（3 次）。\lstinline{\elegantpar} 命令的效果如下。
+
+%\setlength{\marginparwidth}{2.5cm}
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et \elegantpar{dolore magna aliqua}{This is Beautiful the elegantpar Style for English Text}. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+
+\begin{equation}
+a^{2}+b^{2} = \elegantpar{c^{2}}{勾股定理
+\begin{equation*}a^2+b^2=c^2\end{equation*}}
+\end{equation}
+ 
+ 若夫日出而林霏开，云归而岩穴暝，晦明变化者，山间之朝暮也。野芳发而幽香，佳木秀而繁阴，风霜高洁，水落而石出者，山间之四时也。朝而往，暮而归，四时之景不同，而乐亦无穷也。 
+ 
+ 至于负者歌于途，行者休于树，前者呼，后者应，\elegantpar{伛偻提携}{指搀扶着走的小孩子}，往来而不绝者，滁人游也。临溪而渔，溪深而鱼肥。酿泉为酒，泉香而酒洌；山肴野蔌，杂然而前陈者，太守宴也。宴酣之乐，非丝非竹，射者中，弈者胜，觥筹交错，起坐而喧哗者，众宾欢也。苍颜白发，颓然乎其间者，太守醉也。$2\elegantpar{x}{方程的解与数学符号的选择无关}=3$。
+
+\chapter{常见问题集}
+
+\begin{custom}{问题}
+有没有办法章节用“第一章，第一节，（一）”这种？
+\end{custom}
+
+\begin{solution}
+你可以修改模板中对于章节的设置，利用 ctex 宏集的 \lstinline{\zhnumber} 命令可以把计数器的数字形式转为中文。
+\end{solution}
+
+
+\begin{custom}{问题}
+3.07 版本的 cls 的 natbib 加了numbers 编译完了没变化，群主设置了不可更改了？
+\end{custom}
+
+\begin{solution}
+3.07 中在 \lstinline{gbt7714} 宏包使用时，加入了 \lstinline{authoryear} 选项，这个使得 \lstinline{natbib} 设置了 \lstinline{numbers} 也无法生效。3.08 版本中，模板增加了 \lstinline{numbers} 和 \lstinline{authoryear} 文献选项，你可以参考前文设置说明。
+\end{solution}
+
+\begin{custom}{问题}
+大佬，我想把正文字体改为亮色，背景色改为黑灰色。
+\end{custom}
+
+\begin{solution}
+页面颜色可以使用 \lstinline{\pagecolor} 命令设置，文本命令可以参考\href{https://tex.stackexchange.com/questions/278544/xcolor-what-is-the-equivalent-of-default-text-color}{这里}进行设置。
+\end{solution}
+
+\begin{custom}{问题}
+\lstinline{! LaTeX Error: Unknown option `scheme=plain' for package `ctex'.}
+\end{custom}
+
+\begin{solution}
+你用的 C\TeX{} 套装吧？这个里面的 \lstinline{ctex} 宏包已经是已经是 10 年前的了，与本模板使用的 \lstinline{ctex} 宏集有很大区别。不建议 C\TeX{} 套装了，请卸载并安装 \TeX{} Live 2019。
+\end{solution}
+
+\begin{custom}{问题}
+我该使用什么版本？
+\end{custom}
+
+\begin{solution}
+请务必使用\href{https://github.com/ElegantLaTeX/ElegantBook/releases}{最新正式发行版}，发行版间不定期可能会有更新（修复 bug 或者改进之类），如果你在使用过程中没有遇到问题，不需要每次更新\href{https://github.com/ElegantLaTeX/ElegantBook/archive/master.zip}{最新版}，但是在发行版更新之后，请尽可能使用最新版（发行版）！最新发行版可以在 Github 或者 \TeX{} Live 2019 内获取。
+\end{solution}
+
+
+\begin{custom}{问题}
+我该使用什么编辑器？
+\end{custom}
+
+\begin{solution}
+你可以使用 \TeX{} Live 2019 自带的编辑器 \TeX{}works 或者使用 \TeX{}studio，\TeX works 的自动补全，你可以参考我们的总结 \href{https://github.com/EthanDeng/texworks-autocomplete}{\TeX works 自动补全}。推荐使用 \TeX{} Live 2019 + \TeX Studio。我自己用 VS Code 和 Sublime Text，相关的配置说明，请参考 \href{https://github.com/EthanDeng/vscode-latex}{\LaTeX{} 编译环境配置：Visual Studio Code 配置简介} 和 \href{https://github.com/EthanDeng/sublime-text-latex}{Sublime Text 搭建 \LaTeX{} 编写环境}。
+\end{solution}
+
+
+\begin{custom}{问题}
+您好，我们想用您的 ElegantBook 模板写一本书。关于机器学习的教材，希望获得您的授权，谢谢您的宝贵时间。
+\end{custom}
+
+\begin{solution}
+模板的使用修改都是自由的，你们声明模板来源以及模板地址（github 地址）即可，其他未尽事宜按照开源协议 LPPL-1.3c。做好之后，如果方便的话，可以给我们一个链接，我把你们的教材放在 ElegantLaTeX 用户作品集里。
+\end{solution}
+
+\begin{custom}{问题}
+我想要原来的封面！
+\end{custom}
+
+\begin{solution}
+我们计划在未来版本加入封面选择，让用户可以选择旧版封面。
+\end{solution}
+
+\begin{custom}{问题}
+我想修改中文字体！
+\end{custom}
+
+\begin{solution}
+首先，我们{\heiti 强烈建议你不要去修改字体}！如果你一定坚持修改字体，请在 \lstinline{newtxtext} 宏包加载前加入中文字体设置（\lstinline{xeCJK} 宏包）。如果你选择自定义字体，请设置好 \lstinline{\kaishu}，\lstinline{\heiti} 等命令，否则会报错。如果你看不懂我现在说的，请停止你的字体自定义行为。
+\end{solution}
+
+\begin{custom}{问题}
+请问交叉引用是什么？
+\end{custom}
+
+\begin{solution}
+本群和本模板适合有一定 \LaTeX{} 基础的用户使用，新手请先学习 \LaTeX{} 的基础，理解各种概念，否则你将寸步难行。
+\end{solution}
+
+\begin{custom}{问题}
+定义等环境中无法使用加粗命令么？
+\end{custom}
+
+\begin{solution}
+是这样的，默认中文并没加粗命令，如果你想在定义等环境中使用加粗命令，请使用 \lstinline{\heiti} 等字体命令，而不要使用 \lstinline{\textbf}。或者，你可以将 \lstinline{\textbf} 重新定义为 \lstinline{\heiti}。英文模式不存在这个问题。
+\end{solution}
+
+\begin{custom}{问题}
+代码高亮环境能用其他语言吗？
+\end{custom}
+
+\begin{solution}
+可以的，ElegantBook 模板用的是 \lstinline{listings} 宏包，你可以在环境之后加上语言，全局语言修改请使用 \lstinline{\lstset} 命令，更多信息请参考宏包文档。
+\end{solution}
+
+
+\begin{custom}{问题}
+群主，什么时候出 Beamer 的模板（主题），ElegantSlide 或者 ElegantBeamer？
+\end{custom}
+
+\begin{solution}
+这个问题问的人比较多，我这里给个明确的答案。由于 Beamer 中有一个很优秀的主题 \href{https://github.com/matze/mtheme}{Metropolis}。我觉得在我们找到非常好的创意之前不会发布正式的 Beamer 主题，如果你非常希望得到 Elegant\LaTeX{} “官方”的主题，请在用户 QQ 群内下载我们测试主题 PreElegantSlide（未来不一定按照这个制作）。正式版制作计划在 2020 年之后。
+\end{solution}
+
+\begin{custom}{问题}
+群主好棒，想嫁！
+\end{custom}
+
+\begin{solution}
+我取向正常！
+\end{solution}
+
+
 \nocite{*} 
 
 \bibliography{reference}
@@ -387,6 +689,7 @@ Lebesgue 积分有几种不同的定义方式。我们将采用逐步定义非�
 \end{equation}
 
 
+
 \chapter{最小示例}
 
 \begin{lstlisting}
@@ -400,7 +703,7 @@ Lebesgue 积分有几种不同的定义方式。我们将采用逐步定义非�
 \date{\today}
 % extra info
 \version{1.00}
-\equote{Victory won\rq t come to us unless we go to it. --- M. Moore}
+\extrainfo{Victory won\rq t come to us unless we go to it. --- M. Moore}
 \logo{logo.png}
 \cover{cover.jpg}
 
@@ -419,4 +722,5 @@ The content of chapter one.
 \end{document}
 \end{lstlisting}
 
+
 \end{document}
diff --git a/Master/texmf-dist/doc/latex/elegantbook/elegantbook-en.pdf b/Master/texmf-dist/doc/latex/elegantbook/elegantbook-en.pdf
index bc39d44cbdf..e6aa90fb346 100644
--- a/Master/texmf-dist/doc/latex/elegantbook/elegantbook-en.pdf
+++ b/Master/texmf-dist/doc/latex/elegantbook/elegantbook-en.pdf
diff --git a/Master/texmf-dist/doc/latex/elegantbook/elegantbook-en.tex b/Master/texmf-dist/doc/latex/elegantbook/elegantbook-en.tex
index 707f92acbd2..f367a03da8f 100644
--- a/Master/texmf-dist/doc/latex/elegantbook/elegantbook-en.tex
+++ b/Master/texmf-dist/doc/latex/elegantbook/elegantbook-en.tex
@@ -1,4 +1,4 @@
-\documentclass[noanswer,fancy,blue,11pt]{elegantbook}
+\documentclass[fancy,blue,11pt]{elegantbook}
 
 \title{An Elegant \LaTeX{} Template for Books}
 \subtitle{Classic Elegant\LaTeX{} Template}
@@ -6,15 +6,13 @@
 \author{Ethan Deng \& Liam Huang}
 \institute{Elegant\LaTeX{} Program}
 \date{\today}
-\version{3.07}
+\version{3.08}
 
-\equote{Victory won\rq t come to us unless we go to it. --- M. Moore}
+\extrainfo{Victory won\rq t come to us unless we go to it. }
 
 \logo{logo.png}
 \cover{cover.jpg}
 
-
-
 \begin{document}
 
 \maketitle
@@ -25,55 +23,138 @@
 \hypersetup{pageanchor=true}
 
 \chapter{Elegant\LaTeX{} Templates}
+Elegant\LaTeX{} Program developers are intended to provide you beautiful, elegant, user-friendly templates. Currently, the Elegant\LaTeX{} is composed of \href{https://github.com/ElegantLaTeX/ElegantNote}{ElegantNote}, \href{https://github.com/ElegantLaTeX/ElegantBook}{ElegantBook}, \href{https://github.com/ElegantLaTeX/ElegantPaper}{ElegantPaper}, designed for typesetting notes, books, and working papers respectively. Latest releases are strongly recommended! This guide is aimed at briefly introducing the 101 of this template. For any other question, suggestion or comment, feel free to contact us on GitHub \href{https://github.com/ElegantLaTeX/ElegantBook/issues}{issues} or email us at \email{elegantlatex2e@gmail.com}.
 
-On the occasion of this release, we, Elegant\LaTeX{} Program, want to reintroduce our work to you. We are committed to creating a series of beautiful, elegant, easy to use \LaTeX{} templates for users. The Elegant\LaTeX{} is currently composed of \href{https://github.com/ElegantLaTeX/ElegantNote}{ElegantNote}, \href{https://github.com/ElegantLaTeX/ElegantBook}{ElegantBook}, \href{https://github.com/ElegantLaTeX/ElegantPaper}{ElegantPaper} for typesetting notes, books, and working papers respectively. 
-
-The latest version is available on \href{https://github.com/ElegantLaTeX/ElegantBook/releases}{Github}. This guide describes some settings of this template and how to use it. If you have any other questions, suggestions or comments, please feel free to contact us, our email is \email{elegantlatex2e@gmail.com}.
+Contact Infos:
+\begin{itemize}
+	\item Homepage: \href{https://elegantlatex.org/}{https://elegantlatex.org/}
+	\item Github: \href{https://github.com/ElegantLaTeX/}{https://github.com/ElegantLaTeX/}
+	\item CTAN: \href{https://ctan.org/pkg/elegantbook}{https://ctan.org/pkg/elegantbook}
+	\item Wiki: \href{https://github.com/ElegantLaTeX/ElegantBook/wiki}{https://github.com/ElegantLaTeX/ElegantBook/wiki}
+	\item Download: \href{https://github.com/ElegantLaTeX/ElegantBook/releases}{release}, \href{https://github.com/ElegantLaTeX/ElegantBook/archive/master.zip}{latest version}
+	\item Weibo: ElegantLaTeX
+	\item Wechat: ElegantLaTeX
+	\item QQ: 692108391
+	\item Email: \email{elegantlatex2e@gmail.com}
+\end{itemize}
 
 
 \section{ElegantBook Updates}
-Over these years, we've received a lot of feedbacks from users, with major issues related to font installation, coding support, theorem class environments floats, theorem cross-page, cross-references, and etc. We really think about these problems, it wasn't elegant to let the user install the font for visual beauty since users got into a lot of trouble, which went against the concept of our template. So we've removed that from the new version, users don't have to install any fonts. Let's take a look at the ElegantBook template 3.x updates:
-
+What\rq s new in this version:
 \begin{enumerate}
-   \item Remove custom font settings;
-   \item Add English and Chinese modes;
-   \item \lstinline{PDFLaTeX} and \lstinline{XeLaTeX} support;
-   \item Use the \lstinline{tcolorbox} package to re-written the theorem class environments;
-   \item Theorem class environments name updated, and cross-references fixed;
-   \item renew color themes and add gray and black theme;
-   \item Color name updated, link color unified;
-   \item New Elegant\LaTeX{} Logo;
-   \item New cover and decorations, remove the watermark;
-   \item Fix appendix;
-   \item Add code highlighting;
-   \item Beautify the list environments;
-   \item Add simple theorem mode;
-   \item Add base hide option.
+   \item Fix \lstinline|\part|.
+   \item Introduce pad mode.
+   \item Support mtpro2 package.
+   \item Revise default format of references to numbers.
+   \item Include environment for chapter introduction.
+   \item Include environment for problem set.
+   \item Include margin note using \lstinline{\elegantpar} (beta).
+   \item Reduce line spacing for equations.
+   \item Turn \lstinline{\equote} into \lstinline{\extrainfo}, with multi-line display.
+   \item Polish documentation by including acknowledgement, etc.
 \end{enumerate}
 
+\begin{note}
+	Since the latest version has witnessed huge reconstruction (with cover change in version 3.06), 3.x is backward incompatible with 2.x. For those who would like to convert documents compiled with earlier version (3.06 or 2.x) to be compatible with latest version, please refer to \href{https://github.com/ElegantLaTeX/ElegantBook/wiki/convert}{conversion}. Questions about version 2.x will not be answered henceforth.
+\end{note}
 
-\chapter{ElegantBook Settings}
+\section{Installation and Update}
+Both portable version and installation package are available for this template.
 
+For portable version, simply download lastest ElegantBook-master from Github or CTAN (to be more accurate, download \lstinline{elegantbook.cls}) and save the file(s) under your working directory. This way of installation is simple and convenient, but you have to manually update \lstinline{cls} now and then.
 
-\section{Compilation Methods}
-This template is based on the Standard LaTeX book class,  so the options of book class also work. The default encoding is UTF-8, and \TeX{} Live is recommended. The test environment is Win10 + \TeX{} Live 2018. 
+If you are a \TeX{} Live 2019 user, using the \lstinline{tlshell}\footnote{namely, \TeX{} Live Manager} of \TeX{} Live 2019 direct installation package is strongly recommended. Simply search and open \lstinline{tlshell}, click on \lstinline{File -> Load Default Repository} or customize repository by \lstinline{Options}. Wait till the repository loads successfully, search \lstinline{elegantbook} by name, installation and update is just a click away.
 
+\begin{figure}[htbp]
+	\centering
+	\includegraphics[width=0.7\textwidth]{tlshell.png}
+	\caption{Use \TeX{} Live Shell to Install ElegantBook Template}
+\end{figure}
 
-\section{Languages}
+If you are a \TeX{} Live 2018 user and would like to update to \TeX{} Live 2019, the official solution is to uninstall 2018. If you want to save the bother of uninstallation and installation, please copy \lstinline{elegantbook.cls} to the installation directory of \TeX{} Live 2018 (default: \lstinline|C:\texlive\2018\texmf-dist\tex\latex\elegantbook| ), run \lstinline{texhash} in cmd.
+
+Excuse me? You are a  C\TeX{}  user? Sorry, this template is incompatible with C\TeX{}.
+
+For more details about the installation and usage of \TeX{} Live 2019, the compatibility of C\TeX{} and \TeX{} Live, installation directory, etc., please refer to OG (Official Guide).
+
+\section{Online Usage of Templates}
+Considering the online usage of the templates, all the templates are available on Overleaf. Those who enjoy smooth network may feel free to use the templates without \TeX{} Live and to visit your documents anywhere anytime. Search \lstinline{elegantlatex} on Overleaf or visit \href{https://www.overleaf.com/latex/templates?addsearch=elegantlatex}{search result}, choose the one you prefer and save it to your account, then you can edit yourself or corporate with others if you like. For more infomation about Overleaf, please refer to Overleaf OG.
+
+\section{User\rq s Selected Works Plan}
+Eight years have passed since the found of Elegant\LaTeX{} Program. It\rq s an honor that our templates are preferred by a lot of users. Hence, in order to promote more interactions among our users and know more about what you need, we are planning to provide a platform to display selected works of our users on Github or our homepage. If you want to show us your work(s), contact us via Email or other ways. Or if you have upload your work(s) on Github or Gitee etc., share the URL(s) with us.
+
+\section{About Pull Request}
+For some reasons, pull request is 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 constriction of  LPPL-1.3c.
+
+\section{Recruit Support Members}
+Recruit Support Members for Elegant\LaTeX{} to translate template OGs(Chinese -> English), maintain wiki entries using MarkDown, update Wechat articles. No deadline for this recruitment.
+
+Thank our best support members for their selfless work!
+\begin{itemize}
+	\item OG Translator: \href{https://github.com/peggy2006xzyz}{YPY};
+	\item Wiki Maintainer: \href{https://github.com/izinngo}{Ingo Zinngo};
+	\item QQ Group Manager: \href{https://github.com/sikouhjw}{Sikouhjw}.
+\end{itemize}
+
+\section{Acknowledgement}
+The number of stars on Github for ElegantBook reached 100 on May 20, 2019 and was included in the \href{https://github.com/trending/tex?since=daily}{Trending} under the \TeX{} catagory. It is a remarkable moment for Elegant\LaTeX{} !!!
+
+Thank China\TeX{} and \href{http://www.latexstudio.net/}{\LaTeX{} studio} for their promotion. \LaTeX{} studio offers tons of valuable posts and templates for discovery. It is the most comprehensive website on \LaTeX{} in China.
+
+Thank muzimuzhi for the revision of the template.
 
-We defined one option named \lstinline{lang}, this option has two alternative values, \lstinline{lang=en} (default) or \lstinline{lang=cn}. \lstinline{lang=cn} will make the captions of figure/table, abstract name, refname etc. Chinese. You can use this option as
+If you like our template, star on Github.
+\begin{figure}[htbp]
+	\centering
+	\includegraphics[width=\textwidth]{star.png}
+	\caption{Twinkle, Twinkle, Little Star}
+\end{figure}
+Recently some users have expressed their love for our templates and want to tip us. QR code for donation is now available.
+\begin{figure}[htbp]
+	\centering
+	\includegraphics[width=0.5\textwidth]{donate.jpg}
+\end{figure}
+
+The explanation right of the tip usage belongs to Elegant\LaTeX{} with no supervision. Feel free to tip us. Those who donate more than 10 RMB will be recorded in the Donation List. Thank all the tippers!
+\begin{table}[htbp]
+	\centering
+	\caption{Donation List}
+	\begin{tabular}{cccc}
+		\toprule
+		Tipper   & Amount & Date & Channel \\
+		\midrule
+		Lerh  & 10 RMB  & 2019/5/15 & Wechat \\
+		Yueguodipingxian & 10 RMB   & 2019/5/15 & Wechat \\
+		Dapeng & 20 RMB & 2019/5/27 & Wechat\\
+		\bottomrule
+	\end{tabular}%
+\end{table}%
+
+\chapter{ElegantBook Settings}
+
+This template is based on the Standard \LaTeX{} book class, so the options of book class work as well. The default encoding is UTF-8 while \TeX{} Live is recommended. The test environment is Win10 + \TeX{} Live 2019. 
+
+
+\section{Languages}
+We defined one option named \lstinline{lang} which has two alternative values, \lstinline{lang=en} (default) and \lstinline{lang=cn}. Different values will alter the captions of figure/table, abstract name, refname, etc. You can use this option as
 \begin{lstlisting}
 \documentclass[en]{elegantbook} 
 \documentclass[lang=en]{elegantbook}
 \end{lstlisting}
 
 \begin{remark}
-You can input Chinese Characters in either \lstinline{lang=en} or \lstinline{lang=cn}. If you are using (\lstinline{lstlisting}) environment, and it contains Chinese characters, please use \lstinline{XeLaTeX}.
+Chinese Characters  are acceptable whenever \lstinline{lang=en} or \lstinline{lang=cn}. If you would like to include Chinese characters under (\lstinline{lstlisting}) environment, please use \lstinline{XeLaTeX} to compile.
 \end{remark}
 
+\section{Device Mode Option}
+The option for device (\lstinline{device}) was originally used in ElegantNote, now we include this option in ElegantBook\footnote{Pictures have to be modified accordingly} as well. Activate iPad mode in the following way\footnote{Default size: normal, A4 paper}:
+\begin{lstlisting}
+\documentclass[pad]{elegantbook} %or
+\documentclass[device=pad]{elegantbook}
+\end{lstlisting}
 
 \section{Color Themes}
-This template contains 5 color themes,they are  \textcolor{main1}{\lstinline{green}}\footnote{original default theme.}、\textcolor{main2}{\lstinline{cyan}}、\textcolor{main3}{\lstinline{blue}}（default）、\textcolor{main4}{\lstinline{gray}}、\textcolor{main5}{\lstinline{black}}. You can choose \lstinline{green} with  
+This template contains 5 color themes, i.e. \textcolor{structure1}{\lstinline{green}}\footnote{Original default theme.}, \textcolor{structure2}{\lstinline{cyan}}, \textcolor{structure3}{\lstinline{blue}}(default), \textcolor{structure4}{\lstinline{gray}}, \textcolor{structure5}{\lstinline{black}}. You can choose \lstinline{green} with
 \begin{lstlisting}
 \documentclass[green]{elegantbook} %or
 \documentclass[color=green]{elegantbook}
@@ -81,15 +162,15 @@ This template contains 5 color themes,they are  \textcolor{main1}{\lstinline{gre
 
 
 \begin{table}[htbp]
-\caption{ElegantBook Themes\label{tab:color thm}\label{tab:color thm}}
+\caption{ElegantBook Themes\label{tab:color thm}}
 \centering
 \begin{tabular}{ccccccc}
 \toprule
-	        & \textcolor{main1}{green} 
-	        & \textcolor{main2}{cyan} 
-	        & \textcolor{main3}{blue}
-	        & \textcolor{main4}{gray} 
-	        & \textcolor{main5}{black} 
+	        & \textcolor{structure1}{green} 
+	        & \textcolor{structure2}{cyan} 
+	        & \textcolor{structure3}{blue}
+	        & \textcolor{structure4}{gray} 
+	        & \textcolor{structure5}{black} 
 	        & Main Environments\\
 \midrule
 structure & \makecell{{\color{structure1}\rule{1cm}{1cm}}}
@@ -97,22 +178,19 @@ structure & \makecell{{\color{structure1}\rule{1cm}{1cm}}}
 				& \makecell{{\color{structure3}\rule{1cm}{1cm}}} 
 				& \makecell{{\color{structure4}\rule{1cm}{1cm}}} 
 				& \makecell{{\color{structure5}\rule{1cm}{1cm}}} 
-				& chapter \ section \ subsection \\
-
+				& chapter  section  subsection \\
 main      & \makecell{{\color{main1}\rule{1cm}{1cm}}}
 				& \makecell{{\color{main2}\rule{1cm}{1cm}}}
 				& \makecell{{\color{main3}\rule{1cm}{1cm}}}
 				& \makecell{{\color{main4}\rule{1cm}{1cm}}}
 				& \makecell{{\color{main5}\rule{1cm}{1cm}}}
-				& definition \ exercise \ problem \ solution \\
-
+				& definition  exercise  problem  \\
 second    & \makecell{{\color{second1}\rule{1cm}{1cm}}}
 				& \makecell{{\color{second2}\rule{1cm}{1cm}}}
 				& \makecell{{\color{second3}\rule{1cm}{1cm}}}
 				& \makecell{{\color{second4}\rule{1cm}{1cm}}}
 				& \makecell{{\color{second5}\rule{1cm}{1cm}}}
-				& theorem \ lemma \ corollary\\
-
+				& theorem  lemma  corollary\\
 third     & \makecell{{\color{third1}\rule{1cm}{1cm}}}
 				& \makecell{{\color{third2}\rule{1cm}{1cm}}}
 				& \makecell{{\color{third3}\rule{1cm}{1cm}}}
@@ -123,7 +201,7 @@ third     & \makecell{{\color{third1}\rule{1cm}{1cm}}}
 \end{tabular}
 \end{table}
 
-If you want to customize the colors, please select \lstinline{nocolor} or use \lstinline{color=none} , then define the main, second, and third colors in the preamble section as follows:
+If you want to customize the colors, please select \lstinline{nocolor} or use \lstinline{color=none} and declare the main, second, and third colors in the preamble section as follows:
 \begin{lstlisting}[frame=single]
 \definecolor{structurecolor}{RGB}{60,113,183}
 \definecolor{main}{RGB}{0,166,82}%
@@ -134,46 +212,45 @@ If you want to customize the colors, please select \lstinline{nocolor} or use \l
 
 \section{Chapter Title Display Styles}
 
-This template contains 2 sets of \textit{title display styles},which including \lstinline{hang}(default) and \lstinline{display} style, 
-
-The difference is that the chapter heading is displayed on a single line (\lstinline{hang}) and on a double line (\lstinline{display}) , and this guide uses \lstinline{hang} . To change display style
+This template contains 2 sets of \textit{title display styles},\lstinline{hang}(default) and \lstinline{display} style. For the former, chapter title is displayed on a single line (\lstinline{hang}). For the latter, chapter title is displayed on a double line (\lstinline{display}).In this guide, we use \lstinline{hang} . To change display style
 \begin{lstlisting}
 \documentclass[hang]{elegantbook} %or
 \documentclass[titlestyle=hang]{elegantbook}
 \end{lstlisting}
 
 \section{Theorem Class Environments}
-We defined two sets of theorem modes, \lstinline{simple} style and \lstinline{fancy} style (default), you can change to \lstinline{simple} mode by 
+We defined two sets of theorem modes, \lstinline{simple} style and \lstinline{fancy} style (default). You may change to \lstinline{simple} mode by
+
 \begin{lstlisting}
 \documentclass[simple]{elegantbook} %or
 \documentclass[mode=simple]{elegantbook}
 \end{lstlisting}
 
-In this template, we defined four categories of theorem class environments
+In this template, we defined four different theorem class environments
 
 \begin{itemize}
-\item \textit{Theorem Environment}, including title and contents, numbering within chapter. There are three types depending on the format
+\item \textit{Theorem Environment}, including title and content, numbering corresponding to chapter. Three types depending on the format:
    \begin{itemize}
       \item \textcolor{main}{\textbf{definition}} environment, the color is  \textcolor{main}{main};
       \item \textcolor{second}{\textbf{theorem, lemma, corollary}} environment, the color is \textcolor{second} {second};
       \item \textcolor{third}{\textbf{proposition}} environment, the color is \textcolor{third}{third}.
    \end{itemize}
-\item \textit{Example Environments}, including \textbf{example, exercise, problem} environment, auto numering within chapter.
-\item \textit{Proof Environment}, including \textbf{proof, note} environment, they contain introductory symbol (\textbf{note} environment) or ending symbol (\textbf{proof} environment).
-\item \textit{Conclusion Environments}, including \textbf{conclusion, assumption, property, remark, solution}\footnote{We also define and key \lstinline{result}, which can hide the \lstinline{solution} and \lstinline{proof} environments. You can switch by \lstinline{result=answer} or \lstinline{result=noanswer}} environment, all of these begin with boldfaced words, and the contents are the same as a normal paragraph.
+\item \textit{Example Environments}, including \textbf{example, exercise, problem} environment, auto-numbering corresponding to chapter.
+\item \textit{Proof Environment}, including \textbf{proof, note} environment containing introductory symbol (\textbf{note} environment) or ending symbol (\textbf{proof} environment).
+\item \textit{Conclusion Environments}, including \textbf{conclusion, assumption, property, remark, solution}\footnote{We also define an option \lstinline{result}, which can hide the \lstinline{solution} and \lstinline{proof} environments. You can switch between \lstinline{result=answer} and \lstinline{result=noanswer}} environment, all of which begin with boldfaced words, with format consistent with normal paragraphs.
 \end{itemize}
 
 \subsection{Theorem Class Environments}
-The template uses the \lstinline{tcolorbox} package to customize the theorem class environments, it is slightly different from the normal theorem environments. The usage is as follows:
+Since the template uses the \lstinline{tcolorbox} package to customize the theorem class environments, it is slightly different from the normal theorem environments. The usage is as follows:
 \begin{lstlisting}
 \begin{theorem}{<theorem name>}{<label>}
 The content of theorem.
 \end{theorem}
 \end{lstlisting}
 
-The first parameter \lstinline{<theorem name>} is the name of the theorem, and the second parameter \lstinline{label} is the label used in cross-reference with \verb|ref{thm:label}|. Note that cross-references must be prefixed with \lstinline{thm:}. 
+The first parameter \lstinline{<theorem name>} represents the name of the theorem, and the second parameter \lstinline{label} represents the label used in cross-reference with \verb|ref{thm:label}|. Note that cross-references must be prefixed with \lstinline{thm:}. 
 
-Other theorem class environments with the same usage are:
+Other theorem class environments with the same usage includes:
 
 \begin{table}[htbp]
    \centering
@@ -194,7 +271,7 @@ Other theorem class environments with the same usage are:
  
 
 \subsection{Other Customized Environments}
-The other three math environments can be used directly since there are no options for them, the \lstinline{example} environment usage:
+The other three math environments can be called directly since there are no additional option for them, e.g. \lstinline{example}:
 \begin{lstlisting}
 \begin{example}
 This is the content of example environment.
@@ -207,16 +284,16 @@ The effect is as follows:
 This is the content of example environment.
 \end{example}
 
-These are all the same environments, except that
+These are all similar environments with slight differences lies in:
 
 \begin{itemize}
-   \item example, exercise, problem environments numbering within chapter;
-   \item note with introductory symbol, proof with ending symbol;
-   \item conclusion environment with boldfaced keywords and normal paragraph content.
+   \item Example, exercise, problem environments number within chapter;
+   \item Note begins with introductory symbol and proof ends with ending symbol;
+   \item Conclusion environment and so on are normal paragraph environments with boldfaced introductory words.
 \end{itemize}
 
 \section{Base Hide Option}
-We defined an option to hide the base below the chapter, you can use it by
+Hiding the end-of-chapter base is optional, simply type in:
 \begin{lstlisting}
 \documentclass[hide]{elegantbook} %or
 \documentclass[base=hide]{elegantbook}
@@ -225,12 +302,12 @@ We defined an option to hide the base below the chapter, you can use it by
 
 \section{Cover and Logo}
 
-The cover image used in this template is from \href{https://pixabay.com/en/tea-time-poetry-coffee-reading-3240766/}{pixabay.com}\footnote{Thank China\TeX{} for providing free image source site, and \href{https://www.pexels.com/}{pexels.com} is also recommended.}. The image is completely free and can be used in any circumstance. The cover image size is $1280 \times 1024$, when changing the cover, please crop it according to the size of the cover picture strictly. Here is a free online image clipping site: \href{https://www.befunky.com/create/crop-photo/}{befunky.com}.
+The cover image used in this template is from \href{https://pixabay.com/en/tea-time-poetry-coffee-reading-3240766/}{pixabay.com}\footnote{Thank China\TeX{} for providing free image source, \href{https://www.pexels.com/}{pexels.com} is strongly recommended.}. The image is completely free and can be used under any circumstance. The cover image size is $1280 \times 1024$. If you would like to change the cover, please crop it according to the size of the cover picture strictly.One free online image clipping site: \href{https://www.befunky.com/create/crop-photo/}{befunky.com}.
 
-This Logo ratio is 1:1, that is square picture. In the replacement of the picture, please choose the appropriate picture to replace.
+Aspect ratio of the logo is 1:1 in this guide, i.e. a square picture. To replace the logo, do remember to choose the appropriate picture.
 
 \section{List Environments}
-This template uses \lstinline{tikz} to customize \lstinline{itemize} and \lstinline{enumerate} environments, the \lstinline{itemize} environment customized to the third depth, and \lstinline{enumerate} environment customized to fourth depth. The effect is as follows\\[2ex]
+This template uses \lstinline{tikz} to customize \lstinline{itemize} and \lstinline{enumerate} environments, with  \lstinline{itemize} environment customized to the third depth and \lstinline{enumerate} environment customized to fourth depth. The effect is as follows\\[2ex]
 \begin{minipage}[b]{0.49\textwidth}
 \begin{itemize}
    \item first item of nesti;
@@ -262,16 +339,23 @@ This template uses \lstinline{tikz} to customize \lstinline{itemize} and \lstinl
 
 \section{Bibliography}
 
-This template uses \BibTeX{} to generate the bibliography, the default bibliography style is \lstinline{aer}. Let's take a glance at the citation effect, ~\cite{en1} use data from a major peer-to-peer lending marketplace in China to study whether female and male investors evaluate loan performance differently. 
+This template uses \hologo{BibTeX} to generate the bibliography, the default bibliography style is \lstinline{aer}. Let's take a glance at the citation effect. ~\cite{en1} use 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 \BibTeX{}, you must create a file named \lstinline{reference.bib}, and add bib items (from Google Scholar, Mendeley, EndNote, and etc.) to \lstinline{reference.bib} file, and cite the bibkey in the \lstinline{tex} file. The Bib\TeX{} will automatically generate the bibliography for you for the reference you cited. If you want to add some noncited reference to the bibliography, you can use 
+If you want to use \hologo{BibTeX}, 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 Bib\TeX{} will automatically generate the bibliography for the reference you cited. If you want to add some noncited reference to the bibliography, you can use 
+\begin{lstlisting}[frame=single]
+\nocite{EINAV2010,Havrylchyk2018} %or include some bibitems
+\nocite{*} %include all the bibitems
+\end{lstlisting}
+
+Two more options \lstinline{cite=numbers} and \lstinline{cite=authoryear} are available in this new version, with the default setting as \lstinline{numbers} since those major in science and technology use \lstinline{numbers} more often. For those who major in liberal arts want to use \lstinline{authoryear}, please type in:
 \begin{lstlisting}
-\nocite{EINAV2010, Havrylchyk2018} 
+\documentclass[cite=authoryear]{elegantbook} %or
+\documentclass[authoryear]{elegantbook}
 \end{lstlisting}
 
 \section{Preface}
 
-If you want to add a preface before the first chapter without changing the number of chapter, you can use it before the first chapter 
+If you want to add a preface before the first chapter with the number of chapter unchanged, please add the preface in the following way:
 \begin{lstlisting}
 \chapter*{Preface}
 \addcontentsline{toc}{chapter}{Preface} 
@@ -279,7 +363,65 @@ If you want to add a preface before the first chapter without changing the numbe
 The content of Preface.
 \end{lstlisting}
 
+\section{Introduction Environment}
+We create a introduction environment to display the structure of chapter. The basic useage is as follows
+\begin{lstlisting}
+\begin{introduction}
+	\item Definition of Theorem
+	\item Ask for help
+	\item Optimization Problem
+	\item Property of Cauchy Series
+	\item Angle of Corner
+\end{introduction}
+\end{lstlisting}
+you will get:
+\begin{introduction}
+	\item Definition of Theorem
+	\item Ask for help
+	\item Optimization Problem
+	\item Property of Cauchy Series
+	\item Angle of Corner
+\end{introduction}
+
+You can change the title of this environment by modifying the optional argument of this environment
+\begin{lstlisting}
+\begin{introduction}[Brief Introduction]
+...
+\end{introduction}
+\end{lstlisting}
+
+\section{Problem Set}
+The environment \lstinline{problemset} is used at the end of each chapter to display corresponding exercises. Just type in the following sentences:
+\begin{lstlisting}
+\begin{problemset}
+	\item exercise 1
+	\item exercise 2
+	\item exercise 3
+\end{problemset}
+\end{lstlisting}
+And you will get:
+\begin{problemset}
+	\item exercise 1
+	\item exercise 2
+	\item exercise 3
+\end{problemset}
+\begin{remark}
+If you want to customize the title of  \lstinline{problemset}, please change the optional argument like introduction environment.
+\end{remark}
+
+
 \chapter{ElegantBook Writing Sample}
+
+\begin{introduction}
+\item Theorem Class Envrionments
+\item Cross Reference
+\item Math Environments
+\item List Environments
+\item Logo and Base 
+\item $a^2+b^2=c^2$
+\end{introduction}
+
+
 \lipsum[1]
 % source: https://www.maths.tcd.ie/~dwilkins/LaTeXPrimer/Theorems.html
 
@@ -357,9 +499,99 @@ Let's continue using our application training example. In this case, we'd want t
 	\item Distributed storage and search.
 \end{itemize}
 
+\begin{problemset}
+	\item Solve the equation $5(- 3x - 2) - (x - 3) = -4(4x + 5) + 13$.
+	\item Find the distance between the points (-4 , -5) and (-1 , -1). 
+	\item Find the slope of the line $5x - 5y = 7$.
+\end{problemset}
 
-\nocite{en1,en2,en3} 
+\chapter{Margin Notes}
+For version 3.08, we introduce margin note option and \lstinline{\elegantpar} (Beta). In this template, margin note option \lstinline{marginpar} is included. If \lstinline{marginpar=margintrue}, the width of both sides will reduce at least 1.5cm. If \lstinline{marginpar=marginfalse}, the width of sides will remain unchanged. Margin note option works under \lstinline{device=normal} only.
+
+Margin note option can be activated using \lstinline{\marginpar} built in \LaTeX{} or \lstinline{\marginnote} command in \lstinline{marginnote}. For more information, refer to \href{https://en.wikibooks.org/wiki/LaTeX/Footnotes_and_Margin_Notes#Margin_Notes}{Margin Notes} or \LaTeX{} books.
+
+\lstinline{\elegantpar} is introduced in this version. Note that TikZ overlay is used in this command, hence you have to compile three times to get the right display effect.
+
+%\setlength{\marginparwidth}{2.5cm}
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et \elegantpar{dolore magna aliqua}{This is Beautiful the elegantpar Style for English Text}. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+
+\begin{equation}
+E = m\elegantpar{c^{2}}{
+	\begin{equation*}E=mc^2\end{equation*}}
+\end{equation}
+
+\chapter{FAQ}
 
+\begin{custom}{Question}
+	I want to customize font and background color.
+\end{custom}
+
+\begin{solution}
+	Please use \lstinline{\pagecolor} to change background color, refer to \href{https://tex.stackexchange.com/questions/278544/xcolor-what-is-the-equivalent-of-default-text-color}{this} to customize font.
+\end{solution}
+
+
+
+\begin{custom}{Question}
+	Which version should I choose?
+\end{custom}
+
+\begin{solution}
+	Please use \href{https://github.com/ElegantLaTeX/ElegantBook/releases}{Latest Release} via GitHub or \TeX{} Live 2019.
+\end{solution}
+
+
+\begin{custom}{Question}
+	Which editor should I choose?
+\end{custom}
+
+\begin{solution}
+	You can use \TeX{} Live 2019 built-in \TeX works or \TeX Studio. You may refer to \href{https://github.com/EthanDeng/texworks-autocomplete}{\TeX{}works autocomplete}. \TeX{} Live 2019 + \TeX{}studio is strongly recommended. I myself use VS Code and Sublime Text. Related configurations can be found at \href{https://github.com/EthanDeng/vscode-latex}{vscode-latex} and \href{https://github.com/EthanDeng/sublime-text-latex}{sublime-text-latex}.
+\end{solution}
+
+
+\begin{custom}{Question}
+	Hello, we want to use ElegantBook to write a book about machine learning and would like your authorization.
+\end{custom}
+
+\begin{solution}
+	Feel free to use our templates by pointing out our copyright. For other issues, please refer to LPPL-1.3c. If you want to show us your work, share the URL with us afterwards.
+\end{solution}
+
+\begin{custom}{Question}
+	I would like to use the former cover!
+\end{custom}
+
+\begin{solution}
+	Cover option is forthcoming.
+\end{solution}
+
+
+
+\begin{custom}{Question}
+	What is cross reference?
+\end{custom}
+
+\begin{solution}
+	This template is aimed at who are not a complete beginner for \LaTeX{}. Please learn more about \LaTeX{} before using this template.
+\end{solution}
+
+
+\begin{custom}{Question}
+	Is the language for code highlighting optional?
+\end{custom}
+
+\begin{solution}
+	Yes, \lstinline{listings} package is used in ElegantBook, hence language is optional. For global setting, use \lstinline{\lstset}. For more information, please refer to package documentations.
+\end{solution}
+
+
+\nocite{en1,en2,en3} 
 \bibliography{reference}
 
 \appendix
@@ -369,7 +601,7 @@ This appendix covers some of the basic mathematics used in econometrics. We brie
 
 \section{Summation Operator and Description Statistics}
 
-\textbf{Summation Operator} is an abbreviation used to express the summation of numbers, it plays an important role in statistics and econometrics analysis. If $\{x_i: i=1, 2, \ldots, n\}$ is a sequence of $n$ numbers, the summation of the $n$ numbers is：
+\textbf{Summation Operator} is an abbreviation used to express the summation of numbers, it plays an important role in statistics and econometrics analysis. If $\{x_i: i=1, 2, \ldots, n\}$ is a sequence of $n$ numbers, the summation of the $n$ numbers is:
 
 \begin{equation}
 \sum_{i=1}^n x_i \equiv x_1 + x_2 +\cdots + x_n
@@ -388,7 +620,7 @@ This appendix covers some of the basic mathematics used in econometrics. We brie
 \date{\today}
 % extra info
 \version{1.00}
-\equote{Victory won\rq t come to us unless we go to it. --- M. Moore}
+\extrainfo{Victory won\rq t come to us unless we go to it. --- M. Moore}
 \logo{logo.png}
 \cover{cover.jpg}
 
@@ -406,5 +638,5 @@ The content of chapter one.
 \end{document}
 \end{lstlisting}
 
-\bibliographystyle{aer}
+
 \end{document}
diff --git a/Master/texmf-dist/doc/latex/elegantbook/image/donate.jpg b/Master/texmf-dist/doc/latex/elegantbook/image/donate.jpg
new file mode 100644
index 00000000000..60741efcdee
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/elegantbook/image/donate.jpg
diff --git a/Master/texmf-dist/doc/latex/elegantbook/image/star.png b/Master/texmf-dist/doc/latex/elegantbook/image/star.png
new file mode 100644
index 00000000000..a8ec70c6f6b
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/elegantbook/image/star.png
diff --git a/Master/texmf-dist/doc/latex/elegantbook/image/tlshell.png b/Master/texmf-dist/doc/latex/elegantbook/image/tlshell.png
new file mode 100644
index 00000000000..6cf1c3ad5c0
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/elegantbook/image/tlshell.png
diff --git a/Master/texmf-dist/doc/latex/elegantbook/reference.bib b/Master/texmf-dist/doc/latex/elegantbook/reference.bib
index fd2c1192609..c4870395f21 100644
--- a/Master/texmf-dist/doc/latex/elegantbook/reference.bib
+++ b/Master/texmf-dist/doc/latex/elegantbook/reference.bib
@@ -34,6 +34,7 @@
 
 @article{cn1,
    author = {方军雄},
+   key = {fang1 jun1 xiong2},
    title = {{所有制、制度环境与信贷资金配置}},
    journal = {经济研究},
    number = {12},
@@ -45,6 +46,7 @@
 
 @article{cn2,
    author = {刘凤良 and 章潇萌 and 于泽},
+   key = {liu2 feng4 liang2 zhang1 xiao1 meng2 yu2 ze2},
    title = {{高投资、结构失衡与价格指数二元分化}},
    journal = {金融研究},
    number = {02},
@@ -56,6 +58,7 @@
 
 @article{cn3,
    author = {吕捷 and 王高望},
+   key = {lv3 jie2 wang2 gao1 wang4},
    title = {{CPI 与 PPI “背离”的结构性解释}},
    journal = {经济研究},
    volume = {50},
diff --git a/Master/texmf-dist/tex/latex/elegantbook/elegantbook.cls b/Master/texmf-dist/tex/latex/elegantbook/elegantbook.cls
index 9dbcc18b657..7c8ddde691b 100644
--- a/Master/texmf-dist/tex/latex/elegantbook/elegantbook.cls
+++ b/Master/texmf-dist/tex/latex/elegantbook/elegantbook.cls
@@ -4,12 +4,11 @@
 %%
 %% This work may be distributed and/or modified freely
 %% available at https://github.com/ElegantLaTeX/ElegantBook
-% %
-%% Last Modification 2019-04-12
+% 
 %%%%%%%%%%%%%%%%%%%%%
 % % !Mode:: "TeX:UTF-8"
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{elegantbook}[2019/04/03 v3.07 ElegantBook document class]
+\ProvidesClass{elegantbook}[2019/05/26 v3.08 ElegantBook document class]
 
 \RequirePackage{kvoptions}
 \RequirePackage{etoolbox}
@@ -22,15 +21,17 @@
 \DeclareStringOption[answer]{result}
 \DeclareStringOption[fancy]{mode}
 \DeclareStringOption[show]{base}
-
-
+\DeclareStringOption[normal]{device}
+\DeclareStringOption[numbers]{cite}
+\DeclareStringOption[newtxmath]{math}
+\DeclareStringOption[marginfalse]{marginpar}
 % ----- backward compatibility
-\DeclareVoidOption{green}{\ekv{color = green}}
-\DeclareVoidOption{cyan}{\ekv{color = cyan}}
-\DeclareVoidOption{blue}{\ekv{color = blue}}
-\DeclareVoidOption{gray}{\ekv{color = gray}}
-\DeclareVoidOption{black}{\ekv{color = black}}
-\DeclareVoidOption{nocolor}{\ekv{color = none}}
+\DeclareVoidOption{green}{\ekv{color=green}}
+\DeclareVoidOption{cyan}{\ekv{color=cyan}}
+\DeclareVoidOption{blue}{\ekv{color=blue}}
+\DeclareVoidOption{gray}{\ekv{color=gray}}
+\DeclareVoidOption{black}{\ekv{color=black}}
+\DeclareVoidOption{nocolor}{\ekv{color=none}}
 
 \DeclareVoidOption{en}{\ekv{lang=en}}
 \DeclareVoidOption{cn}{\ekv{lang=cn}}
@@ -38,20 +39,31 @@
 \DeclareVoidOption{fancy}{\ekv{mode=fancy}}
 \DeclareVoidOption{simple}{\ekv{mode=simple}}
 
-\DeclareVoidOption{answer}{\ekv{result = answer}}
-\DeclareVoidOption{noanswer}{\ekv{result = noanswer}}
+\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}}
+
+\DeclareVoidOption{numbers}{\ekv{cite=numbers}}
+\DeclareVoidOption{authoryear}{\ekv{cite=authoryear}}
 
-\DeclareVoidOption{hide}{\ekv{base = hide}}
-\DeclareVoidOption{show}{\ekv{base = show}}
+\DeclareVoidOption{newtxmath}{\ekv{math=newtx}}
+\DeclareVoidOption{mtpro2}{\ekv{math=mtpro2}}
 
+\DeclareVoidOption{margintrue}{\ekv{marginpar=margintrue}}
+\DeclareVoidOption{marginfalse}{\ekv{marginpar=marginfalse}}
 % ----- Math option -----
 \newcommand\mailto[1]{\href{mailto:#1}{\nolinkurl{#1}}}
 
 % ----- Title Style -----
 \DeclareStringOption[hang]{titlestyle}[hang]
 % ----- backward compatibility
-\DeclareVoidOption{hang}{\ekv{titlestyle = hang}}
-\DeclareVoidOption{display}{\ekv{titlestyle = display}}
+\DeclareVoidOption{hang}{\ekv{titlestyle=hang}}
+\DeclareVoidOption{display}{\ekv{titlestyle=display}}
 % ----- Default Options -----
 \DeclareDefaultOption{\PassOptionsToClass{\CurrentOption}{book}}
 
@@ -63,9 +75,16 @@
 \setlength\parindent{2em}
 
 % fontsetting
+\ifdefstring{\ELEGANT@math}{mtpro2}{
+\let\Bbbk\relax
+\RequirePackage[lite]{mtpro2}
+}{\relax}
+
 
 \PassOptionsToPackage{no-math}{fontspec}
-\RequirePackage[UTF8, scheme=plain,punct=kaiming]{ctex}
+\ifdefstring{\ELEGANT@lang}{cn}{
+\RequirePackage[UTF8, scheme=plain]{ctex}
+}
 
 \RequirePackage{ifxetex}
 
@@ -75,9 +94,13 @@
 	\RequirePackage[T1]{fontenc}
 \fi
 
+
 \RequirePackage{newtxtext}
+\ifdefstring{\ELEGANT@math}{newtxmath}{
 \RequirePackage{newtxmath}
-%
+}{\relax}
+
+
 
 % font setting for text and math
 % \RequirePackage[T1]{fontenc}
@@ -85,29 +108,26 @@
 % \RequirePackage{newtxmath}
 % \RequirePackage[scale=0.85]{newtxtt}  
 \RequirePackage{anyfontsize}
-
+\ifdefstring{\ELEGANT@math}{newtxmath}{
 \DeclareSymbolFont{CMletters}     {OML}{cmm} {m}{it}%
 \DeclareSymbolFont{CMsymbols}     {OMS}{cmsy}{m}{n}%
 \DeclareSymbolFont{CMlargesymbols}{OMX}{cmex}{m}{n}%
-
 % \let\sum\relax
 % \DeclareMathSymbol{\sum}{\mathop}{CMlargesymbols}{"50}%
 % \let\int\relax
 % \DeclareMathSymbol{\int}{\mathop}{CMlargesymbols}{"5A}%
-
 \let\intop\relax\let\sumop\relax\let\ointop\relax\let\prodop\relax
 \DeclareMathSymbol{\sumop}{\mathop}{CMlargesymbols}{"50}
 \DeclareMathSymbol{\intop}{\mathop}{CMlargesymbols}{"52}
-\DeclareMathSymbol{\ointop}{\mathop}{CMlargesymbols}{"49}
-\DeclareMathSymbol{\prodop}{\mathop}{CMlargesymbols}{"59}
-
+\DeclareMathSymbol{\ointop}{\mathop}{CMlargesymbols}{"48}
+\DeclareMathSymbol{\prodop}{\mathop}{CMlargesymbols}{"51}
 % \let\partial\relax
 % \DeclareMathSymbol{\partial}{\mathord}{CMletters}{"40}%
 % \let\in\relax
 %\DeclareMathSymbol{\in}{\mathrel}{CMsymbols}{"32}%
 % \let\pi\relax
 % \DeclareMathSymbol{\pi}{\mathord}{CMletters}{"19}
-
+}{\relax}
 
 % ----- Handle Colors -----
 %% 章节以及页脚图形
@@ -132,7 +152,7 @@
 	\definecolor{third}{RGB}{0,174,247}%
 }{\relax}
 \ifdefstring{\ELEGANT@color}{gray}{
-	\definecolor{structurecolor}{RGB}{0,0,0}
+	\definecolor{structurecolor}{RGB}{150,150,150}
 	\definecolor{main}{RGB}{150,150,150}%
 	\definecolor{second}{RGB}{150,150,150}%
 	\definecolor{third}{RGB}{150,150,150}%
@@ -160,7 +180,7 @@
 	\definecolor{second3}{RGB}{255,134,24}%
 	\definecolor{third3}{RGB}{0,174,247}%
 % gray color
-	\definecolor{structure4}{RGB}{0,0,0}
+	\definecolor{structure4}{RGB}{150,150,150}
 	\definecolor{main4}{RGB}{150,150,150}%
 	\definecolor{second4}{RGB}{150,150,150}%
 	\definecolor{third4}{RGB}{150,150,150}%
@@ -199,6 +219,11 @@
 \newtoks\institute
 \newtoks\subtitle
 
+\RequirePackage[sort&compress]{natbib}
+\setlength{\bibsep}{0.0pt}
+\def\bibfont{\footnotesize}
+
+
 
 \RequirePackage{enumerate}
 % list/itemize/enumerate setting
@@ -206,14 +231,18 @@
 \setlist{nolistsep}
 
 % caption settings 
-\RequirePackage{caption}
-\captionsetup{labelfont = bf}
 \RequirePackage[font=small,labelfont={bf,color=structurecolor}]{caption} 
 \captionsetup[table]{skip=3pt}
 \captionsetup[figure]{skip=3pt}
 
+\AtBeginDocument{
+\setlength{\abovedisplayskip}{3pt}
+\setlength{\belowdisplayskip}{3pt}
+\setcounter{tocdepth}{1}
+}
 %% 常用宏包
 \linespread{1.3}
+
 \RequirePackage{graphicx}
 %\RequirePackage{enumerate}
 \RequirePackage{amsmath,mathrsfs,amsfonts,amssymb}
@@ -221,20 +250,15 @@
 \RequirePackage{multicol}
 \RequirePackage{xcolor}
 \RequirePackage{fancyvrb}
-\RequirePackage{makecell,lipsum,bxtexlogo,setspace}
-
+\RequirePackage{makecell,lipsum,hologo,setspace}
 
 %%中文结构名字
-\ifdefstring{\ELEGANT@lang}{en}{
-\newcommand\figref[1]{\textbf{Figure}~\ref{#1}}
-\newcommand\tabref[1]{\textbf{Table}~\ref{#1}}
-\renewcommand{\chaptername}{Chapter \thechapter}
-}{\relax}
 \ifdefstring{\ELEGANT@lang}{cn}{
 \renewcommand{\contentsname}{目\hspace{2em}录}
 \renewcommand{\figurename}{图}
 \renewcommand{\tablename}{表}
-\renewcommand{\partname}{第 \thepart\; 部分}
+\renewcommand{\partname}{\color{structurecolor}}
+\renewcommand{\thepart}{第\zhnumber{\arabic{part}}部分}
 \renewcommand{\listfigurename}{插图目录}
 \renewcommand{\listtablename}{表格目录}
 \renewcommand{\bibname}{参考文献}
@@ -243,17 +267,31 @@
 \newcommand\figref[1]{\textbf{图}~\ref{#1}}
 \newcommand\tabref[1]{\textbf{表}~\ref{#1}}
 \renewcommand{\chaptername}{第 \thechapter\;章}
+\ifdefstring{\ELEGANT@cite}{authoryear}{
+\RequirePackage[authoryear]{gbt7714}}{\relax}
+\ifdefstring{\ELEGANT@cite}{numbers}{
+\RequirePackage[numbers]{gbt7714}}{\relax}
+% \bibliographystyle{aer}
+}{\relax}
+\ifdefstring{\ELEGANT@lang}{en}{
+\newcommand\figref[1]{\textbf{Figure}~\ref{#1}}
+\newcommand\tabref[1]{\textbf{Table}~\ref{#1}}
+\renewcommand{\chaptername}{Chapter \thechapter}
+\bibliographystyle{aer}
 }{\relax}
 
-
-
+\RequirePackage{xpatch}
+\xpatchcmd{\part}{\thispagestyle{plain}}
+      {\thispagestyle{plain}}{}{}
+\xpatchcmd{\@endpart}{\vfil\newpage}{\vfil\newpage
+             }{}{}
 \graphicspath{{./figure/}{./figures/}{./image/}{./images/}{./graphics/}{./graphic/}{./pictures/}{./picture/}}
 
 \RequirePackage{tikz}
 \usetikzlibrary{backgrounds,calc,shadows}
 \usepackage[object=vectorian]{pgfornament} %% 
 
-\newcommand*{\eitemi}{\tikz \draw [baseline, ball color=structurecolor, draw=none] circle (2pt);}
+\newcommand*{\eitemi}{\tikz \draw [baseline, ball color=structurecolor,draw=none] circle (2pt);}
 \newcommand*{\eitemii}{\tikz \draw [baseline, fill=structurecolor,draw=none,circular drop shadow] circle (2pt);}
 \newcommand*{\eitemiii}{\tikz \draw [baseline, fill=structurecolor,draw=none] circle (2pt);}
 \setlist[enumerate,1]{label=\color{structurecolor}\arabic*.}
@@ -264,24 +302,35 @@
 \setlist[itemize,2]{label={\eitemii}}
 \setlist[itemize,3]{label={\eitemiii}}
 
-\RequirePackage{natbib}
-\setlength{\bibsep}{0.0pt}
-\def\bibfont{\footnotesize}
-
 
 %% device settings
 
 \RequirePackage{geometry}
+\RequirePackage{marginnote}
+\ifdefstring{\ELEGANT@device}{normal}{
 \geometry{
 	a4paper,
-%	left=27mm,  %% or inner=23mm
-%	right=27mm, %% or outer=18mm
 	top=25.4mm, bottom=25.4mm,
 	headheight=2.17cm,
 	headsep=4mm,
 	footskip=12mm
 }
+\ifdefstring{\ELEGANT@marginpar}{margintrue}{
+\geometry{
+	marginparwidth=6cm, marginparsep=5mm,
+	left=1.5cm,right=7.5cm,
+}
+}{\relax}
+}{\relax}
 
+\ifdefstring{\ELEGANT@device}{pad}{
+\geometry{
+	paperwidth=7.5in, 
+	paperheight=10in,
+	margin=16mm,
+	headheight=2.17cm,
+	footskip=4mm
+}}{\relax}
 
 \RequirePackage{hyperref}
 \hypersetup{
@@ -330,9 +379,6 @@
 
 %%define the note and proof environment
 \RequirePackage{pifont,manfnt,bbding}
-% list/itemize/enumerate setting
-\RequirePackage[shortlabels]{enumitem}
-\setlist{nolistsep}
 
 
 \RequirePackage[many]{tcolorbox}
@@ -410,9 +456,9 @@
 {\ifdefstring{\ELEGANT@lang}{en}{\itshape}{\upshape\kaishu}}% Body font
 {}% Indent amount
 {\bfseries\color{main}}% Theorem head font
-{.}% Punctuation after theorem head
-{.5em}% Space after theorem head 
-{\thmname{#1}\thmnumber{ #2}\thmnote{ (#3)}}% Theorem head spec (can be left empty, meaning ‘normal’)
+{}% Punctuation after theorem head
+{0.5em}% Space after theorem head 
+{\thmname{#1} \thmnumber{#2} \thmnote{(#3)}}% Theorem head spec (can be left empty, meaning ‘normal’)
 % -------------------------------------------------%
 \newtheoremstyle{ethmstyle}%
 {3pt}% Space above
@@ -420,9 +466,9 @@
 {\ifdefstring{\ELEGANT@lang}{en}{\itshape}{\upshape\kaishu}}% Body font
 {}% Indent amount
 {\bfseries\color{second}}% Theorem head font
-{.}% Punctuation after theorem head
+{}% Punctuation after theorem head
 {.5em}% Space after theorem head 
-{\thmname{#1}\thmnumber{ #2}\thmnote{ (#3)}}% Theorem head spec (can be left empty, meaning ‘normal’)
+{\thmname{#1} \thmnumber{#2} \thmnote{(#3)}}% Theorem head spec (can be left empty, meaning ‘normal’)
 % -------------------------------------------------%
 \newtheoremstyle{eprostyle}%
 {3pt}% Space above
@@ -430,9 +476,9 @@
 {\ifdefstring{\ELEGANT@lang}{en}{\itshape}{\upshape\kaishu}}% Body font
 {}% Indent amount
 {\bfseries\color{third}}% Theorem head font
-{.}% Punctuation after theorem head
+{}% Punctuation after theorem head
 {.5em}% Space after theorem head 
-{\thmname{#1}\thmnumber{ #2}\thmnote{ (#3)}}% Theorem head spec (can be left empty, meaning ‘normal’)
+{\thmname{#1} \thmnumber{#2} \thmnote{(#3)}}% Theorem head spec (can be left empty, meaning ‘normal’)
 
 \theoremstyle{edefstyle}
 \newtheorem{edefinition}{\ifdefstring{\ELEGANT@lang}{en}{Definition}{定义}}[chapter]
@@ -477,7 +523,7 @@
 \newenvironment{example}[1][]{
  		\refstepcounter{exam}\par\noindent\textbf{\color{main}{
  			\ifdefstring{\ELEGANT@lang}{en}{Example}{例}
- 		}~\theexam #1: }\rmfamily %
+ 		}\theexam #1 }\rmfamily %
  	}{
  		\par\medskip\ignorespacesafterend %
  	}
@@ -489,7 +535,7 @@
 \newenvironment{exercise}[1][]{
  		\refstepcounter{exer}\par\noindent\makebox[-3pt][r]{\scriptsize\color{red!90}\HandPencilLeft\quad}\textbf{\color{main}{
  			\ifdefstring{\ELEGANT@lang}{en}{Exercise}{练习}
- 		}~\theexer #1: }\rmfamily %
+ 		}\theexer #1 }\rmfamily %
  	}{
  		\par\medskip\ignorespacesafterend %
  	}
@@ -501,7 +547,7 @@
 \newenvironment{problem}[1][]{
  		\refstepcounter{prob}\par\noindent\textbf{\color{main}{%
  			\ifdefstring{\ELEGANT@lang}{en}{Problem}{例题}
- 		}~\theprob #1: }\rmfamily %
+ 		}\theprob #1 }\rmfamily %
  	}{
  		\par\medskip\ignorespacesafterend %
  	}
@@ -509,33 +555,70 @@
 
 
 \newenvironment{note}{\par\noindent{\makebox[0pt][r]{\scriptsize\color{red!90}\textdbend\quad}\textbf{\color{second}
-	\ifdefstring{\ELEGANT@lang}{en}{Note:}{注意：}
+	\ifdefstring{\ELEGANT@lang}{en}{Note}{注意}
 }}\ifdefstring{\ELEGANT@lang}{en}{\itshape}{\kaishu}}{\par}
 
 \newenvironment{proof}{\par\noindent\textbf{\color{second}
-	\ifdefstring{\ELEGANT@lang}{en}{Proof:}{证明：}
+	\ifdefstring{\ELEGANT@lang}{en}{Proof}{证明}
 }\color{black!90}\small}{
 %\hfill$\Box$\quad
 \par}
 \newenvironment{remark}{\noindent\textbf{\color{second}
-	\ifdefstring{\ELEGANT@lang}{en}{Remark:}{注：}
+	\ifdefstring{\ELEGANT@lang}{en}{Remark}{注}
 }}{\par}
 \newenvironment{assumption}{\par\noindent\textbf{\color{third}
-	\ifdefstring{\ELEGANT@lang}{en}{Assumption:}{假设：}
+	\ifdefstring{\ELEGANT@lang}{en}{Assumption}{假设}
 }}{\par}
 \newenvironment{conclusion}{\par\noindent\textbf{\color{third}
-	\ifdefstring{\ELEGANT@lang}{en}{Conclusion:}{结论：}
+	\ifdefstring{\ELEGANT@lang}{en}{Conclusion}{结论}
 }}{\par}
 \newenvironment{solution}{\par\noindent\textbf{\color{main}
-	\ifdefstring{\ELEGANT@lang}{en}{Solution:}{解：}
-}}{\par}
+	\ifdefstring{\ELEGANT@lang}{en}{Solution}{解}
+}\ifdefstring{\ELEGANT@lang}{en}{\itshape}{\kaishu}}{\vskip2ex\par}
 \newenvironment{property}{\par\noindent\textbf{\color{third}
-	\ifdefstring{\ELEGANT@lang}{en}{Property:}{性质：}
+	\ifdefstring{\ELEGANT@lang}{en}{Property}{性质}
 }}{\par}
 \newenvironment{custom}[1]{\par\noindent\textbf{\color{third}
-	\ifdefstring{\ELEGANT@lang}{en}{#1:}{#1：}
+	\ifdefstring{\ELEGANT@lang}{en}{#1}{#1}
 }}{\par}
 
+\RequirePackage{multicol}
+\tcbset{
+    introduction/.style={
+        enhanced,
+		breakable,
+		colback=structurecolor!10,
+		colframe=structurecolor,
+  		fonttitle=\bfseries,
+  		colbacktitle=structurecolor,
+  		fontupper=\ifdefstring{\ELEGANT@lang}{en}{\sffamily}{\kaishu},
+  		attach boxed title to top center={yshift=-3mm,yshifttext=-1mm},
+  		boxrule=0pt,
+  		toprule=0.5pt,
+  		bottomrule=0.5pt,
+  		top=8pt,
+        before skip=8pt,
+  		sharp corners
+    },
+}
+
+\newenvironment{introduction}[1][\ifdefstring{\ELEGANT@lang}{en}{Introduction}{内容提要}]{
+\begin{tcolorbox}[introduction,title={#1}]
+\begin{multicols}{2}
+\begin{itemize}[label=\textcolor{structurecolor}{\scriptsize\SquareShadowBottomRight}]
+}{%
+\end{itemize}
+\end{multicols}
+\end{tcolorbox}}
+
+\RequirePackage{adforn}
+\newenvironment{problemset}[1][\ifdefstring{\ELEGANT@lang}{en}{\textbf{\chaptername\; Exercise}}{\textbf{\chaptername\; 习题}}]{
+\begin{center}
+\textcolor{structurecolor}{\Large\bfseries\adftripleflourishleft~#1~\adftripleflourishright}
+\end{center}
+\begin{enumerate}[label=\textcolor{structurecolor}{\arabic*.}]}{%
+\end{enumerate}}
+
 \ifdefstring{\ELEGANT@result}{noanswer}{
 	\AtBeginDocument{
 	\excludecomment{solution}
@@ -569,7 +652,7 @@
 \renewcommand{\chaptermark}[1]{\markboth{\chaptername \; #1\;}{}}
 
 %%封面
-\newcommand*{\equote}[1]{\def\@equote{#1}}
+\newcommand*{\extrainfo}[1]{\def\@extrainfo{#1}}
 
 \def\IfEmpty#1{%
   \edef\1{\the#1}
@@ -581,11 +664,17 @@
  \def\@logo{\includegraphics[width=4.2cm]{#1}
  }
 }
+\ifdefstring{\ELEGANT@device}{normal}{
 \newcommand*{\cover}[1]{
  \def\@cover{\includegraphics[width=\linewidth]{#1}
  }
-}
+}}{\relax}
 
+\ifdefstring{\ELEGANT@device}{pad}{
+\newcommand*{\cover}[1]{
+ \def\@cover{\includegraphics[trim=0 26bp 0 26bp,clip=true, width=\linewidth]{#1}
+ }
+}}{\relax}
 
 \renewcommand{\baselinestretch}{1.35} 
 
@@ -607,15 +696,15 @@
 	\vspace{-1.0cm}
 	\setstretch{2.5}
 	\hspace{2.5em}
-	\begin{minipage}[c]{0.68\linewidth}
+	\begin{minipage}[c]{0.67\linewidth}
 		{\color{darkgray}\bfseries\Large \the\subtitle\\[2ex]}
-		\color{gray}\kaishu\normalsize
+		\color{gray}\normalsize
 		{\renewcommand{\arraystretch}{0.618}
 		\begin{tabular}{l} 
-			\ifdefstring{\ELEGANT@lang}{en}{\textbf{Author: }}{\textbf{作者：}} \@author \\
-			\ifdefstring{\ELEGANT@lang}{en}{\textbf{Institute: }}{\textbf{组织：}} \the\institute\\
-			\ifdefstring{\ELEGANT@lang}{en}{\textbf{Date: }}{\textbf{时间：}} \@date\\
-			\ifdefstring{\ELEGANT@lang}{en}{\textbf{Version: }}{\textbf{版本：}} \the\version\\
+			\ifdefstring{\ELEGANT@lang}{en}{\textbf{Author:}}{\kaishu 作者：} \@author \\
+			\ifdefstring{\ELEGANT@lang}{en}{\textbf{Institute:}}{\kaishu 组织：} \the\institute\\
+			\ifdefstring{\ELEGANT@lang}{en}{\textbf{Date:}}{\kaishu 时间：} \@date\\
+			\ifdefstring{\ELEGANT@lang}{en}{\textbf{Version:}}{\kaishu 版本：} \the\version\\
 		\end{tabular}}
 	\end{minipage}
 	\begin{minipage}[c]{0.27\linewidth}
@@ -626,7 +715,10 @@
 	\end{tikzpicture}
 	\end{minipage}
 	\vfill
-	\centerline{\itshape \@equote}
+	\begin{center}
+	\setstretch{1.3}
+	\parbox[t]{0.7\textwidth}{\centering \itshape \@extrainfo}
+	\end{center}
 	\vfill
 \end{titlepage}
 \restoregeometry
@@ -644,7 +736,7 @@
     \lst@ifdisplaystyle\small\fi
 }
 
-\lstset{basicstyle=\ttfamily,style=mystyle}
+\lstset{basicstyle=\ttfamily,style=mystyle,breaklines=true}
 
 \definecolor{lightgrey}{rgb}{0.9,0.9,0.9}
 \definecolor{frenchplum}{RGB}{190,20,83}
@@ -654,9 +746,9 @@
 	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,newtx,booktabs,tabular,PDFLaTeX,XeLaTeX,type1cm,BibTeX,device,color,mode,lang,amsthm,tcolorbox,titlestyle},
+	emph={elegantpaper,fontenc,fontspec,xeCJK,FiraMono,xunicode,newtxmath,figure,fig,image,img,table,itemize,enumerate,newtxtext,newtxtt,ctex,microtype,description,times,newtx,booktabs,tabular,PDFLaTeX,XeLaTeX,type1cm,BibTeX,device,color,mode,lang,amsthm,tcolorbox,titlestyle,cite,marginnote,ctex,listings},
 	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,equote,logo,cover,subtitle,appendix,chapter,hypersetup,mainmatter,tableofcontents},
+	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,tableofcontents,elegantpar,numbers,authoryear,heiti,kaishu,lstset,pagecolor,zhnumber,marginpar,part,equote},
 	frame=single,
 	tabsize=2,
 	rulecolor=\color{structurecolor},
@@ -665,5 +757,24 @@
 	% backgroundcolor=\color{lightgrey}
 }
 
-
-
+\RequirePackage{bm}
+\newif\ifstartedinmathmode
+\newcommand{\elegantpar}[2]{%
+ \relax\ifmmode\startedinmathmodetrue\else\startedinmathmodefalse\fi
+  {\color{second}\ifstartedinmathmode \ensuremath{\bm\langle #1 \bm\rangle}\else $\bm\langle$#1$\bm\rangle$\fi}%
+  \begin{tikzpicture}[remember picture, baseline=-0.75ex]%
+    \node[coordinate] (inText) {};%
+  \end{tikzpicture}%
+  \marginnote{%
+    \renewcommand{\baselinestretch}{1.0}%
+    \begin{tikzpicture}[remember picture]%
+      \draw node[fill= third!20, rounded corners,text width=\marginparwidth] (inNote){\footnotesize #2};%
+    \end{tikzpicture}%
+    }%
+  \begin{tikzpicture}[remember picture, overlay]%
+    \draw[draw = second]
+      ([yshift=-0.55em] inText)
+        -| ([xshift=-0.55em] inNote.west)
+        -| (inNote.west);%
+  \end{tikzpicture}%
+}