chemstyle update (30jan10)

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

2 files changed, 46 insertions, 14 deletions

diff --git a/Master/texmf-dist/source/latex/chemstyle/chemstyle.dtx b/Master/texmf-dist/source/latex/chemstyle/chemstyle.dtx
index 9bf94de3b50..3b67c5558cf 100644
--- a/Master/texmf-dist/source/latex/chemstyle/chemstyle.dtx
+++ b/Master/texmf-dist/source/latex/chemstyle/chemstyle.dtx
@@ -50,7 +50,7 @@ See http://www.latex-project.org/lppl.txt
 \endpreamble
 \postamble
 
-Copyright (C) 2006-2009 by
+Copyright (C) 2006-2010 by
   Joseph Wright <joseph.wright@morningstar2.co.uk>
 
 It may be distributed and/or modified under the conditions of
@@ -304,6 +304,8 @@ This work consists of the file  chemstyle.dtx and
 %\maketitle
 %
 %\changes{v1.0}{2006/08/06}{Initial release of package}
+%\changes{v2.0f}{2010/01/30}{Detect use of \pkg{achemso} class and
+%  abort loading of \pkg{chemstyle} and \pkg{chemscheme}}
 %
 %\begin{abstract}
 %  The \textsf{chemstyle} bundle provides two packages: 
@@ -976,7 +978,7 @@ This work consists of the file  chemstyle.dtx and
 \usepackage[runs=2]{auto-pst-pdf}   % Use EPS graphics with pdfLaTeX
 \usepackage{booktabs}               % Better table layouts
 \usepackage[journal=rsc]{chemstyle} % Of course!
-\usepackage{geometry}               % Easy page laout
+\usepackage{geometry}               % Easy page layout
 \usepackage{lmodern}                % Use Latin Modern fonts
 \usepackage[version=3]{mhchem}      % Formula subscripts using \ce{}
 \begin{document}
@@ -995,13 +997,28 @@ This work consists of the file  chemstyle.dtx and
 %    \begin{macrocode}
 %<*package> 
 \ProvidesPackage{chemstyle}
-  [2009/12/28 v2.0e Schemes and style for chemistry]   
+  [2010/01/30 v2.0f Schemes and style for chemistry]   
 \RequirePackage{amstext,caption,chemscheme,xspace}
 \SetupKeyvalOptions{
   family=cst,
   prefix=cst@
 }
 %    \end{macrocode}
+%
+% Users of the \pkg{achemso} class should not load \pkg{chemstyle}.
+%    \begin{macrocode}
+\@ifclassloaded{achemso}
+  {
+    \PackageWarning{chemstyle}
+      {%
+        The chemstyle package should not\MessageBreak
+        be used with the achemso class:\MessageBreak
+        loading chemstyle will abort%
+      }
+    \endinput
+  }
+  {}
+%    \end{macrocode}
 %    
 %\begin{macro}{\cst@tempa}
 % A temporary macro.
@@ -1775,13 +1792,28 @@ This work consists of the file  chemstyle.dtx and
 %    \begin{macrocode}
 %<*chemscheme>
 \ProvidesPackage{chemscheme}
-  [2009/12/28 v2.0e Schemes for chemistry] 
+  [2010/01/30 v2.0f Schemes for chemistry] 
 \RequirePackage{kvoptions,psfrag}
 \SetupKeyvalOptions{
   family=cst,
   prefix=cst@
 }
 %    \end{macrocode}
+%    
+% Users of the \pkg{achemso} class should not load \pkg{chemscheme}.
+%    \begin{macrocode}
+\@ifclassloaded{achemso}
+  {
+    \PackageWarning{chemscheme}
+      {%
+        The chemscheme package should not\MessageBreak
+        be used with the achemso class:\MessageBreak
+        loading chemscheme will abort%
+      }
+    \endinput
+  }
+  {}
+%    \end{macrocode}
 % 
 %\begin{macro}{\ifcst@floatrow} 
 %\begin{macro}{\ifcst@chemcompounds} 
@@ -2264,7 +2296,7 @@ This work consists of the file  chemstyle.dtx and
 %    \begin{macrocode}
 %<*angew>    
 \ProvidesFile{angew.chemstyle.cfg}
