summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-01-06 00:17:06 +0000
committerKarl Berry <karl@freefriends.org>2011-01-06 00:17:06 +0000
commit23874e3b30e5dbeba8cb8d27231c6c247e7f97dc (patch)
treec9513b30590eab11577a462c1179028c995d060f
parent4f4d5a12f967ecfe1ef88bf43966f35347cf7b7c (diff)
rsc 3.1d (4jan11)
git-svn-id: svn://tug.org/texlive/trunk@20942 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/bibtex/bst/rsc/angew.bst31
-rw-r--r--Master/texmf-dist/bibtex/bst/rsc/rsc.bst31
-rw-r--r--Master/texmf-dist/doc/latex/rsc/rsc.pdfbin170979 -> 154921 bytes
-rw-r--r--Master/texmf-dist/source/latex/rsc/rsc.dtx67
-rw-r--r--Master/texmf-dist/source/latex/rsc/rsc.ins4
-rw-r--r--Master/texmf-dist/tex/latex/rsc/rsc.sty15
6 files changed, 129 insertions, 19 deletions
diff --git a/Master/texmf-dist/bibtex/bst/rsc/angew.bst b/Master/texmf-dist/bibtex/bst/rsc/angew.bst
index 316263279be..f598f0717e4 100644
--- a/Master/texmf-dist/bibtex/bst/rsc/angew.bst
+++ b/Master/texmf-dist/bibtex/bst/rsc/angew.bst
@@ -20,6 +20,7 @@ ENTRY
chapter
ctrl-use-title
ctrl-etal-number
+ ctrl-link-doi
ctrl-use-doi-all
doi
edition
@@ -59,7 +60,7 @@ FUNCTION {init.state.consts}
#4 'after.item :=
}
-INTEGERS { is.use.title etal.number use.doi.all }
+INTEGERS { is.use.title etal.number use.doi.all link.doi }
%% #0 turns off the display of the title for articles
%% #1 enables
@@ -72,6 +73,10 @@ FUNCTION {default.etal.number} { #0 }
%% #1 enables
FUNCTION {default.use.doi.all} { #0 }
+%% #0 turns off hyperlinks for DOI
+%% #1 enables
+FUNCTION {default.link.doi} { #0 }
+
FUNCTION {add.comma}
{ ", " * }
@@ -510,7 +515,19 @@ FUNCTION {format.doi}
{ use.doi.all
{ doi empty$
'skip$
- { bbl.doi doi tie.or.space.connect output }
+ {
+ link.doi
+ {
+ "\href{http://dx.doi.org/"
+ doi *
+ "}{" *
+ bbl.doi doi tie.or.space.connect *
+ "}" *
+ }
+ { bbl.doi doi tie.or.space.connect }
+ if$
+ output
+ }
if$
}
'skip$
@@ -1234,6 +1251,13 @@ FUNCTION {Control}
yes.no.to.int
'use.doi.all := }
if$
+ ctrl-link-doi
+ empty$
+ { skip$ }
+ { ctrl-link-doi
+ yes.no.to.int
+ 'link.doi := }
+ if$
}
FUNCTION {conference} {inproceedings}
@@ -1261,6 +1285,7 @@ FUNCTION {initialize.controls}
{ default.is.use.title 'is.use.title :=
default.etal.number 'etal.number :=
default.use.doi.all 'use.doi.all :=
+ default.link.doi 'link.doi :=
}
INTEGERS { len }
@@ -1473,7 +1498,7 @@ FUNCTION {end.bib}
EXECUTE {end.bib}
%%
-%% Copyright (C) 2006-2009 by
+%% Copyright (C) 2006-2009,2011 by
%% Joseph Wright <joseph.wright@morningstar2.co.uk>
%%
%% It may be distributed and/or modified under the conditions of
diff --git a/Master/texmf-dist/bibtex/bst/rsc/rsc.bst b/Master/texmf-dist/bibtex/bst/rsc/rsc.bst
index cd9785e103b..b912ae1cae7 100644
--- a/Master/texmf-dist/bibtex/bst/rsc/rsc.bst
+++ b/Master/texmf-dist/bibtex/bst/rsc/rsc.bst
@@ -20,6 +20,7 @@ ENTRY
chapter
ctrl-use-title
ctrl-etal-number
+ ctrl-link-doi
ctrl-use-doi-all
doi
edition
@@ -59,7 +60,7 @@ FUNCTION {init.state.consts}
#4 'after.item :=
}
-INTEGERS { is.use.title etal.number use.doi.all }
+INTEGERS { is.use.title etal.number use.doi.all link.doi }
%% #0 turns off the display of the title for articles
%% #1 enables
@@ -72,6 +73,10 @@ FUNCTION {default.etal.number} { #0 }
%% #1 enables
FUNCTION {default.use.doi.all} { #0 }
+%% #0 turns off hyperlinks for DOI
+%% #1 enables
+FUNCTION {default.link.doi} { #0 }
+
FUNCTION {add.comma}
{ ", " * }
@@ -503,7 +508,19 @@ FUNCTION {format.doi}
{ use.doi.all
{ doi empty$
'skip$
- { bbl.doi doi tie.or.space.connect output }
+ {
+ link.doi
+ {
+ "\href{http://dx.doi.org/"
+ doi *
+ "}{" *
+ bbl.doi doi tie.or.space.connect *
+ "}" *
+ }
+ { bbl.doi doi tie.or.space.connect }
+ if$
+ output
+ }
if$
}
'skip$
@@ -1227,6 +1244,13 @@ FUNCTION {Control}
yes.no.to.int
'use.doi.all := }
if$
+ ctrl-link-doi
+ empty$
+ { skip$ }
+ { ctrl-link-doi
+ yes.no.to.int
+ 'link.doi := }
+ if$
}
FUNCTION {conference} {inproceedings}
@@ -1254,6 +1278,7 @@ FUNCTION {initialize.controls}
{ default.is.use.title 'is.use.title :=
default.etal.number 'etal.number :=
default.use.doi.all 'use.doi.all :=
+ default.link.doi 'link.doi :=
}
INTEGERS { len }
@@ -1466,7 +1491,7 @@ FUNCTION {end.bib}
EXECUTE {end.bib}
%%
-%% Copyright (C) 2006-2009 by
+%% Copyright (C) 2006-2009,2011 by
%% Joseph Wright <joseph.wright@morningstar2.co.uk>
%%
%% It may be distributed and/or modified under the conditions of
diff --git a/Master/texmf-dist/doc/latex/rsc/rsc.pdf b/Master/texmf-dist/doc/latex/rsc/rsc.pdf
index 99aeb6a2113..f645c232eb1 100644
--- a/Master/texmf-dist/doc/latex/rsc/rsc.pdf
+++ b/Master/texmf-dist/doc/latex/rsc/rsc.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/rsc/rsc.dtx b/Master/texmf-dist/source/latex/rsc/rsc.dtx
index 4395edc1c75..d0acac3a1ab 100644
--- a/Master/texmf-dist/source/latex/rsc/rsc.dtx
+++ b/Master/texmf-dist/source/latex/rsc/rsc.dtx
@@ -43,7 +43,7 @@ See http://www.latex-project.org/lppl.txt
\endpreamble
\postamble
-Copyright (C) 2006-2009 by
+Copyright (C) 2006-2009,2011 by
Joseph Wright <joseph.wright@morningstar2.co.uk>
It may be distributed and/or modified under the conditions of
@@ -97,12 +97,13 @@ This work consists of the file rsc.dtx
%<*package>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{rsc}
- [2009/10/16 v3.1c Support for RSC and Wiley journals]
+ [2011/01/04 v3.1e Support for RSC and Wiley journals]
%</package>
%<*driver>
\documentclass[a4paper]{ltxdoc}
\usepackage[T1]{fontenc}
-\usepackage{array,booktabs,lmodern,rsc}
+\usepackage{array,booktabs,lmodern}
+\usepackage[usedoi,linkdoi]{rsc}
\usepackage[osf]{mathpazo}
\usepackage[scaled=0.95]{helvet}
\usepackage[final]{listings,microtype}
@@ -246,8 +247,10 @@ This work consists of the file rsc.dtx
% \texttt{rsc.bst}}
%\changes{v2.0}{2007/07/21}{First re-write of package}
%\changes{v3.0}{2008/07/20}{Second re-write of package}
-%\changes{v3.1}{2009/04/24}{\textsf{mciteplus} package optional}
+%\changes{v3.1}{2009/04/24}{\pkg{mciteplus} package optional}
%\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}}
%
%\begin{abstract}
% The \pkg{rsc} package provides \BibTeX\ style files to produce
@@ -337,6 +340,7 @@ This work consists of the file rsc.dtx
%\DescribeOption{maxnames}
%\DescribeOption{usetitle}
%\DescribeOption{usedoi}
+%\DescribeOption{linkdoi}
% The \opt{maxnames} option sets whether and when a long list of
% authors is truncated, and takes an integer value. Giving the value
% \opt{0} means that no truncation occurs, otherwise the list is
@@ -349,7 +353,10 @@ This work consists of the file rsc.dtx
% option forces the use of \textsc{doi} information in cases where it
% would not normally be present (for example journal articles with
% page ranges available). This is intended to make it easier for
-% readers to find journal information.
+% readers to find journal information. The related
+% \opt{linkdoi} option will include a hyperlink for each \textsc{doi},
+% so that the \textsc{doi} can be clicked on to resolve the
+% original reference.
%
%\DescribeOption{super}
% The \opt{super} Boolean option turns on superscript citations, and
@@ -360,6 +367,12 @@ This work consists of the file rsc.dtx
% documentation has been compiled using \pkg{natmove}: see the input
% of the example citations in the previous section.
%
+%\DescribeOption{mciteplus}
+% The \pkg{rsc} package normally loads the support package
+% \pkg{mciteplus}. This can be controlled using the \opt{mciteplus}
+% option: loading \pkg{rsc} with \opt{mciteplus=false} will skip loading
+% \pkg{mciteplus}.
+%
%\section{Demonstration file}
%
% This bundle includes the demonstration file \file{rsc-demo.tex}. The
@@ -381,6 +394,8 @@ This work consists of the file rsc.dtx
%\begin{macro}{\ifrsc@super}
%\begin{macro}{\ifrsc@usetitle}
%\begin{macro}{\ifrsc@usedoi}
+%\begin{macro}{\ifrsc@linkdoi}
+%\begin{macro}{\ifrsc@mciteplus}
%\begin{macro}{\rsc@maxauthors}
% To make life easier for the user, the control values for the
% bibliography are converted into \LaTeX\ package options using
@@ -392,11 +407,15 @@ This work consists of the file rsc.dtx
family = rsc,
prefix = rsc@
}
+\DeclareBoolOption{linkdoi}
+\DeclareBoolOption{mciteplus}
\DeclareBoolOption{super}
\DeclareBoolOption{usetitle}
\DeclareBoolOption{usedoi}
\DeclareStringOption{maxauthors}
\setkeys{rsc}{
+ linkdoi = false,
+ mciteplus = true,
maxauthors = 0,
usetitle = false,
usedoi = false,
@@ -408,6 +427,8 @@ This work consists of the file rsc.dtx
%\end{macro}
%\end{macro}
%\end{macro}
+%\end{macro}
+%\end{macro}
%
% Citation support is loaded.
% \begin{macrocode}
@@ -464,6 +485,9 @@ This work consists of the file rsc.dtx
\@tempa{ctrl-use-doi-all}{%
\ifrsc@usedoi yes\else no\fi
}%
+ \@tempa{ctrl-link-doi}{%
+ \ifrsc@linkdoi yes\else no\fi
+ }%
\@tempa{ctrl-etal-number}{\rsc@maxauthors}%
\string}^^J%
}%
@@ -484,7 +508,9 @@ This work consists of the file rsc.dtx
% either way.
% \begin{macrocode}
\IfFileExists{mciteplus.sty}{%
- \RequirePackage{mciteplus}
+ \ifrsc@mciteplus
+ \RequirePackage{mciteplus}
+ \fi
}{}
% \end{macrocode}
%
@@ -764,6 +790,7 @@ ENTRY
chapter
ctrl-use-title
ctrl-etal-number
+ ctrl-link-doi
ctrl-use-doi-all
doi
edition
@@ -803,7 +830,7 @@ FUNCTION {init.state.consts}
#4 'after.item :=
}
-INTEGERS { is.use.title etal.number use.doi.all }
+INTEGERS { is.use.title etal.number use.doi.all link.doi }
%% #0 turns off the display of the title for articles
%% #1 enables
@@ -816,6 +843,10 @@ FUNCTION {default.etal.number} { #0 }
%% #1 enables
FUNCTION {default.use.doi.all} { #0 }
+%% #0 turns off hyperlinks for DOI
+%% #1 enables
+FUNCTION {default.link.doi} { #0 }
+
FUNCTION {add.comma}
{ ", " * }
@@ -1265,7 +1296,19 @@ FUNCTION {format.doi}
{ use.doi.all
{ doi empty$
'skip$
- { bbl.doi doi tie.or.space.connect output }
+ {
+ link.doi
+ {
+ "\href{http://dx.doi.org/"
+ doi *
+ "}{" *
+ bbl.doi doi tie.or.space.connect *
+ "}" *
+ }
+ { bbl.doi doi tie.or.space.connect }
+ if$
+ output
+ }
if$
}
'skip$
@@ -2010,6 +2053,13 @@ FUNCTION {Control}
yes.no.to.int
'use.doi.all := }
if$
+ ctrl-link-doi
+ empty$
+ { skip$ }
+ { ctrl-link-doi
+ yes.no.to.int
+ 'link.doi := }
+ if$
}
FUNCTION {conference} {inproceedings}
@@ -2037,6 +2087,7 @@ FUNCTION {initialize.controls}
{ default.is.use.title 'is.use.title :=
default.etal.number 'etal.number :=
default.use.doi.all 'use.doi.all :=
+ default.link.doi 'link.doi :=
}
INTEGERS { len }
diff --git a/Master/texmf-dist/source/latex/rsc/rsc.ins b/Master/texmf-dist/source/latex/rsc/rsc.ins
index 71ab7163939..ddead05f1db 100644
--- a/Master/texmf-dist/source/latex/rsc/rsc.ins
+++ b/Master/texmf-dist/source/latex/rsc/rsc.ins
@@ -28,7 +28,7 @@ See http://www.latex-project.org/lppl.txt
\endpreamble
\postamble
-Copyright (C) 2006-2009 by
+Copyright (C) 2006-2009,2011 by
Joseph Wright <joseph.wright@morningstar2.co.uk>
It may be distributed and/or modified under the conditions of
@@ -60,7 +60,7 @@ This work consists of the file rsc.dtx
}
\endbatchfile
%%
-%% Copyright (C) 2006-2009 by
+%% Copyright (C) 2006-2009,2011 by
%% Joseph Wright <joseph.wright@morningstar2.co.uk>
%%
%% It may be distributed and/or modified under the conditions of
diff --git a/Master/texmf-dist/tex/latex/rsc/rsc.sty b/Master/texmf-dist/tex/latex/rsc/rsc.sty
index 68a1478094d..64e09d35bb3 100644
--- a/Master/texmf-dist/tex/latex/rsc/rsc.sty
+++ b/Master/texmf-dist/tex/latex/rsc/rsc.sty
@@ -15,17 +15,21 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{rsc}
- [2009/10/16 v3.1c Support for RSC and Wiley journals]
+ [2011/01/04 v3.1e Support for RSC and Wiley journals]
\RequirePackage{kvoptions}
\SetupKeyvalOptions{
family = rsc,
prefix = rsc@
}
+\DeclareBoolOption{linkdoi}
+\DeclareBoolOption{mciteplus}
\DeclareBoolOption{super}
\DeclareBoolOption{usetitle}
\DeclareBoolOption{usedoi}
\DeclareStringOption{maxauthors}
\setkeys{rsc}{
+ linkdoi = false,
+ mciteplus = true,
maxauthors = 0,
usetitle = false,
usedoi = false,
@@ -67,6 +71,9 @@
\@tempa{ctrl-use-doi-all}{%
\ifrsc@usedoi yes\else no\fi
}%
+ \@tempa{ctrl-link-doi}{%
+ \ifrsc@linkdoi yes\else no\fi
+ }%
\@tempa{ctrl-etal-number}{\rsc@maxauthors}%
\string}^^J%
}%
@@ -78,7 +85,9 @@
}%
}
\IfFileExists{mciteplus.sty}{%
- \RequirePackage{mciteplus}
+ \ifrsc@mciteplus
+ \RequirePackage{mciteplus}
+ \fi
}{}
\AtBeginDocument{%
\let\rsc@bibliography\bibliography
@@ -87,7 +96,7 @@
}%
}
%%
-%% Copyright (C) 2006-2009 by
+%% Copyright (C) 2006-2009,2011 by
%% Joseph Wright <joseph.wright@morningstar2.co.uk>
%%
%% It may be distributed and/or modified under the conditions of