From 57a03e95e90053ef4495e528abb0f8aae5a9862d Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 17 Jan 2008 20:56:30 +0000 Subject: rsc 2.2a (16jan08) git-svn-id: svn://tug.org/texlive/trunk@6295 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/source/latex/rsc/rsc.dtx | 53 +++++++++++++++++++----------- Master/texmf-dist/source/latex/rsc/rsc.ins | 2 -- 2 files changed, 33 insertions(+), 22 deletions(-) (limited to 'Master/texmf-dist/source') diff --git a/Master/texmf-dist/source/latex/rsc/rsc.dtx b/Master/texmf-dist/source/latex/rsc/rsc.dtx index 7256cac6f41..1d2ffa77b46 100644 --- a/Master/texmf-dist/source/latex/rsc/rsc.dtx +++ b/Master/texmf-dist/source/latex/rsc/rsc.dtx @@ -103,8 +103,6 @@ \generate{\usepostamble\bibtexable \file{rscM.bst}{\from{rsc.dtx}{bib,rsc,mcp}} \file{angewM.bst}{\from{rsc.dtx}{bib,angew,mcp}} - \file{rscnatM.bst}{\from{rsc.dtx}{bib,rsc,nat,mcp}} - \file{angewnatM.bst}{\from{rsc.dtx}{bib,angew,nat,mcp}} } \endbatchfile % @@ -160,10 +158,8 @@ %\changes{v2.2}{2007/10/16}{License change to LPPL} %\changes{v2.2}{2007/10/16}{Improved packaging} %\changes{v2.2}{2007/10/16}{\LaTeX\ package converted to stub} -%\changes{v2.2a}{2008/01/16}{Added \pkg{mciteplus} support} +%\changes{v2.2a}{2008/01/16}{Added \textsf{mciteplus} support} %\changes{v2.2a}{2008/01/16}{Documentation improvements} -%\changes{v2.2b}{2008/01/16}{Added combined \pkg{mciteplus} and -% \pkg{natbib} support} % %\DoNotIndex{} % @@ -206,7 +202,6 @@ % \item \meta{nat} \pkg{natbib}-compatible styles (which need the % \opt{numbers,super} options with \pkg{natbib}; % \item \meta{M} Designed for use with the \pkg{mciteplus} package; -% \item \meta{natM} Combine \pkg{mciteplus} and \pkg{natbib} support; % \item \meta{-mc} For use with the \pkg{mcite} package, and provided % for back-compatibility only. %\end{itemize} @@ -321,7 +316,7 @@ % First of all, the package identifies itself. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{rsc}[2008/01/16 v2.2b +\ProvidesPackage{rsc}[2008/01/16 v2.2a Useful chemistry functions] % \end{macrocode} % A warning is given that the package has been superseded. @@ -1789,7 +1784,7 @@ EXECUTE {initialize.longest.label} ITERATE {forward.pass} % -%<*!mcp> +%<*!mc&!nat&!mcp> FUNCTION {begin.bib} { preamble$ empty$ 'skip$ @@ -1797,15 +1792,37 @@ FUNCTION {begin.bib} if$ "\providecommand{\url}[1]{\texttt{#1}}" write$ newline$ -% "\begin{thebibliography}{" longest.label * "}" * write$ newline$ -% "\begin{mcbibliography}{" longest.label * "}" * write$ newline$ -% "\begin{thebibliography}{" number.label int.to.str$ * "}" * -% write$ newline$ -% "\providecommand{\natexlab}[1]{#1}" -% write$ newline$ + "\begin{thebibliography}{" longest.label * "}" * write$ newline$ } -% +% +%<*!mc&!mcp&nat> +FUNCTION {begin.bib} +{ preamble$ empty$ + 'skip$ + { preamble$ write$ newline$ } + if$ + "\providecommand{\url}[1]{\texttt{#1}}" + write$ newline$ + "\begin{thebibliography}{" number.label int.to.str$ * "}" * + write$ newline$ + "\providecommand{\natexlab}[1]{#1}" + write$ newline$ +} + +% +%<*mc> +FUNCTION {begin.bib} +{ preamble$ empty$ + 'skip$ + { preamble$ write$ newline$ } + if$ + "\providecommand{\url}[1]{\texttt{#1}}" + write$ newline$ + "\begin{mcbibliography}{" longest.label * "}" * write$ newline$ +} + +% %<*mcp> FUNCTION {begin.bib} { preamble$ empty$ @@ -1819,11 +1836,7 @@ FUNCTION {begin.bib} write$ newline$ "{This bibstyle requires the use of the mciteplus package.}\fi" write$ newline$ -% "\begin{mcitethebibliography}{" longest.label * "}" * write$ newline$ -% "\begin{mcitethebibliography}{" number.label int.to.str$ * "}" * -% write$ newline$ -% "\providecommand{\natexlab}[1]{#1}" -% write$ newline$ + "\begin{mcitethebibliography}{" longest.label * "}" * write$ newline$ "\mciteSetBstSublistMode{f}" write$ newline$ % "\mciteSetBstMaxWidthForm{subitem}{(\emph{\alph{mcitesubitemcount}})}" diff --git a/Master/texmf-dist/source/latex/rsc/rsc.ins b/Master/texmf-dist/source/latex/rsc/rsc.ins index c0967115191..f161082b07c 100644 --- a/Master/texmf-dist/source/latex/rsc/rsc.ins +++ b/Master/texmf-dist/source/latex/rsc/rsc.ins @@ -48,8 +48,6 @@ \generate{\usepostamble\bibtexable \file{rscM.bst}{\from{rsc.dtx}{bib,rsc,mcp}} \file{angewM.bst}{\from{rsc.dtx}{bib,angew,mcp}} - \file{rscnatM.bst}{\from{rsc.dtx}{bib,rsc,nat,mcp}} - \file{angewnatM.bst}{\from{rsc.dtx}{bib,angew,nat,mcp}} } \endbatchfile \endinput -- cgit v1.2.3