From a0fd0a0407e303ff43a339e47fbe7e8de782e60c Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 15 Apr 2024 20:04:28 +0000 Subject: siunitx (15apr24) git-svn-id: svn://tug.org/texlive/trunk@70958 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md | 13 ++++++++++--- .../texmf-dist/doc/latex/siunitx/siunitx-code.pdf | Bin 645101 -> 645640 bytes Master/texmf-dist/doc/latex/siunitx/siunitx.pdf | Bin 703728 -> 703738 bytes .../source/latex/siunitx/siunitx-abbreviation.dtx | 2 +- .../source/latex/siunitx/siunitx-number.dtx | 15 ++++++++++++--- .../source/latex/siunitx/siunitx-unit.dtx | 2 +- Master/texmf-dist/source/latex/siunitx/siunitx.dtx | 2 +- Master/texmf-dist/tex/latex/siunitx/siunitx.sty | 12 +++++++++--- 8 files changed, 34 insertions(+), 12 deletions(-) diff --git a/Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md b/Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md index 87c775ca83a..38db79ac180 100644 --- a/Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md +++ b/Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md @@ -7,6 +7,12 @@ Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to ## [Unreleased] +## [v3.3.14] - 2024-04-15 + +### Fixed +- Extension of multiple uncertainties when main value is less precise (see + issue [\#727](https://github.com/josephwright/siunitx/issues/727)) + ## [v3.3.13] - 2024-04-12 ### Fixed @@ -339,7 +345,7 @@ Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to - Options `digit-group-size`, `digit-group-first-size` and `digit-group-other-size` to control digit grouping - Options `display-per-mode` and `inline-per-mode` to offer additional - flexiblity in `per-mode` control + flexibility in `per-mode` control - Option `per-symbol-script-correction` - Option `power-half-as-sqrt` - Option `retain-negative-zero` @@ -1396,7 +1402,7 @@ Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to - Allow for `bidi`/RTL when applying `\text` - Search-and-replace in UTF-8 literal units - Load binary-units only when requested (issue [\#201](https://github.com/josephwright/siunitx/issues/201)) -- Disable `\hightlight` in bookmarks (issue [\#207](https://github.com/josephwright/siunitx/issues/207)) +- Disable `\highlight` in bookmarks (issue [\#207](https://github.com/josephwright/siunitx/issues/207)) ## [v2.5l] - 2012-11-21 @@ -2086,7 +2092,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.3.13...HEAD +[Unreleased]: https://github.com/josephwright/siunitx/compare/v3.3.14...HEAD +[v3.3.14]: https://github.com/josephwright/siunitx/compare/v3.3.13...v3.3.14 [v3.3.13]: https://github.com/josephwright/siunitx/compare/v3.3.12...v3.3.13 [v3.3.12]: https://github.com/josephwright/siunitx/compare/v3.3.11...v3.3.12 [v3.3.11]: https://github.com/josephwright/siunitx/compare/v3.3.10...v3.3.11 diff --git a/Master/texmf-dist/doc/latex/siunitx/siunitx-code.pdf b/Master/texmf-dist/doc/latex/siunitx/siunitx-code.pdf index cf002514278..7c2b6e2b653 100644 Binary files a/Master/texmf-dist/doc/latex/siunitx/siunitx-code.pdf and b/Master/texmf-dist/doc/latex/siunitx/siunitx-code.pdf differ diff --git a/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf b/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf index 8bd9cefb62c..15e5ab256a5 100644 Binary files a/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf and b/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf differ diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx-abbreviation.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx-abbreviation.dtx index f1235463899..9d99fed92e7 100644 --- a/Master/texmf-dist/source/latex/siunitx/siunitx-abbreviation.dtx +++ b/Master/texmf-dist/source/latex/siunitx/siunitx-abbreviation.dtx @@ -40,7 +40,7 @@ % \GetFileInfo{siunitx.sty} % % \title{^^A -% \pkg{siunitx-abbreviations} -- Abbreviatons^^A +% \pkg{siunitx-abbreviations} -- Abbreviations^^A % \thanks{This file describes \fileversion, % last revised \filedate.}^^A % } diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx-number.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx-number.dtx index cfa4a03e259..2b875143759 100644 --- a/Master/texmf-dist/source/latex/siunitx/siunitx-number.dtx +++ b/Master/texmf-dist/source/latex/siunitx/siunitx-number.dtx @@ -1117,9 +1117,11 @@ % } % \begin{macro}[EXP] % {\@@_parse_combine_uncert:nnnnnn, \@@_parse_combine_uncert:ennnnn} +% \begin{macro}[EXP]{\@@_parse_combine_uncert_aux:nn} % \begin{macro}[EXP] % {\@@_parse_combine_uncert:nnnnnnn, \@@_parse_combine_uncert:ennnnnn} -% \begin{macro}[EXP]{\@@_parse_combine_uncert:nnnnn} +% \begin{macro}[EXP] +% {\@@_parse_combine_uncert:nnnnn, \@@_parse_combine_uncert:nnenn} % \begin{macro}[EXP] % { % \@@_parse_combine_uncert_aux:nnnn , @@ -1196,11 +1198,16 @@ {#3} {#4} {#5} {#6} { #7 #1 } } { - \@@_parse_combine_uncert:nnnnn - { #3 #1 } {#4} {#5} {#6} {#7} + \@@_parse_combine_uncert:nnenn { #3 #1 } {#4} + { + \tl_map_tokens:nn {#5} + { \@@_parse_combine_uncert_aux:nn {#1} } + } + {#6} {#7} } } \cs_generate_variant:Nn \@@_parse_combine_uncert:nnnnnnn { e } +\cs_new:Npn \@@_parse_combine_uncert_aux:nn #1#2 { {#2#1} } % \end{macrocode} % We now ensure that the decimal part is never entirely blank \emph{if} there % are decimal-part uncertainty digits. There is also a need to handle the @@ -1224,6 +1231,7 @@ {#2} {#3} } +\cs_generate_variant:Nn \@@_parse_combine_uncert:nnnnn { nne } \cs_new:Npn \@@_parse_combine_uncert_aux:nnnn #1#2#3#4 { \@@_parse_combine_uncert_loop:neennnn @@ -1282,6 +1290,7 @@ % \end{macro} % \end{macro} % \end{macro} +% \end{macro} % % \begin{macro}{\@@_parse_comparator:} % \begin{macro}{\@@_parse_comparator_aux:Nw} diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx-unit.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx-unit.dtx index 2c9c1efb138..a7fd28e8bc0 100644 --- a/Master/texmf-dist/source/latex/siunitx/siunitx-unit.dtx +++ b/Master/texmf-dist/source/latex/siunitx/siunitx-unit.dtx @@ -272,7 +272,7 @@ % \end{variable} % % \begin{variable}{\l_siunitx_unit_fraction_tl} -% The fraction function which is applied whne constructing fractional units: +% The fraction function which is applied when constructing fractional units: % set by |fraction-command|. % \end{variable} % diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx index 0d79cd5fde1..34a38b864a7 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} {2024-04-12} {3.3.13} +\ProvidesExplPackage {siunitx} {2024-04-15} {3.3.14} {A comprehensive (SI) units package} % \end{macrocode} % diff --git a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty index f58f61ec131..a9268bddb2b 100644 --- a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty +++ b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty @@ -41,7 +41,7 @@ }% \endinput }% -\ProvidesExplPackage {siunitx} {2024-04-12} {3.3.13} +\ProvidesExplPackage {siunitx} {2024-04-15} {3.3.14} {A comprehensive (SI) units package} \msg_new:nnnn { siunitx } { incompatible-package } { Package~'#1'~incompatible. } @@ -286,11 +286,16 @@ {#3} {#4} {#5} {#6} { #7 #1 } } { - \__siunitx_number_parse_combine_uncert:nnnnn - { #3 #1 } {#4} {#5} {#6} {#7} + \__siunitx_number_parse_combine_uncert:nnenn { #3 #1 } {#4} + { + \tl_map_tokens:nn {#5} + { \__siunitx_number_parse_combine_uncert_aux:nn {#1} } + } + {#6} {#7} } } \cs_generate_variant:Nn \__siunitx_number_parse_combine_uncert:nnnnnnn { e } +\cs_new:Npn \__siunitx_number_parse_combine_uncert_aux:nn #1#2 { {#2#1} } \cs_new:Npn \__siunitx_number_parse_combine_uncert:nnnnn #1#2#3#4#5 { \__siunitx_number_parse_combine_uncert_aux:eenn @@ -308,6 +313,7 @@ {#2} {#3} } +\cs_generate_variant:Nn \__siunitx_number_parse_combine_uncert:nnnnn { nne } \cs_new:Npn \__siunitx_number_parse_combine_uncert_aux:nnnn #1#2#3#4 { \__siunitx_number_parse_combine_uncert_loop:neennnn -- cgit v1.2.3