texlive[51002] Master/texmf-dist: elegantbook (15apr19)

commits+karl at tug.org commits+karl at tug.org
Sun May 5 19:39:49 CEST 2019


Revision: 51002
          http://tug.org/svn/texlive?view=revision&revision=51002
Author:   karl
Date:     2019-05-05 19:39:49 +0200 (Sun, 05 May 2019)
Log Message:
-----------
elegantbook (15apr19)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/latex/elegantbook/README.md
    trunk/Master/texmf-dist/doc/latex/elegantbook/elegantbook-cn.pdf
    trunk/Master/texmf-dist/doc/latex/elegantbook/elegantbook-cn.tex
    trunk/Master/texmf-dist/doc/latex/elegantbook/elegantbook-en.pdf
    trunk/Master/texmf-dist/doc/latex/elegantbook/elegantbook-en.tex
    trunk/Master/texmf-dist/doc/latex/elegantbook/figure/cover.jpg
    trunk/Master/texmf-dist/doc/latex/elegantbook/reference.bib
    trunk/Master/texmf-dist/tex/latex/elegantbook/elegantbook.cls

Modified: trunk/Master/texmf-dist/doc/latex/elegantbook/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/elegantbook/README.md	2019-05-05 17:39:35 UTC (rev 51001)
+++ trunk/Master/texmf-dist/doc/latex/elegantbook/README.md	2019-05-05 17:39:49 UTC (rev 51002)
@@ -14,6 +14,8 @@
 
 如果你有其他问题、建议或者报告 bug,可以提交 issues 或者给我们发邮件:elegantlatex2e at gmail.com。
 
+**注意:** 由于新版本进行了重构,3.x 版本并不兼容 2.x 版本,如果你想把 2.x 版本的文件转为 3.x 版本,请查看[跨版本转换](https://github.com/ElegantLaTeX/ElegantBook/wiki/%E8%BD%AC%E6%8D%A2)。
+
 # License
 
 This work is released under the LaTeX Project Public License, v1.3c or later. 

Modified: trunk/Master/texmf-dist/doc/latex/elegantbook/elegantbook-cn.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/elegantbook/elegantbook-cn.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/elegantbook/elegantbook-cn.tex	2019-05-05 17:39:35 UTC (rev 51001)
+++ trunk/Master/texmf-dist/doc/latex/elegantbook/elegantbook-cn.tex	2019-05-05 17:39:49 UTC (rev 51002)
@@ -1,5 +1,6 @@
-\documentclass[cn]{elegantbook}
+\documentclass[cn,fancy,blue,11pt]{elegantbook}
 
+
 \title{ElegantBook:优美的 \LaTeX{} 书籍模板}
 \subtitle{Elegant\LaTeX{} 经典之作}
 
@@ -6,138 +7,135 @@
 \author{Ethan Deng \& Liam Huang}
 \institute{Elegant\LaTeX{} Program}
 \date{\today}
+\version{3.07}
 
-\version{3.06}
 \equote{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
-\clearpage
-\thispagestyle{empty}
 
+% \thispagestyle{empty}
+
 \mainmatter
 \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 at gmail.com}.}联系我们。
 
-值此版本发行之际,我们 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} 组成,分别用于排版笔记,书籍和工作论文。这些子项目的名词是一体的,请在使用这些名词的时候不要将其断开(如 Elegant Note 是不正确的写法)。并且,Elegant\LaTeX{}  Book 指的即是 ElegantBook。
 
