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 --- Master/texmf-dist/doc/latex/easybook/easybook.pdf | Bin 584506 -> 584209 bytes Master/texmf-dist/doc/latex/easybook/easybook.tex | 10 ++--- .../texmf-dist/source/latex/easybook/easybook.dtx | 50 +++++++++++---------- Master/texmf-dist/tex/latex/easybook/easybase.sty | 46 ++++++++++--------- Master/texmf-dist/tex/latex/easybook/easybook.cls | 2 +- .../texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg | 2 +- 6 files changed, 58 insertions(+), 52 deletions(-) diff --git a/Master/texmf-dist/doc/latex/easybook/easybook.pdf b/Master/texmf-dist/doc/latex/easybook/easybook.pdf index 820fa838ad4..2b1f911ffef 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 af6381fc976..812eba9f28d 100644 --- a/Master/texmf-dist/doc/latex/easybook/easybook.tex +++ b/Master/texmf-dist/doc/latex/easybook/easybook.tex @@ -20,7 +20,7 @@ name = easybook, color-scheme = blue, title = EASYBOOK 使用手册, - version = v1.41D, + version = v1.41E, date = 2021/12/01, authors = 瞿毅, info = 排版简体中文学位论文和书籍, @@ -203,7 +203,7 @@ enumitem & etoolbox & fancyhdr & geometry & hyperref \\ imakeidx & listings & marginnote & mathtools & multicol \\ pifont & pdfpages & siunitx & spbmark & setspace \\ - thmtools & tcolorbox & ulem & titletoc & tabularray + thmtools & tcolorbox & titletoc & tabularray & ulem } \section{文档类选项} @@ -832,10 +832,8 @@ 悬挂缩进选项 \option{hang} 使目录标题为悬挂缩进形式,缩进距离为标签及其与标题间距的长度,但此时标题编号会失去超链接。这个选项对所有标题级别有效。 \keyval-{lolskip}{弹性长度}\Default{10pt} 代码目录中每章代码标题的额外距离,与 C\TeX 的表格和图片目录中每章间的标题距离选项 \option*{lotskip} 和 \option*{lofskip} 类似,在 \cls*{article} 模式中此选项失效。 - \keyval-{voffset}{弹性长度} - 图片、表格或代码目录标题下方的间距补偿,一般为正值,用于抵消目录中首行的额外垂直间距。路径为 \module*{figure}、\module*{table} 和 \module*{lstlisting},或者用 \module*{list} 路径统一设置。 - \keyval-{main-voffset}{弹性长度} - 文档主目录标题下方的间距补偿,一般为正值,用于抵消目录中首行的额外垂直间距。 + \keyval-{between}{目录代码钩子} + 目录标题与内容间的钩子,一般插入负的垂直距离代码,用于抵消目录首行额外的垂直间距。一级路径此选项对应文档主目录的钩子,二级路径为 \module*{figure}、\module*{table} 和 \module*{lstlisting},或者用位于 \module*{list} 路径的此选项统一设置对应种类目录的钩子。 \keybool{dotalign}\Default{true} 引导线选项 \option{dotalign} 可以使目录引导线右端对齐并与页码保持一定间隙,否则会与页码连接。 \keyval-{tocafter-all}{距离命令}\Default{\cs*{hspace}\Carg{1em}} 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 diff --git a/Master/texmf-dist/tex/latex/easybook/easybase.sty b/Master/texmf-dist/tex/latex/easybook/easybase.sty index 88bd5151f08..8c66cf3ed44 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}[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 } @@ -937,15 +937,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 @@ -976,16 +975,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{}} @@ -1055,7 +1059,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} @@ -1293,10 +1297,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 { @@ -1304,7 +1308,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: } @@ -1329,12 +1333,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: diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls index 5a3fd955944..ec682fda3c6 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}[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 diff --git a/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg b/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg index d267d257809..769ac0c0616 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}{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