1 files changed, 24 insertions, 9 deletions
diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls
index fb4fdca32d0..43e8a2d0679 100644
--- a/Master/texmf-dist/tex/latex/easybook/easybook.cls
+++ b/Master/texmf-dist/tex/latex/easybook/easybook.cls
@@ -13,7 +13,7 @@
 %%   https://creativecommons.org/licenses/by/4.0/legalcode
 \NeedsTeXFormat{LaTeX2e}[2020/10/01]
 \RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplClass{easybook}{2021/05/30}{1.25o}{beta}
+\ProvidesExplClass{easybook}{2021/05/31}{1.25p}{beta}
 
 \cs_generate_variant:Nn \eb_ctex_define:nn { nx }
 \cs_generate_variant:Nn \int_to_arabic:n { v }
@@ -378,6 +378,21 @@
     \booltrue{@mainmatter}
     \pagenumbering{arabic}
   }
+\seq_const_from_clist:Nn \c__eb_mark_title_level_seq
+  { chapter,section,subsection }
+\seq_map_inline:Nn \c__eb_mark_title_level_seq
+  {
+    \exp_args:Nc \NewDocumentCommand { eb@mark@#1@label@layout }
+      {O{\use:c { CTEXthe#1 }}m}
+      {\tl_set:cn { eb@mark@#1@label } {##1##2}}
+    \cs_new:cpn { eb_mark_#1_number_bool:n } ##1
+      {
+        \tl_if_in:nnTF {##1} { [ }
+          { \use:c { eb@mark@#1@label@layout } ##1 }
+          { \use:c { eb@mark@#1@label@layout } {##1} }
+      }
+  }
+
 \cs_gset_eq:NN \easyhead \fancyhead
 \cs_gset_eq:NN \easyfoot \fancyfoot
 \eb_ctex_define:nn { hdrset }
@@ -427,12 +442,12 @@
               { \eb@mark@subsection@label }
           }#1
       },
-    chap-label .tl_set:N    = \eb@mark@chapter@label,
-    chap-label .initial:n   = \CTEXthechapter\hspace{\ccwd},
-    sec-label .tl_set:N     = \eb@mark@section@label,
-    sec-label .initial:n    = \CTEXthesection\hspace{0.5\ccwd},
-    subsec-label .tl_set:N  = \eb@mark@subsection@label,
-    subsec-label .initial:n = \CTEXthesubsection\hspace{0.5\ccwd},
+    chap-label .code:n      = \eb_mark_chapter_number_bool:n {#1},
+    chap-label .initial:n   = \hspace{\ccwd},
+    sec-label .code:n       = \eb_mark_section_number_bool:n {#1},
+    sec-label .initial:n    = \hspace{0.5\ccwd},
+    subsec-label .code:n    = \eb_mark_subsection_number_bool:n {#1},
+    subsec-label .initial:n = \hspace{0.5\ccwd},
 
     headrule .tl_gset:N = \headrule,
     headrule .initial:n =
@@ -1311,7 +1326,7 @@
 \allowdisplaybreaks[4]
 \DeclareGraphicsExtensions{.pdf,.png,.jpg,.eps,.tif}
 
-\cs_new_protected:Npn \eb_enumitem_labelval_set:nn #1#2
+\cs_new_protected:Npn \eb_enumitem_label_set:nn #1#2
   { \SetEnumitemValue{label}{#1}{\color{ctex@emph}#2} }
 \clist_map_inline:nn
   {
@@ -1323,7 +1338,7 @@
     { roman } { \roman*. },
     { outline } { \upshape\ding{111} }
   }
-  { \eb_enumitem_labelval_set:nn #1 }
+  { \eb_enumitem_label_set:nn #1 }
 \SetEnumitemValue{font}{sf}{\color{ctex@emph}\normalfont\sffamily}
 \SetEnumitemValue{ref}{enumii}{\arabic{enumi}.\alph*}
 \SetEnumitemValue{ref}{enumiii}{\arabic{enumi}.\alph{enumii}.\roman*}