diff options
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r-- | Master/texmf-dist/doc/latex/easybook/easybook.pdf | bin | 581902 -> 581933 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/easybook/easybook.tex | 6 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/easybook/easybook.dtx | 24 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/easybook/easybase.sty | 14 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/easybook/easybook.cls | 8 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg | 2 |
6 files changed, 21 insertions, 33 deletions
diff --git a/Master/texmf-dist/doc/latex/easybook/easybook.pdf b/Master/texmf-dist/doc/latex/easybook/easybook.pdf Binary files differindex 87c3d6e96ef..394dee6851b 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 28ed36925cd..bf8c6ee7601 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.40L, - date = 2021/11/06, + version = v1.40M, + date = 2021/11/09, authors = 瞿毅, info = 排版简体中文学位论文和书籍, email = q1jx@foxmail.com, @@ -848,7 +848,7 @@ \environment*{tabularx}[\marg{长度}\marg{列格式}]\default{} \environment*{tabular}[\marg{列格式}]\default{} \environment{tblr}[\marg{键值列表}] - \pkg*{tabularray} 是一个较新且强大的表格宏包,不依赖其它表格宏包所以同时使用不会产生冲突。不仅提供 \pkg*{tabularx}、\pkg*{multirow}、和 \pkg*{booktabs} 等宏包的功能,还实现了用键值列表方式简便地设置表格样式。具体用法可见宏包的说明文档,下面演示一个 \env{tblr} 表格的用法: + \pkg*{tabularray} 是一个较新且强大的表格宏包,不依赖其它表格宏包所以同时使用不会产生冲突。不仅提供 \pkg*{tabularx}、\pkg*{multirow} 和 \pkg*{booktabs} 等宏包的功能,还实现了用键值列表方式简便地设置表格样式。具体用法可见宏包的说明文档,下面演示一个 \env{tblr} 表格的用法: \begin{ctexexam} \begin{tblr} { diff --git a/Master/texmf-dist/source/latex/easybook/easybook.dtx b/Master/texmf-dist/source/latex/easybook/easybook.dtx index 81171ce8b2e..94ee574cafd 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/06}{1.40L} +\ProvidesExplClass{easybook}{2021/11/09}{1.40M} {Typeset Chinese theses or books} \bool_set_false:N \l__eb_compile_draft_bool @@ -26,6 +26,7 @@ \clist_new:N \g__eb_options_clist \cs_new_protected:Npn \eb_put_ctexbook:n #1 { \PassOptionsToClass{#1}{ctexbook} } +\cs_generate_variant:Nn \eb_put_ctexbook:n { V } \keys_define:nn { easybook } { @@ -66,13 +67,12 @@ config .tl_set:N = \g__eb_config_tl, floatpage .bool_set:N = \l__eb_float_page_bool, floatpage .default:n = true, - unknown .code:n = - { \clist_gput_right:NV \g__eb_options_clist \CurrentOption } + unknown .code:n = \clist_gput_right:NV \g__eb_options_clist \CurrentOption } \ProcessKeysOptions{easybook} \PassOptionsToPackage{no-math,quiet,CJKmath}{xeCJK} -\eb_put_ctexbook:n { \g__eb_options_clist } +\eb_put_ctexbook:V \g__eb_options_clist \LoadClass[UTF8]{ctexbook} \RequirePackage{easybase} @@ -325,7 +325,7 @@ %<*package> \NeedsTeXFormat{LaTeX2e}[2020/10/01] \RequirePackage{l3keys2e,etoolbox} -\ProvidesExplPackage{easybase}{2021/11/06}{1.40L} +\ProvidesExplPackage{easybase}{2021/11/09}{1.40M} {Typeset Chinese theses or books} \cs_generate_variant:Nn \dim_set:Nn { NV } @@ -1798,9 +1798,7 @@ } \IfPackageAtLeastTF{tabularray}{2021/07/01} { - \NewTableCommand{\toprule}[1][1pt]{\hline[#1]} - \NewTableCommand{\midrule}[1][0.5pt]{\hline[#1]} - \NewTableCommand{\bottomrule}[1][1pt]{\hline[#1]} + \UseTblrLibrary{booktabs} \SetTblrInner{stretch = \fp_use:N \l__eb_spread_table_fp} }{} \eb_at_begin_environment:nn { tabular,tabularx } @@ -1857,12 +1855,8 @@ \SetEnumitemValue{font}{sf}{\color{ctex@emph}\normalfont\sffamily} \SetEnumitemValue{ref}{enumii}{\arabic{enumi}.\alph*} \SetEnumitemValue{ref}{enumiii}{\arabic{enumi}.\alph{enumii}.\roman*} -\setlist - { - labelsep = 0.75em,listparindent = 2em,leftmargin = *, - itemsep = 0.75ex plus .1ex,topsep = 0.75ex plus .1ex, - partopsep = 0ex,parsep = 0ex - } +\setlist{nosep,align = left} +\setlist*{labelsep = 0.5em,listparindent = 2em,leftmargin = *} \setlist[itemize,1]{label = bullet} \setlist[itemize,2]{label = endash} \setlist[itemize,3]{label = asterisk} @@ -2454,7 +2448,7 @@ } %</package> %<*tcolorbox> -\ProvidesExplFile{eb-tcolorbox.cfg}{2021/11/06}{1.40L} +\ProvidesExplFile{eb-tcolorbox.cfg}{2021/11/09}{1.40M} {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 80afd16db8a..a0a154f852d 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/06}{1.40L} +\ProvidesExplPackage{easybase}{2021/11/09}{1.40M} {Typeset Chinese theses or books} \cs_generate_variant:Nn \dim_set:Nn { NV } @@ -1493,9 +1493,7 @@ } \IfPackageAtLeastTF{tabularray}{2021/07/01} { - \NewTableCommand{\toprule}[1][1pt]{\hline[#1]} - \NewTableCommand{\midrule}[1][0.5pt]{\hline[#1]} - \NewTableCommand{\bottomrule}[1][1pt]{\hline[#1]} + \UseTblrLibrary{booktabs} \SetTblrInner{stretch = \fp_use:N \l__eb_spread_table_fp} }{} \eb_at_begin_environment:nn { tabular,tabularx } @@ -1552,12 +1550,8 @@ \SetEnumitemValue{font}{sf}{\color{ctex@emph}\normalfont\sffamily} \SetEnumitemValue{ref}{enumii}{\arabic{enumi}.\alph*} \SetEnumitemValue{ref}{enumiii}{\arabic{enumi}.\alph{enumii}.\roman*} -\setlist - { - labelsep = 0.75em,listparindent = 2em,leftmargin = *, - itemsep = 0.75ex plus .1ex,topsep = 0.75ex plus .1ex, - partopsep = 0ex,parsep = 0ex - } +\setlist{nosep,align = left} +\setlist*{labelsep = 0.5em,listparindent = 2em,leftmargin = *} \setlist[itemize,1]{label = bullet} \setlist[itemize,2]{label = endash} \setlist[itemize,3]{label = asterisk} diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls index 8913ccba875..eed1827762d 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/06}{1.40L} +\ProvidesExplClass{easybook}{2021/11/09}{1.40M} {Typeset Chinese theses or books} \bool_set_false:N \l__eb_compile_draft_bool @@ -31,6 +31,7 @@ \clist_new:N \g__eb_options_clist \cs_new_protected:Npn \eb_put_ctexbook:n #1 { \PassOptionsToClass{#1}{ctexbook} } +\cs_generate_variant:Nn \eb_put_ctexbook:n { V } \keys_define:nn { easybook } { @@ -71,13 +72,12 @@ config .tl_set:N = \g__eb_config_tl, floatpage .bool_set:N = \l__eb_float_page_bool, floatpage .default:n = true, - unknown .code:n = - { \clist_gput_right:NV \g__eb_options_clist \CurrentOption } + unknown .code:n = \clist_gput_right:NV \g__eb_options_clist \CurrentOption } \ProcessKeysOptions{easybook} \PassOptionsToPackage{no-math,quiet,CJKmath}{xeCJK} -\eb_put_ctexbook:n { \g__eb_options_clist } +\eb_put_ctexbook:V \g__eb_options_clist \LoadClass[UTF8]{ctexbook} \RequirePackage{easybase} diff --git a/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg b/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg index 1d100e729f1..28cb1a6af0d 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/06}{1.40L} +\ProvidesExplFile{eb-tcolorbox.cfg}{2021/11/09}{1.40M} {Customization of tcolorbox for easybook} \tl_gset:Nn \eb@tc@line@skip { 0.5\baselineskip } |