From 17337a1ac66e89310e57ca7eaff87370d2172703 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 22 Jan 2008 00:40:47 +0000 Subject: achemso 2.2g git-svn-id: svn://tug.org/texlive/trunk@6362 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/achemso/achemso.sty | 63 ++++++++++++++++++------- 1 file changed, 45 insertions(+), 18 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 c9905e50c79..bd4c5b4e9b3 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.2e LaTeX and BibTeX support for American + [2008/01/21 v2.2g LaTeX and BibTeX support for American Chemical Society publications] \newif\ifACS@sctnnmbr\ACS@sctnnmbrfalse \newif\ifACS@list\ACS@listfalse @@ -24,6 +24,7 @@ \newif\ifACS@super\ACS@supertrue \newif\ifACS@natbib\ACS@natbibfalse \newif\ifACS@mcite\ACS@mcitefalse +\newif\ifACS@iecr\ACS@iecrfalse \DeclareOption{note}{\ExecuteOptions{notes}} \DeclareOption{notes}{\ACS@notetrue} \DeclareOption{number}{\ACS@sctnnmbrtrue} @@ -32,6 +33,7 @@ \DeclareOption{notsuper}{\ACS@superfalse} \DeclareOption{natbib}{\ACS@natbibtrue} \DeclareOption{mcite}{\ACS@mcitetrue} +\DeclareOption{iecr}{\ACS@iecrtrue} \DeclareOption*{\OptionNotUsed} \ProcessOptions\relax \ifACS@natbib @@ -41,10 +43,6 @@ \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} @@ -81,31 +79,60 @@ \ifACS@sctnnmbr \RequirePackage[numbib]{tocbibind} \fi -\ifACS@list +\ifACS@mcite + \RequirePackage{mciteplus} +\fi +\ifACS@iecr \ifACS@natbib - \bibliographystyle{achemlnt} + \ifACS@mcite + \bibliographystyle{iecrnatM} + \else + \bibliographystyle{iecrnat} + \fi \else \ifACS@mcite - \bibliographystyle{achemsolM} - \RequirePackage{mciteplus} + \bibliographystyle{iecrM} \else - \bibliographystyle{achemsol} + \bibliographystyle{iecr} \fi \fi - \RequirePackage[notcite]{showkeys} \else - \ifACS@natbib - \bibliographystyle{achemnat} + \ifACS@list + \ifACS@natbib + \ifACS@mcite + \bibliographystyle{achemlntM} + \else + \bibliographystyle{achemlnt} + \fi + \else + \ifACS@mcite + \bibliographystyle{achemsolM} + \else + \bibliographystyle{achemsol} + \fi + \fi + \RequirePackage[notcite]{showkeys} \else - \ifACS@mcite - \bibliographystyle{achemsoM} - \RequirePackage{mciteplus} + \ifACS@natbib + \ifACS@mcite + \bibliographystyle{achemnatM} + \else + \bibliographystyle{achemnat} + \fi \else - \bibliographystyle{achemso} + \ifACS@mcite + \bibliographystyle{achemsoM} + \else + \bibliographystyle{achemso} + \fi \fi \fi \fi -\renewcommand*{\@biblabel}[1]{#1.} +\ifACS@iecr + \renewcommand*{\@biblabel}[1]{(#1)} +\else + \renewcommand*{\@biblabel}[1]{#1.} +\fi \newcommand*{\ACS@bibwarning}{\PackageWarning{achemso}% {Additional bibliographystyle command ignored}} \renewcommand*{\bibliographystyle}{\ACS@bibwarning\@gobble} -- cgit v1.2.3