rsc (23aug16)

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

2 files changed, 48 insertions, 102 deletions

diff --git a/Master/texmf-dist/source/latex/rsc/rsc.dtx b/Master/texmf-dist/source/latex/rsc/rsc.dtx
index d0acac3a1ab..90b5e44d1c5 100644
--- a/Master/texmf-dist/source/latex/rsc/rsc.dtx
+++ b/Master/texmf-dist/source/latex/rsc/rsc.dtx
@@ -1,24 +1,39 @@
 % \iffalse meta-comment
-% !TEX program  = pdflatex
-% !TEX encoding = ISO-8859-1
 %<*internal>
 \iffalse
 %</internal>
 %<*readme>
-----------------------------------------------------------------
-rsc --- BibTeX styles for Royal Society of Chemistry and Wiley 
-  journals
-E-mail: joseph.wright@morningstar2.co.uk
-Released under the LaTeX Project Public License v1.3c or later
-See http://www.latex-project.org/lppl.txt
-----------------------------------------------------------------
+rsc - BibTeX styles for Royal Society of Chemistry and Wiley journals
+=====================================================================
 
-The rsc package provides BibTeX style files to produce
+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
-styles require the use of natbib.  In addition, a short LaTeX 
+styles require the use of `natbib`.  In addition, a short LaTeX 
 package is included; this provides a convenient user interface to 
 the customisation hooks made available by the BibTeX styles.
+
+Installation
+------------
+
+The package is supplied in `.dtx` format and as a pre-extracted
+zip file, `rsc.tds.zip`. The later is most convenient for
+most users: simply unzip this in your local `texmf` directory.
+If you want to unpack the `.dtx` yourself, running `tex
+rsc.dtx` will extract the package whereas 'latex rsc.dtx
+will extract it and also typeset the documentation.
+
+Typesetting the documentation requires a number of packages in
+addition to those needed to use the package. This is mainly 
+because of the number of demonstration items included in the 
+text. To compile the documentation without error, you will 
+need the packages:
+ - `helvet`
+ - `hypdoc`
+ - `listings`
+ - `lmodern`
+ - `mathpazo`
+ - `microtype`
 %</readme>
 %<*internal>
 \fi
@@ -43,7 +58,7 @@ See http://www.latex-project.org/lppl.txt
 \endpreamble
 \postamble
 
-Copyright (C) 2006-2009,2011 by
+Copyright (C) 2006-2009,2011,2013,2016 by
   Joseph Wright <joseph.wright@morningstar2.co.uk>
   
 It may be distributed and/or modified under the conditions of
@@ -84,7 +99,6 @@ This work consists of the file  rsc.dtx
 \nopreamble\nopostamble
 \usedir{doc/latex/rsc}
 \generate{
-  \file{README.txt}{\from{\jobname.dtx}{readme}}
   \file{rsc-demo.tex}{\from{\jobname.dtx}{demo}}
   \file{rsc.bib}{\from{\jobname.dtx}{bib}}
 }
@@ -97,7 +111,7 @@ This work consists of the file  rsc.dtx
 %<*package>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{rsc}
-  [2011/01/04 v3.1e Support for RSC and Wiley journals]
+  [2016/08/22 v31.f Support for RSC and Wiley journals]
 %</package>
 %<*driver>
 \documentclass[a4paper]{ltxdoc}
@@ -251,6 +265,8 @@ This work consists of the file  rsc.dtx
 %\changes{v3.1}{2009/04/24}{Demonstration file included}
 %\changes{v3.1d}{2011/01/04}{New \opt{linkdoi} option}
 %\changes{v3.1e}{2011/01/05}{Option to skip loading \pkg{mciteplus}}
+%\changes{v3.1f}{2016/08/22}{Include series in \texttt{incollection}
+%  entries for \pkg{rsc} bibliographies}
 %
 %\begin{abstract}
 % The \pkg{rsc} package provides \BibTeX\ style files to produce
@@ -1350,6 +1366,19 @@ FUNCTION {format.bvolume}
   if$
 }
 
