summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2008-07-04 00:34:29 +0000
committerKarl Berry <karl@freefriends.org>2008-07-04 00:34:29 +0000
commit4e033cc41a84ffdd76bfeab639b3630d99e2f591 (patch)
tree62ba7fc8cacebcbc2759424a5d22356672196cad /Master/texmf-dist
parentca48791ca2d6647686560b55b4ff0696326b33e5 (diff)
siunitx update (3jul08)
git-svn-id: svn://tug.org/texlive/trunk@9207 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/doc/latex/siunitx/siunitx-manual.pdfbin725094 -> 725105 bytes
-rw-r--r--Master/texmf-dist/doc/latex/siunitx/siunitx.bib (renamed from Master/texmf-dist/bibtex/bib/siunitx/siunitx.bib)3
-rw-r--r--Master/texmf-dist/doc/latex/siunitx/siunitx.pdfbin1109023 -> 1109166 bytes
-rw-r--r--Master/texmf-dist/source/latex/siunitx/siunitx.dtx19
-rw-r--r--Master/texmf-dist/source/latex/siunitx/siunitx.ins5
-rw-r--r--Master/texmf-dist/tex/latex/siunitx/config/si-abbr.cfg3
-rw-r--r--Master/texmf-dist/tex/latex/siunitx/siunitx.sty5
7 files changed, 17 insertions, 18 deletions
diff --git a/Master/texmf-dist/doc/latex/siunitx/siunitx-manual.pdf b/Master/texmf-dist/doc/latex/siunitx/siunitx-manual.pdf
index 8b5aef0e333..ad0b0b099c6 100644
--- a/Master/texmf-dist/doc/latex/siunitx/siunitx-manual.pdf
+++ b/Master/texmf-dist/doc/latex/siunitx/siunitx-manual.pdf
Binary files differ
diff --git a/Master/texmf-dist/bibtex/bib/siunitx/siunitx.bib b/Master/texmf-dist/doc/latex/siunitx/siunitx.bib
index 322ed1577a8..724bf05d963 100644
--- a/Master/texmf-dist/bibtex/bib/siunitx/siunitx.bib
+++ b/Master/texmf-dist/doc/latex/siunitx/siunitx.bib
@@ -33,6 +33,3 @@
@misc{NIST,
note = {\url{http://physics.nist.gov/cuu/Units/index.html}},
}
-\endinput
-%%
-%% End of file `siunitx.bib'.
diff --git a/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf b/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf
index 99a598e8145..1dc7b679c5d 100644
--- a/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf
+++ b/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
index abfea4627b8..57eae2e27d3 100644
--- a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
+++ b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
@@ -150,13 +150,10 @@
\file{si-DE.cfg}{\from{\jobname.dtx}{DE}}
\file{si-ZA.cfg}{\from{\jobname.dtx}{ZA}}
}
-\nopreamble
-\usedir{bibtex/bib/siunitx}
-\generate{\file{\jobname.bib}{\from{\jobname.dtx}{refs}}
-}
\nopreamble\nopostamble
\usedir{doc/latex/siunitx}
\generate{\file{README.txt}{\from{\jobname.dtx}{readme}}
+ \file{\jobname.bib}{\from{\jobname.dtx}{refs}}
}
\endbatchfile
%</install>
@@ -228,7 +225,7 @@ dcolumn, rccol and numprint packages.
%</driver>
% \fi
%
-%\CheckSum{9503}
+%\CheckSum{9511}
%
% \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
@@ -3124,11 +3121,11 @@ author.
% number, of course.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\newcommand*{\si@svn@ver}{v1.0d}
+\newcommand*{\si@svn@ver}{v1.0e}
\def\si@svn@id$#1: #2.#3 #4 #5-#6-#7 #8 #9${%
\newcommand*{\si@svn@version}{%
#5/#6/#7\space\si@svn@ver\space}}
-\si@svn@id $Id: siunitx.dtx 97 2008-06-25 11:11:46Z joseph $
+\si@svn@id $Id: siunitx.dtx 101 2008-07-03 09:02:22Z joseph $
\ProvidesPackage{siunitx}
[\si@svn@version A comprehensive (SI) units package]
% \end{macrocode}
@@ -8198,6 +8195,7 @@ author.
\newcommand*{\si@unt@SIopts}{}
\def\si@SI[#1]#2[#3]#4{%
\begingroup
+ \let\fg\SIfg
\si@ifnotmtarg{#1}
{\sisetup{#1}%
\renewcommand*{\si@unt@SIopts}{#1}}%
@@ -10412,6 +10410,8 @@ author.
%\end{macro}
%\end{macro}
%\end{macro}
+%\begin{macro}{\fg}
+%\begin{macro}{\SIfg}
%\begin{macro}{\kg}
%\begin{macro}{\fg}
%\begin{macro}{\pg}
@@ -10426,7 +10426,8 @@ author.
% There is a name clash with \pkg{babel} here in French; hopefully
% there will not be too many complaints.
% \begin{macrocode}
-\provideunit{\fg}{\femto\gram}
+\AtBeginDocument{\provideunit{\fg}{\femto\gram}}
+\newunit{\SIfg}{\femto\gram}
\newunit{\pg}{\pico\gram}
\newunit{\nanog}{\nano\gram}
\newunit{\micg}{\micro\gram}
@@ -10440,6 +10441,8 @@ author.
%\end{macro}
%\end{macro}
%\end{macro}
+%\end{macro}
+%\end{macro}
%\begin{macro}{\kJ}
%\begin{macro}{\eV}
%\begin{macro}{\meV}
diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx.ins b/Master/texmf-dist/source/latex/siunitx/siunitx.ins
index 60b954530c6..f117c9ea32e 100644
--- a/Master/texmf-dist/source/latex/siunitx/siunitx.ins
+++ b/Master/texmf-dist/source/latex/siunitx/siunitx.ins
@@ -65,13 +65,10 @@
\file{si-DE.cfg}{\from{\jobname.dtx}{DE}}
\file{si-ZA.cfg}{\from{\jobname.dtx}{ZA}}
}
-\nopreamble
-\usedir{bibtex/bib/siunitx}
-\generate{\file{\jobname.bib}{\from{\jobname.dtx}{refs}}
-}
\nopreamble\nopostamble
\usedir{doc/latex/siunitx}
\generate{\file{README.txt}{\from{\jobname.dtx}{readme}}
+ \file{\jobname.bib}{\from{\jobname.dtx}{refs}}
}
\endbatchfile
\endinput
diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-abbr.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-abbr.cfg
index bf409115351..5764f6af24c 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-abbr.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-abbr.cfg
@@ -40,7 +40,8 @@
\newunit{\dmc}{\deci\metre\cubed}
\newunit{\cms}{\centi\metre\squared}
\newunit{\kg}{\kilo\gram}
-\provideunit{\fg}{\femto\gram}
+\AtBeginDocument{\provideunit{\fg}{\femto\gram}}
+\newunit{\SIfg}{\femto\gram}
\newunit{\pg}{\pico\gram}
\newunit{\nanog}{\nano\gram}
\newunit{\micg}{\micro\gram}
diff --git a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
index e5e5673ee79..dd57007726f 100644
--- a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
+++ b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
@@ -14,11 +14,11 @@
%% ----------------------------------------------------------------
%%
\NeedsTeXFormat{LaTeX2e}
-\newcommand*{\si@svn@ver}{v1.0d}
+\newcommand*{\si@svn@ver}{v1.0e}
\def\si@svn@id$#1: #2.#3 #4 #5-#6-#7 #8 #9${%
\newcommand*{\si@svn@version}{%
#5/#6/#7\space\si@svn@ver\space}}
-\si@svn@id $Id: siunitx.dtx 97 2008-06-25 11:11:46Z joseph $
+\si@svn@id $Id: siunitx.dtx 101 2008-07-03 09:02:22Z joseph $
\ProvidesPackage{siunitx}
[\si@svn@version A comprehensive (SI) units package]
\begingroup
@@ -2647,6 +2647,7 @@
\newcommand*{\si@unt@SIopts}{}
\def\si@SI[#1]#2[#3]#4{%
\begingroup
+ \let\fg\SIfg
\si@ifnotmtarg{#1}
{\sisetup{#1}%
\renewcommand*{\si@unt@SIopts}{#1}}%