texlive[57596] Master/texmf-dist: easybook (2feb21)

commits+karl at tug.org commits+karl at tug.org
Tue Feb 2 23:13:05 CET 2021 

Revision: 57596
          http://tug.org/svn/texlive?view=revision&revision=57596
Author:   karl
Date:     2021-02-02 23:13:05 +0100 (Tue, 02 Feb 2021)
Log Message:
-----------
easybook (2feb21)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/latex/easybook/chapter1.tex
    trunk/Master/texmf-dist/doc/latex/easybook/chapter2.tex
    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

Removed Paths:
-------------
    trunk/Master/texmf-dist/doc/latex/easybook/preface.tex

Modified: trunk/Master/texmf-dist/doc/latex/easybook/chapter1.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/easybook/chapter1.tex	2021-02-02 03:09:16 UTC (rev 57595)
+++ trunk/Master/texmf-dist/doc/latex/easybook/chapter1.tex	2021-02-02 22:13:05 UTC (rev 57596)
@@ -6,14 +6,14 @@
 
 \section{公式}\index{g@公式}
 \zhlipsum*[42][name = aspirin]
-\begin{equation}\label{eq1}
+\begin{equation}\label{eq:matrix}
   \bm{A} = \left[
-  \begin{matrix}
-    a_{11} & a_{12} & \cdots & a_{1n} \\
-    a_{21} & a_{22} & \cdots & a_{2n} \\
-    \vdots & \vdots & \ddots & \vdots \\
-    a_{m1} & a_{m2} & \cdots & a_{mn} \\
-  \end{matrix}
+    \begin{matrix}
+      a_{11} & a_{12} & \cdots & a_{1n} \\
+      a_{21} & a_{22} & \cdots & a_{2n} \\
+      \vdots & \vdots & \ddots & \vdots \\
+      a_{m1} & a_{m2} & \cdots & a_{mn} \\
+    \end{matrix}
   \right] = \left[
     \begin{matrix}
       \bm{a}_1 & \bm{a}_2 & \cdots & \bm{a}_n
@@ -20,7 +20,7 @@
     \end{matrix}
   \right]
 \end{equation}
-可以通过添加标签在正文中引用公式，如带有中文括号的引用\cref{eq1}。
+可以通过添加标签在正文中引用公式，如带有中文括号的引用\cref{eq:matrix}。
 
 \zhlipsum*[56][name = aspirin]
 \begin{equation}
@@ -35,16 +35,17 @@
 \begin{subnumcases}{y =}
   C_1e^{r_1x}+C_2e^{r_2x} & \quad $p^2-4q > 0$
   \\
-  \left(C_1+C_2\right)e^{r_1x} & \quad $p^2-4q=0$
+  \left(C_1+C_2\right)e^{r_1x} & \quad $p^2-4q = 0$
   \\
-  e^{\alpha x}\left(C_1\cos\beta x+C_2\sin\beta x\right) & \quad $p^2-4q<0$
+  e^{\alpha x}\left(C_1\cos\beta x+C_2\sin\beta x\right) & \quad $p^2-4q < 0$
 \end{subnumcases}
 
 \zhlipsum*[57][name = aspirin]
+\vfill{\small\doclicenseThis}
 
 \clearpage
 \section{插图}\index{c@插图}
-当我们需要排列一组子图共享标题的图片时，可以使用依赖于 \lstinline{caption} 宏包的 \lstinline{subcaption} 宏包的功能，效果见\cref{fig1}。
+当我们需要排列一组子图共享标题的图片时，可以使用依赖于 \lstinline{caption} 宏包的 \lstinline{subcaption} 宏包的功能，效果见\cref{fig:example}。
 \begin{figure}[htbp]
   \centering
   \subcaptionbox{并排子图1}
@@ -52,14 +53,14 @@
   \hspace{1.2em}
   \subcaptionbox{并排子图2}
     {\includegraphics[width=0.4\textwidth]{example-image-4x3}}
