diff options
author | Karl Berry <karl@freefriends.org> | 2022-01-16 21:16:37 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2022-01-16 21:16:37 +0000 |
commit | b34dcff9ba90395c74cefedb4106a48221c772f4 (patch) | |
tree | 883101284e7ebdd4b2a29e24ee61730e8dae228b | |
parent | a71f46f17544910a1e3b1d02a905d6a19c88e27d (diff) |
easybook (16jan22)
git-svn-id: svn://tug.org/texlive/trunk@61623 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r-- | Master/texmf-dist/doc/latex/easybook/easybook.pdf | bin | 594993 -> 595578 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/easybook/easybook.tex | 32 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/easybook/easybook.dtx | 55 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/easybook/easybase.sty | 51 | ||||
-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, 83 insertions, 59 deletions
diff --git a/Master/texmf-dist/doc/latex/easybook/easybook.pdf b/Master/texmf-dist/doc/latex/easybook/easybook.pdf Binary files differindex 421d98606bc..bcb1d7e9748 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 1669a6215ac..39b0334c40b 100644 --- a/Master/texmf-dist/doc/latex/easybook/easybook.tex +++ b/Master/texmf-dist/doc/latex/easybook/easybook.tex @@ -21,7 +21,7 @@ name = easybook, color-scheme = blue, title = EASYBOOK 使用手册, - version = v1.46B, + version = v1.46C, date = 2022/01/15, authors = 瞿毅, info = 排版简体中文学位论文和书籍, @@ -418,7 +418,7 @@ uppercase = false } } - \ebstyle{connect-figure = {-}} + \ebstyle{hyphen-figure = {-}} \end{ctexexam} 文档类有三种选项:布尔型 \boolkey*{key},选项的值为真 \code{true} 或假 \code{false},如果不指定默认为真。键值型 \key*-{key}{value} 需要为选项指定值,后面 \code{=} 号不能省略。选择型 \choicekey*{key}{one,\default{two},three} 根据提供的可选值进行设定。 @@ -453,18 +453,18 @@ 设置插入图片的文件夹路径名,可以有多个路径名,每个路径包含在括号分隔,只有一个路径时需要包含在两层括号内。 \end{options} -\subsubsection{连接符} +\subsubsection{连字符} \begin{options} - \keyval-{connect-figure}{图片连接符}\Default{\Carg{.}} - 设置图片题注编号的连接符。 - \keyval-{connect-table}{表格连接符}\Default{\Carg{.}} - 设置表格题注编号的连接符。 - \keyval-{connect-listing}{代码连接符}\Default{\Carg{.}} - 设置代码题注编号的连接符。 - \keyval-{connect-equation}{公式连接符}\Default{\Carg{.}} - 设置公式题注编号的连接符。 - \keyval-{connect-every}{连接符}\Default{\Carg{.}} - 统一设置上述所有编号的连接符。 + \keyval-{hyphen-figure}{图片连字符}\Default{\Carg{.}} + 设置图片题注编号的连字符。 + \keyval-{hyphen-table}{表格连字符}\Default{\Carg{.}} + 设置表格题注编号的连字符。 + \keyval-{hyphen-listing}{代码连字符}\Default{\Carg{.}} + 设置代码题注编号的连字符。 + \keyval-{hyphen-equation}{公式连字符}\Default{\Carg{.}} + 设置公式题注编号的连字符。 + \keyval-{hyphen-every}{连字符}\Default{\Carg{.}} + 统一设置上述所有编号的连字符。 \end{options} \subsubsection{上下标全局设置} @@ -689,7 +689,7 @@ \label{subsec:page margins} 模块 \module*{geoset} 会将除了前两个附加的选项交给页面尺寸宏包 \pkg*{geometry} 处理,并且支持它的键值列表,预置的页面尺寸与 \cls*{Word} 的默认值接近。下面列举几种代表性选项,其它选项可查阅宏包帮助文档。当在此设置纸张规格时,会覆盖文类选项 \option{paper} 的设置。 \begin{options}\noitemsep - \keyval-{headruleskip}{页眉线间距}\Module{geoset}\Default*{1.5pt} + \keyval-{headruleskip}{页眉线间距}\Module{geoset}\Default*{0pt} \keyval-{footruleskip}{页脚线间距}\Default*{3.5pt} \kvsplit*{hdivide}{左边距,页面文本宽度,右边距} \kvsplit*{hmargin}{左边距,右边距} @@ -1161,10 +1161,12 @@ \begin{commands} \command{labelformat}[\marg{计数器}\marg{标签引用格式}] 标签格式命令 \cs{labelformat} 可以设置标签引用格式,\meta{标签引用格式} 中 \code{\#1} 代表 \cs*{the}\meta{计数器},可以设置引用序号的前缀和后缀。也可以使用 \pkg*{cleveref} 宏包提供更强大的标签功能。 + \command{AtEndPreamble}[\marg{钩子代码}] + 导言区末尾的钩子命令。为了保证兼容性 \pkg*{hyperref} 宏包被设计在导言区末尾载入,一些情况下需要合适的钩子在 \pkg*{hyperref} 后方执行 \meta{钩子代码},例如载入 \pkg*{cleveref} 宏包。 \begin{ctexexam} \labelformat{chapter}{第 #1 章} \labelformat{chapter}{第\thechapter 章} - \AtBeginDocument{\usepackage{cleveref}} + \AtEndPreamble{\usepackage{cleveref}} \end{ctexexam} \end{commands} diff --git a/Master/texmf-dist/source/latex/easybook/easybook.dtx b/Master/texmf-dist/source/latex/easybook/easybook.dtx index bd76ebd4756..ec8cfcee744 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/15}{1.46B} +\ProvidesExplClass{easybook}{2022/01/15}{1.46C} {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/15}{1.46B} +\ProvidesExplPackage{easybase}{2022/01/15}{1.46C} {Typeset Chinese theses or books} \cs_generate_variant:Nn \dim_set:Nn { NV } @@ -590,7 +590,7 @@ \ctex_define:nn { geoset } { headruleskip .tl_set:N = \headruleskip, - headruleskip .initial:n = 1.5pt, + headruleskip .initial:n = 0pt, footruleskip .tl_set:N = \footruleskip, footruleskip .initial:n = 3.5pt, unknown .code:n = @@ -1477,16 +1477,16 @@ \ctex_define:nn { style } { - connect-figure .tl_set:N = \l__eb_connect_figure_tl, - connect-table .tl_set:N = \l__eb_connect_table_tl, - connect-listing .tl_set:N = \l__eb_connect_lstlisting_tl, - connect-equation .tl_set:N = \l__eb_connect_equation_tl, - connect-every .meta:n = + hyphen-figure .tl_set:N = \l__eb_hyphen_figure_tl, + hyphen-table .tl_set:N = \l__eb_hyphen_table_tl, + hyphen-listing .tl_set:N = \l__eb_hyphen_lstlisting_tl, + hyphen-equation .tl_set:N = \l__eb_hyphen_equation_tl, + hyphen-every .meta:n = { - connect-figure = #1,connect-table = #1, - connect-listing = #1,connect-equation = #1 + hyphen-figure = #1,hyphen-table = #1, + hyphen-listing = #1,hyphen-equation = #1 }, - connect-every .initial:n = { . }, + hyphen-every .initial:n = { . }, unknown .code:n = \eb_msg_abandon_option:n { style } } \eb_seq_map_inline:nn @@ -1497,7 +1497,7 @@ \int_compare:nNnT { \c@chapter } > { 0 } { \thechapter - \tl_use:c { l__eb_connect_#1_tl } + \tl_use:c { l__eb_hyphen_#1_tl } } \int_to_arabic:v { c@#1 } } @@ -2182,6 +2182,7 @@ } \eb_at_end_preamble:n { + \providecommand{\bibname}{\refname} \clist_if_empty:NF \l__eb_bib_datafile_clist { \bool_if:NTF \l__eb_backend_bibtex_bool @@ -2371,11 +2372,25 @@ \exp_args:NV \hypersetup \l__eb_hyperref_clist } -\labelformat{part}{\CTEXthepart} -\labelformat{chapter}{\CTEXthechapter} -\labelformat{figure}{\figurename~#1} -\labelformat{table}{\tablename~#1} -\providecommand{\bibname}{\refname} +\AtBeginDocument + { + \@ifpackageloaded{cleveref}{} + { + \labelformat{part}{\CTEXthepart} + \labelformat{chapter}{\CTEXthechapter} + \labelformat{figure}{\figurename~#1} + \labelformat{table}{\tablename~#1} + \tl_if_eq:NnTF \l__ctex_scheme_tl { chinese } + { + \labelformat{section}{节 #1} + \labelformat{subsection}{小节 #1} + } + { + \labelformat{section}{Section~#1} + \labelformat{subsection}{Subsection~#1} + } + } + } \ctex_define:n { lstlistlistingname .tl_set:N = \listlstlistingname, @@ -2393,8 +2408,6 @@ lstlistlistingname = 代码索引, lstlistingname = 代码 } - \labelformat{section}{节 #1} - \labelformat{subsection}{小节 #1} } { \keys_set_known:nn { ctex } @@ -2403,12 +2416,10 @@ lstlistlistingname = List~of~Codes, lstlistingname = Code } - \labelformat{section}{Section~#1} - \labelformat{subsection}{Subsection~#1} } %</package> %<*tcolorbox> -\ProvidesExplFile{eb-tcolorbox.cfg}{2022/01/15}{1.46B} +\ProvidesExplFile{eb-tcolorbox.cfg}{2022/01/15}{1.46C} {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 b3470a748c0..2267065684c 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/15}{1.46B} +\ProvidesExplPackage{easybase}{2022/01/15}{1.46C} {Typeset Chinese theses or books} \cs_generate_variant:Nn \dim_set:Nn { NV } @@ -305,7 +305,7 @@ \ctex_define:nn { geoset } { headruleskip .tl_set:N = \headruleskip, - headruleskip .initial:n = 1.5pt, + headruleskip .initial:n = 0pt, footruleskip .tl_set:N = \footruleskip, footruleskip .initial:n = 3.5pt, unknown .code:n = @@ -1192,16 +1192,16 @@ \ctex_define:nn { style } { - connect-figure .tl_set:N = \l__eb_connect_figure_tl, - connect-table .tl_set:N = \l__eb_connect_table_tl, - connect-listing .tl_set:N = \l__eb_connect_lstlisting_tl, - connect-equation .tl_set:N = \l__eb_connect_equation_tl, - connect-every .meta:n = + hyphen-figure .tl_set:N = \l__eb_hyphen_figure_tl, + hyphen-table .tl_set:N = \l__eb_hyphen_table_tl, + hyphen-listing .tl_set:N = \l__eb_hyphen_lstlisting_tl, + hyphen-equation .tl_set:N = \l__eb_hyphen_equation_tl, + hyphen-every .meta:n = { - connect-figure = #1,connect-table = #1, - connect-listing = #1,connect-equation = #1 + hyphen-figure = #1,hyphen-table = #1, + hyphen-listing = #1,hyphen-equation = #1 }, - connect-every .initial:n = { . }, + hyphen-every .initial:n = { . }, unknown .code:n = \eb_msg_abandon_option:n { style } } \eb_seq_map_inline:nn @@ -1212,7 +1212,7 @@ \int_compare:nNnT { \c@chapter } > { 0 } { \thechapter - \tl_use:c { l__eb_connect_#1_tl } + \tl_use:c { l__eb_hyphen_#1_tl } } \int_to_arabic:v { c@#1 } } @@ -1897,6 +1897,7 @@ } \eb_at_end_preamble:n { + \providecommand{\bibname}{\refname} \clist_if_empty:NF \l__eb_bib_datafile_clist { \bool_if:NTF \l__eb_backend_bibtex_bool @@ -2086,11 +2087,25 @@ \exp_args:NV \hypersetup \l__eb_hyperref_clist } -\labelformat{part}{\CTEXthepart} -\labelformat{chapter}{\CTEXthechapter} -\labelformat{figure}{\figurename~#1} -\labelformat{table}{\tablename~#1} -\providecommand{\bibname}{\refname} +\AtBeginDocument + { + \@ifpackageloaded{cleveref}{} + { + \labelformat{part}{\CTEXthepart} + \labelformat{chapter}{\CTEXthechapter} + \labelformat{figure}{\figurename~#1} + \labelformat{table}{\tablename~#1} + \tl_if_eq:NnTF \l__ctex_scheme_tl { chinese } + { + \labelformat{section}{节 #1} + \labelformat{subsection}{小节 #1} + } + { + \labelformat{section}{Section~#1} + \labelformat{subsection}{Subsection~#1} + } + } + } \ctex_define:n { lstlistlistingname .tl_set:N = \listlstlistingname, @@ -2108,8 +2123,6 @@ lstlistlistingname = 代码索引, lstlistingname = 代码 } - \labelformat{section}{节 #1} - \labelformat{subsection}{小节 #1} } { \keys_set_known:nn { ctex } @@ -2118,8 +2131,6 @@ lstlistlistingname = List~of~Codes, lstlistingname = Code } - \labelformat{section}{Section~#1} - \labelformat{subsection}{Subsection~#1} } \endinput %% diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls index e1ff1a41550..81721cf89be 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/15}{1.46B} +\ProvidesExplClass{easybook}{2022/01/15}{1.46C} {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 8fa5ee3cf4b..655c82a915a 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/15}{1.46B} +\ProvidesExplFile{eb-tcolorbox.cfg}{2022/01/15}{1.46C} {Customization of tcolorbox for easybook} \cs_set_protected:Npn \addtotcbstyle #1#2 |