From 3823f9ede0c52aa11096e63d97bfced267f3adcb Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Thu, 9 Nov 2023 22:16:35 +0000
Subject: siunitx (6nov23)

git-svn-id: svn://tug.org/texlive/trunk@68775 c570f23f-e606-0410-a88d-b1316a301751
---
 Master/texmf-dist/source/latex/siunitx/siunitx-number.dtx | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'Master/texmf-dist/source/latex/siunitx/siunitx-number.dtx')

diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx-number.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx-number.dtx
index 2218e610228..04b302cf513 100644
--- a/Master/texmf-dist/source/latex/siunitx/siunitx-number.dtx
+++ b/Master/texmf-dist/source/latex/siunitx/siunitx-number.dtx
@@ -1777,7 +1777,7 @@
 % \begin{macro}
 %   {
 %     \@@_parse_uncert_marker:nnnnnnN ,
-%     \@@_parse_uncert_marker:xnnnnnN
+%     \@@_parse_uncert_marker:ennnnnN
 %   }
 % \begin{macro}{\@@_parse_uncert_after:N}
 %   Parsing a combined uncertainty has a very restricted range of allowed
@@ -1954,7 +1954,7 @@
   }
 \cs_new_protected:Npn \@@_parse_uncert_marker:nnnnnN #1#2#3#4#5#6
   {
-    \@@_parse_uncert_marker:xnnnnnN
+    \@@_parse_uncert_marker:ennnnnN
       { \int_eval:n { \tl_count:n {#4} } }
       {#1} {#2} {#3} {#4} {#5} #6
   }
@@ -1990,7 +1990,7 @@
       }
         #5#6#7
   }
-\cs_generate_variant:Nn \@@_parse_uncert_marker:nnnnnnN { x }
+\cs_generate_variant:Nn \@@_parse_uncert_marker:nnnnnnN { e }
 %    \end{macrocode}
 %   At the end of collection, we can either start another one or be done:
 %   either way we move the data around.
@@ -4148,7 +4148,11 @@
                 { ! \str_if_eq_p:nn { #1 . #2 } { 1. } }
                 {
                   \bool_lazy_and_p:nn
-                    { \str_if_eq_p:nn {#3} { 0 } }
+                    {
+                      \bool_lazy_or_p:nn
+                        { \tl_if_blank_p:n {#3} }
+                        { \str_if_eq_p:nn {#3} { 0 } }
+                    }
                     { ! \l_@@_zero_exponent_bool }
                 }
                 {
-- 
cgit v1.2.3