-  \bicaption[使用subcaption排版子图]{使用subcaption宏包的subcaptionbox命令排版子图}[Use subcaption to typeset subgraphs]{Use the subcaptionbox command of the subcaption package to typeset sub-pictures}\label{fig1}
+  \bicaption[使用subcaption排版子图]{使用subcaption宏包的subcaptionbox命令排版子图}[Use subcaption to typeset subgraphs]{Use the subcaptionbox command of the subcaption package to typeset sub-pictures}\label{fig:example}
 \end{figure} 
 
 \section{表格}\index{b@表格}
-合并表格列使用 \lstinline{\multicolumn} 命令，合并行使用 \lstinline{\multirowcell} 命令。当插入的表格内容过长以至于一行放不下的情况可以使用 \lstinline{tabularx} 环境，设置了\textsf{L、C和R}三个列对齐选项，一个例子如\cref{tab1} 所示。
+合并表格列使用 \lstinline{\multicolumn} 命令，合并行使用 \lstinline{\multirowcell} 命令。当插入的表格内容过长以至于一行放不下的情况可以使用 \lstinline{tabularx} 环境，设置了\textsf{L、C和R}三个列对齐选项，一个例子如\cref{tab:example} 所示。
 \begin{table}[htbp]
   \centering
-  \bicaption{使用tabularx创建内容过长表格}{Use tabularx to create a table with too long content}\label{tab1}\small
+  \bicaption{使用tabularx创建内容过长表格}{Use tabularx to create a table with too long content}\label{tab:example}\small
   \begin{tabularx}{0.87\textwidth}{@{}llL@{}}
     \toprule
     Aliquam & Integer & Pellentesque tincidunt purus

Modified: trunk/Master/texmf-dist/doc/latex/easybook/chapter2.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/easybook/chapter2.tex	2021-02-02 03:09:16 UTC (rev 57595)
+++ trunk/Master/texmf-dist/doc/latex/easybook/chapter2.tex	2021-02-02 22:13:05 UTC (rev 57596)
@@ -10,7 +10,7 @@
 \end{outline}
 
 \section{定理}\index{d@定理}
-\begin{theorem}[（高斯公式\footnote{选自高等数学公式。}）]\label{gauss formula}\index{d@定理!g@高斯公式}
+\begin{theorem}[（高斯公式\footnote{选自高等数学公式。}）]\label{theorem:gauss formula}\index{d@定理!g@高斯公式}
 设空间闭区域$\Omega$是由分片光滑的闭曲面$\Sigma$围成，若函数$P(x,y,z)$，$Q(x,y,z)$，$R(x,y,z)$在$\Omega$上具有一节连续偏导数，则有
 \begin{align}
   \iiint_\Omega\left(\frac{\partial P}{\partial x}+\frac{\partial Q}{\partial y}+\frac{\partial R}{\partial x}\right)\mathrm{d}V & =\oiint_\Sigma P\mathrm{d}y\mathrm{d}z+Q\mathrm{d}z\mathrm{d}x+R\mathrm{d}x\mathrm{d}y
@@ -17,10 +17,10 @@
   \\
   & =\oiint_\Sigma \left(P\cos\alpha+Q\cos\beta+R\cos\gamma\right)\mathrm{d}S
 \end{align}
-这里$\Sigma$是整个边界曲面$\Omega$的外侧，$\cos\alpha,\cos\beta,\cos\gamma$是$\Sigma$在点$(x,y,z)$处的法向量的方向余弦。引用这个公式如\cref{gauss formula}。
+这里$\Sigma$是整个边界曲面$\Omega$的外侧，$\cos\alpha,\cos\beta,\cos\gamma$是$\Sigma$在点$(x,y,z)$处的法向量的方向余弦。引用这个公式如\cref{theorem:gauss formula}。
 \end{theorem}
 
