summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/source/latex/siunitx/siunitx.dtx')
-rw-r--r--Master/texmf-dist/source/latex/siunitx/siunitx.dtx44
1 files changed, 31 insertions, 13 deletions
diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
index 02bf68674fc..0d49fbd2d99 100644
--- a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
+++ b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
@@ -534,8 +534,14 @@ This work consists of the file siunitx.dtx
% using the \opt{output-exponent-marker} option}
%\changes{v2.2c}{2011/04/20}{Fix bad interaction with \pkg{cellspace} package}
%\changes{v2.2d}{2011/04/28}{Fix the \opt{strict} option}
-%\changes{v2.2e}{2011/05/23}{Fix incorrect interpretation of complex numbers with
-% no real part.}
+%\changes{v2.2e}{2011/05/23}{Fix incorrect interpretation of complex numbers
+% with no real part}
+%\changes{v2.2g}{2011/06/02}{Correctly space \cs{degree} and similar units
+% in lists and ranges when only a single unit is given}
+%\changes{v2.2h}{2011/06/03}{Fix bug in significant figures rounding code
+% for some integer part values}
+%\changes{v2.2i}{2011/06/15}{Fix \opt{detect-mode} option inside
+% table cells}
%
%\begin{abstract}
% Physical quantities have both numbers and units, and each physical
@@ -1277,6 +1283,8 @@ This work consists of the file siunitx.dtx
%\end{syntax}
%\changes{v2.2}{2011/03/20}{Add new \cs{tablenum} macro to allow
% complex table alignments}
+%\changes{v2.2g}{2011/06/02}{Ensure \cs{tablenum} works correctly when
+% \opt{parse-numbers} is set \opt{false}}
% Within more complex tables, aligned numbers may be desirable within
% the argument of \cs{multicolumn} or
% \cs{multirow}.\footnote{Provided by the \pkg{multirow} package} The
@@ -4789,7 +4797,7 @@ This work consists of the file siunitx.dtx
%
% The usual preliminaries.
% \begin{macrocode}
-\ProvidesExplPackage {siunitx} {2011/05/25} {2.2f}
+\ProvidesExplPackage {siunitx} {2011/06/15} {2.2i}
{A comprehensive (SI) units package}
% \end{macrocode}
%
@@ -7670,7 +7678,7 @@ This work consists of the file siunitx.dtx
{ \bool_set_true:N \l_siunitx_round_bool }
}
{
- \int_compare:nNnT { \l_siunitx_tmp_int } > { 10 }
+ \int_compare:nNnT { \l_siunitx_tmp_int } = { 10 }
{
\bool_set_true:N \l_siunitx_round_bool
\int_zero:N \l_siunitx_tmp_int
@@ -12487,6 +12495,7 @@ This work consists of the file siunitx.dtx
\siunitx_print:nn { number }
{ \siunitx_ensuremath:n { \l_siunitx_bracket_close_tl } }
}
+ \siunitx_unit_parse_options:nn {#2} {#3}
\siunitx_unit_output_number_sep:
\siunitx_unit_output:nn {#2} {#3}
}
@@ -12591,6 +12600,7 @@ This work consists of the file siunitx.dtx
\siunitx_print:nn { number }
{ \siunitx_ensuremath:n { \l_siunitx_bracket_close_tl } }
}
+ \siunitx_unit_parse_options:nn {#1} {#2}
\siunitx_unit_output_number_sep:
\siunitx_unit_output:nn {#1} {#2}
}
@@ -12706,7 +12716,9 @@ This work consists of the file siunitx.dtx
%\begin{macro}[aux]{\siunitx_table_collect_begin_s:}
%\begin{macro}[aux]{\siunitx_table_collect_begin_S:}
% The collector starts by setting up local options, then clears and
-% initialises the storage and testing system.
+% initialises the storage and testing system. Font detection for the
+% \texttt{S} column happens here as this ensures that it is not inside
+% a box, which will give the wrong result for \opt{detect-mode}.
% \begin{macrocode}
\cs_new_protected:Npn \siunitx_table_collect_begin:Nn #1#2 {
\keys_set:nn { siunitx } {#2}
@@ -12724,6 +12736,7 @@ This work consists of the file siunitx.dtx
\siunitx_table_collect_token_S:N
\cs_set_eq:NN \siunitx_table_print: \siunitx_table_print_S:
\siunitx_table_collect_init_S:
+ \siunitx_detect_font:
\bool_if:NTF \l_siunitx_number_parse_bool
{ \siunitx_table_collect_get: }
{ \siunitx_table_direct: }
@@ -14963,14 +14976,20 @@ This work consists of the file siunitx.dtx
%
%\begin{macro}{\tablenum}
% A variation on the \cs{num} macro that will retain alignment within
-% \cs{multicolumn} and \cs{multirow} situations.
+% \cs{multicolumn} and \cs{multirow} situations. The slightly odd code
+% for the non-parsed case is needed to reinsert the appropriate tokens
+% after \enquote{collection}.
% \begin{macrocode}
\NewDocumentCommand \tablenum { o m } {
\IfNoValueF {#1}
{ \keys_set:nn { siunitx } {#1} }
- \tl_set:Nn \l_siunitx_table_collect_tl {#2}
- \bool_set_false:N \l_siunitx_table_collect_pre_bool
- \siunitx_table_print_S:
+ \bool_if:NTF \l_siunitx_number_parse_bool
+ {
+ \tl_set:Nn \l_siunitx_table_collect_tl {#2}
+ \bool_set_false:N \l_siunitx_table_collect_pre_bool
+ \siunitx_table_print_S:
+ }
+ { \siunitx_table_direct: #2 \siunitx_table_print: }
}
% \end{macrocode}
%\end{macro}
@@ -15636,7 +15655,7 @@ This work consists of the file siunitx.dtx
% \end{macrocode}
%
% \begin{macrocode}
-\ProvidesExplFile {siunitx-version-1.cfg} {2011/05/25} {2.2f}
+\ProvidesExplFile {siunitx-version-1.cfg} {2011/06/15} {2.2i}
{siunitx: Version 1 settings}
% \end{macrocode}
%
@@ -16831,8 +16850,7 @@ This work consists of the file siunitx.dtx
%}
% Finally, times.
% \begin{macrocode}
-\DeclareSIUnit \s { \second }
-\DeclareSIUnit \as { \atto \second }
+\DeclareSIUnit \s { \second }\DeclareSIUnit \as { \atto \second }
\DeclareSIUnit \fs { \femto \second }
\DeclareSIUnit \ps { \pico \second }
\DeclareSIUnit \ns { \nano \second }
@@ -16852,7 +16870,7 @@ This work consists of the file siunitx.dtx
% \end{macrocode}
%
% \begin{macrocode}
-\ProvidesExplFile {siunitx-binary.cfg} {2011/05/25} {2.2f}
+\ProvidesExplFile {siunitx-binary.cfg} {2011/06/15} {2.2i}
{siunitx: Binary units}
% \end{macrocode}
%