diff options
author | Karl Berry <karl@freefriends.org> | 2024-04-26 21:26:13 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2024-04-26 21:26:13 +0000 |
commit | 3a637df91b4adc6a95c103f3ae90448ab649c2b6 (patch) | |
tree | 9077f6ab04f9f65d65b378c79cb13b409f7fdbb5 /Master/texmf-dist/source/latex | |
parent | e05223a39d1747bc8d39427c21b583dfd68e27f6 (diff) |
easybook (26apr24)
git-svn-id: svn://tug.org/texlive/trunk@71085 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex')
-rw-r--r-- | Master/texmf-dist/source/latex/easybook/easybook.dtx | 75 |
1 files changed, 50 insertions, 25 deletions
diff --git a/Master/texmf-dist/source/latex/easybook/easybook.dtx b/Master/texmf-dist/source/latex/easybook/easybook.dtx index 08b7136aac3..2a60d8894fa 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/04/24}{2024az} +\ProvidesExplClass{easybook}{2024/04/26}{2024bb} {Easily typesetting Chinese theses or books} \bool_new:N \l__eb_compile_draft_bool @@ -297,7 +297,7 @@ %<*package> \NeedsTeXFormat{LaTeX2e}[2021/11/15] \RequirePackage{l3keys2e,etoolbox} -\ProvidesExplPackage{easybase}{2024/04/24}{2024az} +\ProvidesExplPackage{easybase}{2024/04/26}{2024bb} {Easily typesetting Chinese theses or books} \cs_generate_variant:Nn \dim_set:Nn { NV } @@ -1204,7 +1204,7 @@ \l__eb_fnmarktext_format_tl \l__eb_fncustom_format_tl } } -\NewDocumentCommand{\Footnote}{O{#2}mm} +\NewDocumentCommand{\Footnote}{O{#2}m+m} { \group_begin: \eb_fncustom_format_initial: @@ -1470,7 +1470,7 @@ { \par } } } -\cs_new_protected:Npn \eb_toc_float_list_parse:nnnnn #1#2#3#4#5 +\cs_new_protected:Npn \eb_toc_list_struct_parse:nnnnn #1#2#3#4#5 { \group_begin: \tl_set_eq:Nc \eb@toc@title { list#4name } @@ -1491,7 +1491,7 @@ \cs_new_protected:Npn \DeclareFloatList #1#2 { \exp_args:Nc \DeclareDocumentCommand { listof#1s }{st+o} - {\eb_toc_float_list_parse:nnnnn {##1} {##2} {##3} {#1} {#2}} + {\eb_toc_list_struct_parse:nnnnn {##1} {##2} {##3} {#1} {#2}} \ctex_define:n { #1 .meta:nn = { ctex/#1 } {##1}, @@ -1538,7 +1538,7 @@ \bool_if:NT \l__eb_toc_plan_cn_bool { \IfBooleanF{#1}{\eb@toc@title@level{\eb@toc@title}{}} - \eb_toc_if_title_between_hook:nn {#1} { main } + \eb_toc_if_title_between_hook:nn {#1} { title } \eb_toc_start_multi_column_ext:n { toc }#4 } \bool_if:NT \l__eb_toc_plan_bi_bool @@ -1546,7 +1546,7 @@ \tl_if_eq:NnF \g__eb_bilist_permute_value_tl { mix } { \IfBooleanF{#1}{\eb@toc@title@level{\eb@bitoc@title}{}} - \eb_toc_if_title_between_hook:nn {#1} { bimain } + \eb_toc_if_title_between_hook:nn {#1} { bititle } \eb_toc_start_multi_column_ext:n { tec } } } @@ -1667,13 +1667,30 @@ } } } +\NewDocumentCommand{\tocrule}{st-O{0.7pc}d()mO{}} + { + \normalsize\normalfont + \titlerule*[#3]{\IfValueTF{#4}{\scalebox{#4}{#5}}{#5}}#6 + { + \IfBooleanF{#2} + { + \IfBooleanTF{#1} + {\thecontentspage} + { + \bool_if:NTF \l__eb_toc_dot_align_bool + { \contentspage } + { \thecontentspage } + } + } + } + } \ctex_define:nn { toc } { lolskip .skip_set:N = \eb@toc@lol@skip, lolskip .initial:n = 10pt, - between .tl_set:N = \l__eb_toc_main_between_hook_tl, + between .tl_set:N = \l__eb_toc_title_between_hook_tl, between .initial:n = \bool_if:NT \l__eb_class_mode_book_bool { \vspace*{-1pc} }, - bibetween .tl_set:N = \l__eb_toc_bimain_between_hook_tl, + bibetween .tl_set:N = \l__eb_toc_bititle_between_hook_tl, bibetween .initial:n = \bool_if:NT \l__eb_class_mode_book_bool { \vspace*{-1pc} }, dotalign .bool_set:N = \l__eb_toc_dot_align_bool, dotalign .default:n = true, @@ -1685,23 +1702,27 @@ pagenumwd .initial:n = 1.55em, unknown .code:n = \eb_msg_deprecated_option:n { toc } } -\NewDocumentCommand{\tocrule}{st-O{0.7pc}d()mO{}} + +\NewHookWithArguments{starttoc/after}{1} +\AddToHookWithArguments{starttoc/after}[aux] { - \normalsize\normalfont - \titlerule*[#3]{\IfValueTF{#4}{\scalebox{#4}{#5}}{#5}}#6 + \ifbool{@filesw} { - \IfBooleanF{#2} - { - \IfBooleanTF{#1} - {\thecontentspage} - { - \bool_if:NTF \l__eb_toc_dot_align_bool - { \contentspage } - { \thecontentspage } - } - } + \tl_if_exist:cF { tf@#1 } + {\iow_new:c { tf@#1 }\iow_open:cn { tf@#1 } { \jobname.#1 }} } + {} + } +\cs_set:Npn \@starttoc #1 + { + \group_begin: + \file_if_exist_input:n { \jobname.#1 } + \UseHookWithArguments{starttoc/after}{1}{#1} + \boolfalse{@nobreak} + \group_end: } +\AtEndDocument{\iow_now:Nn \@mainaux { \RemoveFromHook{starttoc/after}[aux] }} + \cs_set_eq:NN \eb@ctexsetii \ctex_set:nn \cs_new_protected:Npn \SetTocStyle #1#2#3 { @@ -1716,6 +1737,7 @@ } \msg_new:nnn { easybase } { undefined-toc-style } { The~contents~style~'#1'~of~'#2'~is~not~defined. } + \ctex_set:n { part = @@ -1823,7 +1845,7 @@ } \cs_new_protected:Npn \ebaddtofont #1#2 { - \str_case:nnF {#1} + \str_case:nn {#1} { { table } { \tl_put_right:Nn \l__eb_font_caption_table_tl {#2} } @@ -1837,8 +1859,11 @@ \tl_put_right:Nn \l__eb_font_caption_figure_tl {#2} \tl_put_right:Nn \l__eb_font_caption_listing_tl {#2} } + { footnote } + { \tl_put_right:Nn \eb@font@footnote {#2} } + { marginpar } + { \tl_put_right:Nn \marginfont {#2} } } - { \tl_put_right:cn { l__eb_font_#1_tl } {#2} } } \ctex_define:nn { spread } { @@ -2479,7 +2504,7 @@ } %</package> %<*tcolorbox> -\ProvidesExplFile{eb-tcolorbox.cfg}{2024/04/24}{2024az} +\ProvidesExplFile{eb-tcolorbox.cfg}{2024/04/26}{2024bb} {Customization of tcolorbox for easybook} \cs_set_protected:Npn \addtotcbstyle #1#2 |