summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/easybook/easybook.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'macros/latex/contrib/easybook/easybook.dtx')
-rw-r--r--macros/latex/contrib/easybook/easybook.dtx38
1 files changed, 17 insertions, 21 deletions
diff --git a/macros/latex/contrib/easybook/easybook.dtx b/macros/latex/contrib/easybook/easybook.dtx
index 169e50a8a7..701abb0ff0 100644
--- a/macros/latex/contrib/easybook/easybook.dtx
+++ b/macros/latex/contrib/easybook/easybook.dtx
@@ -15,14 +15,14 @@
%<*class>
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2021/12/12}{1.41S}
+\ProvidesExplClass{easybook}{2021/12/14}{1.41T}
{Typeset Chinese theses or books}
\bool_set_false:N \l__eb_compile_draft_bool
\bool_set_false:N \l__eb_title_newline_bool
\bool_set_true:N \l__eb_class_mode_book_bool
-\tl_new:N \g__eb_config_tl
\tl_new:N \l__eb_font_value_tl
+\clist_new:N \g__eb_config_file_clist
\clist_new:N \g__eb_options_clist
\cs_new_protected:Npn \eb_put_ctexbook:n #1
{ \PassOptionsToClass{#1}{ctexbook} }
@@ -52,7 +52,7 @@
},
book .meta:n = { class = book },
article .meta:n = { class = article },
- config .tl_set:N = \g__eb_config_tl,
+ config .clist_gset:N = \g__eb_config_file_clist,
floatpage .bool_set:N = \l__eb_float_page_bool,
floatpage .default:n = true,
unknown .code:n = \clist_gput_right:NV \g__eb_options_clist \CurrentOption
@@ -67,8 +67,8 @@
\ctex_at_end:n
{
\use:c { eb@font@load@\l__eb_font_value_tl }
- \tl_if_empty:NF \g__eb_config_tl
- { \file_input:n { \g__eb_config_tl } }
+ \clist_if_empty:NF \g__eb_config_file_clist
+ { \clist_map_function:NN \g__eb_config_file_clist \file_input:n }
}
\sys_if_engine_xetex:TF
@@ -100,10 +100,8 @@
}
\RenewDocumentCommand{\newCJKfontfamily}{omO{}mO{}}
{
- \tl_set:Nx \l_tmpa_tl
- { \tl_if_novalue:nTF {#1} { \cs_to_str:N #2 } {#1} }
- \cs_new_protected:Npx #2
- { \eb_switch_family:V \l_tmpa_tl }
+ \tl_set:Nx \l_tmpa_tl { \tl_if_novalue:nTF {#1} { \cs_to_str:N #2 } {#1} }
+ \cs_new_protected:Npx #2 { \eb_switch_family:V \l_tmpa_tl }
\eb_set_family:nnn { \l_tmpa_tl } {#3,#5} {#4}
}
@@ -310,7 +308,7 @@
%<*package>
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2021/12/12}{1.41S}
+\ProvidesExplPackage{easybase}{2021/12/14}{1.41T}
{Typeset Chinese theses or books}
\cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -408,10 +406,8 @@
{ \BeforeBeginEnvironment{document} }
\cs_gset_eq:NN \PackageWarning \PackageInfo
-\bool_if_exist:NF \l__eb_class_mode_book_bool
- { \bool_set_true:N \l__eb_class_mode_book_bool }
-\bool_if_exist:NF \l__eb_compile_draft_bool
- { \bool_set_false:N \l__eb_compile_draft_bool }
+\bool_set_true:N \l__eb_class_mode_book_bool
+\bool_set_false:N \l__eb_compile_draft_bool
\clist_new:N \g__eb_ctex_options_clist
\keys_define:nn { easybase }
@@ -454,7 +450,7 @@
\bool_new:N \l__eb_mark_uppercase_bool
\bool_new:N \l__eb_chap_counter_withpart_bool
-\tl_new:N \l__eb_foot_counter_parent_value_tl
+\tl_new:N \l__eb_fnt_counter_parent_value_tl
\eb_seq_map_inline:nn
{
@@ -735,11 +731,11 @@
\ctex_define:nn { style }
{
- footwith .choices:nn =
+ fntnumwith .choices:nn =
{ part,page,chapter }
- { \tl_set:Nn \l__eb_foot_counter_parent_value_tl {#1} },
- footwith .value_required:n = true,
- footwith .initial:n = chapter
+ { \tl_set:Nn \l__eb_fnt_counter_parent_value_tl {#1} },
+ fntnumwith .value_required:n = true,
+ fntnumwith .initial:n = chapter
}
\NewDocumentCommand{\eb_assign_fntext_code:n}
{>{\SplitArgument{1}{,}}m}
@@ -917,7 +913,7 @@
\dim_set:Nn \footnotesep { \dim_use:N \box_ht:N \strutbox }
\bool_if:NT \l__eb_chap_counter_withpart_bool
{ \counterwithin*{chapter}{part} }
- \str_case:VnT \l__eb_foot_counter_parent_value_tl
+ \str_case:VnT \l__eb_fnt_counter_parent_value_tl
{
{ part } { \counterwithin*{footnote}{part} }
{ page } { \counterwithin*{footnote}{page} }
@@ -2433,7 +2429,7 @@
}
%</package>
%<*tcolorbox>
-\ProvidesExplFile{eb-tcolorbox.cfg}{2021/12/12}{1.41S}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2021/12/14}{1.41T}
{Customization of tcolorbox for easybook}
\cs_set_protected:Npn \setexercise #1