Only suppress math font at one level (fixes #694)

josephwright · Sep 1, 2023 · 7272ea9 · 7272ea9
1 parent d27081d
commit 7272ea9
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 55 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,11 @@ Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to
 
 ## [Unreleased]
 
+### Fixed
+- Corrected handling of font commands inside `\ensuremath` in text
+ mode (see issue
+ [\#694](https:/josephwright/siunitx/issues/694))
+
 ## [v3.3.5] - 2023-08-30
 
 ### Fixed

diff --git a/siunitx-print.dtx b/siunitx-print.dtx
@@ -891,15 +891,15 @@
  \tl_set:Nn \l_@@_tmp_tl {#1}
  \tl_if_empty:NF \l_@@_tmp_tl
  {
- \@@_text_replace_font:N \l_@@_tmp_tl
- \tl_if_empty:NF \l_siunitx_unit_font_tl
- {
- \exp_after:wN
-  \cs_set_eq:NN \l_siunitx_unit_font_tl \scan_stop:
- }
- \cs_set:Npn \mathord ##1
- { \@@_text_replace_first:N ##1 }
- \group_begin: 
+ \group_begin:
+  \@@_text_replace_font:N \l_@@_tmp_tl
+ \cs_set:Npn \mathord ##1
+ { \@@_text_replace_first:N ##1 }
+ \tl_if_empty:NF \l_siunitx_unit_font_tl
+  {
+  \exp_after:wN
+  \cs_set_eq:NN \l_siunitx_unit_font_tl \scan_stop:
+  }
  \tl_map_inline:nn
  { \mp \approx \sim \ge \le \geq \leq \gg \ll \angle }
  {
@@ -909,7 +909,10 @@
  \cs_set:Npn \sqrt ##1
  {
  \exp_not:N \ensuremath
- { \exp_not:N \sqrt { \exp_not:N \text {##1} } }
+ {
+ \exp_not:N \sqrt
+ { \exp_not:N \text { \@@_text_replace:n {##1} } }
+ }
  }
  \protected@edef \l_@@_tmp_tl
  { \exp_after:wN \@@_text_replace_first:N \l_@@_tmp_tl }

diff --git a/testfiles/siunitx-print.luatex.tlg b/testfiles/siunitx-print.luatex.tlg
@@ -255,29 +255,27 @@ l. ... }
 <argument> \l_tmpa_box 
 l. ... }
 > \box...=
-\hbox(6.94444+0.0)x16.80794, direction TLT
-.\hbox(6.94444+0.0)x16.80794, direction TLT
+\hbox(6.94444+0.0)x16.11116, direction TLT
+.\hbox(6.94444+0.0)x16.11116, direction TLT
 ..\mathon
-..\hbox(6.94444+0.0)x16.80794, direction TLT
-...\OML/cmm/m/it/10 m
-...\OML/cmm/m/it/10 o
-...\OML/cmm/m/it/10 l
-...\kern0.19678 (italic)
+..\hbox(6.94444+0.0)x16.11116, direction TLT
+...\OT1/cmr/m/n/10 m
+...\OT1/cmr/m/n/10 o
+...\OT1/cmr/m/n/10 l
 ..\mathoff
 ! OK.
 <argument> \l_tmpa_box 
 l. ... }
 > \box...=
-\hbox(6.94444+0.0)x16.80794, direction TLT
+\hbox(6.94444+0.0)x16.11116, direction TLT
 .\mathon
-.\hbox(6.94444+0.0)x16.80794, direction TLT
-..\hbox(6.94444+0.0)x16.80794, direction TLT
+.\hbox(6.94444+0.0)x16.11116, direction TLT
+..\hbox(6.94444+0.0)x16.11116, direction TLT
 ...\mathon
-...\hbox(6.94444+0.0)x16.80794, direction TLT
-....\OML/cmm/m/it/10 m
-....\OML/cmm/m/it/10 o
-....\OML/cmm/m/it/10 l
-....\kern0.19678 (italic)
+...\hbox(6.94444+0.0)x16.11116, direction TLT
+....\OT1/cmr/m/n/10 m
+....\OT1/cmr/m/n/10 o
+....\OT1/cmr/m/n/10 l
 ...\mathoff
 .\mathoff
 ! OK.

diff --git a/testfiles/siunitx-print.tlg b/testfiles/siunitx-print.tlg
@@ -249,29 +249,27 @@ l. ... }
 <argument> \l_tmpa_box 
 l. ... }
 > \box...=
-\hbox(6.94444+0.0)x16.80794
-.\hbox(6.94444+0.0)x16.80794
+\hbox(6.94444+0.0)x16.11116
+.\hbox(6.94444+0.0)x16.11116
 ..\mathon
-..\hbox(6.94444+0.0)x16.80794
-...\OML/cmm/m/it/10 m
-...\OML/cmm/m/it/10 o
-...\OML/cmm/m/it/10 l
-...\kern0.19678
+..\hbox(6.94444+0.0)x16.11116
+...\OT1/cmr/m/n/10 m
+...\OT1/cmr/m/n/10 o
+...\OT1/cmr/m/n/10 l
 ..\mathoff
 ! OK.
 <argument> \l_tmpa_box 
 l. ... }
 > \box...=
-\hbox(6.94444+0.0)x16.80794
+\hbox(6.94444+0.0)x16.11116
 .\mathon
-.\hbox(6.94444+0.0)x16.80794
-..\hbox(6.94444+0.0)x16.80794
+.\hbox(6.94444+0.0)x16.11116
+..\hbox(6.94444+0.0)x16.11116
 ...\mathon
-...\hbox(6.94444+0.0)x16.80794
-....\OML/cmm/m/it/10 m
-....\OML/cmm/m/it/10 o
-....\OML/cmm/m/it/10 l
-....\kern0.19678
+...\hbox(6.94444+0.0)x16.11116
+....\OT1/cmr/m/n/10 m
+....\OT1/cmr/m/n/10 o
+....\OT1/cmr/m/n/10 l
 ...\mathoff
 .\mathoff
 ! OK.

diff --git a/testfiles/siunitx-print.xetex.tlg b/testfiles/siunitx-print.xetex.tlg
@@ -225,29 +225,27 @@ l. ... }
 <argument> \l_tmpa_box 
 l. ... }
 > \box...=
-\hbox(6.94444+0.0)x16.80794
-.\hbox(6.94444+0.0)x16.80794
+\hbox(6.94444+0.0)x16.11116
+.\hbox(6.94444+0.0)x16.11116
 ..\mathon
-..\hbox(6.94444+0.0)x16.80794
-...\OML/cmm/m/it/10 m
-...\OML/cmm/m/it/10 o
-...\OML/cmm/m/it/10 l
-...\kern0.19678
+..\hbox(6.94444+0.0)x16.11116
+...\OT1/cmr/m/n/10 m
+...\OT1/cmr/m/n/10 o
+...\OT1/cmr/m/n/10 l
 ..\mathoff
 ! OK.
 <argument> \l_tmpa_box 
 l. ... }
 > \box...=
-\hbox(6.94444+0.0)x16.80794
+\hbox(6.94444+0.0)x16.11116
 .\mathon
-.\hbox(6.94444+0.0)x16.80794
-..\hbox(6.94444+0.0)x16.80794
+.\hbox(6.94444+0.0)x16.11116
+..\hbox(6.94444+0.0)x16.11116
 ...\mathon
-...\hbox(6.94444+0.0)x16.80794
-....\OML/cmm/m/it/10 m
-....\OML/cmm/m/it/10 o
-....\OML/cmm/m/it/10 l
-....\kern0.19678
+...\hbox(6.94444+0.0)x16.11116
+....\OT1/cmr/m/n/10 m
+....\OT1/cmr/m/n/10 o
+....\OT1/cmr/m/n/10 l
 ...\mathoff
 .\mathoff
 ! OK.