diff options
Diffstat (limited to 'Master')
| -rw-r--r-- | Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md | 10 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/siunitx/siunitx-code.pdf | bin | 1512131 -> 1512430 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/latex/siunitx/siunitx.pdf | bin | 636196 -> 636993 bytes | |||
| -rw-r--r-- | Master/texmf-dist/source/latex/siunitx/siunitx-print.dtx | 44 | ||||
| -rw-r--r-- | Master/texmf-dist/source/latex/siunitx/siunitx.dtx | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/source/latex/siunitx/siunitx.tex | 7 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/siunitx/siunitx.sty | 22 |
7 files changed, 52 insertions, 33 deletions
diff --git a/Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md b/Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md index 193bd0cb470..614260e8454 100644 --- a/Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md +++ b/Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md @@ -7,6 +7,13 @@ Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to ## [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 @@ Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to ### 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 diff --git a/Master/texmf-dist/doc/latex/siunitx/siunitx-code.pdf b/Master/texmf-dist/doc/latex/siunitx/siunitx-code.pdf Binary files differindex 69de10dbc3e..e674520e65c 100644 --- a/Master/texmf-dist/doc/latex/siunitx/siunitx-code.pdf +++ b/Master/texmf-dist/doc/latex/siunitx/siunitx-code.pdf diff --git a/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf b/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf Binary files differindex 417219bbc00..6f9ceb00c1c 100644 --- a/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf +++ b/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx-print.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx-print.dtx index a38edf5c55d..5b14aa123bc 100644 --- a/Master/texmf-dist/source/latex/siunitx/siunitx-print.dtx +++ b/Master/texmf-dist/source/latex/siunitx/siunitx-print.dtx @@ -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@version { normal } } { \tl_set:Nx \l_@@_tmp_tl { \exp_after:wN \@@_extract_series:Nw \f@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} } } } diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx index dde4c1ade4a..1269e5ff90d 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-08-27} {3.0.28} +\ProvidesExplPackage {siunitx} {2021-09-06} {3.0.29} {A comprehensive (SI) units package} % \end{macrocode} % diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx.tex b/Master/texmf-dist/source/latex/siunitx/siunitx.tex index b83b72463d3..95cad5ca88e 100644 --- a/Master/texmf-dist/source/latex/siunitx/siunitx.tex +++ b/Master/texmf-dist/source/latex/siunitx/siunitx.tex @@ -1900,6 +1900,13 @@ exponents. \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} diff --git a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty index 5929ace5fd8..22386e3533c 100644 --- a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty +++ b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty @@ -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@version { normal } } { \tl_set:Nx \l__siunitx_print_tmp_tl { \exp_after:wN \__siunitx_print_extract_series:Nw \f@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} } } } |