From 21ec58a3ff045c5ec43e3744d6ffb28ea9ab194a Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 12 Nov 2021 23:01:20 +0000 Subject: easybook (12nov21) git-svn-id: svn://tug.org/texlive/trunk@61038 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/easybook/easybook.pdf | Bin 582938 -> 581410 bytes Master/texmf-dist/doc/latex/easybook/easybook.tex | 10 +++++----- .../texmf-dist/source/latex/easybook/easybook.dtx | 15 ++++++--------- Master/texmf-dist/tex/latex/easybook/easybase.sty | 11 ++++------- Master/texmf-dist/tex/latex/easybook/easybook.cls | 2 +- .../texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg | 2 +- 6 files changed, 17 insertions(+), 23 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/easybook/easybook.pdf b/Master/texmf-dist/doc/latex/easybook/easybook.pdf index 2871a82625c..37b9add116d 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 54806dc5a6d..cde1c710e87 100644 --- a/Master/texmf-dist/doc/latex/easybook/easybook.tex +++ b/Master/texmf-dist/doc/latex/easybook/easybook.tex @@ -20,8 +20,8 @@ name = easybook, color-scheme = blue, title = EASYBOOK 使用手册, - version = v1.40O, - date = 2021/11/10, + version = v1.40P, + date = 2021/11/12, authors = 瞿毅, info = 排版简体中文学位论文和书籍, email = q1jx@foxmail.com, @@ -637,8 +637,8 @@ \label{subsec:page margins} 模块 \module*{geoset} 会将除了前两个附加的选项交给页面尺寸宏包 \pkg*{geometry} 处理,并且支持它的键值列表,预置的页面尺寸与 \cls*{Word} 的默认值接近。下面列举的仅是一小部分选项,其它选项可查阅宏包帮助文档。当在此设置页面大小时,会覆盖 \option{paper} 选项的设置。 \begin{options}\noitemsep - \keyval-{headruleskip}{页眉线间距}\Module{geoset}\Default* - \keyval-{footruleskip}{页脚线间距}\Default* + \keyval-{headruleskip}{页眉线间距}\Module{geoset}\Default*{1.5pt} + \keyval-{footruleskip}{页脚线间距}\Default*{0.3\cs*{normalbaselineskip}} \keyval*-{left}{页面左边距}\Default*{3.17cm} \keyval*-{top}{页面上边距}\Default*{2.54cm} \kvsplit{hmargin}{左边距,右边距} @@ -893,7 +893,7 @@ \environment*{description}[\oarg{键值列表}] 已为三种列表各自预置了三个级别,同种列表或不同种列表间的不同级别可相互嵌套,可以使用短编号的形式,带有星号的环境为行内列表。默认列表标签与标准文档类一致,下面举几个更改列表标签以及其它格式的例子: \begin{ctexexam} - \setlist{nosep} % 取消所有列表额外的垂直间距 + \setlist*{wide = 0em} % 取消所有列表的左边距 \begin{enumerate}[label = \arabic*(a),leftmargin = 1cm,resume] \begin{enumerate}[(1)] % 短编号形式 \begin{itemize}[label = \textbullet,labelsep = *] diff --git a/Master/texmf-dist/source/latex/easybook/easybook.dtx b/Master/texmf-dist/source/latex/easybook/easybook.dtx index 5ee1eadb0fe..14c53c66084 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/10}{1.40O} +\ProvidesExplClass{easybook}{2021/11/12}{1.40P} {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/10}{1.40O} +\ProvidesExplPackage{easybase}{2021/11/12}{1.40P} {Typeset Chinese theses or books} \cs_generate_variant:Nn \dim_set:Nn { NV } @@ -908,14 +908,12 @@ { plain,pifont,pifont*,pifont-sans,pifont-sans* } { \eb_fnmate_normal_label_set:nn {#1} { the@footnote } }, fnmark-num .value_required:n = true, - fnmark-num/unknown .code:n = - { \eb_fnmate_short_label_set:nn {#1} { the@footnote } }, + fnmark-num/unknown .code:n = \eb_fnmate_short_label_set:nn {#1} { the@footnote }, fntext-num .choices:nn = { plain,pifont,pifont*,pifont-sans,pifont-sans* } { \eb_fnmate_normal_label_set:nn {#1} { thefootnote } }, fntext-num .value_required:n = true, - fntext-num/unknown .code:n = - { \eb_fnmate_short_label_set:nn {#1} { thefootnote } }, + fntext-num/unknown .code:n = \eb_fnmate_short_label_set:nn {#1} { thefootnote }, fnmate-num .meta:n = { fntext-num = #1,fnmark-num = #1 }, fnmate-num .initial:n = plain, unknown .code:n = \eb_msg_unknown_option:n { hdrset } @@ -1837,8 +1835,7 @@ \newlist{eb@exercise@list}{enumerate}{2} \newlist{eb@eqcomp@list}{description}{1} \setlist[eb@outline@list]{label = outline,itemsep = 0.5ex plus .1ex} -\setlist[eb@exercise@list]{labelsep = 0.5em,nosep} -\setlist[eb@eqcomp@list]{labelsep = 0em,nosep} +\setlist[eb@eqcomp@list]{labelsep = 0em} \cs_new:Npn \setexerlist #1 { \setlist*[eb@exercise@list]{#1} } \cs_new:Npn \seteqcomplist #1 { \setlist*[eb@eqcomp@list]{#1} } \cs_new:Npn \setoutlinelist #1 { \setlist*[eb@outline@list]{#1} } @@ -2404,7 +2401,7 @@ } % %<*tcolorbox> -\ProvidesExplFile{eb-tcolorbox.cfg}{2021/11/10}{1.40O} +\ProvidesExplFile{eb-tcolorbox.cfg}{2021/11/12}{1.40P} {Customization of tcolorbox for easybook} \tl_gset:Nn \eb@tc@line@skip { 0.5\baselineskip } diff --git a/Master/texmf-dist/tex/latex/easybook/easybase.sty b/Master/texmf-dist/tex/latex/easybook/easybase.sty index 051caf597d8..5f377cf5c21 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/10}{1.40O} +\ProvidesExplPackage{easybase}{2021/11/12}{1.40P} {Typeset Chinese theses or books} \cs_generate_variant:Nn \dim_set:Nn { NV } @@ -603,14 +603,12 @@ { plain,pifont,pifont*,pifont-sans,pifont-sans* } { \eb_fnmate_normal_label_set:nn {#1} { the@footnote } }, fnmark-num .value_required:n = true, - fnmark-num/unknown .code:n = - { \eb_fnmate_short_label_set:nn {#1} { the@footnote } }, + fnmark-num/unknown .code:n = \eb_fnmate_short_label_set:nn {#1} { the@footnote }, fntext-num .choices:nn = { plain,pifont,pifont*,pifont-sans,pifont-sans* } { \eb_fnmate_normal_label_set:nn {#1} { thefootnote } }, fntext-num .value_required:n = true, - fntext-num/unknown .code:n = - { \eb_fnmate_short_label_set:nn {#1} { thefootnote } }, + fntext-num/unknown .code:n = \eb_fnmate_short_label_set:nn {#1} { thefootnote }, fnmate-num .meta:n = { fntext-num = #1,fnmark-num = #1 }, fnmate-num .initial:n = plain, unknown .code:n = \eb_msg_unknown_option:n { hdrset } @@ -1532,8 +1530,7 @@ \newlist{eb@exercise@list}{enumerate}{2} \newlist{eb@eqcomp@list}{description}{1} \setlist[eb@outline@list]{label = outline,itemsep = 0.5ex plus .1ex} -\setlist[eb@exercise@list]{labelsep = 0.5em,nosep} -\setlist[eb@eqcomp@list]{labelsep = 0em,nosep} +\setlist[eb@eqcomp@list]{labelsep = 0em} \cs_new:Npn \setexerlist #1 { \setlist*[eb@exercise@list]{#1} } \cs_new:Npn \seteqcomplist #1 { \setlist*[eb@eqcomp@list]{#1} } \cs_new:Npn \setoutlinelist #1 { \setlist*[eb@outline@list]{#1} } diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls index e8cc98fab60..5603af10dc4 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/10}{1.40O} +\ProvidesExplClass{easybook}{2021/11/12}{1.40P} {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 d2f11e9b8b1..d8295ff117c 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/10}{1.40O} +\ProvidesExplFile{eb-tcolorbox.cfg}{2021/11/12}{1.40P} {Customization of tcolorbox for easybook} \tl_gset:Nn \eb@tc@line@skip { 0.5\baselineskip } -- cgit v1.2.3