texlive[69469] Master/texmf-dist: easybook (17jan24)
commits+karl at tug.org
commits+karl at tug.org
Wed Jan 17 21:38:48 CET 2024
Revision: 69469
https://tug.org/svn/texlive?view=revision&revision=69469
Author: karl
Date: 2024-01-17 21:38:48 +0100 (Wed, 17 Jan 2024)
Log Message:
-----------
easybook (17jan24)
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-01-17 20:38:39 UTC (rev 69468)
+++ trunk/Master/texmf-dist/doc/latex/easybook/easybook.tex 2024-01-17 20:38:48 UTC (rev 69469)
@@ -23,8 +23,8 @@
name = easybook,
color-scheme = blue,
title = EASYBOOK使用手册,
- version = v2024I,
- date = 2024/01/16,
+ version = v2024J,
+ date = 2024/01/18,
authors = 瞿毅,
info = 简便地排版中文学位论文或书籍,
email = toquyi at 163.com,
@@ -813,7 +813,7 @@
\keyval{tocbelow}{距离命令}\dtag
在目录条目下方执行的代码，可以插入垂直距离等命令。
\keyval{tocline}{条目定义}\dtag[\textcolor{red}{\ding{73}}]
- 这个选项在章节标题基础上扩展了浮动环境的题注标题在目录文件中的定义。由于设计的原因，章节标题选项中参数 \code{\#1} 代表标题编号 \cs*{the}\meta{计数器} 对应的计数器名称，而题注标题选项中参数 \code{\#1} 代表标题编号 \cs*{the}\meta{计数器} 的值，章节和题注标题中参数 \code{\#2} 均代表相应标题内容。
+ 这个选项在章节标题基础上扩展了浮动环境的题注标题在目录文件中的定义。章节和题注标题选项中参数 \code{\#1} 代表标题编号 \cs*{the}\meta{计数器} 对应的计数器名称，参数 \code{\#2} 则代表相应标题内容。
\begin{ctexexam}
\ctexset
{
@@ -854,13 +854,13 @@
\SetTocStyle{chapter}{fancy}{tocformat = \color{red}\zihao{3}}
\UseTocStyle{chapter}{fancy}{toc}
\end{ctexexam}
- \command{listnumberline}[\marg{条目名}]
- 在图表等浮动环境的题注目录中插入条目标签，默认标签的名字可以由格式命令 \cs{labelformat} 设置。注意其中 \meta{条目名} 需要用对应名称\textbf{显式指定}。
+ \command{listnumberline}[\marg{计数器名}]
+ 在图表等浮动环境的题注目录中插入条目标签，默认标签的名字可以由格式命令 \cs{labelformat} 设置。其中 \meta{计数器名} 一般与 \meta{条目名} 相同，可以用参数 \code{\#1} 指定或用对应计数器名称显式指定。
\begin{ctexexam}
\ctexset
{
- figure/tocline = \listnumberline{figure}#2,
- lstlisting/tocline = \protect\numberline{代码#1\hspace{1em}}#2
+ lstlisting/tocline = \listnumberline{#1}#2,
+ figure/tocline = \protect\numberline{图\thefigure\hspace{1em}}#2
}
\end{ctexexam}
\command{contentsmargin}[\marg{右边距}]
@@ -1350,9 +1350,9 @@
\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 = 2024I,date = 2024/01/16,simple]
+ \begin{version}[v = 2024J,date = 2024/01/18,simple]
\item 核对依赖宏包的更新改动，优化使用手册的内容细节。
- \item 修复图表题注目录中条目标签编号的计数器值显示错误问题。
+ \item 修复图表等浮动环境题注目录中条目标签编号的计数器值显示错误问题。
\item 新增目录风格定义命令 \cs{SetTocStyle} 和使用命令 \cs{UseTocStyle}。
\end{version}
\end{changelog}
Modified: trunk/Master/texmf-dist/source/latex/easybook/easybook.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/easybook/easybook.dtx 2024-01-17 20:38:39 UTC (rev 69468)
+++ trunk/Master/texmf-dist/source/latex/easybook/easybook.dtx 2024-01-17 20:38:48 UTC (rev 69469)
@@ -15,7 +15,7 @@
%<*class>
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2024/01/16}{2024I}
+\ProvidesExplClass{easybook}{2024/01/18}{2024J}
{Easily typesetting Chinese theses or books}
\bool_set_false:N \l__eb_compile_draft_bool
@@ -302,7 +302,7 @@
%<*package>
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2024/01/16}{2024I}
+\ProvidesExplPackage{easybase}{2024/01/18}{2024J}
{Easily typesetting Chinese theses or books}
\cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -1371,7 +1371,6 @@
{ \tl_clear:N \eb at bitoc@title }
{ \tl_set:Nn \eb at bitoc@title {#2} }
}
-\prop_new:N \l__eb_toc_float_label_prop
\cs_new_protected:Npn \eb_toc_start_multi_column_ext:n #1
{
\int_compare:nNnTF { \l__eb_toc_columns_int } > { 1 }
@@ -1424,10 +1423,8 @@
#1 .meta:nn = { ctex/#1 } {##1},
#1/between .tl_set:c = l__eb_toc_#1_between_hook_tl,
#1/tocline .cs_set:cp = { eb at tocline@#1 } ##1##2,
- #1/tocline .initial:n = \listnumberline{#1}##2
+ #1/tocline .initial:n = \listnumberline{##1}##2
}
- \prop_put_from_keyval:Nn \l__eb_toc_float_label_prop
- { #1 = \use:c { eb at tocline@#1 } }
}
\DeclareFloatList{table}{lot}
\DeclareFloatList{figure}{lof}
@@ -1434,24 +1431,13 @@
\DeclareFloatList{lstlisting}{lol}
\cs_gset:Npn \caption@@@addcontentsline #1#2#3#4
{
- \exp_args:Nnnx
\addcontentsline{#1}{#2}
{
- \prop_if_in:NnTF \l__eb_toc_float_label_prop {#2}
- { \prop_item:Nn \l__eb_toc_float_label_prop {#2} }
- { \protect\numberline }
- {#3}{#4}
+ \cs_if_exist_use:cTF { eb at tocline@#2 }
+ { {#2}{#4} }
+ { \protect\numberline{#3}{#4} }
}
}
-\ctex_patch_cmd:Nnn \lst at MakeCaption
- {
- \addcontentsline{lol}{lstlisting}
- {\protect\numberline{\thelstlisting}\lst@@caption}
- }
- {
- \addcontentsline{lol}{lstlisting}
- {\eb at tocline@lstlisting{\thelstlisting}{\lst@@caption}}
- }
\ctex_define:n
{
bicontentsname .tl_set:N = \bicontentsname,
@@ -2348,7 +2334,7 @@
}
%</package>
%<*tcolorbox>
-\ProvidesExplFile{eb-tcolorbox.cfg}{2024/01/16}{2024I}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2024/01/18}{2024J}
{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-01-17 20:38:39 UTC (rev 69468)
+++ trunk/Master/texmf-dist/tex/latex/easybook/easybase.sty 2024-01-17 20:38:48 UTC (rev 69469)
@@ -20,7 +20,7 @@
%% This work has the LPPL maintenance status `maintained'.
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2024/01/16}{2024I}
+\ProvidesExplPackage{easybase}{2024/01/18}{2024J}
{Easily typesetting Chinese theses or books}
\cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -1089,7 +1089,6 @@
{ \tl_clear:N \eb at bitoc@title }
{ \tl_set:Nn \eb at bitoc@title {#2} }
}
-\prop_new:N \l__eb_toc_float_label_prop
\cs_new_protected:Npn \eb_toc_start_multi_column_ext:n #1
{
\int_compare:nNnTF { \l__eb_toc_columns_int } > { 1 }
@@ -1142,10 +1141,8 @@
#1 .meta:nn = { ctex/#1 } {##1},
#1/between .tl_set:c = l__eb_toc_#1_between_hook_tl,
#1/tocline .cs_set:cp = { eb at tocline@#1 } ##1##2,
- #1/tocline .initial:n = \listnumberline{#1}##2
+ #1/tocline .initial:n = \listnumberline{##1}##2
}
- \prop_put_from_keyval:Nn \l__eb_toc_float_label_prop
- { #1 = \use:c { eb at tocline@#1 } }
}
\DeclareFloatList{table}{lot}
\DeclareFloatList{figure}{lof}
@@ -1152,24 +1149,13 @@
\DeclareFloatList{lstlisting}{lol}
\cs_gset:Npn \caption@@@addcontentsline #1#2#3#4
{
- \exp_args:Nnnx
\addcontentsline{#1}{#2}
{
- \prop_if_in:NnTF \l__eb_toc_float_label_prop {#2}
- { \prop_item:Nn \l__eb_toc_float_label_prop {#2} }
- { \protect\numberline }
- {#3}{#4}
+ \cs_if_exist_use:cTF { eb at tocline@#2 }
+ { {#2}{#4} }
+ { \protect\numberline{#3}{#4} }
}
}
-\ctex_patch_cmd:Nnn \lst at MakeCaption
- {
- \addcontentsline{lol}{lstlisting}
- {\protect\numberline{\thelstlisting}\lst@@caption}
- }
- {
- \addcontentsline{lol}{lstlisting}
- {\eb at tocline@lstlisting{\thelstlisting}{\lst@@caption}}
- }
\ctex_define:n
{
bicontentsname .tl_set:N = \bicontentsname,
Modified: trunk/Master/texmf-dist/tex/latex/easybook/easybook.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/easybook/easybook.cls 2024-01-17 20:38:39 UTC (rev 69468)
+++ trunk/Master/texmf-dist/tex/latex/easybook/easybook.cls 2024-01-17 20:38:48 UTC (rev 69469)
@@ -20,7 +20,7 @@
%% This work has the LPPL maintenance status `maintained'.
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2024/01/16}{2024I}
+\ProvidesExplClass{easybook}{2024/01/18}{2024J}
{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-01-17 20:38:39 UTC (rev 69468)
+++ trunk/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg 2024-01-17 20:38:48 UTC (rev 69469)
@@ -18,7 +18,7 @@
%% LaTeX version 2005/12/01 or later.
%%
%% This work has the LPPL maintenance status `maintained'.
-\ProvidesExplFile{eb-tcolorbox.cfg}{2024/01/16}{2024I}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2024/01/18}{2024J}
{Customization of tcolorbox for easybook}
\cs_set_protected:Npn \addtotcbstyle #1#2
More information about the tex-live-commits
mailing list.