easybook (17sep24)

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

7 files changed, 21 insertions, 12 deletions

diff --git a/Master/texmf-dist/doc/latex/easybook/README.md b/Master/texmf-dist/doc/latex/easybook/README.md
index 7ceb739d7e2..15624c6c876 100644
--- a/Master/texmf-dist/doc/latex/easybook/README.md
+++ b/Master/texmf-dist/doc/latex/easybook/README.md
@@ -1,5 +1,5 @@
 # The `easybook` document class
-Easily typesetting Chinese theses or books (v2024dp)
+Easily typesetting Chinese theses or books (v2024dq)
 
 ## Abstract
 `easybook` is a pure academic template created based on the `ctexbook` book document class. It also has the functions of `book` and `article` document class. Combined with the general framework design of the theses of many universities in China, providing multiple commands and interfaces allows users to easily customize the theses templates. Its basic macro package `easybase` can also be used with `ctex` and standard document classes.
diff --git a/Master/texmf-dist/doc/latex/easybook/easybook.pdf b/Master/texmf-dist/doc/latex/easybook/easybook.pdf
index 56362ae369b..0b8ae4ddc38 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 c73726b5b53..6199add63bb 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         = v2024dp,
-    date            = 2024/09/13,
+    version         = v2024dq,
+    date            = 2024/09/16,
     authors         = 瞿毅,
     info            = 简便地排版中文学位论文或书籍,
     email           = toquyi@163.com,
@@ -395,7 +395,7 @@ $\blacktriangleright$需要注意正确\textbf{编译索引}要增加 \code{-she
   \keychoice{withpart}{true,\fbox{false}}
   使章标题跟随部分计数器编号，仅在导言区有效。当开启新的部分标题时章编号从1开始。
   \keychoice{fntnumwith}{part,\fbox{chapter},page}
-  设置脚注跟随编号的计数器，仅在导言区有效。默认跟随章计数器，即开启新的章标题时脚注编号从1开始。
+  设置脚注重置编号的方式，仅在导言区有效。默认跟随章计数器，即开启新的章标题时脚注编号从1开始。选项 \code{page} 代表的是换页而不是页计数器，这是由于在一些排版情况下换页后页计数器仍为上页的值。
   \keychoice{uppercase}{\fbox{all},first,none,none*}
   使用 \cs{rightmark} 和 \cs{leftmark} 等标题标记命令获取标题内容用于页眉页脚时其中英文的大小写类型。\code{all} 为标题标记中的英文字母全部大写。\code{first} 为标记以英文起始时仅第一个字母大写。\code{none} 不改变标记中英文字母的大小写形式，变体 \code{none*} 则强制标记的字母均为小写形式。
   \kvsplit{tagform}{左括号,右括号}\Default{\Marg{(,)}}
@@ -1522,6 +1522,7 @@ $\blacktriangleright$需要注意正确\textbf{编译索引}要增加 \code{-she
   \item 使用 \pkg*{xtemplate} 宏包将封面标题命令 \cs{maketitle} 抽象为由实例组成的模板。
   \item 新增图表题注模块 \module*{cap}。
   \end{version}
+  \shortversion{v = 2024dq,date = 2024/09/16,changes = 修复脚注重置编号的方式为 \code{page} 时在一些换页情况下失败的问题。}
 \end{changelog}
 \nocite{*}
 % \AddToHook{cmd/printindex/before}{\clearpage}
diff --git a/Master/texmf-dist/source/latex/easybook/easybook.dtx b/Master/texmf-dist/source/latex/easybook/easybook.dtx
index f8df9715f3e..1c833d2042a 100644
--- a/Master/texmf-dist/source/latex/easybook/easybook.dtx
+++ b/Master/texmf-dist/source/latex/easybook/easybook.dtx
@@ -14,7 +14,7 @@
 % This work has the LPPL maintenance status `maintained'.
 %<class|package>\NeedsTeXFormat{LaTeX2e}[2021/11/15]
 %<*class>
-\ProvidesExplClass{easybook}{2024/09/13}{2024dp}
+\ProvidesExplClass{easybook}{2024/09/16}{2024dq}
   {Easily typesetting Chinese theses or books}
 
 \bool_new:N \l__eb_compile_draft_bool
@@ -301,7 +301,7 @@
 %</class>
 %<*package>
 \RequirePackage{etoolbox}
-\ProvidesExplPackage{easybase}{2024/09/13}{2024dp}
+\ProvidesExplPackage{easybase}{2024/09/16}{2024dq}
   {Easily typesetting Chinese theses or books}
 
 \cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -964,7 +964,11 @@
     \str_case:VnT \l__eb_fnt_parent_counter_tl
       {
         { part } { \counterwithin*{footnote}{part} }
-        { page } { \counterwithin*{footnote}{page} }
+        { page }
+        {
+          \RequirePackage{zref-perpage}
+          \zmakeperpage{footnote}
+        }
       }
       { \counterwithout*{footnote}{chapter} }
   }
@@ -2846,7 +2850,7 @@
   }
 %</package>
 %<*tcolorbox>
-\ProvidesExplFile{eb-tcolorbox.cfg}{2024/09/13}{2024dp}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2024/09/16}{2024dq}
   {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 1002dbd754d..4e7e901a5aa 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/09/13}{2024dp}
+\ProvidesExplPackage{easybase}{2024/09/16}{2024dq}
   {Easily typesetting Chinese theses or books}
 
 \cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -683,7 +683,11 @@
     \str_case:VnT \l__eb_fnt_parent_counter_tl
       {
         { part } { \counterwithin*{footnote}{part} }
-        { page } { \counterwithin*{footnote}{page} }
+        { page }
+        {
+          \RequirePackage{zref-perpage}
+          \zmakeperpage{footnote}
+        }
       }
       { \counterwithout*{footnote}{chapter} }
   }
diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls
index b0ab50ebbe3..10293af2dc5 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/09/13}{2024dp}
+\ProvidesExplClass{easybook}{2024/09/16}{2024dq}
   {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 31028f17548..dd807fbabe2 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/09/13}{2024dp}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2024/09/16}{2024dq}
   {Customization of tcolorbox for easybook}
 
 \cs_set_protected:Npn \addtotcbstyle #1#2