siunitx (19jan16)

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

6 files changed, 29 insertions, 17 deletions

diff --git a/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf b/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf
index 916832aea3f..76e1604ab29 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 a2edbe1911b..d814079e86e 100644
--- a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
+++ b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
@@ -641,10 +641,13 @@ This work consists of the file  siunitx.dtx
 % \changes{v2.6k}{2015/09/12}{Track \pkg{expl3} changes}
 % \changes{v2.6l}{2015/09/14}{Fix an internal error}
 % \changes{v2.6m}{2015/10/15}{Address an issue with \pkg{mwtab}}
-% \changes{v2.6n}{2015/12/31}{Improve defintion for degree Celsius}
+% \changes{v2.6n}{2015/12/31}{Improve definition for degree Celsius}
 % \changes{v2.6n}{2015/12/31}{Fix angstrom symbol with \LuaTeX{}}
 % \changes{v2.6o}{2016/01/05}{Allow for unit powers when converting exponents
 %   to prefixes}
+% \changes{v2.6p}{2016/01/13}{Allow for reciprocal powers when converting
+%   exponents to prefixes}
+% \changes{v2.6p}{2016/01/19}{Improve definition for degree Celsius}
 %
 %\begin{abstract}
 % Physical quantities have both numbers and units, and each physical
@@ -3940,8 +3943,7 @@ This work consists of the file  siunitx.dtx
 %      math-angstrom    & Literal & \verb=\text{\AA}=                 \\
 %      math-arcminute   & Literal & \verb={}^{\prime}=                \\
 %      math-arcsecond   & Literal & \verb={}^{\prime\prime}=          \\
-%      math-celsius     & Literal &
-%        \verb={}^{\circ}\kern-\scriptspace C= \\
+%      math-celsius     & Literal & \meta{see text}                   \\
 %      math-degree      & Literal & \verb={}^{\circ}=                 \\
 %      math-micro       & Literal & \meta{see text}                   \\
 %      math-ohm         & Literal & \cs{Omega}                        \\
@@ -3950,8 +3952,8 @@ This work consists of the file  siunitx.dtx
 %      text-arcminute   & Literal & \verb=\ensuremath{{}^{\prime}}=   \\
 %      text-arcsecond   & Literal &
 %        \verb=\ensuremath{{}^{\prime\prime}}= \\
-%      text-celsius     & Literal &  \verb=\ensuremath{{}^{\circ}=    \\
-%        & & \verb=\kern -\scriptspace C}= \\
+%      text-celsius     & Literal &  \verb=\ensuremath{{}^{\circ}}=    \\
+%        & & \verb=\kern -\scriptspace C= \\
 %      text-degree      & Literal & \verb=\ensuremath{{}^{\circ}}=    \\
 %      text-micro       & Literal & \meta{see text}                   \\
 %      text-ohm         & Literal & \verb=\ensuremath{\Omega}=        \\
@@ -5168,7 +5170,7 @@ This work consists of the file  siunitx.dtx
 %
 % The usual preliminaries.
 %    \begin{macrocode}
-\ProvidesExplPackage {siunitx} {2016/01/05} {2.6o}
+\ProvidesExplPackage {siunitx} {2016/01/19} {2.6p}
   {A comprehensive (SI) units package}
 %    \end{macrocode}
 %
@@ -9382,6 +9384,11 @@ This work consists of the file  siunitx.dtx
         \prop_get:NnNT \l_@@_number_in_prop { exponent-sign }
           \l_@@_tmpb_tl
           { \tl_put_left:NV \l_@@_tmpa_tl \l_@@_tmpb_tl }
