easybook (6jan22)

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

6 files changed, 28 insertions, 30 deletions

diff --git a/Master/texmf-dist/doc/latex/easybook/easybook.pdf b/Master/texmf-dist/doc/latex/easybook/easybook.pdf
index 6fed3034300..4ad198fe22f 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 5a55539db42..7b654d92811 100644
--- a/Master/texmf-dist/doc/latex/easybook/easybook.tex
+++ b/Master/texmf-dist/doc/latex/easybook/easybook.tex
@@ -20,8 +20,8 @@
     name            = easybook,
     color-scheme    = blue,
     title           = EASYBOOK 使用手册,
-    version         = v1.42L,
-    date            = 2022/01/04,
+    version         = v1.42P,
+    date            = 2022/01/05,
     authors         = 瞿毅,
     info            = 排版简体中文学位论文和书籍,
     email           = q1jx@foxmail.com,
@@ -44,7 +44,7 @@
 \addtokomafont{subsubsection}{\normalfont\sffamily}
 \DeclareTOCStyleEntry[entryformat = \sffamily]{default}{section}
 \geometry{margin = 1in,marginparwidth = 0.65in}
-\setlist{nosep,labelindent = \parindent,leftmargin = *,labelsep = 0.5em}
+\setlist{nosep,labelindent = \parindent,leftmargin = *}
 \setlist[itemize,1]{label = \small\color{Blue}\textbullet}
 \setcounter{tocdepth}{2}
 \SetTblrInner{hline{1,Z} = {0.8pt,Blue}}
@@ -144,7 +144,7 @@
 您在使用 \cls*{easybook} 文档类编写文档前可能需要具备以下的条件：
 \begin{itemize}
   \item 使用 \hologo{XeLaTeX}（推荐）或 \hologo{LuaLaTeX} 两种编译方式。
-  \item 由于用到了一些 \LaTeX 和宏包较新的功能，建议安装最新的 \TeX 发行版，例如 \TeX Live 2021 或 \hologo{MiKTeX} 21.2 之后的版本。
+  \item 由于文档类用到了一些 \LaTeX 和依赖宏包较新的功能，需要版本至少在 2020/10/01 以后的 \LaTeX 内核支持，建议您安装最新的 \TeX 发行版。
   \item 虽然手册对基本用法做了介绍，但这并不是入门教程，所涉及到宏包的用法与命令也需要有了解。您应当具有一定的 \LaTeX 使用基础，可以在 \TeX 综合网站 \href{https://www.ctan.org/}{CTAN} 查看相关资源。
 \end{itemize}
 
@@ -436,7 +436,7 @@
   \keychoice{fntnumwith}{part,chapter,page}\Default{chapter}
   使脚注跟随编号的计数器名。默认跟随章计数器，当开启新的一章时脚注编号从 1 开始。
   \keybool{uppercase}\Default{true}
-  使用 \cs*{rightmark} 及 \cs*{leftmark} 等标题标记命令获取标题内容时英文是否大写。
+  使用 \cs*{rightmark} 和 \cs*{leftmark} 等标题标记命令获取标题内容时英文是否大写。
   \kvsplit{brackets}{左括号,右括号}\Default{\Carg{(\black{,})}}
   设置行间公式编号标签的括号及格式，以英文逗号分隔，分别代表左右括号。\meta{左括号} 可以是带有一个参数的命令，用于接受编号和 \meta{右括号}。将标签括号设置为方括号，并使用无衬线字体：
   \begin{ctexexam}
@@ -635,11 +635,11 @@
 
 \subsubsection{新建定理环境}
 \begin{commands}
-  \command{declaretheorem}[\oarg{键值列表1}\marg{定理环境}\oarg{键值列表2}]
+  \command{declaretheorem}[\oarg{键值列表1}\marg{环境名}\oarg{键值列表2}]
   定理环境声明命令，命令 \cs{newtheorem} 与它等效。可选参数的 \meta{键值列表1} 与 \meta{键值列表2} 等效，用法与原来的同名命令一致。键值列表中常用的选项如下：
   \begin{options}
   \keyval*-{name}{定理名}
-  定理名的默认值是首字母大写的环境名称（英文标题）。
+  预置定理环境的标题根据语言模式自动切换，也可以重新定义 \cs*{\black{\normalfont\meta{环境名}}name} 命令修改。
   \keychoice*{numbered}{no,yes,unless unique}
   定理可以被编号、不被编号或者只有在文档中多次出现时才被编号。
   \keyval*-{numberlike}{计数器}
@@ -680,7 +680,7 @@
 模块 \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-{footruleskip}{页脚线间距}\Default*{3.5pt}
   \kvsplit*{hdivide}{左边距,页面文本宽度,右边距}
   \kvsplit*{hmargin}{左边距,右边距}
   \keyval*-{textheight}{页面文本高度}\default{}
diff --git a/Master/texmf-dist/source/latex/easybook/easybook.dtx b/Master/texmf-dist/source/latex/easybook/easybook.dtx
index 4336d8da06d..16cdd91b882 100644
--- a/Master/texmf-dist/source/latex/easybook/easybook.dtx
+++ b/Master/texmf-dist/source/latex/easybook/easybook.dtx
@@ -15,14 +15,13 @@
 %<*class>
 \NeedsTeXFormat{LaTeX2e}[2020/10/01]
 \RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2022/01/04}{1.42L}
