diff options
Diffstat (limited to 'macros/latex/contrib/easybook')
-rw-r--r-- | macros/latex/contrib/easybook/doc/chapter1.tex | 6 | ||||
-rw-r--r-- | macros/latex/contrib/easybook/doc/chapter2.tex | 4 | ||||
-rw-r--r-- | macros/latex/contrib/easybook/doc/easybook-demo.pdf | bin | 262715 -> 262400 bytes | |||
-rw-r--r-- | macros/latex/contrib/easybook/doc/easybook-demo.tex | 4 | ||||
-rw-r--r-- | macros/latex/contrib/easybook/doc/easybook.pdf | bin | 259277 -> 258854 bytes | |||
-rw-r--r-- | macros/latex/contrib/easybook/easybook.dtx | 236 |
6 files changed, 136 insertions, 114 deletions
diff --git a/macros/latex/contrib/easybook/doc/chapter1.tex b/macros/latex/contrib/easybook/doc/chapter1.tex index 1d15512317..4b0a5c2475 100644 --- a/macros/latex/contrib/easybook/doc/chapter1.tex +++ b/macros/latex/contrib/easybook/doc/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/macros/latex/contrib/easybook/doc/chapter2.tex b/macros/latex/contrib/easybook/doc/chapter2.tex index 5b42327bd1..cee689e4d4 100644 --- a/macros/latex/contrib/easybook/doc/chapter2.tex +++ b/macros/latex/contrib/easybook/doc/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/macros/latex/contrib/easybook/doc/easybook-demo.pdf b/macros/latex/contrib/easybook/doc/easybook-demo.pdf Binary files differindex e0f895c924..23020eff17 100644 --- a/macros/latex/contrib/easybook/doc/easybook-demo.pdf +++ b/macros/latex/contrib/easybook/doc/easybook-demo.pdf diff --git a/macros/latex/contrib/easybook/doc/easybook-demo.tex b/macros/latex/contrib/easybook/doc/easybook-demo.tex index cc9887d612..05e371c34d 100644 --- a/macros/latex/contrib/easybook/doc/easybook-demo.tex +++ b/macros/latex/contrib/easybook/doc/easybook-demo.tex @@ -14,7 +14,7 @@ % multoc = true, % withpart = true, footwith = page, - % notomath = false, + notomath = true, rulewidth = 0.75pt, % uppercase = false, number-sep = {.} @@ -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/03/25\hskip\ccwd\relax v1.24} \frontmatter[roman] \maketitle diff --git a/macros/latex/contrib/easybook/doc/easybook.pdf b/macros/latex/contrib/easybook/doc/easybook.pdf Binary files differindex 742fb38739..e14364234e 100644 --- a/macros/latex/contrib/easybook/doc/easybook.pdf +++ b/macros/latex/contrib/easybook/doc/easybook.pdf diff --git a/macros/latex/contrib/easybook/easybook.dtx b/macros/latex/contrib/easybook/easybook.dtx index 0a587aea74..e71b2b46e4 100644 --- a/macros/latex/contrib/easybook/easybook.dtx +++ b/macros/latex/contrib/easybook/easybook.dtx @@ -51,7 +51,7 @@ The latest version of this license is in % % \changes{v1.20}{2021/01/09}{修改和完善用户文档。} % \changes{v1.20}{2021/01/09}{模板更改为使用 CC-BY 许可协议。} -% \changes{v1.23z}{2021/03/19}{修复在 \pkg{ctex} v2.5.6 更新后 \cls{easybook} 与 \pkg{hyperref} 冲突问题。} +% \changes{v1.23}{2021/03/19}{修复在 \pkg{ctex} v2.5.6 更新后 \cls{easybook} 与 \pkg{hyperref} 冲突问题。} % % \CheckSum{0} % @@ -73,7 +73,7 @@ The latest version of this license is in % % \title{\sffamily easybook书籍文档类} % \author{瞿毅} -% \date{2021/03/23\hskip\ccwd\relax v1.23z\thanks{\url{https://gitee.com/texl3/easybook}}} +% \date{2021/03/25\hskip\ccwd\relax v1.24\thanks{\url{https://gitee.com/texl3/easybook}}} % \maketitle % \begin{abstract} % \cls{easybook} 是基于 \cls{ctexbook} 书籍文档类创建以极简为风格的模板,可以看作对 \cls{ctexbook} 的进一步包装。虽然\CTeX 文档类提供了较好的中文支持,但想实现个性化功能一般需要在其基础上载入更多宏包来定制。\cls{easybook} 考虑了一些细节并载入一些常用宏包实现一般的排版需求,它适用于排版中英文书籍或笔记,甚至可稍加调整成为学位论文模板。 @@ -164,7 +164,7 @@ The latest version of this license is in % class = <(book)|article> % \end{syntax} % 设置文类风格,默认为 \opt{book} 文档类。选用 \opt{article} 使文档编号、结构等与 \cls{article} 文档类的特性相似,可用于短篇幅的文章,不要再使用 \tn{chapter} 命令,此时设置双栏目录的 \opt{style/multoc} 选项、小节 \ref{subsec:document command} 中打印目录命令的 \opt{multoc} 及 \opt{book} 选项均会失效,会以 \opt{section} 标题级别输出目录。 -% \changes{v1.23z}{2021/03/16}{增加 article 文章模式,可用于短篇幅的文章。} +% \changes{v1.23}{2021/03/16}{增加 article 文章模式,可用于短篇幅的文章。} % \end{function} % % \subsection{文档命令} @@ -180,7 +180,7 @@ The latest version of this license is in % \tn{listoflistings*}\oarg{键值列表} % \end{syntax} % \tn{frontmatter} 为前言区命令,章标题不编号,页码可设置为例如 \opt{roman}、\opt{Alph} 等格式,带有星号的命令 \tn{frontmatter*} 不使用 \tn{cleardoublepage}。\tn{mainmatter} 为主文区命令,章标题正常编号且页码为从1开始计数的阿拉伯数字,\tn{mainmatter*} 命令不使用 \tn{cleardoublepage}。\tn{backmatter} 为后记区命令,页码格式与编号保持不变,章标题不编号。\tn{listoffigures} 命令输出图片目录,\tn{listoftables} 命令输出表格目录,\tn{listoflistings} 命令输出代码目录。带有星号的目录命令不会添加进主文档目录中,目录的键值列表选项如下 -% \changes{v1.23z}{2021/02/20}{重新定义文档结构划分命令。} +% \changes{v1.23}{2021/02/20}{重新定义文档结构划分命令。} % \end{function} % % \begin{function}{multoc,book,article} @@ -188,7 +188,7 @@ The latest version of this license is in % multoc = <true|(false)> % \end{syntax} % \opt{multoc} 与 \opt{style/multoc} 选项具有相同的效果,但是具有优先性且可单独设置不同目录是否双栏排版。\opt{book} 选项使目录标题按照 \opt{chapter} 级别输出,\opt{article} 选项使目录标题按照 \opt{article} 级别输出,默认为 \opt{chapter} 级别。 -% \changes{v1.23z}{2021/03/15}{为几个目录增加键值列表的选项,可设置标题输出级别以及是否加入主目录。} +% \changes{v1.23}{2021/03/15}{为几个目录增加键值列表的选项,可设置标题输出级别以及是否加入主目录。} % \end{function} % % \section{接口选项} @@ -214,7 +214,7 @@ The latest version of this license is in % multoc = <true|(false)> % withpart = <true|(false)> % footwith = <part|(chapter)|page> -% notomath = <(true)|false> +% notomath = <true|(false)> % rulewidth = <(0.75pt)> % uppercase = <(true)|false> % figure-sep = <(.)> @@ -225,9 +225,9 @@ The latest version of this license is in % \end{syntax} % \ding{229} 以上选项路径为 \opt{style/...} % \changes{v1.10}{2021/01/08}{更改颜色实现方式与选项名。} -% \changes{v1.23z}{2021/02/02}{noto风格的数学字体独立出来,可自定义设置。} -% \changes{v1.23z}{2021/02/09}{增加控制页面横线粗细的选项。} -% \changes{v1.23z}{2021/03/15}{增加控制编号连接符的选项。} +% \changes{v1.23}{2021/02/02}{noto风格的数学字体独立出来,可自定义设置。} +% \changes{v1.23}{2021/02/09}{增加控制页面横线粗细的选项。} +% \changes{v1.23}{2021/03/15}{增加控制编号连接符的选项。} % \end{function} % % \begin{optdesc} @@ -289,7 +289,7 @@ The latest version of this license is in % \ding{229} 以上选项路径为 \opt{spread/...} \\ % 行距因子用于设置各种行距倍数,只能是浮点数,不能带有长度单位。\tn{ctexset} 原有的行距选项 \opt{linespread} 失效。各行距既可在导言区全局设置也可正文中设置对后面生效,行距的意义为 % \changes{v1.21}{2021/01/12}{增加脚注线间的距离选项。} -% \changes{v1.23z}{2021/02/09}{取消使用 \pkg{zhlineskip} 宏包设置数学间距。} +% \changes{v1.23}{2021/02/09}{取消使用 \pkg{zhlineskip} 宏包设置数学间距。} % \end{function} % % \begin{optdesc} @@ -311,7 +311,7 @@ The latest version of this license is in % \end{syntax} % \ding{229} 以上选项路径为 \opt{elsefont/...} % \changes{v1.10}{2021/01/08}{加入自定义非正文字体选项。} -% \changes{v1.23z}{2021/02/08}{修复使用 \tn{zihao} 命令设置字体失效的问题。} +% \changes{v1.23}{2021/02/08}{修复使用 \tn{zihao} 命令设置字体失效的问题。} % \end{function} % % \begin{optdesc} @@ -332,7 +332,7 @@ The latest version of this license is in % \end{syntax} % \ding{229} 以上选项路径为 \opt{bibset/...} % \changes{v1.21}{2021/01/11}{增加 \opt{bibset} 选项,可以使用 \hologo{BibTeX} 或 \hologo{biber} 编译参考文献。} -% \changes{v1.23z}{2021/02/23}{使用 \opt{bibset} 选项时可设置标注风格。} +% \changes{v1.23}{2021/02/23}{使用 \opt{bibset} 选项时可设置标注风格。} % \end{function} % % \begin{optdesc} @@ -394,7 +394,7 @@ The latest version of this license is in % \tn{declaretheoremstyle}\oarg{键值列表}\marg{定理样式名} % \end{syntax} % 文档类已预置8个定理环境,环境名及对应的定理标题名见小节 \ref{subsec:theorem},如果需要新的定理标题名或定理样式可使用这两个命令。 -% \changes{v1.23z}{2021/03/12}{重新定义了新定理环境命令 \tn{newtheorem}。} +% \changes{v1.23}{2021/03/12}{重新定义了新定理环境命令 \tn{newtheorem}。} % \end{function} % % \begin{optdesc} @@ -409,9 +409,9 @@ The latest version of this license is in % \end{optdesc} % % \subsubsection{新的定理样式} -% 定理由 \pkg{thmtools} 设置,预置定理的样式为 \opt{mythm},上述定理样式选项将对这个定理样式生效。如果使用这个样式而只是增加新的定理名称,可以这样 +% 定理由 \pkg{thmtools} 设置,预置定理的样式为 \opt{easythm},上述定理样式选项将对这个定理样式生效。如果使用这个样式而只是增加新的定理名称,可以这样 % \begin{ctexexam} -% \newtheorem[style = mythm,name = 定理名]{定理环境名} +% \newtheorem[style = easythm,name = 定理名]{定理环境名} % \end{ctexexam} % 若要给定理环境增加边框,可以如下进行设置 % \begin{ctexexam} @@ -467,8 +467,8 @@ The latest version of this license is in % \opt{hdrset} 设置的命令由 \pkg{fancyhdr} 宏包提供支持,\opt{headrule}、\opt{footrule} 和 \opt{footnoterule} 三个横线选项一般可以使用 \tn{hrule} width \meta{长度} height \meta{高度} 命令来绘制,脚注横线默认为空。当然,手动绘制横线时线条粗细选项 \opt{style/rulewidth} 会失效。 % \changes{v1.21}{2021/01/11}{修复单面文档时页眉横线消失的问题。} % \changes{v1.21}{2021/01/13}{增加配置页眉页脚的选项。} -% \changes{v1.23z}{2021/03/08}{优化页眉页脚设置,增加 \opt{chap-mark} 和 \opt{sec-mark} 选项。} -% \changes{v1.23z}{2021/03/14}{可以手动绘制页眉、页脚和脚注的横线。} +% \changes{v1.23}{2021/03/08}{优化页眉页脚设置,增加 \opt{chap-mark} 和 \opt{sec-mark} 选项。} +% \changes{v1.23}{2021/03/14}{可以手动绘制页眉、页脚和脚注的横线。} % \end{function} % % \begin{function}[added = 2021-01-13,updated = 2021-03-14]{,\easyhead,\easyfoot} @@ -626,7 +626,7 @@ The latest version of this license is in % \item 习题内容 % \end{exercise} % \end{ctexexam} -% \changes{v1.23z}{2021/02/08}{增加准确的习题盒子标题目录锚点。} +% \changes{v1.23}{2021/02/08}{增加准确的习题盒子标题目录锚点。} % \end{function} % % \subsection{盒子} @@ -650,19 +650,19 @@ The latest version of this license is in % \end{function} % % \subsubsection{段落盒子} -% \begin{function}[added = 2021-01-05,updated = 2021-03-19]{mybox} +% \begin{function}[added = 2021-01-05,updated = 2021-03-19]{easybox} % \begin{syntax} -% \tn{begin}\marg{mybox}\oarg{颜色名|(MintCream)}\parg{段落标题}\oarg{配置选项} +% \tn{begin}\marg{easybox}\oarg{颜色名|(MintCream)}\parg{段落标题}\oarg{配置选项} % <盒子内容> -% \tn{end}\marg{mybox} +% \tn{end}\marg{easybox} % \end{syntax} -% 环境 \opt{mybox} 创建一个段落盒子,可以添加可选参数的标题,否则无标题框。当使用带有星号的环境时 \oarg{颜色名} 选项生效,可以自定义背景颜色,否则无背景颜色。 +% 环境 \opt{easybox} 创建一个段落盒子,可以添加可选参数的标题,否则无标题框。当使用带有星号的环境时 \oarg{颜色名} 选项生效,可以自定义背景颜色,否则无背景颜色。 % \begin{ctexexam} -% \begin{mybox}*[MintCream](段落标题) +% \begin{easybox}*[MintCream](段落标题) % 盒子内容 % \tcblower % 盒子上下部分分界线 % 盒子内容 -% \end{mybox} +% \end{easybox} % \end{ctexexam} % \end{function} % @@ -785,7 +785,7 @@ The latest version of this license is in %<*class> \NeedsTeXFormat{LaTeX2e}[2020/10/01] \RequirePackage{l3keys2e} -\ProvidesExplClass{easybook}{2021/03/23}{1.23z}{beta} +\ProvidesExplClass{easybook}{2021/03/25}{1.24}{beta} \cs_generate_variant:Nn \keys_define:nn {nx} \cs_generate_variant:Nn \int_to_arabic:n {v} @@ -810,21 +810,21 @@ The latest version of this license is in \keys_define:nn {easybook} { - draft .code:n = {\bool_set_true:N \l__draft_bool}, - newline .code:n = {\bool_set_true:N \l__newline_bool}, - entitle .code:n = {\bool_set_false:N \l__zhtitle_bool}, - english .code:n = {\bool_set_false:N \l__lang_chinese_bool}, + draft .code:n = \bool_set_true:N \l__draft_bool, + newline .code:n = \bool_set_true:N \l__newline_bool, + entitle .code:n = \bool_set_false:N \l__zhtitle_bool, + english .code:n = \bool_set_false:N \l__lang_chinese_bool, enstyle .meta:n = {newline,entitle,english}, font .choice:, font .value_required:n = true, font/overleaf .code:n = {}, - font/adobe .code:n = {\__put_ctexbook:n {fontset = #1}}, - font/founder .code:n = {\__put_ctexbook:n {fontset = #1}}, - font/mac .code:n = {\__put_ctexbook:n {fontset = #1}}, - font/windows .code:n = {\__put_ctexbook:n {fontset = #1}}, - font/linux .code:n = {\__put_ctexbook:n {fontset = ubuntu}}, - font/none .code:n = {\__put_ctexbook:n {fontset = #1}}, + font/adobe .code:n = \__put_ctexbook:n {fontset = #1}, + font/founder .code:n = \__put_ctexbook:n {fontset = #1}, + font/mac .code:n = \__put_ctexbook:n {fontset = #1}, + font/windows .code:n = \__put_ctexbook:n {fontset = #1}, + font/linux .code:n = \__put_ctexbook:n {fontset = ubuntu}, + font/none .code:n = \__put_ctexbook:n {fontset = #1}, font/noto .code:n = { \bool_set_true:N \l__font_noto_bool @@ -834,7 +834,7 @@ The latest version of this license is in paper .choice:, paper .value_required:n = true, - paper/unknown .code:n = {\PassOptionsToPackage{#1}{geometry}}, + paper/unknown .code:n = \PassOptionsToPackage{#1}{geometry}, paper .initial:n = a4paper, oneside .value_forbidden:n = true, @@ -848,7 +848,7 @@ The latest version of this license is in class .choice:, class .value_required:n = true, class/book .code:n = {}, - class/article .code:n = {\bool_set_false:N \l__class_book_bool}, + class/article .code:n = \bool_set_false:N \l__class_book_bool, class .initial:n = book, unknown .code:n = @@ -907,7 +907,7 @@ The latest version of this license is in withpart .initial:n = false, notomath .bool_set:N = \l__notomath_bool, notomath .default:n = true, - notomath .initial:n = true, + notomath .initial:n = false, rulewidth .dim_set:N = \l__rule_width_dim, rulewidth .initial:n = 0.75pt, uppercase .bool_set:N = \l__uppercase_bool, @@ -945,7 +945,7 @@ The latest version of this license is in pdfpages,graphicx, fancyhdr,titletoc, caption-light,subcaption, - tabularx,multirow,makecell,booktabs, + tabularx,multirow,booktabs, tasks,enumitem, listings, imakeidx @@ -1392,7 +1392,7 @@ The latest version of this license is in \fi }{\tl_set:Nn \l__toc_type_tl{article}} } -\cs_new_protected:Npn \__ifmultoc_after_set: +\cs_new_protected:Npn \__ifmultoc_post_set: { \bool_if:NTF \l__class_book_bool { @@ -1411,7 +1411,7 @@ The latest version of this license is in \__title_mark:n {\contentsname} \vspace*{\dim_use:N \l__toc_offset_dim} \@starttoc{toc} - \__ifmultoc_after_set: + \__ifmultoc_post_set: \group_end: } \RenewDocumentCommand{\listoffigures}{so} @@ -1425,7 +1425,7 @@ The latest version of this license is in \dim_add:NV \l__toc_offset_dim\l__toc_listsoffset_dim \vspace*{\dim_use:N \l__toc_offset_dim} \@starttoc{lof} - \__ifmultoc_after_set: + \__ifmultoc_post_set: \group_end: } \RenewDocumentCommand{\listoftables}{so} @@ -1439,7 +1439,7 @@ The latest version of this license is in \dim_add:NV \l__toc_offset_dim\l__toc_listsoffset_dim \vspace*{\dim_use:N \l__toc_offset_dim} \@starttoc{lot} - \__ifmultoc_after_set: + \__ifmultoc_post_set: \group_end: } \NewDocumentCommand{\listoflistings}{so} @@ -1453,7 +1453,7 @@ The latest version of this license is in \dim_add:NV \l__toc_offset_dim\l__toc_listsoffset_dim \vspace*{\dim_use:N \l__toc_offset_dim} \@starttoc{lol} - \__ifmultoc_after_set: + \__ifmultoc_post_set: \group_end: } @@ -1651,24 +1651,24 @@ The latest version of this license is in { \clist_map_inline:nn { - {theorem}{定理}, + {example}{例}, {definition}{定义}, + {theorem}{定理}, + {proposition}{性质}, {lemma}{引理}, {corollary}{推论}, - {proposition}{性质}, - {example}{例}, {remark}{注}, {exercise}{练习} }{\__thmname_set:nn #1} }{ \clist_map_inline:nn { - {theorem}{Theorem}, + {example}{Example}, {definition}{Definition}, + {theorem}{Theorem}, + {proposition}{Proposition}, {lemma}{Lemma}, {corollary}{Corollary}, - {proposition}{Proposition}, - {example}{Example}, {remark}{Remark}, {exercise}{Exercise} }{\__thmname_set:nn #1} @@ -1690,24 +1690,24 @@ The latest version of this license is in thmbox .bool_set:N = \l__thmbox_bool, thmbox .default:n = true, thmbox .initial:n = false, - numberwith .tl_set:N = \l__thm_numberwith_tl, - numberwith .initial:n = {chapter}, - headpunct .tl_set:N = \l__thm_headpunct_tl, - headpunct .initial:n = {}, bodyfont .tl_set:N = \l__thm_bodyfont_tl, bodyfont .initial:n = {}, notefont .tl_set:N = \l__thm_notefont_tl, notefont .initial:n = {}, headfont .tl_set:N = \l__thm_headfont_tl, - headfont .initial:n = {\color{ctex@emph}\sffamily}, + headfont .initial:n = \color{ctex@emph}\sffamily, + headpunct .tl_set:N = \l__thm_headpunct_tl, + headpunct .initial:n = {}, + spacepost .tl_set:N = \l__thm_spacepost_tl, + spacepost .initial:n = \ccwd, + numberwith .tl_set:N = \l__thm_numberwith_tl, + numberwith .initial:n = chapter, headindent .tl_set:N = \l__thm_headindent_tl, - headindent .initial:n = {0\ccwd}, + headindent .initial:n = 0\ccwd, spaceabove .tl_set:N = \l__thm_spaceabove_tl, - spaceabove .initial:n = {.75ex plus .1ex}, + spaceabove .initial:n = .75ex plus .1ex, spacebelow .tl_set:N = \l__thm_spacebelow_tl, - spacebelow .initial:n = {.75ex plus .1ex}, - spacepost .tl_set:N = \l__thm_spacepost_tl, - spacepost .initial:n = {\ccwd} + spacebelow .initial:n = .75ex plus .1ex } \ctex_at_end_preamble:n { @@ -1723,25 +1723,29 @@ The latest version of this license is in postheadspace = \l__thm_spacepost_tl, numberwithin = \l__thm_numberwith_tl, headformat = \NAME\space\NUMBER\NOTE - ]{mythm} - \declaretheorem[style = mythm,name = \c__name_theorem_tl]{theorem} - \declaretheorem[style = mythm,name = \c__name_definition_tl]{definition} - \declaretheorem[style = mythm,name = \c__name_lemma_tl]{lemma} - \declaretheorem[style = mythm,name = \c__name_corollary_tl]{corollary} - \declaretheorem[style = mythm,name = \c__name_proposition_tl]{proposition} - \declaretheorem[style = mythm,name = \c__name_example_tl]{example} + ]{easythm} + \clist_map_inline:nn + { + example,definition,theorem, + proposition,lemma,corollary + }{ + \declaretheorem[ + style = easythm, + name = \use:c {c__name_#1_tl} + ]{#1} + } \cs_gset_eq:NN \proof\relax - \declaretheorem{remark}[ - style = mythm, + \declaretheorem[ + style = easythm, name = \c__name_remark_tl, numbered = no - ] - \declaretheorem{proof}[ - style = mythm, + ]{remark} + \declaretheorem[ + style = easythm, name = \proofname, numbered = no, qed = \qedsymbol - ] + ]{proof} } \settasks @@ -1891,7 +1895,7 @@ The latest version of this license is in #6 \end{enumerate} }{} - \DeclareTColorBox{mybox}{sO{MintCream}d()O{}} + \DeclareTColorBox{easybox}{sO{MintCream}d()O{}} { enhanced~jigsaw,pad~at~break* = 3pt, IfBooleanTF = {#1}{colback = #2}{opacityback = 0,colframe = ctex@emph}, @@ -1999,7 +2003,7 @@ The latest version of this license is in {\__title_mark_intoc:n {\bibname}} } \exp_args:NV \bibliography\l__bib_file_tl - \__ifmultoc_after_set: + \__ifmultoc_post_set: \group_end: } } @@ -2018,7 +2022,7 @@ The latest version of this license is in {\__put_biblatex:n {citestyle = \l__bib_citestyle_tl}} \__put_biblatex:n {backend = biber} } -\cs_new_protected:Npn \__biblatex_after_set: +\cs_new_protected:Npn \__biblatex_post_set: { \exp_args:NV \addbibresource\l__bib_file_tl \cs_gset:Npn \blx@default@theheading{bibintoc} @@ -2034,7 +2038,7 @@ The latest version of this license is in }{ \__biblatex_pre_set: \RequirePackage{biblatex} - \__biblatex_after_set: + \__biblatex_post_set: } } @@ -2071,9 +2075,29 @@ The latest version of this license is in { language = [LaTeX]TeX, texcsstyle = - *\lst@ifdisplaystyle\bfseries\color{ctex@verb}\else\color{ctex@verb}\fi, + { + *\lst@ifdisplaystyle + \bfseries\color{ctex@verb} + \else + \color{ctex@verb} + \fi + }, basicstyle = - \ttfamily\lst@ifdisplaystyle\small\else\color{ctex@verb}\fi, + { + \ttfamily\lst@ifdisplaystyle + \small + \else + \color{ctex@verb} + \fi + }, + keywordstyle = + { + \lst@ifdisplaystyle + \bfseries\color{ctex@verb} + \else + \color{ctex@verb} + \fi + }, framexleftmargin = 0pt, framexrightmargin = 0pt, xleftmargin = 3pt, @@ -2084,9 +2108,7 @@ The latest version of this license is in rulecolor = \color{ctex@frame}, commentstyle = \color{gray}, emphstyle = \color{ctex@emph}, - emph = {caption,makecell,subcaption,tabularx}, - keywordstyle = - \lst@ifdisplaystyle\bfseries\color{ctex@verb}\else\color{ctex@verb}\fi, + emph = {caption,multirow,subcaption,tabularx}, morekeywords = { includegraphics,setmainfont,setsansfont,setmonofont,setCJKmainfont,setCJKsansfont,setCJKmonofont,setCJKfamilyfont,RequirePackage @@ -2157,8 +2179,8 @@ The latest version of this license is in { hyperlink .choice:, hyperlink/edge .code:n = {}, - hyperlink/various .code:n = {\__put_hyperref:n {colorlinks}}, - hyperlink/none .code:n = {\__put_hyperref:n {hidelinks}}, + hyperlink/various .code:n = \__put_hyperref:n {colorlinks}, + hyperlink/none .code:n = \__put_hyperref:n {hidelinks}, hyperlink .default:n = edge, hyperlink .initial:n = edge, @@ -2175,7 +2197,7 @@ The latest version of this license is in linkcolor .initial:n = fresh, linktopage .choice:, - linktopage/true .code:n = {\__put_hyperref:n {linktocpage}}, + linktopage/true .code:n = \__put_hyperref:n {linktocpage}, linktopage/false .code:n = {}, linktopage .default:n = true, linktopage .initial:n = false @@ -2187,7 +2209,7 @@ The latest version of this license is in \clist_map_function:nN { {none, 000000,000000,000000}, - {seaside, 4682B4,004986,a40000}, + {seaside, 4682B4,004986,2E8B57}, {energy, f39800,00a0e9,893895}, {cyberpunk, 601986,eb6877,a4005b} } @@ -2263,10 +2285,10 @@ The latest version of this license is in pagestyle = empty, number = {\bool_if:NTF \l__zhtitle_bool{\chinese{part}}{\thepart}}, - format = {\color{ctex@frame}\sffamily\Huge}, + format = \color{ctex@frame}\sffamily\Huge, aftername = {\bool_if:NTF \l__newline_bool{\par\nobreak}{\hspace{\ccwd}}}, - tocline = {\CTEXifname{\CTEXthepart\hspace{\ccwd}}{}#2} + tocline = \CTEXifname{\CTEXthepart\hspace{\ccwd}}{}#2 }, chapter = { @@ -2283,37 +2305,37 @@ The latest version of this license is in \bool_if:NTF \l__newline_bool {\par\nobreak\vskip 1.5pc}{\hspace{\ccwd}} }, - beforeskip = {-1.5ex}, - afterskip = {3ex}, - lotskip = {0.8pc}, - lofskip = {0.8pc}, - tocline = {\CTEXifname{\CTEXthechapter\hspace{\ccwd}}{}#2} + beforeskip = -1.5ex, + afterskip = 3ex, + lotskip = 0.8pc, + lofskip = 0.8pc, + tocline = \CTEXifname{\CTEXthechapter\hspace{\ccwd}}{}#2 }, section = { hang = true, - format = {\color{ctex@frame}\sffamily\Large}, - aftername = {\hspace{0.5\ccwd}}, - beforeskip = {1.5ex plus .2ex minus .1ex}, - afterskip = {1.5ex plus .2ex minus .1ex}, - tocline = {\CTEXifname{\CTEXthesection\hspace{\ccwd}}{}#2} + format = \color{ctex@frame}\sffamily\Large, + aftername = \hspace{0.5\ccwd}, + beforeskip = 1.5ex plus .2ex minus .1ex, + afterskip = 1.5ex plus .2ex minus .1ex, + tocline = \CTEXifname{\CTEXthesection\hspace{\ccwd}}{}#2 }, subsection = { hang = true, - format = {\color{ctex@frame}\sffamily\large}, - aftername = {\hspace{0.5\ccwd}}, - beforeskip = {1.3ex plus .2ex minus .1ex}, - afterskip = {1.3ex plus .2ex minus .1ex}, - tocline = {\CTEXifname{\CTEXthesubsection\hspace{\ccwd}}{}#2} + format = \color{ctex@frame}\sffamily\large, + aftername = \hspace{0.5\ccwd}, + beforeskip = 1.3ex plus .2ex minus .1ex, + afterskip = 1.3ex plus .2ex minus .1ex, + tocline = \CTEXifname{\CTEXthesubsection\hspace{\ccwd}}{}#2 }, subsubsection = { hang = true, - format = {\color{ctex@frame}\sffamily}, - aftername = {\hspace{0.5\ccwd}}, - beforeskip = {\parskip}, - afterskip = {\parskip} + format = \color{ctex@frame}\sffamily, + aftername = \hspace{0.5\ccwd}, + beforeskip = \parskip, + afterskip = \parskip } } |