texlive[69964] branches/branch2023.final/Master/texmf-dist: easybook
commits+karl at tug.org
commits+karl at tug.org
Sun Feb 18 22:06:33 CET 2024
Revision: 69964
https://tug.org/svn/texlive?view=revision&revision=69964
Author: karl
Date: 2024-02-18 22:06:33 +0100 (Sun, 18 Feb 2024)
Log Message:
-----------
easybook (branch) (18feb24)
Modified Paths:
--------------
branches/branch2023.final/Master/texmf-dist/doc/latex/easybook/easybook.pdf
branches/branch2023.final/Master/texmf-dist/doc/latex/easybook/easybook.tex
branches/branch2023.final/Master/texmf-dist/source/latex/easybook/easybook.dtx
branches/branch2023.final/Master/texmf-dist/tex/latex/easybook/easybase.sty
branches/branch2023.final/Master/texmf-dist/tex/latex/easybook/easybook.cls
branches/branch2023.final/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg
Modified: branches/branch2023.final/Master/texmf-dist/doc/latex/easybook/easybook.pdf
===================================================================
(Binary files differ)
Modified: branches/branch2023.final/Master/texmf-dist/doc/latex/easybook/easybook.tex
===================================================================
--- branches/branch2023.final/Master/texmf-dist/doc/latex/easybook/easybook.tex 2024-02-18 21:06:20 UTC (rev 69963)
+++ branches/branch2023.final/Master/texmf-dist/doc/latex/easybook/easybook.tex 2024-02-18 21:06:33 UTC (rev 69964)
@@ -5,7 +5,7 @@
\usepackage
{
enumitem,newtxmath,indentfirst,tabularray,
- fancyvrb,geometry,hologo,pifont,changelog
+ fancyvrb,geometry,hologo,pifont,changelog,calc
}
\definecolorscheme{blue}
{
@@ -23,8 +23,8 @@
name = easybook,
color-scheme = blue,
title = EASYBOOK使用手册,
- version = v2024ad,
- date = 2024/02/16,
+ version = v2024ae,
+ date = 2024/02/18,
authors = 瞿毅,
info = 简便地排版中文学位论文或书籍,
email = toquyi at 163.com,
@@ -61,6 +61,7 @@
\ExplSyntaxOn\makeatletter
% * Do not add entries to the index
% - Leave the option value blank
+\let\isvalue\cnltx at isvalue
\NewDocumentCommand{\kvsplit}{st-mm}
{
\item\code
@@ -112,6 +113,12 @@
\IfBooleanF{#1}{\cnltx at checkdefault{\hfill\newline}}
}
\newnote{\newtag}[1][New]{\fbox{#1}}
+% Multi-row values alignment when there are many choices
+\newcommand{\leftfillchoice}[2]
+ {
+ \hspace*{\widthof{\option*{#1}}+\widthof{\code{\cnltx at isvalue}}-1em}
+ \code{\choices{#2}}
+ }
% Use a separate module margin marker to prevent overlap
\newcommand{\smodule}[1]{\cnltx at module@text*{\normalsize #1}}
\newcommand{\noitemsep}{\setlength{\itemsep}{0ex}}
@@ -308,7 +315,8 @@
\end{options}
\begin{options}
- \keychoice{mathfont}{\fbox{times},noto,notosans,nc,stix2,charter,ebgaramond,libertine,none}\dtag
+ \keychoice{mathfont}{\fbox{times},noto,notosans,nc,ncf,stix2,charter,ebgaramond,libertine}\dtag
+ \leftfillchoice{mathfont}{minion,garamondx,baskervaldx,baskerville,none} \\
选择合适的数学字体，将会加载 \pkg*{newtxmath} 和 \pkg*{bm} 宏包。使用选项 \code{none} 时可以使用 \pkg*{unicode-math} 等其它数学字体宏包定义字体。
\end{options}
@@ -454,8 +462,8 @@
\keyval{line}{数值}
正文行距因子。行距因子初始值为 \code{1.354}（相当于 \textsf{Word} 的1.25倍行距），如果设置了文类或 \pkg*{ctex} 宏包的全局行距选项 \option*{linespread} 则初始值设为它的值。
\keyval{table}{数值}\Default{1.354}
- 表格内容行距因子。对传统表格 \env{tabular} 和 \env{tabularx} 等环境以及 \pkg*{tabularray} 宏包的 \env{tblr} 环境生效，同时 \env{tblr} 也自带有 \option*{stretch} 选项设置行距系数。
- \keyval{math}{数值}\Default{1.354}
+ 表格内容行距因子，对传统表格 \env{tabular} 和 \env{tabularx} 等环境生效。\pkg*{tabularray} 宏包的 \env{tblr} 环境自带 \option*{stretch} 和 \option*{rowsep} 等行间距选项，这里不做调整。
+ \keyval{math}{数值}\Default{1.2}
数学环境的行距因子，包含了 \pkg*{amsmath} 和 \pkg*{mathtools} 宏包提供的公式环境。
\keyval{caption-figure}{数值}\Default{1.2}
图片题注的行距因子。
@@ -473,6 +481,10 @@
\end{ctexexam}
\keyval{every}{数值}
统一设置上述所有的行距因子。
+ \keyval{abovedisplayskip}{弹性长度}\Default{0.5ex plus .1ex minus .1ex}\newtag%
+ 行间公式与上面正文间的额外距离。
+ \keyval{belowdisplayskip}{弹性长度}\Default{0.5ex plus .1ex minus .1ex}\newtag%
+ 行间公式与下面正文间的额外距离。
\end{options}
\subsection[其它字体]{其它字体\smodule{subfont}}
@@ -880,7 +892,7 @@
\keyval{lolskip}{弹性长度}\Default{10pt}
代码目录中每章第一个条目上方增加的垂直距离。与 \CTeX 的表格和图片目录中每章间的条目距离选项 \option*{lotskip} 和 \option*{lofskip} 类似，在 \cls*{article} 模式中此选项失效。
\keyval{between}{代码钩子}\dtag[\textcolor{red}{\ding{73}}]
- 目录标题与条目内容间的钩子（作用于标题下方间距之后），一般插入负的垂直距离代码用于抵消目录首行额外的垂直间距。除了条目名的键路径外，此选项也可用于 \module*{tocset} 路径中，表示章节标题目录标题代码钩子。
+ 目录标题与条目内容间的钩子（作用于标题下方间距之后），如果是 \cls*{book} 模式则默认插入 \code{-10pt} 垂直距离抵消首行目录的额外垂直间距，这是由于图表和 由 \pkg*{newfloat} 宏包所创建环境的目录默认每使用一次章标题在题注目录中插入 \code{10pt} 距离。除了条目名的键路径外，此选项也可用于 \module*{tocset} 路径中，表示章节标题目录标题代码钩子，如果是 \cls*{book} 模式则默认插入 \code{-1pc} 垂直距离。
\keyval{bibetween}{代码钩子}
与选项 \option{between} 类似，是英文章节标题目录（如果启用）标题代码钩子。
\keychoice{dotalign}{\fbox{true},false}
@@ -919,7 +931,7 @@
\begin{options}
\keychoice{plan}{\fbox{cn},bi,both}\newtag[Exp]%
章节标题目录的输出方案。\code{cn} 只输出中文目录，\code{bi} 只输出英文目录。\code{both} 同时连续输出中文和英文目录，需要与双语目录标题命令 \cs{bichapter} 等或双语标题选项 \option{title} 配合使用。
- \keyval{bicontentsname}{英文目录标题}\Default{Contents}\newtag%
+ \keyval{bicontentsname}{英文目录标题}\Default{Contents}
英文目录的标题，为通用接口命令 \cs*{ctexset} 的选项。
\end{options}
\command{listoffigures}[\sarg\oarg{键值列表}]
@@ -929,9 +941,13 @@
\command{listoflstlistings}[\sarg\oarg{键值列表}]
输出代码目录命令。带有星号参数的命令不输出目录标题。
- 如果需要部分而不是全文的目录或其它类型的目录，可以查看 \pkg*{titletoc} 宏包的相关示例。如果需要双语图表目录，可以查看 \pkg*{bicaption} 宏包的相关示例。上面目录命令的可选参数改进了原本单一的功能，其中 \meta{键值列表} 的选项如下：
+ 如果需要部分而不是全文的目录或其它类型的目录，可以查看 \pkg*{titletoc} 宏包的相关示例。如果需要双语图表目录，可以查看 \pkg*{bicaption} 宏包的相关示例。上面目录命令的可选参数改进了原本单一的功能，也提供了配置命令 \cs{SetTocOuter} 在目录命令外设置选项默认值。
+ \begin{commands}
+ \command{SetTocOuter}[\marg{键值列表}]\newtag%
+ 统一设置上述所有目录可选参数的默认值\footnote{由于目录命令通常只在文中使用一次，因此不设计为可以分别指定不同目录的参数。}，其中 \meta{键值列表} 的选项如下：
+ \end{commands}
\begin{options}
- \keyval{level}{标题命令}\newtag%
+ \keyval{level}{标题命令}
设定输出目录标题的命令。如果使用 \option{title} 选项设置了双语标题则需要配合双语标题命令。
\begin{ctexexam}
\tableofcontents[level = \chapter*]
@@ -942,7 +958,20 @@
\kvsplit{title}{中文目录标题,英文目录标题}
用于更改目录的双语标题。标题之间用一个英文逗号分开，对主目录来说前部分为中文目录标题，后部分为英文目录标题，对图表和代码目录来说后部分则是加入英文目录的条目。也可以只有一部分，表示中文目录的标题。
\keychoice{bilist}{mix,\fbox{new}}
- 确定章节标题目录中双语标题条目的输出排列方式。选项 \code{mix} 使每个英文标题条目在中文目录中跟随对应的中文标题输出，\code{new} 则在新建的英文目录中输出英文标题。
+ 确定章节标题目录中双语标题条目的输出排列方式。选项 \code{mix} 使每个英文标题条目在中文目录中跟随对应的中文标题输出，\code{new} 则在新建的英文目录中输出英文标题。这是个全局选项，在所有目录的可选参数中使用均可生效，但推荐在章节标题目录中使用。
+ \begin{commands}
+ \command{ebifbitoc}[\marg{英文目录代码}\marg{中文目录代码}]\newtag%
+ 启用混合双语目录条目即 \keyis{bilist}{mix} 时，在设置目录样式时可以配合 \cs{ebifbitoc} 命令判断当前条目是否为英文，从而输出不同的代码。
+ \begin{ctexexam}
+ \SetTocStyle{section}{fancy}
+ {
+ tocformat = \ebifbitoc{\color{red}}{\small},
+ tocindent = \ebifbitoc{1em}{2em}
+ }
+ \UseTocStyle{section}{fancy}{toc}
+ \tableofcontents[bilist = mix]
+ \end{ctexexam}
+ \end{commands}
\keyval{format}{目录标题格式}
设置目录标题的格式，在标题级别为 \code{chapter} 或者 \cls*{article} 模式且标题级别为 \code{section} 时有效。
\keyval{aftertitle}{标题后代码}
@@ -1358,13 +1387,17 @@
\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 = 2024ad,date = 2024/02/16,simple]
- \item 核对依赖宏包的更新改动，优化使用手册的内容细节。
+ \begin{version}[v = 2024ae,date = 2024/02/18]
+ \fixed
\item 修复图表等浮动环境题注目录中条目标签编号的计数器值显示错误问题。
\item 修复附录命令 \cs{appendix} 的可选参数设置英文目录中条目名字和编号失效的问题。
+ \item 修复 \pkg*{biblatex} 宏包对脚注打补丁失效的问题。
+ \added
\item 新增目录风格定义命令 \cs{SetTocStyle} 和使用命令 \cs{UseTocStyle}。
+ \item 新增目录配置命令 \cs{SetTocOuter} 双语目录判断命令 \cs{ebifbitoc}。
\item 新增脚注段落文本格式定义命令 \cs{deffntpara} 和脚注间距离选项 \option{footnotesep}。
\item 新增悬挂缩进命令 \cs{hangfrom}。
+ \item 新增行间公式与正文上下间距选项 \option{abovedisplayskip} 和 \option{belowdisplayskip}。
\end{version}
\end{changelog}
\nocite{*}
Modified: branches/branch2023.final/Master/texmf-dist/source/latex/easybook/easybook.dtx
===================================================================
--- branches/branch2023.final/Master/texmf-dist/source/latex/easybook/easybook.dtx 2024-02-18 21:06:20 UTC (rev 69963)
+++ branches/branch2023.final/Master/texmf-dist/source/latex/easybook/easybook.dtx 2024-02-18 21:06:33 UTC (rev 69964)
@@ -15,7 +15,7 @@
%<*class>
\NeedsTeXFormat{LaTeX2e}[2021/11/15]
\RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2024/02/16}{2024ad}
+\ProvidesExplClass{easybook}{2024/02/18}{2024ae}
{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/16}{2024ad}
+\ProvidesExplPackage{easybase}{2024/02/18}{2024ae}
{Easily typesetting Chinese theses or books}
\cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -630,19 +630,19 @@
}
\ctex_define:nn { hdrset }
{
- chap-mark .cs_set:Np = \eb_fancyhf_chapter_mark:n #1,
+ chap-mark .cs_set:Np = \eb at mark@chapter at whole #1,
chap-mark .initial:n =
{
\CTEXifname{\eb at mark@chapter at label}{}
\eb_mark_uppercase_case_init:n {#1}
},
- sec-mark .cs_set:Np = \eb_fancyhf_section_mark:n #1,
+ sec-mark .cs_set:Np = \eb at mark@section at whole #1,
sec-mark .initial:n =
{
\CTEXifname{\eb at mark@section at label}{}
\eb_mark_uppercase_case_init:n {#1}
},
- subsec-mark .cs_set:Np = \eb_fancyhf_subsection_mark:n #1,
+ subsec-mark .cs_set:Np = \eb at mark@subsection at whole #1,
subsec-mark .initial:n =
{
\CTEXifname{\eb at mark@subsection at label}{}
@@ -668,9 +668,9 @@
\cs_set:Npn \markdouble #1 { \markboth{#1}{\ifbool{@twoside}{#1}{}} }
\cs_new:Npn \eb at level@markdouble #1#2
- { \markdouble{\use:c { eb_fancyhf_#1_mark:n } {#2}} }
+ { \markdouble{\use:c { eb at mark@#1 at whole } {#2}} }
\cs_new:Npn \eb at level@markright #1#2
- { \markright{\use:c { eb_fancyhf_#1_mark:n } {#2}} }
+ { \markright{\use:c { eb at mark@#1 at whole } {#2}} }
\cs_gset:Npn \chaptermark #1 { \eb at level@markdouble{chapter}{#1} }
\cs_gset:Npn \sectionmark #1
{
@@ -1032,8 +1032,8 @@
\eb_patch_cmd:Nnn #1
{ \reset at font }
{
- \setspread{\fp_use:N \l__eb_spread_footnote_fp}
- \tl_use:N \l__eb_subfont_footnote_tl
+ \setspread{\eb at spread@footnote}
+ \eb at subfont@footnote
}
}
\cs_set_eq:NN \eb@@makefntext \@makefntext
@@ -1150,7 +1150,7 @@
{ \tl_clear:N \l__eb_fnmarktext_format_tl }
}
\bool_if:NF \l__eb_fnmarktext_format_match_bool { \spbset{spcmd = { }} }
- \tl_use:N \l__eb_subfont_footnote_tl
+ \eb at subfont@footnote
}
\cs_new_protected:Npn \defupfntmark #1
{ \cs_set:Npn \@makefnmark { \hbox:n {#1} } }
@@ -1328,8 +1328,12 @@
}
}
+\cs_new_protected:Npn \SetTocOuter #1
+ { \keys_set:nn { eb/tocouter } {#1} }
\tl_new:N \eb at bitoc@title
-\keys_define:nn { eb/floattoc }
+\newbool{bitoc}
+\cs_new:Npn \ebifbitoc { \ifbool{bitoc} }
+\keys_define:nn { eb/tocouter }
{
level .tl_set:N = \eb at toc@title at level,
level .initial:n =
@@ -1364,13 +1368,27 @@
plan .initial:n = cn,
columns .meta:n = { multoc = #1 },
title .code:n = \eb_assign_toc_title:n {#1},
- bilist .tl_gset:N = \g__eb_bilist_permute_value_tl,
+ bilist .code:n =
+ {
+ \tl_gset:Nn \g__eb_bilist_permute_value_tl {#1}
+ \str_if_eq:nnTF {#1} { mix }
+ {
+ \eb_preto_cmd:nn { CTEX at addtocline }
+ { \addtocontents{toc}{\boolfalse{bitoc}} }
+ \eb_preto_cmd:nn { CTEX at addbitocline }
+ { \addtocontents{toc}{\booltrue{bitoc}} }
+ }
+ {
+ \RemoveFromHook{cmd/CTEX at addtocline/before}
+ \RemoveFromHook{cmd/CTEX at addbitocline/before}
+ }
+ },
name .tl_set:N = \l__eb_print_index_name_tl,
name .initial:n = \imki at jobname
}
\bool_if:NTF \l__eb_class_mode_book_bool
- { \keys_define:nn { } { eb/floattoc .inherit:n = ctex/chapter } }
- { \keys_define:nn { } { eb/floattoc .inherit:n = ctex/section } }
+ { \keys_define:nn { } { eb/tocouter .inherit:n = ctex/chapter } }
+ { \keys_define:nn { } { eb/tocouter .inherit:n = ctex/section } }
\NewDocumentCommand{\eb_assign_toc_title:n}
{>{\SplitArgument{1}{,}}m}
{\eb_assign_toc_title_judge:nn #1}
@@ -1410,7 +1428,7 @@
{
\group_begin:
\tl_set_eq:Nc \eb at toc@title { list#4name }
- \IfValueT{#3}{\keys_set:nn { eb/floattoc } {#3}}
+ \IfValueT{#3}{\keys_set:nn { eb/tocouter } {#3}}
\eb_toc_title_level_cmd:n {#1}
\eb_toc_if_title_between_hook:nn {#1} {#4}
\eb_toc_start_multi_column_ext:n {#5}
@@ -1465,7 +1483,7 @@
{ \chapter* }
{ \section* }
}
- \IfValueT{#3}{\keys_set:nn { eb/floattoc } {#3}}
+ \IfValueT{#3}{\keys_set:nn { eb/tocouter } {#3}}
\bool_if:NT \l__eb_toc_plan_cn_bool
{
\IfBooleanF{#1}{\eb at toc@title at level{\eb at toc@title}{}}
@@ -1474,9 +1492,12 @@
}
\bool_if:NT \l__eb_toc_plan_bi_bool
{
- \IfBooleanF{#1}{\eb at toc@title at level{\eb at bitoc@title}{}}
- \eb_toc_if_title_between_hook:nn {#1} { bimain }
- \eb_toc_start_multi_column_ext:n { tec }
+ \tl_if_eq:NnF \g__eb_bilist_permute_value_tl { mix }
+ {
+ \IfBooleanF{#1}{\eb at toc@title at level{\eb at bitoc@title}{}}
+ \eb_toc_if_title_between_hook:nn {#1} { bimain }
+ \eb_toc_start_multi_column_ext:n { tec }
+ }
}
\group_end:
}
@@ -1605,7 +1626,7 @@
\cs_set_eq:NN \eb at ctexsetii \ctex_set:nn
\cs_new_protected:Npn \SetTocStyle #1#2#3
{
- \cs_set:cpn { eb at toc@style at set@#1@#2 }
+ \cs_set_protected:cpn { eb at toc@style at set@#1@#2 }
{ \eb at ctexsetii{#1}{#3} }
}
\cs_new_protected:Npn \UseTocStyle #1#2#3
@@ -1654,7 +1675,7 @@
\group_begin:
\tl_set_eq:NN \eb at toc@title \indexname
\cs_set_eq:NN \imki at indexlevel \use_none:n
- \IfValueT{#3}{\keys_set:nn { eb/floattoc } {#3}}
+ \IfValueT{#3}{\keys_set:nn { eb/tocouter } {#3}}
\cs_set_protected:Npn \imki at indexheaders
{
\eb_toc_title_level_cmd:n {#1}
@@ -1716,7 +1737,7 @@
caption-listing = #1
},
caption-every .initial:n = \sffamily\small,
- footnote .tl_set:N = \l__eb_subfont_footnote_tl,
+ footnote .tl_set:N = \eb at subfont@footnote,
marginpar .tl_set:N = \marginfont,
marginpar .initial:n = \footnotesize,
unknown .code:n = \eb_msg_deprecated_option:n { subfont }
@@ -1742,10 +1763,10 @@
}
\ctex_define:nn { spread }
{
- line .code:n = \AfterPreamble{\setspread{#1}},
+ line .code:n = \setspread{#1},
line .initial:n =
{
- \fp_if_nan:nTF { \l__ctex_line_spread_fp }
+ \fp_compare:nNnTF { \l__ctex_line_spread_fp } = { 1.3 }
{ 1.354 }
{ \fp_use:N \l__ctex_line_spread_fp }
},
@@ -1752,13 +1773,13 @@
table .fp_set:N = \l__eb_spread_table_fp,
table .initial:n = 1.354,
math .fp_set:N = \l__eb_spread_math_fp,
- math .initial:n = 1.354,
+ math .initial:n = 1.2,
footnote .code:n =
{
- \fp_set:Nn \l__eb_spread_footnote_fp {#1}
+ \tl_set:Nn \eb at spread@footnote {#1}
\group_begin:
\footnotesize
- \setspread{\fp_use:N \l__eb_spread_footnote_fp}
+ \setspread{\eb at spread@footnote}
\exp_args:NNNo \group_end:
\dim_set:Nn \footnotesep { \dim_use:N \box_ht:N \strutbox }
},
@@ -1777,8 +1798,22 @@
line = #1,table = #1,math = #1,
caption-every = #1,footnote = #1
},
- unknown .code:n = \eb_msg_deprecated_option:n { spread }
+ abovedisplayskip .code:n =
+ {\AfterPreamble{\skip_set:Nn \abovedisplayskip {#1}}},
+ abovedisplayskip .initial:n = 0.5ex plus .1ex minus .1ex,
+ belowdisplayskip .code:n =
+ {
+ \AfterPreamble
+ {
+ \skip_set:Nn \belowdisplayskip {#1}
+ \skip_set:Nn \belowdisplayshortskip {#1}
+ }
+ },
+ belowdisplayskip .initial:n = 0.5ex plus .1ex minus .1ex,
+ unknown .code:n = \eb_msg_deprecated_option:n { spread }
}
+\AfterPreamble
+ {\skip_set:Nn \abovedisplayshortskip { 0ex plus .1ex }}
\eb_seq_map_inline:nn
{ table,figure,listing }
@@ -1806,9 +1841,9 @@
\captionsetup[table][bi-second]{name = Table}
}
\eb_at_begin_environment:nn
- { tabular,tabularx,tblr,longtblr,longtable }
+ { tabular,tabularx,longtblr,longtable }
{ \setspread{\fp_use:N \l__eb_spread_table_fp} }
-\IfPackageAtLeastTF{tabularray}{2021/07/01}{\UseTblrLibrary{booktabs}}{}
+\UseTblrLibrary{booktabs}
\bool_if:NF \l__eb_float_page_bool
{
@@ -2022,13 +2057,6 @@
\setspread{\fp_use:N \l__eb_spread_math_fp}
\spread at equation
}
-\ctex_after_end_preamble:n
- {
- \skip_set:Nn \abovedisplayskip { 6pt plus 1pt minus 1pt }
- \skip_set:Nn \belowdisplayskip { 6pt plus 1pt minus 1pt }
- \skip_set:Nn \abovedisplayshortskip { 0pt plus 1pt minus 1pt }
- \skip_set:Nn \belowdisplayshortskip { 6pt plus 1pt minus 1pt }
- }
\ctex_at_end_package:nn { unicode-math }
{ \msg_redirect_module:nnn { unicode-math } { warning } { info } }
\ctex_at_end_package:nn { tcolorbox }
@@ -2071,7 +2099,7 @@
{
\group_begin:
\tl_set_eq:NN \eb at toc@title \bibname
- \IfValueT{##3}{ \keys_set:nn { eb/floattoc } {##3} }
+ \IfValueT{##3}{ \keys_set:nn { eb/tocouter } {##3} }
\cs_set_protected:Npn \bibsection
{
\eb_toc_title_level_cmd:n {##1}
@@ -2092,7 +2120,6 @@
\bool_if:NTF \l__eb_class_mode_book_bool
{ \bichapter*{#1}{\eb at bib@bitoc at title} }
{ \bisection*{#1}{\eb at bib@bitoc at title} }
- \sectionmark{#1}
}
\cs_new_protected:Npn \eb_biber_biblatex_set:
{
@@ -2215,7 +2242,7 @@
\clist_map_function:nN
{
{ none, 000000,000000,000000 },
- { seaside, 4169e1,9932cc,eb6100 },
+ { seaside, 3f3fc4,9932cc,09cc00 },
{ energy, f39800,00a0e9,893895 },
{ cyberpunk, 601986,eb6877,a4005b }
}
@@ -2352,7 +2379,7 @@
}
%</package>
%<*tcolorbox>
-\ProvidesExplFile{eb-tcolorbox.cfg}{2024/02/16}{2024ad}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2024/02/18}{2024ae}
{Customization of tcolorbox for easybook}
\cs_set_protected:Npn \addtotcbstyle #1#2
Modified: branches/branch2023.final/Master/texmf-dist/tex/latex/easybook/easybase.sty
===================================================================
--- branches/branch2023.final/Master/texmf-dist/tex/latex/easybook/easybase.sty 2024-02-18 21:06:20 UTC (rev 69963)
+++ branches/branch2023.final/Master/texmf-dist/tex/latex/easybook/easybase.sty 2024-02-18 21:06:33 UTC (rev 69964)
@@ -20,7 +20,7 @@
%% This work has the LPPL maintenance status `maintained'.
\NeedsTeXFormat{LaTeX2e}[2021/11/15]
\RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2024/02/16}{2024ad}
+\ProvidesExplPackage{easybase}{2024/02/18}{2024ae}
{Easily typesetting Chinese theses or books}
\cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -353,19 +353,19 @@
}
\ctex_define:nn { hdrset }
{
- chap-mark .cs_set:Np = \eb_fancyhf_chapter_mark:n #1,
+ chap-mark .cs_set:Np = \eb at mark@chapter at whole #1,
chap-mark .initial:n =
{
\CTEXifname{\eb at mark@chapter at label}{}
\eb_mark_uppercase_case_init:n {#1}
},
- sec-mark .cs_set:Np = \eb_fancyhf_section_mark:n #1,
+ sec-mark .cs_set:Np = \eb at mark@section at whole #1,
sec-mark .initial:n =
{
\CTEXifname{\eb at mark@section at label}{}
\eb_mark_uppercase_case_init:n {#1}
},
- subsec-mark .cs_set:Np = \eb_fancyhf_subsection_mark:n #1,
+ subsec-mark .cs_set:Np = \eb at mark@subsection at whole #1,
subsec-mark .initial:n =
{
\CTEXifname{\eb at mark@subsection at label}{}
@@ -391,9 +391,9 @@
\cs_set:Npn \markdouble #1 { \markboth{#1}{\ifbool{@twoside}{#1}{}} }
\cs_new:Npn \eb at level@markdouble #1#2
- { \markdouble{\use:c { eb_fancyhf_#1_mark:n } {#2}} }
+ { \markdouble{\use:c { eb at mark@#1 at whole } {#2}} }
\cs_new:Npn \eb at level@markright #1#2
- { \markright{\use:c { eb_fancyhf_#1_mark:n } {#2}} }
+ { \markright{\use:c { eb at mark@#1 at whole } {#2}} }
\cs_gset:Npn \chaptermark #1 { \eb at level@markdouble{chapter}{#1} }
\cs_gset:Npn \sectionmark #1
{
@@ -755,8 +755,8 @@
\eb_patch_cmd:Nnn #1
{ \reset at font }
{
- \setspread{\fp_use:N \l__eb_spread_footnote_fp}
- \tl_use:N \l__eb_subfont_footnote_tl
+ \setspread{\eb at spread@footnote}
+ \eb at subfont@footnote
}
}
\cs_set_eq:NN \eb@@makefntext \@makefntext
@@ -873,7 +873,7 @@
{ \tl_clear:N \l__eb_fnmarktext_format_tl }
}
\bool_if:NF \l__eb_fnmarktext_format_match_bool { \spbset{spcmd = { }} }
- \tl_use:N \l__eb_subfont_footnote_tl
+ \eb at subfont@footnote
}
\cs_new_protected:Npn \defupfntmark #1
{ \cs_set:Npn \@makefnmark { \hbox:n {#1} } }
@@ -1051,8 +1051,12 @@
}
}
+\cs_new_protected:Npn \SetTocOuter #1
+ { \keys_set:nn { eb/tocouter } {#1} }
\tl_new:N \eb at bitoc@title
-\keys_define:nn { eb/floattoc }
+\newbool{bitoc}
+\cs_new:Npn \ebifbitoc { \ifbool{bitoc} }
+\keys_define:nn { eb/tocouter }
{
level .tl_set:N = \eb at toc@title at level,
level .initial:n =
@@ -1087,13 +1091,27 @@
plan .initial:n = cn,
columns .meta:n = { multoc = #1 },
title .code:n = \eb_assign_toc_title:n {#1},
- bilist .tl_gset:N = \g__eb_bilist_permute_value_tl,
+ bilist .code:n =
+ {
+ \tl_gset:Nn \g__eb_bilist_permute_value_tl {#1}
+ \str_if_eq:nnTF {#1} { mix }
+ {
+ \eb_preto_cmd:nn { CTEX at addtocline }
+ { \addtocontents{toc}{\boolfalse{bitoc}} }
+ \eb_preto_cmd:nn { CTEX at addbitocline }
+ { \addtocontents{toc}{\booltrue{bitoc}} }
+ }
+ {
+ \RemoveFromHook{cmd/CTEX at addtocline/before}
+ \RemoveFromHook{cmd/CTEX at addbitocline/before}
+ }
+ },
name .tl_set:N = \l__eb_print_index_name_tl,
name .initial:n = \imki at jobname
}
\bool_if:NTF \l__eb_class_mode_book_bool
- { \keys_define:nn { } { eb/floattoc .inherit:n = ctex/chapter } }
- { \keys_define:nn { } { eb/floattoc .inherit:n = ctex/section } }
+ { \keys_define:nn { } { eb/tocouter .inherit:n = ctex/chapter } }
+ { \keys_define:nn { } { eb/tocouter .inherit:n = ctex/section } }
\NewDocumentCommand{\eb_assign_toc_title:n}
{>{\SplitArgument{1}{,}}m}
{\eb_assign_toc_title_judge:nn #1}
@@ -1133,7 +1151,7 @@
{
\group_begin:
\tl_set_eq:Nc \eb at toc@title { list#4name }
- \IfValueT{#3}{\keys_set:nn { eb/floattoc } {#3}}
+ \IfValueT{#3}{\keys_set:nn { eb/tocouter } {#3}}
\eb_toc_title_level_cmd:n {#1}
\eb_toc_if_title_between_hook:nn {#1} {#4}
\eb_toc_start_multi_column_ext:n {#5}
@@ -1188,7 +1206,7 @@
{ \chapter* }
{ \section* }
}
- \IfValueT{#3}{\keys_set:nn { eb/floattoc } {#3}}
+ \IfValueT{#3}{\keys_set:nn { eb/tocouter } {#3}}
\bool_if:NT \l__eb_toc_plan_cn_bool
{
\IfBooleanF{#1}{\eb at toc@title at level{\eb at toc@title}{}}
@@ -1197,9 +1215,12 @@
}
\bool_if:NT \l__eb_toc_plan_bi_bool
{
- \IfBooleanF{#1}{\eb at toc@title at level{\eb at bitoc@title}{}}
- \eb_toc_if_title_between_hook:nn {#1} { bimain }
- \eb_toc_start_multi_column_ext:n { tec }
+ \tl_if_eq:NnF \g__eb_bilist_permute_value_tl { mix }
+ {
+ \IfBooleanF{#1}{\eb at toc@title at level{\eb at bitoc@title}{}}
+ \eb_toc_if_title_between_hook:nn {#1} { bimain }
+ \eb_toc_start_multi_column_ext:n { tec }
+ }
}
\group_end:
}
@@ -1328,7 +1349,7 @@
\cs_set_eq:NN \eb at ctexsetii \ctex_set:nn
\cs_new_protected:Npn \SetTocStyle #1#2#3
{
- \cs_set:cpn { eb at toc@style at set@#1@#2 }
+ \cs_set_protected:cpn { eb at toc@style at set@#1@#2 }
{ \eb at ctexsetii{#1}{#3} }
}
\cs_new_protected:Npn \UseTocStyle #1#2#3
@@ -1377,7 +1398,7 @@
\group_begin:
\tl_set_eq:NN \eb at toc@title \indexname
\cs_set_eq:NN \imki at indexlevel \use_none:n
- \IfValueT{#3}{\keys_set:nn { eb/floattoc } {#3}}
+ \IfValueT{#3}{\keys_set:nn { eb/tocouter } {#3}}
\cs_set_protected:Npn \imki at indexheaders
{
\eb_toc_title_level_cmd:n {#1}
@@ -1439,7 +1460,7 @@
caption-listing = #1
},
caption-every .initial:n = \sffamily\small,
- footnote .tl_set:N = \l__eb_subfont_footnote_tl,
+ footnote .tl_set:N = \eb at subfont@footnote,
marginpar .tl_set:N = \marginfont,
marginpar .initial:n = \footnotesize,
unknown .code:n = \eb_msg_deprecated_option:n { subfont }
@@ -1465,10 +1486,10 @@
}
\ctex_define:nn { spread }
{
- line .code:n = \AfterPreamble{\setspread{#1}},
+ line .code:n = \setspread{#1},
line .initial:n =
{
- \fp_if_nan:nTF { \l__ctex_line_spread_fp }
+ \fp_compare:nNnTF { \l__ctex_line_spread_fp } = { 1.3 }
{ 1.354 }
{ \fp_use:N \l__ctex_line_spread_fp }
},
@@ -1475,13 +1496,13 @@
table .fp_set:N = \l__eb_spread_table_fp,
table .initial:n = 1.354,
math .fp_set:N = \l__eb_spread_math_fp,
- math .initial:n = 1.354,
+ math .initial:n = 1.2,
footnote .code:n =
{
- \fp_set:Nn \l__eb_spread_footnote_fp {#1}
+ \tl_set:Nn \eb at spread@footnote {#1}
\group_begin:
\footnotesize
- \setspread{\fp_use:N \l__eb_spread_footnote_fp}
+ \setspread{\eb at spread@footnote}
\exp_args:NNNo \group_end:
\dim_set:Nn \footnotesep { \dim_use:N \box_ht:N \strutbox }
},
@@ -1500,8 +1521,22 @@
line = #1,table = #1,math = #1,
caption-every = #1,footnote = #1
},
- unknown .code:n = \eb_msg_deprecated_option:n { spread }
+ abovedisplayskip .code:n =
+ {\AfterPreamble{\skip_set:Nn \abovedisplayskip {#1}}},
+ abovedisplayskip .initial:n = 0.5ex plus .1ex minus .1ex,
+ belowdisplayskip .code:n =
+ {
+ \AfterPreamble
+ {
+ \skip_set:Nn \belowdisplayskip {#1}
+ \skip_set:Nn \belowdisplayshortskip {#1}
+ }
+ },
+ belowdisplayskip .initial:n = 0.5ex plus .1ex minus .1ex,
+ unknown .code:n = \eb_msg_deprecated_option:n { spread }
}
+\AfterPreamble
+ {\skip_set:Nn \abovedisplayshortskip { 0ex plus .1ex }}
\eb_seq_map_inline:nn
{ table,figure,listing }
@@ -1529,9 +1564,9 @@
\captionsetup[table][bi-second]{name = Table}
}
\eb_at_begin_environment:nn
- { tabular,tabularx,tblr,longtblr,longtable }
+ { tabular,tabularx,longtblr,longtable }
{ \setspread{\fp_use:N \l__eb_spread_table_fp} }
-\IfPackageAtLeastTF{tabularray}{2021/07/01}{\UseTblrLibrary{booktabs}}{}
+\UseTblrLibrary{booktabs}
\bool_if:NF \l__eb_float_page_bool
{
@@ -1745,13 +1780,6 @@
\setspread{\fp_use:N \l__eb_spread_math_fp}
\spread at equation
}
-\ctex_after_end_preamble:n
- {
- \skip_set:Nn \abovedisplayskip { 6pt plus 1pt minus 1pt }
- \skip_set:Nn \belowdisplayskip { 6pt plus 1pt minus 1pt }
- \skip_set:Nn \abovedisplayshortskip { 0pt plus 1pt minus 1pt }
- \skip_set:Nn \belowdisplayshortskip { 6pt plus 1pt minus 1pt }
- }
\ctex_at_end_package:nn { unicode-math }
{ \msg_redirect_module:nnn { unicode-math } { warning } { info } }
\ctex_at_end_package:nn { tcolorbox }
@@ -1794,7 +1822,7 @@
{
\group_begin:
\tl_set_eq:NN \eb at toc@title \bibname
- \IfValueT{##3}{ \keys_set:nn { eb/floattoc } {##3} }
+ \IfValueT{##3}{ \keys_set:nn { eb/tocouter } {##3} }
\cs_set_protected:Npn \bibsection
{
\eb_toc_title_level_cmd:n {##1}
@@ -1815,7 +1843,6 @@
\bool_if:NTF \l__eb_class_mode_book_bool
{ \bichapter*{#1}{\eb at bib@bitoc at title} }
{ \bisection*{#1}{\eb at bib@bitoc at title} }
- \sectionmark{#1}
}
\cs_new_protected:Npn \eb_biber_biblatex_set:
{
@@ -1938,7 +1965,7 @@
\clist_map_function:nN
{
{ none, 000000,000000,000000 },
- { seaside, 4169e1,9932cc,eb6100 },
+ { seaside, 3f3fc4,9932cc,09cc00 },
{ energy, f39800,00a0e9,893895 },
{ cyberpunk, 601986,eb6877,a4005b }
}
Modified: branches/branch2023.final/Master/texmf-dist/tex/latex/easybook/easybook.cls
===================================================================
--- branches/branch2023.final/Master/texmf-dist/tex/latex/easybook/easybook.cls 2024-02-18 21:06:20 UTC (rev 69963)
+++ branches/branch2023.final/Master/texmf-dist/tex/latex/easybook/easybook.cls 2024-02-18 21:06:33 UTC (rev 69964)
@@ -20,7 +20,7 @@
%% This work has the LPPL maintenance status `maintained'.
\NeedsTeXFormat{LaTeX2e}[2021/11/15]
\RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2024/02/16}{2024ad}
+\ProvidesExplClass{easybook}{2024/02/18}{2024ae}
{Easily typesetting Chinese theses or books}
\bool_set_false:N \l__eb_compile_draft_bool
Modified: branches/branch2023.final/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg
===================================================================
--- branches/branch2023.final/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg 2024-02-18 21:06:20 UTC (rev 69963)
+++ branches/branch2023.final/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg 2024-02-18 21:06:33 UTC (rev 69964)
@@ -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/16}{2024ad}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2024/02/18}{2024ae}
{Customization of tcolorbox for easybook}
\cs_set_protected:Npn \addtotcbstyle #1#2
More information about the tex-live-commits
mailing list.