achemso update from CTAN

git-svn-id: svn://tug.org/texlive/trunk@3548 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 57 insertions, 59 deletions

diff --git a/Master/texmf-dist/tex/latex/achemso/achemso.sty b/Master/texmf-dist/tex/latex/achemso/achemso.sty
index 27a1959422a..ca01ebf45d6 100644
--- a/Master/texmf-dist/tex/latex/achemso/achemso.sty
+++ b/Master/texmf-dist/tex/latex/achemso/achemso.sty
@@ -1,70 +1,68 @@
-%% 
+%%
 %% This is file `achemso.sty',
 %% generated with the docstrip utility.
-%% 
+%%
 %% The original source files were:
-%% 
-%% achemso.dtx  (with options: `paketkod')
-%% 
-%% Copyright (c) 1995-97 by Mats Dahlgren <matsd@homenet.se>. 
-%% All rights reserved. See the file `achemso.ins' for information 
-%% on how you may (re-)distribute the `achemso' package files. 
-%% 
-\NeedsTeXFormat{LaTeX2e}[1995/12/01]
-\ProvidesPackage{achemso}[1997/02/22 version 0.99.]
-\def\achemsover{\texttt{achemso} version 0.99 (1997/02/22)}
-\newif \ifsctnnmbr \sctnnmbrfalse
-\newif \iflst      \lstfalse
-\DeclareOption{note}{\renewcommand{\refname}{References and Notes}}
-\DeclareOption{number}{\global\sctnnmbrtrue}
-\DeclareOption{list}{\global\lsttrue}
+%%
+%% achemso.dtx  (with options: `package')
+%% ----------------------------------------------------------------
+%% The achemso package - A BibTeX style for American Chemical
+%% Society publications
+%% Maintained by Joseph A. Wright
+%% E-mail: joseph.wright@morningstar2.co.uk
+%% Originally developed by Mats Dahlgren
+%%  (c) 1996-98 by Mats Dahlgren
+%%  (c) 2007 Joseph Wright
+%% Released under the LaTeX Project Public license v1.3 or later
+%% ----------------------------------------------------------------
+\NeedsTeXFormat{LaTeX2e}[2005/12/01]
+\ProvidesPackage{achemso}
+ [2007/01/17 v2.0 Enhancements for ACS publications]
+\def\ACSver{\texttt{achemso} v2.0 (2007/01/17)}
+\newif \ifACS@sctnnmbr \ACS@sctnnmbrfalse
+\newif \ifACS@lst      \ACS@lstfalse
+\newif \ifACS@note     \ACS@notefalse
+\DeclareOption{note}{\global\ACS@notetrue}
+\DeclareOption{number}{\global\ACS@sctnnmbrtrue}
+\DeclareOption{list}{\global\ACS@lsttrue}
 \DeclareOption*{\OptionNotUsed}
 \ProcessOptions
-\RequirePackage[nospace]{overcite}
-\iflst
+\RequirePackage[super,nospace]{cite}
+ \@ifpackageloaded{babel}
+  {\ACS@notefalse\PackageWarning{achemso}%
+    {babel package loaded - note option disabled}}
+  {\relax}
+\def\ACS@biberror{\PackageError{achemso}%
+  {No bibliography name command defined}\@eha}
+\ifx\refname\undefined
+   \ifx\bibname\undefined
+      \ACS@biberror
+    \else
+      \ifACS@note
+        \renewcommand*{\bibname}{References and Notes}
+      \else
+        \renewcommand*{\bibname}{References}
+      \fi
+    \fi
+ \else
+   \ifACS@note
+     \renewcommand*{\refname}{References and Notes}
+   \fi
+\fi
+\ifACS@sctnnmbr
+  \RequirePackage[numbib]{tocbibind}
+\fi
+\ifACS@lst
   \bibliographystyle{achemsol}
-  \if@twocolumn
-  \else
-    \reversemarginpar
-  \fi
-  \def\@bibitem#1{\item\if@filesw \immediate\write\@auxout
-    {\string\bibcite{#1}{\the\value{\@listctr}}}\fi\ignorespaces
-     \@showtag{#1}}
-  \def\@lbibitem[#1]#2{\item[\@biblabel{#1}\hfill]\if@filesw
-    {\let\protect\noexpand
-     \immediate
-     \write\@auxout{\string\bibcite{#2}{#1}}}\fi\ignorespaces
-     \@showtag{#2}}
-  \newcommand{\thecitetag}[1]{\fbox{\texttt{#1}}}
-  \def\@showtag#1{\@tempdima=\baselineskip
-    \addtolength{\@tempdima}{0.5ex}
-    \marginpar{\hfill\raisebox{-\@tempdima}[0pt][0pt]{\thecitetag{#1}}}}
+  \RequirePackage[notcite]{showkeys}
 \else
-\bibliographystyle{achemso}
+  \bibliographystyle{achemso}
 \fi
-\renewenvironment{thebibliography}[1]
-     {\iflst \else \par\clearpage \fi
-      \ifsctnnmbr
-         \section{\refname
-          \@mkboth{\MakeUppercase\refname}{\MakeUppercase\refname}}%
-      \else
-         \section*{\refname
-          \@mkboth{\MakeUppercase\refname}{\MakeUppercase\refname}}%
-      \fi
-      \list{\@biblabel{\@arabic\c@enumiv}}%
-           {\settowidth\labelwidth{\@biblabel{#1}}%
-            \leftmargin\labelwidth
-            \advance\leftmargin\labelsep
-            \@openbib@code
-            \usecounter{enumiv}%
-            \let\p@enumiv\@empty
-            \renewcommand\theenumiv{\@arabic\c@enumiv}}%
-      \sloppy\clubpenalty4000\widowpenalty4000%
-      \sfcode`\.\@m}
-     {\def\@noitemerr
-       {\@latex@warning{Empty `thebibliography' environment}}%
-      \endlist}
 \def\@biblabel#1{#1.}
+\def\ACS@bibwarning{\PackageWarning{achemso}%
+  {Additional bibliographystyle command ignored}}
+\def\bibliographystyle{\ACS@bibwarning\@gobble}
 
-%% 
+\endinput
+%%
 %% End of file `achemso.sty'.