easybook (16nov21)

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

6 files changed, 33 insertions, 47 deletions

diff --git a/Master/texmf-dist/doc/latex/easybook/easybook.pdf b/Master/texmf-dist/doc/latex/easybook/easybook.pdf
index 37b9add116d..d949277b011 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 cde1c710e87..661175447eb 100644
--- a/Master/texmf-dist/doc/latex/easybook/easybook.tex
+++ b/Master/texmf-dist/doc/latex/easybook/easybook.tex
@@ -20,8 +20,8 @@
     name            = easybook,
     color-scheme    = blue,
     title           = EASYBOOK 使用手册,
-    version         = v1.40P,
-    date            = 2021/11/12,
+    version         = v1.40Q,
+    date            = 2021/11/16,
     authors         = 瞿毅,
     info            = 排版简体中文学位论文和书籍,
     email           = q1jx@foxmail.com,
@@ -488,7 +488,7 @@
 \label{subsec:spacing}
 行距因子用于设置各种行距倍数，\meta{数值} 是不带有长度单位的浮点数。各类行距既可以在导言区全局设置，也可以在正文中设置对后面生效。
 \begin{options}
-  \keyval-{line}{数值}\Module{spread}\Default{1.3}
+  \keyval-{line}{数值}\Module{spread}\Default{1.354}
   正文行距因子，C\TeX 原有的行距选项 \option*{linespread} 失效。
   \keyval-{table}{数值}\Default{1.2}
   表格行距因子，对传统表格环境 \env*{tabular}、\env*{tabularx} 以及 \pkg*{tabularray} 宏包的 \env{tblr} 环境生效，同时 \env{tblr} 也自带有 \option*{stretch} 选项设置行距。
@@ -580,9 +580,9 @@
   定理标题部分的字体，包括字体族、字体系列、字体尺寸和字体形状命令。
   \keyval-{headindent}{刚性长度}\Default{0em}
   定理标题的缩进，默认无缩进，可用 \cs*{parindent} 命令设置为段落缩进。
-  \keyval-{spaceabove}{弹性长度}\Default{0.75ex plus .1ex}
+  \keyval-{spaceabove}{弹性长度}\Default{0ex plus .1ex}
   定理环境前的间距，使用 \pkg*{tcolorbox} 的盒子环境包装后被覆盖。
-  \keyval-{spacebelow}{弹性长度}\Default{0.75ex plus .1ex}
+  \keyval-{spacebelow}{弹性长度}\Default{0ex plus .1ex}
   定理环境后的间距，使用 \pkg*{tcolorbox} 的盒子环境包装后被覆盖。
   \keyval-{postheadspace}{刚性长度}\Default{1em}
   定理标题后与定理第一段内容的间距。
diff --git a/Master/texmf-dist/source/latex/easybook/easybook.dtx b/Master/texmf-dist/source/latex/easybook/easybook.dtx
index 14c53c66084..2e023285a00 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/11/12}{1.40P}
+\ProvidesExplClass{easybook}{2021/11/16}{1.40Q}
   {Typeset Chinese theses or books}
 
 \bool_set_false:N \l__eb_compile_draft_bool
@@ -325,7 +325,7 @@
 %<*package>
 \NeedsTeXFormat{LaTeX2e}[2020/10/01]
 \RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2021/11/12}{1.40P}
