From e2fc9a84bdc5487b71b32a3ec9f5a3a1c7df5695 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 11 May 2024 20:35:58 +0000 Subject: easybook (11may24) git-svn-id: svn://tug.org/texlive/trunk@71234 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/source/latex/easybook/easybook.dtx | 44 ++++++++++------------ 1 file changed, 20 insertions(+), 24 deletions(-) (limited to 'Master/texmf-dist/source') 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 @@ } % %<*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 -- cgit v1.2.3