easybook (6jul21)

git-svn-id: svn://tug.org/texlive/trunk@59858 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 33 insertions, 32 deletions

diff --git a/Master/texmf-dist/tex/latex/easybook/easybase.sty b/Master/texmf-dist/tex/latex/easybook/easybase.sty
index d8c8dc5774a..0a2be5abd09 100644
--- a/Master/texmf-dist/tex/latex/easybook/easybase.sty
+++ b/Master/texmf-dist/tex/latex/easybook/easybase.sty
@@ -13,7 +13,7 @@
 %%   https://creativecommons.org/licenses/by/4.0/legalcode
 \NeedsTeXFormat{LaTeX2e}[2020/10/01]
 \RequirePackage{etoolbox}
-\ProvidesExplPackage{easybase}{2021/07/05}{1.26s}
+\ProvidesExplPackage{easybase}{2021/07/06}{1.26u}
   {Typeset Chinese books or notes}
 
 \cs_generate_variant:Nn \eb_ctex_define:nn { nx }
@@ -24,16 +24,28 @@
 \cs_generate_variant:Nn \seq_set_from_clist:Nn { No }
 \cs_generate_variant:Nn \int_compare:nNnT { oNnT }
 \cs_generate_variant:Nn \prop_set_from_keyval:Nn { NV }
