easybook (16jan24)

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

3 files changed, 42 insertions, 15 deletions

diff --git a/Master/texmf-dist/tex/latex/easybook/easybase.sty b/Master/texmf-dist/tex/latex/easybook/easybase.sty
index 3e336efda42..f4190979b21 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}{2024/01/14}{2024H}
+\ProvidesExplPackage{easybase}{2024/01/16}{2024I}
   {Easily typesetting Chinese theses or books}
 
 \cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -963,7 +963,6 @@
 \cs_set:Npn \thebisection { \eb_section_counter_prefix:n { bi } }
 \cs_set:Npn \thebisubsection { \thebisection.\@arabic\c@bisubsection }
 \cs_set:Npn \thesection { \eb_section_counter_prefix:n { } }
-\contentsuse{}{tec}
 \tl_new:N \eb@before@addbitoc@hook
 \NewDocumentCommand{\BeforeAddBitoc}{sm}
   {
@@ -1108,8 +1107,13 @@
   }
 \cs_new_protected:Npn \eb_toc_title_level_cmd:n #1
   {
-    \IfBooleanF{#1}
-      {\eb@toc@title@level{\eb@toc@title}{\eb@bitoc@title}}
+    \IfBooleanTF{#1}
+      {\par}
+      {
+        \tl_if_exist:NTF \eb@toc@title
+          { \eb@toc@title@level{\eb@toc@title}{\eb@bitoc@title} }
+          { \par }
+      }
   }
 \cs_new_protected:Npn \eb_toc_float_list_parse:nnnnn #1#2#3#4#5
   {
@@ -1217,7 +1221,7 @@
         \tl_use:c { l__eb_toc_#1_after_tl }
       }
   }
-\cs_new_protected:Npn \RegisterTocName #1
+\cs_new_protected:Npn \eb@toc@format@define #1
   {
     \ctex_define:n
       {
@@ -1229,6 +1233,9 @@
         #1/tocafter .tl_set:c   = l__eb_toc_#1_after_tl,
         #1/tocbelow .tl_set:c   = l__eb_toc_#1_below_tl
       }
+  }
+\cs_new_protected:Npn \eb@toc@format@initial #1
+  {
     \titlecontents{#1}
       [\dim_use:c { l__eb_toc_#1_indent_dim }]
       {\tl_use:c { l__eb_toc_#1_format_tl }}
@@ -1236,8 +1243,20 @@
       {\tl_use:c { l__eb_toc_#1_rule_tl }}
       [\tl_use:c { l__eb_toc_#1_below_tl }]
   }
+\cs_new_protected:Npn \RegisterTocName #1
+  {
+    \eb@toc@format@define{#1}
+    \eb@toc@format@initial{#1}
+  }
 \seq_map_function:NN
 \c__ctex_headings_seq \RegisterTocName
+\seq_remove_all:Nn \c__ctex_headings_seq { table }
+\seq_remove_all:Nn \c__ctex_headings_seq { figure }
+\seq_remove_all:Nn \c__ctex_headings_seq { lstlisting }
+\cs_new_protected:Npn \eb@key@path@meta@define #1
+  { \ctex_define:n { #1 .meta:nn = { ctex/#1 } {##1} } }
+\seq_map_function:NN
+\c__ctex_headings_seq \eb@key@path@meta@define
 \eb_seq_map_inline:nn
   {
     tocformat,tocformat+,tocformat~+,
@@ -1304,6 +1323,14 @@
           }
       }
   }
+\cs_set_eq:NN \eb@ctexsetii \ctex_set:nn
+\cs_new_protected:Npn \SetTocStyle #1#2#3
+  {
+    \tl_set:cn { eb@toc@style@set@#1@#2 }
+      { \eb@ctexsetii{#1}{#3} }
+  }
+\cs_new_protected:Npn \UseTocStyle #1#2#3
+  { \addtocontents{#3}{\@nameuse{eb@toc@style@set@#1@#2}} }
 \ctex_set:n
   {
     part          =
diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls
index 4443657e42d..40faa154ff0 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}{2024/01/14}{2024H}
+\ProvidesExplClass{easybook}{2024/01/16}{2024I}
   {Easily typesetting Chinese theses or books}
 
 \bool_set_false:N \l__eb_compile_draft_bool
@@ -163,7 +163,7 @@
     \eb_setsansfont:nn { Arial } { }
     \eb_setmonofont:nn { Courier~New } { }
   }
-\cs_new_protected:Npn \eb_font_load_libertinus_sans:
+\cs_new_protected:Npn \eb@font@load@libertinus@sans
   {
     \eb_setsansfont:nn { LibertinusSans }
       {
@@ -173,7 +173,7 @@
         ItalicFont  = *-Italic
       }
   }
-\cs_new_protected:Npn \eb_font_load_lmmonolt_mono:
+\cs_new_protected:Npn \eb@font@load@lmmonolt@mono
   {
     \eb_setmonofont:nn { lmmonolt10 }
       {
@@ -194,8 +194,8 @@
         ItalicFont      = *-Italic,
         BoldItalicFont  = *-BoldItalic
       }
-    \eb_font_load_libertinus_sans:
-    \eb_font_load_lmmonolt_mono:
+    \eb@font@load@libertinus@sans
+    \eb@font@load@lmmonolt@mono
   }
 \cs_new_protected:Npn \eb@font@load@libertine
   {
@@ -207,8 +207,8 @@
         ItalicFont      = *-Italic,
         BoldItalicFont  = *-BoldItalic
       }
-    \eb_font_load_libertinus_sans:
-    \eb_font_load_lmmonolt_mono:
+    \eb@font@load@libertinus@sans
+    \eb@font@load@lmmonolt@mono
   }
 \cs_new_protected:Npn \eb@font@load@palatino
   {
@@ -220,8 +220,8 @@
         ItalicFont      = *-italic,
         BoldItalicFont  = *-bolditalic
       }
-    \eb_font_load_libertinus_sans:
-    \eb_font_load_lmmonolt_mono:
+    \eb@font@load@libertinus@sans
+    \eb@font@load@lmmonolt@mono
   }
 \cs_new_protected:Npn \eb_put_newtxmath:n #1
   { \PassOptionsToPackage{#1}{newtxmath} }
diff --git a/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg b/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg
index 788e520310d..bc3196da4da 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}{2024/01/14}{2024H}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2024/01/16}{2024I}
   {Customization of tcolorbox for easybook}
 
 \cs_set_protected:Npn \addtotcbstyle #1#2