summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/easybook/easybook.dtx
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2024-01-08 03:02:10 +0000
committerNorbert Preining <norbert@preining.info>2024-01-08 03:02:10 +0000
commitafbba3b1d12f17572ca4745766f2e0d55a6f58f3 (patch)
treeedd2a155356a9d3c357d03d6c49e6531f189e7df /macros/latex/contrib/easybook/easybook.dtx
parentaba7fb229e902758b312ecec84ab6f485c89ba66 (diff)
CTAN sync 202401080302
Diffstat (limited to 'macros/latex/contrib/easybook/easybook.dtx')
-rw-r--r--macros/latex/contrib/easybook/easybook.dtx33
1 files changed, 16 insertions, 17 deletions
diff --git a/macros/latex/contrib/easybook/easybook.dtx b/macros/latex/contrib/easybook/easybook.dtx
index a0727bfa7d..93ca70813e 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}{2024/01/06}{2024C}
+\ProvidesExplClass{easybook}{2024/01/07}{2024D}
{Easily typesetting Chinese theses or books}
\bool_set_false:N \l__eb_compile_draft_bool
@@ -223,12 +223,12 @@
\cs_generate_variant:Nn \eb_put_newtxmath:n { V }
\str_case:VnF \l__eb_mathfont_value_tl
{
- { times } { \LoadPackage{newtxmath+bm} }
+ { times } { \RequirePackage{newtxmath,bm} }
{ none } { }
}
{
\eb_put_newtxmath:V \l__eb_mathfont_value_tl
- \LoadPackage{newtxmath+bm}
+ \RequirePackage{newtxmath,bm}
}
\ctex_set:n
@@ -302,7 +302,7 @@
%<*package>
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2024/01/06}{2024C}
+\ProvidesExplPackage{easybase}{2024/01/07}{2024D}
{Easily typesetting Chinese theses or books}
\cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -362,7 +362,7 @@
}
\cs_new_protected:Npn \eb_if_package_loaded:nnF #1#2#3
{
- \@ifpackageloaded{#1}
+ \IfPackageLoadedTF{#1}
{
\tl_if_blank:nTF {#2}
{ \msg_warning:nnn { easybase } { package-repeat-load-ii } {#1} }
@@ -433,11 +433,11 @@
\PassOptionsToPackage{many}{tcolorbox}
\ProcessKeysOptions{easybase}
\PassOptionsToPackage{\g__eb_ctex_options_clist}{ctex}
-\@ifclassloaded{ctexbook}{}
+\IfClassLoadedTF{ctexbook}{}
{
- \@ifclassloaded{ctexart}{}
+ \IfClassLoadedTF{ctexart}{}
{
- \@ifclassloaded{ctexrep}{}
+ \IfClassLoadedTF{ctexrep}{}
{\RequirePackage[heading]{ctex}}
}
}
@@ -930,7 +930,7 @@
{
\bool_if:NT \l__eb_fnpara_bottom_bool
{
- \@ifpackageloaded{footmisc}
+ \IfPackageLoadedTF{footmisc}
{\msg_warning:nn { easybase } { bottom-not-compatible }}
{
\cs_set:Npn \@makecol
@@ -1702,7 +1702,7 @@
},
caption-every .initial:n = \sffamily\small,
footnote .tl_set:N = \l__eb_subfont_footnote_tl,
- marginpar .tl_set:N = \l__eb_subfont_marginpar_tl,
+ marginpar .tl_set:N = \marginfont,
marginpar .initial:n = \footnotesize,
unknown .code:n = \eb_msg_deprecated_option:n { subfont }
}
@@ -1757,7 +1757,6 @@
unknown .code:n = \eb_msg_deprecated_option:n { spread }
}
-\tl_gset:Nn \marginfont { \l__eb_subfont_marginpar_tl }
\eb_seq_map_inline:nn
{ table,figure,listing }
{
@@ -1927,7 +1926,7 @@
}
\bool_if:NT \l__eb_theorem_support_bool
{
- \LoadPackage{amsthm+thmtools}
+ \RequirePackage{amsthm,thmtools}
\eb_package_date_check:nn { thmtools } { 2020/08/01 }
\cs_set_eq:NN \eb@declaretheorem@save \declaretheorem
\cs_set_eq:NN \eb@declaretheoremsyle@save \declaretheoremstyle
@@ -2029,7 +2028,7 @@
\cs_new_protected:Npn \eb_bibtex_natbib_set:
{
- \LoadPackage[sort&compress]{natbib}
+ \RequirePackage[sort&compress]{natbib}
\str_case:VnTF \l__eb_bib_both_style_tl
{
{ numerical }
@@ -2084,7 +2083,7 @@
{ \eb_put_biblatex:n { style = \l__eb_bib_both_style_tl } }
\tl_if_blank:VF \l__eb_bib_cite_style_tl
{ \eb_put_biblatex:n { citestyle = \l__eb_bib_cite_style_tl } }
- \LoadPackage[backend = biber]{biblatex}
+ \RequirePackage[backend = biber]{biblatex}
\clist_map_function:NN \l__eb_bib_datafile_clist \addbibresource
\tl_gset:Nn \blx@default@theheading { bibintoc }
\defbibheading{bibintoc}[\bibname]{\eb_biber_toc_title:n {##1}}
@@ -2268,7 +2267,7 @@
}
\ctex_at_end_preamble:n
{
- \LoadPackage{hyperref}
+ \RequirePackage{hyperref}
\urlstyle{same}
\eb_allow_url_break:
\eb_put_hyperref:n
@@ -2286,7 +2285,7 @@
{ \AfterPreamble{\eb@labelformat@save{#1}{#2}} }
\AtBeginDocument
{
- \@ifpackageloaded{cleveref}{}
+ \IfPackageLoadedTF{cleveref}{}
{
\labelformat{part}{\CTEXthepart}
\labelformat{chapter}{\CTEXthechapter}
@@ -2328,7 +2327,7 @@
}
%</package>
%<*tcolorbox>
-\ProvidesExplFile{eb-tcolorbox.cfg}{2024/01/06}{2024C}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2024/01/07}{2024D}
{Customization of tcolorbox for easybook}
\cs_set_protected:Npn \addtotcbstyle #1#2