achemso 2.2c (22aug07)

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

4 files changed, 44 insertions, 44 deletions

diff --git a/Master/texmf-dist/doc/latex/achemso/README b/Master/texmf-dist/doc/latex/achemso/README
index 3d48d39c88c..44cce6c820d 100644
--- a/Master/texmf-dist/doc/latex/achemso/README
+++ b/Master/texmf-dist/doc/latex/achemso/README
@@ -1,16 +1,16 @@
-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

-----------------------------------------------------------------

-

-The achemso package provides a BibTeX style in accordance with

-the requirements of the journals of the American Chemical Society,

-along with a supporting LaTeX package file. Also provided is a

-BibTeX style file to be used for bibliography database listings.

+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
+----------------------------------------------------------------
+
+The achemso package provides a BibTeX style in accordance with
+the requirements of the journals of the American Chemical Society,
+along with a supporting LaTeX package file. Also provided is a
+BibTeX style file to be used for bibliography database listings.
diff --git a/Master/texmf-dist/doc/latex/achemso/achemso.pdf b/Master/texmf-dist/doc/latex/achemso/achemso.pdf
index 78bb92f8f77..1687db3c1e1 100644
--- a/Master/texmf-dist/doc/latex/achemso/achemso.pdf
+++ b/Master/texmf-dist/doc/latex/achemso/achemso.pdf
diff --git a/Master/texmf-dist/source/latex/achemso/achemso.dtx b/Master/texmf-dist/source/latex/achemso/achemso.dtx
index 24df719bfe5..3a0b6a731ac 100644
--- a/Master/texmf-dist/source/latex/achemso/achemso.dtx
+++ b/Master/texmf-dist/source/latex/achemso/achemso.dtx
@@ -10,9 +10,9 @@
 % Released under the LaTeX Project Public license v1.3 or later
 % ----------------------------------------------------------------
 %
-%<package>\NeedsTeXFormat{LaTeX2e}[2005/12/01]
+%<package>\NeedsTeXFormat{LaTeX2e}
 %<package>\ProvidesPackage{achemso}
-%<package> [2007/07/09 v2.2b Enhancements for ACS publications]
+%<package> [2007/08/22 v2.2c Enhancements for ACS publications]
 %
 %<*driver>
 \documentclass{ltxdoc}
@@ -58,7 +58,7 @@
 % \thanks{E-mail: joseph.wright@morningstar2.co.uk}}
 % \date{\filedate}
 %
-% \CheckSum{118}
+% \CheckSum{0}
 % \changes{v1.0}{1998/06/01}{Initial release of package by Mats
 %   Dahlgren}
 % \changes{v2.0}{2007/01/17}{Re-write of package by Joseph Wright}
@@ -77,15 +77,11 @@
 %  for \texttt{incollection} records}
 % \changes{v2.2b}{2007/07/09}{Bug fix to name formatting}
 %
-% \DoNotIndex{\def,\else,\fi,\global,\texttt,\ifx,\newif,\undefined}
-% \DoNotIndex{\ProcessOptions,\DeclareOption,\OptionNotUsed,\@gobble}
-% \DoNotIndex{\RequirePackage,\PackageWarning,\renewcommand,\@eha}
-% \DoNotIndex{\@ifpackageloaded,\PackageError,\relax,\emph,\textit}
-% \DoNotIndex{\newcommand,\renewcommand}
+%\DoNotIndex{}
 %
-% \maketitle
+%\maketitle
 %
-% \begin{abstract}
+%\begin{abstract}
 % The |achemso| package provides a BibTeX style in accordance with
 % the requirements of the journals of the American Chemical Society,
 % along with a supporting LaTeX package file. Also provided is a
@@ -370,7 +366,7 @@
 % Boolean values are used to handle the options.
 %    \begin{macrocode}
 \newif \ifACS@sctnnmbr \ACS@sctnnmbrfalse
-\newif \ifACS@list      \ACS@listfalse
+\newif \ifACS@list     \ACS@listfalse
 \newif \ifACS@note     \ACS@notefalse
 \newif \ifACS@super    \ACS@supertrue
 \newif \ifACS@natbib   \ACS@natbibfalse
@@ -382,12 +378,12 @@
 % \end{macro}
 % The options are processed.
 %    \begin{macrocode}
-\DeclareOption{note}{\global\ACS@notetrue}
-\DeclareOption{number}{\global\ACS@sctnnmbrtrue}
-\DeclareOption{super}{\global\ACS@supertrue}
-\DeclareOption{list}{\global\ACS@listtrue}
-\DeclareOption{notsuper}{\global\ACS@superfalse}
-\DeclareOption{natbib}{\global\ACS@natbibtrue}
+\DeclareOption{note}{\ACS@notetrue}
+\DeclareOption{number}{\ACS@sctnnmbrtrue}
+\DeclareOption{super}{\ACS@supertrue}
+\DeclareOption{list}{\ACS@listtrue}
+\DeclareOption{notsuper}{\ACS@superfalse}
+\DeclareOption{natbib}{\ACS@natbibtrue}
 \DeclareOption*{\OptionNotUsed}
 \ProcessOptions
 %    \end{macrocode}
@@ -413,7 +409,11 @@
   \fi
 \else
   \ifACS@super
-    \RequirePackage[super,nospace]{cite}
+%    \end{macrocode}
+%\changes{v2.2c}{2007/08/22}{Use the \texttt{overcite} alias for
+%  \texttt{cite} as ACS have very old LaTeX system}
+%    \begin{macrocode}
+    \RequirePackage[nospace]{overcite}
   \else
 %    \end{macrocode}
 % Again in-line citations need some format changes.  In the case of
diff --git a/Master/texmf-dist/tex/latex/achemso/achemso.sty b/Master/texmf-dist/tex/latex/achemso/achemso.sty
index 1afb71989b3..baf6c3f4e29 100644
--- a/Master/texmf-dist/tex/latex/achemso/achemso.sty
+++ b/Master/texmf-dist/tex/latex/achemso/achemso.sty
@@ -15,21 +15,21 @@
 %%  (c) 2007 Joseph Wright
 %% Released under the LaTeX Project Public license v1.3 or later
 %% ----------------------------------------------------------------
-\NeedsTeXFormat{LaTeX2e}[2005/12/01]
+\NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{achemso}
- [2007/07/09 v2.2b Enhancements for ACS publications]
+ [2007/08/22 v2.2c Enhancements for ACS publications]
 \def\ACSver{\texttt{achemso} v2.2b (2007/07/09)}
 \newif \ifACS@sctnnmbr \ACS@sctnnmbrfalse
-\newif \ifACS@list      \ACS@listfalse
+\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{super}{\global\ACS@supertrue}
-\DeclareOption{list}{\global\ACS@listtrue}
-\DeclareOption{notsuper}{\global\ACS@superfalse}
-\DeclareOption{natbib}{\global\ACS@natbibtrue}
+\DeclareOption{note}{\ACS@notetrue}
+\DeclareOption{number}{\ACS@sctnnmbrtrue}
+\DeclareOption{super}{\ACS@supertrue}
+\DeclareOption{list}{\ACS@listtrue}
+\DeclareOption{notsuper}{\ACS@superfalse}
+\DeclareOption{natbib}{\ACS@natbibtrue}
 \DeclareOption*{\OptionNotUsed}
 \ProcessOptions
 \ifACS@natbib
@@ -41,7 +41,7 @@
   \fi
 \else
   \ifACS@super
-    \RequirePackage[super,nospace]{cite}
+    \RequirePackage[nospace]{overcite}
   \else
     \RequirePackage{cite}
     \renewcommand\citeleft{(}