-最新版本下载地址:\href{https://github.com/ElegantLaTeX/ElegantBook/releases}{Github:ElegantBook/releases}。本文将介绍本模板的一些设置内容以及基本使用方法。如果您在使用此模板,欢迎把您使用此模板制作的成品发一份给我们,谢谢!如果您有其他问题,建议或者意见,欢迎联系我们。
 
-
 \section{ElegantBook 更新说明}
-在这几年间,我们收到了很多用户的反馈,主要的问题涉及到字体安装,编码支持,定理浮动,定理跨页,交叉引用等等。我们思前想后,原先让用户安装字体以追求视觉上的美观并不完美,用户陷入了巨大的麻烦,这违背了我们的模板初衷。因此我们在新版中删除了这部分,用户无需安装任何字体。让我们来看下此次 ElegantBook 模板 3.x 更新的主要内容有:
+在这几年间,我们收到了很多用户的反馈,主要的问题涉及到字体安装,编码支持,定理浮动,定理跨页,交叉引用等等。我们思前想后,原先让用户安装字体以追求视觉上的美观并不完美,用户陷入了巨大的麻烦,这违背了我们的模板初衷。因此我们在新版中删除了这部分,用户无需安装任何字体。ElegantBook 3.x 版本更新的主要内容有:
 
 \begin{enumerate}
-   \item 删除了自定义字体设置,改用 \lstinline{ctex} 宏包或者系统默认字体;
+   \item 删除了自定义字体设置,改用 \lstinline{ctex} 宏包支持中文;
    \item 模板拆分为中英文模式(\lstinline{lang=cn/en});
-   \item \lstinline{PDFLaTeX} 与 \lstinline{XeLaTeX} 支持;
+   \item 支持 \lstinline{PDFLaTeX} 与 \lstinline{XeLaTeX};
    \item 使用 \lstinline{tcolorbox} 宏包改写定理类环境,可跨页;
    \item 定理类环境名字更新,修复定理环境交叉引用;
+   \item 更新颜色主题,增加灰色和黑色主题;
    \item 颜色名字更新,统一链接颜色;
    \item 重新绘制 Elegant\LaTeX{} 的 Logo;
    \item 更新封面与装饰物,删除水印;
    \item 修正附录相关内容;
-   \item 增加灰色主题 \lstinline{color=plain};
    \item 增加代码高亮;
-   \item 美化列表环境。
+   \item 美化列表环境;
+   \item 增加简化模式;
+   \item 增加 base 隐藏选项。
 \end{enumerate}
 
+\begin{note}
+由于新版本进行了重构,3.x 版本并不兼容 2.x 版本,如果你想把 2.x 版本的文件转为 3.x 版本,请查看\href{https://github.com/ElegantLaTeX/ElegantBook/wiki/convert}{跨版本转换}。今后不再回答关于 2.x 版本的问题。
+\end{note}
 
 \chapter{ElegantBook 设置说明}
 
-
-
 \section{编译方式}
 
 本模板基于基础的 book 文类,所以 book 的选项对于本模板也是有效的。默认编码为 UTF-8,推荐使用 \TeX{} Live 编译。本文编写环境为 Win10 (64bit) + \TeX{} Live 2018,支持 \lstinline{PDFLaTeX} 以及 \lstinline{XeLaTeX} 编译。
-\subsection[选择 PDFLaTeX 编译]{选择 \lstinline{PDFLaTeX} 编译}
-如果你使用 \lstinline{PDFLaTeX} 编译,默认的 Computer Modern 字体被换成了 \lstinline{newtx} 系列字体,默认的字体字号是 12 pt。关于字体设置的宏包主要用到了:
-\begin{itemize}
-   \item \lstinline{newtxtext} 用于文档正文字体,类似于 Times New Roman 字体。
-   \item \lstinline{newtxmath} 用于数学字体,搭配 \lstinline{newtxtext} 非常合适。
-   \item \lstinline{FiraMono} 用于打字机字体,并使用了 \lstinline{scale=0.7} 选项。
-   \item \lstinline{ctex} 用于中文字体设置,并使用了 \lstinline{scheme=plain} 选项。
-\end{itemize}
-一次完整的编译:\lstinline[breaklines]{PDFLaTeX -> BibTeX -> PDFLaTeX*2}。
 
-\subsection[选择 XeLaTeX 编译]{选择 \lstinline{XeLaTeX} 编译}
-如果你选择 \lstinline{XeLaTeX} 编译的话,那么设置字体的宏包为 \lstinline{fontspec} 和 \lstinline{xeCJK}。由于模板中使用的字体是 Windows 中的字体,所以如果你使用其他操作系统,比如 Linux 或者 Mac OS,那么你需要把所用字体替换为你系统中的字体。设置字体的命令:
 
-\begin{lstlisting}[frame=single]
-\RequirePackage{fontenc}
-\RequirePackage[no-math]{fontspec}
-\setmainfont{Times New Roman}[NFSSFamily=ntxtlf]
-\setsansfont{Arial}
-%\setmonofont[Scale=0.7]{Courier New}
-\RequirePackage{xeCJK}
-\RequirePackage{xunicode}
-\setCJKmainfont[BoldFont={SimHei},ItalicFont={KaiTi}]{SimSun}
-\setCJKsansfont[BoldFont={SimHei},ItalicFont={KaiTi}]{KaiTi}
-\setCJKmonofont[BoldFont={SimHei},ItalicFont={KaiTi},Scale=0.7]{Microsoft YaHei}
-\XeTeXlinebreaklocale "zh"
-\XeTeXlinebreakskip = 0pt plus 1pt minus 0.1pt
-\RequirePackage{newtxmath}
-\end{lstlisting}
-一次完整的编译:\lstinline[breaklines]{XeLaTeX -> BibTeX -> XeLaTeX*2}。
-
-
 \section{语言模式}
 本模板内含两套语言环境,改变语言环境会改变图表标题的引导词(图,表),文章结构词(比如目录,参考文献等),以及定理环境中的引导词(比如定理,引理等)。不同语言模式的启用如下:
-
-\begin{lstlisting}[frame=single]  
+\begin{lstlisting}
 \documentclass[cn]{elegantbook} 
 \documentclass[lang=cn]{elegantbook}
-\documentclass[en]{elegantbook} 
-\documentclass[lang=en]{elegantbook}
 \end{lstlisting}
 
 \begin{remark}
-不管选用中文环境(\lstinline{lang=cn})还是英文环境(\lstinline{lang=en})均可输入中文。另外如果在笔记中使用了抄录环境(\lstinline{lstlisting}),并且其中包括了中文,请务必使用 \lstinline{XeLaTeX} 编译。
+不管选用中文环境(\lstinline{lang=cn})还是英文环境(\lstinline{lang=en})均可输入中文。另外如果在笔记中使用了抄录环境(\lstinline{lstlisting}),并抄录代码中有中文,请务必使用 \lstinline{XeLaTeX} 编译。
 \end{remark}
 
 
 \section{颜色主题}
-本模板内置 4 组颜色主题,分别为 \textcolor{main1}{\lstinline{green}}(默认)、\textcolor{main2}{\lstinline{cyan}}、\textcolor{main3}{\lstinline{blue}}、\textcolor{gray}{\lstinline{plain}},另外还有一个自定义的选项  \lstinline{nocolor}。调用颜色主题 \lstinline{green} 的方法为 
-
-\begin{lstlisting}[frame=single]
+本模板内置 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} 的方法为 
+\begin{lstlisting}
 \documentclass[green]{elegantbook} %or
 \documentclass[color=green]{elegantbook}
 \end{lstlisting}
 
-其中 \textcolor{gray}{plain} 主题为全灰色。如果需要自定义颜色的话请选择 \lstinline{nocolor} 选项或者使用 \lstinline{color=none},然后在导言区定义 main、second、third 颜色,具体方法如下:
-
-\begin{lstlisting}[frame=single]
-\definecolor{main}{RGB}{70,70,70}    
-\definecolor{second}{RGB}{115,45,2}    
-\definecolor{third}{RGB}{0,80,80}   
-\end{lstlisting}
-
-\begin{table}[htp]
+\begin{table}[htbp]
 \caption{ElegantBook 模板中的颜色主题\label{tab:color thm}}
 \centering
-\begin{tabular}{ccccc}
+\begin{tabular}{ccccccc}
 \toprule
-	  & \textcolor{main1}{green} & \textcolor{main2}{cyan} & \textcolor{main3}{blue} & 主要使用的环境\\
+	        & \textcolor{main1}{green} 
+	        & \textcolor{main2}{cyan} 
+	        & \textcolor{main3}{blue}
+	        & \textcolor{main4}{gray} 
+	        & \textcolor{main5}{black} 
+	        & 主要使用的环境\\
 \midrule
-main & \makecell{{\color{main1}\rule{1cm}{1cm}}}& \makecell{{\color{main2}\rule{1cm}{1cm}}}&\makecell{ {\color{main3}\rule{1cm}{1cm}}}& definition \\
+structure & \makecell{{\color{structure1}\rule{1cm}{1cm}}}
+				& \makecell{{\color{structure2}\rule{1cm}{1cm}}}
+				& \makecell{{\color{structure3}\rule{1cm}{1cm}}} 
+				& \makecell{{\color{structure4}\rule{1cm}{1cm}}} 
+				& \makecell{{\color{structure5}\rule{1cm}{1cm}}} 
+				& chapter \ section \ subsection \\
 
-second &\makecell{ {\color{second1}\rule{1cm}{1cm}}}& \makecell{{\color{second2}\rule{1cm}{1cm}}}&\makecell{ {\color{second3}\rule{1cm}{1cm}}}&theorem \ lemma \ corollary\\
+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 \\
 
-third &\makecell{ {\color{third1}\rule{1cm}{1cm}}}& \makecell{{\color{third2}\rule{1cm}{1cm}}}&\makecell{ {\color{third3}\rule{1cm}{1cm}}}&proposition\\
+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\\
+
+third     & \makecell{{\color{third1}\rule{1cm}{1cm}}}
+				& \makecell{{\color{third2}\rule{1cm}{1cm}}}
+				& \makecell{{\color{third3}\rule{1cm}{1cm}}}
+				& \makecell{{\color{third4}\rule{1cm}{1cm}}}
+				& \makecell{{\color{third5}\rule{1cm}{1cm}}}
+				& proposition\\
 \bottomrule
 \end{tabular}
 \end{table}
 
+如果需要自定义颜色的话请选择 \lstinline{nocolor} 选项或者使用 \lstinline{color=none},然后在导言区定义 structure、main、second、third 颜色,具体方法如下:
+\begin{lstlisting}
+\definecolor{structurecolor}{RGB}{0,0,0}
+\definecolor{main}{RGB}{70,70,70}    
+\definecolor{second}{RGB}{115,45,2}    
+\definecolor{third}{RGB}{0,80,80}   
+\end{lstlisting}
+
+
 \section{章标题显示风格}
 
 本模板内置 2 套\textit{章标题显示风格},包含 \lstinline{hang}(默认)与 \lstinline{display} 两种风格,区别在于章标题单行显示(\lstinline{hang})与双行显示(\lstinline{display}),本说明使用了 \lstinline{hang}。调用方式为
-
-\begin{lstlisting}[frame=single]
+\begin{lstlisting}
 \documentclass[hang]{elegantbook} %or
 \documentclass[titlestyle=hang]{elegantbook}
 \end{lstlisting}
@@ -144,8 +142,14 @@
 
 \section{数学环境简介}
 
-在我们这个模板中,定义了四大类环境
+在我们这个模板中,我们定义了两种不同的定理模式 \lstinline{mode},包括简单模式(\lstinline{simple})和炫彩模式(\lstinline{fancy}),默认为 \lstinline{fancy} 模式,不同模式的选择为
+\begin{lstlisting}
+\documentclass[simple]{elegantbook} %or
+\documentclass[mode=simple]{elegantbook}
+\end{lstlisting}
 
+本模板定义了四大类环境
+
 \begin{itemize}
 \item \textit{定理类环境},包含标题和内容两部分,全部定理类环境的编号均以章节编号。根据格式的不同分为 3 种
    \begin{itemize}
@@ -155,24 +159,19 @@
    \end{itemize}
 \item \textit{示例类环境},有 \textbf{example、exercise、problem} 环境(对应于例,练习,例题),自动编号,编号以章节为单位。
 \item \textit{证明类环境},有 \textbf{proof、note} 环境,特点是,有引导符或者结尾符,\textbf{note} 环境有引导符号,\textbf{proof} 环境有证明完毕符号。
-\item \textit{结论类环境},有 \textbf{conclusion、assumption、property,remark、solution} 环境,三者均以粗体的引导词为开头,和普通段落格式一致。
+\item \textit{结论类环境},有 \textbf{conclusion、assumption、property,remark、solution} 环境\footnote{本模板还添加了一个 result 选项,用于隐藏 \lstinline{solution} 和 \lstinline{proof} 环境,默认为显示(\lstinline{result=answer}),隐藏使用 \lstinline{result=noanswer}。},三者均以粗体的引导词为开头,和普通段落格式一致。
 \end{itemize}
 
 \subsection{定理类环境的使用}
 由于本模板使用了 \lstinline{tcolorbox} 宏包来定制定理类环境,所以和普通的定理环境的使用有些许区别,定理的使用方法如下:
-
-\begin{lstlisting}[frame=single]
+\begin{lstlisting}
 \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:}。
 
-\begin{theorem}{<theorem name>}{<label>}
-The content of theorem.
-\end{theorem}
-
 其他相同用法的定理类环境有:
 
 \begin{table}[htbp]
@@ -193,23 +192,18 @@
  \end{table}%
  
 
-\subsection{其他数学环境的使用}
-其他三种数学环境因为没有选项,可以直接使用,比如 \lstinline{example} 环境的使用:
-
-\begin{lstlisting}[frame=single]
+\subsection{其他环境的使用}
+其他三种环境没有选项,可以直接使用,比如 \lstinline{example} 环境的使用方法与效果:
+\begin{lstlisting}
 \begin{example}
    This is the content of example environment.
 \end{example}
 \end{lstlisting}
 
-效果如下:
-
 \begin{example}
 This is the content of example environment.
 \end{example}
 
-
-
 这几个都是同一类环境,区别在于
 
 \begin{itemize}
@@ -218,7 +212,14 @@
    \item 结论(conclusion)等环境都是普通段落环境,引导词加粗。
 \end{itemize}
 
+\section{装饰物}
 
+本模板为章节后的装饰物(base)添加了隐藏选项,有 \lstinline{show} 和 \lstinline{hide} 两个选项。
+\begin{lstlisting}
+\documentclass[hide]{elegantbook} %or
+\documentclass[base=hide]{elegantbook}
+\end{lstlisting}
+
 \section{封面和徽标}
 
 本模板使用的封面图片来源于 \href{https://pixabay.com/en/tea-time-poetry-coffee-reading-3240766/}{pixabay.com}\footnote{感谢 China\TeX{} 提供免费图源网站,另外还推荐 \href{https://www.pexels.com/}{pexels.com}。},图片完全免费,可用于任何场景。封面图片的尺寸为 $1280 \times 1024$, 更换图片的时候请\textbf{严格}按照封面图片尺寸进行裁剪。推荐一个免费的在线图片裁剪网站 \href{https://www.befunky.com/create/crop-photo/}{befunky.com}。
@@ -258,20 +259,22 @@
 
 \section{参考文献}
 
-此模板使用了 Bib\TeX{} 来生成参考文献,默认使用的文献样式(bib style)是 \lstinline{aer}。参考文献示例:~\cite{Chen2018} 使用了中国一个大型的 P2P 平台(人人贷)的数据来检验男性投资者和女性投资者在投资表现上是否有显著差异。
+此模板使用了 \BibTeX{} 来生成参考文献,在中文示例中,使用了 \lstinline{gbt7714} 宏包。参考文献示例:~\cite{en1} 使用了中国一个大型的 P2P 平台(人人贷)的数据来检验男性投资者和女性投资者在投资表现上是否有显著差异。
 
-你可以在谷歌学术,Mendeley,Endnote 中获得文献条目(bib item),然后把它们添加到 \lstinline{reference.bib} 中。在文中引用的时候,引用它们的键值(bib key)即可。注意需要在编译的过程中添加 Bib\TeX{} 编译。如果你想在参考文献中添加未引用的文献,可以使用
+你可以在谷歌学术,Mendeley,Endnote 中获得文献条目(bib item),然后把它们添加到 \lstinline{reference.bib} 中。在文中引用的时候,引用它们的键值(bib key)即可。注意需要在编译的过程中添加 \BibTeX{} 编译。如果你想在参考文献中添加未引用的文献,可以使用
+\begin{lstlisting}[frame=single]
+\nocite{EINAV2010,Havrylchyk2018} %or include some bibitems
+\nocite{*} %include all the bibitems
+\end{lstlisting}
 
-
 \section{添加序章}
 
-如果你想在第一章前面添加序章,不改变原本章节序号,你可以在第一章内容前面使用 
-
-\begin{lstlisting}[frame=single]
-\chapter*{序章}
-\addcontentsline{toc}{chapter}{序章} 
-\markboth{序章}{} 
-序章的内容。
+如果你想在第一章前面添序章,不改变原本章节序号,你可以在第一章内容前面使用 
+\begin{lstlisting}
+\chapter*{Introduction}
+\addcontentsline{toc}{chapter}{Introduction} 
+\markboth{Introduction}{} 
+The content of introduction.
 \end{lstlisting}
 
 \chapter{ElegantBook 写作示例}
@@ -287,11 +290,12 @@
 
 我们将通过三个步骤定义可测函数的积分。首先定义非负简单函数的积分。以下设 $E$ 是 $\mathcal{R}^n$ 中的可测集。
 
+
 \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$ 上的积分为
+设 $ 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)$
 \begin{equation}
    \label{inter}
