From cf666dc5e24281d33947b484351dacfef64b134d Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Thu, 2 May 2024 19:42:58 +0000
Subject: easybook (2may24)

git-svn-id: svn://tug.org/texlive/trunk@71154 c570f23f-e606-0410-a88d-b1316a301751
---
 .../texmf-dist/source/latex/easybook/easybook.dtx  | 32 ++++++++++++++--------
 1 file changed, 21 insertions(+), 11 deletions(-)

(limited to 'Master/texmf-dist/source/latex/easybook/easybook.dtx')

diff --git a/Master/texmf-dist/source/latex/easybook/easybook.dtx b/Master/texmf-dist/source/latex/easybook/easybook.dtx
index 14f666ba703..fcfd0a1e773 100644
--- a/Master/texmf-dist/source/latex/easybook/easybook.dtx
+++ b/Master/texmf-dist/source/latex/easybook/easybook.dtx
@@ -14,8 +14,7 @@
 % This work has the LPPL maintenance status `maintained'.
 %<*class>
 \NeedsTeXFormat{LaTeX2e}[2021/11/15]
-\RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2024/04/28}{2024bc}
+\ProvidesExplClass{easybook}{2024/05/01}{2024be}
   {Easily typesetting Chinese theses or books}
 
 \bool_new:N \l__eb_compile_draft_bool
@@ -47,7 +46,12 @@
     unknown .code:n = \clist_gput_right:NV \g__eb_doc_options_clist \CurrentOption
   }
 
-\ProcessKeysOptions{easybook}
+\cs_if_exist:NTF \ProcessKeyOptions
+  { \ProcessKeyOptions[easybook] }
+  {
+    \RequirePackage{l3keys2e}
+    \ProcessKeysOptions{easybook}
+  }
 \PassOptionsToPackage{no-math,quiet,CJKmath}{xeCJK}
 \eb_put_ctexbook:V \g__eb_doc_options_clist
 \LoadClass[UTF8]{ctexbook}
@@ -296,8 +300,8 @@
 %</class>
 %<*package>
 \NeedsTeXFormat{LaTeX2e}[2021/11/15]
-\RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2024/04/28}{2024bc}
+\RequirePackage{etoolbox}
+\ProvidesExplPackage{easybase}{2024/05/01}{2024be}
   {Easily typesetting Chinese theses or books}
 
 \cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -421,7 +425,12 @@
 \PassOptionsToPackage{list = off}{bicaption}
 \PassOptionsToPackage{svgnames}{xcolor}
 \PassOptionsToPackage{many}{tcolorbox}
-\ProcessKeysOptions{easybase}
+\cs_if_exist:NTF \ProcessKeyOptions
+  { \ProcessKeyOptions[easybase] }
+  {
+    \RequirePackage{l3keys2e}
+    \ProcessKeysOptions{easybase}
+  }
 \PassOptionsToPackage{\g__eb_ctex_options_clist}{ctex}
 \IfClassLoadedTF{ctexbook}{}
   {
@@ -1149,14 +1158,15 @@
   {
     \bool_if:NTF \l__eb_normal_footnote_bool
       {
-        \bool_if:NT \l__eb_fnmarktext_format_match_bool
+        \bool_if:NTF \l__eb_fnmarktext_format_match_bool
           { \tl_clear:N \l__eb_fnmarktext_format_tl }
+          { \spbset{spcmd = { }} }
       }
       {
-        \bool_if:NT \l__eb_fncustom_format_match_bool
+        \bool_if:NTF \l__eb_fncustom_format_match_bool
           { \tl_clear:N \l__eb_fnmarktext_format_tl }
+          { \spbset{spcmd = { }} }
       }
-    \bool_if:NF \l__eb_fnmarktext_format_match_bool { \spbset{spcmd = { }} }
     \eb@font@footnote
   }
 \cs_new_protected:Npn \defupfntmark #1
@@ -1727,7 +1737,7 @@
     \ifbool{@filesw}
       {
         \tl_if_exist:cF { tf@#1 }
-          {\iow_new:c { tf@#1 }\iow_open:cn { tf@#1 } { \jobname.#1 }}
+          { \iow_new:c { tf@#1 }\iow_open:cn { tf@#1 } { \jobname.#1 } }
       }
       {}
   }
@@ -2527,7 +2537,7 @@
   }
 %</package>
 %<*tcolorbox>
-\ProvidesExplFile{eb-tcolorbox.cfg}{2024/04/28}{2024bc}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2024/05/01}{2024be}
   {Customization of tcolorbox for easybook}
 
 \cs_set_protected:Npn \addtotcbstyle #1#2
-- 
cgit v1.2.3