+\ProvidesExplClass{easybook}{2022/01/05}{1.42P}
   {Typeset Chinese theses or books}
 
 \bool_set_false:N \l__eb_compile_draft_bool
 \bool_set_false:N \l__eb_title_newline_bool
 \bool_set_true:N  \l__eb_class_mode_book_bool
 \tl_new:N         \l__eb_font_value_tl
-\clist_new:N      \g__eb_config_file_clist
 \clist_new:N      \g__eb_options_clist
 \cs_new_protected:Npn \eb_put_ctexbook:n #1
   { \PassOptionsToClass{#1}{ctexbook} }
@@ -307,7 +306,7 @@
 %<*package>
 \NeedsTeXFormat{LaTeX2e}[2020/10/01]
 \RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2022/01/04}{1.42L}
+\ProvidesExplPackage{easybase}{2022/01/05}{1.42P}
   {Typeset Chinese theses or books}
 
 \cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -584,8 +583,8 @@
     columnsep       = 2em,
     headheight      = 2.04cm,
     headsep         = 0.5cm,
-    footskip        = 0.79cm,
     footnotesep     = 0.5cm,
+    footskip        = 0.79cm,
     marginparsep    = 8pt,
     marginparwidth  = 2.54cm
   }
@@ -594,6 +593,7 @@
     headruleskip .tl_set:N  = \headruleskip,
     headruleskip .initial:n = 1.5pt,
     footruleskip .tl_set:N  = \footruleskip,
+    footruleskip .initial:n = 3.5pt,
     unknown .code:n         =
       {
         \exp_args:Nx \geometry
@@ -1850,8 +1850,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,mode = unboxed}
-\setlist*{labelsep = 0.5em,listparindent = 2em,leftmargin = *}
+\setlist{nosep,align = left,mode = unboxed,leftmargin = *,listparindent = 2em}
 \setlist[itemize,1]{label = bullet}
 \setlist[itemize,2]{label = endash}
 \setlist[itemize,3]{label = asterisk}
