chemstyle update (24aug09)

git-svn-id: svn://tug.org/texlive/trunk@14850 c570f23f-e606-0410-a88d-b1316a301751

9 files changed, 23 insertions, 18 deletions

diff --git a/Master/texmf-dist/tex/latex/chemstyle/chemscheme.sty b/Master/texmf-dist/tex/latex/chemstyle/chemscheme.sty
index 3f4e61317ae..4b2103be04c 100644
--- a/Master/texmf-dist/tex/latex/chemstyle/chemscheme.sty
+++ b/Master/texmf-dist/tex/latex/chemstyle/chemscheme.sty
@@ -14,7 +14,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{chemscheme}
-  [2009/06/06 v2.0 Schemes for chemistry]
+  [2009/08/23 v2.0a Schemes for chemistry]
 \RequirePackage{kvoptions,psfrag}
 \SetupKeyvalOptions{
   family=cst,
diff --git a/Master/texmf-dist/tex/latex/chemstyle/chemstyle.sty b/Master/texmf-dist/tex/latex/chemstyle/chemstyle.sty
index 7fa4babf398..f8d2999cd85 100644
--- a/Master/texmf-dist/tex/latex/chemstyle/chemstyle.sty
+++ b/Master/texmf-dist/tex/latex/chemstyle/chemstyle.sty
@@ -14,8 +14,8 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{chemstyle}
-  [2009/06/06 v2.0 Schemes and style for chemistry]
-\RequirePackage{amstext,caption,chemscheme,varioref,xspace}
+  [2009/08/23 v2.0a Schemes and style for chemistry]
+\RequirePackage{amstext,caption,chemscheme,xspace}
 \SetupKeyvalOptions{
   family=cst,
   prefix=cst@
@@ -30,6 +30,7 @@
 \DeclareBoolOption[true]{radhyphen}
 \DeclareBoolOption[true]{radprefix}
 \DeclareBoolOption[false]{radsuper}
+\DeclareBoolOption[true]{varioref}
 \DeclareBoolOption[true]{xspace}
 \DeclareStringOption{journal}
 \DeclareDefaultOption{%
@@ -44,7 +45,8 @@
 \DeclareStringOption{language}
 \setkeys{cst}{%
   journal  = ,
-  language = english
+  language = english,
+  varioref = true
 }
 \newif\ifcst@notes
 \newif\ifcst@autonotes
@@ -278,13 +280,6 @@
     \cst@radical@emph{#1}%
   }%
 }
-\labelformat{figure}{\figurename~#1}
-\labelformat{table}{\tablename~#1}
-\AtEndOfPackage{%
-  \AtBeginDocument{%
-    \labelformat{scheme}{\schemename~#1}%
-  }%
-}
 \AtBeginDocument{%
   \@ifpackageloaded{notes2bib}{}{%
     \newcounter{bibnote}%
@@ -411,6 +406,16 @@
   \fi
 \fi
 \ProcessKeyvalOptions{cst}
+\ifcst@varioref
+  \RequirePackage{varioref}
+  \labelformat{figure}{\figurename~#1}
+  \labelformat{table}{\tablename~#1}
+  \AtEndOfPackage{%
+    \AtBeginDocument{%
+      \labelformat{scheme}{\schemename~#1}%
+    }%
+  }
+\fi
 \newcommand*\cst@float@memoir@correct{%
   \let\newfloat\@undefined
 }
diff --git a/Master/texmf-dist/tex/latex/chemstyle/config/angew.chemstyle.cfg b/Master/texmf-dist/tex/latex/chemstyle/config/angew.chemstyle.cfg
index 0838ca333b8..4934a660409 100644
--- a/Master/texmf-dist/tex/latex/chemstyle/config/angew.chemstyle.cfg
+++ b/Master/texmf-dist/tex/latex/chemstyle/config/angew.chemstyle.cfg
@@ -13,7 +13,7 @@
 %% ----------------------------------------------------------------
 %% 
 \ProvidesFile{angew.chemstyle.cfg}
-  [2009/06/06 v2.0 Angew. Chem. journal style]
+  [2009/08/23 v2.0a Angew. Chem. journal style]
 \setkeys{cst}{
   abbremph  = false,
   radhyphen = false
diff --git a/Master/texmf-dist/tex/latex/chemstyle/config/ic.chemstyle.cfg b/Master/texmf-dist/tex/latex/chemstyle/config/ic.chemstyle.cfg
index 4e7d1d36dd5..1bfc131f7af 100644
--- a/Master/texmf-dist/tex/latex/chemstyle/config/ic.chemstyle.cfg
+++ b/Master/texmf-dist/tex/latex/chemstyle/config/ic.chemstyle.cfg
@@ -13,7 +13,7 @@
 %% ----------------------------------------------------------------
 %% 
 \ProvidesFile{ic.chemstyle.cfg}
-  [2009/06/06 v2.0 Inorg. Chem. journal style]
+  [2009/08/23 v2.0a Inorg. Chem. journal style]
 \DeclareCaptionLabelSeparator{perquad}{.\quad}
 \captionsetup{
   labelfont       = {bf,it,sf},
diff --git a/Master/texmf-dist/tex/latex/chemstyle/config/jacs.chemstyle.cfg b/Master/texmf-dist/tex/latex/chemstyle/config/jacs.chemstyle.cfg
index 7f77ecc6dd0..0c2d40f84ac 100644
--- a/Master/texmf-dist/tex/latex/chemstyle/config/jacs.chemstyle.cfg
+++ b/Master/texmf-dist/tex/latex/chemstyle/config/jacs.chemstyle.cfg
@@ -13,7 +13,7 @@
 %% ----------------------------------------------------------------
 %% 
 \ProvidesFile{jacs.chemstyle.cfg}
-  [2009/06/06 v2.0 J. Am. Chem. Soc. journal style]
+  [2009/08/23 v2.0a J. Am. Chem. Soc. journal style]
 \DeclareCaptionLabelSeparator{perquad}{.\quad}
 \captionsetup{
   labelfont       = {bf,it,sf},
diff --git a/Master/texmf-dist/tex/latex/chemstyle/config/jomc.chemstyle.cfg b/Master/texmf-dist/tex/latex/chemstyle/config/jomc.chemstyle.cfg
index 9e8bf75da44..8072fcf193d 100644
--- a/Master/texmf-dist/tex/latex/chemstyle/config/jomc.chemstyle.cfg
+++ b/Master/texmf-dist/tex/latex/chemstyle/config/jomc.chemstyle.cfg
@@ -13,7 +13,7 @@
 %% ----------------------------------------------------------------
 %% 
 \ProvidesFile{jomc.chemstyle.cfg}
-  [2009/06/06 v2.0 J. Organomet. Chem. journal style]
+  [2009/08/23 v2.0a J. Organomet. Chem. journal style]
 \setkeys{cst}{
   abbremph  = false,
   radhyphen = true,
diff --git a/Master/texmf-dist/tex/latex/chemstyle/config/orglett.chemstyle.cfg b/Master/texmf-dist/tex/latex/chemstyle/config/orglett.chemstyle.cfg
index 414df6f0a8a..5270d89f26d 100644
--- a/Master/texmf-dist/tex/latex/chemstyle/config/orglett.chemstyle.cfg
+++ b/Master/texmf-dist/tex/latex/chemstyle/config/orglett.chemstyle.cfg
@@ -13,7 +13,7 @@
 %% ----------------------------------------------------------------
 %% 
 \ProvidesFile{orglett.chemstyle.cfg}
-  [2009/06/06 v2.0 Org. Lett. journal style]
+  [2009/08/23 v2.0a Org. Lett. journal style]
 \DeclareCaptionLabelSeparator{perquad}{.\quad}
 \captionsetup{
   labelfont       = bf,
diff --git a/Master/texmf-dist/tex/latex/chemstyle/config/rsc.chemstyle.cfg b/Master/texmf-dist/tex/latex/chemstyle/config/rsc.chemstyle.cfg
index 7bbf64b6705..29ef60e86c2 100644
--- a/Master/texmf-dist/tex/latex/chemstyle/config/rsc.chemstyle.cfg
+++ b/Master/texmf-dist/tex/latex/chemstyle/config/rsc.chemstyle.cfg
@@ -13,7 +13,7 @@
 %% ----------------------------------------------------------------
 %% 
 \ProvidesFile{rsc.chemstyle.cfg}
-  [2009/06/06 v2.0 RSC journal style]
+  [2009/08/23 v2.0a RSC journal style]
 \captionsetup{
   labelsep  = quad,
   labelfont = bf
diff --git a/Master/texmf-dist/tex/latex/chemstyle/config/tetlett.chemstyle.cfg b/Master/texmf-dist/tex/latex/chemstyle/config/tetlett.chemstyle.cfg
index e21931713a2..066cb6dc9fe 100644
--- a/Master/texmf-dist/tex/latex/chemstyle/config/tetlett.chemstyle.cfg
+++ b/Master/texmf-dist/tex/latex/chemstyle/config/tetlett.chemstyle.cfg
@@ -13,7 +13,7 @@
 %% ----------------------------------------------------------------
 %% 
 \ProvidesFile{tetlett.chemstyle.cfg}
-  [2009/06/06 v2.0 Tetrahedron Lett. journal style]
+  [2009/08/23 v2.0a Tetrahedron Lett. journal style]
 \captionsetup{
   labelsep        = period,
   labelfont       = bf,