texlive[61244] Master/texmf-dist: easybook (7dec21)

commits+karl at tug.org commits+karl at tug.org
Tue Dec 7 22:25:29 CET 2021


Revision: 61244
          http://tug.org/svn/texlive?view=revision&revision=61244
Author:   karl
Date:     2021-12-07 22:25:29 +0100 (Tue, 07 Dec 2021)
Log Message:
-----------
easybook (7dec21)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/latex/easybook/easybook.pdf
    trunk/Master/texmf-dist/doc/latex/easybook/easybook.tex
    trunk/Master/texmf-dist/source/latex/easybook/easybook.dtx
    trunk/Master/texmf-dist/tex/latex/easybook/easybase.sty
    trunk/Master/texmf-dist/tex/latex/easybook/easybook.cls
    trunk/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg

Modified: trunk/Master/texmf-dist/doc/latex/easybook/easybook.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/easybook/easybook.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/easybook/easybook.tex	2021-12-07 21:25:15 UTC (rev 61243)
+++ trunk/Master/texmf-dist/doc/latex/easybook/easybook.tex	2021-12-07 21:25:29 UTC (rev 61244)
@@ -20,7 +20,7 @@
     name            = easybook,
     color-scheme    = blue,
     title           = EASYBOOK 使用手册,
-    version         = v1.41H,
+    version         = v1.41I,
     date            = 2021/12/06,
     authors         = 瞿毅,
     info            = 排版简体中文学位论文和书籍,
@@ -417,7 +417,11 @@
   \keychoice{footwith}{part,chapter,page}\Default{chapter}
   使脚注跟随编号的计数器,默认跟随章,当开启新的一章时脚注编号从 1 开始。
   \keyval-{rulewidth}{刚性长度}\Default{0.6pt}
-  统一调整页眉、定理盒子以及代码框等线条的粗细。
+  统一调整页眉、定理盒子以及代码等边框线条的粗细。需要单独设置代码和定理盒子边框线条的粗细时可用它们的宏包自带命令:
+  \begin{ctexexam}
+  \lstset{framerule = 0.5pt}
+  \tcbset{boxrule = 0.5pt}
+  \end{ctexexam}
   \keybool{uppercase}\Default{true}
   使用 \cs*{rightmark} 及 \cs*{leftmark} 标题标记命令获取标题内容时英文是否大写。
   \kvsplit{brackets}{左括号,右括号}\Default{\Carg{(\black{,})}}
@@ -741,11 +745,21 @@
   \keychoice{fnmark-num}{plain,pifont,pifont*,pisans,pisans*,short num}\Default{plain}
   脚注正文标记编号的类型,默认为原生样式 \code{plain},还可以改为 \code{pifont} 的各个版本,从左往右依次为普通版、阴文衬线版、阳文无衬线版和阴文无衬线版,缺点是它们的编号仅包括 1-10。
 
-  短编号的形式与列表环境类似,不过增加了一个中文数字格式参数 \code{c}。原生样式 \code{plain} 等同于单独使用数字 \code{1} 参数。这个选项可以用在正文中改变其后脚注编号类型。
+  短编号的形式与列表环境类似,不过增加了中文数字 \code{c} 和符号 \code{s} 格式参数。原生样式 \code{plain} 等同于单独使用数字 \code{1} 参数。这个选项可以用在正文中改变其后脚注编号类型。
   \begin{ctexexam}
   \hdrset{fnmark-num = 1} % 等于编号类型plain
   \hdrset{fnmark-num = (a)}
   \end{ctexexam}
