texlive[71280] Master/texmf-dist: easybook (18may24)
commits+karl at tug.org
commits+karl at tug.org
Sat May 18 00:14:40 CEST 2024
Revision: 71280
https://tug.org/svn/texlive?view=revision&revision=71280
Author: karl
Date: 2024-05-18 00:14:39 +0200 (Sat, 18 May 2024)
Log Message:
-----------
easybook (18may24)
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-05-17 22:14:29 UTC (rev 71279)
+++ trunk/Master/texmf-dist/doc/latex/easybook/easybook.tex 2024-05-17 22:14:39 UTC (rev 71280)
@@ -23,8 +23,8 @@
name = easybook,
color-scheme = blue,
title = EASYBOOK使用手册,
- version = v2024bq,
- date = 2024/05/15,
+ version = v2024br,
+ date = 2024/05/16,
authors = 瞿毅,
info = 简便地排版中文学位论文或书籍,
email = toquyi at 163.com,
@@ -832,10 +832,10 @@
\subsection[目录]{目录\smodule{toc}}
\label{subsec:catalog}
-模块 \module*{toc} 将使用 \pkg*{titletoc} 宏包处理目录样式。默认包括 \module*{part}$\longrightarrow$\module*{subparagraph}、\module*{figure}、\module*{table} 和 \module*{lstlisting} 条目名的键路径。选项前带有 \ding{73} 符号表示支持所有相应\textbf{条目名}的路径，其它选项则处于 \module*{toc} 键路径下。目前支持多数学术论文目录样式，更复杂的样式可以查看 \pkg*{titletoc} 的相关用法。
+模块 \module*{toc} 将使用 \pkg*{titletoc} 宏包处理目录样式。默认包括 \module*{part}$\longrightarrow$\module*{subparagraph}、\module*{figure}、\module*{table} 和 \module*{lstlisting} 条目名的键路径。选项前带有 \ding{73} 符号表示支持所有相应\textbf{条目名}的路径，其它选项则处于 \module*{toc} 键路径下。目录选项均支持标题编号判定命令 \cs{CTEXifname}。目前支持多数学术论文目录样式，更复杂的样式可以查看 \pkg*{titletoc} 的相关用法。
\begin{cnltxlist}
\keyval{tocformat}{条目格式}\dtag
- 目录中各类型条目的格式。可以设置条目字体和加入垂直间距等，垂直间距最好使用防止垂直间距重合的 \cs*{addvspace} 命令。如果是段落型目录，格式代码仅在段落中当前级别条目前执行一次。
+ 目录中各类型条目的格式。可以设置条目字体和加入垂直间距等，垂直间距最好使用防止垂直间距重合的 \cs*{addvspace} 命令。如果是段落型目录，格式代码仅在段落中当前级别条目前执行一次。也可以用 \cs{CTEXifname} 命令或 \option{tocformat*} 选项给有无编号的标题分别设置格式。
\keyval{tocformat+}{条目格式}\dtag
与选项 \option{tocformat} 用法一样，只是在已有的格式命令后附加代码。
\keyval{tocformat*}{条目格式}\dtag
@@ -863,8 +863,8 @@
{
chapter =
{
- tocformat = \addvspace{8pt}\large,
- tocindent = 1.5em,
+ tocformat = \CTEXifname{\addvspace{8pt}\large}{},
+ tocindent = \CTEXifname{2em}{1.5em},
tocrule = \tocrule[0.6pc](1.1){.}[\zihao{5}],
tocline = \CTEXnumberline{#1}#2
},
Modified: trunk/Master/texmf-dist/source/latex/easybook/easybook.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/easybook/easybook.dtx 2024-05-17 22:14:29 UTC (rev 71279)
+++ trunk/Master/texmf-dist/source/latex/easybook/easybook.dtx 2024-05-17 22:14:39 UTC (rev 71280)
@@ -14,7 +14,7 @@
% This work has the LPPL maintenance status `maintained'.
%<*class>
\NeedsTeXFormat{LaTeX2e}[2021/11/15]
-\ProvidesExplClass{easybook}{2024/05/15}{2024bq}
+\ProvidesExplClass{easybook}{2024/05/16}{2024br}
{Easily typesetting Chinese theses or books}
\bool_new:N \l__eb_compile_draft_bool
@@ -301,7 +301,7 @@
%<*package>
\NeedsTeXFormat{LaTeX2e}[2021/11/15]
\RequirePackage{etoolbox}
-\ProvidesExplPackage{easybase}{2024/05/15}{2024bq}
+\ProvidesExplPackage{easybase}{2024/05/16}{2024br}
{Easily typesetting Chinese theses or books}
\cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -1456,8 +1456,11 @@
{\addtocontents{toc}{\booltrue{bitoc}}}
}
{
- \RemoveFromHook{cmd/CTEX at addtocline/before}[bitoc]
- \RemoveFromHook{cmd/CTEX at addbitocline/before}[bitoc]
+ \IfHookEmptyTF{cmd/CTEX at addtocline/before}{}
+ {
+ \RemoveFromHook{cmd/CTEX at addtocline/before}[bitoc]
+ \RemoveFromHook{cmd/CTEX at addbitocline/before}[bitoc]
+ }
}
},
name .tl_set:N = \l__eb_print_index_name_tl,
@@ -1771,6 +1774,28 @@
}
\AllotPartialExt{lol}{pll}
+\cs_new_protected:Npn \RegisterTitleIfname #1
+ {
+ \clist_map_function:nN {#1}
+ \eb at register@title at ifname
+ }
+\cs_new_protected:Npn \eb at register@title at ifname #1
+ {
+ \AddToHookWithArguments{cmd/addcontentsline/before}[title/ifname/#1]
+ {
+ \str_if_eq:nnT {##1} {#1}
+ {
+ \addtocontents{##1}
+ {\CTEXifname{\CTEX at ifnametrue}{\CTEX at ifnamefalse}}
+ }
+ }
+ \AddToHook{file/\jobname.#1/before}
+ {\cs_set_eq:NN \eb at title@ifname at resume \CTEXifname}
+ \AddToHook{file/\jobname.#1/after}
+ {\cs_set_eq:NN \CTEXifname \eb at title@ifname at resume}
+ }
+\RegisterTitleIfname{toc}
+
\cs_set_eq:NN \eb at ctexsetii \ctex_set:nn
\cs_new_protected:Npn \SetTocStyle #1#2#3
{
@@ -2557,7 +2582,7 @@
}
%</package>
%<*tcolorbox>
-\ProvidesExplFile{eb-tcolorbox.cfg}{2024/05/15}{2024bq}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2024/05/16}{2024br}
{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-05-17 22:14:29 UTC (rev 71279)
+++ trunk/Master/texmf-dist/tex/latex/easybook/easybase.sty 2024-05-17 22:14:39 UTC (rev 71280)
@@ -20,7 +20,7 @@
%% This work has the LPPL maintenance status `maintained'.
\NeedsTeXFormat{LaTeX2e}[2021/11/15]
\RequirePackage{etoolbox}
-\ProvidesExplPackage{easybase}{2024/05/15}{2024bq}
+\ProvidesExplPackage{easybase}{2024/05/16}{2024br}
{Easily typesetting Chinese theses or books}
\cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -1175,8 +1175,11 @@
{\addtocontents{toc}{\booltrue{bitoc}}}
}
{
- \RemoveFromHook{cmd/CTEX at addtocline/before}[bitoc]
- \RemoveFromHook{cmd/CTEX at addbitocline/before}[bitoc]
+ \IfHookEmptyTF{cmd/CTEX at addtocline/before}{}
+ {
+ \RemoveFromHook{cmd/CTEX at addtocline/before}[bitoc]
+ \RemoveFromHook{cmd/CTEX at addbitocline/before}[bitoc]
+ }
}
},
name .tl_set:N = \l__eb_print_index_name_tl,
@@ -1490,6 +1493,28 @@
}
\AllotPartialExt{lol}{pll}
+\cs_new_protected:Npn \RegisterTitleIfname #1
+ {
+ \clist_map_function:nN {#1}
+ \eb at register@title at ifname
+ }
+\cs_new_protected:Npn \eb at register@title at ifname #1
+ {
+ \AddToHookWithArguments{cmd/addcontentsline/before}[title/ifname/#1]
+ {
+ \str_if_eq:nnT {##1} {#1}
+ {
+ \addtocontents{##1}
+ {\CTEXifname{\CTEX at ifnametrue}{\CTEX at ifnamefalse}}
+ }
+ }
+ \AddToHook{file/\jobname.#1/before}
+ {\cs_set_eq:NN \eb at title@ifname at resume \CTEXifname}
+ \AddToHook{file/\jobname.#1/after}
+ {\cs_set_eq:NN \CTEXifname \eb at title@ifname at resume}
+ }
+\RegisterTitleIfname{toc}
+
\cs_set_eq:NN \eb at ctexsetii \ctex_set:nn
\cs_new_protected:Npn \SetTocStyle #1#2#3
{
Modified: trunk/Master/texmf-dist/tex/latex/easybook/easybook.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/easybook/easybook.cls 2024-05-17 22:14:29 UTC (rev 71279)
+++ trunk/Master/texmf-dist/tex/latex/easybook/easybook.cls 2024-05-17 22:14:39 UTC (rev 71280)
@@ -19,7 +19,7 @@
%%
%% This work has the LPPL maintenance status `maintained'.
\NeedsTeXFormat{LaTeX2e}[2021/11/15]
-\ProvidesExplClass{easybook}{2024/05/15}{2024bq}
+\ProvidesExplClass{easybook}{2024/05/16}{2024br}
{Easily typesetting Chinese theses or books}
\bool_new: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-05-17 22:14:29 UTC (rev 71279)
+++ trunk/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg 2024-05-17 22:14:39 UTC (rev 71280)
@@ -18,7 +18,7 @@
%% LaTeX version 2005/12/01 or later.
%%
%% This work has the LPPL maintenance status `maintained'.
-\ProvidesExplFile{eb-tcolorbox.cfg}{2024/05/15}{2024bq}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2024/05/16}{2024br}
{Customization of tcolorbox for easybook}
\cs_set_protected:Npn \addtotcbstyle #1#2
More information about the tex-live-commits
mailing list.