diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/easybook/easybase.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/easybook/easybase.sty | 39 |
1 files changed, 20 insertions, 19 deletions
diff --git a/Master/texmf-dist/tex/latex/easybook/easybase.sty b/Master/texmf-dist/tex/latex/easybook/easybase.sty index 89205fae876..5909a108bd4 100644 --- a/Master/texmf-dist/tex/latex/easybook/easybase.sty +++ b/Master/texmf-dist/tex/latex/easybook/easybase.sty @@ -20,12 +20,13 @@ %% This work has the LPPL maintenance status `maintained'. \NeedsTeXFormat{LaTeX2e}[2020/10/01] \RequirePackage{l3keys2e,etoolbox} -\ProvidesExplPackage{easybase}{2021/12/12}{1.41S} +\ProvidesExplPackage{easybase}{2021/12/15}{1.41U} {Typeset Chinese theses or books} \cs_generate_variant:Nn \dim_set:Nn { NV } \cs_generate_variant:Nn \dim_sign:n { V } \cs_generate_variant:Nn \int_to_arabic:n { v } +\cs_generate_variant:Nn \msg_warning:nnn { nnV } \cs_generate_variant:Nn \prop_set_from_keyval:Nn { NV } \cs_generate_variant:Nn \skip_set:Nn { NV } \cs_generate_variant:Nn \seq_set_from_clist:Nn { No } @@ -118,10 +119,8 @@ { \BeforeBeginEnvironment{document} } \cs_gset_eq:NN \PackageWarning \PackageInfo -\bool_if_exist:NF \l__eb_class_mode_book_bool - { \bool_set_true:N \l__eb_class_mode_book_bool } -\bool_if_exist:NF \l__eb_compile_draft_bool - { \bool_set_false:N \l__eb_compile_draft_bool } +\bool_set_true:N \l__eb_class_mode_book_bool +\bool_set_false:N \l__eb_compile_draft_bool \clist_new:N \g__eb_ctex_options_clist \keys_define:nn { easybase } @@ -164,7 +163,7 @@ \bool_new:N \l__eb_mark_uppercase_bool \bool_new:N \l__eb_chap_counter_withpart_bool -\tl_new:N \l__eb_foot_counter_parent_value_tl +\tl_new:N \l__eb_fnt_counter_parent_value_tl \eb_seq_map_inline:nn { @@ -186,7 +185,7 @@ } } \cs_new:Npn \eb_msg_abandon_option:n #1 - { \msg_warning:nnx { easybase } { abandon-#1 } { \l_keys_key_str } } + { \msg_warning:nnV { easybase } { abandon-#1 } \l_keys_key_str } \cs_if_exist:NF \chapter { \newcounter{chapter} @@ -445,11 +444,11 @@ \ctex_define:nn { style } { - footwith .choices:nn = + fntnumwith .choices:nn = { part,page,chapter } - { \tl_set:Nn \l__eb_foot_counter_parent_value_tl {#1} }, - footwith .value_required:n = true, - footwith .initial:n = chapter + { \tl_set:Nn \l__eb_fnt_counter_parent_value_tl {#1} }, + fntnumwith .value_required:n = true, + fntnumwith .initial:n = chapter } \NewDocumentCommand{\eb_assign_fntext_code:n} {>{\SplitArgument{1}{,}}m} @@ -554,7 +553,7 @@ \str_if_eq:nnTF {#1} { match } { \tl_set:cv { l__eb_fn#2_#3shift_tl } - { l__spb_super_script_#3shift_dim } + { l__spb_super_#3shift_dim } } { \tl_set:cn { l__eb_fn#2_#3shift_tl } {#1} } } @@ -627,7 +626,7 @@ \dim_set:Nn \footnotesep { \dim_use:N \box_ht:N \strutbox } \bool_if:NT \l__eb_chap_counter_withpart_bool { \counterwithin*{chapter}{part} } - \str_case:VnT \l__eb_foot_counter_parent_value_tl + \str_case:VnT \l__eb_fnt_counter_parent_value_tl { { part } { \counterwithin*{footnote}{part} } { page } { \counterwithin*{footnote}{page} } @@ -793,16 +792,18 @@ } } -\ProvideDocumentCommand{\super}{omo}{\textsuperscript{#2}} +\ProvideDocumentCommand{\super}{mo}{\textsuperscript{#1}} \providecommand{\spbset}{\use_none:n} \NewDocumentCommand{\eb@fnmate@super}{sm} { \IfBooleanTF{#1} - {\super[\l__eb_fntext_vshift_tl]{#2}[0pt]} + {\super{#2}[vshift = \l__eb_fntext_vshift_tl,nohshift]} { - \super[\l__eb_fnmark_vshift_tl] - {\l__eb_fnmate_format_tl{#2}} - [\l__eb_fnmark_hshift_tl] + \super{#2}[ + cmd = \l__eb_fnmate_format_tl, + vshift = \l__eb_fnmark_vshift_tl, + hshift = \l__eb_fnmark_hshift_tl + ] } } \cs_new_protected:Npn \eb_fnmate_format_initial: @@ -1785,7 +1786,7 @@ { \sisetup { - mode = match, + number-mode = match, table-parse-only, text-family-to-math, text-series-to-math, |