-   \int_{E} f dx = \sum_{i=1}^k a_i m(A_i) . 
+   \int_{E} f dx = \sum_{i=1}^k a_i m(A_i) \pi \alpha\beta\sigma\gamma\nu\xi\epsilon\varepsilon. 
 \end{equation}
 一般情况下 $0 \leq \int_{E} f dx \leq \infty$。若 $\int_{E} f dx < \infty$,则称 $f$ 在 $E$ 上可积。
 \end{definition}
@@ -304,10 +308,11 @@
 即 $D(x)$ 在 $[0,1]$ 上是 Lebesgue 可积的并且积分值为零。但 $D(x)$ 在 $[0,1]$ 上不是 Riemann 可积的。
 
 
+
 有界变差函数是与单调函数有密切联系的一类函数。有界变差函数可以表示为两个单调递增函数之差。与单调函数一样,有界变差函数几乎处处可导。与单调函数不同,有界变差函数类对线性运算是封闭的,它们构成一线空间。练习题 \ref{exer:43} 是一个性质的证明。
 
 \begin{exercise}\label{exer:43}
-设 $f\in L(\mathcal{R}^1)$,$g$ 是 $\mathcal{R}^1$ 上的有界可测函数。证明函数
+设 $f \notin\in L(\mathcal{R}^1)$,$g$ 是 $\mathcal{R}^1$ 上的有界可测函数。证明函数
 \begin{equation}
    \label{ex:1}
    I(t) = \int_{\mathcal{R}^1} f(x+t)g(x)dx \quad t \in \mathcal{R}^1
@@ -315,6 +320,14 @@
 是 $\mathcal{R}^1$ 上的连续函数。
 \end{exercise}
 
+\begin{problem}
+即 $D(x)$ 在 $[0,1]$ 上是 Lebesgue 可积的并且积分值为零。但 $D(x)$ 在 $[0,1]$ 上不是 Riemann 可积的。
+\end{problem}
+
+\begin{solution}
+即 $D(x)$ 在 $[0,1]$ 上是 Lebesgue 可积的并且积分值为零。但 $D(x)$ 在 $[0,1]$ 上不是 Riemann 可积的。
+\end{solution}
+
 \begin{theorem}{Fubini 定理}{fubi} 
 (1)若 $f(x,y)$ 是 $\mathcal{R}^p\times\mathcal{R}^q$ 上的非负可测函数,则对几乎处处的 $x\in \mathcal{R}^p$,$f(x,y)$ 作为 $y$ 的函数是 $\mathcal{R}^q$ 上的非负可测函数,$g(x)=\int_{\mathcal{R}^q}f(x,y) dy$ 是 $\mathcal{R}^p$ 上的非负可测函数。并且
 \begin{equation}
@@ -325,13 +338,13 @@
 \end{theorem}
 
 \begin{note}
-在本模板中,引理(lemma),推论(corollary )的样式和定理~\ref{thm:fubi} 的样式一致,包括颜色,仅仅只有计数器的设置不一样。
+在本模板中,引理(lemma),推论(corollary)的样式和定理~\ref{thm:fubi} 的样式一致,包括颜色,仅仅只有计数器的设置不一样。
 \end{note}
 
 我们说一个实变或者复变量的实值或者复值函数是在区间上平方可积的,如果其绝对值的平方在该区间上的积分是有限的。所有在勒贝格积分意义下平方可积的可测函数构成一个希尔伯特空间,也就是所谓的 $L^2$ 空间,几乎处处相等的函数归为同一等价类。形式上,$L^2$ 是平方可积函数的空间和几乎处处为 0 的函数空间的商空间。
 
 \begin{proposition}{最优性原理}{max}
-如果 $u^*$ 在 $[s,T]$ 上为最优解,则 $u^*$ 在 $[s,T]$ 任意子区间都是最优解,假设区间为 $[t_0,t_1]$ 的最优解为 $u^*$ ,则 $u(t_0)=u^{*}(t_0)$,即初始条件必须还是在 $u^*$ 上。
+如果 $u^*$ 在 $[s,T]$ 上为最优解,则 $u^*$ 在 $[s, T]$ 任意子区间都是最优解,假设区间为 $[t_0, t_1]$ 的最优解为 $u^*$ ,则 $u(t_0)=u^{*}(t_0)$,即初始条件必须还是在 $u^*$ 上。
 \end{proposition}
 
 我们知道最小二乘法可以用来处理一组数据,可以从一组测定的数据中寻求变量之间的依赖关系,这种函数关系称为经验公式。本课题将介绍最小二乘法的精确定义及如何寻求点与点之间近似成线性关系时的经验公式。假定实验测得变量之间的 $n$ 个数据,则在平面上,可以得到 $n$ 个点,这种图形称为 “散点图”,从图中可以粗略看出这些点大致散落在某直线近旁, 我们认为其近似为一线性函数,下面介绍求解步骤。
@@ -356,7 +369,7 @@
 回归分析(regression analysis) 是确定两种或两种以上变量间相互依赖的定量关系的一种统计分析方法。运用十分广泛,回归分析按照涉及的变量的多少,分为一元回归和多元回归分析;按照因变量的多少,可分为简单回归分析和多重回归分析;按照自变量和因变量之间的关系类型,可分为线性回归分析和非线性回归分析。
 \end{conclusion}
 
-\nocite{EINAV2010,Havrylchyk2018} 
+\nocite{*} 
 
 \bibliography{reference}
 
@@ -376,8 +389,8 @@
 
 \chapter{最小示例}
 
-\begin{lstlisting}[frame=single]
-\documentclass{elegantbook}
+\begin{lstlisting}
+\documentclass[lang=cn,11pt]{elegantbook}
 % title info
 \title{Title}
 \subtitle{Subtitle is here}
@@ -403,10 +416,6 @@
 
 \bibliography{reference}
 
-\appendix
-\chapter{Appendix Chapter Title}
-The content of appendix 1.
-
 \end{document}
 \end{lstlisting}
 

Modified: trunk/Master/texmf-dist/doc/latex/elegantbook/elegantbook-en.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/elegantbook/elegantbook-en.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/elegantbook/elegantbook-en.tex	2019-05-05 17:39:35 UTC (rev 51001)
+++ trunk/Master/texmf-dist/doc/latex/elegantbook/elegantbook-en.tex	2019-05-05 17:39:49 UTC (rev 51002)
@@ -1,4 +1,4 @@
-\documentclass{elegantbook}
+\documentclass[noanswer,fancy,blue,11pt]{elegantbook}
 
 \title{An Elegant \LaTeX{} Template for Books}
 \subtitle{Classic Elegant\LaTeX{} Template}
@@ -6,14 +6,17 @@
 \author{Ethan Deng \& Liam Huang}
 \institute{Elegant\LaTeX{} Program}
 \date{\today}
+\version{3.07}
 
-\version{3.06}
 \equote{Victory won\rq t come to us unless we go to it. --- M. Moore}
+
 \logo{logo.png}
 \cover{cover.jpg}
 
 
+
 \begin{document}
+
 \maketitle
 \tableofcontents
 \clearpage
@@ -21,131 +24,130 @@
 \mainmatter
 \hypersetup{pageanchor=true}
 
-
 \chapter{Elegant\LaTeX{} Templates}
 
 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:ElegantBook/releases}. 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.
+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 at gmail.com}.
 
 
 \section{ElegantBook Updates}
-Over these years, we've received a lot of feedback 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:
+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:
 
 \begin{enumerate}
-   \item Remove custom font settings and use the \lstinline{ctex} package or system font instead;
-   \item Add English and Chinese modes(\lstinline{lang=cn/en});
-   \item \lstinline{PDFLaTeX} 与 \lstinline{XeLaTeX} Support;
-   \item Use the \lstinline{tcolorbox} package to re-written the theorem class environments, which can span over pages;
+   \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 gray theme: \lstinline{color=plain};
    \item Add code highlighting;
-   \item Beautify the list environment.
+   \item Beautify the list environments;
+   \item Add simple theorem mode;
+   \item Add base hide option.
 \end{enumerate}
 
 
 \chapter{ElegantBook Settings}
 
+
 \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. 
-\subsection[Compile with PDFLaTeX]{Compile with \lstinline{PDFLaTeX}}
+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 choose \lstinline{PDFLaTeX} to process your book, the default article font computer modern has changed to \lstinline{newtx} series, and the default font size is set to \lstinline{11pt}. The fonts are settings with:
 
