summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2022-01-16 21:16:37 +0000
committerKarl Berry <karl@freefriends.org>2022-01-16 21:16:37 +0000
commitb34dcff9ba90395c74cefedb4106a48221c772f4 (patch)
tree883101284e7ebdd4b2a29e24ee61730e8dae228b /Master/texmf-dist/tex
parenta71f46f17544910a1e3b1d02a905d6a19c88e27d (diff)
easybook (16jan22)
git-svn-id: svn://tug.org/texlive/trunk@61623 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/easybook/easybase.sty51
-rw-r--r--Master/texmf-dist/tex/latex/easybook/easybook.cls2
-rw-r--r--Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg2
3 files changed, 33 insertions, 22 deletions
diff --git a/Master/texmf-dist/tex/latex/easybook/easybase.sty b/Master/texmf-dist/tex/latex/easybook/easybase.sty
index b3470a748c0..2267065684c 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/15}{1.46B}
+\ProvidesExplPackage{easybase}{2022/01/15}{1.46C}
{Typeset Chinese theses or books}
\cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -305,7 +305,7 @@
\ctex_define:nn { geoset }
{
headruleskip .tl_set:N = \headruleskip,
- headruleskip .initial:n = 1.5pt,
+ headruleskip .initial:n = 0pt,
footruleskip .tl_set:N = \footruleskip,
footruleskip .initial:n = 3.5pt,
unknown .code:n =
@@ -1192,16 +1192,16 @@
\ctex_define:nn { style }
{
- connect-figure .tl_set:N = \l__eb_connect_figure_tl,
- connect-table .tl_set:N = \l__eb_connect_table_tl,
- connect-listing .tl_set:N = \l__eb_connect_lstlisting_tl,
- connect-equation .tl_set:N = \l__eb_connect_equation_tl,
- connect-every .meta:n =
+ hyphen-figure .tl_set:N = \l__eb_hyphen_figure_tl,
+ hyphen-table .tl_set:N = \l__eb_hyphen_table_tl,
+ hyphen-listing .tl_set:N = \l__eb_hyphen_lstlisting_tl,
+ hyphen-equation .tl_set:N = \l__eb_hyphen_equation_tl,
+ hyphen-every .meta:n =
{
- connect-figure = #1,connect-table = #1,
- connect-listing = #1,connect-equation = #1
+ hyphen-figure = #1,hyphen-table = #1,
+ hyphen-listing = #1,hyphen-equation = #1
},
- connect-every .initial:n = { . },
+ hyphen-every .initial:n = { . },
unknown .code:n = \eb_msg_abandon_option:n { style }
}
\eb_seq_map_inline:nn
@@ -1212,7 +1212,7 @@
\int_compare:nNnT { \c@chapter } > { 0 }
{
\thechapter
- \tl_use:c { l__eb_connect_#1_tl }
+ \tl_use:c { l__eb_hyphen_#1_tl }
}
\int_to_arabic:v { c@#1 }
}
@@ -1897,6 +1897,7 @@
}
\eb_at_end_preamble:n
{
+ \providecommand{\bibname}{\refname}
\clist_if_empty:NF \l__eb_bib_datafile_clist
{
\bool_if:NTF \l__eb_backend_bibtex_bool
@@ -2086,11 +2087,25 @@
\exp_args:NV \hypersetup \l__eb_hyperref_clist
}
-\labelformat{part}{\CTEXthepart}
-\labelformat{chapter}{\CTEXthechapter}
-\labelformat{figure}{\figurename~#1}
-\labelformat{table}{\tablename~#1}
-\providecommand{\bibname}{\refname}
+\AtBeginDocument
+ {
+ \@ifpackageloaded{cleveref}{}
+ {
+ \labelformat{part}{\CTEXthepart}
+ \labelformat{chapter}{\CTEXthechapter}
+ \labelformat{figure}{\figurename~#1}
+ \labelformat{table}{\tablename~#1}
+ \tl_if_eq:NnTF \l__ctex_scheme_tl { chinese }
+ {
+ \labelformat{section}{节 #1}
+ \labelformat{subsection}{小节 #1}
+ }
+ {
+ \labelformat{section}{Section~#1}
+ \labelformat{subsection}{Subsection~#1}
+ }
+ }
+ }
\ctex_define:n
{
lstlistlistingname .tl_set:N = \listlstlistingname,
@@ -2108,8 +2123,6 @@
lstlistlistingname = 代码索引,
lstlistingname = 代码
}
- \labelformat{section}{节 #1}
- \labelformat{subsection}{小节 #1}
}
{
\keys_set_known:nn { ctex }
@@ -2118,8 +2131,6 @@
lstlistlistingname = List~of~Codes,
lstlistingname = Code
}
- \labelformat{section}{Section~#1}
- \labelformat{subsection}{Subsection~#1}
}
\endinput
%%
diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls
index e1ff1a41550..81721cf89be 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/15}{1.46B}
+\ProvidesExplClass{easybook}{2022/01/15}{1.46C}
{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 8fa5ee3cf4b..655c82a915a 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/15}{1.46B}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2022/01/15}{1.46C}
{Customization of tcolorbox for easybook}
\cs_set_protected:Npn \addtotcbstyle #1#2