siunitx 2.0b (1jun10)

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

4 files changed, 124 insertions, 40 deletions

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 cfa9241cd4d..b1fdb37b386 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} {2010/05/28} {2.0a}
+\ProvidesExplFile {siunitx-abbreviations.cfg} {2010/06/01} {2.0b}
   {siunitx: Abbreviated units}
 \DeclareSIUnit \pA { \pico  \ampere }
 \DeclareSIUnit \nA { \nano  \ampere }
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 3db2a7eb0dd..81912d50d4a 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} {2010/05/28} {2.0a}
+\ProvidesExplFile {siunitx-binary.cfg} {2010/06/01} {2.0b}
   {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 790ecfc3f67..ddeb173e1cf 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,14 +13,23 @@
 %% See http://www.latex-project.org/lppl.txt
 %% ---------------------------------------------------------------
 %% 
-\ProvidesExplFile {siunitx-version-1.cfg} {2010/05/28} {2.0a}
+\ProvidesExplFile {siunitx-version-1.cfg} {2010/06/01} {2.0b}
   {siunitx: Version 1 settings}
-\keys_set:nn { siunitx } { load-configurations = abbreviations }
+\keys_set:nn { siunitx }
+  { load-configurations = { abbreviations , binary } }
 \keys_define:nn { siunitx } {
   addsign        .choice: ,
   addsign /
+    all          .meta:n    = { explicit-sign           = +           },
+  addsign /
+    exp          .meta:n    = { explicit-sign           = +           },
+  addsign /
     false        .meta:n    = { explicit-sign           =             },
   addsign /
+    mant         .meta:n    = { explicit-sign           = +           },
+  addsign /
+    none         .meta:n    = { explicit-sign           =             },
+  addsign /
     true         .meta:n    = { explicit-sign           = +           },
   addsign        .default:n = { true                                  },
   allowlitunits  .meta:n    = { free-standing-units     = #1          },
@@ -71,6 +80,7 @@
   closeerr       .meta:n    = { close-bracket           = #1          },
   closefrac      .meta:n    = { close-bracket           = #1          },
   closerange     .meta:n    = { close-bracket           = #1          },
+  colour         .code:n    = { color                   = #1          },
   colorall       .code:n    = ,
   colourall      .code:n    = ,
   colorneg       .code:n    = ,
@@ -161,6 +171,7 @@
     two          .meta:n    = { exponent-base           = 2           },
   expbase /
     unknown      .meta:n    = { exponent-base           = #1          },
+  expproduct     .choice: ,
   expproduct /
     cdot         .meta:n    =
       { exponent-product        = { } \cdot { }                       },
@@ -200,8 +211,10 @@
         per-mode                = symbol-or-fraction
       },
   inlinebold     .meta:n    = { detect-inline-weight    = #1          },
+  locale         .code:n    = ,
   log            .code:n    = ,
   load           .code:n    = ,
+  loctolang      .code:n    = ,
   mathOmega      .meta:n    = { math-ohm                = #1          },
   mathcelsius    .meta:n    = { math-celsius            = #1          },
   mathdegree     .meta:n    = { math-degree             = #1          },
@@ -245,6 +258,8 @@
   obeyall        .default:n = { true                                  },
   obeybold       .meta:n    = { detect-weight           = #1          },
   obeybold       .default:n = { true                                  },
+  obeyfamily     .meta:n    = { detect-family           = #1          },
+  obeyfamily     .default:n = { true                                  },
   obeyitalic     .meta:n    = { detect-italic           = #1          },
   obeyitalic     .default:n = { true                                  },
   obeymode       .meta:n    = { detect-mode             = #1          },
@@ -260,6 +275,7 @@
         add-arc-minute-zero = true,
         add-arc-second-zero = true
       },
+  padangle /
     both         .meta:n    =
       {
         add-arc-degree-zero = true,
@@ -343,7 +359,9 @@
         add-decimal-zero = true,
         add-integer-zero = true
       },
-  per           .choice: ,
+  per            .choice: ,
+  per /
+    frac         .meta:n    = { per-mode                = fraction    },
   per /
     fraction     .meta:n    = { per-mode                = fraction    },
   per /
@@ -362,19 +380,19 @@
   repeatunits /
     false        .meta:n    =
       {
-        multi-part-numbers    = single,
+        multi-part-units      = single,
         product-units         = single,
       },
   repeatunits /
     power        .meta:n    =
       {
-        multi-part-numbers    = repeat,
+        multi-part-units      = repeat,
         product-units         = power,
       },
   repeatunits /
     true        .meta:n       =
       {
-        multi-part-numbers    = repeat,
+        multi-part-units      = repeat,
         product-units         = repeat,
       },
   repeatunits    .default:n = { true                                  },
@@ -394,24 +412,57 @@
   slash /
     slash        .meta:n    = { per-symbol              = /           },
   slash /
-    unknown      .meta:n    = { per symbol              = #1          },
+    unknown      .meta:n    = { per-symbol              = #1          },
   stickyper      .meta:n    = { sticky-per              = #1          },
   stickyper      .default:n = { true                                  },
   strictarc      .code:n    = ,
-  tabalign       .meta:n    =
+  tabalign       .code:n    =
     {
-      table-number-alignment  = #1,
-      table-text-alignment    = #1,
-      table-unit-alignment    = #1
+      \tl_if_eq:nnTF {#1} { centre }
+        { \keys_set:nn { siunitx } { table-alignment = center } }
+        { \keys_set:nn { siunitx } { table-alignment = #1 } }
     },
   tabalignexp    .code:n    = ,
   tabautofit     .meta:n    = { table-auto-round        = #1          },
+  tabautofit     .default:n = { true                                  },
   tabformat      .meta:n    = { table-format            = #1          },
-  tabnumalign    .meta:n    = { table-number-alignment  = #1          },
+  tabnumalign    .code:n    =
+    {
+      \tl_if_eq:nnTF {#1} { centre }
+        { \keys_set:nn { siunitx } { table-number-alignment = center } }
+        {
+          \tl_if_eq:nnTF {#1} { centredecimal }
+            {
+              \keys_set:nn { siunitx }
+                { table-number-alignment = center-decimal-marker }
+            }
+            {
+              \tl_if_eq:nnTF {#1} { centerdecimal }
+                {
+                  \keys_set:nn { siunitx }
+                    { table-number-alignment = center-decimal-marker }
+                }
+                {
+                  \keys_set:nn { siunitx }
+                    { table-number-alignment = #1 }
+                }
+            }
+        }
+    },
   tabparseonly   .meta:n    = { table-parse-only        = #1          },
   tabparseonly   .default:n = { true                                  },
-  tabtextalign   .meta:n    = { table-text-numbers      = #1          },
-  tabunitalign   .meta:n    = { table-unit-alignment    = #1          },
+  tabtextalign   .code:n    =
+    {
+      \tl_if_eq:nnTF {#1} { centre }
+        { \keys_set:nn { siunitx } { table-text-alignment = center } }
+        { \keys_set:nn { siunitx } { table-text-alignment = #1 } }
+    },
+  tabunitalign   .code:n    =
+    {
+      \tl_if_eq:nnTF {#1} { centre }
+        { \keys_set:nn { siunitx } { table-unit-alignment = center } }
+        { \keys_set:nn { siunitx } { table-unit-alignment = #1 } }
+    },
   textOmega      .meta:n    = { text-ohm                = #1          },
   textcelsius    .meta:n    = { text-celsius            = #1          },
   textdegree     .meta:n    = { text-degree             = #1          },
@@ -530,39 +581,39 @@
   valuesep        .choice: ,
   valuesep /
     cdot         .meta:n    =
-      { unit-value-separator    = { } \cdot { }                       },
+      { number-unit-separator   = { } \cdot { }                       },
   valuesep /
-    comma        .meta:n    = { unit-value-separator    = { {,} }     },
+    comma        .meta:n    = { number-unit-separator   = { {,} }     },
   valuesep /
-    fullstop     .meta:n    = { unit-value-separator    = { { . } }   },
+    fullstop     .meta:n    = { number-unit-separator   = { { . } }   },
   valuesep /
-    med          .meta:n    = { unit-value-separator    = \:          },
+    med          .meta:n    = { number-unit-separator   = \:          },
   valuesep /
-    medium       .meta:n    = { unit-value-separator    = \:          },
+    medium       .meta:n    = { number-unit-separator   = \:          },
   valuesep /
-    none         .meta:n    = { unit-value-separator    =             },
+    none         .meta:n    = { number-unit-separator   =             },
   valuesep /
-    period       .meta:n    = { unit-value-separator    = { { . } }   },
+    period       .meta:n    = { number-unit-separator   = { { . } }   },
   valuesep /
-    space        .meta:n    = { unit-value-separator    = \text { ~ } },
+    space        .meta:n    = { number-unit-separator   = \text { ~ } },
   valuesep /
-    stop         .meta:n    = { unit-value-separator    = { { . } }   },
+    stop         .meta:n    = { number-unit-separator   = { { . } }   },
   valuesep /
-    thick        .meta:n    = { unit-value-separator    = \;          },
+    thick        .meta:n    = { number-unit-separator   = \;          },
   valuesep /
-    thin         .meta:n    = { unit-value-separator    = \,          },
+    thin         .meta:n    = { number-unit-separator   = \,          },
   valuesep /
     tightcdot    .meta:n    =
-      { unit-value-separator    = \bgroup \cdot \egroup               },
+      { number-unit-separator    = \bgroup \cdot \egroup              },
   valuesep /
     tighttimes   .meta:n    =
-      { unit-value-separator    = \bgroup \times \egroup              },
+      { number-unit-separator    = \bgroup \times \egroup             },
   valuesep /
-    times        .meta:n    = { unit-value-separator     = \times     },
+    times        .meta:n    = { number-unit-separator    = \times     },
   valuesep /
-    unknown      .meta:n    = { unit-value-separator     = #1         },
+    unknown      .meta:n    = { number-unit-separator    = #1         },
   xspace         .meta:n    = { use-xspace               = #1         },
-  xpace          .default:n = { true                                  }
+  xpace          .default:n = { true                                  },
 }
 \keys_define:nn { siunitx } {
   unknown .code:n =
@@ -612,9 +663,11 @@
     { \DeclareSIPrefix     #2 {#3} {#4} }
     { \DeclareBinaryPrefix #2 {#3} {#4} }
 }
-\cs_set_eq:NN \newqualifier     \DeclareSIQualifier
-\cs_set_eq:NN \renewqualifier   \DeclareSIQualifier
-\cs_set_eq:NN \providequalifier \DeclareSIQualifier
+\NewDocumentCommand \newqualifier { m m } {
+  \_siunitx_declare_qualifier:Nn #1 {#2}
+}
+\cs_set_eq:NN \renewqualifier   \newqualifier
+\cs_set_eq:NN \providequalifier \newqualifier
 \DeclareSIPrePower \Square  { 2 }
 \DeclareSIPrePower \ssquare { 2 }
 \DeclareSIUnit \BAR   { \bar }
@@ -646,6 +699,13 @@
 \DeclareSIUnit \cmc    { \centi \metre \cubed }
 \DeclareSIUnit \dmc    { \deci  \metre \cubed }
 \DeclareSIUnit \cms    { \centi \metre \squared }
+\DeclareSIUnit \centimetrecubed   { \centi \metre \cubed }
+\DeclareSIUnit \centimetresquared { \centi \metre \squared }
+\DeclareSIUnit \cubiccentimetre   { \centi \metre \cubed }
+\DeclareSIUnit \cubicdecimetre    { \deci \metre \cubed }
+\DeclareSIUnit \squarecentimetre  { \centi \metre \squared }
+\DeclareSIUnit \squaremetre       { \metre \squared }
+\DeclareSIUnit \squarekilometre   { \kilo \metre \squared }
 \DeclareSIUnit \parsec    { pc }
 \DeclareSIUnit \lightyear { ly }
 \DeclareSIUnit \gmol  { g  \text { - } mol }
diff --git a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
index 97211e1db54..f655f1b034b 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} {2010/05/28} {2.0a}
+\ProvidesExplPackage {siunitx} {2010/06/01} {2.0b}
   {A comprehensive (SI) units package}
 \msg_set:nnnn { siunitx } { incompatible-package }
   { Package~'#1'~incompatible. }
@@ -94,6 +94,7 @@
 \_siunitx_tmp:w { closeerr }
 \_siunitx_tmp:w { closrfrac }
 \_siunitx_tmp:w { closerange }
+\_siunitx_tmp:w { colour }
 \_siunitx_tmp:w { colorall }
 \_siunitx_tmp:w { colourall }
 \_siunitx_tmp:w { colorneg }
@@ -117,6 +118,8 @@
 \_siunitx_tmp:w { fixsf }
 \_siunitx_tmp:w { fraction }
 \_siunitx_tmp:w { inlinebold }
+\_siunitx_tmp:w { locale }
+\_siunitx_tmp:w { loctolang }
 \_siunitx_tmp:w { log }
 \_siunitx_tmp:w { load }
 \_siunitx_tmp:w { mathOmega }
@@ -154,6 +157,7 @@
 \_siunitx_tmp:w { numsign }
 \_siunitx_tmp:w { obeyall }
 \_siunitx_tmp:w { obeybold }
+\_siunitx_tmp:w { obeyfamily }
 \_siunitx_tmp:w { obeymode }
 \_siunitx_tmp:w { obeyitalic }
 \_siunitx_tmp:w { openerr }
@@ -246,6 +250,22 @@
         }
     }
 }
+\AtBeginDocument {
+  \keys_define:nn { siunitx } {
+    unknown .code:n =
+      {
+        \seq_if_in:NVTF \_c_siunitx_old_options_seq \l_keys_key_tl
+          {
+            \msg_error:nnx { siunitx } { version-1-option }
+              { \exp_not:V \l_keys_key_tl }
+          }
+          {
+            \msg_error:nnx { siunitx } { unknown-option }
+              { \exp_not:V \l_keys_key_tl }
+          }
+      }
+}
+}
 \clist_new:N \_l_siunitx_option_deactivate_clist
 \cs_set_protected_nopar:Npn \_siunitx_option_deactivate:n #1 {
   \clist_put_right:Nn \_l_siunitx_option_deactivate_clist {#1}
@@ -2831,7 +2851,7 @@
     }
     {
       \IfNoValueTF {#3}
-        { \_siunitx_error:nn { invalid-arc-format } { #1 ; #2 } }
+        { \_siunitx_error:nx { invalid-arc-format } { #1 ; #2 } }
         { \_siunitx_angle_output_aux:nnn {#1} {#2} {#3} }
     }
 }
@@ -5573,10 +5593,14 @@
     The~option~file~'#1'~is~not~known~by~siunitx: \\
     perhaps~it~is~spelled~incorrectly.
   }
-\msg_set:nnn { siunitx } { version-1-option }
+\msg_set:nnnn { siunitx } { version-1-option }
+  { Version~1~option~'#1'~detected. }
   {
-    Version~1~option~'#1'~detected: \\
-    loading~compatibility~code.
+    Use: \\
+    \c_space_tl \c_space_tl
+    \token_to_str:N \usepackage[load-configurations = version-1]
+    \token_to_str:N { siunitx \token_to_str:N } \\
+    in~the~preamble~to~load~the~appropriate~code.
   }
 \cs_set_protected_nopar:Npn \DeclareBinaryPrefix #1#2#3 {
   \_siunitx_declare_prefix:Nnnn #1 {#2} { 2 } {#3}