From 22862769b10e5e0de5117786a9e51daa8391deaf Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 22 Feb 2009 00:19:28 +0000 Subject: siunitx 1.2f (20feb09) git-svn-id: svn://tug.org/texlive/trunk@12202 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/siunitx/config/si-DE.cfg | 2 +- .../tex/latex/siunitx/config/si-SIunits.cfg | 2 +- .../texmf-dist/tex/latex/siunitx/config/si-UK.cfg | 2 +- .../texmf-dist/tex/latex/siunitx/config/si-USA.cfg | 2 +- .../texmf-dist/tex/latex/siunitx/config/si-ZA.cfg | 2 +- .../tex/latex/siunitx/config/si-abbr.cfg | 2 +- .../tex/latex/siunitx/config/si-accepted.cfg | 2 +- .../tex/latex/siunitx/config/si-addn.cfg | 2 +- .../tex/latex/siunitx/config/si-astro.cfg | 2 +- .../tex/latex/siunitx/config/si-binary.cfg | 2 +- .../tex/latex/siunitx/config/si-chemeng.cfg | 23 +++++++++++++++++ .../tex/latex/siunitx/config/si-fancynum.cfg | 2 +- .../tex/latex/siunitx/config/si-fancyunits.cfg | 2 +- .../tex/latex/siunitx/config/si-geophys.cfg | 2 +- .../texmf-dist/tex/latex/siunitx/config/si-hep.cfg | 2 +- .../tex/latex/siunitx/config/si-hepunits.cfg | 2 +- .../tex/latex/siunitx/config/si-named.cfg | 2 +- .../tex/latex/siunitx/config/si-physical.cfg | 2 +- .../tex/latex/siunitx/config/si-prefix.cfg | 2 +- .../tex/latex/siunitx/config/si-prefixed.cfg | 2 +- .../tex/latex/siunitx/config/si-sistyle.cfg | 2 +- .../tex/latex/siunitx/config/si-synchem.cfg | 2 +- .../tex/latex/siunitx/config/si-units.cfg | 2 +- .../tex/latex/siunitx/config/si-unitsdef.cfg | 2 +- Master/texmf-dist/tex/latex/siunitx/siunitx.sty | 30 +++++++++++++++++----- 25 files changed, 69 insertions(+), 30 deletions(-) create mode 100644 Master/texmf-dist/tex/latex/siunitx/config/si-chemeng.cfg (limited to 'Master/texmf-dist/tex/latex/siunitx') diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-DE.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-DE.cfg index 939f5744393..a5c3159295e 100644 --- a/Master/texmf-dist/tex/latex/siunitx/config/si-DE.cfg +++ b/Master/texmf-dist/tex/latex/siunitx/config/si-DE.cfg @@ -14,7 +14,7 @@ %% ---------------------------------------------------------------- %% \ProvidesFile{si-DE.cfg} - [2009/02/04 v1.2e siunitx: Germany locale] + [2009/02/20 v1.2f siunitx: Germany locale] \sisetup{ unitsep=cdot, valuesep=thin, diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-SIunits.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-SIunits.cfg index 119aa33ade6..1c683ef416f 100644 --- a/Master/texmf-dist/tex/latex/siunitx/config/si-SIunits.cfg +++ b/Master/texmf-dist/tex/latex/siunitx/config/si-SIunits.cfg @@ -14,7 +14,7 @@ %% ---------------------------------------------------------------- %% \ProvidesFile{si-SIunits.cfg} - [2009/02/04 v1.2e siunitx: Emulation of + [2009/02/20 v1.2f siunitx: Emulation of SIunits] \si@emulating{SIunits}{2007/12/02 v1.36} \sisetup{ diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-UK.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-UK.cfg index f70e3cebf9e..64bf5de72cc 100644 --- a/Master/texmf-dist/tex/latex/siunitx/config/si-UK.cfg +++ b/Master/texmf-dist/tex/latex/siunitx/config/si-UK.cfg @@ -14,7 +14,7 @@ %% ---------------------------------------------------------------- %% \ProvidesFile{si-UK.cfg} - [2009/02/04 v1.2e siunitx: UK locale] + [2009/02/20 v1.2f siunitx: UK locale] \sisetup{ unitsep=thin, expproduct=times, diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-USA.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-USA.cfg index af33e99d12a..cf445ec06c1 100644 --- a/Master/texmf-dist/tex/latex/siunitx/config/si-USA.cfg +++ b/Master/texmf-dist/tex/latex/siunitx/config/si-USA.cfg @@ -14,7 +14,7 @@ %% ---------------------------------------------------------------- %% \ProvidesFile{si-USA.cfg} - [2009/02/04 v1.2e siunitx: USA locale] + [2009/02/20 v1.2f siunitx: USA locale] \sisetup{ unitsep=thin, expproduct=times, diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-ZA.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-ZA.cfg index 064bce3c963..88407d56449 100644 --- a/Master/texmf-dist/tex/latex/siunitx/config/si-ZA.cfg +++ b/Master/texmf-dist/tex/latex/siunitx/config/si-ZA.cfg @@ -14,7 +14,7 @@ %% ---------------------------------------------------------------- %% \ProvidesFile{si-ZA.cfg} - [2009/02/04 v1.2e siunitx: South Africa locale] + [2009/02/20 v1.2f siunitx: South Africa locale] \sisetup{ unitsep=cdot, valuesep=thin, diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-abbr.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-abbr.cfg index def0d971651..acccc1c1142 100644 --- a/Master/texmf-dist/tex/latex/siunitx/config/si-abbr.cfg +++ b/Master/texmf-dist/tex/latex/siunitx/config/si-abbr.cfg @@ -14,7 +14,7 @@ %% ---------------------------------------------------------------- %% \ProvidesFile{si-abbr.cfg} - [2009/02/04 v1.2e siunitx: Abbreviated units] + [2009/02/20 v1.2f siunitx: Abbreviated units] \requiresiconfigs{prefix,named,accepted,physical} \newunit{\pA}{\pico\ampere} \newunit{\nA}{\nano\ampere} diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-accepted.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-accepted.cfg index bfd768c8d58..a6488569f07 100644 --- a/Master/texmf-dist/tex/latex/siunitx/config/si-accepted.cfg +++ b/Master/texmf-dist/tex/latex/siunitx/config/si-accepted.cfg @@ -14,7 +14,7 @@ %% ---------------------------------------------------------------- %% \ProvidesFile{si-accepted.cfg} - [2009/02/04 v1.2e siunitx: SI Accepted units] + [2009/02/20 v1.2f siunitx: SI Accepted units] \newunit{\minute}{min} \newunit{\hour}{h} \newunit{\Day}{d} diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-addn.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-addn.cfg index 28ec40a14ec..5f1da724d0f 100644 --- a/Master/texmf-dist/tex/latex/siunitx/config/si-addn.cfg +++ b/Master/texmf-dist/tex/latex/siunitx/config/si-addn.cfg @@ -14,7 +14,7 @@ %% ---------------------------------------------------------------- %% \ProvidesFile{si-addn.cfg} - [2009/02/04 v1.2e siunitx: SI Additional units] + [2009/02/20 v1.2f siunitx: SI Additional units] \newunit{\angstrom}{\si@sym@ringA} \newunit{\are}{a} \newunit{\hectare}{\hecto\are} diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-astro.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-astro.cfg index 79b37a15dfb..eccd7283008 100644 --- a/Master/texmf-dist/tex/latex/siunitx/config/si-astro.cfg +++ b/Master/texmf-dist/tex/latex/siunitx/config/si-astro.cfg @@ -14,7 +14,7 @@ %% ---------------------------------------------------------------- %% \ProvidesFile{si-astro.cfg} - [2009/02/04 v1.2e siunitx: Units for astronomy] + [2009/02/20 v1.2f siunitx: Units for astronomy] \newunit{\parsec}{pc} \newunit{\lightyear}{ly} \endinput diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-binary.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-binary.cfg index 3574df57bf0..478475240b5 100644 --- a/Master/texmf-dist/tex/latex/siunitx/config/si-binary.cfg +++ b/Master/texmf-dist/tex/latex/siunitx/config/si-binary.cfg @@ -14,7 +14,7 @@ %% ---------------------------------------------------------------- %% \ProvidesFile{si-binary.cfg} - [2009/02/04 v1.2e siunitx: Binary units] + [2009/02/20 v1.2f siunitx: Binary units] \newprefix[binary]{\kibi}{10}{Ki} \newprefix[binary]{\mebi}{20}{Mi} \newprefix[binary]{\gibi}{30}{Gi} diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-chemeng.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-chemeng.cfg new file mode 100644 index 00000000000..d8fef319554 --- /dev/null +++ b/Master/texmf-dist/tex/latex/siunitx/config/si-chemeng.cfg @@ -0,0 +1,23 @@ +%% +%% This is file `si-chemeng.cfg', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% siunitx.dtx (with options: `chemeng') +%% ---------------------------------------------------------------- +%% 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 +%% ---------------------------------------------------------------- +%% +\ProvidesFile{si-chemeng.cfg} + [2009/02/20 v1.2f siunitx: Units for chemical engineering] +\newunit{\gmol}{g\text{-}mol} +\newunit{\kgmol}{kg\text{-}mol} +\newunit{\lbmol}{lb\text{-}mol} +\endinput +%% +%% End of file `si-chemeng.cfg'. diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-fancynum.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-fancynum.cfg index 0b4c70dbcc7..86d52b438f4 100644 --- a/Master/texmf-dist/tex/latex/siunitx/config/si-fancynum.cfg +++ b/Master/texmf-dist/tex/latex/siunitx/config/si-fancynum.cfg @@ -14,7 +14,7 @@ %% ---------------------------------------------------------------- %% \ProvidesFile{si-fancynum.cfg} - [2009/02/04 v1.2e siunitx: Emulation of + [2009/02/20 v1.2f siunitx: Emulation of fancynum] \si@emulating{fancynum}{2000/08/08 0.92} \sisetup{decimalsymbol=cdot,digitsep=comma} diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-fancyunits.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-fancyunits.cfg index 476c24c3333..4ff2c0cdb16 100644 --- a/Master/texmf-dist/tex/latex/siunitx/config/si-fancyunits.cfg +++ b/Master/texmf-dist/tex/latex/siunitx/config/si-fancyunits.cfg @@ -14,7 +14,7 @@ %% ---------------------------------------------------------------- %% \ProvidesFile{si-fancyunits.cfg} - [2009/02/04 v1.2e siunitx: Emulation of + [2009/02/20 v1.2f siunitx: Emulation of fancyunits] \si@emulating{fancyunits}{2007/02/01 v1.0.1} \si@ifloaded{SIunits} diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-geophys.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-geophys.cfg index 2c679ccb62e..c1ce075637a 100644 --- a/Master/texmf-dist/tex/latex/siunitx/config/si-geophys.cfg +++ b/Master/texmf-dist/tex/latex/siunitx/config/si-geophys.cfg @@ -14,7 +14,7 @@ %% ---------------------------------------------------------------- %% \ProvidesFile{si-geophys.cfg} - [2009/02/04 v1.2e siunitx: Units for astronomy] + [2009/02/20 v1.2f siunitx: Units for astronomy] \newunit{\gon}{gon} \endinput %% diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-hep.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-hep.cfg index 5d158f2602c..f779b156ecd 100644 --- a/Master/texmf-dist/tex/latex/siunitx/config/si-hep.cfg +++ b/Master/texmf-dist/tex/latex/siunitx/config/si-hep.cfg @@ -14,7 +14,7 @@ %% ---------------------------------------------------------------- %% \ProvidesFile{si-hep.cfg} - [2009/02/04 v1.2e siunitx: Units for high-energy physics] + [2009/02/20 v1.2f siunitx: Units for high-energy physics] \requiresiconfigs{prefix,named} \provideunit{\micron}{\micro\metre} \newunit{\mrad}{\milli\rad} diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-hepunits.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-hepunits.cfg index 36d9abed5db..2837abcf3b3 100644 --- a/Master/texmf-dist/tex/latex/siunitx/config/si-hepunits.cfg +++ b/Master/texmf-dist/tex/latex/siunitx/config/si-hepunits.cfg @@ -14,7 +14,7 @@ %% ---------------------------------------------------------------- %% \ProvidesFile{si-hepunits.cfg} - [2009/02/04 v1.2e siunitx: Emulation of + [2009/02/20 v1.2f siunitx: Emulation of hepunits] \si@emulating{hepunits}{2007/09/27} \requiresiconfigs{SIunits,accepted,prefix,hep} diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-named.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-named.cfg index c4605cab712..260422f417b 100644 --- a/Master/texmf-dist/tex/latex/siunitx/config/si-named.cfg +++ b/Master/texmf-dist/tex/latex/siunitx/config/si-named.cfg @@ -14,7 +14,7 @@ %% ---------------------------------------------------------------- %% \ProvidesFile{si-named.cfg} - [2009/02/04 v1.2e siunitx: SI Named units] + [2009/02/20 v1.2f siunitx: SI Named units] \newunit{\becquerel}{Bq} \newunit{\coulomb}{C} \newunit{\farad}{F} diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-physical.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-physical.cfg index d0b34e1bc9c..1075a068228 100644 --- a/Master/texmf-dist/tex/latex/siunitx/config/si-physical.cfg +++ b/Master/texmf-dist/tex/latex/siunitx/config/si-physical.cfg @@ -14,7 +14,7 @@ %% ---------------------------------------------------------------- %% \ProvidesFile{si-physical.cfg} - [2009/02/04 v1.2e siunitx: SI Physically-measured units] + [2009/02/20 v1.2f siunitx: SI Physically-measured units] \newcommand*{\si@eVspacea}{\text{\kern-\si@eVcorra}}% \newcommand*{\si@eVspaceb}{\text{\kern-\si@eVcorrb}}% \newunit{\electronvolt}{e\protect\si@eVspacea V\protect% diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-prefix.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-prefix.cfg index 5bb1420b0a7..8ccb7e98339 100644 --- a/Master/texmf-dist/tex/latex/siunitx/config/si-prefix.cfg +++ b/Master/texmf-dist/tex/latex/siunitx/config/si-prefix.cfg @@ -14,7 +14,7 @@ %% ---------------------------------------------------------------- %% \ProvidesFile{si-prefix.cfg} - [2009/02/04 v1.2e siunitx: SI Multiple prefixes] + [2009/02/20 v1.2f siunitx: SI Multiple prefixes] \newprefix{\yocto}{-24}{y} \newprefix{\zepto}{-21}{z} \newprefix{\atto}{-18}{a} diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-prefixed.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-prefixed.cfg index e5a724b33f1..3b8afa65c1b 100644 --- a/Master/texmf-dist/tex/latex/siunitx/config/si-prefixed.cfg +++ b/Master/texmf-dist/tex/latex/siunitx/config/si-prefixed.cfg @@ -14,7 +14,7 @@ %% ---------------------------------------------------------------- %% \ProvidesFile{si-prefixed.cfg} - [2009/02/04 v1.2e siunitx: SI Prefixed units] + [2009/02/20 v1.2f siunitx: SI Prefixed units] \requiresiconfigs{prefix,named,accepted,physical} \newunit{\picometre}{\pico\metre} \newunit{\nanometre}{\nano\metre} diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-sistyle.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-sistyle.cfg index 341477a9b2f..184c882502a 100644 --- a/Master/texmf-dist/tex/latex/siunitx/config/si-sistyle.cfg +++ b/Master/texmf-dist/tex/latex/siunitx/config/si-sistyle.cfg @@ -14,7 +14,7 @@ %% ---------------------------------------------------------------- %% \ProvidesFile{si-sistyle.cfg} - [2009/02/04 v1.2e siunitx: Emulation of + [2009/02/20 v1.2f siunitx: Emulation of SIstyle] \si@emulating{sistyle}{2006/12/20 v2.3} \sisetup{% diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-synchem.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-synchem.cfg index 1d0a1c23d41..5d429aa199b 100644 --- a/Master/texmf-dist/tex/latex/siunitx/config/si-synchem.cfg +++ b/Master/texmf-dist/tex/latex/siunitx/config/si-synchem.cfg @@ -14,7 +14,7 @@ %% ---------------------------------------------------------------- %% \ProvidesFile{si-synchem.cfg} - [2009/02/04 v1.2e siunitx: Units for synthetic chemists] + [2009/02/20 v1.2f siunitx: Units for synthetic chemists] \requiresiconfigs{prefix} \newunit{\mmHg}{mmHg} \newunit{\molar}{\mole\per\cubic\deci\metre} diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-units.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-units.cfg index 36f870a1833..256b521a08c 100644 --- a/Master/texmf-dist/tex/latex/siunitx/config/si-units.cfg +++ b/Master/texmf-dist/tex/latex/siunitx/config/si-units.cfg @@ -15,7 +15,7 @@ %% \si@ifloaded{units}{\endinput}{} \ProvidesFile{si-units.cfg} - [2009/02/04 v1.2e siunitx: Emulation of units] + [2009/02/20 v1.2f siunitx: Emulation of units] \si@emulating{units}{1998/08/04 v0.9b} \si@ifloaded{SIunits} {\si@emclash{units}{SIunits}\endinput}{} diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-unitsdef.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-unitsdef.cfg index 17e1609480a..063deb751e9 100644 --- a/Master/texmf-dist/tex/latex/siunitx/config/si-unitsdef.cfg +++ b/Master/texmf-dist/tex/latex/siunitx/config/si-unitsdef.cfg @@ -14,7 +14,7 @@ %% ---------------------------------------------------------------- %% \ProvidesFile{si-unitsdef.cfg} - [2009/02/04 v1.2e siunitx: + [2009/02/20 v1.2f siunitx: Emulation of unitsdef] \si@emulating{unitsdef}{2005/01/04 v0.2} \si@ifloaded{SIunits} diff --git a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty index 0c4377ca094..ed919522565 100644 --- a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty +++ b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty @@ -15,7 +15,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{siunitx} - [2009/02/04 v1.2e A comprehensive (SI) units package] + [2009/02/20 v1.2f A comprehensive (SI) units package] \begingroup \@ifundefined{eTeXversion} {\PackageError{siunitx} @@ -692,6 +692,7 @@ \fi] {prespace} \si@opt@boolkey{allowoptarg} +\si@opt@boolkey{allowlitunits} \newif\ifsi@slash \newif\ifsi@frac \si@opt@boolkey{stickyper} @@ -2964,18 +2965,32 @@ \newif\ifsi@unt@litout \newcommand*{\si@unt@printunit}[1]{% \si@unt@ifliteral{#1} - {\si@log@debug{Literal items found in unit - argument:\MessageBreak outputting without further - processing}% - \si@unt@litouttrue - \si@unt@addvaluesep - \si@unt@out{#1}} + {\ifsi@allowlitunits + \expandafter\si@unt@litprint + \else + \expandafter\si@unt@nolitprint + \fi + {#1}} {\si@log@debug{Macro unit found:\MessageBreak processing to format output}% \si@unt@init \advance\si@unt@depthcnt\@ne\relax #1% \si@unt@final}} +\newcommand*{\si@unt@litprint}[1]{% + \si@log@debug{% + Literal items found in unit argument:\MessageBreak outputting + without further processing}% + \si@unt@litouttrue + \si@unt@addvaluesep + \si@unt@out{#1}% +} +\newcommand*{\si@unt@nolitprint}[1]{% + \si@log@err{Literal units disabled}{% + You can the literal input `#1' for a unit\MessageBreak + but the allowliteralunits option is off. + } +} \newcommand*{\si@unt@addvaluesep}{% \ifsi@unt@num \expandafter\si@unt@addvalsep @@ -3787,6 +3802,7 @@ \fi}} \sisetup{ addsign=none, + allowlitunits=true, allowzeroexp=false, angformat=unchanged, astroang=false,%( -- cgit v1.2.3