texlive[57702] Master/texmf-dist: easybook (10feb21)
commits+karl at tug.org
commits+karl at tug.org
Wed Feb 10 23:04:11 CET 2021
Revision: 57702
http://tug.org/svn/texlive?view=revision&revision=57702
Author: karl
Date: 2021-02-10 23:04:10 +0100 (Wed, 10 Feb 2021)
Log Message:
-----------
easybook (10feb21)
Modified Paths:
--------------
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/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-10 22:03:54 UTC (rev 57701)
+++ trunk/Master/texmf-dist/doc/latex/easybook/easybook-demo.tex 2021-02-10 22:04:10 UTC (rev 57702)
@@ -94,7 +94,7 @@
\github~\url{https://github.com/texl3/easybook} \\
\edge~\url{https://latexstudio.net}
}
- \date{2021/02/09\hskip\ccwd\relax v1.23b}
+ \date{2021/02/10\hskip\ccwd\relax v1.23c}
}
\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-02-10 22:03:54 UTC (rev 57701)
+++ trunk/Master/texmf-dist/doc/latex/easybook/easybook.tex 2021-02-10 22:04:10 UTC (rev 57702)
@@ -3,7 +3,7 @@
\title{\sffamily easybook书籍文档类}
\author{瞿毅}
-\date{2021/02/09\hskip\ccwd\relax v1.23b\thanks{\url{https://gitee.com/texl3/easybook}}}
+\date{2021/02/10\hskip\ccwd\relax v1.23c\thanks{\url{https://gitee.com/texl3/easybook}}}
\begin{document}
\maketitle
@@ -480,7 +480,7 @@
<行间代码>
\tn{end}\marg{lstlisting}
\end{syntax}
-加载了 \pkg{listings} 宏包以对代码格式进行高度定制，代码样式可使用 \tn{lstset} 命令设置，\tn{listoflistings} 命令用于输出代码目录。
+加载 \pkg{listings} 宏包以对代码格式进行高度定制，代码样式可使用 \tn{lstset} 命令设置，\tn{listoflistings} 命令用于输出代码目录。
\end{function}
\subsection{物理量}
Modified: trunk/Master/texmf-dist/tex/latex/easybook/easybook.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/easybook/easybook.cls 2021-02-10 22:03:54 UTC (rev 57701)
+++ trunk/Master/texmf-dist/tex/latex/easybook/easybook.cls 2021-02-10 22:04:10 UTC (rev 57702)
@@ -9,7 +9,7 @@
%% https://creativecommons.org/licenses/by/4.0/legalcode
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2021/02/09}{1.23b}{}
+\ProvidesExplClass{easybook}{2021/02/10}{1.23c}{}
\cs_generate_variant:Nn \keys_define:nn {nx}
\cs_generate_variant:Nn \int_to_arabic:n {v}
@@ -652,7 +652,7 @@
format = hang,
% figurewithin = section,
% tablewithin = section,
- font = {stretch = \l__cap_spread_tl},
+ font = {stretch = {\fp_use:N \l__cap_spread_fp}},
labelfont = {color = ctex at frame},
labelsep = ccwd,
belowskip = 0pt,aboveskip = 10pt
@@ -685,9 +685,9 @@
\fp_new:N \l__line_spread_fp
\fp_new:N \l__tab_spread_fp
-\tl_new:N \l__math_spread_tl
-\tl_new:N \l__cap_spread_tl
-\tl_new:N \l__foot_spread_tl
+\fp_new:N \l__math_spread_fp
+\fp_new:N \l__cap_spread_fp
+\fp_new:N \l__foot_spread_fp
\__ctex_define:nn {spread}
{
@@ -695,11 +695,11 @@
linespread .initial:n = 1.3,
tabspread .fp_set:N = \l__tab_spread_fp,
tabspread .initial:n = 1.05,
- mathspread .tl_set:N = \l__math_spread_tl,
+ mathspread .fp_set:N = \l__math_spread_fp,
mathspread .initial:n = 1.05,
- capspread .tl_set:N = \l__cap_spread_tl,
+ capspread .fp_set:N = \l__cap_spread_fp,
capspread .initial:n = 1,
- fnspread .tl_set:N = \l__foot_spread_tl,
+ fnspread .fp_set:N = \l__foot_spread_fp,
fnspread .initial:n = 1
}
@@ -748,7 +748,7 @@
\skip_set:Nn \plitemsep{.75ex plus .1ex}
\skip_set:Nn \plparsep{0ex}
-\cs_new_protected:Npn \__thmname_set:nn #1#2
+\cs_new_protected:Npn \__thmname_set:n #1#2
{\tl_const:cn {c__name_#1_tl}{#2}}
\bool_if:NTF \l__lang_chinese_bool
{
@@ -762,7 +762,7 @@
{example}{例},
{remark}{注},
{exercise}{练习}
- }{\__thmname_set:nn #1}
+ }{\__thmname_set:n #1}
}{
\clist_map_inline:nn
{
@@ -774,7 +774,7 @@
{example}{Example},
{remark}{Remark},
{exercise}{Exercise}
- }{\__thmname_set:nn #1}
+ }{\__thmname_set:n #1}
}
\bool_new:N \l__thmbox_bool
@@ -875,50 +875,30 @@
\allowdisplaybreaks[4]
\cs_gset:Npn \ULthickness{.75pt}
\skip_set:Nn \jot{4pt plus 1pt minus 1pt}
-\cs_new:Npn \l__math_restore:n #1
+\cs_new_protected:Npn \l__math_restore:n #1
{
\AtBeginEnvironment{#1}
- {\linespread{\l__math_spread_tl}\selectfont\ignorespaces}
+ {\linespread{\fp_use:N \l__math_spread_fp}\selectfont\ignorespaces}
}
-\l__math_restore:n {array}
-\l__math_restore:n {matrix}
-\l__math_restore:n {pmatrix}
-\l__math_restore:n {bmatrix}
-\l__math_restore:n {Bmatrix}
-\l__math_restore:n {vmatrix}
-\l__math_restore:n {Vmatrix}
-\l__math_restore:n {cases}
-\l__math_restore:n {aligned}
-\l__math_restore:n {alignedat}
-\l__math_restore:n {gathered}
+\clist_map_inline:nn
+ {
+ {array},{matrix},{pmatrix},{bmatrix},{Bmatrix},{vmatrix},{Vmatrix},
+ {matrix*},{pmatrix*},{bmatrix*},{Bmatrix*},{vmatrix*},{Vmatrix*},
+ {cases},{cases*},{dcases},{dcases*},{rcases},{rcases*},{drcases},{drcases*},
+ {aligned},{alignedat},{gathered},{multlined},{lgathered},{rgathered}
+ }{\l__math_restore:n {#1}}
\__patch_cmd:Nnn \start at gather
{\collect at body}
- {\linespread{\l__math_spread_tl}\selectfont\collect at body}
+ {\linespread{\fp_use:N \l__math_spread_fp}\selectfont\collect at body}
\__patch_cmd:Nnn \start at align
{\collect at body}
- {\linespread{\l__math_spread_tl}\selectfont\collect at body}
+ {\linespread{\fp_use:N \l__math_spread_fp}\selectfont\collect at body}
\__patch_cmd:Nnn \start at multline
{\collect at body}
- {\linespread{\l__math_spread_tl}\selectfont\collect at body}
+ {\linespread{\fp_use:N \l__math_spread_fp}\selectfont\collect at body}
\__patch_cmd:Nnn \gather at split
{\spread at equation}
- {\linespread{\l__math_spread_tl}\selectfont\spread at equation}
-\l__math_restore:n {matrix*}
-\l__math_restore:n {pmatrix*}
-\l__math_restore:n {bmatrix*}
-\l__math_restore:n {Bmatrix*}
-\l__math_restore:n {vmatrix*}
-\l__math_restore:n {Vmatrix*}
-\l__math_restore:n {cases*}
-\l__math_restore:n {dcases}
-\l__math_restore:n {dcases*}
-\l__math_restore:n {rcases}
-\l__math_restore:n {rcases*}
-\l__math_restore:n {drcases}
-\l__math_restore:n {drcases*}
-\l__math_restore:n {multlined}
-\l__math_restore:n {lgathered}
-\l__math_restore:n {rgathered}
+ {\linespread{\fp_use:N \l__math_spread_fp}\selectfont\spread at equation}
\ctex_after_end_preamble:n
{
\skip_set:Nn \abovedisplayskip{5pt plus 1pt minus 1pt}
@@ -1139,7 +1119,7 @@
\skip_set:Nn \footnotemargin{0.5\ccwd}
\group_begin:
\footnotesize
- \exp_args:Nx \linespread{\tl_use:N \l__foot_spread_tl}\selectfont
+ \exp_args:Nx \linespread{\fp_use:N \l__foot_spread_fp}\selectfont
\skip_gset:Nn \footnotesep{\ht\strutbox}
\group_end:
\cs_gset:Npn \hangfootparskip{0ex}
@@ -1165,10 +1145,10 @@
}
\__patch_cmd:Nnn \@footnotetext
{\reset at font}
- {\def\baselinestretch{\l__foot_spread_tl}\l__foot_font_tl}
+ {\def\baselinestretch{\fp_use:N \l__foot_spread_fp}\l__foot_font_tl}
\__patch_cmd:Nnn \@mpfootnotetext
{\reset at font}
- {\def\baselinestretch{\l__foot_spread_tl}\l__foot_font_tl}
+ {\def\baselinestretch{\fp_use:N \l__foot_spread_fp}\l__foot_font_tl}
\__patch_cmd:Nnn \@makefnmark
{\normalfont}{\l__foot_font_tl}
\cs_gset:Npn \marginfont{\l__margin_font_tl}
More information about the tex-live-commits
mailing list.