diff options
author | Karl Berry <karl@freefriends.org> | 2022-08-04 20:32:47 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2022-08-04 20:32:47 +0000 |
commit | 38da54161a33c88925e4effcb2ae29f4ecfde6c8 (patch) | |
tree | eeb7a97629e4dfbea86e2899dba3fa009a643866 /Master/texmf-dist | |
parent | 9216a167fe76e74507560a204eee28581dcfdb63 (diff) |
easybook (4aug22)
git-svn-id: svn://tug.org/texlive/trunk@64045 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r-- | Master/texmf-dist/doc/latex/easybook/easybook.pdf | bin | 591121 -> 590981 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/easybook/easybook.tex | 26 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/easybook/easybook.dtx | 110 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/easybook/easybase.sty | 106 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/easybook/easybook.cls | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg | 2 |
6 files changed, 123 insertions, 123 deletions
diff --git a/Master/texmf-dist/doc/latex/easybook/easybook.pdf b/Master/texmf-dist/doc/latex/easybook/easybook.pdf Binary files differindex c650bd28d4a..3daa1a6648d 100644 --- a/Master/texmf-dist/doc/latex/easybook/easybook.pdf +++ b/Master/texmf-dist/doc/latex/easybook/easybook.pdf diff --git a/Master/texmf-dist/doc/latex/easybook/easybook.tex b/Master/texmf-dist/doc/latex/easybook/easybook.tex index a85792d8763..ef0b16e0ba9 100644 --- a/Master/texmf-dist/doc/latex/easybook/easybook.tex +++ b/Master/texmf-dist/doc/latex/easybook/easybook.tex @@ -21,8 +21,8 @@ name = easybook, color-scheme = blue, title = EASYBOOK使用手册, - version = v1.683, - date = 2022/05/02, + version = v1.69, + date = 2022/08/03, authors = 瞿毅, info = 简便地排版中文学位论文或书籍, email = toquyi@163.com, @@ -454,10 +454,10 @@ \keyval{caption-every}{数值}\Default{1.2} 同时设置图片、表格和代码题注的行距因子。 \keyval{footnote}{数值}\Default{1.2} - 脚注内容整体的行距因子。可以使用 \option{fnpara-form} 的代码覆盖每个脚注单独的行距,从而与不同脚注的段落间距不同\footnote{若在正文区中更改脚注行距,脚注横线下方的间距不会随当前行距改变。}。 + 脚注内容整体的行距因子。可以使用 \option{fnpara-format} 的代码覆盖每个脚注单独的行距,从而与不同脚注的段落间距不同\footnote{若在正文区中更改脚注行距,脚注横线下方的间距不会随当前行距改变。}。 \begin{ctexexam} \ebspread{footnote = 1.3} - \ebhdrset{fnpara-form = \linespread{1.2}\selectfont} + \ebhdrset{fnpara-format = \linespread{1.2}\selectfont} \end{ctexexam} \keyval{every}{数值} 统一设置上述所有的行距因子。 @@ -719,7 +719,7 @@ \end{commands} \keychoice{fntext-num}{plain,pifont,pifont*,pisans,pisans*,short num}\Default{plain} 脚注内容标记编号的类型。用法与 \option{fnmark-num} 一样,所以脚注内容与正文标记编号类型\textbf{可以不同}。 - \keychoice{fnmate-num}{plain,pifont,pifont*,pisans,pisans*,short num}\Default{plain} + \keychoice{fnmarktext-num}{plain,pifont,pifont*,pisans,pisans*,short num}\Default{plain} 同时设定脚注正文标记编号 \option{fnmark-num} 与脚注内容标记编号 \option{fntext-num} 的类型。目前脚注编号类型选项对于迷你页环境 \env*{minipage} 无效,其中的脚注保持默认英文字母的编号类型。 \keychoice{fnmark-vmove}{fixed length,match}\Default{0pt} 脚注正文标记的垂直偏移。可以设为刚性长度,或用 \code{match} 匹配 \option*{spvmove} 全局的值。 @@ -727,15 +727,15 @@ 脚注正文标记的水平偏移。可以设为刚性长度,或用 \code{match} 匹配 \option*{sphmove} 全局的值。 \keychoice{fntext-vmove}{fixed length,match}\Default{0pt} 脚注内容标记的垂直偏移。可以设为刚性长度,或用 \code{match} 匹配 \option*{spvmove} 全局的值。 - \keychoice{fnmate-form}{format code,match} - 默认脚注标记的格式,选项 \code{match} 可以匹配 \option*{spcmd} 全局的值。一般配合 \keyis{fnmate-num}{plain} 原生编号形式使用,例如用 \pkg*{circledtext} 宏包的带圈字符命令 \cs*{circledtext} 给脚注标记添加圆圈: + \keychoice{fnmarktext-format}{format code,match} + 默认脚注标记的格式,选项 \code{match} 可以匹配 \option*{spcmd} 全局的值。一般配合 \keyis{fnmarktext-num}{plain} 原生编号形式使用,例如用 \pkg*{circledtext} 宏包的带圈字符命令 \cs*{circledtext} 给脚注标记添加圆圈: \begin{ctexexam} \usepackage{circledtext} \circledtextset{resize = real,width = 0.5em} \ebhdrset { - fntext-pos = normal, - fnmate-form = \circledtext + fntext-pos = normal, + fnmarktext-format = \circledtext } \end{ctexexam} \begin{commands} @@ -754,7 +754,7 @@ \defupfntmark{\super[vmove = 2pt]{\theupfootnote}} \defdownfntmark{\notminipage{\textcolor{blue}{\thedownfootnote}}{}} \end{ctexexam} - \keychoice{fncust-form}{format code,match} + \keychoice{fncustom-format}{format code,match} 单独设定自定义脚注标记的格式,选项 \code{match} 可以匹配 \option*{spcmd} 全局的值。自定义脚注的命令与用法可以见下方的介绍。 \begin{commands}\noitemsep \command{Footnote}[\oarg{内容标记}\marg{正文标记}\marg{脚注文本}]\default{} @@ -765,9 +765,9 @@ \Footnote{*}{这是可以自定义标记的脚注。} \end{ctexexam} \end{commands} - \keychoice{fnboth-form}{format code,match} - 同时设定默认脚注标记 \option{fnmate-form} 和自定义脚注标记 \option{fncust-form} 的格式。两种脚注标记匹配上标格式 \option*{spcmd} 的值是独立的,使用 \code{match} 则可以同时匹配。标记格式选项含有字体命令会覆盖 \option{footnote} 的设置,最后一个格式命令可以带有一个参数接受脚注标记。 - \keyval{fnpara-form}{格式代码} + \keychoice{fnboth-format}{format code,match} + 同时设定默认脚注标记 \option{fnmarktext-format} 和自定义脚注标记 \option{fncustom-format} 的格式。两种脚注标记匹配上标格式 \option*{spcmd} 的值是独立的,使用 \code{match} 则可以同时匹配。标记格式选项含有字体命令会覆盖 \option{footnote} 的设置,最后一个格式命令可以带有一个参数接受脚注标记。 + \keyval{fnpara-format}{格式代码} 脚注内容的格式。在此设置字体命令会覆盖 \option{footnote} 的设置,最后一个格式命令可以带有一个参数接受脚注内容。 \kvsplit{fntext-code}{前代码,后代码} 可以用 \meta{前代码} 与 \meta{后代码} 额外增加脚注内容标记前后的代码。也可以只有前部分,\meta{前代码} 中最后一个格式命令可以带有一个参数接受脚注内容标记。由于脚注标记处于水平模式,一般用于在脚注内容标记与脚注首行间插入一点距离,或与脚注正文标记的格式稍有不同。 diff --git a/Master/texmf-dist/source/latex/easybook/easybook.dtx b/Master/texmf-dist/source/latex/easybook/easybook.dtx index 4d64ffcd4a2..e7d60873488 100644 --- a/Master/texmf-dist/source/latex/easybook/easybook.dtx +++ b/Master/texmf-dist/source/latex/easybook/easybook.dtx @@ -15,7 +15,7 @@ %<*class> \NeedsTeXFormat{LaTeX2e}[2020/10/01] \RequirePackage{l3keys2e} -\ProvidesExplClass{easybook}{2022/05/02}{1.683} +\ProvidesExplClass{easybook}{2022/08/03}{1.69} {Easily typesetting Chinese theses or books} \bool_set_false:N \l__eb_compile_draft_bool @@ -303,7 +303,7 @@ %<*package> \NeedsTeXFormat{LaTeX2e}[2020/10/01] \RequirePackage{l3keys2e,etoolbox} -\ProvidesExplPackage{easybase}{2022/05/02}{1.683} +\ProvidesExplPackage{easybase}{2022/08/03}{1.69} {Easily typesetting Chinese theses or books} \cs_generate_variant:Nn \dim_set:Nn { NV } @@ -752,13 +752,13 @@ { \tl_clear:N \l__eb_fntext_after_tl } { \tl_set:Nn \l__eb_fntext_after_tl {#2} } } -\cs_new_protected:Npn \eb_fnmate_counter_pifont:N #1 +\cs_new_protected:Npn \eb_fnmarktext_counter_pifont:N #1 { \ding{\int_eval:n { 171 + #1 }} } -\cs_new_protected:Npn \eb_fnmate_counter_pifont_neg:N #1 +\cs_new_protected:Npn \eb_fnmarktext_counter_pifont_neg:N #1 { \ding{\int_eval:n { 181 + #1 }} } -\cs_new_protected:Npn \eb_fnmate_counter_pisans:N #1 +\cs_new_protected:Npn \eb_fnmarktext_counter_pisans:N #1 { \ding{\int_eval:n { 191 + #1 }} } -\cs_new_protected:Npn \eb_fnmate_counter_pisans_neg:N #1 +\cs_new_protected:Npn \eb_fnmarktext_counter_pisans_neg:N #1 { \ding{\int_eval:n { 201 + #1 }} } \cs_new_protected:Npn \DefineFntSymbols #1#2#3 { @@ -785,31 +785,31 @@ { s } { \eb_int_to_symbols:n } } } -\cs_new_protected:Npn \eb_fnmate_normal_label_set:Nn #1#2 +\cs_new_protected:Npn \eb_fnmarktext_normal_label_set:Nn #1#2 { - \tl_set:Nn \l__eb_fnmate_number_type_tl {#2} + \tl_set:Nn \l__eb_fnmarktext_number_type_tl {#2} \cs_set:Npx #1 { - \str_case:VnT \l__eb_fnmate_number_type_tl + \str_case:VnT \l__eb_fnmarktext_number_type_tl { { plain } { \exp_not:N \int_use:N } { pifont } - { \eb_fnmate_counter_pifont:N } + { \eb_fnmarktext_counter_pifont:N } { pifont* } - { \eb_fnmate_counter_pifont_neg:N } + { \eb_fnmarktext_counter_pifont_neg:N } { pisans } - { \eb_fnmate_counter_pisans:N } + { \eb_fnmarktext_counter_pisans:N } { pisans* } - { \eb_fnmate_counter_pisans_neg:N } + { \eb_fnmarktext_counter_pisans_neg:N } } { \exp_not:N \c@footnote } } \cs_set_eq:NN \thedownfootnote \thefootnote } -\cs_new_protected:Npn \eb_fnmate_short_label_set:Nn #1#2 +\cs_new_protected:Npn \eb_fnmarktext_short_label_set:Nn #1#2 { - \tl_set:Nn \l__eb_fnmate_short_tokens_tl {#2} + \tl_set:Nn \l__eb_fnmarktext_short_tokens_tl {#2} \eb_seq_map_inline:nn { A,a,1,I,i,c,s } { @@ -817,11 +817,11 @@ { \regex_replace_once:nnN {##1} { \c{eb_int_format_trans:NN} ##1 \c{c@footnote} } - \l__eb_fnmate_short_tokens_tl + \l__eb_fnmarktext_short_tokens_tl \seq_map_break: } } - \cs_set_eq:NN #1 \l__eb_fnmate_short_tokens_tl + \cs_set_eq:NN #1 \l__eb_fnmarktext_short_tokens_tl \cs_set_eq:NN \thedownfootnote \thefootnote } \cs_new_protected:Npn \eb_footnote_value_handle:n #1 @@ -843,7 +843,7 @@ { \tl_set:Nn \l__eb_footnote_value_tl {#1} } } } -\cs_new_protected:Npn \eb_fnmate_move_set:nnn #1#2#3 +\cs_new_protected:Npn \eb_fnmarktext_move_set:nnn #1#2#3 { \str_if_eq:nnTF {#1} { match } { @@ -863,8 +863,8 @@ } \bool_new:N \l__eb_fnpara_bottom_bool -\tl_new:N \l__eb_fnmate_format_tl -\tl_new:N \l__eb_fncust_format_tl +\tl_new:N \l__eb_fnmarktext_format_tl +\tl_new:N \l__eb_fncustom_format_tl \clist_new:N \l__eb_footnote_value_clist \ctex_define:nn { hdrset } { @@ -874,38 +874,38 @@ fnafterindent .initial:n = 2em, fnparskip .skip_set:N = \fnparskip, fnparskip .initial:n = 0ex plus .1ex, - fnpara-form .tl_set:N = \l__eb_fnpara_format_tl, + fnpara-formatat .tl_set:N = \l__eb_fnpara_format_tl, fntext-pos .tl_set:N = \l__eb_fntext_position_tl, fntext-pos .initial:n = super, fntext-code .code:n = \eb_assign_fntext_code:n {#1}, fntext-code .initial:n = { ,\tl_if_eq:NnF \l__eb_fntext_position_tl { super } { ~ } }, - fnmate-form .code:n = \eb_fnboth_format_set:nn {#1} { mate }, - fncust-form .code:n = \eb_fnboth_format_set:nn {#1} { cust }, - fnboth-form .meta:n = { fnmate-form = #1,fncust-form = #1 }, + fnmarktext-format .code:n = \eb_fnboth_format_set:nn {#1} { marktext }, + fncustom-format .code:n = \eb_fnboth_format_set:nn {#1} { custom }, + fnboth-format .meta:n = { fnmarktext-format = #1,fncustom-format = #1 }, footnotetype .multichoices:nn = { plain,hang,bottom,para,flush } { \eb_footnote_value_handle:n {#1} }, footnotetype .value_required:n = true, footnotetype/default .meta:n = footnotetype/plain, footnotetype .initial:n = hang, - fnmark-vmove .code:n = \eb_fnmate_move_set:nnn {#1} { mark } { v }, - fnmark-hmove .code:n = \eb_fnmate_move_set:nnn {#1} { mark } { h }, - fntext-vmove .code:n = \eb_fnmate_move_set:nnn {#1} { text } { v }, + fnmark-vmove .code:n = \eb_fnmarktext_move_set:nnn {#1} { mark } { v }, + fnmark-hmove .code:n = \eb_fnmarktext_move_set:nnn {#1} { mark } { h }, + fntext-vmove .code:n = \eb_fnmarktext_move_set:nnn {#1} { text } { v }, fnmark-vmove .initial:n = 0pt, fnmark-hmove .initial:n = 0pt, fntext-vmove .initial:n = 0pt, fnmark-num .choices:nn = { plain,pifont,pifont*,pifont-sans,pifont-sans* } - { \eb_fnmate_normal_label_set:Nn \theupfootnote {#1} }, + { \eb_fnmarktext_normal_label_set:Nn \theupfootnote {#1} }, fnmark-num .value_required:n = true, - fnmark-num/unknown .code:n = \eb_fnmate_short_label_set:Nn \theupfootnote {#1}, + fnmark-num/unknown .code:n = \eb_fnmarktext_short_label_set:Nn \theupfootnote {#1}, fntext-num .choices:nn = { plain,pifont,pifont*,pifont-sans,pifont-sans* } - { \eb_fnmate_normal_label_set:Nn \thefootnote {#1} }, + { \eb_fnmarktext_normal_label_set:Nn \thefootnote {#1} }, fntext-num .value_required:n = true, - fntext-num/unknown .code:n = \eb_fnmate_short_label_set:Nn \thefootnote {#1}, - fnmate-num .meta:n = { fntext-num = #1,fnmark-num = #1 }, - fnmate-num .initial:n = plain, + fntext-num/unknown .code:n = \eb_fnmarktext_short_label_set:Nn \thefootnote {#1}, + fnmarktext-num .meta:n = { fntext-num = #1,fnmark-num = #1 }, + fnmarktext-num .initial:n = plain, unknown .code:n = \eb_msg_deprecated_option:n { hdrset } } @@ -1120,32 +1120,32 @@ \ProvideDocumentCommand{\super}{mo}{\textsuperscript{#1}} \providecommand{\spbset}{\use_none:n} -\NewDocumentCommand{\eb@fnmate@super}{sm} +\NewDocumentCommand{\eb@fnmarktext@super}{sm} { \IfBooleanTF{#1} {\super{#2}[vmove = \l__eb_fntext_vmove_tl,nohmove]} { - \super{\l__eb_fnmate_format_tl{#2}}[ + \super{\l__eb_fnmarktext_format_tl{#2}}[ vmove = \l__eb_fnmark_vmove_tl, hmove = \l__eb_fnmark_hmove_tl ] } } \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_fnmate_format_initial: +\bool_new:N \l__eb_fnmarktext_format_match_bool +\bool_new:N \l__eb_fncustom_format_match_bool +\cs_new_protected:Npn \eb_fnmarktext_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_fnmarktext_format_match_bool + { \tl_clear:N \l__eb_fnmarktext_format_tl } } { - \bool_if:NT \l__eb_fncust_format_match_bool - { \tl_clear:N \l__eb_fnmate_format_tl } + \bool_if:NT \l__eb_fncustom_format_match_bool + { \tl_clear:N \l__eb_fnmarktext_format_tl } } - \bool_if:NF \l__eb_fnmate_format_match_bool { \spbset{spcmd = { }} } + \bool_if:NF \l__eb_fnmarktext_format_match_bool { \spbset{spcmd = { }} } \tl_use:N \l__eb_subfont_footnote_tl } \cs_new_protected:Npn \defupfntmark #1 @@ -1156,18 +1156,18 @@ { \tl_if_eq:NnTF \@mpfn { footnote } } \defupfntmark { - \eb_fnmate_format_initial: - \eb@fnmate@super{\notminipage{\@the@up@fnmark}{\@thefnmark}} + \eb_fnmarktext_format_initial: + \eb@fnmarktext@super{\notminipage{\@the@up@fnmark}{\@thefnmark}} } \defdownfntmark { - \eb_fnmate_format_initial: + \eb_fnmarktext_format_initial: \tl_if_eq:NnTF \l__eb_fntext_position_tl { super } - { \eb@fnmate@super* } + { \eb@fnmarktext@super* } { \use:n } { \tl_use:N \l__eb_fntext_before_tl - { \l__eb_fnmate_format_tl{\@thefnmark} } + { \l__eb_fnmarktext_format_tl{\@thefnmark} } } \tl_use:N \l__eb_fntext_after_tl } @@ -1184,20 +1184,20 @@ \group_end: } } -\cs_new_protected:Npn \eb_fncust_format_initial: +\cs_new_protected:Npn \eb_fncustom_format_initial: { % \ebhdrset{fntext-code = { }} \bool_set_false:N \l__eb_normal_footnote_bool - \bool_if:NF \l__eb_fncust_format_match_bool + \bool_if:NF \l__eb_fncustom_format_match_bool { \tl_set_eq:NN - \l__eb_fnmate_format_tl \l__eb_fncust_format_tl + \l__eb_fnmarktext_format_tl \l__eb_fncustom_format_tl } } \NewDocumentCommand{\Footnote}{O{#2}mm} { \group_begin: - \eb_fncust_format_initial: + \eb_fncustom_format_initial: \eb@@makefnmark{#2}{#1} \@footnotemark \@footnotetext{#3} @@ -1206,14 +1206,14 @@ \cs_new_protected:Npn \Footnotemark #1 { \group_begin: - \eb_fncust_format_initial: + \eb_fncustom_format_initial: \eb@@makefnmark{#1}{#1}\@footnotemark \group_end: } \cs_new_protected:Npn \Footnotetext #1#2 { \group_begin: - \eb_fncust_format_initial: + \eb_fncustom_format_initial: \eb@@makefnmark{#1}{#1}\@footnotetext{#2} \group_end: } @@ -2333,7 +2333,7 @@ } %</package> %<*tcolorbox> -\ProvidesExplFile{eb-tcolorbox.cfg}{2022/05/02}{1.683} +\ProvidesExplFile{eb-tcolorbox.cfg}{2022/08/03}{1.69} {Customization of tcolorbox for easybook} \cs_set_protected:Npn \addtotcbstyle #1#2 diff --git a/Master/texmf-dist/tex/latex/easybook/easybase.sty b/Master/texmf-dist/tex/latex/easybook/easybase.sty index d972200369e..dddb0b626a1 100644 --- a/Master/texmf-dist/tex/latex/easybook/easybase.sty +++ b/Master/texmf-dist/tex/latex/easybook/easybase.sty @@ -20,7 +20,7 @@ %% This work has the LPPL maintenance status `maintained'. \NeedsTeXFormat{LaTeX2e}[2020/10/01] \RequirePackage{l3keys2e,etoolbox} -\ProvidesExplPackage{easybase}{2022/05/02}{1.683} +\ProvidesExplPackage{easybase}{2022/08/03}{1.69} {Easily typesetting Chinese theses or books} \cs_generate_variant:Nn \dim_set:Nn { NV } @@ -469,13 +469,13 @@ { \tl_clear:N \l__eb_fntext_after_tl } { \tl_set:Nn \l__eb_fntext_after_tl {#2} } } -\cs_new_protected:Npn \eb_fnmate_counter_pifont:N #1 +\cs_new_protected:Npn \eb_fnmarktext_counter_pifont:N #1 { \ding{\int_eval:n { 171 + #1 }} } -\cs_new_protected:Npn \eb_fnmate_counter_pifont_neg:N #1 +\cs_new_protected:Npn \eb_fnmarktext_counter_pifont_neg:N #1 { \ding{\int_eval:n { 181 + #1 }} } -\cs_new_protected:Npn \eb_fnmate_counter_pisans:N #1 +\cs_new_protected:Npn \eb_fnmarktext_counter_pisans:N #1 { \ding{\int_eval:n { 191 + #1 }} } -\cs_new_protected:Npn \eb_fnmate_counter_pisans_neg:N #1 +\cs_new_protected:Npn \eb_fnmarktext_counter_pisans_neg:N #1 { \ding{\int_eval:n { 201 + #1 }} } \cs_new_protected:Npn \DefineFntSymbols #1#2#3 { @@ -502,31 +502,31 @@ { s } { \eb_int_to_symbols:n } } } -\cs_new_protected:Npn \eb_fnmate_normal_label_set:Nn #1#2 +\cs_new_protected:Npn \eb_fnmarktext_normal_label_set:Nn #1#2 { - \tl_set:Nn \l__eb_fnmate_number_type_tl {#2} + \tl_set:Nn \l__eb_fnmarktext_number_type_tl {#2} \cs_set:Npx #1 { - \str_case:VnT \l__eb_fnmate_number_type_tl + \str_case:VnT \l__eb_fnmarktext_number_type_tl { { plain } { \exp_not:N \int_use:N } { pifont } - { \eb_fnmate_counter_pifont:N } + { \eb_fnmarktext_counter_pifont:N } { pifont* } - { \eb_fnmate_counter_pifont_neg:N } + { \eb_fnmarktext_counter_pifont_neg:N } { pisans } - { \eb_fnmate_counter_pisans:N } + { \eb_fnmarktext_counter_pisans:N } { pisans* } - { \eb_fnmate_counter_pisans_neg:N } + { \eb_fnmarktext_counter_pisans_neg:N } } { \exp_not:N \c@footnote } } \cs_set_eq:NN \thedownfootnote \thefootnote } -\cs_new_protected:Npn \eb_fnmate_short_label_set:Nn #1#2 +\cs_new_protected:Npn \eb_fnmarktext_short_label_set:Nn #1#2 { - \tl_set:Nn \l__eb_fnmate_short_tokens_tl {#2} + \tl_set:Nn \l__eb_fnmarktext_short_tokens_tl {#2} \eb_seq_map_inline:nn { A,a,1,I,i,c,s } { @@ -534,11 +534,11 @@ { \regex_replace_once:nnN {##1} { \c{eb_int_format_trans:NN} ##1 \c{c@footnote} } - \l__eb_fnmate_short_tokens_tl + \l__eb_fnmarktext_short_tokens_tl \seq_map_break: } } - \cs_set_eq:NN #1 \l__eb_fnmate_short_tokens_tl + \cs_set_eq:NN #1 \l__eb_fnmarktext_short_tokens_tl \cs_set_eq:NN \thedownfootnote \thefootnote } \cs_new_protected:Npn \eb_footnote_value_handle:n #1 @@ -560,7 +560,7 @@ { \tl_set:Nn \l__eb_footnote_value_tl {#1} } } } -\cs_new_protected:Npn \eb_fnmate_move_set:nnn #1#2#3 +\cs_new_protected:Npn \eb_fnmarktext_move_set:nnn #1#2#3 { \str_if_eq:nnTF {#1} { match } { @@ -580,8 +580,8 @@ } \bool_new:N \l__eb_fnpara_bottom_bool -\tl_new:N \l__eb_fnmate_format_tl -\tl_new:N \l__eb_fncust_format_tl +\tl_new:N \l__eb_fnmarktext_format_tl +\tl_new:N \l__eb_fncustom_format_tl \clist_new:N \l__eb_footnote_value_clist \ctex_define:nn { hdrset } { @@ -591,38 +591,38 @@ fnafterindent .initial:n = 2em, fnparskip .skip_set:N = \fnparskip, fnparskip .initial:n = 0ex plus .1ex, - fnpara-form .tl_set:N = \l__eb_fnpara_format_tl, + fnpara-formatat .tl_set:N = \l__eb_fnpara_format_tl, fntext-pos .tl_set:N = \l__eb_fntext_position_tl, fntext-pos .initial:n = super, fntext-code .code:n = \eb_assign_fntext_code:n {#1}, fntext-code .initial:n = { ,\tl_if_eq:NnF \l__eb_fntext_position_tl { super } { ~ } }, - fnmate-form .code:n = \eb_fnboth_format_set:nn {#1} { mate }, - fncust-form .code:n = \eb_fnboth_format_set:nn {#1} { cust }, - fnboth-form .meta:n = { fnmate-form = #1,fncust-form = #1 }, + fnmarktext-format .code:n = \eb_fnboth_format_set:nn {#1} { marktext }, + fncustom-format .code:n = \eb_fnboth_format_set:nn {#1} { custom }, + fnboth-format .meta:n = { fnmarktext-format = #1,fncustom-format = #1 }, footnotetype .multichoices:nn = { plain,hang,bottom,para,flush } { \eb_footnote_value_handle:n {#1} }, footnotetype .value_required:n = true, footnotetype/default .meta:n = footnotetype/plain, footnotetype .initial:n = hang, - fnmark-vmove .code:n = \eb_fnmate_move_set:nnn {#1} { mark } { v }, - fnmark-hmove .code:n = \eb_fnmate_move_set:nnn {#1} { mark } { h }, - fntext-vmove .code:n = \eb_fnmate_move_set:nnn {#1} { text } { v }, + fnmark-vmove .code:n = \eb_fnmarktext_move_set:nnn {#1} { mark } { v }, + fnmark-hmove .code:n = \eb_fnmarktext_move_set:nnn {#1} { mark } { h }, + fntext-vmove .code:n = \eb_fnmarktext_move_set:nnn {#1} { text } { v }, fnmark-vmove .initial:n = 0pt, fnmark-hmove .initial:n = 0pt, fntext-vmove .initial:n = 0pt, fnmark-num .choices:nn = { plain,pifont,pifont*,pifont-sans,pifont-sans* } - { \eb_fnmate_normal_label_set:Nn \theupfootnote {#1} }, + { \eb_fnmarktext_normal_label_set:Nn \theupfootnote {#1} }, fnmark-num .value_required:n = true, - fnmark-num/unknown .code:n = \eb_fnmate_short_label_set:Nn \theupfootnote {#1}, + fnmark-num/unknown .code:n = \eb_fnmarktext_short_label_set:Nn \theupfootnote {#1}, fntext-num .choices:nn = { plain,pifont,pifont*,pifont-sans,pifont-sans* } - { \eb_fnmate_normal_label_set:Nn \thefootnote {#1} }, + { \eb_fnmarktext_normal_label_set:Nn \thefootnote {#1} }, fntext-num .value_required:n = true, - fntext-num/unknown .code:n = \eb_fnmate_short_label_set:Nn \thefootnote {#1}, - fnmate-num .meta:n = { fntext-num = #1,fnmark-num = #1 }, - fnmate-num .initial:n = plain, + fntext-num/unknown .code:n = \eb_fnmarktext_short_label_set:Nn \thefootnote {#1}, + fnmarktext-num .meta:n = { fntext-num = #1,fnmark-num = #1 }, + fnmarktext-num .initial:n = plain, unknown .code:n = \eb_msg_deprecated_option:n { hdrset } } @@ -837,32 +837,32 @@ \ProvideDocumentCommand{\super}{mo}{\textsuperscript{#1}} \providecommand{\spbset}{\use_none:n} -\NewDocumentCommand{\eb@fnmate@super}{sm} +\NewDocumentCommand{\eb@fnmarktext@super}{sm} { \IfBooleanTF{#1} {\super{#2}[vmove = \l__eb_fntext_vmove_tl,nohmove]} { - \super{\l__eb_fnmate_format_tl{#2}}[ + \super{\l__eb_fnmarktext_format_tl{#2}}[ vmove = \l__eb_fnmark_vmove_tl, hmove = \l__eb_fnmark_hmove_tl ] } } \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_fnmate_format_initial: +\bool_new:N \l__eb_fnmarktext_format_match_bool +\bool_new:N \l__eb_fncustom_format_match_bool +\cs_new_protected:Npn \eb_fnmarktext_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_fnmarktext_format_match_bool + { \tl_clear:N \l__eb_fnmarktext_format_tl } } { - \bool_if:NT \l__eb_fncust_format_match_bool - { \tl_clear:N \l__eb_fnmate_format_tl } + \bool_if:NT \l__eb_fncustom_format_match_bool + { \tl_clear:N \l__eb_fnmarktext_format_tl } } - \bool_if:NF \l__eb_fnmate_format_match_bool { \spbset{spcmd = { }} } + \bool_if:NF \l__eb_fnmarktext_format_match_bool { \spbset{spcmd = { }} } \tl_use:N \l__eb_subfont_footnote_tl } \cs_new_protected:Npn \defupfntmark #1 @@ -873,18 +873,18 @@ { \tl_if_eq:NnTF \@mpfn { footnote } } \defupfntmark { - \eb_fnmate_format_initial: - \eb@fnmate@super{\notminipage{\@the@up@fnmark}{\@thefnmark}} + \eb_fnmarktext_format_initial: + \eb@fnmarktext@super{\notminipage{\@the@up@fnmark}{\@thefnmark}} } \defdownfntmark { - \eb_fnmate_format_initial: + \eb_fnmarktext_format_initial: \tl_if_eq:NnTF \l__eb_fntext_position_tl { super } - { \eb@fnmate@super* } + { \eb@fnmarktext@super* } { \use:n } { \tl_use:N \l__eb_fntext_before_tl - { \l__eb_fnmate_format_tl{\@thefnmark} } + { \l__eb_fnmarktext_format_tl{\@thefnmark} } } \tl_use:N \l__eb_fntext_after_tl } @@ -901,20 +901,20 @@ \group_end: } } -\cs_new_protected:Npn \eb_fncust_format_initial: +\cs_new_protected:Npn \eb_fncustom_format_initial: { % \ebhdrset{fntext-code = { }} \bool_set_false:N \l__eb_normal_footnote_bool - \bool_if:NF \l__eb_fncust_format_match_bool + \bool_if:NF \l__eb_fncustom_format_match_bool { \tl_set_eq:NN - \l__eb_fnmate_format_tl \l__eb_fncust_format_tl + \l__eb_fnmarktext_format_tl \l__eb_fncustom_format_tl } } \NewDocumentCommand{\Footnote}{O{#2}mm} { \group_begin: - \eb_fncust_format_initial: + \eb_fncustom_format_initial: \eb@@makefnmark{#2}{#1} \@footnotemark \@footnotetext{#3} @@ -923,14 +923,14 @@ \cs_new_protected:Npn \Footnotemark #1 { \group_begin: - \eb_fncust_format_initial: + \eb_fncustom_format_initial: \eb@@makefnmark{#1}{#1}\@footnotemark \group_end: } \cs_new_protected:Npn \Footnotetext #1#2 { \group_begin: - \eb_fncust_format_initial: + \eb_fncustom_format_initial: \eb@@makefnmark{#1}{#1}\@footnotetext{#2} \group_end: } diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls index 830bed9ae37..04504ebbee9 100644 --- a/Master/texmf-dist/tex/latex/easybook/easybook.cls +++ b/Master/texmf-dist/tex/latex/easybook/easybook.cls @@ -20,7 +20,7 @@ %% This work has the LPPL maintenance status `maintained'. \NeedsTeXFormat{LaTeX2e}[2020/10/01] \RequirePackage{l3keys2e} -\ProvidesExplClass{easybook}{2022/05/02}{1.683} +\ProvidesExplClass{easybook}{2022/08/03}{1.69} {Easily typesetting Chinese theses or books} \bool_set_false:N \l__eb_compile_draft_bool diff --git a/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg b/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg index cf81850ab61..8e7d93641bb 100644 --- a/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg +++ b/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg @@ -18,7 +18,7 @@ %% LaTeX version 2005/12/01 or later. %% %% This work has the LPPL maintenance status `maintained'. -\ProvidesExplFile{eb-tcolorbox.cfg}{2022/05/02}{1.683} +\ProvidesExplFile{eb-tcolorbox.cfg}{2022/08/03}{1.69} {Customization of tcolorbox for easybook} \cs_set_protected:Npn \addtotcbstyle #1#2 |