-\begin{definition}[(Stokes formula)]\label{defi1}\index{d@定理!s at Stokes formula}
+\begin{definition}[(Stokes formula)]\index{d@定理!s at Stokes formula}
 Let $\Gamma$ be a piecewise smooth directed closed curve, $\Sigma$ is a piecewise smooth directed surface bounded by $\Gamma$, the side of $\Gamma$ and the positive direction of $\Sigma$ According to the right-hand rule, if the function $P(x,y,z)$, $Q(x,y,z)$, $R(x,y,z)$ has a first-order continuous deviation on the curve $\Sigma$ Derivative, then
 \begin{multline}
   \iint_\Sigma\left(\frac{\partial R}{\partial y}-\frac{\partial Q}{\partial z}\right)\mathrm{d}y\mathrm{d}z+\left(\frac{\partial P}{\partial z}-\frac{\partial R}{\partial x}\right)\mathrm{d}z\mathrm{d}x+\left(\frac{\partial Q}{\partial x}-\frac{\partial P}{\partial y}\right)\mathrm{d}x\mathrm{d}y

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-02-02 03:09:16 UTC (rev 57595)
+++ trunk/Master/texmf-dist/doc/latex/easybook/easybook-demo.tex	2021-02-02 22:13:05 UTC (rev 57596)
@@ -96,13 +96,12 @@
         \edge~\url{https://latexstudio.net} \\
         \url{https://ctan.org/pkg/easybook}
       }
-    \date{2021/02/01\hskip\ccwd\relax v1.22}
+    \date{2021/02/02\hskip\ccwd\relax v1.23}
   }
 
 \begin{document}
 \frontmatter
 \maketitle
-\subfile{pages/preface}
 \tableofcontents
 
 \mainmatter

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-02-02 03:09:16 UTC (rev 57595)
+++ trunk/Master/texmf-dist/doc/latex/easybook/easybook.tex	2021-02-02 22:13:05 UTC (rev 57596)
@@ -1,7 +1,6 @@
 \documentclass{ctxdoc}
 \hypersetup
   {
-    colorlinks,
     linkcolor = blue,
     urlcolor = blue
   }
@@ -8,7 +7,7 @@
 
 \title{\sffamily easybook书籍文档类}
 \author{瞿毅}
