From 07549467cd23db09b2150c50bc9f93f10f08764a Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Tue, 19 Jan 2021 03:01:36 +0000 Subject: CTAN sync 202101190301 --- .../latex/contrib/easybook/doc/easybook-demo.pdf | Bin 308555 -> 308553 bytes .../latex/contrib/easybook/doc/easybook-demo.tex | 2 +- macros/latex/contrib/easybook/doc/easybook.pdf | Bin 231477 -> 234522 bytes macros/latex/contrib/easybook/doc/easybook.tex | 10 +++++++--- macros/latex/contrib/easybook/easybook.cls | 21 +++++++++++---------- 5 files changed, 19 insertions(+), 14 deletions(-) (limited to 'macros/latex/contrib/easybook') diff --git a/macros/latex/contrib/easybook/doc/easybook-demo.pdf b/macros/latex/contrib/easybook/doc/easybook-demo.pdf index 8de59b0b82..71496575c9 100644 Binary files a/macros/latex/contrib/easybook/doc/easybook-demo.pdf and b/macros/latex/contrib/easybook/doc/easybook-demo.pdf differ diff --git a/macros/latex/contrib/easybook/doc/easybook-demo.tex b/macros/latex/contrib/easybook/doc/easybook-demo.tex index 2eeda2eb20..2c9a7ae899 100644 --- a/macros/latex/contrib/easybook/doc/easybook-demo.tex +++ b/macros/latex/contrib/easybook/doc/easybook-demo.tex @@ -95,7 +95,7 @@ \edge~\url{https://latexstudio.net} \\ \url{https://ctan.org/pkg/easybook} } - \date{2021/01/15\hskip\ccwd\relax v1.21e} + \date{2021/01/18\hskip\ccwd\relax v1.21f} } \begin{document} diff --git a/macros/latex/contrib/easybook/doc/easybook.pdf b/macros/latex/contrib/easybook/doc/easybook.pdf index bf0dd89a05..8cdd54c31a 100644 Binary files a/macros/latex/contrib/easybook/doc/easybook.pdf and b/macros/latex/contrib/easybook/doc/easybook.pdf differ diff --git a/macros/latex/contrib/easybook/doc/easybook.tex b/macros/latex/contrib/easybook/doc/easybook.tex index 6e78054325..aa6248434b 100644 --- a/macros/latex/contrib/easybook/doc/easybook.tex +++ b/macros/latex/contrib/easybook/doc/easybook.tex @@ -8,7 +8,7 @@ \title{\sffamily easybook书籍文档类} \author{瞿毅} -\date{2021/01/15\hskip\ccwd\relax v1.21e\thanks{\url{https://gitee.com/texl3/easybook}}} +\date{2021/01/18\hskip\ccwd\relax v1.21f\thanks{\url{https://gitee.com/texl3/easybook}}} \begin{document} \maketitle @@ -227,16 +227,18 @@ \end{optdesc} \subsection{定理样式} -\begin{function}[EXP,added = 2021-01-12]{thmset/thmbox,thmset/numberwith,thmset/headpunct,thmset/bodyfont,thmset/notefont,thmset/headindent,thmset/spaceabove,thmset/spacebelow} +\begin{function}[EXP,added = 2021-01-12,updated = 2021-01-18]{thmset/thmbox,thmset/numberwith,thmset/headpunct,thmset/bodyfont,thmset/notefont,thmset/headfont,thmset/headindent,thmset/spaceabove,thmset/spacebelow,thmset/spacepost} \begin{syntax} thmbox = numberwith = <(chapter)|section|其它环境|空置> headpunct = <(未设置)> bodyfont = <(未设置)> notefont = <(未设置)> + headfont = <(\tn{color}\marg{ctex@emph}\tn{sffamily})> headindent = <(0\tn{ccwd})> spaceabove = <(0.75ex plus .1ex)> spacebelow = <(0.75ex plus .1ex)> + spacepost = <(\tn{ccwd})> \end{syntax} \changes{v1.21b}{2021/01/12}{增加配置定理环境样式的选项。} \end{function} @@ -247,15 +249,17 @@ \item[headpunct] 定理标题后的标记。 \item[bodyfont] 定理内容部分的字体。 \item[notefont] 定理标题内容的字体。 + \item[headfont] 定理类型标题名的字体。 \item[headindent] 定理标题的缩进,默认无缩进,可用 \tn{parindent} 命令设置为段落缩进。 \item[spaceabove] 定理环境前的间距。 \item[spacebelow] 定理环境后的间距。 + \item[spacepost] 定理标题后与内容的间距。 \end{optdesc} \subsubsection{新的定理样式} 定理由 \pkg{thmtools} 设置,自带定理的样式为 \opt{mythm},如果使用这个样式而只是增加新的定理名称,可以这样 \begin{ctexexam} - \declaretheorem[style = mythm,name = 定理名]{定理环境名} + \AfterPreamble{\declaretheorem[style = mythm,name = 定理名]{定理环境名}} \end{ctexexam} 若要重新定义一个全新的定理样式,具体参数可以查看 \pkg{thmtools} 宏包帮助文档。 diff --git a/macros/latex/contrib/easybook/easybook.cls b/macros/latex/contrib/easybook/easybook.cls index 8e5273e3ee..59eee8726e 100644 --- a/macros/latex/contrib/easybook/easybook.cls +++ b/macros/latex/contrib/easybook/easybook.cls @@ -9,7 +9,7 @@ %% https://creativecommons.org/licenses/by/4.0/legalcode \NeedsTeXFormat{LaTeX2e} \RequirePackage{l3keys2e} -\ProvidesExplClass{easybook}{2021/01/15}{1.21e}{} +\ProvidesExplClass{easybook}{2021/01/18}{1.21f}{} \cs_generate_variant:Nn \keys_define:nn {nx} \cs_generate_variant:Nn \int_to_arabic:n {v} @@ -812,12 +812,16 @@ bodyfont .initial:n = {}, notefont .tl_set:N = \l__thm_notefont_tl, notefont .initial:n = {}, + headfont .tl_set:N = \l__thm_headfont_tl, + headfont .initial:n = {\color{ctex@emph}\sffamily}, headindent .tl_set:N = \l__thm_headindent_tl, headindent .initial:n = {0\ccwd}, spaceabove .tl_set:N = \l__thm_spaceabove_tl, spaceabove .initial:n = {.75ex plus .1ex}, spacebelow .tl_set:N = \l__thm_spacebelow_tl, - spacebelow .initial:n = {.75ex plus .1ex} + spacebelow .initial:n = {.75ex plus .1ex}, + spacepost .tl_set:N = \l__thm_spacepost_tl, + spacepost .initial:n = {\ccwd} } \ctex_at_end_preamble:n { @@ -825,12 +829,12 @@ spaceabove = \l__thm_spaceabove_tl, spacebelow = \l__thm_spacebelow_tl, headindent = \l__thm_headindent_tl, - headfont = \color{ctex@emph}\sffamily, + headfont = \l__thm_headfont_tl, notefont = \l__thm_notefont_tl, notebraces = {}{}, bodyfont = \l__thm_bodyfont_tl, headpunct = \l__thm_headpunct_tl, - postheadspace = \ccwd, + postheadspace = \l__thm_spacepost_tl, numberwithin = \l__thm_numberwith_tl, headformat = \NAME\space\NUMBER\NOTE ]{mythm} @@ -955,14 +959,10 @@ { \IfBooleanF{#1} { + \CTEX@ifnametrue \refstepcounter{section} \CTEX@addtocline{section}{#4} - \markright - { - \ifnum\c@secnumdepth>\z@ - \CTEXthesection\hspace{0.5\ccwd} - \fi#4 - } + \markright{\CTEXthesection\hspace{0.5\ccwd}#4} } \begin{center} \bool_if:NTF \l__thmbox_bool @@ -1079,6 +1079,7 @@ { \exp_args:NV \addbibresource\l__bib_file_tl \defbibheading{bibliography}[\bibname]{\__title_mark_intoc:n {##1}} + \skip_set:Nn \bibitemsep{0ex} } \ctex_at_end_preamble:n { -- cgit v1.2.3