easybook (23apr21)

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

5 files changed, 41 insertions, 29 deletions

diff --git a/Master/texmf-dist/doc/latex/easybook/easybook-demo.pdf b/Master/texmf-dist/doc/latex/easybook/easybook-demo.pdf
index 5678730118f..5a65caeff25 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 e21ba19ef23..72944586bf2 100644
--- a/Master/texmf-dist/doc/latex/easybook/easybook-demo.tex
+++ b/Master/texmf-dist/doc/latex/easybook/easybook-demo.tex
@@ -106,7 +106,7 @@
     \url{https://latexstudio.net} \\
     \url{https://gitee.com/texl3/easybook}\thanks{Gitee为项目的主要发布地址。}
   }
-\date{2021/04/21\hskip\ccwd\relax v1.24q}
+\date{2021/04/23\hskip\ccwd\relax v1.24s}
 
 \frontmatter[roman]
 \maketitle
diff --git a/Master/texmf-dist/doc/latex/easybook/easybook.pdf b/Master/texmf-dist/doc/latex/easybook/easybook.pdf
index 5fed3ed4735..03d5910ac86 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/source/latex/easybook/easybook.dtx b/Master/texmf-dist/source/latex/easybook/easybook.dtx
index f4aa029e1c0..fe0a1e01bee 100644
--- a/Master/texmf-dist/source/latex/easybook/easybook.dtx
+++ b/Master/texmf-dist/source/latex/easybook/easybook.dtx
@@ -55,7 +55,7 @@ The latest version of this license is in
 %
 % \title{\sffamily easybook 书籍文档类}
 % \author{瞿毅}
-% \date{2021/04/21\hskip\ccwd\relax v1.24q\thanks{\url{https://gitee.com/texl3/easybook}}}
+% \date{2021/04/23\hskip\ccwd\relax v1.24s\thanks{\url{https://gitee.com/texl3/easybook}}}
 % \maketitle
 % \begin{abstract}
 %   \cls{easybook} 是基于 \cls{ctexbook} 书籍文档类创建以极简为风格的模板，可以看作对 \cls{ctexbook} 的进一步包装。虽然\CTeX 文档类提供了较好的中文支持，但想实现个性化功能一般需要在其基础上载入更多宏包来定制。\cls{easybook} 考虑了一些细节并载入一些常用宏包实现一般的排版需求，它适用于排版中英文书籍或笔记，甚至可稍加调整成为学位论文模板。
@@ -182,7 +182,7 @@ The latest version of this license is in
 % \end{syntax}
 % \opt{multoc} 与 \opt{style/multoc} 选项具有相同的效果，但是具有优先性且可单独设置不同目录是否双栏排版。已经预置了中英文的目录标题，可以使用 \opt{title} 选项更改目录标题的名称。\opt{book} 选项使目录标题按照 \opt{chapter} 级别输出，\opt{article} 选项使目录标题按照 \opt{article} 级别输出，默认为 \opt{chapter} 级别。
 % \changes{v1.23}{2021/03/15}{为几个目录增加键值列表的选项，可设置标题输出级别以及是否加入主目录。}
-% \changes{v1.24q}{2021/04/04}{目录命令的可选参数增加标题键值。}
+% \changes{v1.24s}{2021/04/04}{目录命令的可选参数增加标题键值。}
 % \end{function}
 %
 % \section{接口选项}
@@ -265,7 +265,7 @@ The latest version of this license is in
 % \ding{229} 以上选项路径为 \opt{link/...} \\
 % \opt{link} 将超链接选项（包括以上选项）交给 \pkg{hyperref} 处理，除了一些关于 pdf 书签的选项可能会失效，其它由键值选项命令 \tn{hypersetup} 支持的多数选项可用。
 % \changes{v1.10}{2021/01/08}{修复了 \opt{linktopage} 选项关闭时目录中标题编号无超链接的问题。}
-% \changes{v1.24q}{2021/04/05}{增加 \pkg{hyperref} 超链接选项完整的支持。}
+% \changes{v1.24s}{2021/04/05}{增加 \pkg{hyperref} 超链接选项完整的支持。}
 % \end{function}
 %
 % \begin{optdesc}
@@ -344,7 +344,7 @@ The latest version of this license is in
 % \ding{229} 以上选项路径为 \opt{bibset/...}
 % \changes{v1.21}{2021/01/11}{增加 \opt{bibset} 选项，可以使用 \hologo{BibTeX} 或 \hologo{biber} 编译参考文献。}
 % \changes{v1.23}{2021/02/23}{使用 \opt{bibset} 选项时可设置标注风格。}
-% \changes{v1.24q}{2021/04/09}{可以不载入参考文献包手动配置参考文献格式。}
+% \changes{v1.24s}{2021/04/09}{可以不载入参考文献包手动配置参考文献格式。}
 % \end{function}
 %
 % \begin{optdesc}
@@ -490,7 +490,7 @@ The latest version of this license is in
 % \changes{v1.21}{2021/01/13}{增加配置页眉页脚的选项。}
 % \changes{v1.23}{2021/03/08}{优化页眉页脚设置，增加 \opt{chap-mark} 和 \opt{sec-mark} 标志选项。}
 % \changes{v1.23}{2021/03/14}{可以手动绘制页眉、页脚和脚注的横线。}
-% \changes{v1.24q}{2021/04/09}{增加 \opt{subsec-mark} 标志选项，仅在 \opt{article} 模式生效。}
+% \changes{v1.24s}{2021/04/09}{增加 \opt{subsec-mark} 标志选项，仅在 \opt{article} 模式生效。}
 % \end{function}
 %
 % \begin{function}[added = 2021-01-13,updated = 2021-03-14]{\easyhead,\easyfoot}
@@ -529,7 +529,7 @@ The latest version of this license is in
 %
 % \opt{format} 是目录中标题的格式，可以设置字体和加入垂直间距等，垂直间距最好使用无间距重合的 \tn{addvspace} 命令。\opt{indent} 是目录中标题在页面左侧的缩进距离，应该有长度单位。\opt{rule} 选项中一般应当使用 \tn{tocrule} 命令，将会在接下来介绍。\opt{numsep} 是有编号的标题在目录中编号与标题的间距。
 % \changes{v1.21}{2021/01/13}{增加配置目录样式的选项。}
-% \changes{v1.24q}{2021/04/20}{增加目录中编号与标题的间距选项 \opt{numsep}。}
+% \changes{v1.24s}{2021/04/20}{增加目录中编号与标题的间距选项 \opt{numsep}。}
 % \end{function}
 %
 % \begin{function}[added = 2021-01-13,updated = 2021-04-20]{\tocrule,\EbNumberline}
@@ -568,9 +568,9 @@ The latest version of this license is in
 %   indent-all = <目录标题左边缩进>
 % \end{syntax}
 % \ding{229} 以上选项路径为 \opt{tocset/lists/...} 或 \opt{tocset/...}
-% \changes{v1.24q}{2021/04/05}{可以设置图、表和代码目录的标签。}
-% \changes{v1.24q}{2021/04/06}{增加目录引导线右边对齐方式。}
-% \changes{v1.24q}{2021/04/19}{给目录增加 \opt{hang} 样式选项。}
+% \changes{v1.24s}{2021/04/05}{可以设置图、表和代码目录的标签。}
+% \changes{v1.24s}{2021/04/06}{增加目录引导线右边对齐方式。}
+% \changes{v1.24s}{2021/04/19}{给目录增加 \opt{hang} 样式选项。}
 % \end{function}
 %
 % \begin{optdesc}
@@ -610,7 +610,7 @@ The latest version of this license is in
 %   \tn{end}\marg{环境名}
 % \end{syntax}
 % \pkg{enumitem} 宏包为系统预置的列表环境 \env{enumerate}、\env{itemize}和 \env{description} 提供了更灵活的标签以及间距的控制，可使用 \tn{setlist} 命令设置原有的三种列表格式，也可以直接使用可选参数的键值列表，具体选项见 \pkg{enumitem} 宏包文档。已为三种列表预置了三个级别的格式可相互嵌套，默认标签与 \cls{book} 文档类相同，若自定义标签可例如
-% \changes{v1.24q}{2021/04/08}{重新优化列表环境的配置。}
+% \changes{v1.24s}{2021/04/08}{重新优化列表环境的配置。}
 % \end{function}
 %
 % \begin{ctexexam}
@@ -729,7 +729,7 @@ The latest version of this license is in
 %   \tn{end}\marg{ebparbox}
 % \end{syntax}
 % 环境 \env{ebparbox} 与 \env{easybox} 类似，同样带有三个可选参数。当使用星号参数时盒子左边带有一条竖线，\meta{颜色名} 选项可以自定义竖线颜色，使用不带有星号的环境则盒子带有竖线颜色的浅色背景。\meta{段落标题} 选项可以设置标题，默认无标题。
-% \changes{v1.24q}{2021/04/19}{优化盒子环境的选项，增加可带有标题的扁平盒子 \env{ebparbox}。}
+% \changes{v1.24s}{2021/04/19}{优化盒子环境的选项，增加可带有标题的扁平盒子 \env{ebparbox}。}
 % \end{function}
 %
 % \subsubsection{行内盒子}
@@ -788,7 +788,7 @@ The latest version of this license is in
 %   \tn{labelformat}\marg{计数器}\marg{标签引用格式}
 % \end{syntax}
 % 使用 \tn{ref} 命令进行引用将会自动检测环境并添加相应的前缀，\tn{labelformat} 可以设置标签引用格式，第二个参数中\#1代表 \tn{the}\meta{计数器}，可以设置引用序号的前缀和后缀。
-% \changes{v1.24q}{2021/04/11}{取消载入 \pkg{cleveref} 宏包来交叉引用。}
+% \changes{v1.24s}{2021/04/11}{取消载入 \pkg{cleveref} 宏包来交叉引用。}
 % \end{function}
 %
 % \subsubsection{索引}
@@ -898,7 +898,7 @@ The latest version of this license is in
 %<*class>
 \NeedsTeXFormat{LaTeX2e}[2020/10/01]
 \RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplClass{easybook}{2021/04/21}{1.24q}{beta}
+\ProvidesExplClass{easybook}{2021/04/23}{1.24s}{beta}
 
 \cs_generate_variant:Nn \__ctex_define:nn {nx}
 \cs_generate_variant:Nn \int_to_arabic:n {v}
@@ -1397,7 +1397,11 @@ The latest version of this license is in
     lists/lolskip     .skip_set:N = \l__eb_toc_lolskip_skip,
     lists/lolskip     .initial:n = 0.8pc,
     lists/belowoffset .dim_set:N = \l__eb_toc_listsoffset_dim,
-    lists/belowoffset .initial:n = 0pc,
+    lists/belowoffset .initial:n =
+      {\bool_if:NTF \l__eb_class_book_bool{0pc}{0.15pc}},
+    belowoffset       .dim_set:N = \l__eb_toc_offset_dim,
+    belowoffset       .initial:n =
+      {\bool_if:NTF \l__eb_class_book_bool{-1pc}{-0.35pc}},
     tocline-fig       .cs_set:Np = \eb@labelname@lof#1,
     tocline-fig       .initial:n =
       {
@@ -1426,8 +1430,6 @@ The latest version of this license is in
           \hspace{\eb@toc@lists@numsep}
         \fi
       },
-    belowoffset       .dim_set:N = \l__eb_toc_offset_dim,
-    belowoffset       .initial:n = -1pc,
     line-align        .bool_set:N = \l__eb_toc_line_align_bool,
     line-align        .default:n = true,
     line-align        .initial:n = true,
@@ -1486,7 +1488,8 @@ The latest version of this license is in
     chapter/numsep = \ccwd,
 
     section/format = \addvspace{0.35pc},
-    section/indent = 1.5\ccwd,
+    section/indent =
+      {\bool_if:NTF \l__eb_class_book_bool{1.5\ccwd}{0\ccwd}},
     section/rule = \tocrule{$\cdot$},
     section/numsep = \ccwd,
 
@@ -2196,7 +2199,8 @@ The latest version of this license is in
           {toptitle = 8pt,top = 8pt}
           {frame~hidden,boxrule = 0pt,toptitle = 8pt,top = 0pt},
         IfValueT = {#3}{title = #3},
-        colback = #2!8!white,colbacktitle = #2!8!white,
+        colback = #2,colbacktitle = #2,
+        opacityback = 0.1,opacitybacktitle = 0.1,
         coltitle = black,colframe = black,
         left = 6pt,right = 6pt,bottom = 8pt,middle= 8pt,
         bottomtitle = 8pt,
@@ -2216,7 +2220,8 @@ The latest version of this license is in
             IfValueT = {#3}{title = #3},
             top = 0pt,bottom = 0pt,toptitle = 0pt
           }{
-            colback = #2!8!white,colbacktitle = #2!8!white,
+            colback = #2,colbacktitle = #2,
+            opacityback = 0.1,opacitybacktitle = 0.1,
             IfValueTF = {#3}{title = #3,top = 0pt}{top = 8pt},
             bottom = 8pt,toptitle = 8pt
           },
@@ -2232,10 +2237,11 @@ The latest version of this license is in
       }{#2}
     \DeclareTotalTCBox{\eblink}{O{Aqua}vO{}}
       {
+        standard~jigsaw,
         nobeforeafter,tcbox~raise~base,
         top = 1.25pt,bottom = 1.25pt,left = 1.25pt,right = 1.25pt,
         boxrule = 0.75pt,arc = 1pt,
-        colback = #1!12!white,colframe = #1,#3
+        colback = #1,opacityback = 0.12,colframe = #1,#3
       }{#2}
   }
 \ctex_at_end_preamble:n
diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls
index 410de43f383..d1a9a4f2c68 100644
--- a/Master/texmf-dist/tex/latex/easybook/easybook.cls
+++ b/Master/texmf-dist/tex/latex/easybook/easybook.cls
@@ -13,7 +13,7 @@
 %%   https://creativecommons.org/licenses/by/4.0/legalcode
 \NeedsTeXFormat{LaTeX2e}[2020/10/01]
 \RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplClass{easybook}{2021/04/21}{1.24q}{beta}
+\ProvidesExplClass{easybook}{2021/04/23}{1.24s}{beta}
 
 \cs_generate_variant:Nn \__ctex_define:nn {nx}
 \cs_generate_variant:Nn \int_to_arabic:n {v}
@@ -512,7 +512,11 @@
     lists/lolskip     .skip_set:N = \l__eb_toc_lolskip_skip,
     lists/lolskip     .initial:n = 0.8pc,
     lists/belowoffset .dim_set:N = \l__eb_toc_listsoffset_dim,
-    lists/belowoffset .initial:n = 0pc,
+    lists/belowoffset .initial:n =
+      {\bool_if:NTF \l__eb_class_book_bool{0pc}{0.15pc}},
+    belowoffset       .dim_set:N = \l__eb_toc_offset_dim,
+    belowoffset       .initial:n =
+      {\bool_if:NTF \l__eb_class_book_bool{-1pc}{-0.35pc}},
     tocline-fig       .cs_set:Np = \eb@labelname@lof#1,
     tocline-fig       .initial:n =
       {
@@ -541,8 +545,6 @@
           \hspace{\eb@toc@lists@numsep}
         \fi
       },
-    belowoffset       .dim_set:N = \l__eb_toc_offset_dim,
-    belowoffset       .initial:n = -1pc,
     line-align        .bool_set:N = \l__eb_toc_line_align_bool,
     line-align        .default:n = true,
     line-align        .initial:n = true,
@@ -601,7 +603,8 @@
     chapter/numsep = \ccwd,
 
     section/format = \addvspace{0.35pc},
-    section/indent = 1.5\ccwd,
+    section/indent =
+      {\bool_if:NTF \l__eb_class_book_bool{1.5\ccwd}{0\ccwd}},
     section/rule = \tocrule{$\cdot$},
     section/numsep = \ccwd,
 
@@ -1311,7 +1314,8 @@
           {toptitle = 8pt,top = 8pt}
           {frame~hidden,boxrule = 0pt,toptitle = 8pt,top = 0pt},
         IfValueT = {#3}{title = #3},
-        colback = #2!8!white,colbacktitle = #2!8!white,
+        colback = #2,colbacktitle = #2,
+        opacityback = 0.1,opacitybacktitle = 0.1,
         coltitle = black,colframe = black,
         left = 6pt,right = 6pt,bottom = 8pt,middle= 8pt,
         bottomtitle = 8pt,
@@ -1331,7 +1335,8 @@
             IfValueT = {#3}{title = #3},
             top = 0pt,bottom = 0pt,toptitle = 0pt
           }{
-            colback = #2!8!white,colbacktitle = #2!8!white,
+            colback = #2,colbacktitle = #2,
+            opacityback = 0.1,opacitybacktitle = 0.1,
             IfValueTF = {#3}{title = #3,top = 0pt}{top = 8pt},
             bottom = 8pt,toptitle = 8pt
           },
@@ -1347,10 +1352,11 @@
       }{#2}
     \DeclareTotalTCBox{\eblink}{O{Aqua}vO{}}
       {
+        standard~jigsaw,
         nobeforeafter,tcbox~raise~base,
         top = 1.25pt,bottom = 1.25pt,left = 1.25pt,right = 1.25pt,
         boxrule = 0.75pt,arc = 1pt,
-        colback = #1!12!white,colframe = #1,#3
+        colback = #1,opacityback = 0.12,colframe = #1,#3
       }{#2}
   }
 \ctex_at_end_preamble:n