summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/achemso
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2007-07-16 16:12:53 +0000
committerKarl Berry <karl@freefriends.org>2007-07-16 16:12:53 +0000
commit498a57b54b9d627acb94b05c6bcb1129b57c0310 (patch)
treecb808b48e3eda9229e114f874e91a02ae577757c /Master/texmf-dist/tex/latex/achemso
parentf543bacf4791b9beb5b7d5e62d8a56115a0151ba (diff)
achemso 2.2b (9jul07)
git-svn-id: svn://tug.org/texlive/trunk@4610 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/achemso')
-rw-r--r--Master/texmf-dist/tex/latex/achemso/achemso.sty48
1 files changed, 34 insertions, 14 deletions
diff --git a/Master/texmf-dist/tex/latex/achemso/achemso.sty b/Master/texmf-dist/tex/latex/achemso/achemso.sty
index fc5632ab455..1afb71989b3 100644
--- a/Master/texmf-dist/tex/latex/achemso/achemso.sty
+++ b/Master/texmf-dist/tex/latex/achemso/achemso.sty
@@ -8,7 +8,7 @@
%% ----------------------------------------------------------------
%% The achemso package - A BibTeX style for American Chemical
%% Society publications
-%% Maintained by Joseph A. Wright
+%% Maintained by Joseph Wright
%% E-mail: joseph.wright@morningstar2.co.uk
%% Originally developed by Mats Dahlgren
%% (c) 1996-98 by Mats Dahlgren
@@ -17,25 +17,37 @@
%% ----------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}[2005/12/01]
\ProvidesPackage{achemso}
- [2007/02/15 v2.1 Enhancements for ACS publications]
-\def\ACSver{\texttt{achemso} v2.1 (2007/02/15)}
+ [2007/07/09 v2.2b Enhancements for ACS publications]
+\def\ACSver{\texttt{achemso} v2.2b (2007/07/09)}
\newif \ifACS@sctnnmbr \ACS@sctnnmbrfalse
-\newif \ifACS@lst \ACS@lstfalse
+\newif \ifACS@list \ACS@listfalse
\newif \ifACS@note \ACS@notefalse
\newif \ifACS@super \ACS@supertrue
+\newif \ifACS@natbib \ACS@natbibfalse
\DeclareOption{note}{\global\ACS@notetrue}
\DeclareOption{number}{\global\ACS@sctnnmbrtrue}
-\DeclareOption{list}{}
+\DeclareOption{super}{\global\ACS@supertrue}
+\DeclareOption{list}{\global\ACS@listtrue}
\DeclareOption{notsuper}{\global\ACS@superfalse}
+\DeclareOption{natbib}{\global\ACS@natbibtrue}
\DeclareOption*{\OptionNotUsed}
\ProcessOptions
-\ifACS@super
- \RequirePackage[super,nospace]{cite}
+\ifACS@natbib
+ \ifACS@super
+ \RequirePackage[numbers,sort&compress,super]{natbib}
+ \else
+ \RequirePackage[numbers,sort&compress,round]{natbib}
+ \newcommand*{\citenumfont}{\textit}
+ \fi
\else
- \RequirePackage{cite}
- \def\citeleft{(}
- \def\citeright{)}
- \def\citeform{\emph{#1}}
+ \ifACS@super
+ \RequirePackage[super,nospace]{cite}
+ \else
+ \RequirePackage{cite}
+ \renewcommand\citeleft{(}
+ \renewcommand\citeright{)}
+ \renewcommand\citeform[1]{\emph{#1}}
+ \fi
\fi
\@ifpackageloaded{babel}
{\ACS@notefalse\PackageWarning{achemso}%
@@ -61,11 +73,19 @@
\ifACS@sctnnmbr
\RequirePackage[numbib]{tocbibind}
\fi
-\ifACS@lst
- \bibliographystyle{achemsol}
+\ifACS@list
+ \ifACS@natbib
+ \bibliographystyle{achemlnt}
+ \else
+ \bibliographystyle{achemsol}
+ \fi
\RequirePackage[notcite]{showkeys}
\else
- \bibliographystyle{achemso}
+ \ifACS@natbib
+ \bibliographystyle{achemnat}
+ \else
+ \bibliographystyle{achemso}
+ \fi
\fi
\def\@biblabel#1{#1.}
\def\ACS@bibwarning{\PackageWarning{achemso}%