summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/bibtex/bst/nar/nar.bst (renamed from Master/texmf-dist/bibtex/bst/beebe/nar.bst)220
-rwxr-xr-xMaster/tlpkg/bin/tlpkg-ctan-check2
-rw-r--r--Master/tlpkg/tlpsrc/collection-bibtexextra.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/nar.tlpsrc0
4 files changed, 156 insertions, 67 deletions
diff --git a/Master/texmf-dist/bibtex/bst/beebe/nar.bst b/Master/texmf-dist/bibtex/bst/nar/nar.bst
index e08fdd3be85..2a26a5190d2 100644
--- a/Master/texmf-dist/bibtex/bst/beebe/nar.bst
+++ b/Master/texmf-dist/bibtex/bst/nar/nar.bst
@@ -1,40 +1,55 @@
-%%% ====================================================================
-%%% @BibTeX-style-file{
-%%% author = "Tom Schneider",
-%%% version = "3.04",
-%%% date = "10 Sep 1991",
-%%% filename = "nar.bst",
-%%% address = "National Cancer Institute
-%%% Laboratory of Mathematical Biology
-%%% Frederick, Maryland 21701-1013
-%%% USA",
-%%% checksum = "49904 1056 2955 21359",
-%%% email = "toms@ncifcrf.gov (Internet)",
-%%% codetable = "ISO/ASCII",
-%%% keywords = "nucleic acid research",
-%%% supported = "yes",
-%%% docstring = "This BibTeX bibliography style is for the
-%%% journal Nucleic Acid Research. It was
-%%% adapted from the standard unsrt.bst style
-%%% file.
-%%%
-%%% The checksum field above contains a CRC-16
-%%% checksum as the first value, followed by the
-%%% equivalent of the standard UNIX wc (word
-%%% count) utility output of lines, words, and
-%%% characters. This is produced by Robert
-%%% Solovay's checksum utility."
-%%% }
-%%% ====================================================================
-
-% new.bst
% nar.bst was created by Tom Schneider from unsrt.bst
-% version = 3.04 of nar.bst 1990 May 23
-% Tom Schneider
-% National Cancer Institute
-% Laboratory of Mathematical Biology
-% Frederick, Maryland
-% toms@ncifcrf.gov
+% version = 3.19 of nar.bst 2011 Dec 23
+% 2011 Dec 23, 3.19 correct year
+% 2011 Dec 23, 3.18 inproceedings bug, line 555 needs another '*'
+% thanks to David Koes dkoes
+% 2010 Dec 05, 3.17 for incollection bug
+% format bvolume needed a '*'
+% 2010 Mar 11, 3.16 techreport - add commas after author and number
+% 2010 Mar 11, 3.15 make unpublished not have two titles ... & date at start
+% 2010 Mar 07, 3.14 Changes from Wolfgang Langer!
+% 2001 Nov 12, 3.13 volume just before pages for inproceedings
+% 2001 Nov 12, 3.12 editor names reversed again...
+% 2001 Jun 15, 3.11 period after title (was comma)
+% 2000 Sep 13, 3.10 introduction of titles as per new NAR instructions
+% 1994 November 30, 3.09 previous version
+
+% Dr. Thomas D. Schneider, Ph.D.
+% National Institutes of Health
+% schneidt@mail.nih.gov
+% toms@alum.mit.edu (permanent)
+% http://alum.mit.edu/www/toms (permanent)
+
+% This is the bibliography definition for
+% Nucleic Acids Research
+% http://nar.oupjournals.org/
+
+% The instructions for authors are at
+% http://www3.oup.co.uk/nar/instauth/
+
+% about titles:
+
+% http://www3.oup.co.uk/nar/instauth/editorial_28_17.html
+% This first appeared in NAR Volume 28, Issue 17, September 1 2000.
+%
+% Titles in References; Papers Longer than 10
+% Printed Pages
+%
+% At the recent Editors' Meeting it was decided that in future all
+% papers, not just Surveys and Summaries, will have titles
+% included in their reference lists. Starting immediately, all
+% authors will be encouraged to include titles, and this will
+% become mandatory for all papers published after January 1 st
+% 2001. The suggested page limit of 8 pages will be relaxed to
+% accommodate this. Some papers require extra space, and so in
+% future all papers longer than 10 pages will incur a per excess
+% printed page charge of euro 20/$200 to help offset the increased
+% costs of production. This charge for pages in excess of 10 will
+% be applied to all printed papers published after January 1st
+% 2001. Note that the charge will not apply to papers published
+% solely in NAR Methods Online, nor to data published online as
+% `Supplementary Material'. Also, the journal will continue to
+% offer free colour printing.
% BibTeX standard bibliography style `unsrt'
% version 0.99a for BibTeX versions 0.99a or later, LaTeX version 2.09.
@@ -69,6 +84,7 @@ ENTRY
type
volume
year
+ url
}
{}
{ label }
@@ -85,6 +101,7 @@ FUNCTION {init.state.consts}
#0 'doblank := % put a blanks in output.nonnul if not zero
#0 'straightnames := % force names to be J. B. Smith if not zero
% otherwise they are Smith, J. B.
+ % 2001 Nov 12: NAR changed back to the unstraight ...
}
STRINGS { s t }
@@ -107,8 +124,15 @@ FUNCTION {output.nonnull}
{ output.state after.block =
{
-% add.period$ write$ % TDS NO PERIODS!
- write$ % TDS NO PERIODS!
+% new as of 2001 jun 15:
+% zzz
+% add.period$ write$ % TDS PERIODS!
+ write$ % TDS PERIODS!
+
+% prior to 2001 jun 15:
+%% add.period$ write$ % TDS NO PERIODS!
+% write$ % TDS NO PERIODS!
+
newline$
% "\newblock " write$ % TDS NO NEWBLOCKS: makes for a cleaner file
}
@@ -255,7 +279,8 @@ FUNCTION {format.names}
% note, no ~ so that the format is straight for NAR.
straightnames #0 =
- { s nameptr "{vv}{ll}{, jj}{, f.}" format.name$ 't := }% TDS
+ { s nameptr "{vv~}{ll}{, jj}{, f.}" format.name$ 't := }% TDS; Langer
+ % added blank after vv. 01.03.2010 Wolfram Langer
{ s nameptr "{ff{ }}{vv}{ ll}{, jj}" format.name$ 't := }% TDS
if$
@@ -291,25 +316,34 @@ FUNCTION {format.authors}
FUNCTION {format.editors}
{
- #1 'straightnames := % names go as J. B. Smith for editors
+% #1 'straightnames := % names go as J. B. Smith for editors
+% NAR Changed back!! 2001 Nov 12 TDS
editor empty$
{ "" }
{ editor format.names
editor num.names$ #1 >
- { ", (ed.)" * }
+ { ", (eds.)" * } % 2001 Nov 12 TDS
{ ", (ed.)" * }
% { ", editors" * }
% { ", editor" * }
if$
}
if$
- #0 'straightnames := % names go as Smith, J. B. again
+% #0 'straightnames := % names go as Smith, J. B. again
}
FUNCTION {format.title}
{ title empty$
{ "" }
- { title "t" change.case$ }
+% { title "t" change.case$ }
+% 2000 Sep 13 TDS put comma after title:
+% { title "," * "t" change.case$ }
+% 2001 Jun 15 TDS put period after title!
+% { title "." * "t" change.case$ }
+% Wolfram Langer, 15.12.2009: No dot after title, no change of the case.
+% TDS: 2010 Mar 07: No, there is a dot after the title, see:
+% http://nar.oxfordjournals.org/cgi/content/full/38/4/1182
+ { title "." * }
if$
}
@@ -350,7 +384,7 @@ FUNCTION {format.date}
{ month empty$
% 'year originally
{"(" year ")" * * } % TDS
- { month " " * year * }
+ {"(" month ", " year ")" * * * * } % TDS
if$
}
if$
@@ -379,12 +413,20 @@ FUNCTION {format.bvolume}
{ volume empty$
{ "" }
% { "volume" volume tie.or.space.connect % TDS
- { "volume" "{\bf " volume "}, " * * tie.or.space.connect
% TDS add a comma and bold
+% { "volume" "{\bf " volume "}, " * * tie.or.space.connect
+% 2001 Nov 12 no longer bold!!
+% { "volume" volume ", " * tie.or.space.connect
+% 2001 nov 12 now "Vol."
+% { "Vol." volume ", " * tie.or.space.connect
+ { "Vol." volume tie.or.space.connect % TDS 2011 Dec 05 No comma yet!
series empty$
- 'skip$
+% 'skip$
+% PUT COMMA HERE INSTEAD OF SKIP! REMOVE COMMA ABOVE % TDS 2011 Dec 05
+ {", " *} % TDS
%{ " of " * series emphasize * } TDS
- { " of " * series } % TDS book titles not emphasized for NAR
+ { " of " * series * ", " * } % TDS book titles not emphasized for NAR
+ % TDS add comma 2011 Dec 05
if$
"volume and number" number either.or.check
}
@@ -457,9 +499,15 @@ FUNCTION {format.pages}
if$
}
+
FUNCTION {format.vol.num.pages}
%{ volume * field.or.null
-{ "{\bf " volume * field.or.null % TDS add boldface
+{
+ volume empty$
+ { "" }
+ {"{\bf " volume * field.or.null "}" *} % TDS add boldface
+ if$
+
number empty$
'skip$
{ "(" number * ")" * *
@@ -474,8 +522,7 @@ FUNCTION {format.vol.num.pages}
{ duplicate$ empty$
{ pop$ format.pages }
% { ":" * pages n.dashify * } % TDS remove colon!
- { "}, " * pages n.dashify * } % TDS replace colon with a comma
- % TDS add a boldface
+ { ", " * pages n.dashify * } % TDS replace colon with a comma
if$
}
if$
@@ -504,8 +551,18 @@ FUNCTION {format.in.ed.booktitle}
% add colon after "In"
%{ "In " booktitle emphasize * } % TDS
%{ "In " format.editors * ", " * booktitle emphasize *
- { "In " booktitle *} % TDS no emphasis in nar!
- { "In " format.editors * ", " * booktitle * % TDS no emphasis in nar!
+% { "In " booktitle *} % TDS no emphasis in nar!
+% 2001 Nov 12 Now Nar wants emph!!
+ { "In "
+"\emph{"
+booktitle
+"}" * * * % 2011 Dec 23 thanks to dkoes - a * was missing
+} % TDS now emphasis in nar!
+ { "In " format.editors * ", " *
+"\emph{"
+booktitle
+"}" * *
+* % TDS now emphasis in nar!
", " * } % TDS and tack on a comma
if$
}
@@ -623,15 +680,25 @@ FUNCTION {format.incoll.inproc.crossref}
" \cite{" * crossref * "}" *
}
+% Wolfram Langer, 15.12.2009
+FUNCTION {format.url}
+{ url empty$
+ { "" }
+ {"\url{" url * "}" *}
+ if$
+}
+
FUNCTION {article}
{ output.bibitem
format.authors "author" output.check
format.date "year" output.check % TDS move date to here
new.block
% format.title "title" output.check % TDS NO TITLES
-% new.block
+ format.title "title" output.check % TDS NO TITLES; titles as of 2000 Sep 13
+ new.block
+% zzz
crossref missing$
- { journal emphasize "journal" output.check
+ { journal "," * emphasize "journal" output.check %TDS add ,
format.vol.num.pages output
% format.date "year" output.check % TDS move date
}
@@ -762,17 +829,25 @@ FUNCTION {inproceedings}
format.authors "author" output.check
format.date "year" output.check % TDS
new.block
-% format.title "title" output.check % TDS NO TITLE
-% new.block
+ format.title "title" output.check % TDS NO TITLE, titles 2000 Sep 13
+% 2001 Nov 12 Now make this title emph!!
+% TDS NO TITLE, titles 2000 Sep 13
+ new.block
crossref missing$
- { format.in.ed.booktitle "booktitle" output.check
- format.bvolume output
- format.number.series output
+ {
+ format.in.ed.booktitle "booktitle"
+%"\emph{"
+% "}" * *
+output.check
+% qqq
+% format.bvolume output
+% format.number.series output
% format.pages output % TDS pages go at the end
address empty$
{ organization publisher new.sentence.checkb
organization output
- ": " output % TDS put a colon
+% 2001 nov 12: no longer colon! TDS
+% ": " output % TDS put a colon
publisher output
% format.date "year" output.check
}
@@ -782,9 +857,8 @@ FUNCTION {inproceedings}
#1 'doblank := % remove blanks
organization output
": " output % TDS put a colon after the location
-%zzz
publisher output
- ". " output % TDS put a period after the publisher
+% ". " output % TDS put a period after the publisher
#0 'doblank := % put back blanks
}
if$
@@ -795,6 +869,8 @@ FUNCTION {inproceedings}
if$
new.block
note output
+ format.bvolume output % TDS goes at end
+ format.number.series output % TDS goes at end
format.pages output % TDS pages go at the end
fin.entry
}
@@ -864,6 +940,17 @@ FUNCTION {misc}
empty.misc.check
}
+% Wolfram Langer, 15.12.2009
+FUNCTION {electronic}
+{ output.bibitem
+ format.authors "author" output.check
+ note output
+ format.date "year" output.check
+ new.block
+ title ", available: " * format.url * "title" output.check
+ fin.entry
+}
+
FUNCTION {phdthesis}
{ output.bibitem
format.authors "author" output.check
@@ -916,11 +1003,11 @@ FUNCTION {proceedings}
FUNCTION {techreport}
{ output.bibitem
- format.authors "author" output.check
+ format.authors ", " * "author" output.check
new.block
format.title "title" output.check
new.block
- format.tr.number output.nonnull
+ format.tr.number ", " * output.nonnull
institution "institution" output.check
address output
format.date "year" output.check
@@ -933,10 +1020,11 @@ FUNCTION {unpublished}
{ output.bibitem
format.authors "author" output.check
new.block
- format.title "title" output.check
+ format.date output
+ format.title "title" output.check % titles as of 2000 Sep 13
+% format.title ", " * "title" output.check
new.block
note "note" output.check
- format.date output
fin.entry
}
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index 6db0cabd62e..7537e4c256f 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -386,7 +386,7 @@ my @TLP_working = qw(
musixtex musixtex-fonts musixtnt musuos muthesis
mversion mwcls mwe mweights mxedruli
mychemistry mycv mylatexformat
- nag nameauth namespc nanumtype1 natbib natded nath nature navigator
+ nag nameauth namespc nanumtype1 nar natbib natded nath nature navigator
ncclatex ncctools
nddiss ndsu-thesis needspace nestquot neuralnetwork
newcommand newenviron newfile newlfm newpx newsletr newspaper
diff --git a/Master/tlpkg/tlpsrc/collection-bibtexextra.tlpsrc b/Master/tlpkg/tlpsrc/collection-bibtexextra.tlpsrc
index b46f49193db..f78581553f2 100644
--- a/Master/tlpkg/tlpsrc/collection-bibtexextra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-bibtexextra.tlpsrc
@@ -89,6 +89,7 @@ depend margbib
depend multibib
depend multibibliography
depend munich
+depend nar
depend nmbib
depend notes2bib
depend oscola
diff --git a/Master/tlpkg/tlpsrc/nar.tlpsrc b/Master/tlpkg/tlpsrc/nar.tlpsrc
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/Master/tlpkg/tlpsrc/nar.tlpsrc