texlive[70066] Master/texmf-dist: easybook (22feb24)
commits+karl at tug.org
commits+karl at tug.org
Thu Feb 22 21:59:58 CET 2024
Revision: 70066
https://tug.org/svn/texlive?view=revision&revision=70066
Author: karl
Date: 2024-02-22 21:59:58 +0100 (Thu, 22 Feb 2024)
Log Message:
-----------
easybook (22feb24)
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-02-22 20:59:47 UTC (rev 70065)
+++ trunk/Master/texmf-dist/doc/latex/easybook/easybook.tex 2024-02-22 20:59:58 UTC (rev 70066)
@@ -23,8 +23,8 @@
name = easybook,
color-scheme = blue,
title = EASYBOOK使用手册,
- version = v2024ai,
- date = 2024/02/21,
+ version = v2024ak,
+ date = 2024/02/22,
authors = 瞿毅,
info = 简便地排版中文学位论文或书籍,
email = toquyi at 163.com,
@@ -388,11 +388,11 @@
设置脚注跟随编号的计数器，仅在导言区有效。默认跟随章计数器，即开启新的章标题时脚注编号从1开始。
\keychoice{uppercase}{\fbox{all},first,none,none*}
使用 \cs{rightmark} 和 \cs{leftmark} 等标题标记命令获取标题内容用于页眉页脚时其中英文的大小写类型。\code{all} 为标题标记中的英文字母全部大写。\code{first} 为标记以英文起始时仅第一个字母大写。\code{none} 不改变标记中英文字母的大小写形式，变体 \code{none*} 则强制标记的字母均为小写形式。
- \kvsplit{brackets}{左括号,右括号}\Default{\Marg{(,)}}
- 设置行间公式编号标签的括号及格式，以英文逗号分隔，分别代表左右括号。\meta{左括号} 可以是带有一个参数的命令，用于接受编号和 \meta{右括号}。将标签括号设置为方括号，并使用无衬线字体：
+ \kvsplit{tagform}{左括号,右括号}\Default{\Marg{(,)}}\newtag[Chg]%
+ 设置行间公式标签的括号及格式，以英文逗号分隔，分别代表左右括号。\meta{左括号} 的末尾可以是带有一个参数的命令，用于接受公式编号。将标签括号设置为方括号，并给编号使用无衬线字体：
\begin{ctexexam}
- \newcommand{\bracketsf}[1]{\textsf{[#1}}
- \ebstyle{brackets = {\bracketsf,]}}
+ \newcommand{\bracketsf}[1]{[\textsf{#1}}
+ \ebstyle{tagform = {\bracketsf,]}}
\end{ctexexam}
\kvsplit-{figurepath}{\marg{路径名1}\marg{路径名2}$\cdots$\marg{路径名n}}
设置插入图片的文件夹路径名。可以有多个路径名，每个路径包含在花括号内分隔，只有一个路径时需要包含在两层括号内。
@@ -709,7 +709,7 @@
\end{commands}
\subsection[脚注格式]{脚注格式\smodule{hdrset}}
-模块 \module*{hdrset} 还可以灵活调整脚注编号和内容的格式。格式主要包括脚注标记的编号类型、字体、附加符号和对齐方式等，以及脚注内容的首行缩进、行距和字体等。基本思想是默认脚注和自定义编号脚注标记的格式分离，两种类型脚注各自正文和内容的标记又共享格式，默认脚注中正文和内容标记的编号类型分离。目前脚注模块基本兼容 \pkg*{footmisc} 宏包。
+模块 \module*{hdrset} 还可以灵活调整脚注编号和内容的格式。格式主要包括脚注标记的编号类型、字体、附加符号和对齐方式等，以及脚注内容的首行缩进、行距和字体等。基本思想是提供常规和自定义标记（\code{fncustom}）两种脚注，常规脚注的标记分为正文（\code{fnmark}）和内容（\code{fntext}）标记两种，且两者编号类型分离，自定义脚注的标记与其共享格式。目前脚注模块基本兼容 \pkg*{footmisc} 宏包。
\begin{options}
\keychoice{footnotetype}{plain,\fbox{hang},flush,bottom}
脚注的类型。悬挂缩进 \code{hang} 是默认值，\code{plain} 是原始的类型，\code{flush} 使脚注内容标记位于脚注首行边缘外侧并右对齐。当存在浮动环境排版时，脚注可能位于页面中间，\code{bottom} 使脚注始终位于页面底端。其中 \code{bottom} 是复合选项，可以与前三种类型重复或复合使用：
@@ -782,7 +782,7 @@
\command{theupfootnote}
保存正文标记编号类型选项 \option{fnmark-num} 指定的正文标记。
\command{thedownfootnote}
- 保存内容标记编号类型选项 \option{fnmtext-num} 指定的内容标记。
+ 保存内容标记编号类型选项 \option{fntext-num} 指定的内容标记。
\end{commands}
\begin{ctexexam}
\defupfntmark{\super[vmove = 2pt]{\theupfootnote}}
@@ -1401,7 +1401,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 = 2024ai,date = 2024/02/21]
+ \begin{version}[v = 2024ak,date = 2024/02/22]
\fixed
\item 修复图表等浮动环境题注目录中条目标签编号的计数器值显示错误问题。
\item 修复附录命令 \cs{appendix} 的可选参数设置英文目录中条目名字和编号失效的问题。
Modified: trunk/Master/texmf-dist/source/latex/easybook/easybook.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/easybook/easybook.dtx 2024-02-22 20:59:47 UTC (rev 70065)
+++ trunk/Master/texmf-dist/source/latex/easybook/easybook.dtx 2024-02-22 20:59:58 UTC (rev 70066)
@@ -15,11 +15,11 @@
%<*class>
\NeedsTeXFormat{LaTeX2e}[2021/11/15]
\RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2024/02/21}{2024ai}
+\ProvidesExplClass{easybook}{2024/02/22}{2024ak}
{Easily typesetting Chinese theses or books}
-\bool_set_false:N \l__eb_compile_draft_bool
-\bool_set_false:N \l__eb_title_newline_bool
+\bool_new:N \l__eb_compile_draft_bool
+\bool_new:N \l__eb_title_newline_bool
\bool_set_true:N \l__eb_class_mode_book_bool
\clist_new:N \g__eb_doc_options_clist
\cs_new_protected:Npn \eb_put_ctexbook:n #1
@@ -297,7 +297,7 @@
%<*package>
\NeedsTeXFormat{LaTeX2e}[2021/11/15]
\RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2024/02/21}{2024ai}
+\ProvidesExplPackage{easybase}{2024/02/22}{2024ak}
{Easily typesetting Chinese theses or books}
\cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -506,10 +506,10 @@
Please~update~your~macro~package~from~CTAN.
}
-\NewDocumentCommand{\eb_assign_tag_brackets:n}
+\NewDocumentCommand{\eb_assign_tagform:n}
{>{\SplitArgument{1}{,}}m}
- {\eb_assign_tag_brackets_pos:nn #1}
-\cs_new_protected:Npn \eb_assign_tag_brackets_pos:nn #1#2
+ {\eb_assign_tagform_pos:nn #1}
+\cs_new_protected:Npn \eb_assign_tagform_pos:nn #1#2
{
\tl_set:Nn \eb at tag@brackets at left {#1}
\tl_set:Nn \eb at tag@brackets at right {#2}
@@ -519,11 +519,10 @@
\maketag@@@
{
\color{ctex at emph}
- \eb at tag@brackets at left
- {
- \ignorespaces{#1}\unskip\@@italiccorr
- \eb at tag@brackets at right
- }
+ \ignorespaces
+ \eb at tag@brackets at left{#1}
+ \unskip\@@italiccorr
+ \eb at tag@brackets at right
}
}
\ctex_define:nn { style }
@@ -536,8 +535,9 @@
uppercase .tl_set:N = \l__eb_mark_uppercase_value_tl,
uppercase .default:n = all,
uppercase .initial:n = all,
- brackets .code:n = \eb_assign_tag_brackets:n {#1},
- brackets .initial:n = { (,) },
+ tagform .code:n = \eb_assign_tagform:n {#1},
+ tagform .initial:n = { (,) },
+ brackets .meta:n = { tagform = {#1} },
figurepath .tl_set:N = \l_eb_graphics_path_tl
}
@@ -1331,7 +1331,7 @@
\cs_new_protected:Npn \SetTocOuter #1
{ \keys_set:nn { eb/tocouter } {#1} }
\tl_new:N \eb at bitoc@title
-\bool_set_false:N \l__eb_toc_notitle_bool
+\bool_new:N \l__eb_toc_notitle_bool
\newbool{bitoc}
\cs_new:Npn \ebifbitoc { \ifbool{bitoc} }
\keys_define:nn { eb/tocouter }
@@ -2260,15 +2260,17 @@
color-every .code:n = \eb_define_theme_color:n { \exp_not:n {#1} }
}
-\bool_set_false:N \l__eb_toc_number_color_bool
+\bool_new:N \l__eb_toc_number_color_bool
\cs_new_protected:Npn \eb_link_border_set:n #1
{
- \AtBeginDocument
+ \bool_set_false:N \l__eb_toc_number_color_bool
+ \ctex_at_end_package:nn { hyperref }
{
\def\@pdfborder{#1}
\def\Hy at colorlink ##1 {\begingroup}
\def\Hy at endcolorlink{\endgroup}
}
+ \eb_put_hyperref:n { colorlinks = false }
}
\cs_new_protected:Npn \eb_link_colors_set:
{
@@ -2388,7 +2390,7 @@
}
%</package>
%<*tcolorbox>
-\ProvidesExplFile{eb-tcolorbox.cfg}{2024/02/21}{2024ai}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2024/02/22}{2024ak}
{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-02-22 20:59:47 UTC (rev 70065)
+++ trunk/Master/texmf-dist/tex/latex/easybook/easybase.sty 2024-02-22 20:59:58 UTC (rev 70066)
@@ -20,7 +20,7 @@
%% This work has the LPPL maintenance status `maintained'.
\NeedsTeXFormat{LaTeX2e}[2021/11/15]
\RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2024/02/21}{2024ai}
+\ProvidesExplPackage{easybase}{2024/02/22}{2024ak}
{Easily typesetting Chinese theses or books}
\cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -229,10 +229,10 @@
Please~update~your~macro~package~from~CTAN.
}
-\NewDocumentCommand{\eb_assign_tag_brackets:n}
+\NewDocumentCommand{\eb_assign_tagform:n}
{>{\SplitArgument{1}{,}}m}
- {\eb_assign_tag_brackets_pos:nn #1}
-\cs_new_protected:Npn \eb_assign_tag_brackets_pos:nn #1#2
+ {\eb_assign_tagform_pos:nn #1}
+\cs_new_protected:Npn \eb_assign_tagform_pos:nn #1#2
{
\tl_set:Nn \eb at tag@brackets at left {#1}
\tl_set:Nn \eb at tag@brackets at right {#2}
@@ -242,11 +242,10 @@
\maketag@@@
{
\color{ctex at emph}
- \eb at tag@brackets at left
- {
- \ignorespaces{#1}\unskip\@@italiccorr
- \eb at tag@brackets at right
- }
+ \ignorespaces
+ \eb at tag@brackets at left{#1}
+ \unskip\@@italiccorr
+ \eb at tag@brackets at right
}
}
\ctex_define:nn { style }
@@ -259,8 +258,9 @@
uppercase .tl_set:N = \l__eb_mark_uppercase_value_tl,
uppercase .default:n = all,
uppercase .initial:n = all,
- brackets .code:n = \eb_assign_tag_brackets:n {#1},
- brackets .initial:n = { (,) },
+ tagform .code:n = \eb_assign_tagform:n {#1},
+ tagform .initial:n = { (,) },
+ brackets .meta:n = { tagform = {#1} },
figurepath .tl_set:N = \l_eb_graphics_path_tl
}
@@ -1054,7 +1054,7 @@
\cs_new_protected:Npn \SetTocOuter #1
{ \keys_set:nn { eb/tocouter } {#1} }
\tl_new:N \eb at bitoc@title
-\bool_set_false:N \l__eb_toc_notitle_bool
+\bool_new:N \l__eb_toc_notitle_bool
\newbool{bitoc}
\cs_new:Npn \ebifbitoc { \ifbool{bitoc} }
\keys_define:nn { eb/tocouter }
@@ -1983,15 +1983,17 @@
color-every .code:n = \eb_define_theme_color:n { \exp_not:n {#1} }
}
-\bool_set_false:N \l__eb_toc_number_color_bool
+\bool_new:N \l__eb_toc_number_color_bool
\cs_new_protected:Npn \eb_link_border_set:n #1
{
- \AtBeginDocument
+ \bool_set_false:N \l__eb_toc_number_color_bool
+ \ctex_at_end_package:nn { hyperref }
{
\def\@pdfborder{#1}
\def\Hy at colorlink ##1 {\begingroup}
\def\Hy at endcolorlink{\endgroup}
}
+ \eb_put_hyperref:n { colorlinks = false }
}
\cs_new_protected:Npn \eb_link_colors_set:
{
Modified: trunk/Master/texmf-dist/tex/latex/easybook/easybook.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/easybook/easybook.cls 2024-02-22 20:59:47 UTC (rev 70065)
+++ trunk/Master/texmf-dist/tex/latex/easybook/easybook.cls 2024-02-22 20:59:58 UTC (rev 70066)
@@ -20,11 +20,11 @@
%% This work has the LPPL maintenance status `maintained'.
\NeedsTeXFormat{LaTeX2e}[2021/11/15]
\RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2024/02/21}{2024ai}
+\ProvidesExplClass{easybook}{2024/02/22}{2024ak}
{Easily typesetting Chinese theses or books}
-\bool_set_false:N \l__eb_compile_draft_bool
-\bool_set_false:N \l__eb_title_newline_bool
+\bool_new:N \l__eb_compile_draft_bool
+\bool_new:N \l__eb_title_newline_bool
\bool_set_true:N \l__eb_class_mode_book_bool
\clist_new:N \g__eb_doc_options_clist
\cs_new_protected:Npn \eb_put_ctexbook:n #1
Modified: trunk/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg
===================================================================
--- trunk/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg 2024-02-22 20:59:47 UTC (rev 70065)
+++ trunk/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg 2024-02-22 20:59:58 UTC (rev 70066)
@@ -18,7 +18,7 @@
%% LaTeX version 2005/12/01 or later.
%%
%% This work has the LPPL maintenance status `maintained'.
-\ProvidesExplFile{eb-tcolorbox.cfg}{2024/02/21}{2024ai}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2024/02/22}{2024ak}
{Customization of tcolorbox for easybook}
\cs_set_protected:Npn \addtotcbstyle #1#2
More information about the tex-live-commits
mailing list.