easybook (21oct21)

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

6 files changed, 120 insertions, 122 deletions

diff --git a/Master/texmf-dist/doc/latex/easybook/easybook.pdf b/Master/texmf-dist/doc/latex/easybook/easybook.pdf
index 3bfd5d67903..06436bb1e8b 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 07274eeb2cd..43d36ab1716 100644
--- a/Master/texmf-dist/doc/latex/easybook/easybook.tex
+++ b/Master/texmf-dist/doc/latex/easybook/easybook.tex
@@ -20,8 +20,8 @@
     name            = easybook,
     color-scheme    = blue,
     title           = EASYBOOK 使用手册,
-    version         = v1.3S,
-    date            = 2021/10/20,
+    version         = v1.3X,
+    date            = 2021/10/21,
     authors         = 瞿毅,
     info            = 排版简体中文学位论文和书籍,
     email           = q1jx@foxmail.com,
@@ -960,7 +960,7 @@
 
   \meta{键值列表2} 包括 \pkg*{tcolorbox} 的盒子样式选项，例如 \option*{boxsep} 和 \option*{fontupper} 等，也可以使用下述 \option{tcolorbox} 选项。在这里可以使用 \cs{addtcbstyle} 命令设置标题选项 \meta{键值列表2} 的值，第一个参数为 \code{tc-exercise}。
   \begin{ctexexam}
-  \tcphantomifname{\markright{\counteruse{tcbcounter}{\quad 习题}}}{}
+  \tcphantomifname{\markright{\counteruse{tcbcounter}\quad 习题}}{}
   \addtcbstyle{tc-exercise}{boxsep = 5pt}
   \exerprologue{习题前的一段文本}
   \begin{exercise}+[color = LightSkyBlue](after skip = 2pc)[itemsep = 1ex]
@@ -1089,13 +1089,13 @@
 \subsection{计数器}
 \begin{commands}\noitemsep
   \command{newcounter}[\marg{计数器}\oarg{父计数器}]\default{}
