texlive[69332] Master/texmf-dist: easybook (6jan24)
commits+karl at tug.org
commits+karl at tug.org
Sun Jan 7 22:26:04 CET 2024
Revision: 69332
https://tug.org/svn/texlive?view=revision&revision=69332
Author: karl
Date: 2024-01-07 22:26:03 +0100 (Sun, 07 Jan 2024)
Log Message:
-----------
easybook (6jan24)
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-07 21:25:54 UTC (rev 69331)
+++ trunk/Master/texmf-dist/doc/latex/easybook/easybook.tex 2024-01-07 21:26:03 UTC (rev 69332)
@@ -23,8 +23,8 @@
name = easybook,
color-scheme = blue,
title = EASYBOOK使用手册,
- version = v2024C,
- date = 2024/01/06,
+ version = v2024D,
+ date = 2024/01/07,
authors = 瞿毅,
info = 简便地排版中文学位论文或书籍,
email = toquyi at 163.com,
@@ -234,12 +234,11 @@
cell{1}{3,4} = PaleTurquoise,
cell{2}{5} = PaleTurquoise,
cell{3}{2,4} = PaleTurquoise,
- cell{5}{1} = PaleTurquoise,
+ cell{5}{1} = GreenYellow,
cell{1}{2} = GreenYellow,
- cell{3}{1,4} = GreenYellow,
- cell{5}{2} = GreenYellow
+ cell{3}{1,4} = GreenYellow
}{
- amsthm & bicaption & ctexbook & caption & chemformula \\
+ amsthm & bicaption & ctex & caption & chemformula \\
enumitem & etoolbox & fancyhdr & geometry & hyperref \\
imakeidx & listings & marginnote & mathtools & multicol \\
pifont & pdfpages & siunitx & spbmark & thmtools \\
@@ -674,7 +673,7 @@
\command*{markboth}[\marg{左页标题标记}\marg{右页标题标记}]\default{}
\command*{markright}[\marg{右页标题标记}]\default{}
\command{markdouble}[\marg{双页标题标记}]
- 这三个命令用于手动设置当前页标题标记，一般紧随标题命令，特殊情况下可以使用它们得到需要的页眉页脚内容。上述标记命令内容的选项便是基于这三个命令。其中 \cs{markdouble} 根据是否是双面打印设置相应标记。如果是单面打印，则 \meta{左页标题标记} 无效。
+ 这三个命令用于手动设置当前页标题标记，特殊情况下可以使用它们定义与标题不同的页眉页脚标记。上述标记命令内容的选项便是基于这三个命令。其中 \cs{markdouble} 根据是否是双面打印设置相应标记。如果是单面打印，则 \meta{左页标题标记} 无效。
\end{commands}
\begin{commands}
@@ -832,7 +831,7 @@
\command{contentsuse}[\marg{条目名}\marg{扩展名}]
激活名称为 \meta{条目名} 的浮动环境目录定制功能，它使用的目录文件后缀为 \meta{扩展名}。需要在激活条目后再使用命令 \cs{RegisterTocName} 注册选项。
\command{DeclareFloatList}[\marg{条目名}\marg{扩展名}]\newtag%
- 声明一个浮动环境题注的目录命令 \cs*{listof}\meta{条目名}\code{\textcolor{cs}{s}}，并且支持\ref{subsec:directory command} 中图表目录命令的机制。使用这个命令要确保将条目加入目录的机制已经存在，推荐搭配 \pkg*{newfloat} 宏包创建新的浮动环境。选项前有符号 \textcolor{red}{\ding{73}} 表示在声明后可用。下面举一个声明算法目录的例子：
+ 声明一个浮动环境题注的目录命令 \cs*{listof}\meta{条目名}\code{\textcolor{cs}{s}}，并且支持\ref{subsec:directory command} 中图表目录命令的机制。使用这个命令要确保将条目加入目录的机制已经存在，推荐搭配 \pkg*{newfloat} 宏包创建新的浮动环境。选项前有红色符号 \textcolor{red}{\ding{73}}（仍包含黑色符号选项的性质）表示在声明后可用。下面举一个声明算法环境和题注目录的例子：
\begin{ctexexam}
\usepackage{newfloat}
\DeclareFloatingEnvironment[
@@ -1204,7 +1203,7 @@
\command{labelformat}[\marg{计数器}\marg{标签引用格式}]
标签格式命令 \cs{labelformat} 可以设置标签引用格式。\meta{标签引用格式} 中 \code{\#1} 代表 \cs*{the}\meta{计数器}，可以设置引用序号的前缀和后缀。也可以使用 \pkg*{cleveref} 宏包提供更强大的标签功能。
\command{AtEndPreamble}[\marg{钩子代码}]
- 导言区末尾的钩子命令。为了保证兼容性 \pkg*{hyperref} 宏包被设计在导言区末尾载入，一些情况下需要合适的钩子在 \pkg*{hyperref} 后方执行 \meta{钩子代码}，例如载入 \pkg*{cleveref} 宏包。
+ 导言区末尾的钩子命令。为了保证兼容性 \pkg*{hyperref} 宏包被设计在导言区末尾载入，一些情况下需要钩子命令在 \pkg*{hyperref} 宏包后方执行 \meta{钩子代码}，例如载入 \pkg*{cleveref} 宏包。
\begin{ctexexam}
\labelformat{chapter}{第#1章}
\labelformat{chapter}{第\thechapter 章}
@@ -1336,7 +1335,7 @@
\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} 宏包。}
- \shortversion{v = 2024C,date = 2024/01/06,changes = 核对依赖宏包的更新改动，优化使用手册的内容细节。}
+ \shortversion{v = 2024D,date = 2024/01/07,changes = 核对依赖宏包的更新改动，优化使用手册的内容细节。}
\end{changelog}
\nocite{*}
Modified: trunk/Master/texmf-dist/source/latex/easybook/easybook.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/easybook/easybook.dtx 2024-01-07 21:25:54 UTC (rev 69331)
+++ trunk/Master/texmf-dist/source/latex/easybook/easybook.dtx 2024-01-07 21:26:03 UTC (rev 69332)
@@ -15,7 +15,7 @@
%<*class>
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2024/01/06}{2024C}
+\ProvidesExplClass{easybook}{2024/01/07}{2024D}
{Easily typesetting Chinese theses or books}
\bool_set_false:N \l__eb_compile_draft_bool
@@ -223,12 +223,12 @@
\cs_generate_variant:Nn \eb_put_newtxmath:n { V }
\str_case:VnF \l__eb_mathfont_value_tl
{
- { times } { \LoadPackage{newtxmath+bm} }
+ { times } { \RequirePackage{newtxmath,bm} }
{ none } { }
}
{
\eb_put_newtxmath:V \l__eb_mathfont_value_tl
- \LoadPackage{newtxmath+bm}
+ \RequirePackage{newtxmath,bm}
}
\ctex_set:n
@@ -302,7 +302,7 @@
%<*package>
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2024/01/06}{2024C}
+\ProvidesExplPackage{easybase}{2024/01/07}{2024D}
{Easily typesetting Chinese theses or books}
\cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -362,7 +362,7 @@
}
\cs_new_protected:Npn \eb_if_package_loaded:nnF #1#2#3
{
- \@ifpackageloaded{#1}
+ \IfPackageLoadedTF{#1}
{
\tl_if_blank:nTF {#2}
{ \msg_warning:nnn { easybase } { package-repeat-load-ii } {#1} }
@@ -433,11 +433,11 @@
\PassOptionsToPackage{many}{tcolorbox}
\ProcessKeysOptions{easybase}
\PassOptionsToPackage{\g__eb_ctex_options_clist}{ctex}
-\@ifclassloaded{ctexbook}{}
+\IfClassLoadedTF{ctexbook}{}
{
- \@ifclassloaded{ctexart}{}
+ \IfClassLoadedTF{ctexart}{}
{
- \@ifclassloaded{ctexrep}{}
+ \IfClassLoadedTF{ctexrep}{}
{\RequirePackage[heading]{ctex}}
}
}
@@ -930,7 +930,7 @@
{
\bool_if:NT \l__eb_fnpara_bottom_bool
{
- \@ifpackageloaded{footmisc}
+ \IfPackageLoadedTF{footmisc}
{\msg_warning:nn { easybase } { bottom-not-compatible }}
{
\cs_set:Npn \@makecol
@@ -1702,7 +1702,7 @@
},
caption-every .initial:n = \sffamily\small,
footnote .tl_set:N = \l__eb_subfont_footnote_tl,
- marginpar .tl_set:N = \l__eb_subfont_marginpar_tl,
+ marginpar .tl_set:N = \marginfont,
marginpar .initial:n = \footnotesize,
unknown .code:n = \eb_msg_deprecated_option:n { subfont }
}
@@ -1757,7 +1757,6 @@
unknown .code:n = \eb_msg_deprecated_option:n { spread }
}
-\tl_gset:Nn \marginfont { \l__eb_subfont_marginpar_tl }
\eb_seq_map_inline:nn
{ table,figure,listing }
{
@@ -1927,7 +1926,7 @@
}
\bool_if:NT \l__eb_theorem_support_bool
{
- \LoadPackage{amsthm+thmtools}
+ \RequirePackage{amsthm,thmtools}
\eb_package_date_check:nn { thmtools } { 2020/08/01 }
\cs_set_eq:NN \eb at declaretheorem@save \declaretheorem
\cs_set_eq:NN \eb at declaretheoremsyle@save \declaretheoremstyle
@@ -2029,7 +2028,7 @@
\cs_new_protected:Npn \eb_bibtex_natbib_set:
{
- \LoadPackage[sort&compress]{natbib}
+ \RequirePackage[sort&compress]{natbib}
\str_case:VnTF \l__eb_bib_both_style_tl
{
{ numerical }
@@ -2084,7 +2083,7 @@
{ \eb_put_biblatex:n { style = \l__eb_bib_both_style_tl } }
\tl_if_blank:VF \l__eb_bib_cite_style_tl
{ \eb_put_biblatex:n { citestyle = \l__eb_bib_cite_style_tl } }
- \LoadPackage[backend = biber]{biblatex}
+ \RequirePackage[backend = biber]{biblatex}
\clist_map_function:NN \l__eb_bib_datafile_clist \addbibresource
\tl_gset:Nn \blx at default@theheading { bibintoc }
\defbibheading{bibintoc}[\bibname]{\eb_biber_toc_title:n {##1}}
@@ -2268,7 +2267,7 @@
}
\ctex_at_end_preamble:n
{
- \LoadPackage{hyperref}
+ \RequirePackage{hyperref}
\urlstyle{same}
\eb_allow_url_break:
\eb_put_hyperref:n
@@ -2286,7 +2285,7 @@
{ \AfterPreamble{\eb at labelformat@save{#1}{#2}} }
\AtBeginDocument
{
- \@ifpackageloaded{cleveref}{}
+ \IfPackageLoadedTF{cleveref}{}
{
\labelformat{part}{\CTEXthepart}
\labelformat{chapter}{\CTEXthechapter}
@@ -2328,7 +2327,7 @@
}
%</package>
%<*tcolorbox>
-\ProvidesExplFile{eb-tcolorbox.cfg}{2024/01/06}{2024C}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2024/01/07}{2024D}
{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-07 21:25:54 UTC (rev 69331)
+++ trunk/Master/texmf-dist/tex/latex/easybook/easybase.sty 2024-01-07 21:26:03 UTC (rev 69332)
@@ -20,7 +20,7 @@
%% This work has the LPPL maintenance status `maintained'.
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2024/01/06}{2024C}
+\ProvidesExplPackage{easybase}{2024/01/07}{2024D}
{Easily typesetting Chinese theses or books}
\cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -80,7 +80,7 @@
}
\cs_new_protected:Npn \eb_if_package_loaded:nnF #1#2#3
{
- \@ifpackageloaded{#1}
+ \IfPackageLoadedTF{#1}
{
\tl_if_blank:nTF {#2}
{ \msg_warning:nnn { easybase } { package-repeat-load-ii } {#1} }
@@ -151,11 +151,11 @@
\PassOptionsToPackage{many}{tcolorbox}
\ProcessKeysOptions{easybase}
\PassOptionsToPackage{\g__eb_ctex_options_clist}{ctex}
-\@ifclassloaded{ctexbook}{}
+\IfClassLoadedTF{ctexbook}{}
{
- \@ifclassloaded{ctexart}{}
+ \IfClassLoadedTF{ctexart}{}
{
- \@ifclassloaded{ctexrep}{}
+ \IfClassLoadedTF{ctexrep}{}
{\RequirePackage[heading]{ctex}}
}
}
@@ -648,7 +648,7 @@
{
\bool_if:NT \l__eb_fnpara_bottom_bool
{
- \@ifpackageloaded{footmisc}
+ \IfPackageLoadedTF{footmisc}
{\msg_warning:nn { easybase } { bottom-not-compatible }}
{
\cs_set:Npn \@makecol
@@ -1420,7 +1420,7 @@
},
caption-every .initial:n = \sffamily\small,
footnote .tl_set:N = \l__eb_subfont_footnote_tl,
- marginpar .tl_set:N = \l__eb_subfont_marginpar_tl,
+ marginpar .tl_set:N = \marginfont,
marginpar .initial:n = \footnotesize,
unknown .code:n = \eb_msg_deprecated_option:n { subfont }
}
@@ -1475,7 +1475,6 @@
unknown .code:n = \eb_msg_deprecated_option:n { spread }
}
-\tl_gset:Nn \marginfont { \l__eb_subfont_marginpar_tl }
\eb_seq_map_inline:nn
{ table,figure,listing }
{
@@ -1645,7 +1644,7 @@
}
\bool_if:NT \l__eb_theorem_support_bool
{
- \LoadPackage{amsthm+thmtools}
+ \RequirePackage{amsthm,thmtools}
\eb_package_date_check:nn { thmtools } { 2020/08/01 }
\cs_set_eq:NN \eb at declaretheorem@save \declaretheorem
\cs_set_eq:NN \eb at declaretheoremsyle@save \declaretheoremstyle
@@ -1747,7 +1746,7 @@
\cs_new_protected:Npn \eb_bibtex_natbib_set:
{
- \LoadPackage[sort&compress]{natbib}
+ \RequirePackage[sort&compress]{natbib}
\str_case:VnTF \l__eb_bib_both_style_tl
{
{ numerical }
@@ -1802,7 +1801,7 @@
{ \eb_put_biblatex:n { style = \l__eb_bib_both_style_tl } }
\tl_if_blank:VF \l__eb_bib_cite_style_tl
{ \eb_put_biblatex:n { citestyle = \l__eb_bib_cite_style_tl } }
- \LoadPackage[backend = biber]{biblatex}
+ \RequirePackage[backend = biber]{biblatex}
\clist_map_function:NN \l__eb_bib_datafile_clist \addbibresource
\tl_gset:Nn \blx at default@theheading { bibintoc }
\defbibheading{bibintoc}[\bibname]{\eb_biber_toc_title:n {##1}}
@@ -1986,7 +1985,7 @@
}
\ctex_at_end_preamble:n
{
- \LoadPackage{hyperref}
+ \RequirePackage{hyperref}
\urlstyle{same}
\eb_allow_url_break:
\eb_put_hyperref:n
@@ -2004,7 +2003,7 @@
{ \AfterPreamble{\eb at labelformat@save{#1}{#2}} }
\AtBeginDocument
{
- \@ifpackageloaded{cleveref}{}
+ \IfPackageLoadedTF{cleveref}{}
{
\labelformat{part}{\CTEXthepart}
\labelformat{chapter}{\CTEXthechapter}
Modified: trunk/Master/texmf-dist/tex/latex/easybook/easybook.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/easybook/easybook.cls 2024-01-07 21:25:54 UTC (rev 69331)
+++ trunk/Master/texmf-dist/tex/latex/easybook/easybook.cls 2024-01-07 21:26:03 UTC (rev 69332)
@@ -20,7 +20,7 @@
%% This work has the LPPL maintenance status `maintained'.
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2024/01/06}{2024C}
+\ProvidesExplClass{easybook}{2024/01/07}{2024D}
{Easily typesetting Chinese theses or books}
\bool_set_false:N \l__eb_compile_draft_bool
@@ -228,12 +228,12 @@
\cs_generate_variant:Nn \eb_put_newtxmath:n { V }
\str_case:VnF \l__eb_mathfont_value_tl
{
- { times } { \LoadPackage{newtxmath+bm} }
+ { times } { \RequirePackage{newtxmath,bm} }
{ none } { }
}
{
\eb_put_newtxmath:V \l__eb_mathfont_value_tl
- \LoadPackage{newtxmath+bm}
+ \RequirePackage{newtxmath,bm}
}
\ctex_set:n
Modified: trunk/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg
===================================================================
--- trunk/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg 2024-01-07 21:25:54 UTC (rev 69331)
+++ trunk/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg 2024-01-07 21:26:03 UTC (rev 69332)
@@ -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/06}{2024C}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2024/01/07}{2024D}
{Customization of tcolorbox for easybook}
\cs_set_protected:Npn \addtotcbstyle #1#2
More information about the tex-live-commits
mailing list.