achemso update (16oct07)

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

2 files changed, 157 insertions, 27 deletions

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'.