diff options
author | Karl Berry <karl@freefriends.org> | 2008-12-24 01:10:54 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2008-12-24 01:10:54 +0000 |
commit | 41a56f5b7e74229d400a0c72cb900e2b1b3875c3 (patch) | |
tree | cc8ede263d129924dd4864297dcf4018999f46bd /Master/texmf-dist/source/latex | |
parent | 219fecec6f6232564cea56106ba88017354f50f2 (diff) |
siunitx 1.1j (22dec08)
git-svn-id: svn://tug.org/texlive/trunk@11700 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex')
-rw-r--r-- | Master/texmf-dist/source/latex/siunitx/siunitx.dtx | 181 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/siunitx/siunitx.ins | 1 |
2 files changed, 99 insertions, 83 deletions
diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx index 8159294eb20..209a4a4091c 100644 --- a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx +++ b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx @@ -37,6 +37,7 @@ % si-synchem.cfg, % si-hep.cfg, % si-astro.cfg, +% si-geophys.cfg, % si-binary.cfg, % si-UK.cfg, % si-USA.cfg, @@ -141,6 +142,7 @@ \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-binary.cfg}{\from{\jobname.dtx}{binary}} } \generate{\file{si-UK.cfg}{\from{\jobname.dtx}{UK}} @@ -213,7 +215,7 @@ dcolumn, rccol and numprint packages. \sisetup{ eVcorra=0.1ex, unitsep=cdot, - alsoload={synchem,hep,binary,astro}, + alsoload={synchem,hep,binary,astro,geophys}, loctolang={UK:UKenglish,DE:german}} \setlength{\cftsubsecnumwidth}{2.5em} \begin{document} @@ -222,7 +224,7 @@ dcolumn, rccol and numprint packages. %</driver> % \fi % -%\CheckSum{10226} +%\CheckSum{10177} % % \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 @@ -1486,6 +1488,16 @@ dcolumn, rccol and numprint packages. % \SI{1}{\lightyear} %\end{LaTeXexample} % +% +%\subsection{Geophysics (\opt{geophys})} +%\changes{v1.1j}{2008/12/22}{New module \opt{geophys} containing \cs{gon} +% unit} +%\DescribeMacro{\gon} +% For geophysics, the unit \cs{gon} is available. +%\begin{LaTeXexample} +% \SI{12}{\gon} +%\end{LaTeXexample} +% %\section{Font control} % Following the lead of \SIstyle, \currpkg provides control over the % font used to typeset output. By default, all text is typeset using @@ -2932,7 +2944,7 @@ dcolumn, rccol and numprint packages. % columns. % %\subsection{Using \currpkg\ with the \pkg{mathabx} package} -%\changes{2008/11/26}{v1.1g}{Respect loading of \pkg{mathabx}} +%\changes{v1.1g}{2008/11/26}{Respect loading of \pkg{mathabx}} % The \pkg{mathabx} package defines its own \cs{second} and % \cs{degree} macros. This is respected by \currpkg: if you want the % \currpkg\ definitions instead, put the lines @@ -3353,7 +3365,7 @@ author. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{siunitx} - [2008/11/31 v1.1h A comprehensive (SI) units package] + [2008/12/22 v1.1j A comprehensive (SI) units package] % \end{macrocode} % The package requires \eTeX, so the usual test is made. % \begin{macrocode} @@ -4491,15 +4503,17 @@ author. \si@opt@choicekey{tabnumalign} {centredecimal,centerdecimal,right,left,centre,center} {\si@tab@fixedtrue - \let\si@tab@rfill@S\hfil - \let\si@tab@lfill@S\hfil + \def\si@tab@rfill@S{0.5}% + \def\si@tab@lfill@S{0.5}% \renewcommand*{\si@tempb}{right}% \ifx\si@tempa\si@tempb - \let\si@tab@lfill@S\hfill + \def\si@tab@rfill@S{0}% + \def\si@tab@lfill@S{1}% \fi \renewcommand*{\si@tempb}{left}% \ifx\si@tempa\si@tempb - \let\si@tab@rfill@S\hfill + \def\si@tab@rfill@S{1}% + \def\si@tab@lfill@S{0}% \fi \renewcommand*{\si@tempb}{centredecimal}% \ifx\si@tempa\si@tempb @@ -4643,15 +4657,17 @@ author. % By default, centring happens on both sides of the content of % tabular material. % \begin{macrocode} - {\let\si@tab@rfill@t\hfill - \let\si@tab@lfill@t\hfill + {\def\si@tab@rfill@t{0.5}% + \def\si@tab@lfill@t{0.5}% \renewcommand*{\si@tempb}{right}% \ifx\si@tempa\si@tempb - \let\si@tab@rfill@t\relax + \def\si@tab@rfill@t{0}% + \def\si@tab@lfill@t{1}% \fi \renewcommand*{\si@tempb}{left}% \ifx\si@tempa\si@tempb - \let\si@tab@lfill@t\relax + \def\si@tab@rfill@t{1}% + \def\si@tab@lfill@t{0}% \fi} % \end{macrocode} %\end{macro} @@ -4666,15 +4682,17 @@ author. % By default, centring happens on both sides of the content of % tabular material. % \begin{macrocode} - {\let\si@tab@rfill@s\hfill - \let\si@tab@lfill@s\hfill + {\def\si@tab@rfill@s{0.5}% + \def\si@tab@lfill@s{0.5}% \renewcommand*{\si@tempb}{right}% \ifx\si@tempa\si@tempb - \let\si@tab@rfill@s\relax + \def\si@tab@rfill@s{0}% + \def\si@tab@lfill@s{1}% \fi \renewcommand*{\si@tempb}{left}% \ifx\si@tempa\si@tempb - \let\si@tab@lfill@s\relax + \def\si@tab@rfill@s{1}% + \def\si@tab@lfill@s{0}% \fi} % \end{macrocode} %\end{macro} @@ -5013,7 +5031,7 @@ author. %\end{macro} %\end{macro} %\begin{macro}{\si@textcelsius} -%\changes{2008/11/18}{v1.1e}{Bug fix in appearance} +%\changes{v1.1e}{2008/11/18}{Bug fix in appearance} %\begin{macro}{\si@mathscelsius} % Finally, degrees Celsius, which may need the degree symbol. % \begin{macrocode} @@ -8028,7 +8046,7 @@ author. % units (the letter is taken from \cs{si}). % %\begin{macro}{\NC@list} -%\changes{2008/11/18}{v1.1e}{Fixed issue with \pkg{cellspace} package} +%\changes{v1.1e}{2008/11/18}{Fixed issue with \pkg{cellspace} package} % The first part of the job is to create the basic apparatus for the % columns using the \pkg{array} package. To prevent any issues with % the content of optional arguments to the new columns, so @@ -8056,42 +8074,19 @@ author. \NC@list\expandafter{\si@tempa} % \end{macrocode} %\end{macro} -%\changes{2008/11/30}{v1.1h}{Fixed problem with \pkg{colortbl} package} -%\begin{macro}{\@classz} -% If \pkg{colortbl} is loaded, the \cs{@classz} macro needs to have the -% original \pkg{array} method for the \texttt{c} column restored. +%\changes{v1.1h}{2008/11/30}{Fixed problem with \pkg{colortbl} package} +%\changes{v1.1i}{2008/11/30}{Better solution to \pkg{colortbl} issue} +%\begin{macro}{\si@tab@corr@colortbl} +% A correction if \pkg{colortbl} is loaded. % \begin{macrocode} +\newcommand*{\si@tab@corr@colortbl}{\relax} \AtBeginDocument{ \@ifpackageloaded{colortbl}{% - \renewcommand*{\@classz}{% - \@classx - \@tempcnta \count@ - \prepnext@tok - \expandafter\CT@extract\the\toks\@tempcnta\columncolor!\@nil - \@addtopreamble{% - \setbox\z@\hbox\bgroup\bgroup - \ifcase\@chnum - \hfil\d@llarbegin\insert@column\d@llarend\hfil\or - \d@llarbegin\insert@column\d@llarend\hfill\or - \hfill\kern\z@\d@llarbegin\insert@column\d@llarend\or - $\vcenter\@startpbox{\@nextchar}\insert@column\@endpbox$\or - \vtop\@startpbox{\@nextchar}\insert@column\@endpbox\or - \vbox\@startpbox{\@nextchar}\insert@column\@endpbox - \fi - \egroup\egroup - \begingroup - \CT@setup - \CT@column@color - \CT@row@color - \CT@cell@color - \CT@do@color - \endgroup - \@tempdima\ht\z@ - \advance\@tempdima\minrowclearance - \vrule\@height\@tempdima\@width\z@ - \unhbox\z@}% - \prepnext@tok}% - }{}} + \renewcommand*{\si@tab@corr@colortbl}{% + \hskip\stretch{-0.5}\kern\z@ + } + }{} +} % \end{macrocode} %\end{macro} %\begin{macro}{\NC@rewrite@S} @@ -8187,7 +8182,7 @@ author. % \end{macrocode} %\end{macro} %\begin{macro}{\si@tab@gettok@S} -%\changes{1.0j}{2008/08/21}{Token gathering code now checks for +%\changes{v1.0j}{2008/08/21}{Token gathering code now checks for % expandable content} %\darg{token} % The cell-content collection system is inherited from \pkg{rccol}. @@ -8407,7 +8402,8 @@ author. \let\si@tab@rfill\si@tab@rfill@t \let\si@tab@lfill\si@tab@lfill@t \fi - \si@tab@lfill\relax + \si@tab@corr@colortbl + \hskip\stretch{\si@tab@lfill}\kern\z@ \ifsi@switch \the\si@tab@pretoks \si@tab@numout @@ -8415,14 +8411,17 @@ author. \else \the\si@tab@pretoks \fi - \si@tab@rfill\relax + \hskip\stretch{\si@tab@rfill}\kern\z@ + \si@tab@corr@colortbl \endgroup} \newcommand*{\si@tab@end@s}{% - \si@tab@lfill@s\relax + \si@tab@corr@colortbl + \hskip\stretch{\si@tab@lfill@s}\kern\z@ \ignorespaces \expandafter\si\expandafter{\the\si@tab@toks}% \unskip - \si@tab@rfill@s\relax + \hskip\stretch{\si@tab@rfill@s}\kern\z@ + \si@tab@corr@colortbl \endgroup} % \end{macrocode} %\end{macro} @@ -10405,9 +10404,12 @@ author. %\end{macro} %\end{macro} %\begin{macro}{\si@out@minus} +%\changes{v1.1j}{2008/12/22}{Fixed infinite loop with \pkg{breqn}} % An active minus sign is needed. % \begin{macrocode} -\newcommand*{\si@out@minus}{\ensuremath{-}} +\newcommand*{\si@out@minus}{} +\DeclareTextSymbolDefault{\si@out@minus}{TS1} +\DeclareTextSymbol{\si@out@minus}{TS1}{61} % \end{macrocode} %\end{macro} %\begin{macro}{\ifsi@out@num} @@ -10744,7 +10746,7 @@ author. % powers. % \begin{macrocode} \ProvidesFile{si-prefix.cfg} - [2008/11/31 v1.1h siunitx: SI Multiple prefixes] + [2008/12/22 v1.1j siunitx: SI Multiple prefixes] \newprefix{\yocto}{-24}{y} \newprefix{\zepto}{-21}{z} \newprefix{\atto}{-18}{a} @@ -10848,7 +10850,7 @@ author. % is an awkward one, but here the UK standard is used. % \begin{macrocode} \ProvidesFile{si-named.cfg} - [2008/11/31 v1.1h siunitx: SI Named units] + [2008/12/22 v1.1j siunitx: SI Named units] \newunit{\becquerel}{Bq} \newunit{\coulomb}{C} \newunit{\farad}{F} @@ -10944,7 +10946,7 @@ author. % This requires \file{si-prefix.cfg} and \file{si-named.cfg}. % \begin{macrocode} \ProvidesFile{si-prefixed.cfg} - [2008/11/31 v1.1h siunitx: SI Prefixed units] + [2008/12/22 v1.1j siunitx: SI Prefixed units] \requiresiconfigs{prefix,named,accepted,physical} % \end{macrocode} %\begin{macro}{\picometre} @@ -10995,7 +10997,7 @@ author. %\begin{macro}{\micromole} %\begin{macro}{\millimole} %\begin{macro}{\kilomole} -%\changes{2008/11/18}{v1.1e}{New unit} +%\changes{v1.1e}{2008/11/18}{New unit} % Now some moles. % \begin{macrocode} \newunit{\femtomole}{\femto\mole} @@ -11087,9 +11089,9 @@ author. %\end{macro} %\end{macro} %\begin{macro}{\kilohm} -%\changes{2008/11/25}{v1.1f}{Renamed from \cs{kiloohm}} +%\changes{v1.1f}{2008/11/25}{Renamed from \cs{kiloohm}} %\begin{macro}{\megohm} -%\changes{2008/11/25}{v1.1f}{Renamed from \cs{megaohm}} +%\changes{v1.1f}{2008/11/25}{Renamed from \cs{megaohm}} %\begin{macro}{\gigaohm} % For resistance, checks are needed again for the definition of % \cs{ohm}. @@ -11242,7 +11244,7 @@ author. % block for the appropriate option. First currents. % \begin{macrocode} \ProvidesFile{si-abbr.cfg} - [2008/11/31 v1.1h siunitx: Abbreviated units] + [2008/12/22 v1.1j siunitx: Abbreviated units] \requiresiconfigs{prefix,named,accepted,physical} \newunit{\pA}{\pico\ampere} \newunit{\nA}{\nano\ampere} @@ -11282,7 +11284,7 @@ author. %\begin{macro}{\micmol} %\begin{macro}{\mmol} %\begin{macro}{\kmol} -%\changes{2008/11/18}{v1.1e}{New unit} +%\changes{v1.1e}{2008/11/18}{New unit} % Amounts of substance. % \begin{macrocode} \newunit{\fmol}{\femto\mole} @@ -11465,7 +11467,7 @@ author. % These are defined here, although some are in very general use. % \begin{macrocode} \ProvidesFile{si-addn.cfg} - [2008/11/31 v1.1h siunitx: SI Additional units] + [2008/12/22 v1.1j siunitx: SI Additional units] \newunit{\angstrom}{\si@sym@ringA} \newunit{\are}{a} \newunit{\hectare}{\hecto\are} @@ -11515,7 +11517,7 @@ author. %\begin{macro}{\percent} % \begin{macrocode} \ProvidesFile{si-accepted.cfg} - [2008/11/31 v1.1h siunitx: SI Accepted units] + [2008/12/22 v1.1j siunitx: SI Accepted units] \newunit{\minute}{min} \newunit{\hour}{h} \newunit{\Day}{d} @@ -11568,7 +11570,7 @@ author. % for a negative kern does make things a bit complicated. % \begin{macrocode} \ProvidesFile{si-physical.cfg} - [2008/11/31 v1.1h siunitx: SI Physically-measured units] + [2008/12/22 v1.1j 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% @@ -11604,7 +11606,7 @@ author. % own definitions. % \begin{macrocode} \ProvidesFile{si-synchem.cfg} - [2008/11/31 v1.1h siunitx: Units for synthetic chemists] + [2008/12/22 v1.1j siunitx: Units for synthetic chemists] \requiresiconfigs{prefix} \newunit{\mmHg}{mmHg} \newunit{\molar}{\mole\per\cubic\deci\metre} @@ -11625,7 +11627,7 @@ author. % Some units inspired by \pkg{hepunits}. % \begin{macrocode} \ProvidesFile{si-hep.cfg} - [2008/11/31 v1.1h siunitx: Units for high-energy physics] + [2008/12/22 v1.1j siunitx: Units for high-energy physics] \requiresiconfigs{prefix,named} % \end{macrocode} %\begin{macro}{\micron} @@ -11707,7 +11709,7 @@ author. % For astronomy, the \cs{parsec} unit is needed. % \begin{macrocode} \ProvidesFile{si-astro.cfg} - [2008/11/31 v1.1h siunitx: Units for astronomy] + [2008/12/22 v1.1j siunitx: Units for astronomy] \newunit{\parsec}{pc} \newunit{\lightyear}{ly} % \end{macrocode} @@ -11715,6 +11717,19 @@ author. %\end{macro} %\iffalse %</astro> +%<*geophys> +%\fi +%\subsection{Geophysics} +%\begin{macro}{\lightyear} +% The unit \cs{gon} is useful here. +% \begin{macrocode} +\ProvidesFile{si-geophys.cfg} + [2008/12/22 v1.1j siunitx: Units for astronomy] +\newunit{\gon}{gon} +% \end{macrocode} +%\end{macro} +%\iffalse +%</geophys> %<*binary> %\fi %\subsection{Binary units} @@ -11730,7 +11745,7 @@ author. % \SIunits. First, the binary prefixes. % \begin{macrocode} \ProvidesFile{si-binary.cfg} - [2008/11/31 v1.1h siunitx: Binary units] + [2008/12/22 v1.1j siunitx: Binary units] \newprefix[binary]{\kibi}{10}{Ki} \newprefix[binary]{\mebi}{20}{Mi} \newprefix[binary]{\gibi}{30}{Gi} @@ -11773,7 +11788,7 @@ author. % default values.\footnote{The package author is in the UK.} % \begin{macrocode} \ProvidesFile{si-UK.cfg} - [2008/11/31 v1.1h siunitx: UK locale] + [2008/12/22 v1.1j siunitx: UK locale] \sisetup{ unitsep=thin, expproduct=times, @@ -11790,7 +11805,7 @@ author. % The same as for the UK. % \begin{macrocode} \ProvidesFile{si-USA.cfg} - [2008/11/31 v1.1h siunitx: USA locale] + [2008/12/22 v1.1j siunitx: USA locale] \sisetup{ unitsep=thin, expproduct=times, @@ -11807,7 +11822,7 @@ author. % Germany, hopefully. % \begin{macrocode} \ProvidesFile{si-DE.cfg} - [2008/11/31 v1.1h siunitx: Germany locale] + [2008/12/22 v1.1j siunitx: Germany locale] \sisetup{ unitsep=cdot, valuesep=thin, @@ -11824,7 +11839,7 @@ author. % Design decisions taken from the same section of \SIstyle. % \begin{macrocode} \ProvidesFile{si-ZA.cfg} - [2008/11/31 v1.1h siunitx: South Africa locale] + [2008/12/22 v1.1j siunitx: South Africa locale] \sisetup{ unitsep=cdot, valuesep=thin, @@ -11856,7 +11871,7 @@ author. % \units for conflicting options, so users probably expect none. % \begin{macrocode} \ProvidesFile{si-units.cfg} - [2008/11/31 v1.1h siunitx: Emulation of units] + [2008/12/22 v1.1j siunitx: Emulation of units] \si@emulating{units}{1998/08/04 v0.9b} \si@ifloaded{SIunits} {\si@emclash{units}{SIunits}\endinput}{} @@ -11926,7 +11941,7 @@ author. % clash. % \begin{macrocode} \ProvidesFile{si-unitsdef.cfg} - [2008/11/31 v1.1h siunitx: + [2008/12/22 v1.1j siunitx: Emulation of unitsdef] \si@emulating{unitsdef}{2005/01/04 v0.2} \si@ifloaded{SIunits} @@ -12375,7 +12390,7 @@ author. % the macros in \SIstyle as given in the manual for that package. % \begin{macrocode} \ProvidesFile{si-sistyle.cfg} - [2008/11/31 v1.1h siunitx: Emulation of + [2008/12/22 v1.1j siunitx: Emulation of SIstyle] \si@emulating{sistyle}{2006/12/20 v2.3} \sisetup{% @@ -12559,7 +12574,7 @@ author. % \SIunits emulation starts in much the same way. % \begin{macrocode} \ProvidesFile{si-SIunits.cfg} - [2008/11/31 v1.1h siunitx: Emulation of + [2008/12/22 v1.1j siunitx: Emulation of SIunits] \si@emulating{SIunits}{2007/12/02 v1.36} \sisetup{ @@ -13122,7 +13137,7 @@ author. % which are not really to be encouraged. % \begin{macrocode} \ProvidesFile{si-hepunits.cfg} - [2008/11/31 v1.1h siunitx: Emulation of + [2008/12/22 v1.1j siunitx: Emulation of hepunits] \si@emulating{hepunits}{2007/09/27} \requiresiconfigs{SIunits,accepted,prefix,hep} @@ -13277,7 +13292,7 @@ author. % a little emulation and a few macros needed. % \begin{macrocode} \ProvidesFile{si-fancynum.cfg} - [2008/11/31 v1.1h siunitx: Emulation of + [2008/12/22 v1.1j siunitx: Emulation of fancynum] \si@emulating{fancynum}{2000/08/08 0.92} \sisetup{decimalsymbol=cdot,digitsep=comma} @@ -13339,7 +13354,7 @@ author. % test is needed. % \begin{macrocode} \ProvidesFile{si-fancyunits.cfg} - [2008/11/31 v1.1h siunitx: Emulation of + [2008/12/22 v1.1j 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 f117c9ea32e..a26e2854605 100644 --- a/Master/texmf-dist/source/latex/siunitx/siunitx.ins +++ b/Master/texmf-dist/source/latex/siunitx/siunitx.ins @@ -58,6 +58,7 @@ \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-binary.cfg}{\from{\jobname.dtx}{binary}}
}
\generate{\file{si-UK.cfg}{\from{\jobname.dtx}{UK}}
|