texlive[61027] Master/texmf-dist: easybook (11nov21)
commits+karl at tug.org
commits+karl at tug.org
Thu Nov 11 22:07:16 CET 2021
Revision: 61027
http://tug.org/svn/texlive?view=revision&revision=61027
Author: karl
Date: 2021-11-11 22:07:15 +0100 (Thu, 11 Nov 2021)
Log Message:
-----------
easybook (11nov21)
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-11-11 00:48:34 UTC (rev 61026)
+++ trunk/Master/texmf-dist/doc/latex/easybook/easybook.tex 2021-11-11 21:07:15 UTC (rev 61027)
@@ -20,7 +20,7 @@
name = easybook,
color-scheme = blue,
title = EASYBOOK 使用手册,
- version = v1.40N,
+ version = v1.40O,
date = 2021/11/10,
authors = 瞿毅,
info = 排版简体中文学位论文和书籍,
@@ -414,7 +414,11 @@
\keybool{uppercase}\Default{true}
使用 \cs*{rightmark} 及 \cs*{leftmark} 标题标记命令获取标题内容时英文是否大写。
\kvsplit{brackets}{左括号,右括号}\Default{\Carg{(\black{,})}}
- 设置行间公式编号标签的括号，以英文逗号分隔，分别代表左右括号。
+ 设置行间公式编号标签的括号及格式，以英文逗号分隔，分别代表左右括号。\meta{左括号} 可以是带有一个参数的命令，用于接受编号和 \meta{右括号}。将标签括号设置为方括号，并使用无衬线字体：
+ \begin{ctexexam}
+ \newcommand{\bracketsf}[1]{\textsf{[#1}}
+ \style{brackets = {\bracketsf,]}}
+ \end{ctexexam}
\kvsplit*{figurepath}{\meta{路径名1}\code{\}\{}\meta{路径名2}}\Default
设置插入图片的文件夹路径名，可以有多个路径名，每个路径包含在括号分隔，只有一个路径时需要包含在两层括号内。
\end{options}
@@ -421,7 +425,7 @@
\subsubsection{连接符}
\begin{options}
- \keyval-{figure-connect}{图片连接符}\Module{style}\Default{\Carg{.}}
+ \keyval-{figure-connect}{图片连接符}\Default{\Carg{.}}
设置图片题注编号的连接符。
\keyval-{table-connect}{表格连接符}\Default{\Carg{.}}
设置表格题注编号的连接符。
Modified: trunk/Master/texmf-dist/source/latex/easybook/easybook.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/easybook/easybook.dtx 2021-11-11 00:48:34 UTC (rev 61026)
+++ trunk/Master/texmf-dist/source/latex/easybook/easybook.dtx 2021-11-11 21:07:15 UTC (rev 61027)
@@ -15,7 +15,7 @@
%<*class>
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2021/11/10}{1.40N}
+\ProvidesExplClass{easybook}{2021/11/10}{1.40O}
{Typeset Chinese theses or books}
\bool_set_false:N \l__eb_compile_draft_bool
@@ -325,7 +325,7 @@
%<*package>
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2021/11/10}{1.40N}
+\ProvidesExplPackage{easybase}{2021/11/10}{1.40O}
{Typeset Chinese theses or books}
\cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -453,19 +453,13 @@
class .initial:n = book,
book .meta:n = { class = book },
article .meta:n = { class = article },
-
unknown .code:n = \clist_gput_right:NV \g__eb_ctex_options_clist \CurrentOption
}
-\eb_clist_map_inline:nn
- {
- { protrusion = false } { microtype },
- { list = off } { bicaption },
- { many } { tcolorbox },
- { upint } { newtxmath },
- { svgnames } { xcolor }
- }
- { \PassOptionsToPackage #1 }
+\PassOptionsToPackage{list = off}{bicaption}
+\PassOptionsToPackage{many}{tcolorbox}
+\PassOptionsToPackage{upint}{newtxmath}
+\PassOptionsToPackage{svgnames}{xcolor}
\ProcessKeysOptions{easybase}
\PassOptionsToPackage{\g__eb_ctex_options_clist}{ctex}
\@ifclassloaded{ctexbook}{}
@@ -584,8 +578,10 @@
{
\color{ctex at emph}
\eb at tag@brackets at left
- \ignorespaces #1\unskip\@@italiccorr
+ \bgroup
+ \ignorespaces{#1}\unskip\@@italiccorr
\eb at tag@brackets at right
+ \egroup
}
}
\ctex_define:nn { style }
@@ -1091,7 +1087,7 @@
}
}
-\ProvideDocumentCommand{\super}{omo}{\textsuperscript{#3}}
+\ProvideDocumentCommand{\super}{omo}{\textsuperscript{#2}}
\providecommand{\spbset}{\use_none:n}
\NewDocumentCommand{\eb at fnmate@super}{sm}
{
@@ -1140,7 +1136,9 @@
{ \eb at fnmate@super* }
{
\tl_use:N \l__eb_fntext_before_tl
- {\l__eb_fnmate_format_tl{\@thefnmark}}
+ \bgroup
+ \l__eb_fnmate_format_tl{\@thefnmark}
+ \egroup
}
\tl_use:N \l__eb_fntext_after_tl
}
@@ -1296,24 +1294,24 @@
{
\normalsize\normalfont
\titlerule*[#2]{\scalebox{#3}{#4}}#5
+ \bgroup
+ \IfBooleanTF{#1}
+ {\thecontentspage}
{
- \IfBooleanTF{#1}
- {\thecontentspage}
- {
- \bool_if:NTF \l__eb_toc_line_align_bool
- { \contentspage }
- { \thecontentspage }
- }
+ \bool_if:NTF \l__eb_toc_line_align_bool
+ { \contentspage }
+ { \thecontentspage }
}
+ \egroup
}
\cs_set_eq:NN \ctexnumberline \CTEXnumberline
-\cs_new:Npn \eb at numberline { \protect\numberline }
+\cs_new:Npn \p at numberline { \protect\numberline }
\cs_set:Npn \CTEXnumberline #1
{
\CTEXifname
{
\bool_if:NTF \eb at titletoc@hang at fix@bool
- { \eb at numberline{\use:c { CTEXthe#1 }} }
+ { \p at numberline{\use:c { CTEXthe#1 }} }
{
\use:c { CTEXthe#1 }
\tl_use:c { l__eb_toc_#1_after_tl }
@@ -1368,8 +1366,10 @@
{
\addcontentsline{#1}{#2}
{
- \bool_if:NT \eb at titletoc@hang at fix@bool { \eb at numberline }
- {\prop_item:Nn \l__eb_list_label_name_prop {#2}{#3}}#4
+ \bool_if:NT \eb at titletoc@hang at fix@bool { \p at numberline }
+ \bgroup
+ \prop_item:Nn \l__eb_list_label_name_prop {#2}{#3}
+ \egroup #4
}
}
\cs_set_eq:NN \eb at if@boolT \bool_if:NT
@@ -1381,8 +1381,11 @@
{
\addcontentsline{lol}{lstlisting}
{
- \eb at if@boolT\eb at titletoc@hang at fix@bool{\eb at numberline}
- {\eb at toc@label at lstlisting{}}\lst@@caption
+ \eb at if@boolT\eb at titletoc@hang at fix@bool{\p at numberline}
+ \bgroup
+ \eb at toc@label at lstlisting{}
+ \egroup
+ \lst@@caption
}
}
@@ -2069,7 +2072,7 @@
color .tl_set:N = \eb at tc@background at color,
color .initial:n = DeepSkyBlue,
number .tl_set:N = \eb at tc@list at number,
- number .initial:n = { 1. },
+ number .initial:n = 1.,
title .tl_set:N = \eb at tc@exercise at title,
title .initial:n = \c__eb_name_exercise_tl,
numsep .dim_set:N = \eb at toc@exercise at numsep,
@@ -2401,7 +2404,7 @@
}
%</package>
%<*tcolorbox>
-\ProvidesExplFile{eb-tcolorbox.cfg}{2021/11/10}{1.40N}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2021/11/10}{1.40O}
{Customization of tcolorbox for easybook}
\tl_gset:Nn \eb at tc@line at skip { 0.5\baselineskip }
Modified: trunk/Master/texmf-dist/tex/latex/easybook/easybase.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/easybook/easybase.sty 2021-11-11 00:48:34 UTC (rev 61026)
+++ trunk/Master/texmf-dist/tex/latex/easybook/easybase.sty 2021-11-11 21:07:15 UTC (rev 61027)
@@ -20,7 +20,7 @@
%% This work has the LPPL maintenance status `maintained'.
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2021/11/10}{1.40N}
+\ProvidesExplPackage{easybase}{2021/11/10}{1.40O}
{Typeset Chinese theses or books}
\cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -148,19 +148,13 @@
class .initial:n = book,
book .meta:n = { class = book },
article .meta:n = { class = article },
-
unknown .code:n = \clist_gput_right:NV \g__eb_ctex_options_clist \CurrentOption
}
-\eb_clist_map_inline:nn
- {
- { protrusion = false } { microtype },
- { list = off } { bicaption },
- { many } { tcolorbox },
- { upint } { newtxmath },
- { svgnames } { xcolor }
- }
- { \PassOptionsToPackage #1 }
+\PassOptionsToPackage{list = off}{bicaption}
+\PassOptionsToPackage{many}{tcolorbox}
+\PassOptionsToPackage{upint}{newtxmath}
+\PassOptionsToPackage{svgnames}{xcolor}
\ProcessKeysOptions{easybase}
\PassOptionsToPackage{\g__eb_ctex_options_clist}{ctex}
\@ifclassloaded{ctexbook}{}
@@ -279,8 +273,10 @@
{
\color{ctex at emph}
\eb at tag@brackets at left
- \ignorespaces #1\unskip\@@italiccorr
+ \bgroup
+ \ignorespaces{#1}\unskip\@@italiccorr
\eb at tag@brackets at right
+ \egroup
}
}
\ctex_define:nn { style }
@@ -786,7 +782,7 @@
}
}
-\ProvideDocumentCommand{\super}{omo}{\textsuperscript{#3}}
+\ProvideDocumentCommand{\super}{omo}{\textsuperscript{#2}}
\providecommand{\spbset}{\use_none:n}
\NewDocumentCommand{\eb at fnmate@super}{sm}
{
@@ -835,7 +831,9 @@
{ \eb at fnmate@super* }
{
\tl_use:N \l__eb_fntext_before_tl
- {\l__eb_fnmate_format_tl{\@thefnmark}}
+ \bgroup
+ \l__eb_fnmate_format_tl{\@thefnmark}
+ \egroup
}
\tl_use:N \l__eb_fntext_after_tl
}
@@ -991,24 +989,24 @@
{
\normalsize\normalfont
\titlerule*[#2]{\scalebox{#3}{#4}}#5
+ \bgroup
+ \IfBooleanTF{#1}
+ {\thecontentspage}
{
- \IfBooleanTF{#1}
- {\thecontentspage}
- {
- \bool_if:NTF \l__eb_toc_line_align_bool
- { \contentspage }
- { \thecontentspage }
- }
+ \bool_if:NTF \l__eb_toc_line_align_bool
+ { \contentspage }
+ { \thecontentspage }
}
+ \egroup
}
\cs_set_eq:NN \ctexnumberline \CTEXnumberline
-\cs_new:Npn \eb at numberline { \protect\numberline }
+\cs_new:Npn \p at numberline { \protect\numberline }
\cs_set:Npn \CTEXnumberline #1
{
\CTEXifname
{
\bool_if:NTF \eb at titletoc@hang at fix@bool
- { \eb at numberline{\use:c { CTEXthe#1 }} }
+ { \p at numberline{\use:c { CTEXthe#1 }} }
{
\use:c { CTEXthe#1 }
\tl_use:c { l__eb_toc_#1_after_tl }
@@ -1063,8 +1061,10 @@
{
\addcontentsline{#1}{#2}
{
- \bool_if:NT \eb at titletoc@hang at fix@bool { \eb at numberline }
- {\prop_item:Nn \l__eb_list_label_name_prop {#2}{#3}}#4
+ \bool_if:NT \eb at titletoc@hang at fix@bool { \p at numberline }
+ \bgroup
+ \prop_item:Nn \l__eb_list_label_name_prop {#2}{#3}
+ \egroup #4
}
}
\cs_set_eq:NN \eb at if@boolT \bool_if:NT
@@ -1076,8 +1076,11 @@
{
\addcontentsline{lol}{lstlisting}
{
- \eb at if@boolT\eb at titletoc@hang at fix@bool{\eb at numberline}
- {\eb at toc@label at lstlisting{}}\lst@@caption
+ \eb at if@boolT\eb at titletoc@hang at fix@bool{\p at numberline}
+ \bgroup
+ \eb at toc@label at lstlisting{}
+ \egroup
+ \lst@@caption
}
}
@@ -1764,7 +1767,7 @@
color .tl_set:N = \eb at tc@background at color,
color .initial:n = DeepSkyBlue,
number .tl_set:N = \eb at tc@list at number,
- number .initial:n = { 1. },
+ number .initial:n = 1.,
title .tl_set:N = \eb at tc@exercise at title,
title .initial:n = \c__eb_name_exercise_tl,
numsep .dim_set:N = \eb at toc@exercise at numsep,
Modified: trunk/Master/texmf-dist/tex/latex/easybook/easybook.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/easybook/easybook.cls 2021-11-11 00:48:34 UTC (rev 61026)
+++ trunk/Master/texmf-dist/tex/latex/easybook/easybook.cls 2021-11-11 21:07:15 UTC (rev 61027)
@@ -20,7 +20,7 @@
%% This work has the LPPL maintenance status `maintained'.
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2021/11/10}{1.40N}
+\ProvidesExplClass{easybook}{2021/11/10}{1.40O}
{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-11-11 00:48:34 UTC (rev 61026)
+++ trunk/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg 2021-11-11 21:07:15 UTC (rev 61027)
@@ -18,7 +18,7 @@
%% LaTeX version 2005/12/01 or later.
%%
%% This work has the LPPL maintenance status `maintained'.
-\ProvidesExplFile{eb-tcolorbox.cfg}{2021/11/10}{1.40N}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2021/11/10}{1.40O}
{Customization of tcolorbox for easybook}
\tl_gset:Nn \eb at tc@line at skip { 0.5\baselineskip }
More information about the tex-live-commits
mailing list.