From f2ea4ea1024064a680672c760f626f295ad1e1fb Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 23 Jan 2022 21:11:13 +0000 Subject: easybook (23jan22) git-svn-id: svn://tug.org/texlive/trunk@61713 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/easybook/easybase.sty | 33 +++++++++++----------- Master/texmf-dist/tex/latex/easybook/easybook.cls | 2 +- .../texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg | 2 +- 3 files changed, 18 insertions(+), 19 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/latex/easybook/easybase.sty b/Master/texmf-dist/tex/latex/easybook/easybase.sty index a1daa7a86bd..d223ac9e309 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/01/20}{1.48} +\ProvidesExplPackage{easybase}{2022/01/23}{1.50} {Typeset Chinese theses or books} \cs_generate_variant:Nn \dim_set:Nn { NV } @@ -187,7 +187,7 @@ Please~browse~the~user~manual~for~the~new~options. } } -\cs_new:Npn \eb_msg_abandon_option:n #1 +\cs_new_protected:Npn \eb_msg_abandon_option:n #1 { \msg_warning:nnV { easybase } { abandon-#1 } \l_keys_key_str } \cs_if_exist:NF \chapter { @@ -349,7 +349,7 @@ \exp_args:Nc \NewDocumentCommand { eb@mark@#1@label@layout } {O{\use:c { CTEXthe#1 }}m} {\tl_set:cn { eb@mark@#1@label } {##1##2}} - \cs_new:cpn { eb_mark_#1_name_parse:n } ##1 + \cs_new_protected:cpn { eb_mark_#1_name_parse:n } ##1 { \tl_if_in:nnTF {##1} { [ } { \use:c { eb@mark@#1@label@layout }##1 } @@ -476,13 +476,13 @@ { \tl_clear:N \l__eb_fntext_after_tl } { \tl_set:Nn \l__eb_fntext_after_tl {#2} } } -\cs_new:Npn \eb_fnmate_counter_pifont:N #1 +\cs_new_protected:Npn \eb_fnmate_counter_pifont:N #1 { \ding{\int_eval:n { 171 + #1 }} } -\cs_new:Npn \eb_fnmate_counter_pifont_neg:N #1 +\cs_new_protected:Npn \eb_fnmate_counter_pifont_neg:N #1 { \ding{\int_eval:n { 181 + #1 }} } -\cs_new:Npn \eb_fnmate_counter_pisans:N #1 +\cs_new_protected:Npn \eb_fnmate_counter_pisans:N #1 { \ding{\int_eval:n { 191 + #1 }} } -\cs_new:Npn \eb_fnmate_counter_pisans_neg:N #1 +\cs_new_protected:Npn \eb_fnmate_counter_pisans_neg:N #1 { \ding{\int_eval:n { 201 + #1 }} } \cs_new_protected:Npn \DefineFntSymbols #1#2#3 { @@ -519,13 +519,13 @@ { plain } { \exp_not:N \int_use:N } { pifont } - { \exp_not:N \eb_fnmate_counter_pifont:N } + { \eb_fnmate_counter_pifont:N } { pifont* } - { \exp_not:N \eb_fnmate_counter_pifont_neg:N } + { \eb_fnmate_counter_pifont_neg:N } { pisans } - { \exp_not:N \eb_fnmate_counter_pisans:N } + { \eb_fnmate_counter_pisans:N } { pisans* } - { \exp_not:N \eb_fnmate_counter_pisans_neg:N } + { \eb_fnmate_counter_pisans_neg:N } } { \exp_not:N \c@footnote } } @@ -844,12 +844,11 @@ { \cs_set:Npn \@makefnmark { \hbox:n {#1} } } \cs_new_protected:Npn \defdownfntmark #1 { \cs_set:Npn \eb@makefnmark { \hbox:n {#1} } } +\cs_new:Npn \notminipage { \tl_if_eq:NnTF \@mpfn { footnote } } \defupfntmark { \eb_fnmate_format_initial: - \tl_if_eq:NnTF \@mpfn { footnote } - { \eb@fnmate@super{\@the@up@fnmark} } - { \eb@fnmate@super{\@thefnmark} } + \eb@fnmate@super{\notminipage{\@the@up@fnmark}{\@thefnmark}} } \defdownfntmark { @@ -879,7 +878,7 @@ } \cs_new_protected:Npn \eb_fncust_format_initial: { - % \hdrset{fntext-code = { }} + % \ebhdrset{fntext-code = { }} \bool_set_false:N \l__eb_normal_footnote_bool \bool_if:NF \l__eb_fncust_format_match_bool { @@ -1605,7 +1604,7 @@ \cs_new_protected:Npn \seteqcomp #1 { \keys_set:nn { eb/eqcomp } {#1} } -\cs_new:Npn \eb_eqsymb_left_margin_calc: +\cs_new_protected:Npn \eb_eqsymb_left_margin_calc: { \hbox_set:Nn \l_tmpa_box { \l__eb_eqsymb_delim_tl } \hbox_set:Nn \l_tmpb_box { \l__eb_eqsymb_intro_tl } @@ -1946,7 +1945,7 @@ { style = lst-base, language = [LaTeX]TeX, - texcsstyle = *\color{ctex@verb}\bfseries, + texcsstyle = *\color{ctex@verb}\eb@lst@if@display{\bfseries}{}, basicstyle = \ttfamily\eb@lst@if@display{\small}{\color{ctex@verb}}, keywordstyle = \color{ctex@verb}\eb@lst@if@display{\bfseries}{} } diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls index bd23d910d05..362fe5600bb 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/01/20}{1.48} +\ProvidesExplClass{easybook}{2022/01/23}{1.50} {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 7d6506742da..f2c1b61f4a3 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/01/20}{1.48} +\ProvidesExplFile{eb-tcolorbox.cfg}{2022/01/23}{1.50} {Customization of tcolorbox for easybook} \cs_set_protected:Npn \addtotcbstyle #1#2 -- cgit v1.2.3