easybook (19jun24)

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

3 files changed, 17 insertions, 15 deletions

diff --git a/Master/texmf-dist/tex/latex/easybook/easybase.sty b/Master/texmf-dist/tex/latex/easybook/easybase.sty
index b556583b3a0..c87c08f88d6 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}[2021/11/15]
 \RequirePackage{etoolbox}
-\ProvidesExplPackage{easybase}{2024/06/16}{2024ce}
+\ProvidesExplPackage{easybase}{2024/06/18}{2024cf}
   {Easily typesetting Chinese theses or books}
 
 \cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -95,7 +95,7 @@
 \cs_new_protected:Npn \ebloadpackage #1
   {
     \int_compare:nTF { \clist_count:n {#1} <= 1 }
-      { \RequirePackage }
+      { \RequirePackage{#1} }
       {
         \clist_map_inline:nn {#1}
           { \eb_match_load_package:n {##1} }
@@ -278,7 +278,15 @@
     tagform .code:n       = \eb_assign_tagform:n {#1},
     tagform .initial:n    = { (,) },
     brackets .meta:n      = { tagform = {#1} },
-    figurepath .tl_set:N  = \l_eb_graphics_path_tl
+    figurepath .code:n    =
+      {
+        \tl_if_blank:nF {#1}
+          {
+            \regex_match:nnTF { \cB. } {#1}
+              { \graphicspath{#1} }
+              { \graphicspath{{#1}} }
+          }
+      }
   }
 
 \includepdfset{fitpaper = true}
@@ -448,12 +456,6 @@
 \ctex_at_end_preamble:n
   {
     \bool_if:NF \l__eb_ps_used_bool { \pagestyle{fancy} }
-    \tl_if_blank:VF \l_eb_graphics_path_tl
-      {
-        \regex_match:nVTF { \cB. } \l_eb_graphics_path_tl
-          { \exp_args:NV \graphicspath \l_eb_graphics_path_tl }
-          { \exp_args:Nx \graphicspath { {\l_eb_graphics_path_tl} } }
-      }
     \providecommand{\kaishu}{\itshape}
   }
 
diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls
index e8fda0bd873..60d3163cc03 100644
--- a/Master/texmf-dist/tex/latex/easybook/easybook.cls
+++ b/Master/texmf-dist/tex/latex/easybook/easybook.cls
@@ -19,7 +19,7 @@
 %% 
 %% This work has the LPPL maintenance status `maintained'.
 \NeedsTeXFormat{LaTeX2e}[2021/11/15]
-\ProvidesExplClass{easybook}{2024/06/16}{2024ce}
+\ProvidesExplClass{easybook}{2024/06/18}{2024cf}
   {Easily typesetting Chinese theses or books}
 
 \bool_new:N \l__eb_compile_draft_bool
@@ -94,13 +94,13 @@
   { main,sans,mono,CJKmain,CJKsans,CJKmono }
   {
     \exp_args:Nc \RenewDocumentCommand { set#1font }{O{}mO{}}
-      {\use:c { eb_set#1font:nn } {##2} {##1,##3}}
+      {\use:c { eb_set#1font:nn } {##2} { ##1,##3 }}
   }
 \RenewDocumentCommand{\newCJKfontfamily}{omO{}mO{}}
   {
     \tl_set:Nx \l_tmpa_tl { \tl_if_novalue:nTF {#1} { \cs_to_str:N #2 } {#1} }
     \cs_new_protected:Npx #2 { \eb_switch_family:n { \l_tmpa_tl } }
-    \eb_set_family:xnn { \l_tmpa_tl } {#3,#5} {#4}
+    \eb_set_family:xnn { \l_tmpa_tl } { #3,#5 } {#4}
   }
 
 \cs_new_protected:Npn \eb@font@load@noto
@@ -266,8 +266,8 @@
               { \par\nobreak\vskip 1.5pc }
               { \hspace{1em} }
           },
-        beforeskip  = -1.5ex,
-        afterskip   = 4ex
+        beforeskip  = 0pt,
+        afterskip   = 25pt
       },
     section         =
       {
diff --git a/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg b/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg
index da2e2549a42..aabe16be3f9 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/06/16}{2024ce}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2024/06/18}{2024cf}
   {Customization of tcolorbox for easybook}
 
 \cs_set_protected:Npn \addtotcbstyle #1#2