diff options
author | Norbert Preining <norbert@preining.info> | 2021-07-24 03:01:03 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2021-07-24 03:01:03 +0000 |
commit | 9c5706814f2f593a9f52c51ad02b61e9bacd9ee4 (patch) | |
tree | fd31ea72f451724d8ad7908c945f0f6a40cdcda9 /macros/latex/contrib/spbmark | |
parent | 9e46b83b2d49ad6f5d4285266a81c9af1dd3d74e (diff) |
CTAN sync 202107240301
Diffstat (limited to 'macros/latex/contrib/spbmark')
-rw-r--r-- | macros/latex/contrib/spbmark/spbmark.dtx | 56 | ||||
-rw-r--r-- | macros/latex/contrib/spbmark/spbmark.pdf | bin | 68498 -> 68676 bytes |
2 files changed, 30 insertions, 26 deletions
diff --git a/macros/latex/contrib/spbmark/spbmark.dtx b/macros/latex/contrib/spbmark/spbmark.dtx index 33498e535e..ba9cc49e69 100644 --- a/macros/latex/contrib/spbmark/spbmark.dtx +++ b/macros/latex/contrib/spbmark/spbmark.dtx @@ -23,7 +23,7 @@ % % \title{\pkg{spbmark} -- Customize superscripts and subscripts} % \author{Qu Yi} -% \date{2021/07/22\hskip 1em\relax v1.02\thanks{\url{https://github.com/texl3/spbmark}}} +% \date{2021/07/22\hskip 1em\relax v1.03\thanks{\url{https://github.com/texl3/spbmark}}} % % \maketitle % \begin{abstract} @@ -136,7 +136,7 @@ %<*package> \NeedsTeXFormat{LaTeX2e}[2018/12/31] \RequirePackage{xparse,l3keys2e} -\ProvidesExplPackage{spbmark}{2021/07/22}{1.02} +\ProvidesExplPackage{spbmark}{2021/07/22}{1.03} {Customize superscripts and subscripts} \cs_new_protected:Npn \spb_define:n { \keys_define:nn { spbmark } } @@ -175,8 +175,6 @@ \tl_set:Nn \l__spb_boxb_wd_tl { \box_wd:N \l_tmpb_box } \cs_new:Npn \spb_tmp_boxa_use: { \box_use:N \l_tmpa_box } \cs_new:Npn \spb_tmp_boxb_use: { \box_use:N \l_tmpb_box } -\cs_new:Npn \spb_tmp_hboxa_set:n #1 { \hbox_set:Nn \l_tmpa_box {#1} } -\cs_new:Npn \spb_tmp_hboxb_set:n #1 { \hbox_set:Nn \l_tmpb_box {#1} } \cs_new:Npn \spb_box_max_dim_horizontal: { \skip_horizontal:n @@ -194,6 +192,26 @@ \spb_boxwd_subtract:nnnn { -0.5 } { 0.5 } {#1} {#2} \use:c { spb_tmp_#1_use: } } +\cs_new:Npn \spb_math_print_store:nnn #1#2#3 + { + \hbox_set:Nn \l_tmpa_box + { \ensuremath{#1{\spb_math:nn {#2} {#3}}} } + } +\cs_new:Npn \spb_text_print_store:nnn #1#2#3 + { + \hbox_set:Nn \l_tmpa_box + { #1{\use:c { spb@text#2script@save }{#3}} } + } +\cs_new:Npn \spb_math_print_store:nnnn #1#2#3#4 + { + \hbox_set:Nn \l_tmpa_box { \ensuremath{#1{\spb@sp@save{#2}}} } + \hbox_set:Nn \l_tmpb_box { \ensuremath{#3{\spb@sb@save{#4}}} } + } +\cs_new:Npn \spb_text_print_store:nnnn #1#2#3#4 + { + \hbox_set:Nn \l_tmpa_box { #1{\spb@textsuperscript@save{#2}} } + \hbox_set:Nn \l_tmpb_box { #3{\spb@textsubscript@save{#4}} } + } \cs_set_eq:NN \spb@textsuperscript@save \textsuperscript \cs_set_eq:NN \spb@textsubscript@save \textsubscript \cs_set_eq:NN \spb@sp@save \sp @@ -211,6 +229,7 @@ \tl_if_empty:nF {#1} { \box_set_ht:Nn \l_tmpb_box {#1} } \tl_if_novalue:nF {#2} { \box_set_dp:Nn \l_tmpb_box {#2} } } + \clist_map_inline:nn { super,sub } { @@ -222,18 +241,11 @@ } { \IfBooleanTF{##1} + {\spb_math_print_store:nnn {##4} {#1} {##5}} { - \spb_tmp_hboxa_set:n - { \ensuremath{##4{\spb_math:nn {#1} {##5}}} } - }{ \mode_if_math:TF - { - \spb_tmp_hboxa_set:n - { \ensuremath{##4{\spb_math:nn {#1} {##5}}} } - }{ - \spb_tmp_hboxa_set:n - { ##4{\use:c { spb@text#1script@save }{##5}} } - } + { \spb_math_print_store:nnn {##4} {#1} {##5} } + { \spb_text_print_store:nnn {##4} {#1} {##5} } } \hbox_set_to_wd:Nnn \l_tmpb_box { \l__spb_boxa_wd_tl + ##6 } { \hss\box_move_up:nn {##2} { \spb_tmp_boxa_use: } } @@ -248,19 +260,11 @@ } { \IfBooleanTF{#1} + {\spb_math_print_store:nnnn {#4} {#5} {#8} {#6}} { - \spb_tmp_hboxa_set:n { \ensuremath{#4{\spb@sp@save{#5}}} } - \spb_tmp_hboxb_set:n { \ensuremath{#8{\spb@sb@save{#6}}} } - }{ \mode_if_math:TF - { - \spb_tmp_hboxa_set:n { \ensuremath{#4{\spb@sp@save{#5}}} } - \spb_tmp_hboxb_set:n { \ensuremath{#8{\spb@sb@save{#6}}} } - } - { - \spb_tmp_hboxa_set:n { #4{\spb@textsuperscript@save{#5}} } - \spb_tmp_hboxb_set:n { #8{\spb@textsubscript@save{#6}} } - } + { \spb_math_print_store:nnnn {#4} {#5} {#8} {#6} } + { \spb_text_print_store:nnnn {#4} {#5} {#8} {#6} } } \hbox_set_to_wd:Nnn \l_tmpa_box { \l__spb_boxa_wd_tl + #7 } { \hss\box_move_up:nn {#2} { \spb_tmp_boxa_use: } } @@ -282,7 +286,7 @@ \spb_box_max_dim_horizontal: } { - \dim_compare:nTF { \l__spb_boxa_wd_tl > \l__spb_boxb_wd_tl } + \dim_compare:nNnTF { \l__spb_boxa_wd_tl } > { \l__spb_boxb_wd_tl } { \spb_boxwd_script_align:nn { boxa } { boxb } } { \spb_boxwd_script_align:nn { boxb } { boxa } } } diff --git a/macros/latex/contrib/spbmark/spbmark.pdf b/macros/latex/contrib/spbmark/spbmark.pdf Binary files differindex 541ea467ed..1c3f271fe9 100644 --- a/macros/latex/contrib/spbmark/spbmark.pdf +++ b/macros/latex/contrib/spbmark/spbmark.pdf |