From 425b066c37d773e7d575b5c3749d3f3bc3f1dca3 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Sun, 4 Apr 2021 01:49:16 +0000 Subject: easybook (4apr21) git-svn-id: svn://tug.org/texlive/trunk@58719 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/easybook/README.md | 24 --------------------- Master/texmf-dist/doc/latex/easybook/chapter1.tex | 6 +++--- Master/texmf-dist/doc/latex/easybook/chapter2.tex | 4 ++-- .../doc/latex/easybook/easybook-demo.pdf | Bin 262715 -> 262407 bytes .../doc/latex/easybook/easybook-demo.tex | 6 +++--- Master/texmf-dist/doc/latex/easybook/easybook.pdf | Bin 259277 -> 260079 bytes 6 files changed, 8 insertions(+), 32 deletions(-) (limited to 'Master/texmf-dist/doc/latex') diff --git a/Master/texmf-dist/doc/latex/easybook/README.md b/Master/texmf-dist/doc/latex/easybook/README.md index e33ecae2091..0424a5b29f5 100644 --- a/Master/texmf-dist/doc/latex/easybook/README.md +++ b/Master/texmf-dist/doc/latex/easybook/README.md @@ -2,18 +2,6 @@ Easybook is a minimalist style template based on the ctexbook book document class. It is mainly suitable for typesetting Chinese books or notes, and can even be slightly modified to become a dissertation template. Some commonly used macro packages have been loaded to achieve general typesetting requirements. Although some details have been considered as much as possible, there are still deficiencies. This project is currently under active development. If you have good suggestions, please feel free to give feedback. -## Compilation method - -Please use the UTF8 encoding and enter the following command on the command line - -``` -xelatex -shell-escape easybook-demo -bibtex easybook-demo -makeindex easybook-demo -xelatex -shell-escape easybook-demo -xelatex -shell-escape easybook-demo -``` - ## Reference documents - [CTeX macro collection manual](https://ctan.org/pkg/ctex) @@ -34,18 +22,6 @@ This work may be distributed and/or modified under the conditions of the CC-BY 4 easybook 是基于 ctexbook 书籍文档类的极简风格模板。它主要适用于中文书籍或笔记的排版，甚至可以稍作调整成为学位论文模板。已加载一些常用的宏包以实现一般的排版要求。尽管已尽可能多地考虑了一些细节，但仍然存在不足。目前本项目处于活跃的开发状态，如果您有好的建议欢迎进行反馈。 -## 编译方法 - -请使用 UTF8 编码，并在命令行上输入以下命令 - -``` -xelatex -shell-escape easybook-demo -bibtex easybook-demo -makeindex easybook-demo -xelatex -shell-escape easybook-demo -xelatex -shell-escape easybook-demo -``` - ## 参考文档 - [CTeX 宏集手册](https://ctan.org/pkg/ctex) diff --git a/Master/texmf-dist/doc/latex/easybook/chapter1.tex b/Master/texmf-dist/doc/latex/easybook/chapter1.tex index 1d155123174..4b0a5c24756 100644 --- a/Master/texmf-dist/doc/latex/easybook/chapter1.tex +++ b/Master/texmf-dist/doc/latex/easybook/chapter1.tex @@ -57,7 +57,7 @@ \section{表格} \index{b@表格} -合并表格列使用 \lstinline{\multicolumn} 命令，合并行可以使用 \lstinline{makecell} 宏包的 \lstinline{\multirowcell} 命令。当插入的表格内容过长以至于一行放不下的情况可以使用 \lstinline{tabularx} 环境，文档类设置了\textsf{L、C和R}三个列对齐选项，一个例子如\cref{tab:example} 所示。 +合并表格列使用 \lstinline{\multicolumn} 命令，合并行可以使用 \lstinline{multirow} 宏包的 \lstinline{\multirow} 命令。当插入的表格内容过长以至于一行放不下的情况可以使用 \lstinline{tabularx} 环境，文档类设置了\textsf{L、C和R}三个列对齐选项，一个例子如\cref{tab:example} 所示。 \begin{table}[htbp] \centering \bicaption{使用tabularx创建内容过长表格}{Use tabularx to create a table with too long content}\label{tab:example}\small @@ -66,9 +66,9 @@ Aliquam & Integer & Pellentesque tincidunt purus vel magna. \\ \midrule - viverra & \multirowcell{3}[0ex][l]{metus} & Nulla malesuada porttitor diam. Vestibulum lectus. Proin mauris. Proin eu nunc eu urna hendrerit faucibus. \\ + viverra & \multirow[c]{3}*{metus} & Nulla malesuada porttitor diam. Vestibulum lectus. Proin mauris. Proin eu nunc eu urna hendrerit faucibus. \\ semper & & Nullam elementum, urna vel imperdiet sodales, elit ipsum pharetra ligula, ac pretium ante justo a nulla. Curabitur tristique arcu eu metus. \\ - \multicolumn{2}{c}{\multirowcell{3}{convallis}} & Nunc elementum fermentum wisi. Aenean placerat. Ut imperdiet, enim sed gravida sollicitudin, felis odio placerat quam, ac pulvinar elit purus eget enim. \\ + \multicolumn{2}{c}{\multirow{3}*[0ex]{convallis}} & Nunc elementum fermentum wisi. Aenean placerat. Ut imperdiet, enim sed gravida sollicitudin, felis odio placerat quam, ac pulvinar elit purus eget enim. \\ \bottomrule \end{tabularx} \end{table} diff --git a/Master/texmf-dist/doc/latex/easybook/chapter2.tex b/Master/texmf-dist/doc/latex/easybook/chapter2.tex index 5b42327bd11..cee689e4d43 100644 --- a/Master/texmf-dist/doc/latex/easybook/chapter2.tex +++ b/Master/texmf-dist/doc/latex/easybook/chapter2.tex @@ -58,12 +58,12 @@ The Stokes formula is an extension of the basic calculus formula in the case of 这是一个证明，末尾自动添加证明结束符。 \end{proof} -\begin{mybox}*[MintCream](My title) +\begin{easybox}*[MintCream](Aspirin) \index{z@自定义盒子} \zhlipsum*[3][name = aspirin] \tcblower \zhlipsum*[8][name = aspirin] -\end{mybox} +\end{easybox} \zhlipsum*[3][name = aspirin] \begin{exercise}[LightYellow][1.](习题) diff --git a/Master/texmf-dist/doc/latex/easybook/easybook-demo.pdf b/Master/texmf-dist/doc/latex/easybook/easybook-demo.pdf index e0f895c924a..3698e95626c 100644 Binary files a/Master/texmf-dist/doc/latex/easybook/easybook-demo.pdf and b/Master/texmf-dist/doc/latex/easybook/easybook-demo.pdf differ diff --git a/Master/texmf-dist/doc/latex/easybook/easybook-demo.tex b/Master/texmf-dist/doc/latex/easybook/easybook-demo.tex index cc9887d612d..cd8eefc46df 100644 --- a/Master/texmf-dist/doc/latex/easybook/easybook-demo.tex +++ b/Master/texmf-dist/doc/latex/easybook/easybook-demo.tex @@ -14,7 +14,7 @@ % multoc = true, % withpart = true, footwith = page, - % notomath = false, + notomath = true, rulewidth = 0.75pt, % uppercase = false, number-sep = {.} @@ -44,7 +44,7 @@ thmset = { thmbox = true, - numberwith = chapter, + within = chapter, bodyfont = \normalfont, headpunct = {.} }, @@ -99,7 +99,7 @@ \url{https://latexstudio.net} \\ \url{https://gitee.com/texl3/easybook}\thanks{Gitee为项目的主要发布地址。} } -\date{2021/03/23\hskip\ccwd\relax v1.23z} +\date{2021/04/01\hskip\ccwd\relax v1.24b} \frontmatter[roman] \maketitle diff --git a/Master/texmf-dist/doc/latex/easybook/easybook.pdf b/Master/texmf-dist/doc/latex/easybook/easybook.pdf index 742fb38739a..ffdc2ab9d5a 100644 Binary files a/Master/texmf-dist/doc/latex/easybook/easybook.pdf and b/Master/texmf-dist/doc/latex/easybook/easybook.pdf differ -- cgit v1.2.3