easybook (10mar21) (branch)

git-svn-id: svn://tug.org/texlive/branches/branch2020.0@58261 c570f23f-e606-0410-a88d-b1316a301751

6 files changed, 69 insertions, 80 deletions

diff --git a/Master/texmf-dist/doc/latex/easybook/chapter2.tex b/Master/texmf-dist/doc/latex/easybook/chapter2.tex
index 01bfdf7dc2a..4cf3e8113c3 100644
--- a/Master/texmf-dist/doc/latex/easybook/chapter2.tex
+++ b/Master/texmf-dist/doc/latex/easybook/chapter2.tex
@@ -26,9 +26,9 @@
 \index{d@定理!s@Stokes formula}
 Let $\Gamma$ be a piecewise smooth directed closed curve, $\Sigma$ is a piecewise smooth directed surface bounded by $\Gamma$, the side of $\Gamma$ and the positive direction of $\Sigma$ According to the right-hand rule, if the function $P(x,y,z)$, $Q(x,y,z)$, $R(x,y,z)$ has a first-order continuous deviation on the curve $\Sigma$ Derivative, then
 \begin{multline}
-  \iint_\Sigma\left(\frac{\partial R}{\partial y} - \frac{\partial Q}{\partial z}\right)\mathrm{d}y\mathrm{d}z + \left(\frac{\partial P}{\partial z} - \frac{\partial R}{\partial x}\right)\mathrm{d}z\mathrm{d}x + \left(\frac{\partial Q}{\partial x} - \frac{\partial P}{\partial y}\right)\mathrm{d}x\mathrm{d}y
+  \iint_\Sigma\left(\frac{\partial R}{\partial y} - \frac{\partial Q}{\partial z}\right)\mathrm{d}y\mathrm{d}z + \left(\frac{\partial P}{\partial z} - \frac{\partial R}{\partial x}\right)\mathrm{d}z\mathrm{d}x
   \\
-  = \oint_\Gamma P\mathrm{d}x + Q\mathrm{d}y + R\mathrm{d}z
+  + \left(\frac{\partial Q}{\partial x} - \frac{\partial P}{\partial y}\right)\mathrm{d}x\mathrm{d}y = \oint_\Gamma P\mathrm{d}x + Q\mathrm{d}y + R\mathrm{d}z
 \end{multline}
 The Stokes formula is an extension of the basic calculus formula in the case of surface integration. It is also an extension of the Green formula. This formula gives the second type of surface integral on the surface block and the second type of curve on the boundary curve  Link between points.
 \end{definition}
