diff options
author | Karl Berry <karl@freefriends.org> | 2008-02-22 16:47:51 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2008-02-22 16:47:51 +0000 |
commit | 1e25b6e7b7831b5bac0a5ef44d9aed1d023a371e (patch) | |
tree | bdf43b684783412aa49cc5ac2af9468b8ffc37c7 | |
parent | 981821a057d0c297d49ad7a3844206a7524f50b7 (diff) |
si update
git-svn-id: svn://tug.org/texlive/trunk@6735 c570f23f-e606-0410-a88d-b1316a301751
22 files changed, 45 insertions, 43 deletions
diff --git a/Master/texmf-dist/bibtex/bib/si/si.bib b/Master/texmf-dist/doc/latex/si/si.bib index adabb278432..adabb278432 100644 --- a/Master/texmf-dist/bibtex/bib/si/si.bib +++ b/Master/texmf-dist/doc/latex/si/si.bib diff --git a/Master/texmf-dist/doc/latex/si/si.pdf b/Master/texmf-dist/doc/latex/si/si.pdf Binary files differindex fd3177798aa..a0cbaf33524 100644 --- a/Master/texmf-dist/doc/latex/si/si.pdf +++ b/Master/texmf-dist/doc/latex/si/si.pdf diff --git a/Master/texmf-dist/source/latex/si/si.dtx b/Master/texmf-dist/source/latex/si/si.dtx index 40ec01b12db..f7cab0cd35a 100644 --- a/Master/texmf-dist/source/latex/si/si.dtx +++ b/Master/texmf-dist/source/latex/si/si.dtx @@ -168,7 +168,7 @@ % Right brace \} Tilde \~} % %\GetFileInfo{\jobname.sty} -% +% %\DoNotIndex{\@car,\@eha,\@ehc,\@empty,\@firstofone,\@firstoftwo} %\DoNotIndex{\@for,\@gobble,\@gobbletwo,\@ifl@aded,\@ifnextchar} %\DoNotIndex{\@ifpackagelater,\@ifpackageloaded,\@ifstar} @@ -790,7 +790,7 @@ % \cs{#1}% % \expandafter\SpecialUsageIndex\csname#1\endcsname} %\newcommand{\unitinfo}[1]{% -% #1 & \csindex{#1} & +% #1 & \csindex{#1} & % \expandafter\unitsym\expandafter{\csname#1\endcsname}} %\begin{table} % \centering @@ -1726,7 +1726,7 @@ % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{si}% - [2008/02/18 v0.6 A comprehensive (SI) units package] + [2008/02/20 v.06a A comprehensive (SI) units package] \PackageInfo{si} {This package is experimental. \MessageBreak The interface and functionality is subject to review \MessageBreak and may be changed @@ -6262,12 +6262,14 @@ % \end{macrocode} %\end{macro} %\begin{macro}{\si@requirecfgs} -%\begin{macro}{\si@tempa} +%\changes{v0.6a}{2008/02/20}{Changed temporary macro used to fix +% bug with \pkg{memoir} and \textsc{koma}-script} +%\begin{macro}{\si@tempb} % The configuration files depend on each other.\\ %\cs{si@requirecfgs}\marg{cfg-file} % \begin{macrocode} \newcommand*{\si@requirecfgs}[1]{% - \@for\si@tempa:=#1\do{\si@loadfile{\si@tempa}}} + \@for\si@tempb:=#1\do{\si@loadfile{\si@tempb}}} % \end{macrocode} %\end{macro} %\end{macro} @@ -6416,7 +6418,7 @@ % powers. % \begin{macrocode} \ProvidesFile{si-prefix.cfg} - [2008/02/18 v0.6 SI Multiple prefixes] + [2008/02/20 v.06a SI Multiple prefixes] \newprefix{\yocto}{-24}{y} \newprefix{\zepto}{-21}{z} \newprefix{\atto}{-18}{a} @@ -6519,7 +6521,7 @@ % is an awkward one, but here the UK standard is used. % \begin{macrocode} \ProvidesFile{si-named.cfg} - [2008/02/18 v0.6 SI Named units] + [2008/02/20 v.06a SI Named units] \newunit{\becquerel}{Bq} \newunit{\coulomb}{C} \newunit{\farad}{F} @@ -6613,7 +6615,7 @@ % This requires \file{si-prefix.cfg} and \file{si-named.cfg}. % \begin{macrocode} \ProvidesFile{si-prefixed.cfg} - [2008/02/18 v0.6 SI Prefixed units] + [2008/02/20 v.06a SI Prefixed units] \si@requirecfgs{prefix,named,accepted,physical} % \end{macrocode} %\begin{macro}{\picometre} @@ -6892,7 +6894,7 @@ % block for the appropriate option. First currents. % \begin{macrocode} \ProvidesFile{si-abbr.cfg} - [2008/02/18 v0.6 Abbreviated units] + [2008/02/20 v.06a Abbreviated units] \si@requirecfgs{prefix,named,accepted,physical} \newunit{\pA}{\pico\ampere} \newunit{\nA}{\nano\ampere} @@ -7092,7 +7094,7 @@ % These are defined here, although some are in very general use. % \begin{macrocode} \ProvidesFile{si-addn.cfg} - [2008/02/18 v0.6 SI Additional units] + [2008/02/20 v.06a SI Additional units] \newunit{\angstrom}{\si@sym@ringA} \newunit{\are}{a} \newunit{\hectare}{\hecto\are} @@ -7137,7 +7139,7 @@ %\begin{macro}{\percent} % \begin{macrocode} \ProvidesFile{si-accepted.cfg} - [2008/02/18 v0.6 SI accepted units] + [2008/02/20 v.06a SI accepted units] \newunit{\minute}{min} \newunit{\hour}{h} \newunit{\Day}{d} @@ -7183,7 +7185,7 @@ % for a negative kern does make things a bit complicated. % \begin{macrocode} \ProvidesFile{si-physical.cfg} - [2008/02/18 v0.6 SI physically-measured units] + [2008/02/20 v.06a 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\si@eVspaceb} @@ -7219,7 +7221,7 @@ % own definitions. % \begin{macrocode} \ProvidesFile{si-synchem.cfg} - [2008/02/18 v0.6 Units for synthetic chemists] + [2008/02/20 v.06a Units for synthetic chemists] \si@requirecfgs{prefix} \newunit{\mmHg}{mmHg} \newunit{\molar}{\mole\per\cubic\deci\metre} @@ -7244,7 +7246,7 @@ % \pkg{hepunits} but stick with the new package interface. % \begin{macrocode} \ProvidesFile{si-hep.cfg} - [2008/02/18 v0.6 Units for high-energy physics] + [2008/02/20 v.06a Units for high-energy physics] \si@requirecfgs{prefix,named} % \end{macrocode} %\begin{macro}{\micron} @@ -7442,7 +7444,7 @@ % \SIunits. First, the binary prefixes. % \begin{macrocode} \ProvidesFile{si-binary.cfg} - [2008/02/18 v0.6 Binary units] + [2008/02/20 v.06a Binary units] \newprefix{\kibi}{10}{Ki} \newprefix{\mebi}{20}{Mi} \newprefix{\gibi}{30}{Gi} @@ -7480,7 +7482,7 @@ % This is also used for the USA, and is the default. % \begin{macrocode} \ProvidesFile{si-UK.cfg} - [2008/02/18 v0.6 UK locale] + [2008/02/20 v.06a UK locale] \sisetup{ unitsep=thin, expproduct=times, @@ -7497,7 +7499,7 @@ % The same as for the UK. % \begin{macrocode} \ProvidesFile{si-USA.cfg} - [2008/02/18 v0.6 USA locale] + [2008/02/20 v.06a USA locale] \sisetup{ unitsep=thin, expproduct=times, @@ -7516,7 +7518,7 @@ % Germany, hopefully. % \begin{macrocode} \ProvidesFile{si-germany.cfg} - [2008/02/18 v0.6 Germany locale] + [2008/02/20 v.06a Germany locale] \sisetup{ unitsep=cdot, valuesep=thin, @@ -7535,7 +7537,7 @@ % Taken from \sistyle. % \begin{macrocode} \ProvidesFile{si-south-africa.loc} - [2008/02/18 v0.6 UK Locale] + [2008/02/20 v.06a UK Locale] \sisetup{ unitsep=cdot, valuesep=thin, @@ -7566,7 +7568,7 @@ % \unitspkg for conflicting options, so users probably expect none. % \begin{macrocode} \ProvidesFile{si-units.cfg} - [2008/02/18 v0.6 Emulation of units] + [2008/02/20 v.06a Emulation of units] \si@ifloaded{SIunits} {\si@emclash{units}{SIunits}\endinput}{} \si@ifloaded{sistyle} @@ -7632,7 +7634,7 @@ % clash. % \begin{macrocode} \ProvidesFile{si-unitsdef.cfg} - [2008/02/18 v0.6 Emulation of unitsdef] + [2008/02/20 v.06a Emulation of unitsdef] \si@ifloaded{SIunits} {\si@emclash{unitsdef}{SIunits}\endinput}{} \si@ifloaded{sistyle} @@ -8089,7 +8091,7 @@ % the macros in \sistyle as given in the manual for that package. % \begin{macrocode} \ProvidesFile{si-sistyle.cfg} - [2008/02/18 v0.6 Emulation of sistyle] + [2008/02/20 v.06a Emulation of sistyle] \sisetup{% sepfour=true, obeyfamily, @@ -8266,7 +8268,7 @@ % \SIunits emulation starts in much the same way. % \begin{macrocode} \ProvidesFile{si-SIunits.cfg} - [2008/02/18 v0.6 Emulation of SIunits] + [2008/02/20 v.06a Emulation of SIunits] \sisetup{ unitsep=thick, valuesep=thick, diff --git a/Master/texmf-dist/tex/latex/si/si-SIunits.cfg b/Master/texmf-dist/tex/latex/si/si-SIunits.cfg index 3e504f461fc..ffd50e1520d 100644 --- a/Master/texmf-dist/tex/latex/si/si-SIunits.cfg +++ b/Master/texmf-dist/tex/latex/si/si-SIunits.cfg @@ -14,7 +14,7 @@ %% ---------------------------------------------------------------- %% \ProvidesFile{si-SIunits.cfg} - [2008/02/18 v0.6 Emulation of SIunits] + [2008/02/20 v.06a Emulation of SIunits] \sisetup{ unitsep=thick, valuesep=thick, diff --git a/Master/texmf-dist/tex/latex/si/si-UK.cfg b/Master/texmf-dist/tex/latex/si/si-UK.cfg index df3dfd3ae14..d0321a3a1fd 100644 --- a/Master/texmf-dist/tex/latex/si/si-UK.cfg +++ b/Master/texmf-dist/tex/latex/si/si-UK.cfg @@ -14,7 +14,7 @@ %% ---------------------------------------------------------------- %% \ProvidesFile{si-UK.cfg} - [2008/02/18 v0.6 UK locale] + [2008/02/20 v.06a UK locale] \sisetup{ unitsep=thin, expproduct=times, diff --git a/Master/texmf-dist/tex/latex/si/si-USA.cfg b/Master/texmf-dist/tex/latex/si/si-USA.cfg index 1dd741af556..a02067e5c8f 100644 --- a/Master/texmf-dist/tex/latex/si/si-USA.cfg +++ b/Master/texmf-dist/tex/latex/si/si-USA.cfg @@ -14,7 +14,7 @@ %% ---------------------------------------------------------------- %% \ProvidesFile{si-USA.cfg} - [2008/02/18 v0.6 USA locale] + [2008/02/20 v.06a USA locale] \sisetup{ unitsep=thin, expproduct=times, diff --git a/Master/texmf-dist/tex/latex/si/si-abbr.cfg b/Master/texmf-dist/tex/latex/si/si-abbr.cfg index 7a2cba1d0be..4f336671a55 100644 --- a/Master/texmf-dist/tex/latex/si/si-abbr.cfg +++ b/Master/texmf-dist/tex/latex/si/si-abbr.cfg @@ -14,7 +14,7 @@ %% ---------------------------------------------------------------- %% \ProvidesFile{si-abbr.cfg} - [2008/02/18 v0.6 Abbreviated units] + [2008/02/20 v.06a Abbreviated units] \si@requirecfgs{prefix,named,accepted,physical} \newunit{\pA}{\pico\ampere} \newunit{\nA}{\nano\ampere} diff --git a/Master/texmf-dist/tex/latex/si/si-accepted.cfg b/Master/texmf-dist/tex/latex/si/si-accepted.cfg index 982f022993d..89d036c7235 100644 --- a/Master/texmf-dist/tex/latex/si/si-accepted.cfg +++ b/Master/texmf-dist/tex/latex/si/si-accepted.cfg @@ -14,7 +14,7 @@ %% ---------------------------------------------------------------- %% \ProvidesFile{si-accepted.cfg} - [2008/02/18 v0.6 SI accepted units] + [2008/02/20 v.06a SI accepted units] \newunit{\minute}{min} \newunit{\hour}{h} \newunit{\Day}{d} diff --git a/Master/texmf-dist/tex/latex/si/si-addn.cfg b/Master/texmf-dist/tex/latex/si/si-addn.cfg index 7a5c0a07556..8590dbc2a00 100644 --- a/Master/texmf-dist/tex/latex/si/si-addn.cfg +++ b/Master/texmf-dist/tex/latex/si/si-addn.cfg @@ -14,7 +14,7 @@ %% ---------------------------------------------------------------- %% \ProvidesFile{si-addn.cfg} - [2008/02/18 v0.6 SI Additional units] + [2008/02/20 v.06a SI Additional units] \newunit{\angstrom}{\si@sym@ringA} \newunit{\are}{a} \newunit{\hectare}{\hecto\are} diff --git a/Master/texmf-dist/tex/latex/si/si-binary.cfg b/Master/texmf-dist/tex/latex/si/si-binary.cfg index c45cdd2d68b..3c99e52ad11 100644 --- a/Master/texmf-dist/tex/latex/si/si-binary.cfg +++ b/Master/texmf-dist/tex/latex/si/si-binary.cfg @@ -14,7 +14,7 @@ %% ---------------------------------------------------------------- %% \ProvidesFile{si-binary.cfg} - [2008/02/18 v0.6 Binary units] + [2008/02/20 v.06a Binary units] \newprefix{\kibi}{10}{Ki} \newprefix{\mebi}{20}{Mi} \newprefix{\gibi}{30}{Gi} diff --git a/Master/texmf-dist/tex/latex/si/si-germany.cfg b/Master/texmf-dist/tex/latex/si/si-germany.cfg index cbe80e10a2b..a101e27d79f 100644 --- a/Master/texmf-dist/tex/latex/si/si-germany.cfg +++ b/Master/texmf-dist/tex/latex/si/si-germany.cfg @@ -14,7 +14,7 @@ %% ---------------------------------------------------------------- %% \ProvidesFile{si-germany.cfg} - [2008/02/18 v0.6 Germany locale] + [2008/02/20 v.06a Germany locale] \sisetup{ unitsep=cdot, valuesep=thin, diff --git a/Master/texmf-dist/tex/latex/si/si-hep.cfg b/Master/texmf-dist/tex/latex/si/si-hep.cfg index de4695f5c7d..6ac658d7713 100644 --- a/Master/texmf-dist/tex/latex/si/si-hep.cfg +++ b/Master/texmf-dist/tex/latex/si/si-hep.cfg @@ -14,7 +14,7 @@ %% ---------------------------------------------------------------- %% \ProvidesFile{si-hep.cfg} - [2008/02/18 v0.6 Units for high-energy physics] + [2008/02/20 v.06a Units for high-energy physics] \si@requirecfgs{prefix,named} \newunit{\micron}{\micro\metre} \newunit{\mrad}{\milli\radian} diff --git a/Master/texmf-dist/tex/latex/si/si-named.cfg b/Master/texmf-dist/tex/latex/si/si-named.cfg index 48592f892e1..59aaa398e27 100644 --- a/Master/texmf-dist/tex/latex/si/si-named.cfg +++ b/Master/texmf-dist/tex/latex/si/si-named.cfg @@ -14,7 +14,7 @@ %% ---------------------------------------------------------------- %% \ProvidesFile{si-named.cfg} - [2008/02/18 v0.6 SI Named units] + [2008/02/20 v.06a SI Named units] \newunit{\becquerel}{Bq} \newunit{\coulomb}{C} \newunit{\farad}{F} diff --git a/Master/texmf-dist/tex/latex/si/si-physical.cfg b/Master/texmf-dist/tex/latex/si/si-physical.cfg index 15f03e149b6..7e78b365cb8 100644 --- a/Master/texmf-dist/tex/latex/si/si-physical.cfg +++ b/Master/texmf-dist/tex/latex/si/si-physical.cfg @@ -14,7 +14,7 @@ %% ---------------------------------------------------------------- %% \ProvidesFile{si-physical.cfg} - [2008/02/18 v0.6 SI physically-measured units] + [2008/02/20 v.06a 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\si@eVspaceb} diff --git a/Master/texmf-dist/tex/latex/si/si-prefix.cfg b/Master/texmf-dist/tex/latex/si/si-prefix.cfg index 90aa5e724ed..8d0339f6faf 100644 --- a/Master/texmf-dist/tex/latex/si/si-prefix.cfg +++ b/Master/texmf-dist/tex/latex/si/si-prefix.cfg @@ -14,7 +14,7 @@ %% ---------------------------------------------------------------- %% \ProvidesFile{si-prefix.cfg} - [2008/02/18 v0.6 SI Multiple prefixes] + [2008/02/20 v.06a SI Multiple prefixes] \newprefix{\yocto}{-24}{y} \newprefix{\zepto}{-21}{z} \newprefix{\atto}{-18}{a} diff --git a/Master/texmf-dist/tex/latex/si/si-prefixed.cfg b/Master/texmf-dist/tex/latex/si/si-prefixed.cfg index e7199688dda..4db6229e6b8 100644 --- a/Master/texmf-dist/tex/latex/si/si-prefixed.cfg +++ b/Master/texmf-dist/tex/latex/si/si-prefixed.cfg @@ -14,7 +14,7 @@ %% ---------------------------------------------------------------- %% \ProvidesFile{si-prefixed.cfg} - [2008/02/18 v0.6 SI Prefixed units] + [2008/02/20 v.06a SI Prefixed units] \si@requirecfgs{prefix,named,accepted,physical} \newunit{\picometre}{\pico\metre} \newunit{\nanometre}{\nano\metre} diff --git a/Master/texmf-dist/tex/latex/si/si-sistyle.cfg b/Master/texmf-dist/tex/latex/si/si-sistyle.cfg index 54291b53124..1ee3bf36d71 100644 --- a/Master/texmf-dist/tex/latex/si/si-sistyle.cfg +++ b/Master/texmf-dist/tex/latex/si/si-sistyle.cfg @@ -14,7 +14,7 @@ %% ---------------------------------------------------------------- %% \ProvidesFile{si-sistyle.cfg} - [2008/02/18 v0.6 Emulation of sistyle] + [2008/02/20 v.06a Emulation of sistyle] \sisetup{% sepfour=true, obeyfamily, diff --git a/Master/texmf-dist/tex/latex/si/si-south-africa.cfg b/Master/texmf-dist/tex/latex/si/si-south-africa.cfg index 33bd259f8fb..525346c3ce2 100644 --- a/Master/texmf-dist/tex/latex/si/si-south-africa.cfg +++ b/Master/texmf-dist/tex/latex/si/si-south-africa.cfg @@ -14,7 +14,7 @@ %% ---------------------------------------------------------------- %% \ProvidesFile{si-south-africa.loc} - [2008/02/18 v0.6 UK Locale] + [2008/02/20 v.06a UK Locale] \sisetup{ unitsep=cdot, valuesep=thin, diff --git a/Master/texmf-dist/tex/latex/si/si-synchem.cfg b/Master/texmf-dist/tex/latex/si/si-synchem.cfg index c0a63db9621..5c2232d57e5 100644 --- a/Master/texmf-dist/tex/latex/si/si-synchem.cfg +++ b/Master/texmf-dist/tex/latex/si/si-synchem.cfg @@ -14,7 +14,7 @@ %% ---------------------------------------------------------------- %% \ProvidesFile{si-synchem.cfg} - [2008/02/18 v0.6 Units for synthetic chemists] + [2008/02/20 v.06a Units for synthetic chemists] \si@requirecfgs{prefix} \newunit{\mmHg}{mmHg} \newunit{\molar}{\mole\per\cubic\deci\metre} diff --git a/Master/texmf-dist/tex/latex/si/si-units.cfg b/Master/texmf-dist/tex/latex/si/si-units.cfg index 8257a9a2239..afb4d657608 100644 --- a/Master/texmf-dist/tex/latex/si/si-units.cfg +++ b/Master/texmf-dist/tex/latex/si/si-units.cfg @@ -15,7 +15,7 @@ %% \si@ifloaded{units}{\endinput}{} \ProvidesFile{si-units.cfg} - [2008/02/18 v0.6 Emulation of units] + [2008/02/20 v.06a Emulation of units] \si@ifloaded{SIunits} {\si@emclash{units}{SIunits}\endinput}{} \si@ifloaded{sistyle} diff --git a/Master/texmf-dist/tex/latex/si/si-unitsdef.cfg b/Master/texmf-dist/tex/latex/si/si-unitsdef.cfg index c9d0d453585..cd17baa11da 100644 --- a/Master/texmf-dist/tex/latex/si/si-unitsdef.cfg +++ b/Master/texmf-dist/tex/latex/si/si-unitsdef.cfg @@ -14,7 +14,7 @@ %% ---------------------------------------------------------------- %% \ProvidesFile{si-unitsdef.cfg} - [2008/02/18 v0.6 Emulation of unitsdef] + [2008/02/20 v.06a Emulation of unitsdef] \si@ifloaded{SIunits} {\si@emclash{unitsdef}{SIunits}\endinput}{} \si@ifloaded{sistyle} diff --git a/Master/texmf-dist/tex/latex/si/si.sty b/Master/texmf-dist/tex/latex/si/si.sty index 47c94e3f630..fb1cd8e7ef4 100644 --- a/Master/texmf-dist/tex/latex/si/si.sty +++ b/Master/texmf-dist/tex/latex/si/si.sty @@ -15,7 +15,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{si}% - [2008/02/18 v0.6 A comprehensive (SI) units package] + [2008/02/20 v.06a A comprehensive (SI) units package] \PackageInfo{si} {This package is experimental. \MessageBreak The interface and functionality is subject to review \MessageBreak and may be changed @@ -2065,7 +2065,7 @@ \si@fileprefix#1.\si@extension} {The configuration file requested could not be found}}}} \newcommand*{\si@requirecfgs}[1]{% - \@for\si@tempa:=#1\do{\si@loadfile{\si@tempa}}} + \@for\si@tempb:=#1\do{\si@loadfile{\si@tempb}}} \newcommand*{\si@loademfile}[1]{% \@ifpackageloaded{#1} {\si@log@err{Emulation clash for package `#1'} |