rsc update (1jan07)

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

1 files changed, 35 insertions, 14 deletions

diff --git a/Master/texmf-dist/tex/latex/rsc/rsc.sty b/Master/texmf-dist/tex/latex/rsc/rsc.sty
index 30d162cfa96..08ae5897ad9 100644
--- a/Master/texmf-dist/tex/latex/rsc/rsc.sty
+++ b/Master/texmf-dist/tex/latex/rsc/rsc.sty
@@ -7,15 +7,18 @@
 %% rsc.dtx  (with options: `package')
 %%  ----------------------------------------------------------------
 %%  The rsc package - BibTeX and macro support for Royal Society
-%%  of Chemistry style articles
+%%  of Chemistry and Wiley chemistry articles
 %%  Maintained by Joseph A. Wright
 %%  E-mail: joseph.wright@morningstar2.co.uk
 %%  Released under the GNU General Public License
 %%  See http://www.gnu.org/licenses/gpl.txt
 %%  ----------------------------------------------------------------
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{rsc}[2006/11/08 v1.0 Useful chemistry functions]
+\ProvidesPackage{rsc}[2007/01/01 v1.1
+Useful chemistry functions]
 \RequirePackage{unitsdef,graphicx,amssymb,fixltx2e,float,varioref}
+\RequirePackage[super]{cite}
+\RequirePackage[labelsep=quad,labelfont=bf]{caption}
 \newif\ifRSC@floatcentre\RSC@floatcentretrue
 \DeclareOption{floatleft}{\global\RSC@floatcentrefalse}
 \DeclareOption{fl}{\global\RSC@floatcentrefalse}
@@ -24,6 +27,10 @@
 \DeclareOption{cl}{\global\RSC@captioncentrefalse}
 \newif\ifRSC@chapter\RSC@chapterfalse
 \DeclareOption{chapter}{\global\RSC@chaptertrue}
+\DeclareOption{ch}{\global\RSC@chaptertrue}
+\newif\ifRSC@angew\RSC@angewfalse
+\DeclareOption{angew}{\global\RSC@angewtrue%
+\global\RSC@captioncentrefalse}
 \ProcessOptions
 \newunit{\cubiccentimeter}{\cm\unitsuperscript{3}}
 \newcommand*{\cmc}{\cubiccentimeter}
@@ -34,12 +41,26 @@
 \newcommand*{\standardstate}%
   {\textsuperscript{\rotatebox[origin=c]{140.8}%
   {\ensuremath{\varnothing}}}}
-\newcommand*{\iPr}{Pr\textsuperscript{i}}
-\newcommand*{\iBu}{Bu\textsuperscript{i}}
-\newcommand*{\tBu}{Bu\textsuperscript{t}}
+\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*{\tBu}{\ifRSC@angew\emph{t}Pr\else Bu\textsuperscript{t}\fi}
+\ifRSC@angew
+  \def\@citess#1{\textsuperscript{[#1]}}
+\fi
+\ifRSC@angew
+  \floatstyle{plaintop}
+  \captionsetup[Table]{labelsep=colon}
+  \captionsetup[Scheme]{labelsep=period}
+  \captionsetup[Figure]{labelsep=period}
+\fi
+\ifRSC@captioncentre
+  \relax
+\else
+  \captionsetup{singlelinecheck=off}
+\fi
 \ifRSC@chapter
   \ifx\chapter\@undefined
-     \@latex@warning{No chapters in this document}
+     \PackageError{rsc}{No chapters in this document}\@eha
      \newfloat{Scheme}{htbp}{los}
      \newfloat{Figure}{htbp}{lof}
      \newfloat{Table}{htbp}{lot}
@@ -55,14 +76,10 @@
 \fi
 \floatname{Scheme}{Scheme}
 \floatname{Table}{Table}
-\floatname{Figure}{Fig.}
-\ifRSC@captioncentre
-  \renewcommand\floatc@plain[2]%
-    {\setbox\@tempboxa\hbox{\textbf{{\@fs@cfont #1}}\quad #2}%
-    \ifdim\wd\@tempboxa>\hsize {\textbf{\@fs@cfont #1}}\quad #2\par
-      \else\hbox to\hsize{\hfil\box\@tempboxa\hfil}\fi}
+\ifRSC@angew
+  \floatname{Figure}{Figure}
 \else
-  \renewcommand\floatc@plain[2]{\textbf{{\@fs@cfont #1}}\quad #2}
+  \floatname{Figure}{Fig.}
 \fi
 \ifRSC@floatcentre
   \newenvironment{scheme}[1][htbp]{\begin{Scheme}[#1]\centering}
@@ -86,7 +103,11 @@
 \renewcommand*{\listoftables}[1][List of Tables]%
     {\listof{Table}{#1}}
 \labelformat{Scheme}{Scheme~#1}
-\labelformat{Figure}{Fig.~#1}
+\ifRSC@angew
+  \labelformat{Figure}{Figure~#1}
+\else
+  \labelformat{Figure}{Fig.~#1}
+\fi
 \labelformat{Table}{Table~#1}
 \endinput
 %%