From a74989377656219c0c7b81049b6a924e5b77670a Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 2 Dec 2021 21:52:29 +0000 Subject: easybook (2dec21) git-svn-id: svn://tug.org/texlive/trunk@61206 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/source/latex/easybook/easybook.dtx | 50 ++++++++++++---------- 1 file changed, 27 insertions(+), 23 deletions(-) (limited to 'Master/texmf-dist/source/latex/easybook') diff --git a/Master/texmf-dist/source/latex/easybook/easybook.dtx b/Master/texmf-dist/source/latex/easybook/easybook.dtx index 6dc44b2621d..961f9c8277e 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}[2020/10/01] \RequirePackage{l3keys2e} -\ProvidesExplClass{easybook}{2021/12/01}{1.41D} +\ProvidesExplClass{easybook}{2021/12/01}{1.41E} {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/12/01}{1.41D} +\ProvidesExplPackage{easybase}{2021/12/01}{1.41E} {Typeset Chinese theses or books} \cs_generate_variant:Nn \dim_set:Nn { NV } @@ -1242,15 +1242,14 @@ { \ctex_define:n { - #1/voffset .skip_set:c = l__eb_toc_#1_voffset_skip, - #1/tocline .cs_set:cp = { eb@toc@label@#1 } ##1, + #1/between .tl_set:c = l__eb_toc_#1_between_hook_tl, + #1/tocline .cs_set:cp = { eb@toc@label@#1 } ##1, } } \eb_clist_map_inline:nn { tocformat,tocformat+,tocformat~+, - tocindent,tocrule,tocline, - voffset,tocafter + tocindent,tocrule,tocline,tocafter,between } { \ctex_define:n @@ -1281,16 +1280,21 @@ \ctex_define:nn { tocset } { - lolskip .skip_set:N = \eb@toc@lolskip, - lolskip .initial:n = 10pt, - main-voffset .skip_set:N = \l__eb_toc_main_voffset_skip, - main-voffset .initial:n = \bool_if:NTF \l__eb_class_mode_book_bool { 1pc } { 0.2pc }, - dotalign .bool_set:N = \l__eb_toc_dot_align_bool, - dotalign .default:n = true, - dotalign .initial:n = true, - hang .bool_set:N = \eb@titletoc@hang@fix@bool, - hang .default:n = true, - hang .initial:n = false, + lolskip .skip_set:N = \eb@toc@lolskip, + lolskip .initial:n = 10pt, + between .tl_set:N = \l__eb_toc_main_between_hook_tl, + between .initial:n = + { + \bool_if:NTF \l__eb_class_mode_book_bool + { \vspace*{-1pc} } + { \vspace*{-0.2pc} } + }, + dotalign .bool_set:N = \l__eb_toc_dot_align_bool, + dotalign .default:n = true, + dotalign .initial:n = true, + hang .bool_set:N = \eb@titletoc@hang@fix@bool, + hang .default:n = true, + hang .initial:n = false, unknown .code:n = \eb_msg_abandon_option:n { tocset } } \NewDocumentCommand{\tocrule}{st-O{0.7pc}D(){1.2}mO{}} @@ -1360,7 +1364,7 @@ list/tocformat = \addvspace{0.2pc}, list/tocindent = 0em, list/tocrule = \tocrule{$\cdot$}, - list/voffset = 0.2pc\bool_if:NT \l__eb_class_mode_book_bool { + 10pt }, + list/between = \vspace*{-0.2pc\bool_if:NT \l__eb_class_mode_book_bool { - 10pt }}, table/tocline = \listnumberline{table}, figure/tocline = \listnumberline{figure}, lstlisting/tocline = \listnumberline{lstlisting} @@ -1598,10 +1602,10 @@ } { \@starttoc{#1} } } -\cs_new_protected:Npn \eb_toc_if_title_voffset:n #1 +\cs_new_protected:Npn \eb_toc_if_title_between_hook:n #1 { \tl_if_eq:NnF \l__eb_toc_title_level_tl { none } - { \vspace*{-\dim_use:c { l__eb_toc_#1_voffset_skip }} } + { \tl_use:c { l__eb_toc_#1_between_hook_tl } } } \cs_new_protected:Npn \eb_toc_list_parse:nnnnn #1#2#3#4#5 { @@ -1609,7 +1613,7 @@ \tl_set_eq:Nc \eb@toc@title { list#4name } \IfValueT{#3}{\keys_set:nn { eb/listoc } {#3}} \eb_title_number_intoc_spec:nn {#2} {#1} - \eb_toc_if_title_voffset:n {#4} + \eb_toc_if_title_between_hook:n {#4} \eb_toc_start_multi_column_ext:n {#5} \group_end: } @@ -1634,12 +1638,12 @@ \IfValueT{#2}{\keys_set:nn { eb/listoc } {#2}} \eb_toc_title_level_initial: \eb_title_mark_notoc:n { \eb@toc@title } - \eb_toc_if_title_voffset:n { main } + \eb_toc_if_title_between_hook:n { main } \eb_toc_start_multi_column_ext:n { toc }#3 \IfBooleanT{#1} { \eb_title_mark_notoc:n { \eb@bitoc@title } - \eb_toc_if_title_voffset:n { main } + \eb_toc_if_title_between_hook:n { main } \eb_toc_start_multi_column_ext:n { tec } } \group_end: @@ -2404,7 +2408,7 @@ } % %<*tcolorbox> -\ProvidesExplFile{eb-tcolorbox.cfg}{2021/12/01}{1.41D} +\ProvidesExplFile{eb-tcolorbox.cfg}{2021/12/01}{1.41E} {Customization of tcolorbox for easybook} \cs_set_protected:Npn \setexercise #1 -- cgit v1.2.3