diff options
author | Karl Berry <karl@freefriends.org> | 2009-09-21 22:38:39 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2009-09-21 22:38:39 +0000 |
commit | 88d26d8a8079d7b343841bb875a83f89cb27e050 (patch) | |
tree | 515ad870d624c2aca1b0647461f10fa329edeb13 /Master/texmf-dist/source/latex | |
parent | 2e4d31558c3c1ccae16e6c670be84b3757a609c0 (diff) |
siunitx 1.3a (21sep09)
git-svn-id: svn://tug.org/texlive/trunk@15408 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex')
-rw-r--r-- | Master/texmf-dist/source/latex/siunitx/siunitx.dtx | 410 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/siunitx/siunitx.ins | 92 |
2 files changed, 189 insertions, 313 deletions
diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx index bd8e96a50c8..daaaaf3edaa 100644 --- a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx +++ b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx @@ -1,130 +1,88 @@ % \iffalse meta-comment -% -% !TEX encoding = ISO-8859-1 % !TEX program = pdflatex -% -% Copyright (C) 2008-09 by -% Joseph Wright <joseph.wright@morningstar2.co.uk> -% -% This work may be distributed and/or modified under the -% conditions of the LaTeX Project Public License, either -% version 1.3c of this license or (at your option) any later -% version. The latest version of this license is in -% http://www.latex-project.org/lppl.txt -% and version 1.3c or later is part of all distributions of -% LaTeX version 2005/12/01 or later. -% -% This work has the LPPL maintenance status `maintained'. -% -% The current maintainer of this work is Joseph Wright. -% -% This work consists of the source file siunitx.dtx -% and the derived files siunitx.ins, -% siunitx.sty, -% jawltxdoc.sty, -% si-bug.tex, -% si-SIunits.cfg, -% si-sistyle.cfg, -% si-unitsdef.cfg, -% si-units.cfg, -% si-hepunits.cfg, -% si-fancynum.cfg, -% si-fancyunits.cfg, -% si-prefix.cfg, -% si-named.cfg, -% si-prefixed.cfg, -% si-addn.cfg, -% si-accepted.cfg, -% si-physical.cfg, -% si-abbr.cfg, -% si-synchem.cfg, -% si-hep.cfg, -% si-astro.cfg, -% si-geophys.cfg, -% si-chemeng.cfg, -% si-binary.cfg, -% si-UK.cfg, -% si-USA.cfg, -% si-DE.cfg, -% si-ZA.cfg, -% siunitx.bib and -% siunitx.pdf -% -% TDS-ready files: -% The compressed file siunitx.tds.zip contains an unpacked version -% of all of the files included here, and pre-compiled -% documentation in PDF format. Simply decompress siunitx.tds.dtx -% in your local TeX directory, run your hash program (texhash, -% initexmf --update-fndb, etc.) and everything will be ready to -% go. -% -% Unpacking: -% (a) If siunitx.ins is present: -% tex siunitx.ins -% (b) Without siunitx.ins: -% tex siunitx.dtx -% (c) If you use LaTeX to generate files: -% latex \let\install=y\input{siunitx.dtx} -% -% Documentation: -% (a) Without write18 enabled: -% pdflatex siunitx.dtx -% bibtex8 --wolfgang siunitx -% makeindex -s gind.ist siunitx.idx -% makeindex -s gglo.ist -o siunitx.gls siunitx.glo -% pdflatex siunitx.dtx -% pdflatex siunitx.dtx -% (b) With write18 enabled: -% pdflatex siunitx.dtx -% pdflatex siunitx.dtx -% pdflatex siunitx.dtx -% -% Installation: -% Copy siunitx.sty and the various .cfg files to a location -% searched by TeX, and if required by your TeX installation, -% run the appropriate command to build a hash of files -% (texhash, initexmf --update-fndb, etc.) -% -% Note: -% The jawltxdoc.sty file is not needed for installation, -% only for building the documentation; it may be deleted -% after producing the documentation (if necessary). -% -%<*ignore> -% This is all taken verbatim from Heiko Oberdiek's packages -\begingroup - \def\x{LaTeX2e}% -\expandafter\endgroup -\ifcase 0\ifx\install y1\fi\expandafter - \ifx\csname processbatchFile\endcsname\relax\else1\fi - \ifx\fmtname\x\else 1\fi\relax -\else\csname fi\endcsname -%</ignore> +% !TEX encoding = iso-8859-1 +%<*internal> +\iffalse +%</internal> +%<*readme> +---------------------------------------------------------------- +The siunitx package --- A comprehensive (SI) units package +Maintained by Joseph Wright +E-mail: joseph.wright@morningstar2.co.uk +Released under the LaTeX Project Public License v1.3c or later +See http://www.latex-project.org/lppl.txt +---------------------------------------------------------------- + +Typesetting values with units requires care to ensure that the +combined mathematical meaning of the value plus unit combination +is clear. In particular, the SI units system lays down a +consistent set of units with rules on how these are to be used. +However, different countries and publishers have differing +conventions on the exact appearance of numbers (and units). + +The siunitx package provides a set of tools for authors to +typeset numbers and units in a consistent way. The package has +an extended set of configuration options which make it possible +to follow varying typographic conventions with the same input +syntax. The package includes automated processing of numbers +and units, and the ability to control tabular alignment of +numbers. + +A number of LaTeX packages have been developed in the past for +formatting units: SIunits, sistyle, unitsdef, units, fancyunits +and fancynum. Support for users of all of these packages is +available as emulation modules in siunitx. In addition, siunitx +can carry out many of the functions of the dcolumn, rccol and +numprint packages +%</readme> +%<*internal> +\fi +\def\nameofplainTeX{plain} +\ifx\fmtname\nameofplainTeX\else + \expandafter\begingroup +\fi +%</internal> %<*install> \input docstrip.tex \keepsilent \askforoverwritefalse \preamble - ---------------------------------------------------------------- - The siunitx package --- A comprehensive (SI) units package - Maintained by Joseph Wright - E-mail: joseph.wright@morningstar2.co.uk - Released under the LaTeX Project Public License v1.3c or later - See http://www.latex-project.org/lppl.txt - ---------------------------------------------------------------- +--------------------------------------------------------------- +The siunitx package --- A comprehensive (SI) units package +Maintained by Joseph Wright +E-mail: joseph.wright@morningstar2.co.uk +Released under the LaTeX Project Public License v1.3c or later +See http://www.latex-project.org/lppl.txt +--------------------------------------------------------------- \endpreamble -\Msg{Generating siunitx files:} -\generate{\file{jawltxdoc.sty}{\from{\jobname.dtx}{jawltxdoc}} -} +\postamble + +Copyright (C) 2008-2009 by + Joseph Wright <joseph.wright@morningstar2.co.uk> + +It may be distributed and/or modified under the conditions of +the LaTeX Project Public License (LPPL), either version 1.3c of +this license or (at your option) any later version. The latest +version of this license is in the file: + + http://www.latex-project.org/lppl.txt + +This work is "maintained" (as per LPPL maintenance status) by + Joseph Wright. + +This work consists of the file siunitx.dtx + and the derived files siunitx.pdf, + siunitx.sty + siunitx.bib, + siunitx.ins, + siunitx-bug.tex and + various .cfg files. + +\endpostamble \usedir{tex/latex/siunitx} -\generate{\file{\jobname.sty}{\from{\jobname.dtx}{package}} -} -\usedir{source/latex/siunitx} -\generate{\file{\jobname.ins}{\from{\jobname.dtx}{install}} -} -\usedir{doc/latex/siunitx} -\generate{\file{si-bug.tex}{\from{\jobname.dtx}{bug}} +\generate{ + \file{\jobname.sty}{\from{\jobname.dtx}{package}} } \usedir{tex/latex/siunitx/config} \generate{\file{si-SIunits.cfg}{\from{\jobname.dtx}{SIunits}} @@ -155,65 +113,39 @@ \file{si-DE.cfg}{\from{\jobname.dtx}{DE}} \file{si-ZA.cfg}{\from{\jobname.dtx}{ZA}} } +%</install> +%<install>\endbatchfile +%<*internal> +\generate{ + \file{jawltxdoc.sty}{\from{\jobname.dtx}{jawltxdoc}} +} +\usedir{source/latex/siunitx} +\generate{ + \file{\jobname.ins}{\from{\jobname.dtx}{install}} +} \nopreamble\nopostamble \usedir{doc/latex/siunitx} -\generate{\file{README.txt}{\from{\jobname.dtx}{readme}} - \file{\jobname.bib}{\from{\jobname.dtx}{refs}} +\generate{ + \file{\jobname-bug.tex}{\from{\jobname.dtx}{bug}} + \file{\jobname.bib}{\from{\jobname.dtx}{refs}} + \file{README.txt}{\from{\jobname.dtx}{readme}} } -\endbatchfile -%</install> -%<*readme> ----------------------------------------------------------------- -The siunitx package --- A comprehensive (SI) units package -Maintained by Joseph Wright -E-mail: joseph.wright@morningstar2.co.uk -Released under the LaTeX Project Public License v1.3c or later -See http://www.latex-project.org/lppl.txt ----------------------------------------------------------------- - -Typesetting values with units requires care to ensure that the -combined mathematical meaning of the value plus unit combination -is clear. In particular, the SI units system lays down a -consistent set of units with rules on how these are to be used. -However, different countries and publishers have differing -conventions on the exact appearance of numbers (and units). - -The siunitx provides a set of tools for authors to typeset -numbers and units in a consistent way. The package has an -extended set of configuration options which make it possible to -follow varying typographic conventions with the same input -syntax. The package includes automated processing of numbers -and units, and the ability to control tabular alignment of -numbers. - -A number of LaTeX packages have been developed in the past for -formatting units: SIunits, sistyle, unitsdef, unitspkg, -fancyunits and fancynum. Support for users of all of these -packages is available as emulation modules in siunitx. In -addition, siunitx can carry out many of the functions of the -dcolumn, rccol and numprint packages. -%</readme> -%<*ignore> +\ifx\fmtname\nameofplainTeX + \expandafter\endbatchfile +\else + \expandafter\endgroup \fi -% Will Robertson's trick -\immediate\write18{bibtex8 --wolfgang \jobname} -\immediate\write18{makeindex -s gind.ist -o \jobname.ind \jobname.idx} -\immediate\write18{makeindex -s gglo.ist -o \jobname.gls \jobname.glo} -%</ignore> +%</internal> %<*driver> +%\fi +%\iffalse \PassOptionsToClass{a4paper}{article} \documentclass[german,english,UKenglish]{ltxdoc} \EnableCrossrefs \CodelineIndex \RecordChanges -%\OnlyDescription -% Various adjustments are needed to the packages loaded. xfrac is -% only loaded if it is available. \usepackage[final]{graphicx} -% Currently, xfrac is not working with expl3! -%\IfFileExists{xfrac.sty} -% {\usepackage{xfrac}} -% {} +\IfFileExists{xfrac.sty}{\usepackage{xfrac}}{} \usepackage{jawltxdoc} \usepackage{textcomp,tikz,pgfplots,tocloft,datatool} \usepackage[latin1]{inputenc} @@ -229,78 +161,8 @@ dcolumn, rccol and numprint packages. %</driver> % \fi % -%\CheckSum{10260} -% -% \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 -% Lower-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 -% Digits \0\1\2\3\4\5\6\7\8\9 -% Exclamation \! Double quote \" Hash (number) \# -% Dollar \$ Percent \% Ampersand \& -% Acute accent \' Left paren \( Right paren \) -% Asterisk \* Plus \+ Comma \, -% Minus \- Point \. Solidus \/ -% Colon \: Semicolon \; Less than \< -% Equals \= Greater than \> Question mark \? -% Commercial at \@ Left bracket \[ Backslash \\ -% Right bracket \] Circumflex \^ Underscore \_ -% Grave accent \` Left brace \{ Vertical bar \| -% Right brace \} Tilde \~} -% %\GetFileInfo{\jobname.sty} % -%\DoNotIndex{\@car,\@eha,\@ehc,\@empty,\@firstofone,\@firstoftwo} -%\DoNotIndex{\@for,\@gobble,\@gobbletwo,\@ifl@aded,\@ifnextchar} -%\DoNotIndex{\@ifpackagelater,\@ifpackageloaded,\@ifstar} -%\DoNotIndex{\@ifundefined,\@makeother,\@namedef,\@nameuse,\@ne} -%\DoNotIndex{\@nil,\@secondoftwo,\@temptokena,\@undefined,\AA} -%\DoNotIndex{\active,\addto,\addtolength,\advance,\afterassignment} -%\DoNotIndex{\aftergroup,\AtBeginDocument,\AtEndOfPackage} -%\DoNotIndex{\begingroup,\bfseries,\bgroup,\boldmath,\box} -%\DoNotIndex{\capitalring,\catcode,\cdot,\chardef,\check@mathfonts} -%\DoNotIndex{\circ,\csname,\DeclareFontEncoding,\DeclareFontFamily} -%\DoNotIndex{\DeclareFontShape,\DeclareFontSubstitution} -%\DoNotIndex{\DeclareMathSymbol,\DeclareRobustCommand} -%\DoNotIndex{\DeclareSymbolFont,\DeclareTextSymbol} -%\DoNotIndex{\DeclareTextSymbolDefault,\def,\define@boolkey} -%\DoNotIndex{\define@choicekey,\define@cmdkey,\define@cmdkeys} -%\DoNotIndex{\define@key,\displaystyle,\displaywidth,\divide,\do} -%\DoNotIndex{\edef,\egroup,\else,\encodingdefault,\end,\endcsname} -%\DoNotIndex{\endgroup,\endinput,\endtabular,\ensuremath} -%\DoNotIndex{\expandafter,\f@family,\f@series,\fam,\fi,\font} -%\DoNotIndex{\fontsize,\frac,\gdef,\global,\hbox,\hfil,\hfill,\hskip} -%\DoNotIndex{\hspace,\hss,\ifcsname,\ifdim,\iffalse,\IfFileExists} -%\DoNotIndex{\ifmmode,\ifnum,\ifx,\ignorespaces,\inputencodingname} -%\DoNotIndex{\InputIfFileExists,\key@ifundefine,\let,\long,\m@ne} -%\DoNotIndex{\makeatletter,\math@version,\mathchoice,\mathnormal} -%\DoNotIndex{\mathord,\mathrm,\mathsf,\mathtt,\mdseries} -%\DoNotIndex{\MessageBreak,\mkern,\mp,\NC@find,\NeedsTeXFormat} -%\DoNotIndex{\newbox,\newcolumntype,\newcommand,\newcount,\newdimen} -%\DoNotIndex{\newif,\newlength,\newtoks,\nobreak,\noexpand,\p@} -%\DoNotIndex{\PackageError,\PackageInfo,\PackageWarning,\phantom} -%\DoNotIndex{\ProcessOptionsX,\protect,\protected@edef,\ProvidesFile} -%\DoNotIndex{\ProvidesPackage,\Q,\raisebox,\relax,\renewcommand} -%\DoNotIndex{\RequirePackage,\rlap,\sbox,\scantokens} -%\DoNotIndex{\scriptscriptstyle,\scriptstyle,\selectfont,\setbox} -%\DoNotIndex{\setkeys,\setlength,\settoheight,\sf@size,\sfdefault} -%\DoNotIndex{\sfrac,\skewchar,\sp,\space,\string,\strip@pt} -%\DoNotIndex{\tabularnewline,\text,\textdegree,\textmu,\textohm} -%\DoNotIndex{\textsc,\textstyle,\textsuperscript,\the,\thr@@,\times} -%\DoNotIndex{\ttdefault,\uccode,\unboldmath,\unhbox,\upmu,\Upomega} -%\DoNotIndex{\uppercase,\upshape,\wd,\xdef,\xspace,\z@} -% -%\DoNotIndex{\if,\lowercase,\+,\,,\-,\.,\:,\;,\@argdef,\@cdr} -%\DoNotIndex{\@ifdefinable,\@testopt,\@yargdef,\color,\endlinechar} -%\DoNotIndex{\key@ifundefined,\newrobustcmd,\protected,\scriptspace} -%\DoNotIndex{\usebox,\tw@,\ifinner,\usepackage,\texttt,\textsf} -%\DoNotIndex{\NC@do,\loop,\l@ngrel@x,\g@addto@macro,\documentclass} -%\DoNotIndex{\document\,\begin,\=,\@ehb,\\,\listfiles,\nullfont} -%\DoNotIndex{\normalsize,\futurelet} -% -%\DoNotIndex{\pascalsecond,\amperemetresecond,\ohmmetre} -%\DoNotIndex{\newtonmetre,\newtonmetrenp} -%\DoNotIndex{\kilogramsquaremetre,\kilogramsquaremetrenp} -% %\changes{v1.0}{2008/06/12}{First official release} % %\setkeys{lst}{language=[LaTeX]{TeX},moretexcs={sisetup,num,ang,SI, @@ -3460,7 +3322,7 @@ author. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{siunitx} - [2009/09/16 v1.2n A comprehensive (SI) units package] + [2009/09/21 v1.3a A comprehensive (SI) units package] % \end{macrocode} % The package requires \eTeX, so the usual test is made. % \begin{macrocode} @@ -5087,6 +4949,7 @@ author. %\begin{macro}{\si@textmu} %\begin{macro}{\si@mathsmu} %\changes{v1.2m}{2009/08/10}{Fixed clash wth \pkg{fourier} package} +%\changes{v1.3}{2009/09/20}{Better definition for micro symbol} % For the \si{\micro} symbol, some direct loading of symbols is % needed as the maths mu sign ($\mu$) is wrong. % \begin{macrocode} @@ -5096,23 +4959,7 @@ author. \DeclareFontSubstitution{TS1}{cmr}{m}{n} \DeclareTextSymbol{\si@textmu}{TS1}{181} \DeclareTextSymbolDefault{\si@textmu}{TS1} -\@ifpackageloaded{upgreek} - {} - {\DeclareFontFamily{OML}{eur}{\skewchar\font'177} - \DeclareFontShape{OML}{eur}{m}{n}{% - <-6> eurm5 <6-8> eurm7 <8-> eurm10}{}} -\AtBeginDocument{% - \@ifpackageloaded{upgreek}{% - \let\si@mathsmu\upmu - }{% - \@ifpackageloaded{fourier}{% - \let\si@mathsmu\othermu - }{% - \DeclareSymbolFont{si@greek}{OML}{eur}{m}{n}% - \DeclareMathSymbol{\si@mathsmu}{\mathord}{si@greek}{"16}% - }% - }% -} +\def\si@mathsmu{\text{\si@textmu}} % \end{macrocode} %\end{macro} %\end{macro} @@ -7696,12 +7543,13 @@ author. % \end{macrocode} %\end{macro} %\begin{macro}{\si@num@sepxpart} +%\changes{v1.3}{2009/09/20}{Problem using \opt{textmode} corrected} % A similar approach for numbers containing products, except the % first token of the input has to be deleted. % \begin{macrocode} \newcommand*{\si@num@sepxpart}{% \si@num@addunit - \ensuremath{\times}% + \ensuremath{{}\times{}}% \expandafter\expandafter\expandafter\si@num\expandafter \expandafter\expandafter{% \expandafter\@cdr\si@num@xpart\@nil}} @@ -10969,7 +10817,7 @@ author. % powers. % \begin{macrocode} \ProvidesFile{si-prefix.cfg} - [2009/09/16 v1.2n siunitx: SI Multiple prefixes] + [2009/09/21 v1.3a siunitx: SI Multiple prefixes] \newprefix{\yocto}{-24}{y} \newprefix{\zepto}{-21}{z} \newprefix{\atto}{-18}{a} @@ -11073,7 +10921,7 @@ author. % is an awkward one, but here the UK standard is used. % \begin{macrocode} \ProvidesFile{si-named.cfg} - [2009/09/16 v1.2n siunitx: SI Named units] + [2009/09/21 v1.3a siunitx: SI Named units] \newunit{\becquerel}{Bq} \newunit{\coulomb}{C} \newunit{\farad}{F} @@ -11172,7 +11020,7 @@ author. % This requires \file{si-prefix.cfg} and \file{si-named.cfg}. % \begin{macrocode} \ProvidesFile{si-prefixed.cfg} - [2009/09/16 v1.2n siunitx: SI Prefixed units] + [2009/09/21 v1.3a siunitx: SI Prefixed units] \requiresiconfigs{prefix,named,accepted,physical} % \end{macrocode} %\begin{macro}{\picometre} @@ -11470,7 +11318,7 @@ author. % block for the appropriate option. First currents. % \begin{macrocode} \ProvidesFile{si-abbr.cfg} - [2009/09/16 v1.2n siunitx: Abbreviated units] + [2009/09/21 v1.3a siunitx: Abbreviated units] \requiresiconfigs{prefix,named,accepted,physical} \newunit{\pA}{\pico\ampere} \newunit{\nA}{\nano\ampere} @@ -11693,7 +11541,7 @@ author. % These are defined here, although some are in very general use. % \begin{macrocode} \ProvidesFile{si-addn.cfg} - [2009/09/16 v1.2n siunitx: SI Additional units] + [2009/09/21 v1.3a siunitx: SI Additional units] \provideunit{\angstrom}{\si@sym@ringA} \AtBeginDocument{% \ifdefined\Saveangstrom @@ -11748,7 +11596,7 @@ author. %\begin{macro}{\bel} % \begin{macrocode} \ProvidesFile{si-accepted.cfg} - [2009/09/16 v1.2n siunitx: SI Accepted units] + [2009/09/21 v1.3a siunitx: SI Accepted units] \newunit{\minute}{min} \newunit{\hour}{h} \newunit{\Day}{d} @@ -11806,7 +11654,7 @@ author. % for a negative kern does make things a bit complicated. % \begin{macrocode} \ProvidesFile{si-physical.cfg} - [2009/09/16 v1.2n siunitx: SI Physically-measured units] + [2009/09/21 v1.3a 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% @@ -11842,7 +11690,7 @@ author. % own definitions. % \begin{macrocode} \ProvidesFile{si-synchem.cfg} - [2009/09/16 v1.2n siunitx: Units for synthetic chemists] + [2009/09/21 v1.3a siunitx: Units for synthetic chemists] \requiresiconfigs{prefix} \newunit{\mmHg}{mmHg} \newunit{\molar}{\mole\per\cubic\deci\metre} @@ -11863,7 +11711,7 @@ author. % Some units inspired by \pkg{hepunits}. % \begin{macrocode} \ProvidesFile{si-hep.cfg} - [2009/09/16 v1.2n siunitx: Units for high-energy physics] + [2009/09/21 v1.3a siunitx: Units for high-energy physics] \requiresiconfigs{prefix,named} % \end{macrocode} %\begin{macro}{\micron} @@ -11945,7 +11793,7 @@ author. % For astronomy, the \cs{parsec} unit is needed. % \begin{macrocode} \ProvidesFile{si-astro.cfg} - [2009/09/16 v1.2n siunitx: Units for astronomy] + [2009/09/21 v1.3a siunitx: Units for astronomy] \newunit{\parsec}{pc} \newunit{\lightyear}{ly} % \end{macrocode} @@ -11960,7 +11808,7 @@ author. % The unit \cs{gon} is useful here. % \begin{macrocode} \ProvidesFile{si-geophys.cfg} - [2009/09/16 v1.2n siunitx: Units for astronomy] + [2009/09/21 v1.3a siunitx: Units for astronomy] \newunit{\gon}{gon} % \end{macrocode} %\end{macro} @@ -11975,7 +11823,7 @@ author. % For astronomy, the \cs{parsec} unit is needed. % \begin{macrocode} \ProvidesFile{si-chemeng.cfg} - [2009/09/16 v1.2n siunitx: Units for chemical engineering] + [2009/09/21 v1.3a siunitx: Units for chemical engineering] \newunit{\gmol}{g\text{-}mol} \newunit{\kgmol}{kg\text{-}mol} \newunit{\lbmol}{lb\text{-}mol} @@ -12000,7 +11848,7 @@ author. % \SIunits. First, the binary prefixes. % \begin{macrocode} \ProvidesFile{si-binary.cfg} - [2009/09/16 v1.2n siunitx: Binary units] + [2009/09/21 v1.3a siunitx: Binary units] \newprefix[binary]{\kibi}{10}{Ki} \newprefix[binary]{\mebi}{20}{Mi} \newprefix[binary]{\gibi}{30}{Gi} @@ -12043,7 +11891,7 @@ author. % default values.\footnote{The package author is in the UK.} % \begin{macrocode} \ProvidesFile{si-UK.cfg} - [2009/09/16 v1.2n siunitx: UK locale] + [2009/09/21 v1.3a siunitx: UK locale] \sisetup{ unitsep=thin, expproduct=times, @@ -12061,7 +11909,7 @@ author. % The same as for the UK. % \begin{macrocode} \ProvidesFile{si-USA.cfg} - [2009/09/16 v1.2n siunitx: USA locale] + [2009/09/21 v1.3a siunitx: USA locale] \sisetup{ unitsep=thin, expproduct=times, @@ -12079,7 +11927,7 @@ author. % Germany, hopefully. % \begin{macrocode} \ProvidesFile{si-DE.cfg} - [2009/09/16 v1.2n siunitx: Germany locale] + [2009/09/21 v1.3a siunitx: Germany locale] \sisetup{ unitsep=cdot, valuesep=thin, @@ -12087,7 +11935,7 @@ author. expproduct=cdot, digitsep=thin, sepfour=false, - tophrase=bis} + tophrase={ bis }} % \end{macrocode} %\iffalse %</DE> @@ -12097,7 +11945,7 @@ author. % Design decisions taken from the same section of \SIstyle. % \begin{macrocode} \ProvidesFile{si-ZA.cfg} - [2009/09/16 v1.2n siunitx: South Africa locale] + [2009/09/21 v1.3a siunitx: South Africa locale] \sisetup{ unitsep=cdot, valuesep=thin, @@ -12130,7 +11978,7 @@ author. % \units for conflicting options, so users probably expect none. % \begin{macrocode} \ProvidesFile{si-units.cfg} - [2009/09/16 v1.2n siunitx: Emulation of units] + [2009/09/21 v1.3a siunitx: Emulation of units] \si@emulating{units}{1998/08/04 v0.9b} \si@ifloaded{SIunits} {\si@emclash{units}{SIunits}\endinput}{} @@ -12200,7 +12048,7 @@ author. % clash. % \begin{macrocode} \ProvidesFile{si-unitsdef.cfg} - [2009/09/16 v1.2n siunitx: + [2009/09/21 v1.3a siunitx: Emulation of unitsdef] \si@emulating{unitsdef}{2005/01/04 v0.2} \si@ifloaded{SIunits} @@ -12649,7 +12497,7 @@ author. % the macros in \SIstyle as given in the manual for that package. % \begin{macrocode} \ProvidesFile{si-sistyle.cfg} - [2009/09/16 v1.2n siunitx: Emulation of + [2009/09/21 v1.3a siunitx: Emulation of SIstyle] \si@emulating{sistyle}{2006/12/20 v2.3} \sisetup{% @@ -12833,7 +12681,7 @@ author. % \SIunits emulation starts in much the same way. % \begin{macrocode} \ProvidesFile{si-SIunits.cfg} - [2009/09/16 v1.2n siunitx: Emulation of + [2009/09/21 v1.3a siunitx: Emulation of SIunits] \si@emulating{SIunits}{2007/12/02 v1.36} \sisetup{ @@ -12987,10 +12835,6 @@ author. \ifsi@old@binary \sisetup{alsoload=binary} \fi -\ifsi@old@noams - \AtBeginDocument{% - \renewcommand*{\si@textmu}{\ensuremath\si@mathsmu}} -\fi % \end{macrocode} %\begin{macro}{\arcminute} %\begin{macro}{\arcsecond} @@ -13396,7 +13240,7 @@ author. % which are not really to be encouraged. % \begin{macrocode} \ProvidesFile{si-hepunits.cfg} - [2009/09/16 v1.2n siunitx: Emulation of + [2009/09/21 v1.3a siunitx: Emulation of hepunits] \si@emulating{hepunits}{2007/09/27} \requiresiconfigs{SIunits,accepted,prefix,hep} @@ -13551,7 +13395,7 @@ author. % a little emulation and a few macros needed. % \begin{macrocode} \ProvidesFile{si-fancynum.cfg} - [2009/09/16 v1.2n siunitx: Emulation of + [2009/09/21 v1.3a siunitx: Emulation of fancynum] \si@emulating{fancynum}{2000/08/08 0.92} \sisetup{decimalsymbol=cdot,digitsep=comma} @@ -13613,7 +13457,7 @@ author. % test is needed. % \begin{macrocode} \ProvidesFile{si-fancyunits.cfg} - [2009/09/16 v1.2n siunitx: Emulation of + [2009/09/21 v1.3a 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 418c9b540ca..8009614e15b 100644 --- a/Master/texmf-dist/source/latex/siunitx/siunitx.ins +++ b/Master/texmf-dist/source/latex/siunitx/siunitx.ins @@ -5,38 +5,54 @@ %% The original source files were: %% %% siunitx.dtx (with options: `install') -%% ---------------------------------------------------------------- -%% The siunitx package --- A comprehensive (SI) units package -%% Maintained by Joseph Wright -%% E-mail: joseph.wright@morningstar2.co.uk -%% Released under the LaTeX Project Public License v1.3c or later -%% See http://www.latex-project.org/lppl.txt -%% ---------------------------------------------------------------- +%% --------------------------------------------------------------- +%% The siunitx package --- A comprehensive (SI) units package +%% Maintained by Joseph Wright +%% E-mail: joseph.wright@morningstar2.co.uk +%% Released under the LaTeX Project Public License v1.3c or later +%% See http://www.latex-project.org/lppl.txt +%% --------------------------------------------------------------- %% \input docstrip.tex \keepsilent \askforoverwritefalse \preamble - ---------------------------------------------------------------- - The siunitx package --- A comprehensive (SI) units package - Maintained by Joseph Wright - E-mail: joseph.wright@morningstar2.co.uk - Released under the LaTeX Project Public License v1.3c or later - See http://www.latex-project.org/lppl.txt - ---------------------------------------------------------------- +--------------------------------------------------------------- +The siunitx package --- A comprehensive (SI) units package +Maintained by Joseph Wright +E-mail: joseph.wright@morningstar2.co.uk +Released under the LaTeX Project Public License v1.3c or later +See http://www.latex-project.org/lppl.txt +--------------------------------------------------------------- \endpreamble -\Msg{Generating siunitx files:} -\generate{\file{jawltxdoc.sty}{\from{\jobname.dtx}{jawltxdoc}} -} +\postamble + +Copyright (C) 2008-2009 by + Joseph Wright <joseph.wright@morningstar2.co.uk> + +It may be distributed and/or modified under the conditions of +the LaTeX Project Public License (LPPL), either version 1.3c of +this license or (at your option) any later version. The latest +version of this license is in the file: + + http://www.latex-project.org/lppl.txt + +This work is "maintained" (as per LPPL maintenance status) by + Joseph Wright. + +This work consists of the file siunitx.dtx + and the derived files siunitx.pdf, + siunitx.sty + siunitx.bib, + siunitx.ins, + siunitx-bug.tex and + various .cfg files. + +\endpostamble \usedir{tex/latex/siunitx} -\generate{\file{\jobname.sty}{\from{\jobname.dtx}{package}} -} -\usedir{source/latex/siunitx} -\generate{\file{\jobname.ins}{\from{\jobname.dtx}{install}} -} -\usedir{doc/latex/siunitx} -\generate{\file{si-bug.tex}{\from{\jobname.dtx}{bug}} +\generate{ + \file{\jobname.sty}{\from{\jobname.dtx}{package}} } \usedir{tex/latex/siunitx/config} \generate{\file{si-SIunits.cfg}{\from{\jobname.dtx}{SIunits}} @@ -67,12 +83,28 @@ \file{si-DE.cfg}{\from{\jobname.dtx}{DE}} \file{si-ZA.cfg}{\from{\jobname.dtx}{ZA}} } -\nopreamble\nopostamble -\usedir{doc/latex/siunitx} -\generate{\file{README.txt}{\from{\jobname.dtx}{readme}} - \file{\jobname.bib}{\from{\jobname.dtx}{refs}} -} \endbatchfile -\endinput +%% +%% Copyright (C) 2008-2009 by +%% Joseph Wright <joseph.wright@morningstar2.co.uk> +%% +%% It may be distributed and/or modified under the conditions of +%% the LaTeX Project Public License (LPPL), either version 1.3c of +%% this license or (at your option) any later version. The latest +%% version of this license is in the file: +%% +%% http://www.latex-project.org/lppl.txt +%% +%% This work is "maintained" (as per LPPL maintenance status) by +%% Joseph Wright. +%% +%% This work consists of the file siunitx.dtx +%% and the derived files siunitx.pdf, +%% siunitx.sty +%% siunitx.bib, +%% siunitx.ins, +%% siunitx-bug.tex and +%% various .cfg files. +%% %% %% End of file `siunitx.ins'. |