+\ProvidesExplPackage{easybase}{2021/11/16}{1.40Q}
   {Typeset Chinese theses or books}
 
 \cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -923,8 +923,7 @@
   {
     \group_begin:
     \footnotesize
-    \exp_args:Nx
-    \setspread{ \fp_use:N \l__eb_spread_footnote_fp }
+    \setspread{\fp_use:N \l__eb_spread_footnote_fp}
     \exp_args:NNNo \group_end:
     \dim_set:Nn \footnotesep { \dim_use:N \box_ht:N \strutbox }
     \bool_if:NT \l__eb_chap_counter_withpart_bool
@@ -1279,7 +1278,7 @@
     lolskip .skip_set:N       = \eb@toc@lolskip,
     lolskip .initial:n        = 10pt,
     main-voffset .skip_set:N  = \l__eb_toc_main_voffset_skip,
-    main-voffset .initial:n   = \bool_if:NTF \l__eb_class_book_bool { 1pc } { 0.35pc },
+    main-voffset .initial:n   = \bool_if:NTF \l__eb_class_book_bool { 1pc } { 0.2pc },
     line-align .bool_set:N    = \l__eb_toc_line_align_bool,
     line-align .default:n     = true,
     line-align .initial:n     = true,
@@ -1332,7 +1331,7 @@
     chapter/tocindent     = 0em,
     chapter/tocrule       = \tocrule{$\cdot$}[\bfseries],
     chapter/tocline       = \CTEXnumberline{#1}#2,
-    section/tocformat = \addvspace{0.35pc}\bool_if:NF \l__eb_class_book_bool { \sffamily },
+    section/tocformat = \addvspace{0.2pc}\bool_if:NF \l__eb_class_book_bool { \sffamily },
     section/tocindent = \bool_if:NTF \l__eb_class_book_bool { 1.5em } { 0em },
     section/tocrule       =
       {
@@ -1341,7 +1340,7 @@
           { \tocrule{$\cdot$}[\bfseries] }
       },
     section/tocline       = \CTEXnumberline{#1}#2,
-    subsection/tocformat  = \addvspace{0.35pc},
+    subsection/tocformat  = \addvspace{0.2pc},
     subsection/tocindent  = \bool_if:NTF \l__eb_class_book_bool { 3.8em } { 1.4em },
     subsection/tocrule    = \tocrule{$\cdot$},
     subsection/tocline    = \CTEXnumberline{#1}#2,
@@ -1467,10 +1466,7 @@
     \eb_appto_cmd:Nn \@chapter
       {
         \skip_if_eq:nnF { \eb@toc@lolskip } { \c_zero_skip }
-          {
-            \addtocontents{lol}
-              {\protect\addvspace{\skip_use:N \eb@toc@lolskip}}
-          }
+          { \addtocontents{lol}{\protect\addvspace{\skip_use:N \eb@toc@lolskip}} }
       }
   }
 
@@ -1721,7 +1717,7 @@
 \ctex_define:nn { spread }
   {
     line .code:n        = \AfterPreamble{\setspread{#1}},
-    line .initial:n     = 1.3,
+    line .initial:n     = 1.354,
     table .fp_set:N     = \l__eb_spread_table_fp,
     table .initial:n    = 1.2,
     math .fp_set:N      = \l__eb_spread_math_fp,
@@ -1769,10 +1765,7 @@
     \SetTblrInner{stretch = \fp_use:N \l__eb_spread_table_fp}
   }{}
 \eb_at_begin_environment:nn { tabular,tabularx }
-  {
-    \exp_args:Nx
-    \setspread { \fp_use:N \l__eb_spread_table_fp }
-  }
+  { \setspread{\fp_use:N \l__eb_spread_table_fp} }
 
 \bool_if:NF \l__eb_float_page_bool
   {
@@ -1799,9 +1792,9 @@
 \tl_gset:Nn \ULthickness { \l__eb_rule_width_dim }
 \DeclareGraphicsExtensions{.pdf,.png,.jpg,.eps,.tif}
 
-\cs_new_protected:Npn \hangpara #1#2
+\cs_set_protected:Npn \hangpara #1#2
   { \hangindent #1\hangafter #2\noindent\ignorespaces }
-\NewDocumentEnvironment{hangparas}{mm+b}
+\DeclareDocumentEnvironment{hangparas}{mm+b}
   {
     \dim_zero:N \parindent
     \everypar{\hangpara{#1}{#2}}#3\par
@@ -1984,8 +1977,8 @@
   }
 \ctex_set:nn { thmset }
   {
-    spaceabove    = 0.75ex plus .1ex,
-    spacebelow    = 0.75ex plus .1ex,
+    spaceabove    = 0ex plus .1ex,
+    spacebelow    = 0ex plus .1ex,
     headindent    = 0em,
     headfont      = \color{ctex@emph}\sffamily,
     postheadspace = 1em,
@@ -2401,7 +2394,7 @@
   }
 %</package>
 %<*tcolorbox>
-\ProvidesExplFile{eb-tcolorbox.cfg}{2021/11/12}{1.40P}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2021/11/16}{1.40Q}
   {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 5f377cf5c21..99518e4bf6e 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/11/12}{1.40P}
+\ProvidesExplPackage{easybase}{2021/11/16}{1.40Q}
   {Typeset Chinese theses or books}
 
 \cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -618,8 +618,7 @@
   {
     \group_begin:
     \footnotesize
-    \exp_args:Nx
-    \setspread{ \fp_use:N \l__eb_spread_footnote_fp }
+    \setspread{\fp_use:N \l__eb_spread_footnote_fp}
     \exp_args:NNNo \group_end:
     \dim_set:Nn \footnotesep { \dim_use:N \box_ht:N \strutbox }
     \bool_if:NT \l__eb_chap_counter_withpart_bool
@@ -974,7 +973,7 @@
     lolskip .skip_set:N       = \eb@toc@lolskip,
     lolskip .initial:n        = 10pt,
     main-voffset .skip_set:N  = \l__eb_toc_main_voffset_skip,
-    main-voffset .initial:n   = \bool_if:NTF \l__eb_class_book_bool { 1pc } { 0.35pc },
+    main-voffset .initial:n   = \bool_if:NTF \l__eb_class_book_bool { 1pc } { 0.2pc },
     line-align .bool_set:N    = \l__eb_toc_line_align_bool,
     line-align .default:n     = true,
     line-align .initial:n     = true,
@@ -1027,7 +1026,7 @@
     chapter/tocindent     = 0em,
     chapter/tocrule       = \tocrule{$\cdot$}[\bfseries],
     chapter/tocline       = \CTEXnumberline{#1}#2,
-    section/tocformat = \addvspace{0.35pc}\bool_if:NF \l__eb_class_book_bool { \sffamily },
+    section/tocformat = \addvspace{0.2pc}\bool_if:NF \l__eb_class_book_bool { \sffamily },
     section/tocindent = \bool_if:NTF \l__eb_class_book_bool { 1.5em } { 0em },
     section/tocrule       =
       {
@@ -1036,7 +1035,7 @@
           { \tocrule{$\cdot$}[\bfseries] }
       },
     section/tocline       = \CTEXnumberline{#1}#2,
-    subsection/tocformat  = \addvspace{0.35pc},
+    subsection/tocformat  = \addvspace{0.2pc},
     subsection/tocindent  = \bool_if:NTF \l__eb_class_book_bool { 3.8em } { 1.4em },
     subsection/tocrule    = \tocrule{$\cdot$},
     subsection/tocline    = \CTEXnumberline{#1}#2,
@@ -1162,10 +1161,7 @@
     \eb_appto_cmd:Nn \@chapter
       {
         \skip_if_eq:nnF { \eb@toc@lolskip } { \c_zero_skip }
-          {
-            \addtocontents{lol}
-              {\protect\addvspace{\skip_use:N \eb@toc@lolskip}}
-          }
+          { \addtocontents{lol}{\protect\addvspace{\skip_use:N \eb@toc@lolskip}} }
       }
   }
 
@@ -1416,7 +1412,7 @@
 \ctex_define:nn { spread }
   {
     line .code:n        = \AfterPreamble{\setspread{#1}},
-    line .initial:n     = 1.3,
+    line .initial:n     = 1.354,
     table .fp_set:N     = \l__eb_spread_table_fp,
     table .initial:n    = 1.2,
     math .fp_set:N      = \l__eb_spread_math_fp,
@@ -1464,10 +1460,7 @@
     \SetTblrInner{stretch = \fp_use:N \l__eb_spread_table_fp}
   }{}
 \eb_at_begin_environment:nn { tabular,tabularx }
-  {
-    \exp_args:Nx
-    \setspread { \fp_use:N \l__eb_spread_table_fp }
-  }
+  { \setspread{\fp_use:N \l__eb_spread_table_fp} }
 
 \bool_if:NF \l__eb_float_page_bool
   {
@@ -1494,9 +1487,9 @@
 \tl_gset:Nn \ULthickness { \l__eb_rule_width_dim }
 \DeclareGraphicsExtensions{.pdf,.png,.jpg,.eps,.tif}
 
-\cs_new_protected:Npn \hangpara #1#2
+\cs_set_protected:Npn \hangpara #1#2
   { \hangindent #1\hangafter #2\noindent\ignorespaces }
-\NewDocumentEnvironment{hangparas}{mm+b}
+\DeclareDocumentEnvironment{hangparas}{mm+b}
   {
     \dim_zero:N \parindent
     \everypar{\hangpara{#1}{#2}}#3\par
@@ -1679,8 +1672,8 @@
   }
 \ctex_set:nn { thmset }
   {
-    spaceabove    = 0.75ex plus .1ex,
-    spacebelow    = 0.75ex plus .1ex,
+    spaceabove    = 0ex plus .1ex,
+    spacebelow    = 0ex plus .1ex,
     headindent    = 0em,
     headfont      = \color{ctex@emph}\sffamily,
     postheadspace = 1em,
diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls
index 5603af10dc4..b73ce1ff16e 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/11/12}{1.40P}
+\ProvidesExplClass{easybook}{2021/11/16}{1.40Q}
   {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 d8295ff117c..245fd9dc665 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/11/12}{1.40P}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2021/11/16}{1.40Q}
   {Customization of tcolorbox for easybook}
 
 \tl_gset:Nn \eb@tc@line@skip { 0.5\baselineskip }