summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2022-02-07 21:40:38 +0000
committerKarl Berry <karl@freefriends.org>2022-02-07 21:40:38 +0000
commit0ed34292e70ef7defa21aa9c358f196e9d938c65 (patch)
tree7601c3e1a250c67a77ddfa0d722d890aff269c11
parenta4c5c9826e217b374234a296a1c0c7fcfe91ef93 (diff)
siunitx (7feb22)
git-svn-id: svn://tug.org/texlive/trunk@61934 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md12
-rw-r--r--Master/texmf-dist/doc/latex/siunitx/siunitx-code.pdfbin607726 -> 607830 bytes
-rw-r--r--Master/texmf-dist/doc/latex/siunitx/siunitx.pdfbin639466 -> 639784 bytes
-rw-r--r--Master/texmf-dist/source/latex/siunitx/siunitx-locale.dtx7
-rw-r--r--Master/texmf-dist/source/latex/siunitx/siunitx-print.dtx31
-rw-r--r--Master/texmf-dist/source/latex/siunitx/siunitx.dtx2
-rw-r--r--Master/texmf-dist/source/latex/siunitx/siunitx.tex9
-rw-r--r--Master/texmf-dist/tex/latex/siunitx/siunitx.sty40
8 files changed, 67 insertions, 34 deletions
diff --git a/Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md b/Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md
index ba5c3de075a..836e95a0af5 100644
--- a/Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md
+++ b/Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md
@@ -7,6 +7,15 @@ Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to
## [Unreleased]
+## [v3.0.48] - 2022-02-07
+
+### Added
+- Polish locale
+
+### Fixed
+- Printing blank entries in text mode (see issue
+ [\#5853](https://github.com/josephwright/siunitx/issues/585))
+
## [v3.0.47] - 2022-02-03
### Changed
@@ -1703,7 +1712,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.47...HEAD
+[Unreleased]: https://github.com/josephwright/siunitx/compare/v3.0.48...HEAD
+[v3.0.48]: https://github.com/josephwright/siunitx/compare/v3.0.47...v3.0.48
[v3.0.47]: https://github.com/josephwright/siunitx/compare/v3.0.46...v3.0.47
[v3.0.46]: https://github.com/josephwright/siunitx/compare/v3.0.45...v3.0.46
[v3.0.45]: https://github.com/josephwright/siunitx/compare/v3.0.44...v3.0.45
diff --git a/Master/texmf-dist/doc/latex/siunitx/siunitx-code.pdf b/Master/texmf-dist/doc/latex/siunitx/siunitx-code.pdf
index d6d131b16c5..f427b017c8d 100644
--- a/Master/texmf-dist/doc/latex/siunitx/siunitx-code.pdf
+++ b/Master/texmf-dist/doc/latex/siunitx/siunitx-code.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf b/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf
index 5563799b59a..70e9f7d7ac0 100644
--- a/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf
+++ b/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx-locale.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx-locale.dtx
index 3bdb5c941e7..36c83e034f6 100644
--- a/Master/texmf-dist/source/latex/siunitx/siunitx-locale.dtx
+++ b/Master/texmf-dist/source/latex/siunitx/siunitx-locale.dtx
@@ -101,6 +101,12 @@
inter-unit-product = \, ,
output-decimal-marker = { , }
} ,
+ locale / PL .meta:n =
+ {
+ exponent-product = \cdot ,
+ inter-unit-product = \cdot ,
+ output-decimal-marker = { , }
+ } ,
locale / FR .meta:n =
{
exponent-product = \times ,
@@ -148,6 +154,7 @@
\DeclareTranslation { English } { to~(numerical~range) } { to }
\DeclareTranslation { French } { to~(numerical~range) } { à }
\DeclareTranslation { German } { to~(numerical~range) } { bis }
+ \DeclareTranslation { Polish } { to~(numerical~range) } { do }
\DeclareTranslation { Slovene } { to~(numerical~range) } { do }
\DeclareTranslation { Spanish } { to~(numerical~range) } { a }
\keys_set:nn { siunitx }
diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx-print.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx-print.dtx
index 10a316da897..cb63a0e325f 100644
--- a/Master/texmf-dist/source/latex/siunitx/siunitx-print.dtx
+++ b/Master/texmf-dist/source/latex/siunitx/siunitx-print.dtx
@@ -842,20 +842,23 @@
{ \@@_text_replace:Nnnnn #1 }
{
\tl_set:Nn \l_@@_tmp_tl {#1}
- \tl_if_empty:NF \l_siunitx_unit_font_tl
- { \exp_after:wN \cs_set_eq:NN \l_siunitx_unit_font_tl \use:n }
- \cs_set:Npn \mathord ##1
- { \@@_text_replace_first:N ##1 }
- \cs_set:Npn \pm { \: \exp_not:N \textpm \: }
- \tl_map_inline:nn
- { \mp \ge \le \gg \ll }
- { \cs_set:Npn ##1 { \exp_not:N \ensuremath { \exp_not:N ##1 } } }
- \cs_set:Npn \cdot { \: \exp_not:N \textperiodcentered \: }
- \cs_set:Npn \times { \: \exp_not:N \texttimes \: }
- \protected@edef \l_@@_tmp_tl
- { \exp_after:wN \@@_text_replace_first:N \l_@@_tmp_tl }
- \@@_text_replace:N \l_@@_tmp_tl
- \@@_text_replace_aux:n { \tl_use:N \l_@@_tmp_tl }
+ \tl_if_empty:NF \l_@@_tmp_tl
+ {
+ \tl_if_empty:NF \l_siunitx_unit_font_tl
+ { \exp_after:wN \cs_set_eq:NN \l_siunitx_unit_font_tl \use:n }
+ \cs_set:Npn \mathord ##1
+ { \@@_text_replace_first:N ##1 }
+ \cs_set:Npn \pm { \: \exp_not:N \textpm \: }
+ \tl_map_inline:nn
+ { \mp \ge \le \gg \ll }
+ { \cs_set:Npn ##1 { \exp_not:N \ensuremath { \exp_not:N ##1 } } }
+ \cs_set:Npn \cdot { \: \exp_not:N \textperiodcentered \: }
+ \cs_set:Npn \times { \: \exp_not:N \texttimes \: }
+ \protected@edef \l_@@_tmp_tl
+ { \exp_after:wN \@@_text_replace_first:N \l_@@_tmp_tl }
+ \@@_text_replace:N \l_@@_tmp_tl
+ \@@_text_replace_aux:n { \tl_use:N \l_@@_tmp_tl }
+ }
}
\group_end:
}
diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
index d1d4e125ab9..61d45f9621c 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-02-03} {3.0.47}
+\ProvidesExplPackage {siunitx} {2022-02-07} {3.0.48}
{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 1c8e8f62ab9..62fa382f866 100644
--- a/Master/texmf-dist/source/latex/siunitx/siunitx.tex
+++ b/Master/texmf-dist/source/latex/siunitx/siunitx.tex
@@ -79,7 +79,7 @@ for those people who are interested.
}
% For demos
-\usepackage[french,german,spanish,UKenglish]{babel}
+\usepackage[french,german,polish,spanish,UKenglish]{babel}
\AtBeginDocument{\shorthandoff{:<>}}
\usepackage{translations}
\usepackage{cancel}
@@ -2860,7 +2860,7 @@ same value (one of \opt{center}, \opt{right} or \opt{left}).
\pkg{siunitx} allows the user to switch between the typographic conventions of
different (geographical) areas by using locales. Currently, the package is
supplied with configurations for locales \opt{UK}, \opt{US}, \opt{DE}
-(Germany), \opt{FR} (French), \opt{SI} (Slovene) and \opt{ZA} (South Africa).
+(Germany), \opt{PL} (Poland), \opt{FR} (French), \opt{SI} (Slovene) and \opt{ZA} (South Africa).
The \opt{locale}
option is used to switch to a particular locale.
\begin{LaTeXdemo}
@@ -3033,7 +3033,7 @@ options to read:
\end{LaTeXdemo}
If the current language is known to the \pkg{translator} package then the
result will be localised text. The preamble for this manual loads English,
-French, German and Spanish as options, and also loads the \pkg{babel} package:
+French, German, Polish and Spanish as options, and also loads the \pkg{babel} package:
\begin{LaTeXdemo}
% In English by default
\numlist{1;2;3} \\
@@ -3044,6 +3044,9 @@ French, German and Spanish as options, and also loads the \pkg{babel} package:
\selectlanguage{german}%
\numlist{1;2;3} \\
\numrange{1}{10} \\
+ \selectlanguage{polish}%
+ \numlist{1;2;3} \\
+ \numrange{1}{10} \\
\selectlanguage{spanish}%
\numlist{1;2;3} \\
\numrange{1}{10}
diff --git a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
index a821be14f47..c67097bd938 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-02-03} {3.0.47}
+\ProvidesExplPackage {siunitx} {2022-02-07} {3.0.48}
{A comprehensive (SI) units package}
\msg_new:nnnn { siunitx } { incompatible-package }
{ Package~'#1'~incompatible. }
@@ -1427,6 +1427,12 @@
inter-unit-product = \, ,
output-decimal-marker = { , }
} ,
+ locale / PL .meta:n =
+ {
+ exponent-product = \cdot ,
+ inter-unit-product = \cdot ,
+ output-decimal-marker = { , }
+ } ,
locale / FR .meta:n =
{
exponent-product = \times ,
@@ -1467,6 +1473,7 @@
\DeclareTranslation { English } { to~(numerical~range) } { to }
\DeclareTranslation { French } { to~(numerical~range) } { à }
\DeclareTranslation { German } { to~(numerical~range) } { bis }
+ \DeclareTranslation { Polish } { to~(numerical~range) } { do }
\DeclareTranslation { Slovene } { to~(numerical~range) } { do }
\DeclareTranslation { Spanish } { to~(numerical~range) } { a }
\keys_set:nn { siunitx }
@@ -3966,20 +3973,23 @@
{ \__siunitx_print_text_replace:Nnnnn #1 }
{
\tl_set:Nn \l__siunitx_print_tmp_tl {#1}
- \tl_if_empty:NF \l_siunitx_unit_font_tl
- { \exp_after:wN \cs_set_eq:NN \l_siunitx_unit_font_tl \use:n }
- \cs_set:Npn \mathord ##1
- { \__siunitx_print_text_replace_first:N ##1 }
- \cs_set:Npn \pm { \: \exp_not:N \textpm \: }
- \tl_map_inline:nn
- { \mp \ge \le \gg \ll }
- { \cs_set:Npn ##1 { \exp_not:N \ensuremath { \exp_not:N ##1 } } }
- \cs_set:Npn \cdot { \: \exp_not:N \textperiodcentered \: }
- \cs_set:Npn \times { \: \exp_not:N \texttimes \: }
- \protected@edef \l__siunitx_print_tmp_tl
- { \exp_after:wN \__siunitx_print_text_replace_first:N \l__siunitx_print_tmp_tl }
- \__siunitx_print_text_replace:N \l__siunitx_print_tmp_tl
- \__siunitx_print_text_replace_aux:n { \tl_use:N \l__siunitx_print_tmp_tl }
+ \tl_if_empty:NF \l__siunitx_print_tmp_tl
+ {
+ \tl_if_empty:NF \l_siunitx_unit_font_tl
+ { \exp_after:wN \cs_set_eq:NN \l_siunitx_unit_font_tl \use:n }
+ \cs_set:Npn \mathord ##1
+ { \__siunitx_print_text_replace_first:N ##1 }
+ \cs_set:Npn \pm { \: \exp_not:N \textpm \: }
+ \tl_map_inline:nn
+ { \mp \ge \le \gg \ll }
+ { \cs_set:Npn ##1 { \exp_not:N \ensuremath { \exp_not:N ##1 } } }
+ \cs_set:Npn \cdot { \: \exp_not:N \textperiodcentered \: }
+ \cs_set:Npn \times { \: \exp_not:N \texttimes \: }
+ \protected@edef \l__siunitx_print_tmp_tl
+ { \exp_after:wN \__siunitx_print_text_replace_first:N \l__siunitx_print_tmp_tl }
+ \__siunitx_print_text_replace:N \l__siunitx_print_tmp_tl
+ \__siunitx_print_text_replace_aux:n { \tl_use:N \l__siunitx_print_tmp_tl }
+ }
}
\group_end:
}