siunitx 2.3b (8aug11)

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

6 files changed, 55 insertions, 23 deletions

diff --git a/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf b/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf
index 760aa7e00bf..7becca7d360 100644
--- a/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf
+++ b/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf
diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
index e642a598b4a..77fa17c759f 100644
--- a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
+++ b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
@@ -538,6 +538,8 @@ This work consists of the file  siunitx.dtx
 %\changes{v2.3}{2011/06/19}{New implementation for alignment in \texttt{S}
 %  column}
 %\changes{v2.3a}{2011/07/09}{Restore fix in v2.2l missing in v2.3}
+%\changes{v2.3b}{2011/08/08}{Adjust internal load order so that
+%  \opt{free-standing-units} works correctly for abbreviations}
 %
 %\begin{abstract}
 % Physical quantities have both numbers and units, and each physical
@@ -2436,6 +2438,7 @@ This work consists of the file  siunitx.dtx
 %
 %\begin{center}
 %  \changes{v2.0n}{2010/07/15}{More abbreviated units}
+%  \changes{v2.3b}{2011/07/27}{More abbreviated units}
 %  \tablecaption{Abbreviated units.}
 %  \label{tab:unit:abbr}
 %  \tablefirsthead{^^A
@@ -2560,6 +2563,7 @@ This work consists of the file  siunitx.dtx
 %      \midrule
 %
 %      \DescribeNamedUnit{watt}{W}                \\
+%      \DescribeNamedUnit{microwatt}{uW}          \\
 %      \DescribeNamedUnit{milliwatt}{mW}          \\
 %      \DescribeNamedUnit{kilowatt}{kW}           \\
 %      \DescribeNamedUnit{megawatt}{MW}           \\
@@ -2573,10 +2577,20 @@ This work consists of the file  siunitx.dtx
 %      \DescribeNamedUnit{gigaelectronvolt}{GeV}  \\
 %      \DescribeNamedUnit{teraelectronvolt}{TeV}  \\
 %      \DescribeNamedUnit{kilowatt hour}{kWh}     \\
+%      
+%      \midrule
+%
+%      \DescribeNamedUnit{farad}{F}       \\
+%      \DescribeNamedUnit{femtofarad}{fF} \\
+%      \DescribeNamedUnit{picofarad}{pF}  \\
 %
 %      \midrule
 %
 %      \DescribeNamedUnit{kelvin}{K} \\
+%      
+%      \midrule
+%
+%      \DescribeNamedUnit{decibel}{dB} \\
 %
 %  \end{xtabular}
 %\end{center}
@@ -4869,7 +4883,7 @@ This work consists of the file  siunitx.dtx
 %
 % The usual preliminaries.
 %    \begin{macrocode}
-\ProvidesExplPackage {siunitx} {2011/07/09} {2.3a}
+\ProvidesExplPackage {siunitx} {2011/08/08} {2.3b}
   {A comprehensive (SI) units package}
 %    \end{macrocode}
 %
@@ -10854,15 +10868,6 @@ This work consists of the file  siunitx.dtx
 %    \end{macrocode}
 %\end{macro}
 %
-% The master control macro which occurs at the start of the document.
-%    \begin{macrocode}
-\AtBeginDocument {
-  \bool_if:NTF \l_siunitx_create_free_bool
-    { \siunitx_unit_create_functions: }
-    { \siunitx_unit_create_empty_functions: }
-}
-%    \end{macrocode}
-%
 %\begin{macro}{\siunitx_unit_create_empty_functions:}
 %\begin{macro}[aux]{\siunitx_unit_create_empty_functions_aux:N}
 % Without this, horrible things happen with \pkg{memoir} and
@@ -15934,6 +15939,15 @@ This work consists of the file  siunitx.dtx
   }
 %    \end{macrocode}
 %
+% The master control macro which occurs at the start of the document.
+%    \begin{macrocode}
+\AtBeginDocument {
+  \bool_if:NTF \l_siunitx_create_free_bool
+    { \siunitx_unit_create_functions: }
+    { \siunitx_unit_create_empty_functions: }
+}
+%    \end{macrocode}
+%
 % Finally apply the settings given at load time.
 %    \begin{macrocode}
 \ProcessKeysOptions { siunitx }
@@ -15950,7 +15964,7 @@ This work consists of the file  siunitx.dtx
 %    \end{macrocode}
 %
 %    \begin{macrocode}
-\ProvidesExplFile {siunitx-version-1.cfg} {2011/07/09} {2.3a} 
+\ProvidesExplFile {siunitx-version-1.cfg} {2011/08/08} {2.3b} 
   {siunitx: Version 1 settings}
 %    \end{macrocode}
 %
@@ -16895,7 +16909,7 @@ This work consists of the file  siunitx.dtx
 %    \end{macrocode}
 %
 %    \begin{macrocode}
-\ProvidesExplFile {siunitx-abbreviations.cfg} {2011/07/09} {2.3a}
+\ProvidesExplFile {siunitx-abbreviations.cfg} {2011/08/08} {2.3b}
   {siunitx: Abbreviated units}
 %    \end{macrocode}
 %
@@ -16976,10 +16990,11 @@ This work consists of the file  siunitx.dtx
 %    \end{macrocode}
 % \end{macro}
 % \begin{macro}