-\begin{itemize}
-	\item \lstinline{newtxtext} package for text fonts, similar to times new roman font.
-	\item \lstinline{newtxmath} package for math fonts, close to \lstinline{times} package.
-	\item \lstinline{FiraMono} package for typewriter fonts, with option \lstinline{scale=0.7}.
-	\item \lstinline{ctex} package for Chinese fonts, with option \lstinline{scheme=plain}.
-\end{itemize}
-
-A full compilation chain:\lstinline[breaklines]{PDFLaTeX -> BibTeX -> PDFLaTeX*2}.
-
-
-\subsection[Compile with XeLaTeX]{Compile with \lstinline{XeLaTeX}}
-If you choose \lstinline{XeLaTeX} to process your book, we use \lstinline{fontspec} package and \lstinline{xeCJK} package. we used fonts available in Windows, if you are using Linux or Mac OS, please substitute these fonts with that of your system.
-
-\begin{lstlisting}[frame=single]
-\RequirePackage{fontenc}
-\RequirePackage[no-math]{fontspec}
-\setmainfont{Times New Roman}[NFSSFamily=ntxtlf]
-\setsansfont{Arial}
-%\setmonofont[Scale=0.7]{Courier New}
-\RequirePackage{xeCJK}
-\RequirePackage{xunicode}
-\setCJKmainfont[BoldFont={SimHei},ItalicFont={KaiTi}]{SimSun}
-\setCJKsansfont[BoldFont={SimHei},ItalicFont={KaiTi}]{KaiTi}
-\setCJKmonofont[BoldFont={SimHei},ItalicFont={KaiTi},Scale=0.7]{Microsoft YaHei}
-\XeTeXlinebreaklocale "zh"
-\XeTeXlinebreakskip = 0pt plus 1pt minus 0.1pt
-\RequirePackage{newtxmath}
-\end{lstlisting}
-
-A full compilation chain:\lstinline[breaklines]{XeLaTeX -> BibTeX -> XeLaTeX*2}.
-
-
 \section{Languages}
-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 caption of figure/table, abstract name, refname etc. Chinese, while \lstinline{lang=en} will keep all these stuff English, as the default article class sets. You can use this option as
 
-\begin{lstlisting}[frame=none]  
-\documentclass[cn]{elegantbook} 
-\documentclass[lang=cn]{elegantbook}
+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
+\begin{lstlisting}
 \documentclass[en]{elegantbook} 
 \documentclass[lang=en]{elegantbook}
 \end{lstlisting}
 
 \begin{remark}
-You can input Chinese Character 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}.
+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}.
 \end{remark}
 
 
 \section{Color Themes}
-This template contains 4 color themes,they are \textcolor{main1}{\lstinline{green}} (default), \textcolor{main2}{\lstinline{cyan}}, \textcolor{main3}{\lstinline{blue}}, \textcolor{gray}{\lstinline{plain}}, and there is a customization color option  \lstinline{nocolor}. You can choose \lstinline{green} with  
-
-\begin{lstlisting}[frame=single]
+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  
+\begin{lstlisting}
 \documentclass[green]{elegantbook} %or
 \documentclass[color=green]{elegantbook}
 \end{lstlisting}
 
-where \textcolor{gray}{plain} theme is gray for all theorem class environments and paper structures. 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:
-\begin{lstlisting}[frame=single]
-\definecolor{main}{RGB}{70,70,70}    
-\definecolor{second}{RGB}{115,45,2}    
-\definecolor{third}{RGB}{0,80,80}   
-\end{lstlisting}
 
-\begin{table}[htp]
-\caption{ElegantBook Themes\label{tab:color thm}}
+\begin{table}[htbp]
+\caption{ElegantBook Themes\label{tab:color thm}\label{tab:color thm}}
 \centering
-\begin{tabular}{ccccc}
+\begin{tabular}{ccccccc}
 \toprule
-	  & \textcolor{main1}{green} & \textcolor{main2}{cyan} & \textcolor{main3}{blue} & Main Environments\\
+	        & \textcolor{main1}{green} 
+	        & \textcolor{main2}{cyan} 
+	        & \textcolor{main3}{blue}
+	        & \textcolor{main4}{gray} 
+	        & \textcolor{main5}{black} 
+	        & Main Environments\\
 \midrule
-main & \makecell{{\color{main1}\rule{1cm}{1cm}}}& \makecell{{\color{main2}\rule{1cm}{1cm}}}&\makecell{ {\color{main3}\rule{1cm}{1cm}}}& definition \\
+structure & \makecell{{\color{structure1}\rule{1cm}{1cm}}}
+				& \makecell{{\color{structure2}\rule{1cm}{1cm}}}
+				& \makecell{{\color{structure3}\rule{1cm}{1cm}}} 
+				& \makecell{{\color{structure4}\rule{1cm}{1cm}}} 
+				& \makecell{{\color{structure5}\rule{1cm}{1cm}}} 
+				& chapter \ section \ subsection \\
 
-second &\makecell{ {\color{second1}\rule{1cm}{1cm}}}& \makecell{{\color{second2}\rule{1cm}{1cm}}}&\makecell{ {\color{second3}\rule{1cm}{1cm}}}&theorem \ lemma \ corollary\\
+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 \\
 
-third &\makecell{ {\color{third1}\rule{1cm}{1cm}}}& \makecell{{\color{third2}\rule{1cm}{1cm}}}&\makecell{ {\color{third3}\rule{1cm}{1cm}}}&proposition\\
+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\\
+
+third     & \makecell{{\color{third1}\rule{1cm}{1cm}}}
+				& \makecell{{\color{third2}\rule{1cm}{1cm}}}
+				& \makecell{{\color{third3}\rule{1cm}{1cm}}}
+				& \makecell{{\color{third4}\rule{1cm}{1cm}}}
+				& \makecell{{\color{third5}\rule{1cm}{1cm}}}
+				& proposition\\
 \bottomrule
 \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:
+\begin{lstlisting}[frame=single]
+\definecolor{structurecolor}{RGB}{60,113,183}
+\definecolor{main}{RGB}{0,166,82}%
+\definecolor{second}{RGB}{255,134,24}%
+\definecolor{third}{RGB}{0,174,247}% 
+\end{lstlisting}
+
+
 \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
-
-\begin{lstlisting}[frame=single]
+\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 
+\begin{lstlisting}
+\documentclass[simple]{elegantbook} %or
+\documentclass[mode=simple]{elegantbook}
+\end{lstlisting}
 
 In this template, we defined four categories of theorem class environments
 
@@ -158,24 +160,19 @@
    \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} environment, all of these begin with boldfaced words, and the contents are the same as a normal paragraph.
+\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.
 \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:
-
-\begin{lstlisting}[frame=single]
+\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 effect is as follows:
+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:}. 
 
-\begin{theorem}{<theorem name>}{<label>}
-The content of theorem.
-\end{theorem}
-
 Other theorem class environments with the same usage are:
 
 \begin{table}[htbp]
@@ -198,8 +195,7 @@
 
 \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:
-
-\begin{lstlisting}[frame=single]
+\begin{lstlisting}
 \begin{example}
 This is the content of example environment.
 \end{example}
@@ -219,7 +215,14 @@
    \item conclusion environment with boldfaced keywords and normal paragraph content.
 \end{itemize}
 
+\section{Base Hide Option}
+We defined an option to hide the base below the chapter, you can use it by
+\begin{lstlisting}
+\documentclass[hide]{elegantbook} %or
+\documentclass[base=hide]{elegantbook}
+\end{lstlisting}
 
+
 \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}.
@@ -259,10 +262,9 @@
 
 \section{Bibliography}
 
-This template uses Bib\TeX{} to generate the bibliography, the default bibliography style is \lstinline{aer}. Let's take a glance at the citation effect, ~\cite{Chen2018} 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 \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 Bib\TeX{}, 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 \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 
 \begin{lstlisting}
 \nocite{EINAV2010, Havrylchyk2018} 
 \end{lstlisting}
@@ -270,8 +272,7 @@
 \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 
-
-\begin{lstlisting}[frame=single]
+\begin{lstlisting}
 \chapter*{Preface}
 \addcontentsline{toc}{chapter}{Preface} 
 \markboth{Preface}{} 
@@ -357,7 +358,7 @@
 \end{itemize}
 
 
-\nocite{EINAV2010,Havrylchyk2018} 
+\nocite{en1,en2,en3} 
 
 \bibliography{reference}
 
@@ -402,12 +403,8 @@
 The content of chapter one.
 
 \bibliography{reference}
-
-\appendix
-\chapter{Appendix Chapter Title}
-The content of appendix 1.
-
 \end{document}
 \end{lstlisting}
 
+\bibliographystyle{aer}
 \end{document}