+        \prop_if_in:NnT \l_@@_unit_prop { per-1 }
+          {
+            \tl_set:Nx \l_@@_tmpa_tl
+              { \int_eval:n { - \l_@@_tmpa_tl } }
+          }
         \prop_get:NnNT \l_@@_unit_prop { prefix-1 } \l_@@_tmpb_tl
           {
             \prop_remove:Nn \l_@@_unit_prop { prefix-1 }
@@ -15380,7 +15387,7 @@ This work consists of the file  siunitx.dtx
   math-angstrom  = \text { \AA },
   math-arcminute = { } ^ { \prime },
   math-arcsecond = { } ^ { \prime \prime },
-  math-celsius   = { } ^ { \circ } \kern - \scriptspace C,
+  math-celsius   = { } ^ { \circ } \kern - \scriptspace \@@_unit_mathrm:n { C } ,
   math-degree    = { } ^ { \circ },
   math-micro     = \text { \c_@@_mu_tl },
   math-ohm       = \text { \ensuremath { \c_@@_omega_tl } },
@@ -15416,7 +15423,7 @@ This work consists of the file  siunitx.dtx
   text-arcminute = \ensuremath { { } ^ { \prime } },
   text-arcsecond = \ensuremath { { } ^ { \prime \prime } },
   text-celsius   =
-    \ensuremath { { } ^ { \circ } \kern - \scriptspace C },
+    \ensuremath { { } ^ { \circ } } \kern -\scriptspace C ,
   text-degree    = \ensuremath { { } ^ { \circ } },
   text-micro     = \c_@@_mu_tl ,
   text-ohm       = \ensuremath { \c_@@_omega_tl },
@@ -16724,7 +16731,7 @@ This work consists of the file  siunitx.dtx
 %    \end{macrocode}
 %
 %    \begin{macrocode}
-\ProvidesExplFile {siunitx-version-1.cfg} {2016/01/05} {2.6o}
+\ProvidesExplFile {siunitx-version-1.cfg} {2016/01/19} {2.6p}
   {siunitx: Version 1 settings}
 %    \end{macrocode}
 %
@@ -17666,7 +17673,7 @@ This work consists of the file  siunitx.dtx
 %    \end{macrocode}
 %
 %    \begin{macrocode}
-\ProvidesExplFile {siunitx-abbreviations.cfg} {2016/01/05} {2.6o}
+\ProvidesExplFile {siunitx-abbreviations.cfg} {2016/01/19} {2.6p}
   {siunitx: Abbreviated units}
 %    \end{macrocode}
 %
@@ -17848,7 +17855,7 @@ This work consists of the file  siunitx.dtx
 %    \end{macrocode}
 %
 %    \begin{macrocode}
-\ProvidesExplFile {siunitx-binary.cfg} {2016/01/05} {2.6o}
+\ProvidesExplFile {siunitx-binary.cfg} {2016/01/19} {2.6p}
   {siunitx: Binary units}
 %    \end{macrocode}
 %
diff --git a/Master/texmf-dist/tex/latex/siunitx/siunitx-abbreviations.cfg b/Master/texmf-dist/tex/latex/siunitx/siunitx-abbreviations.cfg
index 0ee1d50625d..c666ca433b6 100644
--- a/Master/texmf-dist/tex/latex/siunitx/siunitx-abbreviations.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/siunitx-abbreviations.cfg
@@ -13,7 +13,7 @@
 %% See http://www.latex-project.org/lppl.txt
 %% ---------------------------------------------------------------
 %% 
-\ProvidesExplFile {siunitx-abbreviations.cfg} {2016/01/05} {2.6o}
+\ProvidesExplFile {siunitx-abbreviations.cfg} {2016/01/19} {2.6p}
   {siunitx: Abbreviated units}
 \DeclareSIUnit \A  {        \ampere }
 \DeclareSIUnit \pA { \pico  \ampere }
diff --git a/Master/texmf-dist/tex/latex/siunitx/siunitx-binary.cfg b/Master/texmf-dist/tex/latex/siunitx/siunitx-binary.cfg
index 6331a4d6409..ea3a5e7dcc8 100644
--- a/Master/texmf-dist/tex/latex/siunitx/siunitx-binary.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/siunitx-binary.cfg
@@ -13,7 +13,7 @@
 %% See http://www.latex-project.org/lppl.txt
 %% ---------------------------------------------------------------
 %% 
-\ProvidesExplFile {siunitx-binary.cfg} {2016/01/05} {2.6o}
+\ProvidesExplFile {siunitx-binary.cfg} {2016/01/19} {2.6p}
   {siunitx: Binary units}
 \DeclareBinaryPrefix \kibi { Ki } { 10 }
 \DeclareBinaryPrefix \mebi { Mi } { 20 }
diff --git a/Master/texmf-dist/tex/latex/siunitx/siunitx-version-1.cfg b/Master/texmf-dist/tex/latex/siunitx/siunitx-version-1.cfg
index cb63a1f428d..d96a2028795 100644
--- a/Master/texmf-dist/tex/latex/siunitx/siunitx-version-1.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/siunitx-version-1.cfg
@@ -13,7 +13,7 @@
 %% See http://www.latex-project.org/lppl.txt
 %% ---------------------------------------------------------------
 %% 
-\ProvidesExplFile {siunitx-version-1.cfg} {2016/01/05} {2.6o}
+\ProvidesExplFile {siunitx-version-1.cfg} {2016/01/19} {2.6p}
   {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 430ca07fbf3..6569fb731a7 100644
--- a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
+++ b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
@@ -15,7 +15,7 @@
 %% 
 \RequirePackage{expl3}[2015/09/11]
 \RequirePackage{xparse}
-\ProvidesExplPackage {siunitx} {2016/01/05} {2.6o}
+\ProvidesExplPackage {siunitx} {2016/01/19} {2.6p}
   {A comprehensive (SI) units package}
 \@ifpackagelater { expl3 } { 2015/09/11 }
   { }
@@ -2908,6 +2908,11 @@
         \prop_get:NnNT \l__siunitx_number_in_prop { exponent-sign }
           \l__siunitx_tmpb_tl
           { \tl_put_left:NV \l__siunitx_tmpa_tl \l__siunitx_tmpb_tl }
+        \prop_if_in:NnT \l__siunitx_unit_prop { per-1 }
+          {
+            \tl_set:Nx \l__siunitx_tmpa_tl
+              { \int_eval:n { - \l__siunitx_tmpa_tl } }
+          }
         \prop_get:NnNT \l__siunitx_unit_prop { prefix-1 } \l__siunitx_tmpb_tl
           {
             \prop_remove:Nn \l__siunitx_unit_prop { prefix-1 }
@@ -6885,7 +6890,7 @@
   math-angstrom  = \text { \AA },
   math-arcminute = { } ^ { \prime },
   math-arcsecond = { } ^ { \prime \prime },
-  math-celsius   = { } ^ { \circ } \kern - \scriptspace C,
+  math-celsius   = { } ^ { \circ } \kern - \scriptspace \__siunitx_unit_mathrm:n { C } ,
   math-degree    = { } ^ { \circ },
   math-micro     = \text { \c__siunitx_mu_tl },
   math-ohm       = \text { \ensuremath { \c__siunitx_omega_tl } },
@@ -6904,7 +6909,7 @@
   text-arcminute = \ensuremath { { } ^ { \prime } },
   text-arcsecond = \ensuremath { { } ^ { \prime \prime } },
   text-celsius   =
-    \ensuremath { { } ^ { \circ } \kern - \scriptspace C },
+    \ensuremath { { } ^ { \circ } } \kern -\scriptspace C ,
   text-degree    = \ensuremath { { } ^ { \circ } },
   text-micro     = \c__siunitx_mu_tl ,
   text-ohm       = \ensuremath { \c__siunitx_omega_tl },