+  \begin{commands}\noitemsep
+  \command{DefineFntSymbols}[\marg{符号表名}\marg{符号数量}\marg{符号列表}]\default{}
+  \command{setfntsymbol}[\marg{符号表名}]
+  这两个命令用于在脚注短编号标记为 \code{s} 自定义符号型时设置符号列表。\cs{DefineFntSymbols} 命令用于设置符号列表,\cs{setfntsymbol} 命令用于选择已定义符号列表。默认的脚注符号列表是空的,定义新列表时应注意 \meta{符号列表} 的写法和命令顺序:
+  \begin{ctexexam}
+  \DefineFntSymbols{myfnsymb}{2}{{1}{*}{2}{@}}
+  \setfntsymbol{myfnsymb}
+  \hdrset{fnmark-num = s}
+  \end{ctexexam}
+  \end{commands}
   \keychoice{fntext-num}{plain,pifont,pifont*,pisans,pisans*,short num}\Default{plain}
   脚注内容标记编号的类型,用法与 \option{fnmark-num} 一样,所以脚注内容与正文标记编号类型\textbf{可以不同}。
   \keychoice{fnmate-num}{plain,pifont,pifont*,pisans,pisans*,short num}\Default{plain}
@@ -835,7 +849,9 @@
   \keyval-{between}{目录代码钩子}
   目录标题与内容间的钩子,一般插入负的垂直距离代码,用于抵消目录首行额外的垂直间距。一级路径此选项对应文档主目录的钩子,二级路径为 \module*{figure}、\module*{table} 和 \module*{lstlisting},或者用位于 \module*{list} 路径的此选项统一设置相应类型目录的钩子。
   \keybool{dotalign}\Default{true}
-  引导线选项 \option{dotalign} 可以使目录引导线右端对齐并与页码保持一定间隙,否则会与页码连接。
+  引导线选项 \option{dotalign} 可以使目录引导线右端对齐并与页码保持一定间距,否则会与页码相连。
+  \keyval-{pnumwd}{刚性长度}\Default{1.55em}
+  目录条目页码的宽度。开启 \option{dotalign} 选项时宽度越大引导线与页码的距离就越大。
   \keyval-{tocafter-all}{距离命令}\Default{\cs*{hspace}\Carg{1em}}
   统一设置所有级别在目录中标签与标题间的代码。
   \keyval-{tocindent-all}{刚性长度}
@@ -860,7 +876,7 @@
   \environment*{tabularx}[\marg{长度}\marg{列格式}]\default{}
   \environment*{tabular}[\marg{列格式}]\default{}
   \environment{tblr}[\marg{键值列表}]
-  \pkg*{tabularray} 是一个较新且强大的表格宏包,不依赖其它表格宏包所以同时使用不会产生冲突。不仅提供 \pkg*{tabularx}、\pkg*{multirow} 和 \pkg*{booktabs} 等宏包的功能,还实现了用键值列表方式简便地设置表格样式。具体用法可见宏包的说明文档,下面演示一个 \env{tblr} 表格的用法:
+  \pkg*{tabularray} 是一个强大且全面的表格宏包,不依赖其它表格宏包所以同时使用不会产生冲突。不仅提供了各种传统表格宏包的功能,还实现了用键值列表方式简便地设置表格样式。具体用法可见宏包的说明文档,下面演示一个 \env{tblr} 表格的用法:
   \begin{ctexexam}
   \begin{tblr}
     {

Modified: trunk/Master/texmf-dist/source/latex/easybook/easybook.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/easybook/easybook.dtx	2021-12-07 21:25:15 UTC (rev 61243)
+++ trunk/Master/texmf-dist/source/latex/easybook/easybook.dtx	2021-12-07 21:25:29 UTC (rev 61244)
@@ -15,7 +15,7 @@
 %<*class>
 \NeedsTeXFormat{LaTeX2e}[2020/10/01]
 \RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2021/12/06}{1.41H}
+\ProvidesExplClass{easybook}{2021/12/06}{1.41I}
   {Typeset Chinese theses or books}
 
 \bool_set_false:N \l__eb_compile_draft_bool
