summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-08-14 23:54:13 +0000
committerKarl Berry <karl@freefriends.org>2009-08-14 23:54:13 +0000
commit61015931036a57c135e326d38c4da5331f390e1e (patch)
treeb021ec9a48f72ebd9cc2699f23dfbfc371ffe3b8 /Master/texmf-dist/source
parentf4bead0f804c8f2fd96f2110cf8c88c8391a808e (diff)
siunitx 1.2m (11aug09)
git-svn-id: svn://tug.org/texlive/trunk@14678 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source')
-rw-r--r--Master/texmf-dist/source/latex/siunitx/siunitx.dtx70
-rw-r--r--Master/texmf-dist/source/latex/siunitx/siunitx.ins156
2 files changed, 117 insertions, 109 deletions
diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
index c1c03340a93..0c96bd1b3af 100644
--- a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
+++ b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
@@ -229,7 +229,7 @@ dcolumn, rccol and numprint packages.
%</driver>
% \fi
%
-%\CheckSum{10253}
+%\CheckSum{10257}
%
% \CharacterTable
% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -3458,7 +3458,7 @@ author.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{siunitx}
- [2009/06/04 v1.2l A comprehensive (SI) units package]
+ [2009/08/10 v1.2m A comprehensive (SI) units package]
% \end{macrocode}
% The package requires \eTeX, so the usual test is made.
% \begin{macrocode}
@@ -5084,6 +5084,7 @@ author.
%\changes{v1.0c}{2008/06/25}{Fixed excess loading of maths fonts}
%\begin{macro}{\si@textmu}
%\begin{macro}{\si@mathsmu}
+%\changes{v1.2m}{2009/08/10}{Fixed clash wth \pkg{fourier} package}
% For the \si{\micro} symbol, some direct loading of symbols is
% needed as the maths mu sign ($\mu$) is wrong.
% \begin{macrocode}
@@ -5098,11 +5099,18 @@ author.
{\DeclareFontFamily{OML}{eur}{\skewchar\font'177}
\DeclareFontShape{OML}{eur}{m}{n}{%
<-6> eurm5 <6-8> eurm7 <8-> eurm10}{}}
-\AtBeginDocument{
- \@ifpackageloaded{upgreek}
- {\let\si@mathsmu\upmu}
- {\DeclareSymbolFont{si@greek}{OML}{eur}{m}{n}
- \DeclareMathSymbol{\si@mathsmu}{\mathord}{si@greek}{"16}}}
+\AtBeginDocument{%
+ \@ifpackageloaded{upgreek}{%
+ \let\si@mathsmu\upmu
+ }{%
+ \@ifpackageloaded{fourier}{%
+ \let\si@mathsmu\othermu
+ }{%
+ \DeclareSymbolFont{si@greek}{OML}{eur}{m}{n}%
+ \DeclareMathSymbol{\si@mathsmu}{\mathord}{si@greek}{"16}%
+ }%
+ }%
+}
% \end{macrocode}
%\end{macro}
%\end{macro}
@@ -10959,7 +10967,7 @@ author.
% powers.
% \begin{macrocode}
\ProvidesFile{si-prefix.cfg}
- [2009/06/04 v1.2l siunitx: SI Multiple prefixes]
+ [2009/08/10 v1.2m siunitx: SI Multiple prefixes]
\newprefix{\yocto}{-24}{y}
\newprefix{\zepto}{-21}{z}
\newprefix{\atto}{-18}{a}
@@ -11063,7 +11071,7 @@ author.
% is an awkward one, but here the UK standard is used.
% \begin{macrocode}
\ProvidesFile{si-named.cfg}
- [2009/06/04 v1.2l siunitx: SI Named units]
+ [2009/08/10 v1.2m siunitx: SI Named units]
\newunit{\becquerel}{Bq}
\newunit{\coulomb}{C}
\newunit{\farad}{F}
@@ -11159,7 +11167,7 @@ author.
% This requires \file{si-prefix.cfg} and \file{si-named.cfg}.
% \begin{macrocode}
\ProvidesFile{si-prefixed.cfg}
- [2009/06/04 v1.2l siunitx: SI Prefixed units]
+ [2009/08/10 v1.2m siunitx: SI Prefixed units]
\requiresiconfigs{prefix,named,accepted,physical}
% \end{macrocode}
%\begin{macro}{\picometre}
@@ -11457,7 +11465,7 @@ author.
% block for the appropriate option. First currents.
% \begin{macrocode}
\ProvidesFile{si-abbr.cfg}
- [2009/06/04 v1.2l siunitx: Abbreviated units]
+ [2009/08/10 v1.2m siunitx: Abbreviated units]
\requiresiconfigs{prefix,named,accepted,physical}
\newunit{\pA}{\pico\ampere}
\newunit{\nA}{\nano\ampere}
@@ -11680,7 +11688,7 @@ author.
% These are defined here, although some are in very general use.
% \begin{macrocode}
\ProvidesFile{si-addn.cfg}
- [2009/06/04 v1.2l siunitx: SI Additional units]
+ [2009/08/10 v1.2m siunitx: SI Additional units]
\provideunit{\angstrom}{\si@sym@ringA}
\AtBeginDocument{%
\ifdefined\Saveangstrom
@@ -11735,7 +11743,7 @@ author.
%\begin{macro}{\bel}
% \begin{macrocode}
\ProvidesFile{si-accepted.cfg}
- [2009/06/04 v1.2l siunitx: SI Accepted units]
+ [2009/08/10 v1.2m siunitx: SI Accepted units]
\newunit{\minute}{min}
\newunit{\hour}{h}
\newunit{\Day}{d}
@@ -11793,7 +11801,7 @@ author.
% for a negative kern does make things a bit complicated.
% \begin{macrocode}
\ProvidesFile{si-physical.cfg}
- [2009/06/04 v1.2l siunitx: SI Physically-measured units]
+ [2009/08/10 v1.2m 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%
@@ -11829,7 +11837,7 @@ author.
% own definitions.
% \begin{macrocode}
\ProvidesFile{si-synchem.cfg}
- [2009/06/04 v1.2l siunitx: Units for synthetic chemists]
+ [2009/08/10 v1.2m siunitx: Units for synthetic chemists]
\requiresiconfigs{prefix}
\newunit{\mmHg}{mmHg}
\newunit{\molar}{\mole\per\cubic\deci\metre}
@@ -11850,7 +11858,7 @@ author.
% Some units inspired by \pkg{hepunits}.
% \begin{macrocode}
\ProvidesFile{si-hep.cfg}
- [2009/06/04 v1.2l siunitx: Units for high-energy physics]
+ [2009/08/10 v1.2m siunitx: Units for high-energy physics]
\requiresiconfigs{prefix,named}
% \end{macrocode}
%\begin{macro}{\micron}
@@ -11932,7 +11940,7 @@ author.
% For astronomy, the \cs{parsec} unit is needed.
% \begin{macrocode}
\ProvidesFile{si-astro.cfg}
- [2009/06/04 v1.2l siunitx: Units for astronomy]
+ [2009/08/10 v1.2m siunitx: Units for astronomy]
\newunit{\parsec}{pc}
\newunit{\lightyear}{ly}
% \end{macrocode}
@@ -11947,7 +11955,7 @@ author.
% The unit \cs{gon} is useful here.
% \begin{macrocode}
\ProvidesFile{si-geophys.cfg}
- [2009/06/04 v1.2l siunitx: Units for astronomy]
+ [2009/08/10 v1.2m siunitx: Units for astronomy]
\newunit{\gon}{gon}
% \end{macrocode}
%\end{macro}
@@ -11962,7 +11970,7 @@ author.
% For astronomy, the \cs{parsec} unit is needed.
% \begin{macrocode}
\ProvidesFile{si-chemeng.cfg}
- [2009/06/04 v1.2l siunitx: Units for chemical engineering]
+ [2009/08/10 v1.2m siunitx: Units for chemical engineering]
\newunit{\gmol}{g\text{-}mol}
\newunit{\kgmol}{kg\text{-}mol}
\newunit{\lbmol}{lb\text{-}mol}
@@ -11987,7 +11995,7 @@ author.
% \SIunits. First, the binary prefixes.
% \begin{macrocode}
\ProvidesFile{si-binary.cfg}
- [2009/06/04 v1.2l siunitx: Binary units]
+ [2009/08/10 v1.2m siunitx: Binary units]
\newprefix[binary]{\kibi}{10}{Ki}
\newprefix[binary]{\mebi}{20}{Mi}
\newprefix[binary]{\gibi}{30}{Gi}
@@ -12030,7 +12038,7 @@ author.
% default values.\footnote{The package author is in the UK.}
% \begin{macrocode}
\ProvidesFile{si-UK.cfg}
- [2009/06/04 v1.2l siunitx: UK locale]
+ [2009/08/10 v1.2m siunitx: UK locale]
\sisetup{
unitsep=thin,
expproduct=times,
@@ -12048,7 +12056,7 @@ author.
% The same as for the UK.
% \begin{macrocode}
\ProvidesFile{si-USA.cfg}
- [2009/06/04 v1.2l siunitx: USA locale]
+ [2009/08/10 v1.2m siunitx: USA locale]
\sisetup{
unitsep=thin,
expproduct=times,
@@ -12066,7 +12074,7 @@ author.
% Germany, hopefully.
% \begin{macrocode}
\ProvidesFile{si-DE.cfg}
- [2009/06/04 v1.2l siunitx: Germany locale]
+ [2009/08/10 v1.2m siunitx: Germany locale]
\sisetup{
unitsep=cdot,
valuesep=thin,
@@ -12084,7 +12092,7 @@ author.
% Design decisions taken from the same section of \SIstyle.
% \begin{macrocode}
\ProvidesFile{si-ZA.cfg}
- [2009/06/04 v1.2l siunitx: South Africa locale]
+ [2009/08/10 v1.2m siunitx: South Africa locale]
\sisetup{
unitsep=cdot,
valuesep=thin,
@@ -12117,7 +12125,7 @@ author.
% \units for conflicting options, so users probably expect none.
% \begin{macrocode}
\ProvidesFile{si-units.cfg}
- [2009/06/04 v1.2l siunitx: Emulation of units]
+ [2009/08/10 v1.2m siunitx: Emulation of units]
\si@emulating{units}{1998/08/04 v0.9b}
\si@ifloaded{SIunits}
{\si@emclash{units}{SIunits}\endinput}{}
@@ -12187,7 +12195,7 @@ author.
% clash.
% \begin{macrocode}
\ProvidesFile{si-unitsdef.cfg}
- [2009/06/04 v1.2l siunitx:
+ [2009/08/10 v1.2m siunitx:
Emulation of unitsdef]
\si@emulating{unitsdef}{2005/01/04 v0.2}
\si@ifloaded{SIunits}
@@ -12636,7 +12644,7 @@ author.
% the macros in \SIstyle as given in the manual for that package.
% \begin{macrocode}
\ProvidesFile{si-sistyle.cfg}
- [2009/06/04 v1.2l siunitx: Emulation of
+ [2009/08/10 v1.2m siunitx: Emulation of
SIstyle]
\si@emulating{sistyle}{2006/12/20 v2.3}
\sisetup{%
@@ -12820,7 +12828,7 @@ author.
% \SIunits emulation starts in much the same way.
% \begin{macrocode}
\ProvidesFile{si-SIunits.cfg}
- [2009/06/04 v1.2l siunitx: Emulation of
+ [2009/08/10 v1.2m siunitx: Emulation of
SIunits]
\si@emulating{SIunits}{2007/12/02 v1.36}
\sisetup{
@@ -13383,7 +13391,7 @@ author.
% which are not really to be encouraged.
% \begin{macrocode}
\ProvidesFile{si-hepunits.cfg}
- [2009/06/04 v1.2l siunitx: Emulation of
+ [2009/08/10 v1.2m siunitx: Emulation of
hepunits]
\si@emulating{hepunits}{2007/09/27}
\requiresiconfigs{SIunits,accepted,prefix,hep}
@@ -13538,7 +13546,7 @@ author.
% a little emulation and a few macros needed.
% \begin{macrocode}
\ProvidesFile{si-fancynum.cfg}
- [2009/06/04 v1.2l siunitx: Emulation of
+ [2009/08/10 v1.2m siunitx: Emulation of
fancynum]
\si@emulating{fancynum}{2000/08/08 0.92}
\sisetup{decimalsymbol=cdot,digitsep=comma}
@@ -13600,7 +13608,7 @@ author.
% test is needed.
% \begin{macrocode}
\ProvidesFile{si-fancyunits.cfg}
- [2009/06/04 v1.2l siunitx: Emulation of
+ [2009/08/10 v1.2m siunitx: Emulation of
fancyunits]
\si@emulating{fancyunits}{2007/02/01 v1.0.1}
\si@ifloaded{SIunits}
diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx.ins b/Master/texmf-dist/source/latex/siunitx/siunitx.ins
index 6e0ca741b08..d058666265d 100644
--- a/Master/texmf-dist/source/latex/siunitx/siunitx.ins
+++ b/Master/texmf-dist/source/latex/siunitx/siunitx.ins
@@ -1,78 +1,78 @@
-%%
-%% 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 docstrip.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
-\Msg{Generating siunitx files:}
-\generate{\file{jawltxdoc.sty}{\from{\jobname.dtx}{jawltxdoc}}
-}
-\usedir{tex/latex/siunitx}
-\generate{\file{\jobname.sty}{\from{\jobname.dtx}{package}}
-}
-\usedir{source/latex/siunitx}
-\generate{\file{\jobname.ins}{\from{\jobname.dtx}{install}}
-}
-\usedir{doc/latex/siunitx}
-\generate{\file{si-bug.ltx}{\from{\jobname.dtx}{bug}}
-}
-\usedir{tex/latex/siunitx/config}
-\generate{\file{si-SIunits.cfg}{\from{\jobname.dtx}{SIunits}}
- \file{si-sistyle.cfg}{\from{\jobname.dtx}{sistyle}}
- \file{si-unitsdef.cfg}{\from{\jobname.dtx}{unitsdef}}
- \file{si-units.cfg}{\from{\jobname.dtx}{units}}
- \file{si-hepunits.cfg}{\from{\jobname.dtx}{hepunits}}
- \file{si-fancynum.cfg}{\from{\jobname.dtx}{fancynum}}
- \file{si-fancyunits.cfg}{\from{\jobname.dtx}{fancyunits}}
-}
-\generate{\file{si-prefix.cfg}{\from{\jobname.dtx}{prefix}}
- \file{si-named.cfg}{\from{\jobname.dtx}{named}}
- \file{si-prefixed.cfg}{\from{\jobname.dtx}{prefixed}}
- \file{si-addn.cfg}{\from{\jobname.dtx}{addn}}
- \file{si-accepted.cfg}{\from{\jobname.dtx}{accepted}}
- \file{si-physical.cfg}{\from{\jobname.dtx}{physical}}
- \file{si-abbr.cfg}{\from{\jobname.dtx}{abbr}}
-}
-\generate{\file{si-synchem.cfg}{\from{\jobname.dtx}{synchem}}
- \file{si-hep.cfg}{\from{\jobname.dtx}{hep}}
- \file{si-astro.cfg}{\from{\jobname.dtx}{astro}}
- \file{si-geophys.cfg}{\from{\jobname.dtx}{geophys}}
- \file{si-chemeng.cfg}{\from{\jobname.dtx}{chemeng}}
- \file{si-binary.cfg}{\from{\jobname.dtx}{binary}}
-}
-\generate{\file{si-UK.cfg}{\from{\jobname.dtx}{UK}}
- \file{si-USA.cfg}{\from{\jobname.dtx}{USA}}
- \file{si-DE.cfg}{\from{\jobname.dtx}{DE}}
- \file{si-ZA.cfg}{\from{\jobname.dtx}{ZA}}
-}
-\nopreamble\nopostamble
-\usedir{doc/latex/siunitx}
-\generate{\file{README.txt}{\from{\jobname.dtx}{readme}}
- \file{\jobname.bib}{\from{\jobname.dtx}{refs}}
-}
-\endbatchfile
-\endinput
-%%
-%% End of file `siunitx.ins'.
+%%
+%% 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 docstrip.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
+\Msg{Generating siunitx files:}
+\generate{\file{jawltxdoc.sty}{\from{\jobname.dtx}{jawltxdoc}}
+}
+\usedir{tex/latex/siunitx}
+\generate{\file{\jobname.sty}{\from{\jobname.dtx}{package}}
+}
+\usedir{source/latex/siunitx}
+\generate{\file{\jobname.ins}{\from{\jobname.dtx}{install}}
+}
+\usedir{doc/latex/siunitx}
+\generate{\file{si-bug.ltx}{\from{\jobname.dtx}{bug}}
+}
+\usedir{tex/latex/siunitx/config}
+\generate{\file{si-SIunits.cfg}{\from{\jobname.dtx}{SIunits}}
+ \file{si-sistyle.cfg}{\from{\jobname.dtx}{sistyle}}
+ \file{si-unitsdef.cfg}{\from{\jobname.dtx}{unitsdef}}
+ \file{si-units.cfg}{\from{\jobname.dtx}{units}}
+ \file{si-hepunits.cfg}{\from{\jobname.dtx}{hepunits}}
+ \file{si-fancynum.cfg}{\from{\jobname.dtx}{fancynum}}
+ \file{si-fancyunits.cfg}{\from{\jobname.dtx}{fancyunits}}
+}
+\generate{\file{si-prefix.cfg}{\from{\jobname.dtx}{prefix}}
+ \file{si-named.cfg}{\from{\jobname.dtx}{named}}
+ \file{si-prefixed.cfg}{\from{\jobname.dtx}{prefixed}}
+ \file{si-addn.cfg}{\from{\jobname.dtx}{addn}}
+ \file{si-accepted.cfg}{\from{\jobname.dtx}{accepted}}
+ \file{si-physical.cfg}{\from{\jobname.dtx}{physical}}
+ \file{si-abbr.cfg}{\from{\jobname.dtx}{abbr}}
+}
+\generate{\file{si-synchem.cfg}{\from{\jobname.dtx}{synchem}}
+ \file{si-hep.cfg}{\from{\jobname.dtx}{hep}}
+ \file{si-astro.cfg}{\from{\jobname.dtx}{astro}}
+ \file{si-geophys.cfg}{\from{\jobname.dtx}{geophys}}
+ \file{si-chemeng.cfg}{\from{\jobname.dtx}{chemeng}}
+ \file{si-binary.cfg}{\from{\jobname.dtx}{binary}}
+}
+\generate{\file{si-UK.cfg}{\from{\jobname.dtx}{UK}}
+ \file{si-USA.cfg}{\from{\jobname.dtx}{USA}}
+ \file{si-DE.cfg}{\from{\jobname.dtx}{DE}}
+ \file{si-ZA.cfg}{\from{\jobname.dtx}{ZA}}
+}
+\nopreamble\nopostamble
+\usedir{doc/latex/siunitx}
+\generate{\file{README.txt}{\from{\jobname.dtx}{readme}}
+ \file{\jobname.bib}{\from{\jobname.dtx}{refs}}
+}
+\endbatchfile
+\endinput
+%%
+%% End of file `siunitx.ins'.