easybook (26jan22)

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

3 files changed, 13 insertions, 12 deletions

diff --git a/Master/texmf-dist/tex/latex/easybook/easybase.sty b/Master/texmf-dist/tex/latex/easybook/easybase.sty
index 6e0d456dc5c..6ec10a050ba 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/01/25}{1.52}
+\ProvidesExplPackage{easybase}{2022/01/25}{1.53}
   {Typeset Chinese theses or books}
 
 \cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -72,7 +72,7 @@
   }
 \cs_new_protected:Npn \eb_match_load_package:n #1
   {
-    \tl_if_in:nnTF {#1} { [ }
+    \regex_match:nnTF { \[ } {#1}
       {
         \seq_set_split:Nnn \l_tmpa_seq { [ } {#1}
         \seq_pop_left:NN \l_tmpa_seq \l_tmpa_tl
@@ -297,8 +297,8 @@
     hmargin         = 3.17cm,
     columnsep       = 2em,
     headheight      = 2.04cm,
-    headsep         = 0.5cm,
-    footnotesep     = 0.5cm,
+    headsep         = 0.4cm,
+    footnotesep     = 0.4cm,
     footskip        = 0.79cm,
     marginparsep    = 8pt,
     marginparwidth  = 2.54cm
@@ -352,7 +352,7 @@
       {\tl_set:cn { eb@mark@#1@label } {##1##2}}
     \cs_new_protected:cpn { eb_mark_#1_name_parse:n } ##1
       {
-        \tl_if_in:nnTF {##1} { [ }
+        \regex_match:nnTF { \[ } {##1}
           { \use:c { eb@mark@#1@label@layout }##1 }
           { \use:c { eb@mark@#1@label@layout }{##1} }
       }
@@ -538,10 +538,11 @@
     \eb_seq_map_inline:nn
       { A,a,1,I,i,c,s }
       {
-        \tl_if_in:nnT {#2} {##1}
+        \regex_match:nnT {##1} {#2}
           {
-            \tl_replace_once:Nnn \l__eb_fnmate_short_tokens_tl {##1}
-              { \eb_int_format_trans:NN ##1 \c@footnote }
+            \regex_replace_once:nnN {##1}
+              { \c{eb_int_format_trans:NN} ##1 \c{c@footnote} }
+              \l__eb_fnmate_short_tokens_tl
             \seq_map_break:
           }
       }
diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls
index 5f79c5e1de5..c5de0e3a3b3 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/01/25}{1.52}
+\ProvidesExplClass{easybook}{2022/01/25}{1.53}
   {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 1ad0843b3ef..3dca6194f0b 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/01/25}{1.52}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2022/01/25}{1.53}
   {Customization of tcolorbox for easybook}
 
 \cs_set_protected:Npn \addtotcbstyle #1#2
@@ -59,7 +59,7 @@
 \tcbset
   {
     breakable,
-    pad~at~break* = 3pt,
+    pad~at~break* = 0.5\baselineskip,
     sharpish~corners,
     fonttitle     = \sffamily,
     colframe      = black,
@@ -67,7 +67,7 @@
     boxrule       = 0.5pt
   }
 
-\DeclareTColorBox{easybox}{sO{PaleGoldenrod}d()O{}}
+\DeclareTColorBox{easybox}{sO{LemonChiffon}d()O{}}
   {
     IfBooleanF = {#1}{frame~hidden,boxrule = 0pt},
     IfValueT = {#3}{title = #3},