rsc 2.2 (16oct07)

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

2 files changed, 167 insertions, 92 deletions

diff --git a/Master/texmf-dist/tex/latex/rsc/jawltxdoc.sty b/Master/texmf-dist/tex/latex/rsc/jawltxdoc.sty
new file mode 100644
index 00000000000..d29ef298f3d
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/rsc/jawltxdoc.sty
@@ -0,0 +1,131 @@
+%%
+%% This is file `jawltxdoc.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% rsc.dtx  (with options: `jawltxdoc')
+%%  ----------------------------------------------------------------
+%%  The rsc package - BibTeX support for Royal Society of Chemistry
+%%  and Wiley style article
+%%  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'.
diff --git a/Master/texmf-dist/tex/latex/rsc/rsc.sty b/Master/texmf-dist/tex/latex/rsc/rsc.sty
index 6fe4351a872..60f8d73ff13 100644
--- a/Master/texmf-dist/tex/latex/rsc/rsc.sty
+++ b/Master/texmf-dist/tex/latex/rsc/rsc.sty
@@ -6,103 +6,47 @@
 %%
 %% rsc.dtx  (with options: `package')
 %%  ----------------------------------------------------------------
-%%  The rsc package - BibTeX and macro support for Royal Society
-%%  of Chemistry and Wiley chemistry articles
+%%  The rsc package - BibTeX support for Royal Society of Chemistry
+%%  and Wiley style article
 %%  Maintained by Joseph Wright
 %%  E-mail: joseph.wright@morningstar2.co.uk
-%%  Released under the GNU General Public License
-%%  See http://www.gnu.org/licenses/gpl.txt
+%%  Released under the LaTeX Project Public License v1.3 or later
+%%  See http://www.latex-project.org/lppl.txt
 %%  ----------------------------------------------------------------
-
+%% 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{rsc}[2007/08/24 v2.1a
+\ProvidesPackage{rsc}[2007/10/16 v2.2
   Useful chemistry functions]
-\RequirePackage{unitsdef,graphicx,amssymb,fixltx2e,varioref}
-\newif  \ifRSC@fl       \RSC@flfalse
-\newif  \ifRSC@cl       \RSC@clfalse
-\newif  \ifRSC@chapter  \RSC@chapterfalse
-\newif  \ifRSC@angew    \RSC@angewfalse
-\newif  \ifRSC@natbib   \RSC@natbibfalse
-\DeclareOption{floatleft}{\global\RSC@fltrue}
-\DeclareOption{fl}{\global\RSC@fltrue}
-\DeclareOption{captionleft}{\global\RSC@cltrue}
-\DeclareOption{cl}{\global\RSC@cltrue}
-\DeclareOption{chapter}{\global\RSC@chaptertrue%
-  \PassOptionsToPackage{chapter}{chemscheme}}
-\DeclareOption{ch}{\global\RSC@chaptertrue%
-  \PassOptionsToPackage{chapter}{chemscheme}}
-\DeclareOption{angew}{\global\RSC@angewtrue%
-  \global\RSC@cltrue}
-\DeclareOption{natbib}{\global\RSC@natbibtrue}
-\DeclareOption{chemcompounds}%
-  {\PassOptionsToPackage{chemcompounds}{chemscheme}}
-\ProcessOptions
-\RequirePackage{chemscheme}
-\ifRSC@natbib
-  \RequirePackage[numbers,sort&compress,super]{natbib}
-\else
-  \RequirePackage[super]{cite}
-\fi
-\newunit{\cubiccentimeter}{\cm\unitsuperscript{3}}
-\newcommand*{\cmc}{\cubiccentimeter}
-\newcommand*{\Hz}{\hertz}
-\newunit{\Molar}{\textsc{m}}
-\newunit{\molar}{\mole\unitsep\dm\unitsuperscript{--3}}
-\newunit{\mmHg}{mm\unitsep{}Hg}
-\newcommand*{\standardstate}%
-  {\textsuperscript{\rotatebox[origin=c]{140.8}%
-  {\ensuremath{\varnothing}}}}
-\newcommand*{\iPr}%
-  {\ifRSC@angew\emph{i}Pr\else Pr\textsuperscript{i}\fi}
-\newcommand*{\iBu}%
-  {\ifRSC@angew\emph{i}Bu\else Bu\textsuperscript{i}\fi}
-\newcommand*{\sBu}%
-  {\ifRSC@angew\emph{s}Bu\else Bu\textsuperscript{s}\fi}
-\newcommand*{\tBu}%
-  {\ifRSC@angew\emph{t}Bu\else Bu\textsuperscript{t}\fi}
-\ifRSC@angew
-  \ifRSC@natbib
-    \renewcommand\NAT@open{[}\renewcommand\NAT@close{]}
-  \else
-    \def\@citess#1{\textsuperscript{[#1]}}
-  \fi
-  \else
-    \def\@biblabel#1{#1}
-\fi
-\ifRSC@angew
-  \RequirePackage[labelsep=period,labelfont=bf]{caption}
-  \captionsetup[table]{labelsep=colon}
-\else
-  \RequirePackage[labelsep=quad,labelfont=bf]{caption}
-\fi
-\ifRSC@cl
-  \captionsetup{singlelinecheck=off}
-\else
-\fi
-\ifRSC@angew
-\else
-  \renewcommand{\figurename}{Fig.}
-\fi
-\@ifclassloaded{memoir}
-  {\let\newfloat\@undefined
-   \RequirePackage{float}}
-  {}
-\floatstyle{plaintop}
-\restylefloat{table}
-\floatstyle{plain}
-\restylefloat{scheme}
-\restylefloat{figure}
-\floatplacement{table}{htbp}
-\floatplacement{scheme}{htbp}
-\floatplacement{figure}{htbp}
-\ifRSC@fl
-  \floatcontentsleft
-\else
-  \floatcontentscentre
-\fi
-\labelformat{scheme}{\schemename~#1}
-\labelformat{figure}{\figurename~#1}
-\labelformat{table}{\tablename~#1}
+\PackageInfo{rsc}{The rsc package has been superseded!}
+\DeclareOption{floatleft}{\AtEndOfPackage{\floatcontentsleft}}
+\DeclareOption{fl}{\ExecuteOptions{floatleft}}
+\DeclareOption{natbib}{\AtEndOfPackage{%
+  \RequirePackage[numbers,sort&compress,super]{natbib}}}
+\DeclareOption{rsc}{%
+  \PassOptionsToPackage{\CurrentOption}{chemstyle}%
+  \def\@biblabel#1{#1}%
+  \PackageInfo{rsc}%
+    {Loading the chemstyle package with the `rsc' option}%
+}
+\DeclareOption{angew}{%
+  \PassOptionsToPackage{\CurrentOption}{chemstyle}%
+  \PackageInfo{rsc}%
+    {Loading the chemstyle package with the `angew' option}%
+  \AtBeginDocument{%
+    \@ifpackageloaded{natbib}
+      {\renewcommand*\NAT@open{[}\renewcommand*\NAT@close{]}}
+      {\def\@citess#1{\textsuperscript{[#1]}}}
+  }
+}
+\DeclareOption*{\PassOptionsToPackage{\CurrentOption}{chemstyle}}
+\ExecuteOptions{rsc}
+\ProcessOptions\relax
+\RequirePackage{chemstyle}
+\floatcontentscentre
+\AtEndOfPackage{
+  \@ifpackageloaded{natbib}{}
+    {\RequirePackage[super]{cite}}
+}
 \endinput
 %%
 %% End of file `rsc.sty'.