summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-11-15 00:19:42 +0000
committerKarl Berry <karl@freefriends.org>2012-11-15 00:19:42 +0000
commita08e5c17878c4f89344ca4e2ee48f0c037024d79 (patch)
tree3e322ca919a3acc55d4ae8cd0f10b476d235803c
parent4bb9dfaf3d22589ae47db564ee588c1690de9cdd (diff)
siunitx (14nov12)
git-svn-id: svn://tug.org/texlive/trunk@28263 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/siunitx/siunitx.pdfbin578613 -> 578878 bytes
-rw-r--r--Master/texmf-dist/source/latex/siunitx/siunitx.dtx49
-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.sty38
6 files changed, 50 insertions, 43 deletions
diff --git a/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf b/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf
index e498abe68df..c4e83e638a2 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 5392e59de24..a29471d3aac 100644
--- a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
+++ b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
@@ -135,7 +135,7 @@ This work consists of the file siunitx.dtx
\fi
%</internal>
%<*driver|package>
-\RequirePackage{expl3}
+\RequirePackage{expl3,xparse}
%</driver|package>
%<*driver>
\documentclass[german,french,english,UKenglish]{l3doc}
@@ -595,6 +595,9 @@ This work consists of the file siunitx.dtx
%\changes{v2.5i}{2012/09/11}{Fix alignment of values without uncertainties in
% columns where space is reserved for uncertainties}
%\changes{v2.5j}{2012/09/18}{Fix rounding when uncertainties are present}
+%\changes{v2.5k}{2012/09/20}{Store fraction function as a macro rather than
+% using \cs{let}: fixes a warning with \pkg{amsmath}}
+%\changes{v2.5k}{2012/11/13}{Skip spaces correctly after start of document}
%
%\begin{abstract}
% Physical quantities have both numbers and units, and each physical
@@ -2657,8 +2660,8 @@ This work consists of the file siunitx.dtx
%
% \midrule
%
-% \DescribeNamedUnit{newton}{N} \\
% \DescribeNamedUnit{millinewton}{mN} \\
+% \DescribeNamedUnit{newton}{N} \\
% \DescribeNamedUnit{kilonewton}{kN} \\
% \DescribeNamedUnit{meganewton}{MN} \\
%
@@ -5105,7 +5108,7 @@ This work consists of the file siunitx.dtx
%
% The usual preliminaries.
% \begin{macrocode}
-\ProvidesExplPackage {siunitx} {2012/09/18} {2.5j}
+\ProvidesExplPackage {siunitx} {2012/11/13} {2.5k}
{A comprehensive (SI) units package}
% \end{macrocode}
%
@@ -5671,10 +5674,12 @@ This work consists of the file siunitx.dtx
}
\group_end:
}
-\tl_put_right:Nn \document {
- \@@_set_math_fam:n { sf }
- \@@_set_math_fam:n { tt }
-}
+\tl_put_right:Nn \document
+ {
+ \@@_set_math_fam:n { sf }
+ \@@_set_math_fam:n { tt }
+ \ignorespaces
+ }
% \end{macrocode}
%\end{macro}
%\end{macro}
@@ -10144,7 +10149,7 @@ This work consists of the file siunitx.dtx
% \begin{macrocode}
\keys_define:nn { siunitx } {
fraction-function .code:n =
- { \cs_set_eq:NN \@@_fraction:nn #1 },
+ { \cs_set_protected:Npn \@@_fraction:nn {#1} },
output-product .tl_set:N = \l_@@_output_product_tl,
output-quotient .tl_set:N = \l_@@_output_quotient_tl,
parse-numbers .bool_set:N = \l_@@_number_parse_bool,
@@ -13598,7 +13603,7 @@ This work consists of the file siunitx.dtx
% A fixed skip of one \texttt{fill}.
% \begin{macrocode}
\skip_new:N \c_@@_one_fill_skip
-\skip_set:Nn \c_@@_one_fill_skip { \c_zero_skip plus 1 fill }
+\skip_set:Nn \c_@@_one_fill_skip { \c_zero_dim plus 1 fill }
% \end{macrocode}
% \end{variable}
%
@@ -13612,7 +13617,7 @@ This work consists of the file siunitx.dtx
{
\cs_new_protected:Npn \@@_table_colortbl_correction:
{
- \skip_horizontal:n { \c_zero_skip plus -0.5 fill }
+ \skip_horizontal:n { \c_zero_dim plus -0.5 fill }
\tex_kern:D \c_zero_skip
}
}
@@ -13712,7 +13717,7 @@ This work consists of the file siunitx.dtx
center .code:n =
{
\skip_set:Nn \l_@@_table_unit_align_skip
- { \c_zero_skip plus 0.5 fill }
+ { \c_zero_dim plus 0.5 fill }
},
table-unit-alignment /
left .code:n =
@@ -13721,7 +13726,7 @@ This work consists of the file siunitx.dtx
right .code:n =
{
\skip_set:Nn \l_@@_table_unit_align_skip
- { \c_zero_skip plus 1 fill }
+ { \c_zero_dim plus 1 fill }
}
}
\keys_set:nn { siunitx } { table-unit-alignment = center }
@@ -13884,7 +13889,7 @@ This work consists of the file siunitx.dtx
center .code:n =
{
\skip_set:Nn \l_@@_table_number_align_skip
- { \c_zero_skip plus 0.5 fill }
+ { \c_zero_dim plus 0.5 fill }
\cs_set_eq:NN \@@_table_print_S_direct_main:
\@@_table_print_S_direct_reserved:
\cs_set_eq:NN \@@_table_print_S_parsed:
@@ -13894,7 +13899,7 @@ This work consists of the file siunitx.dtx
center-decimal-marker .code:n =
{
\skip_set:Nn \l_@@_table_number_align_skip
- { \c_zero_skip plus 0.5 fill }
+ { \c_zero_dim plus 0.5 fill }
\cs_set_eq:NN \@@_table_print_S_direct_main:
\@@_table_print_S_direct_centered:
\cs_set_eq:NN \@@_table_print_S_parsed:
@@ -13913,7 +13918,7 @@ This work consists of the file siunitx.dtx
right .code:n =
{
\skip_set:Nn \l_@@_table_number_align_skip
- { \c_zero_skip plus 1 fill }
+ { \c_zero_dim plus 1 fill }
\cs_set_eq:NN \@@_table_print_S_direct_main:
\@@_table_print_S_direct_reserved:
\cs_set_eq:NN \@@_table_print_S_parsed:
@@ -13926,7 +13931,7 @@ This work consists of the file siunitx.dtx
center .code:n =
{
\skip_set:Nn \l_@@_table_text_align_skip
- { \c_zero_skip plus 0.5 fill }
+ { \c_zero_dim plus 0.5 fill }
},
table-text-alignment /
left .code:n =
@@ -13935,7 +13940,7 @@ This work consists of the file siunitx.dtx
right .code:n =
{
\skip_set:Nn \l_@@_table_text_align_skip
- { \c_zero_skip plus 1 fill }
+ { \c_zero_dim plus 1 fill }
},
table-comparator .choice:,
table-comparator /
@@ -14259,7 +14264,7 @@ This work consists of the file siunitx.dtx
}
}
\dim_compare:nNnT
- { \box_wd:N \l_@@_table_pre_box } = \c_zero_skip
+ { \box_wd:N \l_@@_table_pre_box } = \c_zero_dim
{
\l_@@_table_collect_pre_tl
\bool_set_false:N \l_@@_font_set_bool
@@ -14446,7 +14451,7 @@ This work consists of the file siunitx.dtx
}
}
\dim_compare:nNnT
- { \box_wd:N \l_@@_table_pre_box } = \c_zero_skip
+ { \box_wd:N \l_@@_table_pre_box } = \c_zero_dim
{
\l_@@_table_collect_pre_tl
\bool_set_false:N \l_@@_font_set_bool
@@ -16485,7 +16490,7 @@ This work consists of the file siunitx.dtx
% \end{macrocode}
%
% \begin{macrocode}
-\ProvidesExplFile {siunitx-version-1.cfg} {2012/09/18} {2.5j}
+\ProvidesExplFile {siunitx-version-1.cfg} {2012/11/13} {2.5k}
{siunitx: Version 1 settings}
% \end{macrocode}
%
@@ -17430,7 +17435,7 @@ This work consists of the file siunitx.dtx
% \end{macrocode}
%
% \begin{macrocode}
-\ProvidesExplFile {siunitx-abbreviations.cfg} {2012/09/18} {2.5j}
+\ProvidesExplFile {siunitx-abbreviations.cfg} {2012/11/13} {2.5k}
{siunitx: Abbreviated units}
% \end{macrocode}
%
@@ -17612,7 +17617,7 @@ This work consists of the file siunitx.dtx
% \end{macrocode}
%
% \begin{macrocode}
-\ProvidesExplFile {siunitx-binary.cfg} {2012/09/18} {2.5j}
+\ProvidesExplFile {siunitx-binary.cfg} {2012/11/13} {2.5k}
{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 ab8dd8d35b0..97cd12ed1a1 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} {2012/09/18} {2.5j}
+\ProvidesExplFile {siunitx-abbreviations.cfg} {2012/11/13} {2.5k}
{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 3f9d4da7d0a..e5b0ce34b9b 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} {2012/09/18} {2.5j}
+\ProvidesExplFile {siunitx-binary.cfg} {2012/11/13} {2.5k}
{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 a0523afda5d..f603a32f1f0 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} {2012/09/18} {2.5j}
+\ProvidesExplFile {siunitx-version-1.cfg} {2012/11/13} {2.5k}
{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 6543f144637..a907e507b29 100644
--- a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
+++ b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
@@ -13,8 +13,8 @@
%% See http://www.latex-project.org/lppl.txt
%% ---------------------------------------------------------------
%%
-\RequirePackage{expl3}
-\ProvidesExplPackage {siunitx} {2012/09/18} {2.5j}
+\RequirePackage{expl3,xparse}
+\ProvidesExplPackage {siunitx} {2012/11/13} {2.5k}
{A comprehensive (SI) units package}
\@ifpackagelater { expl3 } { 2012/07/16 }
{ }
@@ -376,10 +376,12 @@
}
\group_end:
}
-\tl_put_right:Nn \document {
- \__siunitx_set_math_fam:n { sf }
- \__siunitx_set_math_fam:n { tt }
-}
+\tl_put_right:Nn \document
+ {
+ \__siunitx_set_math_fam:n { sf }
+ \__siunitx_set_math_fam:n { tt }
+ \ignorespaces
+ }
\cs_new_protected:Npn \__siunitx_set_text_fam:n #1 {
\tl_new:c { c__siunitx_text #1 _tl }
\tl_set:cx { c__siunitx_text #1 _tl } { \use:c { #1 default } }
@@ -3464,7 +3466,7 @@
\cs_new_protected:Npn \__siunitx_fraction:nn { }
\keys_define:nn { siunitx } {
fraction-function .code:n =
- { \cs_set_eq:NN \__siunitx_fraction:nn #1 },
+ { \cs_set_protected:Npn \__siunitx_fraction:nn {#1} },
output-product .tl_set:N = \l__siunitx_output_product_tl,
output-quotient .tl_set:N = \l__siunitx_output_quotient_tl,
parse-numbers .bool_set:N = \l__siunitx_number_parse_bool,
@@ -5684,14 +5686,14 @@
}
}
\skip_new:N \c__siunitx_one_fill_skip
-\skip_set:Nn \c__siunitx_one_fill_skip { \c_zero_skip plus 1 fill }
+\skip_set:Nn \c__siunitx_one_fill_skip { \c_zero_dim plus 1 fill }
\AtBeginDocument
{
\@ifpackageloaded { colortbl }
{
\cs_new_protected:Npn \__siunitx_table_colortbl_correction:
{
- \skip_horizontal:n { \c_zero_skip plus -0.5 fill }
+ \skip_horizontal:n { \c_zero_dim plus -0.5 fill }
\tex_kern:D \c_zero_skip
}
}
@@ -5749,7 +5751,7 @@
center .code:n =
{
\skip_set:Nn \l__siunitx_table_unit_align_skip
- { \c_zero_skip plus 0.5 fill }
+ { \c_zero_dim plus 0.5 fill }
},
table-unit-alignment /
left .code:n =
@@ -5758,7 +5760,7 @@
right .code:n =
{
\skip_set:Nn \l__siunitx_table_unit_align_skip
- { \c_zero_skip plus 1 fill }
+ { \c_zero_dim plus 1 fill }
}
}
\keys_set:nn { siunitx } { table-unit-alignment = center }
@@ -5817,7 +5819,7 @@
center .code:n =
{
\skip_set:Nn \l__siunitx_table_number_align_skip
- { \c_zero_skip plus 0.5 fill }
+ { \c_zero_dim plus 0.5 fill }
\cs_set_eq:NN \__siunitx_table_print_S_direct_main:
\__siunitx_table_print_S_direct_reserved:
\cs_set_eq:NN \__siunitx_table_print_S_parsed:
@@ -5827,7 +5829,7 @@
center-decimal-marker .code:n =
{
\skip_set:Nn \l__siunitx_table_number_align_skip
- { \c_zero_skip plus 0.5 fill }
+ { \c_zero_dim plus 0.5 fill }
\cs_set_eq:NN \__siunitx_table_print_S_direct_main:
\__siunitx_table_print_S_direct_centered:
\cs_set_eq:NN \__siunitx_table_print_S_parsed:
@@ -5846,7 +5848,7 @@
right .code:n =
{
\skip_set:Nn \l__siunitx_table_number_align_skip
- { \c_zero_skip plus 1 fill }
+ { \c_zero_dim plus 1 fill }
\cs_set_eq:NN \__siunitx_table_print_S_direct_main:
\__siunitx_table_print_S_direct_reserved:
\cs_set_eq:NN \__siunitx_table_print_S_parsed:
@@ -5859,7 +5861,7 @@
center .code:n =
{
\skip_set:Nn \l__siunitx_table_text_align_skip
- { \c_zero_skip plus 0.5 fill }
+ { \c_zero_dim plus 0.5 fill }
},
table-text-alignment /
left .code:n =
@@ -5868,7 +5870,7 @@
right .code:n =
{
\skip_set:Nn \l__siunitx_table_text_align_skip
- { \c_zero_skip plus 1 fill }
+ { \c_zero_dim plus 1 fill }
},
table-comparator .choice:,
table-comparator /
@@ -6111,7 +6113,7 @@
}
}
\dim_compare:nNnT
- { \box_wd:N \l__siunitx_table_pre_box } = \c_zero_skip
+ { \box_wd:N \l__siunitx_table_pre_box } = \c_zero_dim
{
\l__siunitx_table_collect_pre_tl
\bool_set_false:N \l__siunitx_font_set_bool
@@ -6238,7 +6240,7 @@
}
}
\dim_compare:nNnT
- { \box_wd:N \l__siunitx_table_pre_box } = \c_zero_skip
+ { \box_wd:N \l__siunitx_table_pre_box } = \c_zero_dim
{
\l__siunitx_table_collect_pre_tl
\bool_set_false:N \l__siunitx_font_set_bool