summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2024-05-11 20:35:58 +0000
committerKarl Berry <karl@freefriends.org>2024-05-11 20:35:58 +0000
commite2fc9a84bdc5487b71b32a3ec9f5a3a1c7df5695 (patch)
tree56201e059607e546f031f2b066e7463647ff23d2
parentcb4dac2c942d187baaa09bc952a9e8e8ac68b5ce (diff)
easybook (11may24)
git-svn-id: svn://tug.org/texlive/trunk@71234 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/easybook/easybook.pdfbin631693 -> 631701 bytes
-rw-r--r--Master/texmf-dist/doc/latex/easybook/easybook.tex23
-rw-r--r--Master/texmf-dist/source/latex/easybook/easybook.dtx44
-rw-r--r--Master/texmf-dist/tex/latex/easybook/easybase.sty40
-rw-r--r--Master/texmf-dist/tex/latex/easybook/easybook.cls2
-rw-r--r--Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg2
6 files changed, 56 insertions, 55 deletions
diff --git a/Master/texmf-dist/doc/latex/easybook/easybook.pdf b/Master/texmf-dist/doc/latex/easybook/easybook.pdf
index 2a0e3e57c1d..858e4066496 100644
--- a/Master/texmf-dist/doc/latex/easybook/easybook.pdf
+++ b/Master/texmf-dist/doc/latex/easybook/easybook.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/easybook/easybook.tex b/Master/texmf-dist/doc/latex/easybook/easybook.tex
index 7bc19cadd5e..60dc80faccf 100644
--- a/Master/texmf-dist/doc/latex/easybook/easybook.tex
+++ b/Master/texmf-dist/doc/latex/easybook/easybook.tex
@@ -23,8 +23,8 @@
name = easybook,
color-scheme = blue,
title = EASYBOOK使用手册,
- version = v2024bm,
- date = 2024/05/09,
+ version = v2024bn,
+ date = 2024/05/10,
authors = 瞿毅,
info = 简便地排版中文学位论文或书籍,
email = toquyi@163.com,
@@ -857,7 +857,7 @@
\subsection[目录]{目录\smodule{toc}}
\label{subsec:catalog}
-模块 \module*{toc} 将使用 \pkg*{titletoc} 宏包处理目录样式。默认包括 \module*{part}$\longrightarrow$\module*{subparagraph}、\module*{figure}、\module*{table} 和 \module*{lstlisting} 条目名的键路径,而使用 \module*{float} 路径可以统一设置图片、表格和代码目录的样式。选项前带有 \ding{73} 符号表示支持所有相应\textbf{条目名}的路径,其它选项则处于 \module*{toc} 键路径下。目前支持多数学术论文目录样式,更复杂的样式可以查看 \pkg*{titletoc} 的相关用法。
+模块 \module*{toc} 将使用 \pkg*{titletoc} 宏包处理目录样式。默认包括 \module*{part}$\longrightarrow$\module*{subparagraph}、\module*{figure}、\module*{table} 和 \module*{lstlisting} 条目名的键路径。选项前带有 \ding{73} 符号表示支持所有相应\textbf{条目名}的路径,其它选项则处于 \module*{toc} 键路径下。目前支持多数学术论文目录样式,更复杂的样式可以查看 \pkg*{titletoc} 的相关用法。
\begin{options}
\keyval{tocformat}{条目格式}\dtag
目录中各类型条目的格式。可以设置条目字体和加入垂直间距等,垂直间距最好使用防止垂直间距重合的 \cs*{addvspace} 命令。如果是段落型目录,格式代码仅在段落中当前级别条目前执行一次。
@@ -977,11 +977,15 @@
\keyval{pagenumwd}{刚性长度}\Default{1.55em}
设置开启 \option{dotalign} 选项时页码水平盒子的宽度。
\keyval{tocafter-every}{距离命令}\Default{\cs*{hspace}\Marg{1em}}
- 统一设置所有类型条目编号与标题间的代码(仅支持上述预注册的条目)。
+ 统一设置所有类型条目编号与标题间的代码。
\keyval{tocindent-every}{刚性长度}
- 统一设置所有类型条目的左边缩进(仅支持上述预注册的条目)。
+ 统一设置所有类型条目的左边缩进。
\keyval{tocrule-every}{引导线命令}
- 统一设置所有类型的目录引导线样式(仅支持上述预注册的条目)。
+ 统一设置所有类型的目录引导线样式。
+ \begin{commands}
+ \command{ExcludeEveryTocName}[\marg{条目名}]\newtagv{2024bn}
+ 用于指定带有 \option*{every} 后缀选项排除的条目类型。
+ \end{commands}
\end{options}
\section{环境和命令}
@@ -1522,7 +1526,12 @@
\shortversion{v = 2024aw,date = 2022/04/22,changes = 新增新建章节标题命令 \cs{NewTitleCommand} 和 \cs{NewTitleEntryCommand}。}
\shortversion{v = 2024bb,date = 2022/04/26,changes = 增加对 \pkg*{thmtools} 宏包定理环境目录 \cs{listoftheorems} 的支持。}
\shortversion{v = 2024bk,date = 2022/05/07,changes = 新增局部题注目录分配命令 \cs{AllotPartialExt}。}
- \shortversion{v = 2024bm,date = 2022/05/09,changes = 修复 \module*{toc} 模块中带有 \option*{every} 后缀的选项不对所有预注册条目有效的问题。}
+ \begin{version}[v = 2024bn,date = 2022/05/10]
+ \fixed
+ \item 修复 \module*{toc} 模块中带有 \option*{every} 后缀的选项不对所有已注册条目有效的问题。
+ \added
+ \item 新增统一设置所有目录格式时的条目类型排除命令 \cs{ExcludeEveryTocName}。
+ \end{version}
\end{changelog}
\nocite{*}
diff --git a/Master/texmf-dist/source/latex/easybook/easybook.dtx b/Master/texmf-dist/source/latex/easybook/easybook.dtx
index 1396d311baa..7beb93bdb9c 100644
--- a/Master/texmf-dist/source/latex/easybook/easybook.dtx
+++ b/Master/texmf-dist/source/latex/easybook/easybook.dtx
@@ -14,7 +14,7 @@
% This work has the LPPL maintenance status `maintained'.
%<*class>
\NeedsTeXFormat{LaTeX2e}[2021/11/15]
-\ProvidesExplClass{easybook}{2024/05/09}{2024bm}
+\ProvidesExplClass{easybook}{2024/05/10}{2024bn}
{Easily typesetting Chinese theses or books}
\bool_new:N \l__eb_compile_draft_bool
@@ -301,7 +301,7 @@
%<*package>
\NeedsTeXFormat{LaTeX2e}[2021/11/15]
\RequirePackage{etoolbox}
-\ProvidesExplPackage{easybase}{2024/05/09}{2024bm}
+\ProvidesExplPackage{easybase}{2024/05/10}{2024bn}
{Easily typesetting Chinese theses or books}
\cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -445,7 +445,7 @@
{
tools,font,spread,
bib,thmt,toc,
- hdr,ref,geo,float
+ hdr,float,ref,geo
}
\seq_map_inline:Nn \l__eb_module_paths_seq
{
@@ -459,7 +459,7 @@
{\ctex_set:n {#2}}
}
\bool_until_do:nn
- { \int_compare_p:nNn { \seq_count:N \l__eb_module_paths_seq } < { 8 } }
+ { \int_compare_p:nNn { \seq_count:N \l__eb_module_paths_seq } < { 9 } }
{ \seq_pop_right:NN \l__eb_module_paths_seq \l_tmpa_tl }
\seq_map_inline:Nn \l__eb_module_paths_seq
{
@@ -1639,6 +1639,14 @@
tocend = .
}
}
+\seq_new:N \l__eb_toc_every_include_name_seq
+\cs_new_protected:Npn \ExcludeEveryTocName #1
+ { \seq_remove_all:Nn \l__eb_toc_every_include_name_seq {#1} }
+\cs_new_protected:Npn \IncludeEveryTocName #1
+ {
+ \seq_put_right:Nn \l__eb_toc_every_include_name_seq {#1}
+ \seq_remove_duplicates:N \l__eb_toc_every_include_name_seq
+ }
\NewDocumentCommand{\RegisterTocName}{sm}
{
\IfBooleanT{#1}
@@ -1651,6 +1659,7 @@
[\tl_use:c { l__eb_toc_#2_end_tl }]
}
}
+ \IncludeEveryTocName{#2}
\eb_toc_format_define:n {#2}
\eb_toc_format_initial:nn {#1} {#2}
\tl_clear:N \l__eb_toc_tmpa_tl
@@ -1658,34 +1667,21 @@
}
\seq_map_function:NN
\c__ctex_headings_seq \RegisterTocName
-\eb_seq_map_inline:nn
- {
- tocformat,tocformat+,tocformat~+,tocformat*,
- toclabel,tocindent,tocrule,tocline,tocafter,between,
- tocbelow,tocbegin,tocsep,tocend
- }
- {
- \ctex_define:n
- {
- float/#1 .meta:n =
- {
- figure/#1 = {##1},table/#1 = {##1},
- lstlisting/#1 = {##1}
- }
- }
- }
-\eb_seq_map_inline:nn
- { tocafter,tocindent,tocrule }
+\ctex_define:n { float/unknown .code:n = \eb_msg_deprecated_option:n { float } }
+\cs_new_protected:Npn \RegisterEveryTocOption #1
{
\ctex_define:nn { toc }
{
#1-every .code:n =
{
- \seq_map_inline:Nn \c__ctex_headings_seq
+ \seq_map_inline:Nn \l__eb_toc_every_include_name_seq
{ \ctex_set:n { ####1/#1 = {##1} } }
}
}
}
+\clist_map_function:nN
+ { tocafter,tocindent,tocrule }
+ \RegisterEveryTocOption
\NewDocumentCommand{\tocrule}{st-O{0.7pc}d()mO{}}
{
\normalsize\normalfont
@@ -2540,7 +2536,7 @@
}
%</package>
%<*tcolorbox>
-\ProvidesExplFile{eb-tcolorbox.cfg}{2024/05/09}{2024bm}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2024/05/10}{2024bn}
{Customization of tcolorbox for easybook}
\cs_set_protected:Npn \addtotcbstyle #1#2
diff --git a/Master/texmf-dist/tex/latex/easybook/easybase.sty b/Master/texmf-dist/tex/latex/easybook/easybase.sty
index b6669fcfb7b..2dae33aa53b 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}[2021/11/15]
\RequirePackage{etoolbox}
-\ProvidesExplPackage{easybase}{2024/05/09}{2024bm}
+\ProvidesExplPackage{easybase}{2024/05/10}{2024bn}
{Easily typesetting Chinese theses or books}
\cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -164,7 +164,7 @@
{
tools,font,spread,
bib,thmt,toc,
- hdr,ref,geo,float
+ hdr,float,ref,geo
}
\seq_map_inline:Nn \l__eb_module_paths_seq
{
@@ -178,7 +178,7 @@
{\ctex_set:n {#2}}
}
\bool_until_do:nn
- { \int_compare_p:nNn { \seq_count:N \l__eb_module_paths_seq } < { 8 } }
+ { \int_compare_p:nNn { \seq_count:N \l__eb_module_paths_seq } < { 9 } }
{ \seq_pop_right:NN \l__eb_module_paths_seq \l_tmpa_tl }
\seq_map_inline:Nn \l__eb_module_paths_seq
{
@@ -1358,6 +1358,14 @@
tocend = .
}
}
+\seq_new:N \l__eb_toc_every_include_name_seq
+\cs_new_protected:Npn \ExcludeEveryTocName #1
+ { \seq_remove_all:Nn \l__eb_toc_every_include_name_seq {#1} }
+\cs_new_protected:Npn \IncludeEveryTocName #1
+ {
+ \seq_put_right:Nn \l__eb_toc_every_include_name_seq {#1}
+ \seq_remove_duplicates:N \l__eb_toc_every_include_name_seq
+ }
\NewDocumentCommand{\RegisterTocName}{sm}
{
\IfBooleanT{#1}
@@ -1370,6 +1378,7 @@
[\tl_use:c { l__eb_toc_#2_end_tl }]
}
}
+ \IncludeEveryTocName{#2}
\eb_toc_format_define:n {#2}
\eb_toc_format_initial:nn {#1} {#2}
\tl_clear:N \l__eb_toc_tmpa_tl
@@ -1377,34 +1386,21 @@
}
\seq_map_function:NN
\c__ctex_headings_seq \RegisterTocName
-\eb_seq_map_inline:nn
- {
- tocformat,tocformat+,tocformat~+,tocformat*,
- toclabel,tocindent,tocrule,tocline,tocafter,between,
- tocbelow,tocbegin,tocsep,tocend
- }
- {
- \ctex_define:n
- {
- float/#1 .meta:n =
- {
- figure/#1 = {##1},table/#1 = {##1},
- lstlisting/#1 = {##1}
- }
- }
- }
-\eb_seq_map_inline:nn
- { tocafter,tocindent,tocrule }
+\ctex_define:n { float/unknown .code:n = \eb_msg_deprecated_option:n { float } }
+\cs_new_protected:Npn \RegisterEveryTocOption #1
{
\ctex_define:nn { toc }
{
#1-every .code:n =
{
- \seq_map_inline:Nn \c__ctex_headings_seq
+ \seq_map_inline:Nn \l__eb_toc_every_include_name_seq
{ \ctex_set:n { ####1/#1 = {##1} } }
}
}
}
+\clist_map_function:nN
+ { tocafter,tocindent,tocrule }
+ \RegisterEveryTocOption
\NewDocumentCommand{\tocrule}{st-O{0.7pc}d()mO{}}
{
\normalsize\normalfont
diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls
index 3487f2d1bf8..d19d6926cc9 100644
--- a/Master/texmf-dist/tex/latex/easybook/easybook.cls
+++ b/Master/texmf-dist/tex/latex/easybook/easybook.cls
@@ -19,7 +19,7 @@
%%
%% This work has the LPPL maintenance status `maintained'.
\NeedsTeXFormat{LaTeX2e}[2021/11/15]
-\ProvidesExplClass{easybook}{2024/05/09}{2024bm}
+\ProvidesExplClass{easybook}{2024/05/10}{2024bn}
{Easily typesetting Chinese theses or books}
\bool_new: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 21a085d94be..f324dad2a02 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}{2024/05/09}{2024bm}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2024/05/10}{2024bn}
{Customization of tcolorbox for easybook}
\cs_set_protected:Npn \addtotcbstyle #1#2