@@ -1950,8 +1949,8 @@
 \cs_new_protected:Npn \eb_thm_biname_set:nnn #1#2#3
   {
     \tl_if_eq:NnTF \l__ctex_scheme_tl { chinese }
-      { \tl_set:cn { l__eb_thm_biname_#1_tl } {#3} }
-      { \tl_set:cn { l__eb_thm_biname_#1_tl } {#2} }
+      { \tl_set:cn { #1name } {#3} }
+      { \tl_set:cn { #1name } {#2} }
   }
 \cs_set_eq:NN \eb@declaretheorem@save \declaretheorem
 \cs_set_eq:NN \eb@declaretheoremsyle@save \declaretheoremstyle
@@ -1975,7 +1974,7 @@
       }
     \eb_thm_biname_set:nnn {#1} {#2} {#3}
     \declaretheorem{#1}[
-      name  = \tl_use:c { l__eb_thm_biname_#1_tl },
+      name  = \tl_use:c { #1name },
       style = fancy,#5
       ]
     \eb_if_thmframe_with_tcolorbox:TF
@@ -1986,7 +1985,7 @@
         \bool_if:cF { l__eb_tcb_repeat_env_#1_bool }
           { \tcolorboxenvironment{#1}{#4} }
       } { }
-    \labelformat{#1}{\tl_use:c { l__eb_thm_biname_#1_tl }~##1}
+    \labelformat{#1}{\tl_use:c { #1name }~##1}
   }
 
 \prop_new:N \l__eb_thmtools_entry_prop
@@ -2423,7 +2422,7 @@
   }
 %</package>
 %<*tcolorbox>
-\ProvidesExplFile{eb-tcolorbox.cfg}{2022/01/04}{1.42L}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2022/01/05}{1.42P}
   {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 35adcd00e7a..0a68a026177 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}{2022/01/04}{1.42L}
+\ProvidesExplPackage{easybase}{2022/01/05}{1.42P}
   {Typeset Chinese theses or books}
 
 \cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -297,8 +297,8 @@
     columnsep       = 2em,
     headheight      = 2.04cm,
     headsep         = 0.5cm,
-    footskip        = 0.79cm,
     footnotesep     = 0.5cm,
+    footskip        = 0.79cm,
     marginparsep    = 8pt,
     marginparwidth  = 2.54cm
   }
@@ -307,6 +307,7 @@
     headruleskip .tl_set:N  = \headruleskip,
     headruleskip .initial:n = 1.5pt,
     footruleskip .tl_set:N  = \footruleskip,
+    footruleskip .initial:n = 3.5pt,
     unknown .code:n         =
       {
         \exp_args:Nx \geometry
@@ -1563,8 +1564,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,mode = unboxed}
-\setlist*{labelsep = 0.5em,listparindent = 2em,leftmargin = *}
+\setlist{nosep,align = left,mode = unboxed,leftmargin = *,listparindent = 2em}
 \setlist[itemize,1]{label = bullet}
 \setlist[itemize,2]{label = endash}
 \setlist[itemize,3]{label = asterisk}
@@ -1663,8 +1663,8 @@
 \cs_new_protected:Npn \eb_thm_biname_set:nnn #1#2#3
   {
     \tl_if_eq:NnTF \l__ctex_scheme_tl { chinese }
-      { \tl_set:cn { l__eb_thm_biname_#1_tl } {#3} }
-      { \tl_set:cn { l__eb_thm_biname_#1_tl } {#2} }
+      { \tl_set:cn { #1name } {#3} }
+      { \tl_set:cn { #1name } {#2} }
   }
 \cs_set_eq:NN \eb@declaretheorem@save \declaretheorem
 \cs_set_eq:NN \eb@declaretheoremsyle@save \declaretheoremstyle
@@ -1688,7 +1688,7 @@
       }
     \eb_thm_biname_set:nnn {#1} {#2} {#3}
     \declaretheorem{#1}[
-      name  = \tl_use:c { l__eb_thm_biname_#1_tl },
+      name  = \tl_use:c { #1name },
       style = fancy,#5
       ]
     \eb_if_thmframe_with_tcolorbox:TF
@@ -1699,7 +1699,7 @@
         \bool_if:cF { l__eb_tcb_repeat_env_#1_bool }
           { \tcolorboxenvironment{#1}{#4} }
       } { }
-    \labelformat{#1}{\tl_use:c { l__eb_thm_biname_#1_tl }~##1}
+    \labelformat{#1}{\tl_use:c { #1name }~##1}
   }
 
 \prop_new:N \l__eb_thmtools_entry_prop
diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls
index b31307f69bd..893b7db7884 100644
--- a/Master/texmf-dist/tex/latex/easybook/easybook.cls
+++ b/Master/texmf-dist/tex/latex/easybook/easybook.cls
@@ -20,14 +20,13 @@
 %% This work has the LPPL maintenance status `maintained'.
 \NeedsTeXFormat{LaTeX2e}[2020/10/01]
 \RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2022/01/04}{1.42L}
+\ProvidesExplClass{easybook}{2022/01/05}{1.42P}
   {Typeset Chinese theses or books}
 
 \bool_set_false:N \l__eb_compile_draft_bool
 \bool_set_false:N \l__eb_title_newline_bool
 \bool_set_true:N  \l__eb_class_mode_book_bool
 \tl_new:N         \l__eb_font_value_tl
-\clist_new:N      \g__eb_config_file_clist
 \clist_new:N      \g__eb_options_clist
 \cs_new_protected:Npn \eb_put_ctexbook:n #1
   { \PassOptionsToClass{#1}{ctexbook} }
diff --git a/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg b/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg
index 6833d35b9b3..3955cf2cbb6 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}{2022/01/04}{1.42L}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2022/01/05}{1.42P}
   {Customization of tcolorbox for easybook}
 
 \cs_set_protected:Npn \setexercise #1