summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2024-05-02 19:42:58 +0000
committerKarl Berry <karl@freefriends.org>2024-05-02 19:42:58 +0000
commitcf666dc5e24281d33947b484351dacfef64b134d (patch)
treeb2acb8a2f3060ea675931e35e5fa60a545ab3dc9
parentd995d42710ee995566cda706a1a3eaa86df24f76 (diff)
easybook (2may24)
git-svn-id: svn://tug.org/texlive/trunk@71154 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/easybook/easybook.pdfbin640970 -> 640970 bytes
-rw-r--r--Master/texmf-dist/doc/latex/easybook/easybook.tex4
-rw-r--r--Master/texmf-dist/source/latex/easybook/easybook.dtx32
-rw-r--r--Master/texmf-dist/tex/latex/easybook/easybase.sty20
-rw-r--r--Master/texmf-dist/tex/latex/easybook/easybook.cls10
-rw-r--r--Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg2
6 files changed, 44 insertions, 24 deletions
diff --git a/Master/texmf-dist/doc/latex/easybook/easybook.pdf b/Master/texmf-dist/doc/latex/easybook/easybook.pdf
index e2270fd55d9..7ba31f65c1d 100644
--- a/Master/texmf-dist/doc/latex/easybook/easybook.pdf
+++ b/Master/texmf-dist/doc/latex/easybook/easybook.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/easybook/easybook.tex b/Master/texmf-dist/doc/latex/easybook/easybook.tex
index 20a5a1233af..7820c2a1372 100644
--- a/Master/texmf-dist/doc/latex/easybook/easybook.tex
+++ b/Master/texmf-dist/doc/latex/easybook/easybook.tex
@@ -23,8 +23,8 @@
name = easybook,
color-scheme = blue,
title = EASYBOOK使用手册,
- version = v2024bc,
- date = 2024/04/28,
+ version = v2024be,
+ date = 2024/05/01,
authors = 瞿毅,
info = 简便地排版中文学位论文或书籍,
email = toquyi@163.com,
diff --git a/Master/texmf-dist/source/latex/easybook/easybook.dtx b/Master/texmf-dist/source/latex/easybook/easybook.dtx
index 14f666ba703..fcfd0a1e773 100644
--- a/Master/texmf-dist/source/latex/easybook/easybook.dtx
+++ b/Master/texmf-dist/source/latex/easybook/easybook.dtx
@@ -14,8 +14,7 @@
% This work has the LPPL maintenance status `maintained'.
%<*class>
\NeedsTeXFormat{LaTeX2e}[2021/11/15]
-\RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2024/04/28}{2024bc}
+\ProvidesExplClass{easybook}{2024/05/01}{2024be}
{Easily typesetting Chinese theses or books}
\bool_new:N \l__eb_compile_draft_bool
@@ -47,7 +46,12 @@
unknown .code:n = \clist_gput_right:NV \g__eb_doc_options_clist \CurrentOption
}
-\ProcessKeysOptions{easybook}
+\cs_if_exist:NTF \ProcessKeyOptions
+ { \ProcessKeyOptions[easybook] }
+ {
+ \RequirePackage{l3keys2e}
+ \ProcessKeysOptions{easybook}
+ }
\PassOptionsToPackage{no-math,quiet,CJKmath}{xeCJK}
\eb_put_ctexbook:V \g__eb_doc_options_clist
\LoadClass[UTF8]{ctexbook}
@@ -296,8 +300,8 @@
%</class>
%<*package>
\NeedsTeXFormat{LaTeX2e}[2021/11/15]
-\RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2024/04/28}{2024bc}
+\RequirePackage{etoolbox}
+\ProvidesExplPackage{easybase}{2024/05/01}{2024be}
{Easily typesetting Chinese theses or books}
\cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -421,7 +425,12 @@
\PassOptionsToPackage{list = off}{bicaption}
\PassOptionsToPackage{svgnames}{xcolor}
\PassOptionsToPackage{many}{tcolorbox}
-\ProcessKeysOptions{easybase}
+\cs_if_exist:NTF \ProcessKeyOptions
+ { \ProcessKeyOptions[easybase] }
+ {
+ \RequirePackage{l3keys2e}
+ \ProcessKeysOptions{easybase}
+ }
\PassOptionsToPackage{\g__eb_ctex_options_clist}{ctex}
\IfClassLoadedTF{ctexbook}{}
{
@@ -1149,14 +1158,15 @@
{
\bool_if:NTF \l__eb_normal_footnote_bool
{
- \bool_if:NT \l__eb_fnmarktext_format_match_bool
+ \bool_if:NTF \l__eb_fnmarktext_format_match_bool
{ \tl_clear:N \l__eb_fnmarktext_format_tl }
+ { \spbset{spcmd = { }} }
}
{
- \bool_if:NT \l__eb_fncustom_format_match_bool
+ \bool_if:NTF \l__eb_fncustom_format_match_bool
{ \tl_clear:N \l__eb_fnmarktext_format_tl }
+ { \spbset{spcmd = { }} }
}
- \bool_if:NF \l__eb_fnmarktext_format_match_bool { \spbset{spcmd = { }} }
\eb@font@footnote
}
\cs_new_protected:Npn \defupfntmark #1
@@ -1727,7 +1737,7 @@
\ifbool{@filesw}
{
\tl_if_exist:cF { tf@#1 }
- {\iow_new:c { tf@#1 }\iow_open:cn { tf@#1 } { \jobname.#1 }}
+ { \iow_new:c { tf@#1 }\iow_open:cn { tf@#1 } { \jobname.#1 } }
}
{}
}
@@ -2527,7 +2537,7 @@
}
%</package>
%<*tcolorbox>
-\ProvidesExplFile{eb-tcolorbox.cfg}{2024/04/28}{2024bc}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2024/05/01}{2024be}
{Customization of tcolorbox for easybook}
\cs_set_protected:Npn \addtotcbstyle #1#2
diff --git a/Master/texmf-dist/tex/latex/easybook/easybase.sty b/Master/texmf-dist/tex/latex/easybook/easybase.sty
index af23084e975..6c5cd94f34e 100644
--- a/Master/texmf-dist/tex/latex/easybook/easybase.sty
+++ b/Master/texmf-dist/tex/latex/easybook/easybase.sty
@@ -19,8 +19,8 @@
%%
%% This work has the LPPL maintenance status `maintained'.
\NeedsTeXFormat{LaTeX2e}[2021/11/15]
-\RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2024/04/28}{2024bc}
+\RequirePackage{etoolbox}
+\ProvidesExplPackage{easybase}{2024/05/01}{2024be}
{Easily typesetting Chinese theses or books}
\cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -144,7 +144,12 @@
\PassOptionsToPackage{list = off}{bicaption}
\PassOptionsToPackage{svgnames}{xcolor}
\PassOptionsToPackage{many}{tcolorbox}
-\ProcessKeysOptions{easybase}
+\cs_if_exist:NTF \ProcessKeyOptions
+ { \ProcessKeyOptions[easybase] }
+ {
+ \RequirePackage{l3keys2e}
+ \ProcessKeysOptions{easybase}
+ }
\PassOptionsToPackage{\g__eb_ctex_options_clist}{ctex}
\IfClassLoadedTF{ctexbook}{}
{
@@ -872,14 +877,15 @@
{
\bool_if:NTF \l__eb_normal_footnote_bool
{
- \bool_if:NT \l__eb_fnmarktext_format_match_bool
+ \bool_if:NTF \l__eb_fnmarktext_format_match_bool
{ \tl_clear:N \l__eb_fnmarktext_format_tl }
+ { \spbset{spcmd = { }} }
}
{
- \bool_if:NT \l__eb_fncustom_format_match_bool
+ \bool_if:NTF \l__eb_fncustom_format_match_bool
{ \tl_clear:N \l__eb_fnmarktext_format_tl }
+ { \spbset{spcmd = { }} }
}
- \bool_if:NF \l__eb_fnmarktext_format_match_bool { \spbset{spcmd = { }} }
\eb@font@footnote
}
\cs_new_protected:Npn \defupfntmark #1
@@ -1450,7 +1456,7 @@
\ifbool{@filesw}
{
\tl_if_exist:cF { tf@#1 }
- {\iow_new:c { tf@#1 }\iow_open:cn { tf@#1 } { \jobname.#1 }}
+ { \iow_new:c { tf@#1 }\iow_open:cn { tf@#1 } { \jobname.#1 } }
}
{}
}
diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls
index bb631399248..a7ec891684e 100644
--- a/Master/texmf-dist/tex/latex/easybook/easybook.cls
+++ b/Master/texmf-dist/tex/latex/easybook/easybook.cls
@@ -19,8 +19,7 @@
%%
%% This work has the LPPL maintenance status `maintained'.
\NeedsTeXFormat{LaTeX2e}[2021/11/15]
-\RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2024/04/28}{2024bc}
+\ProvidesExplClass{easybook}{2024/05/01}{2024be}
{Easily typesetting Chinese theses or books}
\bool_new:N \l__eb_compile_draft_bool
@@ -52,7 +51,12 @@
unknown .code:n = \clist_gput_right:NV \g__eb_doc_options_clist \CurrentOption
}
-\ProcessKeysOptions{easybook}
+\cs_if_exist:NTF \ProcessKeyOptions
+ { \ProcessKeyOptions[easybook] }
+ {
+ \RequirePackage{l3keys2e}
+ \ProcessKeysOptions{easybook}
+ }
\PassOptionsToPackage{no-math,quiet,CJKmath}{xeCJK}
\eb_put_ctexbook:V \g__eb_doc_options_clist
\LoadClass[UTF8]{ctexbook}
diff --git a/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg b/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg
index c0d31533413..a438755af72 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}{2024/04/28}{2024bc}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2024/05/01}{2024be}
{Customization of tcolorbox for easybook}
\cs_set_protected:Npn \addtotcbstyle #1#2