texlive[60442] Master/texmf-dist: siunitx (6sep21)
commits+karl at tug.org
commits+karl at tug.org
Mon Sep 6 23:17:46 CEST 2021
Revision: 60442
http://tug.org/svn/texlive?view=revision&revision=60442
Author: karl
Date: 2021-09-06 23:17:46 +0200 (Mon, 06 Sep 2021)
Log Message:
-----------
siunitx (6sep21)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md
trunk/Master/texmf-dist/doc/latex/siunitx/siunitx-code.pdf
trunk/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf
trunk/Master/texmf-dist/source/latex/siunitx/siunitx-print.dtx
trunk/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
trunk/Master/texmf-dist/source/latex/siunitx/siunitx.tex
trunk/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
Modified: trunk/Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md 2021-09-06 21:17:31 UTC (rev 60441)
+++ trunk/Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md 2021-09-06 21:17:46 UTC (rev 60442)
@@ -7,6 +7,13 @@
## [Unreleased]
+## [v3.0.29]
+
+### Fixed
+- Only apply `text-series-to-math` when the math version is
+ `normal` (issue
+ [#541](https://github.com/josephwright/siunitx/issues/541))
+
## [v3.0.28]
### Fixed
@@ -1557,7 +1564,8 @@
### Added
- First public testing release (as `si`)
-[Unreleased]: https://github.com/josephwright/siunitx/compare/v3.0.28...HEAD
+[Unreleased]: https://github.com/josephwright/siunitx/compare/v3.0.29...HEAD
+[v3.0.29]: https://github.com/josephwright/siunitx/compare/v3.0.28...v3.0.29
[v3.0.28]: https://github.com/josephwright/siunitx/compare/v3.0.27...v3.0.28
[v3.0.27]: https://github.com/josephwright/siunitx/compare/v3.0.26...v3.0.27
[v3.0.26]: https://github.com/josephwright/siunitx/compare/v3.0.25...v3.0.26
Modified: trunk/Master/texmf-dist/doc/latex/siunitx/siunitx-code.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/siunitx/siunitx-print.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/siunitx/siunitx-print.dtx 2021-09-06 21:17:31 UTC (rev 60441)
+++ trunk/Master/texmf-dist/source/latex/siunitx/siunitx-print.dtx 2021-09-06 21:17:46 UTC (rev 60442)
@@ -339,7 +339,7 @@
% \l_@@_math_version_bool ,
% \l_@@_math_family_bool ,
% \l_@@_text_font_tl ,
-% \l_@@_math_weight_bool
+% \l_@@_math_series_bool
% }
% Options which apply to the main formatting routine, and so are not tied
% to either symbolic or literal input.
@@ -375,7 +375,7 @@
text-font-command .tl_set:N =
\l_@@_text_font_tl ,
text-series-to-math .bool_set:N =
- \l_@@_math_weight_bool ,
+ \l_@@_math_series_bool ,
unit-color .tl_set:N =
\l_@@_unit_color_tl ,
unit-mode .choices:nn =
@@ -482,32 +482,32 @@
%
% \begin{variable}
% {
-% \c_@@_weight_uc_tl ,
-% \c_@@_weight_ecl_tl ,
-% \c_@@_weight_c_tl ,
-% \c_@@_weight_sc_tl ,
-% \c_@@_weight_sx_tl ,
-% \c_@@_weight_x_tl ,
-% \c_@@_weight_ex_tl ,
-% \c_@@_weight_ux_tl
+% \c_@@_series_uc_tl ,
+% \c_@@_series_ecl_tl ,
+% \c_@@_series_c_tl ,
+% \c_@@_series_sc_tl ,
+% \c_@@_series_sx_tl ,
+% \c_@@_series_x_tl ,
+% \c_@@_series_ex_tl ,
+% \c_@@_series_ux_tl
% }
% Font widths where the |m| for weight is omitted.
% \begin{macrocode}
\clist_map_inline:nn { uc , ec , c , sc , sx , x , ex , ux }
- { \tl_const:cn { c_@@_weight_ #1 _tl } { m } }
+ { \tl_const:cn { c_@@_series_ #1 _tl } { m } }
% \end{macrocode}
% \end{variable}
%
% \begin{variable}
% {
-% \c_@@_weight_l_tl ,
-% \c_@@_weight_m_tl ,
-% \c_@@_weight_b_tl
+% \c_@@_series_l_tl ,
+% \c_@@_series_m_tl ,
+% \c_@@_series_b_tl
% }
% Font widths with one letter.
% \begin{macrocode}
\clist_map_inline:nn { l , m , b }
- { \tl_const:cn { c_@@_weight_ #1 _tl } { #1 } }
+ { \tl_const:cn { c_@@_series_ #1 _tl } { #1 } }
% \end{macrocode}
% \end{variable}
%
@@ -535,7 +535,9 @@
% \begin{macrocode}
\cs_new_protected:Npn \siunitx_print_math:n #1
{
- \bool_if:NTF \l_@@_math_weight_bool
+ \bool_lazy_and:nnTF
+ { \l_@@_math_series_bool }
+ { \str_if_eq_p:Vn \math at version { normal } }
{
\tl_set:Nx \l_@@_tmp_tl
{ \exp_after:wN \@@_extract_series:Nw \f at series ? \q_stop }
@@ -551,13 +553,13 @@
% work to do. To keep things fast, we use a hash table based lookup rather
% than a sequence or property list.
% \begin{macrocode}
-\cs_new:Npn \@@_extract_series:Nw #1#2 ? #3 \q_stop
+\cs_new:Npn \@@_extract_series:Nw #1#2 ? #3 \q_stop
{
- \cs_if_exist:cTF { c_@@_weight_ #1#2 _tl }
- { \@@_convert_series:v { c_@@_weight_ #1#2 _tl } }
+ \cs_if_exist:cTF { c_@@_series_ #1#2 _tl }
+ { \@@_convert_series:v { c_@@_series_ #1#2 _tl } }
{
- \cs_if_exist:cTF { c_@@_weight_ #1 _tl }
- { \@@_convert_series:v { c_@@_weight_ #1 _tl } }
+ \cs_if_exist:cTF { c_@@_series_ #1 _tl }
+ { \@@_convert_series:v { c_@@_series_ #1 _tl } }
{ \@@_convert_series:n {#1#2} }
}
}
Modified: trunk/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/siunitx/siunitx.dtx 2021-09-06 21:17:31 UTC (rev 60441)
+++ trunk/Master/texmf-dist/source/latex/siunitx/siunitx.dtx 2021-09-06 21:17:46 UTC (rev 60442)
@@ -121,7 +121,7 @@
%
% Identify the package and give the over all version information.
% \begin{macrocode}
-\ProvidesExplPackage {siunitx} {2021-08-27} {3.0.28}
+\ProvidesExplPackage {siunitx} {2021-09-06} {3.0.29}
{A comprehensive (SI) units package}
% \end{macrocode}
%
Modified: trunk/Master/texmf-dist/source/latex/siunitx/siunitx.tex
===================================================================
--- trunk/Master/texmf-dist/source/latex/siunitx/siunitx.tex 2021-09-06 21:17:31 UTC (rev 60441)
+++ trunk/Master/texmf-dist/source/latex/siunitx/siunitx.tex 2021-09-06 21:17:46 UTC (rev 60442)
@@ -1900,6 +1900,13 @@
\qtyrange[range-units = repeat]{2}{4}{\degreeCelsius} \\
\qtyrange[range-units = single]{2}{4}{\degreeCelsius}
\end{LaTeXdemo}
+The option \opt{product-units} also offers the settings \opt{bracket-power} and
+\opt{power}.
+\begin{LaTeXdemo}
+ \qtyproduct{2 x 4}{\metre} \\
+ \qtyproduct[product-units = bracket-power]{2 x 4}{\metre} \\
+ \qtyproduct[product-units = power]{2 x 4}{\metre}
+\end{LaTeXdemo}
\subsection{Complex numbers}
Modified: trunk/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/siunitx/siunitx.sty 2021-09-06 21:17:31 UTC (rev 60441)
+++ trunk/Master/texmf-dist/tex/latex/siunitx/siunitx.sty 2021-09-06 21:17:46 UTC (rev 60442)
@@ -42,7 +42,7 @@
}%
\endinput
}%
-\ProvidesExplPackage {siunitx} {2021-08-27} {3.0.28}
+\ProvidesExplPackage {siunitx} {2021-09-06} {3.0.29}
{A comprehensive (SI) units package}
\msg_new:nnnn { siunitx } { incompatible-package }
{ Package~'#1'~incompatible. }
@@ -3648,7 +3648,7 @@
text-font-command .tl_set:N =
\l__siunitx_print_text_font_tl ,
text-series-to-math .bool_set:N =
- \l__siunitx_print_math_weight_bool ,
+ \l__siunitx_print_math_series_bool ,
unit-color .tl_set:N =
\l__siunitx_print_unit_color_tl ,
unit-mode .choices:nn =
@@ -3706,12 +3706,14 @@
}
}
\clist_map_inline:nn { uc , ec , c , sc , sx , x , ex , ux }
- { \tl_const:cn { c__siunitx_print_weight_ #1 _tl } { m } }
+ { \tl_const:cn { c__siunitx_print_series_ #1 _tl } { m } }
\clist_map_inline:nn { l , m , b }
- { \tl_const:cn { c__siunitx_print_weight_ #1 _tl } { #1 } }
+ { \tl_const:cn { c__siunitx_print_series_ #1 _tl } { #1 } }
\cs_new_protected:Npn \siunitx_print_math:n #1
{
- \bool_if:NTF \l__siunitx_print_math_weight_bool
+ \bool_lazy_and:nnTF
+ { \l__siunitx_print_math_series_bool }
+ { \str_if_eq_p:Vn \math at version { normal } }
{
\tl_set:Nx \l__siunitx_print_tmp_tl
{ \exp_after:wN \__siunitx_print_extract_series:Nw \f at series ? \q_stop }
@@ -3721,13 +3723,13 @@
}
{ \__siunitx_print_math_auxi:n {#1} }
}
-\cs_new:Npn \__siunitx_print_extract_series:Nw #1#2 ? #3 \q_stop
+\cs_new:Npn \__siunitx_print_extract_series:Nw #1#2 ? #3 \q_stop
{
- \cs_if_exist:cTF { c__siunitx_print_weight_ #1#2 _tl }
- { \__siunitx_print_convert_series:v { c__siunitx_print_weight_ #1#2 _tl } }
+ \cs_if_exist:cTF { c__siunitx_print_series_ #1#2 _tl }
+ { \__siunitx_print_convert_series:v { c__siunitx_print_series_ #1#2 _tl } }
{
- \cs_if_exist:cTF { c__siunitx_print_weight_ #1 _tl }
- { \__siunitx_print_convert_series:v { c__siunitx_print_weight_ #1 _tl } }
+ \cs_if_exist:cTF { c__siunitx_print_series_ #1 _tl }
+ { \__siunitx_print_convert_series:v { c__siunitx_print_series_ #1 _tl } }
{ \__siunitx_print_convert_series:n {#1#2} }
}
}
More information about the tex-live-commits
mailing list.