easybook (23dec21)

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

6 files changed, 49 insertions, 49 deletions

diff --git a/Master/texmf-dist/doc/latex/easybook/easybook.pdf b/Master/texmf-dist/doc/latex/easybook/easybook.pdf
index 9caa756ed71..4bed13fdeed 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 ff6f0c6a935..0aacb0e9c43 100644
--- a/Master/texmf-dist/doc/latex/easybook/easybook.tex
+++ b/Master/texmf-dist/doc/latex/easybook/easybook.tex
@@ -20,7 +20,7 @@
     name            = easybook,
     color-scheme    = blue,
     title           = EASYBOOK 使用手册,
-    version         = v1.42B,
+    version         = v1.42C,
     date            = 2021/12/22,
     authors         = 瞿毅,
     info            = 排版简体中文学位论文和书籍,
@@ -50,35 +50,40 @@
 \SetTblrInner{hline{1,Z} = {0.8pt,Blue}}
 
 \ExplSyntaxOn\makeatletter
+% * Do not add entries to the index
+% - Leave the option value blank
+\NewDocumentCommand{\kvsplit}{st-mm}
+  {
+    \item\code
+      {
+        \IfBooleanTF{#1}{\option*{#3}}{\option{#3}}
+        \cnltx@isvalue
+        \IfBooleanTF{#2}{#4}{\splitmarg{#4}}
+      }
+  }
+% Traversal output parameters
 \newcommand{\splitmeta}[2][\code{,}]
   {
     \clist_clear:N \l_tmpa_clist
-    \clist_map_inline:nn {#2}
-      { \clist_put_right:Nn \l_tmpa_clist { \meta{##1} } }
+    \clist_map_inline:nn {#2} { \clist_put_right:Nn \l_tmpa_clist { \meta{##1} } }
     \clist_use:Nn \l_tmpa_clist {#1}
   }
+% Add delimiters to parameters
 \newcommand{\newsplitarg}[4][\splitmeta]
   {
     \newcommand{#2}[1]
       {\code{\textcolor{argument}{#3\textnormal{#1{##1}}#4}}}
   }
-\NewDocumentCommand{\kvsplit}{st-mm}
-  {
-    \item\code
-      {
-        \option{#3}\cnltx@isvalue
-        \IfBooleanTF{#2}{#4}{\IfBooleanTF{#1}{\Marg{#4}}{\splitmarg{#4}}}
-      }
-  }
 \newarg[\color{violet}\code]\Carg{\{}{\}}
 \newsplitarg{\splitoarg}{[}{]}
 \newsplitarg{\splitdarg}{(}{)}
 \newsplitarg{\splitmarg}{\{}{\}}
+% Separator with vertical bar as parameter
 \newcommand{\spemmeta}{\splitmeta[\code{|}]}
 \newsplitarg[\spemmeta]{\spemcoarg}{[}{]}
 \newcommand{\harg}{\textcolor{argument}{\code{-}}}
-\NewDocumentCommand{\passto}{smm}
-  {\IfBooleanF{#1}{\color{Blue}}#3\ifblank{#2}{}{\ttfamily[#2]}}
+\newcommand{\black}[1]{\textcolor{black}{#1}}
+\newcommand{\noitemsep}{\setlength{\itemsep}{0ex}}
 \newcommand{\insertblr}[2]
   {
     \begin{center}
@@ -87,8 +92,6 @@
     \end{tblr}
     \end{center}
   }
-\newcommand{\black}[1]{\textcolor{black}{#1}}
-\newcommand{\noitemsep}{\setlength{\itemsep}{0ex}}
 \renewcommand{\cnltx@package@abstract@width}{0.85\linewidth}
 \renewcommand{\cmltx@list@setup}
   {
@@ -223,7 +226,7 @@
   \opt{enmode}\Default!
   同时开启 \option{newline} 和 \keyis-{scheme}{plain} 选项以符合英文原生风格。
   \keychoice{paper}{a4paper,b5paper,c5paper,letterpaper,other paper}\Default{a4paper}
-  文档页面尺寸选项将参数交给 \pkg*{geometry} 宏包处理，可使用它支持的所有纸张规格。建议选项值 \code{b5paper} 和 \keyis*-{zihao}{5}，选项值 \code{a4paper} 和 \keyis*-{zihao}{-4} 配合。
+  文档页面尺寸选项将参数交给 \pkg*{geometry} 宏包处理，可使用它支持的所有标准纸张规格。
   \keyval-{config}{配置文件列表}\Default
   载入用户配置的文件名列表，文件列表以花括号包裹并以英文逗号分隔。文件名应包含如 \code{tex}、\code{def} 或 \code{cfg} 等扩展名。若配置文件不在当前文件夹则文件名需要包含路径。
   \keybool{floatpage}\Default{false}
@@ -440,7 +443,7 @@
   \newcommand{\bracketsf}[1]{\textsf{[#1}}
   \ebstyle{brackets = {\bracketsf,]}}
   \end{ctexexam}
-  \kvsplit*{figurepath}{\meta{路径名1}\code{\}\{}\meta{路径名2}}\Default
+  \kvsplit-{figurepath}{\marg{路径名1}\marg{路径名2}}\Default
   设置插入图片的文件夹路径名，可以有多个路径名，每个路径包含在括号分隔，只有一个路径时需要包含在两层括号内。
 \end{options}
 
@@ -624,7 +627,7 @@
   定理环境前的间距，使用 \pkg*{tcolorbox} 的盒子环境包装后被覆盖。
   \keyval-{spacebelow}{弹性长度}\Default{0ex plus .1ex}
   定理环境后的间距，使用 \pkg*{tcolorbox} 的盒子环境包装后被覆盖。
-  \kvsplit*{notebraces}{\meta{左括号}\code{\}\{}\meta{右括号}}\Default{\Carg{(}\Carg{)}}
+  \kvsplit-{notebraces}{\marg{左括号}\marg{右括号}}\Default{\Carg{(}\Carg{)}}
   设置定理题注两边的括号，两个必选参数分别代表左括号和右括号。
   \keyval-{headformat}{标题排列}\Default{\cs*{NAME}\cs*{NUMBER}\cs*{NOTE}}
   定理标题各组成元素的位置排列和格式。定理标题由定理名、编号和题注组成，\meta{标题排列} 中命令 \cs*{NAME}、\cs*{NUMBER} 和 \cs*{NOTE} 分别代表定理名、编号和题注。
@@ -674,24 +677,21 @@
 
 \subsection{页面尺寸}
 \label{subsec:page margins}
-模块 \module*{geoset} 会将除了前两个附加的选项交给页面尺寸宏包 \pkg*{geometry} 处理，并且支持它的键值列表，预置的页面尺寸与 \cls*{Word} 的默认值接近。下面列举的仅是一小部分选项，其它选项可查阅宏包帮助文档。当在此设置页面大小时，会覆盖 \option{paper} 选项的设置。
+模块 \module*{geoset} 会将除了前两个附加的选项交给页面尺寸宏包 \pkg*{geometry} 处理，并且支持它的键值列表，预置的页面尺寸与 \cls*{Word} 的默认值接近。下面列举几种代表性选项，其它选项可查阅宏包帮助文档。当在此设置纸张规格时，会覆盖文类选项 \option{paper} 的设置。
 \begin{options}\noitemsep
   \keyval-{headruleskip}{页眉线间距}\Module{geoset}\Default*{1.5pt}
   \keyval-{footruleskip}{页脚线间距}\Default*{0.3\cs*{normalbaselineskip}}
-  \keyval*-{left}{页面左边距}\Default*{3.17cm}
-  \keyval*-{top}{页面上边距}\Default*{2.54cm}
-  \kvsplit{hmargin}{左边距,右边距}
-  \keyval*-{textwidth}{页面文本区宽度}\default{}
-  \keybool*{includehead}\Default*{false}
+  \kvsplit*{hdivide}{左边距,页面文本宽度,右边距}
+  \kvsplit*{hmargin}{左边距,右边距}
+  \keyval*-{textheight}{页面文本高度}\default{}
+  \keybool*{nofoot}\Default*{false}
   \begin{ctexexam}
   \ebgeoset
     {
       headruleskip  = 3pt,
-      top           = 2.5cm,
-      bottom        = 2.5cm,
-      left          = 3.2cm,
-      right         = 3.2cm,
-      ignoreall
+      vscale        = 0.9,
+      hdivide       = {2cm,15cm,*},
+      vcentering
     }
   \end{ctexexam}
 \end{options}
diff --git a/Master/texmf-dist/source/latex/easybook/easybook.dtx b/Master/texmf-dist/source/latex/easybook/easybook.dtx
index dfbf1feea71..99f5551d5d0 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/12/22}{1.42B}
+\ProvidesExplClass{easybook}{2021/12/22}{1.42C}
   {Typeset Chinese theses or books}
 
 \bool_set_false:N \l__eb_compile_draft_bool
@@ -307,7 +307,7 @@
 %<*package>
 \NeedsTeXFormat{LaTeX2e}[2020/10/01]
 \RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2021/12/22}{1.42B}
+\ProvidesExplPackage{easybase}{2021/12/22}{1.42C}
   {Typeset Chinese theses or books}
 
 \cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -377,19 +377,19 @@
     \@ifpackageloaded{#1}
       {
         \tl_if_blank:nTF {#2}
-          { \msg_warning:nnn { easybase } { package-reloaded-ii } {#1} }
-          { \msg_warning:nnnn { easybase } { package-reloaded-i } {#1} {#2} }
+          { \msg_warning:nnn { easybase } { package-repeat-load-ii } {#1} }
+          { \msg_warning:nnnn { easybase } { package-repeat-load-i } {#1} {#2} }
       }
       {#3\disable@package@load{#1}{}}
   }
-\msg_new:nnn { easybase } { package-reloaded-i }
+\msg_new:nnn { easybase } { package-repeat-load-i }
   {
-    The~macro~package~#1~has~been~reloaded. \\
+    The~macro~package~#1~has~been~loaded~repeatedly. \\
     Please~pass~the~arguments~by \\
     the~\string\PassOptionsToPackage{#2}{#1}\ command.
   }
-\msg_new:nnn { easybase } { package-reloaded-ii }
-  { The~macro~package~#1~has~been~reloaded. }
+\msg_new:nnn { easybase } { package-repeat-load-ii }
+  { The~macro~package~#1~has~been~loaded~repeatedly. }
 \cs_set_eq:NN \eb@usepackage@save \usepackage
 \RenewDocumentCommand{\usepackage}{O{}m}
   {
@@ -1854,7 +1854,7 @@
 \SetEnumitemValue{font}{sf}{\color{ctex@emph}\normalfont\sffamily}
 \SetEnumitemValue{ref}{enumii}{\arabic{enumi}.\alph*}
 \SetEnumitemValue{ref}{enumiii}{\arabic{enumi}.\alph{enumii}.\roman*}
-\setlist{nosep,align = left}
+\setlist{nosep,align = left,mode = unboxed}
 \setlist*{labelsep = 0.5em,listparindent = 2em,leftmargin = *}
 \setlist[itemize,1]{label = bullet}
 \setlist[itemize,2]{label = endash}
@@ -2432,7 +2432,7 @@
   }
 %</package>
 %<*tcolorbox>
-\ProvidesExplFile{eb-tcolorbox.cfg}{2021/12/22}{1.42B}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2021/12/22}{1.42C}
   {Customization of tcolorbox for easybook}
 
 \cs_set_protected:Npn \setexercise #1
diff --git a/Master/texmf-dist/tex/latex/easybook/easybase.sty b/Master/texmf-dist/tex/latex/easybook/easybase.sty
index b5044e131f0..0d63395eb6b 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/12/22}{1.42B}
+\ProvidesExplPackage{easybase}{2021/12/22}{1.42C}
   {Typeset Chinese theses or books}
 
 \cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -90,19 +90,19 @@
     \@ifpackageloaded{#1}
       {
         \tl_if_blank:nTF {#2}
-          { \msg_warning:nnn { easybase } { package-reloaded-ii } {#1} }
-          { \msg_warning:nnnn { easybase } { package-reloaded-i } {#1} {#2} }
+          { \msg_warning:nnn { easybase } { package-repeat-load-ii } {#1} }
+          { \msg_warning:nnnn { easybase } { package-repeat-load-i } {#1} {#2} }
       }
       {#3\disable@package@load{#1}{}}
   }
-\msg_new:nnn { easybase } { package-reloaded-i }
+\msg_new:nnn { easybase } { package-repeat-load-i }
   {
-    The~macro~package~#1~has~been~reloaded. \\
+    The~macro~package~#1~has~been~loaded~repeatedly. \\
     Please~pass~the~arguments~by \\
     the~\string\PassOptionsToPackage{#2}{#1}\ command.
   }
-\msg_new:nnn { easybase } { package-reloaded-ii }
-  { The~macro~package~#1~has~been~reloaded. }
+\msg_new:nnn { easybase } { package-repeat-load-ii }
+  { The~macro~package~#1~has~been~loaded~repeatedly. }
 \cs_set_eq:NN \eb@usepackage@save \usepackage
 \RenewDocumentCommand{\usepackage}{O{}m}
   {
@@ -1567,7 +1567,7 @@
 \SetEnumitemValue{font}{sf}{\color{ctex@emph}\normalfont\sffamily}
 \SetEnumitemValue{ref}{enumii}{\arabic{enumi}.\alph*}
 \SetEnumitemValue{ref}{enumiii}{\arabic{enumi}.\alph{enumii}.\roman*}
-\setlist{nosep,align = left}
+\setlist{nosep,align = left,mode = unboxed}
 \setlist*{labelsep = 0.5em,listparindent = 2em,leftmargin = *}
 \setlist[itemize,1]{label = bullet}
 \setlist[itemize,2]{label = endash}
diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls
index 59be44bf517..868a303a8f9 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/12/22}{1.42B}
+\ProvidesExplClass{easybook}{2021/12/22}{1.42C}
   {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 59d785bb0e1..978f487d260 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/12/22}{1.42B}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2021/12/22}{1.42C}
   {Customization of tcolorbox for easybook}
 
 \cs_set_protected:Npn \setexercise #1