texlive[64929] Master/texmf-dist: easybook (4nov22)
commits+karl at tug.org
commits+karl at tug.org
Fri Nov 4 20:57:37 CET 2022
Revision: 64929
http://tug.org/svn/texlive?view=revision&revision=64929
Author: karl
Date: 2022-11-04 20:57:37 +0100 (Fri, 04 Nov 2022)
Log Message:
-----------
easybook (4nov22)
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 2022-11-04 19:57:22 UTC (rev 64928)
+++ trunk/Master/texmf-dist/doc/latex/easybook/easybook.tex 2022-11-04 19:57:37 UTC (rev 64929)
@@ -21,8 +21,8 @@
name = easybook,
color-scheme = blue,
title = EASYBOOK使用手册,
- version = v1.71A,
- date = 2022/10/26,
+ version = v1.71C,
+ date = 2022/11/04,
authors = 瞿毅,
info = 简便地排版中文学位论文或书籍,
email = toquyi at 163.com,
@@ -51,7 +51,10 @@
\setlist[1]{labelindent = \parindent}
\setlist[itemize,1]{label = smallbullet,leftmargin = *}
\setcounter{tocdepth}{2}
-\SetTblrInner{hline{1,Z} = {0.8pt,blue}}
+\SetTblrInner[talltblr]{hline{1,Z} = {0.8pt,blue}}
+\SetTblrTemplate{caption}{empty}
+\DefTblrTemplate{remark-sep}{default}{\space}
+\SetTblrStyle{remark}{font = \normalfont}
\ExplSyntaxOn\makeatletter
% * Do not add entries to the index
@@ -108,12 +111,12 @@
% Use a separate module margin marker to prevent overlap
\newcommand{\smodule}[1]{\cnltx at module@text*{\normalsize #1}}
\newcommand{\noitemsep}{\setlength{\itemsep}{0ex}}
-\newcommand{\insertblr}[2]
+\newcommand{\insertalltblr}[3][]
{
\begin{center}
- \begin{tblr}{#1}
- #2
- \end{tblr}
+ \begin{talltblr}[#1]{#2}
+ #3
+ \end{talltblr}
\end{center}
}
\renewcommand{\cnltx at package@abstract at width}{0.85\linewidth}
@@ -222,8 +225,8 @@
\ding{72} 需要注意正确\textbf{编译索引}要增加 \code{-shell-escape} 命令行选项。
\subsection{依赖宏包}
-以下为 \pkg*{easybase} 直接调用的关键宏包清单，通常情况下它们是常用且稳定的。棕色背景的宏包表示修改了或依赖它们的内部命令。青色背景的宏包表示并未调用它们，但做了一些预配置，可在导言区手动载入以实现相关的功能。
-\insertblr
+以下为 \pkg*{easybase} 直接调用的关键宏包清单，通常情况下它们是常用且稳定的。棕色背景的宏包表示修改了或依赖它们的内部命令。绿色背景的宏包表示并未调用它们，但做了一些预配置，可在导言区手动载入以实现相关的功能。
+\insertalltblr
{
colspec = @{}*{5}{c}@{},
cells = {cmd = \pkg*},
@@ -283,21 +286,22 @@
\begin{options}
\keychoice{font}{noto,times,times*,ebgaramond,libertine,palatino,auto}\dtag\Default{auto}
预置的英文字体相关配置方案如下表所示。这些字体已经包含在了 \TeX Live 发行版中，所以通常不需要再专门安装。如果您想使用其它英文字体，可以使用 \pkg*{fontspec} 宏包的相关命令进行设置。
- \insertblr
- {
- colspec = @{}*{4}{c}@{},
- hline{2} = {0.5pt,blue},
- row{1} = {font = \sffamily},
- column{1} = {cmd = \code}
- }{
- & 正文字体 & 无衬线字体 & 等宽字体 \\
- noto & Noto Serif & Noto Sans & Noto Sans Mono \\
- times & XITS & TG Heros & TG Cursor \\
- times* & Times New Roman & Arial & Courier New \\
- ebgaramond & EB Garamond & Libertinus Sans & LM Mono \\
- palatino & TG Pagella & Libertinus Sans & LM Mono \\
- libertine & Libertinus Serif & Libertinus Sans & LM Mono
- }
+ \insertalltblr[
+ remark{\ding{72}} = \code{times*} 方案为 \textsf{windows} 系统的预置字体。
+ ]{
+ colspec = @{}*{4}{c}@{},
+ hline{2} = {0.5pt,blue},
+ row{1} = {font = \sffamily},
+ column{1} = {cmd = \code}
+ }{
+ & 正文字体 & 无衬线字体 & 等宽字体 \\
+ noto & Noto Serif & Noto Sans & Noto Sans Mono \\
+ times & XITS & TG Heros & TG Cursor \\
+ times* & Times New Roman & Arial & Courier New \\
+ ebgaramond & EB Garamond & Libertinus Sans & LM Mono \\
+ palatino & TG Pagella & Libertinus Sans & LM Mono \\
+ libertine & Libertinus Serif & Libertinus Sans & LM Mono
+ }
\end{options}
\begin{options}
@@ -320,7 +324,7 @@
\begin{commands}
\command*{ctexset}[\marg{键值列表}]
\cls*{easybook} 扩展了 \CTeX 宏集 \hologo{LaTeX3} 风格键值的通用控制命令 \cs*{ctexset}，接口选项同样可用它设置，原有的 \meta{键值列表} 仍然可用。本文档类目前有9个模块用于实现常规的排版功能，如下表所示。模块名也是统一接口 \cs*{ctexset} 的路径，不同模块单独接口的命令名\textbf{加上前缀} \code{eb}：
- \insertblr
+ \insertalltblr
{
colspec = @{}*{5}{c}@{},
hline{3} = {0.5pt,blue},
Modified: trunk/Master/texmf-dist/source/latex/easybook/easybook.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/easybook/easybook.dtx 2022-11-04 19:57:22 UTC (rev 64928)
+++ trunk/Master/texmf-dist/source/latex/easybook/easybook.dtx 2022-11-04 19:57:37 UTC (rev 64929)
@@ -15,7 +15,7 @@
%<*class>
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2022/10/26}{1.71A}
+\ProvidesExplClass{easybook}{2022/11/04}{1.71C}
{Easily typesetting Chinese theses or books}
\bool_set_false:N \l__eb_compile_draft_bool
@@ -75,6 +75,7 @@
\cs_new_eq:NN \eb_set_family:nnn \ctex_ltj_set_family:nnn
\cs_new_eq:NN \eb_switch_family:n \ctex_ltj_switch_family:n
}
+\cs_generate_variant:Nn \eb_set_family:nnn { x }
\cs_new_protected:Npn \eb_setmainfont:nn #1#2
{ \__fontspec_main_setmainfont:nn {#2} {#1} }
\cs_new_protected:Npn \eb_setsansfont:nn #1#2
@@ -82,11 +83,11 @@
\cs_new_protected:Npn \eb_setmonofont:nn #1#2
{ \__fontspec_main_setmonofont:nn {#2} {#1} }
\cs_new_protected:Npn \eb_setCJKmainfont:nn #1#2
- { \eb_set_family:nnn { \CJKrmdefault } {#2} {#1} }
+ { \eb_set_family:xnn { \CJKrmdefault } {#2} {#1} }
\cs_new_protected:Npn \eb_setCJKsansfont:nn #1#2
- { \eb_set_family:nnn { \CJKsfdefault } {#2} {#1} }
+ { \eb_set_family:xnn { \CJKsfdefault } {#2} {#1} }
\cs_new_protected:Npn \eb_setCJKmonofont:nn #1#2
- { \eb_set_family:nnn { \CJKttdefault } {#2} {#1} }
+ { \eb_set_family:xnn { \CJKttdefault } {#2} {#1} }
\eb_seq_map_inline:nn
{ main,sans,mono,CJKmain,CJKsans,CJKmono }
{
@@ -303,7 +304,7 @@
%<*package>
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2022/10/26}{1.71A}
+\ProvidesExplPackage{easybase}{2022/11/04}{1.71C}
{Easily typesetting Chinese theses or books}
\cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -2333,7 +2334,7 @@
}
%</package>
%<*tcolorbox>
-\ProvidesExplFile{eb-tcolorbox.cfg}{2022/10/26}{1.71A}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2022/11/04}{1.71C}
{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 2022-11-04 19:57:22 UTC (rev 64928)
+++ trunk/Master/texmf-dist/tex/latex/easybook/easybase.sty 2022-11-04 19:57:37 UTC (rev 64929)
@@ -20,7 +20,7 @@
%% This work has the LPPL maintenance status `maintained'.
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2022/10/26}{1.71A}
+\ProvidesExplPackage{easybase}{2022/11/04}{1.71C}
{Easily typesetting Chinese theses or books}
\cs_generate_variant:Nn \dim_set:Nn { NV }
Modified: trunk/Master/texmf-dist/tex/latex/easybook/easybook.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/easybook/easybook.cls 2022-11-04 19:57:22 UTC (rev 64928)
+++ trunk/Master/texmf-dist/tex/latex/easybook/easybook.cls 2022-11-04 19:57:37 UTC (rev 64929)
@@ -20,7 +20,7 @@
%% This work has the LPPL maintenance status `maintained'.
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2022/10/26}{1.71A}
+\ProvidesExplClass{easybook}{2022/11/04}{1.71C}
{Easily typesetting Chinese theses or books}
\bool_set_false:N \l__eb_compile_draft_bool
@@ -80,6 +80,7 @@
\cs_new_eq:NN \eb_set_family:nnn \ctex_ltj_set_family:nnn
\cs_new_eq:NN \eb_switch_family:n \ctex_ltj_switch_family:n
}
+\cs_generate_variant:Nn \eb_set_family:nnn { x }
\cs_new_protected:Npn \eb_setmainfont:nn #1#2
{ \__fontspec_main_setmainfont:nn {#2} {#1} }
\cs_new_protected:Npn \eb_setsansfont:nn #1#2
@@ -87,11 +88,11 @@
\cs_new_protected:Npn \eb_setmonofont:nn #1#2
{ \__fontspec_main_setmonofont:nn {#2} {#1} }
\cs_new_protected:Npn \eb_setCJKmainfont:nn #1#2
- { \eb_set_family:nnn { \CJKrmdefault } {#2} {#1} }
+ { \eb_set_family:xnn { \CJKrmdefault } {#2} {#1} }
\cs_new_protected:Npn \eb_setCJKsansfont:nn #1#2
- { \eb_set_family:nnn { \CJKsfdefault } {#2} {#1} }
+ { \eb_set_family:xnn { \CJKsfdefault } {#2} {#1} }
\cs_new_protected:Npn \eb_setCJKmonofont:nn #1#2
- { \eb_set_family:nnn { \CJKttdefault } {#2} {#1} }
+ { \eb_set_family:xnn { \CJKttdefault } {#2} {#1} }
\eb_seq_map_inline:nn
{ main,sans,mono,CJKmain,CJKsans,CJKmono }
{
Modified: trunk/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg
===================================================================
--- trunk/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg 2022-11-04 19:57:22 UTC (rev 64928)
+++ trunk/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg 2022-11-04 19:57:37 UTC (rev 64929)
@@ -18,7 +18,7 @@
%% LaTeX version 2005/12/01 or later.
%%
%% This work has the LPPL maintenance status `maintained'.
-\ProvidesExplFile{eb-tcolorbox.cfg}{2022/10/26}{1.71A}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2022/11/04}{1.71C}
{Customization of tcolorbox for easybook}
\cs_set_protected:Npn \addtotcbstyle #1#2
More information about the tex-live-commits
mailing list.