-  \command{counteruse}[\sarg\oarg{父计数器}\darg{编号}\marg{计数器}\marg{内容}\oarg{分隔符}]
-  命令 \cs{newcounter} 是 \LaTeX 自带的创建计数器命令，命令 \cs{counteruse} 以一定的格式使用由它创建的计数器，将会以 \cs*{the}\meta{父计数器}\meta{分隔符}\cs*{the}\meta{计数器}\meta{内容} 输出当前内容。注意 \cs{counteruse} 仅具有\textbf{输出功能}，并不会改变计数器原有的绑定关系。默认每使用一次命令 \meta{计数器} 的值增加 1，带有星号的命令使 \meta{计数器} 值保持不变，\meta{编号} 为 \code{arabic} 或 \code{alpha} 等形式，\meta{数值} 可以手动将 \meta{计数器} 设为指定值。
+  \command{counteruse}[\sarg\oarg{父计数器}\darg{编号}\marg{计数器}\oarg{分隔符}\darg{整数}]
+  命令 \cs{newcounter} 是 \LaTeX 自带的创建计数器命令，计数器值输出命令 \cs{counteruse} 以一定的格式使用由它创建的计数器，将会以 \cs*{the}\meta{父计数器}\meta{分隔符}\cs*{the}\meta{计数器} 输出这种计数器的值。命令 \cs{counteruse} 仅具有\textbf{输出功能}，并不会改变计数器原有的绑定关系。默认每使用一次命令 \meta{计数器} 的值增加 1，带有星号的命令使 \meta{计数器} 值保持不变，\meta{编号} 为 \code{arabic} 或 \code{alpha} 等形式，\meta{计数器} 的值也可以设为指定的 \meta{整数}。
 
   在一定的场合下可能用到 \cs{counteruse} 命令，比如通过新建快捷命令在一些位置使用定理环境的计数器，使用 \cs{labelformat} 设置计数器的引用标签需添加 \code{eb@}：
   \begin{ctexexam}
   \labelformat{eb@theorem}{定理 #1}
-  \newcommand{\theoremhead}[1]{定理 \counteruse[chapter]{theorem}{\hspace{1em}#1}}
+  \newcommand{\theoremhead}[1]{定理\counteruse[chapter]{theorem}\hspace{1em}#1}
   \theoremhead{定理内容}\label{thm:theorem}
   \end{ctexexam}
 \end{commands}
diff --git a/Master/texmf-dist/source/latex/easybook/easybook.dtx b/Master/texmf-dist/source/latex/easybook/easybook.dtx
index d1a50adb6b1..6fef9a504ac 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/10/20}{1.3S}
+\ProvidesExplClass{easybook}{2021/10/21}{1.3X}
   {Typeset Chinese theses or books}
 
 \bool_set_false:N \l__eb_compile_draft_bool
@@ -319,7 +319,7 @@
 %<*package>
 \NeedsTeXFormat{LaTeX2e}[2020/10/01]
 \RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2021/10/20}{1.3S}
+\ProvidesExplPackage{easybase}{2021/10/21}{1.3X}
   {Typeset Chinese theses or books}
 
 \cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -394,7 +394,7 @@
   {
     The~macro~package~#1~has~been~reloaded. \\
     Please~pass~the~arguments~by \\
-    the~\string\PassOptionsToPackage{\#1}{#1}\space~command.
+    the~\string\PassOptionsToPackage{\#1}{#1}\ command.
   }
 \cs_set_eq:NN \eb@usepackage@save \usepackage
 \RenewDocumentCommand{\usepackage}{O{}m}
@@ -523,7 +523,7 @@
 \msg_new:nnn { easybase } { no-chapter }
   {
     Your~document~class~is~in~article~mode. \\
-    The~\string\chapter\space~command~will~not~be~used.
+    The~\string\chapter\ command~will~not~be~used.
   }
 
 \LoadPackage
@@ -778,23 +778,23 @@
     footwith .value_required:n  = true,
     footwith .initial:n         = chapter
   }
-\NewDocumentCommand{\eb_assign_fnmark_code:n}
+\NewDocumentCommand{\eb_assign_fntext_code:n}
   {>{\SplitArgument{1}{,}}m}
   {\eb_assign_fnmark_code_pos:nn #1}
 \cs_new_protected:Npn \eb_assign_fnmark_code_pos:nn #1#2
   {
-    \tl_set:Nn \l__eb_fnmark_before_tl {#1}
+    \tl_set:Nn \l__eb_fntext_before_tl {#1}
     \tl_if_novalue:nTF {#2}
-      { \tl_clear:N \l__eb_fnmark_after_tl }
-      { \tl_set:Nn \l__eb_fnmark_after_tl {#2} }
+      { \tl_clear:N \l__eb_fntext_after_tl }
+      { \tl_set:Nn \l__eb_fntext_after_tl {#2} }
   }
-\cs_new:Npn \eb_fnmark_counter_pifont:N #1
+\cs_new:Npn \eb_fnmate_counter_pifont:N #1
   { \ding{\int_eval:n { 171 + #1 }} }
-\cs_new:Npn \eb_fnmark_counter_pifont_neg:N #1
+\cs_new:Npn \eb_fnmate_counter_pifont_neg:N #1
   { \ding{\int_eval:n { 181 + #1 }} }
-\cs_new:Npn \eb_fnmark_counter_pisans:N #1
+\cs_new:Npn \eb_fnmate_counter_pisans:N #1
   { \ding{\int_eval:n { 191 + #1 }} }
-\cs_new:Npn \eb_fnmark_counter_pisans_neg:N #1
+\cs_new:Npn \eb_fnmate_counter_pisans_neg:N #1
   { \ding{\int_eval:n { 201 + #1 }} }
 \cs_new:Npn \eb_int_format_trans:NN #1
   {
@@ -808,41 +808,41 @@
         { c } { \exp_args:NV \zhnumber }
       }
   }
-\cs_new_protected:Npn \eb_fnmark_normal_label_set:nn #1#2
+\cs_new_protected:Npn \eb_fnmate_normal_label_set:nn #1#2
   {
-    \tl_set:Nn \l__eb_fnmark_number_type_tl {#1}
+    \tl_set:Nn \l__eb_fnmate_number_type_tl {#1}
     \cs_set:cpx {#2}
       {
-        \str_case:VnT \l__eb_fnmark_number_type_tl
+        \str_case:VnT \l__eb_fnmate_number_type_tl
           {
             { plain }
             { \exp_not:N \int_use:N }
             { pifont }
-            { \exp_not:N \eb_fnmark_counter_pifont:N }
+            { \exp_not:N \eb_fnmate_counter_pifont:N }
             { pifont* }
-            { \exp_not:N \eb_fnmark_counter_pifont_neg:N }
+            { \exp_not:N \eb_fnmate_counter_pifont_neg:N }
             { pisans }
-            { \exp_not:N \eb_fnmark_counter_pisans:N }
+            { \exp_not:N \eb_fnmate_counter_pisans:N }
             { pisans* }
-            { \exp_not:N \eb_fnmark_counter_pisans_neg:N }
+            { \exp_not:N \eb_fnmate_counter_pisans_neg:N }
           }
           { \exp_not:N \c@footnote }
       }
   }
-\cs_new_protected:Npn \eb_fnmark_short_label_set:nn #1#2
+\cs_new_protected:Npn \eb_fnmate_short_label_set:nn #1#2
   {
-    \tl_set:Nn \l__eb_fnmark_short_tokens_tl {#1}
+    \tl_set:Nn \l__eb_fnmate_short_tokens_tl {#1}
     \eb_clist_map_inline:nn
       { A,a,1,I,i,c }
       {
         \tl_if_in:nnT {#1} {##1}
           {
-            \tl_replace_once:Nnn \l__eb_fnmark_short_tokens_tl {##1}
+            \tl_replace_once:Nnn \l__eb_fnmate_short_tokens_tl {##1}
               { \eb_int_format_trans:NN ##1 \c@footnote }
             \seq_map_break:
           }
       }
-    \cs_set_eq:cN {#2} \l__eb_fnmark_short_tokens_tl
+    \cs_set_eq:cN {#2} \l__eb_fnmate_short_tokens_tl
   }
 \cs_new_protected:Npn \eb_footnote_choice_handle:n #1
   {
@@ -863,7 +863,7 @@
           { \tl_set:Nn \l__eb_footnote_choice_tl {#1} }
       }
   }
-\cs_new_protected:Npn \eb_fn_shift_set:nnn #1#2#3
+\cs_new_protected:Npn \eb_fnmate_shift_set:nnn #1#2#3
   {
     \str_if_eq:nnTF {#1} { match }
       {
@@ -872,7 +872,7 @@
       }
       { \tl_set:cn { l__eb_fn#2_#3shift_tl } {#1} }
   }
-\cs_new_protected:Npn \eb_fn_format_set:nn #1#2
+\cs_new_protected:Npn \eb_fnboth_format_set:nn #1#2
   {
     \str_if_eq:nnTF {#1} { match }
       { \bool_set_true:c { l__eb_fn#2_format_match_bool } }
@@ -898,11 +898,11 @@
 
     fntext-pos .tl_set:N            = \l__eb_fntext_position_tl,
     fntext-pos .initial:n           = super,
-    fntext-code .code:n             = \eb_assign_fnmark_code:n {#1},
+    fntext-code .code:n             = \eb_assign_fntext_code:n {#1},
     fntext-code .initial:n          =
-      { ,\tl_if_eq:NnF \l__eb_fntext_position_tl { super } { \space } },
-    fnmate-form .code:n             = \eb_fn_format_set:nn {#1} { mate },
-    fncust-form .code:n             = \eb_fn_format_set:nn {#1} { cust },
+      { ,\tl_if_eq:NnF \l__eb_fntext_position_tl { super } { ~ } },
+    fnmate-form .code:n = \eb_fnboth_format_set:nn {#1} { mate },
+    fncust-form .code:n = \eb_fnboth_format_set:nn {#1} { cust },
     fnboth-form .meta:n = { fnmate-form = #1,fncust-form = #1 },
 
     footnotetype .multichoices:nn   =
@@ -911,25 +911,25 @@
     footnotetype .value_required:n  = true,
     footnotetype .initial:n         = hang,
 
-    fnmark-vshift .code:n = \eb_fn_shift_set:nnn {#1} { mark } { v },
-    fnmark-hshift .code:n = \eb_fn_shift_set:nnn {#1} { mark } { h },
-    fntext-vshift .code:n = \eb_fn_shift_set:nnn {#1} { text } { v },
+    fnmark-vshift .code:n = \eb_fnmate_shift_set:nnn {#1} { mark } { v },
+    fnmark-hshift .code:n = \eb_fnmate_shift_set:nnn {#1} { mark } { h },
+    fntext-vshift .code:n = \eb_fnmate_shift_set:nnn {#1} { text } { v },
     fnmark-vshift .initial:n        = 0pt,
     fnmark-hshift .initial:n        = 0pt,
     fntext-vshift .initial:n        = 0pt,
 
     fnmark-num .choices:nn          =
       { plain,pifont,pifont*,pifont-sans,pifont-sans* }
-      { \eb_fnmark_normal_label_set:nn {#1} { the@footnote } },
+      { \eb_fnmate_normal_label_set:nn {#1} { the@footnote } },
     fnmark-num .value_required:n    = true,
     fnmark-num/unknown .code:n      =
-      { \eb_fnmark_short_label_set:nn {#1} { the@footnote } },
+      { \eb_fnmate_short_label_set:nn {#1} { the@footnote } },
     fntext-num .choices:nn          =
       { plain,pifont,pifont*,pifont-sans,pifont-sans* }
-      { \eb_fnmark_normal_label_set:nn {#1} { thefootnote } },
+      { \eb_fnmate_normal_label_set:nn {#1} { thefootnote } },
     fntext-num .value_required:n    = true,
     fntext-num/unknown .code:n      =
-      { \eb_fnmark_short_label_set:nn {#1} { thefootnote } },
+      { \eb_fnmate_short_label_set:nn {#1} { thefootnote } },
     fnboth-num .meta:n = { fntext-num = #1,fnmark-num = #1 },
     fnboth-num .initial:n           = plain,
     unknown .code:n = \eb_msg_unknown_option:n { hdrset }
@@ -1103,7 +1103,7 @@
 
 \ProvideDocumentCommand{\super}{omo}{\textsuperscript{#3}}
 \providecommand{\spbset}{\use_none:n}
-\NewDocumentCommand{\eb@fnmark@super}{sm}
+\NewDocumentCommand{\eb@fnmate@super}{sm}
   {
     \IfBooleanTF{#1}
       {\super[\l__eb_fntext_vshift_tl]{#2}[0pt]}
@@ -1113,7 +1113,7 @@
               [\l__eb_fnmark_hshift_tl]
       }
   }
-\cs_new_protected:Npn \eb_fnmark_format_initial:
+\cs_new_protected:Npn \eb_fnmate_format_initial:
   {
     \bool_if:NTF \l__eb_normal_footnote_bool
       {
@@ -1135,24 +1135,24 @@
   {
     \hbox:n
       {
-        \eb_fnmark_format_initial:
+        \eb_fnmate_format_initial:
         \tl_if_eq:NnTF \@mpfn { footnote }
-          { \eb@fnmark@super{\eb@thefnmark} }
-          { \eb@fnmark@super{\@thefnmark} }
+          { \eb@fnmate@super{\eb@thefnmark} }
+          { \eb@fnmate@super{\@thefnmark} }
       }
   }
 \cs_new:Npn \eb@makefnmark
   {
     \hbox:n
       {
-        \eb_fnmark_format_initial:
+        \eb_fnmate_format_initial:
         \tl_if_eq:NnT \l__eb_fntext_position_tl { super }
-          { \eb@fnmark@super* }
+          { \eb@fnmate@super* }
           {
-            \tl_use:N \l__eb_fnmark_before_tl
+            \tl_use:N \l__eb_fntext_before_tl
               {\l__eb_fnmate_format_tl{\@thefnmark}}
           }
-        \tl_use:N \l__eb_fnmark_after_tl
+        \tl_use:N \l__eb_fntext_after_tl
       }
   }
 
@@ -1374,19 +1374,19 @@
 
     figure/tocline      =
       {
-        \figurename\space #1
+        \figurename~#1
         \bool_if:NF \eb@titletoc@hang@fix@bool
           { \hspace{\eb@toc@figure@numsep} }
       },
     table/tocline       =
       {
-        \tablename\space #1
+        \tablename~#1
         \bool_if:NF \eb@titletoc@hang@fix@bool
           { \hspace{\eb@toc@table@numsep} }
       },
     lstlisting/tocline  =
       {
-        \lstlistingname\space\thelstlisting
+        \lstlistingname~\thelstlisting
         \bool_if:NF \eb@titletoc@hang@fix@bool
           { \hspace{\eb@toc@lstlisting@numsep} }
       },
@@ -1432,17 +1432,16 @@
         \tl_use:c { the#1 }
       }
   }
-\NewDocumentCommand{\counteruse}{soD(){arabic}mmO{.}d()}
+\NewDocumentCommand{\counteruse}{soD(){arabic}mO{.}d()}
   {
     \IfBooleanF{#1}{\stepcounter{#4}}
-    \IfValueT{#7}{\setcounter{#4}{#7}}
+    \IfValueT{#6}{\setcounter{#4}{#6}}
     \tl_set:cn { theeb@#4 }
       {
-        \IfValueT{#2}{\use:c { the#2 }#6}
-        \use:c {#3}{#4}\space #5
+        \IfValueT{#2}{\use:c { the#2 }#5}
+        \use:c {#3}{#4}
       }
     \tl_use:c { theeb@#4 }
-    \tl_remove_once:cn { theeb@#4 } {#5}
     \eb_current_label:n { eb@#4 }
   }
 \cs_new:Npn \eb_section_counter_prefix:n #1
@@ -2041,7 +2040,7 @@
     \def\NAME
       {
         \the\thm@headfont ##1
-        \peek_meaning:NT \NUMBER { \tl_if_blank:nF {##2} { \space } }
+        \peek_meaning:NT \NUMBER { \tl_if_blank:nF {##2} { \ } }
       }
   }
 \ctex_set:nn { thmset }
@@ -2143,11 +2142,11 @@
     enumitem .code:n  = \setexerlist{#1},
     tcolorbox .code:n = \addtcbstyle{exercise}{#1}
   }
-\cs_new_protected:Npn \setexercise #1
+\cs_set_protected:Npn \setexercise #1
   { \keys_set:nn { eb/exercise } {#1} }
-\cs_new_protected:Npn \addtcbstyle #1#2
+\cs_set_protected:Npn \addtcbstyle #1#2
   { \tcbset{#1/.append~style = {#2}} }
-\cs_new_protected:Npn \newtcbstyle #1#2
+\cs_set_protected:Npn \newtcbstyle #1#2
   { \tcbset{#1/.style = {#2}} }
 \cs_new_protected:Npn \tcbappstyle
   { \@ifstar{\newtcbstyle}{\addtcbstyle} }
@@ -2470,7 +2469,7 @@
   }
 %</package>
 %<*tcolorbox>
-\ProvidesExplFile{eb-tcolorbox.cfg}{2021/10/20}{1.3S}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2021/10/21}{1.3X}
   {Customization of tcolorbox for easybook}
 
 \tl_gset:Nn \eb@tc@line@skip { 0.5\baselineskip }
diff --git a/Master/texmf-dist/tex/latex/easybook/easybase.sty b/Master/texmf-dist/tex/latex/easybook/easybase.sty
index bb0e6bd07a3..8feab5474ab 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}{2021/10/20}{1.3S}
+\ProvidesExplPackage{easybase}{2021/10/21}{1.3X}
   {Typeset Chinese theses or books}
 
 \cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -95,7 +95,7 @@
   {
     The~macro~package~#1~has~been~reloaded. \\
     Please~pass~the~arguments~by \\
-    the~\string\PassOptionsToPackage{\#1}{#1}\space~command.
+    the~\string\PassOptionsToPackage{\#1}{#1}\ command.
   }
 \cs_set_eq:NN \eb@usepackage@save \usepackage
 \RenewDocumentCommand{\usepackage}{O{}m}
@@ -224,7 +224,7 @@
 \msg_new:nnn { easybase } { no-chapter }
   {
     Your~document~class~is~in~article~mode. \\
-    The~\string\chapter\space~command~will~not~be~used.
+    The~\string\chapter\ command~will~not~be~used.
   }
 
 \LoadPackage
@@ -479,23 +479,23 @@
     footwith .value_required:n  = true,
     footwith .initial:n         = chapter
   }
-\NewDocumentCommand{\eb_assign_fnmark_code:n}
+\NewDocumentCommand{\eb_assign_fntext_code:n}
   {>{\SplitArgument{1}{,}}m}
   {\eb_assign_fnmark_code_pos:nn #1}
 \cs_new_protected:Npn \eb_assign_fnmark_code_pos:nn #1#2
   {
-    \tl_set:Nn \l__eb_fnmark_before_tl {#1}
+    \tl_set:Nn \l__eb_fntext_before_tl {#1}
     \tl_if_novalue:nTF {#2}
-      { \tl_clear:N \l__eb_fnmark_after_tl }
-      { \tl_set:Nn \l__eb_fnmark_after_tl {#2} }
+      { \tl_clear:N \l__eb_fntext_after_tl }
+      { \tl_set:Nn \l__eb_fntext_after_tl {#2} }
   }
-\cs_new:Npn \eb_fnmark_counter_pifont:N #1
+\cs_new:Npn \eb_fnmate_counter_pifont:N #1
   { \ding{\int_eval:n { 171 + #1 }} }
-\cs_new:Npn \eb_fnmark_counter_pifont_neg:N #1
+\cs_new:Npn \eb_fnmate_counter_pifont_neg:N #1
   { \ding{\int_eval:n { 181 + #1 }} }
-\cs_new:Npn \eb_fnmark_counter_pisans:N #1
+\cs_new:Npn \eb_fnmate_counter_pisans:N #1
   { \ding{\int_eval:n { 191 + #1 }} }
-\cs_new:Npn \eb_fnmark_counter_pisans_neg:N #1
+\cs_new:Npn \eb_fnmate_counter_pisans_neg:N #1
   { \ding{\int_eval:n { 201 + #1 }} }
 \cs_new:Npn \eb_int_format_trans:NN #1
   {
@@ -509,41 +509,41 @@
         { c } { \exp_args:NV \zhnumber }
       }
   }
-\cs_new_protected:Npn \eb_fnmark_normal_label_set:nn #1#2
+\cs_new_protected:Npn \eb_fnmate_normal_label_set:nn #1#2
   {
-    \tl_set:Nn \l__eb_fnmark_number_type_tl {#1}
+    \tl_set:Nn \l__eb_fnmate_number_type_tl {#1}
     \cs_set:cpx {#2}
       {
-        \str_case:VnT \l__eb_fnmark_number_type_tl
+        \str_case:VnT \l__eb_fnmate_number_type_tl
           {
             { plain }
             { \exp_not:N \int_use:N }
             { pifont }
-            { \exp_not:N \eb_fnmark_counter_pifont:N }
+            { \exp_not:N \eb_fnmate_counter_pifont:N }
             { pifont* }
-            { \exp_not:N \eb_fnmark_counter_pifont_neg:N }
+            { \exp_not:N \eb_fnmate_counter_pifont_neg:N }
             { pisans }
-            { \exp_not:N \eb_fnmark_counter_pisans:N }
+            { \exp_not:N \eb_fnmate_counter_pisans:N }
             { pisans* }
-            { \exp_not:N \eb_fnmark_counter_pisans_neg:N }
+            { \exp_not:N \eb_fnmate_counter_pisans_neg:N }
           }
           { \exp_not:N \c@footnote }
       }
   }
-\cs_new_protected:Npn \eb_fnmark_short_label_set:nn #1#2
+\cs_new_protected:Npn \eb_fnmate_short_label_set:nn #1#2
   {
-    \tl_set:Nn \l__eb_fnmark_short_tokens_tl {#1}
+    \tl_set:Nn \l__eb_fnmate_short_tokens_tl {#1}
     \eb_clist_map_inline:nn
       { A,a,1,I,i,c }
       {
         \tl_if_in:nnT {#1} {##1}
           {
-            \tl_replace_once:Nnn \l__eb_fnmark_short_tokens_tl {##1}
+            \tl_replace_once:Nnn \l__eb_fnmate_short_tokens_tl {##1}
               { \eb_int_format_trans:NN ##1 \c@footnote }
             \seq_map_break:
           }
       }
-    \cs_set_eq:cN {#2} \l__eb_fnmark_short_tokens_tl
+    \cs_set_eq:cN {#2} \l__eb_fnmate_short_tokens_tl
   }
 \cs_new_protected:Npn \eb_footnote_choice_handle:n #1
   {
@@ -564,7 +564,7 @@
           { \tl_set:Nn \l__eb_footnote_choice_tl {#1} }
       }
   }
-\cs_new_protected:Npn \eb_fn_shift_set:nnn #1#2#3
+\cs_new_protected:Npn \eb_fnmate_shift_set:nnn #1#2#3
   {
     \str_if_eq:nnTF {#1} { match }
       {
@@ -573,7 +573,7 @@
       }
       { \tl_set:cn { l__eb_fn#2_#3shift_tl } {#1} }
   }
-\cs_new_protected:Npn \eb_fn_format_set:nn #1#2
+\cs_new_protected:Npn \eb_fnboth_format_set:nn #1#2
   {
     \str_if_eq:nnTF {#1} { match }
       { \bool_set_true:c { l__eb_fn#2_format_match_bool } }
@@ -599,11 +599,11 @@
 
     fntext-pos .tl_set:N            = \l__eb_fntext_position_tl,
     fntext-pos .initial:n           = super,
-    fntext-code .code:n             = \eb_assign_fnmark_code:n {#1},
+    fntext-code .code:n             = \eb_assign_fntext_code:n {#1},
     fntext-code .initial:n          =
-      { ,\tl_if_eq:NnF \l__eb_fntext_position_tl { super } { \space } },
-    fnmate-form .code:n             = \eb_fn_format_set:nn {#1} { mate },
-    fncust-form .code:n             = \eb_fn_format_set:nn {#1} { cust },
+      { ,\tl_if_eq:NnF \l__eb_fntext_position_tl { super } { ~ } },
+    fnmate-form .code:n = \eb_fnboth_format_set:nn {#1} { mate },
+    fncust-form .code:n = \eb_fnboth_format_set:nn {#1} { cust },
     fnboth-form .meta:n = { fnmate-form = #1,fncust-form = #1 },
 
     footnotetype .multichoices:nn   =
@@ -612,25 +612,25 @@
     footnotetype .value_required:n  = true,
     footnotetype .initial:n         = hang,
 
-    fnmark-vshift .code:n = \eb_fn_shift_set:nnn {#1} { mark } { v },
-    fnmark-hshift .code:n = \eb_fn_shift_set:nnn {#1} { mark } { h },
-    fntext-vshift .code:n = \eb_fn_shift_set:nnn {#1} { text } { v },
+    fnmark-vshift .code:n = \eb_fnmate_shift_set:nnn {#1} { mark } { v },
+    fnmark-hshift .code:n = \eb_fnmate_shift_set:nnn {#1} { mark } { h },
+    fntext-vshift .code:n = \eb_fnmate_shift_set:nnn {#1} { text } { v },
     fnmark-vshift .initial:n        = 0pt,
     fnmark-hshift .initial:n        = 0pt,
     fntext-vshift .initial:n        = 0pt,
 
     fnmark-num .choices:nn          =
       { plain,pifont,pifont*,pifont-sans,pifont-sans* }
-      { \eb_fnmark_normal_label_set:nn {#1} { the@footnote } },
+      { \eb_fnmate_normal_label_set:nn {#1} { the@footnote } },
     fnmark-num .value_required:n    = true,
     fnmark-num/unknown .code:n      =
-      { \eb_fnmark_short_label_set:nn {#1} { the@footnote } },
+      { \eb_fnmate_short_label_set:nn {#1} { the@footnote } },
     fntext-num .choices:nn          =
       { plain,pifont,pifont*,pifont-sans,pifont-sans* }
-      { \eb_fnmark_normal_label_set:nn {#1} { thefootnote } },
+      { \eb_fnmate_normal_label_set:nn {#1} { thefootnote } },
     fntext-num .value_required:n    = true,
     fntext-num/unknown .code:n      =
-      { \eb_fnmark_short_label_set:nn {#1} { thefootnote } },
+      { \eb_fnmate_short_label_set:nn {#1} { thefootnote } },
     fnboth-num .meta:n = { fntext-num = #1,fnmark-num = #1 },
     fnboth-num .initial:n           = plain,
     unknown .code:n = \eb_msg_unknown_option:n { hdrset }
@@ -804,7 +804,7 @@
 
 \ProvideDocumentCommand{\super}{omo}{\textsuperscript{#3}}
 \providecommand{\spbset}{\use_none:n}
-\NewDocumentCommand{\eb@fnmark@super}{sm}
+\NewDocumentCommand{\eb@fnmate@super}{sm}
   {
     \IfBooleanTF{#1}
       {\super[\l__eb_fntext_vshift_tl]{#2}[0pt]}
@@ -814,7 +814,7 @@
               [\l__eb_fnmark_hshift_tl]
       }
   }
-\cs_new_protected:Npn \eb_fnmark_format_initial:
+\cs_new_protected:Npn \eb_fnmate_format_initial:
   {
     \bool_if:NTF \l__eb_normal_footnote_bool
       {
@@ -836,24 +836,24 @@
   {
     \hbox:n
       {
-        \eb_fnmark_format_initial:
+        \eb_fnmate_format_initial:
         \tl_if_eq:NnTF \@mpfn { footnote }
-          { \eb@fnmark@super{\eb@thefnmark} }
-          { \eb@fnmark@super{\@thefnmark} }
+          { \eb@fnmate@super{\eb@thefnmark} }
+          { \eb@fnmate@super{\@thefnmark} }
       }
   }
 \cs_new:Npn \eb@makefnmark
   {
     \hbox:n
       {
-        \eb_fnmark_format_initial:
+        \eb_fnmate_format_initial:
         \tl_if_eq:NnT \l__eb_fntext_position_tl { super }
-          { \eb@fnmark@super* }
+          { \eb@fnmate@super* }
           {
-            \tl_use:N \l__eb_fnmark_before_tl
+            \tl_use:N \l__eb_fntext_before_tl
               {\l__eb_fnmate_format_tl{\@thefnmark}}
           }
-        \tl_use:N \l__eb_fnmark_after_tl
+        \tl_use:N \l__eb_fntext_after_tl
       }
   }
 
@@ -1075,19 +1075,19 @@
 
     figure/tocline      =
       {
-        \figurename\space #1
+        \figurename~#1
         \bool_if:NF \eb@titletoc@hang@fix@bool
           { \hspace{\eb@toc@figure@numsep} }
       },
     table/tocline       =
       {
-        \tablename\space #1
+        \tablename~#1
         \bool_if:NF \eb@titletoc@hang@fix@bool
           { \hspace{\eb@toc@table@numsep} }
       },
     lstlisting/tocline  =
       {
-        \lstlistingname\space\thelstlisting
+        \lstlistingname~\thelstlisting
         \bool_if:NF \eb@titletoc@hang@fix@bool
           { \hspace{\eb@toc@lstlisting@numsep} }
       },
@@ -1133,17 +1133,16 @@
         \tl_use:c { the#1 }
       }
   }
-\NewDocumentCommand{\counteruse}{soD(){arabic}mmO{.}d()}
+\NewDocumentCommand{\counteruse}{soD(){arabic}mO{.}d()}
   {
     \IfBooleanF{#1}{\stepcounter{#4}}
-    \IfValueT{#7}{\setcounter{#4}{#7}}
+    \IfValueT{#6}{\setcounter{#4}{#6}}
     \tl_set:cn { theeb@#4 }
       {
-        \IfValueT{#2}{\use:c { the#2 }#6}
-        \use:c {#3}{#4}\space #5
+        \IfValueT{#2}{\use:c { the#2 }#5}
+        \use:c {#3}{#4}
       }
     \tl_use:c { theeb@#4 }
-    \tl_remove_once:cn { theeb@#4 } {#5}
     \eb_current_label:n { eb@#4 }
   }
 \cs_new:Npn \eb_section_counter_prefix:n #1
@@ -1742,7 +1741,7 @@
     \def\NAME
       {
         \the\thm@headfont ##1
-        \peek_meaning:NT \NUMBER { \tl_if_blank:nF {##2} { \space } }
+        \peek_meaning:NT \NUMBER { \tl_if_blank:nF {##2} { \ } }
       }
   }
 \ctex_set:nn { thmset }
@@ -1844,11 +1843,11 @@
     enumitem .code:n  = \setexerlist{#1},
     tcolorbox .code:n = \addtcbstyle{exercise}{#1}
   }
-\cs_new_protected:Npn \setexercise #1
+\cs_set_protected:Npn \setexercise #1
   { \keys_set:nn { eb/exercise } {#1} }
-\cs_new_protected:Npn \addtcbstyle #1#2
+\cs_set_protected:Npn \addtcbstyle #1#2
   { \tcbset{#1/.append~style = {#2}} }
-\cs_new_protected:Npn \newtcbstyle #1#2
+\cs_set_protected:Npn \newtcbstyle #1#2
   { \tcbset{#1/.style = {#2}} }
 \cs_new_protected:Npn \tcbappstyle
   { \@ifstar{\newtcbstyle}{\addtcbstyle} }
diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls
index 1748f23e014..d36d0864bb9 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}{2021/10/20}{1.3S}
+\ProvidesExplClass{easybook}{2021/10/21}{1.3X}
   {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 c95ff0be7fe..df58f4813dc 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}{2021/10/20}{1.3S}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2021/10/21}{1.3X}
   {Customization of tcolorbox for easybook}
 
 \tl_gset:Nn \eb@tc@line@skip { 0.5\baselineskip }