summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/easybook/easybook.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'macros/latex/contrib/easybook/easybook.dtx')
-rw-r--r--macros/latex/contrib/easybook/easybook.dtx64
1 files changed, 40 insertions, 24 deletions
diff --git a/macros/latex/contrib/easybook/easybook.dtx b/macros/latex/contrib/easybook/easybook.dtx
index 2e13fa3db6..c4e52d8a91 100644
--- a/macros/latex/contrib/easybook/easybook.dtx
+++ b/macros/latex/contrib/easybook/easybook.dtx
@@ -15,7 +15,7 @@
%<*class>
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2021/11/28}{1.41A}
+\ProvidesExplClass{easybook}{2021/11/28}{1.41B}
{Typeset Chinese theses or books}
\bool_set_false:N \l__eb_compile_draft_bool
@@ -325,7 +325,7 @@
%<*package>
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2021/11/28}{1.41A}
+\ProvidesExplPackage{easybase}{2021/11/28}{1.41B}
{Typeset Chinese theses or books}
\cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -1288,9 +1288,9 @@
lolskip .initial:n = 10pt,
main-voffset .skip_set:N = \l__eb_toc_main_voffset_skip,
main-voffset .initial:n = \bool_if:NTF \l__eb_class_book_bool { 1pc } { 0.2pc },
- line-align .bool_set:N = \l__eb_toc_line_align_bool,
- line-align .default:n = true,
- line-align .initial:n = true,
+ dotalign .bool_set:N = \l__eb_toc_dot_align_bool,
+ dotalign .default:n = true,
+ dotalign .initial:n = true,
hang .bool_set:N = \eb@titletoc@hang@fix@bool,
hang .default:n = true,
hang .initial:n = false,
@@ -1304,7 +1304,7 @@
\IfBooleanTF{#1}
{\thecontentspage}
{
- \bool_if:NTF \l__eb_toc_line_align_bool
+ \bool_if:NTF \l__eb_toc_dot_align_bool
{ \contentspage }
{ \thecontentspage }
}
@@ -1513,7 +1513,8 @@
\keys_define:nn { eb/listoc }
{
section .code:n = \tl_set:Nn \l__eb_toc_type_tl { section },
- chapter .code:n = { },
+ chapter .code:n = \tl_set:Nn \l__eb_toc_type_tl { chapter },
+ none .code:n = \tl_set:Nn \l__eb_toc_type_tl { none },
article .meta:n = section,
book .meta:n = chapter,
multoc .int_set:N = \l__eb_toc_columns_int,
@@ -1536,31 +1537,40 @@
{ \tl_set:Nn \eb@bitoc@title {#2} }
}
-\cs_new_protected:Npn \eb_title_mark_intoc:n #1
+\cs_new_protected:Npn \eb_toc_type_section_initial:
{
- \tl_if_eq:NnTF \l__eb_toc_type_tl { chapter }
- { \bichapter*{#1}{\eb@bitoc@title} }
- { \bisection*{#1}{\eb@bitoc@title} }
+ \bool_if:NF \l__eb_class_book_bool
+ {
+ \tl_if_eq:NnT \l__eb_toc_type_tl { chapter }
+ { \tl_set:Nn \l__eb_toc_type_tl { section } }
+ }
}
-\cs_new_protected:Npn \eb_title_mark_notoc:n #1
+\cs_new_protected:Npn \eb_title_mark_intoc:n #1
{
- \tl_if_eq:NnTF \l__eb_toc_type_tl { chapter }
+ \str_case:Vn \l__eb_toc_type_tl
{
- \chapter*{\phantomsection #1}
- \chaptermark{#1}
+ { chapter } { \bichapter*{#1}{\eb@bitoc@title} }
+ { section } { \bisection*{#1}{\eb@bitoc@title} }
}
+ }
+\cs_new_protected:Npn \eb_title_mark_notoc:n #1
+ {
+ \str_case:Vn \l__eb_toc_type_tl
{
- \section*{\phantomsection #1}
- \sectionmark{#1}
+ { chapter } { \chapter*{\phantomsection #1}\chaptermark{#1} }
+ { section } { \section*{\phantomsection #1}\sectionmark{#1} }
}
}
\cs_new_protected:Npn \eb_title_number_intoc_spec:nn #1#2
{
+ \eb_toc_type_section_initial:
\IfBooleanTF{#1}
{
- \tl_if_eq:NnTF \l__eb_toc_type_tl { chapter }
- { \bichapter{\eb@toc@title}{\eb@bitoc@title} }
- { \bisection{\eb@toc@title}{\eb@bitoc@title} }
+ \str_case:Vn \l__eb_toc_type_tl
+ {
+ { chapter } { \bichapter{\eb@toc@title}{\eb@bitoc@title} }
+ { section } { \bisection{\eb@toc@title}{\eb@bitoc@title} }
+ }
}{
\IfBooleanTF{#2}
{\eb_title_mark_notoc:n { \eb@toc@title }}
@@ -1584,13 +1594,18 @@
}
{ \@starttoc{#1} }
}
+\cs_new_protected:Npn \eb_toc_if_title_voffset:n #1
+ {
+ \tl_if_eq:NnF \l__eb_toc_type_tl { none }
+ { \vspace*{-\dim_use:c { l__eb_toc_#1_voffset_skip }} }
+ }
\cs_new_protected:Npn \eb_toc_list_parse:nnnnn #1#2#3#4#5
{
\group_begin:
\tl_set_eq:Nc \eb@toc@title { list#4name }
\IfValueT{#3}{\keys_set:nn { eb/listoc } {#3}}
\eb_title_number_intoc_spec:nn {#2} {#1}
- \vspace*{-\dim_use:c { l__eb_toc_#4_voffset_skip }}
+ \eb_toc_if_title_voffset:n {#4}
\eb_toc_start_multi_column_ext:n {#5}
\group_end:
}
@@ -1613,13 +1628,14 @@
\tl_set_eq:NN \eb@toc@title \contentsname
\tl_set:Nn \eb@bitoc@title { Contents }
\IfValueT{#2}{\keys_set:nn { eb/listoc } {#2}}
+ \eb_toc_type_section_initial:
\eb_title_mark_notoc:n { \eb@toc@title }
- \vspace*{-\dim_use:N \l__eb_toc_main_voffset_skip}
+ \eb_toc_if_title_voffset:n { main }
\eb_toc_start_multi_column_ext:n { toc }#3
\IfBooleanT{#1}
{
\eb_title_mark_notoc:n { \eb@bitoc@title }
- \vspace*{-\dim_use:N \l__eb_toc_main_voffset_skip}
+ \eb_toc_if_title_voffset:n { main }
\eb_toc_start_multi_column_ext:n { tec }
}
\group_end:
@@ -2381,7 +2397,7 @@
}
%</package>
%<*tcolorbox>
-\ProvidesExplFile{eb-tcolorbox.cfg}{2021/11/28}{1.41A}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2021/11/28}{1.41B}
{Customization of tcolorbox for easybook}
\cs_set_protected:Npn \setexercise #1