summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/easybook/easybook.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'macros/latex/contrib/easybook/easybook.dtx')
-rw-r--r--macros/latex/contrib/easybook/easybook.dtx37
1 files changed, 18 insertions, 19 deletions
diff --git a/macros/latex/contrib/easybook/easybook.dtx b/macros/latex/contrib/easybook/easybook.dtx
index 9c59694354..6bb74a2191 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}{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
@@ -305,7 +305,7 @@
%<*package>
\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 }
@@ -472,7 +472,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
{
@@ -634,7 +634,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 }
@@ -761,13 +761,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
{
@@ -804,13 +804,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 }
}
@@ -1129,12 +1129,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
{
@@ -1164,7 +1163,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
{
@@ -1890,7 +1889,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 }
@@ -2231,7 +2230,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}{}
}
@@ -2433,7 +2432,7 @@
}
%</package>
%<*tcolorbox>
-\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