From b251a1a9ddd70c3703f12bb312787f0406f368cd Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 30 Jan 2010 23:07:39 +0000 Subject: chemstyle update (30jan10) git-svn-id: svn://tug.org/texlive/trunk@16875 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/chemstyle/chemscheme.sty | 15 +++++++++++++-- Master/texmf-dist/tex/latex/chemstyle/chemstyle.sty | 15 +++++++++++++-- .../tex/latex/chemstyle/config/angew.chemstyle.cfg | 4 ++-- .../tex/latex/chemstyle/config/ic.chemstyle.cfg | 4 ++-- .../tex/latex/chemstyle/config/jacs.chemstyle.cfg | 4 ++-- .../tex/latex/chemstyle/config/jomc.chemstyle.cfg | 4 ++-- .../tex/latex/chemstyle/config/orglett.chemstyle.cfg | 4 ++-- .../tex/latex/chemstyle/config/rsc.chemstyle.cfg | 4 ++-- .../tex/latex/chemstyle/config/tetlett.chemstyle.cfg | 4 ++-- 9 files changed, 40 insertions(+), 18 deletions(-) (limited to 'Master/texmf-dist/tex/latex/chemstyle') diff --git a/Master/texmf-dist/tex/latex/chemstyle/chemscheme.sty b/Master/texmf-dist/tex/latex/chemstyle/chemscheme.sty index b642463b8fe..963e22c1c8d 100644 --- a/Master/texmf-dist/tex/latex/chemstyle/chemscheme.sty +++ b/Master/texmf-dist/tex/latex/chemstyle/chemscheme.sty @@ -14,12 +14,23 @@ %% \NeedsTeXFormat{LaTeX2e} \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@ } +\@ifclassloaded{achemso} + { + \PackageWarning{chemscheme} + {% + The chemscheme package should not\MessageBreak + be used with the achemso class:\MessageBreak + loading chemscheme will abort% + } + \endinput + } + {} \DeclareBoolOption[true]{chemcompounds} \DeclareComplementaryOption{bpchem}{chemcompounds} \DeclareBoolOption[true]{floatrow} @@ -303,7 +314,7 @@ \AtBeginDocument{\cst@ref@check@sub} %% -%% Copyright (C) 2006-2009 by +%% Copyright (C) 2006-2010 by %% Joseph Wright %% %% It may be distributed and/or modified under the conditions of diff --git a/Master/texmf-dist/tex/latex/chemstyle/chemstyle.sty b/Master/texmf-dist/tex/latex/chemstyle/chemstyle.sty index 93158d09060..fdb42c10489 100644 --- a/Master/texmf-dist/tex/latex/chemstyle/chemstyle.sty +++ b/Master/texmf-dist/tex/latex/chemstyle/chemstyle.sty @@ -14,12 +14,23 @@ %% \NeedsTeXFormat{LaTeX2e} \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@ } +\@ifclassloaded{achemso} + { + \PackageWarning{chemstyle} + {% + The chemstyle package should not\MessageBreak + be used with the achemso class:\MessageBreak + loading chemstyle will abort% + } + \endinput + } + {} \newcommand*\cst@tempa{} \DeclareBoolOption[false]{abbrcomma} \DeclareBoolOption[true]{abbremph} @@ -463,7 +474,7 @@ \cst@ref@load %% -%% Copyright (C) 2006-2009 by +%% Copyright (C) 2006-2010 by %% Joseph Wright %% %% It may be distributed and/or modified under the conditions of 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 fbd57593fb0..5729a92308b 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/12/28 v2.0e Angew. Chem. journal style] + [2010/01/30 v2.0f Angew. Chem. journal style] \setkeys{cst}{ abbremph = false, radhyphen = false @@ -29,7 +29,7 @@ } %% -%% Copyright (C) 2006-2009 by +%% Copyright (C) 2006-2010 by %% Joseph Wright %% %% It may be distributed and/or modified under the conditions of 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 df3ca24df35..f469e5a9c95 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/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}, @@ -40,7 +40,7 @@ } %% -%% Copyright (C) 2006-2009 by +%% Copyright (C) 2006-2010 by %% Joseph Wright %% %% It may be distributed and/or modified under the conditions of 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 25f69f3b8d3..9bccf7fef1a 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/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}, @@ -40,7 +40,7 @@ } %% -%% Copyright (C) 2006-2009 by +%% Copyright (C) 2006-2010 by %% Joseph Wright %% %% It may be distributed and/or modified under the conditions of 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 dfeba0082cb..58dd513fe2b 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/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, @@ -31,7 +31,7 @@ } %% -%% Copyright (C) 2006-2009 by +%% Copyright (C) 2006-2010 by %% Joseph Wright %% %% It may be distributed and/or modified under the conditions of 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 eca1b86af1c..e4376d500be 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/12/28 v2.0e Org. Lett. journal style] + [2010/01/30 v2.0f Org. Lett. journal style] \DeclareCaptionLabelSeparator{perquad}{.\quad} \captionsetup{ labelfont = bf, @@ -112,7 +112,7 @@ } %% -%% Copyright (C) 2006-2009 by +%% Copyright (C) 2006-2010 by %% Joseph Wright %% %% It may be distributed and/or modified under the conditions of 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 efa6e55329a..68900159354 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/12/28 v2.0e RSC journal style] + [2010/01/30 v2.0f RSC journal style] \captionsetup{ labelsep = quad, labelfont = bf @@ -23,7 +23,7 @@ } %% -%% Copyright (C) 2006-2009 by +%% Copyright (C) 2006-2010 by %% Joseph Wright %% %% It may be distributed and/or modified under the conditions of 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 ab09ee251c5..61bad5574c7 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/12/28 v2.0e Tetrahedron Lett. journal style] + [2010/01/30 v2.0f Tetrahedron Lett. journal style] \captionsetup{ labelsep = period, labelfont = bf, @@ -25,7 +25,7 @@ } %% -%% Copyright (C) 2006-2009 by +%% Copyright (C) 2006-2010 by %% Joseph Wright %% %% It may be distributed and/or modified under the conditions of -- cgit v1.2.3