diff options
author | Karl Berry <karl@freefriends.org> | 2021-11-11 21:07:15 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2021-11-11 21:07:15 +0000 |
commit | d1d777d7771012eccfb3662c1eecb8e4bc88ba31 (patch) | |
tree | 711d7147bb0b6e56c4c61d6a5091107e746da460 /Master | |
parent | d7da7a06068de1b9604e772ea412e1aef75b763b (diff) |
easybook (11nov21)
git-svn-id: svn://tug.org/texlive/trunk@61027 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r-- | Master/texmf-dist/doc/latex/easybook/easybook.pdf | bin | 581927 -> 582938 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/easybook/easybook.tex | 10 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/easybook/easybook.dtx | 63 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/easybook/easybase.sty | 59 | ||||
-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, 73 insertions, 63 deletions
diff --git a/Master/texmf-dist/doc/latex/easybook/easybook.pdf b/Master/texmf-dist/doc/latex/easybook/easybook.pdf Binary files differindex 2c4528570b6..2871a82625c 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 e3a95b4568a..54806dc5a6d 100644 --- a/Master/texmf-dist/doc/latex/easybook/easybook.tex +++ b/Master/texmf-dist/doc/latex/easybook/easybook.tex @@ -20,7 +20,7 @@ name = easybook, color-scheme = blue, title = EASYBOOK 使用手册, - version = v1.40N, + version = v1.40O, date = 2021/11/10, authors = 瞿毅, info = 排版简体中文学位论文和书籍, @@ -414,14 +414,18 @@ \keybool{uppercase}\Default{true} 使用 \cs*{rightmark} 及 \cs*{leftmark} 标题标记命令获取标题内容时英文是否大写。 \kvsplit{brackets}{左括号,右括号}\Default{\Carg{(\black{,})}} - 设置行间公式编号标签的括号,以英文逗号分隔,分别代表左右括号。 + 设置行间公式编号标签的括号及格式,以英文逗号分隔,分别代表左右括号。\meta{左括号} 可以是带有一个参数的命令,用于接受编号和 \meta{右括号}。将标签括号设置为方括号,并使用无衬线字体: + \begin{ctexexam} + \newcommand{\bracketsf}[1]{\textsf{[#1}} + \style{brackets = {\bracketsf,]}} + \end{ctexexam} \kvsplit*{figurepath}{\meta{路径名1}\code{\}\{}\meta{路径名2}}\Default 设置插入图片的文件夹路径名,可以有多个路径名,每个路径包含在括号分隔,只有一个路径时需要包含在两层括号内。 \end{options} \subsubsection{连接符} \begin{options} - \keyval-{figure-connect}{图片连接符}\Module{style}\Default{\Carg{.}} + \keyval-{figure-connect}{图片连接符}\Default{\Carg{.}} 设置图片题注编号的连接符。 \keyval-{table-connect}{表格连接符}\Default{\Carg{.}} 设置表格题注编号的连接符。 diff --git a/Master/texmf-dist/source/latex/easybook/easybook.dtx b/Master/texmf-dist/source/latex/easybook/easybook.dtx index b5ca727b029..5ee1eadb0fe 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/10}{1.40N} +\ProvidesExplClass{easybook}{2021/11/10}{1.40O} {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/10}{1.40N} +\ProvidesExplPackage{easybase}{2021/11/10}{1.40O} {Typeset Chinese theses or books} \cs_generate_variant:Nn \dim_set:Nn { NV } @@ -453,19 +453,13 @@ class .initial:n = book, book .meta:n = { class = book }, article .meta:n = { class = article }, - unknown .code:n = \clist_gput_right:NV \g__eb_ctex_options_clist \CurrentOption } -\eb_clist_map_inline:nn - { - { protrusion = false } { microtype }, - { list = off } { bicaption }, - { many } { tcolorbox }, - { upint } { newtxmath }, - { svgnames } { xcolor } - } - { \PassOptionsToPackage #1 } +\PassOptionsToPackage{list = off}{bicaption} +\PassOptionsToPackage{many}{tcolorbox} +\PassOptionsToPackage{upint}{newtxmath} +\PassOptionsToPackage{svgnames}{xcolor} \ProcessKeysOptions{easybase} \PassOptionsToPackage{\g__eb_ctex_options_clist}{ctex} \@ifclassloaded{ctexbook}{} @@ -584,8 +578,10 @@ { \color{ctex@emph} \eb@tag@brackets@left - \ignorespaces #1\unskip\@@italiccorr + \bgroup + \ignorespaces{#1}\unskip\@@italiccorr \eb@tag@brackets@right + \egroup } } \ctex_define:nn { style } @@ -1091,7 +1087,7 @@ } } -\ProvideDocumentCommand{\super}{omo}{\textsuperscript{#3}} +\ProvideDocumentCommand{\super}{omo}{\textsuperscript{#2}} \providecommand{\spbset}{\use_none:n} \NewDocumentCommand{\eb@fnmate@super}{sm} { @@ -1140,7 +1136,9 @@ { \eb@fnmate@super* } { \tl_use:N \l__eb_fntext_before_tl - {\l__eb_fnmate_format_tl{\@thefnmark}} + \bgroup + \l__eb_fnmate_format_tl{\@thefnmark} + \egroup } \tl_use:N \l__eb_fntext_after_tl } @@ -1296,24 +1294,24 @@ { \normalsize\normalfont \titlerule*[#2]{\scalebox{#3}{#4}}#5 + \bgroup + \IfBooleanTF{#1} + {\thecontentspage} { - \IfBooleanTF{#1} - {\thecontentspage} - { - \bool_if:NTF \l__eb_toc_line_align_bool - { \contentspage } - { \thecontentspage } - } + \bool_if:NTF \l__eb_toc_line_align_bool + { \contentspage } + { \thecontentspage } } + \egroup } \cs_set_eq:NN \ctexnumberline \CTEXnumberline -\cs_new:Npn \eb@numberline { \protect\numberline } +\cs_new:Npn \p@numberline { \protect\numberline } \cs_set:Npn \CTEXnumberline #1 { \CTEXifname { \bool_if:NTF \eb@titletoc@hang@fix@bool - { \eb@numberline{\use:c { CTEXthe#1 }} } + { \p@numberline{\use:c { CTEXthe#1 }} } { \use:c { CTEXthe#1 } \tl_use:c { l__eb_toc_#1_after_tl } @@ -1368,8 +1366,10 @@ { \addcontentsline{#1}{#2} { - \bool_if:NT \eb@titletoc@hang@fix@bool { \eb@numberline } - {\prop_item:Nn \l__eb_list_label_name_prop {#2}{#3}}#4 + \bool_if:NT \eb@titletoc@hang@fix@bool { \p@numberline } + \bgroup + \prop_item:Nn \l__eb_list_label_name_prop {#2}{#3} + \egroup #4 } } \cs_set_eq:NN \eb@if@boolT \bool_if:NT @@ -1381,8 +1381,11 @@ { \addcontentsline{lol}{lstlisting} { - \eb@if@boolT\eb@titletoc@hang@fix@bool{\eb@numberline} - {\eb@toc@label@lstlisting{}}\lst@@caption + \eb@if@boolT\eb@titletoc@hang@fix@bool{\p@numberline} + \bgroup + \eb@toc@label@lstlisting{} + \egroup + \lst@@caption } } @@ -2069,7 +2072,7 @@ color .tl_set:N = \eb@tc@background@color, color .initial:n = DeepSkyBlue, number .tl_set:N = \eb@tc@list@number, - number .initial:n = { 1. }, + 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, @@ -2401,7 +2404,7 @@ } %</package> %<*tcolorbox> -\ProvidesExplFile{eb-tcolorbox.cfg}{2021/11/10}{1.40N} +\ProvidesExplFile{eb-tcolorbox.cfg}{2021/11/10}{1.40O} {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 996c1b13768..051caf597d8 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/10}{1.40N} +\ProvidesExplPackage{easybase}{2021/11/10}{1.40O} {Typeset Chinese theses or books} \cs_generate_variant:Nn \dim_set:Nn { NV } @@ -148,19 +148,13 @@ class .initial:n = book, book .meta:n = { class = book }, article .meta:n = { class = article }, - unknown .code:n = \clist_gput_right:NV \g__eb_ctex_options_clist \CurrentOption } -\eb_clist_map_inline:nn - { - { protrusion = false } { microtype }, - { list = off } { bicaption }, - { many } { tcolorbox }, - { upint } { newtxmath }, - { svgnames } { xcolor } - } - { \PassOptionsToPackage #1 } +\PassOptionsToPackage{list = off}{bicaption} +\PassOptionsToPackage{many}{tcolorbox} +\PassOptionsToPackage{upint}{newtxmath} +\PassOptionsToPackage{svgnames}{xcolor} \ProcessKeysOptions{easybase} \PassOptionsToPackage{\g__eb_ctex_options_clist}{ctex} \@ifclassloaded{ctexbook}{} @@ -279,8 +273,10 @@ { \color{ctex@emph} \eb@tag@brackets@left - \ignorespaces #1\unskip\@@italiccorr + \bgroup + \ignorespaces{#1}\unskip\@@italiccorr \eb@tag@brackets@right + \egroup } } \ctex_define:nn { style } @@ -786,7 +782,7 @@ } } -\ProvideDocumentCommand{\super}{omo}{\textsuperscript{#3}} +\ProvideDocumentCommand{\super}{omo}{\textsuperscript{#2}} \providecommand{\spbset}{\use_none:n} \NewDocumentCommand{\eb@fnmate@super}{sm} { @@ -835,7 +831,9 @@ { \eb@fnmate@super* } { \tl_use:N \l__eb_fntext_before_tl - {\l__eb_fnmate_format_tl{\@thefnmark}} + \bgroup + \l__eb_fnmate_format_tl{\@thefnmark} + \egroup } \tl_use:N \l__eb_fntext_after_tl } @@ -991,24 +989,24 @@ { \normalsize\normalfont \titlerule*[#2]{\scalebox{#3}{#4}}#5 + \bgroup + \IfBooleanTF{#1} + {\thecontentspage} { - \IfBooleanTF{#1} - {\thecontentspage} - { - \bool_if:NTF \l__eb_toc_line_align_bool - { \contentspage } - { \thecontentspage } - } + \bool_if:NTF \l__eb_toc_line_align_bool + { \contentspage } + { \thecontentspage } } + \egroup } \cs_set_eq:NN \ctexnumberline \CTEXnumberline -\cs_new:Npn \eb@numberline { \protect\numberline } +\cs_new:Npn \p@numberline { \protect\numberline } \cs_set:Npn \CTEXnumberline #1 { \CTEXifname { \bool_if:NTF \eb@titletoc@hang@fix@bool - { \eb@numberline{\use:c { CTEXthe#1 }} } + { \p@numberline{\use:c { CTEXthe#1 }} } { \use:c { CTEXthe#1 } \tl_use:c { l__eb_toc_#1_after_tl } @@ -1063,8 +1061,10 @@ { \addcontentsline{#1}{#2} { - \bool_if:NT \eb@titletoc@hang@fix@bool { \eb@numberline } - {\prop_item:Nn \l__eb_list_label_name_prop {#2}{#3}}#4 + \bool_if:NT \eb@titletoc@hang@fix@bool { \p@numberline } + \bgroup + \prop_item:Nn \l__eb_list_label_name_prop {#2}{#3} + \egroup #4 } } \cs_set_eq:NN \eb@if@boolT \bool_if:NT @@ -1076,8 +1076,11 @@ { \addcontentsline{lol}{lstlisting} { - \eb@if@boolT\eb@titletoc@hang@fix@bool{\eb@numberline} - {\eb@toc@label@lstlisting{}}\lst@@caption + \eb@if@boolT\eb@titletoc@hang@fix@bool{\p@numberline} + \bgroup + \eb@toc@label@lstlisting{} + \egroup + \lst@@caption } } @@ -1764,7 +1767,7 @@ color .tl_set:N = \eb@tc@background@color, color .initial:n = DeepSkyBlue, number .tl_set:N = \eb@tc@list@number, - number .initial:n = { 1. }, + 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, diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls index b2792344307..e8cc98fab60 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/10}{1.40N} +\ProvidesExplClass{easybook}{2021/11/10}{1.40O} {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 4cbaf15566d..d2f11e9b8b1 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/10}{1.40N} +\ProvidesExplFile{eb-tcolorbox.cfg}{2021/11/10}{1.40O} {Customization of tcolorbox for easybook} \tl_gset:Nn \eb@tc@line@skip { 0.5\baselineskip } |