From 4ed56a2178d1e7438de5fe9a4f9cd9adc59dea8c Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 8 Jan 2016 00:05:49 +0000 Subject: siunitx (6jan16) git-svn-id: svn://tug.org/texlive/trunk@39311 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/siunitx/siunitx.pdf | Bin 613201 -> 613194 bytes Master/texmf-dist/source/latex/siunitx/siunitx.dtx | 17 ++++++++++++----- .../tex/latex/siunitx/siunitx-abbreviations.cfg | 4 ++-- .../tex/latex/siunitx/siunitx-binary.cfg | 4 ++-- .../tex/latex/siunitx/siunitx-version-1.cfg | 4 ++-- Master/texmf-dist/tex/latex/siunitx/siunitx.sty | 9 +++++++-- 6 files changed, 25 insertions(+), 13 deletions(-) diff --git a/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf b/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf index 1df45294e6d..916832aea3f 100644 Binary files a/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf and b/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf differ diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx index 3635915164c..a2edbe1911b 100644 --- a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx +++ b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx @@ -81,7 +81,7 @@ See http://www.latex-project.org/lppl.txt \endpreamble \postamble -Copyright (C) 2008-2015 by +Copyright (C) 2008-2016 by Joseph Wright It may be distributed and/or modified under the conditions of @@ -643,6 +643,8 @@ This work consists of the file siunitx.dtx % \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}{Fix angstrom symbol with \LuaTeX{}} +% \changes{v2.6o}{2016/01/05}{Allow for unit powers when converting exponents +% to prefixes} % %\begin{abstract} % Physical quantities have both numbers and units, and each physical @@ -5166,7 +5168,7 @@ This work consists of the file siunitx.dtx % % The usual preliminaries. % \begin{macrocode} -\ProvidesExplPackage {siunitx} {2015/12/31} {2.6n} +\ProvidesExplPackage {siunitx} {2016/01/05} {2.6o} {A comprehensive (SI) units package} % \end{macrocode} % @@ -9389,6 +9391,11 @@ This work consists of the file siunitx.dtx \tl_set:Nx \l_@@_tmpa_tl { \int_eval:n { \l_@@_tmpa_tl + \l_@@_tmpb_tl } } } + \prop_get:NnNT \l_@@_unit_prop { power-1 } \l_@@_tmpb_tl + { + \tl_set:Nx \l_@@_tmpa_tl + { \int_eval:n { \l_@@_tmpa_tl / \l_@@_tmpb_tl } } + } \prop_get:NVNTF \l_@@_prefix_reverse_prop \l_@@_tmpa_tl \l_@@_tmpb_tl { @@ -16717,7 +16724,7 @@ This work consists of the file siunitx.dtx % \end{macrocode} % % \begin{macrocode} -\ProvidesExplFile {siunitx-version-1.cfg} {2015/12/31} {2.6n} +\ProvidesExplFile {siunitx-version-1.cfg} {2016/01/05} {2.6o} {siunitx: Version 1 settings} % \end{macrocode} % @@ -17659,7 +17666,7 @@ This work consists of the file siunitx.dtx % \end{macrocode} % % \begin{macrocode} -\ProvidesExplFile {siunitx-abbreviations.cfg} {2015/12/31} {2.6n} +\ProvidesExplFile {siunitx-abbreviations.cfg} {2016/01/05} {2.6o} {siunitx: Abbreviated units} % \end{macrocode} % @@ -17841,7 +17848,7 @@ This work consists of the file siunitx.dtx % \end{macrocode} % % \begin{macrocode} -\ProvidesExplFile {siunitx-binary.cfg} {2015/12/31} {2.6n} +\ProvidesExplFile {siunitx-binary.cfg} {2016/01/05} {2.6o} {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 e9590277b27..0ee1d50625d 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} {2015/12/31} {2.6n} +\ProvidesExplFile {siunitx-abbreviations.cfg} {2016/01/05} {2.6o} {siunitx: Abbreviated units} \DeclareSIUnit \A { \ampere } \DeclareSIUnit \pA { \pico \ampere } @@ -102,7 +102,7 @@ \DeclareSIUnit \ns { \nano \second } \DeclareSIUnit \us { \micro \second } \DeclareSIUnit \ms { \milli \second } -%% Copyright (C) 2008-2015 by +%% Copyright (C) 2008-2016 by %% Joseph Wright %% %% It may be distributed and/or modified under the conditions of diff --git a/Master/texmf-dist/tex/latex/siunitx/siunitx-binary.cfg b/Master/texmf-dist/tex/latex/siunitx/siunitx-binary.cfg index 1642c25aa0d..6331a4d6409 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} {2015/12/31} {2.6n} +\ProvidesExplFile {siunitx-binary.cfg} {2016/01/05} {2.6o} {siunitx: Binary units} \DeclareBinaryPrefix \kibi { Ki } { 10 } \DeclareBinaryPrefix \mebi { Mi } { 20 } @@ -25,7 +25,7 @@ \DeclareBinaryPrefix \yobi { Yi } { 80 } \DeclareSIUnit \bit { bit } \DeclareSIUnit \byte { B } -%% Copyright (C) 2008-2015 by +%% Copyright (C) 2008-2016 by %% Joseph Wright %% %% It may be distributed and/or modified under the conditions of 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 285607820c6..cb63a1f428d 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} {2015/12/31} {2.6n} +\ProvidesExplFile {siunitx-version-1.cfg} {2016/01/05} {2.6o} {siunitx: Version 1 settings} \keys_define:nn { siunitx } { addsign .choice: , @@ -727,7 +727,7 @@ \DeclareSIUnit \yb { \yocto \barn } \NewDocumentCommand \requiresiconfigs { m } { \keys_set:nn { siunitx } { version-1-compatibility } } -%% Copyright (C) 2008-2015 by +%% Copyright (C) 2008-2016 by %% Joseph Wright %% %% It may be distributed and/or modified under the conditions of diff --git a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty index 5c2d2ad8866..430ca07fbf3 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} {2015/12/31} {2.6n} +\ProvidesExplPackage {siunitx} {2016/01/05} {2.6o} {A comprehensive (SI) units package} \@ifpackagelater { expl3 } { 2015/09/11 } { } @@ -2917,6 +2917,11 @@ \tl_set:Nx \l__siunitx_tmpa_tl { \int_eval:n { \l__siunitx_tmpa_tl + \l__siunitx_tmpb_tl } } } + \prop_get:NnNT \l__siunitx_unit_prop { power-1 } \l__siunitx_tmpb_tl + { + \tl_set:Nx \l__siunitx_tmpa_tl + { \int_eval:n { \l__siunitx_tmpa_tl / \l__siunitx_tmpb_tl } } + } \prop_get:NVNTF \l__siunitx_prefix_reverse_prop \l__siunitx_tmpa_tl \l__siunitx_tmpb_tl { @@ -7672,7 +7677,7 @@ { \__siunitx_unit_create_functions: } { \__siunitx_unit_create_empty_functions: } } -%% Copyright (C) 2008-2015 by +%% Copyright (C) 2008-2016 by %% Joseph Wright %% %% It may be distributed and/or modified under the conditions of -- cgit v1.2.3