From 1f8faf3d0b1260c492c706b5a523fc2eda244dff Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 29 Nov 2021 21:11:20 +0000 Subject: easybook (29nov21) git-svn-id: svn://tug.org/texlive/trunk@61184 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/easybook/easybook.pdf | Bin 582743 -> 583057 bytes Master/texmf-dist/doc/latex/easybook/easybook.tex | 8 ++- .../texmf-dist/source/latex/easybook/easybook.dtx | 64 +++++++++++++-------- Master/texmf-dist/tex/latex/easybook/easybase.sty | 60 ++++++++++++------- Master/texmf-dist/tex/latex/easybook/easybook.cls | 2 +- .../texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg | 2 +- 6 files changed, 85 insertions(+), 51 deletions(-) diff --git a/Master/texmf-dist/doc/latex/easybook/easybook.pdf b/Master/texmf-dist/doc/latex/easybook/easybook.pdf index 9ef9511eaed..45d99e11415 100644 Binary files a/Master/texmf-dist/doc/latex/easybook/easybook.pdf and b/Master/texmf-dist/doc/latex/easybook/easybook.pdf differ diff --git a/Master/texmf-dist/doc/latex/easybook/easybook.tex b/Master/texmf-dist/doc/latex/easybook/easybook.tex index 1289434785e..168e49d8e4d 100644 --- a/Master/texmf-dist/doc/latex/easybook/easybook.tex +++ b/Master/texmf-dist/doc/latex/easybook/easybook.tex @@ -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}{刚性长度} diff --git a/Master/texmf-dist/source/latex/easybook/easybook.dtx b/Master/texmf-dist/source/latex/easybook/easybook.dtx index 2e13fa3db6a..c4e52d8a916 100644 --- a/Master/texmf-dist/source/latex/easybook/easybook.dtx +++ b/Master/texmf-dist/source/latex/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 @@ } % %<*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 diff --git a/Master/texmf-dist/tex/latex/easybook/easybase.sty b/Master/texmf-dist/tex/latex/easybook/easybase.sty index ab3ff40924b..ba583221c87 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}{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@titletoc@hang@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@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 }} @@ -1279,13 +1289,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: } @@ -1308,13 +1323,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: diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls index 714c473b56c..7cae1be57f3 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}{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 diff --git a/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg b/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg index fb341f67a9d..9db6c0b5c06 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}{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 -- cgit v1.2.3