From 1e25b6e7b7831b5bac0a5ef44d9aed1d023a371e Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 22 Feb 2008 16:47:51 +0000 Subject: si update git-svn-id: svn://tug.org/texlive/trunk@6735 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/source/latex/si/si.dtx | 48 +++++++++++++++++--------------- 1 file changed, 25 insertions(+), 23 deletions(-) (limited to 'Master/texmf-dist/source') 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, -- cgit v1.2.3