-\date{2021/02/01\hskip\ccwd\relax v1.22\thanks{\url{https://gitee.com/texl3/easybook}}}
+\date{2021/02/02\hskip\ccwd\relax v1.23\thanks{\url{https://gitee.com/texl3/easybook}}}
 
 \begin{document}
 \maketitle
@@ -80,7 +79,7 @@
 同时开启 \opt{newline}、\opt{entitle} 和 \opt{english} 三个选项以符合英文原生风格。
 \end{function}
 
-\begin{function}[rEXP,added = 2021-01-05,updated = 2021-02-01]{font}
+\begin{function}[rEXP,added = 2021-01-05,updated = 2021-02-02]{font}
 \begin{syntax}
   font = <adobe|founder|mac|windows|linux|(overleaf)|noto|none>
 \end{syntax}
@@ -112,7 +111,7 @@
 \end{function}
 
 \subsection{风格}
-\begin{function}[EXP,added = 2021-01-05,updated = 2021-02-01]{style/color,style/capdash,style/multoc,style/withpart,style/perpart,style/perpage,style/notomath}
+\begin{function}[EXP,added = 2021-01-05,updated = 2021-02-02]{style/color,style/capdash,style/multoc,style/withpart,style/perpart,style/perpage,style/notomath}
 \begin{syntax}
   color = <(none)|forest|energy|cyberpunk>
   capdash = <true|(false)>
@@ -123,7 +122,7 @@
   notomath = <(true)|false>
 \end{syntax}
 \changes{v1.10}{2021/01/08}{更改颜色实现方式与选项名。}
-\changes{v1.22}{2021/02/01}{noto风格的数学字体独立出来，可自定义设置。}
+\changes{v1.23}{2021/02/02}{noto风格的数学字体独立出来，可自定义设置。}
 \opt{style} 选项控制文章的风格。
 \end{function}
 
@@ -148,7 +147,7 @@
 \begin{function}[EXP,added = 2021-01-05,updated = 2021-01-08]{link/hyperlink,link/linkcolor,link/linktopage}
 \begin{syntax}
   hyperlink = <(edge)|various|none>
-  linkcolor = <(graphite)|cutepink|skyblue|crimson>
+  linkcolor = <(fresh)|cutepink|skyblue|crimson>
   linktopage = <true|(false)>
 \end{syntax}
 \changes{v1.10}{2021/01/08}{修复了 \opt{linktopage} 选项关闭时目录中标题编号无超链接的问题。}

Deleted: trunk/Master/texmf-dist/doc/latex/easybook/preface.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/easybook/preface.tex	2021-02-02 03:09:16 UTC (rev 57595)
+++ trunk/Master/texmf-dist/doc/latex/easybook/preface.tex	2021-02-02 22:13:05 UTC (rev 57596)
@@ -1,22 +0,0 @@
-% Preface
-\documentclass[../easybook-demo]{subfiles}
-\begin{document}
-
-\chapter*{前言}
-
-\lstinline{easybook} 使用\LaTeX 3语法将选项扩展入\CTeX 宏集接口命令 \lstinline{\ctexset} 的列表。如果无法编译以及选项说明细节参见~\href{./easybook.pdf}{easybook用户手册}。
-
-\begin{enumerate}[label = \color{DarkBlue}\protect\circled{\arabic*}]
-\item 增加 \lstinline{bibset} 选项，可以使用 \lstinline{bibtex} 或 \lstinline{biber} 编译参考文献。
-\item 修复单面文档时页眉横线消失的问题。
-\item 修复了 \lstinline{linktopage} 选项关闭时目录中标题编号无超链接的问题。
-\item 增加 \lstinline{elfont} 选项可以自定义图表、代码、脚注和边注的字体。
-\item 增加 \lstinline{config} 选项可以载入用户配置文件。
-\item 优化页眉页脚，单面或双面排版适配了不同风格。
-\item 更改草稿选项，与标准文类行为一致并显示页面边框。
-\item 使用功能更丰富的 \lstinline{thmtools} 设置定理环境。
-\end{enumerate}
-
-\vfill{\small\doclicenseThis}
-
-\end{document}
\ No newline at end of file

Modified: trunk/Master/texmf-dist/tex/latex/easybook/easybook.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/easybook/easybook.cls	2021-02-02 03:09:16 UTC (rev 57595)
+++ trunk/Master/texmf-dist/tex/latex/easybook/easybook.cls	2021-02-02 22:13:05 UTC (rev 57596)
@@ -9,7 +9,7 @@
 %%   https://creativecommons.org/licenses/by/4.0/legalcode
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2021/02/01}{1.22}{}
+\ProvidesExplClass{easybook}{2021/02/02}{1.23}{}
 
 \cs_generate_variant:Nn \keys_define:nn {nx}
 \cs_generate_variant:Nn \int_to_arabic:n {v}
@@ -137,26 +137,36 @@
     notomath  .initial:n = true
   }
 
-\RequirePackage[svgnames]{xcolor}
-\RequirePackage{pdfpages,subfiles}
-\includepdfset{fitpaper = true}
-\RequirePackage[hang,stable]{footmisc}
-\RequirePackage{setspace,zhlineskip}
-\RequirePackage{amsthm,thmtools,cases}
-\RequirePackage{chemformula,chemfig,siunitx}
-\RequirePackage[normalem]{ulem}
-\RequirePackage[protrusion = false]{microtype}
-\RequirePackage{geometry,marginnote}
-\RequirePackage{rotfloat,graphicx}
-\RequirePackage{nccfoots,tablefootnote}
-\RequirePackage{fancyhdr,titletoc}
-\RequirePackage{caption,bicaption,subcaption}
-\RequirePackage{zhlipsum,fontawesome,pifont}
-\RequirePackage{tabularx,multirow,makecell,booktabs}
-\RequirePackage{paralist,tasks}
-\RequirePackage[shortlabels,inline]{enumitem}
-\RequirePackage[most]{tcolorbox}
-\RequirePackage[xindy]{imakeidx}
+\clist_map_inline:nn
+  {
+    {svgnames}{xcolor},
+    {hang,stable}{footmisc},
+    {normalem}{ulem},
+    {protrusion = false}{microtype},
+    {shortlabels,inline}{enumitem},
+    {most}{tcolorbox},
+    {xindy}{imakeidx}
+  }{\PassOptionsToPackage#1}
+\RequirePackage
+  {
+    xcolor,
+    pdfpages,subfiles,
+    footmisc,
+    setspace,zhlineskip,
+    amsthm,thmtools,cases,
+    chemformula,chemfig,siunitx,ulem,
+    microtype,
+    geometry,marginnote,
+    rotfloat,graphicx,
+    nccfoots,tablefootnote,
+    fancyhdr,titletoc,
+    caption,bicaption,subcaption,
+    zhlipsum,fontawesome,pifont,
+    tabularx,multirow,makecell,booktabs,
+    paralist,tasks,enumitem,
+    tcolorbox,
+    imakeidx
+  }
 \RequirePackage[
   lang = {chinese-utf8},
   type = {CC},
@@ -265,6 +275,19 @@
   }
 \cs_if_exist:NF \kaishu{\cs_gset_eq:NN \kaishu\normalfont}
 
+\includepdfset{fitpaper = true}
+\geometry
+  {
+    vmargin = 2.54cm,
+    hmargin = 3.17cm,
+    columnsep = 2\ccwd,
+    headheight = 2.04cm,
+    headsep = 0.5cm,
+    footskip = 0.79cm,
+    footnotesep = 0.5cm,
+    marginparsep = 8pt,
+    marginparwidth = 2.54cm
+  }
 \clist_new:N \g__geometry_clist
 \__ctex_define:nn {geoset}
   {
@@ -277,18 +300,6 @@
           }
       }
   }
-\geometry
-  {
-    vmargin = 2.54cm,
-    hmargin = 3.17cm,
-    columnsep = 2\ccwd,
-    headheight = 2.04cm,
-    headsep = 0.5cm,
-    footskip = 0.79cm,
-    footnotesep = 0.5cm,
-    marginparsep = 8pt,
-    marginparwidth = 2.54cm
-  }
 
 \cs_gset:Npn \cleardoublepage
   {
@@ -1148,10 +1159,7 @@
     rulecolor = \color{ctex at frame},
     commentstyle = \color{gray},
     emphstyle = \color{ctex at emph},
-    emph =
-      {
-        bibset,bibtex,biber,caption,config,easybook,elfont,linktopage,subcaption,tabularx,thmtools
-      },
+    emph = {caption,subcaption,tabularx},
     keywordstyle = \lst at ifdisplaystyle\bfseries\color{ctex at emph}\else\color{ctex at verb}\fi,
     morekeywords =
       {
@@ -1232,14 +1240,14 @@
     linkcolor         .choice:,
     \clist_map_function:nN
       {
-        {graphite,  626262,0000B2,005752},
+        {fresh,     62d71f,0000B2,005752},
         {cutepink,  ff69b4,9d5196,57b5e5},
         {skyblue,   0000ff,004986,eb6877},
         {crimson,   dc143c,00c1c9,afcd20}
       }
       \__linkcolor_set:n,
-    linkcolor         .default:n = graphite,
-    linkcolor         .initial:n = graphite,
+    linkcolor         .default:n = fresh,
+    linkcolor         .initial:n = fresh,
 
     linktopage        .choice:,
     linktopage/true   .code:n = {\__put_hyperref:n {linktocpage}},

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