summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/bibtex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-05-12 21:22:30 +0000
committerKarl Berry <karl@freefriends.org>2018-05-12 21:22:30 +0000
commit3c05f18d5c5a389dddaa70e653990439e5e61162 (patch)
tree424ef2276d3e9564152e38c6bf8ee04a6aa3ce88 /Master/texmf-dist/bibtex
parenta204009c7038b80665cb905b6218877ca0cb5645 (diff)
aastex (12may18)
git-svn-id: svn://tug.org/texlive/trunk@47692 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/bibtex')
-rw-r--r--Master/texmf-dist/bibtex/bst/aastex/aasjournal.bst197
1 files changed, 122 insertions, 75 deletions
diff --git a/Master/texmf-dist/bibtex/bst/aastex/aasjournal.bst b/Master/texmf-dist/bibtex/bst/aastex/aasjournal.bst
index ee6879c82a0..f05cdab7c8e 100644
--- a/Master/texmf-dist/bibtex/bst/aastex/aasjournal.bst
+++ b/Master/texmf-dist/bibtex/bst/aastex/aasjournal.bst
@@ -1,11 +1,54 @@
%%
-%% $Log: apj.bst,v $
+%% $Log: aasjournal.bst $
-%% Revision 1.12 2016/2/11 Amy
+%% Revision 1.16 2017/10/26 Amy Hendrickson
+%% `url' only active when used in misc
+%%
+%% `note' is disabled in all cases; as is adsnote and adsurl.
+%%
+%% Repair to @misc call to aaspublisher to prevent `, ,'
+%% when there is no publisher listed.
+%%
+%% Make correct hyperlinked content for doi, ascl, and arXiv;
+%% changed definition of FUNCTION {format.eprint} to compare
+%% archivePrefix with "arXiv" and when they match do
+%% ' {new.block "\doarXiv{" eprint * "}" * }
+%% otherwise do
+%% ' {new.block "\doeprint{" eprint * "}" * }
+%%
+%% \dodoi, \doarXiv and \doeprint definitions are sent to the top of the .bbl file
+%% with commands found in FUNCTION {begin.bib}.
+%%
+%% bbl.version no longer used, could be deleted.
+%%
+%% Version number is added when author enters: version = {number}, only in `misc'
+%%
+%% Removed `format.doi output' in {article} because in
+%% combination with { format.pid output } we could get double doi entries
+%% in the bibliography.
+%%
+%% Rewrote format.pid so that we can check to see if we have a doi number; in
+%% which case we use that and suppress the arXiv and eprint combination. However,
+%% we do Not eliminate the url field if the author has entered it.
+%%
+%% Deleted format.miscversion and made a simplified way to produce version in @misc
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% Revision 1.15 2016/10/5 Amy Hendrickson
+%% Changed bbl.version so that there is no longer a trailing `.'
+
+%% Revision 1.14 2016/9/14 Amy Hendrickson
+%% Added URL field
+
+%% Revision 1.13 2016/8/9 Amy Hendrickson
+%% Change to presort and bibsort to get multiple entries with same author/year
+%% combination to be ordered in bibliography in same order as \cite{}s entered in text.
+
+%% Revision 1.12 2016/2/11 Amy Hendrickson
%% Changes to @misc function to specifications by Dr. August Muench.
%% Made comma appear between title and publisher whether or not there is a version number.
-%% Revision 1.11 2015/12/31 Amy
+%% Revision 1.11 2015/12/31 Amy Hendrickson
%% Changes to @misc function to specifications by Dr. August Muench.
%% Added version and publisher fields.
@@ -23,7 +66,7 @@
%%
%% Revision 1.8 2013/01/10 16:31:34 alberto
%% Added proper formatting of arXiv eprint entries output by ADS
-%% (thse are article records, but the eprint id is printed only
+%% (these are article records, but the eprint id is printed only
%% if no traditional page number is available). Also added support
%% for ASCL entries under the "misc" category.
%%
@@ -57,7 +100,7 @@
%%
-%% This is file `apj.bst',
+%% This originally was file `apj.bst',
%% generated with the docstrip utility.
%%
%% The original source files were:
@@ -124,7 +167,6 @@ ENTRY
journal
key
month
- note
number
organization
pages
@@ -132,11 +174,12 @@ ENTRY
school
series
title
-misctitle
+ misctitle
type
volume
year
version
+ url
}
{}
{ label extra.label sort.label short.list }
@@ -288,7 +331,7 @@ FUNCTION {bbl.volume}
{ "Vol." }
FUNCTION {bbl.version}
-{ "v." }
+{ "" }
FUNCTION {bbl.of}
{ "of" }
@@ -521,23 +564,6 @@ FUNCTION {format.in.editors}
if$
}
-FUNCTION {format.note}
-{ note empty$
- { "" }
- { note #1 #1 substring$
- duplicate$ "{" =
- 'skip$
- { output.state mid.sentence =
- { "l" }
- { "u" }
- if$
- change.case$
- }
- if$
- note #2 global.max$ substring$ *
- }
- if$
-}
FUNCTION {format.title}
{ title empty$
@@ -547,22 +573,6 @@ FUNCTION {format.title}
if$
}
-
-FUNCTION {format.version}
-{ version empty$
- { "" }
- { bbl.version version * ", " *}
- if$
-}
-
-FUNCTION {format.miscversion}
-{ version empty$
- { "" }
- { bbl.version version * "" *}
- if$
-}
-
-
FUNCTION {format.full.names}
{'s :=
#1 'nameptr :=
@@ -669,10 +679,10 @@ FUNCTION {output.bibitem}
}
-FUNCTION {format.doi}
-{ doi empty$
+FUNCTION {format.url}
+{ url empty$
{ "" }
- { "doi:" doi * }
+ { new.block "\url{" url * "}" * }
if$
}
@@ -681,10 +691,11 @@ FUNCTION {format.eprint}
{ "" }
{ archivePrefix empty$
{ "" }
- { archivePrefix ":" * }
+ { archivePrefix "arXiv" =
+ {new.block "\doarXiv{" eprint * "}" * }
+ {new.block "\doeprint{" eprint * "}" * }
+ if$}
if$
- eprint field.or.null
- *
}
if$
}
@@ -694,10 +705,21 @@ FUNCTION {format.eprint}
% You can easily swap the order of which PID
% gets picked
%
+
+FUNCTION {format.doi}
+{ doi empty$
+ { "" }
+ { "\dodoi{" doi * "}" * }
+ if$
+}
+
FUNCTION {format.pid}
-{ eprint empty$
- { format.doi }
- { format.eprint }
+{ doi empty$
+ {eprint empty$
+ { "" }
+ { format.eprint }
+ if$}
+ { format.doi }
if$
}
@@ -917,6 +939,7 @@ FUNCTION {format.journal.pages}
if$
}
+
FUNCTION {format.vol.num.pages}
{ volume field.or.null
}
@@ -1028,7 +1051,7 @@ FUNCTION {format.publisher}
FUNCTION {format.aaspublisher}
{ publisher empty$
{ "empty publisher in " cite$ * warning$ }
- 'skip$
+ 'skip$
if$
", "
address empty$ publisher empty$ and
@@ -1147,10 +1170,10 @@ FUNCTION {article}
}
if$
pages empty$
- { format.pid output }
+ 'skip$
{ format.journal.pages }
if$
- format.note output
+ format.pid output
fin.entry
}
@@ -1184,8 +1207,8 @@ FUNCTION {book}
% }
% if$
format.pages output
- format.note output
format.pid output
+ format.url output
fin.entry
}
@@ -1199,8 +1222,8 @@ FUNCTION {booklet}
format.title "title" output.check
howpublished output
address output
- format.note output
format.pid output
+ format.url output
fin.entry
}
@@ -1237,7 +1260,7 @@ FUNCTION {inbook}
% }
% if$
format.pages "pages" output.check
- format.note output
+ format.url output
fin.entry
}
@@ -1262,7 +1285,7 @@ FUNCTION {incollection}
% }
% if$
format.pages "pages" output.check
- format.note output
+ format.url output
fin.entry
}
@@ -1290,7 +1313,7 @@ FUNCTION {inproceedings}
% }
% if$
format.pages output
- format.note output
+ format.url output
fin.entry
}
@@ -1307,8 +1330,8 @@ FUNCTION {manual}
format.edition output
organization output
address output
- format.note output
format.pid output
+%% format.url output
fin.entry
}
@@ -1323,8 +1346,8 @@ FUNCTION {mastersthesis}
bbl.mthesis format.thesis.type output.nonnull
school "school" output.check
address output
- format.note output
format.pid output
+ format.url output
fin.entry
}
@@ -1335,12 +1358,21 @@ FUNCTION {misc}
name.or.dash
format.date "year" output.check
date.block
+%% new
format.title output
+%% new
+ version empty$
+ 'skip$
+ { version output}
+ if$
+%%
howpublished output
- format.miscversion output
- format.aaspublisher
- format.note output
+ publisher empty$
+ {}
+ {format.aaspublisher}
+ if$
format.pid output
+ format.url output
fin.entry
}
@@ -1355,8 +1387,8 @@ FUNCTION {phdthesis}
bbl.phdthesis format.thesis.type output.nonnull
school "school" output.check
address output
- format.note output
format.pid output
+ format.url output
fin.entry
}
@@ -1389,7 +1421,7 @@ FUNCTION {proceedings}
% organization output
% publisher output
format.pages output
- format.note output
+ format.url output
fin.entry
}
@@ -1404,8 +1436,8 @@ FUNCTION {techreport}
format.tr.number output.nonnull
institution "institution" output.check
address output
- format.note output
format.pid output
+%% format.url output
fin.entry
}
@@ -1417,8 +1449,8 @@ FUNCTION {unpublished}
format.date "year" output.check
date.block
% format.title "title" output.check
- format.note "note" output.check
format.pid output
+%% format.url output
fin.entry
}
@@ -1640,9 +1672,14 @@ FUNCTION {presort}
*
" "
*
- title field.or.null
- sort.format.title
- *
+%% August 2016
+%% commenting out this combination gets the cites right but references wrong
+%% title field.or.null
+%% sort.format.title
+%% *
+%%
+%% with only this line on, we get cites right but references wrong
+ sort.format.title
#1 entry.max$ substring$
'sort.key$ :=
}
@@ -1704,9 +1741,11 @@ FUNCTION {bib.sort.order}
*
" "
*
- title field.or.null
- sort.format.title
- *
+%% Commented out August 2016, so that multiple indentical author/year
+%% combinations are entered in the order that \cite{}s are found in text.
+% title field.or.null
+% sort.format.title
+% *
#1 entry.max$ substring$
'sort.key$ :=
}
@@ -1720,13 +1759,21 @@ FUNCTION {begin.bib}
'skip$
{ preamble$ write$ newline$ }
if$
-% "\begin{thebibliography}{" number.label int.to.str$ * "}" *
"\begin{thebibliography}{}"
write$ newline$
"\expandafter\ifx\csname natexlab\endcsname\relax\def\natexlab#1{#1}\fi"
write$ newline$
+ "\providecommand{\url}[1]{\href{#1}{#1}}"
+ write$ newline$
+ "\providecommand{\dodoi}[1]{doi:~\href{http://doi.org/#1}{\nolinkurl{#1}}}"
+ write$ newline$
+ "\providecommand{\doeprint}[1]{\href{http://ascl.net/#1}{\nolinkurl{http://ascl.net/#1}}}"
+ write$ newline$
+ "\providecommand{\doarXiv}[1]{\href{https://arxiv.org/abs/#1}{\nolinkurl{https://arxiv.org/abs/#1}}}"
+ write$ newline$
}
+
EXECUTE {begin.bib}
EXECUTE {init.state.consts}
@@ -1741,4 +1788,4 @@ FUNCTION {end.bib}
EXECUTE {end.bib}
%% End of customized bst file
%%
-%% End of file `apj.bst'.
+%% End of file `aasjournal.bst'.