From 9105ca38c03b7a88ed0c306472d9560cc5f206bd Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Wed, 22 Dec 2021 03:01:35 +0000 Subject: CTAN sync 202112220301 --- macros/latex/contrib/easybook/easybook.dtx | 7 ++++--- macros/latex/contrib/easybook/easybook.pdf | Bin 593475 -> 593497 bytes macros/latex/contrib/easybook/easybook.tex | 6 +++--- macros/latex/contrib/fancyvrb/Changes | 1 + macros/latex/contrib/fancyvrb/doc/fancyvrb-doc.pdf | Bin 141135 -> 141124 bytes macros/latex/contrib/fancyvrb/doc/fancyvrb-doc.tex | 20 +++++++++++++++----- macros/latex/contrib/fancyvrb/latex/fancyvrb.sty | 6 +++--- macros/latex/contrib/spbmark/spbmark.pdf | Bin 70115 -> 70953 bytes macros/latex/contrib/spbmark/spbmark.sty | 9 ++++++++- macros/latex/contrib/spbmark/spbmark.tex | 11 ++++++++--- 10 files changed, 42 insertions(+), 18 deletions(-) (limited to 'macros/latex') diff --git a/macros/latex/contrib/easybook/easybook.dtx b/macros/latex/contrib/easybook/easybook.dtx index 2081fc7d3d..45926cc09e 100644 --- a/macros/latex/contrib/easybook/easybook.dtx +++ b/macros/latex/contrib/easybook/easybook.dtx @@ -15,7 +15,7 @@ %<*class> \NeedsTeXFormat{LaTeX2e}[2020/10/01] \RequirePackage{l3keys2e} -\ProvidesExplClass{easybook}{2021/12/20}{1.42} +\ProvidesExplClass{easybook}{2021/12/20}{1.42A} {Typeset Chinese theses or books} \bool_set_false:N \l__eb_compile_draft_bool @@ -307,7 +307,7 @@ %<*package> \NeedsTeXFormat{LaTeX2e}[2020/10/01] \RequirePackage{l3keys2e,etoolbox} -\ProvidesExplPackage{easybase}{2021/12/20}{1.42} +\ProvidesExplPackage{easybase}{2021/12/20}{1.42A} {Typeset Chinese theses or books} \cs_generate_variant:Nn \dim_set:Nn { NV } @@ -405,6 +405,7 @@ \cs_new_protected:Npn \eb_at_end_preamble:n { \BeforeBeginEnvironment{document} } \cs_gset_eq:NN \PackageWarning \PackageInfo +\msg_redirect_module:nnn { hooks } { warning } { info } \bool_set_true:N \l__eb_class_mode_book_bool \bool_set_false:N \l__eb_compile_draft_bool @@ -2430,7 +2431,7 @@ } % %<*tcolorbox> -\ProvidesExplFile{eb-tcolorbox.cfg}{2021/12/20}{1.42} +\ProvidesExplFile{eb-tcolorbox.cfg}{2021/12/20}{1.42A} {Customization of tcolorbox for easybook} \cs_set_protected:Npn \setexercise #1 diff --git a/macros/latex/contrib/easybook/easybook.pdf b/macros/latex/contrib/easybook/easybook.pdf index 6ddf277387..9447e54476 100644 Binary files a/macros/latex/contrib/easybook/easybook.pdf and b/macros/latex/contrib/easybook/easybook.pdf differ diff --git a/macros/latex/contrib/easybook/easybook.tex b/macros/latex/contrib/easybook/easybook.tex index 5b20e761a2..00bfeac3aa 100644 --- a/macros/latex/contrib/easybook/easybook.tex +++ b/macros/latex/contrib/easybook/easybook.tex @@ -20,7 +20,7 @@ name = easybook, color-scheme = blue, title = EASYBOOK 使用手册, - version = v1.42, + version = v1.42A, date = 2021/12/20, authors = 瞿毅, info = 排版简体中文学位论文和书籍, @@ -369,7 +369,7 @@ 关于这三个命令键值列表中共同的选项如下所示。如果 \option{vmove}、\option{hmove} 和 \option{cmd} 选项用于 \module*{style} 模块的全局设置,它们将根据前面最近一个命令的类型设定相应值。 \begin{options} \keyval-{vmove}{刚性长度}\Default{0pt} - 上标或下标的垂直偏移。如果是上下标命令使用则代表上标和上标间的垂直距离 \option{vsep}。 + 上标或下标的垂直偏移。如果是上下标命令使用则代表上标和上标间的额外垂直距离 \option{vsep}。 \keyval-{hmove}{刚性长度}\Default{0pt} 上标或下标的水平偏移。如果是上下标命令使用则代表上标和上标的共同偏移。 \keyval-{cmd}{格式命令}\Default @@ -480,7 +480,7 @@ \kvsplit{spbcmd}{上标格式,下标格式}\Default 上下标命令 \cs{supersub} 对应的上下标格式命令。以英文逗号分隔为前后两个部分分别设置上下标格式,也可以只有前部分,表示上标的格式。 \keyval-{vsep}{刚性长度}\Default{0.6ex} - 上下标命令 \cs{supersub} 对应的上下标垂直距离。 + 上下标命令 \cs{supersub} 对应的上下标额外垂直距离。 \keychoice{halign}{l,c,r}\Default{l} 上下标命令 \cs{supersub} 对应的上下标水平对齐方式,有左 \code{l}、居中 \code{c} 和右 \code{r} 三种对齐方式。 \end{options} diff --git a/macros/latex/contrib/fancyvrb/Changes b/macros/latex/contrib/fancyvrb/Changes index 31b72a061c..c903c62ef2 100644 --- a/macros/latex/contrib/fancyvrb/Changes +++ b/macros/latex/contrib/fancyvrb/Changes @@ -1,4 +1,5 @@ --- fancyvrb.sty +4.1b 2021/12/21 - fix for ~ in message (hv) 4.1a 2021/11/24 - updated filedate (hv) 4.1 2021/11/24 - make lastline without argument possible (hv) 4.0 2021/11/19 - added lastline=0 for no output (hv) diff --git a/macros/latex/contrib/fancyvrb/doc/fancyvrb-doc.pdf b/macros/latex/contrib/fancyvrb/doc/fancyvrb-doc.pdf index 532bcc51d2..55ccaceaab 100644 Binary files a/macros/latex/contrib/fancyvrb/doc/fancyvrb-doc.pdf and b/macros/latex/contrib/fancyvrb/doc/fancyvrb-doc.pdf differ diff --git a/macros/latex/contrib/fancyvrb/doc/fancyvrb-doc.tex b/macros/latex/contrib/fancyvrb/doc/fancyvrb-doc.tex index 434aa99f99..40cb65ff83 100644 --- a/macros/latex/contrib/fancyvrb/doc/fancyvrb-doc.tex +++ b/macros/latex/contrib/fancyvrb/doc/fancyvrb-doc.tex @@ -678,8 +678,22 @@ numbering, and the counter used is \texttt{FancyVerbLine}: \begin{optlist} \item[firstline (integer)]: first line to print (\emph{Default: empty} \Dash all lines from the first are printed). + \item[lastline (integer)]: last line to print + (\emph{Default: empty} \Dash all lines until the last one are printed). \end{optlist} + +\begin{SideBySideExample} + \begin{Verbatim}[gobble=2,firstline,lastline, + numbers=left,numbersep=2pt] + First verbatim line. + Second verbatim line. + Third verbatim line. + \end{Verbatim} +\end{SideBySideExample} + + + \begin{SideBySideExample} \begin{Verbatim}[gobble=2,firstline=2, numbers=left,numbersep=2pt] @@ -689,10 +703,6 @@ numbering, and the counter used is \texttt{FancyVerbLine}: \end{Verbatim} \end{SideBySideExample} -\begin{optlist} - \item[lastline (integer)]: last line to print - (\emph{Default: empty} \Dash all lines until the last one are printed). -\end{optlist} \begin{SideBySideExample} \begin{Verbatim}[gobble=2,lastline=1, @@ -714,7 +724,7 @@ bit klunky. Initially you must define the strings with \begin{SideBySideExample}[gobble=2] \newcommand*\FancyVerbStartString{FROM} - \renewcommand*\FancyVerbStopString{TO} + \newcommand*\FancyVerbStopString{TO} \begin{Verbatim} First verbatim line. FROM diff --git a/macros/latex/contrib/fancyvrb/latex/fancyvrb.sty b/macros/latex/contrib/fancyvrb/latex/fancyvrb.sty index 75f418e7be..86fdbef54e 100644 --- a/macros/latex/contrib/fancyvrb/latex/fancyvrb.sty +++ b/macros/latex/contrib/fancyvrb/latex/fancyvrb.sty @@ -13,9 +13,9 @@ %% verbatim environments and commands and extensive documentation. %% \NeedsTeXFormat{LaTeX2e} -\def\fileversion{4.1a} -\def\filedate{2021/11/24} -\ProvidesPackage{fancyvrb}[\filedate~ \fileversion ~verbatim text (tvz,hv)] +\def\fileversion{4.1b} +\def\filedate{2021/12/21} +\ProvidesPackage{fancyvrb}[\filedate\space \fileversion\space verbatim text (tvz,hv)] %\message{Style option: `fancyvrb' v\fileversion \space <\filedate> (tvz)} \csname fancyvrb@loaded\endcsname \let\fancyvrb@loaded\endinput diff --git a/macros/latex/contrib/spbmark/spbmark.pdf b/macros/latex/contrib/spbmark/spbmark.pdf index 0dc97fd394..90254e4b4e 100644 Binary files a/macros/latex/contrib/spbmark/spbmark.pdf and b/macros/latex/contrib/spbmark/spbmark.pdf differ diff --git a/macros/latex/contrib/spbmark/spbmark.sty b/macros/latex/contrib/spbmark/spbmark.sty index 10defa9e25..3bc3a3dd01 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}{2021/12/20}{1.2E} +\ProvidesExplPackage{spbmark}{2021/12/21}{1.2F} {Customize superscripts and subscripts} \cs_generate_variant:Nn \dim_max:nn { VV } @@ -53,6 +53,11 @@ { supersub } {#4} } } +\cs_new_protected:Npn \defspbstyle #1#2 + { + \spb_define:n + { style/#1 .code:n = \keys_set:nn { ctex/style } {#2} } + } \spb_define:n { spvmove .tl_set:N = \l__spb_super_vmove_tl, @@ -105,6 +110,8 @@ vsep .initial:n = 0.6ex, halign .tl_set:N = \l__spb_supersub_halign_tl, halign .initial:n = l, + style .choice:, + style .value_required:n = true, mode .tl_set:N = \l__spb_mode_value_tl, mode .initial:n = match } diff --git a/macros/latex/contrib/spbmark/spbmark.tex b/macros/latex/contrib/spbmark/spbmark.tex index 93620fd8a7..12c8cacfd0 100644 --- a/macros/latex/contrib/spbmark/spbmark.tex +++ b/macros/latex/contrib/spbmark/spbmark.tex @@ -6,8 +6,8 @@ { package = spbmark, title = the spbmark package, - version = v1.2E, - date = 2021/12/20, + version = v1.2F, + date = 2021/12/21, authors = Qu Yi, info = Customize superscript and subscript, email = q1jx@foxmail.com, @@ -67,6 +67,8 @@ There are currently three commands to set superscript and subscript. Their forma This is a subscript output command. The two \meta{kv list} are equivalent. \command{supersub}[\oarg{kv list}\marg{super cont}\marg{sub cont}\oarg{kv list}] This is a command that outputs both superscript and subscript at the same time. You can also use the shorter command \cs{spb} instead of it. The two \meta{kv list} are equivalent. + \command{defspbstyle}[\marg{style name}\marg{kv list}] + Defines the style of the superscript or subscript used for the \option{style} option. \command{spbifmath}[\marg{math code}\marg{text code}] In some cases, \code{math} or \code{text} output modes require different code for format or move. This command can be used when using the \code{match} option or changing the output mode locally, whitch should be used in the move or format options. It can switch the corresponding code according to different output modes. \end{commands} @@ -83,6 +85,8 @@ The options common to \meta{kv list} of the three commands are as follows. They The format commands of superscript or subscript. The last command can take a parameter, which accepts superscript or subscript. Represents the format of superscript and subscript in the superscript and subscript commands. \keyval{cmd+}{format cmds}\Default Add code to the previous global superscript or subscript format commands. + \keyval{style}{style name}\Default + Use the \meta{style name} defined by the \cs{defspbstyle} command to make it work global or local. \keychoice{mode}{text,math,match}\Default{match} The mode of superscript or subscript output can be \code{text} or \code{math} mode. The \code{match} option automatically matches output modes according to the current mode. \end{options} @@ -137,9 +141,10 @@ The following list of keys control the format of superscript and subscript. \section{Examples of use} Here is a list of the three commands, please pay attention to the usage of optional parameters. Note when the horizontal move is negative, the starting point is at the right end of the mark. \begin{example} +\defspbstyle{fancy}{cmd=\color{purple}} \spbset{spbcmd={\spbifmath{\mathtt}{\ttfamily},\color{blue}}} A\super[vmove=0.2ex,hmove=0.2em,cmd=\textcolor{red}]{exam}B \\ -$A\sub[cmd=\mathsf,mode=math]{exam}B$ \\ +$A\sub[style=fancy,cmd+=\mathsf,mode=math]{exam}B$ \\ A\supersub[vsep=0.6ex,halign=c]{examsuper}{sub}B \\ A\super{c}[vmove=5pt,hmove=-5.5pt]B\sub[vmove=5pt,hmove=-5pt]{d}AB \end{example} -- cgit v1.2.3