From 518997e1511d31037a7b4936a9ad6908b8a0f9d2 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Sun, 19 Dec 2021 03:00:48 +0000 Subject: CTAN sync 202112190300 --- macros/latex/contrib/easybook/easybook.dtx | 33 +++++++++++++++--------------- 1 file changed, 17 insertions(+), 16 deletions(-) (limited to 'macros/latex/contrib/easybook/easybook.dtx') diff --git a/macros/latex/contrib/easybook/easybook.dtx b/macros/latex/contrib/easybook/easybook.dtx index 752a7341c4..11a4f89bb1 100644 --- a/macros/latex/contrib/easybook/easybook.dtx +++ b/macros/latex/contrib/easybook/easybook.dtx @@ -15,7 +15,7 @@ %<*class> \NeedsTeXFormat{LaTeX2e}[2020/10/01] \RequirePackage{l3keys2e} -\ProvidesExplClass{easybook}{2021/12/16}{1.41X} +\ProvidesExplClass{easybook}{2021/12/18}{1.41Z} {Typeset Chinese theses or books} \bool_set_false:N \l__eb_compile_draft_bool @@ -307,7 +307,7 @@ %<*package> \NeedsTeXFormat{LaTeX2e}[2020/10/01] \RequirePackage{l3keys2e,etoolbox} -\ProvidesExplPackage{easybase}{2021/12/16}{1.41X} +\ProvidesExplPackage{easybase}{2021/12/18}{1.41Z} {Typeset Chinese theses or books} \cs_generate_variant:Nn \dim_set:Nn { NV } @@ -476,6 +476,7 @@ \cs_if_exist:NF \chapter { \newcounter{chapter} + \providebool{@mainmatter} \bool_set_false:N \l__eb_class_mode_book_bool \ctex_define:n { chapter/tocline .code:n = { } } } @@ -835,14 +836,14 @@ { \tl_set:Nn \l__eb_footnote_value_tl {#1} } } } -\cs_new_protected:Npn \eb_fnmate_shift_set:nnn #1#2#3 +\cs_new_protected:Npn \eb_fnmate_move_set:nnn #1#2#3 { \str_if_eq:nnTF {#1} { match } { - \tl_set:cv { l__eb_fn#2_#3shift_tl } - { l__spb_super_#3shift_dim } + \tl_set:cv { l__eb_fn#2_#3move_tl } + { l__spb_super_#3move_dim } } - { \tl_set:cn { l__eb_fn#2_#3shift_tl } {#1} } + { \tl_set:cn { l__eb_fn#2_#3move_tl } {#1} } } \cs_new_protected:Npn \eb_fnboth_format_set:nn #1#2 { @@ -882,12 +883,12 @@ footnotetype .value_required:n = true, footnotetype .initial:n = hang, - fnmark-vshift .code:n = \eb_fnmate_shift_set:nnn {#1} { mark } { v }, - fnmark-hshift .code:n = \eb_fnmate_shift_set:nnn {#1} { mark } { h }, - fntext-vshift .code:n = \eb_fnmate_shift_set:nnn {#1} { text } { v }, - fnmark-vshift .initial:n = 0pt, - fnmark-hshift .initial:n = 0pt, - fntext-vshift .initial:n = 0pt, + 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 .initial:n = 0pt, + fnmark-hmove .initial:n = 0pt, + fntext-vmove .initial:n = 0pt, fnmark-num .choices:nn = { plain,pifont,pifont*,pifont-sans,pifont-sans* } @@ -1084,11 +1085,11 @@ \NewDocumentCommand{\eb@fnmate@super}{sm} { \IfBooleanTF{#1} - {\super{#2}[vshift = \l__eb_fntext_vshift_tl,nohshift]} + {\super{#2}[vmove = \l__eb_fntext_vmove_tl,nohmove]} { \super{\l__eb_fnmate_format_tl{#2}}[ - vshift = \l__eb_fnmark_vshift_tl, - hshift = \l__eb_fnmark_hshift_tl + vmove = \l__eb_fnmark_vmove_tl, + hmove = \l__eb_fnmark_hmove_tl ] } } @@ -2429,7 +2430,7 @@ } % %<*tcolorbox> -\ProvidesExplFile{eb-tcolorbox.cfg}{2021/12/16}{1.41X} +\ProvidesExplFile{eb-tcolorbox.cfg}{2021/12/18}{1.41Z} {Customization of tcolorbox for easybook} \cs_set_protected:Npn \setexercise #1 -- cgit v1.2.3