+FUNCTION {format.cvolume}
+{ volume empty$
+    { "" }
+    {
+      bbl.volume volume tie.or.space.connect
+      series empty$
+        'skip$
+        { " of " * series * }
+      if$
+    }
+  if$
+}
+
 FUNCTION {format.title.noemph}
 { 't :=
   t empty$
@@ -1799,7 +1828,7 @@ FUNCTION {incollection}
   format.pub.address "publisher" output.check
   format.edition output
   format.bdate "year" output.check
-%<rsc>  format.bvolume output
+%<rsc>  format.cvolume output
   format.chapter.pages "chapter and pages" output.check
   format.doi
   fin.entry
@@ -2243,7 +2272,9 @@ EXECUTE {initialize.longest.label}
 ITERATE {forward.pass}
 
 FUNCTION {begin.bib}
-{ preamble$ empty$
+{
+  "rsc 2016/08/22 v3.1f" top$
+  preamble$ empty$
     'skip$
     { preamble$ write$ newline$ }
   if$
@@ -2396,4 +2427,4 @@ EXECUTE {end.bib}
   doi = {10.1021/ic9907718},
 }
 %</bib>
-%\fi
\ No newline at end of file
+%\fi
diff --git a/Master/texmf-dist/source/latex/rsc/rsc.ins b/Master/texmf-dist/source/latex/rsc/rsc.ins
deleted file mode 100644
index ddead05f1db..00000000000
--- a/Master/texmf-dist/source/latex/rsc/rsc.ins
+++ /dev/null
@@ -1,85 +0,0 @@
-%%
-%% This is file `rsc.ins',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% rsc.dtx  (with options: `install')
-%% ----------------------------------------------------------------
-%% rsc --- BibTeX styles for Royal Society of Chemistry and Wiley
-%%   journals
-%% E-mail: joseph.wright@morningstar2.co.uk
-%% Released under the LaTeX Project Public License v1.3c or later
-%% See http://www.latex-project.org/lppl.txt
-%% ----------------------------------------------------------------
-%% 
-\input docstrip.tex
-\keepsilent
-\askforoverwritefalse
-\preamble
-----------------------------------------------------------------
-rsc --- BibTeX styles for Royal Society of Chemistry and Wiley
-  journals
-E-mail: joseph.wright@morningstar2.co.uk
-Released under the LaTeX Project Public License v1.3c or later
-See http://www.latex-project.org/lppl.txt
-----------------------------------------------------------------
-
-\endpreamble
-\postamble
-
-Copyright (C) 2006-2009,2011 by
-  Joseph Wright <joseph.wright@morningstar2.co.uk>
-
-It may be distributed and/or modified under the conditions of
-the LaTeX Project Public License (LPPL), either version 1.3c of
-this license or (at your option) any later version.  The latest
-version of this license is in the file:
-
-   http://www.latex-project.org/lppl.txt
-
-This work is "maintained" (as per LPPL maintenance status) by
-  Joseph Wright.
-
-This work consists of the file  rsc.dtx
-          and the derived files rsc.pdf,
-                                rsc.ins,
-                                rsc.sty,
-                                rsc.bib and
-                                rsc-demo.tex.
-
-\endpostamble
-\usedir{tex/latex/rsc}
-\generate{
-  \file{\jobname.sty}{\from{\jobname.dtx}{package}}
-}
-\usedir{bibtex/bst/rsc}
-\generate{
-  \file{rsc.bst}{\from{\jobname.dtx}{bst,rsc}}
-  \file{angew.bst}{\from{\jobname.dtx}{bst,angew}}
-}
-\endbatchfile
-%% 
-%% Copyright (C) 2006-2009,2011 by
-%%   Joseph Wright <joseph.wright@morningstar2.co.uk>
-%% 
-%% It may be distributed and/or modified under the conditions of
-%% the LaTeX Project Public License (LPPL), either version 1.3c of
-%% this license or (at your option) any later version.  The latest
-%% version of this license is in the file:
-%% 
-%%    http://www.latex-project.org/lppl.txt
-%% 
-%% This work is "maintained" (as per LPPL maintenance status) by
-%%   Joseph Wright.
-%% 
-%% This work consists of the file  rsc.dtx
-%%           and the derived files rsc.pdf,
-%%                                 rsc.ins,
-%%                                 rsc.sty,
-%%                                 rsc.bib and
-%%                                 rsc-demo.tex.
-%% 
-%% 
-%%
-%% End of file `rsc.ins'.