diff options
author | Karl Berry <karl@freefriends.org> | 2021-07-05 20:54:36 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2021-07-05 20:54:36 +0000 |
commit | 919d654bed4c7ab98fc426801eaa655da8f75797 (patch) | |
tree | 96f9a08c76de72e825361613f073b831ca8c7ac5 /Master/texmf-dist/source/latex/siunitx | |
parent | 0b1e7a48f8935511132fbd01249c6964e780f2f3 (diff) |
siunitx (5jul21)
git-svn-id: svn://tug.org/texlive/trunk@59844 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/siunitx')
-rw-r--r-- | Master/texmf-dist/source/latex/siunitx/siunitx-quantity.dtx | 23 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/siunitx/siunitx.dtx | 2 |
2 files changed, 18 insertions, 7 deletions
diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx-quantity.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx-quantity.dtx index 353fe94e6e8..e4dc93200e7 100644 --- a/Master/texmf-dist/source/latex/siunitx/siunitx-quantity.dtx +++ b/Master/texmf-dist/source/latex/siunitx/siunitx-quantity.dtx @@ -372,18 +372,29 @@ % } % For printing a single part of a quantity. This is needed for compound % quantities and so is public: that's also the reason for passing both -% argument explicitly. +% argument explicitly. The lazy test here is looking for the case where +% a |1| has been inserted at the start of a format unit \emph{and} we +% have some other number to print: the |1| is then removed and there is +% no space inserted. % \begin{macrocode} \cs_new_protected:Npn \siunitx_quantity_print:nn #1#2 { \siunitx_print_number:n {#1} \tl_if_blank:nF {#2} { - \tl_use:N \l_@@_product_tl - \bool_if:NTF \l_@@_break_bool - { \penalty \binoppenalty } - { \nobreak } - \siunitx_print_unit:n {#2} + \bool_lazy_or:nnTF + { \tl_if_blank_p:n {#1} } + { ! \tl_if_head_eq_charcode_p:nN {#2} { 1 } } + { + \tl_use:N \l_@@_product_tl + \bool_if:NTF \l_@@_break_bool + { \penalty \binoppenalty } + { \nobreak } + \siunitx_print_unit:n {#2} + } + { + \exp_args:No \siunitx_print_unit:n { \use_none:n #2 } + } } } \cs_generate_variant:Nn \siunitx_quantity_print:nn { nV , VV , xV } diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx index 30afff3ae2b..52da6d7b36f 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-29} {3.0.17} +\ProvidesExplPackage {siunitx} {2021-07-04} {3.0.18} {A comprehensive (SI) units package} % \end{macrocode} % |