diff options
author | Karl Berry <karl@freefriends.org> | 2022-09-07 20:42:47 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2022-09-07 20:42:47 +0000 |
commit | b12922cf76ac3be9a9b44057c61b1f463b953fcb (patch) | |
tree | 348cf65339b3aa81864bd5bad71ac196edaab4e7 | |
parent | e6dec9005b7981499b6f08929640a8df848c5b06 (diff) |
siunitx (7sep22)
git-svn-id: svn://tug.org/texlive/trunk@64310 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r-- | Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md | 8 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/siunitx/siunitx-code.pdf | bin | 617785 -> 617808 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/siunitx/siunitx.pdf | bin | 665461 -> 665418 bytes | |||
-rw-r--r-- | Master/texmf-dist/source/latex/siunitx/siunitx-emulation.dtx | 5 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/siunitx/siunitx-number.dtx | 6 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/siunitx/siunitx-quantity.dtx | 5 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/siunitx/siunitx-symbol.dtx | 5 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/siunitx/siunitx-unit.dtx | 10 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/siunitx/siunitx.dtx | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/siunitx/siunitx.sty | 24 |
10 files changed, 49 insertions, 16 deletions
diff --git a/Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md b/Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md index 7c2784c3bf4..c4aec21e34a 100644 --- a/Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md +++ b/Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md @@ -7,6 +7,11 @@ Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to ## [Unreleased] +## [v3.1.7] - 2022-09-07 + +### Changed +- Defensive step against active symbol characters in Unicode engines + ## [v3.1.6] - 2022-08-08 ### Fixed @@ -1806,7 +1811,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.1.6...HEAD +[Unreleased]: https://github.com/josephwright/siunitx/compare/v3.1.7...HEAD +[v3.1.7]: https://github.com/josephwright/siunitx/compare/v3.1.6...v3.1.7 [v3.1.6]: https://github.com/josephwright/siunitx/compare/v3.1.5...v3.1.6 [v3.1.5]: https://github.com/josephwright/siunitx/compare/v3.1.4...v3.1.5 [v3.1.4]: https://github.com/josephwright/siunitx/compare/v3.1.3...v3.1.4 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 b9298d8e964..c9dcdaecda7 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 ce6ec541476..4954530a976 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-emulation.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx-emulation.dtx index 1b96dd2b9a5..96bbaf02d4a 100644 --- a/Master/texmf-dist/source/latex/siunitx/siunitx-emulation.dtx +++ b/Master/texmf-dist/source/latex/siunitx/siunitx-emulation.dtx @@ -950,7 +950,10 @@ { \sys_if_engine_xetex_p: } { \cs_new:Npn \@@_non_latin:n #1 - { \char_generate:nn {#1} { \char_value_catcode:n {#1} } } + { + \exp_after:wN \exp_after:wN \exp_after:wN + \exp_not:N \char_generate:nn {#1} { \char_value_catcode:n {#1} } + } } { \cs_new:Npn \@@_non_latin:n #1 diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx-number.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx-number.dtx index e1cb9e639df..f80684ee9cd 100644 --- a/Master/texmf-dist/source/latex/siunitx/siunitx-number.dtx +++ b/Master/texmf-dist/source/latex/siunitx/siunitx-number.dtx @@ -1906,7 +1906,7 @@ % \end{variable} % % \begin{macro}{\@@_set_round_min:n} -% \begin{macro}[EXP]{\@@_set_round_min:nnnnnnn} +% \begin{macro}{\@@_set_round_min:nnnnnnn} % For setting the rounding minimum, the aim is to do as much of the work % now as possible. That's mainly a question of checking if there are any % significant digits in the mantissa given. @@ -1916,7 +1916,7 @@ \siunitx_number_parse:nN {#1} \l_@@_tmp_tl \exp_after:wN \@@_set_round_min:nnnnnnn \l_@@_tmp_tl } -\cs_new:Npn \@@_set_round_min:nnnnnnn #1#2#3#4#5#6#7 +\cs_new_protected:Npn \@@_set_round_min:nnnnnnn #1#2#3#4#5#6#7 { \tl_set:Nx \l_@@_round_min_tl { @@ -3114,7 +3114,7 @@ % Before doing any rounding, we need to be sure that the main value has % enough significant digits. If not, the result is zero. % \begin{macrocode} -\cs_new:Npn \__siunitx_number_round_uncertainty:nnn #1#2#3 +\cs_new:Npn \@@_round_uncertainty:nnn #1#2#3 { \@@_round_uncertainty_check:nnnw {#1} {#2} {#3} #1#2 \q_recursion_tail \q_recursion_stop diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx-quantity.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx-quantity.dtx index 94f50a1ce71..69182e37c3c 100644 --- a/Master/texmf-dist/source/latex/siunitx/siunitx-quantity.dtx +++ b/Master/texmf-dist/source/latex/siunitx/siunitx-quantity.dtx @@ -428,7 +428,10 @@ { \sys_if_engine_xetex_p: } { \cs_new:Npn \@@_non_latin:n #1 - { \char_generate:nn {#1} { \char_value_catcode:n {#1} } } + { + \exp_after:wN \exp_after:wN \exp_after:wN + \exp_not:N \char_generate:nn {#1} { \char_value_catcode:n {#1} } + } } { \cs_new:Npn \@@_non_latin:n #1 diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx-symbol.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx-symbol.dtx index 30791514b17..496ea9a9985 100644 --- a/Master/texmf-dist/source/latex/siunitx/siunitx-symbol.dtx +++ b/Master/texmf-dist/source/latex/siunitx/siunitx-symbol.dtx @@ -104,7 +104,10 @@ { \sys_if_engine_xetex_p: } { \cs_new:Npn \@@_non_latin:n #1 - { \char_generate:nn {#1} { \char_value_catcode:n {#1} } } + { + \exp_after:wN \exp_after:wN \exp_after:wN + \exp_not:N \char_generate:nn {#1} { \char_value_catcode:n {#1} } + } } { \cs_new:Npn \@@_non_latin:n #1 diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx-unit.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx-unit.dtx index 6ea4ef12b9e..713c4c53259 100644 --- a/Master/texmf-dist/source/latex/siunitx/siunitx-unit.dtx +++ b/Master/texmf-dist/source/latex/siunitx/siunitx-unit.dtx @@ -2644,14 +2644,20 @@ % A small amount of code to make it convenient to include non-Latin % characters in units without having to directly include them in the % sources directly. We only make the first token active as some packages -% (\foreign{e.g.}~\pkg{kotex}) do this. +% (\foreign{e.g.}~\pkg{kotex}) do this. For Unicode engines, we +% might run into some odd situations where active characters are in +% use (\foreign{e.g.}~\pkg{luainputenc}), so take precautions here +% too, % \begin{macrocode} \bool_lazy_or:nnTF { \sys_if_engine_luatex_p: } { \sys_if_engine_xetex_p: } { \cs_new:Npn \@@_non_latin:n #1 - { \char_generate:nn {#1} { \char_value_catcode:n {#1} } } + { + \exp_after:wN \exp_after:wN \exp_after:wN + \exp_not:N \char_generate:nn {#1} { \char_value_catcode:n {#1} } + } } { \cs_new:Npn \@@_non_latin:n #1 diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx index 7dd368799fe..13a76da695d 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} {2022-08-08} {3.1.6} +\ProvidesExplPackage {siunitx} {2022-09-07} {3.1.7} {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 be7645a696c..d325f930009 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} {2022-08-08} {3.1.6} +\ProvidesExplPackage {siunitx} {2022-09-07} {3.1.7} {A comprehensive (SI) units package} \msg_new:nnnn { siunitx } { incompatible-package } { Package~'#1'~incompatible. } @@ -2466,7 +2466,7 @@ \siunitx_number_parse:nN {#1} \l__siunitx_number_tmp_tl \exp_after:wN \__siunitx_number_set_round_min:nnnnnnn \l__siunitx_number_tmp_tl } -\cs_new:Npn \__siunitx_number_set_round_min:nnnnnnn #1#2#3#4#5#6#7 +\cs_new_protected:Npn \__siunitx_number_set_round_min:nnnnnnn #1#2#3#4#5#6#7 { \tl_set:Nx \l__siunitx_number_round_min_tl { @@ -6729,7 +6729,10 @@ { \sys_if_engine_xetex_p: } { \cs_new:Npn \__siunitx_unit_non_latin:n #1 - { \char_generate:nn {#1} { \char_value_catcode:n {#1} } } + { + \exp_after:wN \exp_after:wN \exp_after:wN + \exp_not:N \char_generate:nn {#1} { \char_value_catcode:n {#1} } + } } { \cs_new:Npn \__siunitx_unit_non_latin:n #1 @@ -7073,7 +7076,10 @@ { \sys_if_engine_xetex_p: } { \cs_new:Npn \__siunitx_quantity_non_latin:n #1 - { \char_generate:nn {#1} { \char_value_catcode:n {#1} } } + { + \exp_after:wN \exp_after:wN \exp_after:wN + \exp_not:N \char_generate:nn {#1} { \char_value_catcode:n {#1} } + } } { \cs_new:Npn \__siunitx_quantity_non_latin:n #1 @@ -7110,7 +7116,10 @@ { \sys_if_engine_xetex_p: } { \cs_new:Npn \__siunitx_symbol_non_latin:n #1 - { \char_generate:nn {#1} { \char_value_catcode:n {#1} } } + { + \exp_after:wN \exp_after:wN \exp_after:wN + \exp_not:N \char_generate:nn {#1} { \char_value_catcode:n {#1} } + } } { \cs_new:Npn \__siunitx_symbol_non_latin:n #1 @@ -8612,7 +8621,10 @@ { \sys_if_engine_xetex_p: } { \cs_new:Npn \__siunitx_emulation_non_latin:n #1 - { \char_generate:nn {#1} { \char_value_catcode:n {#1} } } + { + \exp_after:wN \exp_after:wN \exp_after:wN + \exp_not:N \char_generate:nn {#1} { \char_value_catcode:n {#1} } + } } { \cs_new:Npn \__siunitx_emulation_non_latin:n #1 |