diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/siunitx/siunitx.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/siunitx/siunitx.sty | 30 |
1 files changed, 23 insertions, 7 deletions
diff --git a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty index 0c4377ca094..ed919522565 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} - [2009/02/04 v1.2e A comprehensive (SI) units package] + [2009/02/20 v1.2f A comprehensive (SI) units package] \begingroup \@ifundefined{eTeXversion} {\PackageError{siunitx} @@ -692,6 +692,7 @@ \fi] {prespace} \si@opt@boolkey{allowoptarg} +\si@opt@boolkey{allowlitunits} \newif\ifsi@slash \newif\ifsi@frac \si@opt@boolkey{stickyper} @@ -2964,18 +2965,32 @@ \newif\ifsi@unt@litout \newcommand*{\si@unt@printunit}[1]{% \si@unt@ifliteral{#1} - {\si@log@debug{Literal items found in unit - argument:\MessageBreak outputting without further - processing}% - \si@unt@litouttrue - \si@unt@addvaluesep - \si@unt@out{#1}} + {\ifsi@allowlitunits + \expandafter\si@unt@litprint + \else + \expandafter\si@unt@nolitprint + \fi + {#1}} {\si@log@debug{Macro unit found:\MessageBreak processing to format output}% \si@unt@init \advance\si@unt@depthcnt\@ne\relax #1% \si@unt@final}} +\newcommand*{\si@unt@litprint}[1]{% + \si@log@debug{% + Literal items found in unit argument:\MessageBreak outputting + without further processing}% + \si@unt@litouttrue + \si@unt@addvaluesep + \si@unt@out{#1}% +} +\newcommand*{\si@unt@nolitprint}[1]{% + \si@log@err{Literal units disabled}{% + You can the literal input `#1' for a unit\MessageBreak + but the allowliteralunits option is off. + } +} \newcommand*{\si@unt@addvaluesep}{% \ifsi@unt@num \expandafter\si@unt@addvalsep @@ -3787,6 +3802,7 @@ \fi}} \sisetup{ addsign=none, + allowlitunits=true, allowzeroexp=false, angformat=unchanged, astroang=false,%( |