texlive[61153] Master/texmf-dist: easybook (25nov21)
commits+karl at tug.org
commits+karl at tug.org
Thu Nov 25 22:24:09 CET 2021
Revision: 61153
http://tug.org/svn/texlive?view=revision&revision=61153
Author: karl
Date: 2021-11-25 22:24:09 +0100 (Thu, 25 Nov 2021)
Log Message:
-----------
easybook (25nov21)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/easybook/easybook.pdf
trunk/Master/texmf-dist/doc/latex/easybook/easybook.tex
trunk/Master/texmf-dist/source/latex/easybook/easybook.dtx
trunk/Master/texmf-dist/tex/latex/easybook/easybase.sty
trunk/Master/texmf-dist/tex/latex/easybook/easybook.cls
trunk/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg
Modified: trunk/Master/texmf-dist/doc/latex/easybook/easybook.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/easybook/easybook.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/easybook/easybook.tex 2021-11-25 14:10:20 UTC (rev 61152)
+++ trunk/Master/texmf-dist/doc/latex/easybook/easybook.tex 2021-11-25 21:24:09 UTC (rev 61153)
@@ -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 at 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}
Modified: trunk/Master/texmf-dist/source/latex/easybook/easybook.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/easybook/easybook.dtx 2021-11-25 14:10:20 UTC (rev 61152)
+++ trunk/Master/texmf-dist/source/latex/easybook/easybook.dtx 2021-11-25 21:24:09 UTC (rev 61153)
@@ -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 at if@boolT\eb at titletoc@hang at fix@bool{\p at numberline}
\bgroup
- \eb at toc@label at lstlisting{}
+ \eb at toc@label at 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 @@
}
%</package>
%<*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
Modified: trunk/Master/texmf-dist/tex/latex/easybook/easybase.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/easybook/easybase.sty 2021-11-25 14:10:20 UTC (rev 61152)
+++ trunk/Master/texmf-dist/tex/latex/easybook/easybase.sty 2021-11-25 21:24:09 UTC (rev 61153)
@@ -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 at if@boolT\eb at titletoc@hang at fix@bool{\p at numberline}
\bgroup
- \eb at toc@label at lstlisting{}
+ \eb at toc@label at 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
{
Modified: trunk/Master/texmf-dist/tex/latex/easybook/easybook.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/easybook/easybook.cls 2021-11-25 14:10:20 UTC (rev 61152)
+++ trunk/Master/texmf-dist/tex/latex/easybook/easybook.cls 2021-11-25 21:24:09 UTC (rev 61153)
@@ -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
Modified: trunk/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg
===================================================================
--- trunk/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg 2021-11-25 14:10:20 UTC (rev 61152)
+++ trunk/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg 2021-11-25 21:24:09 UTC (rev 61153)
@@ -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
More information about the tex-live-commits
mailing list.