texlive[71125] Master/texmf-dist: easybook (29apr24)
commits+karl at tug.org
commits+karl at tug.org
Mon Apr 29 22:29:50 CEST 2024
Revision: 71125
https://tug.org/svn/texlive?view=revision&revision=71125
Author: karl
Date: 2024-04-29 22:29:50 +0200 (Mon, 29 Apr 2024)
Log Message:
-----------
easybook (29apr24)
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-04-29 20:29:40 UTC (rev 71124)
+++ trunk/Master/texmf-dist/doc/latex/easybook/easybook.tex 2024-04-29 20:29:50 UTC (rev 71125)
@@ -23,8 +23,8 @@
name = easybook,
color-scheme = blue,
title = EASYBOOK使用手册,
- version = v2024bb,
- date = 2024/04/26,
+ version = v2024bc,
+ date = 2024/04/28,
authors = 瞿毅,
info = 简便地排版中文学位论文或书籍,
email = toquyi at 163.com,
@@ -1090,16 +1090,20 @@
\end{commands}
\begin{commands}
- \command{NewTitleCommand}[\marg{条目名}\marg{章节层次}]\newtagv{2024aw}%
- 创建一个命令名为 \meta{条目名} 新章节标题，并且支持 \CTeX 中的标题样式选项机制，默认的标题格式为空。同时创建一个名为 \meta{条目名} 的计数器和标记命令 \code{\textbackslash}\meta{条目名}\code{\textcolor{cs}{mark}}。同时还需指定标题的 \meta{章节层次}，例如标准文档类中 \code{chapter} 级别为 \code{0}。
+ \command{NewTitleCommand}[\oarg{基础标题}\marg{条目名}\marg{章节层次}]\newtagv{2024aw}%
+ 创建一个命令名为 \meta{条目名} 新章节标题，并且支持 \CTeX 中的标题样式选项机制。指定可选参数后标题格式除了编号/名字会与 \meta{基础标题} 相同，否则默认为空。同时创建一个名为 \meta{条目名} 的计数器和标记命令 \code{\textbackslash}\meta{条目名}\code{\textcolor{cs}{mark}}。同时还需指定标题的 \meta{章节层次}，例如标准文档类中 \code{chapter} 级别为 \code{0}。
\command{NewTitleEntryCommand}[\oarg{扩展名}\marg{条目名}]\newtagv{2024aw}%
创建一个命令 \code{\textbackslash}\meta{条目名}\code{\textcolor{cs}{entry}}\marg{标题}，仅将 \meta{标题} 加入文件扩展名为 \meta{扩展名} 的目录中，而不在正文中输出标题，默认扩展名为 \code{toc}。
\begin{ctexexam}
- \NewTitleCommand{lchapter}{0}
+ \NewTitleCommand[chapter]{lchapter}{0}
\NewTitleEntryCommand{lchapter}
\contentsuse{lchapter}{toc}
\RegisterTocName{lchapter}
- \ctexset{lchapter/number = \thechapter}
+ \ctexset
+ {
+ lchapter/runin = true,
+ lchapter/number = \thelchapter
+ }
\lchapter{正常标题}
\lchapterentry{加入目录的标题}
\end{ctexexam}
Modified: trunk/Master/texmf-dist/source/latex/easybook/easybook.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/easybook/easybook.dtx 2024-04-29 20:29:40 UTC (rev 71124)
+++ trunk/Master/texmf-dist/source/latex/easybook/easybook.dtx 2024-04-29 20:29:50 UTC (rev 71125)
@@ -15,7 +15,7 @@
%<*class>
\NeedsTeXFormat{LaTeX2e}[2021/11/15]
\RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2024/04/26}{2024bb}
+\ProvidesExplClass{easybook}{2024/04/28}{2024bc}
{Easily typesetting Chinese theses or books}
\bool_new:N \l__eb_compile_draft_bool
@@ -297,7 +297,7 @@
%<*package>
\NeedsTeXFormat{LaTeX2e}[2021/11/15]
\RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2024/04/26}{2024bb}
+\ProvidesExplPackage{easybase}{2024/04/28}{2024bc}
{Easily typesetting Chinese theses or books}
\cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -1309,25 +1309,43 @@
\skip_if_eq:nnF { \eb at toc@lol at skip } { \c_zero_skip }
{ \addtocontents{lol}{\protect\addvspace{\skip_use:N \eb at toc@lol at skip}} }
}
-\cs_new_protected:Npn \NewTitleCommand #1#2
+\cs_new_protected:Npn \eb_title_base_set_eq:nn #1#2
{
- \newcounter{#1}
- \cs_set_eq:cN { #1mark } \use_none:n
+ \tl_set_eq:cc { CTEX@#2 at beforeskip } { CTEX@#1 at beforeskip }
+ \tl_set_eq:cc { CTEX@#2 at afterskip } { CTEX@#1 at afterskip }
+ \bool_set_eq:cc { CTEX@#2 at numbering } { CTEX@#1 at numbering }
+ \bool_set_eq:cc { CTEX@#2 at fixskip } { CTEX@#1 at fixskip }
+ \bool_set_eq:cc { CTEX@#2 at hang } { CTEX@#1 at hang }
+ \bool_set_eq:cc { CTEX@#2 at runin } { CTEX@#1 at runin }
+ \cs_set_eq:cc { CTEX@#2 at tocline } { CTEX@#1 at tocline }
+ \tl_set_eq:cc { CTEX@#2 at break } { CTEX@#1 at break }
+ \tl_set_eq:cc { CTEX@#2 at format } { CTEX@#1 at format }
+ \tl_set_eq:cc { CTEX@#2 at nameformat } { CTEX@#1 at nameformat }
+ \tl_set_eq:cc { CTEX@#2 at numberformat } { CTEX@#1 at numberformat }
+ \tl_set_eq:cc { CTEX@#2 at titleformat } { CTEX@#1 at titleformat }
+ \tl_set_eq:cc { CTEX@#2 at aftername } { CTEX@#1 at aftername }
+ \tl_set_eq:cc { CTEX@#2 at aftertitle } { CTEX@#1 at aftertitle }
+ }
+\NewDocumentCommand{\NewTitleCommand}{omm}
+ {
+ \newcounter{#2}
+ \cs_set_eq:cN { #2mark } \use_none:n
\tl_clear:N \l__ctex_tmp_tl
- \__ctex_initial_heading:n {#1}
- \__ctex_def_heading_keys:n {#1}
+ \__ctex_initial_heading:n {#2}
+ \__ctex_def_heading_keys:n {#2}
\exp_args:No \ctex_define:n { \l__ctex_tmp_tl }
- \cs_gset_protected:cpx {#1}
+ \cs_gset_protected:cpx {#2}
{
- \exp_not:N \@startsection{#1}{#2}
- {\exp_not:c { CTEX@#1 at indent }}
- {\exp_not:c { CTEX@#1 at beforeskip }}
- {\exp_not:c { CTEX@#1 at afterskip }}
- {\exp_not:N \normalfont\exp_not:c { CTEX@#1 at format }}
+ \exp_not:N \@startsection{#2}{#3}
+ {\exp_not:c { CTEX@#2 at indent }}
+ {\exp_not:c { CTEX@#2 at beforeskip }}
+ {\exp_not:c { CTEX@#2 at afterskip }}
+ {\exp_not:N \normalfont\exp_not:c { CTEX@#2 at format }}
}
- \cs_new:cpn { CTEX@#1 at tocline } ##1##2
+ \cs_new:cpn { CTEX@#2 at tocline } ##1##2
{ \CTEXnumberline{##1}##2 }
- \exp_args:Nc \providecommand { toclevel@#1 }{#2}
+ \exp_args:Nc \providecommand { toclevel@#2 }{#3}
+ \IfValueT{#1}{\eb_title_base_set_eq:nn {#1} {#2}}
}
\NewDocumentCommand{\NewTitleEntryCommand}{O{toc}m}
{
@@ -1419,14 +1437,14 @@
\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}} }
+ \AddToHook{cmd/CTEX at addtocline/before}[bitoc]
+ {\addtocontents{toc}{\boolfalse{bitoc}}}
+ \AddToHook{cmd/CTEX at addbitocline/before}[bitoc]
+ {\addtocontents{toc}{\booltrue{bitoc}}}
}
{
- \RemoveFromHook{cmd/CTEX at addtocline/before}
- \RemoveFromHook{cmd/CTEX at addbitocline/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,
@@ -1716,12 +1734,17 @@
\cs_set:Npn \@starttoc #1
{
\group_begin:
+ \makeatletter
\file_if_exist_input:n { \jobname.#1 }
\UseHookWithArguments{starttoc/after}{1}{#1}
\boolfalse{@nobreak}
\group_end:
}
-\AtEndDocument{\iow_now:Nn \@mainaux { \RemoveFromHook{starttoc/after}[aux] }}
+\AddToHook{enddocument/afterlastpage}
+ {
+ \IfHookEmptyTF{starttoc/after}{}
+ {\iow_now:Nn \@mainaux { \RemoveFromHook{starttoc/after}[aux] }}
+ }
\cs_set_eq:NN \eb at ctexsetii \ctex_set:nn
\cs_new_protected:Npn \SetTocStyle #1#2#3
@@ -2504,7 +2527,7 @@
}
%</package>
%<*tcolorbox>
-\ProvidesExplFile{eb-tcolorbox.cfg}{2024/04/26}{2024bb}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2024/04/28}{2024bc}
{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-04-29 20:29:40 UTC (rev 71124)
+++ trunk/Master/texmf-dist/tex/latex/easybook/easybase.sty 2024-04-29 20:29:50 UTC (rev 71125)
@@ -20,7 +20,7 @@
%% This work has the LPPL maintenance status `maintained'.
\NeedsTeXFormat{LaTeX2e}[2021/11/15]
\RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2024/04/26}{2024bb}
+\ProvidesExplPackage{easybase}{2024/04/28}{2024bc}
{Easily typesetting Chinese theses or books}
\cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -1032,25 +1032,43 @@
\skip_if_eq:nnF { \eb at toc@lol at skip } { \c_zero_skip }
{ \addtocontents{lol}{\protect\addvspace{\skip_use:N \eb at toc@lol at skip}} }
}
-\cs_new_protected:Npn \NewTitleCommand #1#2
+\cs_new_protected:Npn \eb_title_base_set_eq:nn #1#2
{
- \newcounter{#1}
- \cs_set_eq:cN { #1mark } \use_none:n
+ \tl_set_eq:cc { CTEX@#2 at beforeskip } { CTEX@#1 at beforeskip }
+ \tl_set_eq:cc { CTEX@#2 at afterskip } { CTEX@#1 at afterskip }
+ \bool_set_eq:cc { CTEX@#2 at numbering } { CTEX@#1 at numbering }
+ \bool_set_eq:cc { CTEX@#2 at fixskip } { CTEX@#1 at fixskip }
+ \bool_set_eq:cc { CTEX@#2 at hang } { CTEX@#1 at hang }
+ \bool_set_eq:cc { CTEX@#2 at runin } { CTEX@#1 at runin }
+ \cs_set_eq:cc { CTEX@#2 at tocline } { CTEX@#1 at tocline }
+ \tl_set_eq:cc { CTEX@#2 at break } { CTEX@#1 at break }
+ \tl_set_eq:cc { CTEX@#2 at format } { CTEX@#1 at format }
+ \tl_set_eq:cc { CTEX@#2 at nameformat } { CTEX@#1 at nameformat }
+ \tl_set_eq:cc { CTEX@#2 at numberformat } { CTEX@#1 at numberformat }
+ \tl_set_eq:cc { CTEX@#2 at titleformat } { CTEX@#1 at titleformat }
+ \tl_set_eq:cc { CTEX@#2 at aftername } { CTEX@#1 at aftername }
+ \tl_set_eq:cc { CTEX@#2 at aftertitle } { CTEX@#1 at aftertitle }
+ }
+\NewDocumentCommand{\NewTitleCommand}{omm}
+ {
+ \newcounter{#2}
+ \cs_set_eq:cN { #2mark } \use_none:n
\tl_clear:N \l__ctex_tmp_tl
- \__ctex_initial_heading:n {#1}
- \__ctex_def_heading_keys:n {#1}
+ \__ctex_initial_heading:n {#2}
+ \__ctex_def_heading_keys:n {#2}
\exp_args:No \ctex_define:n { \l__ctex_tmp_tl }
- \cs_gset_protected:cpx {#1}
+ \cs_gset_protected:cpx {#2}
{
- \exp_not:N \@startsection{#1}{#2}
- {\exp_not:c { CTEX@#1 at indent }}
- {\exp_not:c { CTEX@#1 at beforeskip }}
- {\exp_not:c { CTEX@#1 at afterskip }}
- {\exp_not:N \normalfont\exp_not:c { CTEX@#1 at format }}
+ \exp_not:N \@startsection{#2}{#3}
+ {\exp_not:c { CTEX@#2 at indent }}
+ {\exp_not:c { CTEX@#2 at beforeskip }}
+ {\exp_not:c { CTEX@#2 at afterskip }}
+ {\exp_not:N \normalfont\exp_not:c { CTEX@#2 at format }}
}
- \cs_new:cpn { CTEX@#1 at tocline } ##1##2
+ \cs_new:cpn { CTEX@#2 at tocline } ##1##2
{ \CTEXnumberline{##1}##2 }
- \exp_args:Nc \providecommand { toclevel@#1 }{#2}
+ \exp_args:Nc \providecommand { toclevel@#2 }{#3}
+ \IfValueT{#1}{\eb_title_base_set_eq:nn {#1} {#2}}
}
\NewDocumentCommand{\NewTitleEntryCommand}{O{toc}m}
{
@@ -1142,14 +1160,14 @@
\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}} }
+ \AddToHook{cmd/CTEX at addtocline/before}[bitoc]
+ {\addtocontents{toc}{\boolfalse{bitoc}}}
+ \AddToHook{cmd/CTEX at addbitocline/before}[bitoc]
+ {\addtocontents{toc}{\booltrue{bitoc}}}
}
{
- \RemoveFromHook{cmd/CTEX at addtocline/before}
- \RemoveFromHook{cmd/CTEX at addbitocline/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,
@@ -1439,12 +1457,17 @@
\cs_set:Npn \@starttoc #1
{
\group_begin:
+ \makeatletter
\file_if_exist_input:n { \jobname.#1 }
\UseHookWithArguments{starttoc/after}{1}{#1}
\boolfalse{@nobreak}
\group_end:
}
-\AtEndDocument{\iow_now:Nn \@mainaux { \RemoveFromHook{starttoc/after}[aux] }}
+\AddToHook{enddocument/afterlastpage}
+ {
+ \IfHookEmptyTF{starttoc/after}{}
+ {\iow_now:Nn \@mainaux { \RemoveFromHook{starttoc/after}[aux] }}
+ }
\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-04-29 20:29:40 UTC (rev 71124)
+++ trunk/Master/texmf-dist/tex/latex/easybook/easybook.cls 2024-04-29 20:29:50 UTC (rev 71125)
@@ -20,7 +20,7 @@
%% This work has the LPPL maintenance status `maintained'.
\NeedsTeXFormat{LaTeX2e}[2021/11/15]
\RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2024/04/26}{2024bb}
+\ProvidesExplClass{easybook}{2024/04/28}{2024bc}
{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-04-29 20:29:40 UTC (rev 71124)
+++ trunk/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg 2024-04-29 20:29:50 UTC (rev 71125)
@@ -18,7 +18,7 @@
%% LaTeX version 2005/12/01 or later.
%%
%% This work has the LPPL maintenance status `maintained'.
-\ProvidesExplFile{eb-tcolorbox.cfg}{2024/04/26}{2024bb}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2024/04/28}{2024bc}
{Customization of tcolorbox for easybook}
\cs_set_protected:Npn \addtotcbstyle #1#2
More information about the tex-live-commits
mailing list.