summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/easybook
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2022-03-04 21:47:13 +0000
committerKarl Berry <karl@freefriends.org>2022-03-04 21:47:13 +0000
commit808579db8e96ab527d841002ac61a8dcb0f4075d (patch)
treea37ccbe4eae8f7f45c2e5c01e26c5d1deececd1a /Master/texmf-dist/tex/latex/easybook
parent2b5b4cf3b13270550e44bbf3eb35657a6562ccb1 (diff)
easybook (4mar22)
git-svn-id: svn://tug.org/texlive/trunk@62403 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/easybook')
-rw-r--r--Master/texmf-dist/tex/latex/easybook/easybase.sty49
-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, 41 insertions, 12 deletions
diff --git a/Master/texmf-dist/tex/latex/easybook/easybase.sty b/Master/texmf-dist/tex/latex/easybook/easybase.sty
index 1e73a23644a..1c92aeda09b 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/03/02}{1.635}
+\ProvidesExplPackage{easybase}{2022/03/04}{1.638}
{Easily typesetting Chinese theses or books}
\cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -929,8 +929,9 @@
\ctex_define:n { list/#1 .meta:nn = { ctex/#1 } {##1} }
\cs_new_protected:Npn \eb_toc_entry_if_hang:n #1
{
- \bool_if:NT \l__eb_toc_entry_hang_bool
+ \bool_if:NTF \l__eb_toc_entry_hang_bool
{ \contentspush }
+ { \use:n }
{
\bool_if:NTF \l__eb_toc_number_color_bool
{ \textcolor{ctex@toc@number} }
@@ -939,7 +940,7 @@
\tl_use:c { l__eb_toc_#1_after_tl }
}
}
-\cs_new_protected:Npn \eb_toc_assign_keys:n #1
+\cs_new_protected:Npn \RegisterTocName #1
{
\ctex_define:n
{
@@ -959,7 +960,7 @@
[\tl_use:c { l__eb_toc_#1_below_tl }]
}
\seq_map_function:NN
-\c__ctex_headings_seq \eb_toc_assign_keys:n
+\c__ctex_headings_seq \RegisterTocName
\eb_seq_map_inline:nn
{ figure,table,lstlisting }
{
@@ -1007,6 +1008,8 @@
lolskip .initial:n = 10pt,
between .tl_set:N = \l__eb_toc_main_between_hook_tl,
between .initial:n = \bool_if:NT \l__eb_class_mode_book_bool { \vspace*{-1pc} },
+ bibetween .tl_set:N = \l__eb_toc_bimain_between_hook_tl,
+ bibetween .initial:n = \bool_if:NT \l__eb_class_mode_book_bool { \vspace*{-1pc} },
dotalign .bool_set:N = \l__eb_toc_dot_align_bool,
dotalign .default:n = true,
dotalign .initial:n = true,
@@ -1209,6 +1212,24 @@
multoc .int_set:N = \l__eb_toc_columns_int,
multoc .default:n = 2,
multoc .initial:n = 1,
+ plan .choice:,
+ plan .value_required:n = true,
+ plan/cn .code:n =
+ {
+ \bool_set_true:N \l__eb_toc_plan_cn_bool
+ \bool_set_false:N \l__eb_toc_plan_bi_bool
+ },
+ plan/bi .code:n =
+ {
+ \bool_set_false:N \l__eb_toc_plan_cn_bool
+ \bool_set_true:N \l__eb_toc_plan_bi_bool
+ },
+ plan/both .code:n =
+ {
+ \bool_set_true:N \l__eb_toc_plan_cn_bool
+ \bool_set_true:N \l__eb_toc_plan_bi_bool
+ },
+ plan .initial:n = cn,
columns .meta:n = { multoc = #1 },
title .code:n = \eb_assign_toc_title:n {#1},
bilist .tl_gset:N = \g__eb_bilist_permute_value_tl
@@ -1276,11 +1297,16 @@
}
{ \eb_list_content_cmd_set:nn #1 }
\cs_set_eq:NN \listoflistings \listoflstlistings
+\ctex_define:n
+ {
+ bicontentsname .tl_set:N = \bicontentsname,
+ bicontentsname .initial:n = Contents
+ }
\RenewDocumentCommand{\tableofcontents}{st+oD(){}}
{
\group_begin:
\tl_set_eq:NN \eb@toc@title \contentsname
- \tl_set:Nn \eb@bitoc@title { Contents }
+ \tl_set_eq:NN \eb@bitoc@title \bicontentsname
\tl_set:Nn \eb@toc@title@level
{
\bool_if:NTF \l__eb_class_mode_book_bool
@@ -1288,13 +1314,16 @@
{ \section* }
}
\IfValueT{#3}{\keys_set:nn { eb/listoc } {#3}}
- \IfBooleanF{#1}{\eb@toc@title@level{\eb@toc@title}{}}
- \eb_toc_if_title_between_hook:nn {#1} { main }
- \eb_toc_start_multi_column_ext:n { toc }#4
- \IfBooleanT{#2}
+ \bool_if:NT \l__eb_toc_plan_cn_bool
{
- \IfBooleanF{#1}{\eb@toc@title@level{\eb@bitoc@title}{}}
+ \IfBooleanF{#1}{\eb@toc@title@level{\eb@toc@title}{}}
\eb_toc_if_title_between_hook:nn {#1} { main }
+ \eb_toc_start_multi_column_ext:n { toc }#4
+ }
+ \bool_if:NT \l__eb_toc_plan_bi_bool
+ {
+ \IfBooleanF{#1}{\eb@toc@title@level{\eb@bitoc@title}{}}
+ \eb_toc_if_title_between_hook:nn {#1} { bimain }
\eb_toc_start_multi_column_ext:n { tec }
}
\group_end:
diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls
index 2e12f380b55..f1aa263bd2d 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/03/02}{1.635}
+\ProvidesExplClass{easybook}{2022/03/04}{1.638}
{Easily typesetting 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 9d0acb66ae3..4dbdc4d03c4 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/03/02}{1.635}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2022/03/04}{1.638}
{Customization of tcolorbox for easybook}
\cs_set_protected:Npn \addtotcbstyle #1#2