summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/rsc
diff options
context:
space:
mode:
authorManuel Pégourié-Gonnard <mpg@elzevir.fr>2008-04-05 17:26:03 +0000
committerManuel Pégourié-Gonnard <mpg@elzevir.fr>2008-04-05 17:26:03 +0000
commitc8513704ba0fb1c1ee8003e6f554972f43031a0e (patch)
tree0584ffcebfa28db56034180dc42edb903528e66f /Master/texmf-dist/source/latex/rsc
parentb0fb3dcb16b825b6d466c6f83fdeaf6b3856d575 (diff)
rsc v2.2b
git-svn-id: svn://tug.org/texlive/trunk@7323 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/rsc')
-rw-r--r--Master/texmf-dist/source/latex/rsc/rsc.dtx53
-rw-r--r--Master/texmf-dist/source/latex/rsc/rsc.ins2
2 files changed, 22 insertions, 33 deletions
diff --git a/Master/texmf-dist/source/latex/rsc/rsc.dtx b/Master/texmf-dist/source/latex/rsc/rsc.dtx
index 1d2ffa77b46..7256cac6f41 100644
--- a/Master/texmf-dist/source/latex/rsc/rsc.dtx
+++ b/Master/texmf-dist/source/latex/rsc/rsc.dtx
@@ -103,6 +103,8 @@
\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
%</install>
@@ -158,8 +160,10 @@
%\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 \textsf{mciteplus} support}
+%\changes{v2.2a}{2008/01/16}{Added \pkg{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{}
%
@@ -202,6 +206,7 @@
% \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}
@@ -316,7 +321,7 @@
% First of all, the package identifies itself.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{rsc}[2008/01/16 v2.2a
+\ProvidesPackage{rsc}[2008/01/16 v2.2b
Useful chemistry functions]
% \end{macrocode}
% A warning is given that the package has been superseded.
@@ -1784,7 +1789,7 @@ EXECUTE {initialize.longest.label}
ITERATE {forward.pass}
%</nat>
-%<*!mc&!nat&!mcp>
+%<*!mcp>
FUNCTION {begin.bib}
{ preamble$ empty$
'skip$
@@ -1792,37 +1797,15 @@ FUNCTION {begin.bib}
if$
"\providecommand{\url}[1]{\texttt{#1}}"
write$ newline$
- "\begin{thebibliography}{" longest.label * "}" * write$ newline$
+%<!nat&!mc> "\begin{thebibliography}{" longest.label * "}" * write$ newline$
+%<!nat&mc> "\begin{mcbibliography}{" longest.label * "}" * write$ newline$
+%<nat> "\begin{thebibliography}{" number.label int.to.str$ * "}" *
+%<nat> write$ newline$
+%<nat> "\providecommand{\natexlab}[1]{#1}"
+%<nat> write$ newline$
}
-%</!mc&!nat&!mcp>
-%<*!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&!mcp&nat>
-%<*mc>
-FUNCTION {begin.bib}
-{ preamble$ empty$
- 'skip$
- { preamble$ write$ newline$ }
- if$
- "\providecommand{\url}[1]{\texttt{#1}}"
- write$ newline$
- "\begin{mcbibliography}{" longest.label * "}" * write$ newline$
-}
-
-%</mc>
+%</!mcp>
%<*mcp>
FUNCTION {begin.bib}
{ preamble$ empty$
@@ -1836,7 +1819,11 @@ FUNCTION {begin.bib}
write$ newline$
"{This bibstyle requires the use of the mciteplus package.}\fi"
write$ newline$
- "\begin{mcitethebibliography}{" longest.label * "}" * write$ newline$
+%<!nat> "\begin{mcitethebibliography}{" longest.label * "}" * write$ newline$
+%<nat> "\begin{mcitethebibliography}{" number.label int.to.str$ * "}" *
+%<nat> write$ newline$
+%<nat> "\providecommand{\natexlab}[1]{#1}"
+%<nat> write$ newline$
"\mciteSetBstSublistMode{f}"
write$ newline$
%<rsc> "\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 f161082b07c..c0967115191 100644
--- a/Master/texmf-dist/source/latex/rsc/rsc.ins
+++ b/Master/texmf-dist/source/latex/rsc/rsc.ins
@@ -48,6 +48,8 @@
\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