summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/source/latex/siunitx/siunitx.dtx')
-rw-r--r--Master/texmf-dist/source/latex/siunitx/siunitx.dtx121
1 files changed, 75 insertions, 46 deletions
diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
index 860412b9196..774458858ea 100644
--- a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
+++ b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
@@ -222,7 +222,7 @@ dcolumn, rccol and numprint packages.
%</driver>
% \fi
%
-%\CheckSum{10084}
+%\CheckSum{10109}
%
% \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
@@ -393,7 +393,7 @@ dcolumn, rccol and numprint packages.
% values with control of appearance and with intelligent processing.
%
% By default, all text is typeset in the current upright, serif maths
-% font. This can be changes by setting the appropriate package
+% font. This can be changed by setting the appropriate package
% options: \opt{obeyall} will use the current font for typesetting.
%
% The package includes a ``unit processor'', which allows the use of
@@ -594,8 +594,8 @@ dcolumn, rccol and numprint packages.
% to \opt{left} and \opt{right}, with the expected results.
%\begin{LaTeXexample}[float]
% \begin{table}
-% \caption{Behaviour of \texttt{S} column type
-% \label{tab:default}}
+% \caption{Behaviour of \texttt{S} column type}
+% \label{tab:default}
% \centering
% \begin{tabular}{%
% S%
@@ -622,14 +622,14 @@ dcolumn, rccol and numprint packages.
% move across as needed. Space for signs is added by using any sign
% in the \opt{tabformat}, so for example \opt{tabformat=+2.2} and
% \opt{tabformat=-2.2} have exactly the same effect. Setting
-% \opt{tabformat} will automatically switch from \opt{tabnumalign}
-% from \opt{centredecimal} to \opt{centre}, if the former is
+% \opt{tabformat} will automatically switch \opt{tabnumalign} from
+% \opt{centredecimal} to \opt{centre}, if the former is
% currently set. In other cases, the current alignment option is
% retained.
%\begin{LaTeXexample}[float]
% \begin{table}
-% \caption{Exponents in tables
-% \label{tab:exptab}}
+% \caption{Exponents in tables}
+% \label{tab:exptab}
% \centering
% \begin{tabular}{%
% S[tabnumalign=right,tabformat=2.2e2]%
@@ -825,7 +825,7 @@ dcolumn, rccol and numprint packages.
% \SI{10}{\kilo\gram\metre\per\second\squared}\\
% \SI{1.453}{\gram\per\cubic\centi\metre}\\
% \SI{33.562}{\candela\second}\\
-% \SI[unitsep=thin]{100}{\metre\per\Square\second}\\
+% \SI[unitsep=medium]{100}{\metre\per\Square\second}\\
% \SI[prefixsymbolic=false]{4.56}{\kilo\metre\per\second}
%\end{LaTeXexample}
% On its own, this is very similar to \SIunits, and is less
@@ -908,7 +908,7 @@ dcolumn, rccol and numprint packages.
%\end{LaTeXexample}
%
%\subsection{Free-standing units}
-% Users of the \unitsdef package will be a accustomed to using unit
+% Users of the \unitsdef package will be accustomed to using unit
% macros on their own (following a value) or with an optional
% argument containing a number. In both cases, only a single unit
% macro could be used. \currpkg supports both operation modes, with
@@ -1217,8 +1217,12 @@ dcolumn, rccol and numprint packages.
% square kilometre & \csindex{squarekilometre} & \squarekilometre \\
%
% \tablesubhead{Volumes}
+%\changes{v1.1d}{2008/10/29}{New units \cs{micoliter}, \cs{milliliter},
+% \cs{micL} and \cs{mL}}
% \unitinfo{microlitre} & \csindex{micl} \\
% \unitinfo{millilitre} & \csindex{ml} \\
+% \unitinfo{microliter} & \csindex{micL} \\
+% \unitinfo{milliliter} & \csindex{mL} \\
% cubic centimetre & \csindex{cubiccentimetre} &
% \cubiccentimetre & \csindex{cmc} \\*
% & \csindex{centimetrecubed} & \centimetrecubed \\
@@ -1728,7 +1732,7 @@ dcolumn, rccol and numprint packages.
% \opt{stop} and \opt{period}.} Notice that this does not have to
% agree with the input marker. The other separator for numerical
% output is the division of digits into groups of three. The result
-% is dependant on two options. The previously-described
+% is dependent on two options. The previously-described
% \opt{digitsep} option controls the spacing added between groups of
% three numbers. For numbers consisting of exactly four digits, the
% \opt{sepfour} Boolean option controls whether separation occurs in
@@ -1863,9 +1867,9 @@ dcolumn, rccol and numprint packages.
%\DescribeOption{dp}
% In contrast to the \opt{padnumber} option, the package can alter
% the precision of the input number if the \opt{fixdp} option is set.
-% The will fix the decimal places of the output to the number stored
-% in the \opt{dp} option. The later should be a positive integer or
-% zero.
+% The \opt{fixdp} option will fix the decimal places of the output to
+% the number stored in the \opt{dp} option. The later should be a
+% positive integer or zero.
%\begin{LaTeXexample}
% \sisetup{fixdp,dp=3}
% \num{1}\\
@@ -1980,6 +1984,9 @@ dcolumn, rccol and numprint packages.
% \opt{numexp}, respectively.
%
%\DescribeOption{tabalignexp}
+%\DescribeOption{tabexpalign}
+%\changes{v1.1d}{2008/10/29}{Added \opt{tabexpalign} as an alias for
+% \opt{tabalignexp}}
% When \opt{tabformat} contains exponents, two possibilities are
% available for alignment. The first method is to place the exponent
% parts so that the ``$\times 10$'' parts form a column, with
@@ -1987,7 +1994,8 @@ dcolumn, rccol and numprint packages.
% method, no additional space is added after the mantissa, and the
% exponents do no line up (\ref{tab:alignexp}). This is controlled
% by the \opt{tabalignexp} option, which can be set to
-% \defaultopt{true} or \opt{false}.
+% \defaultopt{true} or \opt{false}. The alias \opt{tabexpalign} is
+% available for this option.
%\begin{LaTeXexample}[float]
% \begin{table}
% \centering
@@ -2023,7 +2031,7 @@ dcolumn, rccol and numprint packages.
%\DescribeOption{tabautofit}
% The contents of table cells can automatically be rounded or
% zero-filled to the number of decimal places given in
-% \opt{tabformat}. The is activated by the \opt{tabautofit} Boolean
+% \opt{tabformat}. This is activated by the \opt{tabautofit} Boolean
% option. As \opt{tabformat} does not apply to columns with alignment
% \opt{centredecimal}, \opt{tabautofit} is also inactive for these
% columns (\ref{tab:autofit}).
@@ -2150,7 +2158,7 @@ dcolumn, rccol and numprint packages.
% However, the package can convert these into numerical
% powers.\footnote{Provided things are not too complex!} This is
% controlled by the \opt{prefixsymbolic} Boolean option, which by
-% default is \defaultopt{true}. If \opt{prefixsymboli} is set to
+% default is \defaultopt{true}. If \opt{prefixsymbolic} is set to
% \opt{false}, the format of the prefix is controlled by
% \opt{prefixbase} and \opt{prefixproduct}, which work in the same
% way as \opt{expbase} and \opt{expproduct}.
@@ -2398,7 +2406,7 @@ dcolumn, rccol and numprint packages.
% errspace & List & Spacing of bracketed error \\
% eVcorra & Length & Spacing correction in \eV \\
% eVcorrb & Length & Spacing correction after \eV \\
-% expbase & List or Literal & Base used for exponents \\
+% expbase & List or literal & Base used for exponents \\
% expproduct & List or literal & Product sign for exponents \\
% fixdp & Boolean & Switch for fixing decimal \\
% & & places of numbers \\
@@ -2498,6 +2506,7 @@ dcolumn, rccol and numprint packages.
% tabformat & Number & Space reserved in table for numbers \\
% tabnumalign & List & Alignment of |S| column numbers \\
% tabparseonly & Boolean & Do not align |S| columns \\
+% & & on decimal marker \\
% tabtextalign & List & Positioning of text in |S| columns \\
% tabunitalign & List & Positioning of units in |s| columns \\
% textcelsius & Literal & ``$^{\circ}$C'' symbol in text mode \\
@@ -2557,7 +2566,7 @@ dcolumn, rccol and numprint packages.
% (or \cs{np}) macro can be reproduced using \currpkg. However,
% \numprint is large and complex, with its own backward-compatibility
% options. As a result, emulation of \numprint is not provided here.
-% To use an \numprint document with \currpkg, the \cs{numprint} macro
+% To use a \numprint document with \currpkg, the \cs{numprint} macro
% could be provided using the following code.
%^^A Need to deal with \cs{numprint} being defined.
%\let\numprint\relax
@@ -2762,7 +2771,7 @@ dcolumn, rccol and numprint packages.
% \sisetup{obeyfamily=false,mathrm=mathsf,textrm=sffamily}
% \num{1e2} \\
% \SI{3}{\newton}
-% \[ \num{4e5} \si{\pascal} \]
+% \[ \SI{4e5}{\pascal} \]
%\end{LaTeXexample}
%
%\subsection{Effects of emulation}
@@ -2781,9 +2790,9 @@ dcolumn, rccol and numprint packages.
% may happen: use with care!
%\begin{LaTeXexample}[float]
% \begin{table}
+% \centering
% \caption{Non-standard \texttt{S} column}
% \label{tab:dcolumn}
-% \centering
% \begin{tabular}{%
% S[digitsep=none,decimalsymbol={\,\pm\,},
% numdigits={0123456789.},numdecimal=+]}
@@ -2808,9 +2817,9 @@ dcolumn, rccol and numprint packages.
% \cs{protected}).
%\begin{LaTeXexample}[float]
% \begin{table}
+% \centering
% \caption{Values as macros}
% \label{tab:vmacros}
-% \centering
% \newcommand*{\myvala}{1.234}%
% \newcommand*{\myvalb}{20.345}%
% \newcommand*{\myvalc}{0.987654}%
@@ -3194,7 +3203,7 @@ author.
%\end{LaTeXexample}
%
%\subsection{Graphs and tables}
-% In tables and graphs, repetition of the units following each entry
+% In graphs and tables, repetition of the units following each entry
% or axis mark is confusing and repetitive. It is therefore best to
% place the unit in the label part of the information. Placing the
% unit in square brackets is common but mathematically
@@ -3314,7 +3323,7 @@ author.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{siunitx}
- [2008/10/22 v1.1c A comprehensive (SI) units package]
+ [2008/10/29 v1.1d A comprehensive (SI) units package]
% \end{macrocode}
% The package requires \eTeX, so the usual test is made.
% \begin{macrocode}
@@ -4482,6 +4491,12 @@ author.
% A switch for aligning exponents.
% \begin{macrocode}
\si@opt@boolkey{tabalignexp}
+\si@opt@boolkey[%
+ \si@tabalignexpfalse
+ \ifsi@tabexpalign
+ \expandafter\si@tabalignexptrue
+ \fi
+ ]{tabexpalign}
% \end{macrocode}
%\end{macro}
%\begin{macro}{\si@tab@mantprecnt}
@@ -4711,6 +4726,7 @@ author.
\si@opt@boolkey{allowoptarg}
% \end{macrocode}
%\end{macro}
+%\changes{v1.1d}{2008/10/29}{Minor bug with \opt{per} option fixed}
%\begin{macro}{\ifsi@frac}
%\begin{macro}{\ifsi@slash}
%\begin{macro}{\ifsi@stickyper}
@@ -4724,6 +4740,7 @@ author.
{reciprocal,rp,power,slash,frac,fraction}
{\si@slashfalse
\si@fracfalse
+ \let\si@frac\si@frc@frac
\renewcommand*{\si@tempb}{slash}%
\ifx\si@tempa\si@tempb
\si@fractrue
@@ -10645,7 +10662,7 @@ author.
% powers.
% \begin{macrocode}
\ProvidesFile{si-prefix.cfg}
- [2008/10/22 v1.1c siunitx: SI Multiple prefixes]
+ [2008/10/29 v1.1d siunitx: SI Multiple prefixes]
\newprefix{\yocto}{-24}{y}
\newprefix{\zepto}{-21}{z}
\newprefix{\atto}{-18}{a}
@@ -10749,7 +10766,7 @@ author.
% is an awkward one, but here the UK standard is used.
% \begin{macrocode}
\ProvidesFile{si-named.cfg}
- [2008/10/22 v1.1c siunitx: SI Named units]
+ [2008/10/29 v1.1d siunitx: SI Named units]
\newunit{\becquerel}{Bq}
\newunit{\coulomb}{C}
\newunit{\farad}{F}
@@ -10845,7 +10862,7 @@ author.
% This requires \file{si-prefix.cfg} and \file{si-named.cfg}.
% \begin{macrocode}
\ProvidesFile{si-prefixed.cfg}
- [2008/10/22 v1.1c siunitx: SI Prefixed units]
+ [2008/10/29 v1.1d siunitx: SI Prefixed units]
\requiresiconfigs{prefix,named,accepted,physical}
% \end{macrocode}
%\begin{macro}{\picometre}
@@ -11006,6 +11023,8 @@ author.
%\end{macro}
%\begin{macro}{\microlitre}
%\begin{macro}{\millilitre}
+%\begin{macro}{\microliter}
+%\begin{macro}{\milliliter}
%\begin{macro}{\cubicmetre}
%\begin{macro}{\cubiccentimetre}
%\begin{macro}{\centimetrecubed}
@@ -11018,6 +11037,8 @@ author.
% \begin{macrocode}
\newunit{\microlitre}{\micro\litre}
\newunit{\millilitre}{\milli\litre}
+\newunit{\microliter}{\micro\liter}
+\newunit{\milliliter}{\milli\liter}
\newunit{\cubicmetre}{\metre\cubed}
\newunit{\cubiccentimetre}{\centi\metre\cubed}
\newunit{\centimetrecubed}{\centi\metre\cubed}
@@ -11033,6 +11054,8 @@ author.
%\end{macro}
%\end{macro}
%\end{macro}
+%\end{macro}
+%\end{macro}
%\begin{macro}{\squaremetre}
%\begin{macro}{\squarecentimetre}
%\begin{macro}{\centimetresquared}
@@ -11131,7 +11154,7 @@ author.
% block for the appropriate option. First currents.
% \begin{macrocode}
\ProvidesFile{si-abbr.cfg}
- [2008/10/22 v1.1c siunitx: Abbreviated units]
+ [2008/10/29 v1.1d siunitx: Abbreviated units]
\requiresiconfigs{prefix,named,accepted,physical}
\newunit{\pA}{\pico\ampere}
\newunit{\nA}{\nano\ampere}
@@ -11194,6 +11217,8 @@ author.
%\end{macro}
%\begin{macro}{\ml}
%\begin{macro}{\micl}
+%\begin{macro}{\mL}
+%\begin{macro}{\micL}
%\begin{macro}{\cmc}
%\begin{macro}{\dmc}
%\begin{macro}{\cms}
@@ -11201,6 +11226,8 @@ author.
% \begin{macrocode}
\provideunit{\ml}{\milli\litre}
\provideunit{\micl}{\micro\litre}
+\provideunit{\mL}{\milli\liter}
+\provideunit{\micL}{\micro\liter}
\newunit{\cmc}{\centi\metre\cubed}
\newunit{\dmc}{\deci\metre\cubed}
\newunit{\cms}{\centi\metre\squared}
@@ -11210,6 +11237,8 @@ author.
%\end{macro}
%\end{macro}
%\end{macro}
+%\end{macro}
+%\end{macro}
%\begin{macro}{\fg}
%\begin{macro}{\SIfg}
%\begin{macro}{\kg}
@@ -11344,7 +11373,7 @@ author.
% These are defined here, although some are in very general use.
% \begin{macrocode}
\ProvidesFile{si-addn.cfg}
- [2008/10/22 v1.1c siunitx: SI Additional units]
+ [2008/10/29 v1.1d siunitx: SI Additional units]
\newunit{\angstrom}{\si@sym@ringA}
\newunit{\are}{a}
\newunit{\hectare}{\hecto\are}
@@ -11394,7 +11423,7 @@ author.
%\begin{macro}{\percent}
% \begin{macrocode}
\ProvidesFile{si-accepted.cfg}
- [2008/10/22 v1.1c siunitx: SI Accepted units]
+ [2008/10/29 v1.1d siunitx: SI Accepted units]
\newunit{\minute}{min}
\newunit{\hour}{h}
\newunit{\Day}{d}
@@ -11443,7 +11472,7 @@ author.
% for a negative kern does make things a bit complicated.
% \begin{macrocode}
\ProvidesFile{si-physical.cfg}
- [2008/10/22 v1.1c siunitx: SI Physically-measured units]
+ [2008/10/29 v1.1d 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%
@@ -11479,7 +11508,7 @@ author.
% own definitions.
% \begin{macrocode}
\ProvidesFile{si-synchem.cfg}
- [2008/10/22 v1.1c siunitx: Units for synthetic chemists]
+ [2008/10/29 v1.1d siunitx: Units for synthetic chemists]
\requiresiconfigs{prefix}
\newunit{\mmHg}{mmHg}
\newunit{\molar}{\mole\per\cubic\deci\metre}
@@ -11500,7 +11529,7 @@ author.
% Some units inspired by \pkg{hepunits}.
% \begin{macrocode}
\ProvidesFile{si-hep.cfg}
- [2008/10/22 v1.1c siunitx: Units for high-energy physics]
+ [2008/10/29 v1.1d siunitx: Units for high-energy physics]
\requiresiconfigs{prefix,named}
% \end{macrocode}
%\begin{macro}{\micron}
@@ -11582,7 +11611,7 @@ author.
% For astronomy, the \cs{parsec} unit is needed.
% \begin{macrocode}
\ProvidesFile{si-astro.cfg}
- [2008/10/22 v1.1c siunitx: Units for astronomy]
+ [2008/10/29 v1.1d siunitx: Units for astronomy]
\newunit{\parsec}{pc}
\newunit{\lightyear}{ly}
% \end{macrocode}
@@ -11605,7 +11634,7 @@ author.
% \SIunits. First, the binary prefixes.
% \begin{macrocode}
\ProvidesFile{si-binary.cfg}
- [2008/10/22 v1.1c siunitx: Binary units]
+ [2008/10/29 v1.1d siunitx: Binary units]
\newprefix[binary]{\kibi}{10}{Ki}
\newprefix[binary]{\mebi}{20}{Mi}
\newprefix[binary]{\gibi}{30}{Gi}
@@ -11648,7 +11677,7 @@ author.
% default values.\footnote{The package author is in the UK.}
% \begin{macrocode}
\ProvidesFile{si-UK.cfg}
- [2008/10/22 v1.1c siunitx: UK locale]
+ [2008/10/29 v1.1d siunitx: UK locale]
\sisetup{
unitsep=thin,
expproduct=times,
@@ -11665,7 +11694,7 @@ author.
% The same as for the UK.
% \begin{macrocode}
\ProvidesFile{si-USA.cfg}
- [2008/10/22 v1.1c siunitx: USA locale]
+ [2008/10/29 v1.1d siunitx: USA locale]
\sisetup{
unitsep=thin,
expproduct=times,
@@ -11682,7 +11711,7 @@ author.
% Germany, hopefully.
% \begin{macrocode}
\ProvidesFile{si-DE.cfg}
- [2008/10/22 v1.1c siunitx: Germany locale]
+ [2008/10/29 v1.1d siunitx: Germany locale]
\sisetup{
unitsep=cdot,
valuesep=thin,
@@ -11699,7 +11728,7 @@ author.
% Design decisions taken from the same section of \SIstyle.
% \begin{macrocode}
\ProvidesFile{si-ZA.cfg}
- [2008/10/22 v1.1c siunitx: South Africa locale]
+ [2008/10/29 v1.1d siunitx: South Africa locale]
\sisetup{
unitsep=cdot,
valuesep=thin,
@@ -11731,7 +11760,7 @@ author.
% \units for conflicting options, so users probably expect none.
% \begin{macrocode}
\ProvidesFile{si-units.cfg}
- [2008/10/22 v1.1c siunitx: Emulation of units]
+ [2008/10/29 v1.1d siunitx: Emulation of units]
\si@emulating{units}{1998/08/04 v0.9b}
\si@ifloaded{SIunits}
{\si@emclash{units}{SIunits}\endinput}{}
@@ -11801,7 +11830,7 @@ author.
% clash.
% \begin{macrocode}
\ProvidesFile{si-unitsdef.cfg}
- [2008/10/22 v1.1c siunitx:
+ [2008/10/29 v1.1d siunitx:
Emulation of unitsdef]
\si@emulating{unitsdef}{2005/01/04 v0.2}
\si@ifloaded{SIunits}
@@ -12250,7 +12279,7 @@ author.
% the macros in \SIstyle as given in the manual for that package.
% \begin{macrocode}
\ProvidesFile{si-sistyle.cfg}
- [2008/10/22 v1.1c siunitx: Emulation of
+ [2008/10/29 v1.1d siunitx: Emulation of
SIstyle]
\si@emulating{sistyle}{2006/12/20 v2.3}
\sisetup{%
@@ -12434,7 +12463,7 @@ author.
% \SIunits emulation starts in much the same way.
% \begin{macrocode}
\ProvidesFile{si-SIunits.cfg}
- [2008/10/22 v1.1c siunitx: Emulation of
+ [2008/10/29 v1.1d siunitx: Emulation of
SIunits]
\si@emulating{SIunits}{2007/12/02 v1.36}
\sisetup{
@@ -12997,7 +13026,7 @@ author.
% which are not really to be encouraged.
% \begin{macrocode}
\ProvidesFile{si-hepunits.cfg}
- [2008/10/22 v1.1c siunitx: Emulation of
+ [2008/10/29 v1.1d siunitx: Emulation of
hepunits]
\si@emulating{hepunits}{2007/09/27}
\requiresiconfigs{SIunits,accepted,prefix,hep}
@@ -13152,7 +13181,7 @@ author.
% a little emulation and a few macros needed.
% \begin{macrocode}
\ProvidesFile{si-fancynum.cfg}
- [2008/10/22 v1.1c siunitx: Emulation of
+ [2008/10/29 v1.1d siunitx: Emulation of
fancynum]
\si@emulating{fancynum}{2000/08/08 0.92}
\sisetup{decimalsymbol=cdot,digitsep=comma}
@@ -13214,7 +13243,7 @@ author.
% test is needed.
% \begin{macrocode}
\ProvidesFile{si-fancyunits.cfg}
- [2008/10/22 v1.1c siunitx: Emulation of
+ [2008/10/29 v1.1d siunitx: Emulation of
fancyunits]
\si@emulating{fancyunits}{2007/02/01 v1.0.1}
\si@ifloaded{SIunits}