-%   {\W, \mW, \kW,\MW , \GW, \kJ, \J, \eV, \meV, \keV, \MeV, \GeV, \TeV, \kWh}
+%   {\W, \uW, \mW, \kW,\MW , \GW, \kJ, \J, \eV, \meV, \keV, \MeV, \GeV, \TeV, \kWh}
 %   Energies.
 %    \begin{macrocode}
 \DeclareSIUnit \W   {        \watt }
+\DeclareSIUnit \uW  { \micro \watt }
 \DeclareSIUnit \mW  { \milli \watt }
 \DeclareSIUnit \kW  { \kilo  \watt }
 \DeclareSIUnit \MW  { \mega  \watt }
@@ -17014,6 +17029,18 @@ This work consists of the file  siunitx.dtx
 \DeclareSIUnit \K { \kelvin }
 %    \end{macrocode}
 % \end{macro}
+% \begin{macro}{\dB}
+%    \begin{macrocode}
+\DeclareSIUnit \dB { \deci \bel }
+%    \end{macrocode}
+% \end{macro}
+% \begin{macro}{\F, \fF, \pF}
+%    \begin{macrocode}
+\DeclareSIUnit \F  {        \farad }
+\DeclareSIUnit \fF { \femto \farad }
+\DeclareSIUnit \pF { \pico  \farad }
+%    \end{macrocode}
+% \end{macro}
 % \begin{macro}{\N, \mN, \kN, \MN}
 %   Forces.
 %    \begin{macrocode}
@@ -17064,7 +17091,7 @@ This work consists of the file  siunitx.dtx
 %    \end{macrocode}
 %
 %    \begin{macrocode}
-\ProvidesExplFile {siunitx-binary.cfg} {2011/07/09} {2.3a}
+\ProvidesExplFile {siunitx-binary.cfg} {2011/08/08} {2.3b}
   {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 1db71c3a3a2..962821ee461 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} {2011/07/09} {2.3a}
+\ProvidesExplFile {siunitx-abbreviations.cfg} {2011/08/08} {2.3b}
   {siunitx: Abbreviated units}
 \DeclareSIUnit \A  {        \ampere }
 \DeclareSIUnit \pA { \pico  \ampere }
@@ -57,6 +57,7 @@
 \DeclareSIUnit \kg  { \kilo \gram }
 \DeclareSIUnit \amu { \atomicmassunit }
 \DeclareSIUnit \W   {        \watt }
+\DeclareSIUnit \uW  { \micro \watt }
 \DeclareSIUnit \mW  { \milli \watt }
 \DeclareSIUnit \kW  { \kilo  \watt }
 \DeclareSIUnit \MW  { \mega  \watt }
@@ -79,6 +80,10 @@
 \DeclareSIUnit \dm { \deci  \metre }
 \DeclareSIUnit \km { \kilo  \metre }
 \DeclareSIUnit \K { \kelvin }
+\DeclareSIUnit \dB { \deci \bel }
+\DeclareSIUnit \F  {        \farad }
+\DeclareSIUnit \fF { \femto \farad }
+\DeclareSIUnit \pF { \pico  \farad }
 \DeclareSIUnit \N  {        \newton }
 \DeclareSIUnit \mN { \milli \newton }
 \DeclareSIUnit \kN { \kilo  \newton }
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 0f4b95980c5..44b499c02db 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} {2011/07/09} {2.3a}
+\ProvidesExplFile {siunitx-binary.cfg} {2011/08/08} {2.3b}
   {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 d54d4cd1c7d..c4a4b16424f 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} {2011/07/09} {2.3a}
+\ProvidesExplFile {siunitx-version-1.cfg} {2011/08/08} {2.3b}
   {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 0b4147213bf..a4471134ec3 100644
--- a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
+++ b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
@@ -14,7 +14,7 @@
 %% ---------------------------------------------------------------
 %% 
 \RequirePackage{expl3}
-\ProvidesExplPackage {siunitx} {2011/07/09} {2.3a}
+\ProvidesExplPackage {siunitx} {2011/08/08} {2.3b}
   {A comprehensive (SI) units package}
 \cs_if_exist:NTF \msg_new:nnnn
   {
@@ -4102,11 +4102,6 @@
   unit-optional-argument ,
   use-xspace             ,
 }
-\AtBeginDocument {
-  \bool_if:NTF \l_siunitx_create_free_bool
-    { \siunitx_unit_create_functions: }
-    { \siunitx_unit_create_empty_functions: }
-}
 \cs_new_protected_nopar:Npn \siunitx_unit_create_empty_functions: {
   \tl_map_function:NN \l_siunitx_declare_list_tl
     \siunitx_unit_create_empty_functions_aux:N
@@ -7356,6 +7351,11 @@
     \@onefilewithoptions { siunitx } [ ] [ ]
       \c_siunitx_configuration_ext_tl
   }
+\AtBeginDocument {
+  \bool_if:NTF \l_siunitx_create_free_bool
+    { \siunitx_unit_create_functions: }
+    { \siunitx_unit_create_empty_functions: }
+}
 \ProcessKeysOptions { siunitx }
 %% Copyright (C) 2008-2011 by
 %%   Joseph Wright <joseph.wright@morningstar2.co.uk>