summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2008-06-24 17:32:13 +0000
committerKarl Berry <karl@freefriends.org>2008-06-24 17:32:13 +0000
commitdf6d79d94ab220e998c2123f02f8856cc83a2720 (patch)
tree2f0bbc61958ca13a057232d2cd680df44786b1db
parentd77bcc45190a4d54f62cd8d7bca1626a618c6afd (diff)
siunitx update (23jun08)
git-svn-id: svn://tug.org/texlive/trunk@8990 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/siunitx/siunitx-manual.pdfbin724855 -> 724949 bytes
-rw-r--r--Master/texmf-dist/doc/latex/siunitx/siunitx.pdfbin1106233 -> 1106793 bytes
-rw-r--r--Master/texmf-dist/source/latex/siunitx/siunitx.dtx37
-rw-r--r--Master/texmf-dist/tex/latex/siunitx/siunitx.sty28
4 files changed, 42 insertions, 23 deletions
diff --git a/Master/texmf-dist/doc/latex/siunitx/siunitx-manual.pdf b/Master/texmf-dist/doc/latex/siunitx/siunitx-manual.pdf
index b4986f2789e..cce8939909c 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/doc/latex/siunitx/siunitx.pdf b/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf
index 33bc4393c1a..85f07e1fe09 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 3a4964e0ef9..11807b95c74 100644
--- a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
+++ b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
@@ -228,7 +228,7 @@ dcolumn, rccol and numprint packages.
%</driver>
% \fi
%
-%\CheckSum{9424}
+%\CheckSum{9442}
%
% \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
@@ -3125,11 +3125,11 @@ author.
% number, of course.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\newcommand*{\si@svn@ver}{v1.0a}
+\newcommand*{\si@svn@ver}{v1.0b}
\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 82 2008-06-20 20:50:03Z joseph $
+\si@svn@id $Id: siunitx.dtx 88 2008-06-23 08:25:52Z joseph $
\ProvidesPackage{siunitx}
[\si@svn@version A comprehensive (SI) units package]
% \end{macrocode}
@@ -6863,6 +6863,7 @@ author.
%\begin{macro}{\si@num@rnd}
%\begin{macro}{\si@num@rndpre}
%\begin{macro}{\si@num@rndpost}
+%\changes{v1.0b}{2008/06/23}{Corrected bug in rounding code}
% The core looping macro of the system simply divides the flow
% between rounding before and after the decimal. The two routines
% are quite similar, but have subtly different requirements. Both
@@ -6907,16 +6908,22 @@ author.
\advance\si@tempcntb\@ne\relax
\fi
\si@switchfalse
+ \advance\si@num@dp\@ne\relax
\ifnum\si@tempcnta>\si@num@dp\relax
- \ifnum\si@tempcntb>4\relax
- \expandafter\expandafter\expandafter\si@switchtrue
- \fi
+ \advance\si@num@dp\m@ne\relax
\else
- \ifnum\si@tempcntb=10\relax
- \si@tempcntb\z@\relax
- \expandafter\expandafter\expandafter\si@switchtrue
+ \advance\si@num@dp\m@ne\relax
+ \ifnum\si@tempcnta>\si@num@dp\relax
+ \ifnum\si@tempcntb>4\relax
+ \expandafter\expandafter\expandafter\si@switchtrue
+ \fi
+ \else
+ \ifnum\si@tempcntb=10\relax
+ \si@tempcntb\z@\relax
+ \expandafter\expandafter\expandafter\si@switchtrue
+ \fi
+ \edef\si@num@postdec{\the\si@tempcntb\si@num@postdec}%
\fi
- \edef\si@num@postdec{\the\si@tempcntb\si@num@postdec}%
\fi
\advance\si@tempcnta\m@ne\relax
\si@num@rnd}
@@ -8860,7 +8867,7 @@ author.
\si@tempa
\si@log@debug{Adding power
\strip@pt\si@unt@powerdim\space to output stack}%
- \si@unt@addtostack{power}{^{\num{%
+ \si@unt@addtostack{power}{^{\num[fixdp=false]{%
\strip@pt\si@unt@powerdim}}}%
\fi
\fi
@@ -9110,7 +9117,7 @@ author.
\fi
\si@unt@stackvalsep
\let\si@expbase\si@prefixbase
- \num{e\the\si@unt@prefixcnt}%
+ \num[fixdp=false]{e\the\si@unt@prefixcnt}%
\fi}
% \end{macrocode}
%\end{macro}
@@ -12606,6 +12613,7 @@ author.
\newcommand*{\LaTeXcodeexample}{%
\setbox\lst@samplebox=\hbox\bgroup
\LaTeXcodefloat}
+\let\LaTeXcoderesultonly\LaTeXcodeexample
\newcommand*{\LaTeXcodeexampleend}{%
\egroup
\setlength\LaTeXwidth{\wd\lst@samplebox}%
@@ -12649,6 +12657,7 @@ author.
{\lst@ProcessTabulator}}%
\leavevmode \input{\LaTeXexamplefile}}%
\MakePercentIgnore}
+\newcommand*{\LaTeXcoderesultonlyend}{\egroup\LaTeXcodefloatend}
\lstnewenvironment{BibTeXexample}{%
\global\let\lst@intname\@empty
\setbox\lst@samplebox=\hbox\bgroup
@@ -12705,6 +12714,10 @@ author.
\@ifnextchar.
{\latin{i.e}}
{\latin{i.e}.\xspace}}
+\newcommand*{\etal}{%
+ \@ifnextchar.
+ {\latin{et~al.}}
+ {\latin{et~al}.\xspace}}
\newcommand*{\AMS}{{\protect\usefont{OMS}{cmsy}{m}{n}%
A\kern-.1667em\lower.5ex\hbox{M}\kern-.125emS}}
\providecommand*{\eTeX}{\ensuremath{\varepsilon}-\TeX}
diff --git a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
index f199f396fbe..ebf7bac4239 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.0a}
+\newcommand*{\si@svn@ver}{v1.0b}
\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 82 2008-06-20 20:50:03Z joseph $
+\si@svn@id $Id: siunitx.dtx 88 2008-06-23 08:25:52Z joseph $
\ProvidesPackage{siunitx}
[\si@svn@version A comprehensive (SI) units package]
\begingroup
@@ -1934,16 +1934,22 @@
\advance\si@tempcntb\@ne\relax
\fi
\si@switchfalse
+ \advance\si@num@dp\@ne\relax
\ifnum\si@tempcnta>\si@num@dp\relax
- \ifnum\si@tempcntb>4\relax
- \expandafter\expandafter\expandafter\si@switchtrue
- \fi
+ \advance\si@num@dp\m@ne\relax
\else
- \ifnum\si@tempcntb=10\relax
- \si@tempcntb\z@\relax
- \expandafter\expandafter\expandafter\si@switchtrue
+ \advance\si@num@dp\m@ne\relax
+ \ifnum\si@tempcnta>\si@num@dp\relax
+ \ifnum\si@tempcntb>4\relax
+ \expandafter\expandafter\expandafter\si@switchtrue
+ \fi
+ \else
+ \ifnum\si@tempcntb=10\relax
+ \si@tempcntb\z@\relax
+ \expandafter\expandafter\expandafter\si@switchtrue
+ \fi
+ \edef\si@num@postdec{\the\si@tempcntb\si@num@postdec}%
\fi
- \edef\si@num@postdec{\the\si@tempcntb\si@num@postdec}%
\fi
\advance\si@tempcnta\m@ne\relax
\si@num@rnd}
@@ -2996,7 +3002,7 @@
\si@tempa
\si@log@debug{Adding power
\strip@pt\si@unt@powerdim\space to output stack}%
- \si@unt@addtostack{power}{^{\num{%
+ \si@unt@addtostack{power}{^{\num[fixdp=false]{%
\strip@pt\si@unt@powerdim}}}%
\fi
\fi
@@ -3130,7 +3136,7 @@
\fi
\si@unt@stackvalsep
\let\si@expbase\si@prefixbase
- \num{e\the\si@unt@prefixcnt}%
+ \num[fixdp=false]{e\the\si@unt@prefixcnt}%
\fi}
\newcommand*{\si@unt@normout}{%
\si@unt@prefixout