Merge pull request AASJournals#65 from augustfly/master

Updating to v6.2 official

README.md

@@ -1,10 +1,10 @@
-[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.168228.svg)](https://doi.org/10.5281/zenodo.168228)
+[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.593626.svg)](https://doi.org/10.5281/zenodo.593626)
 
 ## AASTeX6
-The Version 6 style files and documentation for authoring [AAS Journal](http://journals.aas.org) articles in LaTeX2e were released on January 6, 2016. A list of updates and changes provided by Version 6 can be found in the [AASTeX Revision History](http://journals.aas.org/authors/aastex/revisionhistory.html). Please note that although this is a point release, it is not backwards compatible with any prior version of AASTeX.
+The Version 6.2 style files and documentation for authoring [AAS Journal](http://journals.aas.org) articles in LaTeX2e were released on January 8, 2018. A list of updates and changes provided by Version 6.2 can be found in the [AASTeX Revision History](http://journals.aas.org/authors/aastex/revisionhistory.html). Version 6.2 is backwards compatible with v6.1 but no prior version of AASTeX.
 
 ## BibTeX
-This repository also includes the AAS Journals BibTeX style file, [aasjournal.bst](bst/aasjournal.bst).
+This repository also includes the AAS Journals BibTeX style file, [aasjournal.bst](bst/aasjournal.bst), which was last updated October 26, 2017. This is our BST file that supports the `version` and `publisher` fields of an `@misc` BibTeX entry. The most recent update added anchored links to reference source material, e.g., links to article DOIs, arXiv preprints, and/or [ASCL](http://ascl.net) identifiers.
 
 ## Download
 You may download the most recent version from this repository or from the [AAS Journals website](http://journals.aas.org/authors/aastex.html). 
@@ -13,7 +13,7 @@ You may download the most recent version from this repository or from the [AAS J
 In addition to the [sample files](sample) provided here, an extensive AASTeX guide can be found at our [AAS Journals website](http://journals.aas.org/authors/aastex/aasguide.html). Broader style, data, and graphics guides are also [available](http://journals.aas.org/authors/). 
 
 ## Development model
-AASTeX development is performed outside of the Github platform, but incremental updates from our developers are posted here regularly, and we gladly accept issues and user pull requests. 
+AASTeX development is performed outside of the GitHub platform, but incremental updates from our developers are posted here regularly, and we gladly accept issues and user pull requests. 
 
 ## Citation
 While the AAS Journals encourage developers to post preferred citations for their codes and encourage authors to cite all software that supports their research articles, citation of AASTeX or acknowledgement of the developers and maintainers of this package is traditionally seen as inappropriate and is not requested.
@@ -35,4 +35,5 @@ Outside of issues or pull requests, please contact the AASTeX team for help at o
 ## Credit
 AASTeX originated 28 years ago with a set of LaTeX macros developed by [Bob Hanisch and Chris Biemesderfer](https://ui.adsabs.harvard.edu/#abs/1989BAAS...21..780H/abstract). While a more detailed history is available in the [sample document](sample/sample61.tex), we want to recognize the most recent contributions of individual astronomers to AASTeX 6 here. A partial list includes:
 
-+ @dfm and @davidwhogg authored a [series of readability and layout modifications of AASTeX v6.0](https://github.com/dfm/peerless/blob/master/document/ms.tex#L19-L69) in a recent manuscript that were incorporated into v6.1 as the *"modern"* document style.
++ Dan Foreman-Mackey (@dfm) and David Hogg (@davidwhogg) authored a [series of readability and layout modifications of AASTeX v6.0](https://github.com/dfm/peerless/blob/master/document/ms.tex#L19-L69) in a recent manuscript that were incorporated into v6.1 as the *"modern"* document style.
++ We thank the many users who have supplied issues directly to the AAS Data Editors in charge of AASTeX development or as issues (ongoing or closed) on this repository. We especially thank Alex Drlica-Wagner (@kadrlica) for developing fixes to many of the issues identified by authors. He also maintains a fork that is pretty much always ahead of ours, as we almost never accept his otherwise excellent PRs. 

bst/aasjournal.bst

@@ -1,7 +1,40 @@
 %%
-%% $Log: apj.bst,v $
+%% $Log: aasjournal.bst $
 
-%% Revision 1.14 2016/10/5 Amy Hendrickson
+%% 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
@@ -33,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.
 %%
@@ -67,7 +100,7 @@
 
 
 %%
-%% This is file `apj.bst',
+%% This originally was file `apj.bst',
 %% generated with the docstrip utility.
 %%
 %% The original source files were:
@@ -134,7 +167,6 @@ ENTRY
     journal
     key
     month
-    note
     number
     organization
     pages
@@ -299,7 +331,7 @@ FUNCTION {bbl.volume}
 { "Vol." }
 
 FUNCTION {bbl.version}
-{ "v" }
+{ "" }
 
 FUNCTION {bbl.of}
 { "of" }
@@ -532,24 +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$
@@ -559,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 :=
@@ -681,13 +679,6 @@ FUNCTION {output.bibitem}
 }
 
 
-FUNCTION {format.doi}
-{ doi empty$
-    { "" }
-    { "doi:" doi * }
-  if$
-}
-
 FUNCTION {format.url}
 { url empty$
     { "" }
@@ -700,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$
 }
@@ -713,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$
 }
 
@@ -936,6 +939,7 @@ FUNCTION {format.journal.pages}
   if$
 }
 
+
 FUNCTION {format.vol.num.pages}
 { volume field.or.null
 }
@@ -1047,7 +1051,7 @@ FUNCTION {format.publisher}
 FUNCTION {format.aaspublisher}
 { publisher empty$
     { "empty publisher in " cite$ * warning$ }
-    'skip$
+     'skip$
   if$
   ", "
   address empty$ publisher empty$ and
@@ -1166,11 +1170,10 @@ FUNCTION {article}
     }
   if$
   pages empty$
-    { format.pid output }
+    'skip$
     { format.journal.pages }
   if$
-  format.note output
-  format.url output
+  format.pid output
   fin.entry
 }
 
@@ -1204,7 +1207,6 @@ FUNCTION {book}
 %    }
 %  if$
   format.pages output
-  format.note output
   format.pid output
   format.url output
   fin.entry
@@ -1220,7 +1222,6 @@ FUNCTION {booklet}
   format.title "title" output.check
   howpublished output
   address output
-  format.note output
   format.pid output
   format.url output
   fin.entry
@@ -1259,7 +1260,6 @@ FUNCTION {inbook}
 %    }
 %  if$
   format.pages "pages" output.check
-  format.note output
   format.url output
   fin.entry
 }
@@ -1285,7 +1285,6 @@ FUNCTION {incollection}
 %    }
 %  if$
   format.pages "pages" output.check
-  format.note output
   format.url output
   fin.entry
 }
@@ -1314,7 +1313,6 @@ FUNCTION {inproceedings}
 %    }
 %  if$
   format.pages output
-  format.note output
   format.url output
   fin.entry
 }
@@ -1332,9 +1330,8 @@ FUNCTION {manual}
   format.edition output
   organization output
   address output
-  format.note output
   format.pid output
-  format.url output
+%%  format.url output
   fin.entry
 }
 
@@ -1349,7 +1346,6 @@ 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
@@ -1362,11 +1358,19 @@ 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
@@ -1383,7 +1387,6 @@ 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
@@ -1418,7 +1421,6 @@ FUNCTION {proceedings}
 %  organization output
 %  publisher output
   format.pages output
-  format.note output
   format.url output
   fin.entry
 }
@@ -1434,9 +1436,8 @@ FUNCTION {techreport}
   format.tr.number output.nonnull
   institution "institution" output.check
   address output
-  format.note output
   format.pid output
-  format.url output
+%%  format.url output
   fin.entry
 }
 
@@ -1448,9 +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
+%%  format.url output
   fin.entry
 }
 
@@ -1759,15 +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}
@@ -1782,4 +1788,4 @@ FUNCTION {end.bib}
 EXECUTE {end.bib}
 %% End of customized bst file
 %%
-%% End of file `apj.bst'.
+%% End of file `aasjournal.bst'.