1 files changed, 26 insertions, 30 deletions
diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
index 0a261eb4ef3..effa1c64958 100644
--- a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
+++ b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
@@ -3308,7 +3308,7 @@ author.
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{siunitx}
-  [2010/02/05 v1.4a A comprehensive (SI) units package]
+  [2010/02/21 v1.4b A comprehensive (SI) units package]
 %    \end{macrocode}
 % The package requires \eTeX, so the usual test is made.
 %    \begin{macrocode}
@@ -8285,6 +8285,7 @@ author.
 %\end{macro}
 %\begin{macro}{\si@tab@othertok}
 %\changes{2009/12/25}{v1.3g}{Fix for multiple tokens in input}
+%\changes{2010/021/21}{v1.4b}{Back to plan A}
 %\darg{token}
 %\begin{macro}{\si@tab@othertok@aux}
 % Tokens which are not part of a number can occur before or after a
@@ -8292,11 +8293,6 @@ author.
 % information for good measure.
 %    \begin{macrocode}
 \newcommand*{\si@tab@othertok}[1]{%
-  \si@tab@ifonechar{#1}
-    {\si@tab@othertok@aux{#1}}
-    {\si@tab@othertok@aux{{#1}}}%
-}
-\newcommand*{\si@tab@othertok@aux}[1]{%
   \si@log@debug{Found other cell contents `\unexpanded{#1}'}%
   \ifsi@switch
     \si@log@debug{Adding to post-numeral part}%
@@ -10864,7 +10860,7 @@ author.
 % powers.
 %    \begin{macrocode}
 \ProvidesFile{si-prefix.cfg}
-  [2010/02/05 v1.4a siunitx: SI Multiple prefixes]
+  [2010/02/21 v1.4b siunitx: SI Multiple prefixes]
 \newprefix{\yocto}{-24}{y}
 \newprefix{\zepto}{-21}{z}
 \newprefix{\atto}{-18}{a}
@@ -10968,7 +10964,7 @@ author.
 % is an awkward one, but here the UK standard is used.
 %    \begin{macrocode}
 \ProvidesFile{si-named.cfg}
-  [2010/02/05 v1.4a siunitx: SI Named units]
+  [2010/02/21 v1.4b siunitx: SI Named units]
 \newunit{\becquerel}{Bq}
 \newunit{\coulomb}{C}
 \newunit{\farad}{F}
@@ -11067,7 +11063,7 @@ author.
 % This requires \file{si-prefix.cfg} and \file{si-named.cfg}.
 %    \begin{macrocode}
 \ProvidesFile{si-prefixed.cfg}
-  [2010/02/05 v1.4a siunitx: SI Prefixed units]
+  [2010/02/21 v1.4b siunitx: SI Prefixed units]
 \requiresiconfigs{prefix,named,accepted,physical}
 %    \end{macrocode}
 %\begin{macro}{\picometre}
@@ -11365,7 +11361,7 @@ author.
 % block for the appropriate option.  First currents.
 %    \begin{macrocode}
 \ProvidesFile{si-abbr.cfg}
-  [2010/02/05 v1.4a siunitx: Abbreviated units]
+  [2010/02/21 v1.4b siunitx: Abbreviated units]
 \requiresiconfigs{prefix,named,accepted,physical}
 \newunit{\pA}{\pico\ampere}
 \newunit{\nA}{\nano\ampere}
@@ -11588,7 +11584,7 @@ author.
 % These are defined here, although some are in very general use.
 %    \begin{macrocode}
 \ProvidesFile{si-addn.cfg}
-  [2010/02/05 v1.4a siunitx: SI Additional units]
+  [2010/02/21 v1.4b siunitx: SI Additional units]
 \provideunit{\angstrom}{\si@sym@ringA}
 \AtBeginDocument{%
   \ifdefined\Saveangstrom
@@ -11643,7 +11639,7 @@ author.
 %\begin{macro}{\bel}
 %    \begin{macrocode}
 \ProvidesFile{si-accepted.cfg}
-  [2010/02/05 v1.4a siunitx: SI Accepted units]
+  [2010/02/21 v1.4b siunitx: SI Accepted units]
 \newunit{\minute}{min}
 \newunit{\hour}{h}
 \newunit{\Day}{d}
@@ -11701,7 +11697,7 @@ author.
 % for a negative kern does make things a bit complicated.
 %    \begin{macrocode}
 \ProvidesFile{si-physical.cfg}
-  [2010/02/05 v1.4a siunitx: SI Physically-measured units]
+  [2010/02/21 v1.4b 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%
@@ -11737,7 +11733,7 @@ author.
 % own definitions.
 %    \begin{macrocode}
 \ProvidesFile{si-synchem.cfg}
-  [2010/02/05 v1.4a siunitx: Units for synthetic chemists]
+  [2010/02/21 v1.4b siunitx: Units for synthetic chemists]
 \requiresiconfigs{prefix}
 \newunit{\mmHg}{mmHg}
 \newunit{\molar}{\mole\per\cubic\deci\metre}
@@ -11758,7 +11754,7 @@ author.
 % Some units inspired by \pkg{hepunits}.
 %    \begin{macrocode}
 \ProvidesFile{si-hep.cfg}
-  [2010/02/05 v1.4a siunitx: Units for high-energy physics]
+  [2010/02/21 v1.4b siunitx: Units for high-energy physics]
 \requiresiconfigs{prefix,named}
 %    \end{macrocode}
 %\begin{macro}{\micron}
@@ -11840,7 +11836,7 @@ author.
 % For astronomy, the \cs{parsec} unit is needed.
 %    \begin{macrocode}
 \ProvidesFile{si-astro.cfg}
-  [2010/02/05 v1.4a siunitx: Units for astronomy]
+  [2010/02/21 v1.4b siunitx: Units for astronomy]
 \newunit{\parsec}{pc}
 \newunit{\lightyear}{ly}
 %    \end{macrocode}
@@ -11855,7 +11851,7 @@ author.
 % The unit \cs{gon} is useful here.
 %    \begin{macrocode}
 \ProvidesFile{si-geophys.cfg}
-  [2010/02/05 v1.4a siunitx: Units for astronomy]
+  [2010/02/21 v1.4b siunitx: Units for astronomy]
 \newunit{\gon}{gon}
 %    \end{macrocode}
 %\end{macro}
@@ -11870,7 +11866,7 @@ author.
 % For astronomy, the \cs{parsec} unit is needed.
 %    \begin{macrocode}
 \ProvidesFile{si-chemeng.cfg}
-  [2010/02/05 v1.4a siunitx: Units for chemical engineering]
+  [2010/02/21 v1.4b siunitx: Units for chemical engineering]
 \newunit{\gmol}{g\text{-}mol}
 \newunit{\kgmol}{kg\text{-}mol}
 \newunit{\lbmol}{lb\text{-}mol}
@@ -11895,7 +11891,7 @@ author.
 % \SIunits. First, the binary prefixes.
 %    \begin{macrocode}
 \ProvidesFile{si-binary.cfg}
-  [2010/02/05 v1.4a siunitx: Binary units]
+  [2010/02/21 v1.4b siunitx: Binary units]
 \newprefix[binary]{\kibi}{10}{Ki}
 \newprefix[binary]{\mebi}{20}{Mi}
 \newprefix[binary]{\gibi}{30}{Gi}
@@ -11938,7 +11934,7 @@ author.
 % default values.\footnote{The package author is in the UK.}
 %    \begin{macrocode}
 \ProvidesFile{si-UK.cfg}
-  [2010/02/05 v1.4a siunitx: UK locale]
+  [2010/02/21 v1.4b siunitx: UK locale]
 \sisetup{
   unitsep=thin,
   expproduct=times,
@@ -11956,7 +11952,7 @@ author.
 % The same as for the UK.
 %    \begin{macrocode}
 \ProvidesFile{si-USA.cfg}
-  [2010/02/05 v1.4a siunitx: USA locale]
+  [2010/02/21 v1.4b siunitx: USA locale]
 \sisetup{
   unitsep=thin,
   expproduct=times,
@@ -11974,7 +11970,7 @@ author.
 % Germany, hopefully.
 %    \begin{macrocode}
 \ProvidesFile{si-DE.cfg}
-  [2010/02/05 v1.4a siunitx: Germany locale]
+  [2010/02/21 v1.4b siunitx: Germany locale]
 \sisetup{
   unitsep=cdot,
   valuesep=thin,
@@ -11992,7 +11988,7 @@ author.
 % Design decisions taken from the same section of \SIstyle.
 %    \begin{macrocode}
 \ProvidesFile{si-ZA.cfg}
-  [2010/02/05 v1.4a siunitx: South Africa locale]
+  [2010/02/21 v1.4b siunitx: South Africa locale]
 \sisetup{
   unitsep=cdot,
   valuesep=thin,
@@ -12025,7 +12021,7 @@ author.
 % \units for conflicting options, so users probably expect none.
 %    \begin{macrocode}
 \ProvidesFile{si-units.cfg}
-  [2010/02/05 v1.4a siunitx: Emulation of units]
+  [2010/02/21 v1.4b siunitx: Emulation of units]
 \si@emulating{units}{1998/08/04 v0.9b}
 \si@ifloaded{SIunits}
   {\si@emclash{units}{SIunits}\endinput}{}
@@ -12095,7 +12091,7 @@ author.
 % clash.
 %    \begin{macrocode}
 \ProvidesFile{si-unitsdef.cfg}
-  [2010/02/05 v1.4a siunitx:
+  [2010/02/21 v1.4b siunitx:
    Emulation of unitsdef]
 \si@emulating{unitsdef}{2005/01/04 v0.2}
 \si@ifloaded{SIunits}
@@ -12544,7 +12540,7 @@ author.
 % the macros in \SIstyle as given in the manual for that package.
 %    \begin{macrocode}
 \ProvidesFile{si-sistyle.cfg}
-  [2010/02/05 v1.4a siunitx: Emulation of
+  [2010/02/21 v1.4b siunitx: Emulation of
      SIstyle]
 \si@emulating{sistyle}{2006/12/20 v2.3}
 \sisetup{%
@@ -12728,7 +12724,7 @@ author.
 % \SIunits emulation starts in much the same way.
 %    \begin{macrocode}
 \ProvidesFile{si-SIunits.cfg}
-  [2010/02/05 v1.4a siunitx: Emulation of
+  [2010/02/21 v1.4b siunitx: Emulation of
      SIunits]
 \si@emulating{SIunits}{2007/12/02 v1.36}
 \sisetup{
@@ -13287,7 +13283,7 @@ author.
 % which are not really to be encouraged.
 %    \begin{macrocode}
 \ProvidesFile{si-hepunits.cfg}
-  [2010/02/05 v1.4a siunitx: Emulation of
+  [2010/02/21 v1.4b siunitx: Emulation of
      hepunits]
 \si@emulating{hepunits}{2007/09/27}
 \requiresiconfigs{SIunits,accepted,prefix,hep}
@@ -13442,7 +13438,7 @@ author.
 % a little emulation and a few macros needed.
 %    \begin{macrocode}
 \ProvidesFile{si-fancynum.cfg}
-  [2010/02/05 v1.4a siunitx: Emulation of
+  [2010/02/21 v1.4b siunitx: Emulation of
      fancynum]
 \si@emulating{fancynum}{2000/08/08 0.92}
 \sisetup{decimalsymbol=cdot,digitsep=comma}
@@ -13504,7 +13500,7 @@ author.
 % test is needed.
 %    \begin{macrocode}
 \ProvidesFile{si-fancyunits.cfg}
-  [2010/02/05 v1.4a siunitx: Emulation of
+  [2010/02/21 v1.4b siunitx: Emulation of
      fancyunits]
 \si@emulating{fancyunits}{2007/02/01 v1.0.1}
 \si@ifloaded{SIunits}