From 5f692b0c97fc156abcb2eb1bb22cb7d3b5e17ed5 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 18 Dec 2021 20:56:36 +0000 Subject: easybook (18dec21) git-svn-id: svn://tug.org/texlive/trunk@61341 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/easybook/easybase.sty | 29 +++++++++++----------- Master/texmf-dist/tex/latex/easybook/easybook.cls | 2 +- .../texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg | 2 +- 3 files changed, 17 insertions(+), 16 deletions(-) (limited to 'Master/texmf-dist/tex/latex') diff --git a/Master/texmf-dist/tex/latex/easybook/easybase.sty b/Master/texmf-dist/tex/latex/easybook/easybase.sty index a4f54cb3a65..96c8971ed17 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/12/16}{1.41X} +\ProvidesExplPackage{easybase}{2021/12/18}{1.41Z} {Typeset Chinese theses or books} \cs_generate_variant:Nn \dim_set:Nn { NV } @@ -189,6 +189,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 = { } } } @@ -548,14 +549,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 { @@ -595,12 +596,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* } @@ -797,11 +798,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 ] } } diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls index d2c4b24aff1..9a5ba4874cf 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/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 diff --git a/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg b/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg index dd93ef15ab8..b3a3497e42e 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/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