1 files changed, 34 insertions, 35 deletions

diff --git a/Master/texmf-dist/source/latex/easybook/easybook.dtx b/Master/texmf-dist/source/latex/easybook/easybook.dtx
index 29456c1287f..778d47e92ad 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/08/16}{1.28q}
+\ProvidesExplClass{easybook}{2021/08/16}{1.29}
   {Typeset Chinese theses or books}
 
 \bool_set_false:N \l__eb_compile_draft_bool
@@ -63,7 +63,7 @@
   }
 
 \ProcessKeysOptions{easybook}
-\PassOptionsToPackage{no-math,quiet,CJKmath}{xeCJK}
+\PassOptionsToPackage{CJKmath,quiet}{xeCJK}
 \eb_put_ctexbook:n { \g__eb_options_clist }
 \LoadClass[UTF8]{ctexbook}
 
@@ -297,7 +297,7 @@
 %<*package>
 \NeedsTeXFormat{LaTeX2e}[2020/10/01]
 \RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2021/08/16}{1.28q}
+\ProvidesExplPackage{easybase}{2021/08/16}{1.29}
   {Typeset Chinese theses or books}
 
 \cs_generate_variant:Nn \dim_add:Nn { NV,Nv }
@@ -437,7 +437,7 @@
       { \clist_gput_right:NV \g__eb_ctex_options_clist \CurrentOption }
   }
 
-\clist_map_inline:nn
+\eb_clist_map_inline:nn
   {
     { protrusion = false } { microtype },
     { list = off } { bicaption },
@@ -536,7 +536,7 @@
     if~you~continue~compiling. \\\\
     Please~update~your~macro~package~from~CTAN.
   }
-\clist_map_inline:nn
+\eb_clist_map_inline:nn
   {
     { expl3 } { 2020/10/27 },
     { xparse } { 2020/10/27 },
@@ -1548,21 +1548,18 @@
     \eb_toc_start_multi_column_ext:n {#5}
     \group_end:
   }
-\clist_map_inline:nn
+\cs_new_protected:Npn \eb_list_content_cmd_set:nn #1#2
   {
-    { figure,lof },
-    { table,lot },
-    { lstlisting,lol }
+    \exp_args:Nc \DeclareDocumentCommand { listof#1s }{st+o}
+      {\eb_toc_list_parse:nnnnn {##1} {##2} {##3} {#1} {#2}}
   }
+\eb_clist_map_inline:nn
   {
-    \exp_args:Nc \DeclareDocumentCommand
-      { listof\clist_item:nn {#1} { 1 }s }{st+o}
-      {
-        \eb_toc_list_parse:nnnnn {##1} {##2} {##3}
-          { \clist_item:nn {#1} { 1 } }
-          { \clist_item:nn {#1} { 2 } }
-      }
+    { figure } { lof },
+    { table } { lot },
+    { lstlisting } { lol }
   }
+  { \eb_list_content_cmd_set:nn #1 }
 \cs_set_eq:NN \listoflistings \listoflstlistings
 \RenewDocumentCommand{\tableofcontents}{t+oD(){}}
   {
@@ -1680,18 +1677,18 @@
 
 \cs_new_protected:Npn \eb_put_newtxmath:n #1
   { \PassOptionsToPackage{#1}{newtxmath} }
-\eb_at_end_preamble:n
+\AfterPreamble
   {
     \str_case:VnT \l__eb_subfont_math_choice_tl
       {
+        { times } { }
+        { nc } { \eb_put_newtxmath:n { nc } }
         { noto } { \eb_put_newtxmath:n { noto } }
+        { stix } { \eb_put_newtxmath:n { stix2 } }
+        { charter } { \eb_put_newtxmath:n { charter } }
         { notosans } { \eb_put_newtxmath:n { notosans } }
         { garamond } { \eb_put_newtxmath:n { ebgaramond } }
-        { times } { \eb_put_newtxmath:n { noOT1 } }
-        { libertine } { \eb_put_newtxmath:n { libertine,noOT1 } }
-        { stix } { \eb_put_newtxmath:n { stix2,noOT1 } }
-        { nc } { \eb_put_newtxmath:n { nc,noOT1 } }
-        { charter } { \eb_put_newtxmath:n { charter,noOT1 } }
+        { libertine } { \eb_put_newtxmath:n { libertine } }
       }
       { \LoadPackage{newtxmath+bm} }
   }
@@ -1809,7 +1806,7 @@
   }{}
 \cs_new_protected:Npn \eb_enumitem_label_set:nn #1#2
   { \SetEnumitemValue{label}{#1}{\color{ctex@emph}#2} }
-\clist_map_inline:nn
+\eb_clist_map_inline:nn
   {
     { bullet } { \textbullet },
     { endash } { \normalfont\bfseries\textendash },
@@ -2134,7 +2131,7 @@
         \group_begin:
         \tl_set_eq:NN \eb@toc@title \bibname
         \IfValueT{##3}{ \keys_set:nn { eb/listoc } {##3} }
-        \tl_set:Nn \bibsection
+        \cs_set:Npn \bibsection
           {
             \eb_title_number_intoc_spec:nn {##2} {##1}
             \bool_if:NT \l__eb_toc_multi_column_bool
@@ -2235,23 +2232,25 @@
   { \ctex_define:nx { refset } { \eb_link_color_set:n {#1} } }
 \cs_new_protected:Npn \DeclareThemeColor #1
   { \ctex_define:nx { style } { \eb_theme_color_set:n {#1} } }
-\clist_map_inline:nn
-  {
-    { linkcolor,link },
-    { color,theme }
-  }
+\cs_new_protected:Npn \eb_color_assign_cmd_set:nn #1#2
   {
-    \cs_new:cpn { eb_\clist_item:nn {#1} { 2 }_color_set:n } ##1
+    \cs_new:cpn { eb_#2_color_set:n } ##1
       {
-        \clist_item:nn {#1} { 1 }/\clist_item:nn {##1} { 1 } .code:n =
+        #1/\clist_item:nn {##1} { 1 } .code:n =
           {
-            \use:c { eb_define_\clist_item:nn {#1} { 2 }_color:nnn }
+            \use:c { eb_define_#2_color:nnn }
               { \clist_item:nn {##1} { 2 } }
               { \clist_item:nn {##1} { 3 } }
               { \clist_item:nn {##1} { 4 } }
           },
       }
   }
+\eb_clist_map_inline:nn
+  {
+    { linkcolor } { link },
+    { color } { theme }
+  }
+  { \eb_color_assign_cmd_set:nn #1 }
 
 \bool_set_false:N \l__eb_toc_number_color_bool
 \ctex_define:nn { refset }
@@ -2274,12 +2273,12 @@
     linktoc/unknown .code:n     =
       {
         \eb_put_hyperref:n { linktoc = #1 }
-        \clist_map_inline:nn { page,none }
+        \eb_clist_map_inline:nn { page,none }
           {
             \tl_if_eq:NnT \l_keys_value_tl {##1}
               {
                 \colorlet{ctex@toc@number}{black}
-                \clist_map_break:
+                \seq_map_break:
               }
           }
       },
@@ -2395,7 +2394,7 @@
   }
 %</package>
 %<*tcolorbox>
-\ProvidesExplFile{eb-tcolorbox.cfg}{2021/08/16}{1.28q}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2021/08/16}{1.29}
   {Customization of tcolorbox for easybook}
 
 \tl_gset:Nn \eb@tc@line@skip { 0.5\baselineskip }