summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/achemso/achemso.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-05-07 01:01:51 +0000
committerKarl Berry <karl@freefriends.org>2009-05-07 01:01:51 +0000
commite2681bc64b61864ab5d8671fcf7d75ebe30586cc (patch)
tree697e198f42178e18b96e1ce3d1e4c33c093379b7 /Master/texmf-dist/tex/latex/achemso/achemso.sty
parent3470bfa60e4b2c1cb4998a358c1b2bda336f3b82 (diff)
achemso 3.2b (5may09)
git-svn-id: svn://tug.org/texlive/trunk@12962 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.sty40
1 files changed, 19 insertions, 21 deletions
diff --git a/Master/texmf-dist/tex/latex/achemso/achemso.sty b/Master/texmf-dist/tex/latex/achemso/achemso.sty
index 01601060a82..e983aa8ae05 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}
- [2009/04/28 v3.2a Support for ACS journals]
+ [2009/04/28 v3.2b Support for ACS journals]
\@ifclassloaded{achemso}{%
\PackageInfo{achemso}{%
You have already loaded the `achemso' class:\MessageBreak
@@ -40,6 +40,7 @@
}
\RequirePackage{xkeyval}
\define@boolkey{acs}[acs@]{biochem}[true]{}
+\define@boolkey{acs}[acs@]{email}[true]{}
\define@boolkey{acs}[acs@]{super}[true]{}
\define@boolkey{acs}[acs@]{usetitle}[true]{}
\newcommand*{\acs@journal}{jacsat}
@@ -100,7 +101,6 @@
\newcommand*{\acs@niib@after@text}{}
\newcommand*{\acs@niib@text}{%
\@bsphack
- \acs@bib@write
\if@filesw
\expandafter\acs@niib@write
\else
@@ -139,19 +139,14 @@
\@esphack
\acs@niib@after@text
}
-\ifacs@super
- \RequirePackage[sort&compress,numbers,super]{natbib}
-\else
- \RequirePackage[sort&compress,numbers,round]{natbib}
- \def\citenumfont{\textit}
-\fi
-\RequirePackage{natmove}
-\renewcommand*{\nmv@natbib@detect}{%
- \ifNAT@super
- \expandafter\acs@nmv@activate
- \else
- \expandafter\acs@autonote
- \fi
+\AtBeginDocument{
+ \renewcommand*{\nmv@natbib@detect}{%
+ \ifNAT@super
+ \expandafter\acs@nmv@activate
+ \else
+ \expandafter\acs@autonote
+ \fi
+ }
}
\newcommand*{\acs@nmv@activate}{%
\let\nmv@citex@nat\@citex
@@ -197,14 +192,12 @@
required.^^J
}
\newcommand*{\acs@bib@name}{acs-\jobname.bib}
-\newif\ifacs@bib@written
\newcommand*{\acs@bib@write}{%
\if@filesw
- \ifacs@bib@written\else
- \expandafter\expandafter\expandafter\acs@bib@write@aux
- \fi
+ \expandafter\acs@bib@write@aux
\fi
}
+\AtBeginDocument{\acs@bib@write}
\newcommand*{\acs@bib@write@aux}{%
\immediate\openout\acs@bib@file\acs@bib@name\relax
\immediate\write\acs@bib@file{\acs@bib@message}%
@@ -223,7 +216,6 @@
\immediate\write\@auxout{%
\string\citation\string{achemso-control\string}%
}%
- \global\acs@bib@writtentrue
\AtEndDocument{%
\immediate\closeout\acs@bib@file\relax
}%
@@ -234,10 +226,16 @@
\AtBeginDocument{%
\let\acs@bibliography\bibliography
\renewcommand*{\bibliography}[1]{%
- \acs@bib@write
\acs@bibliography{acs-\jobname,#1}%
}%
}
+\ifacs@super
+ \RequirePackage[sort&compress,numbers,super]{natbib}
+\else
+ \RequirePackage[sort&compress,numbers,round]{natbib}
+ \def\citenumfont{\textit}
+\fi
+\RequirePackage{natmove}
\AtBeginDocument{%
\@ifpackageloaded{notes2bib}{}{%
\acs@niib@create