summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/easybook/easybase.sty152
-rw-r--r--Master/texmf-dist/tex/latex/easybook/easybook.cls6
-rw-r--r--Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg11
3 files changed, 35 insertions, 134 deletions
diff --git a/Master/texmf-dist/tex/latex/easybook/easybase.sty b/Master/texmf-dist/tex/latex/easybook/easybase.sty
index a8286c70351..6e0d456dc5c 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}{2022/01/24}{1.51}
+\ProvidesExplPackage{easybase}{2022/01/25}{1.52}
{Typeset Chinese theses or books}
\cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -136,6 +136,9 @@
floatpage .bool_set:N = \l__eb_float_page_bool,
floatpage .default:n = true,
floatpage .initial:n = false,
+ theorem .bool_set:N = \l__eb_theorem_support_bool,
+ theorem .default:n = true,
+ theorem .initial:n = true,
paper .code:n = \PassOptionsToPackage{#1}{geometry},
paper .initial:n = a4paper,
class .choice:,
@@ -220,7 +223,6 @@
ulem[normalem]+
enumitem[shortlabels,inline]+
chemformula+siunitx+pifont+
- amsthm+thmtools+
geometry+marginnote+
pdfpages+multicol+
fancyhdr+titletoc+caption+
@@ -245,7 +247,6 @@
{ expl3 } { 2020/10/27 },
{ xparse } { 2020/10/27 },
{ l3keys2e } { 2020/10/27 },
- { thmtools } { 2020/08/01 },
{ caption } { 2020/08/24 },
{ fancyhdr } { 2021/01/28 },
{ siunitx } { 2021/06/22 },
@@ -1211,7 +1212,7 @@
hyphen-figure = #1,hyphen-table = #1,
hyphen-listing = #1,hyphen-equation = #1
},
- hyphen-every .initial:n = { . },
+ hyphen-every .initial:n = .,
unknown .code:n = \eb_msg_abandon_option:n { style }
}
\eb_seq_map_inline:nn
@@ -1588,7 +1589,7 @@
width .dim_set:N = \l__eb_eqsymb_width_dim,
width .initial:n = 10pt,
delim .tl_set:N = \l__eb_eqsymb_delim_tl,
- delim .initial:n = { —— },
+ delim .initial:n = ——,
space .dim_set:N = \l__eb_eqsymb_space_dim,
space .initial:n = 0.25em,
item-align .tl_set:N = \l__eb_eqsymb_item_align_tl,
@@ -1661,123 +1662,32 @@
\tl_clear:N \l__eb_eqsymb_intro_tl
\ignorespaces
}
-
-\cs_new_protected:Npn \eb_thm_biname_set:nnn #1#2#3
- {
- \tl_if_eq:NnTF \l__ctex_scheme_tl { chinese }
- { \tl_set:cn { #1name } {#3} }
- { \tl_set:cn { #1name } {#2} }
- }
-\cs_set_eq:NN \eb@declaretheorem@save \declaretheorem
-\cs_set_eq:NN \eb@declaretheoremsyle@save \declaretheoremstyle
-\RenewDocumentCommand{\declaretheorem}{O{}mO{}}
- {\AtBeginDocument{\eb@declaretheorem@save[#1,#3]{#2}}}
-\RenewDocumentCommand{\declaretheoremstyle}{O{}mO{}}
- {\eb@declaretheoremsyle@save[#1,#3]{#2}}
-\cs_set_eq:NN \newtheorem \declaretheorem
-\cs_new_protected:Npn \eb_tcbwrap_if_load_tcolorbox:TF #1#2
- {
- \bool_if:NT \l__eb_thm_tcbwrap_bool
- { \@ifpackageloaded{tcolorbox}{#1}{#2} }
- }
-\NewDocumentCommand{\deftheorem}
- {mO{\text_titlecase_first:n {#1}}mD(){tc-theorem}O{}}
- {
- \AtBeginDocument
- {
- \cs_undefine:c {#1}
- \cs_undefine:c { c@#1 }
- \@ifpackageloaded{cleveref}{}
- {\labelformat{#1}{\tl_use:c { #1name }~##1}}
- }
- \eb_thm_biname_set:nnn {#1} {#2} {#3}
- \declaretheorem{#1}[
- name = \tl_use:c { #1name },
- style = fancy,#5
+\bool_if:NT \l__eb_theorem_support_bool
+ {
+ \LoadPackage{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
+ \RenewDocumentCommand{\declaretheorem}{O{}mO{}}
+ {\eb@declaretheorem@save[#1,#3]{#2}}
+ \RenewDocumentCommand{\declaretheoremstyle}{O{}mO{}}
+ {\eb@declaretheoremsyle@save[#1,#3]{#2}}
+ \ctex_define:nn { thmset }
+ {
+ tcbwrap .code:n = { },
+ unknown .code:n = \eb_msg_abandon_option:n { thmset }
+ }
+ \cs_undefine:N \proof
+ \declaretheoremstyle{fancy}[
+ spaceabove = 0ex plus .1ex,
+ spacebelow = 0ex plus .1ex,
+ headindent = 0em,
+ within = \bool_if:NT \l__eb_class_mode_book_bool { chapter },
+ headpunct = {},
+ headfont = \color{ctex@emph}\sffamily,
+ bodyfont = \normalfont,
+ postheadspace = 1em
]
- \eb_tcbwrap_if_load_tcolorbox:TF
- {
- \bool_if_exist:cTF { l__eb_tcb_repeat_env_#1_bool }
- { \bool_set_true:c { l__eb_tcb_repeat_env_#1_bool } }
- { \bool_set_false:c { l__eb_tcb_repeat_env_#1_bool } }
- \bool_if:cF { l__eb_tcb_repeat_env_#1_bool }
- { \tcolorboxenvironment{#1}{#4} }
- } { }
- }
-
-\prop_new:N \l__eb_thmtools_entry_prop
-\clist_const:Nn \c__eb_thmtools_entry_clist
- {
- within = \l__eb_thm_within_tl,
- headfont = \l__eb_thm_headfont_tl,
- notefont = \l__eb_thm_notefont_tl,
- bodyfont = \l__eb_thm_bodyfont_tl,
- headpunct = \l__eb_thm_headpunct_tl,
- spaceabove = \l__eb_thm_spaceabove_tl,
- spacebelow = \l__eb_thm_spacebelow_tl,
- headindent = \l__eb_thm_headindent_tl,
- headformat = \l__eb_thm_headformat_tl,
- postheadspace = \l__eb_thm_postheadspace_tl
- }
-\prop_set_from_keyval:NV
-\l__eb_thmtools_entry_prop \c__eb_thmtools_entry_clist
-\prop_map_inline:Nn \l__eb_thmtools_entry_prop
- { \ctex_define:nn { thmset } { #1 .tl_set:N = #2 } }
-\ctex_define:nn { thmset }
- {
- tcbwrap .bool_set:N = \l__eb_thm_tcbwrap_bool,
- tcbwrap .default:n = true,
- tcbwrap .initial:n = false,
- thmbox .meta:n = { tcbwrap = #1 },
- thmbox .default:n = true,
- notebraces .tl_set:N = \l__eb_thm_notebraces_tl,
- unknown .code:n = \eb_msg_abandon_option:n { thmset }
- }
-\eb_patch_cmd:wnn \thmt@setheadstyle
- { \def\NAME{\the\thm@headfont ##1} }
- {
- \def\NAME
- {
- \the\thm@headfont ##1
- \peek_meaning:NT \NUMBER { \tl_if_blank:nF {##2} { \ } }
- }
- }
-\ctex_set:nn { thmset }
- {
- spaceabove = 0ex plus .1ex,
- spacebelow = 0ex plus .1ex,
- headindent = 0em,
- headfont = \color{ctex@emph}\sffamily,
- postheadspace = 1em,
- notebraces = {(}{)},
- within = \bool_if:NT \l__eb_class_mode_book_bool { chapter },
- headformat = \NAME\NUMBER\NOTE
- }
-\msg_new:nnn { easybase } { need-tcolorbox }
- {
- Now~that~the~option~tcbwrap~is~true. \\
- Please~load~the~tcolorbox~macro~package.
- }
-\eb_at_end_preamble:n
- {
- \eb_tcbwrap_if_load_tcolorbox:TF { }
- { \msg_warning:nn { easybase } { need-tcolorbox } }
- \clist_put_right:Nx
- \c__eb_thmtools_entry_clist { notebraces = \l__eb_thm_notebraces_tl }
- \exp_last_unbraced:NNV
- \declaretheoremstyle[\c__eb_thmtools_entry_clist]{fancy}
- \deftheorem{proof}{证明}[numbered = no,qed = \qedsymbol]
- \deftheorem{remark}{注}[numbered = no]
- \deftheorem{proposition}{性质}
- \deftheorem{assumption}{假设}
- \deftheorem{conjecture}{猜想}
- \deftheorem{definition}{定义}
- \deftheorem{corollary}{推论}
- \deftheorem{problem}{问题}
- \deftheorem{theorem}{定理}
- \deftheorem{example}{例}
- \deftheorem{axiom}{公理}
- \deftheorem{lemma}{引理}
}
\setchemformula
diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls
index c61a6a8143b..5f79c5e1de5 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}{2022/01/24}{1.51}
+\ProvidesExplClass{easybook}{2022/01/25}{1.52}
{Typeset Chinese theses or books}
\bool_set_false:N \l__eb_compile_draft_bool
@@ -42,9 +42,9 @@
font .value_required:n = true,
font .initial:n = auto,
cjkfont .code:n = \eb_put_ctexbook:n { fontset = #1 },
- paper .code:n = \PassOptionsToPackage{#1}{geometry},
mathfont .tl_set:N = \l__eb_mathfont_value_tl,
mathfont .initial:n = times,
+ paper .code:n = \PassOptionsToPackage{#1}{geometry},
class .choice:,
class .value_required:n = true,
class/book .code:n = { },
@@ -57,7 +57,7 @@
article .meta:n = { class = article },
config .clist_gset:N = \g__eb_config_file_clist,
floatpage .bool_set:N = \l__eb_float_page_bool,
- floatpage .default:n = true,
+ theorem .bool_set:N = \l__eb_theorem_support_bool,
unknown .code:n = \clist_gput_right:NV \g__eb_doc_options_clist \CurrentOption
}
diff --git a/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg b/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg
index 7974da809a4..1ad0843b3ef 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}{2022/01/24}{1.51}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2022/01/25}{1.52}
{Customization of tcolorbox for easybook}
\cs_set_protected:Npn \addtotcbstyle #1#2
@@ -29,15 +29,6 @@
{ \@ifstar{\deftcbstyle}{\addtotcbstyle} }
\cs_set_eq:NN \newtcbstyle \deftcbstyle
-\deftcbstyle{tc-theorem}
- {
- enhanced~jigsaw,
- frame~hidden,boxrule = 0pt,
- beforeafter~skip = 0.5\baselineskip,
- left = 8pt,right = 8pt,
- top = 0.5\baselineskip,bottom = 0.5\baselineskip,
- middle = 0.5\baselineskip
- }
\deftcbstyle{tc-easybox}
{
enhanced~jigsaw,