diff options
Diffstat (limited to 'macros/latex/contrib/easybook/easybook.dtx')
-rw-r--r-- | macros/latex/contrib/easybook/easybook.dtx | 53 |
1 files changed, 22 insertions, 31 deletions
diff --git a/macros/latex/contrib/easybook/easybook.dtx b/macros/latex/contrib/easybook/easybook.dtx index 5d3b335dee..86168e7329 100644 --- a/macros/latex/contrib/easybook/easybook.dtx +++ b/macros/latex/contrib/easybook/easybook.dtx @@ -15,7 +15,7 @@ %<*class> \NeedsTeXFormat{LaTeX2e}[2020/10/01] \RequirePackage{l3keys2e} -\ProvidesExplClass{easybook}{2021/12/11}{1.41P} +\ProvidesExplClass{easybook}{2021/12/12}{1.41Q} {Typeset Chinese theses or books} \bool_set_false:N \l__eb_compile_draft_bool @@ -309,7 +309,7 @@ %<*package> \NeedsTeXFormat{LaTeX2e}[2020/10/01] \RequirePackage{l3keys2e,etoolbox} -\ProvidesExplPackage{easybase}{2021/12/11}{1.41P} +\ProvidesExplPackage{easybase}{2021/12/12}{1.41Q} {Typeset Chinese theses or books} \cs_generate_variant:Nn \dim_set:Nn { NV } @@ -1197,7 +1197,7 @@ \ctex_define:n { list/#1 .meta:nn = { ctex/#1 } {##1} } \cs_new_protected:Npn \eb_titletoc_if_hang_fix:n #1 { - \bool_if:NT \eb@titletoc@hang@fix@bool + \bool_if:NT \l__eb_titletoc_hang_fix_bool { \contentspush { @@ -1233,7 +1233,7 @@ \ctex_define:n { #1/between .tl_set:c = l__eb_toc_#1_between_hook_tl, - #1/tocline .cs_set:cp = { eb@toc@label@#1 } ##1, + #1/tocline .cs_set:cp = { eb@tocline@#1 } ##1##2, } } \eb_seq_map_inline:nn @@ -1282,7 +1282,7 @@ 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 .bool_set:N = \l__eb_titletoc_hang_fix_bool, hang .default:n = true, hang .initial:n = false, pagenumwd .code:n = \contentsmargin{#1}, @@ -1312,7 +1312,7 @@ { \CTEXifname { - \bool_if:NTF \eb@titletoc@hang@fix@bool + \bool_if:NTF \l__eb_titletoc_hang_fix_bool { \p@numberline{\use:c { CTEXthe#1 }} } { \use:c { CTEXthe#1 } @@ -1322,9 +1322,12 @@ } \cs_new:Npn \listnumberline #1 { - \use:c { #1name }~\use:c { the#1 } - \bool_if:NF \eb@titletoc@hang@fix@bool - { \tl_use:c { l__eb_toc_#1_after_tl } } + \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 } + } } \ctex_set:n { @@ -1357,28 +1360,22 @@ list/tocindent = 0em, list/tocrule = \tocrule{$\cdot$}, 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} + table/tocline = \listnumberline{table}#2, + figure/tocline = \listnumberline{figure}#2, + lstlisting/tocline = \listnumberline{lstlisting}#2 } \ctex_set:nn { tocset } { tocafter-every = \hspace{1em} } \prop_new:N \l__eb_list_label_entry_prop \prop_set_from_keyval:Nn \l__eb_list_label_entry_prop { - figure = \eb@toc@label@figure, - table = \eb@toc@label@table + figure = \eb@tocline@figure, + table = \eb@tocline@table } \cs_gset:Npn \caption@@@addcontentsline #1#2#3#4 { \addcontentsline{#1}{#2} - { - \bool_if:NT \eb@titletoc@hang@fix@bool { \p@numberline } - \bgroup - \prop_item:Nn \l__eb_list_label_entry_prop {#2}{#3} - \egroup #4 - } + {\prop_item:Nn \l__eb_list_label_entry_prop {#2}{#3}{#4}} } -\cs_set_eq:NN \eb@if@boolT \bool_if:NT \ctex_patch_cmd:Nnn \lst@MakeCaption { \addcontentsline{lol}{lstlisting} @@ -1386,13 +1383,7 @@ } { \addcontentsline{lol}{lstlisting} - { - \eb@if@boolT\eb@titletoc@hang@fix@bool{\p@numberline} - \bgroup - \eb@toc@label@lstlisting{\thelstlisting} - \egroup - \lst@@caption - } + {\eb@tocline@lstlisting{\thelstlisting}{\lst@@caption}} } \newcounter{bichapter} @@ -1863,8 +1854,8 @@ \setlist[itemize,2]{label = endash} \setlist[itemize,3]{label = asterisk} \setlist[enumerate,1]{label = arabic,ref = \arabic*} -\setlist[enumerate,2]{label = alph,ref = enumii,labelwidth = *} -\setlist[enumerate,3]{label = roman,ref = enumiii,labelwidth = *} +\setlist[enumerate,2]{label = alph,ref = enumii} +\setlist[enumerate,3]{label = roman,ref = enumiii} \setlist[description]{font = sf,labelwidth = *,leftmargin = 2em} \newlist{eb@outline@list}{itemize}{1} \newlist{eb@exercise@list}{enumerate}{2} @@ -2439,7 +2430,7 @@ } %</package> %<*tcolorbox> -\ProvidesExplFile{eb-tcolorbox.cfg}{2021/12/11}{1.41P} +\ProvidesExplFile{eb-tcolorbox.cfg}{2021/12/12}{1.41Q} {Customization of tcolorbox for easybook} \cs_set_protected:Npn \setexercise #1 |