summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Master/texmf-dist/doc/latex/easybook/easybook.pdfbin575027 -> 576025 bytes
-rw-r--r--Master/texmf-dist/doc/latex/easybook/easybook.tex25
-rw-r--r--Master/texmf-dist/source/latex/easybook/easybook.dtx33
-rw-r--r--Master/texmf-dist/tex/latex/easybook/easybase.sty29
-rw-r--r--Master/texmf-dist/tex/latex/easybook/easybook.cls2
-rw-r--r--Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg2
6 files changed, 37 insertions, 54 deletions
diff --git a/Master/texmf-dist/doc/latex/easybook/easybook.pdf b/Master/texmf-dist/doc/latex/easybook/easybook.pdf
index e9d8282bef5..a6a70491a33 100644
--- a/Master/texmf-dist/doc/latex/easybook/easybook.pdf
+++ b/Master/texmf-dist/doc/latex/easybook/easybook.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/easybook/easybook.tex b/Master/texmf-dist/doc/latex/easybook/easybook.tex
index 355b35bd00f..2ea2f54526d 100644
--- a/Master/texmf-dist/doc/latex/easybook/easybook.tex
+++ b/Master/texmf-dist/doc/latex/easybook/easybook.tex
@@ -21,8 +21,8 @@
name = easybook,
color-scheme = blue,
title = EASYBOOK 使用手册,
- version = v1.60,
- date = 2022/02/02,
+ version = v1.61,
+ date = 2022/02/03,
authors = 瞿毅,
info = 排版简体中文学位论文和书籍,
email = q1jx@foxmail.com,
@@ -44,9 +44,9 @@
\addtokomafont{subsection}{\normalfont\sffamily}
\addtokomafont{subsubsection}{\normalfont\sffamily}
\DeclareTOCStyleEntry[entryformat = \sffamily]{default}{section}
+\DeclareFieldFormat[book]{title}{\textsf{#1}}
\geometry{margin = 1in,marginparwidth = 0.65in}
\SetEnumitemValue{label}{smallbullet}{\small\color{Blue}\textbullet}
-\DeclareFieldFormat[book]{title}{\textsf{#1}}
\setlist{nosep,topsep = \smallskipamount,labelsep = 0.5em}
\setlist[1]{labelindent = \parindent}
\setlist[itemize,1]{label = smallbullet,leftmargin = *}
@@ -86,6 +86,7 @@
\newcommand{\spemmeta}{\splitmeta[\code{|}]}
\newsplitarg[\spemmeta]{\spemcoarg}{[}{]}
\newcommand{\harg}{\textcolor{argument}{\code{-}}}
+% Remove default braces of values
\RenewDocumentCommand{\key}{s}
{
\IfBooleanTF{#1}{\cnltx@key@aux*}{\cnltx@key@aux{}}
@@ -614,15 +615,15 @@
\begin{options}
\keychoice*{heading}{bibliography,subbibliography,bibintoc,subbibintoc}\Default{bibintoc}
参考文献通常有一个章标题或者节标题，该选项选择由 \cs*{defbibheading} 定义的标题名。
- \keyval*-{title}{参考文献标题名}
+ \keyval*{title}{参考文献标题名}
如果标题定义支持的话，该选项覆盖由 \option*{heading} 选项提供的缺省标题名。
- \keyval*-{prenote}{参考文献前注}
+ \keyval*{prenote}{参考文献前注}
该选项选择由 \cs*{defbibnote} 所定义的前注，缺省状态下不打印任何前注。
- \keyval*-{section}{整数}\Default{0}
+ \keyval*{section}{整数}\Default{0}
只打印在指定文节中引用的条目。该参考文献节从 1 开始编号，所有在 \env*{refsection} 环境外给出的引用标记为第零节。
- \keyval*-{type}{条目类型}
+ \keyval*{type}{条目类型}
指定条目的打印类型。
- \keyval*-{filter}{过滤器名}
+ \keyval*{filter}{过滤器名}
使用由 \cs*{defbibfilter} 定义的 \option*{filter} 来过滤条目。
\end{options}
@@ -642,15 +643,15 @@
\command{declaretheorem}[\oarg{键值列表1}\marg{环境名}\oarg{键值列表2}]\Module{thmset}
定理环境声明命令。可选参数的 \meta{键值列表1} 与 \meta{键值列表2} 等效，其中常用的选项如下：
\begin{options}
- \keyval*-{name}{定理名}
+ \keyval*{name}{定理名}
定理环境的标题名称，默认为英文首字母大写的环境名。
\keychoice*{numbered}{no,yes,unless unique}
定理可以被编号、不被编号或者只有在文档中多次出现时才被编号。
\keychoice*{within}{chapter,section,empty,counter}
定理编号跟随的计数器。当计数器值递增时定理编号会从零开始，通常这是一个章节计数器。
- \keyval*-{numberlike}{计数器}
+ \keyval*{numberlike}{计数器}
定理将使用此 \meta{计数器} 进行编号，通常这是另一个定理环境的名称。
- \keyval*-{style}{定理样式}
+ \keyval*{style}{定理样式}
选项的值为使用 \cs{declaretheoremstyle} 命令新定义的定理样式。
\end{options}
@@ -710,7 +711,7 @@
\keyval{footruleskip}{页脚线间距}\Default*{3.5pt}
\kvsplit*{hdivide}{左边距,页面文本宽度,右边距}\default{}
\kvsplit*{hmargin}{左边距,右边距}\default{}
- \keyval*-{textheight}{页面文本高度}\default{}
+ \keyval*{textheight}{页面文本高度}\default{}
\keybool*{nofoot}\Default*{false}
\begin{ctexexam}
\ebgeoset
diff --git a/Master/texmf-dist/source/latex/easybook/easybook.dtx b/Master/texmf-dist/source/latex/easybook/easybook.dtx
index ec17a0f52b8..e1040bbc695 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}{2022/02/02}{1.60}
+\ProvidesExplClass{easybook}{2022/02/03}{1.61}
{Typeset Chinese theses or books}
\bool_set_false:N \l__eb_compile_draft_bool
@@ -305,7 +305,7 @@
%<*package>
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2022/02/02}{1.60}
+\ProvidesExplPackage{easybase}{2022/02/03}{1.61}
{Typeset Chinese theses or books}
\cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -340,16 +340,10 @@
{ } { \ctex_patch_failure:N ##1 }
}
}
-\cs_new_protected:Npn \eb_preto_cmd:Nn #1#2
- {
- \ctex_preto_cmd:NnnTF #1 { } {#2}
- { } { \ctex_patch_failure:N #1 }
- }
-\cs_new_protected:Npn \eb_appto_cmd:Nn #1#2
- {
- \ctex_appto_cmd:NnnTF #1 { } {#2}
- { } { \ctex_patch_failure:N #1 }
- }
+\cs_new_protected:Npn \eb_preto_cmd:nn #1#2
+ { \AddToHook{cmd/#1/before}{#2} }
+\cs_new_protected:Npn \eb_appto_cmd:nn #1#2
+ { \AddToHook{cmd/#1/after}{#2} }
\cs_new_protected:Npn \eb_at_begin_environment:nn #1#2
{
\eb_seq_map_inline:nn {#1}
@@ -734,7 +728,7 @@
\geometry{showframe}
}
\bool_new:N \l__eb_ps_used_bool
-\eb_appto_cmd:Nn \pagestyle { \bool_set_true:N \l__eb_ps_used_bool }
+\eb_appto_cmd:nn { pagestyle } { \bool_set_true:N \l__eb_ps_used_bool }
\ctex_at_end_preamble:n
{
\bool_if:NF \l__eb_ps_used_bool { \pagestyle{fancy} }
@@ -1477,13 +1471,10 @@
}
}
}
-\cs_if_exist:NT \chapter
+\eb_preto_cmd:nn { @chapter }
{
- \eb_appto_cmd:Nn \@chapter
- {
- \skip_if_eq:nnF { \eb@toc@lol@skip } { \c_zero_skip }
- { \addtocontents{lol}{\protect\addvspace{\skip_use:N \eb@toc@lol@skip}} }
- }
+ \skip_if_eq:nnF { \eb@toc@lol@skip } { \c_zero_skip }
+ { \addtocontents{lol}{\protect\addvspace{\skip_use:N \eb@toc@lol@skip}} }
}
\ctex_define:nn { style }
@@ -2265,7 +2256,7 @@
\cs_new_protected:Npn \eb_allow_url_break:
{
- \eb_appto_cmd:Nn \UrlBreaks
+ \eb_appto_cmd:nn { UrlBreaks }
{
\UrlOrds
\tl_map_function:NN \c__eb_url_break_points_tl \do
@@ -2341,7 +2332,7 @@
}
%</package>
%<*tcolorbox>
-\ProvidesExplFile{eb-tcolorbox.cfg}{2022/02/02}{1.60}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2022/02/03}{1.61}
{Customization of tcolorbox for easybook}
\cs_set_protected:Npn \addtotcbstyle #1#2
diff --git a/Master/texmf-dist/tex/latex/easybook/easybase.sty b/Master/texmf-dist/tex/latex/easybook/easybase.sty
index cdb8cd51f63..6ba5fe1498a 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/02/02}{1.60}
+\ProvidesExplPackage{easybase}{2022/02/03}{1.61}
{Typeset Chinese theses or books}
\cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -55,16 +55,10 @@
{ } { \ctex_patch_failure:N ##1 }
}
}
-\cs_new_protected:Npn \eb_preto_cmd:Nn #1#2
- {
- \ctex_preto_cmd:NnnTF #1 { } {#2}
- { } { \ctex_patch_failure:N #1 }
- }
-\cs_new_protected:Npn \eb_appto_cmd:Nn #1#2
- {
- \ctex_appto_cmd:NnnTF #1 { } {#2}
- { } { \ctex_patch_failure:N #1 }
- }
+\cs_new_protected:Npn \eb_preto_cmd:nn #1#2
+ { \AddToHook{cmd/#1/before}{#2} }
+\cs_new_protected:Npn \eb_appto_cmd:nn #1#2
+ { \AddToHook{cmd/#1/after}{#2} }
\cs_new_protected:Npn \eb_at_begin_environment:nn #1#2
{
\eb_seq_map_inline:nn {#1}
@@ -449,7 +443,7 @@
\geometry{showframe}
}
\bool_new:N \l__eb_ps_used_bool
-\eb_appto_cmd:Nn \pagestyle { \bool_set_true:N \l__eb_ps_used_bool }
+\eb_appto_cmd:nn { pagestyle } { \bool_set_true:N \l__eb_ps_used_bool }
\ctex_at_end_preamble:n
{
\bool_if:NF \l__eb_ps_used_bool { \pagestyle{fancy} }
@@ -1192,13 +1186,10 @@
}
}
}
-\cs_if_exist:NT \chapter
+\eb_preto_cmd:nn { @chapter }
{
- \eb_appto_cmd:Nn \@chapter
- {
- \skip_if_eq:nnF { \eb@toc@lol@skip } { \c_zero_skip }
- { \addtocontents{lol}{\protect\addvspace{\skip_use:N \eb@toc@lol@skip}} }
- }
+ \skip_if_eq:nnF { \eb@toc@lol@skip } { \c_zero_skip }
+ { \addtocontents{lol}{\protect\addvspace{\skip_use:N \eb@toc@lol@skip}} }
}
\ctex_define:nn { style }
@@ -1980,7 +1971,7 @@
\cs_new_protected:Npn \eb_allow_url_break:
{
- \eb_appto_cmd:Nn \UrlBreaks
+ \eb_appto_cmd:nn { UrlBreaks }
{
\UrlOrds
\tl_map_function:NN \c__eb_url_break_points_tl \do
diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls
index 689d966e5e5..5b673cc8a4c 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}{2022/02/02}{1.60}
+\ProvidesExplClass{easybook}{2022/02/03}{1.61}
{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 eba94795fe9..33ed6fe8e21 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/02/02}{1.60}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2022/02/03}{1.61}
{Customization of tcolorbox for easybook}
\cs_set_protected:Npn \addtotcbstyle #1#2
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-29 01:06:22 +0000