texlive[57418] Master/texmf-dist: easybook (13jan21)

commits+karl at tug.org commits+karl at tug.org
Thu Jan 14 22:47:37 CET 2021 

Revision: 57418
          http://tug.org/svn/texlive?view=revision&revision=57418
Author:   karl
Date:     2021-01-14 22:47:37 +0100 (Thu, 14 Jan 2021)
Log Message:
-----------
easybook (13jan21)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/latex/easybook/README.md
    trunk/Master/texmf-dist/doc/latex/easybook/easybook-demo.pdf
    trunk/Master/texmf-dist/doc/latex/easybook/easybook-demo.tex
    trunk/Master/texmf-dist/doc/latex/easybook/easybook.pdf
    trunk/Master/texmf-dist/doc/latex/easybook/easybook.tex
    trunk/Master/texmf-dist/tex/latex/easybook/easybook.cls

Modified: trunk/Master/texmf-dist/doc/latex/easybook/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/easybook/README.md	2021-01-14 00:47:37 UTC (rev 57417)
+++ trunk/Master/texmf-dist/doc/latex/easybook/README.md	2021-01-14 21:47:37 UTC (rev 57418)
@@ -28,7 +28,7 @@
 
 ## Website
 
-| [Gitee](https://gitee.com/TeX-doc/easybook) | [Github](https://github.com/TeX-doc/easybook) | [CTAN](https://ctan.org/pkg/easybook) | [Font](https://wws.lanzous.com/b01ns361i) |
+| [Gitee](https://gitee.com/texl3/easybook) | [Github](https://github.com/texl3/easybook) | [CTAN](https://ctan.org/pkg/easybook) | [Font](https://wws.lanzous.com/b01ns361i) |
 
 # easybook 书籍文档类
 
@@ -60,4 +60,4 @@
 
 ## 网址
 
-| [Gitee](https://gitee.com/TeX-doc/easybook) | [Github](https://github.com/TeX-doc/easybook) | [CTAN](https://ctan.org/pkg/easybook) | [字体](https://wws.lanzous.com/b01ns361i) |
\ No newline at end of file
+| [Gitee](https://gitee.com/texl3/easybook) | [Github](https://github.com/texl3/easybook) | [CTAN](https://ctan.org/pkg/easybook) | [字体](https://wws.lanzous.com/b01ns361i) |
\ No newline at end of file

Modified: trunk/Master/texmf-dist/doc/latex/easybook/easybook-demo.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/easybook/easybook-demo.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/easybook/easybook-demo.tex	2021-01-14 00:47:37 UTC (rev 57417)
+++ trunk/Master/texmf-dist/doc/latex/easybook/easybook-demo.tex	2021-01-14 21:47:37 UTC (rev 57418)
@@ -91,12 +91,12 @@
     \author
       {
         瞿毅\thanks{texeasybook at foxmail.com.} \\
-        \textcolor[HTML]{c71d23}{\faGit}~\url{https://gitee.com/TeX-doc/easybook}\thanks{Gitee为项目的主要发布地址。} \\
-        \faGithub~\url{https://github.com/TeX-doc/easybook} \\
-        \textcolor[HTML]{00c2ff}{\faEdge}~\url{https://latexstudio.net} \\
+        \git~\url{https://gitee.com/texl3/easybook}\thanks{Gitee为项目的主要发布地址。} \\
+        \github~\url{https://github.com/texl3/easybook} \\
+        \edge~\url{https://latexstudio.net} \\
         \url{https://ctan.org/pkg/easybook}
       }
-    \date{2021/01/13\hskip\ccwd\relax v1.21c}
+    \date{2021/01/14\hskip\ccwd\relax v1.21d}
   }
 
 \begin{document}

Modified: trunk/Master/texmf-dist/doc/latex/easybook/easybook.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/easybook/easybook.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/easybook/easybook.tex	2021-01-14 00:47:37 UTC (rev 57417)
+++ trunk/Master/texmf-dist/doc/latex/easybook/easybook.tex	2021-01-14 21:47:37 UTC (rev 57418)
@@ -8,7 +8,7 @@
 
 \title{\sffamily easybook书籍文档类}
 \author{瞿毅}
-\date{2021/01/13\hskip\ccwd\relax v1.21c\thanks{\url{https://gitee.com/TeX-doc/easybook}}}
+\date{2021/01/14\hskip\ccwd\relax v1.21d\thanks{\url{https://gitee.com/texl3/easybook}}}
 
 \begin{document}
 \maketitle
@@ -295,7 +295,7 @@
 \end{syntax}
 \changes{v1.21}{2021/01/11}{修复单面文档时页眉横线消失的问题。}
 \changes{v1.21c}{2021/01/13}{增加配置页眉页脚的选项。}
-\opt{hdrset} 将选项交给 \pkg{fancyhdr} 宏包页面风格命令 \tn{fancyhf} 处理，\pkg{fancyhdr} 将页眉页脚分成左中右和奇数页（odd）、偶数页（even）共12个部分，所以设置了对应的12个选项。\opt{head} 与 \opt{foot} 表示页眉与页脚区域，前缀e、o代表偶数、奇数，前缀l、c、r代表左、中、右部分。单面打印时，偶数前缀的选项无效。
+\opt{hdrset} 将选项交给 \pkg{fancyhdr} 宏包页面风格命令 \tn{fancyhf} 处理，设置的是一个名为 \opt{fancy} 的页面风格。\pkg{fancyhdr} 将页眉页脚分成左中右和奇数页（odd）、偶数页（even）共12个部分，所以设置了对应的12个选项。\opt{head} 与 \opt{foot} 表示页眉与页脚区域，前缀e、o代表偶数、奇数，前缀l、c、r代表左、中、右部分。单面打印时，偶数前缀的选项无效。
 \begin{ctexexam}
     \ctexset
       {
@@ -311,15 +311,17 @@
 \end{function}
 
 \subsection{目录样式}
-\begin{function}[EXP,added = 2021-01-13]{tocset/.../format,tocset/.../indent,tocset/.../rule,\tocrule}
+\begin{function}[EXP,added = 2021-01-13,updated = 2021-01-14]{tocset/.../format,tocset/.../indent,tocset/.../rule,tocset/lolskip,tocset/belowoffset,\tocrule}
 \begin{syntax}
   format = <目录标题格式>
   indent = <目录标题左边缩进>
   rule = <目录引导线样式>
+  lolskip = <(0.8pc)>
+  belowoffset = <(-1pc)>
   \tn{tocrule} = \oarg{引导点间距}\oarg{引导点大小}\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} 为图片、表格和代码目录格式的级别。\tn{tocrule} 命令生成目录引导线，需要在 \opt{rule} 选项中使用，其中引导线间距需带有长度单位，引导点大小不带单位，为引导点符号正常大小的倍数，引导点一般为英文句号或 \tn{cdot} 中心点符号。页码格式的内容位于页码前面，可以设置页码字体、距离。
+\opt{tocset} 将目录样式交给 \pkg{titletoc} 处理，预置了 \opt{part}、\opt{chapter}、\opt{section}、\opt{subsection} 和 \opt{lists} 五种级别的目录标题，键值列表中的...代表它们。\opt{lists} 为图片、表格和代码目录格式的级别。\opt{lolskip} 是代码目录标题后的距离，与\CTeX 的 \opt{lotskip} 和 \opt{lofskip} 不太一样。\opt{belowoffset} 选项为目录总标题 \tn{contentsname} 后的间距补偿，一般为负值，用于抵消 \opt{format} 中设置的间距。建议 \opt{lolskip+lists/format/addvspace = -belowoffset}。\tn{tocrule} 命令生成目录引导线，需要在 \opt{rule} 选项中使用，其中引导线间距需带有长度单位，引导点大小不带单位，为引导点符号正常大小的倍数，引导点一般为英文句号或 \tn{cdot} 中心点符号。页码格式的内容位于页码前面，可以设置页码字体、距离。
 \begin{ctexexam}
     \ctexset
       {

Modified: trunk/Master/texmf-dist/tex/latex/easybook/easybook.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/easybook/easybook.cls	2021-01-14 00:47:37 UTC (rev 57417)
+++ trunk/Master/texmf-dist/tex/latex/easybook/easybook.cls	2021-01-14 21:47:37 UTC (rev 57418)
@@ -9,10 +9,11 @@
 %%   https://creativecommons.org/licenses/by/4.0/legalcode
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2021/01/13}{v1.21c}{}
+\ProvidesExplClass{easybook}{2021/01/14}{1.21d}{}
 
 \cs_generate_variant:Nn \keys_define:nn {nx}
 \cs_generate_variant:Nn \int_to_arabic:n {v}
+\cs_generate_variant:Nn \dim_add:Nn {NV}
 \cs_new_protected:Npn \__ctex_define:n #1
   {\keys_define:nn {ctex/#1}}
 \cs_new_protected:Npn \__put_ctexbook:n #1
@@ -166,6 +167,9 @@
   modifier = {by},
   version = {4.0}
   ]{doclicense}
+\cs_new_eq:NN \github\faGithub
+\cs_new:Npn   \git{\textcolor[HTML]{c71d23}{\faGit}}
+\cs_new:Npn   \edge{\textcolor[HTML]{00c2ff}{\faEdge}}
 \ctex_at_end_preamble:n
   {
     \tl_if_empty:NF \g__config_tl
@@ -437,7 +441,7 @@
 \__ctex_define:n {tocset}
   {
     part/format       .tl_set:N = \l__toc_part_format_tl,
-    part/format       .initial:n = 
+    part/format       .initial:n =
       {\addvspace{1pc}\sffamily\large},
     part/indent       .tl_set:N = \l__toc_part_indent_tl,
     part/indent       .initial:n = 0\ccwd,
@@ -471,7 +475,12 @@
     lists/indent      .tl_set:N = \l__toc_lists_indent_tl,
     lists/indent      .initial:n = 0\ccwd,
     lists/rule        .tl_set:N = \l__toc_lists_rule_tl,
-    lists/rule        .initial:n = \tocrule{$\cdot$}
+    lists/rule        .initial:n = \tocrule{$\cdot$},
+    lists/lolskip     .dim_set:N = \l__toc_lolskip_dim,
+    lists/lolskip     .initial:n = 0.8pc,
+
+    belowoffset       .dim_set:N = \l__toc_offset_dim,
+    belowoffset       .initial:n = -1pc
   }
 
 \NewDocumentCommand{\tocrule}{O{0.7pc}O{1.2}mO{}}
@@ -547,7 +556,7 @@
       \bool_if:NT \l__multoc_bool{\twocolumn}
     \fi
     \__title_mark:n {\contentsname}
-    \vspace*{-1pc}
+    \vspace*{\l__toc_offset_dim}
     \@starttoc{toc}
     \if at restonecol
       \twocolumn
@@ -565,7 +574,7 @@
       \bool_if:NT \l__multoc_bool{\twocolumn}
     \fi
     \__title_mark_intoc:n {\listfigurename}
-    \vspace*{-1pc}
+    \vspace*{\l__toc_offset_dim}
     \@starttoc{lof}
     \if at restonecol
       \twocolumn
@@ -583,7 +592,7 @@
       \bool_if:NT \l__multoc_bool{\twocolumn}
     \fi
     \__title_mark_intoc:n {\listtablename}
-    \vspace*{-1pc}
+    \vspace*{\l__toc_offset_dim}
     \@starttoc{lot}
     \if at restonecol
       \twocolumn
@@ -605,7 +614,8 @@
         \fi
       }
     \__title_mark_intoc:n {\lstlistlistingname}
-    \vspace*{-0.2pc}
+    \dim_add:NV \l__toc_offset_dim\l__toc_lolskip_dim
+    \vspace*{\l__toc_offset_dim}
     \@starttoc{lol}
     \@ifundefined{@restonecoltrue}{}
       {

More information about the tex-live-commits mailing list.