summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-09-01 21:02:55 +0000
committerKarl Berry <karl@freefriends.org>2021-09-01 21:02:55 +0000
commitae20adff83abd02f56ef30dac6cb38a25d6d312c (patch)
tree042b139b8edb06baab24e12cdb472d01e1e0ccb7 /Master
parente7f71abb832b04e9312135832a87476404317c47 (diff)
easybook (31aug21)
git-svn-id: svn://tug.org/texlive/trunk@60393 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/easybook/easybook.pdfbin590675 -> 590672 bytes
-rw-r--r--Master/texmf-dist/doc/latex/easybook/easybook.tex4
-rw-r--r--Master/texmf-dist/source/latex/easybook/easybook.dtx24
-rw-r--r--Master/texmf-dist/tex/latex/easybook/easybase.sty20
-rw-r--r--Master/texmf-dist/tex/latex/easybook/easybook.cls2
-rw-r--r--Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg2
6 files changed, 32 insertions, 20 deletions
diff --git a/Master/texmf-dist/doc/latex/easybook/easybook.pdf b/Master/texmf-dist/doc/latex/easybook/easybook.pdf
index 117cc43f284..61676923f48 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 2c340d9b216..a7b3d93c2f7 100644
--- a/Master/texmf-dist/doc/latex/easybook/easybook.tex
+++ b/Master/texmf-dist/doc/latex/easybook/easybook.tex
@@ -12,8 +12,8 @@
name = easybook,
color-scheme = blue,
title = EASYBOOK 使用手册,
- version = v1.29e,
- date = 2021/08/26,
+ version = v1.29h,
+ date = 2021/08/31,
authors = 瞿毅,
info = 排版简体中文学位论文和书籍,
email = quee123@foxmail.com,
diff --git a/Master/texmf-dist/source/latex/easybook/easybook.dtx b/Master/texmf-dist/source/latex/easybook/easybook.dtx
index 7c5e9020591..3c119357297 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/08/26}{1.29e}
+\ProvidesExplClass{easybook}{2021/08/31}{1.29h}
{Typeset Chinese theses or books}
\bool_set_false:N \l__eb_compile_draft_bool
@@ -297,7 +297,7 @@
%<*package>
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2021/08/26}{1.29e}
+\ProvidesExplPackage{easybase}{2021/08/31}{1.29h}
{Typeset Chinese theses or books}
\cs_generate_variant:Nn \dim_add:Nn { NV,Nv }
@@ -1307,8 +1307,8 @@
{ \bool_if:NTF \l__eb_class_book_bool { 0pc } { 0.15pc } }
}
-\prop_new:N \l__eb_label_name_prop
-\prop_set_from_keyval:Nn \l__eb_label_name_prop
+\prop_new:N \l__eb_list_label_name_prop
+\prop_set_from_keyval:Nn \l__eb_list_label_name_prop
{
figure = \eb@labelname@lof,
table = \eb@labelname@lot
@@ -1318,7 +1318,7 @@
\addcontentsline{#1}{#2}
{
\ifbool{eb@titletoc@hang@fix}{\eb@numberline}{}
- {\prop_item:Nn \l__eb_label_name_prop {#2}{#3}}#4
+ {\prop_item:Nn \l__eb_list_label_name_prop {#2}{#3}}#4
}
}
\ctex_patch_cmd:Nnn \lst@MakeCaption
@@ -1363,9 +1363,9 @@
\int_compare:nNnT { \c@chapter } > { 0 } { \use:c { the#1chapter }. }
\int_to_arabic:v { c@#1section }
}
-\cs_set:Npn \thebichapter { \eb_arabic:n { bichapter } }
+\cs_set:Npn \thebichapter { \@arabic\c@bichapter }
\cs_set:Npn \thebisection { \eb_section_counter_prefix:n { bi } }
-\cs_set:Npn \thebisubsection { \thebisection.\eb_arabic:n { bisubsection } }
+\cs_set:Npn \thebisubsection { \thebisection.\@arabic\c@bisubsection }
\cs_set:Npn \thesection { \eb_section_counter_prefix:n { } }
\contentsuse{}{tec}
@@ -1936,10 +1936,16 @@
\bool_if:NT \l__eb_thmbox_bool
{
\@ifpackageloaded{tcolorbox}
- {\tcolorboxenvironment{#1}{#4}}{}
+ {\tcolorboxenvironment{#1}{#4}}
+ {\msg_warning:nn { easybase } { need-tcolorbox }}
}
\labelformat{#1}{\tl_use:c { c__eb_name_#1_tl }~##1}
}
+\msg_new:nnn { easybase } { need-tcolorbox }
+ {
+ Now~that~the~thmbox~option~is~true. \\
+ Please~load~the~tcolorbox~macro~package.
+ }
\cs_set_eq:NN \EBNewTheorem \DeclareTheorem
\prop_new:N \l__eb_thmtools_entry_prop
\clist_const:Nn \c__eb_thmtools_entry_clist
@@ -2394,7 +2400,7 @@
}
%</package>
%<*tcolorbox>
-\ProvidesExplFile{eb-tcolorbox.cfg}{2021/08/26}{1.29e}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2021/08/31}{1.29h}
{Customization of tcolorbox for easybook}
\tl_gset:Nn \eb@tc@line@skip { 0.5\baselineskip }
diff --git a/Master/texmf-dist/tex/latex/easybook/easybase.sty b/Master/texmf-dist/tex/latex/easybook/easybase.sty
index c5579df89fd..afbe0c32c7e 100644
--- a/Master/texmf-dist/tex/latex/easybook/easybase.sty
+++ b/Master/texmf-dist/tex/latex/easybook/easybase.sty
@@ -20,7 +20,7 @@
%% This work has the LPPL maintenance status `maintained'.
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2021/08/26}{1.29e}
+\ProvidesExplPackage{easybase}{2021/08/31}{1.29h}
{Typeset Chinese theses or books}
\cs_generate_variant:Nn \dim_add:Nn { NV,Nv }
@@ -1030,8 +1030,8 @@
{ \bool_if:NTF \l__eb_class_book_bool { 0pc } { 0.15pc } }
}
-\prop_new:N \l__eb_label_name_prop
-\prop_set_from_keyval:Nn \l__eb_label_name_prop
+\prop_new:N \l__eb_list_label_name_prop
+\prop_set_from_keyval:Nn \l__eb_list_label_name_prop
{
figure = \eb@labelname@lof,
table = \eb@labelname@lot
@@ -1041,7 +1041,7 @@
\addcontentsline{#1}{#2}
{
\ifbool{eb@titletoc@hang@fix}{\eb@numberline}{}
- {\prop_item:Nn \l__eb_label_name_prop {#2}{#3}}#4
+ {\prop_item:Nn \l__eb_list_label_name_prop {#2}{#3}}#4
}
}
\ctex_patch_cmd:Nnn \lst@MakeCaption
@@ -1086,9 +1086,9 @@
\int_compare:nNnT { \c@chapter } > { 0 } { \use:c { the#1chapter }. }
\int_to_arabic:v { c@#1section }
}
-\cs_set:Npn \thebichapter { \eb_arabic:n { bichapter } }
+\cs_set:Npn \thebichapter { \@arabic\c@bichapter }
\cs_set:Npn \thebisection { \eb_section_counter_prefix:n { bi } }
-\cs_set:Npn \thebisubsection { \thebisection.\eb_arabic:n { bisubsection } }
+\cs_set:Npn \thebisubsection { \thebisection.\@arabic\c@bisubsection }
\cs_set:Npn \thesection { \eb_section_counter_prefix:n { } }
\contentsuse{}{tec}
@@ -1659,10 +1659,16 @@
\bool_if:NT \l__eb_thmbox_bool
{
\@ifpackageloaded{tcolorbox}
- {\tcolorboxenvironment{#1}{#4}}{}
+ {\tcolorboxenvironment{#1}{#4}}
+ {\msg_warning:nn { easybase } { need-tcolorbox }}
}
\labelformat{#1}{\tl_use:c { c__eb_name_#1_tl }~##1}
}
+\msg_new:nnn { easybase } { need-tcolorbox }
+ {
+ Now~that~the~thmbox~option~is~true. \\
+ Please~load~the~tcolorbox~macro~package.
+ }
\cs_set_eq:NN \EBNewTheorem \DeclareTheorem
\prop_new:N \l__eb_thmtools_entry_prop
\clist_const:Nn \c__eb_thmtools_entry_clist
diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls
index f507d7f12aa..8fb0268e7fd 100644
--- a/Master/texmf-dist/tex/latex/easybook/easybook.cls
+++ b/Master/texmf-dist/tex/latex/easybook/easybook.cls
@@ -20,7 +20,7 @@
%% This work has the LPPL maintenance status `maintained'.
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2021/08/26}{1.29e}
+\ProvidesExplClass{easybook}{2021/08/31}{1.29h}
{Typeset Chinese theses or books}
\bool_set_false:N \l__eb_compile_draft_bool
diff --git a/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg b/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg
index d0f6bca8a42..1409c57e99f 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}{2021/08/26}{1.29e}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2021/08/31}{1.29h}
{Customization of tcolorbox for easybook}
\tl_gset:Nn \eb@tc@line@skip { 0.5\baselineskip }