2 files changed, 29 insertions, 30 deletions
diff --git a/Master/texmf-dist/tex/latex/chemstyle/chemscheme.sty b/Master/texmf-dist/tex/latex/chemstyle/chemscheme.sty
index 045e05a2489..7c7679c41c2 100644
--- a/Master/texmf-dist/tex/latex/chemstyle/chemscheme.sty
+++ b/Master/texmf-dist/tex/latex/chemstyle/chemscheme.sty
@@ -17,7 +17,7 @@
 \def\csh@id$#1: #2.#3 #4 #5-#6-#7 #8 #9${%
     #5/#6/#7\space v1.4\space}
 \ProvidesPackage{chemscheme}
-  [\csh@id $Id: chemscheme.dtx 36 2008-07-17 07:39:53Z joseph $
+  [\csh@id $Id: chemscheme.dtx 45 2008-07-23 11:27:13Z joseph $
    Support for chemical schemes]
 \RequirePackage{kvoptions,psfrag,iflang}
 \SetupKeyvalOptions{
diff --git a/Master/texmf-dist/tex/latex/chemstyle/chemstyle.sty b/Master/texmf-dist/tex/latex/chemstyle/chemstyle.sty
index 34322e56d7d..290fdd95348 100644
--- a/Master/texmf-dist/tex/latex/chemstyle/chemstyle.sty
+++ b/Master/texmf-dist/tex/latex/chemstyle/chemstyle.sty
@@ -15,8 +15,8 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \def\cst@id$#1: #2.#3 #4 #5-#6-#7 #8 #9${%
-    \def\cst@ver{#5/#6/#7\space v1.3\space}}
-\cst@id $Id: chemstyle.dtx 36 2008-07-17 07:39:53Z joseph $
+    \def\cst@ver{#5/#6/#7\space v1.3b\space}}
+\cst@id $Id: chemstyle.dtx 46 2008-07-23 11:29:06Z joseph $
 \ProvidesPackage{chemstyle}
   [\cst@ver Writing chemistry with style]
 \RequirePackage{xkeyval}[2005/05/07]
@@ -100,33 +100,32 @@
   \iffalse{\fi\ifnum0=`}\fi
   \setkeys[cst]{opt}{#1}%
   \ifnum0=`{\fi\iffalse}\fi}
-\AtBeginDocument{
-  \@ifpackageloaded{siunitx}
-    {\requiresiconfigs{synchem}}
-    {\@ifpackageloaded{SIunits}
-       {\newcommand*{\cubiccentimeter}{\centi\metre\cubed}
-        \newcommand*{\Molar}{\textsc{m}}
-        \newcommand*{\molar}{\mole\usk\deci\metre\rpcubed}
-        \newcommand*{\mmHg}{\milli\metre Hg}
-        \newcommand*{\mol}{\mole}
-        \newcommand*{\cmc}{\cubiccentimeter}
-        \newcommand*{\Hz}{\hertz}}
-       {\@ifpackageloaded{unitsdef}
-        {\newunit{\cubiccentimeter}{%
-           \cm\unitsuperscript{3}}
-         \newunit{\Molar}{\textsc{m}}
-         \newunit{\molar}{%
-           \mole\unitsep\dm\unitsuperscript{--3}}
-         \newunit{\mmHg}{mmHg}
-         \newunit{\mol}{\mole}
-         \newcommand*{\cmc}{\cubiccentimeter}
-         \newcommand*{\Hz}{\hertz}}
-        {\RequirePackage[alsoload=synchem]{siunitx}}}}}
-\DeclareSymbolFont{CSTAMS}{U}{msb}{m}{n}
-\DeclareMathSymbol{\cst@varnothing}{\mathord}{CSTAMS}{"3F}
-\providecommand*{\standardstate}%
-  {\textsuperscript{\rotatebox[origin=c]{138.8}%
-  {\ensuremath{\cst@varnothing}}}}
+\@ifpackageloaded{siunitx}
+  {\requiresiconfigs{synchem}}
+  {\@ifpackageloaded{SIunits}
+     {\newcommand*{\cubiccentimeter}{\centi\metre\cubed}
+      \newcommand*{\Molar}{\textsc{m}}
+      \newcommand*{\molar}{\mole\usk\deci\metre\rpcubed}
+      \newcommand*{\mmHg}{\milli\metre Hg}
+      \newcommand*{\mol}{\mole}
+      \newcommand*{\cmc}{\cubiccentimeter}
+      \newcommand*{\Hz}{\hertz}}
+     {\@ifpackageloaded{unitsdef}
+      {\newunit{\cubiccentimeter}{%
+         \cm\unitsuperscript{3}}
+       \newunit{\Molar}{\textsc{m}}
+       \newunit{\molar}{%
+         \mole\unitsep\dm\unitsuperscript{--3}}
+       \newunit{\mmHg}{mmHg}
+       \newunit{\mol}{\mole}
+       \newcommand*{\cmc}{\cubiccentimeter}
+       \newcommand*{\Hz}{\hertz}}
+      {\RequirePackage[alsoload=synchem]{siunitx}}}}
+\providecommand*{\standardstate}{%
+  {\ensuremath{\protect\cst@sstate}}}
+\newcommand*{\cst@sstate}{\mathpalette\cst@s@state\circ}
+\newcommand*{\cst@s@state}[2]{%
+  \ooalign{\hfil$#1-$\hfil\cr\hfil$#1#2$\hfil\cr}}
 \newcommand*{\cst@radical}[2]{%
   \expandafter\DeclareRobustCommand\expandafter*\expandafter{%
     \csname #1#2\endcsname}{%