easybook (6mar22)

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

7 files changed, 36 insertions, 36 deletions

diff --git a/Master/texmf-dist/doc/latex/easybook/README.md b/Master/texmf-dist/doc/latex/easybook/README.md
index 7300ee08f92..0a22e71b493 100644
--- a/Master/texmf-dist/doc/latex/easybook/README.md
+++ b/Master/texmf-dist/doc/latex/easybook/README.md
@@ -1,6 +1,6 @@
 # Easybook document class
 
-`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 dissertation of many universities in China, providing multiple commands and interfaces allows users to easily customize the thesis template. Its basic macro package `easybase` can also be used with `ctex` and standard document classes.
+`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 dissertation of many universities in China, providing multiple commands and interfaces allows users to easily customize the thesis template. Its basic macro package `easybase` can also be used with `ctex` and standard document classes.
 
 ## License
 
diff --git a/Master/texmf-dist/doc/latex/easybook/easybook.pdf b/Master/texmf-dist/doc/latex/easybook/easybook.pdf
index 3905c58b5a1..2de13178dc0 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 f4042c30ec3..fc6d6ec0865 100644
--- a/Master/texmf-dist/doc/latex/easybook/easybook.tex
+++ b/Master/texmf-dist/doc/latex/easybook/easybook.tex
@@ -21,8 +21,8 @@
     name            = easybook,
     color-scheme    = blue,
     title           = EASYBOOK使用手册,
-    version         = v1.639,
-    date            = 2022/03/05,
+    version         = v1.64,
+    date            = 2022/03/06,
     authors         = 瞿毅,
     info            = 简便地排版中文学位论文或书籍,
     email           = q1jx@foxmail.com,
@@ -220,15 +220,15 @@
 以下为 \pkg*{easybase} 直接调用的关键宏包清单，通常情况下它们是常用且稳定的。棕色背景的宏包表示修改了或依赖它们的内部命令。青色背景的宏包表示并未调用它们，但做了一些预配置，可在导言区手动载入以实现相关的功能。
 \insertblr
   {
-    colspec = @{}*{5}{c}@{},
-    cells = {cmd = \pkg*},
-    cell{1}{3,4} = brown8,
-    cell{2}{5} = brown8,
-    cell{3}{2,4} = brown8,
-    cell{5}{1} = brown8,
-    cell{1}{2} = cyan8,
-    cell{3}{1,4} = cyan8,
-    cell{5}{2} = cyan8
+    colspec       = @{}*{5}{c}@{},
+    cells = {cmd  = \pkg*},
+    cell{1}{3,4}  = brown8,
+    cell{2}{5}    = brown8,
+    cell{3}{2,4}  = brown8,
+    cell{5}{1}    = brown8,
+    cell{1}{2}    = cyan8,
+    cell{3}{1,4}  = cyan8,
+    cell{5}{2}    = cyan8
   }{
     amsthm & bicaption & ctex & caption & chemformula \\
     enumitem & etoolbox & fancyhdr & geometry & hyperref \\
@@ -279,9 +279,9 @@
   预置的英文字体相关配置方案如下表所示。这些字体已经包含在了 \TeX Live 发行版中，所以通常不需要再专门安装。如果您想使用其它英文字体，可以使用 \pkg*{fontspec} 宏包的相关命令进行设置。
   \insertblr
   {
-    colspec = @{}*{4}{c}@{},
-    hline{2} = {0.5pt,Blue},
-    row{1} = {font = \sffamily},
+    colspec   = @{}*{4}{c}@{},
+    hline{2}  = {0.5pt,Blue},
+    row{1}    = {font = \sffamily},
     column{1} = {cmd = \code}
   }{
   & 正文字体 & 无衬线字体 & 等宽字体 \\
@@ -396,11 +396,11 @@
 \subsection{上标和下标}
 上标和下标的功能来自 \pkg*{spbmark} 宏包，下面有三个命令可以用于输出上标和下标。可以使用键值列表的形式对上下标格式进行局部或全局设置，下面命令中两个可选参数的键值列表是等效的。全局设置的详情见\ref{subsubsec:super-sub-script}。
 \begin{commands}
-  \command{super}[\oarg{键值列表1}\marg{内容}\oarg{键值列表2}]
+  \command{super}[\sarg\oarg{键值列表1}\marg{内容}\oarg{键值列表2}]
   输出上标的命令，与简短命令 \cs{sp} 等效。
-  \command{sub}[\oarg{键值列表1}\marg{内容}\oarg{键值列表2}]
+  \command{sub}[\sarg\oarg{键值列表1}\marg{内容}\oarg{键值列表2}]
   输出下标的命令，与简短命令 \cs{sb} 等效。用法和参数与上标命令 \cs{super} 类似。
-  \command{supersub}[\oarg{键值列表1}\marg{上标内容}\marg{下标内容}\oarg{键值列表2}]
+  \command{supersub}[\sarg\oarg{键值列表1}\marg{上标内容}\marg{下标内容}\oarg{键值列表2}]
   同时输出上标和下标的命令，与简短命令 \cs{spb} 等效。
   \command{spbifmath}[\marg{数学模式代码}\marg{文本模式代码}]
   根据上下标处于数学还是文本模式分别设置不同的值，应当在格式命令或偏移距离选项中使用。
@@ -429,10 +429,10 @@
   \cls*{easybook} 扩展了 \CTeX 宏集 \hologo{LaTeX3} 风格键值的通用控制命令 \cs*{ctexset}，接口选项同样可用它设置，原有的 \meta{键值列表} 仍然可用。本文档类目前有9个模块用于实现常规的排版功能，如下表所示。模块名也是统一接口 \cs*{ctexset} 的路径，不同模块单独接口的命令名\textbf{加上前缀} \code{eb}：
   \insertblr
   {
-    colspec = @{}*{5}{c}@{},
-    hline{3} = {0.5pt,Blue},
-    row{1,3} = {font = \sffamily,belowsep = 0pt},
-    row{2,4} = {cmd = \module*}
+    colspec   = @{}*{5}{c}@{},
+    hline{3}  = {0.5pt,Blue},
+    row{1,3}  = {font = \sffamily,belowsep = 0pt},
+    row{2,4}  = {cmd = \module*}
   }{
   \hyperref[subsec:style]{风格} & \hyperref[subsec:other font]{其它字体} & \hyperref[subsec:spacing]{行距} & \hyperref[subsec:hyperlinks]{超链接} & \hyperref[subsec:reference]{参考文献} \\
   style & subfont & spread & refset & bibset \\
diff --git a/Master/texmf-dist/source/latex/easybook/easybook.dtx b/Master/texmf-dist/source/latex/easybook/easybook.dtx
index 7978bddf98e..c767f8a5910 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}{2022/03/05}{1.639}
+\ProvidesExplClass{easybook}{2022/03/06}{1.64}
   {Easily typesetting Chinese theses or books}
 
 \bool_set_false:N \l__eb_compile_draft_bool
@@ -303,7 +303,7 @@
 %<*package>
 \NeedsTeXFormat{LaTeX2e}[2020/10/01]
 \RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2022/03/05}{1.639}
+\ProvidesExplPackage{easybase}{2022/03/06}{1.64}
   {Easily typesetting Chinese theses or books}
 
 \cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -1626,7 +1626,6 @@
           {
             \eb_toc_title_level_cmd:n {#1}
             \cs_set_eq:NN \thispagestyle \use_none:n
-            \cs_undefine:N \imki@firstpagestyle
           }
         \imki@putindex{#4}
         \group_end:
@@ -1924,8 +1923,7 @@
         tcbwrap .code:n = { },
         unknown .code:n = \eb_msg_deprecated_option:n { thmset }
       }
-    \cs_undefine:N \proof
-    \declaretheoremstyle{fancy}[
+    \declaretheoremstyle{default}[
       spaceabove    = 0ex plus .1ex,
       spacebelow    = 0ex plus .1ex,
       headindent    = 0em,
@@ -1935,6 +1933,8 @@
       bodyfont      = \normalfont,
       postheadspace = 1em
       ]
+    \theoremstyle{default}
+    \cs_undefine:N \proof
   }
 
 \setchemformula
@@ -2021,7 +2021,7 @@
         { \bibliographystyle{gbt7714-author-year} }
       }
       { \cs_set_eq:NN \cite \citep }
-      { \exp_args:NV \bibliographystyle \l__eb_bib_otherstyle_tl }
+      { \exp_args:NV \bibliographystyle \l__eb_bib_both_style_tl }
     \tl_if_blank:VF \l__eb_bib_cite_style_tl
       { \exp_args:NV \setcitestyle \l__eb_bib_cite_style_tl }
     \NewDocumentCommand{\printbibliography}{st+o}
@@ -2302,7 +2302,7 @@
   }
 %</package>
 %<*tcolorbox>
