From 60118760d0eae7aae978f74f86103d03ca16ada7 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 9 Mar 2022 21:12:24 +0000 Subject: easybook (9mar22) git-svn-id: svn://tug.org/texlive/trunk@62555 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/easybook/easybase.sty | 471 ++++++++++----------- Master/texmf-dist/tex/latex/easybook/easybook.cls | 2 +- .../texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg | 2 +- 3 files changed, 235 insertions(+), 240 deletions(-) (limited to 'Master/texmf-dist/tex/latex') diff --git a/Master/texmf-dist/tex/latex/easybook/easybase.sty b/Master/texmf-dist/tex/latex/easybook/easybase.sty index 9c405313159..a272e34af37 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/03/08}{1.642} +\ProvidesExplPackage{easybase}{2022/03/08}{1.643} {Easily typesetting Chinese theses or books} \cs_generate_variant:Nn \dim_set:Nn { NV } @@ -164,18 +164,21 @@ } } -\eb_seq_map_inline:nn +\seq_set_from_clist:Nn \l__eb_module_paths_seq { style,subfont,spread, - refset,bibset,thmset, - geoset,hdrset,tocset,list + bibset,thmset,tocset, + hdrset,refset,geoset,float } +\seq_map_inline:Nn \l__eb_module_paths_seq { \ctex_define:n { #1 .meta:nn = { ctex/#1 } {##1} } \cs_new_protected:cpn { eb#1 } ##1 { \ctex_set:nn {#1} {##1} } } -\eb_seq_map_inline:nn - { style,subfont,spread,bibset,thmset,hdrset,tocset } +\bool_until_do:nn + { \int_compare_p:nNn { \seq_count:N \l__eb_module_paths_seq } < { 8 } } + { \seq_pop_right:NN \l__eb_module_paths_seq \l_tmpa_tl } +\seq_map_inline:Nn \l__eb_module_paths_seq { \msg_new:nnn { easybase } { deprecated-#1 } { @@ -913,193 +916,6 @@ \cs_new:Npn \eb@footmisc@ifvoid #1#2#3 { \ifvoid #1#2\else #3\fi } \cs_set:Npn \thempfootnote { \int_to_alph:n { \c@mpfootnote } } -\contentsuse{lstlisting}{lol} -\seq_put_left:Nn \c__ctex_headings_seq { chapter } -\seq_put_right:Nn \c__ctex_headings_seq { figure } -\seq_put_right:Nn \c__ctex_headings_seq { table } -\seq_put_right:Nn \c__ctex_headings_seq { lstlisting } -\seq_remove_duplicates:N \c__ctex_headings_seq -\ctex_define:n { lstlisting/#1 .meta:nn = { ctex/#1 } {##1} } -\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_toc_entry_if_hang:n #1 - { - \bool_if:NTF \l__eb_toc_entry_hang_bool - { \contentspush } - { \use:n } - { - \bool_if:NTF \l__eb_toc_number_color_bool - { \textcolor{ctex@toc@number} } - { \use:n } - { \thecontentslabel } - \tl_use:c { l__eb_toc_#1_after_tl } - } - } -\cs_new_protected:Npn \RegisterTocName #1 - { - \ctex_define:n - { - #1/tocformat .tl_set:c = l__eb_toc_#1_format_tl, - #1/tocformat+ .code:n = \tl_put_right:cn { l__eb_toc_#1_format_tl } {##1}, - #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/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_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 \RegisterTocName -\eb_seq_map_inline:nn - { figure,table,lstlisting } - { - \ctex_define:n - { - #1/between .tl_set:c = l__eb_toc_#1_between_hook_tl, - #1/tocline .cs_set:cp = { eb@tocline@#1 } ##1##2, - } - } -\eb_seq_map_inline:nn - { - tocformat,tocformat+,tocformat~+, - tocindent,tocrule,tocline,tocafter,between - } - { - \ctex_define:n - { - list/#1 .meta:n = - { - figure/#1 = ##1,table/#1 = ##1, - lstlisting/#1 = ##1 - } - } - } -\eb_seq_map_inline:nn - { tocafter,tocindent,tocrule } - { - \ctex_define:nn { tocset } - { - #1-every .code:n = - { - \ctex_set:n - { - part/#1 = ##1,chapter/#1 = ##1, - section/#1 = ##1,subsection/#1 = ##1, - list/#1 = ##1 - } - } - } - } - -\ctex_define:nn { tocset } - { - 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:NT \l__eb_class_mode_book_bool { \vspace*{-1pc} }, - bibetween .tl_set:N = \l__eb_toc_bimain_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, - dotalign .initial:n = true, - 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()mO{}} - { - \normalsize\normalfont - \titlerule*[#3]{\IfValueTF{#4}{\scalebox{#4}{#5}}{#5}}#6 - \bgroup - \IfBooleanF{#2} - { - \IfBooleanTF{#1} - {\thecontentspage} - { - \bool_if:NTF \l__eb_toc_dot_align_bool - { \contentspage } - { \thecontentspage } - } - } - \egroup - } -\cs_new:Npn \p@numberline { \protect\numberline } -\cs_new:Npn \listnumberline #1 - { \p@numberline{\use:c { #1name }~\use:c { the#1 }} } -\ctex_set:n - { - part = - { - tocformat = \addvspace{1pc}\sffamily\large, - tocindent = 0em, - tocrule = \tocrule{}[\bfseries], - tocline = \CTEXnumberline{#1}#2 - }, - chapter = - { - tocformat = \addvspace{1pc}\sffamily, - tocindent = 0em, - tocrule = \tocrule{$\cdot$}[\bfseries], - tocline = \CTEXnumberline{#1}#2 - }, - section = - { - tocformat = \bool_if:NF \l__eb_class_mode_book_bool { \sffamily }, - tocindent = \bool_if:NTF \l__eb_class_mode_book_bool { 1.5em } { 0em }, - tocrule = - { - \bool_if:NTF \l__eb_class_mode_book_bool - { \tocrule{$\cdot$} } - { \tocrule{$\cdot$}[\bfseries] } - } - }, - subsection = - { - tocindent = \bool_if:NTF \l__eb_class_mode_book_bool { 3.8em } { 1.4em }, - tocrule = \tocrule{$\cdot$} - }, - list = - { - tocindent = 0em, - tocrule = \tocrule{$\cdot$}, - 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, - 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@tocline@figure, - table = \eb@tocline@table - } -\cs_gset:Npn \caption@@@addcontentsline #1#2#3#4 - { - \addcontentsline{#1}{#2} - {\prop_item:Nn \l__eb_list_label_entry_prop {#2}{#3}{#4}} - } -\ctex_patch_cmd:Nnn \lst@MakeCaption - { - \addcontentsline{lol}{lstlisting} - {\protect\numberline{\thelstlisting}\lst@@caption} - } - { - \addcontentsline{lol}{lstlisting} - {\eb@tocline@lstlisting{\thelstlisting}{\lst@@caption}} - } - \newcounter{bichapter} \newcounter{bisection}[bichapter] \newcounter{bisubsection}[bisection] @@ -1111,14 +927,13 @@ \use:c { p@#1 } { the#1 } } } -\NewDocumentCommand{\counteruse}{soD(){arabic}mO{.}d()} +\NewDocumentCommand{\counteruse}{sO{arabic}D(){.}mod()} { \IfBooleanF{#1}{\stepcounter{#4}} - \IfValueT{#6}{\setcounter{#4}{#6}} \tl_set:cn { theeb@#4 } { - \IfValueT{#2}{\use:c { the#2 }#5} - \use:c {#3}{#4} + \IfValueT{#5}{\use:c { the#5 }#3} + \use:c {#2}{#4} } \tl_use:c { theeb@#4 } \eb_current_label:n { eb@#4 } @@ -1132,7 +947,6 @@ \cs_set:Npn \thebisection { \eb_section_counter_prefix:n { bi } } \cs_set:Npn \thebisubsection { \thebisection.\@arabic\c@bisubsection } \cs_set:Npn \thesection { \eb_section_counter_prefix:n { } } - \contentsuse{}{tec} \tl_new:N \eb@before@addbitoc@hook \NewDocumentCommand{\BeforeAddBitoc}{sm} @@ -1208,7 +1022,7 @@ } \tl_new:N \eb@bitoc@title -\keys_define:nn { eb/listoc } +\keys_define:nn { eb/floattoc } { level .tl_set:N = \eb@toc@title@level, level .initial:n = @@ -1243,11 +1057,13 @@ plan .initial:n = cn, columns .meta:n = { multoc = #1 }, title .code:n = \eb_assign_toc_title:n {#1}, - bilist .tl_gset:N = \g__eb_bilist_permute_value_tl + bilist .tl_gset:N = \g__eb_bilist_permute_value_tl, + name .tl_set:N = \l__eb_print_index_name_tl, + name .initial:n = \imki@jobname } \bool_if:NTF \l__eb_class_mode_book_bool - { \keys_define:nn { } { eb/listoc .inherit:n = ctex/chapter } } - { \keys_define:nn { } { eb/listoc .inherit:n = ctex/section } } + { \keys_define:nn { } { eb/floattoc .inherit:n = ctex/chapter } } + { \keys_define:nn { } { eb/floattoc .inherit:n = ctex/section } } \NewDocumentCommand{\eb_assign_toc_title:n} {>{\SplitArgument{1}{,}}m} {\eb_assign_toc_title_judge:nn #1} @@ -1258,13 +1074,7 @@ { \tl_clear:N \eb@bitoc@title } { \tl_set:Nn \eb@bitoc@title {#2} } } -\cs_new_protected:Npn \eb_biber_toc_title:n #1 - { - \bool_if:NTF \l__eb_class_mode_book_bool - { \bichapter*{#1}{\eb@bib@bitoc@title} } - { \bisection*{#1}{\eb@bib@bitoc@title} } - \sectionmark{#1} - } +\prop_new:N \l__eb_toc_float_label_prop \cs_new_protected:Npn \eb_toc_start_multi_column_ext:n #1 { \int_compare:nNnTF { \l__eb_toc_columns_int } > { 1 } @@ -1285,29 +1095,60 @@ \IfBooleanF{#1} {\eb@toc@title@level{\eb@toc@title}{\eb@bitoc@title}} } -\cs_new_protected:Npn \eb_toc_list_parse:nnnnn #1#2#3#4#5 +\cs_new_protected:Npn \eb_toc_float_list_parse:nnnnn #1#2#3#4#5 { \group_begin: \tl_set_eq:Nc \eb@toc@title { list#4name } - \IfValueT{#3}{\keys_set:nn { eb/listoc } {#3}} + \IfValueT{#3}{\keys_set:nn { eb/floattoc } {#3}} \eb_toc_title_level_cmd:n {#1} \eb_toc_if_title_between_hook:nn {#1} {#4} \eb_toc_start_multi_column_ext:n {#5} \group_end: } -\cs_new_protected:Npn \eb_list_content_cmd_set:nn #1#2 +\cs_new:Npn \listnumberline #1 + { + \protect\numberline + { + \exp_args:Nnv + \use:c { p@#1 } { the#1 } + } + } +\cs_new_protected:Npn \DeclareFloatList #1#2 { \exp_args:Nc \DeclareDocumentCommand { listof#1s }{st+o} - {\eb_toc_list_parse:nnnnn {##1} {##2} {##3} {#1} {#2}} + {\eb_toc_float_list_parse:nnnnn {##1} {##2} {##3} {#1} {#2}} + \ctex_define:n + { + #1/##1 .meta:nn = { ctex/##1 } {####1}, + #1/between .tl_set:c = l__eb_toc_#1_between_hook_tl, + #1/tocline .cs_set:cp = { eb@tocline@#1 } ##1##2, + #1/tocline .initial:n = \listnumberline{#1}##2 + } + \prop_put_from_keyval:Nn \l__eb_toc_float_label_prop + { #1 = \use:c { eb@tocline@#1 } } } -\eb_seq_map_inline:nn +\DeclareFloatList{table}{lot} +\DeclareFloatList{figure}{lof} +\DeclareFloatList{lstlisting}{lol} +\cs_gset:Npn \caption@@@addcontentsline #1#2#3#4 { - { figure } { lof }, - { table } { lot }, - { lstlisting } { lol } + \addcontentsline{#1}{#2} + { + \prop_if_in:NnTF \l__eb_toc_float_label_prop {#2} + { \prop_item:Nn \l__eb_toc_float_label_prop {#2} } + { \protect\numberline } + {#3}{#4} + } + } +\ctex_patch_cmd:Nnn \lst@MakeCaption + { + \addcontentsline{lol}{lstlisting} + {\protect\numberline{\thelstlisting}\lst@@caption} + } + { + \addcontentsline{lol}{lstlisting} + {\eb@tocline@lstlisting{\thelstlisting}{\lst@@caption}} } - { \eb_list_content_cmd_set:nn #1 } -\cs_set_eq:NN \listoflistings \listoflstlistings \ctex_define:n { bicontentsname .tl_set:N = \bicontentsname, @@ -1324,7 +1165,7 @@ { \chapter* } { \section* } } - \IfValueT{#3}{\keys_set:nn { eb/listoc } {#3}} + \IfValueT{#3}{\keys_set:nn { eb/floattoc } {#3}} \bool_if:NT \l__eb_toc_plan_cn_bool { \IfBooleanF{#1}{\eb@toc@title@level{\eb@toc@title}{}} @@ -1340,22 +1181,169 @@ \group_end: } +\contentsuse{lstlisting}{lol} +\seq_put_left:Nn \c__ctex_headings_seq { chapter } +\seq_put_right:Nn \c__ctex_headings_seq { table } +\seq_put_right:Nn \c__ctex_headings_seq { figure } +\seq_put_right:Nn \c__ctex_headings_seq { lstlisting } +\seq_remove_duplicates:N \c__ctex_headings_seq +\cs_new_protected:Npn \eb_toc_entry_if_hang:n #1 + { + \bool_if:NTF \l__eb_toc_entry_hang_bool + { \contentspush } + { \use:n } + { + \bool_if:NTF \l__eb_toc_number_color_bool + { \textcolor{ctex@toc@number} } + { \use:n } + { \thecontentslabel } + \tl_use:c { l__eb_toc_#1_after_tl } + } + } +\cs_new_protected:Npn \RegisterTocName #1 + { + \ctex_define:n + { + #1/tocformat .tl_set:c = l__eb_toc_#1_format_tl, + #1/tocformat+ .code:n = \tl_put_right:cn { l__eb_toc_#1_format_tl } {##1}, + #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/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_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 \RegisterTocName +\eb_seq_map_inline:nn + { + tocformat,tocformat+,tocformat~+, + tocindent,tocrule,tocline,tocafter,between + } + { + \ctex_define:n + { + float/#1 .meta:n = + { + figure/#1 = ##1,table/#1 = ##1, + lstlisting/#1 = ##1 + } + } + } +\eb_seq_map_inline:nn + { tocafter,tocindent,tocrule } + { + \ctex_define:nn { tocset } + { + #1-every .code:n = + { + \ctex_set:n + { + part/#1 = ##1,chapter/#1 = ##1, + section/#1 = ##1,subsection/#1 = ##1, + float/#1 = ##1 + } + } + } + } +\ctex_define:nn { tocset } + { + 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:NT \l__eb_class_mode_book_bool { \vspace*{-1pc} }, + bibetween .tl_set:N = \l__eb_toc_bimain_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, + dotalign .initial:n = true, + 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()mO{}} + { + \normalsize\normalfont + \titlerule*[#3]{\IfValueTF{#4}{\scalebox{#4}{#5}}{#5}}#6 + \bgroup + \IfBooleanF{#2} + { + \IfBooleanTF{#1} + {\thecontentspage} + { + \bool_if:NTF \l__eb_toc_dot_align_bool + { \contentspage } + { \thecontentspage } + } + } + \egroup + } +\ctex_set:n + { + part = + { + tocformat = \addvspace{1pc}\sffamily\large, + tocindent = 0em, + tocrule = \tocrule{}[\bfseries], + tocline = \CTEXnumberline{#1}#2 + }, + chapter = + { + tocformat = \addvspace{1pc}\sffamily, + tocindent = 0em, + tocrule = \tocrule{$\cdot$}[\bfseries], + tocline = \CTEXnumberline{#1}#2 + }, + section = + { + tocformat = \bool_if:NF \l__eb_class_mode_book_bool { \sffamily }, + tocindent = \bool_if:NTF \l__eb_class_mode_book_bool { 1.5em } { 0em }, + tocrule = + { + \bool_if:NTF \l__eb_class_mode_book_bool + { \tocrule{$\cdot$} } + { \tocrule{$\cdot$}[\bfseries] } + } + }, + subsection = + { + tocindent = \bool_if:NTF \l__eb_class_mode_book_bool { 3.8em } { 1.4em }, + tocrule = \tocrule{$\cdot$} + }, + float = + { + tocindent = 0em, + tocrule = \tocrule{$\cdot$}, + between = \bool_if:NT \l__eb_class_mode_book_bool { \vspace*{-10pt} } + }, + tocset/tocafter-every = \hspace{1em} + } + \ctex_at_end_package:nn { imakeidx } { \makeindex - \RenewDocumentCommand{\printindex}{st+oD(){\imki@jobname}} + \RenewDocumentCommand{\printindex}{st+od()} { \group_begin: \tl_set_eq:NN \eb@toc@title \indexname \cs_set_eq:NN \imki@indexlevel \use_none:n \setkeys{imkiindex}{noclearpage} - \IfValueT{#3}{\keys_set:nn { eb/listoc } {#3}} + \IfValueT{#3}{\keys_set:nn { eb/floattoc } {#3}} \cs_set_protected:Npn \imki@indexheaders { \eb_toc_title_level_cmd:n {#1} \cs_set_eq:NN \thispagestyle \use_none:n } - \imki@putindex{#4} + \imki@putindex{\l__eb_print_index_name_tl} \group_end: } } @@ -1407,9 +1395,9 @@ \ctex_define:nn { subfont } { - caption-table .tl_set:N = \l__eb_subfont_cap_table_tl, - caption-figure .tl_set:N = \l__eb_subfont_cap_figure_tl, - caption-listing .tl_set:N = \l__eb_subfont_cap_listing_tl, + caption-table .tl_set:N = \l__eb_subfont_caption_table_tl, + caption-figure .tl_set:N = \l__eb_subfont_caption_figure_tl, + caption-listing .tl_set:N = \l__eb_subfont_caption_listing_tl, caption-every .meta:n = { caption-table = #1,caption-figure = #1, @@ -1426,16 +1414,16 @@ \str_case:nnF {#1} { { table } - { \tl_put_right:Nn \l__eb_subfont_cap_table_tl {#2} } + { \tl_put_right:Nn \l__eb_subfont_caption_table_tl {#2} } { figure } - { \tl_put_right:Nn \l__eb_subfont_cap_figure_tl {#2} } + { \tl_put_right:Nn \l__eb_subfont_caption_figure_tl {#2} } { listing } - { \tl_put_right:Nn \l__eb_subfont_cap_listing_tl {#2} } + { \tl_put_right:Nn \l__eb_subfont_caption_listing_tl {#2} } { every } { - \tl_put_right:Nn \l__eb_subfont_cap_table_tl {#2} - \tl_put_right:Nn \l__eb_subfont_cap_figure_tl {#2} - \tl_put_right:Nn \l__eb_subfont_cap_listing_tl {#2} + \tl_put_right:Nn \l__eb_subfont_caption_table_tl {#2} + \tl_put_right:Nn \l__eb_subfont_caption_figure_tl {#2} + \tl_put_right:Nn \l__eb_subfont_caption_listing_tl {#2} } } { \tl_put_right:cn { l__eb_subfont_#1_tl } {#2} } @@ -1455,9 +1443,9 @@ math .initial:n = 1.354, footnote .fp_set:N = \l__eb_spread_footnote_fp, footnote .initial:n = 1.2, - caption-table .fp_set:N = \l__eb_spread_cap_table_fp, - caption-figure .fp_set:N = \l__eb_spread_cap_figure_fp, - caption-listing .fp_set:N = \l__eb_spread_cap_listing_fp, + caption-table .fp_set:N = \l__eb_spread_caption_table_fp, + caption-figure .fp_set:N = \l__eb_spread_caption_figure_fp, + caption-listing .fp_set:N = \l__eb_spread_caption_listing_fp, caption-every .meta:n = { caption-table = #1,caption-figure = #1, @@ -1478,8 +1466,8 @@ { \DeclareCaptionFont{eb@#1@font} { - \setspread{\fp_use:c { l__eb_spread_cap_#1_fp }} - \tl_use:c { l__eb_subfont_cap_#1_tl } + \setspread{\fp_use:c { l__eb_spread_caption_#1_fp }} + \tl_use:c { l__eb_subfont_caption_#1_tl } } } \captionsetup @@ -1760,7 +1748,7 @@ { \group_begin: \tl_set_eq:NN \eb@toc@title \bibname - \IfValueT{##3}{ \keys_set:nn { eb/listoc } {##3} } + \IfValueT{##3}{ \keys_set:nn { eb/floattoc } {##3} } \cs_set_protected:Npn \bibsection { \eb_toc_title_level_cmd:n {##1} @@ -1776,6 +1764,13 @@ } \cs_new_protected:Npn \eb_put_biblatex:n #1 { \PassOptionsToPackage{#1}{biblatex} } +\cs_new_protected:Npn \eb_biber_toc_title:n #1 + { + \bool_if:NTF \l__eb_class_mode_book_bool + { \bichapter*{#1}{\eb@bib@bitoc@title} } + { \bisection*{#1}{\eb@bib@bitoc@title} } + \sectionmark{#1} + } \cs_new_protected:Npn \eb_biber_biblatex_set: { \str_case:VnF \l__eb_bib_both_style_tl diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls index ec137f0e3af..9bf606d8cb4 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/03/08}{1.642} +\ProvidesExplClass{easybook}{2022/03/08}{1.643} {Easily typesetting 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 668d515e9fc..a73ee95339f 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/03/08}{1.642} +\ProvidesExplFile{eb-tcolorbox.cfg}{2022/03/08}{1.643} {Customization of tcolorbox for easybook} \cs_set_protected:Npn \addtotcbstyle #1#2 -- cgit v1.2.3