texlive[61713] Master/texmf-dist: easybook (23jan22)
commits+karl at tug.org
commits+karl at tug.org
Sun Jan 23 22:11:13 CET 2022
Revision: 61713
http://tug.org/svn/texlive?view=revision&revision=61713
Author: karl
Date: 2022-01-23 22:11:13 +0100 (Sun, 23 Jan 2022)
Log Message:
-----------
easybook (23jan22)
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 2022-01-23 21:05:36 UTC (rev 61712)
+++ trunk/Master/texmf-dist/doc/latex/easybook/easybook.tex 2022-01-23 21:11:13 UTC (rev 61713)
@@ -21,8 +21,8 @@
name = easybook,
color-scheme = blue,
title = EASYBOOK 使用手册,
- version = v1.48,
- date = 2022/01/20,
+ version = v1.50,
+ date = 2022/01/23,
authors = 瞿毅,
info = 排版简体中文学位论文和书籍,
email = q1jx at foxmail.com,
@@ -367,9 +367,9 @@
\subsection{上标和下标}
上标和下标的功能来自 \pkg*{spbmark} 宏包，下面有三个命令可以用于输出上标和下标。可以使用键值列表的形式对上下标格式进行局部或全局设置，下面命令中两个可选参数的键值列表是等效的。全局设置的详情见\ref{subsubsec:super-sub-script}。
\begin{commands}
- \command{super}[\oarg{键值列表1}\splitoarg{高度,深度}\marg{内容}\oarg{键值列表2}]
+ \command{super}[\oarg{键值列表1}\marg{内容}\oarg{键值列表2}]
输出上标的命令，与简短命令 \cs{sp} 等效。
- \command{sub}[\oarg{键值列表1}\splitoarg{高度,深度}\marg{内容}\oarg{键值列表2}]
+ \command{sub}[\oarg{键值列表1}\marg{内容}\oarg{键值列表2}]
输出下标的命令，与简短命令 \cs{sb} 等效。用法和参数与上标命令 \cs{super} 类似。
\command{supersub}[\oarg{键值列表1}\marg{上标内容}\marg{下标内容}\oarg{键值列表2}]
同时输出上标和下标的命令，与简短命令 \cs{spb} 等效。
@@ -377,7 +377,7 @@
根据上下标处于数学还是文本模式分别设置不同的值，应当在格式命令或偏移距离选项中使用。
\end{commands}
-上下标命令键值列表中共同的选项如下所示。如果 \option{vmove}、\option{hmove} 和 \option{cmd} 选项用于 \module*{style} 模块的全局设置，它们将根据前面最近一个命令的类型设定相应值。
+上下标命令键值列表中共同的选项如下所示。当下面除 \option{mode} 以外的选项用于 \module*{style} 模块全局设置时，它们将根据前面最近一个命令的类型设定相应值。
\begin{options}
\keyval-{vmove}{刚性长度}\Default{0pt}
上标或下标的垂直偏移。如果是上下标命令使用则代表上标和上标间的额外垂直距离 \option{vsep}。
@@ -385,6 +385,10 @@
上标或下标的水平偏移。如果是上下标命令使用则代表上标和上标的共同偏移。
\keyval-{cmd}{格式命令}\Default
上标或下标的格式命令选项。最后一个命令可以带有一个参数，这个参数用于接受上标或下标。
+ \keyval-{height}{刚性长度}\Default
+ 段落中当前行上标或下标的基线与前一行的间距。
+ \keyval-{depth}{刚性长度}\Default
+ 段落中当前行上标或下标的基线与下一行的间距。
\keychoice{mode}{text,math,match}\Default{match}
上标或下标的输出格式。可以为文本 \code{text} 或数学 \code{math} 模式。当使用选项 \code{match} 时可以根据当前段落所处的模式自动匹配。
\end{options}
@@ -829,6 +833,8 @@
定义脚注正文标记的格式，与正文标记编号命令 \cs{theupfootnote} 配合使用。
\command{defdownfntmark}[\marg{脚注内容标记格式}]
定义脚注内容标记的格式，与内容标记编号命令 \cs{thedownfootnote} 配合使用。
+ \command{notminipage}[\marg{普通页内容}\marg{迷你页内容}]
+ 用于在定义脚注标记的命令中判断当前脚注是否处于迷你页而输出不同的内容。
\command{theupfootnote}
保存正文标记编号类型选项 \option{fnmark-num} 指定的正文标记。
\command{thedownfootnote}
@@ -836,7 +842,7 @@
\end{commands}
\begin{ctexexam}
\defupfntmark{\super[vmove = 2pt]{\theupfootnote}}
- \defdownfntmark{\textcolor{blue}{\thedownfootnote}}
+ \defdownfntmark{\notminipage{\textcolor{blue}{\thedownfootnote}}{}}
\end{ctexexam}
\keychoice{fncust-form}{format code,match}\Default
单独设定自定义脚注标记的格式，选项 \code{match} 可以匹配 \option*{spcmd} 全局的值。自定义脚注的命令与用法可以见下方的介绍。
@@ -874,8 +880,8 @@
与 \option{tocformat} 用法一样，只是在已有的格式命令后附加代码。
\keyval-{tocindent}{刚性长度}
各级别目录中的标题左边缩进距离，通常标题级别越低缩进越大。
- \keyval-{tocrule}{目录引导线样式}
- 引导线选项 \option{tocrule} 中一般应当使用 \cs{tocrule} 命令绘制引导线，将会在下面介绍。
+ \keyval-{tocrule}{目录引导线命令}
+ 引导线选项 \option{tocrule} 中一般可以使用基于 \cs*{xleaders} 命令的 \cs{tocrule} 绘制引导线。
\keyval-{tocafter}{距离命令}\Default{\cs*{hspace}\Carg{1em}}
在各级别目录中标签与标题间的代码，默认为插入 \code{1em} 横向距离。
\keyval-{tocline}{目录中的标题}
Modified: trunk/Master/texmf-dist/source/latex/easybook/easybook.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/easybook/easybook.dtx 2022-01-23 21:05:36 UTC (rev 61712)
+++ trunk/Master/texmf-dist/source/latex/easybook/easybook.dtx 2022-01-23 21:11:13 UTC (rev 61713)
@@ -15,7 +15,7 @@
%<*class>
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2022/01/20}{1.48}
+\ProvidesExplClass{easybook}{2022/01/23}{1.50}
{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/01/20}{1.48}
+\ProvidesExplPackage{easybase}{2022/01/23}{1.50}
{Typeset Chinese theses or books}
\cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -472,7 +472,7 @@
Please~browse~the~user~manual~for~the~new~options.
}
}
-\cs_new:Npn \eb_msg_abandon_option:n #1
+\cs_new_protected:Npn \eb_msg_abandon_option:n #1
{ \msg_warning:nnV { easybase } { abandon-#1 } \l_keys_key_str }
\cs_if_exist:NF \chapter
{
@@ -634,7 +634,7 @@
\exp_args:Nc \NewDocumentCommand { eb at mark@#1 at label@layout }
{O{\use:c { CTEXthe#1 }}m}
{\tl_set:cn { eb at mark@#1 at label } {##1##2}}
- \cs_new:cpn { eb_mark_#1_name_parse:n } ##1
+ \cs_new_protected:cpn { eb_mark_#1_name_parse:n } ##1
{
\tl_if_in:nnTF {##1} { [ }
{ \use:c { eb at mark@#1 at label@layout }##1 }
@@ -761,13 +761,13 @@
{ \tl_clear:N \l__eb_fntext_after_tl }
{ \tl_set:Nn \l__eb_fntext_after_tl {#2} }
}
-\cs_new:Npn \eb_fnmate_counter_pifont:N #1
+\cs_new_protected:Npn \eb_fnmate_counter_pifont:N #1
{ \ding{\int_eval:n { 171 + #1 }} }
-\cs_new:Npn \eb_fnmate_counter_pifont_neg:N #1
+\cs_new_protected:Npn \eb_fnmate_counter_pifont_neg:N #1
{ \ding{\int_eval:n { 181 + #1 }} }
-\cs_new:Npn \eb_fnmate_counter_pisans:N #1
+\cs_new_protected:Npn \eb_fnmate_counter_pisans:N #1
{ \ding{\int_eval:n { 191 + #1 }} }
-\cs_new:Npn \eb_fnmate_counter_pisans_neg:N #1
+\cs_new_protected:Npn \eb_fnmate_counter_pisans_neg:N #1
{ \ding{\int_eval:n { 201 + #1 }} }
\cs_new_protected:Npn \DefineFntSymbols #1#2#3
{
@@ -804,13 +804,13 @@
{ plain }
{ \exp_not:N \int_use:N }
{ pifont }
- { \exp_not:N \eb_fnmate_counter_pifont:N }
+ { \eb_fnmate_counter_pifont:N }
{ pifont* }
- { \exp_not:N \eb_fnmate_counter_pifont_neg:N }
+ { \eb_fnmate_counter_pifont_neg:N }
{ pisans }
- { \exp_not:N \eb_fnmate_counter_pisans:N }
+ { \eb_fnmate_counter_pisans:N }
{ pisans* }
- { \exp_not:N \eb_fnmate_counter_pisans_neg:N }
+ { \eb_fnmate_counter_pisans_neg:N }
}
{ \exp_not:N \c at footnote }
}
@@ -1129,12 +1129,11 @@
{ \cs_set:Npn \@makefnmark { \hbox:n {#1} } }
\cs_new_protected:Npn \defdownfntmark #1
{ \cs_set:Npn \eb at makefnmark { \hbox:n {#1} } }
+\cs_new:Npn \notminipage { \tl_if_eq:NnTF \@mpfn { footnote } }
\defupfntmark
{
\eb_fnmate_format_initial:
- \tl_if_eq:NnTF \@mpfn { footnote }
- { \eb at fnmate@super{\@the at up@fnmark} }
- { \eb at fnmate@super{\@thefnmark} }
+ \eb at fnmate@super{\notminipage{\@the at up@fnmark}{\@thefnmark}}
}
\defdownfntmark
{
@@ -1164,7 +1163,7 @@
}
\cs_new_protected:Npn \eb_fncust_format_initial:
{
- % \hdrset{fntext-code = { }}
+ % \ebhdrset{fntext-code = { }}
\bool_set_false:N \l__eb_normal_footnote_bool
\bool_if:NF \l__eb_fncust_format_match_bool
{
@@ -1890,7 +1889,7 @@
\cs_new_protected:Npn \seteqcomp #1
{ \keys_set:nn { eb/eqcomp } {#1} }
-\cs_new:Npn \eb_eqsymb_left_margin_calc:
+\cs_new_protected:Npn \eb_eqsymb_left_margin_calc:
{
\hbox_set:Nn \l_tmpa_box { \l__eb_eqsymb_delim_tl }
\hbox_set:Nn \l_tmpb_box { \l__eb_eqsymb_intro_tl }
@@ -2231,7 +2230,7 @@
{
style = lst-base,
language = [LaTeX]TeX,
- texcsstyle = *\color{ctex at verb}\bfseries,
+ texcsstyle = *\color{ctex at verb}\eb at lst@if at display{\bfseries}{},
basicstyle = \ttfamily\eb at lst@if at display{\small}{\color{ctex at verb}},
keywordstyle = \color{ctex at verb}\eb at lst@if at display{\bfseries}{}
}
@@ -2433,7 +2432,7 @@
}
%</package>
%<*tcolorbox>
-\ProvidesExplFile{eb-tcolorbox.cfg}{2022/01/20}{1.48}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2022/01/23}{1.50}
{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 2022-01-23 21:05:36 UTC (rev 61712)
+++ trunk/Master/texmf-dist/tex/latex/easybook/easybase.sty 2022-01-23 21:11:13 UTC (rev 61713)
@@ -20,7 +20,7 @@
%% This work has the LPPL maintenance status `maintained'.
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2022/01/20}{1.48}
+\ProvidesExplPackage{easybase}{2022/01/23}{1.50}
{Typeset Chinese theses or books}
\cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -187,7 +187,7 @@
Please~browse~the~user~manual~for~the~new~options.
}
}
-\cs_new:Npn \eb_msg_abandon_option:n #1
+\cs_new_protected:Npn \eb_msg_abandon_option:n #1
{ \msg_warning:nnV { easybase } { abandon-#1 } \l_keys_key_str }
\cs_if_exist:NF \chapter
{
@@ -349,7 +349,7 @@
\exp_args:Nc \NewDocumentCommand { eb at mark@#1 at label@layout }
{O{\use:c { CTEXthe#1 }}m}
{\tl_set:cn { eb at mark@#1 at label } {##1##2}}
- \cs_new:cpn { eb_mark_#1_name_parse:n } ##1
+ \cs_new_protected:cpn { eb_mark_#1_name_parse:n } ##1
{
\tl_if_in:nnTF {##1} { [ }
{ \use:c { eb at mark@#1 at label@layout }##1 }
@@ -476,13 +476,13 @@
{ \tl_clear:N \l__eb_fntext_after_tl }
{ \tl_set:Nn \l__eb_fntext_after_tl {#2} }
}
-\cs_new:Npn \eb_fnmate_counter_pifont:N #1
+\cs_new_protected:Npn \eb_fnmate_counter_pifont:N #1
{ \ding{\int_eval:n { 171 + #1 }} }
-\cs_new:Npn \eb_fnmate_counter_pifont_neg:N #1
+\cs_new_protected:Npn \eb_fnmate_counter_pifont_neg:N #1
{ \ding{\int_eval:n { 181 + #1 }} }
-\cs_new:Npn \eb_fnmate_counter_pisans:N #1
+\cs_new_protected:Npn \eb_fnmate_counter_pisans:N #1
{ \ding{\int_eval:n { 191 + #1 }} }
-\cs_new:Npn \eb_fnmate_counter_pisans_neg:N #1
+\cs_new_protected:Npn \eb_fnmate_counter_pisans_neg:N #1
{ \ding{\int_eval:n { 201 + #1 }} }
\cs_new_protected:Npn \DefineFntSymbols #1#2#3
{
@@ -519,13 +519,13 @@
{ plain }
{ \exp_not:N \int_use:N }
{ pifont }
- { \exp_not:N \eb_fnmate_counter_pifont:N }
+ { \eb_fnmate_counter_pifont:N }
{ pifont* }
- { \exp_not:N \eb_fnmate_counter_pifont_neg:N }
+ { \eb_fnmate_counter_pifont_neg:N }
{ pisans }
- { \exp_not:N \eb_fnmate_counter_pisans:N }
+ { \eb_fnmate_counter_pisans:N }
{ pisans* }
- { \exp_not:N \eb_fnmate_counter_pisans_neg:N }
+ { \eb_fnmate_counter_pisans_neg:N }
}
{ \exp_not:N \c at footnote }
}
@@ -844,12 +844,11 @@
{ \cs_set:Npn \@makefnmark { \hbox:n {#1} } }
\cs_new_protected:Npn \defdownfntmark #1
{ \cs_set:Npn \eb at makefnmark { \hbox:n {#1} } }
+\cs_new:Npn \notminipage { \tl_if_eq:NnTF \@mpfn { footnote } }
\defupfntmark
{
\eb_fnmate_format_initial:
- \tl_if_eq:NnTF \@mpfn { footnote }
- { \eb at fnmate@super{\@the at up@fnmark} }
- { \eb at fnmate@super{\@thefnmark} }
+ \eb at fnmate@super{\notminipage{\@the at up@fnmark}{\@thefnmark}}
}
\defdownfntmark
{
@@ -879,7 +878,7 @@
}
\cs_new_protected:Npn \eb_fncust_format_initial:
{
- % \hdrset{fntext-code = { }}
+ % \ebhdrset{fntext-code = { }}
\bool_set_false:N \l__eb_normal_footnote_bool
\bool_if:NF \l__eb_fncust_format_match_bool
{
@@ -1605,7 +1604,7 @@
\cs_new_protected:Npn \seteqcomp #1
{ \keys_set:nn { eb/eqcomp } {#1} }
-\cs_new:Npn \eb_eqsymb_left_margin_calc:
+\cs_new_protected:Npn \eb_eqsymb_left_margin_calc:
{
\hbox_set:Nn \l_tmpa_box { \l__eb_eqsymb_delim_tl }
\hbox_set:Nn \l_tmpb_box { \l__eb_eqsymb_intro_tl }
@@ -1946,7 +1945,7 @@
{
style = lst-base,
language = [LaTeX]TeX,
- texcsstyle = *\color{ctex at verb}\bfseries,
+ texcsstyle = *\color{ctex at verb}\eb at lst@if at display{\bfseries}{},
basicstyle = \ttfamily\eb at lst@if at display{\small}{\color{ctex at verb}},
keywordstyle = \color{ctex at verb}\eb at lst@if at display{\bfseries}{}
}
Modified: trunk/Master/texmf-dist/tex/latex/easybook/easybook.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/easybook/easybook.cls 2022-01-23 21:05:36 UTC (rev 61712)
+++ trunk/Master/texmf-dist/tex/latex/easybook/easybook.cls 2022-01-23 21:11:13 UTC (rev 61713)
@@ -20,7 +20,7 @@
%% This work has the LPPL maintenance status `maintained'.
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2022/01/20}{1.48}
+\ProvidesExplClass{easybook}{2022/01/23}{1.50}
{Typeset 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 2022-01-23 21:05:36 UTC (rev 61712)
+++ trunk/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg 2022-01-23 21:11:13 UTC (rev 61713)
@@ -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/20}{1.48}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2022/01/23}{1.50}
{Customization of tcolorbox for easybook}
\cs_set_protected:Npn \addtotcbstyle #1#2
More information about the tex-live-commits
mailing list.