+\cs_generate_variant:Nn \eb_at_begin_environment:nn { on }
 \cs_new_protected:Npn \eb_ctex_define:nn #1
   { \keys_define:nn { ctex/#1 } }
+\cs_new_protected:Npn \eb_clist_map_inline:nn #1#2
+  {
+    \seq_set_from_clist:Nn \l_tmpa_seq {#1}
+    \seq_map_inline:Nn \l_tmpa_seq {#2}
+  }
+\cs_new_protected:Npn \eb_clist_map_function:nN #1#2
+  {
+    \seq_set_from_clist:Nn \l_tmpb_seq {#1}
+    \seq_map_function:NN \l_tmpb_seq #2
+  }
+\cs_new_protected:Npn \eb_patch_cmd:Nnn #1#2#3
+  {
+    \ctex_patch_cmd_once:NnnnTF #1 { } {#2} {#3}
+      { } { \ctex_patch_failure:N #1 }
+  }
 \cs_new_protected:Npn \eb_patch_cmd:nnn #1#2#3
   {
-    \seq_set_from_clist:Nn \l__eb_control_sequence_seq {#1}
-    \seq_map_inline:Nn \l__eb_control_sequence_seq
-      {
-        \ctex_patch_cmd_once:NnnnTF ##1 { } {#2} {#3}
-          { } { \ctex_patch_failure:N ##1 }
-      }
+    \eb_clist_map_inline:nn {#1}
+      { \eb_patch_cmd:Nnn ##1 {#2} {#3} }
   }
 \cs_new_protected:Npn \eb_preto_cmd:Nn #1#2
   {
@@ -47,8 +59,7 @@
   }
 \cs_new_protected:Npn \eb_at_begin_environment:nn #1#2
   {
-    \seq_set_from_clist:No \l__eb_env_hook_name_seq {#1}
-    \seq_map_inline:Nn \l__eb_env_hook_name_seq
+    \eb_clist_map_inline:nn {#1}
       { \AtBeginEnvironment{##1}{#2} }
   }
 \cs_new_protected:Npn \eb_match_package_name:n #1
@@ -126,13 +137,12 @@
 \bool_new:N \l__eb_chap_counter_withpart_bool
 \tl_new:N   \l__eb_foot_counter_parent_choice_tl
 
-\seq_const_from_clist:Nn \c__eb_options_path_seq
+\eb_clist_map_inline:nn
   {
     style,subfont,spread,
     refset,bibset,thmset,
     geoset,hdrset,tocset
   }
-\seq_map_inline:Nn \c__eb_options_path_seq
   {
     \ctex_define:n { #1 .meta:nn = { ctex/#1 } {##1} }
     \cs_new:cpn {#1} ##1 { \keys_set:nn { ctex/#1 } {##1} }
@@ -291,9 +301,8 @@
     \booltrue{@mainmatter}
     \pagenumbering{arabic}
   }
-\seq_const_from_clist:Nn \c__eb_mark_title_level_seq
+\eb_clist_map_inline:nn
   { chapter,section,subsection }
-\seq_map_inline:Nn \c__eb_mark_title_level_seq
   {
     \exp_args:Nc \NewDocumentCommand { eb@mark@#1@label@layout }
       {O{\use:c { CTEXthe#1 }}m}
@@ -557,11 +566,9 @@
   }
 \seq_map_function:NN
 \c__eb_toc_heading_level_seq \eb_toc_assign_keys:n
-
-\seq_const_from_clist:Nn \c__eb_toc_list_meta_keys_seq
-  { format,format+,format~+,indent,rule,numsep,belowoffset }
 \ctex_define:n { tocset/list .meta:nn = { ctex/tocset/list } {#1} }
-\seq_map_inline:Nn \c__eb_toc_list_meta_keys_seq
+\eb_clist_map_inline:nn
+  { format,format+,format~+,indent,rule,numsep,belowoffset }
   {
     \eb_ctex_define:nn { tocset }
       {
@@ -768,9 +775,8 @@
 \cs_set:Npn \thebisection { \eb_section_counter_prefix:n { bi } }
 \cs_set:Npn \thebisubsection { \thebisection.\eb_arabic:n { bisubsection } }
 \cs_set:Npn \thesection { \eb_section_counter_prefix:n { } }
-\seq_const_from_clist:Nn \c__eb_serial_number_counter_seq
+\eb_clist_map_inline:nn
   { figure,table,lstlisting,equation }
-\seq_map_inline:Nn \c__eb_serial_number_counter_seq
   {
     \cs_set:cpn { the#1 }
       {
@@ -800,9 +806,8 @@
     \addcontentsline{tec}{#1}{\use:c { CTEX@#1@tocline }{#1}{#2}}
     \group_end:
   }
-\seq_const_from_clist:Nn \c__eb_bitoc_title_level_seq
+\eb_clist_map_inline:nn
   { chapter,section,subsection }
-\seq_map_inline:Nn \c__eb_bitoc_title_level_seq
   {
     \exp_args:Nc \NewDocumentCommand { bi#1 }{sO{##3}mm}
       {
@@ -1002,10 +1007,7 @@
     binmuber .initial:n = \arabic{chapter}
   }
 \cs_new_protected:Npn \eb_counter_zero:n #1
-  {
-    \seq_set_from_clist:No \l__eb_counter_name_seq {#1}
-    \seq_map_inline:Nn \l__eb_counter_name_seq { \setcounter{##1}{0} }
-  }
+  { \eb_clist_map_inline:nn {#1} { \setcounter{##1}{0} } }
 \RenewDocumentCommand{\appendix}
   {O{Appendix\space}D(){\Alph{chapter}}}
   {
@@ -1013,7 +1015,7 @@
     \int_compare:nNnTF { \c@chapter } > { 0 }
       {
         \ExplSyntaxOn\char_set_catcode_letter:N \@
-        \eb_patch_cmd:nnn { \CTEX@addbitocline }
+        \eb_patch_cmd:Nnn \CTEX@addbitocline
           {
             \def\CTEX@prechapter{\CTEX@prebichapter}
             \def\CTEX@thechapter{\CTEX@bichapter@number}
@@ -1372,7 +1374,7 @@
     \linespread{\fp_use:N \l__eb_spread_math_fp}
     \selectfont\collect@body
   }
-\eb_patch_cmd:nnn { \gather@split }
+\eb_patch_cmd:Nnn \gather@split
   { \spread@equation }
   {
     \linespread{\fp_use:N \l__eb_spread_math_fp}
diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls
index 0050c95b6c3..0b56954857d 100644
--- a/Master/texmf-dist/tex/latex/easybook/easybook.cls
+++ b/Master/texmf-dist/tex/latex/easybook/easybook.cls
@@ -13,7 +13,7 @@
 %%   https://creativecommons.org/licenses/by/4.0/legalcode
 \NeedsTeXFormat{LaTeX2e}[2020/10/01]
 \RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2021/07/05}{1.26s}
+\ProvidesExplClass{easybook}{2021/07/06}{1.26u}
   {Typeset Chinese books or notes}
 
 \bool_set_false:N \l__eb_compile_draft_bool
@@ -105,10 +105,9 @@
     \exp_args:Nc \RenewDocumentCommand {set#1font}{O{}mO{}}
       {\use:c { eb_set#1font:nn } {##2} {##1,##3}}
   }
-\seq_const_from_clist:Nn \c__eb_font_reset_family_seq
+\eb_clist_map_function:nN
   { main,sans,mono,CJKmain,CJKsans,CJKmono }
-\seq_map_inline:Nn \c__eb_font_reset_family_seq
-  { \eb_font_double_engine_set:n {#1} }
+  \eb_font_double_engine_set:n
 
 \cs_new_protected:Npn \eb_setmainfont:nn #1#2
   { \__fontspec_main_setmainfont:nn {#2} {#1} }
diff --git a/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg b/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg
index 386abf79dce..46f0339ce11 100644
--- a/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg
+++ b/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg
@@ -11,7 +11,7 @@
 %% conditions of the CC-BY 4.0 License.
 %% The latest version of this license is in
 %%   https://creativecommons.org/licenses/by/4.0/legalcode
-\ProvidesExplFile{eb-tcolorbox.cfg}{2021/07/05}{1.26s}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2021/07/06}{1.26u}
   {Customization of tcolorbox for easybook}
 
 \cs_new_protected:Npn \eb_tcb_theorem_set:n #1