Merge pull request #33 from augustfly/master

v61 pull request

README.md

@@ -1,7 +1,7 @@
-[![DOI](https://zenodo.org/badge/doi/10.5281/zenodo.45282.svg)](http://dx.doi.org/10.5281/zenodo.45282)
+[![v6.0.1 DOI](https://zenodo.org/badge/doi/10.5281/zenodo.45282.svg)](http://doi.org/10.5281/zenodo.45282)
 
-## AASTeX60
-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). 
+## 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).  
 
 ## BibTeX
 This repository also includes the AAS Journals BibTeX style file, [aasjournal.bst](bst/aasjournal.bst).
@@ -12,5 +12,27 @@ You may download the most recent version from this repository or from the [AAS J
 ## Documentation
 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. 
+
+## 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.
+
 ## Contact
 Outside of issues or pull requests, please contact the AASTeX team for help at our [authoring helpdesk](mailto:[email protected]) or reach us on Twitter [@AAS_Publishing](https://twitter.com/AAS_Publishing).
+
+## Release History
+
+| Version  | Github Release   | DOI  |
+| -------- |:----------------:| -----|
+| [v6.0.1](https://github.com/AASJournals/AASTeX60/tree/v6.0.1)   | 2016 January 26  | [10.5281/zenodo.45282](http://doi.org/10.5281/zenodo.45282)|
+| [v6.0.2](https://github.com/AASJournals/AASTeX60/tree/v6.0.2)   | 2016 March 02    | tbd       |
+| [v6.1](https://github.com/AASJournals/AASTeX60/tree/v6.1)       | 2016 November 23 | tbd       |
+
+  [9e852317]: https://github.com/augustfly/AASTeX60/releases/tag/v6.0.1 "v6.0.1"
+
+
+## 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.

bst/aasjournal.bst

@@ -1,11 +1,21 @@
 %%
 %% $Log: apj.bst,v $
 
-%% Revision 1.12 2016/2/11 Amy
+%% Revision 1.14 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.
 
@@ -132,11 +142,12 @@ ENTRY
     school
     series
     title
-misctitle
+    misctitle
     type
     volume
     year
     version
+    url
   }
   {}
   { label extra.label sort.label short.list }
@@ -288,7 +299,7 @@ FUNCTION {bbl.volume}
 { "Vol." }
 
 FUNCTION {bbl.version}
-{ "v." }
+{ "v" }
 
 FUNCTION {bbl.of}
 { "of" }
@@ -539,6 +550,7 @@ FUNCTION {format.note}
   if$
 }
 
+
 FUNCTION {format.title}
 { title empty$
     { "" }
@@ -676,6 +688,13 @@ FUNCTION {format.doi}
   if$
 }
 
+FUNCTION {format.url}
+{ url empty$
+    { "" }
+    { new.block "\url{" url * "}" * }
+  if$
+}
+
 FUNCTION {format.eprint}
 { eprint empty$
     { "" }
@@ -1151,6 +1170,7 @@ FUNCTION {article}
     { format.journal.pages }
   if$
   format.note output
+  format.url output
   fin.entry
 }
 
@@ -1186,6 +1206,7 @@ FUNCTION {book}
   format.pages output
   format.note output
   format.pid output
+  format.url output
   fin.entry
 }
 
@@ -1201,6 +1222,7 @@ FUNCTION {booklet}
   address output
   format.note output
   format.pid output
+  format.url output
   fin.entry
 }
 
@@ -1238,6 +1260,7 @@ FUNCTION {inbook}
 %  if$
   format.pages "pages" output.check
   format.note output
+  format.url output
   fin.entry
 }
 
@@ -1263,6 +1286,7 @@ FUNCTION {incollection}
 %  if$
   format.pages "pages" output.check
   format.note output
+  format.url output
   fin.entry
 }
 
@@ -1291,6 +1315,7 @@ FUNCTION {inproceedings}
 %  if$
   format.pages output
   format.note output
+  format.url output
   fin.entry
 }
 
@@ -1309,6 +1334,7 @@ FUNCTION {manual}
   address output
   format.note output
   format.pid output
+  format.url output
   fin.entry
 }
 
@@ -1325,6 +1351,7 @@ FUNCTION {mastersthesis}
   address output
   format.note output
   format.pid output
+  format.url output
   fin.entry
 }
 
@@ -1341,6 +1368,7 @@ FUNCTION {misc}
   format.aaspublisher 
   format.note output
   format.pid output
+  format.url output
   fin.entry
 }
 
@@ -1357,6 +1385,7 @@ FUNCTION {phdthesis}
   address output
   format.note output
   format.pid output
+  format.url output
   fin.entry
 }
 
@@ -1390,6 +1419,7 @@ FUNCTION {proceedings}
 %  publisher output
   format.pages output
   format.note output
+  format.url output
   fin.entry
 }
 
@@ -1406,6 +1436,7 @@ FUNCTION {techreport}
   address output
   format.note output
   format.pid output
+  format.url output
   fin.entry
 }
 
@@ -1419,6 +1450,7 @@ FUNCTION {unpublished}
 %  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$ :=
 }
@@ -1725,6 +1764,8 @@ FUNCTION {begin.bib}
   write$ newline$
   "\expandafter\ifx\csname natexlab\endcsname\relax\def\natexlab#1{#1}\fi"
   write$ newline$
+  "\providecommand{\url}[1]{\href{#1}{#1}}"
+  write$ newline$
 }
 
 EXECUTE {begin.bib}