diff options
Diffstat (limited to 'Master/texmf-dist')
| -rw-r--r-- | Master/texmf-dist/doc/latex/siunitx/README.txt | 55 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/siunitx/siunitx.pdf | bin | 613031 -> 613107 bytes | |||
| -rw-r--r-- | Master/texmf-dist/source/latex/siunitx/siunitx.dtx | 27 | ||||
| -rw-r--r-- | Master/texmf-dist/source/latex/siunitx/siunitx.ins | 73 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/siunitx/siunitx-abbreviations.cfg | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/siunitx/siunitx-binary.cfg | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/siunitx/siunitx-version-1.cfg | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/siunitx/siunitx.sty | 13 |
8 files changed, 33 insertions, 141 deletions
diff --git a/Master/texmf-dist/doc/latex/siunitx/README.txt b/Master/texmf-dist/doc/latex/siunitx/README.txt deleted file mode 100644 index cf80911234b..00000000000 --- a/Master/texmf-dist/doc/latex/siunitx/README.txt +++ /dev/null @@ -1,55 +0,0 @@ -siunitx - A comprehensive (SI) units package -============================================== - -Physical quantities have both numbers and units, and each -physical quantity should be expressed as the product of a number -and a unit. Typesetting physical quantities requires care to -ensure that the combined mathematical meaning of the number-unit -combination is clear. In particular, the SI units system lays -down a consistent set of units with rules on how these are to be -used. However, different countries and publishers have differing -conventions on the exact appearance of numbers (and units). The -`siunitx` package provides a set of tools for authors to typeset -quantities in a consistent way. The package has an extended set -of configuration options which make it possible to follow -varying typographic conventions with the same input syntax. The -package includes automated processing of numbers and units, and -the ability to control tabular alignment of numbers. - -Installation ------------- - -The package is supplied in `dtx` format and as a pre-extracted -zip file, `siunitx.tds.zip`. The later is most convenient for -most users: simply unzip this in your local texmf directory . If -you want to unpack the `.dtx` yourself, running `tex -siunitx.dtx` will extract the package whereas `latex -siunitx.dtx` will extract it and also typeset the documentation. - -The package requires LaTeX3 support as provided in the -`l3kernel` and `l3packages` bundles. Both of these are available -on [CTAN](http://www.ctan.org/) as ready-to-install zip files. -Suitable versions are available in MiKTeX 2.9 and TeX Live 2015 -(updating the relevant packages online may be necessary). -LaTeX3, and so `siunitx`, requires the e-TeX extensions: these -are available on all modern TeX systems. - -Typesetting the documentation requires a number of packages in -addition to those needed to use the package. This is mainly -because of the number of demonstration items included in the -text. To compile the documentation without error, you will -need the packages: - - `amsmath` - - `booktabs` - - `cancel` - - `caption` - - `cleveref` - - `colortbl` - - `csquotes` - - `datatool` - - `helvet` - - `mathpazo` - - `multirow` - - `listings` - - `pgfplots` - - `xcolor` diff --git a/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf b/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf Binary files differindex 8b3384be734..464cdb8b8a7 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 4f27817aa86..877c88caf10 100644 --- a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx +++ b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx @@ -634,6 +634,10 @@ This work consists of the file siunitx.dtx % digits} % \changes{v2.6i}{2015/08/18}{Fix behaviour of \cs{cancel} when printing % in math mode} +% \changes{v2.6j}{2015/09/01}{Print all units when \opt{exponent-to-prefix} +% is set} +% \changes{v2.6j}{2015/09/01}{Print $\pm$ correctly when +% \opt{exponent-to-prefix} is set} % %\begin{abstract} % Physical quantities have both numbers and units, and each physical @@ -5157,7 +5161,7 @@ This work consists of the file siunitx.dtx % % The usual preliminaries. % \begin{macrocode} -\ProvidesExplPackage {siunitx} {2015/08/18} {2.6i} +\ProvidesExplPackage {siunitx} {2015/09/01} {2.6j} {A comprehensive (SI) units package} % \end{macrocode} % @@ -9358,7 +9362,9 @@ This work consists of the file siunitx.dtx % \begin{macro}{\@@_number_exp_to_prefix:} % This function is a bit awkward, as it essentially cuts across the % unit processor. The idea here is first to recover the numerical exponent, -% and sign if there is one. +% and sign if there is one. The earlier formatting run will have reset the +% total number of units to zero, so that has to be recovered before +% doing the format a second time. % \begin{macrocode} \cs_new_protected:Npn \@@_number_exp_to_prefix: { @@ -9387,7 +9393,11 @@ This work consists of the file siunitx.dtx @@_ \exp_after:wN \token_to_str:N \l_@@_tmpb_tl _function:w } + \prop_get:NnN \l_@@_unit_prop { total-units } \l_@@_tmpa_tl + \int_set:Nn \l_@@_unit_int \l_@@_tmpa_tl + \cs_set_eq:NN \@@_pm: \pm \@@_unit_format: + \cs_set_eq:NN \pm \@@_pm: } { \msg_error:nnx { siunitx } { non-convertible-exponent } @@ -12064,6 +12074,8 @@ This work consists of the file siunitx.dtx % has to be removed. % \begin{macrocode} \cs_new_protected:Npn \@@_unit_format: { + \prop_put:Nnx \l_@@_unit_prop { total-units } + { \int_use:N \l_@@_unit_int } \@@_unit_format_init: \int_while_do:nNnn { \l_@@_unit_int } > { 0 } { @@ -12678,6 +12690,7 @@ This work consists of the file siunitx.dtx \prop_remove:Nn \l_@@_unit_prop { prefix-1 } \prop_remove:Nn \l_@@_unit_prop { prefix-symbol-1 } \prop_remove:Nn \l_@@_unit_prop { prefix-base-1 } + \prop_remove:Nn \l_@@_unit_prop { total-units } \prop_if_empty:NF \l_@@_unit_prop { \msg_error:nn { siunitx } { prefix-only } } } @@ -15656,8 +15669,8 @@ This work consists of the file siunitx.dtx \msg_new:nnnn { siunitx } { invalid-number } { Invalid~numerical~input~'#1'. } { - The~input given~as~a~number~does~not~make~logical~sense.~ - This~happens,~for example,~if~a~number~only~contains~a~sign. + The~input~given~as~a~number~does~not~make~logical~sense.~ + This~happens,~for~example,~if~a~number~only~contains~a~sign. } \msg_new:nnnn { siunitx } { invalid-token-in-exponent } { Invalid~exponent~in~numerical~input~'#1'. } @@ -16691,7 +16704,7 @@ This work consists of the file siunitx.dtx % \end{macrocode} % % \begin{macrocode} -\ProvidesExplFile {siunitx-version-1.cfg} {2015/08/18} {2.6i} +\ProvidesExplFile {siunitx-version-1.cfg} {2015/09/01} {2.6j} {siunitx: Version 1 settings} % \end{macrocode} % @@ -17633,7 +17646,7 @@ This work consists of the file siunitx.dtx % \end{macrocode} % % \begin{macrocode} -\ProvidesExplFile {siunitx-abbreviations.cfg} {2015/08/18} {2.6i} +\ProvidesExplFile {siunitx-abbreviations.cfg} {2015/09/01} {2.6j} {siunitx: Abbreviated units} % \end{macrocode} % @@ -17815,7 +17828,7 @@ This work consists of the file siunitx.dtx % \end{macrocode} % % \begin{macrocode} -\ProvidesExplFile {siunitx-binary.cfg} {2015/08/18} {2.6i} +\ProvidesExplFile {siunitx-binary.cfg} {2015/09/01} {2.6j} {siunitx: Binary units} % \end{macrocode} % diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx.ins b/Master/texmf-dist/source/latex/siunitx/siunitx.ins deleted file mode 100644 index 5e14df6d890..00000000000 --- a/Master/texmf-dist/source/latex/siunitx/siunitx.ins +++ /dev/null @@ -1,73 +0,0 @@ -%% -%% This is file `siunitx.ins', -%% generated with the docstrip utility. -%% -%% The original source files were: -%% -%% siunitx.dtx (with options: `install') -%% --------------------------------------------------------------- -%% The siunitx package --- A comprehensive (SI) units package -%% Maintained by Joseph Wright -%% E-mail: joseph.wright@morningstar2.co.uk -%% Released under the LaTeX Project Public License v1.3c or later -%% See http://www.latex-project.org/lppl.txt -%% --------------------------------------------------------------- -%% -\input l3docstrip.tex -\keepsilent -\askforoverwritefalse -\preamble ---------------------------------------------------------------- -The siunitx package --- A comprehensive (SI) units package -Maintained by Joseph Wright -E-mail: joseph.wright@morningstar2.co.uk -Released under the LaTeX Project Public License v1.3c or later -See http://www.latex-project.org/lppl.txt ---------------------------------------------------------------- - -\endpreamble -\postamble -Copyright (C) 2008-2014 by - Joseph Wright <joseph.wright@morningstar2.co.uk> - -It may be distributed and/or modified under the conditions of -the LaTeX Project Public License (LPPL), either version 1.3c of -this license or (at your option) any later version. The latest -version of this license is in the file: - http://www.latex-project.org/lppl.txt - -This work is "maintained" (as per LPPL maintenance status) by - Joseph Wright. - -This work consists of the file siunitx.dtx - and the derived files siunitx.pdf, - siunitx.sty and - siunitx.ins. -\endpostamble -\usedir{tex/latex/siunitx} -\generate{ - \file{\jobname.sty}{\from{\jobname.dtx}{package}} - \file{siunitx-abbreviations.cfg} - {\from{\jobname.dtx}{config,abbreviations}} - \file{siunitx-binary.cfg}{\from{\jobname.dtx}{config,binary}} - \file{siunitx-version-1.cfg}{\from{\jobname.dtx}{config,version-1}} -} -\endbatchfile -%% Copyright (C) 2008-2014 by -%% Joseph Wright <joseph.wright@morningstar2.co.uk> -%% -%% It may be distributed and/or modified under the conditions of -%% the LaTeX Project Public License (LPPL), either version 1.3c of -%% this license or (at your option) any later version. The latest -%% version of this license is in the file: -%% http://www.latex-project.org/lppl.txt -%% -%% This work is "maintained" (as per LPPL maintenance status) by -%% Joseph Wright. -%% -%% This work consists of the file siunitx.dtx -%% and the derived files siunitx.pdf, -%% siunitx.sty and -%% siunitx.ins. -%% -%% End of file `siunitx.ins'. diff --git a/Master/texmf-dist/tex/latex/siunitx/siunitx-abbreviations.cfg b/Master/texmf-dist/tex/latex/siunitx/siunitx-abbreviations.cfg index 93a190e8a84..87023acc12d 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/08/18} {2.6i} +\ProvidesExplFile {siunitx-abbreviations.cfg} {2015/09/01} {2.6j} {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 7ae64a2772e..513f705b00f 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/08/18} {2.6i} +\ProvidesExplFile {siunitx-binary.cfg} {2015/09/01} {2.6j} {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 9ffcee26a6f..921abc30b8b 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/08/18} {2.6i} +\ProvidesExplFile {siunitx-version-1.cfg} {2015/09/01} {2.6j} {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 c040fe415d8..ee94ee4f21f 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/03/01] \RequirePackage{xparse} -\ProvidesExplPackage {siunitx} {2015/08/18} {2.6i} +\ProvidesExplPackage {siunitx} {2015/09/01} {2.6j} {A comprehensive (SI) units package} \@ifpackagelater { expl3 } { 2015/03/01 } { } @@ -2926,7 +2926,11 @@ __siunitx_ \exp_after:wN \token_to_str:N \l__siunitx_tmpb_tl _function:w } + \prop_get:NnN \l__siunitx_unit_prop { total-units } \l__siunitx_tmpa_tl + \int_set:Nn \l__siunitx_unit_int \l__siunitx_tmpa_tl + \cs_set_eq:NN \__siunitx_pm: \pm \__siunitx_unit_format: + \cs_set_eq:NN \pm \__siunitx_pm: } { \msg_error:nnx { siunitx } { non-convertible-exponent } @@ -4652,6 +4656,8 @@ qualifier-phrase = { ~ of ~ } } \cs_new_protected:Npn \__siunitx_unit_format: { + \prop_put:Nnx \l__siunitx_unit_prop { total-units } + { \int_use:N \l__siunitx_unit_int } \__siunitx_unit_format_init: \int_while_do:nNnn { \l__siunitx_unit_int } > { 0 } { @@ -5112,6 +5118,7 @@ \prop_remove:Nn \l__siunitx_unit_prop { prefix-1 } \prop_remove:Nn \l__siunitx_unit_prop { prefix-symbol-1 } \prop_remove:Nn \l__siunitx_unit_prop { prefix-base-1 } + \prop_remove:Nn \l__siunitx_unit_prop { total-units } \prop_if_empty:NF \l__siunitx_unit_prop { \msg_error:nn { siunitx } { prefix-only } } } @@ -7086,8 +7093,8 @@ \msg_new:nnnn { siunitx } { invalid-number } { Invalid~numerical~input~'#1'. } { - The~input given~as~a~number~does~not~make~logical~sense.~ - This~happens,~for example,~if~a~number~only~contains~a~sign. + The~input~given~as~a~number~does~not~make~logical~sense.~ + This~happens,~for~example,~if~a~number~only~contains~a~sign. } \msg_new:nnnn { siunitx } { invalid-token-in-exponent } { Invalid~exponent~in~numerical~input~'#1'. } |