texlive[60989] Master/texmf-dist: spbmark (7nov21)

[commits+karl at tug.org]

Revision: 60989
          http://tug.org/svn/texlive?view=revision&revision=60989
Author:   karl
Date:     2021-11-07 22:27:40 +0100 (Sun, 07 Nov 2021)
Log Message:
-----------
spbmark (7nov21)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/latex/spbmark/spbmark.pdf
    trunk/Master/texmf-dist/doc/latex/spbmark/spbmark.tex
    trunk/Master/texmf-dist/tex/latex/spbmark/spbmark.sty

Modified: trunk/Master/texmf-dist/doc/latex/spbmark/spbmark.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/spbmark/spbmark.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/spbmark/spbmark.tex	2021-11-07 21:27:27 UTC (rev 60988)
+++ trunk/Master/texmf-dist/doc/latex/spbmark/spbmark.tex	2021-11-07 21:27:40 UTC (rev 60989)
@@ -6,8 +6,8 @@
   {
     package   = spbmark,
     title     = the spbmark package,
-    version   = v1.1G,
-    date      = 2021/10/30,
+    version   = v1.1H,
+    date      = 2021/11/06,
     authors   = Qu Yi,
     info      = Customize superscript and subscript,
     email     = q1jx at foxmail.com,
@@ -41,14 +41,21 @@
 
 \section{Macro package options}
 \label{sec:macro package options}
+The following macro package options will redefine the scripts commands of the \LaTeX{} kernel. If you do not specify the values of boolean options, they default to \code{true}.
 \begin{options}
-  \opt{ctex}\Default!
-  This option works with the C\TeX{} document class used by simplified Chinese users, there's actually no functional change. Adding path \module*{style} to \cs*{ctexset} command, which is equivalent to using \cs{spbset}.
-  \keychoice{newsupb}{text,math,foot,all}\Default
-  \option{newsupb} is a compound option that can select multiple values and will redefine the scripts commands of the \LaTeX{} kernel. \code{text} stands for \cs{textsuperscript} and \cs{textsubscript} are equivalent to the \cs{super} and \cs{sub} commands. \code{math} indicates that \cs{sp} and \cs{sb} are equivalent to the \cs{super} and \cs{sub} commands. \code{foot} will make the format of the footnote mark match the superscript offsets and format of the \cs{spbset} global setting. \code{all} will selects all previous three values at the same time.
+  \keybool{text}\Default{false}
+  \cs{textsuperscript} and \cs{textsubscript} are equivalent to the \cs{super} and \cs{sub} commands.
+  \keybool{math}\Default{false}
+  \cs{sp} and \cs{sb} are equivalent to the \cs{super} and \cs{sub} commands.
+  \keybool{foot}\Default{false}
+  The format of the footnote mark match the superscript offsets and format of the \cs{spbset} global setting.
+  \opt{both}\Default!
+  The values of \option{text} and \option{math} two options are \code{true} at the same time.
+  \opt{all}\Default!
+  The values of \option{text}, \option{math} and \option{foot} three options are \code{true} at the same time.
   \begin{example}[code-only]
-  \usepackage[newsupb = {text,math,foot}]{spbmark}
-  \usepackage[newsupb = all]{spbmark}
+  \usepackage[both]{spbmark}
+  \usepackage[text,foot = true]{spbmark}
   \end{example}
 \end{options}
 

Modified: trunk/Master/texmf-dist/tex/latex/spbmark/spbmark.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/spbmark/spbmark.sty	2021-11-07 21:27:27 UTC (rev 60988)
+++ trunk/Master/texmf-dist/tex/latex/spbmark/spbmark.sty	2021-11-07 21:27:40 UTC (rev 60989)
@@ -9,29 +9,25 @@
 %   https://creativecommons.org/licenses/by/4.0/legalcode
 \NeedsTeXFormat{LaTeX2e}[2018/12/31]
 \RequirePackage{xparse,l3keys2e}
-\ProvidesExplPackage{spbmark}{2021/10/30}{1.1G}
+\ProvidesExplPackage{spbmark}{2021/11/06}{1.1H}
   {Customize superscripts and subscripts}
 
-\cs_new_protected:Npn \spb_define:n { \keys_define:nn { spbmark } }
-\cs_new_protected:Npn \spbset { \keys_set:nn { spbmark } }
-\bool_new:N \l_spb_newsupb_text_bool
-\bool_new:N \l_spb_newsupb_math_bool
-\bool_new:N \l_spb_newsupb_foot_bool
-\bool_new:N \l_spb_newsupb_all_bool
-
+\cs_new_protected:Npn \spb_define:n { \keys_define:nn { ctex/style } }
+\cs_new_protected:Npn \spbset { \keys_set:nn { ctex/style } }
 \keys_define:nn { spbmark/option }
   {
-    ctex .code:n              =
-      {
-        \cs_set:Npn \spb_define:n { \keys_define:nn { ctex/style } }
-        \cs_set:Npn \spbset { \keys_set:nn { ctex/style } }
-      },
-    newsupb .multichoices:nn  =
-      { text,math,foot,all }
-      { \bool_set_true:c { l_spb_newsupb_#1_bool } },
-    newsupb .default:n        = all,
-    newsupb/true .meta:n      = { newsupb = all },
-    newsupb/false .code:n     = { }
+    text .bool_set:N        = \l_spb_newsupb_text_bool,
+    text .default:n         = true,
+    math .bool_set:N        = \l_spb_newsupb_math_bool,
+    math .default:n         = true,
+    foot .bool_set:N        = \l_spb_newsupb_foot_bool,
+    foot .default:n         = true,
+    both .meta:n            = { text,math },
+    both .value_forbidden:n = true,
+    all .meta:n             = { text,math,foot },
+    all .value_forbidden:n  = true,
+    ctex .code:n            = { },
+    newsupb .code:n         = { }
   }
 
 \ProcessKeysOptions{spbmark/option}
@@ -262,12 +258,6 @@
     The~l~parameter~will~be~used~by~default.
   }
 
-\bool_if:NT \l_spb_newsupb_all_bool
-  {
-    \bool_set_true:N \l_spb_newsupb_text_bool
-    \bool_set_true:N \l_spb_newsupb_math_bool
-    \bool_set_true:N \l_spb_newsupb_foot_bool
-  }
 \bool_if:NT \l_spb_newsupb_text_bool
   {
     \cs_set_eq:NN \textsuperscript \super