achemso 3.2 (20apr09)

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

39 files changed, 2984 insertions, 1416 deletions

diff --git a/Master/texmf-dist/tex/latex/achemso/achemso.cls b/Master/texmf-dist/tex/latex/achemso/achemso.cls
index 611d3d4672b..55240dd242c 100644
--- a/Master/texmf-dist/tex/latex/achemso/achemso.cls
+++ b/Master/texmf-dist/tex/latex/achemso/achemso.cls
@@ -5,404 +5,675 @@
 %% The original source files were:
 %%
 %% achemso.dtx  (with options: `class')
-%%  ----------------------------------------------------------------
-%%  achemso --- Support for submissions to American  Chemical
-%%    Society journals
-%%  Maintained by Joseph Wright
-%%  E-mail: joseph.wright@morningstar2.co.uk
-%%  Released under the LaTeX Project Public License v1.3c or later
-%%  See http://www.latex-project.org/lppl.txt
-%%  ----------------------------------------------------------------
+%% ----------------------------------------------------------------
+%% achemso --- Support for submissions to American Chemical Society
+%%   journals
+%% E-mail: joseph.wright@morningstar2.co.uk
+%% Released under the LaTeX Project Public License v1.3c or later
+%% See http://www.latex-project.org/lppl.txt
+%% ----------------------------------------------------------------
 %% 
 \NeedsTeXFormat{LaTeX2e}
-\LoadClass[12pt]{article}
+
 \ProvidesClass{achemso}
-  [2009/02/03 v3.1a Submissions to ACS journals]
-\RequirePackage[etex=false]{notes2bib}[2008/06/21]
-\RequirePackage[margin=2.54cm]{geometry}
+  [2009/04/21 v3.2 Submission to ACS journals]
+\LoadClass[12pt,letter]{article}
+\newcommand*{\acs@warning}{\ClassWarning{achemso}}
+\newcommand*{\acs@ifundefined}[1]{%
+  \begingroup\expandafter\expandafter\expandafter\endgroup
+  \expandafter\ifx\csname #1\endcsname\relax
+    \expandafter\@firstoftwo
+  \else
+    \expandafter\@secondoftwo
+  \fi
+}
+\RequirePackage{xkeyval}
+\define@boolkey{acs}[acs@]{biochem}[true]{}
+\define@boolkey{acs}[acs@]{super}[true]{}
+\define@boolkey{acs}[acs@]{usetitle}[true]{}
+\newcommand*{\acs@journal}{jacsat}
+\newcommand*{\acs@manuscript}{article}
+\newcommand*{\acs@maxauthors}{15}
+\define@cmdkey{acs}[acs@]{journal}{}
+\define@cmdkey{acs}[acs@]{manuscript}{}
+\define@cmdkey{acs}[acs@]{maxauthors}{}
+\define@key{acs}{biochemistry}{%
+  \setkeys{acs}{biochem = #1}%
+}
+\define@key{acs}{biblabel}{%
+  \acs@ifundefined{acs@biblabel@#1}{%
+    \acs@warning{%
+      Unknown value `#1' for\MessageBreak biblabel option%
+    }%
+  }{%
+    \@nameuse{acs@biblabel@#1}%
+  }%
+}
+\newcommand*{\acs@biblabel@brackets}{\def\@biblabel##1{(##1)}}
+\newcommand*{\acs@biblabel@fullstop}{\def\@biblabel##1{##1.}}
+\newcommand*{\acs@biblabel@period}{\def\@biblabel##1{##1.}}
+\newcommand*{\acs@biblabel@plain}{\def\@biblabel##1{##1}}
+\setkeys{acs}{
+  super = true
+}
+\ProcessOptionsX*<acs>
+\newcommand*{\acs@niib@create}{%
+  \@namedef{ver@notes2bib.sty}{%
+    2009/04/20 v1.6a Integrating notes into the bibliography (achemso
+    version)
+  }%
+  \newcounter{bibnote}
+  \renewcommand*{\thebibnote}{%
+    Note-\the\value{bibnote}%
+  }%
+  \DeclareRobustCommand*{\bibnote}[1][\thebibnote]{%
+    \stepcounter{bibnote}%
+    \def\acs@niib@after@text{\cite{##1}}%
+    \acs@niib@text{##1}%
+  }%
+  \DeclareRobustCommand*{\bibnotemark}[1][\thebibnote]{%
+    \stepcounter{bibnote}%
+    \cite{##1}%
+  }%
+  \DeclareRobustCommand*{\bibnotetext}[1][\thebibnote]{%
+    \let\acs@niib@after@text\relax
+    \acs@niib@text{##1}%
+  }%
+  \newcommand*{\printbibnotes}{%
+    \ifnum\the\value{bibnote}>\z@\relax
+      \nocite{achemso-control}%
+      \acs@bibliography{acs-\jobname}%
+    \fi
+  }%
+}
+\newcommand*{\acs@niib@after@text}{}
+\newcommand*{\acs@niib@text}{%
+  \@bsphack
+  \acs@bib@write
+  \if@filesw
+    \expandafter\acs@niib@write
+  \else
+    \expandafter\acs@niib@no@write
+  \fi
+}
+\newcommand*{\acs@niib@write}[1]{%
+  \begingroup
+    \let\do\@makeother
+    \dospecials
+    \catcode`\{ 1\relax
+    \catcode`\} 2\relax
+    \acs@niib@write@aux@i{#1}%
+}
+\newcommand*{\acs@niib@write@aux@i}[1]{%
+  \long\def\@tempa##1{%
+      \def\@tempa{##1}%
+      \@onelevel@sanitize\@tempa
+    \expandafter\endgroup
+    \expandafter\def\expandafter\@tempa\expandafter{\@tempa}%
+    \acs@niib@write@aux@ii{#1}%
+  }%
+  \catcode`\^^M 10\relax
+  \@tempa
+}
+\newcommand*{\acs@niib@write@aux@ii}[1]{%
+  \immediate\write\acs@bib@file{%
+    @Misc\string{#1,^^J%
+    \space\space note = \string{\@tempa\string},^^J%
+    \string}^^J%
+  }%
+  \@esphack
+  \acs@niib@after@text
+}
+\newcommand{\acs@niib@no@write}[2]{%
+  \@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
+}
+\newcommand*{\acs@nmv@activate}{%
+  \let\nmv@citex@nat\@citex
+  \let\@citex\nmv@citex
+  \let\nmv@cite\cite
+  \renewcommand*{\cite}[2][]{%
+    \nmv@ifmtarg{##1}{%
+      \nmv@citetrue
+      \nmv@cite{##2}%
+    }{%
+      \nocite{##2}%
+      \bibnote{Ref.~\citenum{##2}, ##1}%
+    }%
+  }%
+}
+\newcommand*{\acs@autonote}{%
+  \let\nmv@cite\cite
+  \renewcommand*{\cite}[2][]{%
+    \nmv@ifmtarg{##1}{%
+      \nmv@cite{##2}%
+    }{%
+      \nocite{##2}%
+      \bibnote{Ref.~\citenum{##2}, ##1}%
+    }%
+  }%
+}
+\newcommand*{\acs@bibstyle}{achemso}
+\bibliographystyle{achemso}
+\ifacs@biochem
+  \renewcommand*{\acs@bibstyle}{biochem}
+  \bibliographystyle{biochem}
+\fi
+\newcommand*{\acs@bibliographystyle}{}
+\let\acs@bibliographystyle\bibliographystyle
+\renewcommand*{\bibliographystyle}[1]{%
+  \acs@warning{\string\bibliographystyle\space ignored}%
+  \expandafter\acs@bibliographystyle\expandafter{\acs@bibstyle}%
+}
+\newwrite\acs@bib@file
+\newcommand*{\acs@bib@message}{%
+  This is an auxiliary file used by the `achemso' bundle.^^J%
+  This file may safely be deleted. It will be recreated as
+  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
+  \fi
+}
+\newcommand*{\acs@bib@write@aux}{%
+  \immediate\openout\acs@bib@file\acs@bib@name\relax
+  \immediate\write\acs@bib@file{\acs@bib@message}%
+  \edef\@tempa##1##2{%
+    \space\space##1\space = \space"##2",^^J%
+  }%
+  \immediate\write\acs@bib@file{%
+    @Control\string{%
+      achemso-control,^^J%
+      \@tempa{ctrl-use-title}{%
+        \ifacs@usetitle yes\else no\fi
+      }%
+      \@tempa{ctrl-etal-number}{\acs@maxauthors}%
+    \string}^^J%
+  }%
+  \immediate\write\@auxout{%
+    \string\citation\string{achemso-control\string}%
+  }%
+  \global\acs@bib@writtentrue
+  \AtEndDocument{%
+    \immediate\closeout\acs@bib@file\relax
+  }%
+}
+\IfFileExists{mciteplus.sty}{%
+  \RequirePackage{mciteplus}
+}{}
+\AtBeginDocument{%
+  \let\acs@bibliography\bibliography
+  \renewcommand*{\bibliography}[1]{%
+    \acs@bib@write
+    \acs@bibliography{acs-\jobname,#1}%
+  }%
+}
+\setkeys{acs}{
+  biblabel   = brackets,
+  biochem    = false,
+  maxauthors = 15,
+  super      = true,
+  usetitle   = false
+}
+\acs@niib@create
 \RequirePackage[T1]{fontenc}
+\RequirePackage[margin=2.54cm]{geometry}
 \RequirePackage[scaled=0.90]{helvet}
-\RequirePackage{mathptmx,courier,setspace,graphicx,truncate,
-  float,varioref,url,caption}
+\RequirePackage{
+  caption,
+  courier,
+  float,
+  graphicx,
+  mathptmx,
+  setspace,
+  url,
+  varioref
+}
 \AtBeginDocument{\doublespacing}
 \renewcommand*{\title}[2][]{%
   \gdef\@title{#2}%
   \gdef\acs@title{#2}%
-  \gdef\@shorttitle{#1}}
+}
 \@onlypreamble\title
-\newcount\acs@authorcnt
-\newcount\acs@affilcnt
-\newcount\acs@altaffilcnt
+\newcount\acs@author@cnt
+\newcount\acs@affil@cnt
+\newcount\acs@affil@alt@cnt
 \renewcommand*{\author}[1]{%
-  \global\advance\acs@authorcnt\@ne\relax
-  \expandafter\gdef\csname @author@\@roman\the\acs@authorcnt\endcsname
-    {#1}%
+  \global\advance\acs@author@cnt\@ne\relax
+  \expandafter\gdef\csname @author@\@roman\acs@author@cnt\endcsname{#1}%
   \begingroup
-    \advance\acs@affilcnt\@ne
-    \expandafter\xdef\csname @author@affil@\@roman\the\acs@authorcnt
-      \endcsname
-      {\the\acs@affilcnt}%
+    \advance\acs@affil@cnt\@ne
+    \expandafter\xdef\csname @author@affil@\@roman
+      \acs@author@cnt\endcsname
+      {\the\acs@affil@cnt}%
   \endgroup
 }
 \@onlypreamble\author
 \renewcommand*{\and}{%
-  \ClassError{achemso}{\string\and\space not supported}
-    {The achemso class does not use \string\and
-     \MessageBreak see the documentation for details}}
-\renewcommand*{\thanks}[1]{%
-  \ClassError{achemso}{\string\thanks\space not supported}
-    {The achemso class does not use \string\thanks
-     \MessageBreak see the documentation for details}}
+  \acs@warning{%
+    \string\and\space not used by the achemso class: please see
+    the\MessageBreak package documentation for details%
+  }%
+}
+\renewcommand*{\thanks}{%
+  \acs@warning{%
+    \string\thanks\space not used by the achemso class: please see
+    the\MessageBreak the package documentation for details%
+  }%
+}
 \newcommand*{\affiliation}[2][\relax]{%
-  \ifnum\acs@authorcnt>\z@\relax
+  \ifnum\acs@author@cnt>\z@\relax
     \acs@affil@ifdup{#2}{%
       \acs@affil@swap{#2}%
     }{%
-      \global\advance\acs@affilcnt\@ne
-      \expandafter\gdef\csname @address@\@roman\acs@affilcnt
-        \endcsname{#2}%
+      \global\advance\acs@affil@cnt\@ne\relax
+      \expandafter\gdef\csname @address@\@roman\acs@affil@cnt\endcsname
+        {#2}%
       \ifx\relax#1\relax
-        \expandafter\gdef\csname @affil@\@roman\acs@affilcnt
-          \endcsname{#2}%
+        \expandafter\gdef\csname @affil@\@roman\acs@affil@cnt\endcsname
+          {#2}%
       \else
-        \expandafter\gdef\csname @affil@\@roman\acs@affilcnt
-          \endcsname{#1}%
+        \expandafter\gdef\csname @affil@\@roman\acs@affil@cnt\endcsname
+          {#1}%
       \fi
     }%
   \else
-    \ClassWarning{achemso}
-      {Affiliation with no author}%
-  \fi}
+    \acs@warning{Affiliation with no author}%
+  \fi
+}
 \@onlypreamble\affiliation
 \newcommand*{\acs@affil@ifdup}[1]{%
   \begingroup
-    \def\acs@tempa{#1}%
-    \acs@switchfalse
-    \acs@tempcnta\z@\relax
+    \def\@tempa{#1}%
+    \@tempswafalse
+    \@tempcnta\z@\relax
     \acs@affil@ifdup@aux
-    \ifacs@switch
+    \if@tempswa
       \aftergroup\@firstoftwo
     \else
       \aftergroup\@secondoftwo
     \fi
-    \endgroup
+  \endgroup
 }
 \newcommand*{\acs@affil@ifdup@aux}{%
-  \advance\acs@tempcnta\@ne\relax
-  \expandafter\expandafter\expandafter\def\expandafter\expandafter
-    \expandafter\acs@tempb\expandafter\expandafter\expandafter
-    {\csname @address@\@roman\acs@tempcnta\endcsname}%
-  \ifx\acs@tempa\acs@tempb
-    \expandafter\acs@switchtrue
+  \advance\@tempcnta\@ne\relax
+  \edef\@tempb{%
+    \expandafter\noexpand\csname @address@\@roman\@tempcnta\endcsname
+  }%
+  \expandafter\def\expandafter\@tempb\expandafter{\@tempb}%
+  \ifx\@tempa\@tempb
+    \expandafter\@tempswatrue
   \else
-    \ifnum\acs@tempcnta<\acs@affilcnt\relax
+    \ifnum\@tempcnta<\acs@affil@cnt\relax
       \expandafter\expandafter\expandafter\acs@affil@ifdup@aux
     \fi
   \fi
 }
 \newcommand*{\acs@affil@swap}[1]{%
   \begingroup
-    \def\acs@tempa{#1}%
-    \acs@tempcnta\z@\relax
-    \acs@tempcntb\z@\relax
+    \def\@tempa{#1}%
+    \@tempcnta\z@\relax
+    \@tempcntb\z@\relax
     \acs@affil@ifdup@aux
-    \advance\acs@affilcnt\@ne\relax
+    \advance\acs@affil@cnt\@ne\relax
     \acs@affil@swap@aux
   \endgroup
 }
 \newcommand*{\acs@affil@swap@aux}{%
-  \advance\acs@tempcntb\@ne\relax
-  \expandafter\ifnum\csname @author@affil@\@roman
-    \acs@tempcntb\endcsname = \acs@affilcnt\relax
-    \expandafter\xdef\csname @author@affil@\@roman
-      \acs@tempcntb\endcsname{\the\acs@tempcnta}%
+  \advance\@tempcntb\@ne\relax
+  \expandafter\ifnum\csname @author@affil@\@roman\@tempcntb\endcsname
+    = \acs@affil@cnt\relax
+    \expandafter\xdef\csname @author@affil@\@roman\@tempcntb\endcsname{%
+      \the\@tempcnta
+    }%
   \fi
-  \ifnum\acs@tempcntb<\acs@authorcnt\relax
+  \ifnum\@tempcntb<\acs@author@cnt\relax
     \expandafter\acs@affil@swap@aux
   \fi
 }
 \newcommand*{\alsoaffiliation}[2][\relax]{%
-  \ifnum\acs@authorcnt>\z@\relax
+  \ifnum\acs@author@cnt>\z@\relax
     \acs@affil@ifdup{#2}{%
       \acs@alsoaffil@find{#2}%
     }{%
-      \global\advance\acs@affilcnt\@ne
-      \acs@tempcnta\acs@affilcnt\relax
-      \expandafter\gdef\csname @address@\@roman\acs@affilcnt
-        \endcsname{#2}%
+      \global\advance\acs@affil@cnt\@ne\relax
+      \@tempcnta\acs@affil@cnt\relax
+      \expandafter\gdef\csname @address@\@roman\acs@affil@cnt\endcsname
+        {#2}%
       \ifx\relax#1\relax
-        \expandafter\gdef\csname @affil@\@roman\acs@affilcnt
-          \endcsname{#2}%
+        \expandafter\gdef\csname @affil@\@roman\acs@affil@cnt\endcsname
+          {#2}%
       \else
-        \expandafter\gdef\csname @affil@\@roman\acs@affilcnt
-          \endcsname{#1}%
+        \expandafter\gdef\csname @affil@\@roman\acs@affil@cnt\endcsname
+          {#1}%
       \fi
     }%
-    \@ifundefined{@author@alsoaffil@\@roman\acs@authorcnt}{%
-      \expandafter\xdef\csname @author@alsoaffil@\@roman\acs@authorcnt
-        \endcsname{\the\acs@tempcnta}%
+    \@ifundefined{@author@alsoaffil@\@roman\acs@author@cnt}{%
+      \expandafter\xdef\csname @author@alsoaffil@\@roman\acs@author@cnt
+        \endcsname{\the\@tempcnta}%
     }{%
-      \expandafter\xdef\csname @author@alsoaffil@\@roman\acs@authorcnt
-        \endcsname{\csname @author@alsoaffil@\@roman\acs@authorcnt
-          \endcsname,\the\acs@tempcnta}%
-    }
+      \expandafter\xdef\csname @author@alsoaffil@\@roman\acs@author@cnt
+        \endcsname{%
+        \csname @author@alsoaffil@\@roman\acs@author@cnt\endcsname
+        ,\the\@tempcnta
+      }%
+    }%
   \else
-    \ClassWarning{achemso}
-      {Affiliation with no author}%
-  \fi}
+    \acs@warning{Affiliation with no author}%
+  \fi
+}
 \newcommand*{\acs@alsoaffil@find}[1]{%
   \begingroup
-    \def\acs@tempa{#1}%
-    \acs@tempcnta\z@\relax
-    \acs@tempcntb\z@\relax
+    \def\@tempa{#1}%
+    \@tempcnta\z@\relax
+    \@tempcntb\z@\relax
     \acs@affil@ifdup@aux
   \expandafter\endgroup
-  \expandafter\acs@tempcnta\the\acs@tempcnta\relax
+  \expandafter\@tempcnta\the\@tempcnta\relax
 }
 \newcommand*{\altaffiliation}[1]{%
-  \ifnum\acs@authorcnt>\z@\relax
-    \global\advance\acs@altaffilcnt\@ne\relax
-    \expandafter\gdef\csname @altaffil@\@roman\acs@authorcnt
-      \endcsname{#1}%
-    \expandafter\xdef\csname @author@altaffil@\@roman\acs@authorcnt
-      \endcsname{\the\acs@altaffilcnt}%
+  \ifnum\acs@author@cnt>\z@\relax
+    \global\advance\acs@affil@alt@cnt\@ne\relax
+    \expandafter\gdef\csname @altaffil@\@roman\acs@author@cnt\endcsname
+      {#1}%
+    \expandafter\xdef\csname @author@altaffil@\@roman\acs@author@cnt
+      \endcsname{\the\acs@affil@alt@cnt}%
   \else
-    \ClassWarning{achemso}
-      {Affiliation with no author}%
-  \fi}
+    \acs@warning{Affiliation with no author}%
+  \fi
+}
 \@onlypreamble\altaffiliation
 \newcommand*{\email}[1]{%
-  \ifnum\acs@authorcnt>\z@\relax
-    \expandafter\gdef\csname @email@\@roman\acs@authorcnt
-      \endcsname{#1}%
+  \ifnum\acs@author@cnt>\z@\relax
+    \expandafter\gdef\csname @email@\@roman\acs@author@cnt\endcsname
+      {#1}%
   \else
-    \ClassWarning{achemso}
-      {E-mail with no author}%
-  \fi}
+    \acs@warning{E-mail with no author}%
+  \fi
+}
 \@onlypreamble\email
 \renewcommand*{\@maketitle}{%
-  \ifnum\acs@authorcnt<\z@\relax
-    \ClassError{achemso}{No authors defined}
-      {At least one author is required}%
+  \ifnum\acs@author@cnt<\z@\relax
+    \acs@warning{No authors defined: At least one author is required}%
   \fi
   \newpage
   \null
-  \vskip 2em%
-  \begin{center}%
-    {\LARGE\bfseries\sffamily
-     \renewcommand*{\acs@tempa}{suppinfo}%
-     \ifx\acs@manuscript\acs@tempa
-       Supporting information for:
-     \fi
-     \@title \par}%
+  \vskip 2em\relax
+  \begin{center}
+    {%
+      \LARGE\bfseries\sffamily
+      \def\@tempa{suppinfo}%
+      \ifx\acs@manuscript\@tempa
+        Supporting information for:
+      \fi
+      \@title
+      \par
+    }%
     \vskip 1.5em\relax
-    {\large\sffamily\frenchspacing \acs@authorlist}%
-    \vskip 1em%
-    {\itshape\acs@addresslist}%
+    {%
+      \large\sffamily\frenchspacing\acs@author@list
+    }%
+    \vskip 1em\relax
+    {%
+      \itshape\acs@address@list
+    }%
     \vskip 1em\relax
-    {\sffamily E-mail: \acs@emaillist}%
+    {%
+      \sffamily E-mail: \acs@email@list
+    }%
   \end{center}
   \par
-  \vskip 1.5em\relax}
+  \vskip 1.5em\relax
+}
 \renewcommand*{\@thanks}{%
-  \ifnum\acs@affilcnt>\@ne\relax
-    \acs@affilfoot
+  \ifnum\acs@affil@cnt>\@ne\relax
+    \expandafter\acs@affil@list
   \else
-    \ifnum\acs@altaffilcnt>\z@\relax
-      \acs@affilfoot
-    \fi
-  \fi}
-\newcommand*{\acs@authorlist}{%
-  \acs@tempcnta\z@\relax
-  \acs@tempcntb\acs@affilcnt\relax
-  \ifnum\acs@authorcnt=\z@\relax
-    \ClassError{achemso}{No authors given}
-      {No authors were specified for the paper}%
-  \else
-    \expandafter\acs@authorlist@aux
-  \fi}
-\newcommand*{\acs@authorlist@aux}{%
-  \advance\acs@tempcnta\@ne\relax
-  \def\acs@tempa{}%
-  \ifnum\acs@authorcnt=\@ne\relax\else
-    \ifnum\acs@tempcnta=\acs@authorcnt\relax
-      \space and%
+    \ifnum\acs@affil@alt@cnt>\z@\relax
+      \expandafter\expandafter\expandafter\acs@affil@list
     \fi
   \fi
+}
+\newcommand*{\acs@author@list}{%
+  \@tempcnta\z@\relax
+  \@tempcntb\acs@affil@cnt\relax
+  \ifnum\acs@author@cnt=\z@\relax\else
+    \expandafter\acs@author@list@main
+  \fi
+}
+\newcommand*{\acs@author@footnotes}{}
+\newcommand*{\acs@author@list@main}{%
+  \advance\@tempcnta\@ne\relax
+  \def\acs@author@footnotes{}%
+  \acs@author@list@and
   \space
-  \csname @author@\@roman\acs@tempcnta\endcsname
-  \ifnum\acs@tempcnta<\acs@authorcnt
-    ,%
+  \@nameuse{@author@\@roman\@tempcnta}%
+  \acs@author@list@comma
+  \acs@author@star
+  \acs@author@affil
+  \acs@author@affil@also
+  \acs@author@affil@alt
+  \ifx\@empty\acs@author@footnotes\else
+    \textsuperscript{\acs@author@footnotes}%
   \fi
-  \begingroup
-    \@ifundefined{@email@\@roman\acs@tempcnta}
-      {}
-      {\aftergroup\acs@authorlist@email}%
-  \endgroup
-  \begingroup
-    \expandafter\acs@tempcntb\csname @author@affil@\@roman
-      \acs@tempcnta\endcsname\relax
-    \@ifundefined{@affil@\@roman\acs@tempcntb}
-      {\ClassError{achemso}{Affiliation not given}
-       {No affiliation has been given for author\MessageBreak
-        \csname @author@\@roman\acs@tempcnta\endcsname}}
-      {}%
-  \endgroup
-  \ifnum\acs@affilcnt>\@ne\relax
-    \protected@edef\acs@tempa{%
-      \acs@tempa
-      \acs@fnsymbol{%
-        \csname @author@affil@\@roman\acs@tempcnta\endcsname
-      }%
-    }%
-  \else
-    \ifnum\acs@altaffilcnt>\z@\relax
-      \protected@edef\acs@tempa{\acs@tempa\acs@fnsymbol{\@ne}}%
-    \fi
+  \ifnum\@tempcnta<\acs@author@cnt\relax
+    \expandafter\acs@author@list@main
   \fi
-  \begingroup
-    \@ifundefined{@author@alsoaffil@\@roman\acs@tempcnta}
-      {}
-      {\aftergroup\acs@authorlist@also}%
-  \endgroup
-  \begingroup
-    \@ifundefined{@author@altaffil@\@roman\acs@tempcnta}
-      {}
-      {\aftergroup\acs@authorlist@alt}%
-  \endgroup
-  \ifx\@empty\acs@tempa\@empty\else
-    \textsuperscript{\acs@tempa}%
+}
+\newcommand*{\acs@author@list@and}{%
+  \ifnum\acs@author@cnt=\@ne\relax\else
+    \ifnum\@tempcnta=\acs@author@cnt\relax
+      \space and%
+    \fi
   \fi
-  \ifnum\acs@tempcnta<\acs@authorcnt
-    \expandafter\acs@authorlist@aux
+}
+\newcommand*{\acs@author@list@comma}{%
+  \ifnum\@tempcnta<\acs@author@cnt\relax
+    ,%
   \fi
 }
-\newcommand*{\acs@authorlist@email}{%
-  \protected@edef\acs@tempa{%
-    \acs@fnsymbol{\z@}%
-    \ifnum\acs@affilcnt>\@ne\relax
+\newcommand*{\acs@author@star}{%
+  \acs@ifundefined{@email@\@roman\@tempcnta}{}{%
+    \acs@author@star@aux
+  }%
+}
+\newcommand*{\acs@author@star@aux}{%
+  \protected@edef\acs@author@footnotes{%
+    \acs@author@fnsymbol{\z@}%
+    \ifnum\acs@affil@cnt>\@ne\relax
       ,%
     \else
-      \ifnum\acs@altaffilcnt>\z@\relax
+      \ifnum\acs@affil@alt@cnt>\z@\relax
         ,%
       \fi
     \fi
   }%
 }
-\newcommand*{\acs@authorlist@also}{%
-  \expandafter\@for\expandafter\acs@tempb\expandafter:\expandafter
-    =\csname @author@alsoaffil@\@roman\acs@tempcnta\endcsname\do{%
-    \protected@edef\acs@tempa{%
-      \acs@tempa
+\newcommand*{\acs@author@affil}{%
+  \acs@ifundefined{%
+    @affil@\@roman\csname @author@affil@\@roman\@tempcnta\endcsname
+  }{%
+    \acs@warning{%
+      No affiliation given for author\MessageBreak
+      \@nameuse{@author@\@roman\@tempcnta}%
+    }%
+  }{%
+    \acs@author@affil@aux
+  }%
+}
+\newcommand*{\acs@author@affil@aux}{%
+  \ifnum\acs@affil@cnt>\@ne\relax
+    \protected@edef\acs@author@footnotes{%
+      \acs@author@footnotes
+      \acs@author@fnsymbol{%
+        \@nameuse{@author@affil@\@roman\@tempcnta}%
+      }%
+    }%
+  \else
+    \ifnum\acs@affil@alt@cnt>\z@\relax
+      \protected@edef\acs@author@fnsymbol{%
+        \acs@author@footnotes
+        \acs@author@fnsymbol{\@ne}%
+      }%
+    \fi
+  \fi
+}
+\newcommand*{\acs@author@affil@also}{%
+  \acs@ifundefined{@author@alsoaffil@\@roman\@tempcnta}{}{%
+    \acs@author@affil@also@aux
+  }%
+}
+\newcommand*{\acs@author@affil@also@aux}{%
+  \expandafter\@for\expandafter\@tempa\expandafter:\expandafter
+    =\csname @author@alsoaffil@\@roman\@tempcnta\endcsname\do{%
+    \protected@edef\acs@author@footnotes{%
+      \acs@author@footnotes
       ,%
-      \acs@fnsymbol{\acs@tempb}%
+      \acs@author@fnsymbol{\@tempa}%
     }%
   }%
 }
-\newcommand*{\acs@authorlist@alt}{%
-  \advance\acs@tempcntb\@ne\relax
-  \protected@edef\acs@tempa{%
-    \acs@tempa
+\newcommand*{\acs@author@affil@alt}{%
+  \acs@ifundefined{@author@altaffil@\@roman\@tempcnta}{}{%
+    \acs@author@affil@alt@aux
+  }%
+}
+\newcommand*{\acs@author@affil@alt@aux}{%
+  \advance\@tempcntb\@ne\relax
+  \protected@edef\acs@author@footnotes{%
+    \acs@author@footnotes
     ,%
-    \acs@fnsymbol{\acs@tempcntb}%
-  }%
-}
-\newcommand*{\acs@fnsymbol}[1]{%
-  \ensuremath{\ifcase#1 *\or \dagger\or \ddagger\or \P\or
-   \S\or \|\or \bot\or \#\or @\or \triangle\or \nabla\else
-   \ClassError{achemso}{Too many affiliations}
-     {There are no symbols left: complain to the package
-      author}\fi}}
-\newcommand*{\acs@addresslist}{%
-  \ifnum\acs@affilcnt>\z@\relax
-    \acs@tempcnta\z@\relax
-    \acs@addresslist@aux
+    \acs@author@fnsymbol{\@tempcntb}%
+  }%
+}
+\newcommand*{\acs@author@fnsymbol}[1]{%
+  \ensuremath{%
+    \ifcase #1 *\or
+      \dagger\or
+        \ddagger\or
+          \P\or
+            \S\or
+              \|\or
+                \bot\or
+                  \#\or
+                    @\or
+                      \triangle\or
+                        \nabla\else
+                          #1%
+    \fi
+  }%
+}
+\newcommand*{\acs@address@list}{%
+  \@tempcnta\z@\relax
+  \ifnum\acs@affil@cnt>\z@\relax
+    \acs@address@list@aux
   \else
-    \ClassError{achemso}{No affiliations}
-      {At least one affiliation is needed}%
-  \fi}
-\newcommand*{\acs@addresslist@aux}{%
-  \advance\acs@tempcnta\@ne\relax
-  \ifnum\acs@affilcnt>\@ne\relax
-    \ifnum\acs@tempcnta=\acs@affilcnt\relax
+    \acs@warning{%
+      No affiliations: at least one affiliation is needed%
+    }%
+  \fi
+}
+\newcommand*{\acs@address@list@aux}{%
+  \advance\@tempcnta\@ne\relax
+  \ifnum\acs@affil@cnt>\@ne\relax
+    \ifnum\@tempcnta=\acs@affil@cnt\relax
       and
     \fi
   \fi
-  \csname @address@\@roman\acs@tempcnta\endcsname
-  \ifnum\acs@tempcnta<\acs@affilcnt\relax
+  \@nameuse{@address@\@roman\@tempcnta}%
+  \ifnum\@tempcnta<\acs@affil@cnt\relax
     ,
-    \expandafter\acs@addresslist@aux
+    \expandafter\acs@address@list@aux
   \fi
 }
-\newcommand*{\acs@affilfoot}{%
+\newcommand*{\acs@fnsymbol@org}{}
+\newcommand*{\acs@affil@list}{%
   \let\acs@fnsymbol@org\@fnsymbol
-  \let\@fnsymbol\acs@fnsymbol
-  \acs@tempcnta\z@\relax
-  \acs@tempcntb\z@\relax
-  \ifnum\acs@affilcnt>\@ne\relax
-    \acs@affil@foot
+  \let\@fnsymbol\acs@author@fnsymbol
+  \@tempcnta\z@\relax
+  \@tempcntb\z@\relax
+  \ifnum\acs@affil@cnt>\@ne\relax
+    \expandafter\acs@affil@list@aux
   \else
-    \ifnum\acs@altaffilcnt>\z@\relax
+    \ifnum\acs@affil@alt@cnt>\z@\relax
       \footnotetext[\@ne]{\@affil@i}%
-      \acs@tempcnta\@ne\relax
+      \@tempcnta\@ne\relax
     \fi
   \fi
-  \ifnum\acs@altaffilcnt>\z@\relax
-    \acs@altaffil@foot
-  \fi
-  \let\@fnsymbol\acs@fnsymbol@org}
-\newcommand*{\acs@affil@foot}{%
-  \advance\acs@tempcnta\@ne\relax
-  \footnotetext[\acs@tempcnta]
-    {\csname @affil@\@roman\acs@tempcnta\endcsname}%
-  \ifnum\acs@tempcnta<\acs@affilcnt\relax
-    \expandafter\acs@affil@foot
-  \fi}
-\newcommand*{\acs@altaffil@foot}{%
-  \advance\acs@tempcntb\@ne\relax
-  \begingroup
-    \@ifundefined{@altaffil@\@roman\acs@tempcntb}
-      {}
-      {\aftergroup\acs@altaffil@foot@aux}%
-  \endgroup
-  \ifnum\acs@tempcntb<\acs@authorcnt\relax
-    \expandafter\acs@altaffil@foot
+  \ifnum\acs@affil@alt@cnt>\z@\relax
+    \expandafter\acs@affil@alt@list
+  \fi
+  \let\@fnsymbol\acs@fnsymbol@org
+}
+\newcommand*{\acs@affil@list@aux}{%
+  \advance\@tempcnta\@ne\relax
+  \footnotetext[\@tempcnta]{\@nameuse{@affil@\@roman\@tempcnta}}%
+  \ifnum\@tempcnta<\acs@affil@cnt\relax
+    \expandafter\acs@affil@list@aux
+  \fi
+}
+\newcommand*{\acs@affil@alt@list}{%
+  \advance\@tempcntb\@ne\relax
+  \acs@ifundefined{@altaffil@\@roman\@tempcntb}{}{%
+    \acs@altaffil@foot@aux
+  }
+  \ifnum\@tempcntb<\acs@author@cnt\relax
+    \expandafter\acs@affil@alt@list
   \fi
 }
 \newcommand*{\acs@altaffil@foot@aux}{%
-  \advance\acs@tempcnta\@ne\relax
-  \footnotetext[\acs@tempcnta]
-    {\csname @altaffil@\@roman\acs@tempcntb\endcsname}%
+  \advance\@tempcnta\@ne\relax
+  \footnotetext[\@tempcnta]{\@nameuse{@altaffil@\@roman\@tempcntb}}%
 }
-\newcommand*{\acs@emaillist}{%
-  \begingroup
-    \renewcommand*{\UrlFont}{\sf}%
-    \acs@tempcnta\z@\relax
-    \acs@tempcntb\z@\relax
-    \acs@email@list
-    \expandafter\endgroup\expandafter\acs@tempcntb\number
-      \acs@tempcntb\relax
-  \ifnum\acs@tempcntb=\z@\relax
-    \ClassError{achemso}{No e-mail given}
-      {At lest one author must have a contact e-mail}%
-  \fi}
 \newcommand*{\acs@email@list}{%
-  \advance\acs@tempcnta\@ne\relax
-  \ifnum\acs@tempcnta>\acs@authorcnt\relax\else
-    \begingroup
-      \@ifundefined{@email@\@roman\acs@tempcnta}
-        {\aftergroup\@gobble}
-        {\aftergroup\@firstofone}%
-    \endgroup
-      {\advance\acs@tempcntb\@ne\relax
-       \ifnum\acs@tempcntb>\@ne\relax
-         ;
-       \fi
-       \expandafter\expandafter\expandafter\url\expandafter
-         \expandafter\expandafter{%
-           \csname @email@\@roman\acs@tempcnta\endcsname}}%
-    \acs@email@list
-  \fi}
+  \begingroup
+    \def\UrlFont{\sf}%
+    \@tempcnta\z@\relax
+    \@tempcntb\z@\relax
+    \acs@email@list@aux
+    \ifnum\@tempcntb=\z@\relax
+      \acs@warning{%
+        No e-mail given:\MessageBreak
+        at lest one author must have a contact e-mail%
+      }%
+    \fi
+  \endgroup
+}
+\newcommand*{\acs@email@list@aux}{%
+  \advance\@tempcnta\@ne\relax
+  \ifnum\@tempcnta>\acs@author@cnt\relax\else
+    \acs@ifundefined{@email@\@roman\@tempcnta}{}{%
+      \advance\@tempcntb\@ne\relax
+      \ifnum\@tempcntb>\@ne\relax
+        ;
+      \fi
+      \expandafter\expandafter\expandafter\url\expandafter
+        \expandafter\expandafter{%
+           \csname @email@\@roman\@tempcnta\endcsname
+      }%
+    }%
+    \expandafter\acs@email@list@aux
+  \fi
+}
 \g@addto@macro{\document}{\maketitle}
 \newfloat{scheme}{htbp}{los}
 \floatname{scheme}{Scheme}
@@ -418,57 +689,283 @@
 \floatstyle{plaintop}
 \restylefloat{table}
 \let\acs@floatboxreset\@floatboxreset
-\renewcommand*{\@floatboxreset}{\centering\acs@floatboxreset}
+\renewcommand*{\@floatboxreset}{%
+  \centering
+  \acs@floatboxreset
+}
 \labelformat{scheme}{\schemename~#1}
 \labelformat{chart}{\chartname~#1}
 \labelformat{graph}{\graphname~#1}
 \labelformat{figure}{\figurename~#1}
 \labelformat{table}{\tablename~#1}
-\newcommand*{\ps@achemso}{%
-  \renewcommand*{\@oddfoot}{\reset@font\hfil\thepage\hfil}%
-  \let\@evenfoot\@oddfoot
-  \renewcommand*{\@oddhead}{%
-    \reset@font
-    \@author@i
-    \ifnum\acs@authorcnt>\@ne\relax
-      \space et al.%
-    \fi
-    \hfil\relax
-    \ifx\@empty\@shorttitle\@empty
-      \setbox\z@\hbox{\acs@title}%
-      \ifdim\wd\z@>0.45\textwidth\relax
-        \truncate{0.45\textwidth}{\acs@title}%
-      \else
-        \acs@title
+\newcommand*{\acs@section}{}
+\let\acs@section\section
+\newcommand*{\acs@subsection}{}
+\let\acs@subsection\subsection
+\newcommand*{\acs@subsubsection}{}
+\let\acs@subsubsection\subsubsection
+\newcommand*{\acs@startsection}{}
+\let\acs@startsection\@startsection
+\newcommand*{\acs@startsection@alt}[6]{%
+  \if@noskipsec \leavevmode \fi
+  \par
+  \@tempskipa #4\relax
+  \@afterindenttrue
+  \ifdim\@tempskipa<\z@\relax
+    \@tempskipa -\@tempskipa \@afterindentfalse
+  \fi
+  \if@nobreak
+    \everypar{}%
+  \else
+    \addpenalty\@secpenalty
+    \addvspace\@tempskipa
+  \fi
+  \@ifstar{%
+    \@ssect{#3}{#4}{#5}{#6}%
+  }{%
+    \@ssect{#3}{#4}{#5}{#6}%
+  }%
+}
+\newcommand*{\acs@sections@none}{%
+  \@ifstar{%
+    \acs@sections@none@aux
+  }{%
+    \acs@sections@none@aux
+  }%
+}
+\newcommand*{\acs@sections@none@aux}[2][]{%
+  \acs@warning{%
+    (Sub)section `#2' ignored%
+  }%
+}
+\newcommand*{\SectionNumbersOff}{%
+  \let\@startsection\acs@startsection@alt
+}
+\@onlypreamble\SectionNumbersOff
+\newcommand*{\SectionNumbersOn}{%
+  \let\@startsection\acs@startsection
+}
+\@onlypreamble\SectionNumbersOn
+\newcommand*{\SectionsOff}{%
+  \let\section\acs@sections@none
+  \let\subsection\acs@sections@none
+  \let\subsubsection\acs@sections@none
+}
+\@onlypreamble\SectionsOff
+\newcommand*{\SectionsOn}{%
+  \let\section\acs@section
+  \let\subsection\acs@subsection
+  \let\subsubsection\acs@subsubsection
+}
+\@onlypreamble\SectionsOn
+\newenvironment{acknowledgement}{%
+  \acs@subsection*{\acknowledgementname}%
+}{}
+\newenvironment{suppinfo}{%
+  \acs@subsection*{\suppinfoname}%
+}{}
+\newcommand*{\acknowledgementname}{Acknowledgement}
+\renewcommand*{\bibsection}{%
+  \acs@subsection*{\refname}%
+}
+\newcommand*{\suppinfoname}{Supporting Information Available}
+\newcommand*{\acs@abstract}{}
+\let\acs@abstract\abstract
+\newcommand*{\acs@endabstract}{}
+\let\acs@endabstract\endabstract
+\begingroup
+  \catcode`{ \active
+  \catcode`} 12\relax
+  \catcode`( 1\relax
+  \catcode`) 2\relax
+  \gdef\acs@abstract@start(%
+    \acs@warning(%
+      Abstract not allowed for this\MessageBreak
+       manuscript type
+    )%
+    \@bsphack
+    \catcode`{ \active
+    \catcode`} 12\relax
+    \let\end\fi
+    \let{\acs@abstract@end% }
+    \iffalse
+  )%{
+  \gdef\acs@abstract@end#1}(%
+    \def\@tempa(#1)%
+    \ifx\@tempa\@currenvir
+      \@Esphack\endgroup
+      \if@ignore
+        \global\@ignorefalse
+        \ignorespaces
       \fi
     \else
-      \@shorttitle
-    \fi}%
-  \let\@evenhead\@oddhead}
-\pagestyle{achemso}
+       \expandafter\acs@abstract@iffalse
+    \fi
+  )
+\endgroup
+\newcommand*{\acs@iffalse}{\iffalse}
+\newcommand*{\AbstractOff}{%
+  \let\abstract\acs@abstract@start
+  \let\endabstract\acs@abstract@end
+}
+\@onlypreamble\AbstractOff
+\newcommand*{\AbstractOn}{%
+  \let\abstract\acs@abstract
+  \let\endabstract\acs@endabstract
+}
+\@onlypreamble\AbstractOn
+\newtoks\acs@toc@toks
+\newtoks\acs@toc@empty@toks
+\newcommand*{\acs@toc@begins}{}
+\newcommand*{\acs@toc@content}{}
+\newcommand{\acs@toc@collect}[1]{%
+  \acs@toc@toks{%
+    \expandafter#1\expandafter{\the\acs@toc@toks}%
+  }%
+  \edef\acs@toc@content{%
+    \the\acs@toc@toks
+    \noexpand\end{\@currenvir}%
+  }%
+  \acs@toc@toks\acs@toc@empty@toks
+  \def\acs@toc@begins{b}%
+  \begingroup
+    \expandafter\let\csname\@currenvir\endcsname\acs@toc@collect@aux
+    \edef\acs@toc@content{%
+      \expandafter\noexpand\csname\@currenvir\endcsname
+    }%
+    \acs@toc@content
+}
+\newcommand*{\acs@toc@collect@aux}{}
+\long\def\acs@toc@collect@aux#1\end#2{%
+  \edef\acs@toc@begins{%
+    \acs@toc@collect@begins#1\begin\end
+    \expandafter\@gobble\acs@toc@begins
+  }%
+  \ifx\@empty\acs@toc@begins
+    \endgroup
+    \@checkend{#2}%
+    \acs@toc@collect@body{#1}%
+  \else
+    \acs@toc@collect@body{#1\end{#2}}%
+  \fi
+  \acs@toc@content
+}
+\newcommand*{\acs@toc@collect@begins}{}
+\long\def\acs@toc@collect@begins#1\begin#2{%
+  \ifx\end#2\else
+    b\expandafter\acs@toc@collect@begins
+  \fi
+}
+\newcommand{\acs@toc@collect@body}[1]{%
+  \global\acs@toc@toks\expandafter{\the\acs@toc@toks#1}%
+}
+\newcommand{\acs@toc@print}[1]{%
+  \begin{center}
+    \fbox{%
+      \begin{minipage}{9cm}
+        \vbox to 3.5cm{#1}%
+      \end{minipage}%
+    }%
+  \end{center}%
+}
+\newenvironment{tocentry}{%
+  \if@twocolumn
+    \@restonecoltrue\onecolumn
+  \else
+    \@restonecolfalse\newpage
+  \fi
+  \acs@section*{\tocentryname}%
+  \tocsize
+  \sffamily
+  \singlespacing
+  \acs@toc@collect\acs@toc@print
+}{%
+  \if@restonecol
+    \twocolumn
+  \else
+    \newpage
+  \fi
+}
+\newcommand*{\tocentryname}{Graphical TOC Entry}
+\newcommand*{\tocsize}{%
+  \@setfontsize\tocsize\@viiipt\@ixpt
+}
+\newcommand*{\acs@type@list}{article,communication,suppinfo}
+\newcommand*{\acs@type@default}{article}
+\newcommand*{\acs@type@check}{%
+  \@tempswafalse
+  \@for\@tempa:=\acs@type@list\do{%
+    \ifx\@tempa\acs@manuscript
+      \expandafter\@tempswatrue
+    \fi
+  }%
+  \if@tempswa\else
+    \acs@warning{%
+      Invalid manuscript type \acs@manuscript:\MessageBreak
+      changed to default type \acs@type@default
+    }%
+    \let\acs@manuscript\acs@type@default
+  \fi
+}
 \renewcommand*{\refname}{%
   \ifnum\the\value{bibnote}>\z@\relax
     Notes and
-  \fi References}
-\RequirePackage{achemso}
-\@ifundefined{acs@manuscript}
-  {\newcommand*{\acs@manuscript}{article}}{}
-\edef\acs@tempa{note}
-\ifx\acs@manuscript\acs@tempa
-  \acs@killsecs
-\fi
-\edef\acs@tempa{review}
-\ifx\acs@manuscript\acs@tempa
-  \acs@restsecnums
+  \fi
+  References%
+}
+\InputIfFileExists{\acs@journal.cfg}{}{%
+  \acs@warning{%
+    Unknown journal `\acs@journal':\MessageBreak
+    using default configuration JACSAT%
+  }%
+  \input{jacsat.cfg}%
+}
+\acs@type@check
+\def\@tempa{note}
+\ifx\acs@manuscript\@tempa
+  \SectionsOff
 \fi
-\edef\acs@tempa{suppinfo}
-\ifx\acs@manuscript\acs@tempa
-  \acs@restsecnums
-  \acs@setkeys{maxauthors=0}
+\def\@tempa{review}
+\ifx\acs@manuscript\@tempa
+  \SectionsOn
+  \SectionNumbersOn
 \fi
-\if@filesw
-  \acs@writebib
+\def\@tempa{suppinfo}
+\ifx\acs@manuscript\@tempa
+  \setkeys{acs}{maxauthors = 0}
+  \renewcommand*{\thepage}{S\arabic{page}}
 \fi
-\endinput
+%% 
+%% Originally developed by Mats Dahlgren
+%% Copyright (C) 1996-1998 by Mats Dahlgren
+%% Copyright (C) 2008-2009 by
+%%   Joseph Wright <joseph.wright@morningstar2.co.uk>
+%% 
+%% Part of this bundle is derived from cite.sty, to which the
+%% following license applies:
+%%   Copyright (C) 1989-2003 by Donald Arseneau
+%%   These macros may be freely transmitted, reproduced, or
+%%   modified provided that this notice is left intact.
+%% 
+%% It may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License (LPPL), either version 1.3c of
+%% this license or (at your option) any later version.  The latest
+%% version of this license is in the file:
+%% 
+%%    http://www.latex-project.org/lppl.txt
+%% 
+%% This work is "maintained" (as per LPPL maintenance status) by
+%%   Joseph Wright.
+%% 
+%% This work consists of the file  achemso.dtx
+%%           and the derived files achemso.pdf,
+%%                                 achemso.bib,
+%%                                 achemso.cls,
+%%                                 achemso.ins,
+%%                                 achemso.sty,
+%%                                 achemso-demo.tex,
+%%                                 natmove.sty and
+%%                                 a number of configuration files.
+%% 
 %%
 %% End of file `achemso.cls'.
diff --git a/Master/texmf-dist/tex/latex/achemso/achemso.sty b/Master/texmf-dist/tex/latex/achemso/achemso.sty
index 8a018b233c1..dbbf7292e36 100644
--- a/Master/texmf-dist/tex/latex/achemso/achemso.sty
+++ b/Master/texmf-dist/tex/latex/achemso/achemso.sty
@@ -5,239 +5,275 @@
 %% The original source files were:
 %%
 %% achemso.dtx  (with options: `package')
-%%  ----------------------------------------------------------------
-%%  achemso --- Support for submissions to American  Chemical
-%%    Society journals
-%%  Maintained by Joseph Wright
-%%  E-mail: joseph.wright@morningstar2.co.uk
-%%  Released under the LaTeX Project Public License v1.3c or later
-%%  See http://www.latex-project.org/lppl.txt
-%%  ----------------------------------------------------------------
+%% ----------------------------------------------------------------
+%% achemso --- Support for submissions to American Chemical Society
+%%   journals
+%% E-mail: joseph.wright@morningstar2.co.uk
+%% Released under the LaTeX Project Public License v1.3c or later
+%% See http://www.latex-project.org/lppl.txt
+%% ----------------------------------------------------------------
 %% 
 \NeedsTeXFormat{LaTeX2e}
+
 \ProvidesPackage{achemso}
-  [2009/02/03 v3.1a Support for ACS journals]
-\@ifclassloaded{achemso}{}
-  {\PackageInfo{achemso}{When using the achemso bundle
-     for\MessageBreak submission of articles to the ACS,
-     please\MessageBreak use the achemso document class.}}
-\RequirePackage{notes2bib,mciteplus,xkeyval}
-\newcommand*{\acs@tempa}{}
-\newcommand*{\acs@tempb}{}
-\newcount\acs@tempcnta
-\newcount\acs@tempcntb
-\newcount\acs@tempcntc
-\newif\ifacs@switch
-\define@boolkeys[acs]{key}[acs@]{
-  abbreviate,
-  biochem,
-  biochemistry,
-  super,
-  usetitle}[true]
-\let\acs@key@biochem\acs@key@biochemistry
-\define@cmdkeys[acs]{key}[acs@]{
-  maxauthors,
-  journal,
-  manuscript}
-\define@choicekey*[acs]{key}{biblabel}
-  [\acs@tempa\acs@tempb]
-  {plain,brackets,fullstop,period}
-  {\ifcase\acs@tempb\relax
-     \def\@biblabel##1{##1}\or
-     \def\@biblabel##1{(##1)}\or
-     \def\@biblabel##1{##1.}\or
-     \def\@biblabel##1{##1.}\fi}
-\newcommand*{\acs@setkeys}{\setkeys[acs]{key}}
-\acs@setkeys{
-  maxauthors=15,
-  super=true,
-  biblabel=brackets}
-\ProcessOptionsX*[acs]<key>
-\newcommand*{\acs@cfgextension}{cfg}
-\newcommand*{\acs@prefix}{acs-}
-\newcommand*{\acs@validtype}[2][article]{%
-  \acs@switchfalse
-  \@ifundefined{acs@manuscript}
-    {\newcommand*{\acs@manuscript}{#1}}
-    {\@for\acs@tempa:=#2\do{%
-      \ifx\acs@tempa\acs@manuscript
-        \acs@switchtrue
-      \fi}
-    \ifacs@switch\else
-      \ClassWarning{achemso}{Invalid manuscript type:
-        \MessageBreak changing to #1}%
-      \renewcommand*{\acs@manuscript}{#1}%
-    \fi}}
-\let\acs@orgstartsection\@startsection
-\newcommand*{\acs@startsection}[6]{%
-  \if@noskipsec \leavevmode \fi
-  \par
-  \@tempskipa #4\relax
-  \@afterindenttrue
-  \ifdim\@tempskipa<\z@\relax
-    \@tempskipa -\@tempskipa \@afterindentfalse
+  [2009/04/21 v3.2 Support for ACS journals]
+\@ifclassloaded{achemso}{%
+  \PackageInfo{achemso}{%
+    You have already loaded the `achemso' class:\MessageBreak
+    loading the package will abort%
+  }%
+  \endinput
+}{%
+  \PackageInfo{achemso}{%
+    When writing a submission to an ACS journal, please\MessageBreak
+    use the achemso document class%
+  }%
+}
+\newcommand*{\acs@warning}{\PackageWarning{achemso}}
+\newcommand*{\acs@ifundefined}[1]{%
+  \begingroup\expandafter\expandafter\expandafter\endgroup
+  \expandafter\ifx\csname #1\endcsname\relax
+    \expandafter\@firstoftwo
+  \else
+    \expandafter\@secondoftwo
   \fi
-  \if@nobreak
-    \everypar{}%
+}
+\RequirePackage{xkeyval}
+\define@boolkey{acs}[acs@]{biochem}[true]{}
+\define@boolkey{acs}[acs@]{super}[true]{}
+\define@boolkey{acs}[acs@]{usetitle}[true]{}
+\newcommand*{\acs@journal}{jacsat}
+\newcommand*{\acs@manuscript}{article}
+\newcommand*{\acs@maxauthors}{15}
+\define@cmdkey{acs}[acs@]{journal}{}
+\define@cmdkey{acs}[acs@]{manuscript}{}
+\define@cmdkey{acs}[acs@]{maxauthors}{}
+\define@key{acs}{biochemistry}{%
+  \setkeys{acs}{biochem = #1}%
+}
+\define@key{acs}{biblabel}{%
+  \acs@ifundefined{acs@biblabel@#1}{%
+    \acs@warning{%
+      Unknown value `#1' for\MessageBreak biblabel option%
+    }%
+  }{%
+    \@nameuse{acs@biblabel@#1}%
+  }%
+}
+\newcommand*{\acs@biblabel@brackets}{\def\@biblabel##1{(##1)}}
+\newcommand*{\acs@biblabel@fullstop}{\def\@biblabel##1{##1.}}
+\newcommand*{\acs@biblabel@period}{\def\@biblabel##1{##1.}}
+\newcommand*{\acs@biblabel@plain}{\def\@biblabel##1{##1}}
+\setkeys{acs}{
+  super = true
+}
+\ProcessOptionsX*<acs>
+\newcommand*{\acs@niib@create}{%
+  \@namedef{ver@notes2bib.sty}{%
+    2009/04/20 v1.6a Integrating notes into the bibliography (achemso
+    version)
+  }%
+  \newcounter{bibnote}
+  \renewcommand*{\thebibnote}{%
+    Note-\the\value{bibnote}%
+  }%
+  \DeclareRobustCommand*{\bibnote}[1][\thebibnote]{%
+    \stepcounter{bibnote}%
+    \def\acs@niib@after@text{\cite{##1}}%
+    \acs@niib@text{##1}%
+  }%
+  \DeclareRobustCommand*{\bibnotemark}[1][\thebibnote]{%
+    \stepcounter{bibnote}%
+    \cite{##1}%
+  }%
+  \DeclareRobustCommand*{\bibnotetext}[1][\thebibnote]{%
+    \let\acs@niib@after@text\relax
+    \acs@niib@text{##1}%
+  }%
+  \newcommand*{\printbibnotes}{%
+    \ifnum\the\value{bibnote}>\z@\relax
+      \nocite{achemso-control}%
+      \acs@bibliography{acs-\jobname}%
+    \fi
+  }%
+}
+\newcommand*{\acs@niib@after@text}{}
+\newcommand*{\acs@niib@text}{%
+  \@bsphack
+  \acs@bib@write
+  \if@filesw
+    \expandafter\acs@niib@write
   \else
-    \addpenalty\@secpenalty\addvspace\@tempskipa
+    \expandafter\acs@niib@no@write
   \fi
-  \@ifstar
-    {\@ssect{#3}{#4}{#5}{#6}}
-    {\@ssect{#3}{#4}{#5}{#6}}}
-\newcommand*{\acs@killsecnums}{%
-  \let\@startsection\acs@startsection}
-\newcommand*{\acs@restsecnums}{%
-  \let\@startsection\acs@orgstartsection}
-\@ifclassloaded{achemso}
-  {\acs@killsecnums}
-  {}
-\let\acs@section\section
-\let\acs@subsection\subsection
-\newcommand*{\acs@killsecs}{%
-  \newcommand*{\acs@gobblesection}{%
-    \ClassWarning{achemso}
-      {Sections not allowed for this manuscript type}%
-    \@ifstar{\@gobble}{\@gobble}}
-  \let\section\acs@gobblesection
-  \let\subsection\acs@gobblesection
-  \let\subsubsection\acs@gobblesection
-  \AtBeginDocument{
-    \renewcommand*{\bibsection}{\acs@section*{\refname}}}}
-\newcommand*{\acknowledgement}{%
-  \acs@subsection*{\acs@acknowledgement}}
-\newcommand*{\suppinfo}{%
-  \acs@subsection*{\acs@suppinfo}}
-\newcommand*{\acs@acknowledgement}{Acknowledgement}
-\newcommand*{\acs@suppinfo}{Supporting Information Available}
-\newcommand*{\acs@killabstract}{%
-  \let\abstract\acs@startgobble}
-\begingroup
-  \catcode`{=\active
-  \catcode`}=12\relax
-  \catcode`(=1\relax
-  \catcode`)=2\relax
-  \gdef\acs@startgobble(%
-    \ClassWarning(achemso)
-      (Abstract not allowed for this\MessageBreak
-       manuscript type)%
-    \@bsphack
-    \catcode`{=\active
-    \catcode`}=12\relax
-    \let\end\fi
-    \let{\acs@endgobble%}
-    \iffalse)%{
-  \gdef\acs@endgobble#1}(%
-    \def\acs@tempa(#1)%
-    \ifx\acs@tempa\@currenvir
-      \@Esphack\endgroup
-        \if@ignore
-          \global\@ignorefalse\ignorespaces
-        \fi
-     \else
-       \expandafter\acs@iffalse
-    \fi)
-\endgroup
-\newcommand*{\acs@iffalse}{\iffalse}
-\@ifclassloaded{achemso}
-  {\@ifundefined{acs@journal}
-     {\ClassInfo{achemso}{No target journal specified:
-       \MessageBreak using package defaults}%
-     \@ifundefined{acs@manuscript}{}
-       {\ClassWarning{achemso}{The `type' option is only
-          applicable\MessageBreak when the `journal' option is
-          also specified}}}%
-     {\InputIfFileExists{\acs@journal.\acs@cfgextension}
-        {\ClassInfo{achemso}{Loading configuration for
-          journal\MessageBreak \acs@journal}}
-        {\ClassWarning{achemso}{Unknown journal
-          `\acs@journal'}%
-         \InputIfFileExists{jacsat.\acs@cfgextension}
-           {\ClassInfo{achemso}{Loading jacs
-            configuration\MessageBreak as a fall-back}}
-           {\ClassError{achemso}{Could not load
-             jacsat.cfg}{This is a core file of\MessageBreak
-             the achemso bundle: something is wrong with
-             \MessageBreak  your installation}}}}}%
-  {\@ifundefined{acs@journal}{}
-     {\PackageWarning{achemso}{The `journal' option is only
-        applicable\MessageBreak when using the achemso
-        document class}}%
-   \@ifundefined{acs@manuscript}{}
-     {\PackageWarning{achemso}{The `type' option is only
-       applicable\MessageBreak when using the achemso
-       document class}}}
+}
+\newcommand*{\acs@niib@write}[1]{%
+  \begingroup
+    \let\do\@makeother
+    \dospecials
+    \catcode`\{ 1\relax
+    \catcode`\} 2\relax
+    \acs@niib@write@aux@i{#1}%
+}
+\newcommand*{\acs@niib@write@aux@i}[1]{%
+  \long\def\@tempa##1{%
+      \def\@tempa{##1}%
+      \@onelevel@sanitize\@tempa
+    \expandafter\endgroup
+    \expandafter\def\expandafter\@tempa\expandafter{\@tempa}%
+    \acs@niib@write@aux@ii{#1}%
+  }%
+  \catcode`\^^M 10\relax
+  \@tempa
+}
+\newcommand*{\acs@niib@write@aux@ii}[1]{%
+  \immediate\write\acs@bib@file{%
+    @Misc\string{#1,^^J%
+    \space\space note = \string{\@tempa\string},^^J%
+    \string}^^J%
+  }%
+  \@esphack
+  \acs@niib@after@text
+}
+\newcommand{\acs@niib@no@write}[2]{%
+  \@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@activate}{%
-  \let\nmv@natcitex\@citex
+\renewcommand*{\nmv@natbib@detect}{%
+  \ifNAT@super
+    \expandafter\acs@nmv@activate
+  \else
+    \expandafter\acs@autonote
+  \fi
+}
+\newcommand*{\acs@nmv@activate}{%
+  \let\nmv@citex@nat\@citex
   \let\@citex\nmv@citex
   \let\nmv@cite\cite
   \renewcommand*{\cite}[2][]{%
-    \nmv@ifmtarg{##1}
-      {\nmv@citetrue
-       \nmv@cite{##2}}
-      {\nocite{##2}%
-       \bibnote{Ref.~\citenum{##2}, ##1}}}}
-\renewcommand*{\nmv@notactivate}{%
+    \nmv@ifmtarg{##1}{%
+      \nmv@citetrue
+      \nmv@cite{##2}%
+    }{%
+      \nocite{##2}%
+      \bibnote{Ref.~\citenum{##2}, ##1}%
+    }%
+  }%
+}
+\newcommand*{\acs@autonote}{%
   \let\nmv@cite\cite
   \renewcommand*{\cite}[2][]{%
-    \nmv@ifmtarg{##1}
-      {\nmv@cite{##2}}
-      {\nocite{##2}%
-       \bibnote{Ref.~\citenum{##2}, ##1}}}}
-\ifacs@biochemistry
-  \newcommand*{\acs@bibstyle}{biochem}
-\else
-  \newcommand*{\acs@bibstyle}{achemso}
+    \nmv@ifmtarg{##1}{%
+      \nmv@cite{##2}%
+    }{%
+      \nocite{##2}%
+      \bibnote{Ref.~\citenum{##2}, ##1}%
+    }%
+  }%
+}
+\newcommand*{\acs@bibstyle}{achemso}
+\bibliographystyle{achemso}
+\ifacs@biochem
+  \renewcommand*{\acs@bibstyle}{biochem}
+  \bibliographystyle{biochem}
 \fi
-\expandafter\bibliographystyle\expandafter{\acs@bibstyle}
+\newcommand*{\acs@bibliographystyle}{}
 \let\acs@bibliographystyle\bibliographystyle
-\AtBeginDocument{
-  \@ifpackageloaded{chapterbib}
-    {\renewcommand*{\bibliographystyle}[1]{%
-      \expandafter\acs@bibliographystyle\expandafter{%
-        \acs@bibstyle}}}}
 \renewcommand*{\bibliographystyle}[1]{%
-  \PackageWarning{achemso}{\string\bibliographystyle\space
-    ignored}}
-\ifacs@super\else
-  \newcommand*{\citenumfont}{\textit}
-\fi
-\edef\acs@msg{%
-  This is an auxiliary file used by the `achemso' package.^^J%
+  \acs@warning{\string\bibliographystyle\space ignored}%
+  \expandafter\acs@bibliographystyle\expandafter{\acs@bibstyle}%
+}
+\newwrite\acs@bib@file
+\newcommand*{\acs@bib@message}{%
+  This is an auxiliary file used by the `achemso' bundle.^^J%
   This file may safely be deleted. It will be recreated as
-  required.^^J}
-\newcommand*{\acs@writebib}{%
-  \immediate\openout\acs@out\acs@stream\relax
-  \immediate\write\acs@out{\acs@msg}%
-  \edef\acs@tempa##1##2{\space\space##1\space
-    =\space"##2",^^J}%
-  \immediate\write\acs@out{%
-    @Control\string{achemso-control,^^J%
-    \acs@tempa{ctrl-use-title}{\ifacs@usetitle
-      yes\else no\fi}%
-    \acs@tempa{ctrl-etal-number}{\acs@maxauthors}%
-    \string}^^J}}
-\if@filesw
-  \newwrite\acs@out
-  \newcommand*\acs@stream{\acs@prefix\jobname.bib}
-  \acs@writebib
-  \AtBeginDocument{\immediate\closeout\acs@out}
-\fi
-\AtBeginDocument{
+  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
+  \fi
+}
+\newcommand*{\acs@bib@write@aux}{%
+  \immediate\openout\acs@bib@file\acs@bib@name\relax
+  \immediate\write\acs@bib@file{\acs@bib@message}%
+  \edef\@tempa##1##2{%
+    \space\space##1\space = \space"##2",^^J%
+  }%
+  \immediate\write\acs@bib@file{%
+    @Control\string{%
+      achemso-control,^^J%
+      \@tempa{ctrl-use-title}{%
+        \ifacs@usetitle yes\else no\fi
+      }%
+      \@tempa{ctrl-etal-number}{\acs@maxauthors}%
+    \string}^^J%
+  }%
+  \immediate\write\@auxout{%
+    \string\citation\string{achemso-control\string}%
+  }%
+  \global\acs@bib@writtentrue
+  \AtEndDocument{%
+    \immediate\closeout\acs@bib@file\relax
+  }%
+}
+\IfFileExists{mciteplus.sty}{%
+  \RequirePackage{mciteplus}
+}{}
+\AtBeginDocument{%
   \let\acs@bibliography\bibliography
   \renewcommand*{\bibliography}[1]{%
-    \acs@bibliography{\acs@prefix\jobname,#1}}}
-\g@addto@macro{\document}{%
-  \if@filesw
-    \immediate\write\@auxout{%
-      \string\citation\string{achemso-control\string}}%
-  \fi}
-\endinput
+    \acs@bib@write
+    \acs@bibliography{acs-\jobname,#1}%
+  }%
+}
+\AtBeginDocument{%
+  \@ifpackageloaded{notes2bib}{}{%
+    \acs@niib@create
+  }%
+}
+%% 
+%% Originally developed by Mats Dahlgren
+%% Copyright (C) 1996-1998 by Mats Dahlgren
+%% Copyright (C) 2008-2009 by
+%%   Joseph Wright <joseph.wright@morningstar2.co.uk>
+%% 
+%% Part of this bundle is derived from cite.sty, to which the
+%% following license applies:
+%%   Copyright (C) 1989-2003 by Donald Arseneau
+%%   These macros may be freely transmitted, reproduced, or
+%%   modified provided that this notice is left intact.
+%% 
+%% It may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License (LPPL), either version 1.3c of
+%% this license or (at your option) any later version.  The latest
+%% version of this license is in the file:
+%% 
+%%    http://www.latex-project.org/lppl.txt
+%% 
+%% This work is "maintained" (as per LPPL maintenance status) by
+%%   Joseph Wright.
+%% 
+%% This work consists of the file  achemso.dtx
+%%           and the derived files achemso.pdf,
+%%                                 achemso.bib,
+%%                                 achemso.cls,
+%%                                 achemso.ins,
+%%                                 achemso.sty,
+%%                                 achemso-demo.tex,
+%%                                 natmove.sty and
+%%                                 a number of configuration files.
+%% 
 %%
 %% End of file `achemso.sty'.
diff --git a/Master/texmf-dist/tex/latex/achemso/config/acbcct.cfg b/Master/texmf-dist/tex/latex/achemso/config/acbcct.cfg
index 69b28dd4598..eaad8b26a48 100644
--- a/Master/texmf-dist/tex/latex/achemso/config/acbcct.cfg
+++ b/Master/texmf-dist/tex/latex/achemso/config/acbcct.cfg
@@ -5,26 +5,56 @@
 %% The original source files were:
 %%
 %% achemso.dtx  (with options: `acbcct')
-%%  ----------------------------------------------------------------
-%%  achemso --- Support for submissions to American  Chemical
-%%    Society journals
-%%  Maintained by Joseph Wright
-%%  E-mail: joseph.wright@morningstar2.co.uk
-%%  Released under the LaTeX Project Public License v1.3c or later
-%%  See http://www.latex-project.org/lppl.txt
-%%  ----------------------------------------------------------------
+%% ----------------------------------------------------------------
+%% achemso --- Support for submissions to American Chemical Society
+%%   journals
+%% E-mail: joseph.wright@morningstar2.co.uk
+%% Released under the LaTeX Project Public License v1.3c or later
+%% See http://www.latex-project.org/lppl.txt
+%% ----------------------------------------------------------------
 %% 
+
 \ProvidesFile{acbcct.cfg}
-  [2009/02/03 v3.1a achemso configuration:
-   ACS Chem. Biol.]
-\acs@setkeys{
-  abbreviate=true,
-  biblabel=fullstop,
-  biochem=true,
-  maxauthors=15,
-  super=false,
-  usetitle=true}
-\acs@validtype{article,letter,review,suppinfo}
-\endinput
+  [2009/04/21 v3.2 achemso configuration: ACS Chem. Biol.]
+\setkeys{acs}{
+  biblabel = fullstop,
+  biochem  = true,
+  super    = false,
+  usetitle = true
+}
+\renewcommand*{\acs@type@list}{article,letter,review,suppinfo}
+\SectionNumbersOff
+%% 
+%% Originally developed by Mats Dahlgren
+%% Copyright (C) 1996-1998 by Mats Dahlgren
+%% Copyright (C) 2008-2009 by
+%%   Joseph Wright <joseph.wright@morningstar2.co.uk>
+%% 
+%% Part of this bundle is derived from cite.sty, to which the
+%% following license applies:
+%%   Copyright (C) 1989-2003 by Donald Arseneau
+%%   These macros may be freely transmitted, reproduced, or
+%%   modified provided that this notice is left intact.
+%% 
+%% It may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License (LPPL), either version 1.3c of
+%% this license or (at your option) any later version.  The latest
+%% version of this license is in the file:
+%% 
+%%    http://www.latex-project.org/lppl.txt
+%% 
+%% This work is "maintained" (as per LPPL maintenance status) by
+%%   Joseph Wright.
+%% 
+%% This work consists of the file  achemso.dtx
+%%           and the derived files achemso.pdf,
+%%                                 achemso.bib,
+%%                                 achemso.cls,
+%%                                 achemso.ins,
+%%                                 achemso.sty,
+%%                                 achemso-demo.tex,
+%%                                 natmove.sty and
+%%                                 a number of configuration files.
+%% 
 %%
 %% End of file `acbcct.cfg'.
diff --git a/Master/texmf-dist/tex/latex/achemso/config/achre4.cfg b/Master/texmf-dist/tex/latex/achemso/config/achre4.cfg
index fe776390d30..1e7077cf36c 100644
--- a/Master/texmf-dist/tex/latex/achemso/config/achre4.cfg
+++ b/Master/texmf-dist/tex/latex/achemso/config/achre4.cfg
@@ -5,27 +5,53 @@
 %% The original source files were:
 %%
 %% achemso.dtx  (with options: `achre4')
-%%  ----------------------------------------------------------------
-%%  achemso --- Support for submissions to American  Chemical
-%%    Society journals
-%%  Maintained by Joseph Wright
-%%  E-mail: joseph.wright@morningstar2.co.uk
-%%  Released under the LaTeX Project Public License v1.3c or later
-%%  See http://www.latex-project.org/lppl.txt
-%%  ----------------------------------------------------------------
+%% ----------------------------------------------------------------
+%% achemso --- Support for submissions to American Chemical Society
+%%   journals
+%% E-mail: joseph.wright@morningstar2.co.uk
+%% Released under the LaTeX Project Public License v1.3c or later
+%% See http://www.latex-project.org/lppl.txt
+%% ----------------------------------------------------------------
 %% 
+
 \ProvidesFile{achre4.cfg}
-  [2009/02/03 v3.1a achemso configuration:
-   Acc. Chem. Res.]
-\acs@setkeys{
-  abbreviate=true,
-  biblabel=plain,
-  biochem=false,
-  maxauthors=15,
-  super=true,
-  usetitle=false}
-\acs@validtype{article,suppinfo}
+  [2009/04/21 v3.2 achemso configuration: Acc. Chem. Res.]
+\setkeys{acs}{
+  biblabel = plain
+}
+\renewcommand*{\acs@type@list}{article,suppinfo}
 \renewcommand*{\abstractname}{Conspectus}
-\endinput
+%% 
+%% Originally developed by Mats Dahlgren
+%% Copyright (C) 1996-1998 by Mats Dahlgren
+%% Copyright (C) 2008-2009 by
+%%   Joseph Wright <joseph.wright@morningstar2.co.uk>
+%% 
+%% Part of this bundle is derived from cite.sty, to which the
+%% following license applies:
+%%   Copyright (C) 1989-2003 by Donald Arseneau
+%%   These macros may be freely transmitted, reproduced, or
+%%   modified provided that this notice is left intact.
+%% 
+%% It may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License (LPPL), either version 1.3c of
+%% this license or (at your option) any later version.  The latest
+%% version of this license is in the file:
+%% 
+%%    http://www.latex-project.org/lppl.txt
+%% 
+%% This work is "maintained" (as per LPPL maintenance status) by
+%%   Joseph Wright.
+%% 
+%% This work consists of the file  achemso.dtx
+%%           and the derived files achemso.pdf,
+%%                                 achemso.bib,
+%%                                 achemso.cls,
+%%                                 achemso.ins,
+%%                                 achemso.sty,
+%%                                 achemso-demo.tex,
+%%                                 natmove.sty and
+%%                                 a number of configuration files.
+%% 
 %%
 %% End of file `achre4.cfg'.
diff --git a/Master/texmf-dist/tex/latex/achemso/config/ancac3.cfg b/Master/texmf-dist/tex/latex/achemso/config/ancac3.cfg
index 68dc216adf9..5260af5fd8f 100644
--- a/Master/texmf-dist/tex/latex/achemso/config/ancac3.cfg
+++ b/Master/texmf-dist/tex/latex/achemso/config/ancac3.cfg
@@ -5,26 +5,54 @@
 %% The original source files were:
 %%
 %% achemso.dtx  (with options: `ancac3')
-%%  ----------------------------------------------------------------
-%%  achemso --- Support for submissions to American  Chemical
-%%    Society journals
-%%  Maintained by Joseph Wright
-%%  E-mail: joseph.wright@morningstar2.co.uk
-%%  Released under the LaTeX Project Public License v1.3c or later
-%%  See http://www.latex-project.org/lppl.txt
-%%  ----------------------------------------------------------------
+%% ----------------------------------------------------------------
+%% achemso --- Support for submissions to American Chemical Society
+%%   journals
+%% E-mail: joseph.wright@morningstar2.co.uk
+%% Released under the LaTeX Project Public License v1.3c or later
+%% See http://www.latex-project.org/lppl.txt
+%% ----------------------------------------------------------------
 %% 
+
 \ProvidesFile{acbcct.cfg}
-  [2009/02/03 v3.1a achemso configuration:
-   ACS Nano]
-\acs@setkeys{
-  abbreviate=true,
-  biblabel=fullstop,
-  biochem=false,
-  maxauthors=15,
-  super=true,
-  usetitle=true}
-\acs@validtype{perspective,article,suppinfo}
-\endinput
+  [2009/04/21 v3.2 achemso configuration: ACS Nano]
+\setkeys{acs}{
+  biblabel = fullstop,
+  usetitle = true
+}
+\renewcommand*{\acs@type@list}{article,perspective,suppinfo}
+\SectionNumbersOff
+%% 
+%% Originally developed by Mats Dahlgren
+%% Copyright (C) 1996-1998 by Mats Dahlgren
+%% Copyright (C) 2008-2009 by
+%%   Joseph Wright <joseph.wright@morningstar2.co.uk>
+%% 
+%% Part of this bundle is derived from cite.sty, to which the
+%% following license applies:
+%%   Copyright (C) 1989-2003 by Donald Arseneau
+%%   These macros may be freely transmitted, reproduced, or
+%%   modified provided that this notice is left intact.
+%% 
+%% It may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License (LPPL), either version 1.3c of
+%% this license or (at your option) any later version.  The latest
+%% version of this license is in the file:
+%% 
+%%    http://www.latex-project.org/lppl.txt
+%% 
+%% This work is "maintained" (as per LPPL maintenance status) by
+%%   Joseph Wright.
+%% 
+%% This work consists of the file  achemso.dtx
+%%           and the derived files achemso.pdf,
+%%                                 achemso.bib,
+%%                                 achemso.cls,
+%%                                 achemso.ins,
+%%                                 achemso.sty,
+%%                                 achemso-demo.tex,
+%%                                 natmove.sty and
+%%                                 a number of configuration files.
+%% 
 %%
 %% End of file `ancac3.cfg'.
diff --git a/Master/texmf-dist/tex/latex/achemso/config/ancham.cfg b/Master/texmf-dist/tex/latex/achemso/config/ancham.cfg
index 507c068b8c3..8d254b316a0 100644
--- a/Master/texmf-dist/tex/latex/achemso/config/ancham.cfg
+++ b/Master/texmf-dist/tex/latex/achemso/config/ancham.cfg
@@ -5,26 +5,50 @@
 %% The original source files were:
 %%
 %% achemso.dtx  (with options: `ancham')
-%%  ----------------------------------------------------------------
-%%  achemso --- Support for submissions to American  Chemical
-%%    Society journals
-%%  Maintained by Joseph Wright
-%%  E-mail: joseph.wright@morningstar2.co.uk
-%%  Released under the LaTeX Project Public License v1.3c or later
-%%  See http://www.latex-project.org/lppl.txt
-%%  ----------------------------------------------------------------
+%% ----------------------------------------------------------------
+%% achemso --- Support for submissions to American Chemical Society
+%%   journals
+%% E-mail: joseph.wright@morningstar2.co.uk
+%% Released under the LaTeX Project Public License v1.3c or later
+%% See http://www.latex-project.org/lppl.txt
+%% ----------------------------------------------------------------
 %% 
+
 \ProvidesFile{ancham.cfg}
-  [2009/02/03 v3.1a achemso configuration:
-   Anal. Chem.]
-\acs@setkeys{
-  abbreviate=true,
-  biblabel=brackets,
-  biochem=false,
-  maxauthors=15,
-  super=true,
-  usetitle=false}
-\acs@validtype{article,suppinfo,note}
-\endinput
+  [2009/04/21 v3.2 achemso configuration:  Anal. Chem.]
+\renewcommand*{\acs@type@list}{article,note,suppinfo}
+\SectionNumbersOff
+%% 
+%% Originally developed by Mats Dahlgren
+%% Copyright (C) 1996-1998 by Mats Dahlgren
+%% Copyright (C) 2008-2009 by
+%%   Joseph Wright <joseph.wright@morningstar2.co.uk>
+%% 
+%% Part of this bundle is derived from cite.sty, to which the
+%% following license applies:
+%%   Copyright (C) 1989-2003 by Donald Arseneau
+%%   These macros may be freely transmitted, reproduced, or
+%%   modified provided that this notice is left intact.
+%% 
+%% It may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License (LPPL), either version 1.3c of
+%% this license or (at your option) any later version.  The latest
+%% version of this license is in the file:
+%% 
+%%    http://www.latex-project.org/lppl.txt
+%% 
+%% This work is "maintained" (as per LPPL maintenance status) by
+%%   Joseph Wright.
+%% 
+%% This work consists of the file  achemso.dtx
+%%           and the derived files achemso.pdf,
+%%                                 achemso.bib,
+%%                                 achemso.cls,
+%%                                 achemso.ins,
+%%                                 achemso.sty,
+%%                                 achemso-demo.tex,
+%%                                 natmove.sty and
+%%                                 a number of configuration files.
+%% 
 %%
 %% End of file `ancham.cfg'.
diff --git a/Master/texmf-dist/tex/latex/achemso/config/bcches.cfg b/Master/texmf-dist/tex/latex/achemso/config/bcches.cfg
index 3933620e697..d27cced1093 100644
--- a/Master/texmf-dist/tex/latex/achemso/config/bcches.cfg
+++ b/Master/texmf-dist/tex/latex/achemso/config/bcches.cfg
@@ -5,26 +5,54 @@
 %% The original source files were:
 %%
 %% achemso.dtx  (with options: `bcches')
-%%  ----------------------------------------------------------------
-%%  achemso --- Support for submissions to American  Chemical
-%%    Society journals
-%%  Maintained by Joseph Wright
-%%  E-mail: joseph.wright@morningstar2.co.uk
-%%  Released under the LaTeX Project Public License v1.3c or later
-%%  See http://www.latex-project.org/lppl.txt
-%%  ----------------------------------------------------------------
+%% ----------------------------------------------------------------
+%% achemso --- Support for submissions to American Chemical Society
+%%   journals
+%% E-mail: joseph.wright@morningstar2.co.uk
+%% Released under the LaTeX Project Public License v1.3c or later
+%% See http://www.latex-project.org/lppl.txt
+%% ----------------------------------------------------------------
 %% 
+
 \ProvidesFile{bcches.cfg}
-  [2009/02/03 v3.1a achemso configuration:
-   Bioconjugate Chem.]
-\acs@setkeys{
-  abbreviate=true,
-  biblabel=brackets,
-  biochem=true,
-  maxauthors=15,
-  super=false,
-  usetitle=true}
-\acs@validtype{article,communication,suppinfo}
-\endinput
+  [2009/04/21 v3.2 achemso configuration: Bioconjugate Chem.]
+\setkeys{acs}{
+  biochem  = true,
+  super    = false,
+  usetitle = true
+}
+\SectionNumbersOff
+%% 
+%% Originally developed by Mats Dahlgren
+%% Copyright (C) 1996-1998 by Mats Dahlgren
+%% Copyright (C) 2008-2009 by
+%%   Joseph Wright <joseph.wright@morningstar2.co.uk>
+%% 
+%% Part of this bundle is derived from cite.sty, to which the
+%% following license applies:
+%%   Copyright (C) 1989-2003 by Donald Arseneau
+%%   These macros may be freely transmitted, reproduced, or
+%%   modified provided that this notice is left intact.
+%% 
+%% It may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License (LPPL), either version 1.3c of
+%% this license or (at your option) any later version.  The latest
+%% version of this license is in the file:
+%% 
+%%    http://www.latex-project.org/lppl.txt
+%% 
+%% This work is "maintained" (as per LPPL maintenance status) by
+%%   Joseph Wright.
+%% 
+%% This work consists of the file  achemso.dtx
+%%           and the derived files achemso.pdf,
+%%                                 achemso.bib,
+%%                                 achemso.cls,
+%%                                 achemso.ins,
+%%                                 achemso.sty,
+%%                                 achemso-demo.tex,
+%%                                 natmove.sty and
+%%                                 a number of configuration files.
+%% 
 %%
 %% End of file `bcches.cfg'.
diff --git a/Master/texmf-dist/tex/latex/achemso/config/bichaw.cfg b/Master/texmf-dist/tex/latex/achemso/config/bichaw.cfg
index 4b5548b818b..c35b56ab106 100644
--- a/Master/texmf-dist/tex/latex/achemso/config/bichaw.cfg
+++ b/Master/texmf-dist/tex/latex/achemso/config/bichaw.cfg
@@ -5,26 +5,55 @@
 %% The original source files were:
 %%
 %% achemso.dtx  (with options: `bichaw')
-%%  ----------------------------------------------------------------
-%%  achemso --- Support for submissions to American  Chemical
-%%    Society journals
-%%  Maintained by Joseph Wright
-%%  E-mail: joseph.wright@morningstar2.co.uk
-%%  Released under the LaTeX Project Public License v1.3c or later
-%%  See http://www.latex-project.org/lppl.txt
-%%  ----------------------------------------------------------------
+%% ----------------------------------------------------------------
+%% achemso --- Support for submissions to American Chemical Society
+%%   journals
+%% E-mail: joseph.wright@morningstar2.co.uk
+%% Released under the LaTeX Project Public License v1.3c or later
+%% See http://www.latex-project.org/lppl.txt
+%% ----------------------------------------------------------------
 %% 
+
 \ProvidesFile{biochem.cfg}
-  [2009/02/03 v3.1a achemso configuration:
-   Biochemistry]
-\acs@setkeys{
-  abbreviate=true,
-  biblabel=fullstop,
-  biochem=true,
-  maxauthors=15,
-  super=false,
-  usetitle=true}
-\acs@validtype{article,communication,suppinfo}
-\endinput
+  [2009/04/21 v3.2 achemso configuration: Biochemistry]
+\setkeys{acs}{
+  biblabel = fullstop,
+  biochem  = true,
+  super    = false,
+  usetitle = true
+}
+\SectionNumbersOff
+%% 
+%% Originally developed by Mats Dahlgren
+%% Copyright (C) 1996-1998 by Mats Dahlgren
+%% Copyright (C) 2008-2009 by
+%%   Joseph Wright <joseph.wright@morningstar2.co.uk>
+%% 
+%% Part of this bundle is derived from cite.sty, to which the
+%% following license applies:
+%%   Copyright (C) 1989-2003 by Donald Arseneau
+%%   These macros may be freely transmitted, reproduced, or
+%%   modified provided that this notice is left intact.
+%% 
+%% It may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License (LPPL), either version 1.3c of
+%% this license or (at your option) any later version.  The latest
+%% version of this license is in the file:
+%% 
+%%    http://www.latex-project.org/lppl.txt
+%% 
+%% This work is "maintained" (as per LPPL maintenance status) by
+%%   Joseph Wright.
+%% 
+%% This work consists of the file  achemso.dtx
+%%           and the derived files achemso.pdf,
+%%                                 achemso.bib,
+%%                                 achemso.cls,
+%%                                 achemso.ins,
+%%                                 achemso.sty,
+%%                                 achemso-demo.tex,
+%%                                 natmove.sty and
+%%                                 a number of configuration files.
+%% 
 %%
 %% End of file `bichaw.cfg'.
diff --git a/Master/texmf-dist/tex/latex/achemso/config/bipret.cfg b/Master/texmf-dist/tex/latex/achemso/config/bipret.cfg
index cacce1435c4..3fdfb050a36 100644
--- a/Master/texmf-dist/tex/latex/achemso/config/bipret.cfg
+++ b/Master/texmf-dist/tex/latex/achemso/config/bipret.cfg
@@ -5,26 +5,54 @@
 %% The original source files were:
 %%
 %% achemso.dtx  (with options: `bipret')
-%%  ----------------------------------------------------------------
-%%  achemso --- Support for submissions to American  Chemical
-%%    Society journals
-%%  Maintained by Joseph Wright
-%%  E-mail: joseph.wright@morningstar2.co.uk
-%%  Released under the LaTeX Project Public License v1.3c or later
-%%  See http://www.latex-project.org/lppl.txt
-%%  ----------------------------------------------------------------
+%% ----------------------------------------------------------------
+%% achemso --- Support for submissions to American Chemical Society
+%%   journals
+%% E-mail: joseph.wright@morningstar2.co.uk
+%% Released under the LaTeX Project Public License v1.3c or later
+%% See http://www.latex-project.org/lppl.txt
+%% ----------------------------------------------------------------
 %% 
+
 \ProvidesFile{bipret.cfg}
-  [2009/02/03 v3.1a achemso configuration:
-   Biotechnol. Prog.]
-\acs@setkeys{
-  abbreviate=true,
-  biblabel=brackets,
-  biochem=false,
-  maxauthors=15,
-  super=false,
-  usetitle=true}
-\acs@validtype{article,review,suppinfo}
-\endinput
+  [2009/04/21 v3.2 achemso configuration: Biotechnol. Prog.]
+\setkeys{acs}{
+  super    = false,
+  usetitle = true
+}
+\renewcommand*{\acs@type@list}{article,review,suppinfo}
+\SectionNumbersOff
+%% 
+%% Originally developed by Mats Dahlgren
+%% Copyright (C) 1996-1998 by Mats Dahlgren
+%% Copyright (C) 2008-2009 by
+%%   Joseph Wright <joseph.wright@morningstar2.co.uk>
+%% 
+%% Part of this bundle is derived from cite.sty, to which the
+%% following license applies:
+%%   Copyright (C) 1989-2003 by Donald Arseneau
+%%   These macros may be freely transmitted, reproduced, or
+%%   modified provided that this notice is left intact.
+%% 
+%% It may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License (LPPL), either version 1.3c of
+%% this license or (at your option) any later version.  The latest
+%% version of this license is in the file:
+%% 
+%%    http://www.latex-project.org/lppl.txt
+%% 
+%% This work is "maintained" (as per LPPL maintenance status) by
+%%   Joseph Wright.
+%% 
+%% This work consists of the file  achemso.dtx
+%%           and the derived files achemso.pdf,
+%%                                 achemso.bib,
+%%                                 achemso.cls,
+%%                                 achemso.ins,
+%%                                 achemso.sty,
+%%                                 achemso-demo.tex,
+%%                                 natmove.sty and
+%%                                 a number of configuration files.
+%% 
 %%
 %% End of file `bipret.cfg'.
diff --git a/Master/texmf-dist/tex/latex/achemso/config/bomaf6.cfg b/Master/texmf-dist/tex/latex/achemso/config/bomaf6.cfg
index 85fdc1dd617..afc07e10685 100644
--- a/Master/texmf-dist/tex/latex/achemso/config/bomaf6.cfg
+++ b/Master/texmf-dist/tex/latex/achemso/config/bomaf6.cfg
@@ -5,26 +5,53 @@
 %% The original source files were:
 %%
 %% achemso.dtx  (with options: `bomaf6')
-%%  ----------------------------------------------------------------
-%%  achemso --- Support for submissions to American  Chemical
-%%    Society journals
-%%  Maintained by Joseph Wright
-%%  E-mail: joseph.wright@morningstar2.co.uk
-%%  Released under the LaTeX Project Public License v1.3c or later
-%%  See http://www.latex-project.org/lppl.txt
-%%  ----------------------------------------------------------------
+%% ----------------------------------------------------------------
+%% achemso --- Support for submissions to American Chemical Society
+%%   journals
+%% E-mail: joseph.wright@morningstar2.co.uk
+%% Released under the LaTeX Project Public License v1.3c or later
+%% See http://www.latex-project.org/lppl.txt
+%% ----------------------------------------------------------------
 %% 
+
 \ProvidesFile{bomaf6.cfg}
-  [2009/02/03 v3.1a achemso configuration:
-   Biomacromolecules]
-\acs@setkeys{
-  abbreviate=true,
-  biblabel=brackets,
-  biochem=false,
-  maxauthors=15,
-  super=false,
-  usetitle=true}
-\acs@validtype{article,communication,suppinfo}
-\endinput
+  [2009/04/21 v3.2 achemso configuration: Biomacromolecules]
+\setkeys{acs}{
+  super    = false,
+  usetitle = true
+}
+\SectionNumbersOff
+%% 
+%% Originally developed by Mats Dahlgren
+%% Copyright (C) 1996-1998 by Mats Dahlgren
+%% Copyright (C) 2008-2009 by
+%%   Joseph Wright <joseph.wright@morningstar2.co.uk>
+%% 
+%% Part of this bundle is derived from cite.sty, to which the
+%% following license applies:
+%%   Copyright (C) 1989-2003 by Donald Arseneau
+%%   These macros may be freely transmitted, reproduced, or
+%%   modified provided that this notice is left intact.
+%% 
+%% It may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License (LPPL), either version 1.3c of
+%% this license or (at your option) any later version.  The latest
+%% version of this license is in the file:
+%% 
+%%    http://www.latex-project.org/lppl.txt
+%% 
+%% This work is "maintained" (as per LPPL maintenance status) by
+%%   Joseph Wright.
+%% 
+%% This work consists of the file  achemso.dtx
+%%           and the derived files achemso.pdf,
+%%                                 achemso.bib,
+%%                                 achemso.cls,
+%%                                 achemso.ins,
+%%                                 achemso.sty,
+%%                                 achemso-demo.tex,
+%%                                 natmove.sty and
+%%                                 a number of configuration files.
+%% 
 %%
 %% End of file `bomaf6.cfg'.
diff --git a/Master/texmf-dist/tex/latex/achemso/config/cgdefu.cfg b/Master/texmf-dist/tex/latex/achemso/config/cgdefu.cfg
index 21f48ab2cec..5f284285269 100644
--- a/Master/texmf-dist/tex/latex/achemso/config/cgdefu.cfg
+++ b/Master/texmf-dist/tex/latex/achemso/config/cgdefu.cfg
@@ -5,30 +5,56 @@
 %% The original source files were:
 %%
 %% achemso.dtx  (with options: `cgdefu')
-%%  ----------------------------------------------------------------
-%%  achemso --- Support for submissions to American  Chemical
-%%    Society journals
-%%  Maintained by Joseph Wright
-%%  E-mail: joseph.wright@morningstar2.co.uk
-%%  Released under the LaTeX Project Public License v1.3c or later
-%%  See http://www.latex-project.org/lppl.txt
-%%  ----------------------------------------------------------------
+%% ----------------------------------------------------------------
+%% achemso --- Support for submissions to American Chemical Society
+%%   journals
+%% E-mail: joseph.wright@morningstar2.co.uk
+%% Released under the LaTeX Project Public License v1.3c or later
+%% See http://www.latex-project.org/lppl.txt
+%% ----------------------------------------------------------------
 %% 
+
 \ProvidesFile{cgdefu.cfg}
-  [2009/02/03 v3.1a achemso configuration:
-   Cryst. Growth Des.]
-\acs@setkeys{
-  abbreviate=true,
-  biblabel=brackets,
-  biochem=false,
-  maxauthors=15,
-  super=true,
-  usetitle=false}
-\acs@validtype{perspective,article,communication,suppinfo}
-\renewcommand*{\acs@tempa}{communication}
-\ifx\acs@manuscript\acs@tempa
-  \acs@killsecs
+  [2009/04/21 v3.2 achemso configuration: Cryst. Growth Des.]
+\renewcommand*{\acs@type@list}{%
+  article,communication,perspective,suppinfo%
+}
+\SectionNumbersOff
+\def\@tempa{communication}
+\ifx\acs@manuscript\@tempa
+  \SectionsOff
 \fi
-\endinput
+%% 
+%% Originally developed by Mats Dahlgren
+%% Copyright (C) 1996-1998 by Mats Dahlgren
+%% Copyright (C) 2008-2009 by
+%%   Joseph Wright <joseph.wright@morningstar2.co.uk>
+%% 
+%% Part of this bundle is derived from cite.sty, to which the
+%% following license applies:
+%%   Copyright (C) 1989-2003 by Donald Arseneau
+%%   These macros may be freely transmitted, reproduced, or
+%%   modified provided that this notice is left intact.
+%% 
+%% It may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License (LPPL), either version 1.3c of
+%% this license or (at your option) any later version.  The latest
+%% version of this license is in the file:
+%% 
+%%    http://www.latex-project.org/lppl.txt
+%% 
+%% This work is "maintained" (as per LPPL maintenance status) by
+%%   Joseph Wright.
+%% 
+%% This work consists of the file  achemso.dtx
+%%           and the derived files achemso.pdf,
+%%                                 achemso.bib,
+%%                                 achemso.cls,
+%%                                 achemso.ins,
+%%                                 achemso.sty,
+%%                                 achemso-demo.tex,
+%%                                 natmove.sty and
+%%                                 a number of configuration files.
+%% 
 %%
 %% End of file `cgdefu.cfg'.
diff --git a/Master/texmf-dist/tex/latex/achemso/config/chreay.cfg b/Master/texmf-dist/tex/latex/achemso/config/chreay.cfg
index ae667bc9d4a..0bf5a7c78f9 100644
--- a/Master/texmf-dist/tex/latex/achemso/config/chreay.cfg
+++ b/Master/texmf-dist/tex/latex/achemso/config/chreay.cfg
@@ -5,28 +5,51 @@
 %% The original source files were:
 %%
 %% achemso.dtx  (with options: `chreay')
-%%  ----------------------------------------------------------------
-%%  achemso --- Support for submissions to American  Chemical
-%%    Society journals
-%%  Maintained by Joseph Wright
-%%  E-mail: joseph.wright@morningstar2.co.uk
-%%  Released under the LaTeX Project Public License v1.3c or later
-%%  See http://www.latex-project.org/lppl.txt
-%%  ----------------------------------------------------------------
+%% ----------------------------------------------------------------
+%% achemso --- Support for submissions to American Chemical Society
+%%   journals
+%% E-mail: joseph.wright@morningstar2.co.uk
+%% Released under the LaTeX Project Public License v1.3c or later
+%% See http://www.latex-project.org/lppl.txt
+%% ----------------------------------------------------------------
 %% 
+
 \ProvidesFile{chreay.cfg}
-  [2009/02/03 v3.1a achemso configuration:
-   Chem. Rev.]
-\acs@setkeys{
-  abbreviate=true,
-  biblabel=brackets,
-  biochem=false,
-  maxauthors=0,
-  super=true,
-  usetitle=false}
-\acs@validtype[review]{review}
-\AtBeginDocument{
-  \renewcommand*{\bibsection}{\section{\refname}}}
-\endinput
+  [2009/04/21 v3.2 achemso configuration: Chem. Rev.]
+\renewcommand*{\acs@type@default}{review}
+\renewcommand*{\acs@type@list}{review}
+\renewcommand*{\bibsection}{\acs@section{\refname}}
+%% 
+%% Originally developed by Mats Dahlgren
+%% Copyright (C) 1996-1998 by Mats Dahlgren
+%% Copyright (C) 2008-2009 by
+%%   Joseph Wright <joseph.wright@morningstar2.co.uk>
+%% 
+%% Part of this bundle is derived from cite.sty, to which the
+%% following license applies:
+%%   Copyright (C) 1989-2003 by Donald Arseneau
+%%   These macros may be freely transmitted, reproduced, or
+%%   modified provided that this notice is left intact.
+%% 
+%% It may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License (LPPL), either version 1.3c of
+%% this license or (at your option) any later version.  The latest
+%% version of this license is in the file:
+%% 
+%%    http://www.latex-project.org/lppl.txt
+%% 
+%% This work is "maintained" (as per LPPL maintenance status) by
+%%   Joseph Wright.
+%% 
+%% This work consists of the file  achemso.dtx
+%%           and the derived files achemso.pdf,
+%%                                 achemso.bib,
+%%                                 achemso.cls,
+%%                                 achemso.ins,
+%%                                 achemso.sty,
+%%                                 achemso-demo.tex,
+%%                                 natmove.sty and
+%%                                 a number of configuration files.
+%% 
 %%
 %% End of file `chreay.cfg'.
diff --git a/Master/texmf-dist/tex/latex/achemso/config/cmatex.cfg b/Master/texmf-dist/tex/latex/achemso/config/cmatex.cfg
index 9bfb14f9dba..6be1f3dc1a1 100644
--- a/Master/texmf-dist/tex/latex/achemso/config/cmatex.cfg
+++ b/Master/texmf-dist/tex/latex/achemso/config/cmatex.cfg
@@ -5,31 +5,54 @@
 %% The original source files were:
 %%
 %% achemso.dtx  (with options: `cmatex')
-%%  ----------------------------------------------------------------
-%%  achemso --- Support for submissions to American  Chemical
-%%    Society journals
-%%  Maintained by Joseph Wright
-%%  E-mail: joseph.wright@morningstar2.co.uk
-%%  Released under the LaTeX Project Public License v1.3c or later
-%%  See http://www.latex-project.org/lppl.txt
-%%  ----------------------------------------------------------------
+%% ----------------------------------------------------------------
+%% achemso --- Support for submissions to American Chemical Society
+%%   journals
+%% E-mail: joseph.wright@morningstar2.co.uk
+%% Released under the LaTeX Project Public License v1.3c or later
+%% See http://www.latex-project.org/lppl.txt
+%% ----------------------------------------------------------------
 %% 
+
 \ProvidesFile{cmatex.cfg}
-  [2009/02/03 v3.1a achemso configuration:
-   Chem. Mater.]
-\acs@setkeys{
-  abbreviate=true,
-  biblabel=brackets,
-  biochem=false,
-  maxauthors=15,
-  super=true,
-  usetitle=false}
-\acs@validtype{article,communication,suppinfo}
-\renewcommand*{\acs@tempa}{communication}
-\ifx\acs@manuscript\acs@tempa
-  \acs@killabstract
-  \acs@killsecs
+  [2009/04/21 v3.2 achemso configuration: Chem. Mater.]
+\SectionNumbersOff
+\def\@tempa{communication}
+\ifx\acs@manuscript\@tempa
+  \AbstractOff
+  \SectionsOff
 \fi
-\endinput
+%% 
+%% Originally developed by Mats Dahlgren
+%% Copyright (C) 1996-1998 by Mats Dahlgren
+%% Copyright (C) 2008-2009 by
+%%   Joseph Wright <joseph.wright@morningstar2.co.uk>
+%% 
+%% Part of this bundle is derived from cite.sty, to which the
+%% following license applies:
+%%   Copyright (C) 1989-2003 by Donald Arseneau
+%%   These macros may be freely transmitted, reproduced, or
+%%   modified provided that this notice is left intact.
+%% 
+%% It may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License (LPPL), either version 1.3c of
+%% this license or (at your option) any later version.  The latest
+%% version of this license is in the file:
+%% 
+%%    http://www.latex-project.org/lppl.txt
+%% 
+%% This work is "maintained" (as per LPPL maintenance status) by
+%%   Joseph Wright.
+%% 
+%% This work consists of the file  achemso.dtx
+%%           and the derived files achemso.pdf,
+%%                                 achemso.bib,
+%%                                 achemso.cls,
+%%                                 achemso.ins,
+%%                                 achemso.sty,
+%%                                 achemso-demo.tex,
+%%                                 natmove.sty and
+%%                                 a number of configuration files.
+%% 
 %%
 %% End of file `cmatex.cfg'.
diff --git a/Master/texmf-dist/tex/latex/achemso/config/crtoec.cfg b/Master/texmf-dist/tex/latex/achemso/config/crtoec.cfg
index a5f765b9d3a..6d1f2aeb3e2 100644
--- a/Master/texmf-dist/tex/latex/achemso/config/crtoec.cfg
+++ b/Master/texmf-dist/tex/latex/achemso/config/crtoec.cfg
@@ -5,26 +5,57 @@
 %% The original source files were:
 %%
 %% achemso.dtx  (with options: `crtoec')
-%%  ----------------------------------------------------------------
-%%  achemso --- Support for submissions to American  Chemical
-%%    Society journals
-%%  Maintained by Joseph Wright
-%%  E-mail: joseph.wright@morningstar2.co.uk
-%%  Released under the LaTeX Project Public License v1.3c or later
-%%  See http://www.latex-project.org/lppl.txt
-%%  ----------------------------------------------------------------
+%% ----------------------------------------------------------------
+%% achemso --- Support for submissions to American Chemical Society
+%%   journals
+%% E-mail: joseph.wright@morningstar2.co.uk
+%% Released under the LaTeX Project Public License v1.3c or later
+%% See http://www.latex-project.org/lppl.txt
+%% ----------------------------------------------------------------
 %% 
+
 \ProvidesFile{crtoec.cfg}
-  [2009/02/03 v3.1a achemso configuration:
-   Chem. Res. Toxicol.]
-\acs@setkeys{
-  abbreviate=true,
-  biblabel=brackets,
-  biochem=true,
-  maxauthors=15,
-  super=false,
-  usetitle=true}
-\acs@validtype{perspective,article,review,profile,suppinfo}
-\endinput
+  [2009/04/21 v3.2 achemso configuration: Chem. Res. Toxicol.]
+\setkeys{acs}{
+  biochem  = true,
+  super    = false,
+  usetitle = true
+}
+\renewcommand*{\acs@type@list}{%
+  article,perspective,profile,review,suppinfo%
+}
+\SectionNumbersOff
+%% 
+%% Originally developed by Mats Dahlgren
+%% Copyright (C) 1996-1998 by Mats Dahlgren
+%% Copyright (C) 2008-2009 by
+%%   Joseph Wright <joseph.wright@morningstar2.co.uk>
+%% 
+%% Part of this bundle is derived from cite.sty, to which the
+%% following license applies:
+%%   Copyright (C) 1989-2003 by Donald Arseneau
+%%   These macros may be freely transmitted, reproduced, or
+%%   modified provided that this notice is left intact.
+%% 
+%% It may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License (LPPL), either version 1.3c of
+%% this license or (at your option) any later version.  The latest
+%% version of this license is in the file:
+%% 
+%%    http://www.latex-project.org/lppl.txt
+%% 
+%% This work is "maintained" (as per LPPL maintenance status) by
+%%   Joseph Wright.
+%% 
+%% This work consists of the file  achemso.dtx
+%%           and the derived files achemso.pdf,
+%%                                 achemso.bib,
+%%                                 achemso.cls,
+%%                                 achemso.ins,
+%%                                 achemso.sty,
+%%                                 achemso-demo.tex,
+%%                                 natmove.sty and
+%%                                 a number of configuration files.
+%% 
 %%
 %% End of file `crtoec.cfg'.
diff --git a/Master/texmf-dist/tex/latex/achemso/config/enfuem.cfg b/Master/texmf-dist/tex/latex/achemso/config/enfuem.cfg
index abf1e3fa431..2e6e6120fcc 100644
--- a/Master/texmf-dist/tex/latex/achemso/config/enfuem.cfg
+++ b/Master/texmf-dist/tex/latex/achemso/config/enfuem.cfg
@@ -5,26 +5,50 @@
 %% The original source files were:
 %%
 %% achemso.dtx  (with options: `enfuem')
-%%  ----------------------------------------------------------------
-%%  achemso --- Support for submissions to American  Chemical
-%%    Society journals
-%%  Maintained by Joseph Wright
-%%  E-mail: joseph.wright@morningstar2.co.uk
-%%  Released under the LaTeX Project Public License v1.3c or later
-%%  See http://www.latex-project.org/lppl.txt
-%%  ----------------------------------------------------------------
+%% ----------------------------------------------------------------
+%% achemso --- Support for submissions to American Chemical Society
+%%   journals
+%% E-mail: joseph.wright@morningstar2.co.uk
+%% Released under the LaTeX Project Public License v1.3c or later
+%% See http://www.latex-project.org/lppl.txt
+%% ----------------------------------------------------------------
 %% 
+
 \ProvidesFile{enfuem.cfg}
-  [2009/02/03 v3.1a achemso configuration:
-   Energy Fuels]
-\acs@setkeys{
-  abbreviate=true,
-  biblabel=brackets,
-  biochem=false,
-  maxauthors=15,
-  super=true,
-  usetitle=false}
-\acs@validtype{review,article,suppinfo}
-\endinput
+  [2009/04/21 v3.2 achemso configuration: Energy Fuels]
+\renewcommand*{\acs@type@list}{article,review,suppinfo}
+\SectionNumbersOff
+%% 
+%% Originally developed by Mats Dahlgren
+%% Copyright (C) 1996-1998 by Mats Dahlgren
+%% Copyright (C) 2008-2009 by
+%%   Joseph Wright <joseph.wright@morningstar2.co.uk>
+%% 
+%% Part of this bundle is derived from cite.sty, to which the
+%% following license applies:
+%%   Copyright (C) 1989-2003 by Donald Arseneau
+%%   These macros may be freely transmitted, reproduced, or
+%%   modified provided that this notice is left intact.
+%% 
+%% It may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License (LPPL), either version 1.3c of
+%% this license or (at your option) any later version.  The latest
+%% version of this license is in the file:
+%% 
+%%    http://www.latex-project.org/lppl.txt
+%% 
+%% This work is "maintained" (as per LPPL maintenance status) by
+%%   Joseph Wright.
+%% 
+%% This work consists of the file  achemso.dtx
+%%           and the derived files achemso.pdf,
+%%                                 achemso.bib,
+%%                                 achemso.cls,
+%%                                 achemso.ins,
+%%                                 achemso.sty,
+%%                                 achemso-demo.tex,
+%%                                 natmove.sty and
+%%                                 a number of configuration files.
+%% 
 %%
 %% End of file `enfuem.cfg'.
diff --git a/Master/texmf-dist/tex/latex/achemso/config/esthag.cfg b/Master/texmf-dist/tex/latex/achemso/config/esthag.cfg
index 809bf0c7d68..a972dcb1510 100644
--- a/Master/texmf-dist/tex/latex/achemso/config/esthag.cfg
+++ b/Master/texmf-dist/tex/latex/achemso/config/esthag.cfg
@@ -5,26 +5,54 @@
 %% The original source files were:
 %%
 %% achemso.dtx  (with options: `esthag')
-%%  ----------------------------------------------------------------
-%%  achemso --- Support for submissions to American  Chemical
-%%    Society journals
-%%  Maintained by Joseph Wright
-%%  E-mail: joseph.wright@morningstar2.co.uk
-%%  Released under the LaTeX Project Public License v1.3c or later
-%%  See http://www.latex-project.org/lppl.txt
-%%  ----------------------------------------------------------------
+%% ----------------------------------------------------------------
+%% achemso --- Support for submissions to American Chemical Society
+%%   journals
+%% E-mail: joseph.wright@morningstar2.co.uk
+%% Released under the LaTeX Project Public License v1.3c or later
+%% See http://www.latex-project.org/lppl.txt
+%% ----------------------------------------------------------------
 %% 
+
 \ProvidesFile{esthag.cfg}
-  [2009/02/03 v3.1a achemso configuration:
-   Environ. Sci. Technol.]
-\acs@setkeys{
-  abbreviate=true,
-  biblabel=brackets,
-  biochem=false,
-  maxauthors=15,
-  super=false,
-  usetitle=true}
-\acs@validtype{article,suppinfo}
-\endinput
+  [2009/04/21 v3.2 achemso configuration: Environ. Sci. Technol.]
+\setkeys{acs}{
+  super    = false,
+  usetitle = true
+}
+\renewcommand*{\acs@type@list}{article,suppinfo}
+\SectionNumbersOff
+%% 
+%% Originally developed by Mats Dahlgren
+%% Copyright (C) 1996-1998 by Mats Dahlgren
+%% Copyright (C) 2008-2009 by
+%%   Joseph Wright <joseph.wright@morningstar2.co.uk>
+%% 
+%% Part of this bundle is derived from cite.sty, to which the
+%% following license applies:
+%%   Copyright (C) 1989-2003 by Donald Arseneau
+%%   These macros may be freely transmitted, reproduced, or
+%%   modified provided that this notice is left intact.
+%% 
+%% It may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License (LPPL), either version 1.3c of
+%% this license or (at your option) any later version.  The latest
+%% version of this license is in the file:
+%% 
+%%    http://www.latex-project.org/lppl.txt
+%% 
+%% This work is "maintained" (as per LPPL maintenance status) by
+%%   Joseph Wright.
+%% 
+%% This work consists of the file  achemso.dtx
+%%           and the derived files achemso.pdf,
+%%                                 achemso.bib,
+%%                                 achemso.cls,
+%%                                 achemso.ins,
+%%                                 achemso.sty,
+%%                                 achemso-demo.tex,
+%%                                 natmove.sty and
+%%                                 a number of configuration files.
+%% 
 %%
 %% End of file `esthag.cfg'.
diff --git a/Master/texmf-dist/tex/latex/achemso/config/iecred.cfg b/Master/texmf-dist/tex/latex/achemso/config/iecred.cfg
index 9c603e097f9..0d5015c49d4 100644
--- a/Master/texmf-dist/tex/latex/achemso/config/iecred.cfg
+++ b/Master/texmf-dist/tex/latex/achemso/config/iecred.cfg
@@ -5,30 +5,53 @@
 %% The original source files were:
 %%
 %% achemso.dtx  (with options: `iecred')
-%%  ----------------------------------------------------------------
-%%  achemso --- Support for submissions to American  Chemical
-%%    Society journals
-%%  Maintained by Joseph Wright
-%%  E-mail: joseph.wright@morningstar2.co.uk
-%%  Released under the LaTeX Project Public License v1.3c or later
-%%  See http://www.latex-project.org/lppl.txt
-%%  ----------------------------------------------------------------
+%% ----------------------------------------------------------------
+%% achemso --- Support for submissions to American Chemical Society
+%%   journals
+%% E-mail: joseph.wright@morningstar2.co.uk
+%% Released under the LaTeX Project Public License v1.3c or later
+%% See http://www.latex-project.org/lppl.txt
+%% ----------------------------------------------------------------
 %% 
+
 \ProvidesFile{iecred.cfg}
-  [2009/02/03 v3.1a achemso configuration:
-   Ind. Eng. Chem. Res.]
-\acs@setkeys{
-  abbreviate=true,
-  biblabel=fullstop,
-  biochem=false,
-  maxauthors=15,
-  super=true,
-  usetitle=true}
-\acs@validtype{article,communication,suppinfo}
-\renewcommand*{\acs@tempa}{suppinfo}
-\ifx\acs@manuscript\acs@tempa
-  \acs@setkeys{maxauthors=0}
-\fi
-\endinput
+  [2009/04/21 v3.2 achemso configuration: Ind. Eng. Chem. Res.]
+\setkeys{acs}{
+  biblabel = fullstop,
+  usetitle = true
+}
+\SectionNumbersOff
+%% 
+%% Originally developed by Mats Dahlgren
+%% Copyright (C) 1996-1998 by Mats Dahlgren
+%% Copyright (C) 2008-2009 by
+%%   Joseph Wright <joseph.wright@morningstar2.co.uk>
+%% 
+%% Part of this bundle is derived from cite.sty, to which the
+%% following license applies:
+%%   Copyright (C) 1989-2003 by Donald Arseneau
+%%   These macros may be freely transmitted, reproduced, or
+%%   modified provided that this notice is left intact.
+%% 
+%% It may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License (LPPL), either version 1.3c of
+%% this license or (at your option) any later version.  The latest
+%% version of this license is in the file:
+%% 
+%%    http://www.latex-project.org/lppl.txt
+%% 
+%% This work is "maintained" (as per LPPL maintenance status) by
+%%   Joseph Wright.
+%% 
+%% This work consists of the file  achemso.dtx
+%%           and the derived files achemso.pdf,
+%%                                 achemso.bib,
+%%                                 achemso.cls,
+%%                                 achemso.ins,
+%%                                 achemso.sty,
+%%                                 achemso-demo.tex,
+%%                                 natmove.sty and
+%%                                 a number of configuration files.
+%% 
 %%
 %% End of file `iecred.cfg'.
diff --git a/Master/texmf-dist/tex/latex/achemso/config/inoraj.cfg b/Master/texmf-dist/tex/latex/achemso/config/inoraj.cfg
index ad4fb94b2d2..ddff2569cc4 100644
--- a/Master/texmf-dist/tex/latex/achemso/config/inoraj.cfg
+++ b/Master/texmf-dist/tex/latex/achemso/config/inoraj.cfg
@@ -5,31 +5,54 @@
 %% The original source files were:
 %%
 %% achemso.dtx  (with options: `inoraj')
-%%  ----------------------------------------------------------------
-%%  achemso --- Support for submissions to American  Chemical
-%%    Society journals
-%%  Maintained by Joseph Wright
-%%  E-mail: joseph.wright@morningstar2.co.uk
-%%  Released under the LaTeX Project Public License v1.3c or later
-%%  See http://www.latex-project.org/lppl.txt
-%%  ----------------------------------------------------------------
+%% ----------------------------------------------------------------
+%% achemso --- Support for submissions to American Chemical Society
+%%   journals
+%% E-mail: joseph.wright@morningstar2.co.uk
+%% Released under the LaTeX Project Public License v1.3c or later
+%% See http://www.latex-project.org/lppl.txt
+%% ----------------------------------------------------------------
 %% 
+
 \ProvidesFile{inoraj.cfg}
-  [2009/02/03 v3.1a achemso configuration:
-   Inorg. Chem.]
-\acs@setkeys{
-  abbreviate=true,
-  biblabel=brackets,
-  biochem=false,
-  maxauthors=15,
-  super=true,
-  usetitle=false}
-\acs@validtype{article,communication,suppinfo}
-\renewcommand*{\acs@tempa}{communication}
-\ifx\acs@manuscript\acs@tempa
-  \acs@killabstract
-  \acs@killsecs
+  [2009/04/21 v3.2 achemso configuration: Inorg. Chem.]
+\SectionNumbersOff
+\def\@tempa{communication}
+\ifx\acs@manuscript\@tempa
+  \AbstractOff
+  \SectionsOff
 \fi
-\endinput
+%% 
+%% Originally developed by Mats Dahlgren
+%% Copyright (C) 1996-1998 by Mats Dahlgren
+%% Copyright (C) 2008-2009 by
+%%   Joseph Wright <joseph.wright@morningstar2.co.uk>
+%% 
+%% Part of this bundle is derived from cite.sty, to which the
+%% following license applies:
+%%   Copyright (C) 1989-2003 by Donald Arseneau
+%%   These macros may be freely transmitted, reproduced, or
+%%   modified provided that this notice is left intact.
+%% 
+%% It may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License (LPPL), either version 1.3c of
+%% this license or (at your option) any later version.  The latest
+%% version of this license is in the file:
+%% 
+%%    http://www.latex-project.org/lppl.txt
+%% 
+%% This work is "maintained" (as per LPPL maintenance status) by
+%%   Joseph Wright.
+%% 
+%% This work consists of the file  achemso.dtx
+%%           and the derived files achemso.pdf,
+%%                                 achemso.bib,
+%%                                 achemso.cls,
+%%                                 achemso.ins,
+%%                                 achemso.sty,
+%%                                 achemso-demo.tex,
+%%                                 natmove.sty and
+%%                                 a number of configuration files.
+%% 
 %%
 %% End of file `inoraj.cfg'.
diff --git a/Master/texmf-dist/tex/latex/achemso/config/jacsat.cfg b/Master/texmf-dist/tex/latex/achemso/config/jacsat.cfg
index 2643a69ce3d..a9ec7a127a3 100644
--- a/Master/texmf-dist/tex/latex/achemso/config/jacsat.cfg
+++ b/Master/texmf-dist/tex/latex/achemso/config/jacsat.cfg
@@ -5,149 +5,238 @@
 %% The original source files were:
 %%
 %% achemso.dtx  (with options: `jacsat')
-%%  ----------------------------------------------------------------
-%%  achemso --- Support for submissions to American  Chemical
-%%    Society journals
-%%  Maintained by Joseph Wright
-%%  E-mail: joseph.wright@morningstar2.co.uk
-%%  Released under the LaTeX Project Public License v1.3c or later
-%%  See http://www.latex-project.org/lppl.txt
-%%  ----------------------------------------------------------------
+%% ----------------------------------------------------------------
+%% achemso --- Support for submissions to American Chemical Society
+%%   journals
+%% E-mail: joseph.wright@morningstar2.co.uk
+%% Released under the LaTeX Project Public License v1.3c or later
+%% See http://www.latex-project.org/lppl.txt
+%% ----------------------------------------------------------------
 %% 
+
 \ProvidesFile{jacsat.cfg}
-  [2009/02/03 v3.1a achemso configuration:
-   J. Am. Chem. Soc.]
-\acs@setkeys{
-  abbreviate=true,
-  biblabel=brackets,
-  biochem=false,
-  maxauthors=15,
-  super=true,
-  usetitle=false}
-\acs@validtype{article,communication,suppinfo}
-\renewcommand*{\acs@tempa}{communication}
-\ifx\acs@manuscript\acs@tempa
-  \@twocolumntrue
-  \col@number\tw@\relax
-  \def\@xipt{11}
-  \renewcommand{\normalsize}{%
-    \@setfontsize\normalsize\@ixpt\@xipt}
-  \normalsize
-  \newcommand*{\titlesize}{%
-    \@setfontsize\titlesize\@xiipt{13}}
-  \newcommand*{\authorsize}{%
-    \@setfontsize\authorsize{10.5}{12.5}}
-  \newcommand*{\affilsize}{%
-    \@setfontsize\affilsize\@ixpt\@xpt}
-  \newcommand*{\emailsize}{%
-    \@setfontsize\emailsize\@viiipt{15}}
-  \newcommand*{\capsize}{%
-    \@setfontsize\capsize\@viiipt\@ixpt}
-  \newcommand*{\acksize}{%
-    \@setfontsize\acksize\@ixpt\@xipt}
-  \newcommand*{\suppsize}{%
-    \@setfontsize\suppsize{8.5}{10.5}}
-  \newcommand*{\refsize}{%
-    \@setfontsize\refsize{7.5}{7.5}}
-  \let\footnotesize\refsize
-  \geometry{letterpaper,top=12.7mm,bottom=16.8mm,left=19.3mm,
-    right=19.3mm,dvips}
-  \setlength{\columnsep}{8.1mm}
-  \setlength{\parindent}{3.3mm}
-  \abovedisplayskip 5\p@ \@plus2\p@ \@minus 5\p@
-  \abovedisplayshortskip \z@ \@plus3\p@
-  \belowdisplayshortskip 3\p@ \@plus3\p@ \@minus 3\p@
-  \belowdisplayskip \abovedisplayskip
-  \abovecaptionskip 5\p@
-  \intextsep 7\p@ \@plus 2\p@ \@minus 2\p@
-  \let\@listi\@listI
-  \tolerance=2000
-  \emergencystretch=10pt
-  \acs@killabstract
-  \acs@killsecs
-  \AtBeginDocument{\singlespacing}
-  \renewcommand*{\ps@plain}{%
-    \let\@mkboth\@gobbletwo
-    \let\@oddhead\@empty
-    \renewcommand*{\@oddfoot}{%
-      \reset@font\sffamily\textbf{\thepage}\hfil}%
-    \let\@evenhead\@empty
-    \let\@evenfoot\@oddfoot}
-  \newcommand*{\ps@jacs}{%
-    \renewcommand*{\@oddfoot}{%
-      \reset@font\sffamily\textbf{\thepage}\hfil}%
-    \renewcommand*{\@evenfoot}{%
-      \reset@font\hfil\sffamily\textbf{\thepage}}%
-    \renewcommand*{\@oddhead}{}%
-    \let\@evenhead\@oddhead}
-  \pagestyle{jacs}
-  \renewcommand*{\@maketitle}{%
-    \pagestyle{jacs}%
-    \ifnum\acs@authorcnt<\z@\relax
-      \ClassError{achemso}{No authors defined}
-      {At least one author is required}%
-    \fi
-    \newpage
-    \null
-    {\titlesize
-     \vspace*{16mm}}%
-    \begin{center}
-      \begin{minipage}{152.4mm}
-        \begin{center}
-          {\titlesize\bfseries\sffamily
-           \@title \par}%
-          {\authorsize\sffamily\frenchspacing
-           \acs@authorlist\par}%
-          {\affilsize\itshape\acs@addresslist \par}%
-          {\emailsize\sffamily
-           Received \today;
-           E-mail: \acs@emaillist}%
-          \vspace{-1mm}%
-        \end{center}
-      \end{minipage}
-    \end{center}}
-  \floatstyle{plaintop}
-  \restylefloat{scheme}
-  \floatstyle{plain}
-  \DeclareCaptionLabelSeparator{perquad}{.\quad}
-  \captionsetup{labelfont={bf,it,sf},textfont=sf,
-    labelsep=perquad}
-  \let\captionfont\capsize
-  \captionsetup[figure]{textfont=rm}
-  \captionsetup{singlelinecheck=off}
-  \g@addto@macro{\table}{\capsize}
-  \renewenvironment{acknowledgement}{%
-    \renewcommand*{\acs@tempa}{acknowledgement}%
-    \ifx\@currenvir\acs@tempa
-      \let\par\relax
-      \acksize
-      \vspace{6pt}%
-      \textbf{\acs@acknowledgement.}
-    \else
-      \acs@subsection*{\acs@acknowledgement}
-    \fi}{\acs@par}
-  \renewenvironment{suppinfo}{%
-    \renewcommand*{\acs@tempa}{suppinfo}%
-    \ifx\@currenvir\acs@tempa
-      \let\par\relax
-      \suppsize
-      \vspace{6pt}%
-      \textbf{\acs@suppinfo:}
-    \else
-      \acs@subsection*{\acs@suppinfo}
-    \fi}{\acs@par}
-  \let\acs@par\par
-  \AtBeginDocument{
-    \renewcommand*{\bibsection}{%
-      \@startsection{section}{1}
-        {\z@}{\z@}{2.5mm}%
-        {\normalfont\acksize\bfseries}
-        {\hrule\nobreak
-      \vspace{1.2mm}\noindent\refname}}
-    \let\bibfont\refsize
-    \setlength{\bibhang}{0.61cm}
-    \setlength{\bibsep}{0mm}}
+  [2009/04/21 v3.2 achemso configuration: J. Am. Chem. Soc.]
+\SectionNumbersOff
+\def\@tempa{communication}
+\ifx\acs@manuscript\@tempa\else
+  \expandafter\endinput
 \fi
-\endinput
+\AbstractOff
+\SectionsOff
+\AtBeginDocument{\singlespacing}
+\twocolumn
+\renewcommand*{\@xipt}{11}
+\renewcommand{\normalsize}{%
+  \@setfontsize\normalsize\@ixpt\@xipt
+}
+\normalsize
+\let\@listi\@listI
+\geometry{
+  letterpaper,
+  top    = 12.7mm,
+  bottom = 16.8mm,
+  left   = 19.3mm,
+  right  = 19.3mm,
+  dvips
+}
+\setlength{\columnsep}{8.1mm}
+\setlength{\parindent}{3.3mm}
+\abovedisplayskip 5\p@ \@plus2\p@ \@minus 5\p@\relax
+\abovedisplayshortskip \z@ \@plus3\p@\relax
+\belowdisplayshortskip 3\p@ \@plus3\p@ \@minus 3\p@\relax
+\belowdisplayskip\abovedisplayskip\relax
+\abovecaptionskip 5\p@\relax
+\intextsep 7\p@ \@plus 2\p@ \@minus 2\p@\relax
+\tolerance=2000\relax
+\emergencystretch=10pt\relax
+\newcommand*{\affilsize}{%
+  \@setfontsize\affilsize\@ixpt\@xpt
+}
+\newcommand*{\acksize}{%
+  \@setfontsize\acksize\@ixpt\@xipt
+}
+\newcommand*{\authorsize}{%
+  \@setfontsize\authorsize{10.5}{12.5}%
+}
+\newcommand*{\capsize}{%
+  \@setfontsize\capsize\@viiipt\@ixpt
+}
+\newcommand*{\emailsize}{%
+  \@setfontsize\emailsize\@viiipt{15}%
+}
+\newcommand*{\refsize}{%
+  \@setfontsize\refsize{7.5}{7.5}%
+}
+\newcommand*{\suppsize}{%
+  \@setfontsize\suppsize{8.5}{10.5}%
+}
+\newcommand*{\titlesize}{%
+  \@setfontsize\titlesize\@xiipt{13}%
+}
+\let\footnotesize\refsize
+\let\captionfont\capsize
+\renewcommand*{\ps@plain}{%
+  \let\@mkboth\@gobbletwo
+  \let\@oddhead\@empty
+  \renewcommand*{\@oddfoot}{%
+    \reset@font
+    \sffamily
+    \textbf{\thepage}%
+    \hfil
+  }%
+  \let\@evenhead\@empty
+  \let\@evenfoot\@oddfoot
+}
+\newcommand*{\ps@jacs}{%
+  \renewcommand*{\@oddfoot}{%
+    \reset@font
+    \sffamily
+    \textbf{\thepage}%
+    \hfil
+  }%
+  \renewcommand*{\@evenfoot}{%
+    \reset@font
+    \hfil
+    \sffamily
+    \textbf{\thepage}%
+  }%
+  \renewcommand*{\@oddhead}{}%
+  \let\@evenhead\@oddhead
+}
+\pagestyle{jacs}
+\renewcommand*{\@maketitle}{%
+  \pagestyle{jacs}%
+  \ifnum\acs@author@cnt<\z@\relax
+    \acs@warning{No authors defined: At least one author is required}%
+  \fi
+  \newpage
+  \null
+  {%
+    \titlesize
+    \vspace*{16mm}%
+  }%
+  \begin{center}
+    \begin{minipage}{152.4mm}
+      \begin{center}
+        {%
+          \titlesize
+          \bfseries
+          \sffamily
+          \@title\par
+        }%
+        {%
+          \authorsize
+          \sffamily
+          \frenchspacing
+          \acs@author@list
+          \par
+        }%
+        {%
+          \affilsize
+          \itshape
+          \acs@address@list
+          \par
+        }%
+        {%
+          \emailsize
+          \sffamily
+          Received \today;
+          E-mail: \acs@email@list
+        }%
+        \vspace{-1mm}%
+      \end{center}
+    \end{minipage}
+  \end{center}%
+}
+\floatstyle{plaintop}
+\restylefloat{scheme}
+\floatstyle{plain}
+\DeclareCaptionLabelSeparator{perquad}{.\quad}
+\captionsetup{
+  singlelinecheck = off,
+  labelfont       = {bf,it,sf},
+  textfont        = sf,
+  labelsep        = perquad
+}
+\captionsetup[figure]{textfont=rm}
+\newcommand*{\acs@table}{}
+\let\acs@table\table
+\renewcommand*{\table}{%
+  \capsize
+  \acs@table
+}
+\newcommand*{\acs@par}{}
+\let\acs@par\par
+\renewenvironment{acknowledgement}{%
+  \def\@tempa{acknowledgement}%
+  \ifx\@currenvir\@tempa
+    \let\par\relax
+    \acksize
+    \vspace{6pt}%
+    \textbf{\acknowledgementname}
+  \else
+    \acs@subsection*{\acknowledgementname}
+  \fi
+}{%
+  \acs@par
+}
+\renewenvironment{suppinfo}{%
+  \def\@tempa{suppinfo}%
+  \ifx\@currenvir\@tempa
+    \let\par\relax
+    \suppsize
+    \vspace{6pt}%
+    \textbf{\suppinfoname:}
+  \else
+    \acs@subsection*{\suppinfoname}
+  \fi
+}{%
+  \acs@par
+}
+\AtBeginDocument{
+  \renewcommand*{\bibsection}{%
+    \@startsection
+      {section}
+      {1}
+      {\z@}{\z@}{2.5mm}%
+      {\normalfont\acksize\bfseries}
+      {\hrule\nobreak\vspace{1.2mm}\noindent\refname}%
+  }%
+  \let\bibfont\refsize
+  \setlength{\bibhang}{0.61cm}%
+  \setlength{\bibsep}{0mm}%
+}
+%% 
+%% Originally developed by Mats Dahlgren
+%% Copyright (C) 1996-1998 by Mats Dahlgren
+%% Copyright (C) 2008-2009 by
+%%   Joseph Wright <joseph.wright@morningstar2.co.uk>
+%% 
+%% Part of this bundle is derived from cite.sty, to which the
+%% following license applies:
+%%   Copyright (C) 1989-2003 by Donald Arseneau
+%%   These macros may be freely transmitted, reproduced, or
+%%   modified provided that this notice is left intact.
+%% 
+%% It may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License (LPPL), either version 1.3c of
+%% this license or (at your option) any later version.  The latest
+%% version of this license is in the file:
+%% 
+%%    http://www.latex-project.org/lppl.txt
+%% 
+%% This work is "maintained" (as per LPPL maintenance status) by
+%%   Joseph Wright.
+%% 
+%% This work consists of the file  achemso.dtx
+%%           and the derived files achemso.pdf,
+%%                                 achemso.bib,
+%%                                 achemso.cls,
+%%                                 achemso.ins,
+%%                                 achemso.sty,
+%%                                 achemso-demo.tex,
+%%                                 natmove.sty and
+%%                                 a number of configuration files.
+%% 
 %%
 %% End of file `jacsat.cfg'.
diff --git a/Master/texmf-dist/tex/latex/achemso/config/jafcau.cfg b/Master/texmf-dist/tex/latex/achemso/config/jafcau.cfg
index 7810e22b288..b0d6a92df8f 100644
--- a/Master/texmf-dist/tex/latex/achemso/config/jafcau.cfg
+++ b/Master/texmf-dist/tex/latex/achemso/config/jafcau.cfg
@@ -5,26 +5,54 @@
 %% The original source files were:
 %%
 %% achemso.dtx  (with options: `jafcau')
-%%  ----------------------------------------------------------------
-%%  achemso --- Support for submissions to American  Chemical
-%%    Society journals
-%%  Maintained by Joseph Wright
-%%  E-mail: joseph.wright@morningstar2.co.uk
-%%  Released under the LaTeX Project Public License v1.3c or later
-%%  See http://www.latex-project.org/lppl.txt
-%%  ----------------------------------------------------------------
+%% ----------------------------------------------------------------
+%% achemso --- Support for submissions to American Chemical Society
+%%   journals
+%% E-mail: joseph.wright@morningstar2.co.uk
+%% Released under the LaTeX Project Public License v1.3c or later
+%% See http://www.latex-project.org/lppl.txt
+%% ----------------------------------------------------------------
 %% 
+
 \ProvidesFile{jafcau.cfg}
-  [2009/02/03 v3.1a achemso configuration:
-   J. Agric. Food Chem.]
-\acs@setkeys{
-  abbreviate=true,
-  biblabel=brackets,
-  biochem=false,
-  maxauthors=15,
-  super=false,
-  usetitle=true}
-\acs@validtype{article,suppinfo}
-\endinput
+  [2009/04/21 v3.2 achemso configuration: J. Agric. Food Chem.]
+\setkeys{acs}{
+  super    = false,
+  usetitle = true
+}
+\renewcommand*{\acs@type@list}{article,suppinfo}
+\SectionNumbersOff
+%% 
+%% Originally developed by Mats Dahlgren
+%% Copyright (C) 1996-1998 by Mats Dahlgren
+%% Copyright (C) 2008-2009 by
+%%   Joseph Wright <joseph.wright@morningstar2.co.uk>
+%% 
+%% Part of this bundle is derived from cite.sty, to which the
+%% following license applies:
+%%   Copyright (C) 1989-2003 by Donald Arseneau
+%%   These macros may be freely transmitted, reproduced, or
+%%   modified provided that this notice is left intact.
+%% 
+%% It may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License (LPPL), either version 1.3c of
+%% this license or (at your option) any later version.  The latest
+%% version of this license is in the file:
+%% 
+%%    http://www.latex-project.org/lppl.txt
+%% 
+%% This work is "maintained" (as per LPPL maintenance status) by
+%%   Joseph Wright.
+%% 
+%% This work consists of the file  achemso.dtx
+%%           and the derived files achemso.pdf,
+%%                                 achemso.bib,
+%%                                 achemso.cls,
+%%                                 achemso.ins,
+%%                                 achemso.sty,
+%%                                 achemso-demo.tex,
+%%                                 natmove.sty and
+%%                                 a number of configuration files.
+%% 
 %%
 %% End of file `jafcau.cfg'.
diff --git a/Master/texmf-dist/tex/latex/achemso/config/jcchff.cfg b/Master/texmf-dist/tex/latex/achemso/config/jcchff.cfg
index 89631eeb838..0a8d5c272e4 100644
--- a/Master/texmf-dist/tex/latex/achemso/config/jcchff.cfg
+++ b/Master/texmf-dist/tex/latex/achemso/config/jcchff.cfg
@@ -5,26 +5,50 @@
 %% The original source files were:
 %%
 %% achemso.dtx  (with options: `jcchff')
-%%  ----------------------------------------------------------------
-%%  achemso --- Support for submissions to American  Chemical
-%%    Society journals
-%%  Maintained by Joseph Wright
-%%  E-mail: joseph.wright@morningstar2.co.uk
-%%  Released under the LaTeX Project Public License v1.3c or later
-%%  See http://www.latex-project.org/lppl.txt
-%%  ----------------------------------------------------------------
+%% ----------------------------------------------------------------
+%% achemso --- Support for submissions to American Chemical Society
+%%   journals
+%% E-mail: joseph.wright@morningstar2.co.uk
+%% Released under the LaTeX Project Public License v1.3c or later
+%% See http://www.latex-project.org/lppl.txt
+%% ----------------------------------------------------------------
 %% 
+
 \ProvidesFile{jcchff.cfg}
-  [2009/02/03 v3.1a achemso configuration:
-   J. Comb. Chem.]
-\acs@setkeys{
-  abbreviate=true,
-  biblabel=brackets,
-  biochem=false,
-  maxauthors=15,
-  super=true,
-  usetitle=false}
-\acs@validtype{article,report,perspective,suppinfo}
-\endinput
+  [2009/04/21 v3.2 achemso configuration: J. Comb. Chem.]
+\renewcommand*{\acs@type@list}{article,report,perspective,suppinfo}
+\SectionNumbersOff
+%% 
+%% Originally developed by Mats Dahlgren
+%% Copyright (C) 1996-1998 by Mats Dahlgren
+%% Copyright (C) 2008-2009 by
+%%   Joseph Wright <joseph.wright@morningstar2.co.uk>
+%% 
+%% Part of this bundle is derived from cite.sty, to which the
+%% following license applies:
+%%   Copyright (C) 1989-2003 by Donald Arseneau
+%%   These macros may be freely transmitted, reproduced, or
+%%   modified provided that this notice is left intact.
+%% 
+%% It may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License (LPPL), either version 1.3c of
+%% this license or (at your option) any later version.  The latest
+%% version of this license is in the file:
+%% 
+%%    http://www.latex-project.org/lppl.txt
+%% 
+%% This work is "maintained" (as per LPPL maintenance status) by
+%%   Joseph Wright.
+%% 
+%% This work consists of the file  achemso.dtx
+%%           and the derived files achemso.pdf,
+%%                                 achemso.bib,
+%%                                 achemso.cls,
+%%                                 achemso.ins,
+%%                                 achemso.sty,
+%%                                 achemso-demo.tex,
+%%                                 natmove.sty and
+%%                                 a number of configuration files.
+%% 
 %%
 %% End of file `jcchff.cfg'.
diff --git a/Master/texmf-dist/tex/latex/achemso/config/jceaax.cfg b/Master/texmf-dist/tex/latex/achemso/config/jceaax.cfg
index f6689af5723..3ed3e5e9123 100644
--- a/Master/texmf-dist/tex/latex/achemso/config/jceaax.cfg
+++ b/Master/texmf-dist/tex/latex/achemso/config/jceaax.cfg
@@ -5,26 +5,53 @@
 %% The original source files were:
 %%
 %% achemso.dtx  (with options: `jceaax')
-%%  ----------------------------------------------------------------
-%%  achemso --- Support for submissions to American  Chemical
-%%    Society journals
-%%  Maintained by Joseph Wright
-%%  E-mail: joseph.wright@morningstar2.co.uk
-%%  Released under the LaTeX Project Public License v1.3c or later
-%%  See http://www.latex-project.org/lppl.txt
-%%  ----------------------------------------------------------------
+%% ----------------------------------------------------------------
+%% achemso --- Support for submissions to American Chemical Society
+%%   journals
+%% E-mail: joseph.wright@morningstar2.co.uk
+%% Released under the LaTeX Project Public License v1.3c or later
+%% See http://www.latex-project.org/lppl.txt
+%% ----------------------------------------------------------------
 %% 
+
 \ProvidesFile{jceaax.cfg}
-  [2009/02/03 v3.1a achemso configuration:
-   J. Chem. Eng. Data]
-\acs@setkeys{
-  abbreviate=true,
-  biblabel=brackets,
-  biochem=false,
-  maxauthors=15,
-  super=true,
-  usetitle=true}
-\acs@validtype{article,suppinfo}
-\endinput
+  [2009/04/21 v3.2 achemso configuration: J. Chem. Eng. Data]
+\setkeys{acs}{
+  usetitle = true
+}
+\renewcommand*{\acs@type@list}{article,suppinfo}
+\SectionNumbersOff
+%% 
+%% Originally developed by Mats Dahlgren
+%% Copyright (C) 1996-1998 by Mats Dahlgren
+%% Copyright (C) 2008-2009 by
+%%   Joseph Wright <joseph.wright@morningstar2.co.uk>
+%% 
+%% Part of this bundle is derived from cite.sty, to which the
+%% following license applies:
+%%   Copyright (C) 1989-2003 by Donald Arseneau
+%%   These macros may be freely transmitted, reproduced, or
+%%   modified provided that this notice is left intact.
+%% 
+%% It may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License (LPPL), either version 1.3c of
+%% this license or (at your option) any later version.  The latest
+%% version of this license is in the file:
+%% 
+%%    http://www.latex-project.org/lppl.txt
+%% 
+%% This work is "maintained" (as per LPPL maintenance status) by
+%%   Joseph Wright.
+%% 
+%% This work consists of the file  achemso.dtx
+%%           and the derived files achemso.pdf,
+%%                                 achemso.bib,
+%%                                 achemso.cls,
+%%                                 achemso.ins,
+%%                                 achemso.sty,
+%%                                 achemso-demo.tex,
+%%                                 natmove.sty and
+%%                                 a number of configuration files.
+%% 
 %%
 %% End of file `jceaax.cfg'.
diff --git a/Master/texmf-dist/tex/latex/achemso/config/jcisd8.cfg b/Master/texmf-dist/tex/latex/achemso/config/jcisd8.cfg
index 857129743da..300b783fdf8 100644
--- a/Master/texmf-dist/tex/latex/achemso/config/jcisd8.cfg
+++ b/Master/texmf-dist/tex/latex/achemso/config/jcisd8.cfg
@@ -5,26 +5,53 @@
 %% The original source files were:
 %%
 %% achemso.dtx  (with options: `jcisd8')
-%%  ----------------------------------------------------------------
-%%  achemso --- Support for submissions to American  Chemical
-%%    Society journals
-%%  Maintained by Joseph Wright
-%%  E-mail: joseph.wright@morningstar2.co.uk
-%%  Released under the LaTeX Project Public License v1.3c or later
-%%  See http://www.latex-project.org/lppl.txt
-%%  ----------------------------------------------------------------
+%% ----------------------------------------------------------------
+%% achemso --- Support for submissions to American Chemical Society
+%%   journals
+%% E-mail: joseph.wright@morningstar2.co.uk
+%% Released under the LaTeX Project Public License v1.3c or later
+%% See http://www.latex-project.org/lppl.txt
+%% ----------------------------------------------------------------
 %% 
+
 \ProvidesFile{jcisd8.cfg}
-  [2009/02/03 v3.1a achemso configuration:
-   J. Chem. Inf. Model.]
-\acs@setkeys{
-  abbreviate=true,
-  biblabel=brackets,
-  biochem=false,
-  maxauthors=15,
-  super=true,
-  usetitle=true}
-\acs@validtype{article,suppinfo}
-\endinput
+  [2009/04/21 v3.2 achemso configuration: J. Chem. Inf. Model.]
+\setkeys{acs}{
+  usetitle = true
+}
+\renewcommand*{\acs@type@list}{article,suppinfo}
+\SectionNumbersOff
+%% 
+%% Originally developed by Mats Dahlgren
+%% Copyright (C) 1996-1998 by Mats Dahlgren
+%% Copyright (C) 2008-2009 by
+%%   Joseph Wright <joseph.wright@morningstar2.co.uk>
+%% 
+%% Part of this bundle is derived from cite.sty, to which the
+%% following license applies:
+%%   Copyright (C) 1989-2003 by Donald Arseneau
+%%   These macros may be freely transmitted, reproduced, or
+%%   modified provided that this notice is left intact.
+%% 
+%% It may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License (LPPL), either version 1.3c of
+%% this license or (at your option) any later version.  The latest
+%% version of this license is in the file:
+%% 
+%%    http://www.latex-project.org/lppl.txt
+%% 
+%% This work is "maintained" (as per LPPL maintenance status) by
+%%   Joseph Wright.
+%% 
+%% This work consists of the file  achemso.dtx
+%%           and the derived files achemso.pdf,
+%%                                 achemso.bib,
+%%                                 achemso.cls,
+%%                                 achemso.ins,
+%%                                 achemso.sty,
+%%                                 achemso-demo.tex,
+%%                                 natmove.sty and
+%%                                 a number of configuration files.
+%% 
 %%
 %% End of file `jcisd8.cfg'.
diff --git a/Master/texmf-dist/tex/latex/achemso/config/jctcce.cfg b/Master/texmf-dist/tex/latex/achemso/config/jctcce.cfg
index 9a4c8a5e91e..f3b882ef086 100644
--- a/Master/texmf-dist/tex/latex/achemso/config/jctcce.cfg
+++ b/Master/texmf-dist/tex/latex/achemso/config/jctcce.cfg
@@ -5,27 +5,49 @@
 %% The original source files were:
 %%
 %% achemso.dtx  (with options: `jctcce')
-%%  ----------------------------------------------------------------
-%%  achemso --- Support for submissions to American  Chemical
-%%    Society journals
-%%  Maintained by Joseph Wright
-%%  E-mail: joseph.wright@morningstar2.co.uk
-%%  Released under the LaTeX Project Public License v1.3c or later
-%%  See http://www.latex-project.org/lppl.txt
-%%  ----------------------------------------------------------------
+%% ----------------------------------------------------------------
+%% achemso --- Support for submissions to American Chemical Society
+%%   journals
+%% E-mail: joseph.wright@morningstar2.co.uk
+%% Released under the LaTeX Project Public License v1.3c or later
+%% See http://www.latex-project.org/lppl.txt
+%% ----------------------------------------------------------------
 %% 
+
 \ProvidesFile{jctcce.cfg}
-  [2009/02/03 v3.1a achemso configuration:
-   J. Chem. Theory Comput.]
-\acs@setkeys{
-  abbreviate=true,
-  biblabel=brackets,
-  biochem=false,
-  maxauthors=15,
-  super=true,
-  usetitle=false}
-\acs@validtype{article,suppinfo}
-\acs@restsecnums
-\endinput
+  [2009/04/21 v3.2 achemso configuration: J. Chem. Theory Comput.]
+\renewcommand*{\acs@type@list}{article,suppinfo}
+%% 
+%% Originally developed by Mats Dahlgren
+%% Copyright (C) 1996-1998 by Mats Dahlgren
+%% Copyright (C) 2008-2009 by
+%%   Joseph Wright <joseph.wright@morningstar2.co.uk>
+%% 
+%% Part of this bundle is derived from cite.sty, to which the
+%% following license applies:
+%%   Copyright (C) 1989-2003 by Donald Arseneau
+%%   These macros may be freely transmitted, reproduced, or
+%%   modified provided that this notice is left intact.
+%% 
+%% It may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License (LPPL), either version 1.3c of
+%% this license or (at your option) any later version.  The latest
+%% version of this license is in the file:
+%% 
+%%    http://www.latex-project.org/lppl.txt
+%% 
+%% This work is "maintained" (as per LPPL maintenance status) by
+%%   Joseph Wright.
+%% 
+%% This work consists of the file  achemso.dtx
+%%           and the derived files achemso.pdf,
+%%                                 achemso.bib,
+%%                                 achemso.cls,
+%%                                 achemso.ins,
+%%                                 achemso.sty,
+%%                                 achemso-demo.tex,
+%%                                 natmove.sty and
+%%                                 a number of configuration files.
+%% 
 %%
 %% End of file `jctcce.cfg'.
diff --git a/Master/texmf-dist/tex/latex/achemso/config/jmcmar.cfg b/Master/texmf-dist/tex/latex/achemso/config/jmcmar.cfg
index 3cf20a99a62..547c2c8bd67 100644
--- a/Master/texmf-dist/tex/latex/achemso/config/jmcmar.cfg
+++ b/Master/texmf-dist/tex/latex/achemso/config/jmcmar.cfg
@@ -5,26 +5,53 @@
 %% The original source files were:
 %%
 %% achemso.dtx  (with options: `jmcmar')
-%%  ----------------------------------------------------------------
-%%  achemso --- Support for submissions to American  Chemical
-%%    Society journals
-%%  Maintained by Joseph Wright
-%%  E-mail: joseph.wright@morningstar2.co.uk
-%%  Released under the LaTeX Project Public License v1.3c or later
-%%  See http://www.latex-project.org/lppl.txt
-%%  ----------------------------------------------------------------
+%% ----------------------------------------------------------------
+%% achemso --- Support for submissions to American Chemical Society
+%%   journals
+%% E-mail: joseph.wright@morningstar2.co.uk
+%% Released under the LaTeX Project Public License v1.3c or later
+%% See http://www.latex-project.org/lppl.txt
+%% ----------------------------------------------------------------
 %% 
+
 \ProvidesFile{jmcmar.cfg}
-  [2009/02/03 v3.1a achemso configuration:
-   J. Med. Chem.]
-\acs@setkeys{
-  abbreviate=true,
-  biblabel=brackets,
-  biochem=false,
-  maxauthors=15,
-  super=true,
-  usetitle=true}
-\acs@validtype{perspective,letter,article,suppinfo}
-\endinput
+  [2009/04/21 v3.2 achemso configuration: J. Med. Chem.]
+\setkeys{acs}{
+  usetitle = true
+}
+\renewcommand*{\acs@type@list}{article,letter,perspective,suppinfo}
+\SectionNumbersOff
+%% 
+%% Originally developed by Mats Dahlgren
+%% Copyright (C) 1996-1998 by Mats Dahlgren
+%% Copyright (C) 2008-2009 by
+%%   Joseph Wright <joseph.wright@morningstar2.co.uk>
+%% 
+%% Part of this bundle is derived from cite.sty, to which the
+%% following license applies:
+%%   Copyright (C) 1989-2003 by Donald Arseneau
+%%   These macros may be freely transmitted, reproduced, or
+%%   modified provided that this notice is left intact.
+%% 
+%% It may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License (LPPL), either version 1.3c of
+%% this license or (at your option) any later version.  The latest
+%% version of this license is in the file:
+%% 
+%%    http://www.latex-project.org/lppl.txt
+%% 
+%% This work is "maintained" (as per LPPL maintenance status) by
+%%   Joseph Wright.
+%% 
+%% This work consists of the file  achemso.dtx
+%%           and the derived files achemso.pdf,
+%%                                 achemso.bib,
+%%                                 achemso.cls,
+%%                                 achemso.ins,
+%%                                 achemso.sty,
+%%                                 achemso-demo.tex,
+%%                                 natmove.sty and
+%%                                 a number of configuration files.
+%% 
 %%
 %% End of file `jmcmar.cfg'.
diff --git a/Master/texmf-dist/tex/latex/achemso/config/jnprdf.cfg b/Master/texmf-dist/tex/latex/achemso/config/jnprdf.cfg
index 9345c7b320f..16905a47416 100644
--- a/Master/texmf-dist/tex/latex/achemso/config/jnprdf.cfg
+++ b/Master/texmf-dist/tex/latex/achemso/config/jnprdf.cfg
@@ -5,31 +5,53 @@
 %% The original source files were:
 %%
 %% achemso.dtx  (with options: `jnprdf')
-%%  ----------------------------------------------------------------
-%%  achemso --- Support for submissions to American  Chemical
-%%    Society journals
-%%  Maintained by Joseph Wright
-%%  E-mail: joseph.wright@morningstar2.co.uk
-%%  Released under the LaTeX Project Public License v1.3c or later
-%%  See http://www.latex-project.org/lppl.txt
-%%  ----------------------------------------------------------------
+%% ----------------------------------------------------------------
+%% achemso --- Support for submissions to American Chemical Society
+%%   journals
+%% E-mail: joseph.wright@morningstar2.co.uk
+%% Released under the LaTeX Project Public License v1.3c or later
+%% See http://www.latex-project.org/lppl.txt
+%% ----------------------------------------------------------------
 %% 
+
 \ProvidesFile{jnprdf.cfg}
-  [2009/02/03 v3.1a achemso configuration:
-   J. Nat. Prod.]
-\acs@setkeys{
-  abbreviate=true,
-  biblabel=brackets,
-  biochem=false,
-  maxauthors=15,
-  super=true,
-  usetitle=false}
-\acs@validtype{article,communication,suppinfo}
-\renewcommand*{\acs@tempa}{communication}
-\ifx\acs@manuscript\acs@tempa
-  \acs@killabstract
-  \acs@killsecs
+  [2009/04/21 v3.2 achemso configuration: J. Nat. Prod.]
+\def\@tempa{communication}
+\ifx\acs@manuscript\@tempa
+  \AbstractOff
+  \SectionsOff
 \fi
-\endinput
+%% 
+%% Originally developed by Mats Dahlgren
+%% Copyright (C) 1996-1998 by Mats Dahlgren
+%% Copyright (C) 2008-2009 by
+%%   Joseph Wright <joseph.wright@morningstar2.co.uk>
+%% 
+%% Part of this bundle is derived from cite.sty, to which the
+%% following license applies:
+%%   Copyright (C) 1989-2003 by Donald Arseneau
+%%   These macros may be freely transmitted, reproduced, or
+%%   modified provided that this notice is left intact.
+%% 
+%% It may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License (LPPL), either version 1.3c of
+%% this license or (at your option) any later version.  The latest
+%% version of this license is in the file:
+%% 
+%%    http://www.latex-project.org/lppl.txt
+%% 
+%% This work is "maintained" (as per LPPL maintenance status) by
+%%   Joseph Wright.
+%% 
+%% This work consists of the file  achemso.dtx
+%%           and the derived files achemso.pdf,
+%%                                 achemso.bib,
+%%                                 achemso.cls,
+%%                                 achemso.ins,
+%%                                 achemso.sty,
+%%                                 achemso-demo.tex,
+%%                                 natmove.sty and
+%%                                 a number of configuration files.
+%% 
 %%
 %% End of file `jnprdf.cfg'.
diff --git a/Master/texmf-dist/tex/latex/achemso/config/joceah.cfg b/Master/texmf-dist/tex/latex/achemso/config/joceah.cfg
index 7b65c1841bc..9082cc18282 100644
--- a/Master/texmf-dist/tex/latex/achemso/config/joceah.cfg
+++ b/Master/texmf-dist/tex/latex/achemso/config/joceah.cfg
@@ -5,31 +5,53 @@
 %% The original source files were:
 %%
 %% achemso.dtx  (with options: `joceah')
-%%  ----------------------------------------------------------------
-%%  achemso --- Support for submissions to American  Chemical
-%%    Society journals
-%%  Maintained by Joseph Wright
-%%  E-mail: joseph.wright@morningstar2.co.uk
-%%  Released under the LaTeX Project Public License v1.3c or later
-%%  See http://www.latex-project.org/lppl.txt
-%%  ----------------------------------------------------------------
+%% ----------------------------------------------------------------
+%% achemso --- Support for submissions to American Chemical Society
+%%   journals
+%% E-mail: joseph.wright@morningstar2.co.uk
+%% Released under the LaTeX Project Public License v1.3c or later
+%% See http://www.latex-project.org/lppl.txt
+%% ----------------------------------------------------------------
 %% 
+
 \ProvidesFile{joceah.cfg}
-  [2009/02/03 v3.1a achemso configuration:
-   J. Org. Chem.]
-\acs@setkeys{
-  abbreviate=true,
-  biblabel=brackets,
-  biochem=false,
-  maxauthors=15,
-  super=true,
-  usetitle=false}
-\acs@validtype{article,communication,suppinfo}
-\renewcommand*{\acs@tempa}{communication}
-\ifx\acs@manuscript\acs@tempa
-  \acs@killabstract
-  \acs@killsecs
+  [2009/04/21 v3.2 achemso configuration: J. Org. Chem.]
+\def\@tempa{communication}
+\ifx\acs@manuscript\@tempa
+  \AbstractOff
+  \SectionsOff
 \fi
-\endinput
+%% 
+%% Originally developed by Mats Dahlgren
+%% Copyright (C) 1996-1998 by Mats Dahlgren
+%% Copyright (C) 2008-2009 by
+%%   Joseph Wright <joseph.wright@morningstar2.co.uk>
+%% 
+%% Part of this bundle is derived from cite.sty, to which the
+%% following license applies:
+%%   Copyright (C) 1989-2003 by Donald Arseneau
+%%   These macros may be freely transmitted, reproduced, or
+%%   modified provided that this notice is left intact.
+%% 
+%% It may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License (LPPL), either version 1.3c of
+%% this license or (at your option) any later version.  The latest
+%% version of this license is in the file:
+%% 
+%%    http://www.latex-project.org/lppl.txt
+%% 
+%% This work is "maintained" (as per LPPL maintenance status) by
+%%   Joseph Wright.
+%% 
+%% This work consists of the file  achemso.dtx
+%%           and the derived files achemso.pdf,
+%%                                 achemso.bib,
+%%                                 achemso.cls,
+%%                                 achemso.ins,
+%%                                 achemso.sty,
+%%                                 achemso-demo.tex,
+%%                                 natmove.sty and
+%%                                 a number of configuration files.
+%% 
 %%
 %% End of file `joceah.cfg'.
diff --git a/Master/texmf-dist/tex/latex/achemso/config/jpcafh.cfg b/Master/texmf-dist/tex/latex/achemso/config/jpcafh.cfg
index 53c193f2270..3b74c995171 100644
--- a/Master/texmf-dist/tex/latex/achemso/config/jpcafh.cfg
+++ b/Master/texmf-dist/tex/latex/achemso/config/jpcafh.cfg
@@ -5,26 +5,52 @@
 %% The original source files were:
 %%
 %% achemso.dtx  (with options: `jpcafh')
-%%  ----------------------------------------------------------------
-%%  achemso --- Support for submissions to American  Chemical
-%%    Society journals
-%%  Maintained by Joseph Wright
-%%  E-mail: joseph.wright@morningstar2.co.uk
-%%  Released under the LaTeX Project Public License v1.3c or later
-%%  See http://www.latex-project.org/lppl.txt
-%%  ----------------------------------------------------------------
+%% ----------------------------------------------------------------
+%% achemso --- Support for submissions to American Chemical Society
+%%   journals
+%% E-mail: joseph.wright@morningstar2.co.uk
+%% Released under the LaTeX Project Public License v1.3c or later
+%% See http://www.latex-project.org/lppl.txt
+%% ----------------------------------------------------------------
 %% 
+
 \ProvidesFile{jpcafh.cfg}
-  [2009/02/03 v3.1a achemso configuration:
-   J. Phys. Chem. A]
-\acs@setkeys{
-  abbreviate=true,
-  biblabel=brackets,
-  biochem=false,
-  maxauthors=15,
-  super=true,
-  usetitle=false}
-\acs@validtype{letter,article,suppinfo}
-\endinput
+  [2009/04/21 v3.2 achemso configuration: J. Phys. Chem. A]
+\renewcommand*{\acs@type@list}{article,letter,suppinfo}
+\SectionNumbersOff
+\captionsetup[table]{labelfont=bf,textfont=bf}
+\g@addto@macro{\maketitle}{\newpage}
+%% 
+%% Originally developed by Mats Dahlgren
+%% Copyright (C) 1996-1998 by Mats Dahlgren
+%% Copyright (C) 2008-2009 by
+%%   Joseph Wright <joseph.wright@morningstar2.co.uk>
+%% 
+%% Part of this bundle is derived from cite.sty, to which the
+%% following license applies:
+%%   Copyright (C) 1989-2003 by Donald Arseneau
+%%   These macros may be freely transmitted, reproduced, or
+%%   modified provided that this notice is left intact.
+%% 
+%% It may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License (LPPL), either version 1.3c of
+%% this license or (at your option) any later version.  The latest
+%% version of this license is in the file:
+%% 
+%%    http://www.latex-project.org/lppl.txt
+%% 
+%% This work is "maintained" (as per LPPL maintenance status) by
+%%   Joseph Wright.
+%% 
+%% This work consists of the file  achemso.dtx
+%%           and the derived files achemso.pdf,
+%%                                 achemso.bib,
+%%                                 achemso.cls,
+%%                                 achemso.ins,
+%%                                 achemso.sty,
+%%                                 achemso-demo.tex,
+%%                                 natmove.sty and
+%%                                 a number of configuration files.
+%% 
 %%
 %% End of file `jpcafh.cfg'.
diff --git a/Master/texmf-dist/tex/latex/achemso/config/jpcbfk.cfg b/Master/texmf-dist/tex/latex/achemso/config/jpcbfk.cfg
index 0cf32d0c5d1..9c02747567d 100644
--- a/Master/texmf-dist/tex/latex/achemso/config/jpcbfk.cfg
+++ b/Master/texmf-dist/tex/latex/achemso/config/jpcbfk.cfg
@@ -5,26 +5,52 @@
 %% The original source files were:
 %%
 %% achemso.dtx  (with options: `jpcbfk')
-%%  ----------------------------------------------------------------
-%%  achemso --- Support for submissions to American  Chemical
-%%    Society journals
-%%  Maintained by Joseph Wright
-%%  E-mail: joseph.wright@morningstar2.co.uk
-%%  Released under the LaTeX Project Public License v1.3c or later
-%%  See http://www.latex-project.org/lppl.txt
-%%  ----------------------------------------------------------------
+%% ----------------------------------------------------------------
+%% achemso --- Support for submissions to American Chemical Society
+%%   journals
+%% E-mail: joseph.wright@morningstar2.co.uk
+%% Released under the LaTeX Project Public License v1.3c or later
+%% See http://www.latex-project.org/lppl.txt
+%% ----------------------------------------------------------------
 %% 
+
 \ProvidesFile{jpcbfk.cfg}
-  [2009/02/03 v3.1a achemso configuration:
-   J. Phys. Chem. B]
-\acs@setkeys{
-  abbreviate=true,
-  biblabel=brackets,
-  biochem=false,
-  maxauthors=15,
-  super=true,
-  usetitle=false}
-\acs@validtype{letter,article,suppinfo}
-\endinput
+  [2009/04/21 v3.2 achemso configuration: J. Phys. Chem. B]
+\renewcommand*{\acs@type@list}{article,letter,suppinfo}
+\SectionNumbersOff
+\captionsetup[table]{labelfont=bf,textfont=bf}
+\g@addto@macro{\maketitle}{\newpage}
+%% 
+%% Originally developed by Mats Dahlgren
+%% Copyright (C) 1996-1998 by Mats Dahlgren
+%% Copyright (C) 2008-2009 by
+%%   Joseph Wright <joseph.wright@morningstar2.co.uk>
+%% 
+%% Part of this bundle is derived from cite.sty, to which the
+%% following license applies:
+%%   Copyright (C) 1989-2003 by Donald Arseneau
+%%   These macros may be freely transmitted, reproduced, or
+%%   modified provided that this notice is left intact.
+%% 
+%% It may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License (LPPL), either version 1.3c of
+%% this license or (at your option) any later version.  The latest
+%% version of this license is in the file:
+%% 
+%%    http://www.latex-project.org/lppl.txt
+%% 
+%% This work is "maintained" (as per LPPL maintenance status) by
+%%   Joseph Wright.
+%% 
+%% This work consists of the file  achemso.dtx
+%%           and the derived files achemso.pdf,
+%%                                 achemso.bib,
+%%                                 achemso.cls,
+%%                                 achemso.ins,
+%%                                 achemso.sty,
+%%                                 achemso-demo.tex,
+%%                                 natmove.sty and
+%%                                 a number of configuration files.
+%% 
 %%
 %% End of file `jpcbfk.cfg'.
diff --git a/Master/texmf-dist/tex/latex/achemso/config/jpccck.cfg b/Master/texmf-dist/tex/latex/achemso/config/jpccck.cfg
index 11ae5219bf1..5eaf32fe815 100644
--- a/Master/texmf-dist/tex/latex/achemso/config/jpccck.cfg
+++ b/Master/texmf-dist/tex/latex/achemso/config/jpccck.cfg
@@ -5,26 +5,52 @@
 %% The original source files were:
 %%
 %% achemso.dtx  (with options: `jpccck')
-%%  ----------------------------------------------------------------
-%%  achemso --- Support for submissions to American  Chemical
-%%    Society journals
-%%  Maintained by Joseph Wright
-%%  E-mail: joseph.wright@morningstar2.co.uk
-%%  Released under the LaTeX Project Public License v1.3c or later
-%%  See http://www.latex-project.org/lppl.txt
-%%  ----------------------------------------------------------------
+%% ----------------------------------------------------------------
+%% achemso --- Support for submissions to American Chemical Society
+%%   journals
+%% E-mail: joseph.wright@morningstar2.co.uk
+%% Released under the LaTeX Project Public License v1.3c or later
+%% See http://www.latex-project.org/lppl.txt
+%% ----------------------------------------------------------------
 %% 
+
 \ProvidesFile{jpccck.cfg}
-  [2009/02/03 v3.1a achemso configuration:
-   J. Phys. Chem. C]
-\acs@setkeys{
-  abbreviate=true,
-  biblabel=brackets,
-  biochem=false,
-  maxauthors=15,
-  super=true,
-  usetitle=false}
-\acs@validtype{letter,article,suppinfo}
-\endinput
+  [2009/04/21 v3.2 achemso configuration: J. Phys. Chem. C]
+\renewcommand*{\acs@type@list}{article,letter,suppinfo}
+\SectionNumbersOff
+\captionsetup[table]{labelfont=bf,textfont=bf}
+\g@addto@macro{\maketitle}{\newpage}
+%% 
+%% Originally developed by Mats Dahlgren
+%% Copyright (C) 1996-1998 by Mats Dahlgren
+%% Copyright (C) 2008-2009 by
+%%   Joseph Wright <joseph.wright@morningstar2.co.uk>
+%% 
+%% Part of this bundle is derived from cite.sty, to which the
+%% following license applies:
+%%   Copyright (C) 1989-2003 by Donald Arseneau
+%%   These macros may be freely transmitted, reproduced, or
+%%   modified provided that this notice is left intact.
+%% 
+%% It may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License (LPPL), either version 1.3c of
+%% this license or (at your option) any later version.  The latest
+%% version of this license is in the file:
+%% 
+%%    http://www.latex-project.org/lppl.txt
+%% 
+%% This work is "maintained" (as per LPPL maintenance status) by
+%%   Joseph Wright.
+%% 
+%% This work consists of the file  achemso.dtx
+%%           and the derived files achemso.pdf,
+%%                                 achemso.bib,
+%%                                 achemso.cls,
+%%                                 achemso.ins,
+%%                                 achemso.sty,
+%%                                 achemso-demo.tex,
+%%                                 natmove.sty and
+%%                                 a number of configuration files.
+%% 
 %%
 %% End of file `jpccck.cfg'.
diff --git a/Master/texmf-dist/tex/latex/achemso/config/jprobs.cfg b/Master/texmf-dist/tex/latex/achemso/config/jprobs.cfg
index f46dc26c634..2563f48caa1 100644
--- a/Master/texmf-dist/tex/latex/achemso/config/jprobs.cfg
+++ b/Master/texmf-dist/tex/latex/achemso/config/jprobs.cfg
@@ -5,26 +5,53 @@
 %% The original source files were:
 %%
 %% achemso.dtx  (with options: `jprobs')
-%%  ----------------------------------------------------------------
-%%  achemso --- Support for submissions to American  Chemical
-%%    Society journals
-%%  Maintained by Joseph Wright
-%%  E-mail: joseph.wright@morningstar2.co.uk
-%%  Released under the LaTeX Project Public License v1.3c or later
-%%  See http://www.latex-project.org/lppl.txt
-%%  ----------------------------------------------------------------
+%% ----------------------------------------------------------------
+%% achemso --- Support for submissions to American Chemical Society
+%%   journals
+%% E-mail: joseph.wright@morningstar2.co.uk
+%% Released under the LaTeX Project Public License v1.3c or later
+%% See http://www.latex-project.org/lppl.txt
+%% ----------------------------------------------------------------
 %% 
+
 \ProvidesFile{jprobs.cfg}
-  [2009/02/03 v3.1a achemso configuration:
-   J. Proteome Res.]
-\acs@setkeys{
-  abbreviate=true,
-  biblabel=brackets,
-  biochem=false,
-  maxauthors=15,
-  super=true,
-  usetitle=true}
-\acs@validtype{review,article,suppinfo}
-\endinput
+  [2009/04/21 v3.2 achemso configuration: J. Proteome Res.]
+\setkeys{acs}{
+  usetitle = true
+}
+\renewcommand*{\acs@type@list}{article,review,suppinfo}
+\SectionNumbersOff
+%% 
+%% Originally developed by Mats Dahlgren
+%% Copyright (C) 1996-1998 by Mats Dahlgren
+%% Copyright (C) 2008-2009 by
+%%   Joseph Wright <joseph.wright@morningstar2.co.uk>
+%% 
+%% Part of this bundle is derived from cite.sty, to which the
+%% following license applies:
+%%   Copyright (C) 1989-2003 by Donald Arseneau
+%%   These macros may be freely transmitted, reproduced, or
+%%   modified provided that this notice is left intact.
+%% 
+%% It may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License (LPPL), either version 1.3c of
+%% this license or (at your option) any later version.  The latest
+%% version of this license is in the file:
+%% 
+%%    http://www.latex-project.org/lppl.txt
+%% 
+%% This work is "maintained" (as per LPPL maintenance status) by
+%%   Joseph Wright.
+%% 
+%% This work consists of the file  achemso.dtx
+%%           and the derived files achemso.pdf,
+%%                                 achemso.bib,
+%%                                 achemso.cls,
+%%                                 achemso.ins,
+%%                                 achemso.sty,
+%%                                 achemso-demo.tex,
+%%                                 natmove.sty and
+%%                                 a number of configuration files.
+%% 
 %%
 %% End of file `jprobs.cfg'.
diff --git a/Master/texmf-dist/tex/latex/achemso/config/langd5.cfg b/Master/texmf-dist/tex/latex/achemso/config/langd5.cfg
index 34d8bc502ad..9dd53c7f26a 100644
--- a/Master/texmf-dist/tex/latex/achemso/config/langd5.cfg
+++ b/Master/texmf-dist/tex/latex/achemso/config/langd5.cfg
@@ -5,26 +5,50 @@
 %% The original source files were:
 %%
 %% achemso.dtx  (with options: `langd5')
-%%  ----------------------------------------------------------------
-%%  achemso --- Support for submissions to American  Chemical
-%%    Society journals
-%%  Maintained by Joseph Wright
-%%  E-mail: joseph.wright@morningstar2.co.uk
-%%  Released under the LaTeX Project Public License v1.3c or later
-%%  See http://www.latex-project.org/lppl.txt
-%%  ----------------------------------------------------------------
+%% ----------------------------------------------------------------
+%% achemso --- Support for submissions to American Chemical Society
+%%   journals
+%% E-mail: joseph.wright@morningstar2.co.uk
+%% Released under the LaTeX Project Public License v1.3c or later
+%% See http://www.latex-project.org/lppl.txt
+%% ----------------------------------------------------------------
 %% 
+
 \ProvidesFile{langd5.cfg}
-  [2009/02/03 v3.1a achemso configuration:
-   Langmuir]
-\acs@setkeys{
-  abbreviate=true,
-  biblabel=brackets,
-  biochem=false,
-  maxauthors=15,
-  super=true,
-  usetitle=false}
-\acs@validtype{letter,article,suppinfo}
-\endinput
+  [2009/04/21 v3.2 achemso configuration: Langmuir]
+\renewcommand*{\acs@type@list}{article,letter,suppinfo}
+\SectionNumbersOff
+%% 
+%% Originally developed by Mats Dahlgren
+%% Copyright (C) 1996-1998 by Mats Dahlgren
+%% Copyright (C) 2008-2009 by
+%%   Joseph Wright <joseph.wright@morningstar2.co.uk>
+%% 
+%% Part of this bundle is derived from cite.sty, to which the
+%% following license applies:
+%%   Copyright (C) 1989-2003 by Donald Arseneau
+%%   These macros may be freely transmitted, reproduced, or
+%%   modified provided that this notice is left intact.
+%% 
+%% It may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License (LPPL), either version 1.3c of
+%% this license or (at your option) any later version.  The latest
+%% version of this license is in the file:
+%% 
+%%    http://www.latex-project.org/lppl.txt
+%% 
+%% This work is "maintained" (as per LPPL maintenance status) by
+%%   Joseph Wright.
+%% 
+%% This work consists of the file  achemso.dtx
+%%           and the derived files achemso.pdf,
+%%                                 achemso.bib,
+%%                                 achemso.cls,
+%%                                 achemso.ins,
+%%                                 achemso.sty,
+%%                                 achemso-demo.tex,
+%%                                 natmove.sty and
+%%                                 a number of configuration files.
+%% 
 %%
 %% End of file `langd5.cfg'.
diff --git a/Master/texmf-dist/tex/latex/achemso/config/mamobx.cfg b/Master/texmf-dist/tex/latex/achemso/config/mamobx.cfg
index dfae7f59bf2..901ecc23d56 100644
--- a/Master/texmf-dist/tex/latex/achemso/config/mamobx.cfg
+++ b/Master/texmf-dist/tex/latex/achemso/config/mamobx.cfg
@@ -5,26 +5,49 @@
 %% The original source files were:
 %%
 %% achemso.dtx  (with options: `mamobx')
-%%  ----------------------------------------------------------------
-%%  achemso --- Support for submissions to American  Chemical
-%%    Society journals
-%%  Maintained by Joseph Wright
-%%  E-mail: joseph.wright@morningstar2.co.uk
-%%  Released under the LaTeX Project Public License v1.3c or later
-%%  See http://www.latex-project.org/lppl.txt
-%%  ----------------------------------------------------------------
+%% ----------------------------------------------------------------
+%% achemso --- Support for submissions to American Chemical Society
+%%   journals
+%% E-mail: joseph.wright@morningstar2.co.uk
+%% Released under the LaTeX Project Public License v1.3c or later
+%% See http://www.latex-project.org/lppl.txt
+%% ----------------------------------------------------------------
 %% 
+
 \ProvidesFile{mamobx.cfg}
-  [2009/02/03 v3.1a achemso configuration:
-   Macromolecules]
-\acs@setkeys{
-  abbreviate=true,
-  biblabel=brackets,
-  biochem=false,
-  maxauthors=15,
-  super=true,
-  usetitle=false}
-\acs@validtype{communication,article,suppinfo}
-\endinput
+  [2009/04/21 v3.2 achemso configuration: Macromolecules]
+\SectionNumbersOff
+%% 
+%% Originally developed by Mats Dahlgren
+%% Copyright (C) 1996-1998 by Mats Dahlgren
+%% Copyright (C) 2008-2009 by
+%%   Joseph Wright <joseph.wright@morningstar2.co.uk>
+%% 
+%% Part of this bundle is derived from cite.sty, to which the
+%% following license applies:
+%%   Copyright (C) 1989-2003 by Donald Arseneau
+%%   These macros may be freely transmitted, reproduced, or
+%%   modified provided that this notice is left intact.
+%% 
+%% It may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License (LPPL), either version 1.3c of
+%% this license or (at your option) any later version.  The latest
+%% version of this license is in the file:
+%% 
+%%    http://www.latex-project.org/lppl.txt
+%% 
+%% This work is "maintained" (as per LPPL maintenance status) by
+%%   Joseph Wright.
+%% 
+%% This work consists of the file  achemso.dtx
+%%           and the derived files achemso.pdf,
+%%                                 achemso.bib,
+%%                                 achemso.cls,
+%%                                 achemso.ins,
+%%                                 achemso.sty,
+%%                                 achemso-demo.tex,
+%%                                 natmove.sty and
+%%                                 a number of configuration files.
+%% 
 %%
 %% End of file `mamobx.cfg'.
diff --git a/Master/texmf-dist/tex/latex/achemso/config/mpohbp.cfg b/Master/texmf-dist/tex/latex/achemso/config/mpohbp.cfg
index 842e23680ac..01819099c4d 100644
--- a/Master/texmf-dist/tex/latex/achemso/config/mpohbp.cfg
+++ b/Master/texmf-dist/tex/latex/achemso/config/mpohbp.cfg
@@ -5,26 +5,53 @@
 %% The original source files were:
 %%
 %% achemso.dtx  (with options: `mpohbp')
-%%  ----------------------------------------------------------------
-%%  achemso --- Support for submissions to American  Chemical
-%%    Society journals
-%%  Maintained by Joseph Wright
-%%  E-mail: joseph.wright@morningstar2.co.uk
-%%  Released under the LaTeX Project Public License v1.3c or later
-%%  See http://www.latex-project.org/lppl.txt
-%%  ----------------------------------------------------------------
+%% ----------------------------------------------------------------
+%% achemso --- Support for submissions to American Chemical Society
+%%   journals
+%% E-mail: joseph.wright@morningstar2.co.uk
+%% Released under the LaTeX Project Public License v1.3c or later
+%% See http://www.latex-project.org/lppl.txt
+%% ----------------------------------------------------------------
 %% 
+
 \ProvidesFile{mamobx.cfg}
-  [2009/02/03 v3.1a achemso configuration:
-   Mol. Pharm.]
-\acs@setkeys{
-  abbreviate=true,
-  biblabel=brackets,
-  biochem=false,
-  maxauthors=15,
-  super=true,
-  usetitle=true}
-\acs@validtype{article,suppinfo}
-\endinput
+  [2009/04/21 v3.2 achemso configuration: Mol. Pharm.]
+\setkeys{acs}{
+  usetitle = true
+}
+\renewcommand*{\acs@type@list}{article,suppinfo}
+\SectionNumbersOff
+%% 
+%% Originally developed by Mats Dahlgren
+%% Copyright (C) 1996-1998 by Mats Dahlgren
+%% Copyright (C) 2008-2009 by
+%%   Joseph Wright <joseph.wright@morningstar2.co.uk>
+%% 
+%% Part of this bundle is derived from cite.sty, to which the
+%% following license applies:
+%%   Copyright (C) 1989-2003 by Donald Arseneau
+%%   These macros may be freely transmitted, reproduced, or
+%%   modified provided that this notice is left intact.
+%% 
+%% It may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License (LPPL), either version 1.3c of
+%% this license or (at your option) any later version.  The latest
+%% version of this license is in the file:
+%% 
+%%    http://www.latex-project.org/lppl.txt
+%% 
+%% This work is "maintained" (as per LPPL maintenance status) by
+%%   Joseph Wright.
+%% 
+%% This work consists of the file  achemso.dtx
+%%           and the derived files achemso.pdf,
+%%                                 achemso.bib,
+%%                                 achemso.cls,
+%%                                 achemso.ins,
+%%                                 achemso.sty,
+%%                                 achemso-demo.tex,
+%%                                 natmove.sty and
+%%                                 a number of configuration files.
+%% 
 %%
 %% End of file `mpohbp.cfg'.
diff --git a/Master/texmf-dist/tex/latex/achemso/config/nalefd.cfg b/Master/texmf-dist/tex/latex/achemso/config/nalefd.cfg
index 3c52608bb7d..7ba7d8fdaa5 100644
--- a/Master/texmf-dist/tex/latex/achemso/config/nalefd.cfg
+++ b/Master/texmf-dist/tex/latex/achemso/config/nalefd.cfg
@@ -5,26 +5,51 @@
 %% The original source files were:
 %%
 %% achemso.dtx  (with options: `nalefd')
-%%  ----------------------------------------------------------------
-%%  achemso --- Support for submissions to American  Chemical
-%%    Society journals
-%%  Maintained by Joseph Wright
-%%  E-mail: joseph.wright@morningstar2.co.uk
-%%  Released under the LaTeX Project Public License v1.3c or later
-%%  See http://www.latex-project.org/lppl.txt
-%%  ----------------------------------------------------------------
+%% ----------------------------------------------------------------
+%% achemso --- Support for submissions to American Chemical Society
+%%   journals
+%% E-mail: joseph.wright@morningstar2.co.uk
+%% Released under the LaTeX Project Public License v1.3c or later
+%% See http://www.latex-project.org/lppl.txt
+%% ----------------------------------------------------------------
 %% 
+
 \ProvidesFile{nalefd.cfg}
-  [2009/02/03 v3.1a achemso configuration:
-   Nano Lett.]
-\acs@setkeys{
-  abbreviate=true,
-  biblabel=brackets,
-  biochem=false,
-  maxauthors=15,
-  super=true,
-  usetitle=false}
-\acs@validtype[letter]{letter}
-\endinput
+  [2009/04/21 v3.2 achemso configuration: Nano Lett.]
+\renewcommand*{\acs@type@default}{letter}
+\renewcommand*{\acs@type@list}{letter}
+\SectionNumbersOff
+%% 
+%% Originally developed by Mats Dahlgren
+%% Copyright (C) 1996-1998 by Mats Dahlgren
+%% Copyright (C) 2008-2009 by
+%%   Joseph Wright <joseph.wright@morningstar2.co.uk>
+%% 
+%% Part of this bundle is derived from cite.sty, to which the
+%% following license applies:
+%%   Copyright (C) 1989-2003 by Donald Arseneau
+%%   These macros may be freely transmitted, reproduced, or
+%%   modified provided that this notice is left intact.
+%% 
+%% It may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License (LPPL), either version 1.3c of
+%% this license or (at your option) any later version.  The latest
+%% version of this license is in the file:
+%% 
+%%    http://www.latex-project.org/lppl.txt
+%% 
+%% This work is "maintained" (as per LPPL maintenance status) by
+%%   Joseph Wright.
+%% 
+%% This work consists of the file  achemso.dtx
+%%           and the derived files achemso.pdf,
+%%                                 achemso.bib,
+%%                                 achemso.cls,
+%%                                 achemso.ins,
+%%                                 achemso.sty,
+%%                                 achemso-demo.tex,
+%%                                 natmove.sty and
+%%                                 a number of configuration files.
+%% 
 %%
 %% End of file `nalefd.cfg'.
diff --git a/Master/texmf-dist/tex/latex/achemso/config/oprdfk.cfg b/Master/texmf-dist/tex/latex/achemso/config/oprdfk.cfg
index 3ccc854fbe3..1689751e56b 100644
--- a/Master/texmf-dist/tex/latex/achemso/config/oprdfk.cfg
+++ b/Master/texmf-dist/tex/latex/achemso/config/oprdfk.cfg
@@ -5,26 +5,50 @@
 %% The original source files were:
 %%
 %% achemso.dtx  (with options: `oprdfk')
-%%  ----------------------------------------------------------------
-%%  achemso --- Support for submissions to American  Chemical
-%%    Society journals
-%%  Maintained by Joseph Wright
-%%  E-mail: joseph.wright@morningstar2.co.uk
-%%  Released under the LaTeX Project Public License v1.3c or later
-%%  See http://www.latex-project.org/lppl.txt
-%%  ----------------------------------------------------------------
+%% ----------------------------------------------------------------
+%% achemso --- Support for submissions to American Chemical Society
+%%   journals
+%% E-mail: joseph.wright@morningstar2.co.uk
+%% Released under the LaTeX Project Public License v1.3c or later
+%% See http://www.latex-project.org/lppl.txt
+%% ----------------------------------------------------------------
 %% 
+
 \ProvidesFile{oprdfk.cfg}
-  [2009/02/03 v3.1a achemso configuration:
-   Org. Proc. Res. Dev.]
-\acs@setkeys{
-  abbreviate=true,
-  biblabel=brackets,
-  biochem=false,
-  maxauthors=15,
-  super=true,
-  usetitle=false}
-\acs@validtype{highlight,article,review,suppinfo}
-\endinput
+  [2009/04/21 v3.2 achemso configuration: Org. Proc. Res. Dev.]
+\renewcommand*{\acs@type@list}{article,highlight,review,suppinfo}
+\SectionNumbersOff
+%% 
+%% Originally developed by Mats Dahlgren
+%% Copyright (C) 1996-1998 by Mats Dahlgren
+%% Copyright (C) 2008-2009 by
+%%   Joseph Wright <joseph.wright@morningstar2.co.uk>
+%% 
+%% Part of this bundle is derived from cite.sty, to which the
+%% following license applies:
+%%   Copyright (C) 1989-2003 by Donald Arseneau
+%%   These macros may be freely transmitted, reproduced, or
+%%   modified provided that this notice is left intact.
+%% 
+%% It may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License (LPPL), either version 1.3c of
+%% this license or (at your option) any later version.  The latest
+%% version of this license is in the file:
+%% 
+%%    http://www.latex-project.org/lppl.txt
+%% 
+%% This work is "maintained" (as per LPPL maintenance status) by
+%%   Joseph Wright.
+%% 
+%% This work consists of the file  achemso.dtx
+%%           and the derived files achemso.pdf,
+%%                                 achemso.bib,
+%%                                 achemso.cls,
+%%                                 achemso.ins,
+%%                                 achemso.sty,
+%%                                 achemso-demo.tex,
+%%                                 natmove.sty and
+%%                                 a number of configuration files.
+%% 
 %%
 %% End of file `oprdfk.cfg'.
diff --git a/Master/texmf-dist/tex/latex/achemso/config/orgnd7.cfg b/Master/texmf-dist/tex/latex/achemso/config/orgnd7.cfg
index c631bd901d0..6d83876acbb 100644
--- a/Master/texmf-dist/tex/latex/achemso/config/orgnd7.cfg
+++ b/Master/texmf-dist/tex/latex/achemso/config/orgnd7.cfg
@@ -5,26 +5,49 @@
 %% The original source files were:
 %%
 %% achemso.dtx  (with options: `orgnd7')
-%%  ----------------------------------------------------------------
-%%  achemso --- Support for submissions to American  Chemical
-%%    Society journals
-%%  Maintained by Joseph Wright
-%%  E-mail: joseph.wright@morningstar2.co.uk
-%%  Released under the LaTeX Project Public License v1.3c or later
-%%  See http://www.latex-project.org/lppl.txt
-%%  ----------------------------------------------------------------
+%% ----------------------------------------------------------------
+%% achemso --- Support for submissions to American Chemical Society
+%%   journals
+%% E-mail: joseph.wright@morningstar2.co.uk
+%% Released under the LaTeX Project Public License v1.3c or later
+%% See http://www.latex-project.org/lppl.txt
+%% ----------------------------------------------------------------
 %% 
+
 \ProvidesFile{orgnd7.cfg}
-  [2009/02/03 v3.1a achemso configuration:
-   Organometallics]
-\acs@setkeys{
-  abbreviate=true,
-  biblabel=brackets,
-  biochem=false,
-  maxauthors=15,
-  super=true,
-  usetitle=false}
-\acs@validtype{communication,article,suppinfo}
-\endinput
+  [2009/04/21 v3.2 achemso configuration: Organometallics]
+\SectionNumbersOff
+%% 
+%% Originally developed by Mats Dahlgren
+%% Copyright (C) 1996-1998 by Mats Dahlgren
+%% Copyright (C) 2008-2009 by
+%%   Joseph Wright <joseph.wright@morningstar2.co.uk>
+%% 
+%% Part of this bundle is derived from cite.sty, to which the
+%% following license applies:
+%%   Copyright (C) 1989-2003 by Donald Arseneau
+%%   These macros may be freely transmitted, reproduced, or
+%%   modified provided that this notice is left intact.
+%% 
+%% It may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License (LPPL), either version 1.3c of
+%% this license or (at your option) any later version.  The latest
+%% version of this license is in the file:
+%% 
+%%    http://www.latex-project.org/lppl.txt
+%% 
+%% This work is "maintained" (as per LPPL maintenance status) by
+%%   Joseph Wright.
+%% 
+%% This work consists of the file  achemso.dtx
+%%           and the derived files achemso.pdf,
+%%                                 achemso.bib,
+%%                                 achemso.cls,
+%%                                 achemso.ins,
+%%                                 achemso.sty,
+%%                                 achemso-demo.tex,
+%%                                 natmove.sty and
+%%                                 a number of configuration files.
+%% 
 %%
 %% End of file `orgnd7.cfg'.
diff --git a/Master/texmf-dist/tex/latex/achemso/config/orlef7.cfg b/Master/texmf-dist/tex/latex/achemso/config/orlef7.cfg
index ccde2185892..5bd1179a5db 100644
--- a/Master/texmf-dist/tex/latex/achemso/config/orlef7.cfg
+++ b/Master/texmf-dist/tex/latex/achemso/config/orlef7.cfg
@@ -5,26 +5,51 @@
 %% The original source files were:
 %%
 %% achemso.dtx  (with options: `orlef7')
-%%  ----------------------------------------------------------------
-%%  achemso --- Support for submissions to American  Chemical
-%%    Society journals
-%%  Maintained by Joseph Wright
-%%  E-mail: joseph.wright@morningstar2.co.uk
-%%  Released under the LaTeX Project Public License v1.3c or later
-%%  See http://www.latex-project.org/lppl.txt
-%%  ----------------------------------------------------------------
+%% ----------------------------------------------------------------
+%% achemso --- Support for submissions to American Chemical Society
+%%   journals
+%% E-mail: joseph.wright@morningstar2.co.uk
+%% Released under the LaTeX Project Public License v1.3c or later
+%% See http://www.latex-project.org/lppl.txt
+%% ----------------------------------------------------------------
 %% 
+
 \ProvidesFile{orlef7.cfg}
-  [2009/02/03 v3.1a achemso configuration:
-   Org. Lett.]
-\acs@setkeys{
-  abbreviate=true,
-  biblabel=brackets,
-  biochem=false,
-  maxauthors=15,
-  super=true,
-  usetitle=false}
-\acs@validtype[letter]{letter}
-\endinput
+  [2009/04/21 v3.2 achemso configuration: Org. Lett.]
+\renewcommand*{\acs@type@default}{letter}
+\renewcommand*{\acs@type@list}{letter}
+\SectionNumbersOff
+%% 
+%% Originally developed by Mats Dahlgren
+%% Copyright (C) 1996-1998 by Mats Dahlgren
+%% Copyright (C) 2008-2009 by
+%%   Joseph Wright <joseph.wright@morningstar2.co.uk>
+%% 
+%% Part of this bundle is derived from cite.sty, to which the
+%% following license applies:
+%%   Copyright (C) 1989-2003 by Donald Arseneau
+%%   These macros may be freely transmitted, reproduced, or
+%%   modified provided that this notice is left intact.
+%% 
+%% It may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License (LPPL), either version 1.3c of
+%% this license or (at your option) any later version.  The latest
+%% version of this license is in the file:
+%% 
+%%    http://www.latex-project.org/lppl.txt
+%% 
+%% This work is "maintained" (as per LPPL maintenance status) by
+%%   Joseph Wright.
+%% 
+%% This work consists of the file  achemso.dtx
+%%           and the derived files achemso.pdf,
+%%                                 achemso.bib,
+%%                                 achemso.cls,
+%%                                 achemso.ins,
+%%                                 achemso.sty,
+%%                                 achemso-demo.tex,
+%%                                 natmove.sty and
+%%                                 a number of configuration files.
+%% 
 %%
 %% End of file `orlef7.cfg'.
diff --git a/Master/texmf-dist/tex/latex/achemso/natmove.sty b/Master/texmf-dist/tex/latex/achemso/natmove.sty
index 30c9e98995c..0cd7858bf18 100644
--- a/Master/texmf-dist/tex/latex/achemso/natmove.sty
+++ b/Master/texmf-dist/tex/latex/achemso/natmove.sty
@@ -4,97 +4,147 @@
 %%
 %% The original source files were:
 %%
-%% natmove.dtx  (with options: `package')
-%%  ----------------------------------------------------------------
-%%  natmove --- Automatic citation moving with natbib
-%%  Maintained by Joseph Wright
-%%  E-mail: joseph.wright@morningstar2.co.uk
-%%  Released under the LaTeX Project Public License v1.3c or later
-%%  See http://www.latex-project.org/lppl.txt
-%%  ----------------------------------------------------------------
+%% achemso.dtx  (with options: `natmove')
+%% ----------------------------------------------------------------
+%% achemso --- Support for submissions to American Chemical Society
+%%   journals
+%% E-mail: joseph.wright@morningstar2.co.uk
+%% Released under the LaTeX Project Public License v1.3c or later
+%% See http://www.latex-project.org/lppl.txt
+%% ----------------------------------------------------------------
 %% 
 \NeedsTeXFormat{LaTeX2e}
-\def\nmv@id$#1: #2.#3 #4 #5-#6-#7 #8 #9${%
-  #5/#6/#7\space v1.0\space}
+
 \ProvidesPackage{natmove}
-  [\nmv@id$Id: natmove.dtx 29 2008-08-22 07:47:26Z joseph $
-   Automatic citation moving with natbib]
+  [2009/04/20 v1.1 Automatic citation moving with natbib]
+\RequirePackage{natbib}
+\newcommand*{\nmv@ifmtarg}{}
+\newcommand*{\nmv@xifmtarg}{}
 \begingroup
-  \catcode`\Q=3
+  \catcode`\Q 3\relax
   \long\gdef\nmv@ifmtarg#1{%
-    \nmv@xifmtarg#1QQ\@secondoftwo\@firstoftwo\@nil}
+    \nmv@xifmtarg#1QQ\@secondoftwo\@firstoftwo\@nil
+  }
   \long\gdef\nmv@xifmtarg#1#2Q#3#4#5\@nil{#4}
 \endgroup
 \newif\ifnmv@cite
 \newcommand*{\nmv@citex}{%
   \ifnmv@cite
-    \expandafter\nmv@citex@
+    \expandafter\nmv@citex@moving
   \else
-    \expandafter\nmv@natcitex
-  \fi}
-\def\nmv@citex@[#1][#2]#3{%
+    \expandafter\nmv@citex@nat
+  \fi
+}
+\newcommand*{\nmv@after}{}
+\newcommand*{\nmv@citex@moving}{}
+\def\nmv@citex@moving[#1][#2]#3{%
   \leavevmode
   \skip@\lastskip
   \unskip
   \begingroup
-    \def\nmv@arg{[#1][#2]{#3}}%
-    \newcommand*{\nmv@citex@end}{%
-        \expandafter\nmv@natcitex\nmv@arg
-      \endgroup}%
+    \def\nmv@after{\nmv@citex@nat[#1][#2]{#3}}%
     \global\nmv@citefalse
-    \nmv@citex@getnext\relax}
-\newcommand*{\nmv@citex@getnext}[1]{%
-  \futurelet\nmv@citex@next\nmv@citex@punct}
+    \nmv@citex@get@next\relax
+}
+\newcommand*{\nmv@citex@end}{%
+    \nmv@after
+  \endgroup
+}
+\newcommand*{\nmv@citex@get@next}[1]{%
+  \futurelet\nmv@citex@next\nmv@citex@punct
+}
 \newcommand*{\nmv@citex@punct}{%
   \let\nmv@citex@loop\nmv@citex@end
-  \ifx.\nmv@citex@next\@empty
+  \ifx\nmv@citex@next.\relax
     \ifnum\spacefactor<\nmv@citex@sfac\else
       \let\nmv@citex@next\relax
-      \let\nmv@citex@loop\nmv@citex@getnext
+      \let\nmv@citex@loop\nmv@citex@get@next
     \fi
   \fi
-  \expandafter\nmv@citex@pnct\natmovechars\@empty
-  \nmv@citex@loop}
-\def\nmv@citex@pnct#1#2\@empty{%
+  \expandafter\nmv@citex@punct@aux\natmovechars\@empty
+  \nmv@citex@loop
+}
+\newcommand*{\nmv@citex@loop}{}
+\newcommand*{\nmv@citex@punct@aux}{}
+\def\nmv@citex@punct@aux#1#2\@empty{%
   \ifx\nmv@citex@next#1\@empty
     #1%
-    \let\nmv@citex@loop\nmv@citex@getnext
+    \let\nmv@citex@loop\nmv@citex@get@next
   \fi
   \ifx\@empty#2\@empty\else
-    \expandafter\nmv@citex@pnct#2\@empty
-  \fi}
-\mathchardef\nmv@citex@sfac3000
-\expandafter\renewcommand\expandafter*\expandafter{\expandafter%
-  \frenchspacing\expandafter}\expandafter{%
+    \expandafter\nmv@citex@punct@aux#2\@empty
+  \fi
+}
+\mathchardef\nmv@citex@sfac3000\relax
+\expandafter\def\expandafter\frenchspacing\expandafter{%
   \frenchspacing
-  \mathchardef\nmv@citex@sfac1001
+  \mathchardef\nmv@citex@sfac1001\relax
   \sfcode`\.\nmv@citex@sfac
   \sfcode`\?\nmv@citex@sfac
-  \sfcode`\!\nmv@citex@sfac}
+  \sfcode`\!\nmv@citex@sfac
+}
 \ifnum\sfcode`\.=\@m
   \frenchspacing
 \fi
+\newcommand*{\nmv@citex@nat}{}
 \newcommand*{\nmv@activate}{%
-  \let\nmv@natcitex\@citex
+  \let\nmv@citex@nat\@citex
   \let\@citex\nmv@citex
   \let\nmv@cite\cite
   \renewcommand*{\cite}[2][]{%
-    \nmv@ifmtarg{##1}
-      {\nmv@citetrue
-       \nmv@cite{##2}}
-      {\nmv@citefalse
-       \nmv@cite[##1]{##2}}}}
-\AtBeginDocument{
-  \@ifpackageloaded{natbib}
-    {\ifNAT@super
-      \nmv@activate
-     \else
-      \nmv@notactivate
-     \fi}
-    {\PackageWarning{natmove}
-       {The natbib package has not been loaded}}}
-\newcommand*{\nmv@notactivate}{}
+    \nmv@ifmtarg{##1}{%
+      \nmv@citetrue
+      \nmv@cite{##2}%
+    }{%
+      \nmv@citefalse
+      \nmv@cite[##1]{##2}}%
+  }%
+}
+\newcommand*{\nmv@natbib@detect}{%
+  \@ifpackageloaded{natbib}{%
+    \ifNAT@super
+      \expandafter\nmv@activate
+    \fi
+  }{%
+    \PackageInfo{natmove}{%
+      The natbib package is not loaded.\MessageBreak
+      Loading natmove will do nothing
+    }%
+  }%
+}
+\AtBeginDocument{\nmv@natbib@detect}
 \newcommand*{\natmovechars}{.,;:}
-\endinput
+%% 
+%% Originally developed by Mats Dahlgren
+%% Copyright (C) 1996-1998 by Mats Dahlgren
+%% Copyright (C) 2008-2009 by
+%%   Joseph Wright <joseph.wright@morningstar2.co.uk>
+%% 
+%% Part of this bundle is derived from cite.sty, to which the
+%% following license applies:
+%%   Copyright (C) 1989-2003 by Donald Arseneau
+%%   These macros may be freely transmitted, reproduced, or
+%%   modified provided that this notice is left intact.
+%% 
+%% It may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License (LPPL), either version 1.3c of
+%% this license or (at your option) any later version.  The latest
+%% version of this license is in the file:
+%% 
+%%    http://www.latex-project.org/lppl.txt
+%% 
+%% This work is "maintained" (as per LPPL maintenance status) by
+%%   Joseph Wright.
+%% 
+%% This work consists of the file  achemso.dtx
+%%           and the derived files achemso.pdf,
+%%                                 achemso.bib,
+%%                                 achemso.cls,
+%%                                 achemso.ins,
+%%                                 achemso.sty,
+%%                                 achemso-demo.tex,
+%%                                 natmove.sty and
+%%                                 a number of configuration files.
+%% 
 %%
 %% End of file `natmove.sty'.