From 6ba278a06ce73b6c285197033bca22cf71c58055 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 22 Nov 2009 19:08:17 +0000 Subject: rsc 3.1c (16oct09) git-svn-id: svn://tug.org/texlive/trunk@16127 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/bibtex/bst/rsc/angew.bst | 16 +-- Master/texmf-dist/bibtex/bst/rsc/rsc.bst | 16 +-- Master/texmf-dist/doc/latex/rsc/README | 28 ++--- Master/texmf-dist/doc/latex/rsc/rsc.pdf | Bin 163830 -> 170979 bytes Master/texmf-dist/source/latex/rsc/rsc.dtx | 27 ++--- Master/texmf-dist/source/latex/rsc/rsc.ins | 170 ++++++++++++++--------------- Master/texmf-dist/tex/latex/rsc/rsc.sty | 2 +- 7 files changed, 121 insertions(+), 138 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/bibtex/bst/rsc/angew.bst b/Master/texmf-dist/bibtex/bst/rsc/angew.bst index 4c4876bee2e..316263279be 100644 --- a/Master/texmf-dist/bibtex/bst/rsc/angew.bst +++ b/Master/texmf-dist/bibtex/bst/rsc/angew.bst @@ -974,19 +974,15 @@ FUNCTION {inbook} FUNCTION {incollection} { output.bibitem author empty$ - { booktitle - format.title.vol - "booktitle" output.check + { booktitle format.title.vol "booktitle" output.check editor empty$ - { "Need at least an author or an editor for " - cite$ * warning$ } - { "" format.editors * "editor" output.check } - if$ + { "Need at least an author or an editor for " + cite$ * warning$ } + { "" format.editors * "editor" output.check } + if$ } { format.authors output - booktitle - format.title.vol - "booktitle" output.check + booktitle format.title.vol.in "booktitle" output.check } if$ format.pub.address "publisher" output.check diff --git a/Master/texmf-dist/bibtex/bst/rsc/rsc.bst b/Master/texmf-dist/bibtex/bst/rsc/rsc.bst index 36c1d58f30f..cd9785e103b 100644 --- a/Master/texmf-dist/bibtex/bst/rsc/rsc.bst +++ b/Master/texmf-dist/bibtex/bst/rsc/rsc.bst @@ -965,19 +965,15 @@ FUNCTION {inbook} FUNCTION {incollection} { output.bibitem author empty$ - { booktitle - format.title - "booktitle" output.check + { booktitle format.title "booktitle" output.check editor empty$ - { "Need at least an author or an editor for " - cite$ * warning$ } - { "" format.editors * "editor" output.check } - if$ + { "Need at least an author or an editor for " + cite$ * warning$ } + { "" format.editors * "editor" output.check } + if$ } { format.authors output - booktitle - format.title - "booktitle" output.check + booktitle format.title.in "booktitle" output.check } if$ format.pub.address "publisher" output.check diff --git a/Master/texmf-dist/doc/latex/rsc/README b/Master/texmf-dist/doc/latex/rsc/README index edb37ca1bf1..a409a3e0bdc 100644 --- a/Master/texmf-dist/doc/latex/rsc/README +++ b/Master/texmf-dist/doc/latex/rsc/README @@ -1,14 +1,14 @@ ----------------------------------------------------------------- -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 ----------------------------------------------------------------- - -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 -package is included; this provides a convenient user interface to -the customisation hooks made available by the BibTeX styles. +---------------------------------------------------------------- +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 +---------------------------------------------------------------- + +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 +package is included; this provides a convenient user interface to +the customisation hooks made available by the BibTeX styles. diff --git a/Master/texmf-dist/doc/latex/rsc/rsc.pdf b/Master/texmf-dist/doc/latex/rsc/rsc.pdf index d47934b312c..99aeb6a2113 100644 Binary files a/Master/texmf-dist/doc/latex/rsc/rsc.pdf and b/Master/texmf-dist/doc/latex/rsc/rsc.pdf differ diff --git a/Master/texmf-dist/source/latex/rsc/rsc.dtx b/Master/texmf-dist/source/latex/rsc/rsc.dtx index 235cf212770..4395edc1c75 100644 --- a/Master/texmf-dist/source/latex/rsc/rsc.dtx +++ b/Master/texmf-dist/source/latex/rsc/rsc.dtx @@ -93,14 +93,11 @@ This work consists of the file rsc.dtx \else \expandafter\endgroup \fi -\immediate\write18{bibtex8 --wolfgang rsc} -\immediate\write18{makeindex -s gglo.ist -o rsc.gls rsc.glo} -\immediate\write18{makeindex -s gind.ist -o rsc.ind rsc.idx} % %<*package> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{rsc} - [2009/07/07 v3.1b Support for RSC and Wiley journals] + [2009/10/16 v3.1c Support for RSC and Wiley journals] % %<*driver> \documentclass[a4paper]{ltxdoc} @@ -119,8 +116,6 @@ This work consists of the file rsc.dtx % % \fi % -%\CheckSum{84} -% %\GetFileInfo{\jobname.sty} % %\makeatletter @@ -1745,21 +1740,17 @@ FUNCTION {inbook} FUNCTION {incollection} { output.bibitem author empty$ - { booktitle -% format.title -% format.title.vol - "booktitle" output.check +% { booktitle format.title "booktitle" output.check +% { booktitle format.title.vol "booktitle" output.check editor empty$ - { "Need at least an author or an editor for " - cite$ * warning$ } - { "" format.editors * "editor" output.check } - if$ + { "Need at least an author or an editor for " + cite$ * warning$ } + { "" format.editors * "editor" output.check } + if$ } { format.authors output - booktitle -% format.title -% format.title.vol - "booktitle" output.check +% booktitle format.title.in "booktitle" output.check +% booktitle format.title.vol.in "booktitle" output.check } if$ format.pub.address "publisher" output.check diff --git a/Master/texmf-dist/source/latex/rsc/rsc.ins b/Master/texmf-dist/source/latex/rsc/rsc.ins index 6c034ea0ac4..71ab7163939 100644 --- a/Master/texmf-dist/source/latex/rsc/rsc.ins +++ b/Master/texmf-dist/source/latex/rsc/rsc.ins @@ -1,85 +1,85 @@ -%% -%% 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 by - Joseph Wright - -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 by -%% Joseph Wright -%% -%% 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'. +%% +%% 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 by + Joseph Wright + +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 by +%% Joseph Wright +%% +%% 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'. diff --git a/Master/texmf-dist/tex/latex/rsc/rsc.sty b/Master/texmf-dist/tex/latex/rsc/rsc.sty index 9bb3b8f8bf8..68a1478094d 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} - [2009/07/07 v3.1b Support for RSC and Wiley journals] + [2009/10/16 v3.1c Support for RSC and Wiley journals] \RequirePackage{kvoptions} \SetupKeyvalOptions{ family = rsc, -- cgit v1.2.3