diff options
author | Karl Berry <karl@freefriends.org> | 2021-06-24 20:09:24 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2021-06-24 20:09:24 +0000 |
commit | 7129465b524c87da4dbfab0f54388b1ba3494535 (patch) | |
tree | d7a9b457b11ea9213f2e4a575624c076304d4cf6 /Master/texmf-dist/source/latex/siunitx | |
parent | 44a67527270cdd00ff114b2829882eefae0bdd3b (diff) |
siunitx (24jun21)
git-svn-id: svn://tug.org/texlive/trunk@59694 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/siunitx')
-rw-r--r-- | Master/texmf-dist/source/latex/siunitx/siunitx-print.dtx | 35 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/siunitx/siunitx-unit.dtx | 14 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/siunitx/siunitx.dtx | 2 |
3 files changed, 46 insertions, 5 deletions
diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx-print.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx-print.dtx index 15d44520555..25acdd306b5 100644 --- a/Master/texmf-dist/source/latex/siunitx/siunitx-print.dtx +++ b/Master/texmf-dist/source/latex/siunitx/siunitx-print.dtx @@ -722,6 +722,8 @@ % \begin{macro}{\@@_text_replace:n} % \begin{macro}{\@@_text_replace:N} % \begin{macro}{\@@_text_replace:NNn} +% \begin{macro}{\@@_text_replace:Nnnn} +% \begin{macro}{\@@_text_replace_frac:n} % \begin{macro}{\@@_text_sub:n, \@@_text_super:n} % \begin{macro}{\@@_text_scripts:NnN} % \begin{macro}{\@@_text_scripts:} @@ -763,9 +765,13 @@ \cs_new_protected:Npn \@@_text_replace:n #1 { \group_begin: - \tl_set:Nn \l_@@_tmp_tl {#1} - \@@_text_replace:N \l_@@_tmp_tl - \tl_use:N \l_@@_tmp_tl + \tl_if_head_eq_meaning:nNTF {#1} \mathchoice + { \@@_text_replace:Nnnnn #1 } + { + \tl_set:Nn \l_@@_tmp_tl {#1} + \@@_text_replace:N \l_@@_tmp_tl + \tl_use:N \l_@@_tmp_tl + } \group_end: } \cs_new_protected:Npx \@@_text_replace:N #1 @@ -797,6 +803,27 @@ \tl_replace_all:Nnn #1 {#2} {#3} \@@_text_replace:NNn #1 } +\cs_new_protected:Npn \@@_text_replace:Nnnnn #1#2#3#4#5 + { + \ensuremath + { + \mathchoice + { \@@_print_replace_frac:n {#2} } + { \@@_print_replace_frac:n {#3} } + { \@@_print_replace_frac:n {#4} } + { \@@_print_replace_frac:n {#5} } + } + } +% \end{macrocode} +% Almost the same as the lead-off but here we need to deal with re-inserting +% a text mode shift. +% \begin{macrocode} +\cs_new_protected:Npn \@@_print_replace_frac:n #1 + { + \exp_args:NnV \tl_if_head_eq_meaning:nNTF {#1} \l_siunitx_unit_fraction_tl + { \@@_text_fraction:Nnn #1 } + { \mbox { \@@_text_replace:n {#1} } } + } % \end{macrocode} % When the \pkg{bidi} package is loaded, we need to make sure % that \cs{text} is doing the correct thing. @@ -918,6 +945,8 @@ % \end{macro} % \end{macro} % \end{macro} +% \end{macro} +% \end{macro} % % \subsection{Standard settings for module options} % diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx-unit.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx-unit.dtx index ab9c30a1c24..b0602c25433 100644 --- a/Master/texmf-dist/source/latex/siunitx/siunitx-unit.dtx +++ b/Master/texmf-dist/source/latex/siunitx/siunitx-unit.dtx @@ -1190,6 +1190,7 @@ % \begin{macro}{\@@_format_literal_super:nn, \@@_format_literal_sub:nn} % \begin{macro}{\@@_format_literal_add:n} % \begin{macro}{\@@_format_literal_auxix:nn} +% \begin{macro}{\@@_format_literal_auxx:nw} % \begin{variable}{\l_@@_separator_tl} % To format literal units, there are two tasks to do. The input is % \texttt{x}-type expanded to force any symbolic units to be converted into @@ -1285,7 +1286,11 @@ { \tl_if_head_is_N_type:nTF {#2} { \@@_format_literal_auxvi:nN } - { \@@_format_literal_auxix:nn } + { + \tl_if_head_is_group:nTF {#2} + { \@@_format_literal_auxix:nn } + { \@@_format_literal_auxx:nw } + } {#1} #2 \q_recursion_stop } \cs_new_protected:Npx \@@_format_literal_auxvi:nN #1#2 @@ -1347,6 +1352,12 @@ } \cs_new_protected:Npn \@@_format_literal_auxix:nn #1#2 { \@@_format_literal_auxvi:nN { #1 {#2} } } +\use:x + { + \cs_new_protected:Npn \exp_not:N \@@_format_literal_auxx:nw + ##1 \c_space_tl + } + { \@@_format_literal_auxv:nw {#1} } \tl_new:N \l_@@_separator_tl % \end{macrocode} % \end{variable} @@ -1361,6 +1372,7 @@ % \end{macro} % \end{macro} % \end{macro} +% \end{macro} % % \subsection{(PDF) String creation} % diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx index 0827729689f..0ee202f15f3 100644 --- a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx +++ b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx @@ -121,7 +121,7 @@ % % Identify the package and give the over all version information. % \begin{macrocode} -\ProvidesExplPackage {siunitx} {2021-06-22} {3.0.15} +\ProvidesExplPackage {siunitx} {2021-06-24} {3.0.16} {A comprehensive (SI) units package} % \end{macrocode} % |