Modified: trunk/Master/texmf-dist/doc/latex/elegantbook/figure/cover.jpg
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/elegantbook/reference.bib
===================================================================
--- trunk/Master/texmf-dist/doc/latex/elegantbook/reference.bib	2019-05-05 17:39:35 UTC (rev 51001)
+++ trunk/Master/texmf-dist/doc/latex/elegantbook/reference.bib	2019-05-05 17:39:49 UTC (rev 51002)
@@ -1,68 +1,68 @@
- at article{Zeng2017,
-abstract = {{\textcopyright} 2017 Zeng et al. This is an open access article distributed under the terms of the Creative Commons Attribution License, which permits unrestricted use, distribution, and reproduction in any medium, provided the original author and source are credited. Peer-to-peer (P2P) lending, as a novel economic lending model, has triggered new challenges on making effective investment decisions. In a P2P lending platform, one lender can invest N loans and a loan may be accepted by M investors, thus forming a bipartite graph. Basing on the bipartite graph model, we built an iteration computation model to evaluate the unknown loans. To validate the proposed model, we perform extensive experiments on real-world data from the largest American P2P lending marketplace - Prosper. By comparing our experimental results with those obtained by Bayes and Logistic Regression, we show that our computation model can help borrowers select good loans and help lenders make good investment decisions. Experimental results also show that the Logistic classification model is a good complement to our iterative computation model, which motivates us to integrate the two classification models. The experimental results of the hybrid classification model demonstrate that the logistic classification model and our iteration computation model are complementary to each other. We conclude that the hybrid model (i.e., the integration of iterative computation model and Logistic classification model) is more efficient and stable than the individual model alone.},
-author = {Zeng, Xiangxiang and Liu, Li and Leung, Stephen and Du, Jiangze and Wang, Xun and Li, Tao},
-doi = {10.1371/journal.pone.0184242},
-file = {:D$\backslash$:/Nuts/Reference/A decision support model for investment on P2P lending platform - Zeng et al. - 2017.pdf:pdf;:D$\backslash$:/Nuts/Reference/A decision support model for investment on P2P lending platform - Zeng et al. - 2017(2).pdf:pdf},
-isbn = {1111111111},
-issn = {19326203},
-journal = {PLoS ONE},
-number = {9},
-pages = {1--18},
-title = {{A decision support model for investment on P2P lending platform}},
-volume = {12},
-year = {2017}
+
+ at article{en3,
+  title={{The Mechanism and Effectiveness of Credit Scoring of P2P Lending Platform: Evidence from Renrendai.com}},
+  author={Li, Qiang and Chen, Liwen and Zeng, Yong},
+  journal={China Finance Review International},
+  volume={8},
+  number={3},
+  pages={256--274},
+  year={2018},
+  publisher={Emerald Publishing Limited}
 }
- at article{EINAV2010,
-author = {Einav, Liran And Cullen, Amy Finkelstein Mark R.},
-file = {:D$\backslash$:/Nuts/Reference/Estimating Welfare in Insurance Markets Using Variation in Prices - EINAV, CULLEN - 2010.pdf:pdf},
-isbn = {1932-6203 (Electronic) 1932-6203 (Linking)},
-issn = {19326203},
-journal = {Quarterly Journal of Economics},
-number = {August},
-pages = {877--921},
-pmid = {24710357},
-title = {{Estimating Welfare in Insurance Markets Using Variation in Prices}},
-volume = {CXXV},
-year = {2010}
+
+
+ at article{en2,
+   author = {Carlstrom, Charles T and Fuerst, Timothy S},
+   title = {{Agency Costs, Net Worth, and Business Fluctuations: A Computable General Equilibrium Analysis}},
+   journal = {The American Economic Review},
+   pages = {893-910},
+   ISSN = {0002-8282},
+   year = {1997},
+   type = {Journal Article}
 }
- at article{Veiga2018,
-abstract = {Would consumer surplus increase if annuity rates were age-neutral? This paper characterizes the socially optimal contractibility of a given signal in markets with adverse selection. A signal (e.g., age) partitions consumers into subsets (e.g., young and old). A regulator restricts price-discrimination on the basis of the signal if the consumer subsets where the level of cost is higher are also the subsets where there is greater deadweight loss due to adverse selection. Such signals are empirically common. To illustrate the welfare benefit of price discrimination policy, I use a structural model to estimate its impact on the UK annuities market. The model is estimated using proprietary data that include the annuity seller's estimate of each individual's longevity. I find that restricting price discrimination can increase consumer surplus by the equivalent of about {\pounds}6.5 million per year.},
-author = {Veiga, Andr{\'{e}}},
-file = {:D$\backslash$:/Nuts/Reference/The Impact of Price Discrimination in Markets with Adverse Selection - Veiga - 2018.pdf:pdf},
-keywords = {Adverse Selection,D41,L52,Price Discrimination,Structural Estimation JEL Classification Codes: D8},
-title = {{The Impact of Price Discrimination in Markets with Adverse Selection}},
-year = {2018}
+
+ at article{en1,
+   author = {Quadrini, Vincenzo},
+   title = {{Financial Frictions in Macroeconomic Fluctuations}},
+   journal = {FRB Richmond Economic Quarterly},
+   volume = {97},
+   number = {3},
+   pages = {209-254},
+   year = {2011},
+   type = {Journal Article}
 }
 
- at article{Chen2018,
-abstract = {We use data from a major peer-to-peer lending marketplace in China to study whether female and male investors evaluate loan performance differently. Controlling for variables of investor demographics, investor experience, and loan characteristics, we find that loans invested by female investors are more likely to default and have lower loan return in the future than loans invested by male investors. We define abnormal default or abnormal loan return as the part of the loan default or the part of loan return that is not explained by loan characteristics and find that the loans invested by female investors have higher abnormal default and lower abnormal loan return than the loans invested by male investors. Furthermore, female investors perform similarly to male investors in abnormal default or abnormal loan return when investors have high levels of education or income or when investors work in finance or information technology industries.},
-author = {Chen, Jia and Jiang, Jiajun and jane Liu, Yu},
-doi = {10.1016/j.jempfin.2018.06.004},
-file = {:D$\backslash$:/Nuts/Reference/Financial literacy and gender difference in loan performance - Chen, Jiang, Liu - 2018.pdf:pdf},
-issn = {09275398},
-journal = {Journal of Empirical Finance},
-keywords = {Financial Literacy, Gender Difference, Loan Default, Loan Return,Peer-to-peer Lending},
-number = {71673007},
-pages = {307--320},
-title = {{Financial Literacy and Gender Difference in Loan Performance}},
-volume = {48},
-year = {2018}
+ at article{cn1,
+   author = {方军雄},
+   title = {{所有制、制度环境与信贷资金配置}},
+   journal = {经济研究},
+   number = {12},
+   pages = {82-92},
+   ISSN = {0577-9154},
+   year = {2007},
+   type = {Journal Article}
 }
 
- at article{Havrylchyk2018,
-abstract = {The objective of our paper is to explore the role of P2P lending platforms through the prism of the theory of financial intermediation. P2P lending platforms perform the brokerage function of financial intermediaries by matching lenders' supply and borrowers' demand of funding, according to the risk and the maturity of their needs. Unlike banks, P2P lending platforms do not create money and do not perform risk and maturity transformation. However, they can organize secondary markets to trade loan contracts before maturity and some P2P lending platforms aim at providing a fixed income to lenders. To ensure efficient and sustainable financial intermediation, P2P lending platforms need to ensure that they are not subject to principal-agent problems and that their incentives coincide with those of lenders. The possibility of orderly resolution of P2P lending platforms failures might decrease moral hazard problems that are inherent in the modern financial intermediation.},
-author = {Havrylchyk, Olena and Verdier, Marianne},
-doi = {10.1057/s41294-017-0045-1},
-file = {:D$\backslash$:/Nuts/Reference/The Financial Intermediation Role of the P2P Lending Platforms - Havrylchyk, Verdier - 2018.pdf:pdf},
-issn = {14783320},
-journal = {Comparative Economic Studies},
-keywords = {Access to finance,Financial crisis,Information and communication technologies,Internet,Market structure,Online lenders,Peer-to-peer lending},
-number = {1},
-pages = {115--130},
-publisher = {Palgrave Macmillan UK},
-title = {{The Financial Intermediation Role of the P2P Lending Platforms}},
-url = {https://doi.org/10.1057/s41294-017-0045-1},
-volume = {60},
-year = {2018}
+ at article{cn2,
+   author = {刘凤良 and 章潇萌 and 于泽},
+   title = {{高投资、结构失衡与价格指数二元分化}},
+   journal = {金融研究},
+   number = {02},
+   pages = {54-69},
+   ISSN = {1002-7246},
+   year = {2017},
+   type = {Journal Article}
 }
 
+ at article{cn3,
+   author = {吕捷 and 王高望},
+   title = {{CPI 与 PPI “背离”的结构性解释}},
+   journal = {经济研究},
+   volume = {50},
+   number = {04},
+   pages = {136-149},
+   ISSN = {0577-9154},
+   year = {2015},
+   type = {Journal Article}
+}
+

Modified: trunk/Master/texmf-dist/tex/latex/elegantbook/elegantbook.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/elegantbook/elegantbook.cls	2019-05-05 17:39:35 UTC (rev 51001)
+++ trunk/Master/texmf-dist/tex/latex/elegantbook/elegantbook.cls	2019-05-05 17:39:49 UTC (rev 51002)
@@ -5,11 +5,11 @@
 %% This work may be distributed and/or modified freely
 %% available at https://github.com/ElegantLaTeX/ElegantBook
 % %
-%% Last Modification 2019-02-25
+%% Last Modification 2019-04-12
 %%%%%%%%%%%%%%%%%%%%%
 % % !Mode:: "TeX:UTF-8"
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{elegantbook}[2019/02/24 v3.06 ElegantBook document class]
+\ProvidesClass{elegantbook}[2019/04/03 v3.07 ElegantBook document class]
 
 \RequirePackage{kvoptions}
 \RequirePackage{etoolbox}
@@ -17,16 +17,33 @@
 \newcommand{\ekv}[1]{\kvsetkeys{ELEGANT}{#1}}
 
 % ----- Colors -----
-\DeclareStringOption[green]{color}
+\DeclareStringOption[blue]{color}
 \DeclareStringOption[en]{lang}
+\DeclareStringOption[answer]{result}
+\DeclareStringOption[fancy]{mode}
+\DeclareStringOption[show]{base}
+
+
 % ----- backward compatibility
 \DeclareVoidOption{green}{\ekv{color = green}}
 \DeclareVoidOption{cyan}{\ekv{color = cyan}}
 \DeclareVoidOption{blue}{\ekv{color = blue}}
-\DeclareVoidOption{plain}{\ekv{color = plain}}
+\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}}
+
+\DeclareVoidOption{fancy}{\ekv{mode=fancy}}
+\DeclareVoidOption{simple}{\ekv{mode=simple}}
+
+\DeclareVoidOption{answer}{\ekv{result = answer}}
+\DeclareVoidOption{noanswer}{\ekv{result = noanswer}}
+
+\DeclareVoidOption{hide}{\ekv{base = hide}}
+\DeclareVoidOption{show}{\ekv{base = show}}
+
 % ----- Math option -----
 \newcommand\mailto[1]{\href{mailto:#1}{\nolinkurl{#1}}}
 
@@ -40,44 +57,26 @@
 
 \ProcessKeyvalOptions*\relax
 % \ProcessOptions*\relax
-\LoadClass[12pt,a4paper,oneside,openany]{book}
+\LoadClass[a4paper,oneside,openany]{book}
 
-\RequirePackage{indentfirst}
+\RequirePackage{indentfirst,comment}
 \setlength\parindent{2em}
 
 % fontsetting
+
+\PassOptionsToPackage{no-math}{fontspec}
+\RequirePackage[UTF8, scheme=plain,punct=kaiming]{ctex}
+
 \RequirePackage{ifxetex}
+
 \ifxetex
 	\RequirePackage{fontenc}
-	\RequirePackage[no-math]{fontspec}
-	\setmainfont{Times New Roman}[NFSSFamily=ntxtlf]
-	\setsansfont{Arial}
-	%\setmonofont[Scale=0.9]{Courier New}
-	\RequirePackage{xeCJK}
-	\RequirePackage{xunicode}
-	\setCJKmainfont[BoldFont={SimHei},ItalicFont={KaiTi}]{SimSun}
-	\setCJKsansfont[BoldFont={SimHei},ItalicFont={KaiTi}]{KaiTi}
-	\setCJKmonofont[BoldFont={SimHei},ItalicFont={KaiTi},Scale=0.7]{Microsoft YaHei}
-	\XeTeXlinebreaklocale "zh"
-	\XeTeXlinebreakskip = 0pt plus 1pt minus 0.1pt
-	\RequirePackage{newtxmath}
-	%\DeclareSymbolFont{operators}{OT1}{ntxtlf}{m}{n}
-	%\SetSymbolFont{operators}{bold}{OT1}{ntxtlf}{b}{n}
-	\setCJKfamilyfont{zhsong}{SimSun}
-	\setCJKfamilyfont{zhhei}{SimHei}
-	\setCJKfamilyfont{zhkai}{KaiTi}
-	\setCJKfamilyfont{zhfs}{FangSong}
-	\newcommand*{\songti}{\CJKfamily{zhsong}} 
-	\newcommand*{\heiti}{\CJKfamily{zhhei}}   
-	\newcommand*{\kaishu}{\CJKfamily{zhkai}} 
-	\newcommand*{\fangsong}{\CJKfamily{zhfs}} 
 \else
-	\RequirePackage{fontenc}
-	\RequirePackage{newtxtext}
-	\RequirePackage{newtxmath}
-	\RequirePackage[UTF8, scheme=plain]{ctex}
+	\RequirePackage[T1]{fontenc}
 \fi
-\RequirePackage[scale=0.7]{FiraMono}
+
+\RequirePackage{newtxtext}
+\RequirePackage{newtxmath}
 %
 
 % font setting for text and math
@@ -87,57 +86,90 @@
 % \RequirePackage[scale=0.85]{newtxtt}  
 \RequirePackage{anyfontsize}
 
-\DeclareSymbolFont{cmlargesymbols}{OMX}{cmex}{m}{n}
-\DeclareMathSymbol{\intop}{\mathop}{cmlargesymbols}{"5A}
-  \def\int{\intop\nolimits}
-\DeclareMathSymbol{\ointop}{\mathop}{cmlargesymbols}{"49}
-  \def\oint{\ointop\nolimits}
-\DeclareMathSymbol{\sumop}{\mathop}{cmlargesymbols}{"58}
-  \let\sum\sumop
-\DeclareMathSymbol{\prodop}{\mathop}{cmlargesymbols}{"59}
-  \let\prod\prodop
+\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}
+
+% \let\partial\relax
+% \DeclareMathSymbol{\partial}{\mathord}{CMletters}{"40}%
+% \let\in\relax
+%\DeclareMathSymbol{\in}{\mathrel}{CMsymbols}{"32}%
+% \let\pi\relax
+% \DeclareMathSymbol{\pi}{\mathord}{CMletters}{"19}
+
+
 % ----- Handle Colors -----
 %% 章节以及页脚图形
 
 \RequirePackage{xcolor}
 \ifdefstring{\ELEGANT at color}{green}{
+	\definecolor{structurecolor}{RGB}{0,120,2}%
 	\definecolor{main}{RGB}{0,120,2}%
 	\definecolor{second}{RGB}{230,90,7}%
 	\definecolor{third}{RGB}{0,160,152}%
 }{\relax}
-
 \ifdefstring{\ELEGANT at color}{cyan}{
-	\definecolor{main}{RGB}{0,175,152}%
-	\definecolor{second}{RGB}{239,126,30}%
-	\definecolor{third}{RGB}{120,8,13}%
+	\definecolor{structurecolor}{RGB}{31,186,190}%
+	\definecolor{main}{RGB}{59,180,5}%
+	\definecolor{second}{RGB}{175,153,8}%
+	\definecolor{third}{RGB}{244,105,102}%
 }{\relax}
 \ifdefstring{\ELEGANT at color}{blue}{
-	\definecolor{main}{RGB}{20,50,104}%
-	\definecolor{second}{RGB}{180,50,131}%
-	\definecolor{third}{RGB}{7,127,128}%
+	\definecolor{structurecolor}{RGB}{60,113,183}
+	\definecolor{main}{RGB}{0,166,82}%
+	\definecolor{second}{RGB}{255,134,24}%
+	\definecolor{third}{RGB}{0,174,247}%
 }{\relax}
-\ifdefstring{\ELEGANT at color}{plain}{
-	\definecolor{main}{RGB}{50,50,50}%
-	\definecolor{second}{RGB}{50,50,50}%
-	\definecolor{third}{RGB}{50,50,50}%
+\ifdefstring{\ELEGANT at color}{gray}{
+	\definecolor{structurecolor}{RGB}{0,0,0}
+	\definecolor{main}{RGB}{150,150,150}%
+	\definecolor{second}{RGB}{150,150,150}%
+	\definecolor{third}{RGB}{150,150,150}%
 }{\relax}
+\ifdefstring{\ELEGANT at color}{black}{
+	\definecolor{structurecolor}{RGB}{0,0,0}
+	\definecolor{main}{RGB}{0,0,0}%
+	\definecolor{second}{RGB}{0,0,0}%
+	\definecolor{third}{RGB}{0,0,0}%
+}{\relax}
 
 %green color
-\definecolor{main1}{RGB}{0,120,2}
-\definecolor{second1}{RGB}{230,90,7}
-\definecolor{third1}{RGB}{0,160,152}
+	\definecolor{structure1}{RGB}{0,120,2}%
+	\definecolor{main1}{RGB}{0,120,2}%
+	\definecolor{second1}{RGB}{230,90,7}%
+	\definecolor{third1}{RGB}{0,160,152}%
 %cyan color
-\definecolor{main2}{RGB}{0,175,152}
-\definecolor{second2}{RGB}{239,126,30}
-\definecolor{third2}{RGB}{120,8,13}
+	\definecolor{structure2}{RGB}{31,186,190}%
+	\definecolor{main2}{RGB}{59,180,5}%
+	\definecolor{second2}{RGB}{175,153,8}%
+	\definecolor{third2}{RGB}{244,105,102}%
 %blue color
-\definecolor{main3}{RGB}{20,50,104}
-\definecolor{second3}{RGB}{180,50,131}
-\definecolor{third3}{RGB}{7,127,128}
+	\definecolor{structure3}{RGB}{60,113,183}
+	\definecolor{main3}{RGB}{0,166,82}%
+	\definecolor{second3}{RGB}{255,134,24}%
+	\definecolor{third3}{RGB}{0,174,247}%
+% gray color
+	\definecolor{structure4}{RGB}{0,0,0}
+	\definecolor{main4}{RGB}{150,150,150}%
+	\definecolor{second4}{RGB}{150,150,150}%
+	\definecolor{third4}{RGB}{150,150,150}%
+% black color
+	\definecolor{structure5}{RGB}{0,0,0}
+	\definecolor{main5}{RGB}{0,0,0}%
+	\definecolor{second5}{RGB}{0,0,0}%
+	\definecolor{third5}{RGB}{0,0,0}%
 
-
 % corlor definition
 \definecolor{winered}{rgb}{0.5,0,0}
 \definecolor{bule}{RGB}{18,29,57}
@@ -176,21 +208,20 @@
 % caption settings 
 \RequirePackage{caption}
 \captionsetup{labelfont = bf}
-\RequirePackage[font=small,labelfont={bf,color=main}]{caption} 
+\RequirePackage[font=small,labelfont={bf,color=structurecolor}]{caption} 
 \captionsetup[table]{skip=3pt}
 \captionsetup[figure]{skip=3pt}
 
 %% 常用宏包
 \linespread{1.3}
-\RequirePackage{microtype}
 \RequirePackage{graphicx}
 %\RequirePackage{enumerate}
-\RequirePackage{amsmath,mathrsfs,amsfonts}
+\RequirePackage{amsmath,mathrsfs,amsfonts,amssymb}
 \RequirePackage{booktabs}
 \RequirePackage{multicol}
 \RequirePackage{xcolor}
 \RequirePackage{fancyvrb}
-\RequirePackage{makecell,lipsum,texnames,setspace}
+\RequirePackage{makecell,lipsum,bxtexlogo,setspace}
 
 
 %%中文结构名字
@@ -200,7 +231,7 @@
 \renewcommand{\chaptername}{Chapter \thechapter}
 }{\relax}
 \ifdefstring{\ELEGANT at lang}{cn}{
-\renewcommand{\contentsname}{目录}
+\renewcommand{\contentsname}{目\hspace{2em}录}
 \renewcommand{\figurename}{图}
 \renewcommand{\tablename}{表}
 \renewcommand{\partname}{第 \thepart\; 部分}
@@ -208,7 +239,7 @@
 \renewcommand{\listtablename}{表格目录}
 \renewcommand{\bibname}{参考文献}
 \renewcommand{\appendixname}{附录}
-\renewcommand{\indexname}{索引}
+\renewcommand{\indexname}{索\hspace{2em}引}
 \newcommand\figref[1]{\textbf{图}~\ref{#1}}
 \newcommand\tabref[1]{\textbf{表}~\ref{#1}}
 \renewcommand{\chaptername}{第 \thechapter\;章}
@@ -222,13 +253,13 @@
 \usetikzlibrary{backgrounds,calc,shadows}
 \usepackage[object=vectorian]{pgfornament} %% 
 
-\newcommand*{\eitemi}{\tikz \draw [baseline, ball color=main, draw=main] circle (2pt);}
-\newcommand*{\eitemii}{\tikz \draw [baseline, fill=main,draw=main,circular drop shadow] circle (2pt);}
-\newcommand*{\eitemiii}{\tikz \draw [baseline, fill=main,draw=main] circle (2pt);}
-\setlist[enumerate,1]{label=\color{main}\arabic*.}
-\setlist[enumerate,2]{label=\color{main}(\alph*).}
-\setlist[enumerate,3]{label=\color{main}\Roman*.}
-\setlist[enumerate,4]{label=\color{main}\Alph*.}
+\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*.}
+\setlist[enumerate,2]{label=\color{structurecolor}(\alph*).}
+\setlist[enumerate,3]{label=\color{structurecolor}\Roman*.}
+\setlist[enumerate,4]{label=\color{structurecolor}\Alph*.}
 \setlist[itemize,1]{label={\eitemi}}
 \setlist[itemize,2]{label={\eitemii}}
 \setlist[itemize,3]{label={\eitemiii}}
@@ -238,7 +269,8 @@
 \def\bibfont{\footnotesize}
 
 
-%% 页面设置
+%% device settings
+
 \RequirePackage{geometry}
 \geometry{
 	a4paper,
@@ -250,6 +282,7 @@
 	footskip=12mm
 }
 
+
 \RequirePackage{hyperref}
 \hypersetup{
 	breaklinks,
@@ -267,45 +300,50 @@
 	pdfborder={0 0 0},
 	linktocpage
 }
+\let\email\relax
+\newcommand\email[1]{\href{mailto:#1}{\nolinkurl{#1}}}
 
-
 %%   章节设置
 \RequirePackage[center,pagestyles]{titlesec}
 \RequirePackage{apptools}
 \RequirePackage[toc,page]{appendix}
 
+\setcounter{secnumdepth}{5}
 
 \titleformat{\chapter}[\style]{\bfseries}
-{\filcenter\LARGE\enspace\bfseries{\color{main}\IfAppendix{\appendixname}{\chaptername}\enspace}}{1pt}{\bfseries\color{main}\LARGE\filcenter}[\filcenter\base{main}{88}]
+{\filcenter\LARGE\enspace\bfseries{\color{structurecolor}\IfAppendix{\appendixname}{\chaptername}\enspace}}{1pt}{\bfseries\color{structurecolor}\LARGE\filcenter}[\ifdefstring{\ELEGANT at base}{hide}{}{\filcenter\base{structurecolor}{88}}]
 
 \titleformat{\section}[hang]{\bfseries}
-{\hspace{-2.45em}\Large\bfseries{\color{main}\thesection}\enspace}{1pt}{\color{main}\Large\bfseries\filright}
+{\hspace{-2.45em}\Large\bfseries{\color{structurecolor}\thesection}\enspace}{1pt}{\color{structurecolor}\Large\bfseries\filright}
 
 \titleformat{\subsection}[hang]{\bfseries}
-{\hspace{-2.45em}\large\bfseries\color{main}\thesubsection\enspace}{1pt}{\color{main}\large\bfseries\filright}
+{\hspace{-2.45em}\large\bfseries\color{structurecolor}\thesubsection\enspace}{1pt}{\color{structurecolor}\large\bfseries\filright}
 
 \titleformat{\subsubsection}[hang]{\bfseries}
-{\hspace{-2.45em}\large\bfseries\color{main}\thesubsection\enspace}{1pt}{\color{main}\large\bfseries\filright}
+{\hspace{-2.45em}\large\bfseries\color{structurecolor}\thesubsubsection\enspace}{1pt}{\color{structurecolor}\large\bfseries\filright}
 
 
-\titlespacing{\chapter}{0pt}{0pt}{1.5\baselineskip}
+\titlespacing{\chapter}{0pt}{-20pt}{1.3\baselineskip}
 %\titlespacing{\subsection}{0pt}{0.5\baselineskip}{-\baselineskip}
 
 
 
-
+%%define the note and proof environment
+\RequirePackage{pifont,manfnt,bbding}
 % list/itemize/enumerate setting
 \RequirePackage[shortlabels]{enumitem}
 \setlist{nolistsep}
 
-\RequirePackage[most]{tcolorbox}
 
+\RequirePackage[many]{tcolorbox}
+\ifdefstring{\ELEGANT at mode}{fancy}{
 \tcbset{
     common/.style={
-        fontupper=\itshape,
+        fontupper=\ifdefstring{\ELEGANT at lang}{en}{\itshape}{\upshape\kaishu},
         lower separated=false,
         coltitle=white,
-        colback=gray!10,
+        colback=gray!5,
+        boxrule=0.5pt,
         fonttitle=\bfseries,
         enhanced,
         breakable,
@@ -313,11 +351,12 @@
         before skip=8pt,
         attach boxed title to top left={yshift=-0.11in,xshift=0.15in},
         boxed title style={boxrule=0pt,colframe=white,arc=0pt,outer arc=0pt},
-        % separator sign={:},
+        separator sign={.},
     },
     defstyle/.style={
         common,
         colframe=main,  
+        colback=main!5,
         colbacktitle=main, 
         overlay unbroken and last={\node[anchor=south east, outer sep=6pt] at (\textwidth-width,0) {\textcolor{main}{$\clubsuit$}}; }
     },
@@ -324,6 +363,7 @@
     thmstyle/.style={
         common,
         colframe=second,  
+        colback=second!5,
         colbacktitle=second, 
         overlay unbroken and last={\node[anchor=south east, outer sep=6pt] at (\textwidth-width,0) {\textcolor{second}{$\heartsuit$}}; }
     },
@@ -330,6 +370,7 @@
     propstyle/.style={
         common,
         colframe=third,  
+        colback=third!5,
         colbacktitle=third, 
         overlay unbroken and last={\node[anchor=south east, outer sep=6pt] at (\textwidth-width,0) {\textcolor{third}{$\spadesuit$}}; }
     },
@@ -355,13 +396,86 @@
 	\ifdefstring{\ELEGANT at lang}{en}{Lemma}{引理}
 }{thmstyle}{lem}
 
+}{\relax}
 
+\ifdefstring{\ELEGANT at mode}{simple}{
+\let\openbox\relax
+\RequirePackage{amsthm}
+\let\proof\relax
+\let\endproof\relax
+% declare a new theorem style
+\newtheoremstyle{edefstyle}%
+{3pt}% Space above
+{3pt}% Space below 
+{\ifdefstring{\ELEGANT at 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’)
+% -------------------------------------------------%
+\newtheoremstyle{ethmstyle}%
+{3pt}% Space above
+{3pt}% Space below 
+{\ifdefstring{\ELEGANT at lang}{en}{\itshape}{\upshape\kaishu}}% Body font
+{}% Indent amount
+{\bfseries\color{second}}% 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’)
+% -------------------------------------------------%
+\newtheoremstyle{eprostyle}%
+{3pt}% Space above
+{3pt}% Space below 
+{\ifdefstring{\ELEGANT at lang}{en}{\itshape}{\upshape\kaishu}}% Body font
+{}% Indent amount
+{\bfseries\color{third}}% 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’)
+
+\theoremstyle{edefstyle}
+\newtheorem{edefinition}{\ifdefstring{\ELEGANT at lang}{en}{Definition}{定义}}[chapter]
+
+\theoremstyle{ethmstyle}
+\newtheorem{etheorem}{\ifdefstring{\ELEGANT at lang}{en}{Theorem}{定理}}[chapter]
+\newtheorem{elemma}{\ifdefstring{\ELEGANT at lang}{en}{Lemma}{引理}}[chapter]
+\newtheorem{ecorollary}{\ifdefstring{\ELEGANT at lang}{en}{Corollary}{推论}}[chapter]
+
+\theoremstyle{eprostyle}
+\newtheorem{eproposition}{\ifdefstring{\ELEGANT at lang}{en}{Proposition}{命题}}[chapter]
+
+\newenvironment{theorem}[2]
+  {\ifstrempty{#1}{\etheorem}{\etheorem[#1]}\ifstrempty{#2}{}{\label{thm:#2}}}
+  {\endetheorem}
+
+\newenvironment{definition}[2]
+  {\ifstrempty{#1}{\edefinition}{\edefinition[#1]}\ifstrempty{#2}{}{\label{def:#2}}}
+  {\endedefinition}
+
+\newenvironment{lemma}[2]
+  {\ifstrempty{#1}{\elemma}{\elemma[#1]}\ifstrempty{#2}{}{\label{lem:#2}}}
+  {\endelemma}
+
+\newenvironment{corollary}[2]
+  {\ifstrempty{#1}{\ecorollary}{\ecorollary[#1]}\ifstrempty{#2}{}{\label{cor:#2}}}
+  {\endecorollary}
+
+\newenvironment{proposition}[2]
+  {\ifstrempty{#1}{\eproposition}{\eproposition[#1]}\ifstrempty{#2}{}{\label{pro:#2}}}
+  {\endeproposition}
+}{\relax}
+
+% main(green-def): example exercise problem solution
+% second(orange-thm): proof note remark  
+% third(blue-prop):  assumptions property conclusion custom
+
 %% Example with counter
 \newcounter{exam}[chapter]
 \setcounter{exam}{0}
 \renewcommand{\theexam}{\thechapter.\arabic{exam}}
 \newenvironment{example}[1][]{
- 		\refstepcounter{exam}\par\medskip\noindent \textbf{\color{main}{
+ 		\refstepcounter{exam}\par\noindent\textbf{\color{main}{
  			\ifdefstring{\ELEGANT at lang}{en}{Example}{例}
  		}~\theexam #1: }\rmfamily %
  	}{
@@ -373,7 +487,7 @@
 \setcounter{exer}{0}
 \renewcommand{\theexer}{\thechapter.\arabic{exer}}
 \newenvironment{exercise}[1][]{
- 		\refstepcounter{exer}\par\medskip\noindent \textbf{\color{main}{
+ 		\refstepcounter{exer}\par\noindent\makebox[-3pt][r]{\scriptsize\color{red!90}\HandPencilLeft\quad}\textbf{\color{main}{
  			\ifdefstring{\ELEGANT at lang}{en}{Exercise}{练习}
  		}~\theexer #1: }\rmfamily %
  	}{
@@ -385,7 +499,7 @@
 \setcounter{prob}{0}
 \renewcommand{\theprob}{\thechapter.\arabic{prob}}
 \newenvironment{problem}[1][]{
- 		\refstepcounter{prob}\par\medskip\noindent \textbf{\color{main}{
+ 		\refstepcounter{prob}\par\noindent\textbf{\color{main}{%
  			\ifdefstring{\ELEGANT at lang}{en}{Problem}{例题}
  		}~\theprob #1: }\rmfamily %
  	}{
@@ -392,32 +506,43 @@
  		\par\medskip\ignorespacesafterend %
  	}
 
-%%define the note and proof environment
-\RequirePackage{pifont,manfnt}
 
-\newenvironment{note}{\par\noindent{\makebox[0pt][r]{\scriptsize\color{red!90}\textdbend\quad}\textbf{\color{main}
+
+\newenvironment{note}{\par\noindent{\makebox[0pt][r]{\scriptsize\color{red!90}\textdbend\quad}\textbf{\color{second}
 	\ifdefstring{\ELEGANT at lang}{en}{Note:}{注意:}
-}}\itshape}{\par}
+}}\ifdefstring{\ELEGANT at lang}{en}{\itshape}{\kaishu}}{\par}
 
-\newenvironment{proof}{\par\noindent\textbf{\color{main}
+\newenvironment{proof}{\par\noindent\textbf{\color{second}
 	\ifdefstring{\ELEGANT at lang}{en}{Proof:}{证明:}
-}\color{black!90}\small}{\hfill$\Box$\quad\par}
-\newenvironment{remark}{\noindent\textbf{\color{main}
+}\color{black!90}\small}{
+%\hfill$\Box$\quad
+\par}
+\newenvironment{remark}{\noindent\textbf{\color{second}
 	\ifdefstring{\ELEGANT at lang}{en}{Remark:}{注:}
 }}{\par}
-\newenvironment{assumption}{\par\noindent\textbf{\color{main}
+\newenvironment{assumption}{\par\noindent\textbf{\color{third}
 	\ifdefstring{\ELEGANT at lang}{en}{Assumption:}{假设:}
 }}{\par}
-\newenvironment{conclusion}{\par\noindent\textbf{\color{main}
+\newenvironment{conclusion}{\par\noindent\textbf{\color{third}
 	\ifdefstring{\ELEGANT at lang}{en}{Conclusion:}{结论:}
 }}{\par}
 \newenvironment{solution}{\par\noindent\textbf{\color{main}
 	\ifdefstring{\ELEGANT at lang}{en}{Solution:}{解:}
 }}{\par}
-\newenvironment{property}{\par\noindent\textbf{\color{main}
+\newenvironment{property}{\par\noindent\textbf{\color{third}
 	\ifdefstring{\ELEGANT at lang}{en}{Property:}{性质:}
 }}{\par}
+\newenvironment{custom}[1]{\par\noindent\textbf{\color{third}
+	\ifdefstring{\ELEGANT at lang}{en}{#1:}{#1:}
+}}{\par}
 
+\ifdefstring{\ELEGANT at result}{noanswer}{
+	\AtBeginDocument{
+	\excludecomment{solution}
+	\excludecomment{proof}
+	\excludecomment{inline}
+	}
+}{\relax}
 
 
 %页眉页脚
@@ -424,13 +549,21 @@
 \RequirePackage{fancyhdr}
 \RequirePackage{lastpage}
 \fancyhf{}
-\fancyhead[EL,OR]{\color{main}--\thepage/\pageref*{LastPage}--}
-\fancyhead[ER]{\color{main}\em\nouppercase\leftmark{}}
-\fancyhead[OL]{\color{main}\em\nouppercase\rightmark}
-\fancyfoot[c]{\base{main}{88}}
-\renewcommand{\headrule}{\color{main}\hrule width\textwidth}
+
+\if at twoside
+\fancyhead[EL,OR]{\color{structurecolor}\ifdefstring{\ELEGANT at lang}{en}{\itshape}{\kaishu}--\thepage/\pageref*{LastPage}--}
+\fancyhead[ER]{\color{structurecolor}\ifdefstring{\ELEGANT at lang}{en}{\itshape}{\kaishu}\leftmark{}}
+\fancyhead[OL]{\color{structurecolor}\ifdefstring{\ELEGANT at lang}{en}{\itshape}{\kaishu}\rightmark}
+\else
+\fancyhead[R]{\color{structurecolor}\ifdefstring{\ELEGANT at lang}{en}{\itshape}{\kaishu}--\thepage/\pageref*{LastPage}--}
+\fancyhead[L]{\color{structurecolor}\ifdefstring{\ELEGANT at lang}{en}{\itshape}{\kaishu}\rightmark}
+\fi
+
+\fancyfoot[c]{\base{structurecolor}{88}}
+\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\;}{}}
@@ -438,44 +571,57 @@
 %%封面
 \newcommand*{\equote}[1]{\def\@equote{#1}}
 
+\def\IfEmpty#1{%
+  \edef\1{\the#1}
+  \ifx\1\empty
+}
+\def \ifempty#1{\def\temp{#1} \ifx\temp\empty }
+
 \newcommand*{\logo}[1]{
- \def\@logo{\includegraphics[width=0.3\textwidth]{#1}
+ \def\@logo{\includegraphics[width=4.2cm]{#1}
  }
 }
 \newcommand*{\cover}[1]{
- \def\@logo{\includegraphics[width=\linewidth]{cover.jpg}
+ \def\@cover{\includegraphics[width=\linewidth]{#1}
  }
 }
 
+
+\renewcommand{\baselinestretch}{1.35} 
+
 \renewcommand*{\maketitle}{%
 \hypersetup{pageanchor=false}
 \begin{titlepage}
-	\newpage
 	\newgeometry{margin = 0in}
 	\parindent=0pt
-	\renewcommand\baselinestretch{2.5}
-	\includegraphics[width=\linewidth]{cover.jpg}
+	\@cover
 	\setlength{\fboxsep}{0pt}
 	\colorbox{second}{\makebox[\linewidth][c]{\shortstack[c]{\vspace{0.5in}}}}
 	\vfill
-	\hfill
+	\vskip-2ex
 	\hspace{2em}
+	\parbox{0.8\textwidth}{
+		\bfseries\Huge \@title\par
+	}
+	\vfill
+	\vspace{-1.0cm}
+	\setstretch{2.5}
+	\hspace{2.5em}
 	\begin{minipage}[c]{0.68\linewidth}
-		{\bfseries\Huge \@title\\}
 		{\color{darkgray}\bfseries\Large \the\subtitle\\[2ex]}
 		\color{gray}\kaishu\normalsize
 		{\renewcommand{\arraystretch}{0.618}
 		\begin{tabular}{l} 
-			\ifdefstring{\ELEGANT at lang}{en}{\textbf{Author: }}{\textbf{作者:}}\@author \\
-			\ifdefstring{\ELEGANT at lang}{en}{\textbf{Institute: }}{\textbf{组织:}}\the\institute\\
-			\ifdefstring{\ELEGANT at lang}{en}{\textbf{Update: }}{\textbf{更新:}}\@date\\
-			\ifdefstring{\ELEGANT at lang}{en}{\textbf{Version: }}{\textbf{版本:}}\the\version \\ 
+			\ifdefstring{\ELEGANT at lang}{en}{\textbf{Author: }}{\textbf{作者:}} \@author \\
+			\ifdefstring{\ELEGANT at lang}{en}{\textbf{Institute: }}{\textbf{组织:}} \the\institute\\
+			\ifdefstring{\ELEGANT at lang}{en}{\textbf{Date: }}{\textbf{时间:}} \@date\\
+			\ifdefstring{\ELEGANT at lang}{en}{\textbf{Version: }}{\textbf{版本:}} \the\version\\
 		\end{tabular}}
 	\end{minipage}
 	\begin{minipage}[c]{0.27\linewidth}
 	\begin{tikzpicture}[remember picture,overlay]
 		\begin{pgfonlayer}{background}
-		  \node[opacity=0.8,anchor=south east,outer sep=0pt,inner sep=0pt] at ($(current page.south east) +(-0.8in,1.5in)$) {\includegraphics[width=0.7\textwidth]{logo.png}};
+		  \node[opacity=0.8,anchor=south east,outer sep=0pt,inner sep=0pt] at ($(current page.south east) +(-0.8in,1.5in)$) {\@logo};
 		\end{pgfonlayer}
 	\end{tikzpicture}
 	\end{minipage}
@@ -482,29 +628,42 @@
 	\vfill
 	\centerline{\itshape \@equote}
 	\vfill
-	\restoregeometry
 \end{titlepage}
+\restoregeometry
 \thispagestyle{empty}
 }
 
+
+
+
 \RequirePackage{listings} 
+\renewcommand{\ttdefault}{cmtt}
+\lstdefinestyle{mystyle}{
+  basicstyle=%
+    \ttfamily
+    \lst at ifdisplaystyle\small\fi
+}
+
+\lstset{basicstyle=\ttfamily,style=mystyle}
+
 \definecolor{lightgrey}{rgb}{0.9,0.9,0.9}
 \definecolor{frenchplum}{RGB}{190,20,83}
 \lstset{language=[LaTeX]TeX,
-	texcsstyle=*\bf\color{winered}\ttfamily,
-	basicstyle=\ttfamily,
+	texcsstyle=*\color{winered},
 	numbers=none,
 	breaklines=true,
-	keywordstyle=\bf\color{winered}\ttfamily,
+	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},
 	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},
-	frame=none,
+	frame=single,
 	tabsize=2,
-	rulecolor=\color{main},
+	rulecolor=\color{structurecolor},
+	framerule=0.2pt,
+	columns=flexible,
+	% backgroundcolor=\color{lightgrey}
 }
 
-\bibliographystyle{aer}
 
 



More information about the tex-live-commits mailing list