diff options
author | Karl Berry <karl@freefriends.org> | 2022-01-28 22:23:22 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2022-01-28 22:23:22 +0000 |
commit | e6a75a4b6e50566cc5baa5e91e396c6c9210e610 (patch) | |
tree | 31a1d697b23ae260a38339c3189f80e63d4a945a /Master | |
parent | ecdb8e7ed03ff5752ea72b7cd78a014ed53d29e4 (diff) |
easybook (28jan22)
git-svn-id: svn://tug.org/texlive/trunk@61773 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r-- | Master/texmf-dist/doc/latex/easybook/easybook.pdf | bin | 575309 -> 575298 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/easybook/easybook.tex | 6 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/easybook/easybook.dtx | 43 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/easybook/easybase.sty | 39 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/easybook/easybook.cls | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg | 2 |
6 files changed, 45 insertions, 47 deletions
diff --git a/Master/texmf-dist/doc/latex/easybook/easybook.pdf b/Master/texmf-dist/doc/latex/easybook/easybook.pdf Binary files differindex ae5595cfa26..bd4402b691b 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 5a46413dc18..f6323022a7f 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.53, - date = 2022/01/25, + version = v1.54, + date = 2022/01/28, authors = 瞿毅, info = 排版简体中文学位论文和书籍, email = q1jx@foxmail.com, @@ -1252,7 +1252,7 @@ \item 增加定义脚注正文和内容标记格式的命令 \cs{defupfntmark} 和 \cs{defdownfntmark}。 \item 新增文档主目录中双语标题列表的输出排列方式选项 \option{bilist}。 \end{version} - \begin{version}[v = 1.53,date = 2022/01/25] + \begin{version}[v = 1.54,date = 2022/01/28] \added \item 新增文类选项 \option{theorem} 用于提供定理功能支持。 \deprecated diff --git a/Master/texmf-dist/source/latex/easybook/easybook.dtx b/Master/texmf-dist/source/latex/easybook/easybook.dtx index 36103ea8c18..81156d1337c 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/01/25}{1.53} +\ProvidesExplClass{easybook}{2022/01/28}{1.54} {Typeset Chinese theses or books} \bool_set_false:N \l__eb_compile_draft_bool @@ -305,7 +305,7 @@ %<*package> \NeedsTeXFormat{LaTeX2e}[2020/10/01] \RequirePackage{l3keys2e,etoolbox} -\ProvidesExplPackage{easybase}{2022/01/25}{1.53} +\ProvidesExplPackage{easybase}{2022/01/28}{1.54} {Typeset Chinese theses or books} \cs_generate_variant:Nn \dim_set:Nn { NV } @@ -382,12 +382,12 @@ } \msg_new:nnn { easybase } { package-repeat-load-i } { - The~macro~package~#1~has~been~loaded~repeatedly. \\ + The~macro~package~'#1'~has~been~loaded~repeatedly. \\ Please~pass~the~arguments~by \\ the~\string\PassOptionsToPackage{#2}{#1}\ command. } \msg_new:nnn { easybase } { package-repeat-load-ii } - { The~macro~package~#1~has~been~loaded~repeatedly. } + { The~macro~package~'#1'~has~been~loaded~repeatedly. } \cs_set_eq:NN \eb@usepackage@save \usepackage \RenewDocumentCommand{\usepackage}{O{}m} { @@ -469,14 +469,14 @@ \eb_seq_map_inline:nn { style,subfont,spread,bibset,thmset,hdrset,tocset } { - \msg_new:nnn { easybase } { abandon-#1 } + \msg_new:nnn { easybase } { deprecated-#1 } { - ##1~is~an~abandoned~option~of~#1~module. \\ + The~option~'##1'~of~module~'#1'~is~deprecated~or~non-existent. \\ Please~browse~the~user~manual~for~the~new~options. } } -\cs_new_protected:Npn \eb_msg_abandon_option:n #1 - { \msg_warning:nnV { easybase } { abandon-#1 } \l_keys_key_str } +\cs_new_protected:Npn \eb_msg_deprecated_option:n #1 + { \msg_warning:nnV { easybase } { deprecated-#1 } \l_keys_key_str } \cs_if_exist:NF \chapter { \newcounter{chapter} @@ -498,7 +498,7 @@ } \msg_new:nnn { easybase } { no-chapter } { - Your~document~class~is~in~article~mode. \\ + Your~document~class~is~in~'article'~mode. \\ The~\string\chapter\ command~will~not~be~used. } @@ -522,7 +522,7 @@ } \msg_new:nnn { easybase } { package-old } { - Package~#1~has~been~out~of~date. \\ + Package~'#1'~has~been~out~of~date. \\ Some~problems~or~errors~may~occur \\ if~you~continue~compiling. \\\\ Please~update~your~macro~package~from~CTAN. @@ -919,7 +919,7 @@ fntext-num/unknown .code:n = \eb_fnmate_short_label_set:Nn \thefootnote {#1}, fnmate-num .meta:n = { fntext-num = #1,fnmark-num = #1 }, fnmate-num .initial:n = plain, - unknown .code:n = \eb_msg_abandon_option:n { hdrset } + unknown .code:n = \eb_msg_deprecated_option:n { hdrset } } \eb_at_end_preamble:n @@ -1046,7 +1046,7 @@ { It~is~not~recommended~that~you~use~the \\ hang,~symbol,~marginal,~flushmargin~or~bottom \\ - options~of~the~footmisc~package. + options~of~the~'footmisc'~package. } \cs_set_protected:Npn \footref #1 @@ -1301,7 +1301,7 @@ hang .initial:n = false, pagenumwd .code:n = \contentsmargin{#1}, pagenumwd .initial:n = 1.55em, - unknown .code:n = \eb_msg_abandon_option:n { tocset } + unknown .code:n = \eb_msg_deprecated_option:n { tocset } } \NewDocumentCommand{\tocrule}{st-O{0.7pc}D(){1.2}mO{}} { @@ -1499,7 +1499,7 @@ hyphen-listing = #1,hyphen-equation = #1 }, hyphen-every .initial:n = ., - unknown .code:n = \eb_msg_abandon_option:n { style } + unknown .code:n = \eb_msg_deprecated_option:n { style } } \eb_seq_map_inline:nn { figure,table,lstlisting,equation } @@ -1730,7 +1730,7 @@ footnote .tl_set:N = \l__eb_subfont_footnote_tl, marginpar .tl_set:N = \l__eb_subfont_marginpar_tl, marginpar .initial:n = \footnotesize, - unknown .code:n = \eb_msg_abandon_option:n { subfont } + unknown .code:n = \eb_msg_deprecated_option:n { subfont } } \cs_new_protected:Npn \addtosubfont #1#2 { @@ -1775,7 +1775,7 @@ line = #1,table = #1,math = #1, caption-every = #1,footnote = #1 }, - unknown .code:n = \eb_msg_abandon_option:n { spread } + unknown .code:n = \eb_msg_deprecated_option:n { spread } } \tl_gset:Nn \marginfont { \l__eb_subfont_marginpar_tl } @@ -1821,10 +1821,9 @@ } \dim_zero_new:N \mathindent \skip_set:Nn \parskip { 0pt plus 2pt minus 1pt } -\skip_set:Nn \intextsep { 14pt plus 2pt minus 2pt } -\skip_set:Nn \textfloatsep { 16pt plus 2pt minus 4pt } +\skip_set:Nn \textfloatsep { 12pt plus 2pt minus 4pt } +\skip_set:Nn \dbltextfloatsep { 12pt plus 2pt minus 4pt } \skip_set:Nn \multicolsep { 12pt plus 4pt minus 3pt } -\skip_set:Nn \dbltextfloatsep { 16pt plus 2pt minus 4pt } \int_gset:Nn \vbadness { 10000 } \int_gset:Nn \hbadness { 10000 } \setcounter{topnumber}{4} @@ -1961,7 +1960,7 @@ \ctex_define:nn { thmset } { tcbwrap .code:n = { }, - unknown .code:n = \eb_msg_abandon_option:n { thmset } + unknown .code:n = \eb_msg_deprecated_option:n { thmset } } \cs_undefine:N \proof \declaretheoremstyle{fancy}[ @@ -2043,7 +2042,7 @@ datafile .clist_set:N = \l__eb_bib_datafile_clist, bititle .tl_set:N = \eb@bib@bitoc@title, bititle .initial:n = Bibliography, - unknown .code:n = \eb_msg_abandon_option:n { bibset } + unknown .code:n = \eb_msg_deprecated_option:n { bibset } } \cs_new_protected:Npn \eb_bibtex_natbib_set: @@ -2344,7 +2343,7 @@ } %</package> %<*tcolorbox> -\ProvidesExplFile{eb-tcolorbox.cfg}{2022/01/25}{1.53} +\ProvidesExplFile{eb-tcolorbox.cfg}{2022/01/28}{1.54} {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 6ec10a050ba..f0ff61233e9 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/01/25}{1.53} +\ProvidesExplPackage{easybase}{2022/01/28}{1.54} {Typeset Chinese theses or books} \cs_generate_variant:Nn \dim_set:Nn { NV } @@ -97,12 +97,12 @@ } \msg_new:nnn { easybase } { package-repeat-load-i } { - The~macro~package~#1~has~been~loaded~repeatedly. \\ + The~macro~package~'#1'~has~been~loaded~repeatedly. \\ Please~pass~the~arguments~by \\ the~\string\PassOptionsToPackage{#2}{#1}\ command. } \msg_new:nnn { easybase } { package-repeat-load-ii } - { The~macro~package~#1~has~been~loaded~repeatedly. } + { The~macro~package~'#1'~has~been~loaded~repeatedly. } \cs_set_eq:NN \eb@usepackage@save \usepackage \RenewDocumentCommand{\usepackage}{O{}m} { @@ -184,14 +184,14 @@ \eb_seq_map_inline:nn { style,subfont,spread,bibset,thmset,hdrset,tocset } { - \msg_new:nnn { easybase } { abandon-#1 } + \msg_new:nnn { easybase } { deprecated-#1 } { - ##1~is~an~abandoned~option~of~#1~module. \\ + The~option~'##1'~of~module~'#1'~is~deprecated~or~non-existent. \\ Please~browse~the~user~manual~for~the~new~options. } } -\cs_new_protected:Npn \eb_msg_abandon_option:n #1 - { \msg_warning:nnV { easybase } { abandon-#1 } \l_keys_key_str } +\cs_new_protected:Npn \eb_msg_deprecated_option:n #1 + { \msg_warning:nnV { easybase } { deprecated-#1 } \l_keys_key_str } \cs_if_exist:NF \chapter { \newcounter{chapter} @@ -213,7 +213,7 @@ } \msg_new:nnn { easybase } { no-chapter } { - Your~document~class~is~in~article~mode. \\ + Your~document~class~is~in~'article'~mode. \\ The~\string\chapter\ command~will~not~be~used. } @@ -237,7 +237,7 @@ } \msg_new:nnn { easybase } { package-old } { - Package~#1~has~been~out~of~date. \\ + Package~'#1'~has~been~out~of~date. \\ Some~problems~or~errors~may~occur \\ if~you~continue~compiling. \\\\ Please~update~your~macro~package~from~CTAN. @@ -634,7 +634,7 @@ fntext-num/unknown .code:n = \eb_fnmate_short_label_set:Nn \thefootnote {#1}, fnmate-num .meta:n = { fntext-num = #1,fnmark-num = #1 }, fnmate-num .initial:n = plain, - unknown .code:n = \eb_msg_abandon_option:n { hdrset } + unknown .code:n = \eb_msg_deprecated_option:n { hdrset } } \eb_at_end_preamble:n @@ -761,7 +761,7 @@ { It~is~not~recommended~that~you~use~the \\ hang,~symbol,~marginal,~flushmargin~or~bottom \\ - options~of~the~footmisc~package. + options~of~the~'footmisc'~package. } \cs_set_protected:Npn \footref #1 @@ -1016,7 +1016,7 @@ hang .initial:n = false, pagenumwd .code:n = \contentsmargin{#1}, pagenumwd .initial:n = 1.55em, - unknown .code:n = \eb_msg_abandon_option:n { tocset } + unknown .code:n = \eb_msg_deprecated_option:n { tocset } } \NewDocumentCommand{\tocrule}{st-O{0.7pc}D(){1.2}mO{}} { @@ -1214,7 +1214,7 @@ hyphen-listing = #1,hyphen-equation = #1 }, hyphen-every .initial:n = ., - unknown .code:n = \eb_msg_abandon_option:n { style } + unknown .code:n = \eb_msg_deprecated_option:n { style } } \eb_seq_map_inline:nn { figure,table,lstlisting,equation } @@ -1445,7 +1445,7 @@ footnote .tl_set:N = \l__eb_subfont_footnote_tl, marginpar .tl_set:N = \l__eb_subfont_marginpar_tl, marginpar .initial:n = \footnotesize, - unknown .code:n = \eb_msg_abandon_option:n { subfont } + unknown .code:n = \eb_msg_deprecated_option:n { subfont } } \cs_new_protected:Npn \addtosubfont #1#2 { @@ -1490,7 +1490,7 @@ line = #1,table = #1,math = #1, caption-every = #1,footnote = #1 }, - unknown .code:n = \eb_msg_abandon_option:n { spread } + unknown .code:n = \eb_msg_deprecated_option:n { spread } } \tl_gset:Nn \marginfont { \l__eb_subfont_marginpar_tl } @@ -1536,10 +1536,9 @@ } \dim_zero_new:N \mathindent \skip_set:Nn \parskip { 0pt plus 2pt minus 1pt } -\skip_set:Nn \intextsep { 14pt plus 2pt minus 2pt } -\skip_set:Nn \textfloatsep { 16pt plus 2pt minus 4pt } +\skip_set:Nn \textfloatsep { 12pt plus 2pt minus 4pt } +\skip_set:Nn \dbltextfloatsep { 12pt plus 2pt minus 4pt } \skip_set:Nn \multicolsep { 12pt plus 4pt minus 3pt } -\skip_set:Nn \dbltextfloatsep { 16pt plus 2pt minus 4pt } \int_gset:Nn \vbadness { 10000 } \int_gset:Nn \hbadness { 10000 } \setcounter{topnumber}{4} @@ -1676,7 +1675,7 @@ \ctex_define:nn { thmset } { tcbwrap .code:n = { }, - unknown .code:n = \eb_msg_abandon_option:n { thmset } + unknown .code:n = \eb_msg_deprecated_option:n { thmset } } \cs_undefine:N \proof \declaretheoremstyle{fancy}[ @@ -1758,7 +1757,7 @@ datafile .clist_set:N = \l__eb_bib_datafile_clist, bititle .tl_set:N = \eb@bib@bitoc@title, bititle .initial:n = Bibliography, - unknown .code:n = \eb_msg_abandon_option:n { bibset } + unknown .code:n = \eb_msg_deprecated_option:n { bibset } } \cs_new_protected:Npn \eb_bibtex_natbib_set: diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls index c5de0e3a3b3..907e7c47600 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/01/25}{1.53} +\ProvidesExplClass{easybook}{2022/01/28}{1.54} {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 3dca6194f0b..352ec070d78 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/01/25}{1.53} +\ProvidesExplFile{eb-tcolorbox.cfg}{2022/01/28}{1.54} {Customization of tcolorbox for easybook} \cs_set_protected:Npn \addtotcbstyle #1#2 |