texlive[69800] Master/texmf-dist: easybook (11feb24)
commits+karl at tug.org
commits+karl at tug.org
Sun Feb 11 22:25:15 CET 2024
Revision: 69800
https://tug.org/svn/texlive?view=revision&revision=69800
Author: karl
Date: 2024-02-11 22:25:15 +0100 (Sun, 11 Feb 2024)
Log Message:
-----------
easybook (11feb24)
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 2024-02-11 18:08:19 UTC (rev 69799)
+++ trunk/Master/texmf-dist/doc/latex/easybook/easybook.tex 2024-02-11 21:25:15 UTC (rev 69800)
@@ -23,8 +23,8 @@
name = easybook,
color-scheme = blue,
title = EASYBOOK使用手册,
- version = v2024z,
- date = 2024/02/08,
+ version = v2024ab,
+ date = 2024/02/11,
authors = 瞿毅,
info = 简便地排版中文学位论文或书籍,
email = toquyi at 163.com,
@@ -466,7 +466,7 @@
\keyval{caption-every}{数值}\Default{1.2}
同时设置图片、表格和代码题注的行距因子。
\keyval{footnote}{数值}\Default{1.2}
- 脚注内容整体的行距因子。可以使用 \option{fnpara-format} 的代码覆盖每个脚注单独的行距，从而与不同脚注的段落间距不同\footnote{若在正文区中更改脚注行距，脚注横线下方的间距不会随当前行距改变。}。
+ 脚注内容整体的行距因子。可以使用 \module*{hdrset} 模块 \option{fnpara-format} 选项的代码单独覆盖每个脚注的行距，从而使脚注间和内容文本自身的行距不同。
\begin{ctexexam}
\ebspread{footnote = 1.3}
\ebhdrset{fnpara-format = \linespread{1.2}\selectfont}
@@ -701,13 +701,13 @@
\ebhdrset{footnotetype = plain,footnotetype = bottom}
\ebhdrset{footnotetype = {hang,bottom}}
\end{ctexexam}
- \keyval{fnfirstindent}{刚性长度}\Default{0.8em}
+ \keyval{fnfirstindent}{刚性长度}\Default{1em}
每个脚注首段的首行缩进（悬挂缩进 \code{hang} 为整段缩进），等于长度 \cs{fnfirstindent} 的值。
\keyval{fnafterindent}{刚性长度}\Default{2em}
每个脚注第二段及之后段落的首行缩进，等于长度 \cs{fnafterindent} 的值。
\keyval{fnparskip}{弹性长度}\Default{0ex plus .1ex}
不同脚注自身的段落间距，脚注内容文本分段时生效，等于长度 \cs{fnparskip} 的值。
- \keyval{footnotesep}{弹性长度}\newtag%
+ \keyval{footnotesep}{刚性长度}\newtag%
不同脚注之间的距离，默认情况下它自适应 \module*{spread} 模块脚注行距选项 \option{footnote} 的值。
\keychoice{fntext-pos}{normal,\fbox{super}}
设置脚注内容标记的位置，正常文本或是上标形式。
@@ -724,12 +724,12 @@
\ebhdrset{fnmark-num = (a)}
\end{ctexexam}
\begin{commands}\noitemsep
- \command{DefineFntSymbols}[\marg{符号表名}\marg{符号数量}\marg{符号列表}]\default{}
- \command{setfntsymbol}[\marg{符号表名}]
- 这两个命令用于在脚注短编号标记为 \code{s} 自定义符号型时设置符号列表。\cs{DefineFntSymbols} 命令用于设置符号列表，\cs{setfntsymbol} 命令用于选择已定义的符号列表。默认的脚注符号列表是空的，定义新列表时应注意 \meta{符号列表} 的写法和命令顺序：
+ \command{SetFntSymbsList}[\marg{符号表名}\marg{符号数量}\marg{符号列表}]\default{}
+ \command{UseFntSymbsList}[\marg{符号表名}]\newtag[Chg]%
+ 这两个命令用于在脚注短编号标记为 \code{s} 自定义符号型时设置符号列表。\cs{SetFntSymbsList} 命令用于定义名为 \meta{符号表名} 的符号列表，\cs{UseFntSymbsList} 命令用于启用已定义的符号列表。默认的脚注符号列表是空的，注意使用符号型脚注时计数器 \code{footnote} 的值仍然是递增的，以及定义新列表时 \meta{符号列表} 的写法和命令顺序：
\begin{ctexexam}
- \DefineFntSymbols{fancy}{2}{{1}{*}{2}{@}}
- \setfntsymbol{fancy}
+ \SetFntSymbsList{fancy}{2}{{1}{*}{2}{\P}}
+ \UseFntSymbsList{fancy}
\ebhdrset{fnmark-num = s}
\end{ctexexam}
\end{commands}
@@ -1352,7 +1352,7 @@
\shortversion{v = 1.638,date = 2022/03/04,changes = 增加目录条目样式选项注册命令 \cs{RegisterTocName}。}
\shortversion{v = 1.644,date = 2022/03/10,changes = 增加浮动环境目录声明命令 \cs{DeclareFloatList} 配合 \pkg*{caption} 宏包。}
\shortversion{v = 1.682,date = 2022/05/01,changes = 将迷你页判断命令 \cs{notminipage} 改为被保护命令兼容 \pkg*{circledtext} 宏包。}
- \begin{version}[v = 2024z,date = 2024/02/08,simple]
+ \begin{version}[v = 2024ab,date = 2024/02/11,simple]
\item 核对依赖宏包的更新改动，优化使用手册的内容细节。
\item 修复图表等浮动环境题注目录中条目标签编号的计数器值显示错误问题。
\item 修复附录命令 \cs{appendix} 的可选参数设置英文目录中条目名字和编号失效的问题。
Modified: trunk/Master/texmf-dist/source/latex/easybook/easybook.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/easybook/easybook.dtx 2024-02-11 18:08:19 UTC (rev 69799)
+++ trunk/Master/texmf-dist/source/latex/easybook/easybook.dtx 2024-02-11 21:25:15 UTC (rev 69800)
@@ -15,7 +15,7 @@
%<*class>
\NeedsTeXFormat{LaTeX2e}[2021/11/15]
\RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2024/02/08}{2024z}
+\ProvidesExplClass{easybook}{2024/02/11}{2024ab}
{Easily typesetting Chinese theses or books}
\bool_set_false:N \l__eb_compile_draft_bool
@@ -297,7 +297,7 @@
%<*package>
\NeedsTeXFormat{LaTeX2e}[2021/11/15]
\RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2024/02/08}{2024z}
+\ProvidesExplPackage{easybase}{2024/02/11}{2024ab}
{Easily typesetting Chinese theses or books}
\cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -738,18 +738,42 @@
{ \ding{\int_eval:n { 191 + #1 }} }
\cs_new_protected:Npn \eb_fnmarktext_counter_pisans_neg:N #1
{ \ding{\int_eval:n { 201 + #1 }} }
-\cs_new_protected:Npn \DefineFntSymbols #1#2#3
+\cs_new:Npn \eb_fnt_map_symbols_list:n #1
{
+ \eb_fnt_map_symbols_list:nn #1
+ \q_recursion_tail \q_recursion_tail
+ \q_recursion_stop
+ }
+\cs_new:Npn \eb_fnt_map_symbols_list:nn #1#2
+ {
+ \quark_if_recursion_tail_stop:n {#1}
+ \quark_if_recursion_tail_stop:n {#2}
+ { #1 + \int_use:N \c at footnote } {#2}
+ \eb_fnt_map_symbols_list:nn
+ }
+\cs_new_protected:Npn \SetFntSymbsList #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_set:Npx \eb_int_to_symbols:n ####1
+ {
+ \exp_not:N \int_to_symbols:nnn {####1}
+ { #2 + \int_use:N \c at footnote }
+ { \eb_fnt_map_symbols_list:n {#3} }
+ }
}
}
-\cs_new_protected:Npn \setfntsymbol #1
- { \use:c { eb at use@fnt at symbol@#1 } }
-\DefineFntSymbols{empty}{1}{}
-\setfntsymbol{empty}
+\cs_new_protected:Npn \UseFntSymbsList #1
+ {
+ \cs_if_exist_use:cF { eb at use@fnt at symbol@#1 }
+ { \msg_warning:nnn { easybase } { undefined-fntsymbol } {#1} }
+ }
+\msg_new:nnn { easybase } { undefined-fntsymbol }
+ { The~list~of~footnote~symbols~'#1'~isn't~defined. }
+\SetFntSymbsList{empty}{1}{}
+\UseFntSymbsList{empty}
+\cs_set_eq:NN \DefineFntSymbols \SetFntSymbsList
+\cs_set_eq:NN \setfntsymbol \UseFntSymbsList
\cs_new:Npn \eb_int_format_trans:NN #1
{
\str_case:nn {#1}
@@ -846,13 +870,13 @@
\clist_new:N \l__eb_footnote_value_clist
\ctex_define:nn { hdrset }
{
- fnfirstindent .dim_set:N = \fnfirstindent,
- fnfirstindent .initial:n = 0.8em,
- fnafterindent .dim_set:N = \fnafterindent,
+ fnfirstindent .tl_set:N = \fnfirstindent,
+ fnfirstindent .initial:n = 1em,
+ fnafterindent .tl_set:N = \fnafterindent,
fnafterindent .initial:n = 2em,
- fnparskip .skip_set:N = \fnparskip,
+ fnparskip .tl_set:N = \fnparskip,
fnparskip .initial:n = 0ex plus .1ex,
- footnotesep .skip_set:N = \footnotesep,
+ footnotesep .dim_set:N = \footnotesep,
fnpara-format .tl_set:N = \l__eb_fnpara_format_tl,
fntext-pos .tl_set:N = \l__eb_fntext_position_tl,
fntext-pos .initial:n = super,
@@ -1478,7 +1502,7 @@
\tl_use:c { l__eb_toc_#1_after_tl }
}
}
-\cs_new_protected:Npn \eb at toc@format at define #1
+\cs_new_protected:Npn \eb_toc_format_define:n #1
{
\ctex_define:n
{
@@ -1492,7 +1516,7 @@
#1/tocbelow .tl_set:c = l__eb_toc_#1_below_tl
}
}
-\cs_new_protected:Npn \eb at toc@format at initial #1
+\cs_new_protected:Npn \eb_toc_format_initial:n #1
{
\titlecontents{#1}
[\dim_use:c { l__eb_toc_#1_indent_dim }]
@@ -1509,8 +1533,8 @@
}
\cs_new_protected:Npn \RegisterTocName #1
{
- \eb at toc@format at define{#1}
- \eb at toc@format at initial{#1}
+ \eb_toc_format_define:n {#1}
+ \eb_toc_format_initial:n {#1}
}
\seq_map_function:NN
\c__ctex_headings_seq \RegisterTocName
@@ -1583,12 +1607,12 @@
\cs_set_eq:NN \eb at ctexsetii \ctex_set:nn
\cs_new_protected:Npn \SetTocStyle #1#2#3
{
- \tl_set:cn { eb at toc@style at set@#1@#2 }
+ \cs_set:cpn { eb at toc@style at set@#1@#2 }
{ \eb at ctexsetii{#1}{#3} }
}
\cs_new_protected:Npn \UseTocStyle #1#2#3
{
- \tl_if_exist:cTF { eb at toc@style at set@#1@#2 }
+ \cs_if_exist:cTF { eb at toc@style at set@#1@#2 }
{ \addtocontents{#3}{\@nameuse{eb at toc@style at set@#1@#2}} }
{ \msg_warning:nnnn { easybase } { undefined-toc-style } {#2} {#1} }
}
@@ -2319,7 +2343,7 @@
}
%</package>
%<*tcolorbox>
-\ProvidesExplFile{eb-tcolorbox.cfg}{2024/02/08}{2024z}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2024/02/11}{2024ab}
{Customization of tcolorbox for easybook}
\cs_set_protected:Npn \addtotcbstyle #1#2
Modified: trunk/Master/texmf-dist/tex/latex/easybook/easybase.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/easybook/easybase.sty 2024-02-11 18:08:19 UTC (rev 69799)
+++ trunk/Master/texmf-dist/tex/latex/easybook/easybase.sty 2024-02-11 21:25:15 UTC (rev 69800)
@@ -20,7 +20,7 @@
%% This work has the LPPL maintenance status `maintained'.
\NeedsTeXFormat{LaTeX2e}[2021/11/15]
\RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2024/02/08}{2024z}
+\ProvidesExplPackage{easybase}{2024/02/11}{2024ab}
{Easily typesetting Chinese theses or books}
\cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -461,18 +461,42 @@
{ \ding{\int_eval:n { 191 + #1 }} }
\cs_new_protected:Npn \eb_fnmarktext_counter_pisans_neg:N #1
{ \ding{\int_eval:n { 201 + #1 }} }
-\cs_new_protected:Npn \DefineFntSymbols #1#2#3
+\cs_new:Npn \eb_fnt_map_symbols_list:n #1
{
+ \eb_fnt_map_symbols_list:nn #1
+ \q_recursion_tail \q_recursion_tail
+ \q_recursion_stop
+ }
+\cs_new:Npn \eb_fnt_map_symbols_list:nn #1#2
+ {
+ \quark_if_recursion_tail_stop:n {#1}
+ \quark_if_recursion_tail_stop:n {#2}
+ { #1 + \int_use:N \c at footnote } {#2}
+ \eb_fnt_map_symbols_list:nn
+ }
+\cs_new_protected:Npn \SetFntSymbsList #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_set:Npx \eb_int_to_symbols:n ####1
+ {
+ \exp_not:N \int_to_symbols:nnn {####1}
+ { #2 + \int_use:N \c at footnote }
+ { \eb_fnt_map_symbols_list:n {#3} }
+ }
}
}
-\cs_new_protected:Npn \setfntsymbol #1
- { \use:c { eb at use@fnt at symbol@#1 } }
-\DefineFntSymbols{empty}{1}{}
-\setfntsymbol{empty}
+\cs_new_protected:Npn \UseFntSymbsList #1
+ {
+ \cs_if_exist_use:cF { eb at use@fnt at symbol@#1 }
+ { \msg_warning:nnn { easybase } { undefined-fntsymbol } {#1} }
+ }
+\msg_new:nnn { easybase } { undefined-fntsymbol }
+ { The~list~of~footnote~symbols~'#1'~isn't~defined. }
+\SetFntSymbsList{empty}{1}{}
+\UseFntSymbsList{empty}
+\cs_set_eq:NN \DefineFntSymbols \SetFntSymbsList
+\cs_set_eq:NN \setfntsymbol \UseFntSymbsList
\cs_new:Npn \eb_int_format_trans:NN #1
{
\str_case:nn {#1}
@@ -569,13 +593,13 @@
\clist_new:N \l__eb_footnote_value_clist
\ctex_define:nn { hdrset }
{
- fnfirstindent .dim_set:N = \fnfirstindent,
- fnfirstindent .initial:n = 0.8em,
- fnafterindent .dim_set:N = \fnafterindent,
+ fnfirstindent .tl_set:N = \fnfirstindent,
+ fnfirstindent .initial:n = 1em,
+ fnafterindent .tl_set:N = \fnafterindent,
fnafterindent .initial:n = 2em,
- fnparskip .skip_set:N = \fnparskip,
+ fnparskip .tl_set:N = \fnparskip,
fnparskip .initial:n = 0ex plus .1ex,
- footnotesep .skip_set:N = \footnotesep,
+ footnotesep .dim_set:N = \footnotesep,
fnpara-format .tl_set:N = \l__eb_fnpara_format_tl,
fntext-pos .tl_set:N = \l__eb_fntext_position_tl,
fntext-pos .initial:n = super,
@@ -1201,7 +1225,7 @@
\tl_use:c { l__eb_toc_#1_after_tl }
}
}
-\cs_new_protected:Npn \eb at toc@format at define #1
+\cs_new_protected:Npn \eb_toc_format_define:n #1
{
\ctex_define:n
{
@@ -1215,7 +1239,7 @@
#1/tocbelow .tl_set:c = l__eb_toc_#1_below_tl
}
}
-\cs_new_protected:Npn \eb at toc@format at initial #1
+\cs_new_protected:Npn \eb_toc_format_initial:n #1
{
\titlecontents{#1}
[\dim_use:c { l__eb_toc_#1_indent_dim }]
@@ -1232,8 +1256,8 @@
}
\cs_new_protected:Npn \RegisterTocName #1
{
- \eb at toc@format at define{#1}
- \eb at toc@format at initial{#1}
+ \eb_toc_format_define:n {#1}
+ \eb_toc_format_initial:n {#1}
}
\seq_map_function:NN
\c__ctex_headings_seq \RegisterTocName
@@ -1306,12 +1330,12 @@
\cs_set_eq:NN \eb at ctexsetii \ctex_set:nn
\cs_new_protected:Npn \SetTocStyle #1#2#3
{
- \tl_set:cn { eb at toc@style at set@#1@#2 }
+ \cs_set:cpn { eb at toc@style at set@#1@#2 }
{ \eb at ctexsetii{#1}{#3} }
}
\cs_new_protected:Npn \UseTocStyle #1#2#3
{
- \tl_if_exist:cTF { eb at toc@style at set@#1@#2 }
+ \cs_if_exist:cTF { eb at toc@style at set@#1@#2 }
{ \addtocontents{#3}{\@nameuse{eb at toc@style at set@#1@#2}} }
{ \msg_warning:nnnn { easybase } { undefined-toc-style } {#2} {#1} }
}
Modified: trunk/Master/texmf-dist/tex/latex/easybook/easybook.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/easybook/easybook.cls 2024-02-11 18:08:19 UTC (rev 69799)
+++ trunk/Master/texmf-dist/tex/latex/easybook/easybook.cls 2024-02-11 21:25:15 UTC (rev 69800)
@@ -20,7 +20,7 @@
%% This work has the LPPL maintenance status `maintained'.
\NeedsTeXFormat{LaTeX2e}[2021/11/15]
\RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2024/02/08}{2024z}
+\ProvidesExplClass{easybook}{2024/02/11}{2024ab}
{Easily typesetting Chinese theses or books}
\bool_set_false:N \l__eb_compile_draft_bool
Modified: trunk/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg
===================================================================
--- trunk/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg 2024-02-11 18:08:19 UTC (rev 69799)
+++ trunk/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg 2024-02-11 21:25:15 UTC (rev 69800)
@@ -18,7 +18,7 @@
%% LaTeX version 2005/12/01 or later.
%%
%% This work has the LPPL maintenance status `maintained'.
-\ProvidesExplFile{eb-tcolorbox.cfg}{2024/02/08}{2024z}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2024/02/11}{2024ab}
{Customization of tcolorbox for easybook}
\cs_set_protected:Npn \addtotcbstyle #1#2
More information about the tex-live-commits
mailing list.