From 569af4b742b669cb22728b8ba69f5358f8d0ecbb Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 3 Dec 2024 21:58:50 +0000 Subject: easybook (3dec24) git-svn-id: svn://tug.org/texlive/trunk@73026 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/easybook/README.md | 2 +- Master/texmf-dist/doc/latex/easybook/easybook.pdf | Bin 651967 -> 651960 bytes Master/texmf-dist/doc/latex/easybook/easybook.tex | 4 +- .../texmf-dist/source/latex/easybook/easybook.dtx | 44 +++++++++++---------- Master/texmf-dist/tex/latex/easybook/easybase.sty | 40 ++++++++++--------- Master/texmf-dist/tex/latex/easybook/easybook.cls | 2 +- .../texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg | 2 +- 7 files changed, 49 insertions(+), 45 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/easybook/README.md b/Master/texmf-dist/doc/latex/easybook/README.md index aea95c8ed8c..f0d5c4065e0 100644 --- a/Master/texmf-dist/doc/latex/easybook/README.md +++ b/Master/texmf-dist/doc/latex/easybook/README.md @@ -1,5 +1,5 @@ # The `easybook` document class -Easily typesetting Chinese theses or books (v2024ho) +Easily typesetting Chinese theses or books (v2024hp) ## Abstract `easybook` is a pure academic template created based on the `ctexbook` book document class. It also has the functions of `book` and `article` document class. Combined with the general framework design of the theses of many universities in China, providing multiple commands and interfaces allows users to easily customize the theses templates. Its basic macro package `easybase` can also be used with `ctex` and standard document classes. diff --git a/Master/texmf-dist/doc/latex/easybook/easybook.pdf b/Master/texmf-dist/doc/latex/easybook/easybook.pdf index e0efb9dd065..1689b1480b9 100644 Binary files a/Master/texmf-dist/doc/latex/easybook/easybook.pdf and b/Master/texmf-dist/doc/latex/easybook/easybook.pdf differ diff --git a/Master/texmf-dist/doc/latex/easybook/easybook.tex b/Master/texmf-dist/doc/latex/easybook/easybook.tex index 7c54ad3fd16..56f75f2168a 100644 --- a/Master/texmf-dist/doc/latex/easybook/easybook.tex +++ b/Master/texmf-dist/doc/latex/easybook/easybook.tex @@ -23,8 +23,8 @@ name = easybook, color-scheme = blue, title = EASYBOOK使用手册, - version = v2024ho, - date = 2024/11/23, + version = v2024hp, + date = 2024/12/03, authors = 瞿毅, info = 简便地排版中文学位论文或书籍, email = toquyi@163.com, diff --git a/Master/texmf-dist/source/latex/easybook/easybook.dtx b/Master/texmf-dist/source/latex/easybook/easybook.dtx index ca763346f24..3dbff5cf79e 100644 --- a/Master/texmf-dist/source/latex/easybook/easybook.dtx +++ b/Master/texmf-dist/source/latex/easybook/easybook.dtx @@ -14,7 +14,7 @@ % This work has the LPPL maintenance status `maintained'. %\NeedsTeXFormat{LaTeX2e}[2021/11/15] %<*class> -\ProvidesExplClass{easybook}{2024/11/23}{2024ho} +\ProvidesExplClass{easybook}{2024/12/03}{2024hp} {Easily typesetting Chinese theses or books} \bool_new:N \l__eb_compile_draft_bool @@ -302,7 +302,7 @@ % %<*package> \RequirePackage{etoolbox} -\ProvidesExplPackage{easybase}{2024/11/23}{2024ho} +\ProvidesExplPackage{easybase}{2024/12/03}{2024hp} {Easily typesetting Chinese theses or books} \cs_generate_variant:Nn \dim_set:Nn { NV } @@ -978,17 +978,17 @@ } } \def\@outputbox@attachfloats{\@combinefloats} -\NewHook{makecol/footins/before} -\NewHook{makecol/footins/begin} +\NewHook{eb/footins/before} +\NewHook{eb/footins/begin} \def\@outputbox@appendfootnotes { \@if@footnotes@TF { - \UseHook{makecol/footins/before} + \UseHook{eb/footins/before} \@outputbox@append { \vskip\skip\footins - \UseHook{makecol/footins/begin} + \UseHook{eb/footins/begin} \color@begingroup \normalcolor \footnoterule @@ -1349,12 +1349,12 @@ \cs_set:Npn \thebisection { \eb_section_counter_prefix:n { bi } } \cs_set:Npn \thebisubsection { \thebisection.\@arabic\c@bisubsection } \cs_set:Npn \thesection { \eb_section_counter_prefix:n { } } -\NewHook{bitocline/before} -\DeclareHookRule{bitocline/before}{chapter}{<}{code} +\NewHook{eb/addbitocline/begin} +\DeclareHookRule{eb/addbitocline/begin}{chapter}{<}{code} \NewDocumentCommand{\BeforeAddtoBitoc}{sm} { - \IfBooleanT{#1}{\RemoveFromHook{bitocline/before}[code]} - \AddToHook{bitocline/before}[code]{#2} + \IfBooleanT{#1}{\RemoveFromHook{eb/addbitocline/begin}[code]} + \AddToHook{eb/addbitocline/begin}[code]{#2} } \cs_set_eq:NN \BeforeAddBitoc \BeforeAddtoBitoc \cs_new_protected:Npn \CTEX@addbitocline #1#2 @@ -1363,7 +1363,7 @@ \def\CTEX@prechapter{\CTEX@prebichapter} \def\CTEX@thechapter{\CTEX@bichapter@number} \def\CTEX@postchapter{\CTEX@postbichapter} - \UseHook{bitocline/before} + \UseHook{eb/addbitocline/begin} \tl_if_eq:NnTF \g__eb_bilist_permute_value_tl { mix } { \addcontentsline{toc}{#1} } { \addcontentsline{tec}{#1} } @@ -1906,14 +1906,17 @@ unknown .code:n = \eb_msg_deprecated_option:n { toc } } -\NewHookWithArguments{starttoc/after}{1} -\AddToHookWithArguments{starttoc/after}[aux] +\NewHookWithArguments{eb/starttoc/end}{1} +\AddToHookWithArguments{eb/starttoc/end}[aux] { - \ifbool{@filesw} + \AddToHook{enddocument/afterlastpage} { - \tl_if_exist:cF { tf@#1 } - { \iow_new:c { tf@#1 }\iow_open:cn { tf@#1 } { \jobname.#1 } } - }{} + \ifbool{@filesw} + { + \tl_if_exist:cF { tf@#1 } + { \iow_new:c { tf@#1 }\iow_open:cn { tf@#1 } { \jobname.#1 } } + }{} + } } \cs_set_eq:NN \eb@starttoc \@starttoc \cs_set:Npn \@starttoc #1 @@ -1923,8 +1926,7 @@ \group_begin: \makeatletter \file_if_exist_input:n { \jobname.#1 } - \AddToHook{enddocument/afterlastpage} - {\UseHookWithArguments{starttoc/after}{1}{#1}} + \UseHookWithArguments{eb/starttoc/end}{1}{#1} \boolfalse{@nobreak} \group_end: } @@ -2057,7 +2059,7 @@ \ctex_assign_heading_name:nn { biappendix } {#1} \bool_if:NTF \l__eb_class_mode_book_bool { - \AddToHook{bitocline/before}[chapter] + \AddToHook{eb/addbitocline/begin}[chapter] { \def\CTEX@prechapter{\CTEX@prebiappendix} \def\CTEX@thechapter{#2} @@ -2981,7 +2983,7 @@ } % %<*tcolorbox> -\ProvidesExplFile{eb-tcolorbox.cfg}{2024/11/23}{2024ho} +\ProvidesExplFile{eb-tcolorbox.cfg}{2024/12/03}{2024hp} {Customization of tcolorbox for easybook} \cs_set_protected:Npn \addtotcbstyle #1#2 diff --git a/Master/texmf-dist/tex/latex/easybook/easybase.sty b/Master/texmf-dist/tex/latex/easybook/easybase.sty index 7fe5b19eb10..fc3bcf44ef3 100644 --- a/Master/texmf-dist/tex/latex/easybook/easybase.sty +++ b/Master/texmf-dist/tex/latex/easybook/easybase.sty @@ -20,7 +20,7 @@ %% This work has the LPPL maintenance status `maintained'. \NeedsTeXFormat{LaTeX2e}[2021/11/15] \RequirePackage{etoolbox} -\ProvidesExplPackage{easybase}{2024/11/23}{2024ho} +\ProvidesExplPackage{easybase}{2024/12/03}{2024hp} {Easily typesetting Chinese theses or books} \cs_generate_variant:Nn \dim_set:Nn { NV } @@ -696,17 +696,17 @@ } } \def\@outputbox@attachfloats{\@combinefloats} -\NewHook{makecol/footins/before} -\NewHook{makecol/footins/begin} +\NewHook{eb/footins/before} +\NewHook{eb/footins/begin} \def\@outputbox@appendfootnotes { \@if@footnotes@TF { - \UseHook{makecol/footins/before} + \UseHook{eb/footins/before} \@outputbox@append { \vskip\skip\footins - \UseHook{makecol/footins/begin} + \UseHook{eb/footins/begin} \color@begingroup \normalcolor \footnoterule @@ -1067,12 +1067,12 @@ \cs_set:Npn \thebisection { \eb_section_counter_prefix:n { bi } } \cs_set:Npn \thebisubsection { \thebisection.\@arabic\c@bisubsection } \cs_set:Npn \thesection { \eb_section_counter_prefix:n { } } -\NewHook{bitocline/before} -\DeclareHookRule{bitocline/before}{chapter}{<}{code} +\NewHook{eb/addbitocline/begin} +\DeclareHookRule{eb/addbitocline/begin}{chapter}{<}{code} \NewDocumentCommand{\BeforeAddtoBitoc}{sm} { - \IfBooleanT{#1}{\RemoveFromHook{bitocline/before}[code]} - \AddToHook{bitocline/before}[code]{#2} + \IfBooleanT{#1}{\RemoveFromHook{eb/addbitocline/begin}[code]} + \AddToHook{eb/addbitocline/begin}[code]{#2} } \cs_set_eq:NN \BeforeAddBitoc \BeforeAddtoBitoc \cs_new_protected:Npn \CTEX@addbitocline #1#2 @@ -1081,7 +1081,7 @@ \def\CTEX@prechapter{\CTEX@prebichapter} \def\CTEX@thechapter{\CTEX@bichapter@number} \def\CTEX@postchapter{\CTEX@postbichapter} - \UseHook{bitocline/before} + \UseHook{eb/addbitocline/begin} \tl_if_eq:NnTF \g__eb_bilist_permute_value_tl { mix } { \addcontentsline{toc}{#1} } { \addcontentsline{tec}{#1} } @@ -1624,14 +1624,17 @@ unknown .code:n = \eb_msg_deprecated_option:n { toc } } -\NewHookWithArguments{starttoc/after}{1} -\AddToHookWithArguments{starttoc/after}[aux] +\NewHookWithArguments{eb/starttoc/end}{1} +\AddToHookWithArguments{eb/starttoc/end}[aux] { - \ifbool{@filesw} + \AddToHook{enddocument/afterlastpage} { - \tl_if_exist:cF { tf@#1 } - { \iow_new:c { tf@#1 }\iow_open:cn { tf@#1 } { \jobname.#1 } } - }{} + \ifbool{@filesw} + { + \tl_if_exist:cF { tf@#1 } + { \iow_new:c { tf@#1 }\iow_open:cn { tf@#1 } { \jobname.#1 } } + }{} + } } \cs_set_eq:NN \eb@starttoc \@starttoc \cs_set:Npn \@starttoc #1 @@ -1641,8 +1644,7 @@ \group_begin: \makeatletter \file_if_exist_input:n { \jobname.#1 } - \AddToHook{enddocument/afterlastpage} - {\UseHookWithArguments{starttoc/after}{1}{#1}} + \UseHookWithArguments{eb/starttoc/end}{1}{#1} \boolfalse{@nobreak} \group_end: } @@ -1775,7 +1777,7 @@ \ctex_assign_heading_name:nn { biappendix } {#1} \bool_if:NTF \l__eb_class_mode_book_bool { - \AddToHook{bitocline/before}[chapter] + \AddToHook{eb/addbitocline/begin}[chapter] { \def\CTEX@prechapter{\CTEX@prebiappendix} \def\CTEX@thechapter{#2} diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls index 8d1d9623391..ee00d40f8f5 100644 --- a/Master/texmf-dist/tex/latex/easybook/easybook.cls +++ b/Master/texmf-dist/tex/latex/easybook/easybook.cls @@ -19,7 +19,7 @@ %% %% This work has the LPPL maintenance status `maintained'. \NeedsTeXFormat{LaTeX2e}[2021/11/15] -\ProvidesExplClass{easybook}{2024/11/23}{2024ho} +\ProvidesExplClass{easybook}{2024/12/03}{2024hp} {Easily typesetting Chinese theses or books} \bool_new:N \l__eb_compile_draft_bool diff --git a/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg b/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg index 554b545874d..46e59505e3e 100644 --- a/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg +++ b/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg @@ -18,7 +18,7 @@ %% LaTeX version 2005/12/01 or later. %% %% This work has the LPPL maintenance status `maintained'. -\ProvidesExplFile{eb-tcolorbox.cfg}{2024/11/23}{2024ho} +\ProvidesExplFile{eb-tcolorbox.cfg}{2024/12/03}{2024hp} {Customization of tcolorbox for easybook} \cs_set_protected:Npn \addtotcbstyle #1#2 -- cgit v1.2.3