From 91c444a271f31d785e695b9c74e4dbaaede3f6bc Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 25 Nov 2021 21:24:09 +0000 Subject: easybook (25nov21) git-svn-id: svn://tug.org/texlive/trunk@61153 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/easybook/easybook.pdf | Bin 582438 -> 582859 bytes Master/texmf-dist/doc/latex/easybook/easybook.tex | 12 ++++--- .../texmf-dist/source/latex/easybook/easybook.dtx | 40 ++++++++++----------- Master/texmf-dist/tex/latex/easybook/easybase.sty | 36 +++++++++---------- Master/texmf-dist/tex/latex/easybook/easybook.cls | 2 +- .../texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg | 2 +- 6 files changed, 47 insertions(+), 45 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 befe08edfbf..99dee24a1b9 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 7c9e48b3a88..ecf0c7bc94a 100644 --- a/Master/texmf-dist/doc/latex/easybook/easybook.tex +++ b/Master/texmf-dist/doc/latex/easybook/easybook.tex @@ -20,8 +20,8 @@ name = easybook, color-scheme = blue, title = EASYBOOK 使用手册, - version = v1.40X, - date = 2021/11/24, + version = v1.40Z, + date = 2021/11/25, authors = 瞿毅, info = 排版简体中文学位论文和书籍, email = q1jx@foxmail.com, @@ -489,7 +489,7 @@ \keyval-{line}{数值}\Module{spread}\Default{1.354} 正文行距因子,C\TeX 原有的行距选项 \option*{linespread} 失效。 \keyval-{table}{数值}\Default{1.354} - 表格行距因子,对传统表格环境 \env*{tabular}、\env*{tabularx} 以及 \pkg*{tabularray} 宏包的 \env{tblr} 环境生效,同时 \env{tblr} 也自带有 \option*{stretch} 选项设置行距。 + 表格行距因子,对传统表格 \env*{tabular} 和 \env*{tabularx} 等环境以及 \pkg*{tabularray} 宏包的 \env{tblr} 环境生效,同时 \env{tblr} 也自带有 \option*{stretch} 选项设置行距系数。 \keyval-{math}{数值}\Default{1.2} 数学环境的行距因子,包含了 \pkg*{amsmath} 和 \pkg*{mathtools} 宏包提供的公式环境。 \keyval-{caption}{数值}\Default{1.2} @@ -513,6 +513,8 @@ 图片标题的字体设置,包括字体族、字体系列、字体尺寸和字体形状命令。 \keyval-{caption-listing}{字体命令}\Default{\cs*{sffamily}\cs*{small}} 代码标题的字体设置,包括字体族、字体系列、字体尺寸和字体形状命令。 + \keyval-{caption}{字体命令}\Default{\cs*{sffamily}\cs*{small}} + 同时设置图片、表格和代码题注的字体命令。 \keyval-{footnote}{字体命令}\Default{\cs*{rmfamily}} 设置脚注标记与内容的字体,包括字体族、字体系列、字体尺寸和字体形状命令。 \keyval-{marginpar}{字体命令}\Default{\cs*{rmfamily}\cs*{footnotesize}} @@ -786,12 +788,12 @@ \keyval-{tocafter}{距离命令}\Default{\cs*{hspace}\Carg{1em}} 在各级别目录中标签与标题间的代码,默认为插入 \code{1em} 横向距离。 \keyval-{tocline}{目录标签} - 这个选项扩展了图片、表格或代码的目录标签。图片或表格的选项中参数 \code{\#1} 代表编号,代码中 \cs*{thelstlisting} 代表编号。选项还可包含标签名称,默认标签名称与对应题注名称一致。 + 这个选项扩展了图片、表格或代码的目录标签。选项中参数 \code{\#1} 代表相应题注编号 \cs*{the}\meta{计数器} 的值。选项还可包含标签名称,默认标签名称与对应题注名称一致。 \begin{ctexexam} \ctexset { figure/tocline = 图 #1\hspace{1em}, - lstlisting/tocline = 代码\thelstlisting\hspace{1em} + lstlisting/tocline = 代码 #1\hspace{1em} } \end{ctexexam} \end{options} diff --git a/Master/texmf-dist/source/latex/easybook/easybook.dtx b/Master/texmf-dist/source/latex/easybook/easybook.dtx index 633dde041ce..1dc68e17ad8 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/11/24}{1.40X} +\ProvidesExplClass{easybook}{2021/11/25}{1.40Z} {Typeset Chinese theses or books} \bool_set_false:N \l__eb_compile_draft_bool @@ -325,7 +325,7 @@ %<*package> \NeedsTeXFormat{LaTeX2e}[2020/10/01] \RequirePackage{l3keys2e,etoolbox} -\ProvidesExplPackage{easybase}{2021/11/24}{1.40X} +\ProvidesExplPackage{easybase}{2021/11/25}{1.40Z} {Typeset Chinese theses or books} \cs_generate_variant:Nn \dim_set:Nn { NV } @@ -1388,7 +1388,7 @@ { \eb@if@boolT\eb@titletoc@hang@fix@bool{\p@numberline} \bgroup - \eb@toc@label@lstlisting{} + \eb@toc@label@lstlisting{\thelstlisting} \egroup \lst@@caption } @@ -1697,16 +1697,19 @@ \ctex_define:nn { subfont } { - caption-table .tl_set:N = \l__eb_subfont_table_tl, - caption-table .initial:n = \sffamily\small, - caption-figure .tl_set:N = \l__eb_subfont_figure_tl, - caption-figure .initial:n = \sffamily\small, - caption-listing .tl_set:N = \l__eb_subfont_listing_tl, - caption-listing .initial:n = \sffamily\small, - footnote .tl_set:N = \l__eb_subfont_footnote_tl, - footnote .initial:n = \rmfamily, - marginpar .tl_set:N = \marginfont, - marginpar .initial:n = \rmfamily\footnotesize, + caption-table .tl_set:N = \l__eb_subfont_table_tl, + caption-figure .tl_set:N = \l__eb_subfont_figure_tl, + caption-listing .tl_set:N = \l__eb_subfont_listing_tl, + caption .meta:n = + { + caption-table = #1,caption-figure = #1, + caption-listing = #1 + }, + caption .initial:n = \sffamily\small, + footnote .tl_set:N = \l__eb_subfont_footnote_tl, + footnote .initial:n = \rmfamily, + marginpar .tl_set:N = \marginfont, + marginpar .initial:n = \rmfamily\footnotesize, unknown .code:n = \eb_msg_unknown_option:n { subfont } } @@ -1760,13 +1763,10 @@ \captionsetup[figure][bi-second]{name = Figure} \captionsetup[table][bi-second]{name = Table} } -\IfPackageAtLeastTF{tabularray}{2021/07/01} - { - \UseTblrLibrary{booktabs} - \SetTblrInner{stretch = \fp_use:N \l__eb_spread_table_fp} - }{} -\eb_at_begin_environment:nn { tabular,tabularx } +\eb_at_begin_environment:nn + { tabular,tabularx,tblr,longtblr,longtable } { \setspread{\fp_use:N \l__eb_spread_table_fp} } +\IfPackageAtLeastTF{tabularray}{2021/07/01}{\UseTblrLibrary{booktabs}}{} \bool_if:NF \l__eb_float_page_bool { @@ -2380,7 +2380,7 @@ } % %<*tcolorbox> -\ProvidesExplFile{eb-tcolorbox.cfg}{2021/11/24}{1.40X} +\ProvidesExplFile{eb-tcolorbox.cfg}{2021/11/25}{1.40Z} {Customization of tcolorbox for easybook} \cs_set_protected:Npn \setexercise #1 diff --git a/Master/texmf-dist/tex/latex/easybook/easybase.sty b/Master/texmf-dist/tex/latex/easybook/easybase.sty index 5a4ec969861..43e89f8d020 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/11/24}{1.40X} +\ProvidesExplPackage{easybase}{2021/11/25}{1.40Z} {Typeset Chinese theses or books} \cs_generate_variant:Nn \dim_set:Nn { NV } @@ -1083,7 +1083,7 @@ { \eb@if@boolT\eb@titletoc@hang@fix@bool{\p@numberline} \bgroup - \eb@toc@label@lstlisting{} + \eb@toc@label@lstlisting{\thelstlisting} \egroup \lst@@caption } @@ -1392,16 +1392,19 @@ \ctex_define:nn { subfont } { - caption-table .tl_set:N = \l__eb_subfont_table_tl, - caption-table .initial:n = \sffamily\small, - caption-figure .tl_set:N = \l__eb_subfont_figure_tl, - caption-figure .initial:n = \sffamily\small, - caption-listing .tl_set:N = \l__eb_subfont_listing_tl, - caption-listing .initial:n = \sffamily\small, - footnote .tl_set:N = \l__eb_subfont_footnote_tl, - footnote .initial:n = \rmfamily, - marginpar .tl_set:N = \marginfont, - marginpar .initial:n = \rmfamily\footnotesize, + caption-table .tl_set:N = \l__eb_subfont_table_tl, + caption-figure .tl_set:N = \l__eb_subfont_figure_tl, + caption-listing .tl_set:N = \l__eb_subfont_listing_tl, + caption .meta:n = + { + caption-table = #1,caption-figure = #1, + caption-listing = #1 + }, + caption .initial:n = \sffamily\small, + footnote .tl_set:N = \l__eb_subfont_footnote_tl, + footnote .initial:n = \rmfamily, + marginpar .tl_set:N = \marginfont, + marginpar .initial:n = \rmfamily\footnotesize, unknown .code:n = \eb_msg_unknown_option:n { subfont } } @@ -1455,13 +1458,10 @@ \captionsetup[figure][bi-second]{name = Figure} \captionsetup[table][bi-second]{name = Table} } -\IfPackageAtLeastTF{tabularray}{2021/07/01} - { - \UseTblrLibrary{booktabs} - \SetTblrInner{stretch = \fp_use:N \l__eb_spread_table_fp} - }{} -\eb_at_begin_environment:nn { tabular,tabularx } +\eb_at_begin_environment:nn + { tabular,tabularx,tblr,longtblr,longtable } { \setspread{\fp_use:N \l__eb_spread_table_fp} } +\IfPackageAtLeastTF{tabularray}{2021/07/01}{\UseTblrLibrary{booktabs}}{} \bool_if:NF \l__eb_float_page_bool { diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls index 1a4f18b3e04..10489fb95eb 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/11/24}{1.40X} +\ProvidesExplClass{easybook}{2021/11/25}{1.40Z} {Typeset Chinese theses or books} \bool_set_false:N \l__eb_compile_draft_bool diff --git a/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg b/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg index 92f9f45b948..d151a93c0a6 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/11/24}{1.40X} +\ProvidesExplFile{eb-tcolorbox.cfg}{2021/11/25}{1.40Z} {Customization of tcolorbox for easybook} \cs_set_protected:Npn \setexercise #1 -- cgit v1.2.3