easybook (11mar22)

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

3 files changed, 43 insertions, 45 deletions

diff --git a/Master/texmf-dist/tex/latex/easybook/easybase.sty b/Master/texmf-dist/tex/latex/easybook/easybase.sty
index dc42bd06247..0f3a998a38e 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/10}{1.643}
+\ProvidesExplPackage{easybase}{2022/03/11}{1.645}
   {Easily typesetting Chinese theses or books}
 
 \cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -41,19 +41,16 @@
     \seq_set_from_clist:Nn \l_tmpa_seq {#1}
     \seq_map_inline:Nn \l_tmpa_seq {#2}
   }
-\cs_new_protected:Npn \eb_char_patch_cmd:wnn #1#2#3
+\cs_new_protected:Npn \eb_char_patch_cmd:Nnn #1#2#3
   {
     \ExplSyntaxOn\makeatletter
-    \eb_patch_cmd:wnn {#1} {#2} {#3}
+    \eb_patch_cmd:Nnn {#1} {#2} {#3}
     \ExplSyntaxOff\makeatother
   }
-\cs_new_protected:Npn \eb_patch_cmd:wnn #1#2#3
+\cs_new_protected:Npn \eb_patch_cmd:Nnn #1#2#3
   {
-    \eb_seq_map_inline:nn {#1}
-      {
-        \ctex_patch_cmd_once:NnnnTF ##1 { } {#2} {#3}
-          { } { \ctex_patch_failure:N ##1 }
-      }
+    \ctex_patch_cmd_once:NnnnTF #1 { } {#2} {#3}
+      { } { \ctex_patch_failure:N #1 }
   }
 \cs_new_protected:Npn \eb_preto_cmd:nn #1#2
   { \AddToHook{cmd/#1/before}{#2} }
@@ -224,7 +221,6 @@
     pdfpages+multicol+
     fancyhdr+titletoc+caption+
     tabularray+
-    setspace+
     listings
   }
 \cs_new_protected:Npn \eb_package_date_check:nn #1#2
@@ -593,10 +589,10 @@
   {
     fnfirstindent .dim_set:N        = \fnfirstindent,
     fnfirstindent .initial:n        = 0.8em,
-    fnparskip .skip_set:N           = \fnparskip,
-    fnparskip .initial:n            = 0ex plus .1ex,
     fnafterindent .tl_set:N         = \fnafterindent,
     fnafterindent .initial:n        = 2em,
+    fnparskip .skip_set:N           = \fnparskip,
+    fnparskip .initial:n            = 0ex plus .1ex,
     fnpara-form .tl_set:N           = \l__eb_fnpara_format_tl,
     fntext-pos .tl_set:N            = \l__eb_fntext_position_tl,
     fntext-pos .initial:n           = super,
@@ -649,7 +645,7 @@
     \eb_fnpara_if_pos_bottom:
   }
 \cs_new_protected:Npn \setspread #1 { \linespread{#1}\selectfont }
-\cs_new:Npn \eb@footmisc@ifvoid #1#2#3 { \ifvoid #1#2\else #3\fi }
+\cs_new:Npn \eb@ifvoid #1#2#3 { \ifvoid #1#2\else #3\fi }
 \cs_new_protected:Npn \eb_fnpara_if_pos_bottom:
   {
     \bool_if:NT \l__eb_fnpara_bottom_bool
@@ -660,24 +656,25 @@
             \cs_set:Npn \@makecol
               {
                 \setbox\@outputbox\box\@cclv
+                \let\@elt\relax
                 \xdef\@freelist{\@freelist\@midlist}
                 \global\let\@midlist\@empty
                 \@combinefloats
-                \eb@footmisc@ifvoid\footins{}
+                \eb@ifvoid\footins{}
                   {
                     \setbox\@outputbox\vbox
-                    \bgroup
-                    \boxmaxdepth\@maxdepth
-                    \unvbox\@outputbox
-                    \vfill\relax
-                    \vskip\skip\footins
-                    \color@begingroup
-                    \normalcolor\footnoterule
-                    \unvbox\footins
-                    \color@endgroup
-                    \egroup
+                      {
+                        \boxmaxdepth\@maxdepth
+                        \unvbox\@outputbox
+                        \vfill\relax
+                        \vskip\skip\footins
+                        \color@begingroup
+                        \normalcolor\footnoterule
+                        \unvbox\footins
+                        \color@endgroup
+                      }
                   }
-                \eb@footmisc@ifvoid\@kludgeins
+                \eb@ifvoid\@kludgeins
                   {\@makespecialcolbox}
                   {
                     \setbox\@outputbox\vbox to\@colht
@@ -752,17 +749,21 @@
     \tl_if_eq:NnT \l__eb_footnote_value_tl { hang } { \par }
     \group_end:
   }
-\eb_patch_cmd:wnn { \@footnotetext,\@mpfootnotetext }
-  { \reset@font }
+\eb_seq_map_inline:nn { \@footnotetext,\@mpfootnotetext }
   {
-    \setspread{\fp_use:N \l__eb_spread_footnote_fp}
-    \tl_use:N \l__eb_subfont_footnote_tl
+    \eb_patch_cmd:Nnn #1
+      { \reset@font }
+      {
+        \setspread{\fp_use:N \l__eb_spread_footnote_fp}
+        \tl_use:N \l__eb_subfont_footnote_tl
+      }
   }
 \cs_set_eq:NN \eb@@makefntext \@makefntext
 \cs_set_eq:NN \eb@@footnotetext \@footnotetext
 \ctex_at_end_package:nn { footmisc }
   {
     \eb_package_date_check:nn { footmisc } { 2022/02/10 }
+    \boolfalse{FN@setspace}
     \ifbool{FN@para}{}
       {
         \cs_set_eq:NN \@makefntext \eb@@makefntext
@@ -772,12 +773,7 @@
       {
         bool {FN@hangfoot} or
         bool {FN@perpage} or
-        bool {FN@robust} or
-        (
-          notbool {FN@abovefloats} and
-          bool {FN@fixskip} and
-          test {\ifnumcomp{\FN@bottomcases}{=}{1}}
-        )
+        bool {FN@robust}
       }
       {\msg_warning:nn { easybase } { footmisc }}{}
   }
@@ -1343,7 +1339,6 @@
 
 \ctex_at_end_package:nn { imakeidx }
   {
-    \makeindex
     \RenewDocumentCommand{\printindex}{st+od()}
       {
         \group_begin:
@@ -1374,7 +1369,7 @@
     \ctex_assign_heading_name:nn { biappendix } {#1}
     \int_compare:nNnTF { \c@chapter } > { 0 }
       {
-        \eb_char_patch_cmd:wnn \CTEX@addbitocline
+        \eb_char_patch_cmd:Nnn \CTEX@addbitocline
           {
             \def\CTEX@prechapter{\CTEX@prebichapter}
             \def\CTEX@thechapter{\CTEX@bichapter@number}
@@ -1661,7 +1656,7 @@
       spacebelow    = 0ex plus .1ex,
       headindent    = 0em,
       within        = \bool_if:NT \l__eb_class_mode_book_bool { chapter },
-      headpunct     = {},
+      headpunct     = :,
       headfont      = \color{ctex@emph}\sffamily,
       bodyfont      = \normalfont,
       postheadspace = 1em
@@ -1696,14 +1691,17 @@
     aligned,alignedat,gathered,multlined,lgathered,rgathered
   }
   { \setspread{\fp_use:N \l__eb_spread_math_fp} }
-\eb_patch_cmd:wnn
+\eb_seq_map_inline:nn
   { \start@gather,\start@align,\start@multline }
-  { \collect@body }
   {
-    \setspread{\fp_use:N \l__eb_spread_math_fp}
-    \collect@body
+    \eb_patch_cmd:Nnn #1
+      { \collect@body }
+      {
+        \setspread{\fp_use:N \l__eb_spread_math_fp}
+        \collect@body
+      }
   }
-\eb_patch_cmd:wnn \gather@split
+\eb_patch_cmd:Nnn \gather@split
   { \spread@equation }
   {
     \setspread{\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 fddc4ec97d2..55228fecd4e 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/10}{1.643}
+\ProvidesExplClass{easybook}{2022/03/11}{1.645}
   {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 12eabb01daa..c71408f8793 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/10}{1.643}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2022/03/11}{1.645}
   {Customization of tcolorbox for easybook}
 
 \cs_set_protected:Npn \addtotcbstyle #1#2