easybook (4feb22)

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

6 files changed, 18 insertions, 18 deletions

diff --git a/Master/texmf-dist/doc/latex/easybook/easybook.pdf b/Master/texmf-dist/doc/latex/easybook/easybook.pdf
index a6a70491a33..175389e7c85 100644
--- a/Master/texmf-dist/doc/latex/easybook/easybook.pdf
+++ b/Master/texmf-dist/doc/latex/easybook/easybook.pdf
diff --git a/Master/texmf-dist/doc/latex/easybook/easybook.tex b/Master/texmf-dist/doc/latex/easybook/easybook.tex
index 2ea2f54526d..ccfee80c8c0 100644
--- a/Master/texmf-dist/doc/latex/easybook/easybook.tex
+++ b/Master/texmf-dist/doc/latex/easybook/easybook.tex
@@ -21,8 +21,8 @@
     name            = easybook,
     color-scheme    = blue,
     title           = EASYBOOK 使用手册,
-    version         = v1.61,
-    date            = 2022/02/03,
+    version         = v1.62,
+    date            = 2022/02/04,
     authors         = 瞿毅,
     info            = 排版简体中文学位论文和书籍,
     email           = q1jx@foxmail.com,
diff --git a/Master/texmf-dist/source/latex/easybook/easybook.dtx b/Master/texmf-dist/source/latex/easybook/easybook.dtx
index e1040bbc695..577ee50f49a 100644
--- a/Master/texmf-dist/source/latex/easybook/easybook.dtx
+++ b/Master/texmf-dist/source/latex/easybook/easybook.dtx
@@ -15,7 +15,7 @@
 %<*class>
 \NeedsTeXFormat{LaTeX2e}[2020/10/01]
 \RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2022/02/03}{1.61}
+\ProvidesExplClass{easybook}{2022/02/04}{1.62}
   {Typeset Chinese theses or books}
 
 \bool_set_false:N \l__eb_compile_draft_bool
@@ -305,7 +305,7 @@
 %<*package>
 \NeedsTeXFormat{LaTeX2e}[2020/10/01]
 \RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2022/02/03}{1.61}
+\ProvidesExplPackage{easybase}{2022/02/04}{1.62}
   {Typeset Chinese theses or books}
 
 \cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -349,6 +349,8 @@
     \eb_seq_map_inline:nn {#1}
       { \AtBeginEnvironment{##1}{#2} }
   }
+\cs_new_protected:Npn \eb_at_end_preamble:n
+  { \BeforeBeginEnvironment{document} }
 \cs_new_protected:Npn \eb_match_load_package:n #1
   {
     \regex_match:nnTF { \[ } {#1}
@@ -399,8 +401,6 @@
     \seq_map_function:NN
     \l_tmpb_seq \eb_match_load_package:n
   }
-\cs_new_protected:Npn \eb_at_end_preamble:n
-  { \BeforeBeginEnvironment{document} }
 \cs_gset_eq:NN \PackageWarning \PackageInfo
 \msg_redirect_module:nnn { hooks } { warning } { info }
 
@@ -836,7 +836,7 @@
         { flush }
         {
           \tl_set:Nn \l__eb_footnote_value_tl { default }
-          \clist_push:Nn \l__eb_footnote_mulchoice_clist {#1}
+          \clist_push:Nn \l__eb_footnote_value_clist {#1}
         }
       }
       {
@@ -868,7 +868,7 @@
 \bool_new:N \l__eb_fnpara_bottom_bool
 \tl_new:N \l__eb_fnmate_format_tl
 \tl_new:N \l__eb_fncust_format_tl
-\clist_new:N \l__eb_footnote_mulchoice_clist
+\clist_new:N \l__eb_footnote_value_clist
 \ctex_define:nn { hdrset }
   {
     fnindent .dim_set:N             = \footindent,
@@ -992,7 +992,7 @@
 \cs_new_protected:Npn \eb_footnote_direct_default:
   {
     \noindent
-    \clist_if_in:NnT \l__eb_footnote_mulchoice_clist { flush }
+    \clist_if_in:NnT \l__eb_footnote_value_clist { flush }
       { \dim_zero:N \footindent }
     \int_case:nn { \dim_sign:V \footindent }
       {
@@ -2332,7 +2332,7 @@
   }
 %</package>
 %<*tcolorbox>
-\ProvidesExplFile{eb-tcolorbox.cfg}{2022/02/03}{1.61}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2022/02/04}{1.62}
   {Customization of tcolorbox for easybook}
 
 \cs_set_protected:Npn \addtotcbstyle #1#2
diff --git a/Master/texmf-dist/tex/latex/easybook/easybase.sty b/Master/texmf-dist/tex/latex/easybook/easybase.sty
index 6ba5fe1498a..12825e934d2 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/02/03}{1.61}
+\ProvidesExplPackage{easybase}{2022/02/04}{1.62}
   {Typeset Chinese theses or books}
 
 \cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -64,6 +64,8 @@
     \eb_seq_map_inline:nn {#1}
       { \AtBeginEnvironment{##1}{#2} }
   }
+\cs_new_protected:Npn \eb_at_end_preamble:n
+  { \BeforeBeginEnvironment{document} }
 \cs_new_protected:Npn \eb_match_load_package:n #1
   {
     \regex_match:nnTF { \[ } {#1}
@@ -114,8 +116,6 @@
     \seq_map_function:NN
     \l_tmpb_seq \eb_match_load_package:n
   }
-\cs_new_protected:Npn \eb_at_end_preamble:n
-  { \BeforeBeginEnvironment{document} }
 \cs_gset_eq:NN \PackageWarning \PackageInfo
 \msg_redirect_module:nnn { hooks } { warning } { info }
 
@@ -551,7 +551,7 @@
         { flush }
         {
           \tl_set:Nn \l__eb_footnote_value_tl { default }
-          \clist_push:Nn \l__eb_footnote_mulchoice_clist {#1}
+          \clist_push:Nn \l__eb_footnote_value_clist {#1}
         }
       }
       {
@@ -583,7 +583,7 @@
 \bool_new:N \l__eb_fnpara_bottom_bool
 \tl_new:N \l__eb_fnmate_format_tl
 \tl_new:N \l__eb_fncust_format_tl
-\clist_new:N \l__eb_footnote_mulchoice_clist
+\clist_new:N \l__eb_footnote_value_clist
 \ctex_define:nn { hdrset }
   {
     fnindent .dim_set:N             = \footindent,
@@ -707,7 +707,7 @@
 \cs_new_protected:Npn \eb_footnote_direct_default:
   {
     \noindent
-    \clist_if_in:NnT \l__eb_footnote_mulchoice_clist { flush }
+    \clist_if_in:NnT \l__eb_footnote_value_clist { flush }
       { \dim_zero:N \footindent }
     \int_case:nn { \dim_sign:V \footindent }
       {
diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls
index 5b673cc8a4c..66665dc0b2f 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/02/03}{1.61}
+\ProvidesExplClass{easybook}{2022/02/04}{1.62}
   {Typeset 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 33ed6fe8e21..9a9f3dbe22b 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/02/03}{1.61}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2022/02/04}{1.62}
   {Customization of tcolorbox for easybook}
 
 \cs_set_protected:Npn \addtotcbstyle #1#2