achemso update (16oct07)

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

11 files changed, 665 insertions, 178 deletions

diff --git a/Master/texmf-dist/bibtex/bib/achemso/achemso.bib b/Master/texmf-dist/bibtex/bib/achemso/achemso.bib
index c3292ddf441..3d9ebe1747e 100644
--- a/Master/texmf-dist/bibtex/bib/achemso/achemso.bib
+++ b/Master/texmf-dist/bibtex/bib/achemso/achemso.bib
@@ -10,6 +10,5 @@
 }
 
 @MISC{ACS2007,
-  note = {\url{http://pubs.acs.org/books/references.shtml}},
+  url = {http://pubs.acs.org/books/references.shtml},
 }
-
diff --git a/Master/texmf-dist/bibtex/bst/achemso/achemlnt.bst b/Master/texmf-dist/bibtex/bst/achemso/achemlnt.bst
index 0bd271ac82a..07a23a027da 100644
--- a/Master/texmf-dist/bibtex/bst/achemso/achemlnt.bst
+++ b/Master/texmf-dist/bibtex/bst/achemso/achemlnt.bst
@@ -5,16 +5,15 @@
 %% The original source files were:
 %%
 %% achemso.dtx  (with options: `bib,list,nat')
-%% ----------------------------------------------------------------
-%% The achemso package - A BibTeX style for American Chemical
-%% Society publications
-%% Maintained by Joseph Wright
-%% E-mail: joseph.wright@morningstar2.co.uk
-%% Originally developed by Mats Dahlgren
-%%  (c) 1996-98 by Mats Dahlgren
-%%  (c) 2007 Joseph Wright
-%% Released under the LaTeX Project Public license v1.3 or later
-%% ----------------------------------------------------------------
+%%  ----------------------------------------------------------------
+%%  The achemso package - LaTeX and BibTeX support for American
+%%  Chemical Society publications
+%%  Maintained by Joseph Wright
+%%  E-mail: joseph.wright@morningstar2.co.uk
+%%  Released under the LaTeX Project Public License v1.3 or later
+%%  See http://www.latex-project.org/lppl.txt
+%%  ----------------------------------------------------------------
+%% 
 ENTRY
   { address
     annotate
@@ -37,6 +36,7 @@ ENTRY
     series
     title
     type
+    url
     volume
     year
   }
@@ -125,6 +125,17 @@ FUNCTION {new.block}
   if$
 }
 
+FUNCTION {new.sentence}
+{ output.state after.block =
+    'skip$
+    { output.state before.all =
+        'skip$
+        { after.sentence 'output.state := }
+      if$
+    }
+  if$
+}
+
 FUNCTION {add.note}
 { annotate empty$
     'skip$
@@ -503,6 +514,13 @@ FUNCTION {format.number.series}
   if$
 }
 
+FUNCTION {format.url}
+{ url empty$
+    { "" }
+    { new.sentence "\url{" url * "}" * }
+  if$
+}
+
 FUNCTION {format.full.names}
 {'s :=
   #1 'nameptr :=
@@ -796,8 +814,8 @@ FUNCTION {format.version}
 
 FUNCTION {empty.misc.check}
 { author empty$ title empty$ howpublished empty$
-  year empty$ note empty$
-  and and and and
+  year empty$ note empty$ url empty$
+  and and and and and
     { "all relevant fields are empty in " cite$ * warning$ }
     'skip$
   if$
@@ -1022,6 +1040,7 @@ FUNCTION {misc}
   if$
   howpublished output
   year output
+  format.url output
   note output
   fin.entry
   empty.misc.check
@@ -1369,6 +1388,8 @@ FUNCTION {begin.bib}
     'skip$
     { preamble$ write$ newline$ }
   if$
+  "\providecommand{\url}[1]{\texttt{#1}}"
+  write$ newline$
   "\providecommand{\refin}[1]{\\ \textbf{Referenced in:} #1}"
   write$ newline$
   "\providecommand{\natexlab}[1]{#1}"
@@ -1389,7 +1410,6 @@ FUNCTION {end.bib}
 }
 
 EXECUTE {end.bib}
-
 %% 
 %%
 %% End of file `achemlnt.bst'.
diff --git a/Master/texmf-dist/bibtex/bst/achemso/achemnat.bst b/Master/texmf-dist/bibtex/bst/achemso/achemnat.bst
index fb0ca064003..3259572ef6a 100644
--- a/Master/texmf-dist/bibtex/bst/achemso/achemnat.bst
+++ b/Master/texmf-dist/bibtex/bst/achemso/achemnat.bst
@@ -5,16 +5,15 @@
 %% The original source files were:
 %%
 %% achemso.dtx  (with options: `bib,nat')
-%% ----------------------------------------------------------------
-%% The achemso package - A BibTeX style for American Chemical
-%% Society publications
-%% Maintained by Joseph Wright
-%% E-mail: joseph.wright@morningstar2.co.uk
-%% Originally developed by Mats Dahlgren
-%%  (c) 1996-98 by Mats Dahlgren
-%%  (c) 2007 Joseph Wright
-%% Released under the LaTeX Project Public license v1.3 or later
-%% ----------------------------------------------------------------
+%%  ----------------------------------------------------------------
+%%  The achemso package - LaTeX and BibTeX support for American
+%%  Chemical Society publications
+%%  Maintained by Joseph Wright
+%%  E-mail: joseph.wright@morningstar2.co.uk
+%%  Released under the LaTeX Project Public License v1.3 or later
+%%  See http://www.latex-project.org/lppl.txt
+%%  ----------------------------------------------------------------
+%% 
 ENTRY
   { address
     author
@@ -36,6 +35,7 @@ ENTRY
     series
     title
     type
+    url
     volume
     year
   }
@@ -124,6 +124,17 @@ FUNCTION {new.block}
   if$
 }
 
+FUNCTION {new.sentence}
+{ output.state after.block =
+    'skip$
+    { output.state before.all =
+        'skip$
+        { after.sentence 'output.state := }
+      if$
+    }
+  if$
+}
+
 FUNCTION {fin.entry}
 { add.period$
   write$
@@ -493,6 +504,13 @@ FUNCTION {format.number.series}
   if$
 }
 
+FUNCTION {format.url}
+{ url empty$
+    { "" }
+    { new.sentence "\url{" url * "}" * }
+  if$
+}
+
 FUNCTION {format.full.names}
 {'s :=
   #1 'nameptr :=
@@ -786,8 +804,8 @@ FUNCTION {format.version}
 
 FUNCTION {empty.misc.check}
 { author empty$ title empty$ howpublished empty$
-  year empty$ note empty$
-  and and and and
+  year empty$ note empty$ url empty$
+  and and and and and
     { "all relevant fields are empty in " cite$ * warning$ }
     'skip$
   if$
@@ -1012,6 +1030,7 @@ FUNCTION {misc}
   if$
   howpublished output
   year output
+  format.url output
   note output
   fin.entry
   empty.misc.check
@@ -1359,6 +1378,8 @@ FUNCTION {begin.bib}
     'skip$
     { preamble$ write$ newline$ }
   if$
+  "\providecommand{\url}[1]{\texttt{#1}}"
+  write$ newline$
   "\providecommand{\refin}[1]{\\ \textbf{Referenced in:} #1}"
   write$ newline$
   "\providecommand{\natexlab}[1]{#1}"
@@ -1379,7 +1400,6 @@ FUNCTION {end.bib}
 }
 
 EXECUTE {end.bib}
-
 %% 
 %%
 %% End of file `achemnat.bst'.
diff --git a/Master/texmf-dist/bibtex/bst/achemso/achemso.bst b/Master/texmf-dist/bibtex/bst/achemso/achemso.bst
index f924271cb24..6554b69e34f 100644
--- a/Master/texmf-dist/bibtex/bst/achemso/achemso.bst
+++ b/Master/texmf-dist/bibtex/bst/achemso/achemso.bst
@@ -5,16 +5,15 @@
 %% The original source files were:
 %%
 %% achemso.dtx  (with options: `bib')
-%% ----------------------------------------------------------------
-%% The achemso package - A BibTeX style for American Chemical
-%% Society publications
-%% Maintained by Joseph Wright
-%% E-mail: joseph.wright@morningstar2.co.uk
-%% Originally developed by Mats Dahlgren
-%%  (c) 1996-98 by Mats Dahlgren
-%%  (c) 2007 Joseph Wright
-%% Released under the LaTeX Project Public license v1.3 or later
-%% ----------------------------------------------------------------
+%%  ----------------------------------------------------------------
+%%  The achemso package - LaTeX and BibTeX support for American
+%%  Chemical Society publications
+%%  Maintained by Joseph Wright
+%%  E-mail: joseph.wright@morningstar2.co.uk
+%%  Released under the LaTeX Project Public License v1.3 or later
+%%  See http://www.latex-project.org/lppl.txt
+%%  ----------------------------------------------------------------
+%% 
 ENTRY
   { address
     author
@@ -35,6 +34,7 @@ ENTRY
     series
     title
     type
+    url
     volume
     year
   }
@@ -131,6 +131,17 @@ FUNCTION {new.block}
   if$
 }
 
+FUNCTION {new.sentence}
+{ output.state after.block =
+    'skip$
+    { output.state before.all =
+        'skip$
+        { after.sentence 'output.state := }
+      if$
+    }
+  if$
+}
+
 FUNCTION {fin.entry}
 { add.period$
   write$
@@ -500,6 +511,13 @@ FUNCTION {format.number.series}
   if$
 }
 
+FUNCTION {format.url}
+{ url empty$
+    { "" }
+    { new.sentence "\url{" url * "}" * }
+  if$
+}
+
 FUNCTION {n.dashify}
 { 't :=
   ""
@@ -708,8 +726,8 @@ FUNCTION {format.version}
 
 FUNCTION {empty.misc.check}
 { author empty$ title empty$ howpublished empty$
-  year empty$ note empty$
-  and and and and
+  year empty$ note empty$ url empty$
+  and and and and and
     { "all relevant fields are empty in " cite$ * warning$ }
     'skip$
   if$
@@ -934,6 +952,7 @@ FUNCTION {misc}
   if$
   howpublished output
   year output
+  format.url output
   note output
   fin.entry
   empty.misc.check
@@ -1157,6 +1176,8 @@ FUNCTION {begin.bib}
     'skip$
     { preamble$ write$ newline$ }
   if$
+  "\providecommand{\url}[1]{\texttt{#1}}"
+  write$ newline$
   "\providecommand{\refin}[1]{\\ \textbf{Referenced in:} #1}"
   write$ newline$
   "\begin{thebibliography}{"  longest.label  * "}" *
@@ -1175,7 +1196,6 @@ FUNCTION {end.bib}
 }
 
 EXECUTE {end.bib}
-
 %% 
 %%
 %% End of file `achemso.bst'.
diff --git a/Master/texmf-dist/bibtex/bst/achemso/achemsol.bst b/Master/texmf-dist/bibtex/bst/achemso/achemsol.bst
index 341fda365a1..b5b29f87112 100644
--- a/Master/texmf-dist/bibtex/bst/achemso/achemsol.bst
+++ b/Master/texmf-dist/bibtex/bst/achemso/achemsol.bst
@@ -5,16 +5,15 @@
 %% The original source files were:
 %%
 %% achemso.dtx  (with options: `bib,list')
-%% ----------------------------------------------------------------
-%% The achemso package - A BibTeX style for American Chemical
-%% Society publications
-%% Maintained by Joseph Wright
-%% E-mail: joseph.wright@morningstar2.co.uk
-%% Originally developed by Mats Dahlgren
-%%  (c) 1996-98 by Mats Dahlgren
-%%  (c) 2007 Joseph Wright
-%% Released under the LaTeX Project Public license v1.3 or later
-%% ----------------------------------------------------------------
+%%  ----------------------------------------------------------------
+%%  The achemso package - LaTeX and BibTeX support for American
+%%  Chemical Society publications
+%%  Maintained by Joseph Wright
+%%  E-mail: joseph.wright@morningstar2.co.uk
+%%  Released under the LaTeX Project Public License v1.3 or later
+%%  See http://www.latex-project.org/lppl.txt
+%%  ----------------------------------------------------------------
+%% 
 ENTRY
   { address
     annotate
@@ -36,6 +35,7 @@ ENTRY
     series
     title
     type
+    url
     volume
     year
   }
@@ -132,6 +132,17 @@ FUNCTION {new.block}
   if$
 }
 
+FUNCTION {new.sentence}
+{ output.state after.block =
+    'skip$
+    { output.state before.all =
+        'skip$
+        { after.sentence 'output.state := }
+      if$
+    }
+  if$
+}
+
 FUNCTION {add.note}
 { annotate empty$
     'skip$
@@ -510,6 +521,13 @@ FUNCTION {format.number.series}
   if$
 }
 
+FUNCTION {format.url}
+{ url empty$
+    { "" }
+    { new.sentence "\url{" url * "}" * }
+  if$
+}
+
 FUNCTION {n.dashify}
 { 't :=
   ""
@@ -718,8 +736,8 @@ FUNCTION {format.version}
 
 FUNCTION {empty.misc.check}
 { author empty$ title empty$ howpublished empty$
-  year empty$ note empty$
-  and and and and
+  year empty$ note empty$ url empty$
+  and and and and and
     { "all relevant fields are empty in " cite$ * warning$ }
     'skip$
   if$
@@ -944,6 +962,7 @@ FUNCTION {misc}
   if$
   howpublished output
   year output
+  format.url output
   note output
   fin.entry
   empty.misc.check
@@ -1167,6 +1186,8 @@ FUNCTION {begin.bib}
     'skip$
     { preamble$ write$ newline$ }
   if$
+  "\providecommand{\url}[1]{\texttt{#1}}"
+  write$ newline$
   "\providecommand{\refin}[1]{\\ \textbf{Referenced in:} #1}"
   write$ newline$
   "\begin{thebibliography}{"  longest.label  * "}" *
@@ -1185,7 +1206,6 @@ FUNCTION {end.bib}
 }
 
 EXECUTE {end.bib}
-
 %% 
 %%
 %% End of file `achemsol.bst'.
diff --git a/Master/texmf-dist/doc/latex/achemso/README b/Master/texmf-dist/doc/latex/achemso/README
index 44cce6c820d..de9212e1e8b 100644
--- a/Master/texmf-dist/doc/latex/achemso/README
+++ b/Master/texmf-dist/doc/latex/achemso/README
@@ -1,5 +1,5 @@
-The achemso package - A BibTeX style for American Chemical
-Society publications
+The achemso package - LaTeX and BibTeX support for American 
+Chemical Society publications
 
 ----------------------------------------------------------------
 Maintained by Joseph A. Wright
diff --git a/Master/texmf-dist/doc/latex/achemso/achemso.pdf b/Master/texmf-dist/doc/latex/achemso/achemso.pdf
index 1687db3c1e1..1b454d150f7 100644
--- a/Master/texmf-dist/doc/latex/achemso/achemso.pdf
+++ b/Master/texmf-dist/doc/latex/achemso/achemso.pdf
diff --git a/Master/texmf-dist/source/latex/achemso/achemso.dtx b/Master/texmf-dist/source/latex/achemso/achemso.dtx
index 3a0b6a731ac..d946c1a83e4 100644
--- a/Master/texmf-dist/source/latex/achemso/achemso.dtx
+++ b/Master/texmf-dist/source/latex/achemso/achemso.dtx
@@ -1,38 +1,133 @@
-% \iffalse
-% ----------------------------------------------------------------
-% The achemso package - A BibTeX style for American Chemical
-% Society publications
-% Maintained by Joseph Wright
-% E-mail: joseph.wright@morningstar2.co.uk
-% Originally developed by Mats Dahlgren
-%  (c) 1996-98 by Mats Dahlgren
-%  (c) 2007 Joseph Wright
-% Released under the LaTeX Project Public license v1.3 or later
-% ----------------------------------------------------------------
+% \iffalse meta-comment
+%
+% Copyright (C) 1996-98 by
+%    Mats Dahlgren
+% Copyright (C) 2007 by
+%    Joseph Wright <joseph.wright@morningstar2.co.uk>
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either
+% version 1.3 of this license or (at your option) any later
+% version. The latest version of this license is in
+%    http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of
+% LaTeX version 2003/12/01 or later.
+%
+% This work has the LPPL maintenance status ``maintained.''
+%
+% The current maintainer of this work is Joseph Wright.
+%
+% This work consists of the source file achemso.dtx
+%                 and the derived files achemso.ins,
+%                                       achemso.sty,
+%                                       achemso.bib,
+%                                       achemso.pdf,
+%                                       achemso.bst,
+%                                       achemsol.bst,
+%                                       achemsnat.bst and
+%                                       achemlnt.bst,
+% Unpacking:
+%    (a) If achemso.ins is present:
+%           tex achemso.ins
+%    (b) Without achemso.ins:
+%           tex achemso.dtx
+%    (c) If you use LaTeX to generate files:
+%           latex \let\install=y\input{achemso.dtx}
+%
+% Documentation:
+%    (a) Without write18 enabled:
+%          pdflatex achemso.dtx
+%          bibtex8 --wolfgang achemso.aux
+%          makeindex -s gind.ist achemso.idx
+%          makeindex -s gglo.ist -o achemso.gls  achemso.glo
+%          pdflatex achemso.dtx
+%          makeindex -s gind.ist achemso.idx
+%          makeindex -s gglo.ist -o achemso.gls  achemso.glo
+%          pdflatex achemso.dtx
+%    (b) With write18 enabled:
+%          pdflatex achemso.dtx
+%          bibtex8 --wolfgang achemso.aux
+%          pdflatex achemso.dtx
+%          pdflatex achemso.dtx
 %
-%<package>\NeedsTeXFormat{LaTeX2e}
-%<package>\ProvidesPackage{achemso}
-%<package> [2007/08/22 v2.2c Enhancements for ACS publications]
+% Installation:
+%     Copy achemso.sty and the achmes*.bst files to a location
+%     searched by TeX, and if required by your TeX installation,
+%     run the appropriate command to build a hash of files
+%     (texhash, mpm --update-db, etc.)
 %
+% Note:
+%     The jawltxdoc.sty file is not needed for installation,
+%     only for building the documentation.  It may be deleted.
+%
+%<*ignore>
+% This is all taken verbatim from Heiko Oberdiek's packages
+\begingroup
+  \def\x{LaTeX2e}%
+\expandafter\endgroup
+\ifcase 0\ifx\install y1\fi\expandafter
+         \ifx\csname processbatchFile\endcsname\relax\else1\fi
+         \ifx\fmtname\x\else 1\fi\relax
+\else\csname fi\endcsname
+%</ignore>
+%<*install>
+\input docstrip.tex
+\keepsilent
+\askforoverwritefalse
+\preamble
+ ----------------------------------------------------------------
+ The achemso package - LaTeX and BibTeX support for American
+ Chemical Society publications
+ Maintained by Joseph Wright
+ E-mail: joseph.wright@morningstar2.co.uk
+ Released under the LaTeX Project Public License v1.3 or later
+ See http://www.latex-project.org/lppl.txt
+ ----------------------------------------------------------------
+
+\endpreamble
+\Msg{Generating achemso files:}
+\usedir{tex/latex/contib/achemso}
+\generate{\file{\jobname.ins}{\from{\jobname.dtx}{install}}
+          \file{\jobname.sty}{\from{\jobname.dtx}{package}}
+          \file{jawltxdoc.sty}{\from{\jobname.dtx}{jawltxdoc}}
+}
+\declarepostamble\bibtexable
+\endpostamble
+\usedir{bibtex/bst/achemso}
+\generate{\usepostamble\bibtexable
+          \file{achemso.bst}{\from{achemso.dtx}{bib}}
+          \file{achemnat.bst}{\from{achemso.dtx}{bib,nat}}
+          \file{achemsol.bst}{\from{achemso.dtx}{bib,list}}
+          \file{achemlnt.bst}{\from{achemso.dtx}{bib,list,nat}}
+}
+\generate{\usepostamble\empty\usepreamble\empty
+          \file{achemso.bib}{\from{achemso.dtx}{database}}
+}
+\endbatchfile
+%</install>
+%<*ignore>
+\fi
+% Will Robertson's trick
+\immediate\write18{makeindex -s gind.ist -o \jobname.ind  \jobname.idx}
+\immediate\write18{makeindex -s gglo.ist -o \jobname.gls  \jobname.glo}
+%</ignore>
 %<*driver>
+\PassOptionsToClass{a4paper}{article}
 \documentclass{ltxdoc}
 \EnableCrossrefs
 \CodelineIndex
 \RecordChanges
 %\OnlyDescription
-\usepackage[T1]{fontenc}
-\usepackage[english,UKenglish]{babel}
-\usepackage{mathpazo,booktabs,array}
-\usepackage[final]{microtype}
-\usepackage[colorlinks]{hyperref}
-\usepackage{\jobname}
+% The various formatting commands used in this file are collected
+% together in |jawltxdoc|.
+\usepackage{jawltxdoc}
 \begin{document}
   \DocInput{\jobname.dtx}
 \end{document}
 %</driver>
 % \fi
 %
-% \CheckSum{277}
+% \CheckSum{105}
 %
 % \CharacterTable
 %  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -50,34 +145,44 @@
 %   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %   Right brace   \}     Tilde         \~}
 %
-% \GetFileInfo{\jobname.sty}
+%\GetFileInfo{\jobname.sty}
 %
-% \title{The \textsf{achemso} package --- A BibTeX style for American
-%        Chemical Society publications}
-% \author{Joseph Wright%
-% \thanks{E-mail: joseph.wright@morningstar2.co.uk}}
-% \date{\filedate}
-%
-% \CheckSum{0}
-% \changes{v1.0}{1998/06/01}{Initial release of package by Mats
+%\changes{v1.0}{1998/06/01}{Initial release of package by Mats
 %   Dahlgren}
-% \changes{v2.0}{2007/01/17}{Re-write of package by Joseph Wright}
-% \changes{v2.0}{2007/01/17}{Several improvements to BibTeX style
-%   files}
-% \changes{v2.0}{2007/01/17}{License changed to LPPL}
-% \changes{v2.1}{2007/02/15}{Updated documentation to reflect 3rd
-%   edition of ACS Style Guide}
-% \changes{v2.1}{2007/02/15}{BibTeX style improved to reflect 3rd
-%   edition of ACS Style Guide}
-% \changes{v2.2}{2007/06/05}{Added \texttt{natbib} support}
-% \changes{v2.2a}{2007/07/08}{Fixed separation of editor names}
-% \changes{v2.2a}{2007/07/08}{Bug fixes to \texttt{natbib} and list
-%  support}
-% \changes{v2.2a}{2007/07/08}{\texttt{title} field included in output
-%  for \texttt{incollection} records}
-% \changes{v2.2b}{2007/07/09}{Bug fix to name formatting}
+%\changes{v2.0}{2007/01/17}{Re-write of package by Joseph Wright}
+%\changes{v2.0}{2007/01/17}{Several improvements to BibTeX style
+%  files}
+%\changes{v2.0}{2007/01/17}{License changed to LPPL}
+%\changes{v2.1}{2007/02/15}{Updated documentation to reflect 3rd
+%  edition of ACS Style Guide}
+%\changes{v2.1}{2007/02/15}{BibTeX style improved to reflect 3rd
+%  edition of ACS Style Guide}
+%\changes{v2.2}{2007/06/05}{Added \texttt{natbib} support}
+%\changes{v2.2a}{2007/07/08}{Fixed separation of editor names}
+%\changes{v2.2a}{2007/07/08}{Bug fixes to \texttt{natbib} and list
+% support}
+%\changes{v2.2a}{2007/07/08}{\texttt{title} field included in output
+% for \texttt{incollection} records}
+%\changes{v2.2b}{2007/07/09}{Bug fix to name formatting}
+%\changes{v2.2d}{2007/10/16}{Added \textsc{url} field to
+%  \texttt{misc} output}
+%\changes{v2.2d}{2007/10/16}{Package design improved}
 %
-%\DoNotIndex{}
+%\DoNotIndex{\@biblabel,\@eha,\@gobble,\@ifpackageloaded,\@ifundefined}
+%\DoNotIndex{\bibliographystyle,\bibname,\citeform,\citeleft}
+%\DoNotIndex{\citenumfont,\citeright,\DeclareOption,\def,\else,\emph}
+%\DoNotIndex{\fi,\ifx,\NeedsTeXFormat,\newcommand,\newif}
+%\DoNotIndex{\OptionNotUsed,\PackageError,\PackageWarning}
+%\DoNotIndex{\ProcessOptions,\ProvidesPackage,\refname,\relax}
+%\DoNotIndex{\renewcommand,\RequirePackage,\textit,}
+%
+% \title{\texttt{achemso} --- LaTeX and BibTeX support for American
+%   Chemical Society publications%
+%   \thanks{This file describes version \fileversion, last revised
+%           \filedate.}}
+% \author{Joseph Wright%
+%   \thanks{E-mail: joseph.wright@morningstar2.co.uk}}
+% \date{Released \filedate}
 %
 %\maketitle
 %
@@ -86,7 +191,7 @@
 % the requirements of the journals of the American Chemical Society,
 % along with a supporting LaTeX package file. Also provided is a
 % BibTeX style file to be used for bibliography database listings.
-% \end{abstract}
+%\end{abstract}
 %
 % \section{Introduction}
 %
@@ -310,7 +415,9 @@
 % (using the |cite| or |natbib| package as appropriate), and the
 % package ensures that the bibliography will be named ``References''
 %  in all standard document types.\footnote{This only works if the
-% |babel| package is \emph{not} loaded.}
+% \texttt{babel} package is \emph{not} loaded.  Users wanting a
+% system which works with \texttt{babel} should look at the
+% \texttt{chemstyle package}. }
 %
 %  The |achemso| package has five options:
 % \begin{description}
@@ -339,22 +446,21 @@
 %        of |achemso|.
 % \end{description}
 %
-% \StopEventually{\PrintChanges%
-% \bibliography{achemso}}
+% \StopEventually{\bibliography{achemso}}
 %
 % \section{The Package Code}
 %
 %  The package code is not very complicated.  For the
 %  interested reader(s), it is presented here.
 %
-% \begin{macro}{\ACSver}
-% An identifying macro is provided, so that other packages
-% can detect the version of achemso in use.
+% The usual setup code is executed.
 %    \begin{macrocode}
 %<*package>
-\def\ACSver{\texttt{achemso} v2.2b (2007/07/09)}
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{achemso}
+  [2007/10/16 v2.2d LaTeX and BibTeX support for American
+     Chemical Society publications]
 %    \end{macrocode}
-% \end{macro}
 % \begin{macro}{\ACS@sctnnmbr}
 % \begin{macro}{\ACS@lst}
 % \begin{macro}{\ACS@note}
@@ -377,8 +483,10 @@
 % \end{macro}
 % \end{macro}
 % The options are processed.
+%\changes{v2.2d}{2007/10/16}{Added \texttt{notes} option}
 %    \begin{macrocode}
-\DeclareOption{note}{\ACS@notetrue}
+\DeclareOption{note}{\ExecuteOptions{notes}}
+\DeclareOption{notes}{\ACS@notetrue}
 \DeclareOption{number}{\ACS@sctnnmbrtrue}
 \DeclareOption{super}{\ACS@supertrue}
 \DeclareOption{list}{\ACS@listtrue}
@@ -453,21 +561,21 @@
 % The term ``Bibliography'' is not used in chemistry, the value of
 % \cmd{\bibname} is redefined here in all cases where it exists.
 %     \begin{macrocode}
-\ifx\refname\undefined
-   \ifx\bibname\undefined
-      \ACS@biberror
+\@ifundefined{refname}{%
+  \@ifundefined{bibname}{%
+    \ACS@biberror
+  }{%
+    \ifACS@note
+      \renewcommand*{\bibname}{References and Notes}
     \else
-      \ifACS@note
-        \renewcommand*{\bibname}{References and Notes}
-      \else
-        \renewcommand*{\bibname}{References}
-      \fi
+      \renewcommand*{\bibname}{References}
     \fi
- \else
-   \ifACS@note
-     \renewcommand*{\refname}{References and Notes}
-   \fi
-\fi
+  }
+}{%
+  \ifACS@note
+    \renewcommand*{\refname}{References and Notes}
+  \fi
+}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -532,7 +640,9 @@
 %    \begin{macrocode}
 %</package>
 %    \end{macrocode}
-%
+% \PrintChanges
+% \PrintIndex
+% \Finale
 % \iffalse
 %<*bib>
 ENTRY
@@ -557,6 +667,7 @@ ENTRY
     series
     title
     type
+    url
     volume
     year
   }
@@ -671,6 +782,17 @@ FUNCTION {new.block}
     { after.block 'output.state := }
   if$
 }
+
+FUNCTION {new.sentence}
+{ output.state after.block =
+    'skip$
+    { output.state before.all =
+        'skip$
+        { after.sentence 'output.state := }
+      if$
+    }
+  if$
+}
 %<*list>
 
 FUNCTION {add.note}
@@ -1053,6 +1175,13 @@ FUNCTION {format.number.series}
   if$
 }
 
+FUNCTION {format.url}
+{ url empty$
+    { "" }
+    { new.sentence "\url{" url * "}" * }
+  if$
+}
+
 % The specialised |output.bibitem| needed for |natbib| support now
 % follows, along with the various support macros it needs.
 % \iffalse
@@ -1358,8 +1487,8 @@ FUNCTION {format.version}
 
 FUNCTION {empty.misc.check}
 { author empty$ title empty$ howpublished empty$
-  year empty$ note empty$
-  and and and and
+  year empty$ note empty$ url empty$
+  and and and and and
     { "all relevant fields are empty in " cite$ * warning$ }
     'skip$
   if$
@@ -1584,6 +1713,7 @@ FUNCTION {misc}
   if$
   howpublished output
   year output
+  format.url output
   note output
   fin.entry
   empty.misc.check
@@ -1977,6 +2107,8 @@ FUNCTION {begin.bib}
     'skip$
     { preamble$ write$ newline$ }
   if$
+  "\providecommand{\url}[1]{\texttt{#1}}"
+  write$ newline$
   "\providecommand{\refin}[1]{\\ \textbf{Referenced in:} #1}"
   write$ newline$
 %<nat>  "\providecommand{\natexlab}[1]{#1}"
@@ -2012,10 +2144,141 @@ EXECUTE {end.bib}
 }
 
 @MISC{ACS2007,
-  note = {\url{http://pubs.acs.org/books/references.shtml}},
+  url = {http://pubs.acs.org/books/references.shtml},
 }
 %</database>
-% \fi
-
-% \Finale
-% \PrintIndex
+%<*jawltxdoc>
+% The following is convenient method for collecting together package
+% loading, formatting commands and new macros used to format |dtx|
+% files written by the current author.  It is based on the similar
+% files provided by Will Robertson in his packages and Heiko Oberdiek
+% as a stand-alone package.  Notice that it is not intended for other
+% users: there is no error checking!  However, it is covered by the
+% LPPL in the same way as the rest of this package.
+%
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{jawltxdoc}
+  [2007/10/14 v1.0b]
+% First of all, a number of support packages are loaded.
+\usepackage[T1]{fontenc}
+\usepackage[english,UKenglish]{babel}
+\usepackage[scaled=0.95]{helvet}
+\usepackage[version=3]{mhchem}
+\usepackage[final]{microtype}
+\usepackage[osf]{mathpazo}
+\usepackage{booktabs,array,url,graphicx,courier,unitsdef}
+\usepackage{upgreek,ifpdf,listings}
+% If using PDFLaTeX, the source will be attached to the PDF. This
+% is basically the system used by Heiko Oberdiek, but with a check
+% that PDF mode is enabled.
+\ifpdf
+  \usepackage{embedfile}
+  \embedfile[%
+    stringmethod=escape,%
+    mimetype=plain/text,%
+    desc={LaTeX docstrip source archive for package `\jobname'}%
+    ]{\jobname.dtx}
+\fi
+\usepackage{\jobname}
+\usepackage[numbered]{hypdoc}
+%
+% To typeset examples, a new environment is needed.  The code below
+% is based on that in used by |listings|, but is modified to get
+% better formatting for this context.  The formatting of the output
+% is basically that in Will Robertson's |dtx-style| file.
+\newlength\LaTeXwidth
+\newlength\LaTeXoutdent
+\newlength\LaTeXgap
+\setlength\LaTeXgap{1em}
+\setlength\LaTeXoutdent{-0.15\textwidth}
+\def\typesetexampleandcode{%
+  \begin{list}{}{%
+    \setlength\itemindent{0pt}
+    \setlength\leftmargin\LaTeXoutdent
+    \setlength\rightmargin{0pt}
+  }
+  \item
+    \setlength\LaTeXoutdent{-0.15\textwidth}
+    \begin{minipage}[c]{\textwidth-\LaTeXwidth-\LaTeXoutdent-\LaTeXgap}
+      \lst@sampleInput
+    \end{minipage}%
+    \hfill%
+    \begin{minipage}[c]{\LaTeXwidth}%
+      \hbox to\linewidth{\box\lst@samplebox\hss}%
+    \end{minipage}%
+  \end{list}
+}
+\def\typesetcodeandexample{%
+  \begin{list}{}{%
+    \setlength\itemindent{0pt}
+    \setlength\leftmargin{0pt}
+    \setlength\rightmargin{0pt}
+  }
+  \item
+    \begin{minipage}[c]{\LaTeXwidth}%
+      \hbox to\linewidth{\box\lst@samplebox\hss}%
+    \end{minipage}%
+    \lst@sampleInput
+  \end{list}
+}
+\def\typesetfloatexample{%
+  \begin{list}{}{%
+    \setlength\itemindent{0pt}
+    \setlength\leftmargin{0pt}
+    \setlength\rightmargin{0pt}
+  }
+  \item
+    \lst@sampleInput
+    \begin{minipage}[c]{\LaTeXwidth}%
+      \hbox to\linewidth{\box\lst@samplebox\hss}%
+    \end{minipage}%
+  \end{list}
+}
+\def\typesetcodeonly{%
+  \begin{list}{}{%
+    \setlength\itemindent{0pt}
+    \setlength\leftmargin{0pt}
+    \setlength\rightmargin{0pt}
+  }
+  \item
+    \begin{minipage}[c]{\LaTeXwidth}%
+      \hbox to\linewidth{\box\lst@samplebox\hss}%
+    \end{minipage}%
+  \end{list}
+}
+\edef\LaTeXexamplefile{\jobname.tmp}
+\lst@RequireAspects{writefile}
+\newbox\lst@samplebox
+\lstnewenvironment{LaTeXexample}[1][\typesetexampleandcode]{%
+  \let\typesetexample#1
+  \global\let\lst@intname\@empty
+  \setbox\lst@samplebox=\hbox\bgroup
+  \setkeys{lst}{language=[LaTeX]{TeX},tabsize=4,gobble=2,%
+    breakindent=0pt,basicstyle=\small\ttfamily,basewidth=0.51em,%
+    keywordstyle=\color{blue},%
+% Notice that new keywords should be added here. The list is simply
+% macro names needed to typeset documentation of the package
+% author.
+    morekeywords={bibnote,citenote,bibnotetext,bibnotemark,%
+      thebibnote,bibnotename,includegraphics,schemeref,%
+      floatcontentsleft,floatcontentsright,floatcontentscentre,%
+      schemerefmarker,compound,schemerefformat,color,%
+      startchemical,stopchemical,chemical,setupchemical,bottext,%
+      listofschemes}}
+  \lst@BeginAlsoWriteFile{\LaTeXexamplefile}
+}{%
+  \lst@EndWriteFile\egroup
+  \setlength\LaTeXwidth{\wd\lst@samplebox}
+  \typesetexample%
+}
+\def\lst@sampleInput{%
+  \MakePercentComment\catcode`\^^M=10\relax
+  \small%
+  {\setkeys{lst}{SelectCharTable=\lst@ReplaceInput{\^\^I}%
+    {\lst@ProcessTabulator}}%
+    \leavevmode \input{\LaTeXexamplefile}}%
+  \MakePercentIgnore%
+}
+\hyphenation{PDF-LaTeX}
+%</jawltxdoc>
+%\fi
diff --git a/Master/texmf-dist/source/latex/achemso/achemso.ins b/Master/texmf-dist/source/latex/achemso/achemso.ins
index 3947bf80030..a91059ebebf 100644
--- a/Master/texmf-dist/source/latex/achemso/achemso.ins
+++ b/Master/texmf-dist/source/latex/achemso/achemso.ins
@@ -1,27 +1,39 @@
+%%
+%% This is file `achemso.ins',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% achemso.dtx  (with options: `install')
+%%  ----------------------------------------------------------------
+%%  The achemso package - LaTeX and BibTeX support for American
+%%  Chemical Society publications
+%%  Maintained by Joseph Wright
+%%  E-mail: joseph.wright@morningstar2.co.uk
+%%  Released under the LaTeX Project Public License v1.3 or later
+%%  See http://www.latex-project.org/lppl.txt
+%%  ----------------------------------------------------------------
+%% 
 \input docstrip.tex
-\askonceonly
+\keepsilent
+\askforoverwritefalse
 \preamble
-----------------------------------------------------------------
-The achemso package - A BibTeX style for American Chemical
-Society publications
-Maintained by Joseph Wright
-E-mail: joseph.wright@morningstar2.co.uk
-Originally developed by Mats Dahlgren
- (c) 1996-98 by Mats Dahlgren
- (c) 2007 Joseph Wright
-Released under the LaTeX Project Public license v1.3 or later
-----------------------------------------------------------------
-\endpreamble
+ ----------------------------------------------------------------
+ The achemso package - LaTeX and BibTeX support for American
+ Chemical Society publications
+ Maintained by Joseph Wright
+ E-mail: joseph.wright@morningstar2.co.uk
+ Released under the LaTeX Project Public License v1.3 or later
+ See http://www.latex-project.org/lppl.txt
+ ----------------------------------------------------------------
 
+\endpreamble
 \Msg{Generating achemso files:}
 \usedir{tex/latex/contib/achemso}
-\generate{\file{achemso.sty}{\from{achemso.dtx}{package}}
+\generate{\file{\jobname.ins}{\from{\jobname.dtx}{install}}
+          \file{\jobname.sty}{\from{\jobname.dtx}{package}}
+          \file{jawltxdoc.sty}{\from{\jobname.dtx}{jawltxdoc}}
 }
-
-% In order to produce the correct ending for
-% BibTeX files, we have to kill the standard
-% DocStrip postamble.  By using an empty one, but
-% not \empty, we still get the "end of file" message.
 \declarepostamble\bibtexable
 \endpostamble
 \usedir{bibtex/bst/achemso}
@@ -35,3 +47,6 @@ Released under the LaTeX Project Public license v1.3 or later
           \file{achemso.bib}{\from{achemso.dtx}{database}}
 }
 \endbatchfile
+\endinput
+%%
+%% End of file `achemso.ins'.
diff --git a/Master/texmf-dist/tex/latex/achemso/achemso.sty b/Master/texmf-dist/tex/latex/achemso/achemso.sty
index baf6c3f4e29..ae552de1612 100644
--- a/Master/texmf-dist/tex/latex/achemso/achemso.sty
+++ b/Master/texmf-dist/tex/latex/achemso/achemso.sty
@@ -5,26 +5,26 @@
 %% The original source files were:
 %%
 %% achemso.dtx  (with options: `package')
-%% ----------------------------------------------------------------
-%% The achemso package - A BibTeX style for American Chemical
-%% Society publications
-%% Maintained by Joseph Wright
-%% E-mail: joseph.wright@morningstar2.co.uk
-%% Originally developed by Mats Dahlgren
-%%  (c) 1996-98 by Mats Dahlgren
-%%  (c) 2007 Joseph Wright
-%% Released under the LaTeX Project Public license v1.3 or later
-%% ----------------------------------------------------------------
+%%  ----------------------------------------------------------------
+%%  The achemso package - LaTeX and BibTeX support for American
+%%  Chemical Society publications
+%%  Maintained by Joseph Wright
+%%  E-mail: joseph.wright@morningstar2.co.uk
+%%  Released under the LaTeX Project Public License v1.3 or later
+%%  See http://www.latex-project.org/lppl.txt
+%%  ----------------------------------------------------------------
+%% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{achemso}
- [2007/08/22 v2.2c Enhancements for ACS publications]
-\def\ACSver{\texttt{achemso} v2.2b (2007/07/09)}
+  [2007/10/16 v2.2d LaTeX and BibTeX support for American
+     Chemical Society publications]
 \newif \ifACS@sctnnmbr \ACS@sctnnmbrfalse
 \newif \ifACS@list     \ACS@listfalse
 \newif \ifACS@note     \ACS@notefalse
 \newif \ifACS@super    \ACS@supertrue
 \newif \ifACS@natbib   \ACS@natbibfalse
-\DeclareOption{note}{\ACS@notetrue}
+\DeclareOption{note}{\ExecuteOptions{notes}}
+\DeclareOption{notes}{\ACS@notetrue}
 \DeclareOption{number}{\ACS@sctnnmbrtrue}
 \DeclareOption{super}{\ACS@supertrue}
 \DeclareOption{list}{\ACS@listtrue}
@@ -55,21 +55,21 @@
   {\relax}
 \def\ACS@biberror{\PackageError{achemso}%
   {No bibliography name command defined}\@eha}
-\ifx\refname\undefined
-   \ifx\bibname\undefined
-      \ACS@biberror
+\@ifundefined{refname}{%
+  \@ifundefined{bibname}{%
+    \ACS@biberror
+  }{%
+    \ifACS@note
+      \renewcommand*{\bibname}{References and Notes}
     \else
-      \ifACS@note
-        \renewcommand*{\bibname}{References and Notes}
-      \else
-        \renewcommand*{\bibname}{References}
-      \fi
+      \renewcommand*{\bibname}{References}
     \fi
- \else
-   \ifACS@note
-     \renewcommand*{\refname}{References and Notes}
-   \fi
-\fi
+  }
+}{%
+  \ifACS@note
+    \renewcommand*{\refname}{References and Notes}
+  \fi
+}
 \ifACS@sctnnmbr
   \RequirePackage[numbib]{tocbibind}
 \fi
@@ -91,7 +91,6 @@
 \def\ACS@bibwarning{\PackageWarning{achemso}%
   {Additional bibliographystyle command ignored}}
 \def\bibliographystyle{\ACS@bibwarning\@gobble}
-
 \endinput
 %%
 %% End of file `achemso.sty'.
diff --git a/Master/texmf-dist/tex/latex/achemso/jawltxdoc.sty b/Master/texmf-dist/tex/latex/achemso/jawltxdoc.sty
new file mode 100644
index 00000000000..86e4549d433
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/achemso/jawltxdoc.sty
@@ -0,0 +1,131 @@
+%%
+%% This is file `jawltxdoc.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% achemso.dtx  (with options: `jawltxdoc')
+%%  ----------------------------------------------------------------
+%%  The achemso package - LaTeX and BibTeX support for American
+%%  Chemical Society publications
+%%  Maintained by Joseph Wright
+%%  E-mail: joseph.wright@morningstar2.co.uk
+%%  Released under the LaTeX Project Public License v1.3 or later
+%%  See http://www.latex-project.org/lppl.txt
+%%  ----------------------------------------------------------------
+%% 
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{jawltxdoc}
+  [2007/10/14 v1.0b]
+\usepackage[T1]{fontenc}
+\usepackage[english,UKenglish]{babel}
+\usepackage[scaled=0.95]{helvet}
+\usepackage[version=3]{mhchem}
+\usepackage[final]{microtype}
+\usepackage[osf]{mathpazo}
+\usepackage{booktabs,array,url,graphicx,courier,unitsdef}
+\usepackage{upgreek,ifpdf,listings}
+\ifpdf
+  \usepackage{embedfile}
+  \embedfile[%
+    stringmethod=escape,%
+    mimetype=plain/text,%
+    desc={LaTeX docstrip source archive for package `\jobname'}%
+    ]{\jobname.dtx}
+\fi
+\usepackage{\jobname}
+\usepackage[numbered]{hypdoc}
+\newlength\LaTeXwidth
+\newlength\LaTeXoutdent
+\newlength\LaTeXgap
+\setlength\LaTeXgap{1em}
+\setlength\LaTeXoutdent{-0.15\textwidth}
+\def\typesetexampleandcode{%
+  \begin{list}{}{%
+    \setlength\itemindent{0pt}
+    \setlength\leftmargin\LaTeXoutdent
+    \setlength\rightmargin{0pt}
+  }
+  \item
+    \setlength\LaTeXoutdent{-0.15\textwidth}
+    \begin{minipage}[c]{\textwidth-\LaTeXwidth-\LaTeXoutdent-\LaTeXgap}
+      \lst@sampleInput
+    \end{minipage}%
+    \hfill%
+    \begin{minipage}[c]{\LaTeXwidth}%
+      \hbox to\linewidth{\box\lst@samplebox\hss}%
+    \end{minipage}%
+  \end{list}
+}
+\def\typesetcodeandexample{%
+  \begin{list}{}{%
+    \setlength\itemindent{0pt}
+    \setlength\leftmargin{0pt}
+    \setlength\rightmargin{0pt}
+  }
+  \item
+    \begin{minipage}[c]{\LaTeXwidth}%
+      \hbox to\linewidth{\box\lst@samplebox\hss}%
+    \end{minipage}%
+    \lst@sampleInput
+  \end{list}
+}
+\def\typesetfloatexample{%
+  \begin{list}{}{%
+    \setlength\itemindent{0pt}
+    \setlength\leftmargin{0pt}
+    \setlength\rightmargin{0pt}
+  }
+  \item
+    \lst@sampleInput
+    \begin{minipage}[c]{\LaTeXwidth}%
+      \hbox to\linewidth{\box\lst@samplebox\hss}%
+    \end{minipage}%
+  \end{list}
+}
+\def\typesetcodeonly{%
+  \begin{list}{}{%
+    \setlength\itemindent{0pt}
+    \setlength\leftmargin{0pt}
+    \setlength\rightmargin{0pt}
+  }
+  \item
+    \begin{minipage}[c]{\LaTeXwidth}%
+      \hbox to\linewidth{\box\lst@samplebox\hss}%
+    \end{minipage}%
+  \end{list}
+}
+\edef\LaTeXexamplefile{\jobname.tmp}
+\lst@RequireAspects{writefile}
+\newbox\lst@samplebox
+\lstnewenvironment{LaTeXexample}[1][\typesetexampleandcode]{%
+  \let\typesetexample#1
+  \global\let\lst@intname\@empty
+  \setbox\lst@samplebox=\hbox\bgroup
+  \setkeys{lst}{language=[LaTeX]{TeX},tabsize=4,gobble=2,%
+    breakindent=0pt,basicstyle=\small\ttfamily,basewidth=0.51em,%
+    keywordstyle=\color{blue},%
+    morekeywords={bibnote,citenote,bibnotetext,bibnotemark,%
+      thebibnote,bibnotename,includegraphics,schemeref,%
+      floatcontentsleft,floatcontentsright,floatcontentscentre,%
+      schemerefmarker,compound,schemerefformat,color,%
+      startchemical,stopchemical,chemical,setupchemical,bottext,%
+      listofschemes}}
+  \lst@BeginAlsoWriteFile{\LaTeXexamplefile}
+}{%
+  \lst@EndWriteFile\egroup
+  \setlength\LaTeXwidth{\wd\lst@samplebox}
+  \typesetexample%
+}
+\def\lst@sampleInput{%
+  \MakePercentComment\catcode`\^^M=10\relax
+  \small%
+  {\setkeys{lst}{SelectCharTable=\lst@ReplaceInput{\^\^I}%
+    {\lst@ProcessTabulator}}%
+    \leavevmode \input{\LaTeXexamplefile}}%
+  \MakePercentIgnore%
+}
+\hyphenation{PDF-LaTeX}
+\endinput
+%%
+%% End of file `jawltxdoc.sty'.