summaryrefslogtreecommitdiff
path: root/macros/latex
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2024-06-22 03:01:39 +0000
committerNorbert Preining <norbert@preining.info>2024-06-22 03:01:39 +0000
commit4012cf5682cd4d2571914ef5de72cf8b933b4b0f (patch)
treef6904c52972a04a1cfd3a15185baa70378c47b7b /macros/latex
parent1a73c17aff5d228648d20cd009d2017c56795fe3 (diff)
CTAN sync 202406220301
Diffstat (limited to 'macros/latex')
-rw-r--r--macros/latex/contrib/easybook/README.md4
-rw-r--r--macros/latex/contrib/easybook/easybook.dtx6
-rw-r--r--macros/latex/contrib/easybook/easybook.pdfbin622189 -> 622175 bytes
-rw-r--r--macros/latex/contrib/easybook/easybook.tex16
-rw-r--r--macros/latex/contrib/spbmark/README.md10
-rw-r--r--macros/latex/contrib/spbmark/spbmark.pdfbin91750 -> 93123 bytes
-rw-r--r--macros/latex/contrib/spbmark/spbmark.sty48
-rw-r--r--macros/latex/contrib/spbmark/spbmark.tex33
8 files changed, 84 insertions, 33 deletions
diff --git a/macros/latex/contrib/easybook/README.md b/macros/latex/contrib/easybook/README.md
index 41cd3ae1dd..9271e95dda 100644
--- a/macros/latex/contrib/easybook/README.md
+++ b/macros/latex/contrib/easybook/README.md
@@ -1,5 +1,5 @@
-# `easybook` document class
-Easily typesetting Chinese theses or books (v2024cg)
+# The `easybook` document class
+Easily typesetting Chinese theses or books (v2024ch)
## Abstract
`easybook` is a pure academic template created based on the `ctexbook` book document class. It also has the functions of `book` and `article` document class. Combined with the general framework design of the theses of many universities in China, providing multiple commands and interfaces allows users to easily customize the theses templates. Its basic macro package `easybase` can also be used with `ctex` and standard document classes.
diff --git a/macros/latex/contrib/easybook/easybook.dtx b/macros/latex/contrib/easybook/easybook.dtx
index 8bdec3e16d..e39c80ee84 100644
--- a/macros/latex/contrib/easybook/easybook.dtx
+++ b/macros/latex/contrib/easybook/easybook.dtx
@@ -14,7 +14,7 @@
% This work has the LPPL maintenance status `maintained'.
%<class|package>\NeedsTeXFormat{LaTeX2e}[2021/11/15]
%<*class>
-\ProvidesExplClass{easybook}{2024/06/20}{2024cg}
+\ProvidesExplClass{easybook}{2024/06/20}{2024ch}
{Easily typesetting Chinese theses or books}
\bool_new:N \l__eb_compile_draft_bool
@@ -300,7 +300,7 @@
%</class>
%<*package>
\RequirePackage{etoolbox}
-\ProvidesExplPackage{easybase}{2024/06/20}{2024cg}
+\ProvidesExplPackage{easybase}{2024/06/20}{2024ch}
{Easily typesetting Chinese theses or books}
\cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -2625,7 +2625,7 @@
}
%</package>
%<*tcolorbox>
-\ProvidesExplFile{eb-tcolorbox.cfg}{2024/06/20}{2024cg}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2024/06/20}{2024ch}
{Customization of tcolorbox for easybook}
\cs_set_protected:Npn \addtotcbstyle #1#2
diff --git a/macros/latex/contrib/easybook/easybook.pdf b/macros/latex/contrib/easybook/easybook.pdf
index 0d63bf8eea..d579c93843 100644
--- a/macros/latex/contrib/easybook/easybook.pdf
+++ b/macros/latex/contrib/easybook/easybook.pdf
Binary files differ
diff --git a/macros/latex/contrib/easybook/easybook.tex b/macros/latex/contrib/easybook/easybook.tex
index 5098a304a7..ca0bcee595 100644
--- a/macros/latex/contrib/easybook/easybook.tex
+++ b/macros/latex/contrib/easybook/easybook.tex
@@ -23,8 +23,8 @@
name = easybook,
color-scheme = blue,
title = EASYBOOK使用手册,
- version = v2024cg,
- date = 2024/06/20,
+ version = v2024ch,
+ date = 2024/06/21,
authors = 瞿毅,
info = 简便地排版中文学位论文或书籍,
email = toquyi@163.com,
@@ -50,10 +50,10 @@
\DeclareFieldFormat[book]{title}{\textsf{#1}}
\geometry{margin = 1in,marginparwidth = 0.6in,footskip = 0.5in}
\renewlist{cnltxlist}{description}{2}
-\SetEnumitemValue{label}{smallbullet}{\small\color{DarkBlue}\textbullet}
+\SetEnumitemValue{label}{textbullet}{\color{DarkBlue}\textbullet}
\setlist{nosep,topsep = \smallskipamount,labelsep = 0.5em}
-\setlist[1]{labelindent = \parindent}
-\setlist[itemize,1]{label = smallbullet,leftmargin = *}
+\setlist[1]{labelindent = \parindent,leftmargin = *}
+\setlist[itemize,1]{label = textbullet}
\setlist[cnltxlist]
{
leftmargin = 0pt,
@@ -188,6 +188,12 @@
\def\keylit{\@cnltx@option@item\keyis}
\def\keychoice{\@cnltx@option@item\choicekey}
\def\keybool{\@cnltx@option@item\boolkey}
+\renewenvironment{changelogdescription}
+ {\begin{description}[leftmargin = \parindent]}
+ {\end{description}}
+\renewenvironment{changelogitemize}
+ {\begin{itemize}[leftmargin = *]}
+ {\end{itemize}}
\makeatother\ExplSyntaxOff
\labelformat{section}{节#1}
\labelformat{subsection}{小节#1}
diff --git a/macros/latex/contrib/spbmark/README.md b/macros/latex/contrib/spbmark/README.md
index fb09a7b7a9..0fd0ff2371 100644
--- a/macros/latex/contrib/spbmark/README.md
+++ b/macros/latex/contrib/spbmark/README.md
@@ -1,11 +1,15 @@
-# The spbmark package
+# The `spbmark` package
+Customize superscripts and subscripts (v1.46k)
+## Abstract
`spbmark` provides three commands `\super`, `\sub` and `\supersub` to improve the layout of superscripts and subscripts which can be adjusted the relative position and format, and can be used in text and math mode.
## License
-
This work may be distributed and/or modified under the conditions of the CC-BY 4.0 License. The latest version of this license is in https://creativecommons.org/licenses/by/4.0/legalcode
## Website
+| [Gitee](https://gitee.com/texno3/spbmark) | [Github](https://github.com/texno3/spbmark) | [CTAN](https://ctan.org/pkg/spbmark) |
-| [Gitee](https://gitee.com/texno3/spbmark) | [Github](https://github.com/texno3/spbmark) | [CTAN](https://ctan.org/pkg/spbmark) | \ No newline at end of file
+## Maintainer
+QuYi<br/>
+Email: toquyi@163.com \ No newline at end of file
diff --git a/macros/latex/contrib/spbmark/spbmark.pdf b/macros/latex/contrib/spbmark/spbmark.pdf
index 8242e5e3bf..f17405570b 100644
--- a/macros/latex/contrib/spbmark/spbmark.pdf
+++ b/macros/latex/contrib/spbmark/spbmark.pdf
Binary files differ
diff --git a/macros/latex/contrib/spbmark/spbmark.sty b/macros/latex/contrib/spbmark/spbmark.sty
index c1ce4837a5..fa10c8410f 100644
--- a/macros/latex/contrib/spbmark/spbmark.sty
+++ b/macros/latex/contrib/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/05/19}{1.46j}
+\ProvidesExplPackage{spbmark}{2024/06/21}{1.46k}
{Customize superscripts and subscripts}
\cs_generate_variant:Nn \box_set_ht:Nn { cv }
@@ -32,6 +32,18 @@
\cs_new_protected:Npn \spb_define:n { \keys_define:nn { ctex/tools } }
\cs_new_protected:Npn \spb_set:n { \keys_set:nn { ctex/tools } }
\cs_set_eq:NN \spbset \spb_set:n
+\cs_new_protected:Npn \spb_mark_core_set_trad:n #1
+ {
+ \cs_set:cpn { spb@text#1script@core }
+ { \use:c { spb@text#1script@save } }
+ \cs_set:cpn { spb@math@#1@core }
+ { \use:c { spb@math@#1@save } }
+ }
+\cs_new_protected:Npn \spb_mark_core_set_none:n #1
+ {
+ \cs_set:cpn { spb@text#1script@core } { \relax }
+ \cs_set:cpn { spb@math@#1@core } { \relax }
+ }
\keys_define:nn { spbmark/option }
{
@@ -43,8 +55,8 @@
},
text/false .code:n =
{
- \cs_set:Npn \textsuperscript { \spb@textsuperscript@save }
- \cs_set:Npn \textsubscript { \spb@textsubscript@save }
+ \cs_set:Npn \textsuperscript { \spb@textsuperscript@core }
+ \cs_set:Npn \textsubscript { \spb@textsubscript@core }
},
text .default:n = true,
math .choice:,
@@ -55,8 +67,8 @@
},
math/false .code:n =
{
- \cs_set:Npn \sp { \spb@math@super@save }
- \cs_set:Npn \sb { \spb@math@sub@save }
+ \cs_set:Npn \sp { \spb@math@super@core }
+ \cs_set:Npn \sb { \spb@math@sub@core }
},
math .default:n = true,
foot .choice:,
@@ -71,7 +83,17 @@
both .meta:n = { text = #1,math = #1 },
both .default:n = true,
all .meta:n = { text = #1,math = #1,foot = #1 },
- all .default:n = true
+ all .default:n = true,
+ spcore .choice:,
+ spcore .value_required:n = true,
+ spcore/trad .code:n = \spb_mark_core_set_trad:n { super },
+ spcore/none .code:n = \spb_mark_core_set_none:n { super },
+ spcore .initial:n = trad,
+ sbcore .choice:,
+ sbcore .value_required:n = true,
+ sbcore/trad .code:n = \spb_mark_core_set_trad:n { sub },
+ sbcore/none .code:n = \spb_mark_core_set_none:n { sub },
+ sbcore .initial:n = trad
}
\char_set_catcode_active:N \~
\keys_define:nn { spbmark/option }
@@ -314,7 +336,7 @@
{
\ensuremath
{
- \use:c { spb@math@#1@save }
+ \use:c { spb@math@#1@core }
{ \tl_use:c { l__spb_#1_cmd_i_tl }{#2} }
}
}
@@ -324,7 +346,7 @@
{
\hbox_gset:cn { g__#1_i_inner_box }
{
- \use:c { spb@text#1script@save }
+ \use:c { spb@text#1script@core }
{ \tl_use:c { l__spb_#1_cmd_i_tl }{#2} }
}
\dim_gset:Nv \rlastwd { l__spb_box_#1_wd_i_tl }
@@ -332,16 +354,16 @@
\cs_new:Npn \spb_math_print_store_ii:nn #1#2
{
\hbox_gset:Nn \g__super_ii_box
- { \ensuremath{\spb@math@super@save{\l__spb_super_cmd_ii_tl{#1}}} }
+ { \ensuremath{\spb@math@super@core{\l__spb_super_cmd_ii_tl{#1}}} }
\hbox_gset:Nn \g__sub_ii_box
- { \ensuremath{\spb@math@sub@save{\l__spb_sub_cmd_ii_tl{#2}}} }
+ { \ensuremath{\spb@math@sub@core{\l__spb_sub_cmd_ii_tl{#2}}} }
}
\cs_new:Npn \spb_text_print_store_ii:nn #1#2
{
\hbox_gset:Nn \g__super_ii_box
- { \spb@textsuperscript@save{\l__spb_super_cmd_ii_tl{#1}} }
+ { \spb@textsuperscript@core{\l__spb_super_cmd_ii_tl{#1}} }
\hbox_gset:Nn \g__sub_ii_box
- { \spb@textsubscript@save{\l__spb_sub_cmd_ii_tl{#2}} }
+ { \spb@textsubscript@core{\l__spb_sub_cmd_ii_tl{#2}} }
}
\cs_set_eq:NN \spbifmath \use_ii:nn
\cs_new:Npn \spb@ifmathtrue { \cs_set_eq:NN \spbifmath \use_i:nn }
@@ -585,7 +607,7 @@
{
\ifaltsbsp@spbmark
\SetAltSubSupCommands{\relax}
- \else\fi
+ \fi
}
}{}
\cs_set_eq:NN \spb \supersub
diff --git a/macros/latex/contrib/spbmark/spbmark.tex b/macros/latex/contrib/spbmark/spbmark.tex
index 9d04ea07f9..9da47d2151 100644
--- a/macros/latex/contrib/spbmark/spbmark.tex
+++ b/macros/latex/contrib/spbmark/spbmark.tex
@@ -1,15 +1,14 @@
\documentclass[load-preamble+]{cnltx-doc}
-\usepackage{siunitx,setspace,pifont,hologo}
+\usepackage{siunitx,setspace,pifont,hologo,changelog,enumitem}
\usepackage[spbmark]{altsubsup}
\usepackage[margin = 1in,marginparwidth = 0.6in,footskip = 0.5in]{geometry}
\usepackage[noto]{newtxmath}
\setcnltx
{
package = spbmark,
- title = the spbmark package,
- version = v1.46j,
- date = 2024/05/19,
+ version = v1.46k,
+ date = 2024/06/21,
authors = Qu Yi,
info = Customize superscript and subscript,
email = toquyi@163.com,
@@ -19,7 +18,6 @@
\pkg*{spbmark} provides three commands \cs{super}, \cs{sub} and \cs{supersub} to improve the layout of superscript and subscript which can be adjusted the relative position and format, and can be used in text and math mode.
},
color-scheme = blue,
- title-format = \huge\bfseries\scshape,
listings-options = {numbers = none,gobble = 2,lineskip = 1pt},
pre-output = {\parindent = 0em\setstretch{1.3}},
before-skip = \smallskipamount,
@@ -43,6 +41,9 @@
\newnote{\newtag}[1]{\textcolor{red}{#1}}
\renewcommand{\emph}[1]{\textcolor{red}{#1}}
\renewcommand{\cnltx@write@lastname}{}
+\setlist{nosep,topsep = \smallskipamount}
+\setlist[description,1]{leftmargin = \parindent}
+\setlist[itemize,1]{leftmargin = *}
\makeatother
\begin{document}
@@ -71,6 +72,15 @@ The following macro package options will redefine the script commands of the \La
\usepackage[text,foot=true]{spbmark}
\spbset{all=false,math}
\end{example}
+ \keychoice{spcore}{\fbox{trad},none}\newtag{New\\v1.46k}%
+ Kernel command case for text and math modes superscript. If \code{none} is selected, support for the superscript kernel command is removed, and the \option{cmd} and \option{vmove} options need to be set to control the size and offset of the superscript.
+ \begin{example}[code-only]
+ \usepackage[spcore=none]{spbmark}
+ \usepackage{graphicx}
+ \spbset{spcmd=\scalebox{0.6},spvmove=5pt}
+ \end{example}
+ \keychoice{sbcore}{\fbox{trad},none}\newtag{New\\v1.46k}%
+ Option for subscript kernel command case, similar to the \option{spcore} option.
\end{options}
\section{User commands}
@@ -197,7 +207,7 @@ The following list of keys control the format both of superscript \emph{or} subs
\keyval{spcmd+}{format cmds}
Add code to the previous global superscript format commands.
\keyval{sbcmd}{format cmds}
- The format commands of subscript. The last command in the code can take an argument, which is a subscript.
+ The format commands of subscript. Similar to the \option{spcmd} option, but for subscript.
\keyval{sbcmd+}{format cmds}
Add code to the previous global subcript format commands.
\keyval{spheight}{fixed length}
@@ -215,7 +225,7 @@ The following list of keys control the format both of superscript \emph{or} subs
\keyval{spregex}{regular expression}
After the superscript 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.
\keyval{sbregex}{regular expression}
- 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.
+ Similar to the \option{spregex} option, but for subscript.
\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 \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.
@@ -294,6 +304,15 @@ If you need to use the original definitions of \cs{textsuperscript}, \cs{textsub
At present, the vertical and horizontal move are effective for the unit commands in the \pkg*{siunitx} macro package. However, due to the special mechanism that the decimal point is not recognized correctly because it's converted to a space in the \cs*{unit} command, it's recommended to use \code{pt} as the unit of move.
\appendix
+\begin{changelog}[simple]
+ \begin{version}[v = 1.46j,date = 2024/05/19]
+ \item Add option \option{math*}: The \code{\^{}} and \code{\_{}} tokens in the math mode are equivalent to the \cs{super} and \cs{sub} commands.
+ \end{version}
+ \begin{version}[v = 1.46k,date = 2024/06/21]
+ \item Add options \option{spcore} and \option{sbcore}: Set kernel commands for superscript and subscript of text and math modes.
+ \end{version}
+\end{changelog}
\nocite{*}
+\AddToHook{cmd/printindex/before}{\clearpage}
\end{document} \ No newline at end of file