summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/achemso/achemso.sty
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2008-01-17 07:13:47 +0000
committerNorbert Preining <preining@logic.at>2008-01-17 07:13:47 +0000
commit1ff881bb9b27e1bfc797ed8ce04608954c87548b (patch)
tree46b616b85c5e768ebe22b7b737f1da8012bd88fb /Master/texmf-dist/tex/latex/achemso/achemso.sty
parentaa80b5c425682a0606de9a0417852bd38bb74f53 (diff)
achemso update 09-01-17
git-svn-id: svn://tug.org/texlive/trunk@6273 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.sty66
1 files changed, 45 insertions, 21 deletions
diff --git a/Master/texmf-dist/tex/latex/achemso/achemso.sty b/Master/texmf-dist/tex/latex/achemso/achemso.sty
index ae552de1612..182ee56e843 100644
--- a/Master/texmf-dist/tex/latex/achemso/achemso.sty
+++ b/Master/texmf-dist/tex/latex/achemso/achemso.sty
@@ -10,19 +10,20 @@
%% Chemical Society publications
%% Maintained by Joseph Wright
%% E-mail: joseph.wright@morningstar2.co.uk
-%% Released under the LaTeX Project Public License v1.3 or later
+%% Released under the LaTeX Project Public License v1.3c or later
%% See http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{achemso}
- [2007/10/16 v2.2d LaTeX and BibTeX support for American
+ [2008/01/16 v2.2f LaTeX and BibTeX support for American
Chemical Society publications]
-\newif \ifACS@sctnnmbr \ACS@sctnnmbrfalse
-\newif \ifACS@list \ACS@listfalse
-\newif \ifACS@note \ACS@notefalse
-\newif \ifACS@super \ACS@supertrue
-\newif \ifACS@natbib \ACS@natbibfalse
+\newif\ifACS@sctnnmbr\ACS@sctnnmbrfalse
+\newif\ifACS@list\ACS@listfalse
+\newif\ifACS@note\ACS@notefalse
+\newif\ifACS@super\ACS@supertrue
+\newif\ifACS@natbib\ACS@natbibfalse
+\newif\ifACS@mcite\ACS@mcitefalse
\DeclareOption{note}{\ExecuteOptions{notes}}
\DeclareOption{notes}{\ACS@notetrue}
\DeclareOption{number}{\ACS@sctnnmbrtrue}
@@ -30,8 +31,9 @@
\DeclareOption{list}{\ACS@listtrue}
\DeclareOption{notsuper}{\ACS@superfalse}
\DeclareOption{natbib}{\ACS@natbibtrue}
+\DeclareOption{mcite}{\ACS@mcitetrue}
\DeclareOption*{\OptionNotUsed}
-\ProcessOptions
+\ProcessOptions\relax
\ifACS@natbib
\ifACS@super
\RequirePackage[numbers,sort&compress,super]{natbib}
@@ -44,17 +46,19 @@
\RequirePackage[nospace]{overcite}
\else
\RequirePackage{cite}
- \renewcommand\citeleft{(}
- \renewcommand\citeright{)}
- \renewcommand\citeform[1]{\emph{#1}}
+ \renewcommand{\citeleft}{(}
+ \renewcommand{\citeright}{)}
+ \renewcommand{\citeform}[1]{\emph{#1}}
\fi
\fi
\@ifpackageloaded{babel}
{\ACS@notefalse\PackageWarning{achemso}%
{babel package loaded - note option disabled}}
- {\relax}
-\def\ACS@biberror{\PackageError{achemso}%
- {No bibliography name command defined}\@eha}
+ {}
+\newcommand*{\ACS@biberror}{\PackageError{achemso}%
+ {No bibliography name command defined}
+ {The document class you have used does not define
+ \string\refname\MessageBreak or \string\bibname}}
\@ifundefined{refname}{%
\@ifundefined{bibname}{%
\ACS@biberror
@@ -75,22 +79,42 @@
\fi
\ifACS@list
\ifACS@natbib
- \bibliographystyle{achemlnt}
+ \ifACS@mcite
+ \bibliographystyle{achemlntM}
+ \RequirePackage{mciteplus}
+ \else
+ \bibliographystyle{achemlnt}
+ \fi
\else
- \bibliographystyle{achemsol}
+ \ifACS@mcite
+ \bibliographystyle{achemsolM}
+ \RequirePackage{mciteplus}
+ \else
+ \bibliographystyle{achemsol}
+ \fi
\fi
\RequirePackage[notcite]{showkeys}
\else
\ifACS@natbib
- \bibliographystyle{achemnat}
+ \ifACS@mcite
+ \bibliographystyle{achemnatM}
+ \RequirePackage{mciteplus}
+ \else
+ \bibliographystyle{achemnat}
+ \fi
\else
- \bibliographystyle{achemso}
+ \ifACS@mcite
+ \bibliographystyle{achemsoM}
+ \RequirePackage{mciteplus}
+ \else
+ \bibliographystyle{achemso}
+ \fi
\fi
\fi
-\def\@biblabel#1{#1.}
-\def\ACS@bibwarning{\PackageWarning{achemso}%
+\renewcommand*{\@biblabel}[1]{#1.}
+\newcommand*{\ACS@bibwarning}{\PackageWarning{achemso}%
{Additional bibliographystyle command ignored}}
-\def\bibliographystyle{\ACS@bibwarning\@gobble}
+\renewcommand*{\bibliographystyle}{\ACS@bibwarning\@gobble}
\endinput
%%
%% End of file `achemso.sty'.