From ed11d82ee5f3bdb266cd37f150c1ca941fc3e67d Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Sat, 16 Oct 2021 03:01:43 +0000 Subject: CTAN sync 202110160301 --- macros/latex/contrib/siunitx/siunitx-print.dtx | 48 +++++++++++--------------- 1 file changed, 21 insertions(+), 27 deletions(-) (limited to 'macros/latex/contrib/siunitx/siunitx-print.dtx') diff --git a/macros/latex/contrib/siunitx/siunitx-print.dtx b/macros/latex/contrib/siunitx/siunitx-print.dtx index fc3ba7c0fc..4f107b5cbb 100644 --- a/macros/latex/contrib/siunitx/siunitx-print.dtx +++ b/macros/latex/contrib/siunitx/siunitx-print.dtx @@ -765,7 +765,7 @@ % \end{macro} % % \begin{macro}{\siunitx_print_text:n} -% \begin{macro}{\@@_text_replace:n} +% \begin{macro}{\@@_text_replace:n, \@@_text_replace_aux:n} % \begin{macro}{\@@_text_replace:N} % \begin{macro}{\@@_text_replace:NNn} % \begin{macro}{\@@_text_replace:Nnnn} @@ -806,35 +806,36 @@ } % \end{macrocode} % To get math mode material to print in text mode, various search-and-replace -% steps are needed. +% steps are needed. We use \tn{protected@edef} to deal with commands, partly +% for speed and partly as it deals with anything nested inside \cs{mathord}. % \begin{macrocode} \cs_new_protected:Npn \@@_text_replace:n #1 { \group_begin: - \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 - } + \tl_if_head_eq_meaning:nNTF {#1} \mathchoice + { \@@_text_replace:Nnnnn #1 } + { + \tl_set:Nn \l_@@_tmp_tl {#1} + \@@_replace_font:N \l_@@_tmp_tl + \cs_set:Npn \mathord ##1 {##1} + \cs_set:Npn \pm { \exp_not:N \textpm } + \tl_map_inline:nn + { \mp \ge \le \gg \ll } + { \cs_set:Npn ##1 { \exp_not:N \ensuremath { \exp_not:N ##1 } } } + \cs_set:Npn \cdot { \exp_not:N \textperiodcentered } + \cs_set:Npn \times { \exp_not:N \texttimes } + \protected@edef \l_@@_tmp_tl { \l_@@_tmp_tl } + \@@_text_replace:N \l_@@_tmp_tl + \@@_text_replace_aux:n { \tl_use:N \l_@@_tmp_tl } + } \group_end: } +\cs_new_protected:Npn \@@_text_replace_aux:n #1 {#1} \cs_new_protected:Npx \@@_text_replace:N #1 { - \@@_replace_font:N #1 \exp_not:N \@@_text_replace:NNn #1 - \exp_not:N \mathord { } - \exp_not:N \pm - { \exp_not:N \textpm } - \exp_not:N \mp - { \exp_not:n { \ensuremath { \mp } } } - { \exp_not:N \textminus } - \exp_not:N \times - { \exp_not:N \texttimes } - \exp_not:N \cdot - { \exp_not:N \textperiodcentered } \char_generate:nn { `\_ } { 8 } { \exp_not:N \@@_text_sub:n } ^ @@ -880,14 +881,7 @@ { \@ifpackageloaded { bidi } { - \cs_set_protected:Npn \@@_text_replace:n #1 - { - \group_begin: - \tl_set:Nn \l_@@_tmp_tl {#1} - \@@_text_replace:N \l_@@_tmp_tl - \LRE { \tl_use:N \l_@@_tmp_tl } - \group_end: - } + \cs_set_protected:Npn \@@_text_replace_aux:n #1 { \LRE {#1} } } { } } -- cgit v1.2.3