From b0de1f59bc796461f68938d74bf9ed12963ba720 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Sun, 2 Dec 2007 16:07:07 +0000 Subject: SIunits update from CTAN git-svn-id: svn://tug.org/texlive/trunk@5681 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/SIunits/SIunits.pdf | Bin 328421 -> 328621 bytes Master/texmf-dist/source/latex/SIunits/SIunits.dtx | 28 ++++++++++++++++++--- Master/texmf-dist/tex/latex/SIunits/SIunits.sty | 21 +++++++++++++--- Master/texmf-dist/tex/latex/SIunits/binary.sty | 4 +-- 4 files changed, 43 insertions(+), 10 deletions(-) diff --git a/Master/texmf-dist/doc/latex/SIunits/SIunits.pdf b/Master/texmf-dist/doc/latex/SIunits/SIunits.pdf index 0500bf11676..dbd346aab84 100644 Binary files a/Master/texmf-dist/doc/latex/SIunits/SIunits.pdf and b/Master/texmf-dist/doc/latex/SIunits/SIunits.pdf differ diff --git a/Master/texmf-dist/source/latex/SIunits/SIunits.dtx b/Master/texmf-dist/source/latex/SIunits/SIunits.dtx index 4924b360f3e..5b1afac0b0c 100644 --- a/Master/texmf-dist/source/latex/SIunits/SIunits.dtx +++ b/Master/texmf-dist/source/latex/SIunits/SIunits.dtx @@ -42,8 +42,8 @@ % \iffalse %<+package|binary>\def\SIunits@RCS$#1: #2 #3${#2} %<+package|binary>\def\filename{SIunits.dtx}%Source File Name -%<+package|binary>\xdef\fileversion{\SIunits@RCS$Revision: 1.35 $}%Revision generated by CS-RCS -%<+package|binary>\xdef\filedate{\SIunits@RCS$Date: 2007/11/24 11:20:00 $}%Date generated by CS-RCS +%<+package|binary>\xdef\fileversion{\SIunits@RCS$Revision: 1.36 $}%Revision generated by CS-RCS +%<+package|binary>\xdef\filedate{\SIunits@RCS$Date: 2007/12/02 12:00:00 $}%Date generated by CS-RCS %<+package|binary>\let\docversion=\fileversion %<+package|binary>\let\docdate=\filedate %<+package|binary>\NeedsTeXFormat{LaTeX2e}[1997/12/01] @@ -422,6 +422,10 @@ Comprehensive TeX Archive Network (CTAN). %\end{abstract} %\newpage %\section*{What's new?} +%\subsubsection*{New in version~1.36} +%\begin{enumerate} +% \item Real minus sign in text mode +%\end{enumerate} %\subsubsection*{New in version~1.35} %\begin{enumerate} % \item Improved \cs{elecronvolt} appearance\footnote{All changes for this version suggested by Philip Ratcliffe} @@ -2119,12 +2123,29 @@ Comprehensive TeX Archive Network (CTAN). \DeclareRobustCommand*{\fourth}[1]{\power{#1}{4}} % \end{macrocode} % \end{macro} +% %\begin{macro}{\SIminus} %\changes{v1.34}{2007/11/22}{New macro} +%\changes{v1.35}{2007/12/02}{Use real minus sign in text mode} +%\changes{v1.35}{2007/12/02}{Require \texttt{amstext} package} % To allow text-mode and maths-mode use, the appearance of the minus % sign needs to be controlled by a macro. % \begin{macrocode} -\DeclareRobustCommand*{\SIminus}{-} +\RequirePackage{amstext} +\DeclareRobustCommand*{\SIminus}{% + \let\SI@tempa\relax + \ifmmode + \edef\SI@tempb{bold}% + \ifx\math@version\SI@tempb + \let\SI@tempa\boldmath% + \fi + \else + \if b\expandafter\@car\f@series\@nil + \let\SI@tempa\bfseries% + \fi + \fi + \text{\SI@tempa$-$}% +} % \end{macrocode} %\end{macro} % The macros |\reciprocal|, |\rpsquare|, |\rpsquared|, |\rpcubic|, |\rpcubed| and |\rpfourth| provide the reciprocal (negative power): e.\,g. @@ -3095,7 +3116,6 @@ Comprehensive TeX Archive Network (CTAN). % \begin{macrocode} \DeclareOption{textstyle}{\renewcommand\SI@fstyle[1]{\@text{\protect#1}}% \@textstyletrue% -\renewcommand*{\SIminus}{--}% \typeout{Option `textstyle' provided!}} % \end{macrocode} % \subsection{compatibility options} diff --git a/Master/texmf-dist/tex/latex/SIunits/SIunits.sty b/Master/texmf-dist/tex/latex/SIunits/SIunits.sty index 65cefad8627..464e83ccbf6 100644 --- a/Master/texmf-dist/tex/latex/SIunits/SIunits.sty +++ b/Master/texmf-dist/tex/latex/SIunits/SIunits.sty @@ -20,8 +20,8 @@ %% \def\SIunits@RCS$#1: #2 #3${#2} \def\filename{SIunits.dtx}%Source File Name -\xdef\fileversion{\SIunits@RCS$Revision: 1.35 $}%Revision generated by CS-RCS -\xdef\filedate{\SIunits@RCS$Date: 2007/11/24 11:20:00 $}%Date generated by CS-RCS +\xdef\fileversion{\SIunits@RCS$Revision: 1.36 $}%Revision generated by CS-RCS +\xdef\filedate{\SIunits@RCS$Date: 2007/12/02 12:00:00 $}%Date generated by CS-RCS \let\docversion=\fileversion \let\docdate=\filedate \NeedsTeXFormat{LaTeX2e}[1997/12/01] @@ -170,7 +170,21 @@ \DeclareRobustCommand*{\cubic}[1]{\power{#1}{3}} \DeclareRobustCommand*{\cubed}{\ensuremath{^{\SI@fstyle{3}}}} \DeclareRobustCommand*{\fourth}[1]{\power{#1}{4}} -\DeclareRobustCommand*{\SIminus}{-} +\RequirePackage{amstext} +\DeclareRobustCommand*{\SIminus}{% + \let\SI@tempa\relax + \ifmmode + \edef\SI@tempb{bold}% + \ifx\math@version\SI@tempb + \let\SI@tempa\boldmath% + \fi + \else + \if b\expandafter\@car\f@series\@nil + \let\SI@tempa\bfseries% + \fi + \fi + \text{\SI@tempa$-$}% +} \DeclareRobustCommand*{\reciprocal}[1]{\power{#1}{\SIminus1}} \DeclareRobustCommand*{\rp}{\reciprocal} \DeclareRobustCommand*{\rpsquare}[1]{\power{#1}{\SIminus2}} @@ -537,7 +551,6 @@ \DeclareOption{thinqspace}{\@thinqspace{Option `thinqspace' provided!}} \DeclareOption{textstyle}{\renewcommand\SI@fstyle[1]{\@text{\protect#1}}% \@textstyletrue% -\renewcommand*{\SIminus}{--}% \typeout{Option `textstyle' provided!}} \DeclareOption{amssymb}{\@redefsquaretrue% \typeout{Option `amssymb' provided!}} diff --git a/Master/texmf-dist/tex/latex/SIunits/binary.sty b/Master/texmf-dist/tex/latex/SIunits/binary.sty index a98416bd328..f17b2bb08cf 100644 --- a/Master/texmf-dist/tex/latex/SIunits/binary.sty +++ b/Master/texmf-dist/tex/latex/SIunits/binary.sty @@ -20,8 +20,8 @@ %% \def\SIunits@RCS$#1: #2 #3${#2} \def\filename{SIunits.dtx}%Source File Name -\xdef\fileversion{\SIunits@RCS$Revision: 1.35 $}%Revision generated by CS-RCS -\xdef\filedate{\SIunits@RCS$Date: 2007/11/24 11:20:00 $}%Date generated by CS-RCS +\xdef\fileversion{\SIunits@RCS$Revision: 1.36 $}%Revision generated by CS-RCS +\xdef\filedate{\SIunits@RCS$Date: 2007/12/02 12:00:00 $}%Date generated by CS-RCS \let\docversion=\fileversion \let\docdate=\filedate \NeedsTeXFormat{LaTeX2e}[1997/12/01] -- cgit v1.2.3