easybook (3apr24)

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

6 files changed, 13 insertions, 12 deletions

diff --git a/Master/texmf-dist/doc/latex/easybook/easybook.pdf b/Master/texmf-dist/doc/latex/easybook/easybook.pdf
index 2fe646ac7ea..505b6252442 100644
--- a/Master/texmf-dist/doc/latex/easybook/easybook.pdf
+++ b/Master/texmf-dist/doc/latex/easybook/easybook.pdf
diff --git a/Master/texmf-dist/doc/latex/easybook/easybook.tex b/Master/texmf-dist/doc/latex/easybook/easybook.tex
index 104080059ba..edd3c476ce9 100644
--- a/Master/texmf-dist/doc/latex/easybook/easybook.tex
+++ b/Master/texmf-dist/doc/latex/easybook/easybook.tex
@@ -23,8 +23,8 @@
     name            = easybook,
     color-scheme    = blue,
     title           = EASYBOOK使用手册,
-    version         = v2024ap,
-    date            = 2024/03/15,
+    version         = v2024ar,
+    date            = 2024/04/02,
     authors         = 瞿毅,
     info            = 简便地排版中文学位论文或书籍,
     email           = toquyi@163.com,
@@ -1420,6 +1420,7 @@
   \item 新增行间公式与正文上下间距选项 \option{abovedisplayskip} 和 \option{belowdisplayskip}。
   \item 新增目录文件扩展名分配命令 \cs{AllotCaptionExt}。
   \end{version}
+  \shortversion{v = 2024aq,date = 2022/03/31,changes = 修复命令 \cs{ebifbitoc} 用于条目缩进选项 \option{tocindent} 失效的问题。}
 \end{changelog}
 \nocite{*}
 
diff --git a/Master/texmf-dist/source/latex/easybook/easybook.dtx b/Master/texmf-dist/source/latex/easybook/easybook.dtx
index 2ce884d5f31..64ece3b0386 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}[2021/11/15]
 \RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2024/03/15}{2024ap}
+\ProvidesExplClass{easybook}{2024/04/02}{2024ar}
   {Easily typesetting Chinese theses or books}
 
 \bool_new:N \l__eb_compile_draft_bool
@@ -297,7 +297,7 @@
 %<*package>
 \NeedsTeXFormat{LaTeX2e}[2021/11/15]
 \RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2024/03/15}{2024ap}
+\ProvidesExplPackage{easybase}{2024/04/02}{2024ar}
   {Easily typesetting Chinese theses or books}
 
 \cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -1540,7 +1540,7 @@
         #1/tocformat .tl_set:c  = l__eb_toc_#1_format_tl,
         #1/tocformat+ .code:n   = \tl_put_right:cn { l__eb_toc_#1_format_tl } {##1},
         #1/tocformat~+ .code:n  = \tl_put_right:cn { l__eb_toc_#1_format_tl } {##1},
-        #1/tocindent .dim_set:c = l__eb_toc_#1_indent_dim,
+        #1/tocindent .tl_set:c  = l__eb_toc_#1_indent_tl,
         #1/tocrule .tl_set:c    = l__eb_toc_#1_rule_tl,
         #1/tocafter .tl_set:c   = l__eb_toc_#1_after_tl,
         #1/tocbelow .tl_set:c   = l__eb_toc_#1_below_tl
@@ -1549,7 +1549,7 @@
 \cs_new_protected:Npn \eb_toc_format_initial:n #1
   {
     \titlecontents{#1}
-      [\dim_use:c { l__eb_toc_#1_indent_dim }]
+      [\tl_use:c { l__eb_toc_#1_indent_tl }]
       {\tl_use:c { l__eb_toc_#1_format_tl }}
       {\eb_toc_entry_if_hang:n {#1}}{}
       {\tl_use:c { l__eb_toc_#1_rule_tl }}
@@ -2392,7 +2392,7 @@
   }
 %</package>
 %<*tcolorbox>
-\ProvidesExplFile{eb-tcolorbox.cfg}{2024/03/15}{2024ap}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2024/04/02}{2024ar}
   {Customization of tcolorbox for easybook}
 
 \cs_set_protected:Npn \addtotcbstyle #1#2
diff --git a/Master/texmf-dist/tex/latex/easybook/easybase.sty b/Master/texmf-dist/tex/latex/easybook/easybase.sty
index bd02b40b87f..6241165ab95 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{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2024/03/15}{2024ap}
+\ProvidesExplPackage{easybase}{2024/04/02}{2024ar}
   {Easily typesetting Chinese theses or books}
 
 \cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -1263,7 +1263,7 @@
         #1/tocformat .tl_set:c  = l__eb_toc_#1_format_tl,
         #1/tocformat+ .code:n   = \tl_put_right:cn { l__eb_toc_#1_format_tl } {##1},
         #1/tocformat~+ .code:n  = \tl_put_right:cn { l__eb_toc_#1_format_tl } {##1},
-        #1/tocindent .dim_set:c = l__eb_toc_#1_indent_dim,
+        #1/tocindent .tl_set:c  = l__eb_toc_#1_indent_tl,
         #1/tocrule .tl_set:c    = l__eb_toc_#1_rule_tl,
         #1/tocafter .tl_set:c   = l__eb_toc_#1_after_tl,
         #1/tocbelow .tl_set:c   = l__eb_toc_#1_below_tl
@@ -1272,7 +1272,7 @@
 \cs_new_protected:Npn \eb_toc_format_initial:n #1
   {
     \titlecontents{#1}
-      [\dim_use:c { l__eb_toc_#1_indent_dim }]
+      [\tl_use:c { l__eb_toc_#1_indent_tl }]
       {\tl_use:c { l__eb_toc_#1_format_tl }}
       {\eb_toc_entry_if_hang:n {#1}}{}
       {\tl_use:c { l__eb_toc_#1_rule_tl }}
diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls
index d71b295850f..56aed60ae8b 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}[2021/11/15]
 \RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2024/03/15}{2024ap}
+\ProvidesExplClass{easybook}{2024/04/02}{2024ar}
   {Easily typesetting Chinese theses or books}
 
 \bool_new:N \l__eb_compile_draft_bool
diff --git a/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg b/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg
index f84040d6c42..2f8e0d95507 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/03/15}{2024ap}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2024/04/02}{2024ar}
   {Customization of tcolorbox for easybook}
 
 \cs_set_protected:Npn \addtotcbstyle #1#2