texlive[60813] Master/texmf-dist: easybook (20oct21)
commits+karl at tug.org
commits+karl at tug.org
Wed Oct 20 23:18:16 CEST 2021
Revision: 60813
http://tug.org/svn/texlive?view=revision&revision=60813
Author: karl
Date: 2021-10-20 23:18:16 +0200 (Wed, 20 Oct 2021)
Log Message:
-----------
easybook (20oct21)
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-10-20 21:17:52 UTC (rev 60812)
+++ trunk/Master/texmf-dist/doc/latex/easybook/easybook.tex 2021-10-20 21:18:16 UTC (rev 60813)
@@ -20,8 +20,8 @@
name = easybook,
color-scheme = blue,
title = EASYBOOK 使用手册,
- version = v1.3P,
- date = 2021/10/18,
+ version = v1.3S,
+ date = 2021/10/20,
authors = 瞿毅,
info = 排版简体中文学位论文和书籍,
email = q1jx at foxmail.com,
@@ -75,7 +75,7 @@
\newsplitarg{\splitoarg}{[}{]}
\newsplitarg{\splitdarg}{(}{)}
\newsplitarg{\splitmarg}{\{}{\}}
-\newcommand{\spemmeta}{\splitmeta[\code{!}]}
+\newcommand{\spemmeta}{\splitmeta[\code{|}]}
\newsplitarg[\spemmeta]{\spemcoarg}{[}{]}
\renewcommand{\cnltx at package@abstract at width}{0.85\linewidth}
\newcommand{\noitemsep}{\setlength{\itemsep}{0ex}}
@@ -123,7 +123,7 @@
\begin{document}
-\section{使用说明}
+\section{准备开始}
您在使用 \cls*{easybook} 文档类编写文档前可能需要满足以下的条件：
\begin{itemize}
\item 使用 \hologo{XeLaTeX}（推荐）或 \hologo{LuaLaTeX} 两种编译方式。
@@ -187,8 +187,8 @@
文档主题方案选项 \option{scheme} 扩展了 C\TeX 文档类中同名选项原有的作用范围，选项值 \code{plain} 可使各类标题变为英文形式。包括章节标题、图表标题和定理名等。
\opt{enmode}\Default!
同时开启 \option{newline} 和 \keyis-{scheme}{plain} 选项以符合英文原生风格。
- \keychoice{scheme}{a4paper,b5paper,c5paper,letterpaper,其它纸张}\Default{a4paper}
- 页眉尺寸选项将参数交给 \pkg*{geometry} 宏包处理，可使用它支持的所有纸张规格。建议选项值 \code{b5paper} 和 \keyis*-{zihao}{5}，选项值 \code{a4paper} 和 \keyis*-{zihao}{-4} 配合。
+ \keychoice{paper}{a4paper,b5paper,c5paper,letterpaper,other paper}\Default{a4paper}
+ 文档页面尺寸选项将参数交给 \pkg*{geometry} 宏包处理，可使用它支持的所有纸张规格。建议选项值 \code{b5paper} 和 \keyis*-{zihao}{5}，选项值 \code{a4paper} 和 \keyis*-{zihao}{-4} 配合。
\keyval-{config}{配置文件名}\Default
选项 \option{config} 载入用户配置文件，最好放在当前路径且需带有文件扩展名如 \code{tex}、\code{def} 和 \code{cfg}。
\keybool{floatpage}\Default{true}
@@ -680,7 +680,7 @@
\begin{commands}
\command{markrule}[\oarg{长度}\darg{颜色名}\marg{线宽}\spemcoarg{上间距,下间距}]
- 命令 \cs{markrule} 既可在 \meta{横线命令} 中用于绘制页眉页脚横线，也可以在正文中使用。\meta{长度} 默认为页面文本区的宽度，上下间距为横线与上下方部件的间距，带有长度单位，上下间距之间用 \code{!} 号分开，若只有一部分则表示 \meta{上间距}。下面举一个设置页眉内容的例子：
+ 命令 \cs{markrule} 既可在 \meta{横线命令} 中用于绘制页眉页脚横线，也可以在正文中使用。\meta{长度} 默认为页面文本区的宽度，上下间距为横线与上下方部件的间距，带有长度单位，上下间距之间用 \code{|} 符号分开，若只有一部分则表示 \meta{上间距}。下面举一个设置页眉内容的例子：
\begin{ctexexam}
\hdrset
{
@@ -690,7 +690,7 @@
\easyhead[OL]{\rightmark}
\easyhead[EL,OR]{\textbf{\thepage}}
},
- headrule = \markrule(DarkOrchid){0.5pt}[2pt!2pt]
+ headrule = \markrule(DarkOrchid){0.5pt}[2pt|2pt]
}
\end{ctexexam}
\end{commands}
Modified: trunk/Master/texmf-dist/source/latex/easybook/easybook.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/easybook/easybook.dtx 2021-10-20 21:17:52 UTC (rev 60812)
+++ trunk/Master/texmf-dist/source/latex/easybook/easybook.dtx 2021-10-20 21:18:16 UTC (rev 60813)
@@ -15,7 +15,7 @@
%<*class>
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2021/10/18}{1.3P}
+\ProvidesExplClass{easybook}{2021/10/20}{1.3S}
{Typeset Chinese theses or books}
\bool_set_false:N \l__eb_compile_draft_bool
@@ -319,7 +319,7 @@
%<*package>
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2021/10/18}{1.3P}
+\ProvidesExplPackage{easybase}{2021/10/20}{1.3S}
{Typeset Chinese theses or books}
\cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -339,11 +339,6 @@
\seq_set_from_clist:Nn \l_tmpa_seq {#1}
\seq_map_inline:Nn \l_tmpa_seq {#2}
}
-\cs_new_protected:Npn \eb_clist_map_function:nN #1#2
- {
- \seq_set_from_clist:Nn \l_tmpb_seq {#1}
- \seq_map_function:NN \l_tmpb_seq #2
- }
\cs_new_protected:Npn \eb_char_patch_cmd:nnn #1#2#3
{
\ExplSyntaxOn\makeatletter
@@ -676,7 +671,7 @@
\cs_gset_eq:NN \easyhead \fancyhead
\cs_gset_eq:NN \easyfoot \fancyfoot
\NewDocumentCommand{\markrule}
- {O{\textwidth}D(){ctex at frame}m>{\SplitArgument{1}{!}}O{}}
+ {O{\textwidth}D(){ctex at frame}m>{\SplitArgument{1}{|}}O{}}
{\eb_draw_markrule:nnnnn {#1} {#2} {#3} #4}
\cs_new_protected:Npn \eb_draw_markrule:nnnnn #1#2#3#4#5
{
@@ -724,7 +719,7 @@
footrule .initial:n = { },
footnoterule .tl_gset:N = \footnoterule,
footnoterule .initial:n =
- { \markrule[0.35\textwidth]{\l__eb_rule_width_dim}[!2.6pt] }
+ { \markrule[0.35\textwidth]{\l__eb_rule_width_dim}[|2.6pt] }
}
\cs_set_eq:NN \eb_mark_uppercase:n \text_uppercase:n
@@ -937,7 +932,6 @@
{ \eb_fnmark_short_label_set:nn {#1} { thefootnote } },
fnboth-num .meta:n = { fntext-num = #1,fnmark-num = #1 },
fnboth-num .initial:n = plain,
-
unknown .code:n = \eb_msg_unknown_option:n { hdrset }
}
@@ -1107,7 +1101,7 @@
}
}
-\ProvideDocumentCommand{\super}{od()mo}{\textsuperscript{#3}}
+\ProvideDocumentCommand{\super}{omo}{\textsuperscript{#3}}
\providecommand{\spbset}{\use_none:n}
\NewDocumentCommand{\eb at fnmark@super}{sm}
{
@@ -1115,12 +1109,21 @@
{\super[\l__eb_fntext_vshift_tl]{#2}[0pt]}
{
\super[\l__eb_fnmark_vshift_tl]
- (\l__eb_fnmate_format_tl){#2}
+ {\l__eb_fnmate_format_tl{#2}}
[\l__eb_fnmark_hshift_tl]
}
}
\cs_new_protected:Npn \eb_fnmark_format_initial:
{
+ \bool_if:NTF \l__eb_normal_footnote_bool
+ {
+ \bool_if:NT \l__eb_fnmate_format_match_bool
+ { \tl_clear:N \l__eb_fnmate_format_tl }
+ }
+ {
+ \bool_if:NT \l__eb_fncust_format_match_bool
+ { \tl_clear:N \l__eb_fnmate_format_tl }
+ }
\bool_if:NF \l__eb_fnmate_format_match_bool
{ \spbset{super-format = { }} }
\tl_use:N \l__eb_subfont_footnote_tl
@@ -1128,23 +1131,11 @@
\bool_set_true:N \l__eb_normal_footnote_bool
\bool_new:N \l__eb_fnmate_format_match_bool
\bool_new:N \l__eb_fncust_format_match_bool
-\cs_new_protected:Npn \eb_fn_format_if_match:T #1
- {
- \bool_if:NTF \l__eb_normal_footnote_bool
- { \bool_if:NT \l__eb_fnmate_format_match_bool {#1} }
- { \bool_if:NT \l__eb_fncust_format_match_bool {#1} }
- }
-\cs_new_protected:Npn \eb_fn_set_eq_format:
- {
- \tl_set_eq:NN
- \l__eb_fnmate_format_tl \l__spb_super_script_formati_tl
- }
\cs_set:Npn \@makefnmark
{
\hbox:n
{
\eb_fnmark_format_initial:
- \eb_fn_format_if_match:T { \eb_fn_set_eq_format: }
\tl_if_eq:NnTF \@mpfn { footnote }
{ \eb at fnmark@super{\eb at thefnmark} }
{ \eb at fnmark@super{\@thefnmark} }
@@ -1155,14 +1146,12 @@
\hbox:n
{
\eb_fnmark_format_initial:
- \tl_use:N \l__eb_fnmark_before_tl
- \tl_if_eq:NnTF \l__eb_fntext_position_tl { super }
+ \tl_if_eq:NnT \l__eb_fntext_position_tl { super }
+ { \eb at fnmark@super* }
{
- \eb_fn_format_if_match:T { \tl_clear:N \l__eb_fnmate_format_tl }
- \eb at fnmark@super*
+ \tl_use:N \l__eb_fnmark_before_tl
+ {\l__eb_fnmate_format_tl{\@thefnmark}}
}
- { \eb_fn_format_if_match:T { \eb_fn_set_eq_format: } }
- {\l__eb_fnmate_format_tl{\@thefnmark}}
\tl_use:N \l__eb_fnmark_after_tl
}
}
@@ -2481,7 +2470,7 @@
}
%</package>
%<*tcolorbox>
-\ProvidesExplFile{eb-tcolorbox.cfg}{2021/10/18}{1.3P}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2021/10/20}{1.3S}
{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-10-20 21:17:52 UTC (rev 60812)
+++ trunk/Master/texmf-dist/tex/latex/easybook/easybase.sty 2021-10-20 21:18:16 UTC (rev 60813)
@@ -20,7 +20,7 @@
%% This work has the LPPL maintenance status `maintained'.
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2021/10/18}{1.3P}
+\ProvidesExplPackage{easybase}{2021/10/20}{1.3S}
{Typeset Chinese theses or books}
\cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -40,11 +40,6 @@
\seq_set_from_clist:Nn \l_tmpa_seq {#1}
\seq_map_inline:Nn \l_tmpa_seq {#2}
}
-\cs_new_protected:Npn \eb_clist_map_function:nN #1#2
- {
- \seq_set_from_clist:Nn \l_tmpb_seq {#1}
- \seq_map_function:NN \l_tmpb_seq #2
- }
\cs_new_protected:Npn \eb_char_patch_cmd:nnn #1#2#3
{
\ExplSyntaxOn\makeatletter
@@ -377,7 +372,7 @@
\cs_gset_eq:NN \easyhead \fancyhead
\cs_gset_eq:NN \easyfoot \fancyfoot
\NewDocumentCommand{\markrule}
- {O{\textwidth}D(){ctex at frame}m>{\SplitArgument{1}{!}}O{}}
+ {O{\textwidth}D(){ctex at frame}m>{\SplitArgument{1}{|}}O{}}
{\eb_draw_markrule:nnnnn {#1} {#2} {#3} #4}
\cs_new_protected:Npn \eb_draw_markrule:nnnnn #1#2#3#4#5
{
@@ -425,7 +420,7 @@
footrule .initial:n = { },
footnoterule .tl_gset:N = \footnoterule,
footnoterule .initial:n =
- { \markrule[0.35\textwidth]{\l__eb_rule_width_dim}[!2.6pt] }
+ { \markrule[0.35\textwidth]{\l__eb_rule_width_dim}[|2.6pt] }
}
\cs_set_eq:NN \eb_mark_uppercase:n \text_uppercase:n
@@ -638,7 +633,6 @@
{ \eb_fnmark_short_label_set:nn {#1} { thefootnote } },
fnboth-num .meta:n = { fntext-num = #1,fnmark-num = #1 },
fnboth-num .initial:n = plain,
-
unknown .code:n = \eb_msg_unknown_option:n { hdrset }
}
@@ -808,7 +802,7 @@
}
}
-\ProvideDocumentCommand{\super}{od()mo}{\textsuperscript{#3}}
+\ProvideDocumentCommand{\super}{omo}{\textsuperscript{#3}}
\providecommand{\spbset}{\use_none:n}
\NewDocumentCommand{\eb at fnmark@super}{sm}
{
@@ -816,12 +810,21 @@
{\super[\l__eb_fntext_vshift_tl]{#2}[0pt]}
{
\super[\l__eb_fnmark_vshift_tl]
- (\l__eb_fnmate_format_tl){#2}
+ {\l__eb_fnmate_format_tl{#2}}
[\l__eb_fnmark_hshift_tl]
}
}
\cs_new_protected:Npn \eb_fnmark_format_initial:
{
+ \bool_if:NTF \l__eb_normal_footnote_bool
+ {
+ \bool_if:NT \l__eb_fnmate_format_match_bool
+ { \tl_clear:N \l__eb_fnmate_format_tl }
+ }
+ {
+ \bool_if:NT \l__eb_fncust_format_match_bool
+ { \tl_clear:N \l__eb_fnmate_format_tl }
+ }
\bool_if:NF \l__eb_fnmate_format_match_bool
{ \spbset{super-format = { }} }
\tl_use:N \l__eb_subfont_footnote_tl
@@ -829,23 +832,11 @@
\bool_set_true:N \l__eb_normal_footnote_bool
\bool_new:N \l__eb_fnmate_format_match_bool
\bool_new:N \l__eb_fncust_format_match_bool
-\cs_new_protected:Npn \eb_fn_format_if_match:T #1
- {
- \bool_if:NTF \l__eb_normal_footnote_bool
- { \bool_if:NT \l__eb_fnmate_format_match_bool {#1} }
- { \bool_if:NT \l__eb_fncust_format_match_bool {#1} }
- }
-\cs_new_protected:Npn \eb_fn_set_eq_format:
- {
- \tl_set_eq:NN
- \l__eb_fnmate_format_tl \l__spb_super_script_formati_tl
- }
\cs_set:Npn \@makefnmark
{
\hbox:n
{
\eb_fnmark_format_initial:
- \eb_fn_format_if_match:T { \eb_fn_set_eq_format: }
\tl_if_eq:NnTF \@mpfn { footnote }
{ \eb at fnmark@super{\eb at thefnmark} }
{ \eb at fnmark@super{\@thefnmark} }
@@ -856,14 +847,12 @@
\hbox:n
{
\eb_fnmark_format_initial:
- \tl_use:N \l__eb_fnmark_before_tl
- \tl_if_eq:NnTF \l__eb_fntext_position_tl { super }
+ \tl_if_eq:NnT \l__eb_fntext_position_tl { super }
+ { \eb at fnmark@super* }
{
- \eb_fn_format_if_match:T { \tl_clear:N \l__eb_fnmate_format_tl }
- \eb at fnmark@super*
+ \tl_use:N \l__eb_fnmark_before_tl
+ {\l__eb_fnmate_format_tl{\@thefnmark}}
}
- { \eb_fn_format_if_match:T { \eb_fn_set_eq_format: } }
- {\l__eb_fnmate_format_tl{\@thefnmark}}
\tl_use:N \l__eb_fnmark_after_tl
}
}
Modified: trunk/Master/texmf-dist/tex/latex/easybook/easybook.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/easybook/easybook.cls 2021-10-20 21:17:52 UTC (rev 60812)
+++ trunk/Master/texmf-dist/tex/latex/easybook/easybook.cls 2021-10-20 21:18:16 UTC (rev 60813)
@@ -20,7 +20,7 @@
%% This work has the LPPL maintenance status `maintained'.
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2021/10/18}{1.3P}
+\ProvidesExplClass{easybook}{2021/10/20}{1.3S}
{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-10-20 21:17:52 UTC (rev 60812)
+++ trunk/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg 2021-10-20 21:18:16 UTC (rev 60813)
@@ -18,7 +18,7 @@
%% LaTeX version 2005/12/01 or later.
%%
%% This work has the LPPL maintenance status `maintained'.
-\ProvidesExplFile{eb-tcolorbox.cfg}{2021/10/18}{1.3P}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2021/10/20}{1.3S}
{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.