summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-07-24 20:46:58 +0000
committerKarl Berry <karl@freefriends.org>2021-07-24 20:46:58 +0000
commitcfe79507336a956c92024e463bc391e2fa182124 (patch)
tree9e514e8aa9fa6b22a8d8105a1e2bd43f8d46d443 /Master/texmf-dist/tex
parent52acc54d35054ef42caddca5c1e489ef5e0de9d1 (diff)
easybook (24jul21)
git-svn-id: svn://tug.org/texlive/trunk@60039 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/easybook/easybase.sty39
-rw-r--r--Master/texmf-dist/tex/latex/easybook/easybook.cls6
-rw-r--r--Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg2
3 files changed, 34 insertions, 13 deletions
diff --git a/Master/texmf-dist/tex/latex/easybook/easybase.sty b/Master/texmf-dist/tex/latex/easybook/easybase.sty
index 950d2f0032f..75b17fa8c0f 100644
--- a/Master/texmf-dist/tex/latex/easybook/easybase.sty
+++ b/Master/texmf-dist/tex/latex/easybook/easybase.sty
@@ -13,7 +13,7 @@
%% https://creativecommons.org/licenses/by/4.0/legalcode
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2021/07/22}{1.27L}
+\ProvidesExplPackage{easybase}{2021/07/24}{1.27o}
{Typeset Chinese theses or books}
\cs_generate_variant:Nn \int_to_arabic:n { v }
@@ -75,13 +75,30 @@
{
\seq_set_split:Nnn \l_tmpa_seq { [ } {#1}
\seq_pop_left:NN \l_tmpa_seq \l_tmpa_tl
- \IfFileExists{\l_tmpa_tl.sty}
+ \seq_pop_right:NN \l_tmpa_seq \l_tmpb_tl
+ \eb_package_reload_check:nn { \l_tmpa_tl }
{
- \exp_last_unbraced:Nx \RequirePackage
- { [\seq_use:Nn \l_tmpa_seq { , } }{\l_tmpa_tl}
- }{}
+ \IfFileExists{\l_tmpa_tl.sty}
+ {
+ \exp_last_unbraced:Nx \RequirePackage
+ { [\l_tmpb_tl }{\l_tmpa_tl}
+ }{}
+ }
+ }
+ {
+ \eb_package_reload_check:nn {#1}
+ { \IfFileExists{#1.sty}{\RequirePackage{#1}}{} }
}
- { \IfFileExists{#1.sty}{\RequirePackage{#1}}{} }
+ }
+\cs_new_protected:Npn \eb_package_reload_check:nn #1#2
+ {
+ \@ifpackageloaded{#1}
+ {\msg_warning:nnn { easybase } { package-reload } {#1}}{#2}
+ }
+\msg_new:nnn { easybase } { package-reload }
+ {
+ There~is~no~need~to~reload~the~#1~macro~package. \\
+ Please~review~your~code.
}
\NewDocumentCommand{\LoadPackage}{O{}m}
{
@@ -1393,7 +1410,7 @@
item-align .initial:n = r,
delim-align .tl_set:N = \l__eb_eqsymb_delim_align_tl,
delim-align .initial:n = c,
- intro .tl_set: = \l__eb_eqsymb_intro_tl,
+ intro .tl_set:N = \l__eb_eqsymb_intro_tl,
font .tl_set:N = \l__eb_eqsymb_font_tl,
mode .tl_set:N = \l__eb_eqsymb_mode_tl,
mode .initial:n = math
@@ -1893,15 +1910,15 @@
{ \eb_define_theme_color:n { \exp_not:n {#1} } }
}
-\cs_new:Npn \eb_allow_urlbreak:
+\cs_new:Npn \eb_allow_url_break:
{
\eb_appto_cmd:Nn \UrlBreaks
{
\UrlOrds
- \tl_map_function:NN \c__eb_urlbreak_points_tl \do
+ \tl_map_function:NN \c__eb_url_break_points_tl \do
}
}
-\tl_const:Nn \c__eb_urlbreak_points_tl
+\tl_const:Nn \c__eb_url_break_points_tl
{
ABCDEFGHIJKLMNOPQRSTUVWXYZ
abcdefghijklmnopqrstuvwxyz
@@ -1911,7 +1928,7 @@
{
\LoadPackage{hyperref}
\urlstyle{same}
- \eb_allow_urlbreak:
+ \eb_allow_url_break:
\exp_args:NV \hypersetup \l__eb_hyperref_clist
}
diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls
index 8b259d36555..d5c82d0cc27 100644
--- a/Master/texmf-dist/tex/latex/easybook/easybook.cls
+++ b/Master/texmf-dist/tex/latex/easybook/easybook.cls
@@ -13,7 +13,7 @@
%% https://creativecommons.org/licenses/by/4.0/legalcode
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2021/07/22}{1.27L}
+\ProvidesExplClass{easybook}{2021/07/24}{1.27o}
{Typeset Chinese theses or books}
\bool_set_false:N \l__eb_compile_draft_bool
@@ -244,6 +244,8 @@
{
pagestyle = empty,
format = \color{ctex@frame}\sffamily\Huge,
+ nameformat = { },
+ titleformat = { },
aftername =
{
\bool_if:NTF \l__eb_title_newline_bool
@@ -259,6 +261,8 @@
\color{ctex@frame}\sffamily\LARGE
\bool_if:NF \l__eb_title_newline_bool { \centering }
},
+ nameformat = { },
+ titleformat = { },
aftername =
{
\bool_if:NTF \l__eb_title_newline_bool
diff --git a/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg b/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg
index 143d8c5e230..4d76d2fd8bc 100644
--- a/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg
+++ b/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg
@@ -11,7 +11,7 @@
%% conditions of the CC-BY 4.0 License.
%% The latest version of this license is in
%% https://creativecommons.org/licenses/by/4.0/legalcode
-\ProvidesExplFile{eb-tcolorbox.cfg}{2021/07/22}{1.27L}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2021/07/24}{1.27o}
{Customization of tcolorbox for easybook}
\cs_new_protected:Npn \eb_tcb_theorem_set:n #1