-\ProvidesExplFile{eb-tcolorbox.cfg}{2022/03/05}{1.639}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2022/03/06}{1.64}
   {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 991953c6da6..6bbfe348545 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}{2022/03/05}{1.639}
+\ProvidesExplPackage{easybase}{2022/03/06}{1.64}
   {Easily typesetting Chinese theses or books}
 
 \cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -1343,7 +1343,6 @@
           {
             \eb_toc_title_level_cmd:n {#1}
             \cs_set_eq:NN \thispagestyle \use_none:n
-            \cs_undefine:N \imki@firstpagestyle
           }
         \imki@putindex{#4}
         \group_end:
@@ -1641,8 +1640,7 @@
         tcbwrap .code:n = { },
         unknown .code:n = \eb_msg_deprecated_option:n { thmset }
       }
-    \cs_undefine:N \proof
-    \declaretheoremstyle{fancy}[
+    \declaretheoremstyle{default}[
       spaceabove    = 0ex plus .1ex,
       spacebelow    = 0ex plus .1ex,
       headindent    = 0em,
@@ -1652,6 +1650,8 @@
       bodyfont      = \normalfont,
       postheadspace = 1em
       ]
+    \theoremstyle{default}
+    \cs_undefine:N \proof
   }
 
 \setchemformula
@@ -1738,7 +1738,7 @@
         { \bibliographystyle{gbt7714-author-year} }
       }
       { \cs_set_eq:NN \cite \citep }
-      { \exp_args:NV \bibliographystyle \l__eb_bib_otherstyle_tl }
+      { \exp_args:NV \bibliographystyle \l__eb_bib_both_style_tl }
     \tl_if_blank:VF \l__eb_bib_cite_style_tl
       { \exp_args:NV \setcitestyle \l__eb_bib_cite_style_tl }
     \NewDocumentCommand{\printbibliography}{st+o}
diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls
index eb2b2c7a753..2dc5be02ccb 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}{2022/03/05}{1.639}
+\ProvidesExplClass{easybook}{2022/03/06}{1.64}
   {Easily typesetting Chinese theses or books}
 
 \bool_set_false: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 8d94afbdb5d..2075d8d6771 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}{2022/03/05}{1.639}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2022/03/06}{1.64}
   {Customization of tcolorbox for easybook}
 
 \cs_set_protected:Npn \addtotcbstyle #1#2