From 62e2d0b7f2ea75c2d38bffd1e756a05c9d770626 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 14 Feb 2022 21:23:27 +0000 Subject: easybook (14feb22) git-svn-id: svn://tug.org/texlive/trunk@62024 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/easybook/easybook.pdf | Bin 578140 -> 578143 bytes Master/texmf-dist/doc/latex/easybook/easybook.tex | 6 ++--- .../texmf-dist/source/latex/easybook/easybook.dtx | 25 ++++++++++++++------- Master/texmf-dist/tex/latex/easybook/easybase.sty | 21 ++++++++++++----- Master/texmf-dist/tex/latex/easybook/easybook.cls | 2 +- .../texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg | 2 +- 6 files changed, 37 insertions(+), 19 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/easybook/easybook.pdf b/Master/texmf-dist/doc/latex/easybook/easybook.pdf index a1d8867b065..c58bf2d8aa6 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 55f6bfda13b..8dfe779fa2e 100644 --- a/Master/texmf-dist/doc/latex/easybook/easybook.tex +++ b/Master/texmf-dist/doc/latex/easybook/easybook.tex @@ -21,8 +21,8 @@ name = easybook, color-scheme = blue, title = EASYBOOK 使用手册, - version = v1.625, - date = 2022/02/13, + version = v1.626, + date = 2022/02/14, authors = 瞿毅, info = 排版简体中文学位论文和书籍, email = q1jx@foxmail.com, @@ -1277,7 +1277,7 @@ \item 文档类移除预置的定理环境，改为由用户自行定义环境。 \item 考虑到功能性和实用性不强弃用摘要环境 \env*{outline} 和习题环境 \env*{exercise}。 \end{version} - \begin{version}[v = 1.625,date = 2022/02/13] + \begin{version}[v = 1.626,date = 2022/02/14] \added \item 增加目录条目下方执行的代码选项 \option{tocbelow}。 \changed diff --git a/Master/texmf-dist/source/latex/easybook/easybook.dtx b/Master/texmf-dist/source/latex/easybook/easybook.dtx index 0e348a84ed7..52c34180555 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}{2022/02/13}{1.625} +\ProvidesExplClass{easybook}{2022/02/14}{1.626} {Typeset Chinese theses or books} \bool_set_false:N \l__eb_compile_draft_bool @@ -303,7 +303,7 @@ %<*package> \NeedsTeXFormat{LaTeX2e}[2020/10/01] \RequirePackage{l3keys2e,etoolbox} -\ProvidesExplPackage{easybase}{2022/02/13}{1.625} +\ProvidesExplPackage{easybase}{2022/02/14}{1.626} {Typeset Chinese theses or books} \cs_generate_variant:Nn \dim_set:Nn { NV } @@ -1027,16 +1027,25 @@ \cs_set_eq:NN \eb@makefntext@save \@makefntext \ctex_at_end_package:nn { footmisc } { - \notbool{FN@para} + \eb_package_date_check:nn { footmisc } { 2022/02/10 } + \notbool{FN@para}{\cs_set_eq:NN \@makefntext \eb@makefntext@save}{} + \ifboolexpr { - \cs_set_eq:NN \@makefntext \eb@makefntext@save - \msg_warning:nn { easybase } { footmisc } - }{} + bool {FN@hangfoot} or + bool {FN@perpage} or + bool {FN@robust} or + ( + notbool {FN@abovefloats} and + bool {FN@fixskip} and + test {\ifnumcomp{\FN@ORspacehandling}{=}{1}} + ) + } + {\msg_warning:nn { easybase } { footmisc }}{} } \msg_new:nnn { easybase } { footmisc } { It~is~not~recommended~that~you~use~the \\ - hang,~symbol,~marginal,~flushmargin~or~bottom \\ + hang,~symbol,~perpage,~marginal,~flushmargin~or~bottom \\ options~of~the~'footmisc'~package. } @@ -2261,7 +2270,7 @@ } % %<*tcolorbox> -\ProvidesExplFile{eb-tcolorbox.cfg}{2022/02/13}{1.625} +\ProvidesExplFile{eb-tcolorbox.cfg}{2022/02/14}{1.626} {Customization of tcolorbox for easybook} \cs_set_protected:Npn \addtotcbstyle #1#2 diff --git a/Master/texmf-dist/tex/latex/easybook/easybase.sty b/Master/texmf-dist/tex/latex/easybook/easybase.sty index 5fdd44f154e..c958de7f3a9 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}{2022/02/13}{1.625} +\ProvidesExplPackage{easybase}{2022/02/14}{1.626} {Typeset Chinese theses or books} \cs_generate_variant:Nn \dim_set:Nn { NV } @@ -744,16 +744,25 @@ \cs_set_eq:NN \eb@makefntext@save \@makefntext \ctex_at_end_package:nn { footmisc } { - \notbool{FN@para} + \eb_package_date_check:nn { footmisc } { 2022/02/10 } + \notbool{FN@para}{\cs_set_eq:NN \@makefntext \eb@makefntext@save}{} + \ifboolexpr { - \cs_set_eq:NN \@makefntext \eb@makefntext@save - \msg_warning:nn { easybase } { footmisc } - }{} + bool {FN@hangfoot} or + bool {FN@perpage} or + bool {FN@robust} or + ( + notbool {FN@abovefloats} and + bool {FN@fixskip} and + test {\ifnumcomp{\FN@ORspacehandling}{=}{1}} + ) + } + {\msg_warning:nn { easybase } { footmisc }}{} } \msg_new:nnn { easybase } { footmisc } { It~is~not~recommended~that~you~use~the \\ - hang,~symbol,~marginal,~flushmargin~or~bottom \\ + hang,~symbol,~perpage,~marginal,~flushmargin~or~bottom \\ options~of~the~'footmisc'~package. } diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls index c66837288a5..afafee9d50f 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}{2022/02/13}{1.625} +\ProvidesExplClass{easybook}{2022/02/14}{1.626} {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 1bdc14859ff..f796611d4de 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}{2022/02/13}{1.625} +\ProvidesExplFile{eb-tcolorbox.cfg}{2022/02/14}{1.626} {Customization of tcolorbox for easybook} \cs_set_protected:Npn \addtotcbstyle #1#2 -- cgit v1.2.3