texlive[61184] Master/texmf-dist: easybook (29nov21)
commits+karl at tug.org
commits+karl at tug.org
Mon Nov 29 22:11:20 CET 2021
Revision: 61184
http://tug.org/svn/texlive?view=revision&revision=61184
Author: karl
Date: 2021-11-29 22:11:20 +0100 (Mon, 29 Nov 2021)
Log Message:
-----------
easybook (29nov21)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/easybook/easybook.pdf
trunk/Master/texmf-dist/doc/latex/easybook/easybook.tex
trunk/Master/texmf-dist/source/latex/easybook/easybook.dtx
trunk/Master/texmf-dist/tex/latex/easybook/easybase.sty
trunk/Master/texmf-dist/tex/latex/easybook/easybook.cls
trunk/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg
Modified: trunk/Master/texmf-dist/doc/latex/easybook/easybook.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/easybook/easybook.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/easybook/easybook.tex 2021-11-29 21:11:06 UTC (rev 61183)
+++ trunk/Master/texmf-dist/doc/latex/easybook/easybook.tex 2021-11-29 21:11:20 UTC (rev 61184)
@@ -20,7 +20,7 @@
name = easybook,
color-scheme = blue,
title = EASYBOOK 使用手册,
- version = v1.41A,
+ version = v1.41B,
date = 2021/11/28,
authors = 瞿毅,
info = 排版简体中文学位论文和书籍,
@@ -305,6 +305,8 @@
使当前目录标题按照 \code{chapter} 章级别输出。
\opt{section}\Default!
使当前目录标题按照 \code{section} 节级别输出。
+ \opt{none}\Default!
+ 使当前目录没有 \code{chapter} 或 \code{section} 级别的标题，仅输出目录原始内容。
\keyval-{multoc}{整数}\Default{2}
与 \module*{style} 模块的 \option{multoc} 选项具有相同的效果，但是具有优先性且可单独设置不同类型目录的排版栏数。\meta{整数} 为目录栏数，不指定栏数值则默认为双栏。
\kvsplit{title}{中文目录标题,英文目录标题}\newline
@@ -826,8 +828,8 @@
图片、表格或代码目录标题下方的间距补偿，一般为正值，用于抵消目录中首行的额外垂直间距。路径为 \module*{figure}、\module*{table} 和 \module*{lstlisting}，或者用 \module*{list} 路径统一设置。
\keyval-{main-voffset}{弹性长度}
文档主目录标题下方的间距补偿，一般为正值，用于抵消目录中首行的额外垂直间距。
- \keybool{line-align}\Default{true}
- 引导线选项 \option{line-align} 可以使目录引导线右边对齐并与页码保持一定间隙，否则会与页码连接。
+ \keybool{dotalign}\Default{true}
+ 引导线选项 \option{dotalign} 可以使目录引导线右边对齐并与页码保持一定间隙，否则会与页码连接。
\keyval-{tocafter-all}{距离命令}\Default{\cs*{hspace}\Carg{1em}}
统一设置所有级别在目录中标签与标题间的代码。
\keyval-{tocindent-all}{刚性长度}
Modified: trunk/Master/texmf-dist/source/latex/easybook/easybook.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/easybook/easybook.dtx 2021-11-29 21:11:06 UTC (rev 61183)
+++ trunk/Master/texmf-dist/source/latex/easybook/easybook.dtx 2021-11-29 21:11:20 UTC (rev 61184)
@@ -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 at titletoc@hang at 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 at bitoc@title {#2} }
}
+\cs_new_protected:Npn \eb_toc_type_section_initial:
+ {
+ \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_intoc:n #1
{
- \tl_if_eq:NnTF \l__eb_toc_type_tl { chapter }
- { \bichapter*{#1}{\eb at bitoc@title} }
- { \bisection*{#1}{\eb at bitoc@title} }
+ \str_case:Vn \l__eb_toc_type_tl
+ {
+ { chapter } { \bichapter*{#1}{\eb at bitoc@title} }
+ { section } { \bisection*{#1}{\eb at bitoc@title} }
+ }
}
\cs_new_protected:Npn \eb_title_mark_notoc: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 } { \chapter*{\phantomsection #1}\chaptermark{#1} }
+ { section } { \section*{\phantomsection #1}\sectionmark{#1} }
}
- {
- \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 at toc@title}{\eb at bitoc@title} }
- { \bisection{\eb at toc@title}{\eb at bitoc@title} }
+ \str_case:Vn \l__eb_toc_type_tl
+ {
+ { chapter } { \bichapter{\eb at toc@title}{\eb at bitoc@title} }
+ { section } { \bisection{\eb at toc@title}{\eb at bitoc@title} }
+ }
}{
\IfBooleanTF{#2}
{\eb_title_mark_notoc:n { \eb at toc@title }}
@@ -1584,6 +1594,11 @@
}
{ \@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:
@@ -1590,7 +1605,7 @@
\tl_set_eq:Nc \eb at 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 at toc@title \contentsname
\tl_set:Nn \eb at bitoc@title { Contents }
\IfValueT{#2}{\keys_set:nn { eb/listoc } {#2}}
+ \eb_toc_type_section_initial:
\eb_title_mark_notoc:n { \eb at 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 at 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
Modified: trunk/Master/texmf-dist/tex/latex/easybook/easybase.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/easybook/easybase.sty 2021-11-29 21:11:06 UTC (rev 61183)
+++ trunk/Master/texmf-dist/tex/latex/easybook/easybase.sty 2021-11-29 21:11:20 UTC (rev 61184)
@@ -20,7 +20,7 @@
%% This work has the LPPL maintenance status `maintained'.
\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 }
@@ -983,9 +983,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 at titletoc@hang at fix@bool,
hang .default:n = true,
hang .initial:n = false,
@@ -999,7 +999,7 @@
\IfBooleanTF{#1}
{\thecontentspage}
{
- \bool_if:NTF \l__eb_toc_line_align_bool
+ \bool_if:NTF \l__eb_toc_dot_align_bool
{ \contentspage }
{ \thecontentspage }
}
@@ -1208,7 +1208,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,
@@ -1231,31 +1232,40 @@
{ \tl_set:Nn \eb at bitoc@title {#2} }
}
+\cs_new_protected:Npn \eb_toc_type_section_initial:
+ {
+ \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_intoc:n #1
{
- \tl_if_eq:NnTF \l__eb_toc_type_tl { chapter }
- { \bichapter*{#1}{\eb at bitoc@title} }
- { \bisection*{#1}{\eb at bitoc@title} }
+ \str_case:Vn \l__eb_toc_type_tl
+ {
+ { chapter } { \bichapter*{#1}{\eb at bitoc@title} }
+ { section } { \bisection*{#1}{\eb at bitoc@title} }
+ }
}
\cs_new_protected:Npn \eb_title_mark_notoc: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 } { \chapter*{\phantomsection #1}\chaptermark{#1} }
+ { section } { \section*{\phantomsection #1}\sectionmark{#1} }
}
- {
- \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 at toc@title}{\eb at bitoc@title} }
- { \bisection{\eb at toc@title}{\eb at bitoc@title} }
+ \str_case:Vn \l__eb_toc_type_tl
+ {
+ { chapter } { \bichapter{\eb at toc@title}{\eb at bitoc@title} }
+ { section } { \bisection{\eb at toc@title}{\eb at bitoc@title} }
+ }
}{
\IfBooleanTF{#2}
{\eb_title_mark_notoc:n { \eb at toc@title }}
@@ -1279,6 +1289,11 @@
}
{ \@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:
@@ -1285,7 +1300,7 @@
\tl_set_eq:Nc \eb at 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:
}
@@ -1308,13 +1323,14 @@
\tl_set_eq:NN \eb at toc@title \contentsname
\tl_set:Nn \eb at bitoc@title { Contents }
\IfValueT{#2}{\keys_set:nn { eb/listoc } {#2}}
+ \eb_toc_type_section_initial:
\eb_title_mark_notoc:n { \eb at 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 at 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:
Modified: trunk/Master/texmf-dist/tex/latex/easybook/easybook.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/easybook/easybook.cls 2021-11-29 21:11:06 UTC (rev 61183)
+++ trunk/Master/texmf-dist/tex/latex/easybook/easybook.cls 2021-11-29 21:11:20 UTC (rev 61184)
@@ -20,7 +20,7 @@
%% This work has the LPPL maintenance status `maintained'.
\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
Modified: trunk/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg
===================================================================
--- trunk/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg 2021-11-29 21:11:06 UTC (rev 61183)
+++ trunk/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg 2021-11-29 21:11:20 UTC (rev 61184)
@@ -18,7 +18,7 @@
%% LaTeX version 2005/12/01 or later.
%%
%% This work has the LPPL maintenance status `maintained'.
-\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
More information about the tex-live-commits
mailing list.