diff --git a/Master/texmf-dist/doc/latex/easybook/easybook-demo.pdf b/Master/texmf-dist/doc/latex/easybook/easybook-demo.pdf
index 0422aff9679..22cc5d82660 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 5a587d21c13..697baf76b9c 100644
--- a/Master/texmf-dist/doc/latex/easybook/easybook-demo.tex
+++ b/Master/texmf-dist/doc/latex/easybook/easybook-demo.tex
@@ -98,7 +98,7 @@
     \github~\url{https://github.com/texl3/easybook} \\
     \edge~\url{https://latexstudio.net}
   }
-\date{2021/03/08\hskip\ccwd\relax v1.23k}
+\date{2021/03/10\hskip\ccwd\relax v1.23m}
 
 \frontmatter[roman]
 \maketitle
@@ -106,10 +106,10 @@
 
 \mainmatter*
 \part{使用示例}
-\include{pages/chapter1}
-\include{pages/chapter2}
-\include{pages/chapter3}
-\include{pages/appendix}
+\include{chapter1}
+\include{chapter2}
+\include{chapter3}
+\include{appendix}
 
 \backmatter
 \printbibliography
diff --git a/Master/texmf-dist/doc/latex/easybook/easybook.pdf b/Master/texmf-dist/doc/latex/easybook/easybook.pdf
index 200e2d1a96d..9809242c070 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 a2660c75852..2db86a5b569 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/03/08\hskip\ccwd\relax v1.23k\thanks{\url{https://gitee.com/texl3/easybook}}}
+\date{2021/03/10\hskip\ccwd\relax v1.23m\thanks{\url{https://gitee.com/texl3/easybook}}}
 
 \begin{document}
 \maketitle
@@ -98,7 +98,7 @@
   \tn{frontmatter}\oarg{编号格式|(Roman)}
   \tn{printindex}\oarg{索引名}
 \end{syntax}
-\changes{v1.23k}{2021/02/20}{重新定义文档结构划分命令。}
+\changes{v1.23m}{2021/02/20}{重新定义文档结构划分命令。}
 \tn{frontmatter} 为前言区命令，章标题不编号，页码可设置为例如 \opt{roman}、\opt{Alph} 等格式，带有星号的命令 \tn{frontmatter*} 不使用 \tn{cleardoublepage}。\tn{mainmatter} 为主文区命令，章标题正常编号且页码为从1开始计数的阿拉伯数字，\tn{mainmatter*} 命令不使用 \tn{cleardoublepage}。\tn{backmatter} 为后记区命令，页码格式与编号保持不变，章标题不编号。\tn{listoffigures} 命令输出图片目录，\tn{listoftables} 命令输出表格目录，\tn{listoflistings} 命令输出代码目录。
 \end{function}
 
@@ -132,8 +132,8 @@
   uppercase = <(true)|false>
 \end{syntax}
 \changes{v1.10}{2021/01/08}{更改颜色实现方式与选项名。}
-\changes{v1.23k}{2021/02/02}{noto风格的数学字体独立出来，可自定义设置。}
-\changes{v1.23k}{2021/02/09}{增加控制页面横线粗细的选项。}
+\changes{v1.23m}{2021/02/02}{noto风格的数学字体独立出来，可自定义设置。}
+\changes{v1.23m}{2021/02/09}{增加控制页面横线粗细的选项。}
 \opt{style} 选项控制文章的风格。
 \end{function}
 
@@ -190,7 +190,7 @@
   footnote = <(1)>
 \end{syntax}
 \changes{v1.21}{2021/01/12}{增加脚注线间的距离选项。}
-\changes{v1.23k}{2021/02/09}{取消使用 \pkg{zhlineskip} 宏包设置数学间距。}
+\changes{v1.23m}{2021/02/09}{取消使用 \pkg{zhlineskip} 宏包设置数学间距。}
 行距因子用于设置各种行距倍数，只能是浮点数，不能带有长度单位。\tn{ctexset} 原有的行距选项\opt{linespread}失效。各行距既可在导言区全局设置也可正文中设置对后面生效，行距的意义为
 \end{function}
 
@@ -212,7 +212,7 @@
   marginpart = <\tn{rmfamily}\tn{footnotesize}>
 \end{syntax}
 \changes{v1.10}{2021/01/08}{加入自定义非正文字体选项。}
-\changes{v1.23k}{2021/02/08}{修复使用 \tn{zihao} 命令设置字体失效的问题。}
+\changes{v1.23m}{2021/02/08}{修复使用 \tn{zihao} 命令设置字体失效的问题。}
 \end{function}
 
 \begin{optdesc}
@@ -229,18 +229,18 @@
   backend = <(bibtex)|biblatex>
   bib-style = <(numerical)|authoryear|其它格式>
   cite-style = <标注风格>
-  bibfile = <ref/refs.bib>
+  bibfile = <refs.bib>
   \tn{printbibliography}\oarg{选项列表}
 \end{syntax}
 \changes{v1.21}{2021/01/11}{增加 \opt{bibset} 选项，可以使用 \hologo{BibTeX} 或 \hologo{biber} 编译参考文献。}
-\changes{v1.23k}{2021/02/23}{使用 \opt{bibset} 选项时可设置标注风格。}
+\changes{v1.23m}{2021/02/23}{使用 \opt{bibset} 选项时可设置标注风格。}
 \end{function}
 
 \begin{optdesc}
   \item[backend] 参考文献处理后端，默认用传统的 \hologo{BibTeX} 处理参考文献。
   \item[bib-style] 参考文献格式为中国的参考文献推荐标准GB/T 7714-2015，有顺序编码制和著者-出版年制两种风格，理工科类一般使用顺序编码制，文科类一般使用著者-出版年制。若使用其它格式，使用 \hologo{BibTeX} 处理时需确保正确的 \opt{bst} 文件，使用 \hologo{biber} 处理可使用 \pkg{biblatex} 宏包支持的参考文献风格名称。
-  \item[cite-style] 标注参考文献的风格，\opt{backend = bibtex} 选项下可使用 \opt{super}（上标标注，默认）或 \opt{numbers}（普通标注）等 \pkg{natbib} 宏包带有的标注风格，\opt{backend = biblatex} 选项下可使用 \pkg{biblatex} 宏包支持的标注风格名称。
-  \item[bibfile] 参考文献的数据文件，使用 \hologo{biber} 处理时要带有 \opt{bib} 后缀，默认为一个在 \opt{ref} 文件夹中以 \opt{refs.bib} 命名的文件。
+  \item[cite-style] 标注参考文献的风格，\opt{backend = bibtex} 选项下可使用 \opt{super}（数字上标标注，默认）或 \opt{numbers}（数字标注）等 \pkg{natbib} 宏包带有的标注风格，\opt{backend = biblatex} 选项下可使用 \pkg{biblatex} 宏包支持的标注风格名称。
+  \item[bibfile] 参考文献的数据文件，使用 \hologo{biber} 处理时要带有 \opt{bib} 后缀，默认为一个以 \opt{refs.bib} 命名的文件。
   \item[\tn{printbibliography}] 两种方式\textbf{均使用}此命令打印参考文献，其中可选项仅在 \hologo{biber} 处理时有效。
 \end{optdesc}
 
@@ -317,7 +317,7 @@
 \end{syntax}
 \changes{v1.21}{2021/01/11}{修复单面文档时页眉横线消失的问题。}
 \changes{v1.21}{2021/01/13}{增加配置页眉页脚的选项。}
-\changes{v1.23k}{2021/03/08}{优化页眉页脚设置，增加 \opt{chap-mark} 和 \opt{sec-mark} 选项。}
+\changes{v1.23m}{2021/03/08}{优化页眉页脚设置，增加 \opt{chap-mark} 和 \opt{sec-mark} 选项。}
 \opt{hdrset} 设置的命令由 \pkg{fancyhdr} 宏包提供支持，命令 \tn{easyhead} 和 \tn{easyfoot} 的含义与 \tn{fancyhead} 和 \tn{fancyfoot} 相同，它们用于 \opt{head-foot} 选项中，设置的是一个名为 \opt{fancy} 的页面风格。\pkg{fancyhdr} 将页眉页脚分成了左中右和奇数页（odd）、偶数页（even）共12个部分，可选参数中E、O代表偶数、奇数，L、C、R代表左、中、右部分。单面打印时，含有偶数的选项无效。
 \begin{ctexexam}
     \ctexset
@@ -416,8 +416,8 @@
 使用 \opt{description} 环境可创建带有主题词的列表。
 \begin{ctexexam}
     \begin{description}
-        \item[主题一] 内容一
-        \item[主题二] 内容二
+      \item[主题一] 内容一
+      \item[主题二] 内容二
     \end{description}
 \end{ctexexam}
 
@@ -438,7 +438,7 @@
   \tn{item} <习题内容>
   \tn{end}\marg{exercise}
 \end{syntax}
-\changes{v1.23k}{2021/02/08}{增加准确的习题盒子标题目录锚点。}
+\changes{v1.23m}{2021/02/08}{增加准确的习题盒子标题目录锚点。}
 习题环境 \opt{exercise} 的标题紧接上一节编号并加入目录与页眉，当使用星号环境时不进行编号。三个可选参数中颜色为自定义或 \pkg{xcolor} 包含的颜色名称，正文编号格式与小节 \ref{sort list} 排序列表相同，标题名默认为摘要，参数只能\textbf{从右往左}省略。
 \begin{ctexexam}
     \begin{exercise}[LightYellow][1.][习题]
diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls
index 29fb884d845..055b403aed3 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/03/08}{1.23k}{}
+\ProvidesExplClass{easybook}{2021/03/10}{1.23m}{}
 
 \cs_generate_variant:Nn \keys_define:nn {nx}
 \cs_generate_variant:Nn \int_to_arabic:n {v}
@@ -425,25 +425,25 @@
     part/rule         .tl_set:N = \l__toc_part_rule_tl,
     part/rule         .initial:n = \tocrule{}[\bfseries],
 
-    chapter/format    .tl_set:N = \l__toc_chap_format_tl,
+    chapter/format    .tl_set:N = \l__toc_chapter_format_tl,
     chapter/format    .initial:n = \addvspace{1pc}\sffamily\large,
-    chapter/indent    .tl_set:N = \l__toc_chap_indent_tl,
+    chapter/indent    .tl_set:N = \l__toc_chapter_indent_tl,
     chapter/indent    .initial:n = 0\ccwd,
-    chapter/rule      .tl_set:N = \l__toc_chap_rule_tl,
+    chapter/rule      .tl_set:N = \l__toc_chapter_rule_tl,
     chapter/rule      .initial:n = \tocrule{$\cdot$}[\bfseries],
 
-    section/format    .tl_set:N = \l__toc_sec_format_tl,
+    section/format    .tl_set:N = \l__toc_section_format_tl,
     section/format    .initial:n = \addvspace{0.35pc},
-    section/indent    .tl_set:N = \l__toc_sec_indent_tl,
+    section/indent    .tl_set:N = \l__toc_section_indent_tl,
     section/indent    .initial:n = 1.5\ccwd,    
-    section/rule      .tl_set:N = \l__toc_sec_rule_tl,
+    section/rule      .tl_set:N = \l__toc_section_rule_tl,
     section/rule      .initial:n = \tocrule{$\cdot$},
 
-    subsection/format .tl_set:N = \l__toc_subsec_format_tl,
+    subsection/format .tl_set:N = \l__toc_subsection_format_tl,
     subsection/format .initial:n = \addvspace{0.35pc},
-    subsection/indent .tl_set:N = \l__toc_subsec_indent_tl,
+    subsection/indent .tl_set:N = \l__toc_subsection_indent_tl,
     subsection/indent .initial:n = 3.8\ccwd,
-    subsection/rule   .tl_set:N = \l__toc_subsec_rule_tl,
+    subsection/rule   .tl_set:N = \l__toc_subsection_rule_tl,
     subsection/rule   .initial:n = \tocrule{$\cdot$},
 
     lists/format      .tl_set:N = \l__toc_lists_format_tl,
@@ -466,35 +466,24 @@
     \normalsize\normalfont
     \titlerule*[#1]{\scalebox{#2}{#3}}#4\contentspage
   }
-\titlecontents{part}
-  [\l__toc_part_indent_tl]
-  {\l__toc_part_format_tl}{}{}
-  {\l__toc_part_rule_tl}
-\titlecontents{chapter}
-  [\l__toc_chap_indent_tl]
-  {\l__toc_chap_format_tl}{}{}
-  {\l__toc_chap_rule_tl}
-\titlecontents{section}
-  [\l__toc_sec_indent_tl]
-  {\l__toc_sec_format_tl}{}{}
-  {\l__toc_sec_rule_tl}
-\titlecontents{subsection}
-  [\l__toc_subsec_indent_tl]
-  {\l__toc_subsec_format_tl}{}{}
-  {\l__toc_subsec_rule_tl}
-\titlecontents{figure}
-  [\l__toc_lists_indent_tl]
-  {\l__toc_lists_format_tl}{}{}
-  {\l__toc_lists_rule_tl}
-\titlecontents{table}
-  [\l__toc_lists_indent_tl]
-  {\l__toc_lists_format_tl}{}{}
-  {\l__toc_lists_rule_tl}
+\cs_new_protected:Npn \__titlecontents_set:nn #1#2
+  {
+    \titlecontents{#1}
+      [\use:c {l__toc_#2_indent_tl}]
+      {\use:c {l__toc_#2_format_tl}}{}{}
+      {\use:c {l__toc_#2_rule_tl}}
+  }
 \contentsuse{lstlisting}{lol}
-\titlecontents{lstlisting}
-  [\l__toc_lists_indent_tl]
-  {\l__toc_lists_format_tl}{}{}
-  {\l__toc_lists_rule_tl}
+\clist_map_inline:nn
+  {
+    {part}{part},
+    {chapter}{chapter},
+    {section}{section},
+    {subsection}{subsection},
+    {figure}{lists},
+    {table}{lists},
+    {lstlisting}{lists}
+  }{\__titlecontents_set:nn #1}
 \ctex_patch_cmd:Nnn \caption@@@addcontentsline
   {\addcontentsline{#1}{#2}{\protect\numberline{#3}{#4}}}
   {\addcontentsline{#1}{#2}{#3\hspace{\ccwd}#4}}
@@ -763,7 +752,7 @@
 \skip_set:Nn \plitemsep{.75ex plus .1ex}
 \skip_set:Nn \plparsep{0ex}
 
-\cs_new_protected:Npn \__thmname_set:n #1#2
+\cs_new_protected:Npn \__thmname_set:nn #1#2
   {\tl_const:cn {c__name_#1_tl}{#2}}
 \bool_if:NTF \l__lang_chinese_bool
   {
@@ -777,7 +766,7 @@
         {example}{例},
         {remark}{注},
         {exercise}{练习}
-      }{\__thmname_set:n #1}
+      }{\__thmname_set:nn #1}
   }{
     \clist_map_inline:nn
       {
@@ -789,7 +778,7 @@
         {example}{Example},
         {remark}{Remark},
         {exercise}{Exercise}
-      }{\__thmname_set:n #1}
+      }{\__thmname_set:nn #1}
   }
 
 \bool_new:N \l__thmbox_bool
@@ -1039,9 +1028,9 @@
   }{#3}
 
 \bool_set_true:N \l__backend_bibtex_bool
-\tl_new:N \l__bib_mysty_tl
 \tl_new:N \l__bib_style_tl
-\tl_new:N \l__bib_citesty_tl
+\tl_new:N \l__bib_otherstyle_tl
+\tl_new:N \l__bib_citestyle_tl
 \tl_new:N \l__bib_file_tl
 
 \__ctex_define:nn {bibset}
@@ -1056,26 +1045,26 @@
     bib-style/numerical   .code:n =
       {
         \tl_set:Nn  \l__bib_style_tl{#1}
-        \tl_clear:N \l__bib_mysty_tl
+        \tl_clear:N \l__bib_otherstyle_tl
       },
     bib-style/authoryear  .code:n =
       {
         \tl_set:Nn  \l__bib_style_tl{#1}
-        \tl_clear:N \l__bib_mysty_tl
+        \tl_clear:N \l__bib_otherstyle_tl
       },
     bib-style/unknown     .code:n =
-      {\tl_set_eq:NN \l__bib_mysty_tl\l_keys_value_tl},
+      {\tl_set_eq:NN \l__bib_otherstyle_tl\l_keys_value_tl},
     bib-style             .initial:n = numerical,
 
     cite-style  .code:n =
-      {\tl_set:Nn \l__bib_citesty_tl{#1}},
+      {\tl_set:Nn \l__bib_citestyle_tl{#1}},
     bibfile     .tl_set:N = \l__bib_file_tl,
-    bibfile     .initial:n = ref/refs.bib
+    bibfile     .initial:n = refs.bib
   }
 
 \cs_new_protected:Npn \__bibtex_set:
   {
-    \tl_if_empty:NTF \l__bib_mysty_tl
+    \tl_if_empty:NTF \l__bib_otherstyle_tl
       {
         \tl_if_eq:VnT \l__bib_style_tl{numerical}
           {
@@ -1086,10 +1075,10 @@
           {\bibliographystyle{gbt7714-author-year}}
         \cs_set_eq:NN \cite\citep
       }{
-        \exp_args:NV \bibliographystyle\l__bib_mysty_tl
+        \exp_args:NV \bibliographystyle\l__bib_otherstyle_tl
       }
-    \tl_if_empty:NF \l__bib_citesty_tl
-      {\exp_args:NV \setcitestyle\l__bib_citesty_tl}
+    \tl_if_empty:NF \l__bib_citestyle_tl
+      {\exp_args:NV \setcitestyle\l__bib_citestyle_tl}
     \cs_set:Npn \bibsection{\__title_mark_intoc:n \bibname}
     \skip_set:Nn \bibsep{0ex}
     \NewDocumentCommand{\printbibliography}{o}
@@ -1099,17 +1088,17 @@
   {\PassOptionsToPackage{#1}{biblatex}}
 \cs_new_protected:Npn \__biblatex_pre_set:
   {
-    \tl_if_empty:NTF \l__bib_mysty_tl
+    \tl_if_empty:NTF \l__bib_otherstyle_tl
       {
         \tl_if_eq:VnT \l__bib_style_tl{numerical}
           {\__put_biblatex:n {style = gb7714-2015}}
         \tl_if_eq:VnT \l__bib_style_tl{authoryear}
           {\__put_biblatex:n {style = gb7714-2015ay}}
       }{
-        \__put_biblatex:n {style = \l__bib_mysty_tl}
+        \__put_biblatex:n {style = \l__bib_otherstyle_tl}
       }
-    \tl_if_empty:NF \l__bib_citesty_tl
-      {\__put_biblatex:n {citestyle = \l__bib_citesty_tl}}
+    \tl_if_empty:NF \l__bib_citestyle_tl
+      {\__put_biblatex:n {citestyle = \l__bib_citestyle_tl}}
     \__put_biblatex:n {backend = biber}
   }
 \cs_new_protected:Npn \__biblatex_after_set:
@@ -1200,7 +1189,7 @@
     style = mystyle,
     breaklines = true,
     resetmargins = true,
-    numbers = left,
+    % numbers = left,
     numberstyle = \footnotesize,
     abovecaptionskip = -1ex,
     belowcaptionskip = 1ex,
@@ -1274,7 +1263,7 @@
         {skyblue,   0000ff,004986,eb6877},
         {crimson,   dc143c,00c1c9,afcd20}
       }
-      \__linkcolor_set:n,
+      \__linkcolor_set:n
     linkcolor         .default:n = fresh,
     linkcolor         .initial:n = fresh,
 
@@ -1295,7 +1284,7 @@
         {energy,    f39800,00a0e9,893895},
         {cyberpunk, 601986,eb6877,a4005b}
       }
-      \__themecolor_set:n,
+      \__themecolor_set:n
     color             .initial:n = none
   }