diff options
author | Karl Berry <karl@freefriends.org> | 2024-02-13 23:48:13 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2024-02-13 23:48:13 +0000 |
commit | 083d59e4b247e408456d1833ad80bd724df72d43 (patch) | |
tree | 931fee20cb20b08841e295205d516955654a6c55 /Master | |
parent | 7bf6cb7522ed05d9e300c4a34b443c0a47ea57ed (diff) |
easybook (14feb24)
git-svn-id: svn://tug.org/texlive/trunk@69839 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r-- | Master/texmf-dist/doc/latex/easybook/easybook.pdf | bin | 593590 -> 594429 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/easybook/easybook.tex | 14 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/easybook/easybook.dtx | 64 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/easybook/easybase.sty | 60 | ||||
-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, 69 insertions, 73 deletions
diff --git a/Master/texmf-dist/doc/latex/easybook/easybook.pdf b/Master/texmf-dist/doc/latex/easybook/easybook.pdf Binary files differindex 06127742ca4..1cb2868c87f 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 0d4867eaa7d..a1ddad3ca6c 100644 --- a/Master/texmf-dist/doc/latex/easybook/easybook.tex +++ b/Master/texmf-dist/doc/latex/easybook/easybook.tex @@ -23,8 +23,8 @@ name = easybook, color-scheme = blue, title = EASYBOOK使用手册, - version = v2024ab, - date = 2024/02/11, + version = v2024ac, + date = 2024/02/12, authors = 瞿毅, info = 简便地排版中文学位论文或书籍, email = toquyi@163.com, @@ -618,10 +618,10 @@ \begin{options}\noitemsep \keyval{headruleskip}{页眉线间距}\Default*{0pt} \keyval{footruleskip}{页脚线间距}\Default*{3.5pt} - \kvsplit{hdivide}{左边距,页面文本宽度,右边距}\default{} + \kvsplit{hdivide}{左边距,版心文本宽度,右边距}\default{} \kvsplit{hmargin}{左边距,右边距}\default{} - \keyval{textheight}{页面文本高度}\default{} - \keychoice{nofoot}{true,\fbox{false}} + \keyval{textheight}{版心文本高度}\default{} + \keychoice{nofoot}{true,\fbox{false}}\default{} \begin{ctexexam} \ebgeoset { @@ -726,7 +726,7 @@ \begin{commands}\noitemsep \command{SetFntSymbsList}[\marg{符号表名}\marg{符号数量}\marg{符号列表}]\default{} \command{UseFntSymbsList}[\marg{符号表名}]\newtag[Chg]% - 这两个命令用于在脚注短编号标记为 \code{s} 自定义符号型时设置符号列表。\cs{SetFntSymbsList} 命令用于定义名为 \meta{符号表名} 的符号列表,\cs{UseFntSymbsList} 命令用于启用已定义的符号列表。默认的脚注符号列表是空的,注意使用符号型脚注时计数器 \code{footnote} 的值仍然是递增的,以及定义新列表时 \meta{符号列表} 的写法和命令顺序: + 这两个命令用于在脚注短编号标记为 \code{s} 自定义符号型时设置符号列表。\cs{SetFntSymbsList} 命令用于定义名为 \meta{符号表名} 的符号列表,\cs{UseFntSymbsList} 命令用于启用已定义的符号列表。默认的脚注符号列表是空的,注意使用符号型标记的脚注时计数器 \code{footnote} 的值仍然递增,以及定义新列表时 \meta{符号列表} 的写法和命令顺序: \begin{ctexexam} \SetFntSymbsList{fancy}{2}{{1}{*}{2}{\P}} \UseFntSymbsList{fancy} @@ -1352,7 +1352,7 @@ \shortversion{v = 1.638,date = 2022/03/04,changes = 增加目录条目样式选项注册命令 \cs{RegisterTocName}。} \shortversion{v = 1.644,date = 2022/03/10,changes = 增加浮动环境目录声明命令 \cs{DeclareFloatList} 配合 \pkg*{caption} 宏包。} \shortversion{v = 1.682,date = 2022/05/01,changes = 将迷你页判断命令 \cs{notminipage} 改为被保护命令兼容 \pkg*{circledtext} 宏包。} - \begin{version}[v = 2024ab,date = 2024/02/11,simple] + \begin{version}[v = 2024ac,date = 2024/02/12,simple] \item 核对依赖宏包的更新改动,优化使用手册的内容细节。 \item 修复图表等浮动环境题注目录中条目标签编号的计数器值显示错误问题。 \item 修复附录命令 \cs{appendix} 的可选参数设置英文目录中条目名字和编号失效的问题。 diff --git a/Master/texmf-dist/source/latex/easybook/easybook.dtx b/Master/texmf-dist/source/latex/easybook/easybook.dtx index 8124d21badb..16f5b792c01 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}[2021/11/15] \RequirePackage{l3keys2e} -\ProvidesExplClass{easybook}{2024/02/11}{2024ab} +\ProvidesExplClass{easybook}{2024/02/12}{2024ac} {Easily typesetting Chinese theses or books} \bool_set_false:N \l__eb_compile_draft_bool @@ -297,7 +297,7 @@ %<*package> \NeedsTeXFormat{LaTeX2e}[2021/11/15] \RequirePackage{l3keys2e,etoolbox} -\ProvidesExplPackage{easybase}{2024/02/11}{2024ab} +\ProvidesExplPackage{easybase}{2024/02/12}{2024ac} {Easily typesetting Chinese theses or books} \cs_generate_variant:Nn \dim_set:Nn { NV } @@ -334,21 +334,6 @@ } \cs_new_protected:Npn \eb_at_end_preamble:n { \BeforeBeginEnvironment{document} } -\cs_new_protected:Npn \eb_match_load_package:n #1 - { - \regex_match:nnTF { \[ } {#1} - { - \seq_set_split:Nnn \l_tmpa_seq { [ } {#1} - \seq_pop_left:NN \l_tmpa_seq \l_tmpa_tl - \seq_pop_right:NN \l_tmpa_seq \l_tmpb_tl - \IfFileExists{\l_tmpa_tl.sty} - { - \exp_last_unbraced:Nx \RequirePackage - { [\l_tmpb_tl }{\l_tmpa_tl} - }{} - } - { \IfFileExists{#1.sty}{\RequirePackage{#1}}{} } - } \cs_new_protected:Npn \eb_if_package_loaded:nnF #1#2#3 { \IfPackageLoadedTF{#1} @@ -376,13 +361,26 @@ { \eb@usepackage@save{##1}[#3] } } } -\NewDocumentCommand{\LoadPackage}{O{}m} +\cs_new_protected:Npn \eb_match_load_package:n #1 { - \seq_set_split:Nnn \l_tmpb_seq { + } {#2} - \int_compare:nNnT { \seq_count:N \l_tmpb_seq } = { 1 } - { \PassOptionsToPackage{#1}{#2} } - \seq_map_function:NN - \l_tmpb_seq \eb_match_load_package:n + \regex_match:nnTF { \[.*\] } {#1} + { \eb@case@load@package #1 } + { \eb@case@load@package{#1} } + } +\NewDocumentCommand{\eb@case@load@package}{omO{}} + { + \IfNoValueTF{#1} + {\IfFileExists{#2.sty}{\RequirePackage{#2}[#3]}{}} + {\IfFileExists{#2.sty}{\RequirePackage[#1]{#2}[#3]}{}} + } +\cs_new_protected:Npn \LoadPackage #1 + { + \int_compare:nTF { \clist_count:n {#1} <= 1 } + { \RequirePackage } + { + \eb_seq_map_inline:nn {#1} + { \eb_match_load_package:n {##1} } + } } \bool_set_true:N \l__eb_class_mode_book_bool @@ -485,14 +483,14 @@ \LoadPackage { - spbmark[text]+ - ulem[normalem]+ - enumitem[shortlabels,inline]+ - chemformula+siunitx+pifont+ - geometry+marginnote+ - pdfpages+multicol+ - fancyhdr+titletoc+caption+ - tabularray+ + [text]{spbmark}, + [normalem]{ulem}, + [{shortlabels,inline}]{enumitem}, + chemformula,siunitx,pifont, + geometry,marginnote, + pdfpages,multicol, + fancyhdr,titletoc,caption, + tabularray, listings } \cs_new_protected:Npn \eb_package_date_check:nn #1#2 @@ -605,7 +603,7 @@ {\tl_set:cn { eb@mark@#1@label } {##1##2}} \cs_new_protected:cpn { eb_mark_#1_name_parse:n } ##1 { - \regex_match:nnTF { \[ } {##1} + \regex_match:nnTF { \[.*\] } {##1} { \use:c { eb@mark@#1@label@layout }##1 } { \use:c { eb@mark@#1@label@layout }{##1} } } @@ -2343,7 +2341,7 @@ } %</package> %<*tcolorbox> -\ProvidesExplFile{eb-tcolorbox.cfg}{2024/02/11}{2024ab} +\ProvidesExplFile{eb-tcolorbox.cfg}{2024/02/12}{2024ac} {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 153dad9cb12..03e40595877 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}[2021/11/15] \RequirePackage{l3keys2e,etoolbox} -\ProvidesExplPackage{easybase}{2024/02/11}{2024ab} +\ProvidesExplPackage{easybase}{2024/02/12}{2024ac} {Easily typesetting Chinese theses or books} \cs_generate_variant:Nn \dim_set:Nn { NV } @@ -57,21 +57,6 @@ } \cs_new_protected:Npn \eb_at_end_preamble:n { \BeforeBeginEnvironment{document} } -\cs_new_protected:Npn \eb_match_load_package:n #1 - { - \regex_match:nnTF { \[ } {#1} - { - \seq_set_split:Nnn \l_tmpa_seq { [ } {#1} - \seq_pop_left:NN \l_tmpa_seq \l_tmpa_tl - \seq_pop_right:NN \l_tmpa_seq \l_tmpb_tl - \IfFileExists{\l_tmpa_tl.sty} - { - \exp_last_unbraced:Nx \RequirePackage - { [\l_tmpb_tl }{\l_tmpa_tl} - }{} - } - { \IfFileExists{#1.sty}{\RequirePackage{#1}}{} } - } \cs_new_protected:Npn \eb_if_package_loaded:nnF #1#2#3 { \IfPackageLoadedTF{#1} @@ -99,13 +84,26 @@ { \eb@usepackage@save{##1}[#3] } } } -\NewDocumentCommand{\LoadPackage}{O{}m} +\cs_new_protected:Npn \eb_match_load_package:n #1 { - \seq_set_split:Nnn \l_tmpb_seq { + } {#2} - \int_compare:nNnT { \seq_count:N \l_tmpb_seq } = { 1 } - { \PassOptionsToPackage{#1}{#2} } - \seq_map_function:NN - \l_tmpb_seq \eb_match_load_package:n + \regex_match:nnTF { \[.*\] } {#1} + { \eb@case@load@package #1 } + { \eb@case@load@package{#1} } + } +\NewDocumentCommand{\eb@case@load@package}{omO{}} + { + \IfNoValueTF{#1} + {\IfFileExists{#2.sty}{\RequirePackage{#2}[#3]}{}} + {\IfFileExists{#2.sty}{\RequirePackage[#1]{#2}[#3]}{}} + } +\cs_new_protected:Npn \LoadPackage #1 + { + \int_compare:nTF { \clist_count:n {#1} <= 1 } + { \RequirePackage } + { + \eb_seq_map_inline:nn {#1} + { \eb_match_load_package:n {##1} } + } } \bool_set_true:N \l__eb_class_mode_book_bool @@ -208,14 +206,14 @@ \LoadPackage { - spbmark[text]+ - ulem[normalem]+ - enumitem[shortlabels,inline]+ - chemformula+siunitx+pifont+ - geometry+marginnote+ - pdfpages+multicol+ - fancyhdr+titletoc+caption+ - tabularray+ + [text]{spbmark}, + [normalem]{ulem}, + [{shortlabels,inline}]{enumitem}, + chemformula,siunitx,pifont, + geometry,marginnote, + pdfpages,multicol, + fancyhdr,titletoc,caption, + tabularray, listings } \cs_new_protected:Npn \eb_package_date_check:nn #1#2 @@ -328,7 +326,7 @@ {\tl_set:cn { eb@mark@#1@label } {##1##2}} \cs_new_protected:cpn { eb_mark_#1_name_parse:n } ##1 { - \regex_match:nnTF { \[ } {##1} + \regex_match:nnTF { \[.*\] } {##1} { \use:c { eb@mark@#1@label@layout }##1 } { \use:c { eb@mark@#1@label@layout }{##1} } } diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls index c5502a18764..3b9fdf57a60 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}[2021/11/15] \RequirePackage{l3keys2e} -\ProvidesExplClass{easybook}{2024/02/11}{2024ab} +\ProvidesExplClass{easybook}{2024/02/12}{2024ac} {Easily typesetting 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 05f01e36255..36ff2218e14 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}{2024/02/11}{2024ab} +\ProvidesExplFile{eb-tcolorbox.cfg}{2024/02/12}{2024ac} {Customization of tcolorbox for easybook} \cs_set_protected:Npn \addtotcbstyle #1#2 |