siunitx 1.3g (26dec09)

git-svn-id: svn://tug.org/texlive/trunk@16535 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 49 insertions, 29 deletions

diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
index 299e065d722..4d189b18bbe 100644
--- a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
+++ b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
@@ -3322,7 +3322,7 @@ author.
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{siunitx}
-  [2009/12/16 v1.3f A comprehensive (SI) units package]
+  [2009/12/25 v1.3g A comprehensive (SI) units package]
 %    \end{macrocode}
 % The package requires \eTeX, so the usual test is made.
 %    \begin{macrocode}
@@ -8248,7 +8248,7 @@ author.
 % to see if the current ``token'' is a single item. If it was wrapped
 % in one set of braces before being picked up here, they will have
 % been removed. So the input may now have more than one character to
-% it. If it is a single token, testing for expendability first
+% it. If it is a single token, testing for expandability first
 % requires a check for another set of braces.  This is handed off
 % using \cs{futurelet}.
 %    \begin{macrocode}
@@ -8267,12 +8267,19 @@ author.
 %    \end{macrocode}
 %\end{macro}
 %\begin{macro}{\si@tab@othertok}
+%\changes{2009/12/25}{v1.3g}{Fix for multiple tokens in input}
 %\darg{token}
+%\begin{macro}{\si@tab@othertok@aux}
 % Tokens which are not part of a number can occur before or after a
 % number. This is all sorted out here, with some debugging
 % 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}%
@@ -8283,6 +8290,7 @@ author.
   \fi}
 %    \end{macrocode}
 %\end{macro}
+%\end{macro}
 %\begin{macro}{\si@tab@ifonechar}
 %\darg{token}
 %\begin{macro}{\si@tab@onechar}
@@ -8312,6 +8320,8 @@ author.
 %    \end{macrocode}
 %\end{macro}
 %\begin{macro}{\si@tab@exptest}
+%\changes{2009/12/25}{v1.3g}{Check dor \LaTeXe\ robust commands}
+%\begin{macro}{\si@tab@exptest@aux}
 %\begin{macro}{\si@tab@meaning}
 %\begin{macro}{\si@tab@strip}
 %\darg{token}
