1 files changed, 30 insertions, 20 deletions
diff --git a/Master/texmf-dist/source/latex/easybook/easybook.dtx b/Master/texmf-dist/source/latex/easybook/easybook.dtx
index d69282b790a..633dde041ce 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}{2021/11/22}{1.40V}
+\ProvidesExplClass{easybook}{2021/11/24}{1.40X}
   {Typeset Chinese theses or books}
 
 \bool_set_false:N \l__eb_compile_draft_bool
@@ -325,7 +325,7 @@
 %<*package>
 \NeedsTeXFormat{LaTeX2e}[2020/10/01]
 \RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2021/11/22}{1.40V}
+\ProvidesExplPackage{easybase}{2021/11/24}{1.40X}
   {Typeset Chinese theses or books}
 
 \cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -1854,7 +1854,6 @@
 \cs_new_protected:Npn \seteqcomp #1
   { \keys_set:nn { eb/eqcomp} {#1} }
 
-\cs_new:Npn \eb@itembox { \item\makebox }
 \cs_new:Npn \eb_eqsymb_left_margin_calc:
   {
     \hbox_set:Nn \l_tmpa_box { \l__eb_eqsymb_delim_tl }
@@ -1876,27 +1875,38 @@
       #3
     \end{eb@eqcomp@list}
   }{}
+\cs_new_protected:Npn \eb_eqsymb_format_mark:n #1
+  {
+    \tl_use:N \l__eb_eqsymb_font_tl
+      {
+        \tl_if_eq:NnT \l__eb_eqsymb_mode_tl { math }
+          { \ensuremath }{#1}
+      }
+  }
+\cs_new_protected:Npn \eb_eqsymb_space_delim:nn #1#2
+  {
+    \hspace{\l__eb_eqsymb_space_dim}
+    \IfBooleanTF{#1}
+      {\makebox{#2}}
+      {\makebox[\box_wd:N \l_tmpa_box][\l__eb_eqsymb_delim_align_tl]{#2}}
+    \hspace{\l__eb_eqsymb_space_dim}
+  }
+\cs_new_protected:Npn \eb@itembox { \item\makebox }
 \NewDocumentCommand{\symb}{smO{\l__eb_eqsymb_delim_tl}}
   {
     \IfBooleanTF{#1}
       {
-        \eb_eqsymb_left_margin_calc:
-        \makebox
+        \eb_eqsymb_format_mark:n {#2}
+        \eb_eqsymb_space_delim:nn {#1} {#3}
       }
-      {\eb@itembox}[\l_tmpa_dim]
       {
-        \makebox[\box_wd:N \l_tmpb_box]{\l__eb_eqsymb_intro_tl}
-        \makebox[\l__eb_eqsymb_width_dim][\l__eb_eqsymb_item_align_tl]
+        \eb@itembox[\l_tmpa_dim]
           {
-            \tl_use:N \l__eb_eqsymb_font_tl
-              {
-                \tl_if_eq:NnT \l__eb_eqsymb_mode_tl { math } 
-                  { \ensuremath }{#2}
-              }
+            \makebox[\box_wd:N \l_tmpb_box]{\l__eb_eqsymb_intro_tl}
+            \makebox[\l__eb_eqsymb_width_dim][\l__eb_eqsymb_item_align_tl]
+              {\eb_eqsymb_format_mark:n {#2}}
+            \eb_eqsymb_space_delim:nn {#1} {#3}
           }
-        \hspace{\l__eb_eqsymb_space_dim}
-        \makebox[\box_wd:N \l_tmpa_box][\l__eb_eqsymb_delim_align_tl]{#3}
-        \hspace{\l__eb_eqsymb_space_dim}
       }
     \tl_clear:N \l__eb_eqsymb_intro_tl
     \ignorespaces
@@ -1918,7 +1928,7 @@
 \cs_set_eq:NN \newtheorem \declaretheorem
 \cs_new_protected:Npn \eb_if_thmframe_with_tcolorbox:TF #1#2
   {
-    \bool_if:NT \l__eb_thmframe_bool
+    \bool_if:NT \l__eb_thm_frame_bool
       { \@ifpackageloaded{tcolorbox}{#1}{#2} }
   }
 \NewDocumentCommand{\deftheorem}
@@ -1954,7 +1964,7 @@
   { \ctex_define:nn { thmset } { #1 .tl_set:N = #2 } }
 \ctex_define:nn { thmset }
   {
-    thmframe .bool_set:N  = \l__eb_thmframe_bool,
+    thmframe .bool_set:N  = \l__eb_thm_frame_bool,
     thmframe .default:n   = true,
     thmframe .initial:n   = false,
     thmbox .meta:n        = { thmframe = #1 },
@@ -2370,7 +2380,7 @@
   }
 %</package>
 %<*tcolorbox>
-\ProvidesExplFile{eb-tcolorbox.cfg}{2021/11/22}{1.40V}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2021/11/24}{1.40X}
   {Customization of tcolorbox for easybook}
 
 \cs_set_protected:Npn \setexercise #1
@@ -2465,7 +2475,7 @@
 \newtcbstyle{tc-ebfbox}
   {
     on~line,sharpish~corners,
-    top = 2pt,bottom = 2pt,left = 1pt,right = 1pt,
+    top = 1.5pt,bottom = 1.5pt,left = 1pt,right = 1pt,
     boxrule = 0.5pt,leftrule = 0pt,rightrule = 0pt
   }
 \tcbset