texlive[61141] Master/texmf-dist: easybook (24nov21)
commits+karl at tug.org
commits+karl at tug.org
Wed Nov 24 22:29:28 CET 2021
Revision: 61141
http://tug.org/svn/texlive?view=revision&revision=61141
Author: karl
Date: 2021-11-24 22:29:28 +0100 (Wed, 24 Nov 2021)
Log Message:
-----------
easybook (24nov21)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/easybook/easybook.pdf
trunk/Master/texmf-dist/doc/latex/easybook/easybook.tex
trunk/Master/texmf-dist/source/latex/easybook/easybook.dtx
trunk/Master/texmf-dist/tex/latex/easybook/easybase.sty
trunk/Master/texmf-dist/tex/latex/easybook/easybook.cls
trunk/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg
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-11-24 21:29:09 UTC (rev 61140)
+++ trunk/Master/texmf-dist/doc/latex/easybook/easybook.tex 2021-11-24 21:29:28 UTC (rev 61141)
@@ -20,8 +20,8 @@
name = easybook,
color-scheme = blue,
title = EASYBOOK 使用手册,
- version = v1.40V,
- date = 2021/11/22,
+ version = v1.40X,
+ date = 2021/11/24,
authors = 瞿毅,
info = 排版简体中文学位论文和书籍,
email = q1jx at foxmail.com,
@@ -1106,7 +1106,7 @@
\begin{commands}\noitemsep
\command{newcounter}[\marg{计数器}\oarg{父计数器}]\default{}
\command{counteruse}[\sarg\oarg{父计数器}\darg{编号}\marg{计数器}\oarg{分隔符}\darg{整数}]
- 命令 \cs{newcounter} 是 \LaTeX 自带的创建计数器命令，计数器值输出命令 \cs{counteruse} 以一定的格式使用由它创建的计数器，将会以 \cs*{the}\meta{父计数器}\meta{分隔符}\cs*{the}\meta{计数器} 输出这种计数器的值。命令 \cs{counteruse} 仅具有\textbf{输出功能}，并不会改变计数器原有的绑定关系。默认每使用一次命令 \meta{计数器} 的值增加 1，带有星号的命令使 \meta{计数器} 值保持不变，\meta{编号} 为 \code{arabic} 或 \code{alpha} 等形式，\meta{计数器} 的值也可以设为指定的 \meta{整数}。
+ 命令 \cs{newcounter} 是 \LaTeX 自带的创建计数器命令，计数器值输出命令 \cs{counteruse} 以一定的格式使用由它创建的计数器，将会以 \cs*{the}\meta{父计数器}\meta{分隔符}\cs*{the}\meta{计数器} 输出这种计数器的值。命令 \cs{counteruse} 仅具有\textbf{输出功能}，并不会改变计数器原有的绑定关系。默认每使用一次命令 \meta{计数器} 的值增加 1，带有星号的命令使 \meta{计数器} 值保持不变，\meta{计数器} 的值也可以设为指定的 \meta{整数}。计数器的 \meta{编号} 为 \code{arabic} 或 \code{alph} 等计数形式。
在一定的场合下可能用到 \cs{counteruse} 命令，比如通过新建快捷命令在一些位置使用定理环境的计数器，使用 \cs{labelformat} 设置计数器的引用标签需添加 \code{eb@}：
\begin{ctexexam}
Modified: trunk/Master/texmf-dist/source/latex/easybook/easybook.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/easybook/easybook.dtx 2021-11-24 21:29:09 UTC (rev 61140)
+++ trunk/Master/texmf-dist/source/latex/easybook/easybook.dtx 2021-11-24 21:29:28 UTC (rev 61141)
@@ -15,7 +15,7 @@
%<*class>
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2021/11/22}{1.40V}
+\ProvidesExplClass{easybook}{2021/11/24}{1.40X}
{Typeset Chinese theses or books}
\bool_set_false:N \l__eb_compile_draft_bool
@@ -325,7 +325,7 @@
%<*package>
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2021/11/22}{1.40V}
+\ProvidesExplPackage{easybase}{2021/11/24}{1.40X}
{Typeset Chinese theses or books}
\cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -1854,7 +1854,6 @@
\cs_new_protected:Npn \seteqcomp #1
{ \keys_set:nn { eb/eqcomp} {#1} }
-\cs_new:Npn \eb at itembox { \item\makebox }
\cs_new:Npn \eb_eqsymb_left_margin_calc:
{
\hbox_set:Nn \l_tmpa_box { \l__eb_eqsymb_delim_tl }
@@ -1876,27 +1875,38 @@
#3
\end{eb at eqcomp@list}
}{}
+\cs_new_protected:Npn \eb_eqsymb_format_mark:n #1
+ {
+ \tl_use:N \l__eb_eqsymb_font_tl
+ {
+ \tl_if_eq:NnT \l__eb_eqsymb_mode_tl { math }
+ { \ensuremath }{#1}
+ }
+ }
+\cs_new_protected:Npn \eb_eqsymb_space_delim:nn #1#2
+ {
+ \hspace{\l__eb_eqsymb_space_dim}
+ \IfBooleanTF{#1}
+ {\makebox{#2}}
+ {\makebox[\box_wd:N \l_tmpa_box][\l__eb_eqsymb_delim_align_tl]{#2}}
+ \hspace{\l__eb_eqsymb_space_dim}
+ }
+\cs_new_protected:Npn \eb at itembox { \item\makebox }
\NewDocumentCommand{\symb}{smO{\l__eb_eqsymb_delim_tl}}
{
\IfBooleanTF{#1}
{
- \eb_eqsymb_left_margin_calc:
- \makebox
+ \eb_eqsymb_format_mark:n {#2}
+ \eb_eqsymb_space_delim:nn {#1} {#3}
}
- {\eb at itembox}[\l_tmpa_dim]
{
- \makebox[\box_wd:N \l_tmpb_box]{\l__eb_eqsymb_intro_tl}
- \makebox[\l__eb_eqsymb_width_dim][\l__eb_eqsymb_item_align_tl]
+ \eb at itembox[\l_tmpa_dim]
{
- \tl_use:N \l__eb_eqsymb_font_tl
- {
- \tl_if_eq:NnT \l__eb_eqsymb_mode_tl { math }
- { \ensuremath }{#2}
- }
+ \makebox[\box_wd:N \l_tmpb_box]{\l__eb_eqsymb_intro_tl}
+ \makebox[\l__eb_eqsymb_width_dim][\l__eb_eqsymb_item_align_tl]
+ {\eb_eqsymb_format_mark:n {#2}}
+ \eb_eqsymb_space_delim:nn {#1} {#3}
}
- \hspace{\l__eb_eqsymb_space_dim}
- \makebox[\box_wd:N \l_tmpa_box][\l__eb_eqsymb_delim_align_tl]{#3}
- \hspace{\l__eb_eqsymb_space_dim}
}
\tl_clear:N \l__eb_eqsymb_intro_tl
\ignorespaces
@@ -1918,7 +1928,7 @@
\cs_set_eq:NN \newtheorem \declaretheorem
\cs_new_protected:Npn \eb_if_thmframe_with_tcolorbox:TF #1#2
{
- \bool_if:NT \l__eb_thmframe_bool
+ \bool_if:NT \l__eb_thm_frame_bool
{ \@ifpackageloaded{tcolorbox}{#1}{#2} }
}
\NewDocumentCommand{\deftheorem}
@@ -1954,7 +1964,7 @@
{ \ctex_define:nn { thmset } { #1 .tl_set:N = #2 } }
\ctex_define:nn { thmset }
{
- thmframe .bool_set:N = \l__eb_thmframe_bool,
+ thmframe .bool_set:N = \l__eb_thm_frame_bool,
thmframe .default:n = true,
thmframe .initial:n = false,
thmbox .meta:n = { thmframe = #1 },
@@ -2370,7 +2380,7 @@
}
%</package>
%<*tcolorbox>
-\ProvidesExplFile{eb-tcolorbox.cfg}{2021/11/22}{1.40V}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2021/11/24}{1.40X}
{Customization of tcolorbox for easybook}
\cs_set_protected:Npn \setexercise #1
@@ -2465,7 +2475,7 @@
\newtcbstyle{tc-ebfbox}
{
on~line,sharpish~corners,
- top = 2pt,bottom = 2pt,left = 1pt,right = 1pt,
+ top = 1.5pt,bottom = 1.5pt,left = 1pt,right = 1pt,
boxrule = 0.5pt,leftrule = 0pt,rightrule = 0pt
}
\tcbset
Modified: trunk/Master/texmf-dist/tex/latex/easybook/easybase.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/easybook/easybase.sty 2021-11-24 21:29:09 UTC (rev 61140)
+++ trunk/Master/texmf-dist/tex/latex/easybook/easybase.sty 2021-11-24 21:29:28 UTC (rev 61141)
@@ -20,7 +20,7 @@
%% This work has the LPPL maintenance status `maintained'.
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2021/11/22}{1.40V}
+\ProvidesExplPackage{easybase}{2021/11/24}{1.40X}
{Typeset Chinese theses or books}
\cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -1549,7 +1549,6 @@
\cs_new_protected:Npn \seteqcomp #1
{ \keys_set:nn { eb/eqcomp} {#1} }
-\cs_new:Npn \eb at itembox { \item\makebox }
\cs_new:Npn \eb_eqsymb_left_margin_calc:
{
\hbox_set:Nn \l_tmpa_box { \l__eb_eqsymb_delim_tl }
@@ -1571,27 +1570,38 @@
#3
\end{eb at eqcomp@list}
}{}
+\cs_new_protected:Npn \eb_eqsymb_format_mark:n #1
+ {
+ \tl_use:N \l__eb_eqsymb_font_tl
+ {
+ \tl_if_eq:NnT \l__eb_eqsymb_mode_tl { math }
+ { \ensuremath }{#1}
+ }
+ }
+\cs_new_protected:Npn \eb_eqsymb_space_delim:nn #1#2
+ {
+ \hspace{\l__eb_eqsymb_space_dim}
+ \IfBooleanTF{#1}
+ {\makebox{#2}}
+ {\makebox[\box_wd:N \l_tmpa_box][\l__eb_eqsymb_delim_align_tl]{#2}}
+ \hspace{\l__eb_eqsymb_space_dim}
+ }
+\cs_new_protected:Npn \eb at itembox { \item\makebox }
\NewDocumentCommand{\symb}{smO{\l__eb_eqsymb_delim_tl}}
{
\IfBooleanTF{#1}
{
- \eb_eqsymb_left_margin_calc:
- \makebox
+ \eb_eqsymb_format_mark:n {#2}
+ \eb_eqsymb_space_delim:nn {#1} {#3}
}
- {\eb at itembox}[\l_tmpa_dim]
{
- \makebox[\box_wd:N \l_tmpb_box]{\l__eb_eqsymb_intro_tl}
- \makebox[\l__eb_eqsymb_width_dim][\l__eb_eqsymb_item_align_tl]
+ \eb at itembox[\l_tmpa_dim]
{
- \tl_use:N \l__eb_eqsymb_font_tl
- {
- \tl_if_eq:NnT \l__eb_eqsymb_mode_tl { math }
- { \ensuremath }{#2}
- }
+ \makebox[\box_wd:N \l_tmpb_box]{\l__eb_eqsymb_intro_tl}
+ \makebox[\l__eb_eqsymb_width_dim][\l__eb_eqsymb_item_align_tl]
+ {\eb_eqsymb_format_mark:n {#2}}
+ \eb_eqsymb_space_delim:nn {#1} {#3}
}
- \hspace{\l__eb_eqsymb_space_dim}
- \makebox[\box_wd:N \l_tmpa_box][\l__eb_eqsymb_delim_align_tl]{#3}
- \hspace{\l__eb_eqsymb_space_dim}
}
\tl_clear:N \l__eb_eqsymb_intro_tl
\ignorespaces
@@ -1613,7 +1623,7 @@
\cs_set_eq:NN \newtheorem \declaretheorem
\cs_new_protected:Npn \eb_if_thmframe_with_tcolorbox:TF #1#2
{
- \bool_if:NT \l__eb_thmframe_bool
+ \bool_if:NT \l__eb_thm_frame_bool
{ \@ifpackageloaded{tcolorbox}{#1}{#2} }
}
\NewDocumentCommand{\deftheorem}
@@ -1649,7 +1659,7 @@
{ \ctex_define:nn { thmset } { #1 .tl_set:N = #2 } }
\ctex_define:nn { thmset }
{
- thmframe .bool_set:N = \l__eb_thmframe_bool,
+ thmframe .bool_set:N = \l__eb_thm_frame_bool,
thmframe .default:n = true,
thmframe .initial:n = false,
thmbox .meta:n = { thmframe = #1 },
Modified: trunk/Master/texmf-dist/tex/latex/easybook/easybook.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/easybook/easybook.cls 2021-11-24 21:29:09 UTC (rev 61140)
+++ trunk/Master/texmf-dist/tex/latex/easybook/easybook.cls 2021-11-24 21:29:28 UTC (rev 61141)
@@ -20,7 +20,7 @@
%% This work has the LPPL maintenance status `maintained'.
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2021/11/22}{1.40V}
+\ProvidesExplClass{easybook}{2021/11/24}{1.40X}
{Typeset Chinese theses or books}
\bool_set_false:N \l__eb_compile_draft_bool
Modified: trunk/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg
===================================================================
--- trunk/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg 2021-11-24 21:29:09 UTC (rev 61140)
+++ trunk/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg 2021-11-24 21:29:28 UTC (rev 61141)
@@ -18,7 +18,7 @@
%% LaTeX version 2005/12/01 or later.
%%
%% This work has the LPPL maintenance status `maintained'.
-\ProvidesExplFile{eb-tcolorbox.cfg}{2021/11/22}{1.40V}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2021/11/24}{1.40X}
{Customization of tcolorbox for easybook}
\cs_set_protected:Npn \setexercise #1
@@ -113,7 +113,7 @@
\newtcbstyle{tc-ebfbox}
{
on~line,sharpish~corners,
- top = 2pt,bottom = 2pt,left = 1pt,right = 1pt,
+ top = 1.5pt,bottom = 1.5pt,left = 1pt,right = 1pt,
boxrule = 0.5pt,leftrule = 0pt,rightrule = 0pt
}
\tcbset
More information about the tex-live-commits
mailing list.