texlive[61384] Master/texmf-dist: easybook (22dec21)
commits+karl at tug.org
commits+karl at tug.org
Wed Dec 22 22:19:42 CET 2021
Revision: 61384
http://tug.org/svn/texlive?view=revision&revision=61384
Author: karl
Date: 2021-12-22 22:19:41 +0100 (Wed, 22 Dec 2021)
Log Message:
-----------
easybook (22dec21)
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 2021-12-22 21:19:29 UTC (rev 61383)
+++ trunk/Master/texmf-dist/doc/latex/easybook/easybook.tex 2021-12-22 21:19:41 UTC (rev 61384)
@@ -20,8 +20,8 @@
name = easybook,
color-scheme = blue,
title = EASYBOOK 使用手册,
- version = v1.42A,
- date = 2021/12/20,
+ version = v1.42B,
+ date = 2021/12/22,
authors = 瞿毅,
info = 排版简体中文学位论文和书籍,
email = q1jx at foxmail.com,
@@ -356,7 +356,7 @@
\end{commands}
\subsection{上标和下标}
-上标和下标的功能来自 \pkg*{spbmark} 宏包，下面三个命令可以用于输出上标和下标。可以使用键值列表的形式对上下标格式进行局部或全局设置，下面命令中两个可选参数的键值列表是等效的。全局设置的详情见\ref{subsubsec:super-sub-script}。
+上标和下标的功能来自 \pkg*{spbmark} 宏包，下面有三个命令可以用于输出上标和下标。可以使用键值列表的形式对上下标格式进行局部或全局设置，下面命令中两个可选参数的键值列表是等效的。全局设置的详情见\ref{subsubsec:super-sub-script}。
\begin{commands}
\command{super}[\oarg{键值列表1}\splitoarg{高度,深度}\marg{内容}\oarg{键值列表2}]
输出上标的命令，与简短命令 \cs{sp} 等效。
@@ -364,9 +364,11 @@
输出下标的命令，与简短命令 \cs{sb} 等效。用法和参数与上标命令 \cs{super} 类似。
\command{supersub}[\oarg{键值列表1}\marg{上标内容}\marg{下标内容}\oarg{键值列表2}]
同时输出上标和下标的命令，与简短命令 \cs{spb} 等效。
+ \command{spbifmath}[\marg{数学模式代码}\marg{文本模式代码}]
+ 根据上下标处于数学还是文本模式分别设置不同的值，应当在格式命令或偏移距离选项中使用。
\end{commands}
-关于这三个命令键值列表中共同的选项如下所示。如果 \option{vmove}、\option{hmove} 和 \option{cmd} 选项用于 \module*{style} 模块的全局设置，它们将根据前面最近一个命令的类型设定相应值。
+上下标命令键值列表中共同的选项如下所示。如果 \option{vmove}、\option{hmove} 和 \option{cmd} 选项用于 \module*{style} 模块的全局设置，它们将根据前面最近一个命令的类型设定相应值。
\begin{options}
\keyval-{vmove}{刚性长度}\Default{0pt}
上标或下标的垂直偏移。如果是上下标命令使用则代表上标和上标间的额外垂直距离 \option{vsep}。
Modified: trunk/Master/texmf-dist/source/latex/easybook/easybook.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/easybook/easybook.dtx 2021-12-22 21:19:29 UTC (rev 61383)
+++ trunk/Master/texmf-dist/source/latex/easybook/easybook.dtx 2021-12-22 21:19:41 UTC (rev 61384)
@@ -15,7 +15,7 @@
%<*class>
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2021/12/20}{1.42A}
+\ProvidesExplClass{easybook}{2021/12/22}{1.42B}
{Typeset Chinese theses or books}
\bool_set_false:N \l__eb_compile_draft_bool
@@ -307,7 +307,7 @@
%<*package>
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2021/12/20}{1.42A}
+\ProvidesExplPackage{easybase}{2021/12/22}{1.42B}
{Typeset Chinese theses or books}
\cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -372,18 +372,24 @@
}
{ \IfFileExists{#1.sty}{\RequirePackage{#1}}{} }
}
-\cs_new_protected:Npn \eb_if_package_loaded:nF #1#2
+\cs_new_protected:Npn \eb_if_package_loaded:nnF #1#2#3
{
\@ifpackageloaded{#1}
- {\msg_warning:nnn { easybase } { package-reloaded } {#1}}
- {#2\disable at package@load{#1}{}}
+ {
+ \tl_if_blank:nTF {#2}
+ { \msg_warning:nnn { easybase } { package-reloaded-ii } {#1} }
+ { \msg_warning:nnnn { easybase } { package-reloaded-i } {#1} {#2} }
+ }
+ {#3\disable at package@load{#1}{}}
}
-\msg_new:nnn { easybase } { package-reloaded }
+\msg_new:nnn { easybase } { package-reloaded-i }
{
The~macro~package~#1~has~been~reloaded. \\
Please~pass~the~arguments~by \\
- the~\string\PassOptionsToPackage{\#1}{#1}\ command.
+ the~\string\PassOptionsToPackage{#2}{#1}\ command.
}
+\msg_new:nnn { easybase } { package-reloaded-ii }
+ { The~macro~package~#1~has~been~reloaded. }
\cs_set_eq:NN \eb at usepackage@save \usepackage
\RenewDocumentCommand{\usepackage}{O{}m}
{
@@ -390,7 +396,7 @@
\PassOptionsToPackage{#1}{#2}
\eb_seq_map_inline:nn {#2}
{
- \eb_if_package_loaded:nF {##1}
+ \eb_if_package_loaded:nnF {##1} {#1}
{ \eb at usepackage@save{##1} }
}
}
@@ -2072,16 +2078,11 @@
{
\sisetup
{
- number-mode = match,
- table-parse-only,
- text-family-to-math,
- text-series-to-math,
- reset-text-family = false,
- reset-text-series = false,
- reset-text-shape = false,
- range-phrase = \ensuremath{\sim},
- range-units = single,
- group-digits = none
+ number-mode = match,
+ range-phrase = \ensuremath{\sim},
+ range-units = single,
+ table-alignment-mode = none,
+ group-digits = none
}
}{}
\eb_at_begin_environment:nn
@@ -2431,7 +2432,7 @@
}
%</package>
%<*tcolorbox>
-\ProvidesExplFile{eb-tcolorbox.cfg}{2021/12/20}{1.42A}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2021/12/22}{1.42B}
{Customization of tcolorbox for easybook}
\cs_set_protected:Npn \setexercise #1
Modified: trunk/Master/texmf-dist/tex/latex/easybook/easybase.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/easybook/easybase.sty 2021-12-22 21:19:29 UTC (rev 61383)
+++ trunk/Master/texmf-dist/tex/latex/easybook/easybase.sty 2021-12-22 21:19:41 UTC (rev 61384)
@@ -20,7 +20,7 @@
%% This work has the LPPL maintenance status `maintained'.
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2021/12/20}{1.42A}
+\ProvidesExplPackage{easybase}{2021/12/22}{1.42B}
{Typeset Chinese theses or books}
\cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -85,18 +85,24 @@
}
{ \IfFileExists{#1.sty}{\RequirePackage{#1}}{} }
}
-\cs_new_protected:Npn \eb_if_package_loaded:nF #1#2
+\cs_new_protected:Npn \eb_if_package_loaded:nnF #1#2#3
{
\@ifpackageloaded{#1}
- {\msg_warning:nnn { easybase } { package-reloaded } {#1}}
- {#2\disable at package@load{#1}{}}
+ {
+ \tl_if_blank:nTF {#2}
+ { \msg_warning:nnn { easybase } { package-reloaded-ii } {#1} }
+ { \msg_warning:nnnn { easybase } { package-reloaded-i } {#1} {#2} }
+ }
+ {#3\disable at package@load{#1}{}}
}
-\msg_new:nnn { easybase } { package-reloaded }
+\msg_new:nnn { easybase } { package-reloaded-i }
{
The~macro~package~#1~has~been~reloaded. \\
Please~pass~the~arguments~by \\
- the~\string\PassOptionsToPackage{\#1}{#1}\ command.
+ the~\string\PassOptionsToPackage{#2}{#1}\ command.
}
+\msg_new:nnn { easybase } { package-reloaded-ii }
+ { The~macro~package~#1~has~been~reloaded. }
\cs_set_eq:NN \eb at usepackage@save \usepackage
\RenewDocumentCommand{\usepackage}{O{}m}
{
@@ -103,7 +109,7 @@
\PassOptionsToPackage{#1}{#2}
\eb_seq_map_inline:nn {#2}
{
- \eb_if_package_loaded:nF {##1}
+ \eb_if_package_loaded:nnF {##1} {#1}
{ \eb at usepackage@save{##1} }
}
}
@@ -1785,16 +1791,11 @@
{
\sisetup
{
- number-mode = match,
- table-parse-only,
- text-family-to-math,
- text-series-to-math,
- reset-text-family = false,
- reset-text-series = false,
- reset-text-shape = false,
- range-phrase = \ensuremath{\sim},
- range-units = single,
- group-digits = none
+ number-mode = match,
+ range-phrase = \ensuremath{\sim},
+ range-units = single,
+ table-alignment-mode = none,
+ group-digits = none
}
}{}
\eb_at_begin_environment:nn
Modified: trunk/Master/texmf-dist/tex/latex/easybook/easybook.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/easybook/easybook.cls 2021-12-22 21:19:29 UTC (rev 61383)
+++ trunk/Master/texmf-dist/tex/latex/easybook/easybook.cls 2021-12-22 21:19:41 UTC (rev 61384)
@@ -20,7 +20,7 @@
%% This work has the LPPL maintenance status `maintained'.
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2021/12/20}{1.42A}
+\ProvidesExplClass{easybook}{2021/12/22}{1.42B}
{Typeset Chinese theses or books}
\bool_set_false:N \l__eb_compile_draft_bool
Modified: trunk/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg
===================================================================
--- trunk/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg 2021-12-22 21:19:29 UTC (rev 61383)
+++ trunk/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg 2021-12-22 21:19:41 UTC (rev 61384)
@@ -18,7 +18,7 @@
%% LaTeX version 2005/12/01 or later.
%%
%% This work has the LPPL maintenance status `maintained'.
-\ProvidesExplFile{eb-tcolorbox.cfg}{2021/12/20}{1.42A}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2021/12/22}{1.42B}
{Customization of tcolorbox for easybook}
\cs_set_protected:Npn \setexercise #1
More information about the tex-live-commits
mailing list.