CTAN sync 202110210301

1 files changed, 20 insertions, 31 deletions

diff --git a/macros/latex/contrib/easybook/easybook.dtx b/macros/latex/contrib/easybook/easybook.dtx
index eed7155bee..d1a50adb6b 100644
--- a/macros/latex/contrib/easybook/easybook.dtx
+++ b/macros/latex/contrib/easybook/easybook.dtx
@@ -15,7 +15,7 @@
 %<*class>
 \NeedsTeXFormat{LaTeX2e}[2020/10/01]
 \RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2021/10/18}{1.3P}
+\ProvidesExplClass{easybook}{2021/10/20}{1.3S}
   {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/18}{1.3P}
+\ProvidesExplPackage{easybase}{2021/10/20}{1.3S}
   {Typeset Chinese theses or books}
 
 \cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -339,11 +339,6 @@
     \seq_set_from_clist:Nn \l_tmpa_seq {#1}
     \seq_map_inline:Nn \l_tmpa_seq {#2}
   }
-\cs_new_protected:Npn \eb_clist_map_function:nN #1#2
-  {
-    \seq_set_from_clist:Nn \l_tmpb_seq {#1}
-    \seq_map_function:NN \l_tmpb_seq #2
-  }
 \cs_new_protected:Npn \eb_char_patch_cmd:nnn #1#2#3
   {
     \ExplSyntaxOn\makeatletter
@@ -676,7 +671,7 @@
 \cs_gset_eq:NN \easyhead \fancyhead
 \cs_gset_eq:NN \easyfoot \fancyfoot
 \NewDocumentCommand{\markrule}
-  {O{\textwidth}D(){ctex@frame}m>{\SplitArgument{1}{!}}O{}}
+  {O{\textwidth}D(){ctex@frame}m>{\SplitArgument{1}{|}}O{}}
   {\eb_draw_markrule:nnnnn {#1} {#2} {#3} #4}
 \cs_new_protected:Npn \eb_draw_markrule:nnnnn #1#2#3#4#5
   {
@@ -724,7 +719,7 @@
     footrule .initial:n     = { },
     footnoterule .tl_gset:N = \footnoterule,
     footnoterule .initial:n =
-      { \markrule[0.35\textwidth]{\l__eb_rule_width_dim}[!2.6pt] }
+      { \markrule[0.35\textwidth]{\l__eb_rule_width_dim}[|2.6pt] }
   }
 
 \cs_set_eq:NN \eb_mark_uppercase:n \text_uppercase:n
@@ -937,7 +932,6 @@
       { \eb_fnmark_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 }
   }
 
@@ -1107,7 +1101,7 @@
       }
   }
 
-\ProvideDocumentCommand{\super}{od()mo}{\textsuperscript{#3}}
+\ProvideDocumentCommand{\super}{omo}{\textsuperscript{#3}}
 \providecommand{\spbset}{\use_none:n}
 \NewDocumentCommand{\eb@fnmark@super}{sm}
   {
@@ -1115,12 +1109,21 @@
       {\super[\l__eb_fntext_vshift_tl]{#2}[0pt]}
       {
         \super[\l__eb_fnmark_vshift_tl]
-              (\l__eb_fnmate_format_tl){#2}
+              {\l__eb_fnmate_format_tl{#2}}
               [\l__eb_fnmark_hshift_tl]
       }
   }
 \cs_new_protected:Npn \eb_fnmark_format_initial:
   {
+    \bool_if:NTF \l__eb_normal_footnote_bool
+      {
+        \bool_if:NT \l__eb_fnmate_format_match_bool
+          { \tl_clear:N \l__eb_fnmate_format_tl }
+      }
+      {
+        \bool_if:NT \l__eb_fncust_format_match_bool
+          { \tl_clear:N \l__eb_fnmate_format_tl }
+      }
     \bool_if:NF \l__eb_fnmate_format_match_bool
       { \spbset{super-format = { }} }
     \tl_use:N \l__eb_subfont_footnote_tl
@@ -1128,23 +1131,11 @@
 \bool_set_true:N \l__eb_normal_footnote_bool
 \bool_new:N \l__eb_fnmate_format_match_bool
 \bool_new:N \l__eb_fncust_format_match_bool
-\cs_new_protected:Npn \eb_fn_format_if_match:T #1
-  {
-    \bool_if:NTF \l__eb_normal_footnote_bool
-      { \bool_if:NT \l__eb_fnmate_format_match_bool {#1} }
-      { \bool_if:NT \l__eb_fncust_format_match_bool {#1} }
-  }
-\cs_new_protected:Npn \eb_fn_set_eq_format:
-  {
-    \tl_set_eq:NN
-    \l__eb_fnmate_format_tl \l__spb_super_script_formati_tl
-  }
 \cs_set:Npn \@makefnmark
   {
     \hbox:n
       {
         \eb_fnmark_format_initial:
-        \eb_fn_format_if_match:T { \eb_fn_set_eq_format: }
         \tl_if_eq:NnTF \@mpfn { footnote }
           { \eb@fnmark@super{\eb@thefnmark} }
           { \eb@fnmark@super{\@thefnmark} }
@@ -1155,14 +1146,12 @@
     \hbox:n
       {
         \eb_fnmark_format_initial:
-        \tl_use:N \l__eb_fnmark_before_tl
-        \tl_if_eq:NnTF \l__eb_fntext_position_tl { super }
+        \tl_if_eq:NnT \l__eb_fntext_position_tl { super }
+          { \eb@fnmark@super* }
           {
-            \eb_fn_format_if_match:T { \tl_clear:N \l__eb_fnmate_format_tl }
-            \eb@fnmark@super*
+            \tl_use:N \l__eb_fnmark_before_tl
+              {\l__eb_fnmate_format_tl{\@thefnmark}}
           }
-          { \eb_fn_format_if_match:T { \eb_fn_set_eq_format: } }
-          {\l__eb_fnmate_format_tl{\@thefnmark}}
         \tl_use:N \l__eb_fnmark_after_tl
       }
   }
@@ -2481,7 +2470,7 @@
   }
 %</package>
 %<*tcolorbox>
-\ProvidesExplFile{eb-tcolorbox.cfg}{2021/10/18}{1.3P}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2021/10/20}{1.3S}
   {Customization of tcolorbox for easybook}
 
 \tl_gset:Nn \eb@tc@line@skip { 0.5\baselineskip }