easybook (29jan24)

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

6 files changed, 32 insertions, 16 deletions

diff --git a/Master/texmf-dist/doc/latex/easybook/easybook.pdf b/Master/texmf-dist/doc/latex/easybook/easybook.pdf
index 83550fbf2d8..31ec25b9991 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 07ac291c6f6..a4b14fd44f2 100644
--- a/Master/texmf-dist/doc/latex/easybook/easybook.tex
+++ b/Master/texmf-dist/doc/latex/easybook/easybook.tex
@@ -23,7 +23,7 @@
     name            = easybook,
     color-scheme    = blue,
     title           = EASYBOOK使用手册,
-    version         = v2024O,
+    version         = v2024P,
     date            = 2024/01/28,
     authors         = 瞿毅,
     info            = 简便地排版中文学位论文或书籍,
@@ -1350,7 +1350,7 @@
   \shortversion{v = 1.638,date = 2022/03/04,changes = 增加目录条目样式选项注册命令 \cs{RegisterTocName}。}
   \shortversion{v = 1.644,date = 2022/03/10,changes = 增加浮动环境目录声明命令 \cs{DeclareFloatList} 配合 \pkg*{caption} 宏包。}
   \shortversion{v = 1.682,date = 2022/05/01,changes = 将迷你页判断命令 \cs{notminipage} 改为被保护命令兼容 \pkg*{circledtext} 宏包。}
-  \begin{version}[v = 2024O,date = 2024/01/28,simple]
+  \begin{version}[v = 2024P,date = 2024/01/28,simple]
   \item 核对依赖宏包的更新改动，优化使用手册的内容细节。
   \item 修复图表等浮动环境题注目录中条目标签编号的计数器值显示错误问题。
   \item 修复附录命令 \cs{appendix} 的可选参数设置英文目录中条目名字和编号失效的问题。
diff --git a/Master/texmf-dist/source/latex/easybook/easybook.dtx b/Master/texmf-dist/source/latex/easybook/easybook.dtx
index 3c026512da7..7709a5ac28e 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}[2020/10/01]
 \RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2024/01/28}{2024O}
+\ProvidesExplClass{easybook}{2024/01/28}{2024P}
   {Easily typesetting Chinese theses or books}
 
 \bool_set_false:N \l__eb_compile_draft_bool
