diff options
-rw-r--r-- | Master/texmf-dist/doc/latex/siunitx/siunitx-manual.pdf | bin | 721955 -> 724855 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/siunitx/siunitx.pdf | bin | 1101861 -> 1106233 bytes | |||
-rw-r--r-- | Master/texmf-dist/source/latex/siunitx/siunitx.dtx | 43 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/siunitx/siunitx.sty | 21 |
4 files changed, 51 insertions, 13 deletions
diff --git a/Master/texmf-dist/doc/latex/siunitx/siunitx-manual.pdf b/Master/texmf-dist/doc/latex/siunitx/siunitx-manual.pdf Binary files differindex 876361b294b..b4986f2789e 100644 --- a/Master/texmf-dist/doc/latex/siunitx/siunitx-manual.pdf +++ b/Master/texmf-dist/doc/latex/siunitx/siunitx-manual.pdf diff --git a/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf b/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf Binary files differindex 8b0b8d59923..33bc4393c1a 100644 --- a/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf +++ b/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx index 04e9eb37b8e..3a4964e0ef9 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{9403} +%\CheckSum{9424} % % \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 @@ -2587,6 +2587,18 @@ dcolumn, rccol and numprint packages. % to force maths processing, and \cs{text} (from the \AMS\TeX\ % bundle) to ensure text mode. % +%\subsection{Using \texttt{.}~in units} +% To use a literal |.| in a unit, it has to be protected from +% expansion. Using \cs{text} will not work here (in contrast to +% \SIstyle). A robust command is needed: +%\begin{LaTeXexample} +% \newunit{\myunit}{V~vs.~NHE}% +% \SI{10}{\myunit}\\ +% \DeclareRobustCommand*{\MyUnit}{V~vs.~NHE} +% \renewunit[unitspace=space]{\myunit}{\MyUnit} +% \SI{20}{\myunit} +%\end{LaTeXexample} +% %\subsection{Limitations of \cs{mathrm}} % The package uses the \cs{mathrm} font family by default to typeset % output in maths mode. This however has a few side-effects. For @@ -3113,11 +3125,11 @@ author. % number, of course. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\newcommand*{\si@svn@ver}{v1.0} +\newcommand*{\si@svn@ver}{v1.0a} \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 76 2008-06-15 08:10:34Z joseph $ +\si@svn@id $Id: siunitx.dtx 82 2008-06-20 20:50:03Z joseph $ \ProvidesPackage{siunitx} [\si@svn@version A comprehensive (SI) units package] % \end{macrocode} @@ -4979,6 +4991,7 @@ author. %\begin{macro}{\si@fix@medium} %\begin{macro}{\si@fix@thick} %\begin{macro}{\si@fix@space} +%\changes{1.0a}{2008/06/20}{Fixed problem with \opt{space} option} % First, there are the various space macros. To allow both \opt{med} % and \opt{medium} to be used as a space description, two macros are % needed for the same output. @@ -4987,7 +5000,7 @@ author. \newcommand*{\si@fix@med}{\:} \newcommand*{\si@fix@medium}{\:} \newcommand*{\si@fix@thick}{\;} -\newcommand*{\si@fix@space}{\text{~}} +\newcommand*{\si@fix@space}{\text{ }} % \end{macrocode} %\end{macro} %\end{macro} @@ -7615,6 +7628,8 @@ author. %\begin{macro}{\si@tab@gettok@S} %\begin{macro}{\si@tab@othertok} %\begin{macro}{\si@tab@gettok@s} +%\changes{1.0a}{2008/06/20}{Fixed issues with alignment of +% \texttt{s} column contents} %\begin{macro}{\si@tab@next} % The two collection macros are very similar. Both compare the % current input with a list of possible fixed values; this is pretty @@ -7691,9 +7706,13 @@ author. \let\si@tab@next\relax \else \let\si@tab@next\si@tab@gettok@s + \ifx\ignorespaces#1\relax\else + \ifx\unskip#1\relax\else \si@tab@toks=\expandafter{% \the\si@tab@toks#1}% \si@log@debug{Found cell contents `#1'}% + \fi + \fi \fi \fi \fi @@ -7707,6 +7726,7 @@ author. %\end{macro} %\end{macro} %\begin{macro}{\si@tab@end@S} +%\changes{1.0a}{2008/06/20}{Fixed mixed number/text column alignment} %\begin{macro}{\si@tab@rfill} %\begin{macro}{\si@tab@lfill} %\begin{macro}{\si@tab@end@s} @@ -7726,16 +7746,20 @@ author. \let\si@tab@lfill\si@tab@lfill@t \fi \si@tab@lfill\relax - \the\si@tab@pretoks \ifsi@switch + \llap{\the\si@tab@pretoks}% \expandafter\si@tab@numout + \rlap{\the\si@tab@posttoks}% + \else + \the\si@tab@pretoks \fi - \the\si@tab@posttoks \si@tab@rfill\relax \endgroup} \newcommand*{\si@tab@end@s}{% \si@tab@lfill@s\relax + \ignorespaces \expandafter\si\expandafter{\the\si@tab@toks}% + \unskip \si@tab@rfill@s\relax \endgroup} % \end{macrocode} @@ -9360,6 +9384,10 @@ author. % \end{macrocode} %\end{macro} %\begin{macro}{\si@loc@ltol} +%\changes{1.0a}{2008/06/20}{\pkg{babel} support fixed for default +% document language} +% The necessary loading for language modules occurs.\\ +%\cs{si@loc@ltol}\marg{list} % \begin{macrocode} \newcommand*{\si@loc@ltol}[1]{% \def\si@tempa##1:##2\@nil{\si@loc@load{##1}} @@ -9372,7 +9400,8 @@ author. \csname extras##2\endcsname}% {\si@loc@set{##1}}}% \@for\si@tempb:=#1\do{% - \expandafter\si@tempa\si@tempb::\@nil}} + \expandafter\si@tempa\si@tempb::\@nil}% + \expandafter\selectlanguage\expandafter{\languagename}} {\si@log@warn{babel not loaded \MessageBreak loctolang option ignored}}}} \AtBeginDocument{ diff --git a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty index a51067b4669..f199f396fbe 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.0} +\newcommand*{\si@svn@ver}{v1.0a} \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 76 2008-06-15 08:10:34Z joseph $ +\si@svn@id $Id: siunitx.dtx 82 2008-06-20 20:50:03Z joseph $ \ProvidesPackage{siunitx} [\si@svn@version A comprehensive (SI) units package] \begingroup @@ -897,7 +897,7 @@ \newcommand*{\si@fix@med}{\:} \newcommand*{\si@fix@medium}{\:} \newcommand*{\si@fix@thick}{\;} -\newcommand*{\si@fix@space}{\text{~}} +\newcommand*{\si@fix@space}{\text{ }} \newcommand*{\si@fix@cdot}{{}\cdot{}} \newcommand*{\si@fix@comma}{{,}} \newcommand*{\si@fix@stop}{{.}} @@ -2397,9 +2397,13 @@ \let\si@tab@next\relax \else \let\si@tab@next\si@tab@gettok@s + \ifx\ignorespaces#1\relax\else + \ifx\unskip#1\relax\else \si@tab@toks=\expandafter{% \the\si@tab@toks#1}% \si@log@debug{Found cell contents `#1'}% + \fi + \fi \fi \fi \fi @@ -2416,16 +2420,20 @@ \let\si@tab@lfill\si@tab@lfill@t \fi \si@tab@lfill\relax - \the\si@tab@pretoks \ifsi@switch + \llap{\the\si@tab@pretoks}% \expandafter\si@tab@numout + \rlap{\the\si@tab@posttoks}% + \else + \the\si@tab@pretoks \fi - \the\si@tab@posttoks \si@tab@rfill\relax \endgroup} \newcommand*{\si@tab@end@s}{% \si@tab@lfill@s\relax + \ignorespaces \expandafter\si\expandafter{\the\si@tab@toks}% + \unskip \si@tab@rfill@s\relax \endgroup} \newcommand*{\si@tab@newline@S}{% @@ -3277,7 +3285,8 @@ \csname extras##2\endcsname}% {\si@loc@set{##1}}}% \@for\si@tempb:=#1\do{% - \expandafter\si@tempa\si@tempb::\@nil}} + \expandafter\si@tempa\si@tempb::\@nil}% + \expandafter\selectlanguage\expandafter{\languagename}} {\si@log@warn{babel not loaded \MessageBreak loctolang option ignored}}}} \AtBeginDocument{ |