rsc update from ctan

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

2 files changed, 261 insertions, 183 deletions

diff --git a/Master/texmf-dist/source/latex/rsc/rsc.dtx b/Master/texmf-dist/source/latex/rsc/rsc.dtx
index ee961a0da6a..7256cac6f41 100644
--- a/Master/texmf-dist/source/latex/rsc/rsc.dtx
+++ b/Master/texmf-dist/source/latex/rsc/rsc.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright (C) 2006-2007 by
+% Copyright (C) 2006-2008 by
 %    Joseph Wright <joseph.wright@morningstar2.co.uk>
 %
 % This work may be distributed and/or modified under the
@@ -8,8 +8,8 @@
 % 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.
+% and version 1.3c or later is part of all distributions of
+% LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status ``maintained.''
 %
@@ -20,11 +20,14 @@
 %                                       rsc.sty,
 %                                       rsc.pdf,
 %                                       rsc.bst,
+%                                       rscM.bst
 %                                       rscnat.bst,
 %                                       rsc-mc.bst,
 %                                       angew.bst,
-%                                       angewnat.bst and
-%                                       angew-mc.bst
+%                                       angeM.bst
+%                                       angewnat.bst,
+%                                       angew-mc.bst and
+%                                       jawltxdoc.sty
 % Unpacking:
 %    (a) If achemso.ins is present:
 %           tex rsc.ins
@@ -97,6 +100,12 @@
           \file{angewnat.bst}{\from{rsc.dtx}{bib,angew,nat}}
           \file{angew-mc.bst}{\from{rsc.dtx}{bib,angew,mc}}
 }
+\generate{\usepostamble\bibtexable
+          \file{rscM.bst}{\from{rsc.dtx}{bib,rsc,mcp}}
+          \file{angewM.bst}{\from{rsc.dtx}{bib,angew,mcp}}
+          \file{rscnatM.bst}{\from{rsc.dtx}{bib,rsc,nat,mcp}}
+          \file{angewnatM.bst}{\from{rsc.dtx}{bib,angew,nat,mcp}}
+}
 \endbatchfile
 %</install>
 %<*ignore>
@@ -141,64 +150,80 @@
 %\GetFileInfo{\jobname.sty}
 %
 %\changes{v2.1}{2007/08/05}{Moved float centring to
-%  \texttt{chemscheme} package}
+%  \pkg{chemscheme} package}
 %\changes{v2.0}{2007/07/21}{Complete re-write of float support}
 %\changes{v2.0}{2007/07/21}{General tidying of code}
 %\changes{v1.0}{2006/11/08}{Initial release of packaged rsc.bst}
-%\changes{v2.1a}{2007/08/24}{Fixed error in BibTeX misc output}
+%\changes{v2.1a}{2007/08/24}{Fixed error in \BibTeX\ misc output}
 %\changes{v2.2}{2007/10/16}{Added \textsc{url} support to
 %  \texttt{Misc} field}
 %\changes{v2.2}{2007/10/16}{License change to LPPL}
 %\changes{v2.2}{2007/10/16}{Improved packaging}
-%\changes{v2.2}{2007/10/16}{LaTeX package converted to stub}
+%\changes{v2.2}{2007/10/16}{\LaTeX\ package converted to stub}
+%\changes{v2.2a}{2008/01/16}{Added \pkg{mciteplus} support}
+%\changes{v2.2a}{2008/01/16}{Documentation improvements}
+%\changes{v2.2b}{2008/01/16}{Added combined \pkg{mciteplus} and
+%  \pkg{natbib} support}
 %
 %\DoNotIndex{}
 %
