From 2ed641d12ee441ca9105552f88cbc9dba73b912e Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 21 Feb 2024 21:09:29 +0000 Subject: easybook (21feb24) git-svn-id: svn://tug.org/texlive/trunk@70043 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/easybook/easybook.pdf | Bin 602450 -> 604534 bytes Master/texmf-dist/doc/latex/easybook/easybook.tex | 18 +++++++++++---- .../texmf-dist/source/latex/easybook/easybook.dtx | 25 ++++++++++++++------- Master/texmf-dist/tex/latex/easybook/easybase.sty | 21 ++++++++++++----- Master/texmf-dist/tex/latex/easybook/easybook.cls | 2 +- .../texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg | 2 +- 6 files changed, 48 insertions(+), 20 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 234d82c5906..9d8f968127e 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 5bf1cadc713..122dffdbf4c 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 = v2024ah, - date = 2024/02/20, + version = v2024ai, + date = 2024/02/21, authors = 瞿毅, info = 简便地排版中文学位论文或书籍, email = toquyi@163.com, @@ -957,6 +957,12 @@ \tableofcontents[level = \chapter*] \listoffigures[level = \bichapter,title = {图片索引,List of Figures}] \end{ctexexam} + \opt{chapter} + 设置目录标题级别为 \code{chapter},与 \keyis{level}{\cs{bichapter}*} 等效。 + \opt{section} + 设置目录标题级别为 \code{section},与 \keyis{level}{\cs{bisection}*} 等效。 + \opt{none} + 不输出目录标题,与带星号参数的目录命令等效。 \keyval{multoc}{整数}\Default{2} 设置目录的排版栏数。\meta{整数} 代表目录栏数,不指定栏数的值则默认为双栏。 \kvsplit{title}{中文目录标题,英文目录标题} @@ -978,8 +984,12 @@ \end{commands} \keyval{format}{目录标题格式} 设置目录标题的格式,在标题级别为 \code{chapter} 或者 \cls*{article} 模式且标题级别为 \code{section} 时有效。 + \keyval{aftername}{标签后代码} + 目录标题的标签与内容之间插入的代码,生效情形同上。 \keyval{aftertitle}{标题后代码} - 目录标题文本之后插入的代码,生效情形同上。 + 目录标题内容之后插入的代码,生效情形同上。 + \keyval{break}{格式命令} + 控制章节标题与之前正文的分隔关系。一般用于设置是否在标题之前分页或者设置行间罚点,生效情形同上。 \keyval{pagestyle}{页面风格}\Default{empty} 目录标题所在页的页面格式,仅当目录以 \code{chapter} 级别输出时有效。除了上述选项还支持 \CTeX 键值列表路径 \module*{chapter} 或 \module*{section} 所有的章节标题样式选项。 \end{options} @@ -1391,7 +1401,7 @@ \shortversion{v = 1.638,date = 2022/03/04,changes = 增加目录条目样式选项注册命令 \cs{RegisterTocName}。} \shortversion{v = 1.644,date = 2022/03/10,changes = 增加浮动环境目录声明命令 \cs{DeclareFloatList} 配合 \pkg*{caption} 宏包。} \shortversion{v = 1.682,date = 2022/05/01,changes = 将迷你页判断命令 \cs{notminipage} 改为被保护命令兼容 \pkg*{circledtext} 宏包。} - \begin{version}[v = 2024ah,date = 2024/02/20] + \begin{version}[v = 2024ai,date = 2024/02/21] \fixed \item 修复图表等浮动环境题注目录中条目标签编号的计数器值显示错误问题。 \item 修复附录命令 \cs{appendix} 的可选参数设置英文目录中条目名字和编号失效的问题。 diff --git a/Master/texmf-dist/source/latex/easybook/easybook.dtx b/Master/texmf-dist/source/latex/easybook/easybook.dtx index 873e0b11a41..1128cde18f3 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}[2021/11/15] \RequirePackage{l3keys2e} -\ProvidesExplClass{easybook}{2024/02/20}{2024ah} +\ProvidesExplClass{easybook}{2024/02/21}{2024ai} {Easily typesetting Chinese theses or books} \bool_set_false:N \l__eb_compile_draft_bool @@ -297,7 +297,7 @@ %<*package> \NeedsTeXFormat{LaTeX2e}[2021/11/15] \RequirePackage{l3keys2e,etoolbox} -\ProvidesExplPackage{easybase}{2024/02/20}{2024ah} +\ProvidesExplPackage{easybase}{2024/02/21}{2024ai} {Easily typesetting Chinese theses or books} \cs_generate_variant:Nn \dim_set:Nn { NV } @@ -1331,6 +1331,7 @@ \cs_new_protected:Npn \SetTocOuter #1 { \keys_set:nn { eb/tocouter } {#1} } \tl_new:N \eb@bitoc@title +\bool_set_false:N \l__eb_toc_notitle_bool \newbool{bitoc} \cs_new:Npn \ebifbitoc { \ifbool{bitoc} } \keys_define:nn { eb/tocouter } @@ -1344,7 +1345,12 @@ }, section .meta:n = { level = \bisection* }, chapter .meta:n = { level = \bichapter* }, - none .code:n = { }, + none .code:n = + { + \tl_set:Nn \eb@toc@title@level + { \par\use_none:nn } + \bool_set_true:N \l__eb_toc_notitle_bool + }, multoc .int_set:N = \l__eb_toc_columns_int, multoc .default:n = 2, multoc .initial:n = 1, @@ -1477,11 +1483,14 @@ \group_begin: \tl_set_eq:NN \eb@toc@title \contentsname \tl_set_eq:NN \eb@bitoc@title \bicontentsname - \tl_set:Nn \eb@toc@title@level + \bool_if:NF \l__eb_toc_notitle_bool { - \bool_if:NTF \l__eb_class_mode_book_bool - { \chapter* } - { \section* } + \tl_set:Nn \eb@toc@title@level + { + \bool_if:NTF \l__eb_class_mode_book_bool + { \chapter* } + { \section* } + } } \IfValueT{#3}{\keys_set:nn { eb/tocouter } {#3}} \bool_if:NT \l__eb_toc_plan_cn_bool @@ -2379,7 +2388,7 @@ } % %<*tcolorbox> -\ProvidesExplFile{eb-tcolorbox.cfg}{2024/02/20}{2024ah} +\ProvidesExplFile{eb-tcolorbox.cfg}{2024/02/21}{2024ai} {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 aefe3e5c555..d6b8ef70342 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{l3keys2e,etoolbox} -\ProvidesExplPackage{easybase}{2024/02/20}{2024ah} +\ProvidesExplPackage{easybase}{2024/02/21}{2024ai} {Easily typesetting Chinese theses or books} \cs_generate_variant:Nn \dim_set:Nn { NV } @@ -1054,6 +1054,7 @@ \cs_new_protected:Npn \SetTocOuter #1 { \keys_set:nn { eb/tocouter } {#1} } \tl_new:N \eb@bitoc@title +\bool_set_false:N \l__eb_toc_notitle_bool \newbool{bitoc} \cs_new:Npn \ebifbitoc { \ifbool{bitoc} } \keys_define:nn { eb/tocouter } @@ -1067,7 +1068,12 @@ }, section .meta:n = { level = \bisection* }, chapter .meta:n = { level = \bichapter* }, - none .code:n = { }, + none .code:n = + { + \tl_set:Nn \eb@toc@title@level + { \par\use_none:nn } + \bool_set_true:N \l__eb_toc_notitle_bool + }, multoc .int_set:N = \l__eb_toc_columns_int, multoc .default:n = 2, multoc .initial:n = 1, @@ -1200,11 +1206,14 @@ \group_begin: \tl_set_eq:NN \eb@toc@title \contentsname \tl_set_eq:NN \eb@bitoc@title \bicontentsname - \tl_set:Nn \eb@toc@title@level + \bool_if:NF \l__eb_toc_notitle_bool { - \bool_if:NTF \l__eb_class_mode_book_bool - { \chapter* } - { \section* } + \tl_set:Nn \eb@toc@title@level + { + \bool_if:NTF \l__eb_class_mode_book_bool + { \chapter* } + { \section* } + } } \IfValueT{#3}{\keys_set:nn { eb/tocouter } {#3}} \bool_if:NT \l__eb_toc_plan_cn_bool diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls index 5d707406cf7..4b2c29655da 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}[2021/11/15] \RequirePackage{l3keys2e} -\ProvidesExplClass{easybook}{2024/02/20}{2024ah} +\ProvidesExplClass{easybook}{2024/02/21}{2024ai} {Easily typesetting 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 16ff9398ae7..b64a0f5ab79 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/02/20}{2024ah} +\ProvidesExplFile{eb-tcolorbox.cfg}{2024/02/21}{2024ai} {Customization of tcolorbox for easybook} \cs_set_protected:Npn \addtotcbstyle #1#2 -- cgit v1.2.3