diff options
Diffstat (limited to 'Master/texmf-dist/tex')
| -rw-r--r-- | Master/texmf-dist/tex/latex/easybook/easybase.sty | 73 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/easybook/easybook.cls | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg | 2 |
3 files changed, 22 insertions, 55 deletions
diff --git a/Master/texmf-dist/tex/latex/easybook/easybase.sty b/Master/texmf-dist/tex/latex/easybook/easybase.sty index e9915d03a86..f41e3752594 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}{2022/02/11}{1.623} +\ProvidesExplPackage{easybase}{2022/02/12}{1.624} {Typeset Chinese theses or books} \cs_generate_variant:Nn \dim_set:Nn { NV } @@ -917,17 +917,15 @@ \ctex_define:n { figure/#1 .meta:nn = { ctex/#1 } {##1} } \ctex_define:n { table/#1 .meta:nn = { ctex/#1 } {##1} } \ctex_define:n { list/#1 .meta:nn = { ctex/#1 } {##1} } -\cs_new_protected:Npn \eb_titletoc_if_hang_fix:n #1 +\cs_new_protected:Npn \eb_toc_entry_if_hang:n #1 { - \bool_if:NT \l__eb_titletoc_hang_fix_bool + \bool_if:NT \l__eb_toc_entry_hang_bool + { \contentspush } { - \contentspush - { - \bool_if:NT \l__eb_toc_number_color_bool - { \color{ctex@toc@number} } - \thecontentslabel - \tl_use:c { l__eb_toc_#1_after_tl } - } + \bool_if:NT \l__eb_toc_number_color_bool + { \textcolor{ctex@toc@number} } + { \thecontentslabel } + \tl_use:c { l__eb_toc_#1_after_tl } } } \cs_new_protected:Npn \eb_toc_assign_keys:n #1 @@ -939,13 +937,15 @@ #1/tocformat~+ .code:n = \tl_put_right:cn { l__eb_toc_#1_format_tl } {##1}, #1/tocindent .dim_set:c = l__eb_toc_#1_indent_dim, #1/tocrule .tl_set:c = l__eb_toc_#1_rule_tl, - #1/tocafter .tl_set:c = l__eb_toc_#1_after_tl + #1/tocafter .tl_set:c = l__eb_toc_#1_after_tl, + #1/tocbelow .tl_set:c = l__eb_toc_#1_below_tl } \titlecontents{#1} [\dim_use:c { l__eb_toc_#1_indent_dim }] {\tl_use:c { l__eb_toc_#1_format_tl }} - {\eb_titletoc_if_hang_fix:n {#1}}{} + {\eb_toc_entry_if_hang:n {#1}}{} {\tl_use:c { l__eb_toc_#1_rule_tl }} + [\tl_use:c { l__eb_toc_#1_below_tl }] } \seq_map_function:NN \c__ctex_headings_seq \eb_toc_assign_keys:n @@ -995,26 +995,21 @@ lolskip .skip_set:N = \eb@toc@lol@skip, 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} } - }, + between .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, dotalign .initial:n = true, - hang .bool_set:N = \l__eb_titletoc_hang_fix_bool, + hang .bool_set:N = \l__eb_toc_entry_hang_bool, hang .default:n = true, hang .initial:n = true, pagenumwd .code:n = \contentsmargin{#1}, pagenumwd .initial:n = 1.55em, unknown .code:n = \eb_msg_deprecated_option:n { tocset } } -\NewDocumentCommand{\tocrule}{st-O{0.7pc}D(){1.2}mO{}} +\NewDocumentCommand{\tocrule}{st-O{0.7pc}d()mO{}} { \normalsize\normalfont - \titlerule*[#3]{\scalebox{#4}{#5}}#6 + \titlerule*[#3]{\IfValueTF{#4}{\scalebox{#4}{#5}}{#5}}#6 \bgroup \IfBooleanF{#2} { @@ -1028,44 +1023,20 @@ } \egroup } -\cs_set_eq:NN \ctexnumberline \CTEXnumberline \cs_new:Npn \p@numberline { \protect\numberline } -\cs_set:Npn \CTEXnumberline #1 - { - \CTEXifname - { - \bool_if:NTF \l__eb_titletoc_hang_fix_bool - { \p@numberline{\use:c { CTEXthe#1 }} } - { - \use:c { CTEXthe#1 } - \tl_use:c { l__eb_toc_#1_after_tl } - } - }{} - } \cs_new:Npn \listnumberline #1 - { - \bool_if:NTF \l__eb_titletoc_hang_fix_bool - { \p@numberline{\use:c { #1name }~\use:c { the#1 }} } - { - \use:c { #1name }~\use:c { the#1 } - \tl_use:c { l__eb_toc_#1_after_tl } - } - } + { \p@numberline{\use:c { #1name }~\use:c { the#1 }} } \ctex_set:n { part/tocformat = \addvspace{1pc}\sffamily\large, part/tocindent = 0em, part/tocrule = \tocrule{}[\bfseries], part/tocline = \CTEXnumberline{#1}#2, - chapter/tocformat = \addvspace{1pc}\sffamily\large, + chapter/tocformat = \addvspace{1pc}\sffamily, chapter/tocindent = 0em, chapter/tocrule = \tocrule{$\cdot$}[\bfseries], chapter/tocline = \CTEXnumberline{#1}#2, - section/tocformat = - { - \addvspace{0.2pc} - \bool_if:NF \l__eb_class_mode_book_bool { \sffamily } - }, + section/tocformat = \bool_if:NF \l__eb_class_mode_book_bool { \sffamily }, section/tocindent = \bool_if:NTF \l__eb_class_mode_book_bool { 1.5em } { 0em }, section/tocrule = { @@ -1073,15 +1044,11 @@ { \tocrule{$\cdot$} } { \tocrule{$\cdot$}[\bfseries] } }, - section/tocline = \CTEXnumberline{#1}#2, - subsection/tocformat = \addvspace{0.2pc}, subsection/tocindent = \bool_if:NTF \l__eb_class_mode_book_bool { 3.8em } { 1.4em }, subsection/tocrule = \tocrule{$\cdot$}, - subsection/tocline = \CTEXnumberline{#1}#2, - list/tocformat = \addvspace{0.2pc}, list/tocindent = 0em, list/tocrule = \tocrule{$\cdot$}, - list/between = \vspace*{-0.2pc\bool_if:NT \l__eb_class_mode_book_bool { - 10pt }}, + list/between = \bool_if:NT \l__eb_class_mode_book_bool { \vspace*{-10pt} }, table/tocline = \listnumberline{table}#2, figure/tocline = \listnumberline{figure}#2, lstlisting/tocline = \listnumberline{lstlisting}#2 diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls index cf42e113c75..925061d743b 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}{2022/02/11}{1.623} +\ProvidesExplClass{easybook}{2022/02/12}{1.624} {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 d1f1de6f919..5355f457b16 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}{2022/02/11}{1.623} +\ProvidesExplFile{eb-tcolorbox.cfg}{2022/02/12}{1.624} {Customization of tcolorbox for easybook} \cs_set_protected:Npn \addtotcbstyle #1#2 |