diff options
author | Karl Berry <karl@freefriends.org> | 2021-05-02 20:41:39 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2021-05-02 20:41:39 +0000 |
commit | b3c9da64133509370b373118b06bf35a1af71c83 (patch) | |
tree | ffe3aa72597a94bd894cab42c6329038344ce87a | |
parent | fa95ee22e0b804d72ae1da50d8c34383455a991d (diff) |
elegantbook (2may21)
git-svn-id: svn://tug.org/texlive/trunk@59053 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r-- | Master/texmf-dist/doc/latex/elegantbook/README-CN.md | 32 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/elegantbook/README.md | 117 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/elegantbook/elegantbook-cn.pdf | bin | 1347213 -> 1107125 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/elegantbook/elegantbook-cn.tex | 362 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/elegantbook/elegantbook-en.pdf | bin | 1385543 -> 1082920 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/elegantbook/elegantbook-en.tex | 333 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/elegantbook/figure/logo.png | bin | 91663 -> 0 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/elegantbook/image/scatter.jpg | bin | 0 -> 113385 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/elegantbook/image/scatter.pdf | bin | 16037 -> 0 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/elegantbook/image/scatter.py | 27 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/elegantbook/image/tlshell.png | bin | 129547 -> 0 bytes | |||
-rw-r--r-- | Master/texmf-dist/tex/latex/elegantbook/elegantbook.cls | 500 |
12 files changed, 712 insertions, 659 deletions
diff --git a/Master/texmf-dist/doc/latex/elegantbook/README-CN.md b/Master/texmf-dist/doc/latex/elegantbook/README-CN.md new file mode 100644 index 00000000000..1b31dab34ad --- /dev/null +++ b/Master/texmf-dist/doc/latex/elegantbook/README-CN.md @@ -0,0 +1,32 @@ +<!-- Author : Dongsheng Deng & Liam Huang--> +<!-- Program Email: elegantlatex2e@gmail.com --> + +[Homepage](https://elegantlatex.org/) | [Github](https://github.com/ElegantLaTeX/ElegantBook) | [CTAN](https://ctan.org/pkg/elegantbook) | [Download](https://github.com/ElegantLaTeX/ElegantBook/releases) | [Wiki](https://github.com/ElegantLaTeX/ElegantBook/wiki) | [Weibo](https://weibo.com/elegantlatex) + +![License](https://img.shields.io/ctan/l/elegantbook.svg) ![CTAN Version](https://img.shields.io/ctan/v/elegantbook.svg) ![Github Version](https://img.shields.io/github/release/ElegantLaTeX/ElegantBook.svg) ![Repo Size](https://img.shields.io/github/repo-size/ElegantLaTeX/ElegantBook.svg) + +--- + +# ElegantBook 优美的 LaTeX 书籍模板 + +ElegantBook 是为 LaTeX 书籍写作而设计的模板,由 [Dongsheng Deng](https://ddswhu.me/) 和 [Liam Huang](https://liam.page/) 创立,模板创立的初衷是方便我们自己做笔记 :smile:。如果你有其他问题、建议或者报告 bug,可以提交 issues 或者给我们发邮件:elegantlatex2e@gmail.com。QQ 用户交流群:692108391,欢迎加入。 + +## 重要提示 + +**重要提示**:ElegantLaTeX 项目 **不接受** 任何非预授权的提交(pull requests)! + +## 致谢 + +特别感谢 ChinaTeX 以及 [LaTeX 工作室](http://www.latexstudio.net/)对于本系列模板的大力宣传与推广。 + +如果你喜欢我们的模板,你可以在 Github 上收藏我们的模板。 + +## 协议 + +本模板发布遵循 LaTeX 项目公共许可证 1.3 c 或更高版本。如果是衍生作品,请务必加入协议声明和模板信息(github、CTAN 地址)。 + +## 衍生作 + ++ [ElegantBookdown](https://github.com/XiangyunHuang/ElegantBookdown):[XiangyunHuang](https://github.com/XiangyunHuang) 开发并维护的基于 ElegantBook 的 Bookdown 模板。 ++ [bookdownplus](https://github.com/pzhaonet/bookdownplus):应网友要求,[pzhaonet](https://github.com/pzhaonet) 在 bookdownplus 收录了 ElegantPaper 模板,并为 Mac 做了字体适配。 ++ [PanBook](https://github.com/annProg/PanBook):[annProg](https://github.com/annProg) 开发并维护的基于 Markdown 写作的工作流,收录了 ElegantBook 和 ElegantPaper 模板。
\ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/elegantbook/README.md b/Master/texmf-dist/doc/latex/elegantbook/README.md index e0695d071f7..582d36380cb 100644 --- a/Master/texmf-dist/doc/latex/elegantbook/README.md +++ b/Master/texmf-dist/doc/latex/elegantbook/README.md @@ -5,82 +5,6 @@ ![License](https://img.shields.io/ctan/l/elegantbook.svg) ![CTAN Version](https://img.shields.io/ctan/v/elegantbook.svg) ![Github Version](https://img.shields.io/github/release/ElegantLaTeX/ElegantBook.svg) ![Repo Size](https://img.shields.io/github/repo-size/ElegantLaTeX/ElegantBook.svg) ---- - -# ElegantBook 优美的 LaTeX 书籍模板 - -ElegantBook 是为 LaTeX 书籍写作而设计的模板,由 [Dongsheng Deng](https://ddswhu.me/) 和 [Liam Huang](https://liam.page/) 创立,模板创立的初衷是方便我们自己做笔记 :smile:。如果你有其他问题、建议或者报告 bug,可以提交 issues 或者给我们发邮件:elegantlatex2e@gmail.com。QQ 用户交流群:692108391,欢迎加入。 - -## 重要提示 - -**版本提醒:** 由于新版本进行了重构,并且 3.06 版本对于封面进行了改版,3.06 以后的版本并不兼容之前版本,如果你想把之前版本的文件转为 3.06 以后的版本,请查看[跨版本转换](https://github.com/ElegantLaTeX/ElegantBook/wiki/convert)。我们强烈建议你使用最新版。 - -**重要提示**:ElegantLaTeX 项目 **不接受** 任何非作者预约提交(pull requests)! - -## 致谢 - -2019 年 5 月 20 日,ElegantBook 模板在 Github 上的 Star 数达到了 100,这对于 ElegantLaTeX 系列模板是一个非常重要的里程碑!在此特别感谢 ChinaTeX 以及 [LaTeX 工作室](http://www.latexstudio.net/)对于本系列模板的大力宣传与推广。LaTeX 工作室网站上有很多精彩的帖子和精致的模板,欢迎大家去挖掘里面的宝藏。这也是我所见到的国内最全面的 LaTeX 相关的网站。 - -如果你喜欢我们的模板,你可以在 Github 上收藏我们的模板。 - -## 捐赠 - -如果您非常喜爱我们的模板或者我,你还可以选择捐赠以表达您对我们模板和我的支持。本模板自 3.08 版本发布了捐赠信息之后,收到了超过千元的捐赠(四舍五入就是一个亿),非常感谢! - -![](https://github.com/ElegantLaTeX/ElegantBook/wiki/donate.jpg) - -**赞赏费用的使用解释权归 ElegantLaTeX 所有,并且不接受监督,请自愿理性打赏**。10 元以上的赞赏,我们将列入捐赠榜,谢谢各位金主!(如果有遗漏,请务必联系我们,这对我们很重要) - - -| 捐赠者 | 金额 | 时间 | 渠道 | -| :------: | :----: | :----: | :------: | -| Lerh | 10 RMB | 2019/05/15 | 微信 | -| 越过地平线 | 10 RMB | 2019/05/15 | 微信 | -| 银桑 | 20 RMB | 2019/05/27 | 微信 | -| *空 | 10 RMB | 2019/05/30 | 微信 | -| [latexstudio.net](http://www.latexstudio.net) | 666 RMB | 2019/06/05 | 支付宝 | -| Cassis | 11 RMB | 2019/06/30 | 微信 | -| *君 | 10 RMB | 2019/07/23 | 微信 | -| P*u | 50 RMB | 2019/07/30 | 微信 | -| *萌 | 19 RMB | 2019/08/28 | 微信 | -| 曲豆豆 | 10 RMB | 2019/08/28 | 微信 | -| 李博 | 100 RMB | 2019/10/06 | 微信 | -| Njustsll | 10 RMB | 2019/10/11 | 微信 | -| 刘志阔 | 99.99 RMB | 2019/10/15 | 支付宝 | -| *涛 | 16 RMB | 2019/10/17 | 微信 | -| 赤霓 | 12 RMB | 2019/10/17 | 支付宝 | -| 追寻原风景 | 10 RMB | 2019/10/28 | 微信 | -| 郭德良 | 88 RMB | 2019/11/03 | 微信 | -| 自强不息 | 20 RMB | 2019/11/04 | 支付宝 | -| 读书之虫 | 20 RMB | 2019/11/18 | 微信 | -| *等 | 10 RMB | 2019/11/18 | 微信 | -| *哲 | 20 RMB | 2019/11/18 | 微信 | -| 佚名 | 10 RMB | 2019/11/24 | 微信 | -| Jiye Qian | 66 RMB | 2019/12/04 | 微信 | -| * 阳 | 20 RMB | 2019/12/05 | 微信 | -| Catcher | 11 RMB | 2019/12/08 | 支付宝 | -| 希尔波特门徒 | 10 RMB | 2019/12/09 | 支付宝 | -| * 伟 | 10 RMB | 2019/12/09 | 微信 | -| Simon | 20 RMB | 2019/12/11 | 支付宝 | -| 流殇丶浅忆 | 66.60 RMB | 2019/12/18 | 支付宝 | -| 羽 | 10 RMB | 2019/12/20 | 支付宝 | -| * 琛 | 15 RMB | 2019/12/20 | 微信 | -| 随风 | 20 RMB | 2019/12/27 | 支付宝 | -| Ws | 23.30 RMB | 2019/12/28 | 微信 | - - -再次感谢大家对于模板的喜爱! - -## 协议 - -本模板发布遵循 LaTeX 项目公共许可证 1.3 c 或更高版本。如果是衍生作品,请务必加入协议声明和模板信息(github、CTAN 地址)。 - -## 衍生作 - -+ [ElegantBookdown](https://github.com/XiangyunHuang/ElegantBookdown):[XiangyunHuang](https://github.com/XiangyunHuang) 开发并维护的基于 ElegantBook 的 Bookdown 模板。 -+ [bookdownplus](https://github.com/pzhaonet/bookdownplus):应网友要求,[pzhaonet](https://github.com/pzhaonet) 在 bookdownplus 收录了 ElegantPaper 模板,并为 Mac 做了字体适配。 -+ [PanBook](https://github.com/annProg/PanBook):[annProg](https://github.com/annProg) 开发并维护的基于 Markdown 写作的工作流,收录了 ElegantBook 和 ElegantPaper 模板。 - ------- # ElegantBook: An Elegant LaTeX Template for Books @@ -89,48 +13,11 @@ ElegantBook is designed for writing books, created by [Dongsheng Deng](https://d ## Important Notes -**Version Note**: Users for 2.x, please refer to [Version Convert](https://github.com/ElegantLaTeX/ElegantBook/wiki/convert). We strongly recommend that you use the latest version. - -**Important Info**: For some reasons, __unauthorial__ pull requests are **UNACCEPTABLE** since May 20, 2019. For those who want to help revise the templates, submit issues or clone to your own repository to modify under the LPPL-1.3c. +For some reasons, __unauthorized__ pull requests are **UNACCEPTABLE** since May 20, 2019. For those who want to help revise the templates, submit issues or clone to your own repository to modify under the LPPL-1.3c. ## Acknowledgement -_News_: _The number of stars on Github for ElegantBook reached 100 on May 20, 2019_. - -Thank ChinaTeX and [LaTeX Studio](http://www.latexstudio.net/) for their promotion. LaTeX studio offers tons of valuable posts and templates for discovery. It is the most comprehensive website on LaTeX in China. If you like our template, star on Github for supporting us. - -## Donation - -To express your love for our templates and/or our developers, please do not hesitate to tip us. Since last release of 3.08, we have received about a thousand RMB! (The emergence of a millionaire is on the way. Loading... ) - -![](https://github.com/ElegantLaTeX/ElegantBook/wiki/donate.jpg) - -The explanation right of the tip usage belongs to ElegantLaTeX with no supervision. Feel free to tip us. Those who donate more than 10 RMB will be recorded in the Donation List. Thank all the tippers! Thank you all. - - -| Tipper | Amount | Date | Channel | -| :--------------: | :----: | :-------: | :-----: | -| Lerh | 10 RMB | 2019/5/15 | Wechat | -| YueGuoDiPingXian | 10 RMB | 2019/5/15 | Wechat | -| YinSang | 20 RMB | 2019/5/27 | Wechat | -| * Kong | 10 RMB | 2019/05/30 | Wechat | -| [latexstudio.net](http://www.latexstudio.net) | 666 RMB | 2019/06/05 | Alipay | -| Cassis | 11 RMB | 2019/06/30 | Wechat | -| * Jun | 10 RMB | 2019/07/23 | Wechat | -| P*u | 50 RMB | 2019/07/30 | Wechat | -| * Meng | 19 RMB | 2019/08/28 | Wechat | -| QuDouDou | 10 RMB | 2019/08/28 | Wechat | -| LI Bo | 100 RMB | 2019/10/06 | Wechat | -| Njustsll | 10 RMB | 2019/10/11 | Wechat | -| LIU ZhiKuo | 99.99 RMB | 2019/10/15 | Alipay | -| * Tao | 16 RMB | 2019/10/17 | Wechat | -| ChiHong | 12 RMB | 2019/10/17 | Alipay | -| YuanFengJing | 10 RMB | 2019/10/28 | Wechat | -| GUO DeLiang | 88 RMB | 2019/11/03 | Wechat | -| ZiQiangBuXi | 20 RMB | 2019/11/03 | Alipay | -| DuShuZhiChong | 20 RMB | 2019/11/18 | Wechat | -| * Deng | 10 RMB | 2019/11/18 | Wechat | -| * Zhe | 20 RMB | 2019/11/18 | Wechat | +Thank ChinaTeX and [LaTeX Studio](http://www.latexstudio.net/) for their promotion. ## License diff --git a/Master/texmf-dist/doc/latex/elegantbook/elegantbook-cn.pdf b/Master/texmf-dist/doc/latex/elegantbook/elegantbook-cn.pdf Binary files differindex 344c848843f..efecb615561 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 1d328f73c52..714436ee70c 100644 --- a/Master/texmf-dist/doc/latex/elegantbook/elegantbook-cn.tex +++ b/Master/texmf-dist/doc/latex/elegantbook/elegantbook-cn.tex @@ -1,15 +1,17 @@ -\documentclass[cn,11pt,chinese]{elegantbook} +\documentclass[cn,10pt,math=newtx,citestyle=gb7714-2015,bibstyle=gb7714-2015]{elegantbook} \title{ElegantBook:优美的 \LaTeX{} 书籍模板} \subtitle{Elegant\LaTeX{} 经典之作} \author{Ethan Deng \& Liam Huang} \institute{Elegant\LaTeX{} Program} -\date{April 12, 2020} -\version{3.11} +\date{May 2, 2021} +\version{4.1} \bioinfo{自定义}{信息} -\extrainfo{温柔正确的人总是难以生存,因为这世界既不温柔,也不正确。—— 比企谷八幡} +\extrainfo{各人自扫门前雪,休管他人瓦上霜。—— 陈元靓} + +\setcounter{tocdepth}{3} \logo{logo-blue.png} \cover{cover.jpg} @@ -18,23 +20,27 @@ \usepackage{array} \newcommand{\ccr}[1]{\makecell{{\color{#1}\rule{1cm}{1cm}}}} +\definecolor{customcolor}{RGB}{32,178,170} +\colorlet{coverlinecolor}{customcolor} + \begin{document} \maketitle \frontmatter \chapter*{特别声明} + \markboth{Introduction}{前言} -在过去的 2019 年,\href{https://elegantlatex.org/}{Elegant\LaTeX{}} 系列模板均逐步上线 \href{https://github.com/ElegantLaTeX}{GitHub}、\href{https://ctan.org/pkg/elegantbook}{CTAN}、\href{https://www.overleaf.com/latex/templates/elegantbook-template/zpsrbmdsxrgy}{Overleaf} 以及 \href{https://gitee.com/ElegantLaTeX/ElegantBook}{Gitee} 上。截止到 2019 年底,ElegantNote、ElegantBook、ElegantPaper 三个模板在 GitHub 上的收藏数达到了 194、333 和 220,从 2019 年 5 月开启捐赠之后收到了用户 33 笔合计超过 1500 元的捐赠,用户群人数也超过了 400 人。这些数字的背后,反映出 Elegant\LaTeX{} 越来越受用户的喜爱,在此非常感谢大家。 +自 2019 年 Elegant\LaTeX{} 系列模板上线 GitHub、CTAN 以来,受到很多用户的喜爱。 -但是,我想声明的是: +2020 年,我打算做 Elegant\LaTeX{} 的最后一个版本,也就是原定计划 ElegantBook 4.x 版本为 Elegant\LaTeX{} 系列模板的终止符。基于我想把 4.x 做成一个最终版本,我计划了很多事情,包括将代码转为 dtx,将三个模板的文档打包进 dtx 里面,然后重新设计封面,补充各种页面,增加元素等等。我想的很多,但是做起来并不是很顺利,中间也发生了很多事情,不想解释。直至今年 4 月,我决定,不论如何,先把 4.1 发布出来。 -\begin{center} - 由于某些原因,Elegant\LaTeX{} 项目 \underline{不再接受}\textbf{任何}非我本人预约的提交。 -\end{center} +\vskip 0.5cm -我是一个理想主义者,关于这个模板,我有自己的想法。我所关心的是,我周围的人能方便使用 \LaTeX{} 以及此模板,我自己会为自己的东西感到开心。如果维护模板让我不开心,那我就不会再维护了。诚然这个模板并不是完美的,但是相比 2.x 好很多了,这些改进离不开大家的反馈、China\TeX{} 和逐鹿人的鼓励以及支援人员的帮助! +另外,在临近 Elegant\LaTeX{} 模板告别之际,我想和各位用户说:多分享,多奉献。 + +\vskip 0.5cm \underline{如果你无法认同我的想法,建议直接删除本模板。} @@ -42,13 +48,13 @@ \begin{flushright} Ethan Deng\\ -February 10, 2020 +May 2, 2021 \end{flushright} \tableofcontents -%\listofchanges \mainmatter + \chapter{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} 组成,分别用于排版笔记,书籍和工作论文。强烈推荐使用最新正式版本!本文将介绍本模板的一些设置内容以及基本使用方法。如果您有其他问题,建议或者意见,欢迎在 GitHub 上给我们提交 \href{https://github.com/ElegantLaTeX/ElegantBook/issues}{issues} 或者邮件联系我们。 @@ -58,7 +64,6 @@ Elegant\LaTeX{} 项目组致力于打造一系列美观、优雅、简便的模 \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 微博:Elegant\LaTeX{} \item 微信公众号:Elegant\LaTeX{} @@ -69,13 +74,15 @@ Elegant\LaTeX{} 项目组致力于打造一系列美观、优雅、简便的模 \section{ElegantBook 更新说明} -此次为 3.x 最后一个版本,在 3.10 基础上,主要为了解决 \TeX{} Live 2020 中编译错误,具体内容有: +此次为 4.x 第一个版本,在 3.x 基础上,主要更新了定理以及参考文献的支持方式,具体内容有: \begin{enumerate} - \item \textbf{重要修正}:修复因为 \lstinline{gbt7714} 宏包更新导致的 \lstinline{natbib option clash} 错误; - \item 由于 \lstinline{pgfornament} 宏包未被 \TeX Live 2020 收录,因此删除 base 相关的内容; - \item 修复部分环境的空格问题; - \item 增加了意大利语言选项 \lstinline{lang=it}。 + \item \textbf{重要改动}:由原先的 \hologo{BibTeX} 改为 biblatex 编译方式(后端为 \lstinline{biber}),请注意两者之间的差异; + \item \textbf{重要改进}:修改对于定理写法兼容方式,提高数学公式代码的兼容性; + \item 页面设置改动,默认页面更宽;方便书写和阅读; + \item 支持目录文字以及页码跳转; + \item 不再维护 \hologo{pdfLaTeX} 中文支持方式,请务必使用 \hologo{XeLaTeX} 编译中文文稿。 + \item 增加多语言选项,法语 \lstinline{lang=fr}、德语 \lstinline{lang=de}、荷兰语 \lstinline{lang=nl}、匈牙利语 \lstinline{lang=hu}、西班牙语 \lstinline{lang=es}、蒙古语 \lstinline{lang=mn} 等。 \end{enumerate} \begin{note} @@ -96,18 +103,11 @@ Overleaf 上,中文需要使用 \hologo{XeLaTeX} 进行编译,英文建议 \subsection{本地免安装使用} - -\textbf{免安装}使用方法如下,从 GitHub 或者 CTAN 下载最新(正式)版文件,严格意义上只需要类文件 \lstinline{elegantbook.cls}。然后将模板文件放在你的工作目录下即可使用。这样使用的好处是,无需安装,简便;缺点是,当模板更新之后,你需要手动替换 \lstinline{cls} 文件。 +\textbf{免安装}使用方法如下,从 GitHub 或者 CTAN 下载最新版,严格意义上只需要类文件 \lstinline{elegantbook.cls}。然后将模板文件放在你的工作目录下即可使用。这样使用的好处是,无需安装,简便;缺点是,当模板更新之后,你需要手动替换 \lstinline{cls} 文件。 \subsection{发行版安装使用} -如果你是 \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} +本模板测试环境为 Win10 和 TeX Live 2021,如果你刚安装 \TeX{} Live 2021 用户,安装后建议升级全部宏包,升级方法:使用 cmd 运行 \lstinline{tlmgr update --all},如果 tlmgr 需要更新,请使用 cmd 运行 \lstinline{tlmgr update --self},如果更新过程中出现了中断,请改用 \lstinline{tlmgr update --self --all --reinstall-forcibly-removed} 更新。 \subsection{更新问题} @@ -124,119 +124,41 @@ Overleaf 上,中文需要使用 \hologo{XeLaTeX} 进行编译,英文建议 \subsection{其他发行版本} -如果你是 \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{} 套装。更多关于 \TeX{} Live 2019 的安装使用以及 C\TeX{} 与 \TeX{} Live 的兼容、系统路径问题,请参考官方文档以及啸行的\href{https://github.com/OsbertWang/install_latex/releases}{一份简短的安装 \LaTeX{} 的介绍}。 +由于宏包版本问题,本模板不支持 C\TeX{} 套装,请务必安装 TeX Live。更多关于 \TeX{} Live 的安装使用以及 C\TeX{} 与 \TeX{} Live 的兼容、系统路径问题,请参考官方文档以及啸行的\href{https://github.com/OsbertWang/install_latex/releases}{一份简短的安装 \LaTeX{} 的介绍}。 -\section{用户作品计划} - -Elegant\LaTeX{} 系列模板从创立至今已经有 9 年了,我们的模板也受到了很多用户的喜爱,在此,为了促进模板用户之间的交流,了解用户需求,完善本模板,我们将建立一个区域专门展示用户的文档,包括但不限于 GitHub 和官网等。如果你愿意将自己的作品展示出来,请邮件或者其他方式联系我们。如果自己代码已经传到 GitHub 或者 Gitee 等网站,可以提供对应网址。\href{https://github.com/ElegantLaTeX/Archive/tree/master/Collections}{用户文档中心}目前有下面一些作品: -\begin{enumerate} -\item 唐绍东:微积分笔记 -\item 曲豆豆:超甜微积分习题集 -\item 王世强:《化工数值计算与 MATLAB》复习指南 -\item 李晨迪:Fluid Mechanics Notes -\item 肖明顺:地球物理勘查常用规范汇编 -\item 白衣卿相:期末复习笔记-拓扑学摘要 -\end{enumerate} - \section{关于提交} 出于某些因素的考虑,Elegant\LaTeX{} 项目自 2019 年 5 月 20 日开始,\textbf{不再接受任何非作者预约性质的提交}(pull request)!如果你想改进模板,你可以给我们提交 issues,或者可以在遵循协议(LPPL-1.3c)的情况下,克隆到自己仓库下进行修改。 -\section{协作人员招募} - -招募 Elegant\LaTeX{} 的协作人员(志愿者),没有报酬。工作内容:翻译 Elegant\LaTeX{} 系列模板文档,维护模板的维基,如果有公众号文稿写作经历的话,也可以帮忙写微信稿。本公告长期有效。目前 Elegant\LaTeX{} 共有 4 名协作人员,在此感谢他们无私的奉献! -\begin{itemize} - \item 官方文档翻译: \href{https://github.com/peggy2006xzyz}{YPY}; - \item GitHub 维基维护: \href{https://github.com/izinngo}{Ingo Zinngo}、\href{https://github.com/xiaohao890809}{追寻原风景}; - \item QQ 群管理、FAQ 整理: \href{https://github.com/sikouhjw}{Sikouhjw}. -\end{itemize} - -另外,也感谢 \href{https://github.com/stone-zeng}{Xiangdong Zeng}、\href{https://github.com/latexers}{逐鹿人}等人帮忙群管理。 - -\section{致谢} -2019 年 5 月 20 日,ElegantBook 模板在 GitHub 上的收藏数(star)达到了 100\footnote{截止 3.10 版本正式发布,star 数为 374。}。在此特别感谢 China\TeX{} 以及 \href{http://www.latexstudio.net/}{\LaTeX{} 工作室}对于本系列模板的大力宣传与推广。\LaTeX{} 工作室网站上有很多精彩的帖子和精致的模板,欢迎大家去挖掘里面的宝藏,这也是国内最全面的 \LaTeX{} 相关的网站。 - -如果你喜欢我们的模板,你可以在 GitHub 上收藏我们的模板。 -%\begin{figure}[htbp] -% \centering -% \includegraphics[width=\textwidth]{star.png} -% \caption{一键三连求赞} -%\end{figure} - -\section{捐赠} - -如果您非常喜爱我们的模板或者我,你还可以选择捐赠\footnote{最好在捐赠时备注信息。}以表达您对我们模板和我的支持。本模板自 3.08 版本发布了捐赠信息之后,收到了超过 1500 元的捐赠(四舍五入就是一个亿),非常感谢! - -\begin{figure}[htbp] -\centering -\includegraphics[width=0.5\textwidth]{donate.jpg} -\end{figure} - -\textbf{赞赏费用的使用解释权归 Elegant\LaTeX{} 所有,并且不接受监督,请自愿理性打赏}。10 元以上的赞赏,我们将列入捐赠榜,谢谢各位金主! - -\begin{table}[!htb] - \centering - \caption{Elegant\LaTeX{} 系列模板捐赠榜} - \begin{tabular}{*{4}{>{\scriptsize}c}|*{4}{>{\scriptsize}c}} - \hline - \textbf{捐赠者} & \textbf{金额} & \textbf{时间} & \textbf{渠道} & \textbf{捐赠者} & \textbf{金额} & \textbf{时间} & \textbf{渠道} \\ - \hline - Lerh & 10 RMB & 2019/05/15 & 微信 & 越过地平线 & 10 RMB & 2019/05/15 & 微信 \\ - 银桑 & 20 RMB & 2019/05/27 & 微信 & *空 & 10 RMB & 2019/05/30 & 微信 \\ - latexstudio.net & 666 RMB & 2019/06/05 & 支付宝 & A*n & 40 RMB & 2019/06/15 & 微信 \\ - * 夏 & 22 RMB & 2019/06/15 & 微信 & * 倩 & 21 RMB & 2019/06/15 & 微信 \\ - Cassis & 11 RMB & 2019/06/30 & 微信 & *君 & 10 RMB & 2019/07/23 & 微信 \\ - P*u & 50 RMB & 2019/07/30 & 微信 & *萌 & 19 RMB & 2019/08/28 & 微信 \\ - 曲豆豆 & 10 RMB & 2019/08/28 & 微信 & 李博 & 100 RMB & 2019/10/06 & 微信 \\ - Njustsll & 10 RMB & 2019/10/11 & 微信 & 刘志阔 & 99.99 RMB & 2019/10/15 & 支付宝 \\ - * 韬 & 16 RMB & 2019/10/17 & 微信 & 赤霓 & 12 RMB & 2019/10/17 & 支付宝 \\ - 追寻原风景 & 10 RMB & 2019/10/28 & 微信 & 郭德良 & 88 RMB & 2019/11/03 & 微信 \\ - 自强不息 & 20 RMB & 2019/11/04 & 支付宝 & 读书之虫 & 20 RMB & 2019/11/18 & 微信 \\ - *等 & 10 RMB & 2019/11/18 & 微信 & *哲 & 20 RMB & 2019/11/18 & 微信 \\ - 佚名 & 10 RMB & 2019/11/24 & 微信 & Jiye Qian & 66 RMB & 2019/12/04 & 微信 \\ - * 阳 & 20 RMB & 2019/12/05 & 微信 & Catcher & 11 RMB & 2019/12/08 & 支付宝 \\ - 希尔波特门徒 & 10 RMB & 2019/12/09 & 支付宝 & * 伟 & 10 RMB & 2019/12/09 & 微信 \\ - Simon & 20 RMB & 2019/12/11 & 支付宝 & 流殇丶浅忆 & 66.60 RMB & 2019/12/18 & 支付宝 \\ - 羽 & 10 RMB & 2019/12/20 & 支付宝 & * 琛 & 15 RMB & 2019/12/20 & 微信 \\ - 随风 & 20 RMB & 2019/12/27 & 支付宝 & Ws & 23.30 RMB & 2019/12/28 & 微信 \\ - 初八 & 100 RMB & 2020/01/02 & 支付宝 & p*e & 20 RMB & 2020/01/03 & 微信 \\ - Shunmx & 100 RMB & 2020/01/03 & 微信 & hj & 10 RMB & 2020/01/03 & 微信 \\ - F*5 & 10 RMB & 2020/01/03 & 微信 & S*m & 20.20 RMB & 2020/01/03 & 微信 \\ - 二代青雉 & 13 RMB & 2020/01/14 & 支付宝 & *? & 66 RMB & 2020/01/15 & 微信 \\ - Mr. Xiong & 20 RMB & 2020/01/17 & 微信 & *博 & 15 RMB & 2020/01/18 & 微信 \\ - * 者 & 10 RMB & 2020/02/02 & 微信 & Jackie & 88.80 RMB & 2020/02/09 & 微信 \\ - Henry\_Sun、 & 50 RMB & 2020/02/14 & 支付宝 & * 桥 & 50 RMB & 2020/02/21 & 微信 \\ - 昀琏 & 10 RMB & 2020/03/02 & 支付宝 & S*y & 10 RMB & 2020/03/15 & 微信 \\ - * 哥 & 66.66 RMB & 2020/03/17 & 微信 & K*e & 30 RMB & 2020/03/30 & 微信\\ - * 阳 & 20 RMB & 2020/04/02 & 微信 & 士*n & 30 RMB & 2020/04/11 & 微信 \\ - \hline - \end{tabular}% - \label{tab:donation}% -\end{table}% - -另外,为了表示感谢,我们制作了捐赠纪念证,欢迎大家来信告知邮箱以及姓名(艺名),我们将通过邮件发送电子版纪念证。 - -\begin{figure}[!htbp] -\centering -\includegraphics[width=0.6\textwidth]{cert.pdf} -\end{figure} \chapter{ElegantBook 设置说明} -本模板基于基础的 book 文类,所以 book 的选项对于本模板也是有效的(纸张无效,因为模板有设备选项)。默认编码为 UTF-8,推荐使用 \TeX{} Live 编译。本文编写环境为 Win10 (64bit) + \TeX{} Live 2020,支持 \hologo{pdfLaTeX} 以及 \hologo{XeLaTeX} 编译。中文请尽量使用 \hologo{XeLaTeX} 编译。 +本模板基于基础的 book 文类,所以 book 的选项对于本模板也是有效的(纸张无效,因为模板有设备选项)。默认编码为 UTF-8,推荐使用 \TeX{} Live 编译。本文编写环境为 Win10 (64bit) + \TeX{} Live 2021,英文支持 \hologo{pdfLaTeX},中文仅支持 \hologo{XeLaTeX} 编译。 \section{语言模式} -本模板内含三套语言环境 \lstinline{lang=cn}、\lstinline{lang=en} 以及 \lstinline{lang=it} \footnote{由 \href{https://github.com/VincentMVV}{VincentMVV} 提供意大利语翻译,具体的内容见\href{https://github.com/ElegantLaTeX/ElegantBook/issues/85}{Italian translation}。},改变语言环境会改变图表标题的引导词(图,表),文章结构词(比如目录,参考文献等),以及定理环境中的引导词(比如定理,引理等)。不同语言模式的启用如下: +本模板内含两套基础语言环境 \lstinline{lang=cn}、\lstinline{lang=en}。改变语言环境会改变图表标题的引导词(图,表),文章结构词(比如目录,参考文献等),以及定理环境中的引导词(比如定理,引理等)。不同语言模式的启用如下: \begin{lstlisting} \documentclass[cn]{elegantbook} \documentclass[lang=cn]{elegantbook} \end{lstlisting} +除模板自带的两套语言设定之外,由网友提供的其他语言环境设置如下: +\begin{itemize} + \item 由 \href{https://github.com/VincentMVV}{VincentMVV} 提供的意大利语翻译 \lstinline{lang=it},相关讨论见 \href{https://github.com/ElegantLaTeX/ElegantBook/issues/85}{Italian translation}; + \item 由 \href{https://github.com/abfek66}{abfek66} 提供的法语翻译 \lstinline{lang=fr},相关讨论见 \href{https://github.com/ElegantLaTeX/ElegantBook/issues/85}{Italian translation}; + % \item 由 \href{https://github.com/stultus}{stultus} 提供的马拉雅拉姆语翻译 \lstinline{lang=},相关讨论见 \href{https://github.com/ElegantLaTeX/ElegantBook/issues/90}{Malayalam translation}; + \item 由 \href{https://github.com/inktvis75}{inktvis75} 提供的荷兰语翻译 \lstinline{lang=nl},相关讨论见 \href{https://github.com/ElegantLaTeX/ElegantBook/issues/108}{Dutch Translation}; + \item 由 \href{https://github.com/palkotamas}{palkotamas} 提供的匈牙利语翻译 \lstinline{lang=hu},相关讨论见 \href{https://github.com/ElegantLaTeX/ElegantBook/issues/111}{Hungarian translation}; + \item 由 Lisa 提供的德语翻译 \lstinline{lang=de},相关讨论见 \href{https://github.com/ElegantLaTeX/ElegantBook/issues/113}{Deutsch translation}; + \item 由 Gustavo A. Corradi 提供的西班牙语的翻译 \lstinline{lang=es},相关讨论见 \href{https://github.com/ElegantLaTeX/ElegantBook/issues/133}{Spanish translation}; + \item 由 \href{https://github.com/Altantsooj}{Altantsooj} 提供的蒙古语的翻译 \lstinline{lang=mn},相关讨论见 \href{https://github.com/ElegantLaTeX/ElegantBook/issues/137}{Mongolian translation}。 +\end{itemize} + + + \begin{remark} -只有中文环境(\lstinline{lang=cn})才可以输入中文。另外如果抄录环境(\lstinline{lstlisting})中有中文字符,请务必使用 \hologo{XeLaTeX} 编译。 +以上各个语言的设定均为网友设定,我们未对上述翻译进行过校对,如果有问题,请在对应的 issue 下评论。并且,只有中文环境(\lstinline{lang=cn})才可以输入中文。 \end{remark} \section{设备选项} @@ -259,47 +181,47 @@ Elegant\LaTeX{} 系列模板从创立至今已经有 9 年了,我们的模板 \centering \begin{tabular}{ccccccc} \toprule - & \textcolor{structure1}{green} - & \textcolor{structure2}{cyan} - & \textcolor{structure3}{blue} - & \textcolor{structure4}{gray} - & \textcolor{structure5}{black} - & 主要使用的环境\\ + & \textcolor{structure1}{green} + & \textcolor{structure2}{cyan} + & \textcolor{structure3}{blue} + & \textcolor{structure4}{gray} + & \textcolor{structure5}{black} + & 主要使用的环境\\ \midrule structure & \ccr{structure1} - & \ccr{structure2} - & \ccr{structure3} - & \ccr{structure4} - & \ccr{structure5} - & chapter \ section \ subsection \\ + & \ccr{structure2} + & \ccr{structure3} + & \ccr{structure4} + & \ccr{structure5} + & chapter \ section \ subsection \\ main & \ccr{main1} - & \ccr{main2} - & \ccr{main3} - & \ccr{main4} - & \ccr{main5} - & definition \ exercise \ problem \\ + & \ccr{main2} + & \ccr{main3} + & \ccr{main4} + & \ccr{main5} + & definition \ exercise \ problem \\ second & \ccr{second1} - & \ccr{second2} - & \ccr{second3} - & \ccr{second4} - & \ccr{second5} - & theorem \ lemma \ corollary\\ + & \ccr{second2} + & \ccr{second3} + & \ccr{second4} + & \ccr{second5} + & theorem \ lemma \ corollary\\ third & \ccr{third1} - & \ccr{third2} - & \ccr{third3} - & \ccr{third4} - & \ccr{third5} - & proposition\\ + & \ccr{third2} + & \ccr{third3} + & \ccr{third4} + & \ccr{third5} + & proposition\\ \bottomrule \end{tabular} \end{table} 如果需要自定义颜色的话请选择 \lstinline{nocolor} 选项或者使用 \lstinline{color=none},然后在导言区定义 structurecolor、main、second、third 颜色,具体方法如下: -\begin{lstlisting} +\begin{lstlisting}[tabsize=4]] \definecolor{structurecolor}{RGB}{0,0,0} \definecolor{main}{RGB}{70,70,70} \definecolor{second}{RGB}{115,45,2} -\definecolor{third}{RGB}{0,80,80} +\definecolor{third}{RGB}{0,80,80} \end{lstlisting} \section{封面} @@ -307,23 +229,32 @@ Elegant\LaTeX{} 系列模板从创立至今已经有 9 年了,我们的模板 \subsection{封面个性化} 从 3.10 版本开始,封面更加弹性化,用户可以自行选择输出的内容,包括 \lstinline{\title} 在内的所有封面元素都可为空。目前封面的元素有 -\begin{itemize} - \item 标题:\lstinline{\title} - \item 副标题:\lstinline{\subtitle} - \item 作者:\lstinline{\author} - \item 机构:\lstinline{\institute} - \item 日期:\lstinline{\date} - \item 版本:\lstinline{\version} - \item 箴言:\lstinline{\extrainfo} - \item 封面图:\lstinline{\cover} - \item 徽标:\lstinline{\logo} -\end{itemize} + +\begin{table}[htbp] + \centering + \caption{封面元素信息} + \begin{tabular}{p{0.07\textwidth}p{0.15\textwidth}|p{0.07\textwidth}p{0.15\textwidth}|p{0.07\textwidth}p{0.15\textwidth}} + \toprule + 信息 & 命令 & 信息 & 命令 & 信息 & 命令 \\ + \midrule + 标题 & \lstinline|\title| & 副标题 & \lstinline|\subtitle| & 作者 & \lstinline|\author| \\ + 机构 & \lstinline|\institute| & 日期 & \lstinline|\date| & 版本 & \lstinline|\version| \\ + 箴言 & \lstinline|\extrainfo| & 封面图 & \lstinline|\cover| & 徽标 & \lstinline|\logo| \\ + \bottomrule + \end{tabular} +\end{table} 另外,额外增加一个 \lstinline{\bioinfo} 命令,有两个选项,分别是信息标题以及信息内容。比如需要显示{\kaishu User Name:111520},则可以使用 \begin{lstlisting} \bioinfo{User Name}{115520} \end{lstlisting} +封面中间位置的色块的颜色可以使用下面命令进行修改: +\begin{lstlisting} + \definecolor{customcolor}{RGB}{32,178,170} + \colorlet{coverlinecolor}{customcolor} +\end{lstlisting} + \subsection{封面图} 本模板使用的封面图片来源于 \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.fotor.com/cn}{fotor.com}。用户 QQ 群内有一些合适尺寸的封面,欢迎取用。 @@ -334,7 +265,7 @@ Elegant\LaTeX{} 系列模板从创立至今已经有 9 年了,我们的模板 \subsection{自定义封面} -另外,如果需要使用自定义的封面,比如 Adobe illustrator 或者其他软件制作的 A4 PDF 文档,请把 \lstinline{\maketitle} 注释掉,然后借助 \lstinline{pdfpages} 宏包将自制封面插入即可。如果使用 \lstinline{titlepage} 环境,也是类似。如果需要 2.x 版本的封面,请参考 \href{https://github.com/EthanDeng/etitlepage}{etitlepage}。 +另外,如果使用自定义的封面,比如 Adobe illustrator 或者其他软件制作的 A4 PDF 文档,请把 \lstinline{\maketitle} 注释掉,然后借助 \lstinline{pdfpages} 宏包将自制封面插入即可。如果使用 \lstinline{titlepage} 环境,也是类似。如果需要 2.x 版本的封面,请参考 \href{https://github.com/EthanDeng/etitlepage}{etitlepage}。 \section{章标标题} @@ -377,12 +308,24 @@ Elegant\LaTeX{} 系列模板从创立至今已经有 9 年了,我们的模板 由于本模板使用了 \lstinline{tcolorbox} 宏包来定制定理类环境,所以和普通的定理环境的使用有些许区别,定理的使用方法如下: \begin{lstlisting} \begin{theorem}{theorem name}{label} -The content of theorem. + The content of theorem. \end{theorem} \end{lstlisting} 第一个必选项 \lstinline{theorem name} 是定理的名字,第二个必选项 \lstinline{label} 是交叉引用时所用到的标签,交叉引用的方法为 \verb|\ref{thm:label}|。请注意,交叉引用时必须加上前缀 \lstinline{thm:}。 +在用户多次反馈下,4.x 之后,引入了原生定理的支持方式,也就是使用可选项方式: + +\begin{lstlisting} +\begin{theorem}[theorem name] \label{thm:theorem-label} + The content of theorem. +\end{theorem} +% or +\begin{theorem} \label{thm:theorem-withou-name} + The content of theorem without name. +\end{theorem} +\end{lstlisting} + 其他相同用法的定理类环境有: \begin{table}[htbp] @@ -402,6 +345,34 @@ The content of theorem. \label{tab:theorem-class}% \end{table}% +% \subsection{算法环境} + + +% \begin{algorithm}\label{alg:test} +% \Input{A bitmap $I$ of size $w \times l$} +% \Output{A partition of the bitmap} +% \BlankLine +% \emph{special treatment of the first line}\; +% \For{$i \leftarrow 2$ \KwTo $l$}{ +% \emph{special treatment of the first element of line $i$}\; +% \For{$j \leftarrow 2$ \KwTo $w$}{\label{forins} +% $\Left \leftarrow \FindCompress{$I[i,j-1]$}$\; +% $\Up \leftarrow \FindCompress{$I[i-1,]$}$\; +% $\This \leftarrow \FindCompress{$I[i,j]$}$\; +% \If(\tcp*[h]{O(\Left,\This)==1}){\Left compatible with \This}{\label{lt} +% \lIf{$\Left < \This$}{$\Union{\Left,\This}$} +% \lElse{$\Union{\This,\Left}$} +% } +% \If(\tcp*[f]{O(\Up,\This)==1}){\Up compatible with \This}{\label{ut} +% \lIf{$\Up < \This$}{$\Union{\Up,\This}$} +% \tcp{\This is put under \Up to keep tree as flat as possible}\label{cmt} +% \lElse{$\Union{\This,\Up}$}\tcp*[r]{\This{} linked to \Up}\label{lelse} +% } +% } +% \lForEach{element $e$ of the line $i$}{\FindCompress{p}} +% } +% \caption{disjoint decomposition}\label{algo_disjdecomp} +% \end{algorithm} \subsection{其他环境的使用} @@ -453,27 +424,22 @@ The content of theorem. \section{参考文献} -此模板使用了 \hologo{BibTeX} 来生成参考文献,在中文示例中,使用了 \lstinline{gbt7714} 宏包。参考文献示例:\cite{en1,en2,en3} 使用了中国一个大型的 P2P 平台(人人贷)的数据来检验男性投资者和女性投资者在投资表现上是否有显著差异。 +此模板使用了 \hologo{biber} 来生成参考文献,也即使用 \lstinline{biblatex} 宏包,在中文示例中,使用了 \lstinline{gbt7714} 宏包。参考文献示例:\cite{cn1,en2,en3} 使用了中国一个大型的 P2P 平台(人人贷)的数据来检验男性投资者和女性投资者在投资表现上是否有显著差异。 -你可以在谷歌学术,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} +你可以在谷歌学术,Mendeley,Endnote 中获得文献条目(bib item),然后把它们添加到 \lstinline{reference.bib} 中。在文中引用的时候,引用它们的键值(bib key)即可。注意需要在编译的过程中添加 \hologo{biber} 编译。 -本模板还添加了 \lstinline{cite=numbers} 、\lstinline{cite=super} 和 \lstinline{cite=authoryear} 三个参考文献选项,用于设置参考文献格式的设置,默认为 \lstinline{numbers}。据我们所知,理工科类一般使用数字形式 \lstinline{numbers} 或者上标形式 \lstinline{super},而文科类使用作者-年份 \lstinline{authoryear} 比较多,所以我们将 \lstinline{numbers} 作为默认格式。如果需要改为 \lstinline{cite=super} 或者 \lstinline{authoryear} ,可以使用 +为了方便文献样式修改,模板引入了 \lstinline{bibstyle} 和 \lstinline{citestyle} 选项,默认均为数字格式(numeric),如果需要设置为国标 GB7714-2015,需要使用: \begin{lstlisting} -\documentclass[cite=super]{elegantbook} % set super style ref style -\documentclass[super]{elegantbook} -\documentclass[cite=authoryear]{elegantbook} % set author year ref style -\documentclass[authoryear]{elegantbook} + \documentclass[citestyle=gb7714-2015, bibstyle=gb7714-2015]{elegantbook} \end{lstlisting} -为了方便文献样式修改,模板引入了 \lstinline{bibstyle} 选项,默认为 apalike,更多的选择可以参考 \href{https://www.overleaf.com/learn/latex/Bibtex_bibliography_styles}{\hologo{BibTeX} Bibliography Styles}。用法为 +如果需要添加排序方式,可以在导言区加入 \begin{lstlisting} - \documentclass[bibstyle=apalike]{elegantbook} + \ExecuteBibliographyOptions{sorting=ynt} \end{lstlisting} +启用国标之后,可以加入 \lstinline{sorting=gb7714-2015}。 + \section{添加序章} 如果你想在第一章前面添序章,不改变原本章节序号,可以在第一章内容前面使用 @@ -596,7 +562,6 @@ The content of introduction. \end{remark} - \chapter{字体选项} 字体选项独立成章的原因是,我们希望本模板的用户关心模板使用的字体,知晓自己使用的字体以及遇到字体相关的问题能更加便捷地找到答案。 @@ -711,7 +676,7 @@ Lebesgue 积分有几种不同的定义方式。我们将采用逐步定义非 我们将通过三个步骤定义可测函数的积分。首先定义非负简单函数的积分。以下设 $E$ 是 $\mathcal{R}^n$ 中的可测集。 -\begin{definition}{可积性}{int} +\begin{definition}[可积性] \label{def: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)$ \begin{equation} \label{inter} @@ -736,7 +701,7 @@ Lebesgue 积分有几种不同的定义方式。我们将采用逐步定义非 \label{ex:1} I(t) = \int_{\mathcal{R}^1} f(x+t)g(x)dx \quad t \in \mathcal{R}^1 \end{equation} -是 $\mathcal{R}^1$ 上的连续函数。 +是 $\mathcal{R}^1$ 上的连续函数。 \end{exercise} \begin{solution} @@ -747,7 +712,7 @@ Lebesgue 积分有几种不同的定义方式。我们将采用逐步定义非 即 $D(x)$ 在 $[0,1]$ 上是 Lebesgue 可积的并且积分值为零。但 $D(x)$ 在 $[0,1]$ 上不是 Riemann 可积的。 \end{proof} -\begin{theorem}{Fubini 定理}{fubi} +\begin{theorem}[Fubini 定理] \label{thm: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} \label{eq:461} @@ -757,13 +722,15 @@ Lebesgue 积分有几种不同的定义方式。我们将采用逐步定义非 (2)若 $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$ 上的可积函数。而且~\ref{eq:461} 成立。 \end{theorem} +\ref{thm:fubi} + \begin{note} 在本模板中,引理(lemma),推论(corollary)的样式和定理~\ref{thm:fubi} 的样式一致,包括颜色,仅仅只有计数器的设置不一样。 \end{note} 我们说一个实变或者复变量的实值或者复值函数是在区间上平方可积的,如果其绝对值的平方在该区间上的积分是有限的。所有在勒贝格积分意义下平方可积的可测函数构成一个希尔伯特空间,也就是所谓的 $L^2$ 空间,几乎处处相等的函数归为同一等价类。形式上,$L^2$ 是平方可积函数的空间和几乎处处为 0 的函数空间的商空间。 -\begin{proposition}{最优性原理}{max} +\begin{proposition}[最优性原理] \label{pro:max} 如果 $u^*$ 在 $[s,T]$ 上为最优解,则 $u^*$ 在 $[s, T]$ 任意子区间都是最优解,假设区间为 $[t_0, t_1]$ 的最优解为 $u^*$ ,则 $u(t_0)=u^{*}(t_0)$,即初始条件必须还是在 $u^*$ 上。 \end{proposition} @@ -771,7 +738,7 @@ Lebesgue 积分有几种不同的定义方式。我们将采用逐步定义非 \begin{figure}[htbp] \centering - \includegraphics[width=0.6\textwidth]{scatter.pdf} + \includegraphics[width=0.6\textwidth]{scatter.jpg} \caption{散点图示例 $\hat{y}=a+bx$ \label{fig:scatter}} \end{figure} @@ -802,18 +769,16 @@ Lebesgue 积分有几种不同的定义方式。我们将采用逐步定义非 \begin{enumerate}[itemsep=1.5ex] \item \question{有没有办法章节用“第一章,第一节,(一)”这种?} 见前文介绍,可以使用 \lstinline{scheme=chinese} 设置。 - \item \question{3.07 版本的 cls 的 natbib 加了numbers 编译完了没变化,群主设置了不可更改了?} - 之前在 3.07 版本中在引入 \lstinline{gbt7714} 宏包时,加入了 \lstinline{authoryear} 选项,这个使得 \lstinline{natbib} 设置了 \lstinline{numbers} 也无法生效。3.08 和 3.09 版本中,模板新增加了 \lstinline{numbers} 、\lstinline{super} 和 \lstinline{authoryear} 文献选项,你可以参考前文设置说明。 \item \question{大佬,我想把正文字体改为亮色,背景色改为黑灰色。} 页面颜色可以使用 \lstinline{\pagecolor} 命令设置,文本命令可以参考\href{https://tex.stackexchange.com/questions/278544/xcolor-what-is-the-equivalent-of-default-text-color}{这里}进行设置。 \item \question{\lstinline[breaklines]{Package ctex Error: CTeX fontset `Mac' is unavailable.}} 在 Mac 系统下,中文编译请使用 \hologo{XeLaTeX}。 \item \question{\lstinline{! LaTeX Error: Unknown option `scheme=plain' for package `ctex'.}} - 你用的 C\TeX{} 套装吧?这个里面的 \lstinline{ctex} 宏包已经是已经是 10 年前的了,与本模板使用的 \lstinline{ctex} 宏集有很大区别。不建议 C\TeX{} 套装了,请卸载并安装 \TeX{} Live 2019。 + 你用的 C\TeX{} 套装吧?这个里面的 \lstinline{ctex} 宏包已经是已经是 10 年前的了,与本模板使用的 \lstinline{ctex} 宏集有很大区别。不建议 C\TeX{} 套装了,请卸载并安装 \TeX{} Live 2021。 \item \question{我该使用什么版本?} - 请务必使用\href{https://github.com/ElegantLaTeX/ElegantBook/releases}{最新正式发行版},发行版间不定期可能会有更新(修复 bug 或者改进之类),如果你在使用过程中没有遇到问题,不需要每次更新\href{https://github.com/ElegantLaTeX/ElegantBook/archive/master.zip}{最新版},但是在发行版更新之后,请尽可能使用最新版(发行版)!最新发行版可以在 GitHub 或者 \TeX{} Live 2019 内获取。 + 请务必使用\href{https://github.com/ElegantLaTeX/ElegantBook/releases}{最新正式发行版},发行版间不定期可能会有更新(修复 bug 或者改进之类),如果你在使用过程中没有遇到问题,不需要每次更新\href{https://github.com/ElegantLaTeX/ElegantBook/archive/master.zip}{最新版},但是在发行版更新之后,请尽可能使用最新版(发行版)!最新发行版可以在 GitHub 或者 \TeX{} Live 2021 内获取。 \item \question{我该使用什么编辑器?} - 你可以使用 \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{} 编写环境}。 + 你可以使用 \TeX{} Live 2021 自带的编辑器 \TeX{}works 或者使用 \TeX{}studio,\TeX works 的自动补全,你可以参考我们的总结 \href{https://github.com/EthanDeng/texworks-autocomplete}{\TeX works 自动补全}。推荐使用 \TeX{} Live 2021 + \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{} 编写环境}。 \item \question{您好,我们想用您的 ElegantBook 模板写一本书。关于机器学习的教材,希望获得您的授权,谢谢您的宝贵时间。} 模板的使用修改都是自由的,你们声明模板来源以及模板地址(GitHub 地址)即可,其他未尽事宜按照开源协议 LPPL-1.3c。做好之后,如果方便的话,可以给我们一个链接,我把你们的教材放在 Elegant\LaTeX{} 用户作品集里。 \item \question{请问交叉引用是什么?} @@ -823,12 +788,25 @@ Lebesgue 积分有几种不同的定义方式。我们将采用逐步定义非 \item \question{代码高亮环境能用其他语言吗?} 可以的,ElegantBook 模板用的是 \lstinline{listings} 宏包,你可以在环境(\lstinline{lstlisting})之后加上语言(比如 Python 使用 \lstinline{language=Python} 选项),全局语言修改请使用 \lstinline{lsset} 命令,更多信息请参考宏包文档。 \item \question{群主,什么时候出 Beamer 的模板(主题),ElegantSlide 或者 ElegantBeamer?} - 由于 Beamer 中有一个很优秀的主题 \href{https://github.com/matze/mtheme}{Metropolis}。在找到非常好的创意之前不会发布正式的 Beamer 主题,如果你非常希望得到 Elegant\LaTeX{} “官方”的主题,请在用户 QQ 群内下载测试主题 PreElegantSlide。正式版制作计划在今年或者明年。 + 由于 Beamer 中有一个很优秀的主题 \href{https://github.com/matze/mtheme}{Metropolis}。后续确定不会再出任何主题/模板,请大家根据需要修改已有主题。 \end{enumerate} \chapter{版本更新历史} -根据用户的反馈,我们不断修正和完善模板。截止到此次更新,ElegantBook 模板在 GitHub 上有将近 100 次提交,正式发行版本(release)有 16 次。由于 3.00 之前版本与现在版本差异非常大,在此不列出 3.00 之前的更新内容。 +根据用户的反馈,我们不断修正和完善模板。截止到此次更新,ElegantBook 模板在 GitHub 上有将近 100 次提交,正式发行版本(release)有 17 次。由于 3.00 之前版本与现在版本差异非常大,在此不列出 3.00 之前的更新内容。 + + +\datechange{2021/05/02}{版本 4.1 正式发布。} + +\begin{change} + \item \textbf{重要改动}:由原先的 \hologo{BibTeX} 改为 biblatex 编译方式(后端为 \lstinline{biber}),请注意两者之间的差异; + \item \textbf{重要改进}:修改对于定理写法兼容方式,提高数学公式代码的兼容性; + \item 页面设置改动,默认页面更宽;方便书写和阅读; + \item 支持目录文字以及页码跳转; + \item 不再维护 \hologo{pdfLaTeX} 中文支持方式,请务必使用 \hologo{XeLaTeX} 编译中文文稿。 + \item 增加多个语言选项,法语 \lstinline{lang=fr}、荷兰语 \lstinline{lang=nl}、匈牙利语 \lstinline{lang=hu}、西班牙语 \lstinline{lang=es}、蒙古语 \lstinline{lang=mn} 等。 +\end{change} + \datechange{2020/04/12}{版本 3.11 正式发布,\textcolor{red}{此版本为 3.x 最后版本。}} @@ -858,7 +836,7 @@ Lebesgue 积分有几种不同的定义方式。我们将采用逐步定义非 \datechange{2019/08/18}{版本 3.09 正式发布} \begin{change} - \item 由于 \lstinline{\elegantpar} 存在一些问题,暂时性删除 \lstinline{\elegantpar} 命令,并提示用户改用 \lstinline{\marginnote} 和 \lstinline{\marginpar} 旁注/边注命令。 + \item \lstinline{\elegantpar} 存在 bug,删除 \lstinline{\elegantpar} 命令,建议用户改用 \lstinline{\marginnote} 和 \lstinline{\marginpar} 旁注命令。 \item 积分操作符统一更改为 \lstinline{esint} 宏包设置; \item 新增目录选项 \lstinline{toc},可选项为单栏 \lstinline{onecol} 和双栏 \lstinline{twocol}; \item 手动增加参考文献选项 \lstinline{cite},可选项为上标形式 \lstinline{super}; @@ -956,7 +934,7 @@ Lebesgue 积分有几种不同的定义方式。我们将采用逐步定义非 \end{change} \nocite{*} -\bibliography{reference} +\printbibliography \appendix \chapter{基本数学工具} diff --git a/Master/texmf-dist/doc/latex/elegantbook/elegantbook-en.pdf b/Master/texmf-dist/doc/latex/elegantbook/elegantbook-en.pdf Binary files differindex 132582d7443..d1580ffb4d0 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 6b62abc4622..739a92f64d5 100644 --- a/Master/texmf-dist/doc/latex/elegantbook/elegantbook-en.tex +++ b/Master/texmf-dist/doc/latex/elegantbook/elegantbook-en.tex @@ -1,12 +1,12 @@ -\documentclass[11pt,fancy,authoryear]{elegantbook} +\documentclass[11pt,fancy]{elegantbook} \title{An Elegant \LaTeX{} Template for Books} \subtitle{Classic Elegant\LaTeX{} Template} \author{Ethan Deng \& Liam Huang} \institute{Elegant\LaTeX{} Program} -\date{April 12, 2020} -\version{3.11} +\date{May. 2, 2021} +\version{4.1} \bioinfo{Bio}{Information} \extrainfo{Victory won\rq t come to us unless we go to it. } @@ -14,6 +14,9 @@ \logo{logo-blue.png} \cover{cover.jpg} +\definecolor{customcolor}{RGB}{32,178,170} +\colorlet{coverlinecolor}{customcolor} + \begin{document} @@ -23,6 +26,7 @@ \tableofcontents \mainmatter + \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}. @@ -40,24 +44,22 @@ Contact Infos: \end{itemize} + \section{ElegantBook Updates} -Version 3.11 is the last version of 3.x, it's base upon 3.10, mainly to resolve \TeX{} Live 2020 compilation errors caused by \lstinline{gbt7714} compatibility issues. What\rq s new in this version: +Version 4.1 is the first version of 3.x, we add support for biblatex, theorem, and multilingual translation. What\rq s new in this version: \begin{enumerate} - \item \textbf{Fix}: Fix \lstinline{natbib option clash} problems caused by \lstinline{gbt7714} updates; - \item Remove \lstinline{base} decorations and its options since \lstinline{pgfornament} package is not included in \TeX{} Live 2020; - \item Fix spacing problem in some environments; - \item Add Italian language option, \lstinline{lang=it}. + \item \textbf{! Big Change}: Change the bibliography method from \hologo{BibTeX} to biblatex(with backend \lstinline{biber}); + \item \textbf{! Big Change}: Add support for the default theorem writing method (with optional name and label); + \item Add left and right space; + \item Support hyperlink from the text of TOC; + \item Remove the \hologo{pdfLaTeX} compatiblity check for Chinese. + \item Add multilingual support, for french \lstinline{lang=fr}, dutch \lstinline{lang=nl}, Hungarian \lstinline{lang=hu}, Spanish \lstinline{lang=es}, Mongolian \lstinline{lang=mn} etc. \end{enumerate} - -\begin{note} - If you are using previous version, please delete \lstinline|\hypersetup{pageanchor=true}| and add \lstinline{\frontmatter} after \lstinline{\maketitle} and before \lstinline{\tableofcontents}. Users for 2.x, please refer to \href{https://github.com/ElegantLaTeX/ElegantBook/wiki/convert}{conversion}. -\end{note} - \section{Installation and Update} -Both portable version and installation package are available for this template, online usage is optional as well. +Both portable version and installation package are available, online usage is optional as well. \subsection{To Use Templates Online} Visit \href{https://www.overleaf.com/}{Overleaf} to use our template online anywhere and anytime without local installation. To find our template, search \lstinline{elegantlatex} in the \lstinline{templates} or simply visit \href{https://www.overleaf.com/latex/templates?addsearch=elegantlatex}{search result}, choose the template you prefer and \lstinline{Open as Template} to own a copy yourself to edit freely. To learn more about Overleaf, please refer to \href{https://www.overleaf.com/learn}{Documentation}. @@ -69,14 +71,6 @@ Visit \href{https://www.overleaf.com/}{Overleaf} to use our template online anyw \subsection{To Use Portable Version} 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. -\subsection{To Use Local Installation Version} -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} \subsection{Update Templates} If you fail to update templates using \lstinline{tlshell}, please use cmd to update all the packages or switch to portable version instead. @@ -90,104 +84,37 @@ tlmgr update --all To learn more, please refer to \href{https://tex.stackexchange.com/questions/55437/how-do-i-update-my-tex-distribution}{How do I update my \TeX{} distribution?} \subsection{Other Release Versions} -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, please refer to OG (Official Guide) and/or \href{https://github.com/OsbertWang/install_latex/releases}{Install LaTeX v5.1} by OsbertWang. - -\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. You can visit current available works \href{https://github.com/ElegantLaTeX/Archive/tree/master/Collections}{here}. +If you are a \TeX{} Live 2018/2019/2020 user and would like to update, the official solution is to uninstall the previous version. If you want to save the bother of uninstallation and re-installation, please copy \lstinline{elegantbook.cls} to the installation directory of \TeX{} Live 2021 (default: \lstinline|C:\texlive\2021\texmf-dist\tex\latex\elegantbook| ), run \lstinline{texhash} in cmd. \section{About Pull Request} For some reasons, pull requests will NOT by accepted since May 20, 2019. For those who want to help improve the templates, submit issues or clone to your own repository to modify under LPPL-1.3c. -\section{Recruit Support Members} -Recruit support members for Elegant\LaTeX{} to translate template OGs, maintain wiki entries using Markdown, update Wechat articles. No deadline for this recruitment. - -So far, Elegant\LaTeX{} has four Support Members: -\begin{itemize} - \item OG Translator: \href{https://github.com/peggy2006xzyz}{YPY}; - \item Wiki Maintainer: \href{https://github.com/izinngo}{Ingo Zinngo}, \href{https://github.com/xiaohao890809}{Xiaohao890809}; - \item QQ Group Manager \& FAQ Maintainer: \href{https://github.com/sikouhjw}{Sikouhjw}. -\end{itemize} - -BTW, thank \href{https://github.com/stone-zeng}{Xiangdong Zeng}, \href{https://github.com/latexers}{Zhuluren}, etc. for their help. - -\section{Acknowledgement} -The number of stars on GitHub for ElegantBook reached 100 on May 20, 2019\footnote{372 stars by February 8, 2020!}.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. - -If you like our template, star on GitHub. - -\section{Donation} -To express your love for our templates and/or our developers, please do not hesitate to tip us. Since last release of 3.08, we have received about 1,500 RMB! (The emergence of a millionaire is on the way. Loading... ) -\begin{figure}[!htb] - \centering - \includegraphics[width=0.45\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}[!htb] - \centering - \caption{Donation List} - \begin{tabular}{*{4}{>{\scriptsize}c}|*{4}{>{\scriptsize}c}} - \toprule - \textbf{Tipper} & \textbf{Amount} & \textbf{Date} & \textbf{Channel} & \textbf{Tipper} & \textbf{Amount} & \textbf{Date} & \textbf{Channel} \\ - \midrule - Lerh & 10 RMB & 2019/05/15 & Wechat & yueguodipingxian & 10 RMB & 2019/05/15 & Wechat \\ - yinsang & 20 RMB & 2019/05/27 & Wechat & *kong & 10 RMB & 2019/05/30 & Wechat \\ - latexstudio.net & 666 RMB & 2019/06/05 & Alipay & A*n & 40 RMB & 2019/06/15 & Wechat \\ - * xia & 22 RMB & 2019/06/15 & Wechat & * qian & 21 RMB & 2019/06/15 & Wechat \\ - Cassis & 11 RMB & 2019/06/30 & Wechat & * jun & 10 RMB & 2019/07/23 & Wechat \\ - P*u & 50 RMB & 2019/07/30 & Wechat & * meng & 19 RMB & 2019/08/28 & Wechat \\ - Qu Doudou & 10 RMB & 2019/08/28 & Wechat & Li Bo & 100 RMB & 2019/10/06 & Wechat \\ - Njustsll & 10 RMB & 2019/10/11 & Wechat & Liu Zhikuo & 99.99 RMB & 2019/10/15 & Alipay \\ - * tao & 16 RMB & 2019/10/17 & Wechat & Chini & 12 RMB & 2019/10/17 & Alipay \\ - yuanfengjing & 10 RMB & 2019/10/28 & Wechat & Guo Deliang & 88 RMB & 2019/11/03 & Wechat \\ - ziqiangbuxi & 20 RMB & 2019/11/04 & Alipay & dushuzhichong & 20 RMB & 2019/11/18 & Wechat \\ - * deng & 10 RMB & 2019/11/18 & Wechat & * zhe & 20 RMB & 2019/11/18 & Wechat \\ - anonymous & 10 RMB & 2019/11/24 & Wechat & Jiye Qian & 66 RMB & 2019/12/04 & Wechat \\ - * yang & 20 RMB & 2019/12/05 & Wechat & Catcher & 11 RMB & 2019/12/08 & Alipay \\ - xierbotementu & 10 RMB & 2019/12/09 & Alipay & * wei & 10 RMB & 2019/12/09 & Wechat \\ - Simon & 20 RMB & 2019/12/11 & Alipay & liushangqianyi & 66.60 RMB & 2019/12/18 & Alipay \\ - yu & 10 RMB & 2019/12/20 & Alipay & *chen & 15 RMB & 2019/12/20 & Wechat \\ - suifeng & 20 RMB & 2019/12/27 & Alipay & Ws & 23.30 RMB & 2019/12/28 & Wechat \\ - chuba & 100 RMB & 2020/01/02 & Alipay & p*e & 20 RMB & 2020/01/03 & Wechat \\ - Shunmx & 100 RMB & 2020/01/03 & Wechat & hj & 10 RMB & 2020/01/03 & Wechat \\ - F*5 & 10 RMB & 2020/01/03 & Wechat & S*m & 20.20 RMB & 2020/01/03 & Wechat \\ - erdaiqingzhi & 13 RMB & 2020/01/14 & Alipay & *? & 66 RMB & 2020/01/15 & Wechat \\ - Mr. Xiong & 20 RMB & 2020/01/17 & Wechat & *bo & 15 RMB & 2020/01/18 & Wechat \\ - *Zhe & 10 RMB & 2020/02/02 & Wechat & Jackie & 88.80 RMB & 2020/02/09 & Wechat \\ - Henry\_Sun & 50 RMB & 2020/02/14 & Alipay & * Qiao & 50 RMB & 2020/02/21 & Wechat \\ - YunLian & 10 RMB & 2020/03/02 & Alipay & S*y & 10 RMB & 2020/03/15 & Wechat \\ - * Ge & 66.66 RMB & 2020/03/17 & Wechat & K*e & 30 RMB & 2020/03/30 & Wechat\\ - * Yang & 20 RMB & 2020/04/02 & Wechat & Shi*n & 30 RMB & 2020/04/11 & Wechat \\ - \bottomrule - \end{tabular}% - \label{tab:donation}% -\end{table}% - -BTW, we provide Certificate of Donation for those who donated, tippers please leave your name(nickname) and email address for us to send the certificates. - -\begin{figure}[!htb] - \centering - \includegraphics[width=0.7\textwidth]{cert.pdf} -\end{figure} \chapter{ElegantBook Settings} -This template is based on the Standard \LaTeX{} book class, so the options of book class work as well (Note that the option of papersize has no effect due to \lstinline{device} option). The default encoding is UTF-8 while \TeX{} Live is recommended. The test environment is Win10 + \TeX{} Live 2019, either \hologo{pdfLaTeX} or \lstinline{XeLaTeX} works fine. \lstinline{XeLaTeX} is preferred for Chinese articles. +This template is based on the Standard \LaTeX{} book class, so the options of book class work as well (Note that the option of papersize has no effect due to \lstinline{device} option). The default encoding is UTF-8 while \TeX{} Live is recommended. The test environment is Win10 + \TeX{} Live 2021, either \hologo{pdfLaTeX} or \hologo{XeLaTeX} works fine. \hologo{XeLaTeX} is preferred for Chinese articles. \section{Languages} -We defined one option named \lstinline{lang} which has three alternative values, \lstinline{lang=en} (default) , \lstinline{lang=cn} and \lstinline{lang=it}\footnote{Provided by \href{https://github.com/VincentMVV}{VincentMVV}, detail in \href{https://github.com/ElegantLaTeX/ElegantBook/issues/85}{GitHub: Italian translation}.}. Different values will alter the captions of figure/table, abstract name, refname, etc. You can use this option as +We defined one option named \lstinline{lang} which has two basic values, \lstinline{lang=en} (default) , \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} +Besides the two basic language translation, our user provide more options, here is a short brief introduction to these translation. Since I am not familiar with these languages, I can't guarantee that the translations are correct, please comment on GitHub if you have some questions. + +\begin{itemize} + \item Italian translation \lstinline{lang=it}, provided by \href{https://github.com/VincentMVV}{VincentMVV} , please refer to \href{https://github.com/ElegantLaTeX/ElegantBook/issues/85}{Italian translation}; + \item French translation \lstinline{lang=fr}, provided by \href{https://github.com/abfek66}{abfek66} , please refer to \href{https://github.com/ElegantLaTeX/ElegantBook/issues/85}{Italian translation}; + \item Dutch Translation \lstinline{lang=nl}, provided by \href{https://github.com/inktvis75}{inktvis75} , please refer to \href{https://github.com/ElegantLaTeX/ElegantBook/issues/108}{Dutch Translation}; + \item Hungarian translation \lstinline{lang=hu}, provided by \href{https://github.com/palkotamas}{palkotamas}, please refer to \href{https://github.com/ElegantLaTeX/ElegantBook/issues/111}{Hungarian translation}; + \item Deutsch translation \lstinline{lang=de}, provided by Lisa, please refer to\href{https://github.com/ElegantLaTeX/ElegantBook/issues/113}{Deutsch translation}; + \item Spanish translation \lstinline{lang=es}, provided by Gustavo A. Corradi, please refer to \href{https://github.com/ElegantLaTeX/ElegantBook/issues/133}{Spanish translation}; + \item Mongolian translation \lstinline{lang=mn}, provided by \href{https://github.com/Altantsooj}{Altantsooj}, please refer to \href{https://github.com/ElegantLaTeX/ElegantBook/issues/137}{Mongolian translation}. +\end{itemize} + \begin{remark} -Chinese Characters are acceptable \textbf{ONLY} in \lstinline{lang=cn}. If you would like to include Chinese characters under (\lstinline{lstlisting}) environment, please use \hologo{XeLaTeX} to compile. +Chinese Characters are acceptable \textbf{ONLY} in \lstinline{lang=cn}. \end{remark} \section{Device Mode Option} @@ -274,6 +201,12 @@ Besides, an extra command \lstinline{\bioinfo} is provided with two options--cap \bioinfo{Username}{115520} \end{lstlisting} +You can change the color of the horizontal bar of the cover by +\begin{lstlisting} + \definecolor{customcolor}{RGB}{32,178,170} + \colorlet{coverlinecolor}{customcolor} +\end{lstlisting} + \subsection{Cover Image} The cover image used in this template is from \href{https://pixabay.com/en/tea-time-poetry-coffee-reading-3240766/}{pixabay.com}. 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.fotor.com/cn}{fotor.com}. Feel free to join our QQ Group to get more elegant covers. @@ -317,13 +250,24 @@ In this template, we defined four different theorem class environments \subsection{Theorem Class Environments} 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>} +\begin{theorem}{theorem name}{label text} The content of theorem. \end{theorem} \end{lstlisting} 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:}. +From version 4.1, you can write your theorem environments as follows: +\begin{lstlisting} +\begin{theorem}[theorem name]\label{thm:label text} + The content of theorem. +\end{theorem} +% or +\begin{theorem} + The content of theorem. +\end{theorem} +\end{lstlisting} + Other theorem class environments with the same usage includes: \begin{table}[htbp] @@ -398,27 +342,62 @@ This template uses \lstinline{tikz} to customize the list environments, with \ls \end{enumerate} \end{minipage} -\section{Bibliography} -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. +\section{Fonts} +\textcolor{red}{\bfseries Alert} After v3.10, newtx is reset to cm, together with other two options, the \lstinline{math} font option offers: +\begin{enumerate} + \item \lstinline{math=cm}(default), use \LaTeX{} default math font (recommended). + \item \lstinline{math=newtx}, use \lstinline{newtxmath} math font (may bring about bugs). + \item \lstinline{math=mtpro2}, use \lstinline{mtpro2} package to set math font. +\end{enumerate} -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 +If you use \lstinline{newtx} fonts, type in: +\begin{lstlisting} +\documentclass[math=newtx]{elegantbook} +\end{lstlisting} + +When you are using \lstinline{newtx}, please pay attention to the hyphens. For instance, +\begin{equation} +\int_{R^q} f(x,y) dy.\emph{of\kern0pt f} +\end{equation} + +The corresponding code is: +\begin{lstlisting} +\begin{equation} + \int_{R^q} f(x,y) dy.\emph{of \kern0pt f} +\end{equation} \end{lstlisting} -Three more options \lstinline{cite=numbers}, \lstinline{cite=super} 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} and/or \lstinline{cite=super} more often. For those who want to use \lstinline{cite=super} or \lstinline{authoryear}, please type in: +\subsection{Symbol Fonts} +Feedback from some 3.08 users claims that error occurs when using our templates with \lstinline{yhmath}, \lstinline{esvect} and other packages. +\begin{lstlisting} +LaTeX Error: +Too many symbol fonts declared. +\end{lstlisting} + +The reason is that the template redefines font for math so that no new math font is allowed to be added. To use \lstinline{yhmath} and/or \lstinline{esvect}, please locate \lstinline{yhmath} or \lstinline{esvect} in \lstinline{elegantbook.cls}, uncomment corresponding related code. + \begin{lstlisting} -\documentclass[cite=super]{elegantbook} % set cite for super style -\documentclass[super]{elegantbook} -\documentclass[cite=authoryear]{elegantbook} % set cite for author-year style -\documentclass[authoryear]{elegantbook} +%%% use yhmath pkg, uncomment following code +% \let\oldwidering\widering +% \let\widering\undefined +% \RequirePackage{yhmath} +% \let\widering\oldwidering + +%%% use esvect pkg, uncomment following code +% \RequirePackage{esvect} \end{lstlisting} -To change the bibliography style, this version introduces \lstinline{bibstyle} with default option apalike, for more options, refer to \href{https://www.overleaf.com/learn/latex/Bibtex_bibliography_styles}{\hologo{BibTeX} Bibliography Styles}. Type in +\section{Bibliography} + +This template uses biblatex to generate the bibliography, the default citestyle and bibliography style are both \lstinline{numeric}. Let's take a glance at the citation effect. ~\cite{en1} use data from a major peer-to-peer lending \cite{en3} marketplace in China to study whether female and male investors evaluate loan performance differently \parencite{en2}. + +If you want to use biblatex, you must create a file named \lstinline{reference.bib}, add bib items (from Google Scholar, Mendeley, EndNote, and etc.) to \lstinline{reference.bib} file, then cite the bibkey in the \lstinline{tex} file. The biber will automatically generate the bibliography for the reference you cited. + + +To change the bibliography style, this version introduces \lstinline{citestyle} and \lstinline{bibstyle}, please refer to \href{https://ctan.org/pkg/biblatex}{CTAN:biblatex} for more detail about these options. You can change your bibliography style as \begin{lstlisting} -\documentclass[bibstyle=apalike]{elegantbook} +\documentclass[citestyle=numeric-comp, bibstyle=authoryear]{elegantbook} \end{lstlisting} \section{Preface} @@ -431,18 +410,13 @@ The content of introduction. \end{lstlisting} \section{Content Option and Depth} -This version adds an option for content \lstinline{toc}, you can choose either one column(\lstinline{onecol}) or two columns(\lstinline{twocol}). For two columns: +Option for content \lstinline{toc}, you can choose either one column(\lstinline{onecol}) or two columns(\lstinline{twocol}). For two columns: \begin{lstlisting} \documentclass[twocol]{elegantbook} \documentclass[toc=twocol]{elegantbook} \end{lstlisting} -Default content depth is 1, use -\begin{lstlisting} -\setcounter{tocdepth}{2} -\end{lstlisting} -to make it 2. - +Default content depth is 1, use to use \lstinline|\setcounter{tocdepth}{2}|. \section{Introduction Environment} We create a introduction environment to display the structure of chapter. The basic useage is as follows: @@ -471,7 +445,7 @@ You can change the title of this environment by modifying the optional argument \end{introduction} \end{lstlisting} -\section{Problem Set} +%\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} @@ -537,59 +511,6 @@ For tables and figures, note that floating environment is not allowed. You have \end{remark} -\chapter{Fonts} -Leave one chapter to introduce fonts to help users to solve font problems conveniently. - -\textcolor{red}{\bfseries Alert} After v3.10, newtx is reset to cm and \lstinline{chinesefont} option is added. - -\section{Math Fonts} -This template defines a new command(\lstinline{math}), with three options: -\begin{enumerate} - \item \lstinline{math=cm}(default), use \LaTeX{} default math font (recommended). - \item \lstinline{math=newtx}, use \lstinline{newtxmath} math font (may bring about bugs). - \item \lstinline{math=mtpro2}, use \lstinline{mtpro2} package to set math font. -\end{enumerate} - -\section{Use newtx fonts} -If you use \lstinline{newtx} fonts, type in: - -\begin{lstlisting} -\documentclass[math=newtx]{elegantbook} -\end{lstlisting} - - -\subsection{Hyphens} -Since the template uses \lstinline{newtx}, please pay attention to the hyphens. For instance, -\begin{equation} -\int_{R^q} f(x,y) dy.\emph{of\kern0pt f} -\end{equation} - -The corresponding code is: -\begin{lstlisting} -\begin{equation} -\int_{R^q} f(x,y) dy.\emph{of \kern0pt f} -\end{equation} -\end{lstlisting} - -\section{Symbol Fonts} -Feedback from some 3.08 users claims that error occurs when using our templates with \lstinline{yhmath}, \lstinline{esvect} and other packages. -\begin{lstlisting} -LaTeX Error: -Too many symbol fonts declared. -\end{lstlisting} - -The reason is that the template redefines font for math so that no new math font is allowed to be added. To use \lstinline{yhmath} and/or \lstinline{esvect}, please locate \lstinline{yhmath} or \lstinline{esvect} in \lstinline{elegantbook.cls}, uncomment corresponding related code. - -\begin{lstlisting} -%%% use yhmath pkg, uncomment following code -% \let\oldwidering\widering -% \let\widering\undefined -% \RequirePackage{yhmath} -% \let\widering\oldwidering - -%%% use esvect pkg, uncomment following code -% \RequirePackage{esvect} -\end{lstlisting} \chapter{ElegantBook Writing Sample} @@ -611,7 +532,7 @@ The reason is that the template redefines font for math so that no new math font We will define the integral of a measurable function in three steps. First, we define the integral of a nonnegative simple function. Let $E$ be the measurable set in $\mathcal{R}^N$. -\begin{definition}{Left Coset}{} +\begin{definition}[Left Coset] Let $H$ be a subgroup of a group~$G$. A \emph{left coset} of $H$ in $G$ is a subset of $G$ that is of the form $xH$, where $x \in G$ and $xH = \{ xh : h \in H \}$. Similarly a \emph{right coset} of $H$ in $G$ is a subset of $G$ that is of the form $Hx$, where $Hx = \{ hx : h \in H \}$ $\hbar$ \end{definition} @@ -621,14 +542,15 @@ Note that a subgroup~$H$ of a group $G$ is itself a left coset of $H$ in $G$. \lipsum[2] -\begin{theorem}{Lagrange's Theorem}{} +\begin{theorem}[Lagrange's Theorem] \label{thm:lg} Let $G$ be a finite group, and let $H$ be a subgroup of $G$. Then the order of $H$ divides the order of $G$. \end{theorem} +\ref{thm:lg} \lipsum[3] -\begin{proposition}{Size of Left Coset}{} +\begin{proposition}[Size of Left Coset] Let $H$ be a finite subgroup of a group $G$. Then each left coset of $H$ in $G$ has the same number of elements as $H$. \end{proposition} @@ -638,7 +560,7 @@ Let $z$ be some element of $xH \cap yH$. Then $z = xa$ for some $a \in H$, and \begin{figure}[htbp] \centering - \includegraphics[width=0.6\textwidth]{scatter.pdf} + \includegraphics[width=0.6\textwidth]{scatter.jpg} \caption{Matplotlib: Scatter Plot Example\label{fig:scatter}} \end{figure} @@ -646,6 +568,10 @@ Regression analysis is a powerful statistical method that allows you to examine Let's continue using our application training example. In this case, we'd want to measure the historical levels of satisfaction with the events from the past three years or so, as well as any information possible in regards to the independent variables. +\section{Second section} +This second section\index{S!section} may include some special word, +and expand the ones already used\index{keywords!used}. + \begin{table}[htbp] \small @@ -681,6 +607,7 @@ Let's continue using our application training example. In this case, we'd want t \item Distributed storage and search. \end{itemize} +%\problemset \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)$. @@ -696,9 +623,9 @@ We list some FAQs for users to refer to: \item \question{I want to customize font and background color.} 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. \item \question{Which version should I choose?} - Please use \href{https://github.com/ElegantLaTeX/ElegantBook/releases}{Latest Release} via GitHub or \TeX{} Live 2019. + Please use \href{https://github.com/ElegantLaTeX/ElegantBook/releases}{Latest Release} via GitHub or \TeX{} Live 2021. \item \question{Which editor should I choose?} - 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}. + You can use \TeX{} Live 2021 built-in \TeX works or \TeX Studio. You may refer to \href{https://github.com/EthanDeng/texworks-autocomplete}{\TeX{}works autocomplete}. \TeX{} Live 2021 + \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}. \item \question{Hello, we want to use ElegantBook to write a book about machine learning and would like your authorization.} 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. \item \question{What is cross reference?} @@ -706,20 +633,33 @@ We list some FAQs for users to refer to: \item \question{Is the language for code highlighting optional?} Yes, \lstinline{listings} package is used in ElegantBook, hence language is optional(e.g. \lstinline{language=Python}). For global setting, use \lstinline{lstset}. For more information, please refer to package documentations. \item \question{When will Beamer template (ElegantSlide or ElegantBeamer) forthcoming?} - Since there is an excellent theme \href{https://github.com/matze/mtheme}{Metropolis}, a Beta theme PreElegantSlide is available in QQ group. Feel free to download. A formal version is forthcoming in this year or next year. + Since there is an excellent theme \href{https://github.com/matze/mtheme}{Metropolis}, no plan for Beamer theme. \end{enumerate} \chapter{Version History} -We revised our templates now and then. This section shows the version story of ElegantBook. We have nearly 100 submits and 16 releases on GitHub since uploaded. +We revised our templates now and then. This section shows the version story of ElegantBook. We have nearly 100 submits and 17 releases on GitHub since uploaded. + + +\datechange{2021/05/02}{release of v4.1.} + +\begin{change} + \item \textbf{! Big Change}: Change the bibliography method from \hologo{BibTeX} to biblatex(with backend \lstinline{biber}); + \item \textbf{! Big Change}: Add support for the default theorem writing method (with optional name and label); + \item Add left and right space; + \item Support hyperlink from the text of TOC; + \item Remove the \hologo{pdfLaTeX} compatiblity check for Chinese. + \item Add multilingual support, for french \lstinline{lang=fr}, dutch \lstinline{lang=nl}, Hungarian \lstinline{lang=hu}, Spanish \lstinline{lang=es}, Mongolian \lstinline{lang=mn} etc. +\end{change} \datechange{2020/04/12}{release of v3.11, \textcolor{red}{\textbf{LAST} version of 3.x}.} -\begin{enumerate} - \item \textbf{Fix}: Fix \lstinline{natbib option clash} problems caused by \lstinline{gbt7714} updates; - \item Remove \lstinline{base} decorations and its options since \lstinline{pgfornament} package is not included in \TeX{} Live 2020; - \item Fix spacing problem in some environments; - \item Add Italian language option, \lstinline{lang=it}. -\end{enumerate} + +\begin{change} + \item \textbf{! Fix}: Fix \lstinline{natbib option clash} problems caused by \lstinline{gbt7714} updates. + \item Remove \lstinline{base} decorations and its options since \lstinline{pgfornament} package is not included in \TeX{} Live 2020. + \item Fix spacing problem in some environments. + \item Introduce language option for Italian, \lstinline{lang=it}. +\end{change} \datechange{2020/02/10}{release of v3.10} @@ -748,8 +688,10 @@ We revised our templates now and then. This section shows the version story of E \end{change} \nocite{en2,en3} -\bibliography{reference} +\printbibliography + \appendix +% \renewcommand\chaptername{\eappendix \thechapter} \chapter{Mathematical Tools} @@ -763,4 +705,5 @@ This appendix covers some of the basic mathematics used in econometrics. We brie \sum_{i=1}^n x_i \equiv x_1 + x_2 +\cdots + x_n \end{equation} + \end{document}
\ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/elegantbook/figure/logo.png b/Master/texmf-dist/doc/latex/elegantbook/figure/logo.png Binary files differdeleted file mode 100644 index 1252e91ece0..00000000000 --- a/Master/texmf-dist/doc/latex/elegantbook/figure/logo.png +++ /dev/null diff --git a/Master/texmf-dist/doc/latex/elegantbook/image/scatter.jpg b/Master/texmf-dist/doc/latex/elegantbook/image/scatter.jpg Binary files differnew file mode 100644 index 00000000000..6692f1f4549 --- /dev/null +++ b/Master/texmf-dist/doc/latex/elegantbook/image/scatter.jpg diff --git a/Master/texmf-dist/doc/latex/elegantbook/image/scatter.pdf b/Master/texmf-dist/doc/latex/elegantbook/image/scatter.pdf Binary files differdeleted file mode 100644 index b217cdc055f..00000000000 --- a/Master/texmf-dist/doc/latex/elegantbook/image/scatter.pdf +++ /dev/null diff --git a/Master/texmf-dist/doc/latex/elegantbook/image/scatter.py b/Master/texmf-dist/doc/latex/elegantbook/image/scatter.py deleted file mode 100644 index 576e6b07df0..00000000000 --- a/Master/texmf-dist/doc/latex/elegantbook/image/scatter.py +++ /dev/null @@ -1,27 +0,0 @@ -# This file is the source file of the scatter.pdf -# source page: https://matplotlib.org/gallery/shapes_and_collections/scatter.html -import numpy as np -import matplotlib.pyplot as plt - -# Fixing random state for reproducibility -np.random.seed(19680801) - - -N = 50 -x = np.random.rand(N) -y = np.random.rand(N) -colors = np.random.rand(N) -area = (30 * np.random.rand(N))**2 # 0 to 15 point radii - -ax = plt.subplot(111) -ax.scatter(x, y, s=area, c=colors, alpha=0.5) - -# Hide the right and top spines -ax.spines['right'].set_visible(False) -ax.spines['top'].set_visible(False) - -# Only show ticks on the left and bottom spines -ax.yaxis.set_ticks_position('left') -ax.xaxis.set_ticks_position('bottom') - -plt.savefig('scatter.pdf', transparent=True) diff --git a/Master/texmf-dist/doc/latex/elegantbook/image/tlshell.png b/Master/texmf-dist/doc/latex/elegantbook/image/tlshell.png Binary files differdeleted file mode 100644 index 6df5fd988c7..00000000000 --- a/Master/texmf-dist/doc/latex/elegantbook/image/tlshell.png +++ /dev/null diff --git a/Master/texmf-dist/tex/latex/elegantbook/elegantbook.cls b/Master/texmf-dist/tex/latex/elegantbook/elegantbook.cls index 08e6716fca0..ae05a7c3a59 100644 --- a/Master/texmf-dist/tex/latex/elegantbook/elegantbook.cls +++ b/Master/texmf-dist/tex/latex/elegantbook/elegantbook.cls @@ -1,6 +1,6 @@ %%%%%%%%%%%%%%%%%%%%%% %% start of file `elegantbook.cls'. -%% Copyright 2013-2020 ElegantLaTeX (elegantlatex2e@gmail.com) +%% Copyright 2013-2021 ElegantLaTeX (elegantlatex2e@gmail.com) %% %% This work may be distributed and/or modified freely %% available at https://github.com/ElegantLaTeX/ElegantBook @@ -8,7 +8,7 @@ %%%%%%%%%%%%%%%%%%%%% % % !Mode:: "TeX:UTF-8" \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{elegantbook}[2020/04/12 v3.11 ElegantBook document class] +\ProvidesClass{elegantbook}[2021/05/02 v4.1 ElegantBook document class] \RequirePackage{kvoptions} \RequirePackage{etoolbox} @@ -53,12 +53,9 @@ \DeclareVoidOption{normal}{\ekv{device=normal}} \DeclareVoidOption{pad}{\ekv{device=pad}} -\DeclareStringOption[numbers]{cite} -\DeclareVoidOption{numbers}{\ekv{cite=numbers}} -\DeclareVoidOption{authoryear}{\ekv{cite=authoryear}} -\DeclareVoidOption{super}{\ekv{cite=super}} +\DeclareStringOption[numeric-comp]{citestyle} +\DeclareStringOption[numeric]{bibstyle} -\DeclareStringOption[apalike]{bibstyle} \DeclareVoidOption{newtx}{\ekv{math=newtx}} \DeclareVoidOption{mtpro2}{\ekv{math=mtpro2}} @@ -67,9 +64,11 @@ \DeclareVoidOption{margintrue}{\ekv{marginpar=margintrue}} \DeclareVoidOption{marginfalse}{\ekv{marginpar=marginfalse}} + \DeclareVoidOption{onecol}{\ekv{toc=onecol}} \DeclareVoidOption{twocol}{\ekv{toc=twocol}} + % ----- Math option ----- \newcommand\mailto[1]{\href{mailto:#1}{\nolinkurl{#1}}} @@ -86,6 +85,10 @@ \LoadClass[a4paper,oneside]{book} \RequirePackage{setspace} + +\RequirePackage{csquotes} + + \RequirePackage{hyperref} \hypersetup{ breaklinks, @@ -110,6 +113,7 @@ \geometry{ a4paper, top=25.4mm, bottom=25.4mm, + left=20mm, right=20mm, headheight=2.17cm, headsep=4mm, footskip=12mm @@ -137,6 +141,7 @@ }{\relax} \setcounter{tocdepth}{1} +\renewcommand{\baselinestretch}{1.2} \PassOptionsToPackage{no-math}{fontspec} \RequirePackage{iftex} @@ -167,7 +172,15 @@ \fi \AfterEndPreamble{ % \renewcommand{\itshape}{\kaishu} - \setlength\parindent{2\ccwd}}}{\relax} + \setlength\parindent{2\ccwd}} +}{\relax} + +\ifcsname heiti\endcsname + \newcommand{\cbfseries}{\heiti} +\else + \newcommand{\cbfseries}{\bfseries} +\fi + \ifcsname kaishu\endcsname \newcommand{\citshape}{\kaishu} @@ -210,7 +223,7 @@ % ----- Handle Colors ----- %% 章节以及页脚图形 -\RequirePackage{xcolor} +\RequirePackage[table]{xcolor} \ifdefstring{\ELEGANT@color}{green}{ \definecolor{structurecolor}{RGB}{0,120,2}% \definecolor{main}{RGB}{0,120,2}% @@ -271,6 +284,8 @@ % corlor definition \definecolor{winered}{rgb}{0.5,0,0} \definecolor{bule}{RGB}{18,29,57} +\colorlet{coverlinecolor}{second} + % ----- Title Style ----- \ifdefstring{\ELEGANT@titlestyle}{hang}{\def\style{hang}}{\relax} @@ -295,15 +310,12 @@ \newcommand{\question}[1]{{\par\citshape #1}\\[0.2ex]} -\ifdefstring{\ELEGANT@lang}{cn}{\relax}{ - \RequirePackage[\ELEGANT@cite,sort&compress]{natbib}} - \RequirePackage{enumerate} % list/itemize/enumerate setting \RequirePackage[shortlabels,inline]{enumitem} \setlist{nolistsep} -\RequirePackage[font=small,labelfont={bf,color=structurecolor}]{caption} +\RequirePackage[labelfont={bf,color=structurecolor}]{caption} \captionsetup[table]{skip=3pt} \captionsetup[figure]{skip=3pt} @@ -314,18 +326,7 @@ \setlength{\footnotesep}{12pt} } -\ifdefstring{\ELEGANT@toc}{twocol}{ -\renewcommand{\tableofcontents}{% -\setlength{\columnsep}{2em} -%\setlength{\columnseprule}{.8pt} -\begin{multicols}{2}[\chapter*{\contentsname}]% - \@starttoc{toc}% -\end{multicols}} -}{\relax} - -%% 常用宏包 -\linespread{1.3} \RequirePackage{graphicx} %\RequirePackage{enumerate} @@ -334,11 +335,24 @@ % \renewcommand{\qed}{\hfill\ensuremath{\square}} \RequirePackage{booktabs} \RequirePackage{multicol,multirow} -\RequirePackage{xcolor} + \RequirePackage{fancyvrb} \RequirePackage{makecell,lipsum,hologo} %%中文结构名字 + +\RequirePackage[ + backend=biber, + citestyle=\ELEGANT@citestyle, + bibstyle=\ELEGANT@bibstyle]{biblatex} + + + +%% 章节设置 + +\RequirePackage{appendix} + \ifdefstring{\ELEGANT@lang}{cn}{ + \renewcommand{\baselinestretch}{1.3} \renewcommand{\contentsname}{目录} \renewcommand{\figurename}{图} \renewcommand{\tablename}{表} @@ -347,26 +361,19 @@ \renewcommand{\listfigurename}{插图目录} \renewcommand{\listtablename}{表格目录} \renewcommand{\bibname}{参考文献} - \renewcommand{\appendixname}{附录~\thechapter} + \renewcommand{\appendixname}{附录} \renewcommand{\indexname}{索\hspace{2em}引} \newcommand\figref[1]{\textbf{图}~\ref{#1}} \newcommand\tabref[1]{\textbf{表}~\ref{#1}} \ifdefstring{\ELEGANT@scheme}{chinese}{ - \renewcommand{\chaptername}{第~\zhnumber{\arabic{chapter}}~章}}{ - \renewcommand{\chaptername}{第~\thechapter{}~章}} + \renewcommand{\chaptername}{第\zhnumber{\arabic{chapter}}章}}{ + \renewcommand{\chaptername}{第 \thechapter{} 章}} \newcommand{\authorname}{\citshape 作者:} \newcommand{\institutename}{\citshape 组织:} \newcommand{\datename}{\citshape 时间:} \newcommand{\versionname}{\citshape 版本:} - \RequirePackage{gbt7714} - \ifdefstring{\ELEGANT@cite}{authoryear}{ - \bibliographystyle{gbt7714-author-year}}{ - \bibliographystyle{gbt7714-numerical}} - \ifdefstring{\ELEGANT@cite}{numbers}{ - \citestyle{numbers}}{\relax} \newcommand{\notename}{笔记} \renewcommand*{\proofname}{证明} - \newcommand{\problemname}{例题} \newcommand{\definitionname}{定义} \newcommand{\theoremname}{定理} \newcommand{\axiomname}{公理} @@ -374,28 +381,30 @@ \newcommand{\lemmaname}{引理} \newcommand{\propositionname}{命题} \newcommand{\corollaryname}{推论} - \newcommand{\examplename}{例} - \newcommand{\exercisename}{练习} + \newcommand{\examplename}{例题} % + \newcommand{\instancename}{示例} % + \newcommand{\problemname}{问题} % 问题 + \newcommand{\exercisename}{练习} % 练习=习题 \newcommand{\remarkname}{注} \newcommand{\assumptionname}{假设} \newcommand{\conclusionname}{结论} \newcommand{\solutionname}{解} \newcommand{\propertyname}{性质} \newcommand{\introductionname}{内容提要} - \newcommand{\problemsetname}{习题} \newcommand\bioinfo[2]{\gdef\@bioinfo{{\citshape #1}:#2}} \newcommand{\updatename}{更新:} - \newcommand{\historyname}{版本更新历史}}{\relax} + \newcommand{\historyname}{版本更新历史} + }{\relax} \ifdefstring{\ELEGANT@lang}{en}{ \setlength\parindent{2em} \newcommand\figref[1]{\textbf{Figure}~\ref{#1}} \newcommand\tabref[1]{\textbf{Table}~\ref{#1}} \renewcommand{\chaptername}{Chapter \thechapter} + \renewcommand{\partname}{\color{structurecolor} Part} \newcommand{\authorname}{\textbf{Author: }} \newcommand{\institutename}{\textbf{Institute: }} \newcommand{\datename}{\textbf{Date: }} \newcommand{\versionname}{\textbf{Version: }} - \bibliographystyle{\ELEGANT@bibstyle} \newcommand{\notename}{Note} \newcommand{\proofname}{Proof} \newcommand{\problemname}{Problem} @@ -414,23 +423,25 @@ \newcommand{\solutionname}{Solution} \newcommand{\propertyname}{Property} \newcommand{\introductionname}{Introduction} - \newcommand{\problemsetname}{Exercise} + \renewcommand{\appendixname}{Appendix} + % \newcommand{\problemsetname}{Exercise} \newcommand\bioinfo[2]{\gdef\@bioinfo{\textbf{#1}: #2}} \newcommand{\updatename}{Updates:} \newcommand{\historyname}{Version History} }{\relax} \ifdefstring{\ELEGANT@lang}{it}{ + % \RequirePackage[utf8]{inputenc} \RequirePackage[italian]{babel} + % \RequirePackage[T1]{fontenc} \setlength\parindent{2em} \newcommand\figref[1]{\textbf{Figura}~\ref{#1}} \newcommand\tabref[1]{\textbf{Tabella}~\ref{#1}} - \renewcommand{\chaptername}{Capitolo \thechapter} + \renewcommand{\chaptername}{Chapter \thechapter} \newcommand{\authorname}{\textbf{Autore: }} \newcommand{\institutename}{\textbf{Istituto: }} \newcommand{\datename}{\textbf{Data: }} \newcommand{\versionname}{\textbf{Versione: }} - \bibliographystyle{\ELEGANT@bibstyle} \newcommand{\notename}{Nota} \newcommand{\proofname}{Dimostrazione} \newcommand{\problemname}{Problema} @@ -449,27 +460,229 @@ \newcommand{\solutionname}{Soluzione} \newcommand{\propertyname}{Proprietà} \newcommand{\introductionname}{Introduzione} - \newcommand{\problemsetname}{Esercizio} \newcommand\bioinfo[2]{\gdef\@bioinfo{\textbf{#1}: #2}} \newcommand{\updatename}{Aggiornamenti:} \newcommand{\historyname}{Cronologia delle versioni} }{\relax} -\setlength{\bibsep}{0.0pt} -\def\bibfont{\footnotesize} +\ifdefstring{\ELEGANT@lang}{fr}{ + \RequirePackage[utf8]{inputenc} + \RequirePackage[T1]{fontenc} + \RequirePackage[french]{babel} + \setlength\parindent{2em} + \renewcommand\figref[1]{\textbf{Figure}\ref{#1}} + \renewcommand\tabref[1]{\textbf{Tableau}\ref{#1}} + \renewcommand{\chaptername}{Chapitre \thechapter} + \renewcommand{\authorname}{\textbf{Auteur: }} + \renewcommand{\institutename}{\textbf{Institut: }} + \renewcommand{\datename}{\textbf{Date: }} + \renewcommand{\versionname}{\textbf{Version: }} + \renewcommand{\notename}{Note} + \renewcommand{\proofname}{Démonstration} + \renewcommand{\problemname}{Problème} + \renewcommand{\definitionname}{Définition} + \renewcommand{\theoremname}{Théorème} + \renewcommand{\axiomname}{Axiôme} + \renewcommand{\postulatename}{Postulat} + \renewcommand{\lemmaname}{Lemme} + \renewcommand{\propositionname}{Proposition} + \renewcommand{\corollaryname}{Corollaire} + \renewcommand{\examplename}{Exemple} + \renewcommand{\exercisename}{Exercice} + \renewcommand{\remarkname}{Remarque} + \renewcommand{\assumptionname}{Supposition} + \renewcommand{\conclusionname}{Conclusion} + \renewcommand{\solutionname}{Solution} + \renewcommand{\propertyname}{Propriété} + \renewcommand{\introductionname}{Introduction} + \renewcommand{\problemsetname}{Exercice} + \renewcommand{\updatename}{Mises à jour:} + \renewcommand{\historyname}{Historique des versions} +}{\relax} + + +\ifdefstring{\ELEGANT@lang}{nl}{ + \RequirePackage[dutch]{babel} + \setlength\parindent{2em} + \newcommand\figref[1]{\textbf{Figuur}~\ref{#1}} + \newcommand\tabref[1]{\textbf{Tabel}~\ref{#1}} + \renewcommand{\chaptername}{Hoofdstuk \arabic{chapter}} + \newcommand{\authorname}{\textbf{Auteur: }} + \newcommand{\institutename}{\textbf{Instituut: }} + \newcommand{\datename}{\textbf{Datum: }} + \newcommand{\versionname}{\textbf{Versie: }} + \newcommand{\notename}{Opmerking} + \newcommand{\proofname}{Bewijs} + \newcommand{\problemname}{Probleem} + \newcommand{\definitionname}{Definitie} + \newcommand{\theoremname}{Stelling} + \newcommand{\axiomname}{Uitgangspunt} + \newcommand{\postulatename}{Hypothese} + \newcommand{\lemmaname}{Lemma} + \newcommand{\propositionname}{Voorstel} + \newcommand{\corollaryname}{Gevolgtrekking} + \newcommand{\examplename}{Voorbeeld} + \newcommand{\exercisename}{Oefening} + \newcommand{\remarkname}{Commentaar} + \newcommand{\assumptionname}{Veronderstelling} + \newcommand{\conclusionname}{Besluit} + \newcommand{\solutionname}{Oplossing} + \newcommand{\propertyname}{Eigenschap} + \newcommand{\introductionname}{Introductie} + \newcommand{\problemsetname}{Probleemcomplex} + \newcommand\bioinfo[2]{\gdef\@bioinfo{\textbf{#1}: #2}} + \newcommand{\updatename}{Update:} + \newcommand{\historyname}{Versie Geschiedenis} +}{\relax} + + +\ifdefstring{\ELEGANT@lang}{hu}{ + \RequirePackage[magyar]{babel} + \setlength\parindent{2em} + \newcommand\figref[1]{\ref{#1}~\textbf{Ábra}} + \newcommand\tabref[1]{\ref{#1}~\textbf{Táblázat}} + \renewcommand{\chaptername}{\thechapter ~ fejezet} + \newcommand{\authorname}{\textbf{Szerző: }} + \newcommand{\institutename}{\textbf{Intézmény: }} + \newcommand{\datename}{\textbf{Dátum: }} + \newcommand{\versionname}{\textbf{Verziószám: }} + \newcommand{\notename}{Jegyzet} + \newcommand{\proofname}{Bizonyítás} + \newcommand{\problemname}{Probléma} + \newcommand{\definitionname}{Definíció} + \newcommand{\theoremname}{Tétel} + \newcommand{\axiomname}{Axióma} + \newcommand{\postulatename}{Követelmény} + \newcommand{\lemmaname}{Lemma} + \newcommand{\propositionname}{Előzmény} + \newcommand{\corollaryname}{Következmény} + \newcommand{\examplename}{Példa} + \newcommand{\exercisename}{Feladat} + \newcommand{\remarkname}{Megjegyzés} + \newcommand{\assumptionname}{Sejtés} + \newcommand{\conclusionname}{Összefoglalás} + \newcommand{\solutionname}{Megoldás} + \newcommand{\propertyname}{Tulajdonság} + \newcommand{\introductionname}{Bevezetés} + \newcommand{\problemsetname}{Feladatok} + \newcommand\bioinfo[2]{\gdef\@bioinfo{\textbf{#1}: #2}} + \newcommand{\updatename}{Frissítve:} + \newcommand{\historyname}{Korábbi verziók} +}{\relax} + +\ifdefstring{\ELEGANT@lang}{de}{ + \setlength\parindent{2em} + \renewcommand{\contentsname}{Inhaltsverzeichnis} + \newcommand\figref[1]{\textbf{Figur}~\ref{#1}} + \newcommand\tabref[1]{\textbf{Tabelle}~\ref{#1}} + \renewcommand{\partname}{\color{structurecolor} Teil} + \renewcommand{\listfigurename}{Abbildungsverzeichnis} + \renewcommand{\listtablename}{Tabellenverzeichnis} + \renewcommand{\bibname}{Bibliographie} + \renewcommand{\appendixname}{Anhang} + \renewcommand{\chaptername}{Kapitel \thechapter} + \newcommand{\authorname}{\textbf{Autor: }} + \newcommand{\institutename}{\textbf{Institut: }} + \newcommand{\datename}{\textbf{Datum: }} + \newcommand{\versionname}{\textbf{Version: }} + \newcommand{\notename}{Notiz} + \newcommand{\proofname}{Beweis} + \newcommand{\problemname}{Problem} + \newcommand{\definitionname}{Definition} + \newcommand{\theoremname}{Theorem} + \newcommand{\axiomname}{Axiom} + \newcommand{\postulatename}{Postulat} + \newcommand{\lemmaname}{Lemma} + \newcommand{\propositionname}{Behauptung} + \newcommand{\corollaryname}{Corollary} + \newcommand{\examplename}{Beispiel} + \newcommand{\instancename}{Beispiel} % + \newcommand{\exercisename}{\"{U}bung} + \newcommand{\remarkname}{Anmerkung} + \newcommand{\assumptionname}{Annahme} + \newcommand{\conclusionname}{Abschluss} + \newcommand{\solutionname}{Aufl\"{o}sung} + \newcommand{\propertyname}{Property} + \newcommand{\introductionname}{Einleitung} + \newcommand\bioinfo[2]{\gdef\@bioinfo{\textbf{#1}: #2}} + \newcommand{\updatename}{Updates:} + \newcommand{\historyname}{Version der Geschichte} +}{\relax} + +\ifdefstring{\ELEGANT@lang}{es}{ + \RequirePackage[spanish]{babel} + \setlength\parindent{2em} + \newcommand\figref[1]{\textbf{Figura}~\ref{#1}} + \newcommand\tabref[1]{\textbf{Tabla}~\ref{#1}} + \renewcommand{\spanishchaptername}{Capítulo \thechapter} + \newcommand{\authorname}{\textbf{Autor: }} + \newcommand{\institutename}{\textbf{Instituto: }} + \newcommand{\datename}{\textbf{Fecha: }} + \newcommand{\versionname}{\textbf{Versión: }} + \newcommand{\notename}{Nota} + \newcommand{\proofname}{Demostración} + \newcommand{\problemname}{Problema} + \newcommand{\definitionname}{Definición} + \newcommand{\theoremname}{Teorema} + \newcommand{\axiomname}{Axioma} + \newcommand{\postulatename}{Postulado} + \newcommand{\lemmaname}{Lema} + \newcommand{\propositionname}{Proposición} + \newcommand{\corollaryname}{Corolario} + \newcommand{\examplename}{Ejemplo} + \newcommand{\exercisename}{Ejercicio} + \newcommand{\remarkname}{Comentario} + \newcommand{\assumptionname}{Asunto} + \newcommand{\conclusionname}{Conclusión} + \newcommand{\solutionname}{Solución} + \newcommand{\propertyname}{Propiedad} + \newcommand{\introductionname}{Introducción} + \newcommand{\problemsetname}{Ejercicio} + \newcommand\bioinfo[2]{\gdef\@bioinfo{\textbf{#1}: #2}} + \newcommand{\updatename}{Actualización:} + \newcommand{\historyname}{Historial de versiones} +}{\relax} -\RequirePackage{xpatch} -\xpatchcmd{\part}{ - \thispagestyle{plain}}{ - \thispagestyle{plain}}{}{} -\xpatchcmd{\@endpart}{ - \vfil\newpage}{ - \vfil\newpage}{}{} +\ifdefstring{\ELEGANT@lang}{mn}{ + \RequirePackage[mongolian]{babel} + \RequirePackage[utf8]{inputenc} + \RequirePackage[T2A]{fontenc} + \setlength\parindent{2em} + \newcommand\figref[1]{\textbf{Зураг}\ref{#1}} + \newcommand\tabref[1]{\textbf{Хүснэгт}\ref{#1}} + \renewcommand{\chaptername}{Бүлэг \thechapter} + \newcommand{\authorname}{\textbf{Зохиогч: }} + \newcommand{\institutename}{\textbf{Сургууль: }} + \newcommand{\datename}{\textbf{Огноо: }} + \newcommand{\versionname}{\textbf{Хувилбар: }} + \newcommand{\notename}{Тэмдэглэл} + \newcommand{\proofname}{Баталгаа} + \newcommand{\problemname}{Бодлого} + \newcommand{\definitionname}{Тодорхойлолт} + \newcommand{\theoremname}{Томьёо} + \newcommand{\axiomname}{Аксиом} + \newcommand{\postulatename}{Постулат} + \newcommand{\lemmaname}{Лемма} + \newcommand{\propositionname}{Таамаглал} + \newcommand{\corollaryname}{Үр дүн} + \newcommand{\examplename}{Жишээ} + \newcommand{\exercisename}{Дасгал} + \newcommand{\remarkname}{Тайлбар} + \newcommand{\assumptionname}{Урьдчилсан нөхцөл} + \newcommand{\conclusionname}{Дүгнэлт} + \newcommand{\solutionname}{Хариулт} + \newcommand{\propertyname}{Шинж чанар} + \newcommand{\introductionname}{Удиртгал} + \newcommand{\problemsetname}{Бодлогууд} + \newcommand\bioinfo[2]{\gdef@bioinfo{\textbf{#1}: #2}} + \newcommand{\updatename}{Шинэчлэлтүүд:} + \newcommand{\historyname}{Хувилбарын түүх} +}{\relax} \graphicspath{{./figure/}{./figures/}{./image/}{./images/}{./graphics/}{./graphic/}{./pictures/}{./picture/}} -\usepackage{tikz} %% load tikz without tikz -\usetikzlibrary{backgrounds,calc,shadows} +\RequirePackage{tikz} %% load tikz without tikz +\usetikzlibrary{backgrounds,calc,shadows,positioning,fit} \newcommand*\circled[1]{\tikz[baseline=(char.base)]{ \node[shape=circle,draw,inner sep=1pt] (char) {#1};}} % https://tex.stackexchange.com/questions/7032/good-way-to-make-textcircled-numbers @@ -486,16 +699,12 @@ \setlist[itemize,3]{label={\eitemiii}} -%% 章节设置 \RequirePackage[center,pagestyles]{titlesec} \RequirePackage{apptools} -\RequirePackage[toc,page,title,titletoc]{appendix} - \setcounter{secnumdepth}{5} - -\titleformat{\chapter}[\style]{\bfseries} -{\filcenter\LARGE\enspace\bfseries{\color{structurecolor}\IfAppendix{\appendixname}{\chaptername}\enspace}}{1pt}{\bfseries\color{structurecolor}\LARGE\filcenter}[] - +\titleformat{\chapter}[\style]{\bfseries}{ + \filcenter\LARGE\enspace\bfseries{\color{structurecolor} \IfAppendix{\appendixname\;\thechapter}{\chaptername}\;}}{1pt}{ + \LARGE\bfseries\color{structurecolor}\filcenter}[] \titleformat{\section}[hang]{\bfseries}{ \Large\bfseries{\color{structurecolor}\thesection}\enspace}{1pt}{% \color{structurecolor}\Large\bfseries\filright} @@ -506,15 +715,15 @@ \large\bfseries\color{structurecolor}\thesubsubsection\enspace}{1pt}{% \color{structurecolor}\large\bfseries\filright} - \titlespacing{\chapter}{0pt}{-20pt}{1.3\baselineskip} %\titlespacing{\subsection}{0pt}{0.5\baselineskip}{-\baselineskip} + + + %%define the note and proof environment \RequirePackage{pifont,manfnt,bbding} - \RequirePackage[many]{tcolorbox} - % \newlength{\normalparindent} % \setlength{\normalparindent}{\parindent} \ifdefstring{\ELEGANT@mode}{fancy}{ @@ -564,15 +773,42 @@ overlay unbroken and last={ \node[anchor=south east, outer sep=0pt] at (\linewidth-width,0) { \textcolor{third}{$\spadesuit$}};}},} + % \newtcbtheorem[auto counter,number within=chapter]{definition}{\definitionname}{defstyle}{def} + \DeclareTColorBox[auto counter,number within=chapter]{definition}{ o t\label g }{ + common,defstyle, + IfValueTF={#1}{title={\definitionname~\thetcbcounter\ (#1)}}{title=\definitionname~\thetcbcounter}, + IfBooleanTF={#2}{label=#3}{}} + % \newtcbtheorem[auto counter,number within=chapter]{theorem}{\theoremname}{thmstyle}{thm} + \DeclareTColorBox[auto counter,number within=chapter]{theorem}{ o t\label g }{ + common,thmstyle, + IfValueTF={#1}{title={\theoremname~\thetcbcounter\ (#1)}}{title=\theoremname~\thetcbcounter}, + IfBooleanTF={#2}{label=#3}{}} + % \newtcbtheorem[auto counter,number within=chapter]{postulate}{\postulatename}{thmstyle}{pos} + \DeclareTColorBox[auto counter,number within=chapter]{postulate}{ o t\label g }{ + common,thmstyle, + IfValueTF={#1}{title={\postulatename~\thetcbcounter\ (#1)}}{title=\postulatename~\thetcbcounter}, + IfBooleanTF={#2}{label=#3}{}} + % \newtcbtheorem[auto counter,number within=chapter]{axiom}{\axiomname}{thmstyle}{axi} + \DeclareTColorBox[auto counter,number within=chapter]{axiom}{ o t\label g }{ + common,thmstyle, + IfValueTF={#1}{title={\axiomname~\thetcbcounter\ (#1)}}{title=\axiomname~\thetcbcounter}, + IfBooleanTF={#2}{label=#3}{}} + % \newtcbtheorem[auto counter,number within=chapter]{corollary}{\corollaryname}{thmstyle}{cor} + \DeclareTColorBox[auto counter,number within=chapter]{corollary}{ o t\label g }{ + common,thmstyle, + IfValueTF={#1}{title={\corollaryname~\thetcbcounter\ (#1)}}{title=\corollaryname~\thetcbcounter}, + IfBooleanTF={#2}{label=#3}{}} + % \newtcbtheorem[auto counter,number within=chapter]{lemma}{\lemmaname}{thmstyle}{lem} + \DeclareTColorBox[auto counter,number within=chapter]{lemma}{ o t\label g }{ + common,thmstyle, + IfValueTF={#1}{title={\lemmaname~\thetcbcounter\ (#1)}}{title=\lemmaname~\thetcbcounter}, + IfBooleanTF={#2}{label=#3}{}} + % \newtcbtheorem[auto counter,number within=chapter]{proposition}{\propositionname}{propstyle}{pro} + \DeclareTColorBox[auto counter,number within=chapter]{proposition}{ o t\label g }{ + common,propstyle, + IfValueTF={#1}{title={\propositionname~\thetcbcounter\ (#1)}}{title=\propositionname~\thetcbcounter}, + IfBooleanTF={#2}{label=#3}{}}}{\relax} - \newtcbtheorem[auto counter,number within=chapter]{definition}{\definitionname}{defstyle}{def} - \newtcbtheorem[auto counter,number within=chapter]{theorem}{\theoremname}{thmstyle}{thm} - \newtcbtheorem[auto counter,number within=chapter]{postulate}{\postulatename}{thmstyle}{pos} - \newtcbtheorem[auto counter,number within=chapter]{axiom}{\axiomname}{thmstyle}{axi} - \newtcbtheorem[auto counter,number within=chapter]{proposition}{\propositionname}{propstyle}{pro} - \newtcbtheorem[auto counter,number within=chapter]{corollary}{\corollaryname}{thmstyle}{cor} - \newtcbtheorem[auto counter,number within=chapter]{lemma}{\lemmaname}{thmstyle}{lem} -}{\relax} \ifdefstring{\ELEGANT@mode}{simple}{ \let\openbox\relax @@ -580,56 +816,28 @@ \let\proof\relax % \let\proofname\relax \let\endproof\relax - + % declare a new theorem style - \newtheoremstyle{edefstyle}{3pt}{3pt}{\citshape}{-3pt}{ + \newtheoremstyle{defstyle}{3pt}{3pt}{\citshape}{-3pt}{ \bfseries\color{main}}{}{0.5em}{\thmname{#1} \thmnumber{#2} \thmnote{(#3)}} - \newtheoremstyle{ethmstyle}{3pt}{3pt}{\citshape}{-3pt}{ + \newtheoremstyle{thmstyle}{3pt}{3pt}{\citshape}{-3pt}{ \bfseries\color{second}}{}{0.5em}{\thmname{#1} \thmnumber{#2} \thmnote{(#3)}} - \newtheoremstyle{eprostyle}{3pt}{3pt}{\citshape}{-3pt}{ + \newtheoremstyle{prostyle}{3pt}{3pt}{\citshape}{-3pt}{ \bfseries\color{third}}{}{0.5em}{\thmname{#1} \thmnumber{#2} \thmnote{(#3)}} - \theoremstyle{edefstyle} % definition style - - \newtheorem{edefinition}{\definitionname}[chapter] - \newenvironment{definition}[2]{ - \ifstrempty{#1}{\edefinition}{\edefinition[#1]}\ifstrempty{#2}{}{\label{def:#2}}}{ - \endedefinition} - - - \theoremstyle{ethmstyle} %theorem style - - \newtheorem{etheorem}{\theoremname}[chapter] - \newenvironment{theorem}[2]{ - \ignorespaces\ifstrempty{#1}{\etheorem}{\etheorem[#1]}\ifstrempty{#2}{}{\label{thm:#2}}}{ - \endetheorem} - - \newtheorem{elemma}{\lemmaname}[chapter] - \newenvironment{lemma}[2]{ - \ignorespaces\ifstrempty{#1}{\elemma}{\elemma[#1]}\ifstrempty{#2}{}{\label{lem:#2}}}{ - \endelemma} - - \newtheorem{ecorollary}{\corollaryname}[chapter] - \newenvironment{corollary}[2]{ - \ignorespaces\ifstrempty{#1}{\ecorollary}{\ecorollary[#1]}\ifstrempty{#2}{}{\label{cor:#2}}}{ - \endecorollary} - - \newtheorem{epostulate}{\postulatename}[chapter] - \newenvironment{postulate}[2]{ - \ifstrempty{#1}{\epostulate}{\epostulate[#1]}\ifstrempty{#2}{}{\label{pos:#2}}}{ - \endepostulate} - - \newtheorem{eaxiom}{\axiomname}[chapter] - \newenvironment{axiom}[2]{ - \ifstrempty{#1}{\eaxiom}{\eaxiom[#1]}\ifstrempty{#2}{}{\label{axi:#2}}}{ - \endaxiom} - - \theoremstyle{eprostyle} - \newtheorem{eproposition}{\propositionname}[chapter] - \newenvironment{proposition}[2]{ - \ifstrempty{#1}{\eproposition}{\eproposition[#1]}\ifstrempty{#2}{}{\label{pro:#2}}}{ - \endeproposition} + \theoremstyle{defstyle} % definition style + \newtheorem{definition}{\definitionname}[chapter] + + \theoremstyle{thmstyle} %theorem style + \newtheorem{theorem}{\theoremname}[chapter] + \newtheorem{lemma}{\lemmaname}[chapter] + \newtheorem{corollary}{\corollaryname}[chapter] + \newtheorem{postulate}{\postulatename}[chapter] + \newtheorem{axiom}{\axiomname}[chapter] + + \theoremstyle{prostyle} % proposition style + \newtheorem{proposition}{\propositionname}[chapter] }{\relax} % main(green-def): example exercise problem solution @@ -712,9 +920,12 @@ \end{tcolorbox}} \RequirePackage{adforn} -\newenvironment{problemset}[1][\chaptername~\problemsetname]{ + +\newenvironment{problemset}[1][\chaptername~\;\exercisename]{ \begin{center} - \phantomsection\addcontentsline{toc}{section}{\texorpdfstring{\chaptername\;\problemsetname}{\problemsetname}} + \phantomsection\addcontentsline{toc}{section}{\texorpdfstring{\chaptername\;\exercisename}{\exercisename}} + % \markboth{#1}{\rightmark} + \markright{#1} \textcolor{structurecolor}{\Large\bfseries\adftripleflourishleft~#1~\adftripleflourishright} \end{center} \begin{enumerate}}{ @@ -739,8 +950,8 @@ \fancyfoot[c]{\color{structurecolor}\scriptsize\thepage} \if@twoside - \fancyhead[ER]{\color{structurecolor}\cnormal\leftmark} - \fancyhead[OL]{\color{structurecolor}\cnormal\rightmark} + \fancyhead[EL]{\color{structurecolor}\cnormal\leftmark} + \fancyhead[OR]{\color{structurecolor}\cnormal\rightmark} \else \fancyhead[R]{\color{structurecolor}\cnormal\rightmark} \fi @@ -750,10 +961,10 @@ \renewcommand{\headrulewidth}{1pt} % \renewcommand{\headrule}{} \fancypagestyle{plain}{\renewcommand{\headrulewidth}{0pt}\fancyhf{}\renewcommand{\headrule}{}} -\renewcommand{\sectionmark}[1]{\markright{\thesection\, #1}{} } -\renewcommand{\chaptermark}[1]{\markboth{\chaptername \, #1\,}{}} +\renewcommand{\sectionmark}[1]{\markright{\thesection\, #1}{}} +\renewcommand{\chaptermark}[1]{\markboth{\chaptername\, #1}{}} + -\renewcommand{\baselinestretch}{1.35} \renewcommand*{\maketitle}{% \hypersetup{pageanchor=false} @@ -776,7 +987,7 @@ \fi }{\relax} \setlength{\fboxsep}{0pt} - \colorbox{second}{\makebox[\linewidth][c]{\shortstack[c]{\vspace{0.5in}}}} + \colorbox{coverlinecolor}{\makebox[\linewidth][c]{\shortstack[c]{\vspace{0.5in}}}} \vfill \vskip-2ex \hspace{2em} @@ -826,6 +1037,7 @@ \thispagestyle{empty}} +\newcommand{\dollar}{\mbox{\textdollar}} \RequirePackage{listings} \renewcommand{\ttdefault}{cmtt} @@ -842,11 +1054,11 @@ \lstset{language=[LaTeX]TeX, texcsstyle=*\color{winered}, numbers=none, - mathescape, + mathescape=false, breaklines=true, keywordstyle=\color{winered}, commentstyle=\color{gray}, - emph={elegantpaper,fontenc,fontspec,xeCJK,FiraMono,xunicode,newtxmath,figure,fig,image,img,table,itemize,enumerate,newtxtext,newtxtt,ctex,microtype,description,times,booktabs,tabular,PDFLaTeX,XeLaTeX,type1cm,BibTeX,device,color,mode,lang,amsthm,tcolorbox,titlestyle,cite,ctex,listings,base,math,scheme,toc,esint,chinesefont,amsmath,bibstyle,natbib,pgfornament}, + emph={elegantpaper,fontenc,fontspec,xeCJK,citestyle,FiraMono,xunicode,newtxmath,figure,fig,image,img,table,itemize,enumerate,newtxtext,newtxtt,ctex,microtype,description,times,booktabs,tabular,PDFLaTeX,XeLaTeX,type1cm,BibTeX,device,color,mode,lang,amsthm,tcolorbox,titlestyle,cite,ctex,listings,base,math,scheme,toc,esint,chinesefont,amsmath,bibstyle,natbib,pgfornament}, emphstyle={\color{frenchplum}}, morekeywords={DeclareSymbolFont,SetSymbolFont,toprule,midrule,bottomrule,institute,version,includegraphics,setmainfont,setsansfont,setmonofont ,setCJKmainfont,setCJKsansfont,setCJKmonofont,RequirePackage,figref,tabref,email,maketitle,keywords,definecolor,extrainfo,logo,cover,subtitle,appendix,chapter,hypersetup,mainmatter,frontmatter,tableofcontents,elegantpar,heiti,kaishu,lstset,pagecolor,zhnumber,marginpar,part,equote,marginnote,bioinfo,datechange,listofchange,lvert,lastpage,songti,heiti,fangsong,setCJKfamilyfont,textbf}, frame=single, @@ -863,8 +1075,9 @@ % add the list of change history \newcommand{\dateinfoline}[2]{ \noindent\makebox[0pt][r]{% - \makebox[-5em][r]{% - \textbf{\textcolor{structurecolor}{#1}}}\quad}% + \makebox[-3em][r]{% + \small + \textbf{\textcolor{structurecolor}{#1}}}\;\;}% {\citshape\updatename\ignorespaces#2}} \newcommand{\datechange}[2]{% @@ -884,4 +1097,31 @@ \newenvironment{change}{ \begin{enumerate}[label=\small\protect\circled{\arabic*}]}{ - \end{enumerate}}
\ No newline at end of file + \end{enumerate}} + +\addbibresource[location=local]{reference.bib} + +\renewcommand\tableofcontents{% + \hypersetup{linktoc=all, linkcolor=black} + \if@twocolumn + \@restonecoltrue\onecolumn + \else + \@restonecolfalse + \fi + \chapter*{\contentsname + \@mkboth{% + \MakeUppercase\contentsname}{\MakeUppercase\contentsname}}% + \ifdefstring{\ELEGANT@toc}{twocol}{ + \setlength{\columnsep}{2em} + \begin{multicols}{2}% + \@starttoc{toc} + \end{multicols}}{ + \@starttoc{toc}} + \if@restonecol\twocolumn\fi} + + +\renewcommand*{\cleardoublepage}{\clearpage\if@twoside \ifodd\c@page\else +\hbox{}% +\thispagestyle{empty}% +\newpage% +\if@twocolumn\hbox{}\newpage\fi\fi\fi} |