From 15c5ddf3315f167a546a5be47558e571e33a8fb5 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 20 Feb 2021 22:14:19 +0000 Subject: easybook (20feb21) git-svn-id: svn://tug.org/texlive/trunk@57813 c570f23f-e606-0410-a88d-b1316a301751 --- .../doc/latex/easybook/easybook-demo.pdf | Bin 297626 -> 299161 bytes .../doc/latex/easybook/easybook-demo.tex | 8 ++++---- Master/texmf-dist/doc/latex/easybook/easybook.pdf | Bin 226728 -> 231349 bytes Master/texmf-dist/doc/latex/easybook/easybook.tex | 13 +++++++++++-- Master/texmf-dist/tex/latex/easybook/easybook.cls | 14 ++++++++++---- 5 files changed, 25 insertions(+), 10 deletions(-) diff --git a/Master/texmf-dist/doc/latex/easybook/easybook-demo.pdf b/Master/texmf-dist/doc/latex/easybook/easybook-demo.pdf index 8e0b1215f23..4f348762ada 100644 Binary files a/Master/texmf-dist/doc/latex/easybook/easybook-demo.pdf and b/Master/texmf-dist/doc/latex/easybook/easybook-demo.pdf differ diff --git a/Master/texmf-dist/doc/latex/easybook/easybook-demo.tex b/Master/texmf-dist/doc/latex/easybook/easybook-demo.tex index e4a64adbb88..7feeac246f5 100644 --- a/Master/texmf-dist/doc/latex/easybook/easybook-demo.tex +++ b/Master/texmf-dist/doc/latex/easybook/easybook-demo.tex @@ -2,7 +2,7 @@ zihao = -4, font = noto, paper = a4paper, - openany + openany, ]{easybook} \ctexset @@ -95,15 +95,15 @@ \github~\url{https://github.com/texl3/easybook} \\ \edge~\url{https://latexstudio.net} } - \date{2021/02/13\hskip\ccwd\relax v1.23d} + \date{2021/02/20\hskip\ccwd\relax v1.23e} } \begin{document} -\frontmatter +\frontmatter[roman] \maketitle \tableofcontents -\mainmatter +\mainmatter* \part{使用示例} \include{pages/chapter1} \include{pages/chapter2} diff --git a/Master/texmf-dist/doc/latex/easybook/easybook.pdf b/Master/texmf-dist/doc/latex/easybook/easybook.pdf index f53a65b20f0..fd7a95f3bcf 100644 Binary files a/Master/texmf-dist/doc/latex/easybook/easybook.pdf and b/Master/texmf-dist/doc/latex/easybook/easybook.pdf differ diff --git a/Master/texmf-dist/doc/latex/easybook/easybook.tex b/Master/texmf-dist/doc/latex/easybook/easybook.tex index aaaab47ed85..6fd6415b4f2 100644 --- a/Master/texmf-dist/doc/latex/easybook/easybook.tex +++ b/Master/texmf-dist/doc/latex/easybook/easybook.tex @@ -3,7 +3,7 @@ \title{\sffamily easybook书籍文档类} \author{瞿毅} -\date{2021/02/13\hskip\ccwd\relax v1.23d\thanks{\url{https://gitee.com/texl3/easybook}}} +\date{2021/02/20\hskip\ccwd\relax v1.23e\thanks{\url{https://gitee.com/texl3/easybook}}} \begin{document} \maketitle @@ -92,6 +92,15 @@ 设置页面大小,交给 \pkg{geometry} 宏包处理,可使用它支持的所有规格。建议选项 \opt{b5paper} 和 \opt{zihao = 5},选项 \opt{a4paper} 和 \opt{zihao = -4} 配合。 \end{function} +\subsection{文档命令} +\begin{function}[added = 2021-02-20]{\frontmatter,\mainmatter,\backmatter,\listoffigures,\listoftables,\listoflistings} +\begin{syntax} + \tn{frontmatter}\oarg{编号格式|(Roman)} + \tn{printindex}\oarg{索引名} +\end{syntax} +\tn{frontmatter} 为前言区命令,章标题不编号,页码可设置为例如 \opt{roman}、\opt{Alph} 等格式,带有星号的命令 \tn{frontmatter*} 不使用 \tn{cleardoublepage}。\tn{mainmatter} 为主文区命令,章标题正常编号且页码为从1开始计数的阿拉伯数字,\tn{mainmatter*} 命令不使用 \tn{cleardoublepage}。\tn{backmatter} 为后记区命令,页码格式与编号保持不变,章标题不编号。\tn{listoffigures} 命令输出图片目录,\tn{listoftables} 命令输出表格目录,\tn{listoflistings} 命令输出代码目录。 +\end{function} + \section{接口选项} \begin{function}[added = 2021-01-05]{\ctexset} \begin{syntax} @@ -325,7 +334,7 @@ lolskip = <(0.8pc)> lists/belowoffset = <(0pc)> belowoffset = <(-1pc)> - \tn{tocrule} = \oarg{引导点间距}\oarg{引导点大小}\marg{引导点}\oarg{页码格式} + \tn{tocrule} = \oarg{引导点间距|(0.7pc)}\oarg{引导点大小|(1.2)}\marg{引导点}\oarg{页码格式} \end{syntax} \changes{v1.21c}{2021/01/13}{增加配置目录样式的选项。} \opt{tocset} 将目录样式交给 \pkg{titletoc} 处理,预置了 \opt{part}、\opt{chapter}、\opt{section}、\opt{subsection} 和 \opt{lists} 五种级别的目录标题,键值列表中的...代表它们。\opt{lists} 为图片、表格和代码目录格式的级别。 diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls index 305f33ac691..475920142e5 100644 --- a/Master/texmf-dist/tex/latex/easybook/easybook.cls +++ b/Master/texmf-dist/tex/latex/easybook/easybook.cls @@ -9,7 +9,7 @@ %% https://creativecommons.org/licenses/by/4.0/legalcode \NeedsTeXFormat{LaTeX2e} \RequirePackage{l3keys2e} -\ProvidesExplClass{easybook}{2021/02/13}{1.23d}{} +\ProvidesExplClass{easybook}{2021/02/20}{1.23e}{} \cs_generate_variant:Nn \keys_define:nn {nx} \cs_generate_variant:Nn \int_to_arabic:n {v} @@ -302,11 +302,17 @@ {\hbox:n {}\thispagestyle{empty}\clearpage} } } -\cs_gset:Npn \frontmatter +\RenewDocumentCommand{\frontmatter}{sO{Roman}} { - \cleardoublepage + \IfBooleanTF{#1}{\clearpage}{\cleardoublepage} \@mainmatterfalse - \pagenumbering{Roman} + \pagenumbering{#2} + } +\RenewDocumentCommand{\mainmatter}{s} + { + \IfBooleanTF{#1}{\clearpage}{\cleardoublepage} + \@mainmattertrue + \pagenumbering{arabic} } \cs_gset_eq:NN \easyhead\fancyhead \cs_gset_eq:NN \easyfoot\fancyfoot -- cgit v1.2.3