summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-10-07 23:16:33 +0000
committerKarl Berry <karl@freefriends.org>2011-10-07 23:16:33 +0000
commita04931aaec1f922807f83ac7a7e3498ad54c0cb7 (patch)
treeb3d70c8bc94a3aef3518c0f301d888283326d082 /Master/texmf-dist
parentd0126365e4a0fb2f190068a374afe6b791b74c8c (diff)
siunitx 2.3g (6oct11)
git-svn-id: svn://tug.org/texlive/trunk@24235 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/doc/latex/siunitx/siunitx.pdfbin567905 -> 564583 bytes
-rw-r--r--Master/texmf-dist/source/latex/siunitx/siunitx.dtx100
-rw-r--r--Master/texmf-dist/tex/latex/siunitx/config/siunitx-abbreviations.cfg2
-rw-r--r--Master/texmf-dist/tex/latex/siunitx/config/siunitx-binary.cfg2
-rw-r--r--Master/texmf-dist/tex/latex/siunitx/config/siunitx-version-1.cfg2
-rw-r--r--Master/texmf-dist/tex/latex/siunitx/siunitx.sty15
6 files changed, 71 insertions, 50 deletions
diff --git a/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf b/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf
index 44d4df302f0..0ce14ffe9bd 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.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
index 5d4eec51789..4aadfc99010 100644
--- a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
+++ b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
@@ -548,6 +548,8 @@ This work consists of the file siunitx.dtx
% updates}
%\changes{v2.3f}{2011/09/03}{Fix processing of numbers in tables when entire
% number is invalid}
+%\changes{v2.3g}{2011/10/06}{Deal with erroneous leading zero in some
+% fixed exponent cases}
%
%\begin{abstract}
% Physical quantities have both numbers and units, and each physical
@@ -1756,19 +1758,19 @@ This work consists of the file siunitx.dtx
% Type &
% \multicolumn{1}{l}{Default} \\
% \midrule
-% add-decimal-zero & Switch & true \\
-% add-integer-zero & Switch & true \\
-% explicit-sign & Literal & \m{none} \\
-% fixed-exponent & Integer & 0 \\
-% minimum-integer-digits & Integer & 0 \\
-% retain-explicit-plus & Switch & false \\
-% retain-unity-mantissa & Switch & true \\
-% retain-zero-exponent & Switch & false \\
-% round-integer-to-decimal & Switch & false \\
-% round-minimum & Literal & 0 \\
-% round-mode & Choice & off \\
-% round-precision & Integer & 2 \\
-% scientific-notation & Switch & false \\
+% add-decimal-zero & Switch & true \\
+% add-integer-zero & Switch & true \\
+% explicit-sign & Literal & \meta{none} \\
+% fixed-exponent & Integer & 0 \\
+% minimum-integer-digits & Integer & 0 \\
+% retain-explicit-plus & Switch & false \\
+% retain-unity-mantissa & Switch & true \\
+% retain-zero-exponent & Switch & false \\
+% round-integer-to-decimal & Switch & false \\
+% round-minimum & Literal & 0 \\
+% round-mode & Choice & off \\
+% round-precision & Integer & 2 \\
+% scientific-notation & Switch & false \\
% \bottomrule
% \end{tabular}
%\end{table}
@@ -3032,30 +3034,30 @@ This work consists of the file siunitx.dtx
% Type &
% \multicolumn{1}{l}{Default} \\
% \midrule ^^A (
-% table-align-comparator & Switch & true \\
-% table-align-exponent & Switch & true \\
-% table-align-text-pre & Switch & true \\
-% table-align-text-post & Switch & true \\
-% table-align-uncertainty & Switch & true \\
-% table-alignment & Choice & \m{none} \\
-% table-auto-round & Switch & false \\
-% table-column-width & Length & 0 pt \\
-% table-comparator & Switch & false \\
-% table-figures-decimal & Integer & 2 \\
-% table-figures-exponent & Integer & 0 \\
-% table-figures-integer & Integer & 3 \\
-% table-figures-uncertainty & Integer & 0 \\
-% table-format & Special & \m{none} \\
+% table-align-comparator & Switch & true \\
+% table-align-exponent & Switch & true \\
+% table-align-text-pre & Switch & true \\
+% table-align-text-post & Switch & true \\
+% table-align-uncertainty & Switch & true \\
+% table-alignment & Choice & \meta{none} \\
+% table-auto-round & Switch & false \\
+% table-column-width & Length & 0 pt \\
+% table-comparator & Switch & false \\
+% table-figures-decimal & Integer & 2 \\
+% table-figures-exponent & Integer & 0 \\
+% table-figures-integer & Integer & 3 \\
+% table-figures-uncertainty & Integer & 0 \\
+% table-format & Special & \meta{none} \\
% table-number-alignment & Choice &
% center-decimal-marker \\
-% table-parse-only & Switch & false \\
-% table-omit-exponent & Switch & true \\
-% table-space-text-pre & Literal & \m{empty} \\
-% table-space-text-post & Literal & \m{empty} \\
-% table-sign-exponent & Switch & false \\
-% table-sign-mantissa & Switch & false \\
-% table-text-alignment & Choice & center \\
-% table-unit-alignment & Choice & center \\
+% table-parse-only & Switch & false \\
+% table-omit-exponent & Switch & true \\
+% table-space-text-pre & Literal & \meta{empty} \\
+% table-space-text-post & Literal & \meta{empty} \\
+% table-sign-exponent & Switch & false \\
+% table-sign-mantissa & Switch & false \\
+% table-text-alignment & Choice & center \\
+% table-unit-alignment & Choice & center \\
% \bottomrule
% \end{tabular}
%\end{table}
@@ -4897,7 +4899,7 @@ This work consists of the file siunitx.dtx
%
% The usual preliminaries.
% \begin{macrocode}
-\ProvidesExplPackage {siunitx} {2011/09/13} {2.3f}
+\ProvidesExplPackage {siunitx} {2011/10/06} {2.3g}
{A comprehensive (SI) units package}
% \end{macrocode}
%
@@ -5499,11 +5501,17 @@ This work consists of the file siunitx.dtx
% \end{macrocode}
%\end{macro}
%
+% \begin{variable}{\l_siunitx_detect_inline_family_tl}
+% This one is not generated by the keys system.
+% \begin{macrocode}
+\tl_new:N \l_siunitx_detect_inline_family_tl
+% \end{macrocode}
+% \end{variable}
+%
%\begin{macro}{
% \l_siunitx_detect_display_math_bool ,
% \l_siunitx_detect_family_bool ,
% \l_siunitx_detect_inline_family_tl ,
-% \l_siunitx_detect_inline_weight_tl ,
% \l_siunitx_detect_shape_bool ,
% \l_siunitx_detect_mode_bool ,
% \l_siunitx_detect_weight_bool
@@ -7909,8 +7917,14 @@ This work consists of the file siunitx.dtx
% leading zeros to dispose of. There is also a check to avoid adding
% an additional zero to the decimal part of the number.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn
- \siunitx_number_process_fixed_large:nnn #1#2#3 {
+\cs_new_protected_nopar:Npn \siunitx_number_process_fixed_large:nnn #1
+ {
+ \int_compare:nNnTF {#1} = \c_zero
+ { \siunitx_number_process_fixed_large_aux:nnn { } }
+ { \siunitx_number_process_fixed_large_aux:nnn {#1} }
+ }
+\cs_new_protected_nopar:Npn \siunitx_number_process_fixed_large_aux:nnn #1#2#3
+ {
\cs_set_protected_nopar:Npn
\siunitx_number_process_fixed_large_aux:w ##1##2 \q_stop
{
@@ -7928,7 +7942,7 @@ This work consists of the file siunitx.dtx
}
}
{
- \int_compare:nNnTF {#1} = { 0 }
+ \int_compare:nNnTF { 0 #1 } = { 0 }
{
\siunitx_number_process_fixed_aux_ii:nnn {##1} {##2}
{ #3 - 1 }
@@ -15937,7 +15951,7 @@ This work consists of the file siunitx.dtx
% \end{macrocode}
%
% \begin{macrocode}
-\ProvidesExplFile {siunitx-version-1.cfg} {2011/09/13} {2.3f}
+\ProvidesExplFile {siunitx-version-1.cfg} {2011/10/06} {2.3g}
{siunitx: Version 1 settings}
% \end{macrocode}
%
@@ -16882,7 +16896,7 @@ This work consists of the file siunitx.dtx
% \end{macrocode}
%
% \begin{macrocode}
-\ProvidesExplFile {siunitx-abbreviations.cfg} {2011/09/13} {2.3f}
+\ProvidesExplFile {siunitx-abbreviations.cfg} {2011/10/06} {2.3g}
{siunitx: Abbreviated units}
% \end{macrocode}
%
@@ -17064,7 +17078,7 @@ This work consists of the file siunitx.dtx
% \end{macrocode}
%
% \begin{macrocode}
-\ProvidesExplFile {siunitx-binary.cfg} {2011/09/13} {2.3f}
+\ProvidesExplFile {siunitx-binary.cfg} {2011/10/06} {2.3g}
{siunitx: Binary units}
% \end{macrocode}
%
diff --git a/Master/texmf-dist/tex/latex/siunitx/config/siunitx-abbreviations.cfg b/Master/texmf-dist/tex/latex/siunitx/config/siunitx-abbreviations.cfg
index e430ffce29d..97a735f3ede 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/siunitx-abbreviations.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/siunitx-abbreviations.cfg
@@ -13,7 +13,7 @@
%% See http://www.latex-project.org/lppl.txt
%% ---------------------------------------------------------------
%%
-\ProvidesExplFile {siunitx-abbreviations.cfg} {2011/09/13} {2.3f}
+\ProvidesExplFile {siunitx-abbreviations.cfg} {2011/10/06} {2.3g}
{siunitx: Abbreviated units}
\DeclareSIUnit \A { \ampere }
\DeclareSIUnit \pA { \pico \ampere }
diff --git a/Master/texmf-dist/tex/latex/siunitx/config/siunitx-binary.cfg b/Master/texmf-dist/tex/latex/siunitx/config/siunitx-binary.cfg
index 6494452434e..bba9e382836 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/siunitx-binary.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/siunitx-binary.cfg
@@ -13,7 +13,7 @@
%% See http://www.latex-project.org/lppl.txt
%% ---------------------------------------------------------------
%%
-\ProvidesExplFile {siunitx-binary.cfg} {2011/09/13} {2.3f}
+\ProvidesExplFile {siunitx-binary.cfg} {2011/10/06} {2.3g}
{siunitx: Binary units}
\DeclareBinaryPrefix \kibi { Ki } { 10 }
\DeclareBinaryPrefix \mebi { Mi } { 20 }
diff --git a/Master/texmf-dist/tex/latex/siunitx/config/siunitx-version-1.cfg b/Master/texmf-dist/tex/latex/siunitx/config/siunitx-version-1.cfg
index 94e0aaf6a39..ea732d63797 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/siunitx-version-1.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/siunitx-version-1.cfg
@@ -13,7 +13,7 @@
%% See http://www.latex-project.org/lppl.txt
%% ---------------------------------------------------------------
%%
-\ProvidesExplFile {siunitx-version-1.cfg} {2011/09/13} {2.3f}
+\ProvidesExplFile {siunitx-version-1.cfg} {2011/10/06} {2.3g}
{siunitx: Version 1 settings}
\keys_define:nn { siunitx } {
addsign .choice: ,
diff --git a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
index ed63a103f15..cb6c2de406d 100644
--- a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
+++ b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
@@ -14,7 +14,7 @@
%% ---------------------------------------------------------------
%%
\RequirePackage{expl3}
-\ProvidesExplPackage {siunitx} {2011/09/13} {2.3f}
+\ProvidesExplPackage {siunitx} {2011/10/06} {2.3g}
{A comprehensive (SI) units package}
\cs_if_exist:NTF \msg_new:nnnn
{
@@ -399,6 +399,7 @@
\siunitx_set_text_fam:n { tt }
}
\tl_new:N \l_siunitx_detect_inline_weight_tl
+\tl_new:N \l_siunitx_detect_inline_family_tl
\keys_define:nn { siunitx } {
detect-all .choice:,
detect-all .default:n = true,
@@ -1992,8 +1993,14 @@
}
}
}
-\cs_new_protected_nopar:Npn
- \siunitx_number_process_fixed_large:nnn #1#2#3 {
+\cs_new_protected_nopar:Npn \siunitx_number_process_fixed_large:nnn #1
+ {
+ \int_compare:nNnTF {#1} = \c_zero
+ { \siunitx_number_process_fixed_large_aux:nnn { } }
+ { \siunitx_number_process_fixed_large_aux:nnn {#1} }
+ }
+\cs_new_protected_nopar:Npn \siunitx_number_process_fixed_large_aux:nnn #1#2#3
+ {
\cs_set_protected_nopar:Npn
\siunitx_number_process_fixed_large_aux:w ##1##2 \q_stop
{
@@ -2011,7 +2018,7 @@
}
}
{
- \int_compare:nNnTF {#1} = { 0 }
+ \int_compare:nNnTF { 0 #1 } = { 0 }
{
\siunitx_number_process_fixed_aux_ii:nnn {##1} {##2}
{ #3 - 1 }