easybook (9feb21)

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

6 files changed, 72 insertions, 28 deletions

diff --git a/Master/texmf-dist/doc/latex/easybook/easybook-demo.pdf b/Master/texmf-dist/doc/latex/easybook/easybook-demo.pdf
index 5fb27f8d904..d6e1b6ee617 100644
--- a/Master/texmf-dist/doc/latex/easybook/easybook-demo.pdf
+++ b/Master/texmf-dist/doc/latex/easybook/easybook-demo.pdf
diff --git a/Master/texmf-dist/doc/latex/easybook/easybook-demo.tex b/Master/texmf-dist/doc/latex/easybook/easybook-demo.tex
index 57801d4fafe..8c50c5690bc 100644
--- a/Master/texmf-dist/doc/latex/easybook/easybook-demo.tex
+++ b/Master/texmf-dist/doc/latex/easybook/easybook-demo.tex
@@ -27,10 +27,9 @@
       {
         linespread = 1.355,
         tabspread = 1.05,
-        mathspread = 1,
+        mathspread = 1.05,
         capspread = 1,
-        fnspread = 1.05,
-        fnsep = 0.5ex
+        fnspread = 1
       },
     elfont =
       {
@@ -95,7 +94,7 @@
         \github~\url{https://github.com/texl3/easybook} \\
         \edge~\url{https://latexstudio.net}
       }
-    \date{2021/02/08\hskip\ccwd\relax v1.23a}
+    \date{2021/02/09\hskip\ccwd\relax v1.23b}
   }
 
 \begin{document}
diff --git a/Master/texmf-dist/doc/latex/easybook/easybook.pdf b/Master/texmf-dist/doc/latex/easybook/easybook.pdf
index cea72f04f6b..10801ed5962 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 4cd23121b73..3c9f686289e 100644
--- a/Master/texmf-dist/doc/latex/easybook/easybook.tex
+++ b/Master/texmf-dist/doc/latex/easybook/easybook.tex
@@ -3,7 +3,7 @@
 
 \title{\sffamily easybook书籍文档类}
 \author{瞿毅}
-\date{2021/02/08\hskip\ccwd\relax v1.23a\thanks{\url{https://gitee.com/texl3/easybook}}}
+\date{2021/02/09\hskip\ccwd\relax v1.23b\thanks{\url{https://gitee.com/texl3/easybook}}}
 
 \begin{document}
 \maketitle
@@ -158,24 +158,25 @@
     \begin{function}{ctex@link,ctex@url,ctex@cite}
     \begin{syntax}
       \tn{definecolor}\oarg{类型}\marg{名称}\marg{模式列表}\marg{参数列表}
-    \end{syntax}超链接颜色用到这三个颜色，可以使用 \tn{definecolor} 命令进行更改。
+    \end{syntax}
     \changes{v1.10}{2021/01/08}{可以自定义超链接颜色。}
+    超链接颜色用到这三个颜色，可以使用 \tn{definecolor} 命令进行更改。
     \end{function}
   \item[linktopage] 将目录中的超链接置于页码上，默认是置于标题上。
 \end{optdesc}
 
 \subsection{行距}
-\begin{function}[EXP,added = 2021-01-05,updated = 2021-01-12]{spread/linespread,spread/tabspread,spread/mathspread,spread/capspread,spread/fnspread,spread/fnsep}
+\begin{function}[EXP,added = 2021-01-05,updated = 2021-02-09]{spread/linespread,spread/tabspread,spread/mathspread,spread/capspread,spread/fnspread}
 \begin{syntax}
   linespread = <(1.3)>
-  tabspread = <(1)>
-  mathspread = <(1)>
+  tabspread = <(1.05)>
+  mathspread = <(1.05)>
   capspread = <(1)>
   fnspread = <(1)>
-  fnsep = <(0ex)>
 \end{syntax}
 \changes{v1.21b}{2021/01/12}{增加脚注线间的距离选项。}
-除了 \opt{fnsep} 选项，其它是行距因子用于设置各种行距倍数，只能是浮点数，不能带有长度单位。\tn{ctexset} 原有的行距选项\opt{linespread}失效。各行距既可在导言区全局设置也可正文中设置对后面生效，行距的意义为
+\changes{v1.23b}{2021/02/09}{取消使用 \pkg{zhlineskip} 宏包设置数学间距。}
+行距因子用于设置各种行距倍数，只能是浮点数，不能带有长度单位。\tn{ctexset} 原有的行距选项\opt{linespread}失效。各行距既可在导言区全局设置也可正文中设置对后面生效，行距的意义为
 \end{function}
 
 \begin{optdesc}
@@ -184,7 +185,6 @@
   \item[mathspread] 数学环境行距。
   \item[capspread] 图表代码标题行距。
   \item[fnspread] 脚注行距。
-  \item[fnsep] 脚注与脚注线间的距离，需带有长度单位。
 \end{optdesc}
 
 \subsection{其它字体}
@@ -411,7 +411,7 @@
 
 \subsection{习题}
 \begin{function}[added = 2021-01-05,updated = 2021-02-08]{exercise}
-  \begin{syntax}
+\begin{syntax}
   \tn{begin}\marg{exercise}\oarg{颜色名}\oarg{编号}\oarg{标题}
   \tn{item} <习题内容>
   \tn{end}\marg{exercise}
diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls
index d0d8ae2c1e7..7f1d5d12559 100644
--- a/Master/texmf-dist/tex/latex/easybook/easybook.cls
+++ b/Master/texmf-dist/tex/latex/easybook/easybook.cls
@@ -9,7 +9,7 @@
 %%   https://creativecommons.org/licenses/by/4.0/legalcode
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2021/02/08}{1.23a}{}
+\ProvidesExplClass{easybook}{2021/02/09}{1.23b}{}
 
 \cs_generate_variant:Nn \keys_define:nn {nx}
 \cs_generate_variant:Nn \int_to_arabic:n {v}
@@ -142,9 +142,9 @@
 \RequirePackage
   {
     xcolor,
-    pdfpages,footmisc,
-    setspace,zhlineskip,
-    amsthm,thmtools,cases,
+    pdfpages,
+    footmisc,setspace,
+    amsmath,amsthm,thmtools,cases,
     chemformula,chemfig,siunitx,ulem,
     microtype,
     geometry,marginnote,
@@ -688,22 +688,19 @@
 \tl_new:N \l__math_spread_tl
 \tl_new:N \l__cap_spread_tl
 \tl_new:N \l__foot_spread_tl
-\tl_new:N \l__foot_fnsep_tl
 
 \__ctex_define:nn {spread}
   {
     linespread  .fp_set:N = \l__line_spread_fp,
     linespread  .initial:n = 1.3,
     tabspread   .fp_set:N = \l__tab_spread_fp,
-    tabspread   .initial:n = 1,
+    tabspread   .initial:n = 1.05,
     mathspread  .tl_set:N = \l__math_spread_tl,
-    mathspread  .initial:n = 1,
+    mathspread  .initial:n = 1.05,
     capspread   .tl_set:N = \l__cap_spread_tl,
     capspread   .initial:n = 1,
     fnspread    .tl_set:N = \l__foot_spread_tl,
-    fnspread    .initial:n = 1,
-    fnsep       .tl_set:N = \l__foot_fnsep_tl,
-    fnsep       .initial:n = 0ex
+    fnspread    .initial:n = 1
   }
 
 \skip_set:Nn \parskip{0pt plus 2pt minus 1pt}
@@ -877,8 +874,51 @@
   }
 \allowdisplaybreaks[4]
 \cs_gset:Npn \ULthickness{.75pt}
-\SetMathEnvironmentSinglespace{\l__math_spread_tl}
 \skip_set:Nn \jot{4pt plus 1pt minus 1pt}
+\cs_new:Npn \l__math_restore:n #1
+  {
+    \AtBeginEnvironment{#1}
+      {\linespread{\l__math_spread_tl}\selectfont\ignorespaces}
+  }
+\l__math_restore:n {array}
+\l__math_restore:n {matrix}
+\l__math_restore:n {pmatrix}
+\l__math_restore:n {bmatrix}
+\l__math_restore:n {Bmatrix}
+\l__math_restore:n {vmatrix}
+\l__math_restore:n {Vmatrix}
+\l__math_restore:n {cases}
+\l__math_restore:n {aligned}
+\l__math_restore:n {alignedat}
+\l__math_restore:n {gathered}
+\__patch_cmd:Nnn \start@gather
+  {\collect@body}
+  {\linespread{\l__math_spread_tl}\selectfont\collect@body}
+\__patch_cmd:Nnn \start@align
+  {\collect@body}
+  {\linespread{\l__math_spread_tl}\selectfont\collect@body}
+\__patch_cmd:Nnn \start@multline
+  {\collect@body}
+  {\linespread{\l__math_spread_tl}\selectfont\collect@body}
+\__patch_cmd:Nnn \gather@split
+  {\spread@equation}
+  {\linespread{\l__math_spread_tl}\selectfont\spread@equation}
+\l__math_restore:n {matrix*}
+\l__math_restore:n {pmatrix*}
+\l__math_restore:n {bmatrix*}
+\l__math_restore:n {Bmatrix*}
+\l__math_restore:n {vmatrix*}
+\l__math_restore:n {Vmatrix*}
+\l__math_restore:n {cases*}
+\l__math_restore:n {dcases}
+\l__math_restore:n {dcases*}
+\l__math_restore:n {rcases}
+\l__math_restore:n {rcases*}
+\l__math_restore:n {drcases}
+\l__math_restore:n {drcases*}
+\l__math_restore:n {multlined}
+\l__math_restore:n {lgathered}
+\l__math_restore:n {rgathered}
 \ctex_after_end_preamble:n
   {
     \skip_set:Nn \abovedisplayskip{5pt plus 1pt minus 1pt}
@@ -1097,7 +1137,11 @@
 \ctex_at_end_preamble:n
   {
     \skip_set:Nn \footnotemargin{0.5\ccwd}
-    \skip_set:Nn \footnotesep{\l__foot_fnsep_tl}
+    \group_begin:
+    \footnotesize
+    \exp_args:Nx \linespread{\tl_use:N \l__foot_spread_tl}\selectfont
+    \skip_gset:Nn \footnotesep{\ht\strutbox}
+    \group_end:
     \cs_gset:Npn \hangfootparskip{0ex}
     \cs_gset:Npn \footnoterule
       {
@@ -1120,10 +1164,10 @@
       }
   }
 \__patch_cmd:Nnn \@footnotetext
-  {\def\baselinestretch{\ZhLS@footlinespread}\reset@font}
+  {\reset@font}
   {\def\baselinestretch{\l__foot_spread_tl}\l__foot_font_tl}
 \__patch_cmd:Nnn \@mpfootnotetext
-  {\def\baselinestretch{\ZhLS@footlinespread}\reset@font}
+  {\reset@font}
   {\def\baselinestretch{\l__foot_spread_tl}\l__foot_font_tl}
 \__patch_cmd:Nnn \@makefnmark
   {\normalfont}{\l__foot_font_tl}
@@ -1249,7 +1293,7 @@
     \clist_map_function:nN
       {
         {none,      000000,000000,000000},
-        {seaside,   13abae,004986,a40000},
+        {seaside,   1381b2,004986,a40000},
         {energy,    f39800,00a0e9,893895},
         {cyberpunk, 005982,eb6877,a4005b}
       }
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 3053e35e5e6..3cfe4530f31 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -1345,6 +1345,7 @@ chomp (my $ctan_root = `tlpkginfo --ctan-root`);
  'turkishintro',"die 'skipping, nosource'",
  'turnstile',   "&MAKEflatten",
  'turnthepage', "&MAKEflatten",
+ 'twemojis',	"die 'skipping, too many thousands of files'",
  'txfonts',     "&MAKEflatten",
  'txfontsb',    "&MAKEflatten",
  'txuprcal',     "&MAKEflatten",