From 8379a45cf223651b1c06ebf5c680db900d83c6a5 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Thu, 11 Mar 2021 03:00:51 +0000 Subject: CTAN sync 202103110300 --- macros/latex/contrib/easybook/easybook.cls | 77 +++++++++++++----------------- 1 file changed, 33 insertions(+), 44 deletions(-) (limited to 'macros/latex/contrib/easybook/easybook.cls') diff --git a/macros/latex/contrib/easybook/easybook.cls b/macros/latex/contrib/easybook/easybook.cls index a502518987..055b403aed 100644 --- a/macros/latex/contrib/easybook/easybook.cls +++ b/macros/latex/contrib/easybook/easybook.cls @@ -9,7 +9,7 @@ %% https://creativecommons.org/licenses/by/4.0/legalcode \NeedsTeXFormat{LaTeX2e} \RequirePackage{l3keys2e} -\ProvidesExplClass{easybook}{2021/03/09}{1.23l}{} +\ProvidesExplClass{easybook}{2021/03/10}{1.23m}{} \cs_generate_variant:Nn \keys_define:nn {nx} \cs_generate_variant:Nn \int_to_arabic:n {v} @@ -425,25 +425,25 @@ part/rule .tl_set:N = \l__toc_part_rule_tl, part/rule .initial:n = \tocrule{}[\bfseries], - chapter/format .tl_set:N = \l__toc_chap_format_tl, + chapter/format .tl_set:N = \l__toc_chapter_format_tl, chapter/format .initial:n = \addvspace{1pc}\sffamily\large, - chapter/indent .tl_set:N = \l__toc_chap_indent_tl, + chapter/indent .tl_set:N = \l__toc_chapter_indent_tl, chapter/indent .initial:n = 0\ccwd, - chapter/rule .tl_set:N = \l__toc_chap_rule_tl, + chapter/rule .tl_set:N = \l__toc_chapter_rule_tl, chapter/rule .initial:n = \tocrule{$\cdot$}[\bfseries], - section/format .tl_set:N = \l__toc_sec_format_tl, + section/format .tl_set:N = \l__toc_section_format_tl, section/format .initial:n = \addvspace{0.35pc}, - section/indent .tl_set:N = \l__toc_sec_indent_tl, + section/indent .tl_set:N = \l__toc_section_indent_tl, section/indent .initial:n = 1.5\ccwd, - section/rule .tl_set:N = \l__toc_sec_rule_tl, + section/rule .tl_set:N = \l__toc_section_rule_tl, section/rule .initial:n = \tocrule{$\cdot$}, - subsection/format .tl_set:N = \l__toc_subsec_format_tl, + subsection/format .tl_set:N = \l__toc_subsection_format_tl, subsection/format .initial:n = \addvspace{0.35pc}, - subsection/indent .tl_set:N = \l__toc_subsec_indent_tl, + subsection/indent .tl_set:N = \l__toc_subsection_indent_tl, subsection/indent .initial:n = 3.8\ccwd, - subsection/rule .tl_set:N = \l__toc_subsec_rule_tl, + subsection/rule .tl_set:N = \l__toc_subsection_rule_tl, subsection/rule .initial:n = \tocrule{$\cdot$}, lists/format .tl_set:N = \l__toc_lists_format_tl, @@ -466,35 +466,24 @@ \normalsize\normalfont \titlerule*[#1]{\scalebox{#2}{#3}}#4\contentspage } -\titlecontents{part} - [\l__toc_part_indent_tl] - {\l__toc_part_format_tl}{}{} - {\l__toc_part_rule_tl} -\titlecontents{chapter} - [\l__toc_chap_indent_tl] - {\l__toc_chap_format_tl}{}{} - {\l__toc_chap_rule_tl} -\titlecontents{section} - [\l__toc_sec_indent_tl] - {\l__toc_sec_format_tl}{}{} - {\l__toc_sec_rule_tl} -\titlecontents{subsection} - [\l__toc_subsec_indent_tl] - {\l__toc_subsec_format_tl}{}{} - {\l__toc_subsec_rule_tl} -\titlecontents{figure} - [\l__toc_lists_indent_tl] - {\l__toc_lists_format_tl}{}{} - {\l__toc_lists_rule_tl} -\titlecontents{table} - [\l__toc_lists_indent_tl] - {\l__toc_lists_format_tl}{}{} - {\l__toc_lists_rule_tl} +\cs_new_protected:Npn \__titlecontents_set:nn #1#2 + { + \titlecontents{#1} + [\use:c {l__toc_#2_indent_tl}] + {\use:c {l__toc_#2_format_tl}}{}{} + {\use:c {l__toc_#2_rule_tl}} + } \contentsuse{lstlisting}{lol} -\titlecontents{lstlisting} - [\l__toc_lists_indent_tl] - {\l__toc_lists_format_tl}{}{} - {\l__toc_lists_rule_tl} +\clist_map_inline:nn + { + {part}{part}, + {chapter}{chapter}, + {section}{section}, + {subsection}{subsection}, + {figure}{lists}, + {table}{lists}, + {lstlisting}{lists} + }{\__titlecontents_set:nn #1} \ctex_patch_cmd:Nnn \caption@@@addcontentsline {\addcontentsline{#1}{#2}{\protect\numberline{#3}{#4}}} {\addcontentsline{#1}{#2}{#3\hspace{\ccwd}#4}} @@ -763,7 +752,7 @@ \skip_set:Nn \plitemsep{.75ex plus .1ex} \skip_set:Nn \plparsep{0ex} -\cs_new_protected:Npn \__thmname_set:n #1#2 +\cs_new_protected:Npn \__thmname_set:nn #1#2 {\tl_const:cn {c__name_#1_tl}{#2}} \bool_if:NTF \l__lang_chinese_bool { @@ -777,7 +766,7 @@ {example}{例}, {remark}{注}, {exercise}{练习} - }{\__thmname_set:n #1} + }{\__thmname_set:nn #1} }{ \clist_map_inline:nn { @@ -789,7 +778,7 @@ {example}{Example}, {remark}{Remark}, {exercise}{Exercise} - }{\__thmname_set:n #1} + }{\__thmname_set:nn #1} } \bool_new:N \l__thmbox_bool @@ -1070,7 +1059,7 @@ cite-style .code:n = {\tl_set:Nn \l__bib_citestyle_tl{#1}}, bibfile .tl_set:N = \l__bib_file_tl, - bibfile .initial:n = ref/refs.bib + bibfile .initial:n = refs.bib } \cs_new_protected:Npn \__bibtex_set: @@ -1274,7 +1263,7 @@ {skyblue, 0000ff,004986,eb6877}, {crimson, dc143c,00c1c9,afcd20} } - \__linkcolor_set:n, + \__linkcolor_set:n linkcolor .default:n = fresh, linkcolor .initial:n = fresh, @@ -1295,7 +1284,7 @@ {energy, f39800,00a0e9,893895}, {cyberpunk, 601986,eb6877,a4005b} } - \__themecolor_set:n, + \__themecolor_set:n color .initial:n = none } -- cgit v1.2.3