Skip to content

Commit

Permalink
Refinements
Browse files Browse the repository at this point in the history
  • Loading branch information
@josephwright
josephwright committed Dec 4, 2021
1 parent b632a10 commit a00ba70
Show file tree
Hide file tree
Showing 5 changed files with 80 additions and 22 deletions.
17 changes: 13 additions & 4 deletions siunitx-emulation.dtx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -559,10 +559,19 @@
} ,
table-omit-exponent .code:n =
{
\@@_option_deprecated:nnV
{ table-omit-exponent }
{ drop-exponent }
\l_keys_value_tl
\msg_info:nnnn { siunitx } { option-deprecated }
{ table-omit-exponent } { drop-exponent }
\str_if_eq:VnTF \l_keys_value_tl { true }
{
\keys_set:nn
{ siunitx }
{ drop-exponent = true , exponent-mode = fixed }
}
{
\keys_set:nn
{ siunitx }
{ drop-exponent = false }
}
} ,
table-omit-exponent .default:n = true ,
table-parse-only .code:n =
Expand Down
4 changes: 1 addition & 3 deletions siunitx-number.dtx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2143,9 +2143,7 @@
{
\bool_if:NT \l_@@_drop_exponent_bool
{
\bool_lazy_or:nnF
{ \str_if_eq_p:Vn \l_@@_exponent_mode_tl { engineering } }
{ \str_if_eq_p:Vn \l_@@_exponent_mode_tl { scientific } }
\str_if_eq:VnT \l_@@_exponent_mode_tl { input }
{ \msg_warning:nn { siunitx } { ambiguous-dropped-exponent } }
\tl_set:Nx #2
{ \exp_after:wN \@@_drop_exponent:nnnnnnn #1 }
Expand Down
27 changes: 22 additions & 5 deletions testfiles/siunitx-emulation.luatex.tlg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1962,6 +1962,20 @@ Package siunitx Info: Option "table-omit-exponent" has been deprecated in this
(siunitx) release.
(siunitx)
(siunitx) Use "drop-exponent" as a replacement.
Overfull \hbox (28.33333pt too wide) detected at line 379
$\OT1/cmr/m/n/10 1 234 000$
\hbox(6.44444+0.0)x10.00003, direction TLT
.\mathon
.\OT1/cmr/m/n/10 1
.\glue 1.66663
.\OT1/cmr/m/n/10 2
.\OT1/cmr/m/n/10 3
.\OT1/cmr/m/n/10 4
.\glue 1.66663
.\OT1/cmr/m/n/10 0
.\OT1/cmr/m/n/10 0
.\OT1/cmr/m/n/10 0
.\mathoff
Package siunitx Info: Option "table-omit-exponent" has been deprecated in this
(siunitx) release.
(siunitx)
Expand All @@ -1983,19 +1997,22 @@ Package siunitx Info: Option "table-omit-exponent" has been deprecated in this
.....\kern0.0
.....\hbox(0.0+0.0)x0.0, direction TLT
......\glue 0.0 plus 1.0fil
.....\hbox(6.44444+0.0)x10.00003, direction TLT
.....\hbox(6.44444+0.0)x10.00003, glue set - 28.33333fil, direction TLT
......\glue 0.0 plus 1.0fil
......\glue 0.0 plus 1.0fil
......\glue 0.0 plus 1.0fil minus 1.0fil
......\mathon
......\OT1/cmr/m/n/10 1
......\glue 1.66663
......\OT1/cmr/m/n/10 2
......\mathoff
.....\hbox(6.44444+0.0)x12.77782, direction TLT
......\mathon
......\OML/cmm/m/it/10 :
......\OT1/cmr/m/n/10 3
......\OT1/cmr/m/n/10 4
......\glue 1.66663
......\OT1/cmr/m/n/10 0
......\OT1/cmr/m/n/10 0
......\OT1/cmr/m/n/10 0
......\mathoff
.....\hbox(0.0+0.0)x12.77782, glue set 12.77782fil, direction TLT
......\glue 0.0 plus 1.0fil
......\mathon
......\hbox(0.0+0.0)x0.0, direction TLT
Expand Down
27 changes: 22 additions & 5 deletions testfiles/siunitx-emulation.tlg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1958,6 +1958,20 @@ Package siunitx Info: Option "table-omit-exponent" has been deprecated in this
(siunitx) release.
(siunitx)
(siunitx) Use "drop-exponent" as a replacement.
Overfull \hbox (28.33333pt too wide) detected at line 379
$\OT1/cmr/m/n/10 1 234 000$
\hbox(6.44444+0.0)x10.00003
.\mathon
.\OT1/cmr/m/n/10 1
.\glue 1.66663
.\OT1/cmr/m/n/10 2
.\OT1/cmr/m/n/10 3
.\OT1/cmr/m/n/10 4
.\glue 1.66663
.\OT1/cmr/m/n/10 0
.\OT1/cmr/m/n/10 0
.\OT1/cmr/m/n/10 0
.\mathoff
Package siunitx Info: Option "table-omit-exponent" has been deprecated in this
(siunitx) release.
(siunitx)
Expand All @@ -1979,19 +1993,22 @@ Package siunitx Info: Option "table-omit-exponent" has been deprecated in this
.....\kern 0.0
.....\hbox(0.0+0.0)x0.0
......\glue 0.0 plus 1.0fil
.....\hbox(6.44444+0.0)x10.00003
.....\hbox(6.44444+0.0)x10.00003, glue set - 28.33333fil
......\glue 0.0 plus 1.0fil
......\glue 0.0 plus 1.0fil
......\glue 0.0 plus 1.0fil minus 1.0fil
......\mathon
......\OT1/cmr/m/n/10 1
......\glue 1.66663
......\OT1/cmr/m/n/10 2
......\mathoff
.....\hbox(6.44444+0.0)x12.77782
......\mathon
......\OML/cmm/m/it/10 :
......\OT1/cmr/m/n/10 3
......\OT1/cmr/m/n/10 4
......\glue 1.66663
......\OT1/cmr/m/n/10 0
......\OT1/cmr/m/n/10 0
......\OT1/cmr/m/n/10 0
......\mathoff
.....\hbox(0.0+0.0)x12.77782, glue set 12.77782fil
......\glue 0.0 plus 1.0fil
......\mathon
......\hbox(0.0+0.0)x0.0
Expand Down
27 changes: 22 additions & 5 deletions testfiles/siunitx-emulation.xetex.tlg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1943,6 +1943,20 @@ Package siunitx Info: Option "table-omit-exponent" has been deprecated in this
(siunitx) release.
(siunitx)
(siunitx) Use "drop-exponent" as a replacement.
Overfull \hbox (28.33333pt too wide) detected at line 379
$\OT1/cmr/m/n/10 1 234 000$
\hbox(6.44444+0.0)x10.00003
.\mathon
.\OT1/cmr/m/n/10 1
.\glue 1.66663
.\OT1/cmr/m/n/10 2
.\OT1/cmr/m/n/10 3
.\OT1/cmr/m/n/10 4
.\glue 1.66663
.\OT1/cmr/m/n/10 0
.\OT1/cmr/m/n/10 0
.\OT1/cmr/m/n/10 0
.\mathoff
Package siunitx Info: Option "table-omit-exponent" has been deprecated in this
(siunitx) release.
(siunitx)
Expand All @@ -1964,19 +1978,22 @@ Package siunitx Info: Option "table-omit-exponent" has been deprecated in this
.....\kern 0.0
.....\hbox(0.0+0.0)x0.0
......\glue 0.0 plus 1.0fil
.....\hbox(6.44444+0.0)x10.00003
.....\hbox(6.44444+0.0)x10.00003, glue set - 28.33333fil
......\glue 0.0 plus 1.0fil
......\glue 0.0 plus 1.0fil
......\glue 0.0 plus 1.0fil minus 1.0fil
......\mathon
......\OT1/cmr/m/n/10 1
......\glue 1.66663
......\OT1/cmr/m/n/10 2
......\mathoff
.....\hbox(6.44444+0.0)x12.77782
......\mathon
......\OML/cmm/m/it/10 :
......\OT1/cmr/m/n/10 3
......\OT1/cmr/m/n/10 4
......\glue 1.66663
......\OT1/cmr/m/n/10 0
......\OT1/cmr/m/n/10 0
......\OT1/cmr/m/n/10 0
......\mathoff
.....\hbox(0.0+0.0)x12.77782, glue set 12.77782fil
......\glue 0.0 plus 1.0fil
......\mathon
......\hbox(0.0+0.0)x0.0
Expand Down

0 comments on commit a00ba70

Please sign in to comment.