From e4243632c40826eeb4ceb96028e31c613b27acad Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 24 Sep 2006 13:24:17 +0000 Subject: mhchem update (22sep06) git-svn-id: svn://tug.org/texlive/trunk@2187 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/mhchem/mhchem.sty | 152 ++++++++++++++++++++++-- Master/texmf-dist/tex/latex/mhchem/rsphrase.sty | 8 +- 2 files changed, 145 insertions(+), 15 deletions(-) (limited to 'Master/texmf-dist/tex/latex/mhchem') diff --git a/Master/texmf-dist/tex/latex/mhchem/mhchem.sty b/Master/texmf-dist/tex/latex/mhchem/mhchem.sty index 0aa67f2967e..237771b1f01 100644 --- a/Master/texmf-dist/tex/latex/mhchem/mhchem.sty +++ b/Master/texmf-dist/tex/latex/mhchem/mhchem.sty @@ -2,9 +2,9 @@ %% Copyright 2004-2006 M.a-r.t-i.n H.e-n.s-e.l % % This work may be distributed and/or modified under the -% conditions of the LaTeX Project Public License version 1.3 +% conditions of the LaTeX Project Public License version 1.3c % which can be found at -% http://www.latex-project.org/lppl/lppl-1-3.txt +% http://www.latex-project.org/lppl/lppl-1-3c.txt % % This work has the LPPL maintenance status "maintained". % The Current Maintainer of this work is M.a-r.t-i.n H.e-n.s-e.l. @@ -26,10 +26,10 @@ % `---------- % % This work consists of the files mhchem.sty, rsphrase.sty, -% mhchem.pdf, legal.txt and whatsnew.txt. +% mhchem.pdf and legal.txt. % % -\ProvidesPackage{mhchem}[2006/06/23 v3.03 for typesetting chemical formulae] +\ProvidesPackage{mhchem}[2006/09/21 v3.04 for typesetting chemical formulae] \RequirePackage{ifthen} \RequirePackage{calc}[1998/07/07] \RequirePackage{twoopt} @@ -277,8 +277,6 @@ \draw[use as bounding box] (0,0) (#1,0.85ex); \draw[cap=round, join=round, line width=0.09ex] (0cm,0.575ex) -- ++(#1,0cm) - %\draw[cap=round, join=round, line width=0.07ex] - % (#1,0.575ex) arc (250:198:0.6ex) arc (198:250:0.6ex) arc (110:162:0.6ex); \end{tikzpicture}% @@ -288,8 +286,6 @@ \draw[use as bounding box] (0,0) (#1,0.85ex); \draw[cap=round, join=round, line width=0.09ex] (#1,0.575ex) -- (0cm,0.575ex) - %\draw[cap=round, join=round, line width=0.07ex] - % (0cm,0.575ex) arc (70:18:0.6ex) arc (18:70:0.6ex) arc (-70:-18:0.6ex); \end{tikzpicture}% @@ -334,6 +330,100 @@ \end{tikzpicture}% }% +%%% for pgf-filled arrows +\newcommand*\mhchem@rightarrow@pgffilled[1]{% + \begin{tikzpicture}[baseline]% + \draw[use as bounding box] (0,0) (#1,0.85ex); + \draw[cap=round, join=round, line width=0.09ex, shorten >=0.01ex] + (0cm,0.575ex) -- ++(#1,0cm); + \filldraw[cap=round, join=round, line width=0.09ex] + (#1,0.575ex) + -- ++(-0.6ex,0.2ex) -- ++(0.15ex,-0.2ex) + -- ++(-0.15ex,-0.2ex) + -- cycle; + \end{tikzpicture}% +}% +\newcommand*\mhchem@leftarrow@pgffilled[1]{% + \begin{tikzpicture}[baseline]% + \draw[use as bounding box] (0,0) (#1,0.85ex); + \draw[cap=round, join=round, line width=0.09ex, shorten >=0.01ex] + (0cm,0.575ex) -- ++(#1,0cm); + \filldraw[cap=round, join=round, line width=0.09ex] + (0cm,0.575ex) + -- ++(0.6ex,0.2ex) -- ++(-0.15ex,-0.2ex) + -- ++(+0.15ex,-0.2ex) + -- cycle; + \end{tikzpicture}% +}% +\newcommand*\mhchem@leftrightarrow@pgffilled[1]{% + \begin{tikzpicture}[baseline]% + \draw[use as bounding box] (0,0) (#1,0.85ex); + \draw[cap=round, join=round, line width=0.09ex, shorten >=0.01ex] + (0cm,0.575ex) -- ++(#1,0cm); + \filldraw[cap=round, join=round, line width=0.09ex] + (#1,0.575ex) + -- ++(-0.6ex,0.2ex) -- ++(0.15ex,-0.2ex) + -- ++(-0.15ex,-0.2ex) + -- cycle; + \filldraw[cap=round, join=round, line width=0.09ex] + (0cm,0.575ex) + -- ++(0.6ex,0.2ex) -- ++(-0.15ex,-0.2ex) + -- ++(+0.15ex,-0.2ex) + -- cycle; + \end{tikzpicture}% +}% +\newcommand*\mhchem@leftrightharpoon@pgffilled[1]{% + \begin{tikzpicture}[baseline]% + \draw[use as bounding box] (0,0) (#1,1ex); + \draw[cap=round, join=round, line width=0.09ex, shorten >=0.01ex] + (0cm,0.575ex+0.22ex) -- ++(#1,0cm); + \filldraw[cap=round, join=round, line width=0.09ex] + (#1,0.575ex+0.22ex) + -- ++(-0.6ex,0.25ex) -- ++(0.15ex,-0.25ex) + -- cycle; + \draw[cap=round, join=round, line width=0.09ex, shorten >=0.01ex] + (0cm,0.575ex-0.22ex) -- ++(#1,0cm); + \filldraw[cap=round, join=round, line width=0.09ex] + (0cm,0.575ex-0.22ex) + -- ++(0.6ex,-0.25ex) -- ++(-0.15ex,0.25ex) + -- cycle; + \end{tikzpicture}% +}% +\newcommand*\mhchem@longrightshortleftharpoons@pgffilled[1]{% + \begin{tikzpicture}[baseline]% + \draw[use as bounding box] (0,0) (#1,1ex); + \draw[cap=round, join=round, line width=0.09ex, shorten >=0.01ex] + (0cm,0.575ex+0.22ex) -- ++(#1,0cm); + \filldraw[cap=round, join=round, line width=0.09ex] + (#1,0.575ex+0.22ex) + -- ++(-0.6ex,0.25ex) -- ++(0.15ex,-0.25ex) + -- cycle; + \draw[cap=round, join=round, line width=0.09ex, shorten >=0.01ex] + (0.5em,0.575ex-0.22ex) -- ++(#1-1em,0cm); + \filldraw[cap=round, join=round, line width=0.09ex] + (0.5em,0.575ex-0.22ex) + -- ++(0.6ex,-0.25ex) -- ++(-0.15ex,0.25ex) + -- cycle; + \end{tikzpicture}% +}% +\newcommand*\mhchem@shortrightlongleftharpoons@pgffilled[1]{% + \begin{tikzpicture}[baseline]% + \draw[use as bounding box] (0,0) (#1,1ex); + \draw[cap=round, join=round, line width=0.09ex, shorten >=0.01ex] + (0.5em,0.575ex+0.22ex) -- ++(#1-1em,0cm); + \filldraw[cap=round, join=round, line width=0.09ex] + (#1-0.5em,0.575ex+0.22ex) + -- ++(-0.6ex,0.25ex) -- ++(0.15ex,-0.25ex) + -- cycle; + \draw[cap=round, join=round, line width=0.09ex, shorten >=0.01ex] + (0cm,0.575ex-0.22ex) -- ++(#1,0cm); + \filldraw[cap=round, join=round, line width=0.09ex] + (0cm,0.575ex-0.22ex) + -- ++(0.6ex,-0.25ex) -- ++(-0.15ex,0.25ex) + -- cycle; + \end{tikzpicture}% +}% + \newlength{\mhchem@arrowlength@pgf} \newlength{\mhchem@arrowminlength@pgf} %TODO: use \mhchem@arrowminlength @@ -350,8 +440,6 @@ }}}% % \setlength\mhchem@arrowminlength@pgf{10pt+0.5em}% - \ifthenelse{\equal{hhleftrightarrow}{#5}}{\setlength\mhchem@arrowminlength@pgf{10pt+0.7em}}{}% - \ifthenelse{\equal{hhleftrightharpoon}{#5}}{\setlength\mhchem@arrowminlength@pgf{10pt+0.7em}}{}% \ifthenelse{\equal{mhchem@longrightshortleftharpoons@pgf}{#5}}{ \setlength\mhchem@arrowminlength@pgf{1.85em}% \setlength\mhchem@arrowlength@pgf{\widthof{\ensuremath{% @@ -380,6 +468,34 @@ \mkern#4mu% }}}% }{}% + \ifthenelse{\equal{mhchem@longrightshortleftharpoons@pgffilled}{#5}}{ + \setlength\mhchem@arrowminlength@pgf{1.85em}% + \setlength\mhchem@arrowlength@pgf{\widthof{\ensuremath{% + \mkern#3mu% + \mathop{}% + \limits% + \@ifnotempty{#7}{^{\if0#1\else\mkern#1mu\fi% + #7\if0#2\else\mkern#2mu\fi}}% + \@ifnotempty{#6}{_{\if0#1\else\mkern#1mu\fi% + \hspace{1em}% %% + #6\if0#2\else\mkern#2mu\fi}}% + \mkern#4mu% + }}}% + }{}% + \ifthenelse{\equal{mhchem@shortrightlongleftharpoons@pgffilled}{#5}}{ + \setlength\mhchem@arrowminlength@pgf{1.85em}% + \setlength\mhchem@arrowlength@pgf{\widthof{\ensuremath{% + \mkern#3mu% + \mathop{}% + \limits% + \@ifnotempty{#7}{^{\if0#1\else\mkern#1mu\fi% + \hspace{1em}% %% + #7\if0#2\else\mkern#2mu\fi}}% + \@ifnotempty{#6}{_{\if0#1\else\mkern#1mu\fi% + #6\if0#2\else\mkern#2mu\fi}}% + \mkern#4mu% + }}}% + }{}% % \ifdim\mhchem@arrowlength@pgf<\mhchem@arrowminlength@pgf% \setlength\mhchem@arrowlength@pgf{\mhchem@arrowminlength@pgf}% @@ -443,10 +559,24 @@ {\ensuremath{\mhchem@labeledarrow@pgf{6}{6}{1}{1}{mhchem@longrightshortleftharpoons@pgf}{##2}{##1}}}% \renewcommandtwoopt*\mhchem@equilibriumLeft[2][][]% {\ensuremath{\mhchem@labeledarrow@pgf{6}{6}{1}{1}{mhchem@shortrightlongleftharpoons@pgf}{##2}{##1}}}% + }{%%% pgf-filled + \ifthenelse{\equal{#1}{pgf-filled}}{% + \renewcommandtwoopt*\mhchem@gives[2][][]% + {\ensuremath{\mhchem@labeledarrow@pgf{1.5}{7}{1.5}{1}{mhchem@rightarrow@pgffilled}{##2}{##1}}}% + \renewcommandtwoopt*\mhchem@givesleft[2][][]% + {\ensuremath{\mhchem@labeledarrow@pgf{7}{1.5}{1}{1.5}{mhchem@leftarrow@pgffilled}{##2}{##1}}}% + \renewcommandtwoopt*\mhchem@mesomeric[2][][]% + {\ensuremath{\mhchem@labeledarrow@pgf{7}{7}{1}{1}{mhchem@leftrightarrow@pgffilled}{##2}{##1}}}% + \renewcommandtwoopt*\mhchem@equilibrium[2][][]% + {\ensuremath{\mhchem@labeledarrow@pgf{7}{7}{1}{1}{mhchem@leftrightharpoon@pgffilled}{##2}{##1}}}% + \renewcommandtwoopt*\mhchem@equilibriumRight[2][][]% + {\ensuremath{\mhchem@labeledarrow@pgf{7}{7}{1}{1}{mhchem@longrightshortleftharpoons@pgffilled}{##2}{##1}}}% + \renewcommandtwoopt*\mhchem@equilibriumLeft[2][][]% + {\ensuremath{\mhchem@labeledarrow@pgf{7}{7}{1}{1}{mhchem@shortrightlongleftharpoons@pgffilled}{##2}{##1}}}% }{% \PackageError{mhchem}{The option font=#1 is not supported}% }% - }% + }}% } \newcommandtwoopt*\mhchem@givesT[2][\hspace{\mhchem@arrowminlength}][]% diff --git a/Master/texmf-dist/tex/latex/mhchem/rsphrase.sty b/Master/texmf-dist/tex/latex/mhchem/rsphrase.sty index 60b67112090..9c59e72c2f5 100644 --- a/Master/texmf-dist/tex/latex/mhchem/rsphrase.sty +++ b/Master/texmf-dist/tex/latex/mhchem/rsphrase.sty @@ -21,9 +21,9 @@ % % % This work may be distributed and/or modified under the -% conditions of the LaTeX Project Public License version 1.3 +% conditions of the LaTeX Project Public License version 1.3c % which can be found at -% http://www.latex-project.org/lppl/lppl-1-3.txt +% http://www.latex-project.org/lppl/lppl-1-3c.txt % % This work has the LPPL maintenance status "maintained". % The Current Maintainer of this work is M.a-r.t-i.n H.e-n.s-e.l. @@ -45,10 +45,10 @@ % `---------- % % This work consists of the files mhchem.sty, rsphrase.sty, -% mhchem.pdf, legal.txt and whatsnew.txt. +% mhchem.pdf and legal.txt. % % -\ProvidesPackage{rsphrase}[2006/06/23 v3.03 Risk and Safety Phrases (mhchem bundle)] +\ProvidesPackage{rsphrase}[2006/09/21 v3.04 Risk and Safety Phrases (mhchem bundle)] \RequirePackage{ifthen} \RequirePackage{textcomp} -- cgit v1.2.3