2 files changed, 39 insertions, 17 deletions
diff --git a/Master/texmf-dist/tex/latex/rsc/jawltxdoc.sty b/Master/texmf-dist/tex/latex/rsc/jawltxdoc.sty
index d29ef298f3d..da4e197b06d 100644
--- a/Master/texmf-dist/tex/latex/rsc/jawltxdoc.sty
+++ b/Master/texmf-dist/tex/latex/rsc/jawltxdoc.sty
@@ -16,14 +16,13 @@
 %% 
 \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{booktabs,array,url,graphicx,courier,xspace}
 \usepackage{upgreek,ifpdf,listings}
 \ifpdf
   \usepackage{embedfile}
@@ -33,14 +32,15 @@
     desc={LaTeX docstrip source archive for package `\jobname'}%
     ]{\jobname.dtx}
 \fi
-\usepackage{\jobname}
+\IfFileExists{\jobname.sty}
+  {\usepackage{\jobname}}{}
 \usepackage[numbered]{hypdoc}
 \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
@@ -57,7 +57,7 @@
     \end{minipage}%
   \end{list}
 }
-\def\typesetcodeandexample{%
+\newcommand*{\typesetcodeandexample}{%
   \begin{list}{}{%
     \setlength\itemindent{0pt}
     \setlength\leftmargin{0pt}
@@ -70,7 +70,7 @@
     \lst@sampleInput
   \end{list}
 }
-\def\typesetfloatexample{%
+\newcommand*{\typesetfloatexample}{%
   \begin{list}{}{%
     \setlength\itemindent{0pt}
     \setlength\leftmargin{0pt}
@@ -83,7 +83,7 @@
     \end{minipage}%
   \end{list}
 }
-\def\typesetcodeonly{%
+\newcommand*{\typesetcodeonly}{%
   \begin{list}{}{%
     \setlength\itemindent{0pt}
     \setlength\leftmargin{0pt}
@@ -102,22 +102,19 @@
   \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},%
-    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}%
@@ -125,7 +122,32 @@
     \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}
 \endinput
 %%
 %% End of file `jawltxdoc.sty'.
diff --git a/Master/texmf-dist/tex/latex/rsc/rsc.sty b/Master/texmf-dist/tex/latex/rsc/rsc.sty
index 60f8d73ff13..865d990d08c 100644
--- a/Master/texmf-dist/tex/latex/rsc/rsc.sty
+++ b/Master/texmf-dist/tex/latex/rsc/rsc.sty
@@ -15,7 +15,7 @@
 %%  ----------------------------------------------------------------
 %% 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{rsc}[2007/10/16 v2.2
+\ProvidesPackage{rsc}[2008/01/16 v2.2b
   Useful chemistry functions]
 \PackageInfo{rsc}{The rsc package has been superseded!}
 \DeclareOption{floatleft}{\AtEndOfPackage{\floatcontentsleft}}