@@ -99,7 +99,7 @@
   { \eb_set_family:nnn { \CJKsfdefault } {#2} {#1} }
 \cs_new_protected:Npn \eb_setCJKmonofont:nn #1#2
   { \eb_set_family:nnn { \CJKttdefault } {#2} {#1} }
-\eb_clist_map_inline:nn
+\eb_seq_map_inline:nn
   { main,sans,mono,CJKmain,CJKsans,CJKmono }
   {
     \exp_args:Nc \RenewDocumentCommand { set#1font }{O{}mO{}}
@@ -321,7 +321,7 @@
 %<*package>
 \NeedsTeXFormat{LaTeX2e}[2020/10/01]
 \RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2021/12/06}{1.41H}
+\ProvidesExplPackage{easybase}{2021/12/06}{1.41I}
   {Typeset Chinese theses or books}
 
 \cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -336,7 +336,7 @@
 
 \cs_set_protected:Npn \ctex_define:nn #1
   { \keys_define:nn { ctex/#1 } }
-\cs_new_protected:Npn \eb_clist_map_inline:nn #1#2
+\cs_new_protected:Npn \eb_seq_map_inline:nn #1#2
   {
     \seq_set_from_clist:Nn \l_tmpa_seq {#1}
     \seq_map_inline:Nn \l_tmpa_seq {#2}
@@ -349,7 +349,7 @@
   }
 \cs_new_protected:Npn \eb_patch_cmd:wnn #1#2#3
   {
-    \eb_clist_map_inline:nn {#1}
+    \eb_seq_map_inline:nn {#1}
       {
         \ctex_patch_cmd_once:NnnnTF ##1 { } {#2} {#3}
           { } { \ctex_patch_failure:N ##1 }
@@ -367,7 +367,7 @@
   }
 \cs_new_protected:Npn \eb_at_begin_environment:nn #1#2
   {
-    \eb_clist_map_inline:nn {#1}
+    \eb_seq_map_inline:nn {#1}
       { \AtBeginEnvironment{##1}{#2} }
   }
 \cs_new_protected:Npn \eb_match_load_package:n #1
@@ -401,7 +401,7 @@
 \RenewDocumentCommand{\usepackage}{O{}m}
   {
     \PassOptionsToPackage{#1}{#2}
-    \eb_clist_map_inline:nn {#2}
+    \eb_seq_map_inline:nn {#2}
       {
         \eb_if_package_loaded:nF {##1}
           { \eb at usepackage@save{##1} }
@@ -469,7 +469,7 @@
 \bool_new:N \l__eb_chap_counter_withpart_bool
 \tl_new:N   \l__eb_foot_counter_parent_choice_tl
 
-\eb_clist_map_inline:nn
+\eb_seq_map_inline:nn
   {
     style,subfont,spread,
     refset,bibset,thmset,
@@ -482,7 +482,7 @@
 \keys_define:nn { } { ctex/link .inherit:n = ctex/refset }
 \ctex_define:n { link .meta:nn = { ctex/link } {#1} }
 \cs_set_eq:NN \link \refset
-\eb_clist_map_inline:nn
+\eb_seq_map_inline:nn
   { style,subfont,spread,bibset,thmset,hdrset,tocset }
   {
     \msg_new:nnn { easybase } { abandon-#1 }
@@ -543,7 +543,7 @@
     if~you~continue~compiling. \\\\
     Please~update~your~macro~package~from~CTAN.
   }
-\eb_clist_map_inline:nn
+\eb_seq_map_inline:nn
   {
     { expl3 } { 2020/10/27 },
     { xparse } { 2020/10/27 },
@@ -647,7 +647,7 @@
     \booltrue{@mainmatter}
     \pagenumbering{arabic}
   }
-\eb_clist_map_inline:nn
+\eb_seq_map_inline:nn
   { chapter,section,subsection }
   {
     \exp_args:Nc \NewDocumentCommand { eb at mark@#1 at label@layout }
@@ -773,6 +773,18 @@
   { \ding{\int_eval:n { 191 + #1 }} }
 \cs_new:Npn \eb_fnmate_counter_pisans_neg:N #1
   { \ding{\int_eval:n { 201 + #1 }} }
+\cs_new_protected:Npn \DefineFntSymbols #1#2#3
+  {
+    \cs_set_protected:cpn { eb at use@fnt at symbol@#1 }
+      {
+        \cs_set:Npn \eb_int_to_symbols:n ####1
+          { \int_to_symbols:nnn {####1} {#2} {#3} }
+      }
+  }
+\cs_new_protected:Npn \setfntsymbol #1
+  { \use:c { eb at use@fnt at symbol@#1 } }
+\DefineFntSymbols{empty}{1}{}
+\setfntsymbol{empty}
 \cs_new:Npn \eb_int_format_trans:NN #1
   {
     \str_case:nn {#1}
@@ -783,6 +795,7 @@
         { I } { \int_to_Roman:n }
         { i } { \int_to_roman:n }
         { c } { \exp_args:NV \zhnumber }
+        { s } { \eb_int_to_symbols:n }
       }
   }
 \cs_new_protected:Npn \eb_fnmate_normal_label_set:nn #1#2
@@ -809,8 +822,8 @@
 \cs_new_protected:Npn \eb_fnmate_short_label_set:nn #1#2
   {
     \tl_set:Nn \l__eb_fnmate_short_tokens_tl {#1}
-    \eb_clist_map_inline:nn
-      { A,a,1,I,i,c }
+    \eb_seq_map_inline:nn
+      { A,a,1,I,i,c,s }
       {
         \tl_if_in:nnT {#1} {##1}
           {
@@ -1231,7 +1244,7 @@
   }
 \seq_map_function:NN
 \c__ctex_headings_seq \eb_toc_assign_keys:n
-\eb_clist_map_inline:nn
+\eb_seq_map_inline:nn
   { figure,table,lstlisting }
   {
     \ctex_define:n
@@ -1240,7 +1253,7 @@
         #1/tocline .cs_set:cp = { eb at toc@label@#1 } ##1,
       }
   }
-\eb_clist_map_inline:nn
+\eb_seq_map_inline:nn
   {
     tocformat,tocformat+,tocformat~+,
     tocindent,tocrule,tocline,tocafter,between
@@ -1255,7 +1268,7 @@
           }
       }
   }
-\eb_clist_map_inline:nn
+\eb_seq_map_inline:nn
   { tocafter,tocindent,tocrule }
   {
     \ctex_define:nn { tocset }
@@ -1289,6 +1302,8 @@
     hang .bool_set:N      = \eb at titletoc@hang at fix@bool,
     hang .default:n       = true,
     hang .initial:n       = false,
+    pnumwd .code:n        = \contentsmargin{#1},
+    pnumwd .initial:n     = 1.55em,
     unknown .code:n = \eb_msg_abandon_option:n { tocset }
   }
 \NewDocumentCommand{\tocrule}{st-O{0.7pc}D(){1.2}mO{}}
@@ -1448,7 +1463,7 @@
     \addcontentsline{tec}{#1}{\use:c { CTEX@#1 at tocline }{#1}{#2}}
     \group_end:
   }
-\eb_clist_map_inline:nn
+\eb_seq_map_inline:nn
   { chapter,section,subsection }
   {
     \exp_args:Nc \NewDocumentCommand { bi#1 }{sO{##3}mm}
@@ -1495,7 +1510,7 @@
     connect-all .initial:n      = { . },
     unknown .code:n = \eb_msg_abandon_option:n { style }
   }
-\eb_clist_map_inline:nn
+\eb_seq_map_inline:nn
   { figure,table,lstlisting,equation }
   {
     \cs_set:cpn { the#1 }
@@ -1616,7 +1631,7 @@
     \exp_args:Nc \DeclareDocumentCommand { listof#1s }{st+o}
       {\eb_toc_list_parse:nnnnn {##1} {##2} {##3} {#1} {#2}}
   }
-\eb_clist_map_inline:nn
+\eb_seq_map_inline:nn
   {
     { figure } { lof },
     { table } { lot },
@@ -1671,7 +1686,7 @@
     binmuber .initial:n = \arabic{chapter}
   }
 \cs_new_protected:Npn \eb_counter_zero:n #1
-  { \eb_clist_map_inline:nn {#1} { \setcounter{##1}{0} } }
+  { \eb_seq_map_inline:nn {#1} { \setcounter{##1}{0} } }
 \RenewDocumentCommand{\appendix}
   {O{Appendix\space}D(){\Alph{chapter}}}
   {
@@ -1820,7 +1835,7 @@
   }{}
 \cs_new_protected:Npn \eb_enumitem_label_set:nn #1#2
   { \SetEnumitemValue{label}{#1}{\color{ctex at emph}#2} }
-\eb_clist_map_inline:nn
+\eb_seq_map_inline:nn
   {
     { bullet } { \textbullet },
     { endash } { \normalfont\bfseries\textendash },
@@ -2243,7 +2258,7 @@
           },
       }
   }
-\eb_clist_map_inline:nn
+\eb_seq_map_inline:nn
   {
     { linkcolor } { link },
     { color } { theme }
@@ -2299,7 +2314,7 @@
 \cs_new_protected:Npn \eb_link_toc_put:n #1
   {
     \eb_put_hyperref:n { linktoc = #1 }
-    \eb_clist_map_inline:nn { page,none }
+    \eb_seq_map_inline:nn { page,none }
       {
         \tl_if_eq:NnT \l_keys_value_tl {##1}
           {
@@ -2402,7 +2417,7 @@
   }
 %</package>
 %<*tcolorbox>
-\ProvidesExplFile{eb-tcolorbox.cfg}{2021/12/06}{1.41H}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2021/12/06}{1.41I}
   {Customization of tcolorbox for easybook}
 
 \cs_set_protected:Npn \setexercise #1

Modified: trunk/Master/texmf-dist/tex/latex/easybook/easybase.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/easybook/easybase.sty	2021-12-07 21:25:15 UTC (rev 61243)
+++ trunk/Master/texmf-dist/tex/latex/easybook/easybase.sty	2021-12-07 21:25:29 UTC (rev 61244)
@@ -20,7 +20,7 @@
 %% This work has the LPPL maintenance status `maintained'.
 \NeedsTeXFormat{LaTeX2e}[2020/10/01]
 \RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2021/12/06}{1.41H}
+\ProvidesExplPackage{easybase}{2021/12/06}{1.41I}
   {Typeset Chinese theses or books}
 
 \cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -35,7 +35,7 @@
 
 \cs_set_protected:Npn \ctex_define:nn #1
   { \keys_define:nn { ctex/#1 } }
-\cs_new_protected:Npn \eb_clist_map_inline:nn #1#2
+\cs_new_protected:Npn \eb_seq_map_inline:nn #1#2
   {
     \seq_set_from_clist:Nn \l_tmpa_seq {#1}
     \seq_map_inline:Nn \l_tmpa_seq {#2}
@@ -48,7 +48,7 @@
   }
 \cs_new_protected:Npn \eb_patch_cmd:wnn #1#2#3
   {
-    \eb_clist_map_inline:nn {#1}
+    \eb_seq_map_inline:nn {#1}
       {
         \ctex_patch_cmd_once:NnnnTF ##1 { } {#2} {#3}
           { } { \ctex_patch_failure:N ##1 }
@@ -66,7 +66,7 @@
   }
 \cs_new_protected:Npn \eb_at_begin_environment:nn #1#2
   {
-    \eb_clist_map_inline:nn {#1}
+    \eb_seq_map_inline:nn {#1}
       { \AtBeginEnvironment{##1}{#2} }
   }
 \cs_new_protected:Npn \eb_match_load_package:n #1
@@ -100,7 +100,7 @@
 \RenewDocumentCommand{\usepackage}{O{}m}
   {
     \PassOptionsToPackage{#1}{#2}
-    \eb_clist_map_inline:nn {#2}
+    \eb_seq_map_inline:nn {#2}
       {
         \eb_if_package_loaded:nF {##1}
           { \eb at usepackage@save{##1} }
@@ -168,7 +168,7 @@
 \bool_new:N \l__eb_chap_counter_withpart_bool
 \tl_new:N   \l__eb_foot_counter_parent_choice_tl
 
-\eb_clist_map_inline:nn
+\eb_seq_map_inline:nn
   {
     style,subfont,spread,
     refset,bibset,thmset,
@@ -181,7 +181,7 @@
 \keys_define:nn { } { ctex/link .inherit:n = ctex/refset }
 \ctex_define:n { link .meta:nn = { ctex/link } {#1} }
 \cs_set_eq:NN \link \refset
-\eb_clist_map_inline:nn
+\eb_seq_map_inline:nn
   { style,subfont,spread,bibset,thmset,hdrset,tocset }
   {
     \msg_new:nnn { easybase } { abandon-#1 }
@@ -242,7 +242,7 @@
     if~you~continue~compiling. \\\\
     Please~update~your~macro~package~from~CTAN.
   }
-\eb_clist_map_inline:nn
+\eb_seq_map_inline:nn
   {
     { expl3 } { 2020/10/27 },
     { xparse } { 2020/10/27 },
@@ -346,7 +346,7 @@
     \booltrue{@mainmatter}
     \pagenumbering{arabic}
   }
-\eb_clist_map_inline:nn
+\eb_seq_map_inline:nn
   { chapter,section,subsection }
   {
     \exp_args:Nc \NewDocumentCommand { eb at mark@#1 at label@layout }
@@ -472,6 +472,18 @@
   { \ding{\int_eval:n { 191 + #1 }} }
 \cs_new:Npn \eb_fnmate_counter_pisans_neg:N #1
   { \ding{\int_eval:n { 201 + #1 }} }
+\cs_new_protected:Npn \DefineFntSymbols #1#2#3
+  {
+    \cs_set_protected:cpn { eb at use@fnt at symbol@#1 }
+      {
+        \cs_set:Npn \eb_int_to_symbols:n ####1
+          { \int_to_symbols:nnn {####1} {#2} {#3} }
+      }
+  }
+\cs_new_protected:Npn \setfntsymbol #1
+  { \use:c { eb at use@fnt at symbol@#1 } }
+\DefineFntSymbols{empty}{1}{}
+\setfntsymbol{empty}
 \cs_new:Npn \eb_int_format_trans:NN #1
   {
     \str_case:nn {#1}
@@ -482,6 +494,7 @@
         { I } { \int_to_Roman:n }
         { i } { \int_to_roman:n }
         { c } { \exp_args:NV \zhnumber }
+        { s } { \eb_int_to_symbols:n }
       }
   }
 \cs_new_protected:Npn \eb_fnmate_normal_label_set:nn #1#2
@@ -508,8 +521,8 @@
 \cs_new_protected:Npn \eb_fnmate_short_label_set:nn #1#2
   {
     \tl_set:Nn \l__eb_fnmate_short_tokens_tl {#1}
-    \eb_clist_map_inline:nn
-      { A,a,1,I,i,c }
+    \eb_seq_map_inline:nn
+      { A,a,1,I,i,c,s }
       {
         \tl_if_in:nnT {#1} {##1}
           {
@@ -930,7 +943,7 @@
   }
 \seq_map_function:NN
 \c__ctex_headings_seq \eb_toc_assign_keys:n
-\eb_clist_map_inline:nn
+\eb_seq_map_inline:nn
   { figure,table,lstlisting }
   {
     \ctex_define:n
@@ -939,7 +952,7 @@
         #1/tocline .cs_set:cp = { eb at toc@label@#1 } ##1,
       }
   }
-\eb_clist_map_inline:nn
+\eb_seq_map_inline:nn
   {
     tocformat,tocformat+,tocformat~+,
     tocindent,tocrule,tocline,tocafter,between
@@ -954,7 +967,7 @@
           }
       }
   }
-\eb_clist_map_inline:nn
+\eb_seq_map_inline:nn
   { tocafter,tocindent,tocrule }
   {
     \ctex_define:nn { tocset }
@@ -988,6 +1001,8 @@
     hang .bool_set:N      = \eb at titletoc@hang at fix@bool,
     hang .default:n       = true,
     hang .initial:n       = false,
+    pnumwd .code:n        = \contentsmargin{#1},
+    pnumwd .initial:n     = 1.55em,
     unknown .code:n = \eb_msg_abandon_option:n { tocset }
   }
 \NewDocumentCommand{\tocrule}{st-O{0.7pc}D(){1.2}mO{}}
@@ -1147,7 +1162,7 @@
     \addcontentsline{tec}{#1}{\use:c { CTEX@#1 at tocline }{#1}{#2}}
     \group_end:
   }
-\eb_clist_map_inline:nn
+\eb_seq_map_inline:nn
   { chapter,section,subsection }
   {
     \exp_args:Nc \NewDocumentCommand { bi#1 }{sO{##3}mm}
@@ -1194,7 +1209,7 @@
     connect-all .initial:n      = { . },
     unknown .code:n = \eb_msg_abandon_option:n { style }
   }
-\eb_clist_map_inline:nn
+\eb_seq_map_inline:nn
   { figure,table,lstlisting,equation }
   {
     \cs_set:cpn { the#1 }
@@ -1315,7 +1330,7 @@
     \exp_args:Nc \DeclareDocumentCommand { listof#1s }{st+o}
       {\eb_toc_list_parse:nnnnn {##1} {##2} {##3} {#1} {#2}}
   }
-\eb_clist_map_inline:nn
+\eb_seq_map_inline:nn
   {
     { figure } { lof },
     { table } { lot },
@@ -1370,7 +1385,7 @@
     binmuber .initial:n = \arabic{chapter}
   }
 \cs_new_protected:Npn \eb_counter_zero:n #1
-  { \eb_clist_map_inline:nn {#1} { \setcounter{##1}{0} } }
+  { \eb_seq_map_inline:nn {#1} { \setcounter{##1}{0} } }
 \RenewDocumentCommand{\appendix}
   {O{Appendix\space}D(){\Alph{chapter}}}
   {
@@ -1519,7 +1534,7 @@
   }{}
 \cs_new_protected:Npn \eb_enumitem_label_set:nn #1#2
   { \SetEnumitemValue{label}{#1}{\color{ctex at emph}#2} }
-\eb_clist_map_inline:nn
+\eb_seq_map_inline:nn
   {
     { bullet } { \textbullet },
     { endash } { \normalfont\bfseries\textendash },
@@ -1942,7 +1957,7 @@
           },
       }
   }
-\eb_clist_map_inline:nn
+\eb_seq_map_inline:nn
   {
     { linkcolor } { link },
     { color } { theme }
@@ -1998,7 +2013,7 @@
 \cs_new_protected:Npn \eb_link_toc_put:n #1
   {
     \eb_put_hyperref:n { linktoc = #1 }
-    \eb_clist_map_inline:nn { page,none }
+    \eb_seq_map_inline:nn { page,none }
       {
         \tl_if_eq:NnT \l_keys_value_tl {##1}
           {

Modified: trunk/Master/texmf-dist/tex/latex/easybook/easybook.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/easybook/easybook.cls	2021-12-07 21:25:15 UTC (rev 61243)
+++ trunk/Master/texmf-dist/tex/latex/easybook/easybook.cls	2021-12-07 21:25:29 UTC (rev 61244)
@@ -20,7 +20,7 @@
 %% This work has the LPPL maintenance status `maintained'.
 \NeedsTeXFormat{LaTeX2e}[2020/10/01]
 \RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2021/12/06}{1.41H}
+\ProvidesExplClass{easybook}{2021/12/06}{1.41I}
   {Typeset Chinese theses or books}
 
 \bool_set_false:N \l__eb_compile_draft_bool
@@ -104,7 +104,7 @@
   { \eb_set_family:nnn { \CJKsfdefault } {#2} {#1} }
 \cs_new_protected:Npn \eb_setCJKmonofont:nn #1#2
   { \eb_set_family:nnn { \CJKttdefault } {#2} {#1} }
-\eb_clist_map_inline:nn
+\eb_seq_map_inline:nn
   { main,sans,mono,CJKmain,CJKsans,CJKmono }
   {
     \exp_args:Nc \RenewDocumentCommand { set#1font }{O{}mO{}}

Modified: trunk/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg
===================================================================
--- trunk/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg	2021-12-07 21:25:15 UTC (rev 61243)
+++ trunk/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg	2021-12-07 21:25:29 UTC (rev 61244)
@@ -18,7 +18,7 @@
 %% LaTeX version 2005/12/01 or later.
 %% 
 %% This work has the LPPL maintenance status `maintained'.
-\ProvidesExplFile{eb-tcolorbox.cfg}{2021/12/06}{1.41H}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2021/12/06}{1.41I}
   {Customization of tcolorbox for easybook}
 
 \cs_set_protected:Npn \setexercise #1



More information about the tex-live-commits mailing list.