easybook (29sep21)

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

6 files changed, 33 insertions, 25 deletions

diff --git a/Master/texmf-dist/doc/latex/easybook/easybook.pdf b/Master/texmf-dist/doc/latex/easybook/easybook.pdf
index 2549d682b34..67e4adfe077 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 a979be5a547..61c180ba7ae 100644
--- a/Master/texmf-dist/doc/latex/easybook/easybook.tex
+++ b/Master/texmf-dist/doc/latex/easybook/easybook.tex
@@ -3,8 +3,8 @@
 \usepackage[fontset = fandol]{ctex}
 \usepackage
   {
-    booktabs,enumitem,newtxmath,indentfirst,
-    fancyvrb,geometry,colortbl,hologo,pifont
+    enumitem,newtxmath,indentfirst,tabularray,
+    fancyvrb,geometry,hologo,pifont
   }
 \colorlet{cnltxred}{violet}
 \setcnltx
@@ -12,8 +12,8 @@
     name            = easybook,
     color-scheme    = blue,
     title           = EASYBOOK 使用手册,
-    version         = v1.3d,
-    date            = 2021/09/12,
+    version         = v1.3F,
+    date            = 2021/09/28,
     authors         = 瞿毅,
     info            = 排版简体中文学位论文和书籍,
     email           = quee123@foxmail.com,
@@ -37,7 +37,6 @@
 \geometry{margin = 1in,marginparwidth = 0.65in}
 \setlist{nosep,labelindent = \parindent,leftmargin = *,labelsep = 0.5em}
 \setlist[itemize,1]{label = \small\color{cnltxblue}\textbullet}
-\arrayrulecolor{cnltxblue}
 \setcounter{tocdepth}{2}
 
 \ExplSyntaxOn\makeatletter
@@ -204,17 +203,19 @@
   \keychoice{font}{noto,garamond,times,libertine,palatino,auto}\Default{auto}
   预置的英文字体相关配置方案如下表所示，这些字体已经包含在了 \TeX Live 发行版中，所以通常不需要再专门安装。如果您想使用其他英文字体，可以使用 \pkg*{fontspec} 宏包的相关命令进行设置。
   \begin{center}
-  \begin{tabular}{cccc}
-  \toprule
+  \begin{tblr}
+  {
+    colspec = cccc,
+    hline{1,7} = {1pt,cnltxblue},
+    hline{2} = {0.6pt,cnltxblue}
+  }
   & \textsf{正文字体} & \textsf{无衬线字体} & \textsf{等宽字体} \\
-  \midrule[0.6pt]
   \code{noto} & Noto Serif & Noto Sans & Noto Sans Mono \\
   \code{garamond} & EB Garamond & Libertinus Sans & LM Mono \\
   \code{palatino} & TG Pagella & Libertinus Sans & LM Mono \\
   \code{libertine} & TG Pagella & Libertinus Sans & LM Mono \\
   \code{times} & XITS & TG Heros & TG Cursor \\
-  \bottomrule
-  \end{tabular}
+  \end{tblr}
   \end{center}
 \end{options}
 
@@ -318,15 +319,17 @@
   \command*{ctexset}[\marg{键值列表}]
   \cls*{easybook} 扩展了 C\TeX 宏集 \hologo{LaTeX3} 风格键值的通用控制命令 \cs*{ctexset}，接口选项同样可用它设置， 原有的 \meta{键值列表} 仍然可用。本文档类目前有 9 个模块用于实现常规的排版功能，如下表所示，它们既是统一接口 \cs*{ctexset} 的路径，也是相关模块的接口命令名：
   \begin{center}
-  \begin{tabular}{*{5}{c}}
-  \toprule
+  \begin{tblr}
+  {
+    colspec = *{5}{c},
+    hline{1,5} = {1pt,cnltxblue},
+    hline{3} = {0.6pt,cnltxblue}
+  }
   \hyperref[subsec:style]{风格} & \hyperref[subsec:other font]{其它字体} & \hyperref[subsec:spacing]{行距} & \hyperref[subsec:hyperlinks]{超链接} & \hyperref[subsec:reference]{参考文献} \\
   \module*{style} & \module*{subfont} & \module*{spread} & \module*{refset} & \module*{bibset} \\
-  \midrule[0.6pt]
   \hyperref[subsec:theorem of style]{定理样式} & \hyperref[subsec:page margins]{页面尺寸} & \hyperref[subsec:header and footer]{页眉页脚} & \hyperref[subsec:catalog style]{目录样式} & \\
   \module*{thmset} & \module*{geoset} & \module*{hdrset} & \module*{tocset} & \\
