From e4f6b6c0d6164dceee9cd08e5be85caf0ede6817 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 17 Jan 2008 20:55:56 +0000 Subject: achemso 2.2e (16jan08) git-svn-id: svn://tug.org/texlive/trunk@6294 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/achemso/achemso.sty | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) (limited to 'Master/texmf-dist/tex/latex/achemso') diff --git a/Master/texmf-dist/tex/latex/achemso/achemso.sty b/Master/texmf-dist/tex/latex/achemso/achemso.sty index 182ee56e843..c9905e50c79 100644 --- a/Master/texmf-dist/tex/latex/achemso/achemso.sty +++ b/Master/texmf-dist/tex/latex/achemso/achemso.sty @@ -16,7 +16,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{achemso} - [2008/01/16 v2.2f LaTeX and BibTeX support for American + [2008/01/16 v2.2e LaTeX and BibTeX support for American Chemical Society publications] \newif\ifACS@sctnnmbr\ACS@sctnnmbrfalse \newif\ifACS@list\ACS@listfalse @@ -41,6 +41,10 @@ \RequirePackage[numbers,sort&compress,round]{natbib} \newcommand*{\citenumfont}{\textit} \fi + \ifACS@mcite + \PackageWarning{achemso}{mcite option incompatible with natbib} + \fi + \ACS@mcitefalse \else \ifACS@super \RequirePackage[nospace]{overcite} @@ -79,12 +83,7 @@ \fi \ifACS@list \ifACS@natbib - \ifACS@mcite - \bibliographystyle{achemlntM} - \RequirePackage{mciteplus} - \else - \bibliographystyle{achemlnt} - \fi + \bibliographystyle{achemlnt} \else \ifACS@mcite \bibliographystyle{achemsolM} @@ -96,12 +95,7 @@ \RequirePackage[notcite]{showkeys} \else \ifACS@natbib - \ifACS@mcite - \bibliographystyle{achemnatM} - \RequirePackage{mciteplus} - \else - \bibliographystyle{achemnat} - \fi + \bibliographystyle{achemnat} \else \ifACS@mcite \bibliographystyle{achemsoM} -- cgit v1.2.3