summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-11-23 22:38:46 +0000
committerKarl Berry <karl@freefriends.org>2021-11-23 22:38:46 +0000
commitebc71f5f7e7a2bdc5e2f00c563891fdcef9ce269 (patch)
tree083b9e1b1719060355d6502663908f85199f6958
parent65270aebeb50083284dbd843d7b40a323e28a57d (diff)
easybook (23nov21)
git-svn-id: svn://tug.org/texlive/trunk@61129 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/easybook/easybook.pdfbin579975 -> 582542 bytes
-rw-r--r--Master/texmf-dist/doc/latex/easybook/easybook.tex17
-rw-r--r--Master/texmf-dist/source/latex/easybook/easybook.dtx16
-rw-r--r--Master/texmf-dist/tex/latex/easybook/easybase.sty12
-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, 28 insertions, 21 deletions
diff --git a/Master/texmf-dist/doc/latex/easybook/easybook.pdf b/Master/texmf-dist/doc/latex/easybook/easybook.pdf
index 1746468440f..9d88bbc59a5 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 a385bc26816..ad430de0319 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.40U,
+ version = v1.40V,
date = 2021/11/22,
authors = 瞿毅,
info = 排版简体中文学位论文和书籍,
@@ -719,11 +719,11 @@
\hdrset{footnotetype = {hang,bottom}}
\end{ctexexam}
\keyval-{fnindent}{刚性长度}\Default{0.75em}
- 脚注首段的首行缩进,等于长度 \cs{footindent} 的值。
+ 每个脚注首段的首行缩进(选项 \option*{hang} 为整体缩进),等于长度 \cs{footindent} 的值。
\keyval-{fnparskip}{弹性长度}\Default{0ex}
- 脚注段落的间距,等于长度 \cs{footparskip} 的值。
+ 不同脚注的段落间距,等于长度 \cs{footparskip} 的值。
\keyval-{fnparindent}{刚性长度}\Default{2em}
- 脚注第二段及之后段落的首行缩进,等于长度 \cs{footparindent} 的值。
+ 每个脚注第二段及之后段落的首行缩进,等于长度 \cs{footparindent} 的值。
\keychoice{fntext-pos}{normal,super}\Default{super}
设置脚注内容标记的位置,正常文本或是上标形式。
\keychoice{fnmark-num}{plain,pifont,pifont*,pisans,pisans*,short num}\Default{plain}
@@ -1140,6 +1140,13 @@
\begin{environments}
\environment{eqcomp}[\oarg{键值列表1}\darg{键值列表2}]
一些公式之后可以使用基于列表环境的 \env{eqcomp} 进行符号对照。对照列表的 \meta{键值列表2} 与 \pkg*{enumitem} 的选项相同,一般较少用到,可以用于设置垂直间距等。
+ \begin{ctexexam}
+ \seteqcomp{intro = 上式中}
+ \begin{eqcomp}[width = 1.5em]
+ \symb{Ab}[$\to$] 符号说明1
+ \symb{C}[---] 符号说明2
+ \end{eqcomp}
+ \end{ctexexam}
\end{environments}
\begin{commands}
@@ -1150,7 +1157,7 @@
\command{seteqcomp}[\marg{键值列表1}]
对照环境的 \meta{键值列表1} 可以使用 \cs{seteqcomp} 全局设置,它的选项如下:
\begin{options}
- \keyval-{width}{符号宽度}\Default{2em}
+ \keyval-{width}{符号宽度}\Default{10pt}
设置适当的符号宽度可以防止文字重叠和边界溢出等问题。
\keyval-{delim}{引导符}\Default{\Carg{——}}
全局的符号对照引导符,\cs{symb} 局部的 \meta{引导符} 和对齐方式是基于这个符号的宽度。
diff --git a/Master/texmf-dist/source/latex/easybook/easybook.dtx b/Master/texmf-dist/source/latex/easybook/easybook.dtx
index 637e238152f..d69282b790a 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/11/22}{1.40U}
+\ProvidesExplClass{easybook}{2021/11/22}{1.40V}
{Typeset Chinese theses or books}
\bool_set_false:N \l__eb_compile_draft_bool
@@ -325,7 +325,7 @@
%<*package>
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2021/11/22}{1.40U}
+\ProvidesExplPackage{easybase}{2021/11/22}{1.40V}
{Typeset Chinese theses or books}
\cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -878,7 +878,7 @@
fnindent .initial:n = 0.75em,
fnparskip .skip_set:N = \footparskip,
fnparskip .initial:n = 0ex,
- fnparindent .dim_set:N = \footparindent,
+ fnparindent .tl_set:N = \footparindent,
fnparindent .initial:n = 2em,
fnpara-form .tl_set:N = \l__eb_fnpara_format_tl,
@@ -1361,8 +1361,8 @@
lstlisting/tocline = \listnumberline{lstlisting}
}
\ctex_set:nn { tocset } { tocafter-all = \hspace{1em} }
-\prop_new:N \l__eb_list_label_name_prop
-\prop_set_from_keyval:Nn \l__eb_list_label_name_prop
+\prop_new:N \l__eb_list_label_entry_prop
+\prop_set_from_keyval:Nn \l__eb_list_label_entry_prop
{
figure = \eb@toc@label@figure,
table = \eb@toc@label@table
@@ -1373,7 +1373,7 @@
{
\bool_if:NT \eb@titletoc@hang@fix@bool { \p@numberline }
\bgroup
- \prop_item:Nn \l__eb_list_label_name_prop {#2}{#3}
+ \prop_item:Nn \l__eb_list_label_entry_prop {#2}{#3}
\egroup #4
}
}
@@ -1836,7 +1836,7 @@
\keys_define:nn { eb/eqcomp }
{
width .dim_set:N = \l__eb_eqsymb_width_dim,
- width .initial:n = 2em,
+ width .initial:n = 10pt,
delim .tl_set:N = \l__eb_eqsymb_delim_tl,
delim .initial:n = { —— },
space .dim_set:N = \l__eb_eqsymb_space_dim,
@@ -2370,7 +2370,7 @@
}
%</package>
%<*tcolorbox>
-\ProvidesExplFile{eb-tcolorbox.cfg}{2021/11/22}{1.40U}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2021/11/22}{1.40V}
{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 67b1a765a4c..5e83a43d7d7 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/11/22}{1.40U}
+\ProvidesExplPackage{easybase}{2021/11/22}{1.40V}
{Typeset Chinese theses or books}
\cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -573,7 +573,7 @@
fnindent .initial:n = 0.75em,
fnparskip .skip_set:N = \footparskip,
fnparskip .initial:n = 0ex,
- fnparindent .dim_set:N = \footparindent,
+ fnparindent .tl_set:N = \footparindent,
fnparindent .initial:n = 2em,
fnpara-form .tl_set:N = \l__eb_fnpara_format_tl,
@@ -1056,8 +1056,8 @@
lstlisting/tocline = \listnumberline{lstlisting}
}
\ctex_set:nn { tocset } { tocafter-all = \hspace{1em} }
-\prop_new:N \l__eb_list_label_name_prop
-\prop_set_from_keyval:Nn \l__eb_list_label_name_prop
+\prop_new:N \l__eb_list_label_entry_prop
+\prop_set_from_keyval:Nn \l__eb_list_label_entry_prop
{
figure = \eb@toc@label@figure,
table = \eb@toc@label@table
@@ -1068,7 +1068,7 @@
{
\bool_if:NT \eb@titletoc@hang@fix@bool { \p@numberline }
\bgroup
- \prop_item:Nn \l__eb_list_label_name_prop {#2}{#3}
+ \prop_item:Nn \l__eb_list_label_entry_prop {#2}{#3}
\egroup #4
}
}
@@ -1531,7 +1531,7 @@
\keys_define:nn { eb/eqcomp }
{
width .dim_set:N = \l__eb_eqsymb_width_dim,
- width .initial:n = 2em,
+ width .initial:n = 10pt,
delim .tl_set:N = \l__eb_eqsymb_delim_tl,
delim .initial:n = { —— },
space .dim_set:N = \l__eb_eqsymb_space_dim,
diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls
index 4ee88f61921..76cdc88cf5a 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/11/22}{1.40U}
+\ProvidesExplClass{easybook}{2021/11/22}{1.40V}
{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 f349baf2031..7e8a74d328c 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/11/22}{1.40U}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2021/11/22}{1.40V}
{Customization of tcolorbox for easybook}
\cs_set_protected:Npn \setexercise #1