-  \bottomrule
-  \end{tabular}
+  \end{tblr}
   \end{center}
 
   例如使用下面小节 \ref{subsec:style} 介绍的风格 \module*{style} 模块，路径名与所属下级选项之间可以 \code{/} 或 \code{=} 号分开，符号后不能有空格或者换行：
@@ -866,12 +869,15 @@
   \environment{proof}
   这些是预置的定理环境，可使用选项 \module*{thmset/}\option{thmbox} 为它们添加盒子边框，其中注与证明环境不编号，证明末尾会自动添加证明结束符，声明新的定理环境或更改定理盒子样式见小节 \ref{subsec:theorem of style}。环境名与之对应的定理名如下：
   \begin{center}
-  \begin{tabular}{*{8}{c}}
-  \toprule
+  \begin{tblr}
+  {
+    colspec = *{8}{c},
+    hline{1,3} = {1pt,cnltxblue},
+    hline{2} = {0.6pt,cnltxblue}
+  }
   \env{theorem} & \env{definition} & \env{lemma} & \env{corollary} & \env{proposition} & \env{example} & \env{remark} & \env{proof} \\
   定理 & 定义 & 引理 & 推论& 性质 & 例 & 注 & 证明 \\
-  \bottomrule
-  \end{tabular}
+  \end{tblr}
   \end{center}
 \end{environments}
 
diff --git a/Master/texmf-dist/source/latex/easybook/easybook.dtx b/Master/texmf-dist/source/latex/easybook/easybook.dtx
index 2081f55551e..7a2475dd586 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}{2021/09/12}{1.3d}
+\ProvidesExplClass{easybook}{2021/09/28}{1.3F}
   {Typeset Chinese theses or books}
 
 \bool_set_false:N \l__eb_compile_draft_bool
@@ -297,7 +297,7 @@
 %<*package>
 \NeedsTeXFormat{LaTeX2e}[2020/10/01]
 \RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2021/09/12}{1.3d}
+\ProvidesExplPackage{easybase}{2021/09/28}{1.3F}
   {Typeset Chinese theses or books}
 
 \cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -1771,6 +1771,7 @@
     \tl_gset:Nn \dbltopfraction { 0.9 }
     \tl_gset:Nn \dblfloatpagefraction { 0.9 }
   }
+\dim_zero_new:N \mathindent
 \skip_set:Nn \parskip { 0pt plus 2pt minus 1pt }
 \skip_set:Nn \intextsep { 14pt plus 2pt minus 2pt }
 \skip_set:Nn \textfloatsep { 16pt plus 2pt minus 4pt }
@@ -2389,7 +2390,7 @@
   }
 %</package>
 %<*tcolorbox>
-\ProvidesExplFile{eb-tcolorbox.cfg}{2021/09/12}{1.3d}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2021/09/28}{1.3F}
   {Customization of tcolorbox for easybook}
 
 \tl_gset:Nn \eb@tc@line@skip { 0.5\baselineskip }
diff --git a/Master/texmf-dist/tex/latex/easybook/easybase.sty b/Master/texmf-dist/tex/latex/easybook/easybase.sty
index 274ebf5f180..183457cdd02 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}{2021/09/12}{1.3d}
+\ProvidesExplPackage{easybase}{2021/09/28}{1.3F}
   {Typeset Chinese theses or books}
 
 \cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -1494,6 +1494,7 @@
     \tl_gset:Nn \dbltopfraction { 0.9 }
     \tl_gset:Nn \dblfloatpagefraction { 0.9 }
   }
+\dim_zero_new:N \mathindent
 \skip_set:Nn \parskip { 0pt plus 2pt minus 1pt }
 \skip_set:Nn \intextsep { 14pt plus 2pt minus 2pt }
 \skip_set:Nn \textfloatsep { 16pt plus 2pt minus 4pt }
diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls
index 79a85606aed..3248671e735 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}{2021/09/12}{1.3d}
+\ProvidesExplClass{easybook}{2021/09/28}{1.3F}
   {Typeset 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 27622d2cae5..a8fb8325768 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}{2021/09/12}{1.3d}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2021/09/28}{1.3F}
   {Customization of tcolorbox for easybook}
 
 \tl_gset:Nn \eb@tc@line@skip { 0.5\baselineskip }