@@ -8322,13 +8332,22 @@ author.
 \newcommand*{\si@tab@exptest}[1]{%
   \edef\si@tempa{\si@tab@meaning{#1}}%
   \ifx\si@tempa\si@tab@macro
+    \expandafter\si@tab@exptest@aux
+  \else
+    \expandafter\si@tab@othertok
+  \fi
+  {#1}%
+}
+\newcommand*{\si@tab@exptest@aux}[1]{%
+  \ifcsname\expandafter\@gobble\string#1 \endcsname
+    \si@tab@othertok{#1}%
+  \else
     \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}
+  \fi
+}
 \newcommand*{\si@tab@meaning}[1]{%
   \expandafter\si@tab@strip\meaning#1:->:->\@empty}
 \def\si@tab@strip#1:->#2:->#3\@empty{#1}
@@ -8336,6 +8355,7 @@ author.
 %\end{macro}
 %\end{macro}
 %\end{macro}
+%\end{macro}
 %\begin{macro}{\si@tab@macro}
 % A supporter macro for the above which always expands to ``macro''
 % with everything with category code 12.
@@ -10827,7 +10847,7 @@ author.
 % powers.
 %    \begin{macrocode}
 \ProvidesFile{si-prefix.cfg}
-  [2009/12/16 v1.3f siunitx: SI Multiple prefixes]
+  [2009/12/25 v1.3g siunitx: SI Multiple prefixes]
 \newprefix{\yocto}{-24}{y}
 \newprefix{\zepto}{-21}{z}
 \newprefix{\atto}{-18}{a}
@@ -10931,7 +10951,7 @@ author.
 % is an awkward one, but here the UK standard is used.
 %    \begin{macrocode}
 \ProvidesFile{si-named.cfg}
-  [2009/12/16 v1.3f siunitx: SI Named units]
+  [2009/12/25 v1.3g siunitx: SI Named units]
 \newunit{\becquerel}{Bq}
 \newunit{\coulomb}{C}
 \newunit{\farad}{F}
@@ -11030,7 +11050,7 @@ author.
 % This requires \file{si-prefix.cfg} and \file{si-named.cfg}.
 %    \begin{macrocode}
 \ProvidesFile{si-prefixed.cfg}
-  [2009/12/16 v1.3f siunitx: SI Prefixed units]
+  [2009/12/25 v1.3g siunitx: SI Prefixed units]
 \requiresiconfigs{prefix,named,accepted,physical}
 %    \end{macrocode}
 %\begin{macro}{\picometre}
@@ -11328,7 +11348,7 @@ author.
 % block for the appropriate option.  First currents.
 %    \begin{macrocode}
 \ProvidesFile{si-abbr.cfg}
-  [2009/12/16 v1.3f siunitx: Abbreviated units]
+  [2009/12/25 v1.3g siunitx: Abbreviated units]
 \requiresiconfigs{prefix,named,accepted,physical}
 \newunit{\pA}{\pico\ampere}
 \newunit{\nA}{\nano\ampere}
@@ -11551,7 +11571,7 @@ author.
 % These are defined here, although some are in very general use.
 %    \begin{macrocode}
 \ProvidesFile{si-addn.cfg}
-  [2009/12/16 v1.3f siunitx: SI Additional units]
+  [2009/12/25 v1.3g siunitx: SI Additional units]
 \provideunit{\angstrom}{\si@sym@ringA}
 \AtBeginDocument{%
   \ifdefined\Saveangstrom
@@ -11606,7 +11626,7 @@ author.
 %\begin{macro}{\bel}
 %    \begin{macrocode}
 \ProvidesFile{si-accepted.cfg}
-  [2009/12/16 v1.3f siunitx: SI Accepted units]
+  [2009/12/25 v1.3g siunitx: SI Accepted units]
 \newunit{\minute}{min}
 \newunit{\hour}{h}
 \newunit{\Day}{d}
@@ -11664,7 +11684,7 @@ author.
 % for a negative kern does make things a bit complicated.
 %    \begin{macrocode}
 \ProvidesFile{si-physical.cfg}
-  [2009/12/16 v1.3f siunitx: SI Physically-measured units]
+  [2009/12/25 v1.3g 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%
@@ -11700,7 +11720,7 @@ author.
 % own definitions.
 %    \begin{macrocode}
 \ProvidesFile{si-synchem.cfg}
-  [2009/12/16 v1.3f siunitx: Units for synthetic chemists]
+  [2009/12/25 v1.3g siunitx: Units for synthetic chemists]
 \requiresiconfigs{prefix}
 \newunit{\mmHg}{mmHg}
 \newunit{\molar}{\mole\per\cubic\deci\metre}
@@ -11721,7 +11741,7 @@ author.
 % Some units inspired by \pkg{hepunits}.
 %    \begin{macrocode}
 \ProvidesFile{si-hep.cfg}
-  [2009/12/16 v1.3f siunitx: Units for high-energy physics]
+  [2009/12/25 v1.3g siunitx: Units for high-energy physics]
 \requiresiconfigs{prefix,named}
 %    \end{macrocode}
 %\begin{macro}{\micron}
@@ -11803,7 +11823,7 @@ author.
 % For astronomy, the \cs{parsec} unit is needed.
 %    \begin{macrocode}
 \ProvidesFile{si-astro.cfg}
-  [2009/12/16 v1.3f siunitx: Units for astronomy]
+  [2009/12/25 v1.3g siunitx: Units for astronomy]
 \newunit{\parsec}{pc}
 \newunit{\lightyear}{ly}
 %    \end{macrocode}
@@ -11818,7 +11838,7 @@ author.
 % The unit \cs{gon} is useful here.
 %    \begin{macrocode}
 \ProvidesFile{si-geophys.cfg}
-  [2009/12/16 v1.3f siunitx: Units for astronomy]
+  [2009/12/25 v1.3g siunitx: Units for astronomy]
 \newunit{\gon}{gon}
 %    \end{macrocode}
 %\end{macro}
@@ -11833,7 +11853,7 @@ author.
 % For astronomy, the \cs{parsec} unit is needed.
 %    \begin{macrocode}
 \ProvidesFile{si-chemeng.cfg}
-  [2009/12/16 v1.3f siunitx: Units for chemical engineering]
+  [2009/12/25 v1.3g siunitx: Units for chemical engineering]
 \newunit{\gmol}{g\text{-}mol}
 \newunit{\kgmol}{kg\text{-}mol}
 \newunit{\lbmol}{lb\text{-}mol}
@@ -11858,7 +11878,7 @@ author.
 % \SIunits. First, the binary prefixes.
 %    \begin{macrocode}
 \ProvidesFile{si-binary.cfg}
-  [2009/12/16 v1.3f siunitx: Binary units]
+  [2009/12/25 v1.3g siunitx: Binary units]
 \newprefix[binary]{\kibi}{10}{Ki}
 \newprefix[binary]{\mebi}{20}{Mi}
 \newprefix[binary]{\gibi}{30}{Gi}
@@ -11901,7 +11921,7 @@ author.
 % default values.\footnote{The package author is in the UK.}
 %    \begin{macrocode}
 \ProvidesFile{si-UK.cfg}
-  [2009/12/16 v1.3f siunitx: UK locale]
+  [2009/12/25 v1.3g siunitx: UK locale]
 \sisetup{
   unitsep=thin,
   expproduct=times,
@@ -11919,7 +11939,7 @@ author.
 % The same as for the UK.
 %    \begin{macrocode}
 \ProvidesFile{si-USA.cfg}
-  [2009/12/16 v1.3f siunitx: USA locale]
+  [2009/12/25 v1.3g siunitx: USA locale]
 \sisetup{
   unitsep=thin,
   expproduct=times,
@@ -11937,7 +11957,7 @@ author.
 % Germany, hopefully.
 %    \begin{macrocode}
 \ProvidesFile{si-DE.cfg}
-  [2009/12/16 v1.3f siunitx: Germany locale]
+  [2009/12/25 v1.3g siunitx: Germany locale]
 \sisetup{
   unitsep=cdot,
   valuesep=thin,
@@ -11955,7 +11975,7 @@ author.
 % Design decisions taken from the same section of \SIstyle.
 %    \begin{macrocode}
 \ProvidesFile{si-ZA.cfg}
-  [2009/12/16 v1.3f siunitx: South Africa locale]
+  [2009/12/25 v1.3g siunitx: South Africa locale]
 \sisetup{
   unitsep=cdot,
   valuesep=thin,
@@ -11988,7 +12008,7 @@ author.
 % \units for conflicting options, so users probably expect none.
 %    \begin{macrocode}
 \ProvidesFile{si-units.cfg}
-  [2009/12/16 v1.3f siunitx: Emulation of units]
+  [2009/12/25 v1.3g siunitx: Emulation of units]
 \si@emulating{units}{1998/08/04 v0.9b}
 \si@ifloaded{SIunits}
   {\si@emclash{units}{SIunits}\endinput}{}
@@ -12058,7 +12078,7 @@ author.
 % clash.
 %    \begin{macrocode}
 \ProvidesFile{si-unitsdef.cfg}
-  [2009/12/16 v1.3f siunitx:
+  [2009/12/25 v1.3g siunitx:
    Emulation of unitsdef]
 \si@emulating{unitsdef}{2005/01/04 v0.2}
 \si@ifloaded{SIunits}
@@ -12507,7 +12527,7 @@ author.
 % the macros in \SIstyle as given in the manual for that package.
 %    \begin{macrocode}
 \ProvidesFile{si-sistyle.cfg}
-  [2009/12/16 v1.3f siunitx: Emulation of
+  [2009/12/25 v1.3g siunitx: Emulation of
      SIstyle]
 \si@emulating{sistyle}{2006/12/20 v2.3}
 \sisetup{%
@@ -12691,7 +12711,7 @@ author.
 % \SIunits emulation starts in much the same way.
 %    \begin{macrocode}
 \ProvidesFile{si-SIunits.cfg}
-  [2009/12/16 v1.3f siunitx: Emulation of
+  [2009/12/25 v1.3g siunitx: Emulation of
      SIunits]
 \si@emulating{SIunits}{2007/12/02 v1.36}
 \sisetup{
@@ -13250,7 +13270,7 @@ author.
 % which are not really to be encouraged.
 %    \begin{macrocode}
 \ProvidesFile{si-hepunits.cfg}
-  [2009/12/16 v1.3f siunitx: Emulation of
+  [2009/12/25 v1.3g siunitx: Emulation of
      hepunits]
 \si@emulating{hepunits}{2007/09/27}
 \requiresiconfigs{SIunits,accepted,prefix,hep}
@@ -13405,7 +13425,7 @@ author.
 % a little emulation and a few macros needed.
 %    \begin{macrocode}
 \ProvidesFile{si-fancynum.cfg}
-  [2009/12/16 v1.3f siunitx: Emulation of
+  [2009/12/25 v1.3g siunitx: Emulation of
      fancynum]
 \si@emulating{fancynum}{2000/08/08 0.92}
 \sisetup{decimalsymbol=cdot,digitsep=comma}
@@ -13467,7 +13487,7 @@ author.
 % test is needed.
 %    \begin{macrocode}
 \ProvidesFile{si-fancyunits.cfg}
-  [2009/12/16 v1.3f siunitx: Emulation of
+  [2009/12/25 v1.3g siunitx: Emulation of
      fancyunits]
 \si@emulating{fancyunits}{2007/02/01 v1.0.1}
 \si@ifloaded{SIunits}