summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/easybook
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/source/latex/easybook')
-rw-r--r--Master/texmf-dist/source/latex/easybook/easybook.dtx39
1 files changed, 20 insertions, 19 deletions
diff --git a/Master/texmf-dist/source/latex/easybook/easybook.dtx b/Master/texmf-dist/source/latex/easybook/easybook.dtx
index 45926cc09ef..dfbf1feea71 100644
--- a/Master/texmf-dist/source/latex/easybook/easybook.dtx
+++ b/Master/texmf-dist/source/latex/easybook/easybook.dtx
@@ -15,7 +15,7 @@
%<*class>
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2021/12/20}{1.42A}
+\ProvidesExplClass{easybook}{2021/12/22}{1.42B}
{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/20}{1.42A}
+\ProvidesExplPackage{easybase}{2021/12/22}{1.42B}
{Typeset Chinese theses or books}
\cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -372,25 +372,31 @@
}
{ \IfFileExists{#1.sty}{\RequirePackage{#1}}{} }
}
-\cs_new_protected:Npn \eb_if_package_loaded:nF #1#2
+\cs_new_protected:Npn \eb_if_package_loaded:nnF #1#2#3
{
\@ifpackageloaded{#1}
- {\msg_warning:nnn { easybase } { package-reloaded } {#1}}
- {#2\disable@package@load{#1}{}}
+ {
+ \tl_if_blank:nTF {#2}
+ { \msg_warning:nnn { easybase } { package-reloaded-ii } {#1} }
+ { \msg_warning:nnnn { easybase } { package-reloaded-i } {#1} {#2} }
+ }
+ {#3\disable@package@load{#1}{}}
}
-\msg_new:nnn { easybase } { package-reloaded }
+\msg_new:nnn { easybase } { package-reloaded-i }
{
The~macro~package~#1~has~been~reloaded. \\
Please~pass~the~arguments~by \\
- the~\string\PassOptionsToPackage{\#1}{#1}\ command.
+ the~\string\PassOptionsToPackage{#2}{#1}\ command.
}
+\msg_new:nnn { easybase } { package-reloaded-ii }
+ { The~macro~package~#1~has~been~reloaded. }
\cs_set_eq:NN \eb@usepackage@save \usepackage
\RenewDocumentCommand{\usepackage}{O{}m}
{
\PassOptionsToPackage{#1}{#2}
\eb_seq_map_inline:nn {#2}
{
- \eb_if_package_loaded:nF {##1}
+ \eb_if_package_loaded:nnF {##1} {#1}
{ \eb@usepackage@save{##1} }
}
}
@@ -2072,16 +2078,11 @@
{
\sisetup
{
- number-mode = match,
- table-parse-only,
- text-family-to-math,
- text-series-to-math,
- reset-text-family = false,
- reset-text-series = false,
- reset-text-shape = false,
- range-phrase = \ensuremath{\sim},
- range-units = single,
- group-digits = none
+ number-mode = match,
+ range-phrase = \ensuremath{\sim},
+ range-units = single,
+ table-alignment-mode = none,
+ group-digits = none
}
}{}
\eb_at_begin_environment:nn
@@ -2431,7 +2432,7 @@
}
%</package>
%<*tcolorbox>
-\ProvidesExplFile{eb-tcolorbox.cfg}{2021/12/20}{1.42A}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2021/12/22}{1.42B}
{Customization of tcolorbox for easybook}
\cs_set_protected:Npn \setexercise #1