From 02350afc89e6f1f770c8d5804c571b1815a44c7a Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 27 Oct 2021 20:13:50 +0000 Subject: siunitx (27oct21) git-svn-id: svn://tug.org/texlive/trunk@60878 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/source/latex/siunitx/siunitx-complex.dtx | 13 ++++++++++++- Master/texmf-dist/source/latex/siunitx/siunitx-symbol.dtx | 8 ++++---- Master/texmf-dist/source/latex/siunitx/siunitx.dtx | 2 +- 3 files changed, 17 insertions(+), 6 deletions(-) (limited to 'Master/texmf-dist/source/latex/siunitx') diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx-complex.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx-complex.dtx index a1783bf8c0c..247d9acc0dc 100644 --- a/Master/texmf-dist/source/latex/siunitx/siunitx-complex.dtx +++ b/Master/texmf-dist/source/latex/siunitx/siunitx-complex.dtx @@ -126,8 +126,9 @@ % % \subsection{General setup} % -% \begin{variable}{\l_@@_tmp_tl} +% \begin{variable}{\l_@@_tmp_fp, \l_@@_tmp_tl} % \begin{macrocode} +\fp_new:N \l_@@_tmp_fp \tl_new:N \l_@@_tmp_tl % \end{macrocode} % \end{variable} @@ -766,6 +767,8 @@ % } % \begin{macro}{\@@_format_extract-exponent:N} % \begin{macro}[EXP]{\@@_extract_exp:nnnnnnn} +% \begin{macro}{\@@_drop_exp:N} +% \begin{macro}[EXP]{\@@_drop_exp:nnnnnnnN} % Formatting units needs to know the settings from the main module, and % the flow is then much the same as in \pkg{siunitx-compound}. We only % have to watch the fact there are two numbers to format. @@ -788,6 +791,8 @@ \siunitx_number_process:NN \l_@@_img_tl \l_@@_img_tl \fp_set:Nn \l_@@_tmp_fp { \exp_after:wN \@@_extract_exp:nnnnnnn \l_@@_img_tl } + \@@_drop_exp:N \l_@@_real_tl + \@@_drop_exp:N \l_@@_img_tl \siunitx_unit_format_combine_exponent:nnN {#1} \l_@@_tmp_fp \l_@@_unit_tl } @@ -816,11 +821,17 @@ \siunitx_unit_format:nN {#1} \l_@@_unit_tl } \cs_new:Npn \@@_extract_exp:nnnnnnn #1#2#3#4#5#6#7 { #6#7 } +\cs_new_protected:Npn \@@_drop_exp:N #1 + { \exp_after:wN \@@_drop_exp:nnnnnnnN #1 #1 } +\cs_new_protected:Npn \@@_drop_exp:nnnnnnnN #1#2#3#4#5#6#7#8 + { \tl_set:Nn #8 { {#1} {#2} {#3} {#4} {#5} { } { 0 } } } % \end{macrocode} % \end{macro} % \end{macro} % \end{macro} % \end{macro} +% \end{macro} +% \end{macro} % % \subsection{Messages} % diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx-symbol.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx-symbol.dtx index 4fa17bde89b..8952aabeabd 100644 --- a/Master/texmf-dist/source/latex/siunitx/siunitx-symbol.dtx +++ b/Master/texmf-dist/source/latex/siunitx/siunitx-symbol.dtx @@ -232,7 +232,7 @@ % \begin{macrocode} \@@_if_replace:NnT \ohm { "03A9 } { - \tl_set:Nx \l_@@_tmp_tl + \tl_set:Nx \l_@@_tmpa_tl { \cs_if_exist:NTF \upOmega { \exp_not:N \upOmega } @@ -243,7 +243,7 @@ \@ifpackageloaded { fourier } { \exp_not:N \ensuremath - { \exp_not:V \l_@@_tmp_tl } + { \exp_not:V \l_@@_tmpa_tl } } { \exp_not:N \ifmmode @@ -252,10 +252,10 @@ \exp_not:N \text { \exp_not:N \ensuremath - { \exp_not:V \l_@@_tmp_tl } + { \exp_not:V \l_@@_tmpa_tl } } } - { \exp_not:V \l_@@_tmp_tl } + { \exp_not:V \l_@@_tmpa_tl } \exp_not:N \else \exp_not:N \text { diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx index adb8063b9d1..cdf49b261c8 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-10-15} {3.0.33} +\ProvidesExplPackage {siunitx} {2021-10-26} {3.0.34} {A comprehensive (SI) units package} % \end{macrocode} % -- cgit v1.2.3