diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/easybook')
-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 |
3 files changed, 55 insertions, 55 deletions
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 |