summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/siunitx/siunitx.sty')
-rw-r--r--Master/texmf-dist/tex/latex/siunitx/siunitx.sty83
1 files changed, 36 insertions, 47 deletions
diff --git a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
index 122cfd80055..a00e3428c57 100644
--- a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
+++ b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
@@ -15,7 +15,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{siunitx}
- [2008/11/31 v1.1h A comprehensive (SI) units package]
+ [2008/12/22 v1.1j A comprehensive (SI) units package]
\begingroup
\@ifundefined{eTeXversion}
{\PackageError{siunitx}
@@ -537,15 +537,17 @@
\si@opt@choicekey{tabnumalign}
{centredecimal,centerdecimal,right,left,centre,center}
{\si@tab@fixedtrue
- \let\si@tab@rfill@S\hfil
- \let\si@tab@lfill@S\hfil
+ \def\si@tab@rfill@S{0.5}%
+ \def\si@tab@lfill@S{0.5}%
\renewcommand*{\si@tempb}{right}%
\ifx\si@tempa\si@tempb
- \let\si@tab@lfill@S\hfill
+ \def\si@tab@rfill@S{0}%
+ \def\si@tab@lfill@S{1}%
\fi
\renewcommand*{\si@tempb}{left}%
\ifx\si@tempa\si@tempb
- \let\si@tab@rfill@S\hfill
+ \def\si@tab@rfill@S{1}%
+ \def\si@tab@lfill@S{0}%
\fi
\renewcommand*{\si@tempb}{centredecimal}%
\ifx\si@tempa\si@tempb
@@ -627,26 +629,30 @@
\csname si@tab@#1postcnt\endcsname\si@num@postdec\relax
\fi}
\si@opt@choicekey{tabtextalign}{left,right,centre,center}
- {\let\si@tab@rfill@t\hfill
- \let\si@tab@lfill@t\hfill
+ {\def\si@tab@rfill@t{0.5}%
+ \def\si@tab@lfill@t{0.5}%
\renewcommand*{\si@tempb}{right}%
\ifx\si@tempa\si@tempb
- \let\si@tab@rfill@t\relax
+ \def\si@tab@rfill@t{0}%
+ \def\si@tab@lfill@t{1}%
\fi
\renewcommand*{\si@tempb}{left}%
\ifx\si@tempa\si@tempb
- \let\si@tab@lfill@t\relax
+ \def\si@tab@rfill@t{1}%
+ \def\si@tab@lfill@t{0}%
\fi}
\si@opt@choicekey{tabunitalign}{left,right,centre,center}
- {\let\si@tab@rfill@s\hfill
- \let\si@tab@lfill@s\hfill
+ {\def\si@tab@rfill@s{0.5}%
+ \def\si@tab@lfill@s{0.5}%
\renewcommand*{\si@tempb}{right}%
\ifx\si@tempa\si@tempb
- \let\si@tab@rfill@s\relax
+ \def\si@tab@rfill@s{0}%
+ \def\si@tab@lfill@s{1}%
\fi
\renewcommand*{\si@tempb}{left}%
\ifx\si@tempa\si@tempb
- \let\si@tab@lfill@s\relax
+ \def\si@tab@rfill@s{1}%
+ \def\si@tab@lfill@s{0}%
\fi}
\si@opt@boolkey[%
\ifsi@fixdp
@@ -2465,37 +2471,14 @@
\newcolumntype{S}{}
\newcolumntype{s}{}
\NC@list\expandafter{\si@tempa}
+\newcommand*{\si@tab@corr@colortbl}{\relax}
\AtBeginDocument{
\@ifpackageloaded{colortbl}{%
- \renewcommand*{\@classz}{%
- \@classx
- \@tempcnta \count@
- \prepnext@tok
- \expandafter\CT@extract\the\toks\@tempcnta\columncolor!\@nil
- \@addtopreamble{%
- \setbox\z@\hbox\bgroup\bgroup
- \ifcase\@chnum
- \hfil\d@llarbegin\insert@column\d@llarend\hfil\or
- \d@llarbegin\insert@column\d@llarend\hfill\or
- \hfill\kern\z@\d@llarbegin\insert@column\d@llarend\or
- $\vcenter\@startpbox{\@nextchar}\insert@column\@endpbox$\or
- \vtop\@startpbox{\@nextchar}\insert@column\@endpbox\or
- \vbox\@startpbox{\@nextchar}\insert@column\@endpbox
- \fi
- \egroup\egroup
- \begingroup
- \CT@setup
- \CT@column@color
- \CT@row@color
- \CT@cell@color
- \CT@do@color
- \endgroup
- \@tempdima\ht\z@
- \advance\@tempdima\minrowclearance
- \vrule\@height\@tempdima\@width\z@
- \unhbox\z@}%
- \prepnext@tok}%
- }{}}
+ \renewcommand*{\si@tab@corr@colortbl}{%
+ \hskip\stretch{-0.5}\kern\z@
+ }
+ }{}
+}
\renewcommand*{\NC@rewrite@S}[1][]{%
\edef\si@tempa{\the\@temptokena
>{\noexpand\si@tab@begin@S[#1]}c%
@@ -2656,7 +2639,8 @@
\let\si@tab@rfill\si@tab@rfill@t
\let\si@tab@lfill\si@tab@lfill@t
\fi
- \si@tab@lfill\relax
+ \si@tab@corr@colortbl
+ \hskip\stretch{\si@tab@lfill}\kern\z@
\ifsi@switch
\the\si@tab@pretoks
\si@tab@numout
@@ -2664,14 +2648,17 @@
\else
\the\si@tab@pretoks
\fi
- \si@tab@rfill\relax
+ \hskip\stretch{\si@tab@rfill}\kern\z@
+ \si@tab@corr@colortbl
\endgroup}
\newcommand*{\si@tab@end@s}{%
- \si@tab@lfill@s\relax
+ \si@tab@corr@colortbl
+ \hskip\stretch{\si@tab@lfill@s}\kern\z@
\ignorespaces
\expandafter\si\expandafter{\the\si@tab@toks}%
\unskip
- \si@tab@rfill@s\relax
+ \hskip\stretch{\si@tab@rfill@s}\kern\z@
+ \si@tab@corr@colortbl
\endgroup}
\newcommand*{\si@tab@newline@S}{%
\si@tab@end@S
@@ -3698,7 +3685,9 @@
\endgroup
\newcommand*{\si@out@sp}[1]{\ensuremath{^{\text{#1}}}}
\newcommand*{\si@out@sb}[1]{\ensuremath{_{\text{#1}}}}
-\newcommand*{\si@out@minus}{\ensuremath{-}}
+\newcommand*{\si@out@minus}{}
+\DeclareTextSymbolDefault{\si@out@minus}{TS1}
+\DeclareTextSymbol{\si@out@minus}{TS1}{61}
\newif\ifsi@out@num
\newcommand*{\si@out@num}[1]{%
\begingroup