-%\title{The \texttt{rsc} package --- BibTeX support for
-%  Royal Society of Chemistry and Wiley style articles%
+%\title{The \currpkg\ package --- \texorpdfstring{\BibTeX}{BibTeX}
+%  support for Royal Society of Chemistry and Wiley style articles^^A
 %  \thanks{This file describes version \fileversion, last revised
 %    \filedate.}}
-%\author{Joseph Wright%
+%\author{Joseph Wright^^A
 %  \thanks{E-mail: joseph.wright@morningstar2.co.uk}}
 %\date{Released \filedate}
 %
 %\maketitle
 %
 %\begin{abstract}
-%
-% The |rsc| package provides BibTeX style files to produce
-% bibliographies in accordance with the guidelines of the
-% Royal Society of Chemistry and Wiley chemistry-related
-% journals.
-%
+% The \currpkg package provides \BibTeX\ style files to produce
+% bibliographies in accordance with the guidelines of the Royal
+% Society of Chemistry and Wiley chemistry-related journals.  The
+% style files are available in versions for the standard \LaTeX\
+% citation methods and for use with \pkg{natbib}.  Versions for use
+% with \pkg{mcite} and \pkg{mciteplus} are also available.
 %\end{abstract}
 %
-% \section{Introduction}
+%\section{Introduction}
+% Although synthetic chemists do not, in the main, use \LaTeX\ for
+% the preparation of journal articles, it would be nice to be able to
+% use it for reports.  The package \pkg{achemso} provides for a
+% \BibTeX\ style and other support for reports in the style of the
+% American Chemical Society.  The aim of the \currpkg package is to
+% provide similar support for the style favoured by the Royal Society
+% of Chemistry.  The package also provides support for the style used
+% in Wiley-published journals.
 %
-% Although synthetic chemists do not, in the main, use LaTeX for the
-% preparation of journal articles, it would be nice to be able to use
-% it for reports.  The package |achemso| provides for a BibTeX style
-% and other support for reports in the style of the American Chemical
-% Society.  The aim of the |rsc| package is to provide similar support
-% for the style favoured by the Royal Society of Chemistry.  The
-% package also provides support for the style used in Wiley-published
-% journals.
+% The \ext{bst} files are available in a number of variations.  Those
+% for RSC journals are names \file{rsc\meta{id}.bst}, those for Wiley
+% journals are \file{angew\meta{id}.bst}.  The value of \meta{id} can
+% be:
+%\begin{itemize}
+%  \item \meta{(none)} For use with standard \LaTeX\ citations (or
+%    the \pkg{cite} package;
+%  \item \meta{nat} \pkg{natbib}-compatible styles (which need the
+%    \opt{numbers,super} options with \pkg{natbib};
+%  \item \meta{M} Designed for use with the \pkg{mciteplus} package;
+%  \item \meta{natM} Combine \pkg{mciteplus} and \pkg{natbib} support;
+%  \item \meta{-mc} For use with the \pkg{mcite} package, and provided
+%    for back-compatibility only.
+%\end{itemize}
 %
-% In addition to providing the core |*.bst| files, this package also
-% generates |*-mc.bst|, |*nat.bst|, |rsc.sty| and |rsc.tex|.  The
-% |*-mc.bst| files includes support for the |mcite| package, allowing
-% the generation of multiple references.  The |*nat.bst| files allow
-% the use of the |natbib| package with BibTeX style files.
+% For backward-compatibility the package provides the
+% \file{rsc.sty} file. This has been superseded by the
+% \pkg{chemstyle} package, and may be dropped in a future version of
+% \pkg{rsc}.
 %
-% \section{Bibliography design decisions}
-%
-% Along with almost every BibTeX style file, much of the |bst| file
-% design is inherited from the original BibTeX style files provided
-% by Oren Patashnik.  However, while the original styles were
-% designed to be flexible, the style files here are designed to do a
-% single job.  Thus much of the original flexibility has been
-% stripped out to give a clearer design. This has many be achieved
-% by removing unused functions.  The style files provided here are
+%\section{Bibliography design decisions}
+% Along with almost every \BibTeX\ style file, much of the \ext{bst}
+% file design is inherited from the original \BibTeX\ style files
+% provided by Oren Patashnik.  However, while the original styles
+% were designed to be flexible, the style files here are designed to
+% do a single job.  Thus much of the original flexibility has been
+% stripped out to give a clearer design. This has many be achieved by
+% removing unused functions.  The style files provided here are
 % therefore poor examples for others to work from!
 %
 % Chemistry journals give only minimal guidance on the format of
@@ -208,23 +233,20 @@
 % I have gone with I feel is most consistent.
 % Please e-mail me if you feel I have got things wrong!
 %
-% \section{Bibliography usage information}
-%
-% \subsection{Cross-references}
-%
-% Unlike most BibTeX styles, the style files provided here do not
-% support cross-referencing between references. Using |crossref|
-% will still fill in missing information, but will not output
-% ``see ref.~X''.  Chemistry references do not lend themselves
-% to the use of |crossref|.
+%\section{Bibliography usage information}
+%\subsection{Cross-references}
+% Unlike most \BibTeX\ styles, the style files provided here do not
+% support cross-referencing between references. Using \opt{crossref}
+% will still fill in missing information, but will not output ``see
+% ref.~X''.  Chemistry references do not lend themselves to the use
+% of \opt{crossref}.
 %
-% \subsection{Notes}
-%
-% As in |pccp.bst|, notes are not output for most reference types.
-% The reasoning here is that it is difficult to predict how people will
-% want to use notes.  In chemistry, they may be used in several forms,
-% for example:
-% \begin{itemize}
+%\subsection{Notes}
+% As in \file{pccp.bst}, notes are not output for most reference
+% types. The reasoning here is that it is difficult to predict how
+% people will want to use notes.  In chemistry, they may be used in
+% several forms, for example:
+%\begin{itemize}
 %   \item See for example: I. V. Gostunskaya, V. S. Petrova, A. I.
 %   Leonava, V. A. Mironava, M. Abubaker, and B. Kazanski,
 %   \emph{Neftekhimiya}, 1967, \textbf{7}, 3--8.
@@ -234,76 +256,72 @@
 %   \item I. V. Gostunskaya, V. S. Petrova, A. I. Leonava, V. A.
 %   Mironava, M. Abubaker, and B. Kazanski, \emph{Neftekhimiya}, 1967,
 %   \textbf{7}, 3--8 (\emph{Chem. Abs.}, 1967, \textbf{67}, 21276t).
-% \end{itemize}
+%\end{itemize}
 % This is pretty much impossible to handle automatically, especially as
 % the format you want might change depending on the report you are
 % writing.  So I would recommend using the |misc| type, and doing the
 % formatting by hand.  If other people feel the behaviour is not the
 % best solution, please e-mail me.
 %
-% \subsection{Multiple citations}
-%
-% By default, BibTeX does not handle producing compound references.
-% Although it is not perfect, the package |mcite| allows you to
-% produce references of the format:
-% \begin{enumerate}
-%    \item K.~\"Ofele, \emph{J.~Organomet.~Chem.}, 1968,
-%    \textbf{12}, P42--P43; C.~D.~Abernethy, A.~H.~Cowley and R.~A.\
-%    Jones, \emph{J.~Organomet.~Chem.}, 2000, \textbf{596},
-%    3--5.
-% \end{enumerate}
-% Although the package only requires a minor modification of the
-% BibTeX style file, it seems a good idea to provide one
-% automatically.  The |*-mc.bst| are produced with the necessary
-% modifications made to |*.bst|.  Note that this requires
-% |\usepackage{mcite}| in your LaTeX source.
-%
-% \subsection{\texttt{natbib} support}
-%
-% The files |rscnat.bst| and |angewnat.bst| provide support for the
-% generation of bibliographies for use with the |natbib| package.
-% As well as altering the |\bibliographystyle| command appropriately,
-% you also need to load |natbib|.  The |rsc| package file provides
-% the option |natbib|, which loads |natbib| automatically (normally,
-% |rsc| loads the |cite| package).  Note that |natbib| and |mcite|
-% are incompatible, so you must choose one or the other.
-%
-% \subsection{Additional entry types}
+%\subsection{Multiple citations}
+% By default, \BibTeX\ does not handle producing compound references.
+% The \pkg{mciteplus} package solves this problem, and is highly
+% recommended to users of \currpkg.  This allows you to put something
+% like:
+%\begin{LaTeXexample}[\typesetcodeonly]
+%  \documentclass{article}
+%  \usepackage{mciteplus}
+%  \begin{document}
+%  \cite{Ofele1968,*Abernethy2000}
+%  \bibliography{example}
+%  \bibliographystyle{rscM}
+%  \end{document}
+%\end{LaTeXexample}
+% and get output of the form:
+%\begin{enumerate}
+%  \item (\emph{a}) K.~\"Ofele, \emph{J.~Organomet.~Chem.}, 1968,
+%    \textbf{12}, P42--P43; (\emph{b}) C.~D.~Abernethy, A.~H.~Cowley
+%    and R.~A.\ Jones, \emph{J.~Organomet.~Chem.}, 2000,
+%    \textbf{596}, 3--5.
+%\end{enumerate}
+% in the bibliography.
 %
-% In order to ensure compatibility with the |achemso| package, the
-% non-standard entry types |remark|, |inpress| and |submitted| are
-% supported.  The implementation is modelled on |achemso.bst|, but the
-% |notes| field is not used for |inpress| and |submitted|.
+% Previous versions of \currpkg recommended the \pkg{mcite} package
+% for compound citations.  With the release of \pkg{mciteplus},
+% \pkg{mcite} is superseded for this
+% purpose.\footnote{\pkg{mciteplus} fixes a number of bugs in
+% \pkg{mcite} and adds the ability to add labels to each compound
+% reference.}  However, \currpkg continues to provide the
+% \file{rsc-mc} and \file{angew-mc} \BibTeX\ styles for users of
+% \pkg{mcite}.
 %
-% \section{Additional macros}
+%\subsection{\pkg{natbib} support}
+% The files \file{rscnat.bst} and \file{angewnat.bst} provide support
+% for the generation of bibliographies for use with the \pkg{natbib}
+% package. As well as altering the \cs{bibliographystyle} command
+% appropriately, you also need to load \pkg{natbib}.  The \currpkg
+% package file provides the option \opt{natbib}, which loads
+% \pkg{natbib} automatically (normally, \currpkg loads the \pkg{cite}
+% package).
 %
-% The macros provided by |rsc.sty| have been migrated (with
-% improvements) to the |chemstyle| package.  Users are strongly
-% advised to use the new package, with either
-%\begin{LaTeXexample}[\typesetcodeonly]
-% \usepackage[rsc]{chemstyle}
-%\end{LaTeXexample}
-%or
-%\begin{LaTeXexample}[\typesetcodeonly]
-% \usepackage[angew]{chemstyle}
-%\end{LaTeXexample}
-% as appropriate in place of loading the |rsc| macros.  Currently,
-% the |rsc| package will load |chemstyle| with appropriate options.
-% There will be no further updates to the |rsc| LaTeX package.
+%\subsection{Additional entry types}
+% In order to ensure compatibility with the \pkg{achemso} package,
+% the non-standard entry types |remark|, |inpress| and |submitted|
+% are supported.  The implementation is modelled on
+% \file{achemso.bst}, but the |notes| field is not used for |inpress|
+% and |submitted|.
 %
-% \StopEventually{}
+%\StopEventually{}
 %
 % \iffalse
 %<*package>
 % \fi
-% \section{The package code}
-%
-% \subsection{Setup code}
-%
+%\section{The package code}
+%\subsection{Setup code}
 % First of all, the package identifies itself.
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{rsc}[2007/10/16 v2.2
+\ProvidesPackage{rsc}[2008/01/16 v2.2b
   Useful chemistry functions]
 %    \end{macrocode}
 % A warning is given that the package has been superseded.
@@ -318,9 +336,9 @@
 \DeclareOption{natbib}{\AtEndOfPackage{%
   \RequirePackage[numbers,sort&compress,super]{natbib}}}
 %    \end{macrocode}
-% The default option is |rsc|.  This loads |chemstyle| with the
-% appropriate option, then alters the bibliography format and reports
-% back to the user.
+% The default option is \opt{rsc}.  This loads \pkg{chemstyle} with
+% the appropriate option, then alters the bibliography format and
+% reports back to the user.
 %    \begin{macrocode}
 \DeclareOption{rsc}{%
   \PassOptionsToPackage{\CurrentOption}{chemstyle}%
@@ -345,21 +363,21 @@
   }
 }
 %    \end{macrocode}
-% Anything else is passed to |chemstyle|.
+% Anything else is passed to \pkg{chemstyle}.
 %    \begin{macrocode}
 \DeclareOption*{\PassOptionsToPackage{\CurrentOption}{chemstyle}}
 %    \end{macrocode}
-% The |rsc| option is the default.
+% The \currpkg option is the default.
 %    \begin{macrocode}
 \ExecuteOptions{rsc}
 \ProcessOptions\relax
 %    \end{macrocode}
-% |chemstyle| can now be loaded.
+% \pkg{chemstyle} can now be loaded.
 %    \begin{macrocode}
 \RequirePackage{chemstyle}
 \floatcontentscentre
 %    \end{macrocode}
-% If |natbib| is not loaded, then |cite| is needed.
+% If \pkg{natbib} is not loaded, then \pkg{cite} is needed.
 %    \begin{macrocode}
 \AtEndOfPackage{
   \@ifpackageloaded{natbib}{}
@@ -370,14 +388,14 @@
 % \iffalse
 %</package>
 % \fi
-% \section{The BibTeX style files}
-%
-% A great deal of the BibTeX style file information is lifted
-% more or less directly from the standard style files, the
-% |custom-bib| package or \emph{Taming the BeaST}.  The rest
-% consists of minor edits to obtain the correct format or support
-% the |natbib| and |mcite| packages.  Only two functions are novel
-% to this package, and are given here for the interested reader.
+%\section{The \texorpdfstring{\BibTeX}{BibTeX} style files}
+% A great deal of the \BibTeX\ style file information is lifted more
+% or less directly from the standard style files, the
+% \pkg{custom-bib} package or \emph{Taming the BeaST}.  The rest
+% consists of minor edits to obtain the correct format or support the
+% \pkg{natbib}, \pkg{mcite} and \pkg{mciteplus} packages.  Only two
+% functions are novel to this package, and are given here for the
+% interested reader.
 %
 % \iffalse
 %<*bib>
@@ -484,15 +502,16 @@ FUNCTION {output.bibitem}
 }
 
 %</!nat>
+%<*!mc&!mcp>
 FUNCTION {fin.entry}
-%<*!mc>
 { add.period$
   write$
   newline$
 }
 
-%</!mc>
+%</!mc&!mcp>
 %<*mc>
+FUNCTION {fin.entry}
 { write$
   "\relax" write$
   newline$
@@ -500,6 +519,42 @@ FUNCTION {fin.entry}
 }
 
 %</mc>
+%<*mcp>
+INTEGERS {would.add.period.textlen}
+FUNCTION {would.add.period}
+{ duplicate$
+  add.period$
+  text.length$
+  'would.add.period.textlen :=
+  duplicate$
+  text.length$
+  would.add.period.textlen =
+    { #0 }
+    { #1 }
+  if$
+}
+
+FUNCTION {fin.entry}
+{ would.add.period
+    { "\relax" * write$ newline$
+      "\mciteBstWouldAddEndPuncttrue" write$ newline$
+      "\mciteSetBstMidEndSepPunct{\mcitedefaultmidpunct}"
+      write$ newline$
+      "{\mcitedefaultendpunct}{\mcitedefaultseppunct}\relax"
+    }
+    { "\relax" * write$ newline$
+      "\mciteBstWouldAddEndPunctfalse" write$ newline$
+      "\mciteSetBstMidEndSepPunct{\mcitedefaultmidpunct}"
+      write$ newline$
+      "{}{\mcitedefaultseppunct}\relax"
+    }
+  if$
+  write$
+  newline$
+  "\EndOfBibitem" write$
+}
+
+%</mcp>
 
 FUNCTION {not}
 {   { #0 }
@@ -1734,7 +1789,7 @@ EXECUTE {initialize.longest.label}
 ITERATE {forward.pass}
 
 %</nat>
-%<*!mc&!nat>
+%<*!mcp>
 FUNCTION {begin.bib}
 { preamble$ empty$
     'skip$
@@ -1742,50 +1797,58 @@ FUNCTION {begin.bib}
   if$
   "\providecommand{\url}[1]{\texttt{#1}}"
   write$ newline$
-  "\begin{thebibliography}{"  longest.label  * "}" * write$ newline$
+%<!nat&!mc>  "\begin{thebibliography}{"  longest.label  * "}" * write$ newline$
+%<!nat&mc>  "\begin{mcbibliography}{"  longest.label  * "}" * write$ newline$
+%<nat>  "\begin{thebibliography}{" number.label int.to.str$ * "}" *
+%<nat>  write$ newline$
+%<nat>  "\providecommand{\natexlab}[1]{#1}"
+%<nat>  write$ newline$
 }
 
-%</!mc&!nat>
-%<*!mc&nat>
+%</!mcp>
+%<*mcp>
 FUNCTION {begin.bib}
 { preamble$ empty$
     'skip$
     { preamble$ write$ newline$ }
   if$
-  "\providecommand{\url}[1]{\texttt{#1}}"
+  "\ifx\mcitethebibliography\mciteundefinedmacro"
   write$ newline$
-  "\begin{thebibliography}{" number.label int.to.str$ * "}" *
+%<rsc>  "\PackageError{rscM.bst}{mciteplus.sty has not been loaded}"
+%<angew>  "\PackageError{angewM.bst}{mciteplus.sty has not been loaded}"
   write$ newline$
-  "\providecommand{\natexlab}[1]{#1}"
+  "{This bibstyle requires the use of the mciteplus package.}\fi"
   write$ newline$
-}
-
-%</!mc&nat>
-%<*mc>
-FUNCTION {begin.bib}
-{ preamble$ empty$
-    'skip$
-    { preamble$ write$ newline$ }
-  if$
-  "\providecommand{\url}[1]{\texttt{#1}}"
+%<!nat>  "\begin{mcitethebibliography}{"  longest.label  * "}" * write$ newline$
+%<nat>  "\begin{mcitethebibliography}{"  number.label int.to.str$  * "}" *
+%<nat>  write$ newline$
+%<nat>  "\providecommand{\natexlab}[1]{#1}"
+%<nat>  write$ newline$
+  "\mciteSetBstSublistMode{f}"
+  write$ newline$
+%<rsc>  "\mciteSetBstMaxWidthForm{subitem}{(\emph{\alph{mcitesubitemcount}})}"
+%<angew>  "\mciteSetBstMaxWidthForm{subitem}{\alph{mcitesubitemcount})}"
+  write$ newline$
+  "\mciteSetBstSublistLabelBeginEnd{\mcitemaxwidthsubitemform\space}"
+  write$ newline$
+  "{\relax}{\relax}"
   write$ newline$
-  "\begin{mcbibliography}{"  longest.label  * "}" * write$ newline$
 }
 
-%</mc>
+%</mcp>
 EXECUTE {begin.bib}
 
 EXECUTE {init.state.consts}
 
 ITERATE {call.type$}
 
-%<*!mc>
+%<*!mc&!mcp>
 FUNCTION {end.bib}
 { newline$
   "\end{thebibliography}" write$ newline$
 }
 
-%</!mc>
+%</!mc&!mcp>
 %<*mc>
 FUNCTION {end.bib}
 { newline$
@@ -1793,6 +1856,13 @@ FUNCTION {end.bib}
 }
 
 %</mc>
+%<*mcp>
+FUNCTION {end.bib}
+{ newline$
+  "\end{mcitethebibliography}" write$ newline$
+}
+
+%</mcp>
 EXECUTE {end.bib}
 %    \end{macrocode}
 %</bib>
@@ -1801,29 +1871,16 @@ EXECUTE {end.bib}
 %\Finale
 %\iffalse
 %<*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{booktabs,array,url,graphicx,courier,xspace}
 \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[%
@@ -1832,19 +1889,15 @@ EXECUTE {end.bib}
     desc={LaTeX docstrip source archive for package `\jobname'}%
     ]{\jobname.dtx}
 \fi
-\usepackage{\jobname}
+\IfFileExists{\jobname.sty}
+  {\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{%
+\newcommand*{\typesetexampleandcode}{%
   \begin{list}{}{%
     \setlength\itemindent{0pt}
     \setlength\leftmargin\LaTeXoutdent
@@ -1861,7 +1914,7 @@ EXECUTE {end.bib}
     \end{minipage}%
   \end{list}
 }
-\def\typesetcodeandexample{%
+\newcommand*{\typesetcodeandexample}{%
   \begin{list}{}{%
     \setlength\itemindent{0pt}
     \setlength\leftmargin{0pt}
@@ -1874,7 +1927,7 @@ EXECUTE {end.bib}
     \lst@sampleInput
   \end{list}
 }
-\def\typesetfloatexample{%
+\newcommand*{\typesetfloatexample}{%
   \begin{list}{}{%
     \setlength\itemindent{0pt}
     \setlength\leftmargin{0pt}
@@ -1887,7 +1940,7 @@ EXECUTE {end.bib}
     \end{minipage}%
   \end{list}
 }
-\def\typesetcodeonly{%
+\newcommand*{\typesetcodeonly}{%
   \begin{list}{}{%
     \setlength\itemindent{0pt}
     \setlength\leftmargin{0pt}
@@ -1906,25 +1959,19 @@ EXECUTE {end.bib}
   \let\typesetexample#1
   \global\let\lst@intname\@empty
   \setbox\lst@samplebox=\hbox\bgroup
-  \setkeys{lst}{language=[LaTeX]{TeX},tabsize=4,gobble=2,%
+  \setkeys{lst}{language=[LaTeX]{TeX},tabsize=4,gobble=3,%
     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}}
+    morekeywords={% notes2bib
+      niibsetup,bibnote,bibnotetext,bibnotemark,thebibnote,%
+      flushnotestack,citenote,printbibnotes}}
   \lst@BeginAlsoWriteFile{\LaTeXexamplefile}
 }{%
   \lst@EndWriteFile\egroup
   \setlength\LaTeXwidth{\wd\lst@samplebox}
   \typesetexample%
 }
-\def\lst@sampleInput{%
+\newcommand*{\lst@sampleInput}{%
   \MakePercentComment\catcode`\^^M=10\relax
   \small%
   {\setkeys{lst}{SelectCharTable=\lst@ReplaceInput{\^\^I}%
@@ -1932,6 +1979,31 @@ EXECUTE {end.bib}
     \leavevmode \input{\LaTeXexamplefile}}%
   \MakePercentIgnore%
 }
-\hyphenation{PDF-LaTeX}
+\newcommand*{\pkg}[1]{\textsf{#1}}
+\newcommand*{\currpkg}{\pkg{\jobname}\xspace}
+\newcommand*{\opt}[1]{\texttt{#1}}
+\newcommand*{\file}[1]{\texttt{#1}}
+\newcommand*{\ext}[1]{\file{.#1}}
+\newcommand*{\latin}[1]{\emph{#1}}
+\newcommand*{\etc}{%
+  \@ifnextchar.
+    {\latin{etc}}
+    {\latin{etc.}}
+  \xspace}
+\newcommand*{\eg}{%
+  \@ifnextchar.
+    {\latin{e.g}}
+    {\latin{e.g.}}
+  \xspace}
+\newcommand*{\ie}{%
+  \@ifnextchar.
+    {\latin{i.e}}
+    {\latin{i.e.}}
+  \xspace}
+\newcommand*{\AMS}{{\protect\usefont{OMS}{cmsy}{m}{n}%
+  A\kern-.1667em\lower.5ex\hbox{M}\kern-.125emS}}
+\providecommand*{\eTeX}{\ensuremath{\varepsilon}-\TeX}
+\newcommand*{\XeTeX}
+  {X\kern-.125em\lower.5ex\hbox{\reflectbox{E}}\kern-.1667em\TeX}
 %</jawltxdoc>
 %\fi
diff --git a/Master/texmf-dist/source/latex/rsc/rsc.ins b/Master/texmf-dist/source/latex/rsc/rsc.ins
index acb3c42dbad..c0967115191 100644
--- a/Master/texmf-dist/source/latex/rsc/rsc.ins
+++ b/Master/texmf-dist/source/latex/rsc/rsc.ins
@@ -45,6 +45,12 @@
           \file{angewnat.bst}{\from{rsc.dtx}{bib,angew,nat}}
           \file{angew-mc.bst}{\from{rsc.dtx}{bib,angew,mc}}
 }
+\generate{\usepostamble\bibtexable
+          \file{rscM.bst}{\from{rsc.dtx}{bib,rsc,mcp}}
+          \file{angewM.bst}{\from{rsc.dtx}{bib,angew,mcp}}
+          \file{rscnatM.bst}{\from{rsc.dtx}{bib,rsc,nat,mcp}}
+          \file{angewnatM.bst}{\from{rsc.dtx}{bib,angew,nat,mcp}}
+}
 \endbatchfile
 \endinput
 %%