From 80d2fb67910f81686ae45787106ec6d5a2797473 Mon Sep 17 00:00:00 2001 From: Manuel Pégourié-Gonnard Date: Tue, 2 Aug 2011 19:05:59 +0000 Subject: mhchem 2011/06/03 v3.11 git-svn-id: svn://tug.org/texlive/trunk@23334 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/mhchem/mhchem.pdf | Bin 280239 -> 280242 bytes Master/texmf-dist/tex/latex/mhchem/mhchem.sty | 12 ++++++------ Master/texmf-dist/tex/latex/mhchem/rsphrase.sty | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Master/texmf-dist/doc/latex/mhchem/mhchem.pdf b/Master/texmf-dist/doc/latex/mhchem/mhchem.pdf index 9cb1087e621..38a749f4481 100644 Binary files a/Master/texmf-dist/doc/latex/mhchem/mhchem.pdf and b/Master/texmf-dist/doc/latex/mhchem/mhchem.pdf differ diff --git a/Master/texmf-dist/tex/latex/mhchem/mhchem.sty b/Master/texmf-dist/tex/latex/mhchem/mhchem.sty index 80d70f8f97c..831a8cf29a6 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}[2011/04/29 v3.10 for typesetting chemical formulae] +\ProvidesPackage{mhchem}[2011/06/03 v3.11 for typesetting chemical formulae] \RequirePackage{ifthen} \RequirePackage{calc}[1998/07/07] \RequirePackage{twoopt} @@ -742,7 +742,7 @@ \newtoks\mhchem@cf@result% \newcommand*\mhchem@cf[2][]{% \bgroup% - %%% + %%% \def\sbond{{\ensuremath{-}}}% \ifnum 2=\mhchem@option@version% \let\bond\sbond% @@ -760,8 +760,8 @@ \edef\mhchem@mathOrText@ii##1##2{##2}% \else% \ifnum 1<\mhchem@option@version% - \edef\mhchem@mathOrText##1{\ifmmode\mhchem@option@mathFont{##1}\else\noexpand\text{##1}\fi}% - \edef\mhchem@mathOrText@ii##1##2{\ifmmode\mhchem@option@mathFont{##1}\else ##2\fi}% + \edef\mhchem@mathOrText##1{\ifmmode\noexpand\mhchem@option@mathFont{##1}\else\noexpand\text{##1}\fi}% + \edef\mhchem@mathOrText@ii##1##2{\ifmmode\noexpand\mhchem@option@mathFont{##1}\else ##2\fi}% \else% \edef\mhchem@mathOrText##1{\ifmmode ##1\else\noexpand\text{##1}\fi}% \edef\mhchem@mathOrText@ii##1##2{\ifmmode ##1\else ##2\fi}% @@ -1651,7 +1651,7 @@ \newtoks\mhchem@cf@presub% \newtoks\mhchem@cf@presup% \def\mhchem@cf@output{% - %\showthe\mhchem@cf@result% + % \if\mhchem@cf@state s% \else\if\mhchem@cf@state 1% \noexpand\mhchem@mathOrText{\noexpand\mhchem@cf@frac\the\mhchem@cf@amount/\noexpand\mhchem@END}% @@ -2101,4 +2101,4 @@ \edef\mhchem@lbracechar{\string{} %} \def\mhchem@gobble#1{}% % -%- todo: \sbond etc. aus Anleitung für v4 entfernen \ No newline at end of file +% \ 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 d5e1e7150b9..8bed392cf4d 100644 --- a/Master/texmf-dist/tex/latex/mhchem/rsphrase.sty +++ b/Master/texmf-dist/tex/latex/mhchem/rsphrase.sty @@ -52,7 +52,7 @@ % mhchem.pdf and legal.txt. % % -\ProvidesPackage{rsphrase}[2011/04/29 v3.10 Risk and Safety Phrases (mhchem bundle)] +\ProvidesPackage{rsphrase}[2011/06/03 v3.11 Risk and Safety Phrases (mhchem bundle)] \RequirePackage{ifthen} \RequirePackage{textcomp} -- cgit v1.2.3