summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/easybook
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2021-09-30 03:01:06 +0000
committerNorbert Preining <norbert@preining.info>2021-09-30 03:01:06 +0000
commitc0e66330261a0098e8041d4cc1428666ef598c30 (patch)
tree6048e9d4cf052ff3dc32b3ffd1081ef3c95bc42c /macros/latex/contrib/easybook
parent0396814223158484c2f424d382bcd670de158d82 (diff)
CTAN sync 202109300301
Diffstat (limited to 'macros/latex/contrib/easybook')
-rw-r--r--macros/latex/contrib/easybook/easybook.dtx8
-rw-r--r--macros/latex/contrib/easybook/easybook.pdfbin577949 -> 578327 bytes
-rw-r--r--macros/latex/contrib/easybook/easybook.tex42
3 files changed, 28 insertions, 22 deletions
diff --git a/macros/latex/contrib/easybook/easybook.dtx b/macros/latex/contrib/easybook/easybook.dtx
index 2a841ac896..7a2475dd58 100644
--- a/macros/latex/contrib/easybook/easybook.dtx
+++ b/macros/latex/contrib/easybook/easybook.dtx
@@ -15,7 +15,7 @@
%<*class>
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2021/09/28}{1.3e}
+\ProvidesExplClass{easybook}{2021/09/28}{1.3F}
{Typeset Chinese theses or books}
\bool_set_false:N \l__eb_compile_draft_bool
@@ -297,7 +297,7 @@
%<*package>
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2021/09/28}{1.3e}
+\ProvidesExplPackage{easybase}{2021/09/28}{1.3F}
{Typeset Chinese theses or books}
\cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -1771,7 +1771,7 @@
\tl_gset:Nn \dbltopfraction { 0.9 }
\tl_gset:Nn \dblfloatpagefraction { 0.9 }
}
-\dim_zero:N \mathindent
+\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 }
@@ -2390,7 +2390,7 @@
}
%</package>
%<*tcolorbox>
-\ProvidesExplFile{eb-tcolorbox.cfg}{2021/09/28}{1.3e}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2021/09/28}{1.3F}
{Customization of tcolorbox for easybook}
\tl_gset:Nn \eb@tc@line@skip { 0.5\baselineskip }
diff --git a/macros/latex/contrib/easybook/easybook.pdf b/macros/latex/contrib/easybook/easybook.pdf
index 9a4997299c..67e4adfe07 100644
--- a/macros/latex/contrib/easybook/easybook.pdf
+++ b/macros/latex/contrib/easybook/easybook.pdf
Binary files differ
diff --git a/macros/latex/contrib/easybook/easybook.tex b/macros/latex/contrib/easybook/easybook.tex
index 0c202a3674..61c180ba7a 100644
--- a/macros/latex/contrib/easybook/easybook.tex
+++ b/macros/latex/contrib/easybook/easybook.tex
@@ -3,8 +3,8 @@
\usepackage[fontset = fandol]{ctex}
\usepackage
{
- booktabs,enumitem,newtxmath,indentfirst,
- fancyvrb,geometry,colortbl,hologo,pifont
+ enumitem,newtxmath,indentfirst,tabularray,
+ fancyvrb,geometry,hologo,pifont
}
\colorlet{cnltxred}{violet}
\setcnltx
@@ -12,7 +12,7 @@
name = easybook,
color-scheme = blue,
title = EASYBOOK 使用手册,
- version = v1.3e,
+ version = v1.3F,
date = 2021/09/28,
authors = 瞿毅,
info = 排版简体中文学位论文和书籍,
@@ -37,7 +37,6 @@
\geometry{margin = 1in,marginparwidth = 0.65in}
\setlist{nosep,labelindent = \parindent,leftmargin = *,labelsep = 0.5em}
\setlist[itemize,1]{label = \small\color{cnltxblue}\textbullet}
-\arrayrulecolor{cnltxblue}
\setcounter{tocdepth}{2}
\ExplSyntaxOn\makeatletter
@@ -204,17 +203,19 @@
\keychoice{font}{noto,garamond,times,libertine,palatino,auto}\Default{auto}
预置的英文字体相关配置方案如下表所示,这些字体已经包含在了 \TeX Live 发行版中,所以通常不需要再专门安装。如果您想使用其他英文字体,可以使用 \pkg*{fontspec} 宏包的相关命令进行设置。
\begin{center}
- \begin{tabular}{cccc}
- \toprule
+ \begin{tblr}
+ {
+ colspec = cccc,
+ hline{1,7} = {1pt,cnltxblue},
+ hline{2} = {0.6pt,cnltxblue}
+ }
& \textsf{正文字体} & \textsf{无衬线字体} & \textsf{等宽字体} \\
- \midrule[0.6pt]
\code{noto} & Noto Serif & Noto Sans & Noto Sans Mono \\
\code{garamond} & EB Garamond & Libertinus Sans & LM Mono \\
\code{palatino} & TG Pagella & Libertinus Sans & LM Mono \\
\code{libertine} & TG Pagella & Libertinus Sans & LM Mono \\
\code{times} & XITS & TG Heros & TG Cursor \\
- \bottomrule
- \end{tabular}
+ \end{tblr}
\end{center}
\end{options}
@@ -318,15 +319,17 @@
\command*{ctexset}[\marg{键值列表}]
\cls*{easybook} 扩展了 C\TeX 宏集 \hologo{LaTeX3} 风格键值的通用控制命令 \cs*{ctexset},接口选项同样可用它设置, 原有的 \meta{键值列表} 仍然可用。本文档类目前有 9 个模块用于实现常规的排版功能,如下表所示,它们既是统一接口 \cs*{ctexset} 的路径,也是相关模块的接口命令名:
\begin{center}
- \begin{tabular}{*{5}{c}}
- \toprule
+ \begin{tblr}
+ {
+ colspec = *{5}{c},
+ hline{1,5} = {1pt,cnltxblue},
+ hline{3} = {0.6pt,cnltxblue}
+ }
\hyperref[subsec:style]{风格} & \hyperref[subsec:other font]{其它字体} & \hyperref[subsec:spacing]{行距} & \hyperref[subsec:hyperlinks]{超链接} & \hyperref[subsec:reference]{参考文献} \\
\module*{style} & \module*{subfont} & \module*{spread} & \module*{refset} & \module*{bibset} \\
- \midrule[0.6pt]
\hyperref[subsec:theorem of style]{定理样式} & \hyperref[subsec:page margins]{页面尺寸} & \hyperref[subsec:header and footer]{页眉页脚} & \hyperref[subsec:catalog style]{目录样式} & \\
\module*{thmset} & \module*{geoset} & \module*{hdrset} & \module*{tocset} & \\
- \bottomrule
- \end{tabular}
+ \end{tblr}
\end{center}
例如使用下面小节 \ref{subsec:style} 介绍的风格 \module*{style} 模块,路径名与所属下级选项之间可以 \code{/} 或 \code{=} 号分开,符号后不能有空格或者换行:
@@ -866,12 +869,15 @@
\environment{proof}
这些是预置的定理环境,可使用选项 \module*{thmset/}\option{thmbox} 为它们添加盒子边框,其中注与证明环境不编号,证明末尾会自动添加证明结束符,声明新的定理环境或更改定理盒子样式见小节 \ref{subsec:theorem of style}。环境名与之对应的定理名如下:
\begin{center}
- \begin{tabular}{*{8}{c}}
- \toprule
+ \begin{tblr}
+ {
+ colspec = *{8}{c},
+ hline{1,3} = {1pt,cnltxblue},
+ hline{2} = {0.6pt,cnltxblue}
+ }
\env{theorem} & \env{definition} & \env{lemma} & \env{corollary} & \env{proposition} & \env{example} & \env{remark} & \env{proof} \\
定理 & 定义 & 引理 & 推论& 性质 & 例 & 注 & 证明 \\
- \bottomrule
- \end{tabular}
+ \end{tblr}
\end{center}
\end{environments}