diff options
author | Karl Berry <karl@freefriends.org> | 2009-02-05 01:05:17 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2009-02-05 01:05:17 +0000 |
commit | f7d0f5b4376106b48bac9d2e8e379fe5c5b03a07 (patch) | |
tree | 7809c5f8c5392fa39f6773cd2e27f20d30fea4b0 /Master/texmf-dist/source/latex/siunitx | |
parent | ad23c1c436c3e031cc4b81849d0fa2b892851467 (diff) |
siunitx update (4feb09)
git-svn-id: svn://tug.org/texlive/trunk@12088 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/siunitx')
-rw-r--r-- | Master/texmf-dist/source/latex/siunitx/siunitx.dtx | 76 |
1 files changed, 39 insertions, 37 deletions
diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx index 4572aa24bcf..82a2649dc98 100644 --- a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx +++ b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx @@ -227,7 +227,7 @@ dcolumn, rccol and numprint packages. %</driver> % \fi % -%\CheckSum{10209} +%\CheckSum{10199} % % \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 @@ -3404,7 +3404,7 @@ author. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{siunitx} - [2009/02/01 v1.2d A comprehensive (SI) units package] + [2009/02/04 v1.2e A comprehensive (SI) units package] % \end{macrocode} % The package requires \eTeX, so the usual test is made. % \begin{macrocode} @@ -8611,6 +8611,8 @@ author. %\begin{macro}{\si@tab@unfixed} %\changes{v1.0l}{2008/09/03}{Fixed issue with decimal sign and % integers} +%\changes{v1.2e}{2009/02/04}{Various \cs{expandafter}s removed: +% lead to a bug with \opt{textmode} option} % When the width of the contents is not fixed, the system creates a % block in which the decimal marker is always at the centre. This is % achieved by placing the pre- and post-decimal parts of the number @@ -8627,10 +8629,8 @@ author. {\ensuremath{{\si@decimalsymbol}}}% \fi \protected@edef\si@num@out{\si@num@out\si@tab@expout}% - \setbox\si@tab@prebox=\hbox - {\expandafter\si@out@num\expandafter{\si@tab@out}}% - \setbox\si@tab@postbox=\hbox - {\expandafter\si@out@num\expandafter{\si@num@out}}% + \setbox\si@tab@prebox=\hbox{\si@out@num{\si@tab@out}}% + \setbox\si@tab@postbox=\hbox{\si@out@num{\si@num@out}}% \ifdim\wd\si@tab@prebox>\wd\si@tab@postbox\relax \setbox\si@tab@postbox=\hbox to\wd\si@tab@prebox% {\unhbox\si@tab@postbox\hfill}% @@ -8668,6 +8668,8 @@ author. %\begin{macro}{\si@tab@fixed} %\changes{v1.0l}{2008/09/03}{Fixed issue with spacing when no digits % present after decimal marker} +%\changes{v1.2e}{2009/02/04}{Various \cs{expandafter}s removed: +% lead to a bug with \opt{textmode} option} % The column is not centred on the decimal marker; the user specifies % how many characters on each side are allowed for. First, the width % of a character is measured, and stored. @@ -8745,7 +8747,7 @@ author. % shuffling may be needed, depending on the treatment of exponents. % \begin{macrocode} \setbox\si@tab@prebox=\hbox to\si@tab@predim{\hss\hfill - \expandafter\si@out@num\expandafter{\si@tab@out}}% + \si@out@num{\si@tab@out}}% \ifx\@empty\si@num@out\@empty \setbox\si@tab@postbox=\hbox to\si@tab@postdim{\hfil}% \else @@ -8753,8 +8755,8 @@ author. \protected@edef\si@num@out{\si@num@out\si@tab@expout}% \fi \setbox\si@tab@postbox=\hbox to\si@tab@postdim - {\ensuremath{{\si@decimalsymbol}}\expandafter\si@out@num - \expandafter{\si@num@out}\hfil}% + {\ensuremath{{\si@decimalsymbol}}\si@out@num + {\si@num@out}\hfil}% \fi \ifx\@empty\si@tab@expout\@empty \ifsi@tabalignexp @@ -8763,8 +8765,7 @@ author. \else \ifsi@tabalignexp \setbox\si@tab@expbox=\hbox to\si@tab@expdim - {\expandafter\si@out@num\expandafter{\si@tab@expout}% - \hfil}% + {\si@out@num{\si@tab@expout}\hfil}% \fi \fi} % \end{macrocode} @@ -8960,6 +8961,7 @@ author. % \end{macrocode} %\end{macro} %\begin{macro}{\si@SI} +%\changes{v1.2e}{2009/02/04}{Fixed issue with mode detection and units} %\begin{macro}{\si@unt@SIopts} %\doarg{keyval options} %\darg{unit} @@ -8974,9 +8976,9 @@ author. \def\si@SI[#1]#2[#3]#4{% \begingroup \let\fg\SIfg - \si@ifnotmtarg{#1} - {\sisetup{#1}% - \renewcommand*{\si@unt@SIopts}{#1}}% + \sisetup{#1}% + \renewcommand*{\si@unt@SIopts}{#1}% + \si@fam@mode % \end{macrocode} %\end{macro} % The prefix unit is handled before any processing of the number; the @@ -10837,7 +10839,7 @@ author. % powers. % \begin{macrocode} \ProvidesFile{si-prefix.cfg} - [2009/02/01 v1.2d siunitx: SI Multiple prefixes] + [2009/02/04 v1.2e siunitx: SI Multiple prefixes] \newprefix{\yocto}{-24}{y} \newprefix{\zepto}{-21}{z} \newprefix{\atto}{-18}{a} @@ -10941,7 +10943,7 @@ author. % is an awkward one, but here the UK standard is used. % \begin{macrocode} \ProvidesFile{si-named.cfg} - [2009/02/01 v1.2d siunitx: SI Named units] + [2009/02/04 v1.2e siunitx: SI Named units] \newunit{\becquerel}{Bq} \newunit{\coulomb}{C} \newunit{\farad}{F} @@ -11037,7 +11039,7 @@ author. % This requires \file{si-prefix.cfg} and \file{si-named.cfg}. % \begin{macrocode} \ProvidesFile{si-prefixed.cfg} - [2009/02/01 v1.2d siunitx: SI Prefixed units] + [2009/02/04 v1.2e siunitx: SI Prefixed units] \requiresiconfigs{prefix,named,accepted,physical} % \end{macrocode} %\begin{macro}{\picometre} @@ -11335,7 +11337,7 @@ author. % block for the appropriate option. First currents. % \begin{macrocode} \ProvidesFile{si-abbr.cfg} - [2009/02/01 v1.2d siunitx: Abbreviated units] + [2009/02/04 v1.2e siunitx: Abbreviated units] \requiresiconfigs{prefix,named,accepted,physical} \newunit{\pA}{\pico\ampere} \newunit{\nA}{\nano\ampere} @@ -11558,7 +11560,7 @@ author. % These are defined here, although some are in very general use. % \begin{macrocode} \ProvidesFile{si-addn.cfg} - [2009/02/01 v1.2d siunitx: SI Additional units] + [2009/02/04 v1.2e siunitx: SI Additional units] \newunit{\angstrom}{\si@sym@ringA} \newunit{\are}{a} \newunit{\hectare}{\hecto\are} @@ -11607,7 +11609,7 @@ author. %\begin{macro}{\bel} % \begin{macrocode} \ProvidesFile{si-accepted.cfg} - [2009/02/01 v1.2d siunitx: SI Accepted units] + [2009/02/04 v1.2e siunitx: SI Accepted units] \newunit{\minute}{min} \newunit{\hour}{h} \newunit{\Day}{d} @@ -11665,7 +11667,7 @@ author. % for a negative kern does make things a bit complicated. % \begin{macrocode} \ProvidesFile{si-physical.cfg} - [2009/02/01 v1.2d siunitx: SI Physically-measured units] + [2009/02/04 v1.2e 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% @@ -11701,7 +11703,7 @@ author. % own definitions. % \begin{macrocode} \ProvidesFile{si-synchem.cfg} - [2009/02/01 v1.2d siunitx: Units for synthetic chemists] + [2009/02/04 v1.2e siunitx: Units for synthetic chemists] \requiresiconfigs{prefix} \newunit{\mmHg}{mmHg} \newunit{\molar}{\mole\per\cubic\deci\metre} @@ -11722,7 +11724,7 @@ author. % Some units inspired by \pkg{hepunits}. % \begin{macrocode} \ProvidesFile{si-hep.cfg} - [2009/02/01 v1.2d siunitx: Units for high-energy physics] + [2009/02/04 v1.2e siunitx: Units for high-energy physics] \requiresiconfigs{prefix,named} % \end{macrocode} %\begin{macro}{\micron} @@ -11804,7 +11806,7 @@ author. % For astronomy, the \cs{parsec} unit is needed. % \begin{macrocode} \ProvidesFile{si-astro.cfg} - [2009/02/01 v1.2d siunitx: Units for astronomy] + [2009/02/04 v1.2e siunitx: Units for astronomy] \newunit{\parsec}{pc} \newunit{\lightyear}{ly} % \end{macrocode} @@ -11819,7 +11821,7 @@ author. % The unit \cs{gon} is useful here. % \begin{macrocode} \ProvidesFile{si-geophys.cfg} - [2009/02/01 v1.2d siunitx: Units for astronomy] + [2009/02/04 v1.2e siunitx: Units for astronomy] \newunit{\gon}{gon} % \end{macrocode} %\end{macro} @@ -11840,7 +11842,7 @@ author. % \SIunits. First, the binary prefixes. % \begin{macrocode} \ProvidesFile{si-binary.cfg} - [2009/02/01 v1.2d siunitx: Binary units] + [2009/02/04 v1.2e siunitx: Binary units] \newprefix[binary]{\kibi}{10}{Ki} \newprefix[binary]{\mebi}{20}{Mi} \newprefix[binary]{\gibi}{30}{Gi} @@ -11883,7 +11885,7 @@ author. % default values.\footnote{The package author is in the UK.} % \begin{macrocode} \ProvidesFile{si-UK.cfg} - [2009/02/01 v1.2d siunitx: UK locale] + [2009/02/04 v1.2e siunitx: UK locale] \sisetup{ unitsep=thin, expproduct=times, @@ -11900,7 +11902,7 @@ author. % The same as for the UK. % \begin{macrocode} \ProvidesFile{si-USA.cfg} - [2009/02/01 v1.2d siunitx: USA locale] + [2009/02/04 v1.2e siunitx: USA locale] \sisetup{ unitsep=thin, expproduct=times, @@ -11917,7 +11919,7 @@ author. % Germany, hopefully. % \begin{macrocode} \ProvidesFile{si-DE.cfg} - [2009/02/01 v1.2d siunitx: Germany locale] + [2009/02/04 v1.2e siunitx: Germany locale] \sisetup{ unitsep=cdot, valuesep=thin, @@ -11935,7 +11937,7 @@ author. % Design decisions taken from the same section of \SIstyle. % \begin{macrocode} \ProvidesFile{si-ZA.cfg} - [2009/02/01 v1.2d siunitx: South Africa locale] + [2009/02/04 v1.2e siunitx: South Africa locale] \sisetup{ unitsep=cdot, valuesep=thin, @@ -11967,7 +11969,7 @@ author. % \units for conflicting options, so users probably expect none. % \begin{macrocode} \ProvidesFile{si-units.cfg} - [2009/02/01 v1.2d siunitx: Emulation of units] + [2009/02/04 v1.2e siunitx: Emulation of units] \si@emulating{units}{1998/08/04 v0.9b} \si@ifloaded{SIunits} {\si@emclash{units}{SIunits}\endinput}{} @@ -12037,7 +12039,7 @@ author. % clash. % \begin{macrocode} \ProvidesFile{si-unitsdef.cfg} - [2009/02/01 v1.2d siunitx: + [2009/02/04 v1.2e siunitx: Emulation of unitsdef] \si@emulating{unitsdef}{2005/01/04 v0.2} \si@ifloaded{SIunits} @@ -12486,7 +12488,7 @@ author. % the macros in \SIstyle as given in the manual for that package. % \begin{macrocode} \ProvidesFile{si-sistyle.cfg} - [2009/02/01 v1.2d siunitx: Emulation of + [2009/02/04 v1.2e siunitx: Emulation of SIstyle] \si@emulating{sistyle}{2006/12/20 v2.3} \sisetup{% @@ -12670,7 +12672,7 @@ author. % \SIunits emulation starts in much the same way. % \begin{macrocode} \ProvidesFile{si-SIunits.cfg} - [2009/02/01 v1.2d siunitx: Emulation of + [2009/02/04 v1.2e siunitx: Emulation of SIunits] \si@emulating{SIunits}{2007/12/02 v1.36} \sisetup{ @@ -13233,7 +13235,7 @@ author. % which are not really to be encouraged. % \begin{macrocode} \ProvidesFile{si-hepunits.cfg} - [2009/02/01 v1.2d siunitx: Emulation of + [2009/02/04 v1.2e siunitx: Emulation of hepunits] \si@emulating{hepunits}{2007/09/27} \requiresiconfigs{SIunits,accepted,prefix,hep} @@ -13388,7 +13390,7 @@ author. % a little emulation and a few macros needed. % \begin{macrocode} \ProvidesFile{si-fancynum.cfg} - [2009/02/01 v1.2d siunitx: Emulation of + [2009/02/04 v1.2e siunitx: Emulation of fancynum] \si@emulating{fancynum}{2000/08/08 0.92} \sisetup{decimalsymbol=cdot,digitsep=comma} @@ -13450,7 +13452,7 @@ author. % test is needed. % \begin{macrocode} \ProvidesFile{si-fancyunits.cfg} - [2009/02/01 v1.2d siunitx: Emulation of + [2009/02/04 v1.2e siunitx: Emulation of fancyunits] \si@emulating{fancyunits}{2007/02/01 v1.0.1} \si@ifloaded{SIunits} |