diff options
author | Karl Berry <karl@freefriends.org> | 2021-10-20 21:18:16 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2021-10-20 21:18:16 +0000 |
commit | 12d897eaaad2dfc093ea910e7413074def2aa361 (patch) | |
tree | 55510db45bd390f1274f29dfd169606d3cbc9e06 /Master/texmf-dist/tex | |
parent | 814539c2b7f634f06dae3203b0c8d0e92bceb3d2 (diff) |
easybook (20oct21)
git-svn-id: svn://tug.org/texlive/trunk@60813 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r-- | Master/texmf-dist/tex/latex/easybook/easybase.sty | 47 | ||||
-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, 20 insertions, 31 deletions
diff --git a/Master/texmf-dist/tex/latex/easybook/easybase.sty b/Master/texmf-dist/tex/latex/easybook/easybase.sty index 4299278afef..bb0e6bd07a3 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}{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@frame}m>{\SplitArgument{1}{!}}O{}} + {O{\textwidth}D(){ctex@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@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@fnmark@super{\eb@thefnmark} } { \eb@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@fnmark@super* } { - \eb_fn_format_if_match:T { \tl_clear:N \l__eb_fnmate_format_tl } - \eb@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 } } diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls index 2d517d72446..1748f23e014 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}{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 diff --git a/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg b/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg index b7c9f589107..c95ff0be7fe 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}{2021/10/18}{1.3P} +\ProvidesExplFile{eb-tcolorbox.cfg}{2021/10/20}{1.3S} {Customization of tcolorbox for easybook} \tl_gset:Nn \eb@tc@line@skip { 0.5\baselineskip } |