summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2024-02-16 21:04:46 +0000
committerKarl Berry <karl@freefriends.org>2024-02-16 21:04:46 +0000
commit0de1f21b378d12318976cefba1fcda96bfc705b5 (patch)
tree2579e24e408c19616805d301b0e9164aec347183
parent1cf06ba3b14d2dc7be3174069138cf6889ec0b15 (diff)
easybook spbmark (16feb24)
git-svn-id: svn://tug.org/texlive/trunk@69907 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/easybook/easybook.pdfbin594429 -> 598997 bytes
-rw-r--r--Master/texmf-dist/doc/latex/easybook/easybook.tex13
-rw-r--r--Master/texmf-dist/doc/latex/spbmark/spbmark.pdfbin93819 -> 93842 bytes
-rw-r--r--Master/texmf-dist/doc/latex/spbmark/spbmark.tex10
-rw-r--r--Master/texmf-dist/source/latex/easybook/easybook.dtx17
-rw-r--r--Master/texmf-dist/tex/latex/easybook/easybase.sty13
-rw-r--r--Master/texmf-dist/tex/latex/easybook/easybook.cls2
-rw-r--r--Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg2
-rw-r--r--Master/texmf-dist/tex/latex/spbmark/spbmark.sty2
9 files changed, 44 insertions, 15 deletions
diff --git a/Master/texmf-dist/doc/latex/easybook/easybook.pdf b/Master/texmf-dist/doc/latex/easybook/easybook.pdf
index 1cb2868c87f..dbddf2a96cb 100644
--- a/Master/texmf-dist/doc/latex/easybook/easybook.pdf
+++ b/Master/texmf-dist/doc/latex/easybook/easybook.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/easybook/easybook.tex b/Master/texmf-dist/doc/latex/easybook/easybook.tex
index a1ddad3ca6c..3a725ee03c5 100644
--- a/Master/texmf-dist/doc/latex/easybook/easybook.tex
+++ b/Master/texmf-dist/doc/latex/easybook/easybook.tex
@@ -23,8 +23,8 @@
name = easybook,
color-scheme = blue,
title = EASYBOOK使用手册,
- version = v2024ac,
- date = 2024/02/12,
+ version = v2024ad,
+ date = 2024/02/16,
authors = 瞿毅,
info = 简便地排版中文学位论文或书籍,
email = toquyi@163.com,
@@ -1083,6 +1083,12 @@
\begin{commands}
\command{hangpara}[\marg{缩进长度}\marg{缩进开始行数}]
悬挂缩进命令 \cs{hangpara} 使其后的一个段落保持悬挂缩进。参数与 \env{hangparas} 环境相同,不过只有一个段落。\meta{缩进长度} 可以是带单位的数值或由文本长度测定命令 \cs{widthof} 提供。
+ \command{hangfrom}[\sarg\oarg{缩进长度}\marg{悬挂内容}\oarg{缩进开始行数}]\newtag%
+ 指定首行的 \meta{悬挂内容},其后一个段落保持悬挂缩进。\meta{缩进长度} 默认为 \meta{悬挂内容} 文本长度 \cs{hangwd} 的值,支持数学表达式。\meta{缩进开始行数} 默认为 \code{1}。如果是带有星号参数的命令,则首行不输出 \meta{悬挂内容},以等于 \meta{缩进长度} 长度的空白代替。
+ \begin{ctexexam}
+ \hangfrom[\hangwd + 1em]{悬挂标签\hspace{0.5em}}[1]
+ \hangfrom*[3em]{}
+ \end{ctexexam}
\end{commands}
\begin{environments}
@@ -1352,12 +1358,13 @@
\shortversion{v = 1.638,date = 2022/03/04,changes = 增加目录条目样式选项注册命令 \cs{RegisterTocName}。}
\shortversion{v = 1.644,date = 2022/03/10,changes = 增加浮动环境目录声明命令 \cs{DeclareFloatList} 配合 \pkg*{caption} 宏包。}
\shortversion{v = 1.682,date = 2022/05/01,changes = 将迷你页判断命令 \cs{notminipage} 改为被保护命令兼容 \pkg*{circledtext} 宏包。}
- \begin{version}[v = 2024ac,date = 2024/02/12,simple]
+ \begin{version}[v = 2024ad,date = 2024/02/16,simple]
\item 核对依赖宏包的更新改动,优化使用手册的内容细节。
\item 修复图表等浮动环境题注目录中条目标签编号的计数器值显示错误问题。
\item 修复附录命令 \cs{appendix} 的可选参数设置英文目录中条目名字和编号失效的问题。
\item 新增目录风格定义命令 \cs{SetTocStyle} 和使用命令 \cs{UseTocStyle}。
\item 新增脚注段落文本格式定义命令 \cs{deffntpara} 和脚注间距离选项 \option{footnotesep}。
+ \item 新增悬挂缩进命令 \cs{hangfrom}。
\end{version}
\end{changelog}
\nocite{*}
diff --git a/Master/texmf-dist/doc/latex/spbmark/spbmark.pdf b/Master/texmf-dist/doc/latex/spbmark/spbmark.pdf
index 2a9f56f6c25..2f512d8f75d 100644
--- a/Master/texmf-dist/doc/latex/spbmark/spbmark.pdf
+++ b/Master/texmf-dist/doc/latex/spbmark/spbmark.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/spbmark/spbmark.tex b/Master/texmf-dist/doc/latex/spbmark/spbmark.tex
index 9fbf4962cfe..32352378224 100644
--- a/Master/texmf-dist/doc/latex/spbmark/spbmark.tex
+++ b/Master/texmf-dist/doc/latex/spbmark/spbmark.tex
@@ -7,8 +7,8 @@
{
package = spbmark,
title = the spbmark package,
- version = v1.46d,
- date = 2024/02/13,
+ version = v1.46e,
+ date = 2024/02/16,
authors = Qu Yi,
info = Customize superscript and subscript,
email = toquyi@163.com,
@@ -163,8 +163,8 @@ The options common to \meta{kv list} of the three commands are as follows. They
\keyval{regex}{regular expression}\newtag%
After using the superscript or subscript command, this option is used to determine whether the \textcolor{red}{following} tokens match the \meta{regular expression}. If it does \textcolor{red}{not}, the width of the this marker returns to zero.
\begin{example}[code-only]
- \newcommand{\mysp}[2][]{\super[regex=\c{mysb},#2]{#1}}
- \newcommand{\mysb}[2][]{\sub[regex=\c{mysp},#2]{#1}}
+ \newcommand{\mysp}[2][]{\super[regex=\c{mysb},#1]{#2}}
+ \newcommand{\mysb}[2][]{\sub[regex=\c{mysp},#1]{#2}}
\end{example}
\end{options}
@@ -215,7 +215,7 @@ The following list of keys control the format both of superscript \emph{or} subs
After the subscript command is used, the regular expression rules of the following tokens are matched. See Section \ref{sec:user commands} for the meaning of this option.
\end{options}
-If \option{sphmove} is positive, the superscript or subscript moves to the right, conversely it moves to the left. The positive direction of vertical offset of subscript and superscript is opposite. For superscript, if \option{spvmove} is positive, the superscript moves up, conversely it moves down. For subscript, if \option{spvmove} is positive, the subscript moves down, conversely it moves up.
+If \option{sphmove} is positive, the superscript or subscript moves to the right, conversely it moves to the left. The positive direction of vertical offset of subscript and superscript is \textcolor{red}{opposite}. For superscript, if \option{spvmove} is positive, the superscript moves up, conversely it moves down. For subscript, if \option{spvmove} is positive, the subscript moves down, conversely it moves up.
The following list of keys control the format of superscript \emph{and} subscript.
\begin{options}
diff --git a/Master/texmf-dist/source/latex/easybook/easybook.dtx b/Master/texmf-dist/source/latex/easybook/easybook.dtx
index 16f5b792c01..a69d7de48bc 100644
--- a/Master/texmf-dist/source/latex/easybook/easybook.dtx
+++ b/Master/texmf-dist/source/latex/easybook/easybook.dtx
@@ -15,7 +15,7 @@
%<*class>
\NeedsTeXFormat{LaTeX2e}[2021/11/15]
\RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2024/02/12}{2024ac}
+\ProvidesExplClass{easybook}{2024/02/16}{2024ad}
{Easily typesetting Chinese theses or books}
\bool_set_false:N \l__eb_compile_draft_bool
@@ -297,7 +297,7 @@
%<*package>
\NeedsTeXFormat{LaTeX2e}[2021/11/15]
\RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2024/02/12}{2024ac}
+\ProvidesExplPackage{easybase}{2024/02/16}{2024ad}
{Easily typesetting Chinese theses or books}
\cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -1831,12 +1831,23 @@
\everymath{\displaystyle}
\DeclareGraphicsExtensions{.pdf,.png,.jpg,.eps,.tif}
+\dim_new:N \hangwd
\cs_set_protected:Npn \hangpara #1#2
{
\dim_set:Nn \hangindent {#1}
\int_set:Nn \hangafter {#2}
\noindent\ignorespaces
}
+\NewDocumentCommand{\hangfrom}{sO{\hangwd}mO{1}}
+ {
+ \hbox_set:Nn \l_tmpa_box {#3}
+ \dim_set:Nn \hangwd { \box_wd:N \l_tmpa_box }
+ \hangpara{#2}{#4}
+ \IfBooleanTF{#1}
+ {\hbox_to_wd:nn {#2} { }}
+ {\box_use_drop:N \l_tmpa_box}
+ \ignorespaces
+ }
\DeclareDocumentEnvironment{hangparas}{mm+b}
{
\dim_zero:N \parindent
@@ -2341,7 +2352,7 @@
}
%</package>
%<*tcolorbox>
-\ProvidesExplFile{eb-tcolorbox.cfg}{2024/02/12}{2024ac}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2024/02/16}{2024ad}
{Customization of tcolorbox for easybook}
\cs_set_protected:Npn \addtotcbstyle #1#2
diff --git a/Master/texmf-dist/tex/latex/easybook/easybase.sty b/Master/texmf-dist/tex/latex/easybook/easybase.sty
index 03e40595877..9fac3e3a21c 100644
--- a/Master/texmf-dist/tex/latex/easybook/easybase.sty
+++ b/Master/texmf-dist/tex/latex/easybook/easybase.sty
@@ -20,7 +20,7 @@
%% This work has the LPPL maintenance status `maintained'.
\NeedsTeXFormat{LaTeX2e}[2021/11/15]
\RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2024/02/12}{2024ac}
+\ProvidesExplPackage{easybase}{2024/02/16}{2024ad}
{Easily typesetting Chinese theses or books}
\cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -1554,12 +1554,23 @@
\everymath{\displaystyle}
\DeclareGraphicsExtensions{.pdf,.png,.jpg,.eps,.tif}
+\dim_new:N \hangwd
\cs_set_protected:Npn \hangpara #1#2
{
\dim_set:Nn \hangindent {#1}
\int_set:Nn \hangafter {#2}
\noindent\ignorespaces
}
+\NewDocumentCommand{\hangfrom}{sO{\hangwd}mO{1}}
+ {
+ \hbox_set:Nn \l_tmpa_box {#3}
+ \dim_set:Nn \hangwd { \box_wd:N \l_tmpa_box }
+ \hangpara{#2}{#4}
+ \IfBooleanTF{#1}
+ {\hbox_to_wd:nn {#2} { }}
+ {\box_use_drop:N \l_tmpa_box}
+ \ignorespaces
+ }
\DeclareDocumentEnvironment{hangparas}{mm+b}
{
\dim_zero:N \parindent
diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls
index 3b9fdf57a60..0a52ccb2eab 100644
--- a/Master/texmf-dist/tex/latex/easybook/easybook.cls
+++ b/Master/texmf-dist/tex/latex/easybook/easybook.cls
@@ -20,7 +20,7 @@
%% This work has the LPPL maintenance status `maintained'.
\NeedsTeXFormat{LaTeX2e}[2021/11/15]
\RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2024/02/12}{2024ac}
+\ProvidesExplClass{easybook}{2024/02/16}{2024ad}
{Easily typesetting Chinese theses or books}
\bool_set_false:N \l__eb_compile_draft_bool
diff --git a/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg b/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg
index 36ff2218e14..21290f966ae 100644
--- a/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg
+++ b/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg
@@ -18,7 +18,7 @@
%% LaTeX version 2005/12/01 or later.
%%
%% This work has the LPPL maintenance status `maintained'.
-\ProvidesExplFile{eb-tcolorbox.cfg}{2024/02/12}{2024ac}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2024/02/16}{2024ad}
{Customization of tcolorbox for easybook}
\cs_set_protected:Npn \addtotcbstyle #1#2
diff --git a/Master/texmf-dist/tex/latex/spbmark/spbmark.sty b/Master/texmf-dist/tex/latex/spbmark/spbmark.sty
index 41fa6ea8b1a..117a0e167b6 100644
--- a/Master/texmf-dist/tex/latex/spbmark/spbmark.sty
+++ b/Master/texmf-dist/tex/latex/spbmark/spbmark.sty
@@ -9,7 +9,7 @@
% https://creativecommons.org/licenses/by/4.0/legalcode
\NeedsTeXFormat{LaTeX2e}[2018/12/31]
\RequirePackage{xparse,l3keys2e}
-\ProvidesExplPackage{spbmark}{2024/02/13}{1.46d}
+\ProvidesExplPackage{spbmark}{2024/02/16}{1.46e}
{Customize superscripts and subscripts}
\cs_generate_variant:Nn \box_set_ht:Nn { cv }