diff options
author | Karl Berry <karl@freefriends.org> | 2021-11-20 20:53:31 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2021-11-20 20:53:31 +0000 |
commit | e46f68801d28bebdbc42a47eb4411b330a7fe2ff (patch) | |
tree | 0cab5b4ca9cb35c9a1afee3343abbe82a46b7190 /Master | |
parent | 4ede05846cf39da0bbfd0484928394f414addc6a (diff) |
easybook (20nov21)
git-svn-id: svn://tug.org/texlive/trunk@61098 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r-- | Master/texmf-dist/doc/latex/easybook/easybook.pdf | bin | 581408 -> 581062 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/easybook/easybook.tex | 38 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/easybook/easybook.dtx | 78 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/easybook/easybase.sty | 44 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/easybook/easybook.cls | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg | 32 |
6 files changed, 105 insertions, 89 deletions
diff --git a/Master/texmf-dist/doc/latex/easybook/easybook.pdf b/Master/texmf-dist/doc/latex/easybook/easybook.pdf Binary files differindex 9f1eaf022ed..2e67d24923e 100644 --- a/Master/texmf-dist/doc/latex/easybook/easybook.pdf +++ b/Master/texmf-dist/doc/latex/easybook/easybook.pdf diff --git a/Master/texmf-dist/doc/latex/easybook/easybook.tex b/Master/texmf-dist/doc/latex/easybook/easybook.tex index fdf030956ef..df4b4c4fb2f 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.40R, - date = 2021/11/16, + version = v1.40T, + date = 2021/11/20, authors = 瞿毅, info = 排版简体中文学位论文和书籍, email = q1jx@foxmail.com, @@ -568,24 +568,24 @@ \begin{options} \keybool{thmframe}\Module{thmset}\Default{false} 给定理环境使用彩色盒子。这个特殊选项在本模块中使用 \pkg*{tcolorbox} 宏包来支持,\meta{盒子风格} 默认为 \code{tc-theorem}。\pkg*{thmtools} 具有类似的选项 \option*{thmbox},可在新建定理样式的命令中使用。 - \keychoice{within}{chapter,section,env,empty}\Default{chapter} - 定理编号跟随的计数器,默认跟随章的编号,也可以跟随其它定理环境的编号,当计数器增加时定理编号会从零开始,空置时不跟随其它计数器编号。 - \keyval-{headpunct}{代码}\Default - 紧随定理标题末尾的标记代码,位于定理第一段内容的间距 \option{postheadspace} 之前,可以是字符或插入换行符 \cs*{newline} 等命令。 - \keyval-{bodyfont}{字体命令}\Default - 定理内容部分的字体,包括字体族、字体系列、字体尺寸和字体形状命令。 - \keyval-{notefont}{字体命令}\Default - 定理题注部分的字体,包括字体族、字体系列、字体尺寸和字体形状命令。 \keyval-{headfont}{字体命令}\Default{\cs*{color}\Carg{ctex@emph}\cs*{sffamily}} 定理标题部分的字体,包括字体族、字体系列、字体尺寸和字体形状命令。 + \keyval-{notefont}{字体命令}\Default + 定理题注部分的字体,包括字体族、字体系列、字体尺寸和字体形状命令。 + \keyval-{bodyfont}{字体命令}\Default + 定理内容部分的字体,包括字体族、字体系列、字体尺寸和字体形状命令。 + \keychoice{within}{chapter,section,env,empty} + 定理编号跟随的计数器,书籍模式默认跟随章计数器编号。也可以跟随其它定理环境的编号,当计数器增加时定理编号会从零开始,空置时不跟随其它计数器编号。 + \keyval-{headpunct}{代码}\Default + 紧随定理标题末尾的标记代码,位于定理第一段内容的间距 \option{postheadspace} 之前,可以是字符或插入换行符 \cs*{newline} 等命令。 \keyval-{headindent}{刚性长度}\Default{0em} 定理标题的缩进,默认无缩进,可用 \cs*{parindent} 命令设置为段落缩进。 + \keyval-{postheadspace}{刚性长度}\Default{1em} + 定理标题后与定理第一段内容的间距。 \keyval-{spaceabove}{弹性长度}\Default{0ex plus .1ex} 定理环境前的间距,使用 \pkg*{tcolorbox} 的盒子环境包装后被覆盖。 \keyval-{spacebelow}{弹性长度}\Default{0ex plus .1ex} 定理环境后的间距,使用 \pkg*{tcolorbox} 的盒子环境包装后被覆盖。 - \keyval-{postheadspace}{刚性长度}\Default{1em} - 定理标题后与定理第一段内容的间距。 \kvsplit*{notebraces}{\meta{左括号}\code{\}\{}\meta{右括号}}\Default{\Carg{(}\Carg{)}} 设置定理题注两边的括号,两个必选参数分别代表左括号和右括号。 \keyval-{headformat}{标题排列}\Default{\cs*{NAME}\cs*{NUMBER}\cs*{NOTE}} @@ -627,7 +627,7 @@ \addtcbstyle{tc-theorem}{colback = GreenYellow} \end{ctexexam} \command{declaretheoremstyle}[\oarg{键值列表1}\marg{定理样式}\oarg{键值列表2}] - 声明新的定理样式命令,键值列表支持上述 \module*{thmset} 模块中以及 \cs{declaretheorem} 的所有选项。可选参数的 \meta{键值列表1} 与 \meta{键值列表2} 等效,用法与原来的同名命令一致。下面定义一个名为 \code{mythm} 的定理样式用于 \cs{declaretheorem} 的 \option*{style} 选项: + 声明新的定理样式命令,键值列表支持 \pkg*{thmtools} 宏包中原命令以及 \cs{declaretheorem} 的所有选项。可选参数的 \meta{键值列表1} 与 \meta{键值列表2} 等效,用法与原来的同名命令一致。下面定义一个名为 \code{mythm} 的定理样式用于 \cs{declaretheorem} 的 \option*{style} 选项: \begin{ctexexam}[labelref = exam:new theorem sty] \declaretheoremstyle[bodyfont = \rmfamily,spacepost = 0.5em]{mythm} \end{ctexexam} @@ -721,11 +721,11 @@ \hdrset{footnotetype = {hang,bottom}} \end{ctexexam} \keyval-{fnindent}{刚性长度}\Default{0.75em} - 脚注内容首段缩进距离,等于长度 \cs{footindent} 的值。 + 脚注首段的首行缩进,等于长度 \cs{footindent} 的值。 \keyval-{fnparskip}{弹性长度}\Default{0ex} - 脚注段落间距,等于长度 \cs{footparskip} 的值。 + 脚注段落的间距,等于长度 \cs{footparskip} 的值。 \keyval-{fnparindent}{刚性长度}\Default{2em} - 脚注段落缩进,等于长度 \cs{footparindent} 的值。 + 脚注第二段及之后段落的首行缩进,等于长度 \cs{footparindent} 的值。 \keychoice{fntext-pos}{normal,super}\Default{super} 设置脚注内容标记的位置,正常文本或是上标形式。 \keychoice{fnmark-num}{plain,pifont,pifont*,pisans,pisans*,short num}\Default{plain} @@ -819,7 +819,7 @@ \begin{options} \keybool{hang}\Default{false} - 悬挂缩进选项 \option{hang} 使目录标题为悬挂缩进形式,缩进距离为标签及其与标题间距的长度,但此时目录编号会失去超链接。这个选项对所有标题级别有效。 + 悬挂缩进选项 \option{hang} 使目录标题为悬挂缩进形式,缩进距离为标签及其与标题间距的长度,但此时标题编号会失去超链接。这个选项对所有标题级别有效。 \keyval-{lolskip}{弹性长度}\Default{10pt} 代码目录中每章代码标题的额外距离,与 C\TeX 的表格和图片目录中每章间的标题距离选项 \option*{lotskip} 和 \option*{lofskip} 类似,在 \cls*{article} 模式中此选项失效。 \keyval-{voffset}{弹性长度} @@ -883,7 +883,7 @@ \setlist[itemize,1]{label = $\triangleleft$} \setlist[enumerate]{labelsep = *,leftmargin = 1.5pc} \newlist{steps}{enumerate}{2} - \setlist[steps,1,2]{label = (\arabic*)} + \setlist[steps,1,2]{label = (\alph*)} \end{ctexexam} \end{commands} @@ -894,7 +894,7 @@ 已为三种列表各自预置了三个级别,同种列表或不同种列表间的不同级别可相互嵌套,可以使用短编号的形式,带有星号的环境为行内列表。默认列表标签与标准文档类一致,下面举几个更改列表标签以及其它格式的例子: \begin{ctexexam} \setlist*{wide = 0em} % 取消所有列表的左边距 - \begin{enumerate}[label = \arabic*(a),leftmargin = 1cm,resume] + \begin{enumerate}[label = (\arabic*),leftmargin = 1cm,resume] \begin{enumerate}[(1)] % 短编号形式 \begin{itemize}[label = \textbullet,labelsep = *] \begin{description}[font = \sffamily\bfseries,style = nextline] diff --git a/Master/texmf-dist/source/latex/easybook/easybook.dtx b/Master/texmf-dist/source/latex/easybook/easybook.dtx index 4d5a6904436..302df73e057 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/16}{1.40R} +\ProvidesExplClass{easybook}{2021/11/20}{1.40T} {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/16}{1.40R} +\ProvidesExplPackage{easybase}{2021/11/20}{1.40T} {Typeset Chinese theses or books} \cs_generate_variant:Nn \dim_set:Nn { NV } @@ -1032,8 +1032,17 @@ \cs_set_eq:NN \eb@makefntext \@makefntext \ctex_at_end_package:nn { footmisc } { - \@ifpackagewith{footmisc}{hang} - {\cs_set_eq:NN \@makefntext \eb@makefntext}{} + \notbool{FN@para} + { + \cs_set_eq:NN \@makefntext \eb@makefntext + \msg_warning:nn { easybase } { footmisc } + }{} + } +\msg_new:nnn { easybase } { footmisc } + { + It~is~not~recommended~that~you~use~the \\ + hang,~symbol,~marginal,~flushmargin~or~bottom \\ + options~of~the~footmisc~package. } \cs_set_protected:Npn \footref #1 @@ -1907,6 +1916,7 @@ { \tl_const:cn { c__eb_name_#1_tl } {#3} } { \tl_const:cn { c__eb_name_#1_tl } {#2} } } +\cs_undefine:N \proof \cs_set_eq:NN \eb@declaretheorem@save \declaretheorem \cs_set_eq:NN \eb@declaretheoremsyle@save \declaretheoremstyle \RenewDocumentCommand{\declaretheorem}{O{}mO{}} @@ -1935,7 +1945,6 @@ Now~that~the~thmframe~option~is~true. \\ Please~load~the~tcolorbox~macro~package. } -\cs_set_eq:NN \DeclareTheorem \deftheorem \prop_new:N \l__eb_thmtools_entry_prop \clist_const:Nn \c__eb_thmtools_entry_clist @@ -1991,8 +2000,6 @@ \c__eb_thmtools_entry_clist { notebraces = \l__eb_thm_notebraces_tl } \exp_last_unbraced:NNV \declaretheoremstyle[\c__eb_thmtools_entry_clist]{easy-theorem} - \eb_thm_name_set:nnn { exercise } { Exercise } { 练习 } - \cs_undefine:N \proof \deftheorem{lemma}{引理} \deftheorem{example}{例} \deftheorem{theorem}{定理} @@ -2055,31 +2062,6 @@ } \ctex_at_end_package:nn { unicode-math } { \msg_redirect_module:nnn { unicode-math } { warning } { info } } - -\keys_define:nn { eb/exercise } - { - color .tl_set:N = \eb@tc@background@color, - color .initial:n = DeepSkyBlue, - number .tl_set:N = \eb@tc@list@number, - number .initial:n = 1., - title .tl_set:N = \eb@tc@exercise@title, - title .initial:n = \c__eb_name_exercise_tl, - numsep .dim_set:N = \eb@toc@exercise@numsep, - numsep .initial:n = 0.5em, - tocnumsep .dim_set:N = \eb@toc@exertoc@numsep, - tocnumsep .initial:n = 1em, - label .tl_set:N = \eb@tc@exercise@label, - enumitem .code:n = \setexerlist{#1}, - tcolorbox .code:n = \addtcbstyle{exercise}{#1} - } -\cs_set_protected:Npn \setexercise #1 - { \keys_set:nn { eb/exercise } {#1} } -\cs_set_protected:Npn \addtcbstyle #1#2 - { \tcbset{#1/.append~style = {#2}} } -\cs_set_protected:Npn \newtcbstyle #1#2 - { \tcbset{#1/.style = {#2}} } -\cs_new_protected:Npn \tcbappstyle - { \@ifstar{\newtcbstyle}{\addtcbstyle} } \ctex_at_end_package:nn { tcolorbox } { \eb_package_date_check:nn { tcolorbox } { 2020/10/09 } @@ -2393,9 +2375,34 @@ } %</package> %<*tcolorbox> -\ProvidesExplFile{eb-tcolorbox.cfg}{2021/11/16}{1.40R} +\ProvidesExplFile{eb-tcolorbox.cfg}{2021/11/20}{1.40T} {Customization of tcolorbox for easybook} +\cs_set_protected:Npn \setexercise #1 + { \keys_set:nn { eb/exercise } {#1} } +\cs_set_protected:Npn \addtcbstyle #1#2 + { \tcbset{#1/.append~style = {#2}} } +\cs_set_protected:Npn \newtcbstyle #1#2 + { \tcbset{#1/.style = {#2}} } +\cs_new_protected:Npn \tcbappstyle + { \@ifstar{\newtcbstyle}{\addtcbstyle} } +\keys_define:nn { eb/exercise } + { + color .tl_set:N = \eb@tc@background@color, + color .initial:n = DeepSkyBlue, + number .tl_set:N = \eb@tc@list@number, + number .initial:n = 1., + title .tl_set:N = \eb@tc@exercise@title, + title .initial:n = \c__eb_name_exercise_tl, + numsep .dim_set:N = \eb@toc@exercise@numsep, + numsep .initial:n = 0.5em, + tocnumsep .dim_set:N = \eb@toc@exertoc@numsep, + tocnumsep .initial:n = 1em, + label .tl_set:N = \eb@tc@exercise@label, + enumitem .code:n = \setexerlist{#1}, + tcolorbox .code:n = \addtcbstyle{exercise}{#1} + } + \tl_gset:Nn \eb@tc@line@skip { 0.5\baselineskip } \newtcbstyle{tc-theorem} { @@ -2457,14 +2464,14 @@ { standard~jigsaw,on~line, top = 1.5pt,bottom = 1.5pt,left = 1.5pt,right = 1.5pt, - boxrule = 0.75pt,arc = 1pt, + boxrule = 0.5pt,arc = 1pt, opacityback = 0.2 } \newtcbstyle{tc-ebfbox} { on~line,sharpish~corners, top = 2pt,bottom = 2pt,left = 1pt,right = 1pt, - leftrule = 0pt,rightrule = 0pt + boxrule = 0.5pt,leftrule = 0pt,rightrule = 0pt } \tcbset { @@ -2482,6 +2489,7 @@ \tl_gset:Nn \eb@tc@exercise@ifnametrue {#1} \tl_gset:Nn \eb@tc@exercise@ifnamefalse {#2} } +\eb_thm_name_set:nnn { exercise } { Exercise } { 练习 } \tcphantomifname { \markright diff --git a/Master/texmf-dist/tex/latex/easybook/easybase.sty b/Master/texmf-dist/tex/latex/easybook/easybase.sty index 84eb1f466c8..da95e0d7a5b 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/16}{1.40R} +\ProvidesExplPackage{easybase}{2021/11/20}{1.40T} {Typeset Chinese theses or books} \cs_generate_variant:Nn \dim_set:Nn { NV } @@ -727,8 +727,17 @@ \cs_set_eq:NN \eb@makefntext \@makefntext \ctex_at_end_package:nn { footmisc } { - \@ifpackagewith{footmisc}{hang} - {\cs_set_eq:NN \@makefntext \eb@makefntext}{} + \notbool{FN@para} + { + \cs_set_eq:NN \@makefntext \eb@makefntext + \msg_warning:nn { easybase } { footmisc } + }{} + } +\msg_new:nnn { easybase } { footmisc } + { + It~is~not~recommended~that~you~use~the \\ + hang,~symbol,~marginal,~flushmargin~or~bottom \\ + options~of~the~footmisc~package. } \cs_set_protected:Npn \footref #1 @@ -1602,6 +1611,7 @@ { \tl_const:cn { c__eb_name_#1_tl } {#3} } { \tl_const:cn { c__eb_name_#1_tl } {#2} } } +\cs_undefine:N \proof \cs_set_eq:NN \eb@declaretheorem@save \declaretheorem \cs_set_eq:NN \eb@declaretheoremsyle@save \declaretheoremstyle \RenewDocumentCommand{\declaretheorem}{O{}mO{}} @@ -1630,7 +1640,6 @@ Now~that~the~thmframe~option~is~true. \\ Please~load~the~tcolorbox~macro~package. } -\cs_set_eq:NN \DeclareTheorem \deftheorem \prop_new:N \l__eb_thmtools_entry_prop \clist_const:Nn \c__eb_thmtools_entry_clist @@ -1686,8 +1695,6 @@ \c__eb_thmtools_entry_clist { notebraces = \l__eb_thm_notebraces_tl } \exp_last_unbraced:NNV \declaretheoremstyle[\c__eb_thmtools_entry_clist]{easy-theorem} - \eb_thm_name_set:nnn { exercise } { Exercise } { 练习 } - \cs_undefine:N \proof \deftheorem{lemma}{引理} \deftheorem{example}{例} \deftheorem{theorem}{定理} @@ -1750,31 +1757,6 @@ } \ctex_at_end_package:nn { unicode-math } { \msg_redirect_module:nnn { unicode-math } { warning } { info } } - -\keys_define:nn { eb/exercise } - { - color .tl_set:N = \eb@tc@background@color, - color .initial:n = DeepSkyBlue, - number .tl_set:N = \eb@tc@list@number, - number .initial:n = 1., - title .tl_set:N = \eb@tc@exercise@title, - title .initial:n = \c__eb_name_exercise_tl, - numsep .dim_set:N = \eb@toc@exercise@numsep, - numsep .initial:n = 0.5em, - tocnumsep .dim_set:N = \eb@toc@exertoc@numsep, - tocnumsep .initial:n = 1em, - label .tl_set:N = \eb@tc@exercise@label, - enumitem .code:n = \setexerlist{#1}, - tcolorbox .code:n = \addtcbstyle{exercise}{#1} - } -\cs_set_protected:Npn \setexercise #1 - { \keys_set:nn { eb/exercise } {#1} } -\cs_set_protected:Npn \addtcbstyle #1#2 - { \tcbset{#1/.append~style = {#2}} } -\cs_set_protected:Npn \newtcbstyle #1#2 - { \tcbset{#1/.style = {#2}} } -\cs_new_protected:Npn \tcbappstyle - { \@ifstar{\newtcbstyle}{\addtcbstyle} } \ctex_at_end_package:nn { tcolorbox } { \eb_package_date_check:nn { tcolorbox } { 2020/10/09 } diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls index b680720a6ee..63d24b2edd6 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/16}{1.40R} +\ProvidesExplClass{easybook}{2021/11/20}{1.40T} {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 91063fd4eca..e2584309959 100644 --- a/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg +++ b/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg @@ -18,9 +18,34 @@ %% LaTeX version 2005/12/01 or later. %% %% This work has the LPPL maintenance status `maintained'. -\ProvidesExplFile{eb-tcolorbox.cfg}{2021/11/16}{1.40R} +\ProvidesExplFile{eb-tcolorbox.cfg}{2021/11/20}{1.40T} {Customization of tcolorbox for easybook} +\cs_set_protected:Npn \setexercise #1 + { \keys_set:nn { eb/exercise } {#1} } +\cs_set_protected:Npn \addtcbstyle #1#2 + { \tcbset{#1/.append~style = {#2}} } +\cs_set_protected:Npn \newtcbstyle #1#2 + { \tcbset{#1/.style = {#2}} } +\cs_new_protected:Npn \tcbappstyle + { \@ifstar{\newtcbstyle}{\addtcbstyle} } +\keys_define:nn { eb/exercise } + { + color .tl_set:N = \eb@tc@background@color, + color .initial:n = DeepSkyBlue, + number .tl_set:N = \eb@tc@list@number, + number .initial:n = 1., + title .tl_set:N = \eb@tc@exercise@title, + title .initial:n = \c__eb_name_exercise_tl, + numsep .dim_set:N = \eb@toc@exercise@numsep, + numsep .initial:n = 0.5em, + tocnumsep .dim_set:N = \eb@toc@exertoc@numsep, + tocnumsep .initial:n = 1em, + label .tl_set:N = \eb@tc@exercise@label, + enumitem .code:n = \setexerlist{#1}, + tcolorbox .code:n = \addtcbstyle{exercise}{#1} + } + \tl_gset:Nn \eb@tc@line@skip { 0.5\baselineskip } \newtcbstyle{tc-theorem} { @@ -82,14 +107,14 @@ { standard~jigsaw,on~line, top = 1.5pt,bottom = 1.5pt,left = 1.5pt,right = 1.5pt, - boxrule = 0.75pt,arc = 1pt, + boxrule = 0.5pt,arc = 1pt, opacityback = 0.2 } \newtcbstyle{tc-ebfbox} { on~line,sharpish~corners, top = 2pt,bottom = 2pt,left = 1pt,right = 1pt, - leftrule = 0pt,rightrule = 0pt + boxrule = 0.5pt,leftrule = 0pt,rightrule = 0pt } \tcbset { @@ -107,6 +132,7 @@ \tl_gset:Nn \eb@tc@exercise@ifnametrue {#1} \tl_gset:Nn \eb@tc@exercise@ifnamefalse {#2} } +\eb_thm_name_set:nnn { exercise } { Exercise } { 练习 } \tcphantomifname { \markright |