-  [2009/12/28 v2.0e Angew. Chem. journal style]
+  [2010/01/30 v2.0f Angew. Chem. journal style]
 \setkeys{cst}{
   abbremph  = false,
   radhyphen = false
@@ -2286,7 +2318,7 @@ This work consists of the file  chemstyle.dtx and
 %    \begin{macrocode}
 %<*ic>    
 \ProvidesFile{ic.chemstyle.cfg}
-  [2009/12/28 v2.0e Inorg. Chem. journal style]
+  [2010/01/30 v2.0f Inorg. Chem. journal style]
 \DeclareCaptionLabelSeparator{perquad}{.\quad}
 \captionsetup{
   labelfont       = {bf,it,sf},
@@ -2321,7 +2353,7 @@ This work consists of the file  chemstyle.dtx and
 %    \begin{macrocode}
 %<*jacs>    
 \ProvidesFile{jacs.chemstyle.cfg}
-  [2009/12/28 v2.0e J. Am. Chem. Soc. journal style]
+  [2010/01/30 v2.0f J. Am. Chem. Soc. journal style]
 \DeclareCaptionLabelSeparator{perquad}{.\quad}
 \captionsetup{
   labelfont       = {bf,it,sf},
@@ -2354,7 +2386,7 @@ This work consists of the file  chemstyle.dtx and
 %    \begin{macrocode}
 %<*jomc>    
 \ProvidesFile{jomc.chemstyle.cfg}
-  [2009/12/28 v2.0e J. Organomet. Chem. journal style]
+  [2010/01/30 v2.0f J. Organomet. Chem. journal style]
 \setkeys{cst}{
   abbremph  = false,
   radhyphen = true,
@@ -2378,7 +2410,7 @@ This work consists of the file  chemstyle.dtx and
 %    \begin{macrocode}
 %<*jpc>    
 \ProvidesFile{jpc.chemstyle.cfg}
-  [2009/12/28 v2.0e J. Phys. Chem. journal style]
+  [2010/01/30 v2.0f J. Phys. Chem. journal style]
 \DeclareCaptionFormat{labelcaps}{\MakeUppercase{#1}#2#3}
 \captionsetup{
   font            = bf,
@@ -2412,7 +2444,7 @@ This work consists of the file  chemstyle.dtx and
 %    \begin{macrocode}
 %<*orglett>    
 \ProvidesFile{orglett.chemstyle.cfg}
-  [2009/12/28 v2.0e Org. Lett. journal style]
+  [2010/01/30 v2.0f Org. Lett. journal style]
 \DeclareCaptionLabelSeparator{perquad}{.\quad}
 \captionsetup{
   labelfont       = bf,
@@ -2536,7 +2568,7 @@ This work consists of the file  chemstyle.dtx and
 %    \begin{macrocode}
 %<*rsc>    
 \ProvidesFile{rsc.chemstyle.cfg}
-  [2009/12/28 v2.0e RSC journal style]
+  [2010/01/30 v2.0f RSC journal style]
 \captionsetup{
   labelsep  = quad,
   labelfont = bf
@@ -2552,7 +2584,7 @@ This work consists of the file  chemstyle.dtx and
 %    \begin{macrocode}
 %<*tetlett>    
 \ProvidesFile{tetlett.chemstyle.cfg}
-  [2009/12/28 v2.0e Tetrahedron Lett. journal style]
+  [2010/01/30 v2.0f Tetrahedron Lett. journal style]
 \captionsetup{
   labelsep        = period,
   labelfont       = bf,
diff --git a/Master/texmf-dist/source/latex/chemstyle/chemstyle.ins b/Master/texmf-dist/source/latex/chemstyle/chemstyle.ins
index 89766404fa0..9df7031c411 100644
--- a/Master/texmf-dist/source/latex/chemstyle/chemstyle.ins
+++ b/Master/texmf-dist/source/latex/chemstyle/chemstyle.ins
@@ -26,7 +26,7 @@ See http://www.latex-project.org/lppl.txt
 \endpreamble
 \postamble
 
-Copyright (C) 2006-2009 by
+Copyright (C) 2006-2010 by
   Joseph Wright <joseph.wright@morningstar2.co.uk>
 
 It may be distributed and/or modified under the conditions of
@@ -66,7 +66,7 @@ This work consists of the file  chemstyle.dtx and
 \endbatchfile
 
 %% 
-%% Copyright (C) 2006-2009 by
+%% Copyright (C) 2006-2010 by
 %%   Joseph Wright <joseph.wright@morningstar2.co.uk>
 %% 
 %% It may be distributed and/or modified under the conditions of