summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/achemso/achemso.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2008-03-14 00:24:17 +0000
committerKarl Berry <karl@freefriends.org>2008-03-14 00:24:17 +0000
commit9cc5e1545f61cc0ca4996b6fb98ce491ec5a4ce5 (patch)
tree8b4b5412ed02fa3b1581f68f03a56f0110953b7c /Master/texmf-dist/tex/latex/achemso/achemso.sty
parent2d0760c2d539075994a651bbcbddb1c1f97bee4d (diff)
achemso 2.2h (12mar08)
git-svn-id: svn://tug.org/texlive/trunk@6960 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/achemso/achemso.sty')
-rw-r--r--Master/texmf-dist/tex/latex/achemso/achemso.sty35
1 files changed, 21 insertions, 14 deletions
diff --git a/Master/texmf-dist/tex/latex/achemso/achemso.sty b/Master/texmf-dist/tex/latex/achemso/achemso.sty
index bd4c5b4e9b3..acce6c1b08a 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/21 v2.2g LaTeX and BibTeX support for American
+ [2008/03/12 v2.2h LaTeX and BibTeX support for American
Chemical Society publications]
\newif\ifACS@sctnnmbr\ACS@sctnnmbrfalse
\newif\ifACS@list\ACS@listfalse
@@ -85,57 +85,64 @@
\ifACS@iecr
\ifACS@natbib
\ifACS@mcite
- \bibliographystyle{iecrnatM}
+ \newcommand*{\acs@bibstyle}{iecrnatM}%
\else
- \bibliographystyle{iecrnat}
+ \newcommand*{\acs@bibstyle}{iecrnat}%
\fi
\else
\ifACS@mcite
- \bibliographystyle{iecrM}
+ \newcommand*{\acs@bibstyle}{iecrM}%
\else
- \bibliographystyle{iecr}
+ \newcommand*{\acs@bibstyle}{iecr}%
\fi
\fi
\else
\ifACS@list
\ifACS@natbib
\ifACS@mcite
- \bibliographystyle{achemlntM}
+ \newcommand*{\acs@bibstyle}{achemlntM}%
\else
- \bibliographystyle{achemlnt}
+ \newcommand*{\acs@bibstyle}{achemlnt}%
\fi
\else
\ifACS@mcite
- \bibliographystyle{achemsolM}
+ \newcommand*{\acs@bibstyle}{achemsolM}%
\else
- \bibliographystyle{achemsol}
+ \newcommand*{\acs@bibstyle}{achemsol}%
\fi
\fi
\RequirePackage[notcite]{showkeys}
\else
\ifACS@natbib
\ifACS@mcite
- \bibliographystyle{achemnatM}
+ \newcommand*{\acs@bibstyle}{achemnatM}%
\else
- \bibliographystyle{achemnat}
+ \newcommand*{\acs@bibstyle}{achemnat}%
\fi
\else
\ifACS@mcite
- \bibliographystyle{achemsoM}
+ \newcommand*{\acs@bibstyle}{achemsoM}%
\else
- \bibliographystyle{achemso}
+ \newcommand*{\acs@bibstyle}{achemso}%
\fi
\fi
\fi
\fi
+\expandafter\bibliographystyle\expandafter{\acs@bibstyle}
\ifACS@iecr
\renewcommand*{\@biblabel}[1]{(#1)}
\else
\renewcommand*{\@biblabel}[1]{#1.}
\fi
+
+\let\acs@bibliographystyle\bibliographystyle
\newcommand*{\ACS@bibwarning}{\PackageWarning{achemso}%
{Additional bibliographystyle command ignored}}
-\renewcommand*{\bibliographystyle}{\ACS@bibwarning\@gobble}
+\AtBeginDocument{
+ \@ifpackageloaded{chapterbib}{\let\ACS@bibwarning\relax}{}}
+\renewcommand*{\bibliographystyle}{%
+ \expandafter\acs@bibliographystyle\expandafter{\acs@bibstyle}%
+ \ACS@bibwarning\@gobble}
\endinput
%%
%% End of file `achemso.sty'.