summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2007-05-20 21:49:21 +0000
committerKarl Berry <karl@freefriends.org>2007-05-20 21:49:21 +0000
commita0acae5b27991203bcf42c69c26eff4bf272cd4f (patch)
tree97a4647cdd4c4b98500020f73bde6769cca78ec2 /Master
parent7ced72e836be0e1f7b0db873796a04941749bf10 (diff)
mhchem update (20may07)
git-svn-id: svn://tug.org/texlive/trunk@4328 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/mhchem/mhchem.pdfbin489221 -> 490347 bytes
-rw-r--r--Master/texmf-dist/tex/latex/mhchem/mhchem.sty190
-rw-r--r--Master/texmf-dist/tex/latex/mhchem/rsphrase.sty2
-rw-r--r--Master/texmf-dist/tpm/mhchem.tpm8
4 files changed, 114 insertions, 86 deletions
diff --git a/Master/texmf-dist/doc/latex/mhchem/mhchem.pdf b/Master/texmf-dist/doc/latex/mhchem/mhchem.pdf
index 9d18c1a8af3..9e5c3519754 100644
--- a/Master/texmf-dist/doc/latex/mhchem/mhchem.pdf
+++ b/Master/texmf-dist/doc/latex/mhchem/mhchem.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/mhchem/mhchem.sty b/Master/texmf-dist/tex/latex/mhchem/mhchem.sty
index b6c367842aa..d4b787d9130 100644
--- a/Master/texmf-dist/tex/latex/mhchem/mhchem.sty
+++ b/Master/texmf-dist/tex/latex/mhchem/mhchem.sty
@@ -29,7 +29,7 @@
% mhchem.pdf and legal.txt.
%
%
-\ProvidesPackage{mhchem}[2007/04/11 v3.06 for typesetting chemical formulae]
+\ProvidesPackage{mhchem}[2007/05/19 v3.07 for typesetting chemical formulae]
\RequirePackage{ifthen}
\RequirePackage{calc}[1998/07/07]
\RequirePackage{twoopt}
@@ -44,7 +44,6 @@
\newcommand*\mhchem@cmath[1]{\ensuremath{\text{\ensuremath{#1}}}}%
\newcommand*\cmath[1]{\mhchem@cmath{#1}}%
\DeclareMathSymbol{\mhchem@hyphen}{0}{operators}{45}
-\def\mhchem@empty{}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%% \cee %%%%%%%%%
@@ -92,49 +91,63 @@
\def\mhchem@protect{\protect\noexpand\protect}%
-\newcommand\ce[1]{\mhchem@ce@xiii{\mhchem@ce@ix#1{} \mhchem@END\mhchem@ENDEND}}%
+\newcommand\ce[1]{\mhchem@ce@xiii{\mhchem@ce@viii#1 \mhchem@END\mhchem@ENDEND}}%
%
%
-\def\mhchem@ce@ix#1#2 #3\mhchem@ENDEND{%
- \ifx\mhchem@END#3\mhchem@END%
- \ifx\mhchem@empty#2\mhchem@empty%
- \mhchem@ce@x{#1}#2\mhchem@END\mhchem@ENDEND%
- \else%
- \mhchem@ce@x#1#2\mhchem@END\mhchem@ENDEND%
- \fi%
+\def\mhchem@ce@viii#1 #2\mhchem@ENDEND{%
+ \ifx\mhchem@END#2%
+ \ifx\@empty#1\@empty
+ \else
+ \mhchem@ce@x#1\mhchem@END\mhchem@ENDEND%
+ \fi
\else%
- \ifx\mhchem@empty#2\mhchem@empty%
- \mhchem@ce@x{#1}#2\mhchem@END\mhchem@ENDEND%
- \else%
- \mhchem@ce@x#1#2\mhchem@END\mhchem@ENDEND%
- \fi%
- \ifx\mhchem@END#1\else%
- \space\mhchem@ce@ix#3\mhchem@ENDEND%
- \fi%
- \fi%
+ \mhchem@ce@x#1\mhchem@END\mhchem@ENDEND%
+ \space\mhchem@ce@viii#2\mhchem@ENDEND%
+ \fi
}
+%\def\mhchem@ce@ix#1#2 #3\mhchem@ENDEND{%
+% \ifx\mhchem@END#3%
+% \ifx\mhchem@empty#2\mhchem@empty%
+% \mhchem@ce@x{#1}#2\mhchem@END\mhchem@ENDEND%
+% \else%
+% \mhchem@ce@x#1#2\mhchem@END\mhchem@ENDEND%
+% \fi%
+% \else%
+% \ifx\mhchem@empty#2\mhchem@empty%
+% \mhchem@ce@x{#1}#2\mhchem@END\mhchem@ENDEND%
+% \else%
+% \mhchem@ce@x#1#2\mhchem@END\mhchem@ENDEND%
+% \fi%
+% \ifx\mhchem@END#1\else%
+% \space\mhchem@ce@ix#3\mhchem@ENDEND%
+% \fi%
+% \fi%
+%}
\def\mhchem@ce@x#1#2\mhchem@ENDEND{%
- \ifx\mhchem@END#1\else%
+ \ifx\@empty#1\@empty%
+ \mhchem@ce@xi{}\mhchem@END\mhchem@ENDEND%
+ \else%\ifx\mhchem@END#1\else
\mhchem@ce@xi#1\mhchem@END\mhchem@ENDEND%
- \fi%
+ \fi%\fi%
\ifx\mhchem@END#2%
\else%
\mhchem@ce@x#2\mhchem@ENDEND%
\fi%
}
\def\mhchem@ce@xi#1#2\mhchem@ENDEND{%
- \ifx\mhchem@END#2\mhchem@END%
- \if\noexpand#1##%
+ \ifx\mhchem@END#2%
+ \ifx\@empty#1\@empty%
+ {}%
+ \else\if\noexpand#1##%
\mhchem@protect\tbond%
\else%
\mhchem@protect#1%
- \fi%
+ \fi\fi%
\else%
- %{\mhchem@ce@ix#1#2\mhchem@ENDEND}%
- {\mhchem@ce@xii#1#2}%
+ {\mhchem@ce@xii#1#2}%
\fi%
}
-\def\mhchem@ce@xii#1\mhchem@END{\mhchem@ce@ix#1{} \mhchem@END\mhchem@ENDEND}
+\def\mhchem@ce@xii#1\mhchem@END{\mhchem@ce@viii#1 \mhchem@END\mhchem@ENDEND}%
\DeclareRobustCommand\mhchem@ce@xiii[1]{%
\bgroup%
\def\mhchem@protect{\noexpand}%
@@ -151,16 +164,23 @@
\ifnum1<\mhchem@option@version%
\ifmmode\else\def\mhchem@option@alwaystextmode{1}\fi%
\fi%
- \ifx\mhchem@END#1\mhchem@END\else%
+ \ifx\@empty#1\@empty\else%
\ifmmode\else\mhchem@option@textfont\fi%
\ensuremath{%
- \mhchem@ce@i#1 \mhchem@END\mhchem@ENDEND%
+ \mhchem@ce@xx#1 \mhchem@END\mhchem@ENDEND%
}%
\fi%
\egroup%
}%
-\def\mhchem@ce@i#1#2 #3\mhchem@ENDEND{%
+\def\mhchem@ce@xx#1 #2\mhchem@ENDEND{%
+ \mhchem@ce@i#1\mhchem@empty\mhchem@ENDEND%
+ \ifx\mhchem@END#2%
+ \else%
+ \mhchem@ce@xx#2 \mhchem@ENDEND%
+ \fi%
+}
+\def\mhchem@ce@i#1#2\mhchem@ENDEND{%
\ifcat a#1 {\mhchem@ce@ii{#1#2}}%
\else\ifx 1#1{\mhchem@ce@ii{#1#2}}%
\else\ifx 2#1{\mhchem@ce@ii{#1#2}}%
@@ -179,8 +199,8 @@
\else\if ^#1{\mhchem@ce@ii{#1#2}}%
\else\ifx _#1{\mhchem@ce@ii{#1#2}}%
\else\ifx $#1{\mhchem@ce@ii{#1#2}}%
- \else\ifx -#1{\ifx\mhchem@END#2\mhchem@END#1\else\mhchem@ce@dash#2\mhchem@END\fi}%
- \else\if\noexpand#1<{\ifx\mhchem@END#2\mhchem@END#1\else\mhchem@ce@lt#2\mhchem@END\fi}%
+ \else\ifx -#1{\ifx\@empty#2\@empty#1\else\mhchem@ce@dash#2\mhchem@END\fi}%
+ \else\if\noexpand#1<{\ifx\@empty#2\@empty#1\else\mhchem@ce@lt#2\mhchem@END\fi}%
\else\ifx +#1+ \mhchem@ce@ii{#2}%
\else\ifx \protect#1{\mhchem@ce@ii{#1#2}}%
%
@@ -190,20 +210,13 @@
%
\else #1#2%
\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi%
- %
- \ifx\mhchem@END#3\mhchem@END%
- \else%
- \ifx\mhchem@END#1\else%
- \mhchem@ce@i#3 \mhchem@ENDEND%
- \fi%
- \fi%
}
%
\def\mhchem@ce@dash#1#2\mhchem@END{%
\if\noexpand#1>%
- {}\ifx \mhchem@END#2\mhchem@END\mhchem@gives#2%
- \else\mhchem@ce@deploycommand{mhchem@gives}#2\mhchem@END\fi{}%
+ {}\ifx\@empty#2\@empty\mhchem@gives#2%
+ \else\mhchem@ce@deploycommand{mhchem@gives}#2{}\mhchem@END\fi{}%
\else%
-#1#2%
\fi%
@@ -211,8 +224,8 @@
\def\mhchem@ce@lt#1#2\mhchem@END{%
\ifx =#1\mhchem@ce@equal#2\mhchem@END%
\else\if\noexpand#1<\mhchem@ce@equiL#2\mhchem@END%
- \else\ifx -#1%
- \ifx \mhchem@END#2\mhchem@END%
+ \else\ifx-#1%
+ \ifx\@empty#2\@empty%
{}\mhchem@givesleft#2{}%
\else%
\mhchem@ce@dashtwo#2\mhchem@END%
@@ -223,7 +236,7 @@
}
\def\mhchem@ce@equal#1#2\mhchem@END{%
\if\noexpand#1>% (<=)>...
- \ifx \mhchem@END#2\mhchem@END{}\mhchem@equilibrium#2{}%
+ \ifx\@empty#2\@empty{}\mhchem@equilibrium#2{}%
\else%
\mhchem@ce@equi#2\mhchem@END%
\fi%
@@ -233,10 +246,10 @@
}
\def\mhchem@ce@equi#1#2\mhchem@END{%
\if\noexpand#1>%
- {}\ifx \mhchem@END#2\mhchem@END\mhchem@equilibriumRight#2%
- \else\mhchem@ce@deploycommand{mhchem@equilibriumRight}#2\mhchem@END\fi{}%
+ {}\ifx\@empty#2\@empty\mhchem@equilibriumRight#2%
+ \else\mhchem@ce@deploycommand{mhchem@equilibriumRight}#2{}\mhchem@END\fi{}%
\else%
- {}\mhchem@ce@deploycommand{mhchem@equilibrium}#1#2\mhchem@END{}%
+ {}\mhchem@ce@deploycommand{mhchem@equilibrium}#1#2{}\mhchem@END{}%
\fi%
}
\def\mhchem@ce@equiL#1#2\mhchem@END{%
@@ -246,18 +259,18 @@
}
\def\mhchem@ce@equiLi#1#2\mhchem@END{%
\if\noexpand#1>% (<<=)>
- {}\ifx \mhchem@END#2\mhchem@END\mhchem@equilibriumLeft#2%
- \else\mhchem@ce@deploycommand{mhchem@equilibriumLeft}#2\mhchem@END\fi{}%
+ {}\ifx\@empty#2\@empty\mhchem@equilibriumLeft#2%
+ \else\mhchem@ce@deploycommand{mhchem@equilibriumLeft}#2{}\mhchem@END\fi{}%
\else%
<<=#1#2%
\fi%
}
\def\mhchem@ce@dashtwo#1#2\mhchem@END{%
\if\noexpand#1>%
- {}\ifx \mhchem@END#2\mhchem@END\mhchem@mesomeric#2%
- \else\mhchem@ce@deploycommand{mhchem@mesomeric}#2\mhchem@END\fi{}%
+ {}\ifx\@empty#2\@empty\mhchem@mesomeric#2%
+ \else\mhchem@ce@deploycommand{mhchem@mesomeric}#2{}\mhchem@END\fi{}%
\else%
- {}\mhchem@ce@deploycommand{mhchem@givesleft}#1#2\mhchem@END{}%
+ {}\mhchem@ce@deploycommand{mhchem@givesleft}#1#2{}\mhchem@END{}%
\fi%
}
\def\mhchem@ce@deploycommand#1#2#3\mhchem@END{%
@@ -266,24 +279,27 @@
\else\csname#1\endcsname#2#3\fi\fi%
}
-\newtoks\tok@mhchem@ce@ii%
-\def\mhchem@ce@ii@tmp@i{}%
-\def\mhchem@ce@ii@tmp@ii{}%
\def\mhchem@ce@ii#1{%
- \tok@mhchem@ce@ii{#1}%
- \edef\mhchem@ce@ii@tmp@i{\the\tok@mhchem@ce@ii}%
+ \mhchem@ce@iii#1%
+}
+\newtoks\tok@mhchem@ce@iii%
+\def\mhchem@ce@iii@tmp@i{}%
+\def\mhchem@ce@iii@tmp@ii{}%
+\def\mhchem@ce@iii#1\mhchem@empty{%
+ \tok@mhchem@ce@iii{#1}%
+ \edef\mhchem@ce@iii@tmp@i{\the\tok@mhchem@ce@iii}%
%
- \def\mhchem@ce@ii@tmp@ii{(^)}%
- \ifx\mhchem@ce@ii@tmp@i\mhchem@ce@ii@tmp@ii%
+ \def\mhchem@ce@iii@tmp@ii{(^)}%
+ \ifx\mhchem@ce@iii@tmp@i\mhchem@ce@iii@tmp@ii%
{}\mathop{\uparrow}{}%
- \else\def\mhchem@ce@ii@tmp@ii{^}%
- \ifx\mhchem@ce@ii@tmp@i\mhchem@ce@ii@tmp@ii%
+ \else\def\mhchem@ce@iii@tmp@ii{^}%
+ \ifx\mhchem@ce@iii@tmp@i\mhchem@ce@iii@tmp@ii%
{}\mathop{\uparrow}{}%
- \else\def\mhchem@ce@ii@tmp@ii{(v)}%
- \ifx\mhchem@ce@ii@tmp@i\mhchem@ce@ii@tmp@ii%
+ \else\def\mhchem@ce@iii@tmp@ii{(v)}%
+ \ifx\mhchem@ce@iii@tmp@i\mhchem@ce@iii@tmp@ii%
{}\mathop{\downarrow}{}%
- \else\def\mhchem@ce@ii@tmp@ii{v}%
- \ifx\mhchem@ce@ii@tmp@i\mhchem@ce@ii@tmp@ii%
+ \else\def\mhchem@ce@iii@tmp@ii{v}%
+ \ifx\mhchem@ce@iii@tmp@i\mhchem@ce@iii@tmp@ii%
{}\mathop{\downarrow}{}%
\else%
\cf{#1}%
@@ -819,14 +835,14 @@
\newcounter{mhchem@cf@length}%
\def\mhchem@cf@length#1{%
\setcounter{mhchem@cf@length}{0}%
- \ifx\mhchem@END#1\mhchem@END%
+ \ifx\@empty#1\@empty%
\else%
\setcounter{mhchem@cf@length}{1}%
\mhchem@cf@length@i#1\mhchem@END%
\fi%
}
\def\mhchem@cf@length@i#1#2\mhchem@END{%
- \ifx\mhchem@END#2\mhchem@END%
+ \ifx\@empty#2\@empty%
\else%
\setcounter{mhchem@cf@length}{2}%
\fi%
@@ -867,13 +883,24 @@
\fi%
}
-\def\mhchem@END{}
-\def\mhchem@ENDEND{}
\def\mhchem@cf@i#1#2\mhchem@ENDEND{%
- \ifx\mhchem@END#1\mhchem@END%
+ \ifx\mhchem@END#1%
\mhchem@cf@output%
\else%
- \ifx\protect#1%
+ \ifx\@empty#1\@empty% leer
+ \if\mhchem@cf@state e\def\mhchem@cf@state{+}%
+ \else\if\mhchem@cf@state E\def\mhchem@cf@state{+}%
+ \else\if\mhchem@cf@state p\def\mhchem@cf@state{*}%
+ \else\if\mhchem@cf@state P\def\mhchem@cf@state{*}%
+ \else\if\mhchem@cf@state f\def\mhchem@cf@state{+}%
+ \else\if\mhchem@cf@state F\def\mhchem@cf@state{+}%
+ \else\if\mhchem@cf@state q\def\mhchem@cf@state{*}%
+ \else\if\mhchem@cf@state Q\def\mhchem@cf@state{*}%
+ \else%
+ \mhchem@cf@output%
+ \def\mhchem@cf@state{s}%
+ \fi\fi\fi\fi\fi\fi\fi\fi%
+ \else\ifx\protect#1%
\else\if\mhchem@cf@state e%
\mhchem@cf@sup=\expandafter{\the\mhchem@cf@sup%
\expandafter\mhchem@cf@replacedot\expandafter{\mhchem@cf@replaceminus{#1}}}%
@@ -893,7 +920,7 @@
\mhchem@cf@number=\expandafter{\the\mhchem@cf@number#1}%
\def\mhchem@cf@state{+}%
\else\if\mhchem@cf@state F%
- \if\mhchem@END\the\mhchem@cf@number\mhchem@END%
+ \ifx\@empty\the\mhchem@cf@number\@empty%***
\else\mhchem@cf@number=\expandafter{\the\mhchem@cf@number\,}\fi%
\mhchem@cf@number=\expandafter{\the\mhchem@cf@number%
\mhchem@mathortext@ii{\mhchem@option@mathfont{#1}}{#1}}%
@@ -927,9 +954,6 @@
\else%
\mhchem@cf@element=\expandafter{\the\mhchem@cf@element#1}%
\fi%
- \else\ifx\mhchem@END#1\mhchem@END%
- \mhchem@cf@output%
- \def\mhchem@cf@state{s}%
\else\ifx\ #1\mhchem@cf@output%
\else\ifx\protect#1%
\else\ifx#1\cmath%
@@ -1033,7 +1057,7 @@
\else\if\mhchem@cf@state 1\mhchem@cf@output\def\mhchem@cf@state{p}%
\else\if\mhchem@cf@state *\def\mhchem@cf@state{p}%
\else%
- \if\mhchem@END\the\mhchem@cf@sup\mhchem@END%
+ \ifx\@empty\the\mhchem@cf@sup\@empty%***
\else\mhchem@cf@sup=\expandafter{\the\mhchem@cf@sup\,}\fi%
\def\mhchem@cf@state{e}%
\fi\fi\fi%
@@ -1042,7 +1066,7 @@
\else\if\mhchem@cf@state 1\mhchem@cf@output\def\mhchem@cf@state{p}%
\else\if\mhchem@cf@state *\def\mhchem@cf@state{p}%
\else%
- \if\mhchem@END\the\mhchem@cf@sup\mhchem@END%
+ \ifx\@empty\the\mhchem@cf@sup\@empty%***
\else\mhchem@cf@sup=\expandafter{\the\mhchem@cf@sup\,}\fi%
\def\mhchem@cf@state{e}%
\fi\fi\fi%
@@ -1059,9 +1083,9 @@
\else%
\mhchem@cf@output@o{#1}%
\fi\fi\fi\fi%
- \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi%
+ \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi%
\fi%
- \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi%
+ \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi%
\mhchem@cf@length{#2}%
\mhchem@cf@i #2\mhchem@ENDEND%
\fi%
@@ -1233,7 +1257,7 @@
\mhchem@definearrows{font}
\define@key{mhchem}{arrows}{%
- \ifthenelse{\equal{pgf}{#1}}{%
+ \ifthenelse{\equal{pgf}{#1} \or \equal{pgf-filled}{#1}}{%
\RequirePackage{pgf}% for finding the tikz package more easily
\RequirePackage{tikz}%
}{}%
@@ -1306,4 +1330,8 @@
%TODO: count0 und dimen@ eliminieren
%
%
-%- option for centered bonds? \ No newline at end of file
+%
+
+\def\mhchem@END{}
+%\def\mhchem@ENDEND{}
+\def\mhchem@empty{} \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/mhchem/rsphrase.sty b/Master/texmf-dist/tex/latex/mhchem/rsphrase.sty
index f2f3d83075b..665fedf1f72 100644
--- a/Master/texmf-dist/tex/latex/mhchem/rsphrase.sty
+++ b/Master/texmf-dist/tex/latex/mhchem/rsphrase.sty
@@ -48,7 +48,7 @@
% mhchem.pdf and legal.txt.
%
%
-\ProvidesPackage{rsphrase}[2007/04/11 v3.06 Risk and Safety Phrases (mhchem bundle)]
+\ProvidesPackage{rsphrase}[2007/05/19 v3.07 Risk and Safety Phrases (mhchem bundle)]
\RequirePackage{ifthen}
\RequirePackage{textcomp}
diff --git a/Master/texmf-dist/tpm/mhchem.tpm b/Master/texmf-dist/tpm/mhchem.tpm
index 0891e07c282..89909fed85e 100644
--- a/Master/texmf-dist/tpm/mhchem.tpm
+++ b/Master/texmf-dist/tpm/mhchem.tpm
@@ -3,7 +3,7 @@
<rdf:Description about="http://texlive.dante.de/texlive/Package/mhchem.zip">
<TPM:Name>mhchem</TPM:Name>
<TPM:Type>Package</TPM:Type>
- <TPM:Date>2007/04/11 06:27:00</TPM:Date>
+ <TPM:Date>2007/05/19 08:43:00</TPM:Date>
<TPM:Version></TPM:Version>
<TPM:Creator>rahtz</TPM:Creator>
<TPM:Title>
@@ -21,15 +21,15 @@ spelling), and Spanish.
[description copied from TeX Catalogue]
</TPM:Description>
<TPM:Author>Martin Hensel</TPM:Author>
- <TPM:Size>677139</TPM:Size>
+ <TPM:Size>677239</TPM:Size>
<TPM:License></TPM:License>
<TPM:Build/>
- <TPM:RunFiles size="167915">
+ <TPM:RunFiles size="168755">
texmf-dist/tex/latex/mhchem/mhchem.sty
texmf-dist/tex/latex/mhchem/rsphrase.sty
texmf-dist/tpm/mhchem.tpm
</TPM:RunFiles>
- <TPM:DocFiles size="509324">
+ <TPM:DocFiles size="510450">
texmf-dist/doc/latex/mhchem/legal.txt
texmf-dist/doc/latex/mhchem/mhchem.pdf
</TPM:DocFiles>