From 097bf63042e521d1fc0912d1e1b76e6ef5ac77e3 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 19 Aug 2021 20:19:38 +0000 Subject: easybook (19aug21) git-svn-id: svn://tug.org/texlive/trunk@60275 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/easybook/easybook.pdf | Bin 590797 -> 590649 bytes Master/texmf-dist/doc/latex/easybook/easybook.tex | 12 ++++++------ .../texmf-dist/source/latex/easybook/easybook.dtx | 18 +++++++++--------- Master/texmf-dist/tex/latex/easybook/easybase.sty | 12 ++++++------ Master/texmf-dist/tex/latex/easybook/easybook.cls | 4 ++-- .../texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg | 2 +- 6 files changed, 24 insertions(+), 24 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/easybook/easybook.pdf b/Master/texmf-dist/doc/latex/easybook/easybook.pdf index 59fc52c31d8..281479c7ddc 100644 Binary files a/Master/texmf-dist/doc/latex/easybook/easybook.pdf and b/Master/texmf-dist/doc/latex/easybook/easybook.pdf differ diff --git a/Master/texmf-dist/doc/latex/easybook/easybook.tex b/Master/texmf-dist/doc/latex/easybook/easybook.tex index 8485acc4783..eba882bc04f 100644 --- a/Master/texmf-dist/doc/latex/easybook/easybook.tex +++ b/Master/texmf-dist/doc/latex/easybook/easybook.tex @@ -12,8 +12,8 @@ name = easybook, color-scheme = blue, title = EASYBOOK 使用手册, - version = v1.29, - date = 2021/08/16, + version = v1.29c, + date = 2021/08/18, authors = 瞿毅, info = 排版简体中文学位论文和书籍, email = quee123@foxmail.com, @@ -316,7 +316,7 @@ \label{sec:interface options} \begin{commands} \command*{ctexset}[\marg{键值列表}] - \cls*{easybook} 扩展了 C\TeX 宏集 \hologo{LaTeX3} 风格键值的通用控制命令 \cs*{ctexset},接口选项同样可用它设置, 原有的 \meta{键值列表} 仍然可用。本文档类目前有九个模块用于实现常规的排版功能,如下表所示,它们既是统一接口 \cs*{ctexset} 的路径,也是相关模块的接口命令名: + \cls*{easybook} 扩展了 C\TeX 宏集 \hologo{LaTeX3} 风格键值的通用控制命令 \cs*{ctexset},接口选项同样可用它设置, 原有的 \meta{键值列表} 仍然可用。本文档类目前有 9 个模块用于实现常规的排版功能,如下表所示,它们既是统一接口 \cs*{ctexset} 的路径,也是相关模块的接口命令名: \begin{center} \begin{tabular}{*{5}{c}} \toprule @@ -547,7 +547,7 @@ \subsubsection{新建定理样式} \begin{commands} \command{declaretheorem}[\oarg{键值列表1}\marg{定理环境}\oarg{键值列表2}] - 声明新的定理环境命令,\cs{newtheorem} 命令与它等效。可选参数的 \meta{键值列表1} 与 \meta{键值列表2} 等效,用法与它们的同名命令一致。键值列表中常用的选项如下: + 声明新的定理环境命令,\cs{newtheorem} 命令与它等效。可选参数的 \meta{键值列表1} 与 \meta{键值列表2} 等效,用法与原来的同名命令一致。键值列表中常用的选项如下: \begin{options} \keyval*-{name}{定理名} 定理名的默认值是首字母大写的环境名称(英文标题)。 @@ -559,7 +559,7 @@ 选项的值为使用 \cs{declaretheoremstyle} 命令新定义的定理样式。 \end{options} \command{DeclareTheorem}[\marg{环境名}\oarg{英文标题}\marg{中文标题}\darg{盒子风格}\oarg{键值列表}] - 定理声明命令 \cs{DeclareTheorem} 更加便捷,同样定义一个新的定理环境,与 \cs{declaretheorem} 命令的键值列表支持相同的选项,但它们的区别有: + 定理声明命令 \cs{DeclareTheorem} 更加便捷,同样定义一个新的定理环境,\meta{键值列表} 中支持的选项与 \cs{declaretheorem} 命令相同,但它们的区别有: \begin{itemize} \item 中英文模式下标题不同,英文标题为可选项,默认为首字母大写的 \meta{环境名}。 \item 自动定义交叉引用的格式,引用标签前缀为定理名。 @@ -567,7 +567,7 @@ \item 新建定理环境默认使用的 \meta{定理样式} 为 \code{easy-theorem},而不是 \pkg*{thmtools} 默认样式。 \end{itemize} \command{declaretheoremstyle}[\oarg{键值列表1}\marg{定理样式}\oarg{键值列表2}] - 声明新的定理样式命令,键值列表支持上述 \module*{thmset} 模块中以及 \cs{declaretheorem} 的所有选项。可选参数的 \meta{键值列表1} 与 \meta{键值列表2} 等效,用法与它们的同名命令一致。 + 声明新的定理样式命令,键值列表支持上述 \module*{thmset} 模块中以及 \cs{declaretheorem} 的所有选项。可选参数的 \meta{键值列表1} 与 \meta{键值列表2} 等效,用法与原来的同名命令一致。 下面简单列举几个定理命令的用法,例如使用预置样式新建一个定理环境猜想: \begin{ctexexam} diff --git a/Master/texmf-dist/source/latex/easybook/easybook.dtx b/Master/texmf-dist/source/latex/easybook/easybook.dtx index 778d47e92ad..23cdec10492 100644 --- a/Master/texmf-dist/source/latex/easybook/easybook.dtx +++ b/Master/texmf-dist/source/latex/easybook/easybook.dtx @@ -15,7 +15,7 @@ %<*class> \NeedsTeXFormat{LaTeX2e}[2020/10/01] \RequirePackage{l3keys2e} -\ProvidesExplClass{easybook}{2021/08/16}{1.29} +\ProvidesExplClass{easybook}{2021/08/18}{1.29c} {Typeset Chinese theses or books} \bool_set_false:N \l__eb_compile_draft_bool @@ -63,7 +63,7 @@ } \ProcessKeysOptions{easybook} -\PassOptionsToPackage{CJKmath,quiet}{xeCJK} +\PassOptionsToPackage{no-math,quiet,CJKmath}{xeCJK} \eb_put_ctexbook:n { \g__eb_options_clist } \LoadClass[UTF8]{ctexbook} @@ -297,7 +297,7 @@ %<*package> \NeedsTeXFormat{LaTeX2e}[2020/10/01] \RequirePackage{l3keys2e,etoolbox} -\ProvidesExplPackage{easybase}{2021/08/16}{1.29} +\ProvidesExplPackage{easybase}{2021/08/18}{1.29c} {Typeset Chinese theses or books} \cs_generate_variant:Nn \dim_add:Nn { NV,Nv } @@ -1337,7 +1337,7 @@ \newcounter{bichapter} \newcounter{bisection}[bichapter] \newcounter{bisubsection}[bisection] -\cs_set_protected:Npn \eb_current_label:n #1 +\cs_new_protected:Npn \eb_current_label:n #1 { \tl_set:Nx \@currentlabel { @@ -1376,7 +1376,7 @@ {\tl_gset:Nn \eb@before@addbitoc@hook {#2}} {\tl_gput_right:Nn \eb@before@addbitoc@hook {#2}} } -\cs_set_protected:Npn \CTEX@addbitocline #1#2 +\cs_new_protected:Npn \CTEX@addbitocline #1#2 { \group_begin: \def\CTEX@prechapter{\CTEX@prebichapter} @@ -1589,7 +1589,7 @@ \cs_set_eq:NN \imki@indexlevel \use_none:n \setkeys{imkiindex}{noclearpage} \IfValueT{#3}{\keys_set:nn { eb/listoc } {#3}} - \tl_set:Nn \imki@indexheaders + \cs_set_protected:Npn \imki@indexheaders { \eb_title_number_intoc_spec:nn {#2} {#1} \cs_set_eq:NN \thispagestyle \use_none:n @@ -1677,7 +1677,7 @@ \cs_new_protected:Npn \eb_put_newtxmath:n #1 { \PassOptionsToPackage{#1}{newtxmath} } -\AfterPreamble +\eb_at_end_preamble:n { \str_case:VnT \l__eb_subfont_math_choice_tl { @@ -2131,7 +2131,7 @@ \group_begin: \tl_set_eq:NN \eb@toc@title \bibname \IfValueT{##3}{ \keys_set:nn { eb/listoc } {##3} } - \cs_set:Npn \bibsection + \cs_set_protected:Npn \bibsection { \eb_title_number_intoc_spec:nn {##2} {##1} \bool_if:NT \l__eb_toc_multi_column_bool @@ -2394,7 +2394,7 @@ } % %<*tcolorbox> -\ProvidesExplFile{eb-tcolorbox.cfg}{2021/08/16}{1.29} +\ProvidesExplFile{eb-tcolorbox.cfg}{2021/08/18}{1.29c} {Customization of tcolorbox for easybook} \tl_gset:Nn \eb@tc@line@skip { 0.5\baselineskip } diff --git a/Master/texmf-dist/tex/latex/easybook/easybase.sty b/Master/texmf-dist/tex/latex/easybook/easybase.sty index d03de597fe5..e6bf1e59fa5 100644 --- a/Master/texmf-dist/tex/latex/easybook/easybase.sty +++ b/Master/texmf-dist/tex/latex/easybook/easybase.sty @@ -20,7 +20,7 @@ %% This work has the LPPL maintenance status `maintained'. \NeedsTeXFormat{LaTeX2e}[2020/10/01] \RequirePackage{l3keys2e,etoolbox} -\ProvidesExplPackage{easybase}{2021/08/16}{1.29} +\ProvidesExplPackage{easybase}{2021/08/18}{1.29c} {Typeset Chinese theses or books} \cs_generate_variant:Nn \dim_add:Nn { NV,Nv } @@ -1060,7 +1060,7 @@ \newcounter{bichapter} \newcounter{bisection}[bichapter] \newcounter{bisubsection}[bisection] -\cs_set_protected:Npn \eb_current_label:n #1 +\cs_new_protected:Npn \eb_current_label:n #1 { \tl_set:Nx \@currentlabel { @@ -1099,7 +1099,7 @@ {\tl_gset:Nn \eb@before@addbitoc@hook {#2}} {\tl_gput_right:Nn \eb@before@addbitoc@hook {#2}} } -\cs_set_protected:Npn \CTEX@addbitocline #1#2 +\cs_new_protected:Npn \CTEX@addbitocline #1#2 { \group_begin: \def\CTEX@prechapter{\CTEX@prebichapter} @@ -1312,7 +1312,7 @@ \cs_set_eq:NN \imki@indexlevel \use_none:n \setkeys{imkiindex}{noclearpage} \IfValueT{#3}{\keys_set:nn { eb/listoc } {#3}} - \tl_set:Nn \imki@indexheaders + \cs_set_protected:Npn \imki@indexheaders { \eb_title_number_intoc_spec:nn {#2} {#1} \cs_set_eq:NN \thispagestyle \use_none:n @@ -1400,7 +1400,7 @@ \cs_new_protected:Npn \eb_put_newtxmath:n #1 { \PassOptionsToPackage{#1}{newtxmath} } -\AfterPreamble +\eb_at_end_preamble:n { \str_case:VnT \l__eb_subfont_math_choice_tl { @@ -1854,7 +1854,7 @@ \group_begin: \tl_set_eq:NN \eb@toc@title \bibname \IfValueT{##3}{ \keys_set:nn { eb/listoc } {##3} } - \cs_set:Npn \bibsection + \cs_set_protected:Npn \bibsection { \eb_title_number_intoc_spec:nn {##2} {##1} \bool_if:NT \l__eb_toc_multi_column_bool diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls index 788286ba650..3bcbfa56a2f 100644 --- a/Master/texmf-dist/tex/latex/easybook/easybook.cls +++ b/Master/texmf-dist/tex/latex/easybook/easybook.cls @@ -20,7 +20,7 @@ %% This work has the LPPL maintenance status `maintained'. \NeedsTeXFormat{LaTeX2e}[2020/10/01] \RequirePackage{l3keys2e} -\ProvidesExplClass{easybook}{2021/08/16}{1.29} +\ProvidesExplClass{easybook}{2021/08/18}{1.29c} {Typeset Chinese theses or books} \bool_set_false:N \l__eb_compile_draft_bool @@ -68,7 +68,7 @@ } \ProcessKeysOptions{easybook} -\PassOptionsToPackage{CJKmath,quiet}{xeCJK} +\PassOptionsToPackage{no-math,quiet,CJKmath}{xeCJK} \eb_put_ctexbook:n { \g__eb_options_clist } \LoadClass[UTF8]{ctexbook} diff --git a/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg b/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg index 066a9b641e2..ec2179670d0 100644 --- a/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg +++ b/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg @@ -18,7 +18,7 @@ %% LaTeX version 2005/12/01 or later. %% %% This work has the LPPL maintenance status `maintained'. -\ProvidesExplFile{eb-tcolorbox.cfg}{2021/08/16}{1.29} +\ProvidesExplFile{eb-tcolorbox.cfg}{2021/08/18}{1.29c} {Customization of tcolorbox for easybook} \tl_gset:Nn \eb@tc@line@skip { 0.5\baselineskip } -- cgit v1.2.3