summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2008-09-05 18:49:14 +0000
committerKarl Berry <karl@freefriends.org>2008-09-05 18:49:14 +0000
commit4b1c829c2bee6f9a1ea665a342afbc563cb63b61 (patch)
tree11e5a7de4d84535c8641a23297cf63c409417bcc /Master/texmf-dist/tex/latex
parentae41bbd3003da49008e930d3f24b1908d316e810 (diff)
siunitx 1.0l (3sep08)
git-svn-id: svn://tug.org/texlive/trunk@10435 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-rw-r--r--Master/texmf-dist/tex/latex/siunitx/config/si-DE.cfg2
-rw-r--r--Master/texmf-dist/tex/latex/siunitx/config/si-SIunits.cfg3
-rw-r--r--Master/texmf-dist/tex/latex/siunitx/config/si-UK.cfg2
-rw-r--r--Master/texmf-dist/tex/latex/siunitx/config/si-USA.cfg2
-rw-r--r--Master/texmf-dist/tex/latex/siunitx/config/si-ZA.cfg3
-rw-r--r--Master/texmf-dist/tex/latex/siunitx/config/si-abbr.cfg2
-rw-r--r--Master/texmf-dist/tex/latex/siunitx/config/si-accepted.cfg2
-rw-r--r--Master/texmf-dist/tex/latex/siunitx/config/si-addn.cfg3
-rw-r--r--Master/texmf-dist/tex/latex/siunitx/config/si-astro.cfg3
-rw-r--r--Master/texmf-dist/tex/latex/siunitx/config/si-binary.cfg2
-rw-r--r--Master/texmf-dist/tex/latex/siunitx/config/si-fancynum.cfg3
-rw-r--r--Master/texmf-dist/tex/latex/siunitx/config/si-fancyunits.cfg3
-rw-r--r--Master/texmf-dist/tex/latex/siunitx/config/si-hep.cfg3
-rw-r--r--Master/texmf-dist/tex/latex/siunitx/config/si-hepunits.cfg3
-rw-r--r--Master/texmf-dist/tex/latex/siunitx/config/si-named.cfg2
-rw-r--r--Master/texmf-dist/tex/latex/siunitx/config/si-physical.cfg3
-rw-r--r--Master/texmf-dist/tex/latex/siunitx/config/si-prefix.cfg3
-rw-r--r--Master/texmf-dist/tex/latex/siunitx/config/si-prefixed.cfg3
-rw-r--r--Master/texmf-dist/tex/latex/siunitx/config/si-sistyle.cfg3
-rw-r--r--Master/texmf-dist/tex/latex/siunitx/config/si-synchem.cfg3
-rw-r--r--Master/texmf-dist/tex/latex/siunitx/config/si-units.cfg2
-rw-r--r--Master/texmf-dist/tex/latex/siunitx/config/si-unitsdef.cfg3
-rw-r--r--Master/texmf-dist/tex/latex/siunitx/siunitx.sty81
23 files changed, 81 insertions, 58 deletions
diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-DE.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-DE.cfg
index 49ee9df1974..46f0c886d01 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-DE.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-DE.cfg
@@ -14,7 +14,7 @@
%% ----------------------------------------------------------------
%%
\ProvidesFile{si-DE.cfg}
- [\si@svn@version siunitx: Germany locale]
+ [2008/09/03 v1.0l siunitx: Germany locale]
\sisetup{
unitsep=cdot,
valuesep=thin,
diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-SIunits.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-SIunits.cfg
index 7a087396d85..3e3f452f090 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-SIunits.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-SIunits.cfg
@@ -14,8 +14,7 @@
%% ----------------------------------------------------------------
%%
\ProvidesFile{si-SIunits.cfg}
- [\si@svn@version siunitx: Emulation of
- SIunits]
+ [2008/09/03 v1.0l siunitx: Emulation of SIunits]
\si@emulating{SIunits}{2007/12/02 v1.36}
\sisetup{
unitsep=thick,
diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-UK.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-UK.cfg
index 1063b7d81a3..738b61d8787 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-UK.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-UK.cfg
@@ -14,7 +14,7 @@
%% ----------------------------------------------------------------
%%
\ProvidesFile{si-UK.cfg}
- [\si@svn@version siunitx: UK locale]
+ [2008/09/03 v1.0l siunitx: UK locale]
\sisetup{
unitsep=thin,
expproduct=times,
diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-USA.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-USA.cfg
index cd5127e1988..ec429c18443 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-USA.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-USA.cfg
@@ -14,7 +14,7 @@
%% ----------------------------------------------------------------
%%
\ProvidesFile{si-USA.cfg}
- [\si@svn@version siunitx: USA locale]
+ [2008/09/03 v1.0l siunitx: USA locale]
\sisetup{
unitsep=thin,
expproduct=times,
diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-ZA.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-ZA.cfg
index b9f23c63be3..6dc518eb08a 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-ZA.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-ZA.cfg
@@ -14,8 +14,7 @@
%% ----------------------------------------------------------------
%%
\ProvidesFile{si-ZA.cfg}
- [\si@svn@version siunitx:
- South Africa locale]
+ [2008/09/03 v1.0l siunitx: South Africa locale]
\sisetup{
unitsep=cdot,
valuesep=thin,
diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-abbr.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-abbr.cfg
index f13994ff4ac..4e18e3fc370 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-abbr.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-abbr.cfg
@@ -14,7 +14,7 @@
%% ----------------------------------------------------------------
%%
\ProvidesFile{si-abbr.cfg}
- [\si@svn@version siunitx: Abbreviated units]
+ [2008/09/03 v1.0l siunitx: Abbreviated units]
\requiresiconfigs{prefix,named,accepted,physical}
\newunit{\pA}{\pico\ampere}
\newunit{\nA}{\nano\ampere}
diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-accepted.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-accepted.cfg
index 4f009470a99..4f050c7ebd9 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-accepted.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-accepted.cfg
@@ -14,7 +14,7 @@
%% ----------------------------------------------------------------
%%
\ProvidesFile{si-accepted.cfg}
- [\si@svn@version siunitx: SI Accepted units]
+ [2008/09/03 v1.0l siunitx: SI Accepted units]
\newunit{\minute}{min}
\newunit{\hour}{h}
\newunit{\Day}{d}
diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-addn.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-addn.cfg
index a92aeb38c9a..52def9ca5ab 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-addn.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-addn.cfg
@@ -14,8 +14,7 @@
%% ----------------------------------------------------------------
%%
\ProvidesFile{si-addn.cfg}
- [\si@svn@version siunitx:
- SI Additional units]
+ [2008/09/03 v1.0l siunitx: SI Additional units]
\newunit{\angstrom}{\si@sym@ringA}
\newunit{\are}{a}
\newunit{\hectare}{\hecto\are}
diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-astro.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-astro.cfg
index 5cf80b83e20..a39cce154c5 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-astro.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-astro.cfg
@@ -14,8 +14,7 @@
%% ----------------------------------------------------------------
%%
\ProvidesFile{si-astro.cfg}
- [\si@svn@version siunitx:
- Units for astronomy]
+ [2008/09/03 v1.0l siunitx: Units for astronomy]
\newunit{\parsec}{pc}
\newunit{\lightyear}{ly}
\endinput
diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-binary.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-binary.cfg
index 9e0ad9a2c74..f90bae2cd62 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-binary.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-binary.cfg
@@ -14,7 +14,7 @@
%% ----------------------------------------------------------------
%%
\ProvidesFile{si-binary.cfg}
- [\si@svn@version siunitx: Binary units]
+ [2008/09/03 v1.0l siunitx: Binary units]
\newprefix[binary]{\kibi}{10}{Ki}
\newprefix[binary]{\mebi}{20}{Mi}
\newprefix[binary]{\gibi}{30}{Gi}
diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-fancynum.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-fancynum.cfg
index c1f7a3251f3..849a1c52043 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-fancynum.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-fancynum.cfg
@@ -14,8 +14,7 @@
%% ----------------------------------------------------------------
%%
\ProvidesFile{si-fancynum.cfg}
- [\si@svn@version Emulation of siunitx:
- fancynum]
+ [2008/09/03 v1.0l siunitx: Emulation of fancynum]
\si@emulating{fancynum}{2000/08/08 0.92}
\sisetup{decimalsymbol=cdot,digitsep=comma}
\let\fnum\num
diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-fancyunits.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-fancyunits.cfg
index 14bcf8aae2f..f73010149df 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-fancyunits.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-fancyunits.cfg
@@ -14,8 +14,7 @@
%% ----------------------------------------------------------------
%%
\ProvidesFile{si-fancyunits.cfg}
- [\si@svn@version Emulation of siunitx:
- fancyunits]
+ [2008/09/03 v1.0l siunitx: Emulation of fancyunits]
\si@emulating{fancyunits}{2007/02/01 v1.0.1}
\si@ifloaded{SIunits}
{\si@log@err{SIunits emulation loaded\MessageBreak before
diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-hep.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-hep.cfg
index 073f61a32ee..8825525b522 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-hep.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-hep.cfg
@@ -14,8 +14,7 @@
%% ----------------------------------------------------------------
%%
\ProvidesFile{si-hep.cfg}
- [\si@svn@version siunitx: Units for
- high-energy physics]
+ [2008/09/03 v1.0l siunitx: Units for high-energy physics]
\requiresiconfigs{prefix,named}
\provideunit{\micron}{\micro\metre}
\newunit{\mrad}{\milli\rad}
diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-hepunits.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-hepunits.cfg
index a3c608ccc44..1e57ff7c5dd 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-hepunits.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-hepunits.cfg
@@ -14,8 +14,7 @@
%% ----------------------------------------------------------------
%%
\ProvidesFile{si-hepunits.cfg}
- [\si@svn@version Emulation of siunitx:
- hepunits]
+ [2008/09/03 v1.0l siunitx: Emulation of hepunits]
\si@emulating{hepunits}{2007/09/27}
\requiresiconfigs{SIunits,accepted,prefix,hep}
\ifsi@old@noprefixcmds\else
diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-named.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-named.cfg
index bba45ded73f..ad9af4617d5 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-named.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-named.cfg
@@ -14,7 +14,7 @@
%% ----------------------------------------------------------------
%%
\ProvidesFile{si-named.cfg}
- [\si@svn@version siunitx: SI Named units]
+ [2008/09/03 v1.0l siunitx: SI Named units]
\newunit{\becquerel}{Bq}
\newunit{\coulomb}{C}
\newunit{\farad}{F}
diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-physical.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-physical.cfg
index 2ef31fa2444..3b6ab1f6018 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-physical.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-physical.cfg
@@ -14,8 +14,7 @@
%% ----------------------------------------------------------------
%%
\ProvidesFile{si-physical.cfg}
- [\si@svn@version siunitx:
- SI Physically-measured units]
+ [2008/09/03 v1.0l siunitx: SI Physically-measured units]
\newcommand*{\si@eVspacea}{\text{\kern-\si@eVcorra}}%
\newcommand*{\si@eVspaceb}{\text{\kern-\si@eVcorrb}}%
\newunit{\electronvolt}{e\protect\si@eVspacea V\protect%
diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-prefix.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-prefix.cfg
index c2a72e82a5c..2969dd8c71e 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-prefix.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-prefix.cfg
@@ -14,8 +14,7 @@
%% ----------------------------------------------------------------
%%
\ProvidesFile{si-prefix.cfg}
- [\si@svn@version siunitx:
- SI Multiple prefixes]
+ [2008/09/03 v1.0l siunitx: SI Multiple prefixes]
\newprefix{\yocto}{-24}{y}
\newprefix{\zepto}{-21}{z}
\newprefix{\atto}{-18}{a}
diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-prefixed.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-prefixed.cfg
index 9d2015b6c2f..99593b2561e 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-prefixed.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-prefixed.cfg
@@ -14,8 +14,7 @@
%% ----------------------------------------------------------------
%%
\ProvidesFile{si-prefixed.cfg}
- [\si@svn@version siunitx:
- SI Prefixed units]
+ [2008/09/03 v1.0l siunitx: SI Prefixed units]
\requiresiconfigs{prefix,named,accepted,physical}
\newunit{\picometre}{\pico\metre}
\newunit{\nanometre}{\nano\metre}
diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-sistyle.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-sistyle.cfg
index 67bef67b2da..3f7977ed19e 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-sistyle.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-sistyle.cfg
@@ -14,8 +14,7 @@
%% ----------------------------------------------------------------
%%
\ProvidesFile{si-sistyle.cfg}
- [\si@svn@version siunitx: Emulation of
- SIstyle]
+ [2008/09/03 v1.0l siunitx: Emulation of SIstyle]
\si@emulating{sistyle}{2006/12/20 v2.3}
\sisetup{%
sepfour=true,
diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-synchem.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-synchem.cfg
index c19f49a351f..97048463852 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-synchem.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-synchem.cfg
@@ -14,8 +14,7 @@
%% ----------------------------------------------------------------
%%
\ProvidesFile{si-synchem.cfg}
- [\si@svn@version siunitx: Units for
- synthetic chemists]
+ [2008/09/03 v1.0l siunitx: Units for synthetic chemists]
\requiresiconfigs{prefix}
\newunit{\mmHg}{mmHg}
\newunit{\molar}{\mole\per\cubic\deci\metre}
diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-units.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-units.cfg
index ab02762f2f5..799b0f99142 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-units.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-units.cfg
@@ -15,7 +15,7 @@
%%
\si@ifloaded{units}{\endinput}{}
\ProvidesFile{si-units.cfg}
- [\si@svn@version siunitx: Emulation of units]
+ [2008/09/03 v1.0l siunitx: Emulation of units]
\si@emulating{units}{1998/08/04 v0.9b}
\si@ifloaded{SIunits}
{\si@emclash{units}{SIunits}\endinput}{}
diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-unitsdef.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-unitsdef.cfg
index 350775acc71..c0a7bebdc86 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-unitsdef.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-unitsdef.cfg
@@ -14,8 +14,7 @@
%% ----------------------------------------------------------------
%%
\ProvidesFile{si-unitsdef.cfg}
- [\si@svn@version siunitx:
- Emulation of unitsdef]
+ [2008/09/03 v1.0l siunitx: Emulation of unitsdef]
\si@emulating{unitsdef}{2005/01/04 v0.2}
\si@ifloaded{SIunits}
{\si@emclash{unitsdef}{SIunits}\endinput}{}
diff --git a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
index 22ecfac416e..3d5eb1260d7 100644
--- a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
+++ b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
@@ -14,13 +14,8 @@
%% ----------------------------------------------------------------
%%
\NeedsTeXFormat{LaTeX2e}
-\newcommand*{\si@svn@ver}{v1.0i}
-\def\si@svn@id$#1: #2.#3 #4 #5-#6-#7 #8 #9${%
- \newcommand*{\si@svn@version}{%
- #5/#6/#7\space\si@svn@ver\space}}
-\si@svn@id $Id: siunitx.dtx 121 2008-08-14 14:06:03Z joseph $
\ProvidesPackage{siunitx}
- [\si@svn@version A comprehensive (SI) units package]
+ [2008/09/03 v1.0l A comprehensive (SI) units package]
\begingroup
\@ifundefined{eTeXversion}
{\PackageError{siunitx}
@@ -2336,6 +2331,7 @@
\si@tab@posttoks{}%
\si@switchfalse
\si@tab@gettok}
+\newcommand*{\si@tab@next}{}
\newcommand*{\si@tab@gettok@S}[1]{%
\ifx\tabularnewline#1\relax
\let\si@tab@next\si@tab@newline@S
@@ -2356,15 +2352,23 @@
\let\si@tab@next\relax
\else
\let\si@tab@next\si@tab@gettok@S
- \si@str@ifchrstr{#1}{\si@numvalid}
- {\si@switchtrue
- \si@log@debug{Found numerical cell
- contents `#1'}%
- \si@tab@toks=\expandafter{%
- \the\si@tab@toks#1}}
- {\si@log@debug{Found other cell contents
- \string#1}%
- \si@tab@othertok{#1}}%
+ \ifx\ignorespaces#1\relax
+ \si@tab@othertok{#1}%
+ \else
+ \ifx\unskip#1\relax
+ \si@tab@othertok{#1}%
+ \else
+ \si@str@ifchrstr{#1}{\si@numvalid}
+ {\si@switchtrue
+ \si@log@debug{Found numerical cell
+ contents `#1'}%
+ \si@tab@toks=\expandafter{%
+ \the\si@tab@toks#1}}
+ {\si@tab@ifonechar{#1}
+ {\futurelet\si@tempa\si@tab@bracetest#1}%
+ {\si@tab@othertok{#1}}}%
+ \fi
+ \fi
\fi
\fi
\fi
@@ -2373,11 +2377,42 @@
\fi
\si@tab@next}
\newcommand*{\si@tab@othertok}[1]{%
+ \si@log@debug{Found other cell contents `\unexpanded{#1}'}%
\ifsi@switch
+ \si@log@debug{Adding to post-numeral part}%
\si@tab@posttoks=\expandafter{\the\si@tab@posttoks#1}%
\else
+ \si@log@debug{Adding to pre-numeral part}%
\si@tab@pretoks=\expandafter{\the\si@tab@pretoks#1}%
\fi}
+\newcommand*{\si@tab@ifonechar}[1]{\si@tab@onechar#1\@empty}
+\def\si@tab@onechar#1#2\@empty{%
+ \ifx\@empty#2\@empty
+ \expandafter\@firstoftwo
+ \else
+ \expandafter\@secondoftwo
+ \fi}
+\newcommand*{\si@tab@bracetest}{%
+ \ifx\si@tempa\bgroup
+ \expandafter\si@tab@othertok
+ \else
+ \expandafter\si@tab@exptest
+ \fi}
+\newcommand*{\si@tab@exptest}[1]{%
+ \edef\si@tempa{\si@tab@meaning{#1}}%
+ \ifx\si@tempa\si@tab@macro
+ \si@log@debug{Expanding cell contents `\unexpanded{#1}'}%
+ \the\si@tab@pretoks
+ \si@tab@pretoks{}%
+ \protected@edef\si@tab@next{\noexpand\si@tab@gettok@S#1}%
+ \else
+ \si@tab@othertok{#1}%
+ \fi}
+\newcommand*{\si@tab@meaning}[1]{%
+ \expandafter\si@tab@strip\meaning#1:->:->\@empty}
+\def\si@tab@strip#1:->#2:->#3\@empty{#1}
+\newcommand*{\si@tab@macro}{}
+\edef\si@tab@macro{\si@tab@meaning{\si@tab@macro}}
\newcommand*{\si@tab@gettok@s}[1]{%
\ifx\tabularnewline#1\relax
\let\si@tab@next\si@tab@newline@s
@@ -2422,9 +2457,9 @@
\fi
\si@tab@lfill\relax
\ifsi@switch
- \llap{\the\si@tab@pretoks}%
- \expandafter\si@tab@numout
- \rlap{\the\si@tab@posttoks}%
+ \the\si@tab@pretoks
+ \si@tab@numout
+ \the\si@tab@posttoks
\else
\the\si@tab@pretoks
\fi
@@ -2478,9 +2513,6 @@
\box\si@tab@expbox}
\newcommand*\si@tab@unfixed{%
\si@log@debug{Using variable width S column}%
- \protected@edef\si@num@out{\si@num@out\si@tab@expout}%
- \setbox\si@tab@prebox=\hbox
- {\expandafter\si@out@num\expandafter{\si@tab@out}}%
\ifx\@empty\si@num@out\@empty
\setbox\si@tab@midbox=\hbox
{\phantom{\ensuremath{{\si@decimalsymbol}}}}%
@@ -2488,6 +2520,9 @@
\setbox\si@tab@midbox=\hbox
{\ensuremath{{\si@decimalsymbol}}}%
\fi
+ \protected@edef\si@num@out{\si@num@out\si@tab@expout}%
+ \setbox\si@tab@prebox=\hbox
+ {\expandafter\si@out@num\expandafter{\si@tab@out}}%
\setbox\si@tab@postbox=\hbox
{\expandafter\si@out@num\expandafter{\si@num@out}}%
\ifdim\wd\si@tab@prebox>\wd\si@tab@postbox\relax
@@ -2515,7 +2550,9 @@
\si@tab@sepcorr{mantpre}{pre}%
\si@tab@postdim\si@tab@mantpostcnt\si@tempdima\relax
\setbox\si@tempboxa=\hbox{\ensuremath{{\si@decimalsymbol}}}%
- \advance\si@tab@postdim\wd\si@tempboxa\relax
+ \ifnum\si@tab@mantpostcnt=\z@\relax\else
+ \advance\si@tab@postdim\wd\si@tempboxa\relax
+ \fi
\si@tab@sepcorr{mantpost}{post}%
\setbox\si@tempboxa=\hbox{\si@out@num{^{1}}}%
\si@tempdima\wd\si@tempboxa\relax