@@ -237,6 +237,7 @@
     tocdepth        = \bool_if:NTF \l__eb_class_mode_book_bool { 1 } { 2 },
     part            =
       {
+        pagestyle   = empty,
         format      = \color{ctex@frame}\sffamily\Huge,
         nameformat  = { },
         titleformat = { },
@@ -249,6 +250,7 @@
       },
     chapter         =
       {
+        pagestyle   = empty,
         format      =
           {
             \color{ctex@frame}\sffamily\LARGE
@@ -302,7 +304,7 @@
 %<*package>
 \NeedsTeXFormat{LaTeX2e}[2020/10/01]
 \RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2024/01/28}{2024O}
+\ProvidesExplPackage{easybase}{2024/01/28}{2024P}
   {Easily typesetting Chinese theses or books}
 
 \cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -699,7 +701,6 @@
     \bool_if:NF \l__eb_class_mode_book_bool
       { \eb@level@markright{subsection}{#1} }
   }
-\cs_gset_eq:NN \ps@plain \ps@empty
 \fancyhf{}
 \ifbool{@twoside}
   {
@@ -1056,7 +1057,7 @@
   {
     It~is~not~recommended~that~you~use~the \\
     hang,~symbol,~perpage,~marginal~or~flushmargin \\
-    options~of~the~'footmisc'~package.
+    options~of~'footmisc'~package.
   }
 
 \cs_set_protected:Npn \footref #1
@@ -1594,7 +1595,13 @@
       { \eb@ctexsetii{#1}{#3} }
   }
 \cs_new_protected:Npn \UseTocStyle #1#2#3
-  { \addtocontents{#3}{\@nameuse{eb@toc@style@set@#1@#2}} }
+  {
+    \tl_if_exist:cTF { eb@toc@style@set@#1@#2 }
+      { \addtocontents{#3}{\@nameuse{eb@toc@style@set@#1@#2}} }
+      { \msg_warning:nnnn { easybase } { undefined-toc-style } {#2} {#1} }
+  }
+\msg_new:nnn { easybase } { undefined-toc-style }
+  { The~contents~style~'#1'~of~'#2'~is~not~defined. }
 \ctex_set:n
   {
     part          =
@@ -1800,13 +1807,14 @@
     \tl_gset:Nn \dbltopfraction { 0.9 }
     \tl_gset:Nn \dblfloatpagefraction { 0.9 }
   }
-\dim_zero_new:N \mathindent
 \skip_set:Nn \textfloatsep { 12pt plus 4pt minus 3pt }
 \skip_set:Nn \dbltextfloatsep { 12pt plus 4pt minus 3pt }
 \skip_set:Nn \multicolsep { 12pt plus 4pt minus 3pt }
 \setcounter{topnumber}{4}
 \setcounter{bottomnumber}{4}
 \setcounter{totalnumber}{8}
+\tl_set:Nn \fontsubfuzz { 0.5pt }
+\dim_zero_new:N \mathindent
 \allowdisplaybreaks[4]
 \everymath{\displaystyle}
 \DeclareGraphicsExtensions{.pdf,.png,.jpg,.eps,.tif}
@@ -2325,7 +2333,7 @@
   }
 %</package>
 %<*tcolorbox>
-\ProvidesExplFile{eb-tcolorbox.cfg}{2024/01/28}{2024O}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2024/01/28}{2024P}
   {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 37b1c7229ce..502ce59b0ff 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/28}{2024O}
+\ProvidesExplPackage{easybase}{2024/01/28}{2024P}
   {Easily typesetting Chinese theses or books}
 
 \cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -417,7 +417,6 @@
     \bool_if:NF \l__eb_class_mode_book_bool
       { \eb@level@markright{subsection}{#1} }
   }
-\cs_gset_eq:NN \ps@plain \ps@empty
 \fancyhf{}
 \ifbool{@twoside}
   {
@@ -774,7 +773,7 @@
   {
     It~is~not~recommended~that~you~use~the \\
     hang,~symbol,~perpage,~marginal~or~flushmargin \\
-    options~of~the~'footmisc'~package.
+    options~of~'footmisc'~package.
   }
 
 \cs_set_protected:Npn \footref #1
@@ -1312,7 +1311,13 @@
       { \eb@ctexsetii{#1}{#3} }
   }
 \cs_new_protected:Npn \UseTocStyle #1#2#3
-  { \addtocontents{#3}{\@nameuse{eb@toc@style@set@#1@#2}} }
+  {
+    \tl_if_exist:cTF { eb@toc@style@set@#1@#2 }
+      { \addtocontents{#3}{\@nameuse{eb@toc@style@set@#1@#2}} }
+      { \msg_warning:nnnn { easybase } { undefined-toc-style } {#2} {#1} }
+  }
+\msg_new:nnn { easybase } { undefined-toc-style }
+  { The~contents~style~'#1'~of~'#2'~is~not~defined. }
 \ctex_set:n
   {
     part          =
@@ -1518,13 +1523,14 @@
     \tl_gset:Nn \dbltopfraction { 0.9 }
     \tl_gset:Nn \dblfloatpagefraction { 0.9 }
   }
-\dim_zero_new:N \mathindent
 \skip_set:Nn \textfloatsep { 12pt plus 4pt minus 3pt }
 \skip_set:Nn \dbltextfloatsep { 12pt plus 4pt minus 3pt }
 \skip_set:Nn \multicolsep { 12pt plus 4pt minus 3pt }
 \setcounter{topnumber}{4}
 \setcounter{bottomnumber}{4}
 \setcounter{totalnumber}{8}
+\tl_set:Nn \fontsubfuzz { 0.5pt }
+\dim_zero_new:N \mathindent
 \allowdisplaybreaks[4]
 \everymath{\displaystyle}
 \DeclareGraphicsExtensions{.pdf,.png,.jpg,.eps,.tif}
diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls
index fee864e247a..74d314ba2a4 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/28}{2024O}
+\ProvidesExplClass{easybook}{2024/01/28}{2024P}
   {Easily typesetting Chinese theses or books}
 
 \bool_set_false:N \l__eb_compile_draft_bool
@@ -242,6 +242,7 @@
     tocdepth        = \bool_if:NTF \l__eb_class_mode_book_bool { 1 } { 2 },
     part            =
       {
+        pagestyle   = empty,
         format      = \color{ctex@frame}\sffamily\Huge,
         nameformat  = { },
         titleformat = { },
@@ -254,6 +255,7 @@
       },
     chapter         =
       {
+        pagestyle   = empty,
         format      =
           {
             \color{ctex@frame}\sffamily\LARGE
diff --git a/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg b/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg
index bc313d4d3fb..f9ad1524266 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/28}{2024O}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2024/01/28}{2024P}
   {Customization of tcolorbox for easybook}
 
 \cs_set_protected:Npn \addtotcbstyle #1#2