texlive[69650] Master: easybook (31jan24)
commits+karl at tug.org
commits+karl at tug.org
Wed Jan 31 22:00:21 CET 2024
Revision: 69650
https://tug.org/svn/texlive?view=revision&revision=69650
Author: karl
Date: 2024-01-31 22:00:20 +0100 (Wed, 31 Jan 2024)
Log Message:
-----------
easybook (31jan24)
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
trunk/Master/tlpkg/libexec/ctan2tds
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-31 20:59:40 UTC (rev 69649)
+++ trunk/Master/texmf-dist/doc/latex/easybook/easybook.tex 2024-01-31 21:00:20 UTC (rev 69650)
@@ -23,8 +23,8 @@
name = easybook,
color-scheme = blue,
title = EASYBOOK使用手册,
- version = v2024P,
- date = 2024/01/28,
+ version = v2024S,
+ date = 2024/01/31,
authors = 瞿毅,
info = 简便地排版中文学位论文或书籍,
email = toquyi at 163.com,
@@ -832,7 +832,7 @@
\begin{commands}
\command{RegisterTocName}[\marg{条目名}]
- 给条目类型名称为 \meta{条目名} 的标题注册用于设置目录样式的选项，即选项前有符号 \ding{73} 表示需要注册后使用。前面提到的条目类型均已注册，需要注意新类型的条目注册后选项初始值\textbf{均为空}。
+ 给条目类型名称为 \meta{条目名} 的标题注册用于设置目录样式的选项，即选项前有符号 \ding{73} 表示需要注册后使用。前面提到的条目类型均已注册，新类型的条目注册后选项初始值与图表条目相同。
\command{contentsuse}[\marg{条目名}\marg{扩展名}]
激活条目类型名称为 \meta{条目名} 的目录定制功能，它使用的目录文件后缀为 \meta{扩展名}。需要在激活条目后再使用命令 \cs{RegisterTocName} 注册选项。
\command{DeclareFloatList}[\marg{条目名}\marg{扩展名}]
@@ -981,7 +981,7 @@
\end{commands}
\subsection[上标和下标]{上标和下标\smodule{style}}
-上标和下标的功能来自 \pkg*{spbmark} 宏包，下面有三个命令可以用于输出上标和下标。可以使用键值列表的形式对上下标格式进行局部或全局设置，下面命令中两个可选参数的键值列表是等效的。全局设置的详情见\ref{subsubsec:super-sub-script}。
+上标和下标的功能来自 \pkg*{spbmark} 宏包，下面有三个命令可以用于输出上标和下标。可以使用键值列表的形式对上下标格式进行局部或全局设置，下面命令中两个可选参数的键值列表是等效的。全局设置的详情见\ref{subsubsec:super-sub-script}，更多命令和详细用法见 \pkg*{spbmark} 宏包说明文档。
\begin{commands}
\command{super}[\sarg\oarg{键值列表1}\marg{内容}\oarg{键值列表2}]
输出上标的命令，可用于文本和数学模式，在数学模式中可代替 \code{\^{}} 符号和 \cs*{sp} 命令。
@@ -1287,7 +1287,7 @@
\keyval{width}{符号宽度}\Default{10pt}
设置适当的符号宽度可以防止文字重叠和边界溢出等问题。
\keyval{delim}{引导符}\Default{——}
- 全局的符号对照引导符。\cs{symb} 局部的 \meta{引导符} 和对齐方式是基于这个符号的宽度。
+ 全局的符号对照引导符。\cs{symb} 命令局部 \meta{引导符} 的对齐方式是基于这个符号的宽度。
\keyval{space}{符号间隙}\Default{0.25em}
符号间隙为引导符两侧与符号和说明文字间的距离。
\keychoice{item-align}{l,c,\fbox{r}}
@@ -1350,7 +1350,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} 宏包。}
- \begin{version}[v = 2024P,date = 2024/01/28,simple]
+ \begin{version}[v = 2024S,date = 2024/01/31,simple]
\item 核对依赖宏包的更新改动，优化使用手册的内容细节。
\item 修复图表等浮动环境题注目录中条目标签编号的计数器值显示错误问题。
\item 修复附录命令 \cs{appendix} 的可选参数设置英文目录中条目名字和编号失效的问题。
Modified: trunk/Master/texmf-dist/source/latex/easybook/easybook.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/easybook/easybook.dtx 2024-01-31 20:59:40 UTC (rev 69649)
+++ trunk/Master/texmf-dist/source/latex/easybook/easybook.dtx 2024-01-31 21:00:20 UTC (rev 69650)
@@ -15,7 +15,7 @@
%<*class>
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2024/01/28}{2024P}
+\ProvidesExplClass{easybook}{2024/01/31}{2024S}
{Easily typesetting Chinese theses or books}
\bool_set_false:N \l__eb_compile_draft_bool
@@ -39,18 +39,11 @@
cjkfont .code:n = \eb_put_ctexbook:n { fontset = #1 },
mathfont .tl_set:N = \l__eb_mathfont_value_tl,
mathfont .initial:n = times,
- paper .code:n = \PassOptionsToPackage{#1}{geometry},
- class .choice:,
- class .value_required:n = true,
- class/book .code:n = { },
- class/article .code:n =
- {
- \bool_set_false:N \l__eb_class_mode_book_bool
- \eb_put_ctexbook:n { oneside }
- },
config .clist_gset:N = \g__eb_config_file_clist,
- floatpage .bool_set:N = \l__eb_float_page_bool,
- theorem .bool_set:N = \l__eb_theorem_support_bool,
+ paper .code:n = { },
+ class.code:n = { },
+ floatpage.code:n = { },
+ theorem .code:n = { },
unknown .code:n = \clist_gput_right:NV \g__eb_doc_options_clist \CurrentOption
}
@@ -304,7 +297,7 @@
%<*package>
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2024/01/28}{2024P}
+\ProvidesExplPackage{easybase}{2024/01/31}{2024S}
{Easily typesetting Chinese theses or books}
\cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -391,7 +384,6 @@
\seq_map_function:NN
\l_tmpb_seq \eb_match_load_package:n
}
-\msg_redirect_module:nnn { hooks } { warning } { info }
\bool_set_true:N \l__eb_class_mode_book_bool
\bool_set_false:N \l__eb_compile_draft_bool
@@ -399,7 +391,11 @@
\keys_define:nn { easybase }
{
- draft .code:n = \bool_set_true:N \l__eb_compile_draft_bool,
+ draft .code:n =
+ {
+ \bool_set_true:N \l__eb_compile_draft_bool
+ \PassOptionsToPackage{draft}{hyperref}
+ },
floatpage .bool_set:N = \l__eb_float_page_bool,
floatpage .default:n = true,
floatpage .initial:n = false,
@@ -1419,6 +1415,7 @@
{
#1 .meta:nn = { ctex/#1 } {##1},
#1/between .tl_set:c = l__eb_toc_#1_between_hook_tl,
+ #1/between .initial:n = \bool_if:NT \l__eb_class_mode_book_bool { \vspace*{-10pt} },
#1/tocline .cs_set:cp = { eb at tocline@#1 } ##1##2,
#1/tocline .initial:n = \listnumberline{##1}##2
}
@@ -1490,6 +1487,7 @@
{
\ctex_define:n
{
+ #1 .meta:nn = { ctex/#1 } {##1},
#1/tocformat .tl_set:c = l__eb_toc_#1_format_tl,
#1/tocformat+ .code:n = \tl_put_right:cn { l__eb_toc_#1_format_tl } {##1},
#1/tocformat~+ .code:n = \tl_put_right:cn { l__eb_toc_#1_format_tl } {##1},
@@ -1507,6 +1505,12 @@
{\eb_toc_entry_if_hang:n {#1}}{}
{\tl_use:c { l__eb_toc_#1_rule_tl }}
[\tl_use:c { l__eb_toc_#1_below_tl }]
+ \ctex_set:nn {#1}
+ {
+ tocindent = 0em,
+ tocrule = \tocrule{$\cdot$},
+ tocafter = \hspace{1em}
+ }
}
\cs_new_protected:Npn \RegisterTocName #1
{
@@ -1515,13 +1519,6 @@
}
\seq_map_function:NN
\c__ctex_headings_seq \RegisterTocName
-\seq_remove_all:Nn \c__ctex_headings_seq { table }
-\seq_remove_all:Nn \c__ctex_headings_seq { figure }
-\seq_remove_all:Nn \c__ctex_headings_seq { lstlisting }
-\cs_new_protected:Npn \eb at key@path at meta@define #1
- { \ctex_define:n { #1 .meta:nn = { ctex/#1 } {##1} } }
-\seq_map_function:NN
-\c__ctex_headings_seq \eb at key@path at meta@define
\eb_seq_map_inline:nn
{
tocformat,tocformat+,tocformat~+,
@@ -1630,17 +1627,7 @@
}
},
subsection =
- {
- tocindent = \bool_if:NTF \l__eb_class_mode_book_bool { 3.8em } { 1.4em },
- tocrule = \tocrule{$\cdot$}
- },
- float =
- {
- tocindent = 0em,
- tocrule = \tocrule{$\cdot$},
- between = \bool_if:NT \l__eb_class_mode_book_bool { \vspace*{-10pt} }
- },
- tocset/tocafter-every = \hspace{1em}
+ { tocindent = \bool_if:NTF \l__eb_class_mode_book_bool { 3.8em } { 1.4em } }
}
\ctex_at_end_package:nn { imakeidx }
@@ -2333,7 +2320,7 @@
}
%</package>
%<*tcolorbox>
-\ProvidesExplFile{eb-tcolorbox.cfg}{2024/01/28}{2024P}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2024/01/31}{2024S}
{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-31 20:59:40 UTC (rev 69649)
+++ trunk/Master/texmf-dist/tex/latex/easybook/easybase.sty 2024-01-31 21:00:20 UTC (rev 69650)
@@ -20,7 +20,7 @@
%% This work has the LPPL maintenance status `maintained'.
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2024/01/28}{2024P}
+\ProvidesExplPackage{easybase}{2024/01/31}{2024S}
{Easily typesetting Chinese theses or books}
\cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -107,7 +107,6 @@
\seq_map_function:NN
\l_tmpb_seq \eb_match_load_package:n
}
-\msg_redirect_module:nnn { hooks } { warning } { info }
\bool_set_true:N \l__eb_class_mode_book_bool
\bool_set_false:N \l__eb_compile_draft_bool
@@ -115,7 +114,11 @@
\keys_define:nn { easybase }
{
- draft .code:n = \bool_set_true:N \l__eb_compile_draft_bool,
+ draft .code:n =
+ {
+ \bool_set_true:N \l__eb_compile_draft_bool
+ \PassOptionsToPackage{draft}{hyperref}
+ },
floatpage .bool_set:N = \l__eb_float_page_bool,
floatpage .default:n = true,
floatpage .initial:n = false,
@@ -1135,6 +1138,7 @@
{
#1 .meta:nn = { ctex/#1 } {##1},
#1/between .tl_set:c = l__eb_toc_#1_between_hook_tl,
+ #1/between .initial:n = \bool_if:NT \l__eb_class_mode_book_bool { \vspace*{-10pt} },
#1/tocline .cs_set:cp = { eb at tocline@#1 } ##1##2,
#1/tocline .initial:n = \listnumberline{##1}##2
}
@@ -1206,6 +1210,7 @@
{
\ctex_define:n
{
+ #1 .meta:nn = { ctex/#1 } {##1},
#1/tocformat .tl_set:c = l__eb_toc_#1_format_tl,
#1/tocformat+ .code:n = \tl_put_right:cn { l__eb_toc_#1_format_tl } {##1},
#1/tocformat~+ .code:n = \tl_put_right:cn { l__eb_toc_#1_format_tl } {##1},
@@ -1223,6 +1228,12 @@
{\eb_toc_entry_if_hang:n {#1}}{}
{\tl_use:c { l__eb_toc_#1_rule_tl }}
[\tl_use:c { l__eb_toc_#1_below_tl }]
+ \ctex_set:nn {#1}
+ {
+ tocindent = 0em,
+ tocrule = \tocrule{$\cdot$},
+ tocafter = \hspace{1em}
+ }
}
\cs_new_protected:Npn \RegisterTocName #1
{
@@ -1231,13 +1242,6 @@
}
\seq_map_function:NN
\c__ctex_headings_seq \RegisterTocName
-\seq_remove_all:Nn \c__ctex_headings_seq { table }
-\seq_remove_all:Nn \c__ctex_headings_seq { figure }
-\seq_remove_all:Nn \c__ctex_headings_seq { lstlisting }
-\cs_new_protected:Npn \eb at key@path at meta@define #1
- { \ctex_define:n { #1 .meta:nn = { ctex/#1 } {##1} } }
-\seq_map_function:NN
-\c__ctex_headings_seq \eb at key@path at meta@define
\eb_seq_map_inline:nn
{
tocformat,tocformat+,tocformat~+,
@@ -1346,17 +1350,7 @@
}
},
subsection =
- {
- tocindent = \bool_if:NTF \l__eb_class_mode_book_bool { 3.8em } { 1.4em },
- tocrule = \tocrule{$\cdot$}
- },
- float =
- {
- tocindent = 0em,
- tocrule = \tocrule{$\cdot$},
- between = \bool_if:NT \l__eb_class_mode_book_bool { \vspace*{-10pt} }
- },
- tocset/tocafter-every = \hspace{1em}
+ { tocindent = \bool_if:NTF \l__eb_class_mode_book_bool { 3.8em } { 1.4em } }
}
\ctex_at_end_package:nn { imakeidx }
Modified: trunk/Master/texmf-dist/tex/latex/easybook/easybook.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/easybook/easybook.cls 2024-01-31 20:59:40 UTC (rev 69649)
+++ trunk/Master/texmf-dist/tex/latex/easybook/easybook.cls 2024-01-31 21:00:20 UTC (rev 69650)
@@ -20,7 +20,7 @@
%% This work has the LPPL maintenance status `maintained'.
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2024/01/28}{2024P}
+\ProvidesExplClass{easybook}{2024/01/31}{2024S}
{Easily typesetting Chinese theses or books}
\bool_set_false:N \l__eb_compile_draft_bool
@@ -44,18 +44,11 @@
cjkfont .code:n = \eb_put_ctexbook:n { fontset = #1 },
mathfont .tl_set:N = \l__eb_mathfont_value_tl,
mathfont .initial:n = times,
- paper .code:n = \PassOptionsToPackage{#1}{geometry},
- class .choice:,
- class .value_required:n = true,
- class/book .code:n = { },
- class/article .code:n =
- {
- \bool_set_false:N \l__eb_class_mode_book_bool
- \eb_put_ctexbook:n { oneside }
- },
config .clist_gset:N = \g__eb_config_file_clist,
- floatpage .bool_set:N = \l__eb_float_page_bool,
- theorem .bool_set:N = \l__eb_theorem_support_bool,
+ paper .code:n = { },
+ class.code:n = { },
+ floatpage.code:n = { },
+ theorem .code:n = { },
unknown .code:n = \clist_gput_right:NV \g__eb_doc_options_clist \CurrentOption
}
Modified: trunk/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg
===================================================================
--- trunk/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg 2024-01-31 20:59:40 UTC (rev 69649)
+++ trunk/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg 2024-01-31 21:00:20 UTC (rev 69650)
@@ -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/28}{2024P}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2024/01/31}{2024S}
{Customization of tcolorbox for easybook}
\cs_set_protected:Npn \addtotcbstyle #1#2
Modified: trunk/Master/tlpkg/libexec/ctan2tds
===================================================================
--- trunk/Master/tlpkg/libexec/ctan2tds 2024-01-31 20:59:40 UTC (rev 69649)
+++ trunk/Master/tlpkg/libexec/ctan2tds 2024-01-31 21:00:20 UTC (rev 69650)
@@ -1392,6 +1392,7 @@
'tex-gyre', "&MAKEcopy",
'tex-gyre-math', "&MAKEflatten",
'tex-implementors', "die 'skipping, verbatim mail archive'",
+ 'tex-in-practice', "die 'skipping, old book examples'",
'tex-it', "die 'skipping, old support'",
'tex_it', "die 'skipping, old support'",
'texdoc', "&MAKEflatten",
More information about the tex-live-commits
mailing list.