diff --git a/bst/aasjournal.bst b/bst/aasjournal.bst index 7df8944..68d2dcf 100644 --- a/bst/aasjournal.bst +++ b/bst/aasjournal.bst @@ -1,1793 +1,1801 @@ -%% -%% $Log: aasjournal.bst $ - -%% 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 Hendrickson -%% Changes to @misc function to specifications by Dr. August Muench. -%% Added version and publisher fields. - -%% Revision 1.10 2013/03/11 13:01:55 alberto -%% Reworked code to use format.pid for articles without proper -%% pagination which then leads the system to use either an eprint -%% id or a DOI; this will solve most problems with citing early -%% access articles (no volume of page available, but online). -%% Removed bibliography count from preamble since it seems to -%% confuse some versions of latex. -%% -%% Revision 1.9 2013/2/19 Erik Tollerud -%% fixes for spurious error messages due to rev 1.8 changes -%% also fixed missing publisher field printing in "book" -%% -%% Revision 1.8 2013/01/10 16:31:34 alberto -%% Added proper formatting of arXiv eprint entries output by ADS -%% (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. -%% -%% Revision 1.7 2011/11/21 13:10:12 alberto -%% Implemented new ApJ formatting rules: for papers with more than -%% 5 authors, print first 3 followed by "et al." -%% -%% Revision 1.6 2009/05/18 15:13:02 alberto -%% Fixed sorting of references with truncated lists of authors -%% in sort.format.names -%% Fix courtesy of Stephen Fegan -%% -%% Revision 1.5 2009/03/19 13:15:11 alberto -%% Truncate \bibitem entries with more than 8 authors. -%% Fix courtesy of Craig Wiegert -%% and Andrew R. Marble -%% -%% Revision 1.4 2002/06/18 16:37:48 alberto -%% Add comma after first author in two-author reference -%% Fix courtesy of Tim Robishaw -%% -%% Revision 1.3 2000/04/20 22:17:50 jbaker -%% Fixed INBOOK bug, now works essentially like BOOK. -%% -%% Revision 1.2 1998/08/30 22:35:45 jbaker -%% Added RCS keywords. -%% -%% 1998/08/12 J Baker -%% Tweaked by hand to get correct results for ApJ. Added functions from -%% astrobib. - - -%% -%% This originally was file `apj.bst', -%% generated with the docstrip utility. -%% -%% The original source files were: -%% -%% merlin.mbs (with options: `,ay,nat,nm-rev,nmdash,dt-beg,yr-per,note-yr,atit-u,jtit-x,jttl-rm,thtit-a,vnum-x,volp-com,jpg-1,pp-last,btit-rm,add-pub,pub-par,pre-edn,edby,edbyx,blk-com,fin-bare,ppx,ed,abr,ord,jabr,amper,em-x') -%% ---------------------------------------- -%% *** Bibliographic Style for ApJ *** -%% - %------------------------------------------------------------------- - % The original source file contains the following version information: - % \ProvidesFile{merlin.mbs}[1998/02/25 3.85a (PWD)] - % - % NOTICE: - % This file may be used for non-profit purposes. - % It may not be distributed in exchange for money, - % other than distribution costs. - % - % The author provides it `as is' and does not guarantee it in any way. - % - % Copyright (C) 1994-98 Patrick W. Daly - %------------------------------------------------------------------- - % For use with BibTeX version 0.99a or later - %------------------------------------------------------------------- - % This bibliography style file is intended for texts in ENGLISH - % This is an author-year citation style bibliography. As such, it is - % non-standard LaTeX, and requires a special package file to function properly. - % Such a package is natbib.sty by Patrick W. Daly - % The form of the \bibitem entries is - % \bibitem[Jones et al.(1990)]{key}... - % \bibitem[Jones et al.(1990)Jones, Baker, and Smith]{key}... - % The essential feature is that the label (the part in brackets) consists - % of the author names, as they should appear in the citation, with the year - % in parentheses following. There must be no space before the opening - % parenthesis! - % With natbib v5.3, a full list of authors may also follow the year. - % In natbib.sty, it is possible to define the type of enclosures that is - % really wanted (brackets or parentheses), but in either case, there must - % be parentheses in the label. - % The \cite command functions as follows: - % \citet{key} ==>> Jones et al. (1990) - % \citet*{key} ==>> Jones, Baker, and Smith (1990) - % \citep{key} ==>> (Jones et al., 1990) - % \citep*{key} ==>> (Jones, Baker, and Smith, 1990) - % \citep[chap. 2]{key} ==>> (Jones et al., 1990, chap. 2) - % \citep[e.g.][]{key} ==>> (e.g. Jones et al., 1990) - % \citep[e.g.][p. 32]{key} ==>> (e.g. Jones et al., p. 32) - % \citeauthor{key} ==>> Jones et al. - % \citeauthor*{key} ==>> Jones, Baker, and Smith - % \citeyear{key} ==>> 1990 - %--------------------------------------------------------------------- - -ENTRY - { address - archivePrefix - author - booktitle - chapter - doi - edition - editor - eprint - howpublished - institution - journal - key - month - number - organization - pages - publisher - school - series - title - misctitle - type - volume - year - version - url - } - {} - { label extra.label sort.label short.list } - -INTEGERS { output.state before.all mid.sentence after.sentence after.block } - -FUNCTION {init.state.consts} -{ #0 'before.all := - #1 'mid.sentence := - #2 'after.sentence := - #3 'after.block := -} - -STRINGS { s t } - -FUNCTION {output.nonnull} -{ 's := - output.state mid.sentence = - { ", " * write$ } - { output.state after.block = - { add.period$ write$ - newline$ - "\newblock " write$ - } - { output.state before.all = - 'write$ - { add.period$ " " * write$ } - if$ - } - if$ - mid.sentence 'output.state := - } - if$ - s -} - -FUNCTION {output} -{ duplicate$ empty$ - 'pop$ - 'output.nonnull - if$ -} - -FUNCTION {output.check} -{ 't := - duplicate$ empty$ - { pop$ "empty " t * " in " * cite$ * warning$ } - 'output.nonnull - if$ -} - -FUNCTION {fin.entry} -{ duplicate$ empty$ - 'pop$ - 'write$ - if$ - newline$ -} - -FUNCTION {new.block} -{ output.state before.all = - 'skip$ - { after.block 'output.state := } - if$ -} - -FUNCTION {new.sentence} -{ output.state after.block = - 'skip$ - { output.state before.all = - 'skip$ - { after.sentence 'output.state := } - if$ - } - if$ -} - -FUNCTION {add.blank} -{ " " * before.all 'output.state := -} - -FUNCTION {date.block} -{ - skip$ -} - -FUNCTION {not} -{ { #0 } - { #1 } - if$ -} - -FUNCTION {and} -{ 'skip$ - { pop$ #0 } - if$ -} - -FUNCTION {or} -{ { pop$ #1 } - 'skip$ - if$ -} - -FUNCTION {new.block.checkb} -{ empty$ - swap$ empty$ - and - 'skip$ - 'new.block - if$ -} - -FUNCTION {field.or.null} -{ duplicate$ empty$ - { pop$ "" } - 'skip$ - if$ -} - -FUNCTION {emphasize} -{ skip$ } - -FUNCTION {capitalize} -{ "u" change.case$ "t" change.case$ } - -FUNCTION {space.word} -{ " " swap$ * " " * } - - % Here are the language-specific definitions for explicit words. - % Each function has a name bbl.xxx where xxx is the English word. - % The language selected here is ENGLISH -FUNCTION {bbl.and} -{ "and"} - -FUNCTION {bbl.editors} -{ "eds." } - -FUNCTION {bbl.editor} -{ "ed." } - -FUNCTION {bbl.edby} -{ "edited by" } - -FUNCTION {bbl.edition} -{ "edn." } - -FUNCTION {bbl.volume} -{ "Vol." } - -FUNCTION {bbl.version} -{ "" } - -FUNCTION {bbl.of} -{ "of" } - -FUNCTION {bbl.number} -{ "no." } - -FUNCTION {bbl.nr} -{ "no." } - -FUNCTION {bbl.in} -{ "in" } - -FUNCTION {bbl.pages} -{ "" } - -FUNCTION {bbl.page} -{ "" } - -FUNCTION {bbl.chapter} -{ "Ch." } -%{ "chap." } - -FUNCTION {bbl.techrep} -{ "Tech. Rep." } - -FUNCTION {bbl.mthesis} -{ "Master's thesis" } - -FUNCTION {bbl.phdthesis} -{ "PhD thesis" } - -FUNCTION {bbl.first} -{ "1st" } - -FUNCTION {bbl.second} -{ "2nd" } - -FUNCTION {bbl.third} -{ "3rd" } - -FUNCTION {bbl.fourth} -{ "4th" } - -FUNCTION {bbl.fifth} -{ "5th" } - -FUNCTION {bbl.st} -{ "st" } - -FUNCTION {bbl.nd} -{ "nd" } - -FUNCTION {bbl.rd} -{ "rd" } - -FUNCTION {bbl.th} -{ "th" } - -MACRO {jan} {"Jan."} - -MACRO {feb} {"Feb."} - -MACRO {mar} {"Mar."} - -MACRO {apr} {"Apr."} - -MACRO {may} {"May"} - -MACRO {jun} {"Jun."} - -MACRO {jul} {"Jul."} - -MACRO {aug} {"Aug."} - -MACRO {sep} {"Sep."} - -MACRO {oct} {"Oct."} - -MACRO {nov} {"Nov."} - -MACRO {dec} {"Dec."} - -FUNCTION {eng.ord} -{ duplicate$ "1" swap$ * - #-2 #1 substring$ "1" = - { bbl.th * } - { duplicate$ #-1 #1 substring$ - duplicate$ "1" = - { pop$ bbl.st * } - { duplicate$ "2" = - { pop$ bbl.nd * } - { "3" = - { bbl.rd * } - { bbl.th * } - if$ - } - if$ - } - if$ - } - if$ -} - -INTEGERS { nameptr namesleft numnames numtrunc } - -FUNCTION {format.names} -{ 's := - #0 'numtrunc := - #1 'nameptr := - s num.names$ 'numnames := - numnames 'namesleft := - numnames #5 > - { #3 'numtrunc := } - {} - if$ - { namesleft #0 > } - { s nameptr - "{vv~}{ll}{, jj}{, f.}" format.name$ - 't := - nameptr #1 > - { - nameptr #1 - numtrunc = - { - #1 'namesleft := - "others" 't := - } - {} - if$ - - namesleft #1 > - { ", " * t * } - { - numnames #1 > - { "," * } - 'skip$ - if$ - s nameptr "{ll}" format.name$ duplicate$ "others" = - { 't := } - { pop$ } - if$ - t "others" = - { - " {et~al.}" * - } - { " \& " * t * } - if$ - } - if$ - } - 't - if$ - nameptr #1 + 'nameptr := - namesleft #1 - 'namesleft := - } - while$ -} - -FUNCTION {format.names.ed} -{ 's := - #1 'nameptr := - s num.names$ 'numnames := - numnames 'namesleft := - { namesleft #0 > } - { s nameptr - "{f.~}{vv~}{ll}{, jj}" - format.name$ - 't := - nameptr #1 > - { - namesleft #1 > - { ", " * t * } - { - numnames #2 > - { "," * } - 'skip$ - if$ - s nameptr "{ll}" format.name$ duplicate$ "others" = - { 't := } - { pop$ } - if$ - t "others" = - { - " {et~al.}" * - } - { " \& " * t * } - if$ - } - if$ - } - 't - if$ - nameptr #1 + 'nameptr := - namesleft #1 - 'namesleft := - } - while$ -} - -FUNCTION {format.key} -{ empty$ - { key field.or.null } - { "" } - if$ -} - -FUNCTION {format.authors} -{ author empty$ - { "" } - { author format.names } - if$ -} - -FUNCTION {format.editors} -{ editor empty$ - { "" } - { editor format.names - editor num.names$ #1 > - { ", " * bbl.editors * } - { ", " * bbl.editor * } - if$ - } - if$ -} - -FUNCTION {format.in.editors} -{ editor empty$ - { "" } - { editor format.names.ed - } - if$ -} - - -FUNCTION {format.title} -{ title empty$ - { "" } - { title - } - if$ -} - -FUNCTION {format.full.names} -{'s := - #1 'nameptr := - s num.names$ 'numnames := - numnames 'namesleft := - { namesleft #0 > } - { s nameptr - "{vv~}{ll}" format.name$ - 't := - nameptr #1 > - { - namesleft #1 > - { ", " * t * } - { - numnames #2 > - { "," * } - 'skip$ - if$ - s nameptr "{ll}" format.name$ duplicate$ "others" = - { 't := } - { pop$ } - if$ - t "others" = - { - " {et~al.}" * - } - { " \& " * t * } - if$ - } - if$ - } - 't - if$ - nameptr #1 + 'nameptr := - namesleft #1 - 'namesleft := - } - while$ -} - -FUNCTION {author.editor.key.full} -{ author empty$ - { editor empty$ - { key empty$ - { cite$ #1 #3 substring$ } - 'key - if$ - } - { editor format.full.names } - if$ - } - { author format.full.names } - if$ -} - -FUNCTION {author.key.full} -{ author empty$ - { key empty$ - { cite$ #1 #3 substring$ } - 'key - if$ - } - { author format.full.names } - if$ -} - -FUNCTION {editor.key.full} -{ editor empty$ - { key empty$ - { cite$ #1 #3 substring$ } - 'key - if$ - } - { editor format.full.names } - if$ -} - -FUNCTION {make.full.names} -{ type$ "book" = - type$ "inbook" = - or - 'author.editor.key.full - { type$ "proceedings" = - 'editor.key.full - 'author.key.full - if$ - } - if$ -} - -FUNCTION {output.bibitem} -{ newline$ - "\bibitem[{" write$ - label write$ - ")" make.full.names duplicate$ short.list = - { pop$ } - { * } - if$ - "}]{" * write$ - cite$ write$ - "}" write$ - newline$ - "" - before.all 'output.state := -} - - -FUNCTION {format.url} -{ url empty$ - { "" } - { new.block "\url{" url * "}" * } - if$ -} - -FUNCTION {format.eprint} -{ eprint empty$ - { "" } - { archivePrefix empty$ - { "" } - { archivePrefix "arXiv" = - {new.block "\doarXiv{" eprint * "}" * } - {new.block "\doeprint{" eprint * "}" * } - if$} - if$ - } - if$ -} - -% Formats a persistent identifier (PID) -% (typically a DOI or an eprint id) -% You can easily swap the order of which PID -% gets picked -% - -FUNCTION {format.doi} -{ doi empty$ - { "" } - { "\dodoi{" doi * "}" * } - if$ -} - -FUNCTION {format.pid} -{ doi empty$ - {eprint empty$ - { "" } - { format.eprint } - if$} - { format.doi } - if$ -} - -FUNCTION {n.dashify} -{ - 't := - "" - { t empty$ not } - { t #1 #1 substring$ "-" = - { t #1 #2 substring$ "--" = not - { "--" * - t #2 global.max$ substring$ 't := - } - { { t #1 #1 substring$ "-" = } - { "-" * - t #2 global.max$ substring$ 't := - } - while$ - } - if$ - } - { t #1 #1 substring$ * - t #2 global.max$ substring$ 't := - } - if$ - } - while$ -} - -FUNCTION {word.in} -{ bbl.in - " " * } - -FUNCTION {format.date} -{ year duplicate$ empty$ - { "empty year in " cite$ * "; set to ????" * warning$ - pop$ "????" } - 'skip$ - if$ - extra.label * - before.all 'output.state := - after.sentence 'output.state := -} - -FUNCTION {format.btitle} -{ title -} - -FUNCTION {tie.or.space.connect} -{ duplicate$ text.length$ #3 < - { "~" } - { " " } - if$ - swap$ * * -} - -FUNCTION {either.or.check} -{ empty$ - 'pop$ - { "can't use both " swap$ * " fields in " * cite$ * warning$ } - if$ -} - -FUNCTION {format.bvolume} -{ volume empty$ - { "" } - { bbl.volume volume tie.or.space.connect - series empty$ - 'skip$ - { bbl.of space.word * series emphasize * } - if$ - "volume and number" number either.or.check - } - if$ -} - -FUNCTION {format.number.series} -{ volume empty$ - { number empty$ - { series field.or.null } - { output.state mid.sentence = - { bbl.number } - { bbl.number capitalize } - if$ - number tie.or.space.connect - series empty$ - { "there's a number but no series in " cite$ * warning$ } - { bbl.in space.word * series * } - if$ - } - if$ - } - { "" } - if$ -} - -FUNCTION {is.num} -{ chr.to.int$ - duplicate$ "0" chr.to.int$ < not - swap$ "9" chr.to.int$ > not and -} - -FUNCTION {extract.num} -{ duplicate$ 't := - "" 's := - { t empty$ not } - { t #1 #1 substring$ - t #2 global.max$ substring$ 't := - duplicate$ is.num - { s swap$ * 's := } - { pop$ "" 't := } - if$ - } - while$ - s empty$ - 'skip$ - { pop$ s } - if$ -} - -FUNCTION {convert.edition} -{ edition extract.num "l" change.case$ 's := - s "first" = s "1" = or - { bbl.first 't := } - { s "second" = s "2" = or - { bbl.second 't := } - { s "third" = s "3" = or - { bbl.third 't := } - { s "fourth" = s "4" = or - { bbl.fourth 't := } - { s "fifth" = s "5" = or - { bbl.fifth 't := } - { s #1 #1 substring$ is.num - { s eng.ord 't := } - { edition 't := } - if$ - } - if$ - } - if$ - } - if$ - } - if$ - } - if$ - t -} - -FUNCTION {format.edition} -{ edition empty$ - { "" } - { output.state mid.sentence = - { convert.edition "l" change.case$ " " * bbl.edition * } - { convert.edition "t" change.case$ " " * bbl.edition * } - if$ - } - if$ -} - -INTEGERS { multiresult } - -FUNCTION {multi.page.check} -{ 't := - #0 'multiresult := - { multiresult not - t empty$ not - and - } - { t #1 #1 substring$ - duplicate$ "-" = - swap$ duplicate$ "," = - swap$ "+" = - or or - { #1 'multiresult := } - { t #2 global.max$ substring$ 't := } - if$ - } - while$ - multiresult -} - -FUNCTION {format.pages} -{ pages empty$ - { "" } - { pages multi.page.check -% { bbl.pages pages n.dashify tie.or.space.connect } -% { bbl.page pages tie.or.space.connect } - { pages n.dashify } - { pages } - if$ - } - if$ -} - -FUNCTION {first.page} -{ 't := - "" - { t empty$ not t #1 #1 substring$ "-" = not and } - { t #1 #1 substring$ * - t #2 global.max$ substring$ 't := - } - while$ -} - -FUNCTION {format.journal.pages} -{ pages empty$ - 'skip$ - { duplicate$ empty$ - { pop$ format.pages } - { - ", " * - pages first.page * - } - if$ - } - if$ -} - - -FUNCTION {format.vol.num.pages} -{ volume field.or.null -} - -FUNCTION {format.chapter.pages} -{ chapter empty$ - { "" } - { type empty$ - { bbl.chapter } - { type "l" change.case$ } - if$ - chapter tie.or.space.connect - } - if$ -} - -FUNCTION {format.in.ed.booktitle} -{ booktitle empty$ - { "" } - { editor empty$ - { word.in booktitle emphasize * } - { word.in booktitle emphasize * - ", " * - editor num.names$ #1 > - { bbl.editors } - { bbl.editor } - if$ - * " " * - format.in.editors * - } - if$ - } - if$ -} - -FUNCTION {format.thesis.type} -{ type empty$ - 'skip$ - { pop$ - type "t" change.case$ - } - if$ -} - -FUNCTION {format.tr.number} -{ type empty$ - { bbl.techrep } - 'type - if$ - number empty$ - { "t" change.case$ } - { number tie.or.space.connect } - if$ -} - -FUNCTION {format.article.crossref} -{ - word.in - " \cite{" * crossref * "}" * -} - -FUNCTION {format.book.crossref} -{ volume empty$ - { "empty volume in " cite$ * "'s crossref of " * crossref * warning$ - word.in - } - { bbl.volume volume tie.or.space.connect - bbl.of space.word * - } - if$ - " \cite{" * crossref * "}" * -} - -FUNCTION {format.incoll.inproc.crossref} -{ - word.in - " \cite{" * crossref * "}" * -} - -FUNCTION {format.publisher} -{ publisher empty$ - { "empty publisher in " cite$ * warning$ } - 'skip$ - if$ - "" - address empty$ publisher empty$ and - 'skip$ - { - add.blank "(" * - address empty$ - 'skip$ - { address * } - if$ - publisher empty$ - 'skip$ - { address empty$ - 'skip$ - { ": " * } - if$ - publisher * - } - if$ - ")" * - } - if$ - output -} - -FUNCTION {format.aaspublisher} -{ publisher empty$ - { "empty publisher in " cite$ * warning$ } - 'skip$ - if$ - ", " - address empty$ publisher empty$ and - 'skip$ - { - add.blank "" * - address empty$ - 'skip$ - { address * } - if$ - publisher empty$ - 'skip$ - { address empty$ - 'skip$ - { ": " * } - if$ - publisher * - } - if$ - "" * - } - if$ - output -} - - - -STRINGS {oldname} - -FUNCTION {name.or.dash} -{ 's := - oldname empty$ - { s 'oldname := s } - { s oldname = - { "---" } - { s 'oldname := s } - if$ - } - if$ -} - -%%%%%%%% Functions added from astrobib - -FUNCTION {format.edn.btitle} % Title should be on stack. -{ duplicate$ empty$ edition empty$ or - 'skip$ - { ", " * format.edition * } - if$ -} - -FUNCTION {format.ed.booktitle} % The title should be on the stack. -{ duplicate$ empty$ - { "no book title in " cite$ * warning$ "" pop$ } - { editor empty$ - author empty$ or % Empty author means editor already given. - 'format.edn.btitle - { format.edn.btitle ", " * bbl.editor * " " * format.in.editors * } - if$ - } - if$ -} - -FUNCTION {format.full.book.spec} % The title should be on the stack. -{ series empty$ - { format.ed.booktitle - volume empty$ - { number empty$ - 'skip$ - { " there's a number but no series in " cite$ * warning$ - " No." number tie.or.space.connect * } - if$ - } - { ", Vol." volume tie.or.space.connect * - number empty$ - 'skip$ - {"Both volume and number fields in " * cite$ * warning$ } - if$ - } - if$ - } - { volume empty$ - { format.ed.booktitle ", " * series * - number empty$ - 'skip$ - { " No." number tie.or.space.connect * } - if$ - } - { series ", Vol." volume tie.or.space.connect * - ", " * swap$ format.ed.booktitle * - number empty$ - 'skip$ - {"Both volume and number fields in " * cite$ * warning$ } - if$ - } - if$ - } - if$ -} - -%%%%%%% End of functions from astrobib - -FUNCTION {article} -{ output.bibitem - format.authors "author" output.check - author format.key output - name.or.dash - format.date "year" output.check - date.block - crossref missing$ - { journal - "journal" output.check - format.vol.num.pages output - } - { format.article.crossref output.nonnull - format.pages output - } - if$ - pages empty$ - 'skip$ - { format.journal.pages } - if$ - format.pid output - fin.entry -} - -FUNCTION {book} -{ output.bibitem - author empty$ - { format.editors "author and editor" output.check - editor format.key output - name.or.dash - } - { format.authors output.nonnull - name.or.dash - crossref missing$ - { "author and editor" editor either.or.check } - 'skip$ - if$ - } - if$ - format.date "year" output.check - date.block - title format.full.book.spec output -% format.btitle "title" output.check -% crossref missing$ -% { format.bvolume output -% format.number.series output -% format.edition output - format.publisher -% } -% { -% format.book.crossref output.nonnull -% } -% if$ - format.pages output - format.pid output - format.url output - fin.entry -} - -FUNCTION {booklet} -{ output.bibitem - format.authors output - author format.key output - name.or.dash - format.date "year" output.check - date.block - format.title "title" output.check - howpublished output - address output - format.pid output - format.url output - fin.entry -} - -FUNCTION {inbook} -{ output.bibitem - author empty$ - { format.editors "author and editor" output.check - editor format.key output - name.or.dash - } - { format.authors output.nonnull - name.or.dash - crossref missing$ - { "author and editor" editor either.or.check } - 'skip$ - if$ - } - if$ - format.date "year" output.check - date.block - title format.full.book.spec output -% format.btitle "title" output.check -% crossref missing$ -% { -% format.bvolume output -% format.chapter.pages "chapter and pages" output.check -% format.number.series output -% format.edition output - format.publisher -% } -% { -% format.chapter.pages "chapter and pages" output.check -% format.book.crossref output.nonnull -% } -% if$ - format.pages "pages" output.check - format.url output - fin.entry -} - -FUNCTION {incollection} -{ output.bibitem - format.authors "author" output.check - author format.key output - name.or.dash - format.date "year" output.check - date.block - bbl.in " " * booktitle format.full.book.spec * output -% crossref missing$ -% { format.in.ed.booktitle "booktitle" output.check -% format.bvolume output -% format.number.series output -% format.edition output -% format.chapter.pages output - format.publisher -% } -% { format.incoll.inproc.crossref output.nonnull -% format.chapter.pages output -% } -% if$ - format.pages "pages" output.check - format.pid output - format.url output - fin.entry -} - -FUNCTION {inproceedings} -{ output.bibitem - format.authors "author" output.check - author format.key output % added - format.date "year" output.check - date.block - bbl.in " " * booktitle format.full.book.spec * output -% crossref missing$ -% { format.in.ed.booktitle "booktitle" output.check -% format.bvolume output -% format.number.series output - publisher empty$ - { organization output - address output - } - { organization output - format.publisher - } - if$ -% } -% { format.incoll.inproc.crossref output.nonnull -% } -% if$ - format.pages output - format.pid output - format.url output - fin.entry -} - -FUNCTION {conference} { inproceedings } - -FUNCTION {manual} -{ output.bibitem - format.authors output - author format.key output - name.or.dash - format.date "year" output.check - date.block - format.btitle "title" output.check - format.edition output - organization output - address output - format.pid output -%% format.url output - fin.entry -} - -FUNCTION {mastersthesis} -{ output.bibitem - format.authors "author" output.check - author format.key output - name.or.dash - format.date "year" output.check - date.block -% format.title "title" output.check - bbl.mthesis format.thesis.type output.nonnull - school "school" output.check - address output - format.pid output - format.url output - fin.entry -} - -FUNCTION {misc} -{output.bibitem - format.authors output - author format.key output - name.or.dash - format.date "year" output.check - date.block -%% new - format.title output -%% new - version empty$ - 'skip$ - { version output} - if$ -%% - howpublished output - publisher empty$ - {} - {format.aaspublisher} - if$ - format.pid output - format.url output - fin.entry -} - -FUNCTION {phdthesis} -{ output.bibitem - format.authors "author" output.check - author format.key output - name.or.dash - format.date "year" output.check - date.block -% format.title "title" output.check - bbl.phdthesis format.thesis.type output.nonnull - school "school" output.check - address output - format.pid output - format.url output - fin.entry -} - -FUNCTION {proceedings} -{ output.bibitem - editor empty$ - { organization output - organization format.key output } - { format.editors output } - if$ -% format.editors output -% editor format.key output - name.or.dash - format.date "year" output.check - date.block - title format.full.book.spec output -% format.btitle "title" output.check -% format.bvolume output -% format.number.series output - publisher empty$ not % No need for warning if no pub. - { format.publisher } - { editor empty$ % For empty editor, organization was already given. - 'skip$ - { organization output } - if$ - address output - } - if$ -% address output -% organization output -% publisher output - format.pages output - format.url output - fin.entry -} - -FUNCTION {techreport} -{ output.bibitem - format.authors "author" output.check - author format.key output - name.or.dash - format.date "year" output.check - date.block - format.title "title" output.check - format.tr.number output.nonnull - institution "institution" output.check - address output - format.pid output -%% format.url output - fin.entry -} - -FUNCTION {unpublished} -{ output.bibitem - format.authors "author" output.check - author format.key output - name.or.dash - format.date "year" output.check - date.block -% format.title "title" output.check - format.pid output -%% format.url output - fin.entry -} - -FUNCTION {default.type} { misc } - -READ - -FUNCTION {sortify} -{ purify$ - "l" change.case$ -} - -INTEGERS { len } - -FUNCTION {chop.word} -{ 's := - 'len := - s #1 len substring$ = - { s len #1 + global.max$ substring$ } - 's - if$ -} - -FUNCTION {format.lab.names} -{ 's := - s #1 "{vv~}{ll}" format.name$ - s num.names$ duplicate$ - #2 > - { pop$ - " {et~al.}" * - } - { #2 < - 'skip$ - { s #2 "{ff }{vv }{ll}{ jj}" format.name$ "others" = - { - " {et~al.}" * - } - { " \& " * s #2 "{vv~}{ll}" format.name$ - * } - if$ - } - if$ - } - if$ -} - -FUNCTION {author.key.label} -{ author empty$ - { key empty$ - { cite$ #1 #3 substring$ } - 'key - if$ - } - { author format.lab.names } - if$ -} - -FUNCTION {author.editor.key.label} -{ author empty$ - { editor empty$ - { key empty$ - { cite$ #1 #3 substring$ } - 'key - if$ - } - { editor format.lab.names } - if$ - } - { author format.lab.names } - if$ -} - -FUNCTION {editor.key.label} -{ editor empty$ - { key empty$ - { cite$ #1 #3 substring$ } - 'key - if$ - } - { editor format.lab.names } - if$ -} - -FUNCTION {calc.short.authors} -{ type$ "book" = - type$ "inbook" = - or - 'author.editor.key.label - { type$ "proceedings" = - 'editor.key.label - 'author.key.label - if$ - } - if$ - 'short.list := -} - -FUNCTION {calc.label} -{ calc.short.authors - short.list - "(" - * - year duplicate$ empty$ - { pop$ "????" } - 'skip$ - if$ - * - 'label := -} - -FUNCTION {sort.format.names} -{ 's := - #1 'nameptr := - "" - s num.names$ 'numnames := - numnames #8 > - { s nameptr - "{vv{ } }{ll{ }}{ f{ }}{ jj{ }}" - format.name$ 't := - t sortify * - " " * - "zzzzz" * - } - { numnames 'namesleft := - { namesleft #0 > } - { s nameptr - "{vv{ } }{ll{ }}{ f{ }}{ jj{ }}" - format.name$ 't := - nameptr #1 > - { - " " * - namesleft #1 = t "others" = and - { "zzzzz" * } - { t sortify * } - if$ - } - { t sortify * } - if$ - nameptr #1 + 'nameptr := - namesleft #1 - 'namesleft := - } - while$ - } - if$ -} - -FUNCTION {sort.format.title} -{ 't := - "A " #2 - "An " #3 - "The " #4 t chop.word - chop.word - chop.word - sortify - #1 global.max$ substring$ -} - -FUNCTION {author.sort} -{ author empty$ - { key empty$ - { "to sort, need author or key in " cite$ * warning$ - "" - } - { key sortify } - if$ - } - { author sort.format.names } - if$ -} - -FUNCTION {author.editor.sort} -{ author empty$ - { editor empty$ - { key empty$ - { "to sort, need author, editor, or key in " cite$ * warning$ - "" - } - { key sortify } - if$ - } - { editor sort.format.names } - if$ - } - { author sort.format.names } - if$ -} - -FUNCTION {editor.sort} -{ editor empty$ - { key empty$ - { "to sort, need editor or key in " cite$ * warning$ - "" - } - { key sortify } - if$ - } - { editor sort.format.names } - if$ -} - -FUNCTION {presort} -{ calc.label - label sortify - " " - * - type$ "book" = - type$ "inbook" = - or - 'author.editor.sort - { type$ "proceedings" = - 'editor.sort - 'author.sort - if$ - } - if$ - #1 entry.max$ substring$ - 'sort.label := - sort.label - * - " " - * -%% 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$ := -} - -ITERATE {presort} - -SORT - -STRINGS { last.label next.extra } - -INTEGERS { last.extra.num number.label } - -FUNCTION {initialize.extra.label.stuff} -{ #0 int.to.chr$ 'last.label := - "" 'next.extra := - #0 'last.extra.num := - #0 'number.label := -} - -FUNCTION {forward.pass} -{ last.label label = - { last.extra.num #1 + 'last.extra.num := - last.extra.num int.to.chr$ 'extra.label := - } - { "a" chr.to.int$ 'last.extra.num := - "" 'extra.label := - label 'last.label := - } - if$ - number.label #1 + 'number.label := -} - -FUNCTION {reverse.pass} -{ next.extra "b" = - { "a" 'extra.label := } - 'skip$ - if$ - extra.label 'next.extra := - extra.label - duplicate$ empty$ - 'skip$ - { "{\natexlab{" swap$ * "}}" * } - if$ - 'extra.label := - label extra.label * 'label := -} - -EXECUTE {initialize.extra.label.stuff} - -ITERATE {forward.pass} - -REVERSE {reverse.pass} - -FUNCTION {bib.sort.order} -{ sort.label - " " - * - year field.or.null sortify - * - " " - * -%% 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$ := -} - -ITERATE {bib.sort.order} - -SORT - -FUNCTION {begin.bib} -{ preamble$ empty$ - 'skip$ - { preamble$ write$ newline$ } - if$ - "\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{https://doi.org/#1}{\nolinkurl{#1}}}" - write$ newline$ - "\providecommand{\doeprint}[1]{\href{https://ascl.net/#1}{\nolinkurl{https://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} - -ITERATE {call.type$} - -FUNCTION {end.bib} -{ newline$ - "\end{thebibliography}" write$ newline$ -} - -EXECUTE {end.bib} -%% End of customized bst file -%% -%% End of file `aasjournal.bst'. +%% AASJournal.bst June 3, 2019 +%% +%% Revision 1.18 2019/6/3 Amy Hendrickson +%% Took out `v' preceding version number in @misc +%% +%% Rewrote format.pid to implement this precedence: +%% if doi, print that, if eprint print that, if neither +%% and there is a url, use the url + +%% Took out format.url output generally because it is included in format.pid, +%% so undesirable to call for it a second time. + +%% +%% Revision 1.17 2019/3/15 Amy Hendrickson +%% Added DOI to every field where format.url was found. Kept format.url in case +%% it is needed. +%% + +%% 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 Hendrickson +%% Changes to @misc function to specifications by Dr. August Muench. +%% Added version and publisher fields. + +%% Revision 1.10 2013/03/11 13:01:55 alberto +%% Reworked code to use format.pid for articles without proper +%% pagination which then leads the system to use either an eprint +%% id or a DOI; this will solve most problems with citing early +%% access articles (no volume of page available, but online). +%% Removed bibliography count from preamble since it seems to +%% confuse some versions of latex. +%% +%% Revision 1.9 2013/2/19 Erik Tollerud +%% fixes for spurious error messages due to rev 1.8 changes +%% also fixed missing publisher field printing in "book" +%% +%% Revision 1.8 2013/01/10 16:31:34 alberto +%% Added proper formatting of arXiv eprint entries output by ADS +%% (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. +%% +%% Revision 1.7 2011/11/21 13:10:12 alberto +%% Implemented new ApJ formatting rules: for papers with more than +%% 5 authors, print first 3 followed by "et al." +%% +%% Revision 1.6 2009/05/18 15:13:02 alberto +%% Fixed sorting of references with truncated lists of authors +%% in sort.format.names +%% Fix courtesy of Stephen Fegan +%% +%% Revision 1.5 2009/03/19 13:15:11 alberto +%% Truncate \bibitem entries with more than 8 authors. +%% Fix courtesy of Craig Wiegert +%% and Andrew R. Marble +%% +%% Revision 1.4 2002/06/18 16:37:48 alberto +%% Add comma after first author in two-author reference +%% Fix courtesy of Tim Robishaw +%% +%% Revision 1.3 2000/04/20 22:17:50 jbaker +%% Fixed INBOOK bug, now works essentially like BOOK. +%% +%% Revision 1.2 1998/08/30 22:35:45 jbaker +%% Added RCS keywords. +%% +%% 1998/08/12 J Baker +%% Tweaked by hand to get correct results for ApJ. Added functions from +%% astrobib. + + +%% +%% This originally was file `apj.bst', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% merlin.mbs (with options: `,ay,nat,nm-rev,nmdash,dt-beg,yr-per,note-yr,atit-u,jtit-x,jttl-rm,thtit-a,vnum-x,volp-com,jpg-1,pp-last,btit-rm,add-pub,pub-par,pre-edn,edby,edbyx,blk-com,fin-bare,ppx,ed,abr,ord,jabr,amper,em-x') +%% ---------------------------------------- +%% *** Bibliographic Style for ApJ *** +%% + %------------------------------------------------------------------- + % The original source file contains the following version information: + % \ProvidesFile{merlin.mbs}[1998/02/25 3.85a (PWD)] + % + % NOTICE: + % This file may be used for non-profit purposes. + % It may not be distributed in exchange for money, + % other than distribution costs. + % + % The author provides it `as is' and does not guarantee it in any way. + % + % Copyright (C) 1994-98 Patrick W. Daly + %------------------------------------------------------------------- + % For use with BibTeX version 0.99a or later + %------------------------------------------------------------------- + % This bibliography style file is intended for texts in ENGLISH + % This is an author-year citation style bibliography. As such, it is + % non-standard LaTeX, and requires a special package file to function properly. + % Such a package is natbib.sty by Patrick W. Daly + % The form of the \bibitem entries is + % \bibitem[Jones et al.(1990)]{key}... + % \bibitem[Jones et al.(1990)Jones, Baker, and Smith]{key}... + % The essential feature is that the label (the part in brackets) consists + % of the author names, as they should appear in the citation, with the year + % in parentheses following. There must be no space before the opening + % parenthesis! + % With natbib v5.3, a full list of authors may also follow the year. + % In natbib.sty, it is possible to define the type of enclosures that is + % really wanted (brackets or parentheses), but in either case, there must + % be parentheses in the label. + % The \cite command functions as follows: + % \citet{key} ==>> Jones et al. (1990) + % \citet*{key} ==>> Jones, Baker, and Smith (1990) + % \citep{key} ==>> (Jones et al., 1990) + % \citep*{key} ==>> (Jones, Baker, and Smith, 1990) + % \citep[chap. 2]{key} ==>> (Jones et al., 1990, chap. 2) + % \citep[e.g.][]{key} ==>> (e.g. Jones et al., 1990) + % \citep[e.g.][p. 32]{key} ==>> (e.g. Jones et al., p. 32) + % \citeauthor{key} ==>> Jones et al. + % \citeauthor*{key} ==>> Jones, Baker, and Smith + % \citeyear{key} ==>> 1990 + %--------------------------------------------------------------------- + +ENTRY + { address + archivePrefix + author + booktitle + chapter + doi + edition + editor + eprint + howpublished + institution + journal + key + month + number + organization + pages + publisher + school + series + title + misctitle + type + volume + year + version + url + } + {} + { label extra.label sort.label short.list } + +INTEGERS { output.state before.all mid.sentence after.sentence after.block } + +FUNCTION {init.state.consts} +{ #0 'before.all := + #1 'mid.sentence := + #2 'after.sentence := + #3 'after.block := +} + +STRINGS { s t } + +FUNCTION {output.nonnull} +{ 's := + output.state mid.sentence = + { ", " * write$ } + { output.state after.block = + { add.period$ write$ + newline$ + "\newblock " write$ + } + { output.state before.all = + 'write$ + { add.period$ " " * write$ } + if$ + } + if$ + mid.sentence 'output.state := + } + if$ + s +} + +FUNCTION {output} +{ duplicate$ empty$ + 'pop$ + 'output.nonnull + if$ +} + +FUNCTION {output.check} +{ 't := + duplicate$ empty$ + { pop$ "empty " t * " in " * cite$ * warning$ } + 'output.nonnull + if$ +} + +FUNCTION {fin.entry} +{ duplicate$ empty$ + 'pop$ + 'write$ + if$ + newline$ +} + +FUNCTION {new.block} +{ output.state before.all = + 'skip$ + { after.block 'output.state := } + if$ +} + +FUNCTION {new.sentence} +{ output.state after.block = + 'skip$ + { output.state before.all = + 'skip$ + { after.sentence 'output.state := } + if$ + } + if$ +} + +FUNCTION {add.blank} +{ " " * before.all 'output.state := +} + +FUNCTION {date.block} +{ + skip$ +} + +FUNCTION {not} +{ { #0 } + { #1 } + if$ +} + +FUNCTION {and} +{ 'skip$ + { pop$ #0 } + if$ +} + +FUNCTION {or} +{ { pop$ #1 } + 'skip$ + if$ +} + +FUNCTION {new.block.checkb} +{ empty$ + swap$ empty$ + and + 'skip$ + 'new.block + if$ +} + +FUNCTION {field.or.null} +{ duplicate$ empty$ + { pop$ "" } + 'skip$ + if$ +} + +FUNCTION {emphasize} +{ skip$ } + +FUNCTION {capitalize} +{ "u" change.case$ "t" change.case$ } + +FUNCTION {space.word} +{ " " swap$ * " " * } + + % Here are the language-specific definitions for explicit words. + % Each function has a name bbl.xxx where xxx is the English word. + % The language selected here is ENGLISH +FUNCTION {bbl.and} +{ "and"} + +FUNCTION {bbl.editors} +{ "eds." } + +FUNCTION {bbl.editor} +{ "ed." } + +FUNCTION {bbl.edby} +{ "edited by" } + +FUNCTION {bbl.edition} +{ "edn." } + +FUNCTION {bbl.volume} +{ "Vol." } + +FUNCTION {bbl.version} +{ "" } + +FUNCTION {bbl.of} +{ "of" } + +FUNCTION {bbl.number} +{ "no." } + +FUNCTION {bbl.nr} +{ "no." } + +FUNCTION {bbl.in} +{ "in" } + +FUNCTION {bbl.pages} +{ "" } + +FUNCTION {bbl.page} +{ "" } + +FUNCTION {bbl.chapter} +{ "Ch." } + +FUNCTION {bbl.techrep} +{ "Tech. Rep." } + +FUNCTION {bbl.mthesis} +{ "Master's thesis" } + +FUNCTION {bbl.phdthesis} +{ "PhD thesis" } + +FUNCTION {bbl.first} +{ "1st" } + +FUNCTION {bbl.second} +{ "2nd" } + +FUNCTION {bbl.third} +{ "3rd" } + +FUNCTION {bbl.fourth} +{ "4th" } + +FUNCTION {bbl.fifth} +{ "5th" } + +FUNCTION {bbl.st} +{ "st" } + +FUNCTION {bbl.nd} +{ "nd" } + +FUNCTION {bbl.rd} +{ "rd" } + +FUNCTION {bbl.th} +{ "th" } + +MACRO {jan} {"Jan."} + +MACRO {feb} {"Feb."} + +MACRO {mar} {"Mar."} + +MACRO {apr} {"Apr."} + +MACRO {may} {"May"} + +MACRO {jun} {"Jun."} + +MACRO {jul} {"Jul."} + +MACRO {aug} {"Aug."} + +MACRO {sep} {"Sep."} + +MACRO {oct} {"Oct."} + +MACRO {nov} {"Nov."} + +MACRO {dec} {"Dec."} + +FUNCTION {eng.ord} +{ duplicate$ "1" swap$ * + #-2 #1 substring$ "1" = + { bbl.th * } + { duplicate$ #-1 #1 substring$ + duplicate$ "1" = + { pop$ bbl.st * } + { duplicate$ "2" = + { pop$ bbl.nd * } + { "3" = + { bbl.rd * } + { bbl.th * } + if$ + } + if$ + } + if$ + } + if$ +} + +INTEGERS { nameptr namesleft numnames numtrunc } + +FUNCTION {format.names} +{ 's := + #0 'numtrunc := + #1 'nameptr := + s num.names$ 'numnames := + numnames 'namesleft := + numnames #5 > + { #3 'numtrunc := } + {} + if$ + { namesleft #0 > } + { s nameptr + "{vv~}{ll}{, jj}{, f.}" format.name$ + 't := + nameptr #1 > + { + nameptr #1 - numtrunc = + { + #1 'namesleft := + "others" 't := + } + {} + if$ + + namesleft #1 > + { ", " * t * } + { + numnames #1 > + { "," * } + 'skip$ + if$ + s nameptr "{ll}" format.name$ duplicate$ "others" = + { 't := } + { pop$ } + if$ + t "others" = + { + " {et~al.}" * + } + { " \& " * t * } + if$ + } + if$ + } + 't + if$ + nameptr #1 + 'nameptr := + namesleft #1 - 'namesleft := + } + while$ +} + +FUNCTION {format.names.ed} +{ 's := + #1 'nameptr := + s num.names$ 'numnames := + numnames 'namesleft := + { namesleft #0 > } + { s nameptr + "{f.~}{vv~}{ll}{, jj}" + format.name$ + 't := + nameptr #1 > + { + namesleft #1 > + { ", " * t * } + { + numnames #2 > + { "," * } + 'skip$ + if$ + s nameptr "{ll}" format.name$ duplicate$ "others" = + { 't := } + { pop$ } + if$ + t "others" = + { + " {et~al.}" * + } + { " \& " * t * } + if$ + } + if$ + } + 't + if$ + nameptr #1 + 'nameptr := + namesleft #1 - 'namesleft := + } + while$ +} + +FUNCTION {format.key} +{ empty$ + { key field.or.null } + { "" } + if$ +} + +FUNCTION {format.authors} +{ author empty$ + { "" } + { author format.names } + if$ +} + +FUNCTION {format.editors} +{ editor empty$ + { "" } + { editor format.names + editor num.names$ #1 > + { ", " * bbl.editors * } + { ", " * bbl.editor * } + if$ + } + if$ +} + +FUNCTION {format.in.editors} +{ editor empty$ + { "" } + { editor format.names.ed + } + if$ +} + + +FUNCTION {format.title} +{ title empty$ + { "" } + { title + } + if$ +} + +FUNCTION {format.full.names} +{'s := + #1 'nameptr := + s num.names$ 'numnames := + numnames 'namesleft := + { namesleft #0 > } + { s nameptr + "{vv~}{ll}" format.name$ + 't := + nameptr #1 > + { + namesleft #1 > + { ", " * t * } + { + numnames #2 > + { "," * } + 'skip$ + if$ + s nameptr "{ll}" format.name$ duplicate$ "others" = + { 't := } + { pop$ } + if$ + t "others" = + { + " {et~al.}" * + } + { " \& " * t * } + if$ + } + if$ + } + 't + if$ + nameptr #1 + 'nameptr := + namesleft #1 - 'namesleft := + } + while$ +} + +FUNCTION {author.editor.key.full} +{ author empty$ + { editor empty$ + { key empty$ + { cite$ #1 #3 substring$ } + 'key + if$ + } + { editor format.full.names } + if$ + } + { author format.full.names } + if$ +} + +FUNCTION {author.key.full} +{ author empty$ + { key empty$ + { cite$ #1 #3 substring$ } + 'key + if$ + } + { author format.full.names } + if$ +} + +FUNCTION {editor.key.full} +{ editor empty$ + { key empty$ + { cite$ #1 #3 substring$ } + 'key + if$ + } + { editor format.full.names } + if$ +} + +FUNCTION {make.full.names} +{ type$ "book" = + type$ "inbook" = + or + 'author.editor.key.full + { type$ "proceedings" = + 'editor.key.full + 'author.key.full + if$ + } + if$ +} + +FUNCTION {output.bibitem} +{ newline$ + "\bibitem[{" write$ + label write$ + ")" make.full.names duplicate$ short.list = + { pop$ } + { * } + if$ + "}]{" * write$ + cite$ write$ + "}" write$ + newline$ + "" + before.all 'output.state := +} + + +FUNCTION {format.url} +{ url empty$ + { "" } + { new.block "\url{" url * "}" * } + if$ +} + +FUNCTION {format.eprint} +{ eprint empty$ + { "" } + { archivePrefix empty$ + { "" } + { archivePrefix "arXiv" = + {new.block "\doarXiv{" eprint * "}" * } + {new.block "\doeprint{" eprint * "}" * } + if$} + if$ + } + if$ +} + +% Formats a persistent identifier (PID) +% (typically a DOI or an eprint id) +% You can easily swap the order of which PID +% gets picked +% + +FUNCTION {format.doi} +{ doi empty$ + { "" } + { "\dodoi{" doi * "}" * } + if$ +} + +FUNCTION {format.pid} +{ doi empty$ +{eprint empty$ + { url empty$ + { "" } + { format.url } + if$} + { format.eprint } + if$} + { format.doi } + if$ +} + +FUNCTION {n.dashify} +{ + 't := + "" + { t empty$ not } + { t #1 #1 substring$ "-" = + { t #1 #2 substring$ "--" = not + { "--" * + t #2 global.max$ substring$ 't := + } + { { t #1 #1 substring$ "-" = } + { "-" * + t #2 global.max$ substring$ 't := + } + while$ + } + if$ + } + { t #1 #1 substring$ * + t #2 global.max$ substring$ 't := + } + if$ + } + while$ +} + +FUNCTION {word.in} +{ bbl.in + " " * } + +FUNCTION {format.date} +{ year duplicate$ empty$ + { "empty year in " cite$ * "; set to ????" * warning$ + pop$ "????" } + 'skip$ + if$ + extra.label * + before.all 'output.state := + after.sentence 'output.state := +} + +FUNCTION {format.btitle} +{ title +} + +FUNCTION {tie.or.space.connect} +{ duplicate$ text.length$ #3 < + { "~" } + { " " } + if$ + swap$ * * +} + +FUNCTION {either.or.check} +{ empty$ + 'pop$ + { "can't use both " swap$ * " fields in " * cite$ * warning$ } + if$ +} + +FUNCTION {format.bvolume} +{ volume empty$ + { "" } + { bbl.volume volume tie.or.space.connect + series empty$ + 'skip$ + { bbl.of space.word * series emphasize * } + if$ + "volume and number" number either.or.check + } + if$ +} + +FUNCTION {format.number.series} +{ volume empty$ + { number empty$ + { series field.or.null } + { output.state mid.sentence = + { bbl.number } + { bbl.number capitalize } + if$ + number tie.or.space.connect + series empty$ + { "there's a number but no series in " cite$ * warning$ } + { bbl.in space.word * series * } + if$ + } + if$ + } + { "" } + if$ +} + +FUNCTION {is.num} +{ chr.to.int$ + duplicate$ "0" chr.to.int$ < not + swap$ "9" chr.to.int$ > not and +} + +FUNCTION {extract.num} +{ duplicate$ 't := + "" 's := + { t empty$ not } + { t #1 #1 substring$ + t #2 global.max$ substring$ 't := + duplicate$ is.num + { s swap$ * 's := } + { pop$ "" 't := } + if$ + } + while$ + s empty$ + 'skip$ + { pop$ s } + if$ +} + +FUNCTION {convert.edition} +{ edition extract.num "l" change.case$ 's := + s "first" = s "1" = or + { bbl.first 't := } + { s "second" = s "2" = or + { bbl.second 't := } + { s "third" = s "3" = or + { bbl.third 't := } + { s "fourth" = s "4" = or + { bbl.fourth 't := } + { s "fifth" = s "5" = or + { bbl.fifth 't := } + { s #1 #1 substring$ is.num + { s eng.ord 't := } + { edition 't := } + if$ + } + if$ + } + if$ + } + if$ + } + if$ + } + if$ + t +} + +FUNCTION {format.edition} +{ edition empty$ + { "" } + { output.state mid.sentence = + { convert.edition "l" change.case$ " " * bbl.edition * } + { convert.edition "t" change.case$ " " * bbl.edition * } + if$ + } + if$ +} + +INTEGERS { multiresult } + +FUNCTION {multi.page.check} +{ 't := + #0 'multiresult := + { multiresult not + t empty$ not + and + } + { t #1 #1 substring$ + duplicate$ "-" = + swap$ duplicate$ "," = + swap$ "+" = + or or + { #1 'multiresult := } + { t #2 global.max$ substring$ 't := } + if$ + } + while$ + multiresult +} + +FUNCTION {format.pages} +{ pages empty$ + { "" } + { pages multi.page.check +% { bbl.pages pages n.dashify tie.or.space.connect } +% { bbl.page pages tie.or.space.connect } + { pages n.dashify } + { pages } + if$ + } + if$ +} + +FUNCTION {first.page} +{ 't := + "" + { t empty$ not t #1 #1 substring$ "-" = not and } + { t #1 #1 substring$ * + t #2 global.max$ substring$ 't := + } + while$ +} + +FUNCTION {format.journal.pages} +{ pages empty$ + 'skip$ + { duplicate$ empty$ + { pop$ format.pages } + { + ", " * + pages first.page * + } + if$ + } + if$ +} + + +FUNCTION {format.vol.num.pages} +{ volume field.or.null +} + +FUNCTION {format.chapter.pages} +{ chapter empty$ + { "" } + { type empty$ + { bbl.chapter } + { type "l" change.case$ } + if$ + chapter tie.or.space.connect + } + if$ +} + +FUNCTION {format.in.ed.booktitle} +{ booktitle empty$ + { "" } + { editor empty$ + { word.in booktitle emphasize * } + { word.in booktitle emphasize * + ", " * + editor num.names$ #1 > + { bbl.editors } + { bbl.editor } + if$ + * " " * + format.in.editors * + } + if$ + } + if$ +} + +FUNCTION {format.thesis.type} +{ type empty$ + 'skip$ + { pop$ + type "t" change.case$ + } + if$ +} + +FUNCTION {format.tr.number} +{ type empty$ + { bbl.techrep } + 'type + if$ + number empty$ + { "t" change.case$ } + { number tie.or.space.connect } + if$ +} + +FUNCTION {format.article.crossref} +{ + word.in + " \cite{" * crossref * "}" * +} + +FUNCTION {format.book.crossref} +{ volume empty$ + { "empty volume in " cite$ * "'s crossref of " * crossref * warning$ + word.in + } + { bbl.volume volume tie.or.space.connect + bbl.of space.word * + } + if$ + " \cite{" * crossref * "}" * +} + +FUNCTION {format.incoll.inproc.crossref} +{ + word.in + " \cite{" * crossref * "}" * +} + +FUNCTION {format.publisher} +{ publisher empty$ + { "empty publisher in " cite$ * warning$ } + 'skip$ + if$ + "" + address empty$ publisher empty$ and + 'skip$ + { + add.blank "(" * + address empty$ + 'skip$ + { address * } + if$ + publisher empty$ + 'skip$ + { address empty$ + 'skip$ + { ": " * } + if$ + publisher * + } + if$ + ")" * + } + if$ + output +} + +FUNCTION {format.aaspublisher} +{ publisher empty$ + { "empty publisher in " cite$ * warning$ } + 'skip$ + if$ + ", " + address empty$ publisher empty$ and + 'skip$ + { + add.blank "" * + address empty$ + 'skip$ + { address * } + if$ + publisher empty$ + 'skip$ + { address empty$ + 'skip$ + { ": " * } + if$ + publisher * + } + if$ + "" * + } + if$ + output +} + + + +STRINGS {oldname} + +FUNCTION {name.or.dash} +{ 's := + oldname empty$ + { s 'oldname := s } + { s oldname = + { "---" } + { s 'oldname := s } + if$ + } + if$ +} + +%%%%%%%% Functions added from astrobib + +FUNCTION {format.edn.btitle} % Title should be on stack. +{ duplicate$ empty$ edition empty$ or + 'skip$ + { ", " * format.edition * } + if$ +} + +FUNCTION {format.ed.booktitle} % The title should be on the stack. +{ duplicate$ empty$ + { "no book title in " cite$ * warning$ "" pop$ } + { editor empty$ + author empty$ or % Empty author means editor already given. + 'format.edn.btitle + { format.edn.btitle ", " * bbl.editor * " " * format.in.editors * } + if$ + } + if$ +} + +FUNCTION {format.full.book.spec} % The title should be on the stack. +{ series empty$ + { format.ed.booktitle + volume empty$ + { number empty$ + 'skip$ + { " there's a number but no series in " cite$ * warning$ + " No." number tie.or.space.connect * } + if$ + } + { ", Vol." volume tie.or.space.connect * + number empty$ + 'skip$ + {"Both volume and number fields in " * cite$ * warning$ } + if$ + } + if$ + } + { volume empty$ + { format.ed.booktitle ", " * series * + number empty$ + 'skip$ + { " No." number tie.or.space.connect * } + if$ + } + { series ", Vol." volume tie.or.space.connect * + ", " * swap$ format.ed.booktitle * + number empty$ + 'skip$ + {"Both volume and number fields in " * cite$ * warning$ } + if$ + } + if$ + } + if$ +} + +%%%%%%% End of functions from astrobib + +FUNCTION {article} +{ output.bibitem + format.authors "author" output.check + author format.key output + name.or.dash + format.date "year" output.check + date.block + crossref missing$ + { journal + "journal" output.check + format.vol.num.pages output + } + { format.article.crossref output.nonnull + format.pages output + } + if$ + pages empty$ + 'skip$ + { format.journal.pages } + if$ + format.pid output + fin.entry +} + +FUNCTION {book} +{ output.bibitem + author empty$ + { format.editors "author and editor" output.check + editor format.key output + name.or.dash + } + { format.authors output.nonnull + name.or.dash + crossref missing$ + { "author and editor" editor either.or.check } + 'skip$ + if$ + } + if$ + format.date "year" output.check + date.block + title format.full.book.spec output +% format.btitle "title" output.check +% crossref missing$ +% { format.bvolume output +% format.number.series output +% format.edition output + format.publisher +% } +% { +% format.book.crossref output.nonnull +% } +% if$ + format.pages output + format.pid output + fin.entry +} + +FUNCTION {booklet} +{ output.bibitem + format.authors output + author format.key output + name.or.dash + format.date "year" output.check + date.block + format.title "title" output.check + howpublished output + address output + format.pid output + fin.entry +} + +FUNCTION {inbook} +{ output.bibitem + author empty$ + { format.editors "author and editor" output.check + editor format.key output + name.or.dash + } + { format.authors output.nonnull + name.or.dash + crossref missing$ + { "author and editor" editor either.or.check } + 'skip$ + if$ + } + if$ + format.date "year" output.check + date.block + title format.full.book.spec output +% format.btitle "title" output.check +% crossref missing$ +% { +% format.bvolume output +% format.chapter.pages "chapter and pages" output.check +% format.number.series output +% format.edition output + format.publisher +% } +% { +% format.chapter.pages "chapter and pages" output.check +% format.book.crossref output.nonnull +% } +% if$ + format.pages "pages" output.check + format.pid output + fin.entry +} + +FUNCTION {incollection} +{ output.bibitem + format.authors "author" output.check + author format.key output + name.or.dash + format.date "year" output.check + date.block + bbl.in " " * booktitle format.full.book.spec * output +% crossref missing$ +% { format.in.ed.booktitle "booktitle" output.check +% format.bvolume output +% format.number.series output +% format.edition output +% format.chapter.pages output + format.publisher +% } +% { format.incoll.inproc.crossref output.nonnull +% format.chapter.pages output +% } +% if$ + format.pages "pages" output.check + format.pid output + fin.entry +} + +FUNCTION {inproceedings} +{ output.bibitem + format.authors "author" output.check + author format.key output % added + format.date "year" output.check + date.block + bbl.in " " * booktitle format.full.book.spec * output +% crossref missing$ +% { format.in.ed.booktitle "booktitle" output.check +% format.bvolume output +% format.number.series output + publisher empty$ + { organization output + address output + } + { organization output + format.publisher + } + if$ +% } +% { format.incoll.inproc.crossref output.nonnull +% } +% if$ + format.pages output + format.pid output + fin.entry +} + +FUNCTION {conference} { inproceedings } + + +FUNCTION {manual} +{ output.bibitem + format.authors output + author format.key output + name.or.dash + format.date "year" output.check + date.block + format.btitle "title" output.check + format.edition output + organization output + address output + format.pid output + fin.entry +} + +FUNCTION {mastersthesis} +{ output.bibitem + format.authors "author" output.check + author format.key output + name.or.dash + format.date "year" output.check + date.block +% format.title "title" output.check + bbl.mthesis format.thesis.type output.nonnull + school "school" output.check + address output + format.pid output + fin.entry +} + +FUNCTION {misc} +{output.bibitem + format.authors output + author format.key output + name.or.dash + format.date "year" output.check + date.block +%% new + format.title output +%% new + version empty$ + 'skip$ + {bbl.version version * output} + if$ +%% + howpublished output + publisher empty$ + {} + {format.aaspublisher} + if$ + format.pid output + fin.entry +} + +FUNCTION {phdthesis} +{ output.bibitem + format.authors "author" output.check + author format.key output + name.or.dash + format.date "year" output.check + date.block +% format.title "title" output.check + bbl.phdthesis format.thesis.type output.nonnull + school "school" output.check + address output + format.pid output + fin.entry +} + +FUNCTION {proceedings} +{ output.bibitem + editor empty$ + { organization output + organization format.key output } + { format.editors output } + if$ +% format.editors output +% editor format.key output + name.or.dash + format.date "year" output.check + date.block + title format.full.book.spec output +% format.btitle "title" output.check +% format.bvolume output +% format.number.series output + publisher empty$ not % No need for warning if no pub. + { format.publisher } + { editor empty$ % For empty editor, organization was already given. + 'skip$ + { organization output } + if$ + address output + } + if$ +% address output +% organization output +% publisher output + format.pages output + format.pid output + fin.entry +} + +FUNCTION {techreport} +{ output.bibitem + format.authors "author" output.check + author format.key output + name.or.dash + format.date "year" output.check + date.block + format.title "title" output.check + format.tr.number output.nonnull + institution "institution" output.check + address output + format.pid output + fin.entry +} + +FUNCTION {unpublished} +{ output.bibitem + format.authors "author" output.check + author format.key output + name.or.dash + format.date "year" output.check + date.block +% format.title "title" output.check + format.pid output + fin.entry +} + +FUNCTION {default.type} { misc } + +READ + +FUNCTION {sortify} +{ purify$ + "l" change.case$ +} + +INTEGERS { len } + +FUNCTION {chop.word} +{ 's := + 'len := + s #1 len substring$ = + { s len #1 + global.max$ substring$ } + 's + if$ +} + +FUNCTION {format.lab.names} +{ 's := + s #1 "{vv~}{ll}" format.name$ + s num.names$ duplicate$ + #2 > + { pop$ + " {et~al.}" * + } + { #2 < + 'skip$ + { s #2 "{ff }{vv }{ll}{ jj}" format.name$ "others" = + { + " {et~al.}" * + } + { " \& " * s #2 "{vv~}{ll}" format.name$ + * } + if$ + } + if$ + } + if$ +} + +FUNCTION {author.key.label} +{ author empty$ + { key empty$ + { cite$ #1 #3 substring$ } + 'key + if$ + } + { author format.lab.names } + if$ +} + +FUNCTION {author.editor.key.label} +{ author empty$ + { editor empty$ + { key empty$ + { cite$ #1 #3 substring$ } + 'key + if$ + } + { editor format.lab.names } + if$ + } + { author format.lab.names } + if$ +} + +FUNCTION {editor.key.label} +{ editor empty$ + { key empty$ + { cite$ #1 #3 substring$ } + 'key + if$ + } + { editor format.lab.names } + if$ +} + +FUNCTION {calc.short.authors} +{ type$ "book" = + type$ "inbook" = + or + 'author.editor.key.label + { type$ "proceedings" = + 'editor.key.label + 'author.key.label + if$ + } + if$ + 'short.list := +} + +FUNCTION {calc.label} +{ calc.short.authors + short.list + "(" + * + year duplicate$ empty$ + { pop$ "????" } + 'skip$ + if$ + * + 'label := +} + +FUNCTION {sort.format.names} +{ 's := + #1 'nameptr := + "" + s num.names$ 'numnames := + numnames #8 > + { s nameptr + "{vv{ } }{ll{ }}{ f{ }}{ jj{ }}" + format.name$ 't := + t sortify * + " " * + "zzzzz" * + } + { numnames 'namesleft := + { namesleft #0 > } + { s nameptr + "{vv{ } }{ll{ }}{ f{ }}{ jj{ }}" + format.name$ 't := + nameptr #1 > + { + " " * + namesleft #1 = t "others" = and + { "zzzzz" * } + { t sortify * } + if$ + } + { t sortify * } + if$ + nameptr #1 + 'nameptr := + namesleft #1 - 'namesleft := + } + while$ + } + if$ +} + +FUNCTION {sort.format.title} +{ 't := + "A " #2 + "An " #3 + "The " #4 t chop.word + chop.word + chop.word + sortify + #1 global.max$ substring$ +} + +FUNCTION {author.sort} +{ author empty$ + { key empty$ + { "to sort, need author or key in " cite$ * warning$ + "" + } + { key sortify } + if$ + } + { author sort.format.names } + if$ +} + +FUNCTION {author.editor.sort} +{ author empty$ + { editor empty$ + { key empty$ + { "to sort, need author, editor, or key in " cite$ * warning$ + "" + } + { key sortify } + if$ + } + { editor sort.format.names } + if$ + } + { author sort.format.names } + if$ +} + +FUNCTION {editor.sort} +{ editor empty$ + { key empty$ + { "to sort, need editor or key in " cite$ * warning$ + "" + } + { key sortify } + if$ + } + { editor sort.format.names } + if$ +} + +FUNCTION {presort} +{ calc.label + label sortify + " " + * + type$ "book" = + type$ "inbook" = + or + 'author.editor.sort + { type$ "proceedings" = + 'editor.sort + 'author.sort + if$ + } + if$ + #1 entry.max$ substring$ + 'sort.label := + sort.label + * + " " + * +%% 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$ := +} + +ITERATE {presort} + +SORT + +STRINGS { last.label next.extra } + +INTEGERS { last.extra.num number.label } + +FUNCTION {initialize.extra.label.stuff} +{ #0 int.to.chr$ 'last.label := + "" 'next.extra := + #0 'last.extra.num := + #0 'number.label := +} + +FUNCTION {forward.pass} +{ last.label label = + { last.extra.num #1 + 'last.extra.num := + last.extra.num int.to.chr$ 'extra.label := + } + { "a" chr.to.int$ 'last.extra.num := + "" 'extra.label := + label 'last.label := + } + if$ + number.label #1 + 'number.label := +} + +FUNCTION {reverse.pass} +{ next.extra "b" = + { "a" 'extra.label := } + 'skip$ + if$ + extra.label 'next.extra := + extra.label + duplicate$ empty$ + 'skip$ + { "{\natexlab{" swap$ * "}}" * } + if$ + 'extra.label := + label extra.label * 'label := +} + +EXECUTE {initialize.extra.label.stuff} + +ITERATE {forward.pass} + +REVERSE {reverse.pass} + +FUNCTION {bib.sort.order} +{ sort.label + " " + * + year field.or.null sortify + * + " " + * +%% 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$ := +} + +ITERATE {bib.sort.order} + +SORT + +FUNCTION {begin.bib} +{ preamble$ empty$ + 'skip$ + { preamble$ write$ newline$ } + if$ + "\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} + +ITERATE {call.type$} + +FUNCTION {end.bib} +{ newline$ + "\end{thebibliography}" write$ newline$ +} + +EXECUTE {end.bib} +%% End of customized bst file +%% +%% End of file `aasjournal.bst'. \ No newline at end of file diff --git a/cls/aastex62.cls b/cls/aastex63.cls similarity index 85% rename from cls/aastex62.cls rename to cls/aastex63.cls index 3191f75..1cb6f0d 100644 --- a/cls/aastex62.cls +++ b/cls/aastex63.cls @@ -1,11 +1,10 @@ -%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% AASTeX62.cls %% -%% Jan 6, 2018 %% -%% Copyright 2018 American Astronomical Society %% +%% AASTEX63.cls %% +%% July 8, 2019 (6:15pm) %% +%% Copyright 2019 American Astronomical Society %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\def\currversion{6.2} +\def\currversion{6.3} %% %% These files are distributed @@ -81,8 +80,8 @@ %%% abstract = "formatter for AAS journal submissions", %%% } -\ProvidesClass{aastex62}%%% - [2017/10/16 Version 6.2/AAS markup document class]% +\ProvidesClass{aastex63}%%% + [2019/06/03 Version 6.3/AAS markup document class]% {} \ClassInfo{aastex}{% ^^J @@ -144,6 +143,7 @@ track changes, new `modern' style and much more, by Amy Hendrickson,% % numberedappendix: Legacy command, will produce same results as lettered appendix, since we don't want more % than one `section 1' in article: will cause problems for cross referencing. +% anonymous: to not list authors/affiliations be listed \newif\ifmanu \newif\iftwelvepoint @@ -173,6 +173,8 @@ track changes, new `modern' style and much more, by Amy Hendrickson,% %% left in from older version, in case it could be useful: + + \DeclareOption{twocolumn}{\twocolstyletrue\@two@coltrue\twelvepointfalse} %% default style @@ -184,10 +186,7 @@ track changes, new `modern' style and much more, by Amy Hendrickson,% Thank-you!^^J^^J=================}\stop} \newif\if@two@col@app -\DeclareOption{twocolappendix}{\typeout{^^J^^J The option^^J -`twocolappendix' no -longer works! onecolappendix is preferred,^^J -and is the default.^^J^^J}\stop}%\@two@col@apptrue} +\DeclareOption{twocolappendix}{\@two@col@apptrue} \DeclareOption{onecolappendix}{\@two@col@appfalse}%% this is default \newif\iflongauthor @@ -254,6 +253,9 @@ access fonts for the \string\astro\space command \newif\iftrack \DeclareOption{trackchanges}{\global\tracktrue} +\newif\ifanonymous +\DeclareOption{anonymous}{\global\anonymoustrue} + %% End AH Options \ExecuteOptions{onecolumn,onecolappendix,letteredappendix}% @@ -619,7 +621,8 @@ revtex4-1.cls^^J^^J}\stop %% running heads: \def\lefthead#1{\gdef\@versohead{#1}} \lefthead{\relax} -\def\righthead#1{\gdef\@rectohead{#1}} \righthead{\relax} +\def\righthead#1{\ifanonymous\gdef\@rectohead{\ \ Anonymous author(s) +\hfill}\else\gdef\@rectohead{#1}\fi} \righthead{\relax} \let\shorttitle\lefthead \let\shortauthors\righthead @@ -651,7 +654,7 @@ revtex4-1.cls^^J^^J}\stop \vspace*{-\headsep}\vspace*{\headheight} \footnotesize \noindent{\sc Draft version \today}\\[2pt] -{\footnotesize Typeset using \LaTeX\ {\bf RNAAS} style in AASTeX62} +{\footnotesize Typeset using \LaTeX\ {\bf RNAAS} style in AASTeX63} \par\vspace*{-\baselineskip}\vspace*{0.625in} \else \vbox to 0pt{\vskip-48pt\normalsize\rptloopnum=0\loop @@ -669,7 +672,7 @@ revtex4-1.cls^^J^^J}\stop \raggedright {\sc Draft version \today}\\[2pt] {\footnotesize -Typeset using \LaTeX\ {\bf modern} style in AASTeX62} +Typeset using \LaTeX\ {\bf modern} style in AASTeX63} \vskip48pt } \else @@ -678,7 +681,7 @@ Typeset using \LaTeX\ {\bf modern} style in AASTeX62} \vspace*{-\headsep}\vspace*{\headheight} \footnotesize \noindent{\sc Draft version \today}\\[2pt] -{\footnotesize Typeset using \LaTeX\ {\bf preprint} style in AASTeX62} +{\footnotesize Typeset using \LaTeX\ {\bf preprint} style in AASTeX63} \par\vspace*{-\baselineskip}\vspace*{0.625in} \else %% @@ -686,7 +689,7 @@ Typeset using \LaTeX\ {\bf modern} style in AASTeX62} \vspace*{-\headsep}\vspace*{\headheight} \footnotesize {\footnotesize\textsc{\@journalinfo}}\par -{\footnotesize Typeset using \LaTeX\ {\bf preprint2} style in AASTeX62} +{\footnotesize Typeset using \LaTeX\ {\bf preprint2} style in AASTeX63} \par\vspace*{-\baselineskip}\vspace*{0.625in} \else %% @@ -694,7 +697,7 @@ Typeset using \LaTeX\ {\bf modern} style in AASTeX62} \vspace*{-\headsep}\vspace*{\headheight} \footnotesize {\footnotesize\textsc{\@journalinfo}}\par -{\footnotesize Typeset using \LaTeX\ {\bf twocolumn} style in AASTeX62} +{\footnotesize Typeset using \LaTeX\ {\bf twocolumn} style in AASTeX63} \par\vspace*{-\baselineskip}\vspace*{0.625in} \else \ifmanu @@ -702,14 +705,14 @@ Typeset using \LaTeX\ {\bf modern} style in AASTeX62} \footnotesize \noindent\textsc{\@journalinfo}\\[-8pt] {\footnotesize Typeset using \LaTeX\ {\bf manuscript} style in -AASTeX62} +AASTeX63} \par\vspace*{-\baselineskip}\vspace*{0.625in} \else %% Default \vspace*{-\headsep}\vspace*{\headheight} \footnotesize {\footnotesize\textsc{\@journalinfo}}\par -{\footnotesize Typeset using \LaTeX\ default style in AASTeX62}%% default style +{\footnotesize Typeset using \LaTeX\ default style in AASTeX63}%% default style \par\vspace*{-\baselineskip}\vspace*{0.625in} \fi\fi\fi\fi\fi %% @@ -745,7 +748,9 @@ AASTeX62} \newcount\endfncount \long\def\tempfootnote#1{\global\advance\fncount by 1\relax% \expandafter\gdef\csname -footnote\the\fncount\endcsname{\if@two@col\hsize=242pt\fi\relax#1}} +footnote\the\fncount\endcsname{\if@two@col\hsize=.5\textwidth +\advance\hsize by -18pt +\fi\relax#1}} \long\def\abstracttempfootnote#1{\global\advance\fncount by 1\relax% \expandafter\gdef\csname absfootnote\the\fncount\endcsname{#1}} @@ -754,8 +759,10 @@ footnote\the\fncount\endcsname{\if@two@col\hsize=242pt\fi\relax#1}} \long\def\ltx@foottext#1#2{% \begingroup - \expandafter\ltx@make@current@footnote\expandafter{\@mpfn}{#1}% -\@footnotetext{#2}% +\expandafter\ltx@make@current@footnote\expandafter{\@mpfn}{#1}% +\@footnotetext{\vtop{\iftwocolstyle\hsize=.5\textwidth +\advance\hsize-18pt +\fi #2\vskip2pt}}% fixed for two col style, march 15, 2019 \endgroup }% @@ -780,10 +787,16 @@ footnote\the\fncount\endcsname{\if@two@col\hsize=242pt\fi\relax#1}} \let\@AF@join\@title@join }% -\def\frontmatter@title@format{\ifrnaas -\large\scshape\centering -\else -\normalsize\centering\fi} +\def\frontmatter@title@format{ +%% No exception for rnaas, May, 2019 +%\ifrnaas +%\large\scshape\centering +%\else +\normalsize +%% added Mar 2019 +\bf\centering +%\fi +} \def\frontmatter@title@below{\vskip8pt}% @@ -1043,7 +1056,7 @@ footnote\the\fncount\endcsname{\if@two@col\hsize=242pt\fi\relax#1}} \let\footnoterule\relax -\def\@makefntext#1{\mbox{}\hspace*{3mm}\@makefnmark~#1} +\def\@makefntext#1{\hsize=\columnwidth\mbox{}\hspace*{3mm}\@makefnmark~#1} % **************************************** @@ -1052,10 +1065,18 @@ footnote\the\fncount\endcsname{\if@two@col\hsize=242pt\fi\relax#1}} \setcounter{secnumdepth}{3} +\newcount\tempsectnum + \newif\if@firstsection \@firstsectiontrue \def\section{% \if@firstsection +%% In case no collaboration is listed: +\ifcollaborationon\else\let\doauthor\olddoauthor +\let\allauthors=\oldallauthors +\fi +%\edef\currauthorlimit{\the\AuthorCollaborationLimit} +%\collaboration{\currauthorlimit}{} \maketitle \global\@firstsectionfalse \setcounter{footnote}{\thefront@matter@foot@note}% @@ -1074,6 +1095,9 @@ footnote\the\fncount\endcsname{\if@two@col\hsize=242pt\fi\relax#1}} \twocolumngrid \fi \fi +\tempsectnum=\the\c@section +\advance\tempsectnum by 1 +\xdef\cref@currentlabel{section \the\tempsectnum} \@startsection{section}{1}{\z@}{9pt plus 1pt minus 1pt}{4pt}{\apjsecfont\center}} @@ -1159,8 +1183,49 @@ the#1\endcsname} \penalty \ApjSectionpenalty} -\def\acknowledgments{\vskip 5.8mm plus 1mm minus 1mm} -\let\acknowledgements=\acknowledgments % second spelling + +%% begin...end form, not as good as \acknowledgments...\par +\newbox\ackbox +\def\xacknowledgments{\vskip 5.8mm plus 1mm minus 1mm +\vskip1sp +\section*{Acknowledgments} +\vskip4pt +\global\setbox\ackbox=\vbox\bgroup +} + +\def\xendacknowledgments{\egroup +\ifanonymous +\centerline{(Acknowledgements anonymized for review)} +\else +\copy\ackbox\fi} + +%% If anonymous option is used, a message instead of acknowledgments will appear. + + +\long\def\xacknowledgments\par#1\par{\vskip 5.8mm plus 1mm minus 1mm +\vskip1sp +\vbox{ +\section*{Acknowledgments} +\ifanonymous +\centerline{(Acknowledgements anonymized for review)} +\else +\nobreak +\vtop{#1}\fi}\vskip6pt} + + +\long\def\yacknowledgments#1\par{\vskip 5.8mm plus 1mm minus 1mm +\vskip1sp +\vbox{ +\section*{Acknowledgments} +\ifanonymous +\centerline{(Acknowledgements anonymized for review)} +\else +\nobreak +\vtop{#1}\fi}\vskip6pt} + +\def\acknowledgments{\futurelet\next\checkforblankline} +\def\checkforblankline{\ifx\next\par \let\go\xacknowledgments \else +\let\go\yacknowledgments\fi\go} % **************************************** @@ -1170,7 +1235,6 @@ the#1\endcsname} \newcounter{remember@figure@num} \newcounter{remember@table@num} - % this was an environment earlier, which doesn't make sense since we don't % do \begin{appendix}...\end{appendix}. Changed to \appendix which is how it is used. @@ -1180,11 +1244,20 @@ the#1\endcsname} \newif\ifappendixon \def\appendix{ \global\appendixontrue +\if@two@col \onecolumngrid -%\clearpage +\noindent\mbox{}\vrule height 24pt width0pt\hfill{\apjsecfont APPENDIX}\hfill\mbox{}\par +\vskip18pt + \if@two@col@app\global\@two@coltrue\twocolumngrid \fi + % above, we want onecolumngrid to be default. Only twocolumn is asked for in documentclass option +\else +\noindent\mbox{}\vrule height 24pt width0pt\hfill{\apjsecfont +APPENDIX}\hfill\mbox{}\par +\vskip18pt + \if@two@col@app\global\@two@coltrue\twocolumngrid + \fi\fi % \vrule used for extra space; otherwise revtex4-1 sometimes eats % away the last line before appendix - \noindent\mbox{}\vrule height 24pt width0pt\hfill{\apjsecfont APPENDIX}\hfill\mbox{}\par \nopagebreak\medskip\@nobreaktrue\def\ApjSectionpenalty{\@M} \@firstsectionfalse \setcounter{section}{0} @@ -1205,16 +1278,20 @@ the#1\endcsname} %\setcounter{equation}{0} \def\thesection{\Alph{section}} \def\theequation{\hbox{\Alph{section}\arabic{equation}}} - \def\section{ -\@startsection {section}{1}{\z@} + \def\section{\@startsection {section}{1}{\z@} {10pt}{5pt}{\centering\scshape\apjsecfont}} \else % Do not use appendix numbers in the titles \def\ApjSectionMarkInTitle{\AppendixApjSectionMarkInTitle} \fi +\ifappletter +\let\savesection\section +\def\section{\resetapptablenumbers\savesection} +\fi } % + %% % **************************************** @@ -1251,7 +1328,7 @@ the#1\endcsname} \def\bibitem{\vskip\bibskip\savebibitem} \newdimen\bibindent \renewenvironment{thebibliography}[1]{\global\bibtrue -\ifrnaas\newpage\fi%+++ +%%\ifrnaas\newpage\fi% Not wanted, March 2019 \onecolumngrid \vspace{20pt} \goodbreak @@ -1432,6 +1509,8 @@ the#1\endcsname} \def\tabcaption{\@ifnextchar[{\@xtabcaption}{\@tabcaption}} \def\@tabcaption#1{{\def\@captype{table}\caption{#1}}} \def\@xtabcaption[#1]#2{{\def\@captype{table}\caption{#2}}} + +%% redefined below \def\fnum@table{{\@eapj@cap@font \@eapj@tabname~\thetable}} \let\fnum@ptable=\fnum@table @@ -1467,7 +1546,7 @@ the#1\endcsname} \else \font\foo=cmr10\fi %% -\fontdimen2\foo=1.5pt +\fontdimen2\foo=3pt %% Changed from 1.5pt to 3pt, March12, 2019 %% {\large \it Software: } #2 @@ -1479,6 +1558,10 @@ the#1\endcsname} \fi }\egroup} + + + + \newcommand\object{\@testopt\@object{[}}% \def\@object[#1]#2{#2}% \newcommand\objectname{\@testopt\@objectname{[]}}% @@ -1569,7 +1652,7 @@ the#1\endcsname} \newcommand\ubvr{\mbox{$U\!BV\!R$}}%% UBVR system \newcommand\ub{\mbox{$U\!-\!B$}}% % U-B \newcommand\bv{\mbox{$B\!-\!V$}}% % B-V -\renewcommand\vr{\mbox{$V\!-\!R$}}% % V-R ++ +\renewcommand\vr{\mbox{$V\!-\!R$}}% % V-R \newcommand\ur{\mbox{$U\!-\!R$}}% % U-R %% need this change so that it works correctly in tables: @@ -1646,18 +1729,18 @@ the#1\endcsname} \vrule\@height\dimen@\@depth\dimen@i\@width\dimen@ii\nobreak }% -\newcommand\anchor[2]{#2}% -\renewcommand\url{\@dblarg\@url}% -\def\@url[#1]{\anchor{#1}}% +%\newcommand\anchor[2]{#2}% +%\renewcommand\url{\@dblarg\@url}% +%\def\@url[#1]{\anchor{#1}}% \let\jnl@style=\rmfamily \def\ref@jnl#1{{\jnl@style#1}}% \newcommand\aj{\ref@jnl{AJ}}% % Astronomical Journal \newcommand\araa{\ref@jnl{ARA\&A}}% % Annual Review of Astron and Astrophys -\renewcommand\apj{\ref@jnl{ApJ}}% % Astrophysical Journal ++ +\renewcommand\apj{\ref@jnl{ApJ}}% % Astrophysical Journal \newcommand\apjl{\ref@jnl{ApJL}} % Astrophysical Journal, Letters \newcommand\apjs{\ref@jnl{ApJS}}% % Astrophysical Journal, Supplement -\renewcommand\ao{\ref@jnl{ApOpt}}% % Applied Optics ++ +\renewcommand\ao{\ref@jnl{ApOpt}}% % Applied Optics \newcommand\apss{\ref@jnl{Ap\&SS}}% % Astrophysics and Space Science \newcommand\aap{\ref@jnl{A\&A}}% % Astronomy and Astrophysics \newcommand\aapr{\ref@jnl{A\&A~Rv}}% % Astronomy and Astrophysics Reviews @@ -1665,14 +1748,15 @@ the#1\endcsname} \newcommand\azh{\ref@jnl{AZh}}% % Astronomicheskii Zhurnal \newcommand\baas{\ref@jnl{BAAS}}% % Bulletin of the AAS \newcommand\icarus{\ref@jnl{Icarus}}% % Icarus +\newcommand\jaavso{\ref@jnl{JAAVSO}} % The Journal of the American Association of Variable Star Observers \newcommand\jrasc{\ref@jnl{JRASC}}% % Journal of the RAS of Canada \newcommand\memras{\ref@jnl{MmRAS}}% % Memoirs of the RAS \newcommand\mnras{\ref@jnl{MNRAS}}% % Monthly Notices of the RAS -\renewcommand\pra{\ref@jnl{PhRvA}}% % Physical Review A: General Physics ++ -\renewcommand\prb{\ref@jnl{PhRvB}}% % Physical Review B: Solid State ++ -\renewcommand\prc{\ref@jnl{PhRvC}}% % Physical Review C ++ -\renewcommand\prd{\ref@jnl{PhRvD}}% % Physical Review D ++ -\renewcommand\pre{\ref@jnl{PhRvE}}% % Physical Review E ++ +\renewcommand\pra{\ref@jnl{PhRvA}}% % Physical Review A: General Physics +\renewcommand\prb{\ref@jnl{PhRvB}}% % Physical Review B: Solid State +\renewcommand\prc{\ref@jnl{PhRvC}}% % Physical Review C +\renewcommand\prd{\ref@jnl{PhRvD}}% % Physical Review D +\renewcommand\pre{\ref@jnl{PhRvE}}% % Physical Review E \renewcommand\prl{\ref@jnl{PhRvL}}% % Physical Review Letters \newcommand\pasp{\ref@jnl{PASP}}% % Publications of the ASP \newcommand\pasj{\ref@jnl{PASJ}}% % Publications of the ASJ @@ -1727,14 +1811,16 @@ the#1\endcsname} \newcounter{table@save} -\def\tablenum#1{% - \setcounter{table@save}{\the\c@table} - \gdef\use@tablenum{1} - \setcounter{table}{#1}\def\thetable{#1}\def\@currentlabel{#1} - %\def\label##1{\save@label{##1}} +%% March 25, 2019 +%% Old v5.2 way, From Greg, This allows a number like 33N to be used +%% for a table, and the cross-references will work correctly +\newcommand\tablenum[1]{% + \def\thetable{#1}% + \xdef\@currentlabel{\thetable} +\global\advance\c@table-1\relax }% -\gdef\use@tablenum{0} -\def\restore@tablenum{\if\use@tablenum0\else\setcounter{table}{\the\c@table@save}\addtocounter{table}{\m@ne}\gdef\use@tablenum{0}\fi} + +\let\savetablenum\tablenum \def\tabletypesize#1{\gdef\currtabletypesize{#1} \def\@table@type@size{#1}}% @@ -1756,15 +1842,21 @@ the#1\endcsname} \def\LT@makecaption#1#2#3{% \LT@mcol\LT@cols c{\hbox to\z@{\hss\parbox[t]\LTcapwidth {% -\def \@currentlabel{\thetable} - \sbox\@tempboxa{\small #2. #3}% +\xdef \@currentlabel{\thetable} + \sbox\@tempboxa{\small #2. +%% disable trackchanges commands here, so they aren't entered 2 times: +\let\added\relax +\let\deleted\relax +\let\replaced\relax +#3}% \ifdim\wd\@tempboxa>\hsize - \small #2. #3% + \small#2. #3% \else \hbox to\hsize{\hfil\box\@tempboxa\hfil}% \fi \endgraf\vskip\baselineskip}% - \hss}}} + \hss}} +}%% \let\LT@makecaption@rtx=\LT@makecaption % to fight redefinition in Revtex-4.1 @@ -1772,12 +1864,12 @@ the#1\endcsname} %% from book.cls/ used?? \long\def\@makecaption#1#2{% \vskip\abovecaptionskip -\ifx\@captype\xfigure -\gdef \@currentlabel{\thefigure} -\else -\gdef \@currentlabel{\thetable}\fi %% \small added to keep currtabletypesize from determining size of caption \sbox\@tempboxa{\small +%% disable trackchanges commands here, so they aren't entered 2 times: +\let\added\relax +\let\deleted\relax +\let\replaced\relax {\bf #1.} #2}% \ifdim \wd\@tempboxa >\hsize \small @@ -1786,7 +1878,8 @@ the#1\endcsname} \global \@minipagefalse \hb@xt@\hsize{\hfill\box\@tempboxa\hfill}% \fi - \vskip\belowcaptionskip} + \vskip\belowcaptionskip +} \newdimen\@abovenoteskip \newcommand\tablerefs[1]{\ifdim\@abovenoteskip=0pt\global\@abovenoteskip=10pt\fi @@ -1799,8 +1892,8 @@ the#1\endcsname} {\hskip1em\rm References. --- #1}\par}% }% - -\global\def\tablenotemark#1{{\normalfont\textsuperscript{#1}}} +%% march 2019, added \it to tablenotemark +\global\def\tablenotemark#1{{\normalfont\textsuperscript{\normalsize\it #1}}} \global\def\tablenotetext#1#2{\footnotetext[#1]{\currtabletypesize\relax#2}} %% redefined by AH below, since it wasn't working with tabular table @@ -1811,7 +1904,7 @@ the#1\endcsname} \def\xyztablehead#1{\@table@not@headedfalse% \kill \caption{\\% - \@tablecaption}% + \@tablecaption\gdef\@currentlabel{\thetable}(0)} \\\hline\hline% #1\vrule height 12pt depth 10pt width 0pt\relax \hskip\tabcolsep\\[.7ex] @@ -1874,6 +1967,7 @@ width0pt\relax#1$}\ignorespaces} \def\lt@expand@linewidth@one{\setlength\LTleft{0pt}\setlength\LTright{0pt}} \def\lt@expand@linewidth@two{@{\extracolsep{0pt plus 1filll}}} + \def\find@table@width{% %%% set table width using aux file and command \tablewidth \setcounter{deluxe@table@num}{\c@LT@tables} @@ -1981,8 +2075,17 @@ width0pt\relax#1$}\ignorespaces} \newcommand{\figsetplot}[1]{\noprint{#1}} \newcommand{\figsetgrpnote}[1]{\noprint{#1}} -%% for url's in document, will allow them to break over lines. \usepackage{url} +%% if we take away the xx before UrlBreaks we will get a url that breaks +%% at any letter or number. It might be better to break only at / however... +\expandafter\def\expandafter\xxUrlBreaks\expandafter{\UrlBreaks% save the current one + \do\a\do\b\do\c\do\d\do\e\do\f\do\g\do\h\do\i\do\j% + \do\k\do\l\do\m\do\n\do\o\do\p\do\q\do\r\do\s\do\t% + \do\u\do\v\do\w\do\x\do\y\do\z\do\A\do\B\do\C\do\D% + \do\E\do\F\do\G\do\H\do\I\do\J\do\K\do\L\do\M\do\N% + \do\O\do\P\do\Q\do\R\do\S\do\T\do\U\do\V\do\W\do\X% + \do\Y\do\Z\do\1\do\2\do\3\do\4\do\5\do\6\do\7\do\8\do\9} + %% for tables continuing over pages \usepackage{longtable} @@ -1993,18 +2096,21 @@ width0pt\relax#1$}\ignorespaces} \definecolor{xlinkcolor}{cmyk}{1,1,0,0} +\PassOptionsToPackage{hyphens}{url} %% In response to request from AAS - \usepackage[bookmarks=false, % show bookmarks bar? + \usepackage[bookmarks=true, % show bookmarks bar?/ Changed March 22, 2019 for + % improved accessibility pdfnewwindow=true, % links in new window colorlinks=true, % false: boxed links; true: colored links linkcolor=xlinkcolor, % color of internal links citecolor=xlinkcolor, % color of links to bibliography filecolor=xlinkcolor, % color of file links urlcolor=xlinkcolor, % color of external links -final=true + final=true, ]{hyperref} + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%% Additions to AASTeX by Amy Hendrickson, TeXnology Inc, August 17, 2015 @@ -2139,11 +2245,11 @@ final=true \catcode`\$=\active \let\savetabular\tabular -\def\tabular{\catcode`\&=\active\relax\catcode`\$=\active\relax\savetabular} +\def\tabular{\catcode`\&=\active\relax\catcode`\$=\active\relax\hskip\movetableright +\savetabular} \long\gdef\eatone{\setbox0=\hbox\bgroup\savedollar\let$\relax} \gdef\endeatone{\savedollar\egroup\hskip-2\tabcolsep} - %% Hide, important because it allows us to split tables horizontally \newcolumntype{h}{>\eatone c<\endeatone} @@ -3886,7 +3992,7 @@ Thank you!^^J}\fi% %\ifbreaktab \\\hline% below, hline is wanted %\else -\noalign{\vskip-13pt} +\noalign{\vskip-8pt} %\vrule height 28pt width0pt %the \vrule is in the line below colnumbers; % it causes all the vrules on that line to grow to 28pt. % The -14pt will cause the lower line to overlap the upper line. @@ -3896,6 +4002,7 @@ Thank you!^^J}\fi% } + \let\savecolnumbers\colnumbers \gdef\plaincolnumbers{% @@ -4190,7 +4297,7 @@ Sorry, more than 30 columns cannot be numbered with^^J \string\colnumbers. Please number the columns manually.^^J Thank you!^^J}\fi% \\\hline% below, hline is wanted -%\\\noalign{\vskip-30pt} +\\\noalign{\vskip-30pt }%%%%% %\vrule height 28pt width0pt %the \vrule is in the line below colnumbers; % it causes all the vrules on that line to grow to 28pt. % The -14pt will cause the lower line to overlap the upper line. @@ -4507,7 +4614,8 @@ Sorry, more than 30 columns cannot be numbered with^^J Thank you!^^J}\fi% \\\hline% below, hline is wanted \iffirsttime -\\\noalign{\vskip-30pt} +\\\noalign{\vskip-30pt}%% +%\noalign{\vskip-8pt} \vrule height 28pt width0pt %the \vrule is in the line below colnumbers; % it causes all the vrules on that line to grow to 28pt. % The -14pt will cause the lower line to overlap the upper line. @@ -4522,7 +4630,7 @@ Thank you!^^J}\fi% \global\let\extracolsep\relax \global\let\ddoit\saveddoit \global\let\zdoit\savezdoit -\vskip-32pt +\vskip-32pt }{\vrule height28pt depth0pt width0pt}\relax} \def\splitdecimalcolnumbers{\\[-15pt]% @@ -4537,7 +4645,7 @@ Thank you!^^J}\fi% }\vrule height 28pt width0pt %!!! \global\let\splitdecimalcolnumbers\secondsplitdecimalcolnumbers} -\def\secondsplitdecimalcolnumbers{\omit\\%[-15pt] +\def\secondsplitdecimalcolnumbers{\omit\\ \plaincolnumbers \global\colnumbersonfalse \\\noalign{\vskip-26pt %!!! was -28pt @@ -4577,10 +4685,12 @@ deluxetable*\endcsname{\deluxestartrue\bgroup\floattrue \def\floatrotatetable{\global\deluxestartrue\global\floattrue} \let\endfloatrotatetable\relax -\def\deluxetable{ -\global\deluxetrue +\def\deluxetable{\global\deluxetrue \catcode`\&=\active \catcode`\$=\active +%% Mar 30, 2019, to make label outside of \caption work correctly +{\advance\c@table by 1 +\xdef\@currentlabel{\thetable}} \let\tablecaption\deluxetablecaption \deluxetablecaption{} %% july 2016 @@ -4589,13 +4699,16 @@ deluxetable*\endcsname{\deluxestartrue\bgroup\floattrue % \else\let\go\longdeluxetable\fi\go%} %% aug 2016 \ifstartlongtable +%% this works for both deluxetable and deluxetable*: %% nov 2017: \def\arraystretch{1.1} - \ifdeluxestar +%% March 2019 +\if@two@col\global\returntotwocoltrue\vskip1pt +\ifdeluxestar\onecolumngrid\fi\fi +%% +\ifdeluxestar \vskip12pt - \if@two@col\onecolumngrid - \vskip12pt - \fi\fi +\fi \let\go\longdeluxetable \else \let\go\ydeluxetable @@ -4605,8 +4718,10 @@ deluxetable*\endcsname{\deluxestartrue\bgroup\floattrue \def\ydeluxetable#1{% \@ifnextchar[{\xdeluxetable{#1}}{\zdeluxetable{#1}}} +%% % x and z are the same, except that xdeluxetable allows optional square bracket arg, like [h]. \def\xdeluxetable#1[#2]{\global\breaktabtrue +%% not here \let\colnumbers\deluxecolnumbers \global\deluxedecimalsfalse \let\decimals\deluxedecimals @@ -4639,10 +4754,12 @@ deluxetable*\endcsname{\deluxestartrue\bgroup\floattrue \pt@head ##1\end{tabular}} \expandafter\ifx\csname @tablecaption\endcsname\empty\else - +%% \noindent\hbox to\hsize{\hss\vtop{\hsize=\wd0 \caption{\@tablecaption}}\hss}\vskip3pt\fi + +%% not here \global\setbox3\hbox{% \begin{tabular}{#1}% \hline\hline\noalign{\vskip-9pt}% @@ -4686,7 +4803,6 @@ to\hsize{\hss\vtop{\hsize=\wd0 \pt@head ##1\end{tabular}}% not here \expandafter\ifx\csname @tablecaption\endcsname\empty\else - \noindent\hbox to\hsize{\hss\vtop{\hsize=\wd0 \caption{\@tablecaption}}\hss}\vskip3pt\fi @@ -4702,8 +4818,25 @@ to\hsize{\hss\vtop{\hsize=\wd0 \leftskip6pt\parindent-6pt }} + %% go to \end{deluxetable}, after longdeluxetable + + +%%@@@@ + +%% Variation on definition found in revtex4-1.cls +\def\LT@start@new{% + \let\LT@start\endgraf + \endgraf + \markthr@@{}% + \LT@pre + \@ifvoid\LT@firsthead{\LT@top}{\hbox{\ifdim\movetableright>0pt\relax\hskip\movetableright\fi\box\LT@firsthead} +\nobreak}% + \mark@envir{longtable}% +}% + +%%% \newbox\longtablebox \def\longdeluxetable#1{ \global\rotateonfalse @@ -4735,16 +4868,43 @@ to\hsize{\hss\vtop{\hsize=\wd0 \bgroup\centering \def\table@hook{\currtabletypesize} \LTcapwidth=\wd\longtablebox -\begin{longtable}{#1}%% +%% march 2019, added [c] and these terms: +\ifcenterwidetable\global\centerwidetablefalse + \def\LT@LR@c{\LTleft=0pt minus1fill + \let\LTright\LTleft}% +\else +%% default, will center table that is narrower than text width + \def\LT@LR@c{\LTleft=0pt plus1fill + \LTright\LTleft}% +\fi +%% +% +\begin{longtable}[c]{#1}%% +\ifdim\movetableright>0pt + \noalign{\ifdim\movetableright>0pt + \global\LTleft=\movetableright + \fi} +% + \noalign{\hbox to \wd\longtablebox{ + \vtop{\hsize=.8\wd\longtablebox + \advance\baselineskip4pt + \raggedright + {\bf \fnum@table}.\vrule depth 6pt width0pt\ + \@tablecaption}\hss}\vskip-3pt }\\ + \hline + \hline\noalign{\vskip-9pt} + \pt@head% +\else \caption{\hsize=\wd\longtablebox \advance\baselineskip2pt -\@tablecaption}\\ +\@tablecaption}\\ % \hline\hline\noalign{\vskip-9pt}% prob ok \pt@head% +\fi \endfirsthead \noalign{\centerline{\small -{\bf Table \thetable}\ \it(continued)}\vskip6pt} +\hskip\movetableright{\bf \fnum@table}\ \it(continued)}\vskip6pt} \hline\hline \noalign{\vskip-12pt} \pt@head% @@ -4752,7 +4912,7 @@ to\hsize{\hss\vtop{\hsize=\wd0 \hline \multicolumn{\totalcolumns}{c}{\vrule height 24pt width0pt\small\it -Table \thetable\ +\fnum@table\ continued \if@two@col\else on next page\fi}\\ \endfoot @@ -4772,11 +4932,13 @@ continued \if@two@col\else on next page\fi}\\ \parindent=-6pt \currtabletypesize \global\startlongtablefalse +\global\movetableright=0pt }% end data, endlongtable } - -\def\endlongdeluxetable{\vrule depth 6pt width 0pt +\def\endlongdeluxetable{ +%% +\vrule depth 6pt width 0pt \vskip1sp \egroup \ifdim\dp4>6pt @@ -4784,23 +4946,26 @@ continued \if@two@col\else on next page\fi}\\ \vbox{\hbox to \columnwidth{\hfill \vtop{\hsize\wd\longtablebox \leftskip=6pt\parindent-6pt -\copy4}\hfill} -}\fi -\ifdeluxestar - \if@two@col -\vglue\ht4 - \twocolumngrid - \hsize=\columnwidth -\fi\fi% +\copy4 +}\hfill}%% +} +\fi +\vglue\ht4 \global\colnumbersonfalse \global\deluxedecimalsfalse \global\rotateonfalse -%\global\floatfalse -\if@two@col\vskip12pt\twocolumngrid\fi +%% \relax\null%% \null is an empty hbox. %% This keeps final page(s) of startlongtable/deluxetable %% from begin thrown away when at end of article. -} +% \global\advance\c@table-1\relax +%% +% +%% march 2019 +\ifreturntotwocol\global\returntotwocolfalse +\twocolumngrid\fi +}%% + %% bbb %% \end{deluxetable}: @@ -4823,7 +4988,8 @@ continued \if@two@col\else on next page\fi}\\ \ifdeluxestar\end{table*}\global\deluxestarfalse \if@two@col \twocolumngrid\hsize=\columnwidth\fi%% check this!! -\else\end{table}\fi +\else +\end{table}\fi \gdef\colnumbers{\saveplaincolnumbers} \global\breaktabfalse \global\deluxefalse @@ -4831,18 +4997,25 @@ continued \if@two@col\else on next page\fi}\\ \global\deluxedecimalsfalse \global\rotateonfalse \startlongtablefalse +\global\movetableright=0pt %\global\floatfalse +%\global\advance\c@table by -1\relax }%% check this!! - +%%@@@ ??? \newbox\splitbox \newif\ifdeluxe -\def\splitdeluxetable{\global\deluxetrue\catcode`\&=\active +\def\splitdeluxetable{ +%% Mar 30, 2019, to make label outside of \caption work correctly +{\advance\c@table by 1 +\xdef\@currentlabel{\thetable}} +\global\deluxetrue\catcode`\&=\active \catcode`\$=\active \xsplitdeluxetable} -\def\xsplitdeluxetable#1{\global\breaktabtrue +\def\xsplitdeluxetable#1{ +\global\breaktabtrue \let\colnumbers\deluxecolnumbers \let\decimals\deluxedecimals \global\deluxedecimalsfalse @@ -4910,6 +5083,7 @@ continued \if@two@col\else on next page\fi}\\ \global\deluxedecimalsfalse } + \newif\ifsplitstar \expandafter\def\csname splitdeluxetable*\endcsname{\global\splitstartrue\splitdeluxetable} \expandafter\def\csname endsplitdeluxetable*\endcsname{\endsplitdeluxetable\global\splitstarfalse @@ -4985,7 +5159,7 @@ continued \if@two@col\else on next page\fi}\\ \setbox\secondtablebox=\hbox{% \begin{tabular}{fZE}% \ifx\csname pt@head\endcsname\relax\else% -\pt@head\fi\\[-14pt]% +\pt@head\fi\\ [-14pt]% #1\crcr% \end{tabular}} \fi @@ -5071,14 +5245,13 @@ continued \if@two@col\else on next page\fi}\\ %% xstartdata, modified from \startdata in emulateapj, for splitdeluxetable \gdef\xstartdata#1\enddata{\def\tablecontents{% \ifcolnumberson% -\\ \savecolnumbers\\[2pt]\fi% +\\\savecolnumbers\\[2pt]\fi% this is for top level split \ifdeluxedecimals\savedecimals\fi% #1}% \currtabletypesize% \setbox2=\vtop{\dbreaktabular{\tablecontents}}% % \expandafter\ifx\csname @tablecaption\endcsname\empty\else - \noindent\hbox to\hsize{\hss\vtop{\hsize=\maxtablewidth\caption{\@tablecaption}}\hss}\vskip3pt\fi \dbreaktabular{\tablecontents\noalign{\global\let\zdoit\relax @@ -5166,7 +5339,7 @@ width 0pt\currtabletypesize{\bf References}---{#1}\vskip1sp}} \catcode`\$=\active% \xxtablehead} -%% ++= +%% \def\xxtablehead#1{% \let&\CheckNumberAndSwitch% \gdef\pt@head{% @@ -5204,7 +5377,7 @@ width 0pt\currtabletypesize{\bf References}---{#1}\vskip1sp}} \fi%end iftwelvepoint #1\ifcolnumberson% \ifnotfirst\\[-22pt]\fi -\else\\\hline\\[-8pt]\fi% space below hline for 2nd and 3rd part of split table +\else\\\hline\\[-8pt]\fi% space below hline for 2nd and 3rd part of split table }% % } @@ -5213,7 +5386,6 @@ width 0pt\currtabletypesize{\bf References}---{#1}\vskip1sp}} \catcode`\$=\active% \zztablehead} -%% +++ \def\zztablehead#1{\let&\CheckNumberAndSwitch% \gdef\pt@head{% %% this is needed: @@ -5247,7 +5419,7 @@ width 0pt\currtabletypesize{\bf References}---{#1}\vskip1sp}} \fi% end ifonecol \fi%endiftwocolstyle \fi%end iftwelvepoint -#1% +#1\unskip% \ifcolnumberson\\[6pt] \savecolnumbers\vrule height 11pt depth 4pt width 0pt\relax% \\\ifmanu\noalign{\vskip-15pt}\fi% @@ -5358,11 +5530,14 @@ by 1\relax}\ignorespaces}% \expandafter \let \csname endtable*\endcsname = \endtable %% + +%%% \movetabledown works \newbox\rotatetablebox \def\rotatetable{% \clearpage \global\startlongtabletrue\setbox\rotatetablebox=\vbox\bgroup } + \def\endrotatetable{\egroup \vglue\movetabledown \hbox to @@ -5371,13 +5546,12 @@ by 1\relax}\ignorespaces}% \global\startlongtablefalse } - +%%% \movetabledown works \expandafter\def\csname rotatetable*\endcsname{% \clearpage \global\startlongtabletrue\setbox\rotatetablebox=\vbox to \textwidth\bgroup\vfill} - \expandafter\def\csname endrotatetable*\endcsname{\vfill\egroup \vbox to \textheight{\vfill \vglue\movetabledown @@ -5390,7 +5564,8 @@ by 1\relax}\ignorespaces}% \global\startlongtablefalse } - +% +%%% \movetabledown works \newif\iflongrotateon \def\longrotatetable{% \global\longrotateontrue @@ -5418,6 +5593,7 @@ by 1\relax}\ignorespaces}% \@colht=\vsize \def\@makecol{\LS@makecol\LS@rot}% \def\@makefcolumn##1{\LS@makefcolumn{##1}\LS@rot}} + \def\endlongrotatetable{% \onecolumngrid %% ?? \clearpage @@ -5434,7 +5610,6 @@ by 1\relax}\ignorespaces}% \global\vsize=\textheight \global\@colroom=\textheight} - \newif\ifGin@pdftex \Gin@pdftexfalse \DeclareOption{pdftex}{% @@ -5523,9 +5698,9 @@ by 1\relax}\ignorespaces}% %% standardized, so didn't make an user interface %% to change the colors easily. -\expandafter\def\csname editcolor1\endcsname{magenta} -\expandafter\def\csname editcolor2\endcsname{blue} -\expandafter\def\csname editcolor3\endcsname{violet} +\expandafter\def\csname editcolor1\endcsname{black}% was magenta +\expandafter\def\csname editcolor2\endcsname{black}% was blue +\expandafter\def\csname editcolor3\endcsname{black}% was violet \newcount\colorcount \def\edit#1#2{{\colorcount=#1\relax% @@ -5636,8 +5811,8 @@ to 20pt{\hfill}}\vskip12pt}% \fboxrule=4pt \fboxsep=12pt \fcolorbox{ltblue}{white}{\hbox to -.93\textwidth{\hss$\vcenter{\advance\hsize -24pt #1}$\hss}}}\gdef\highlightfigure{\typeout{^^J^^JERROR!^^J^^J -Only One Highlighted Figure per Article!^^J^^J}\stop}} +.93\textwidth{\hss$\vcenter{\advance\hsize -24pt #1}$\hss}} +}} %%%%%%%%%%%%% @@ -5675,8 +5850,8 @@ Only One Highlighted Figure per Article!^^J^^J}\stop}} %% Change Feb 2016, to allow optional argument for time/date, and/or editor initials, etc. -\providecolor{trackchange}{rgb}{1,0,0} -\providecolor{explain}{rgb}{.5,0,.5} +\providecolor{trackchange}{cmyk}{0,0,0,1} +\providecolor{explain}{cmyk}{0,0,0,1} \newif\ifsilent @@ -5692,14 +5867,14 @@ Only One Highlighted Figure per Article!^^J^^J}\stop}} \ifabstract\else% \xdef\doit{\noexpand\linelabel{\the\refchangenumber}}\doit\fi\else% \xdef\doit{\noexpand\label{\the\refchangenumber}{}{}{}}\doit\fi}% -{\color{trackchange}(Added: [#1] #2)}%% +{\color{trackchange}\bf(Added: [#1] #2)}%% \ifabstract\label{\the\refchangenumber}% \expandafter\gdef\csname changenum\the\refchangenumber\endcsname{Added: [#1] -\textcolor{trackchange}{#2}\global\silenttrue}% +\textcolor{trackchange}\bf\relax{#2}\global\silenttrue}% \else\expandafter\gdef\csname -changenum\the\refchangenumber\endcsname{Added: [#1] -\textcolor{trackchange}{\let\bibitem\specialbibitem #2}\global\silentfalse}\fi% +changenum\the\refchangenumber\endcsname{\bf\relax Added: [#1] +\textcolor{trackchange}\bf\relax{\let\bibitem\specialbibitem #2}\global\silentfalse}\fi% \else#2\fi} @@ -5713,16 +5888,16 @@ changenum\the\refchangenumber\endcsname{Added: [#1] \xdef\doit{\noexpand\linelabel{\the\refchangenumber}}\doit\fi\else% \xdef\doit{\noexpand\label{\the\refchangenumber}{}{}{}}\doit% \fi}% -{\color{trackchange}(Added: #1)}%% +{\color{trackchange}\bf(Added: #1)}%% \ifabstract% \label{\the\refchangenumber}% \expandafter\gdef\csname changenum\the\refchangenumber\endcsname{Added: -\textcolor{trackchange}{#1}, +\textcolor{trackchange}\bf\relax{#1}, \global\silenttrue}\else \expandafter\gdef\csname changenum\the\refchangenumber\endcsname{Added: -\textcolor{trackchange}{\let\bibitem\specialbibitem #1},% +\textcolor{trackchange}{\bf\relax\let\bibitem\specialbibitem #1},% \global\silentfalse}\fi% \else#1\fi} @@ -5740,7 +5915,7 @@ changenum\the\refchangenumber\endcsname{Added: \else% \xdef\doit{\noexpand\label{\the\refchangenumber}}\doit\fi% }% -{\color{trackchange}% +{\color{trackchange}\bf% \ifbib\let\sout\relax\fi% \let\citep\specialcitep% \let\citet\specialcitet% @@ -5749,7 +5924,7 @@ changenum\the\refchangenumber\endcsname{Added: \ifabstract\label{\the\refchangenumber}% \expandafter\gdef\csname changenum\the\refchangenumber\endcsname{Deleted: [#1] -{\color{trackchange}% +{\color{trackchange}\bf% \let\citet\specialcitet% \let\citep\specialcitep% \let\cite\specialcite\sout{#2}}\global\silenttrue}% @@ -5776,7 +5951,7 @@ changenum\the\refchangenumber\endcsname{Deleted: [#1] \xdef\doit{\noexpand\label{\the\refchangenumber}{}{}{}}\doit% \fi}% %% -{\color{trackchange}% +{\color{trackchange}\bf% \ifbib\let\sout\relax\fi% \let\citep\specialcitep% \let\citet\specialcitet% @@ -5784,13 +5959,13 @@ changenum\the\refchangenumber\endcsname{Deleted: [#1] )}% \ifabstract\label{\the\refchangenumber}% \expandafter\gdef\csname changenum\the\refchangenumber\endcsname{Deleted: -{\color{trackchange}\let\ref\specialref% +{\color{trackchange}\bf\let\ref\specialref% \let\citep\specialcitep% \let\citet\specialcitet% \let\cite\specialcite\sout{#1}}\global\silenttrue}% \else \expandafter\gdef\csname changenum\the\refchangenumber\endcsname{Deleted: -{\color{trackchange}% +{\color{trackchange}\bf% \let\citep\specialcitep% \let\citet\specialcitet% \let\bibitem\specialbibitem% @@ -5811,27 +5986,27 @@ changenum\the\refchangenumber\endcsname{Deleted: [#1] {\ifbib\let\sout\relax\fi \let\citep\specialcitep% \let\citet\specialcitet% -\let\cite\specialcite\color{trackchange}(Replaced: [#1] \sout{#2}}% +\let\cite\specialcite\color{trackchange}\bf(Replaced: [#1] \sout{#2}}% {\color{black}replaced with:} {\let\ref\specialref% \let\citep\specialcitep% \let\citet\specialcitet% -\let\cite\specialcite\color{trackchange} #3)}% +\let\cite\specialcite\color{trackchange}\bf\relax #3)}% \ifabstract\label{\the\refchangenumber}% \expandafter\gdef\csname changenum\the\refchangenumber\endcsname{Replaced: [#1] {\let\citep\specialcitep% \let\citet\specialcitet% -\let\cite\specialcite\color{trackchange}\sout{#2}} {\color{black} replaced with:} -{\color{trackchange}#3}, \global\silenttrue}% +\let\cite\specialcite\color{trackchange}\bf\relax\sout{#2}} {\color{black} replaced with:} +{\color{trackchange}\bf\relax#3}, \global\silenttrue}% \else \expandafter\gdef\csname changenum\the\refchangenumber\endcsname{Replaced: [#1] {\ifbib\let\sout\relax\fi\let\bibitem\specialbibitem \let\citep\specialcitep% \let\citet\specialcitet% -\let\cite\specialcite\color{trackchange}\sout{#2} +\let\cite\specialcite\color{trackchange}\bf\relax\sout{#2} } {\color{black} replaced with:} -{\let\bibitem\specialbibitem\color{trackchange}#3}, \global\silentfalse}\fi% +{\let\bibitem\specialbibitem\color{trackchange}\bf\relax#3}, \global\silentfalse}\fi% \else#3\fi} \long\def\yreplaced#1#2{% @@ -5844,35 +6019,35 @@ changenum\the\refchangenumber\endcsname{Replaced: [#1] {\ifbib\let\sout\relax\fi\let\ref\specialref% \let\citep\specialcitep% \let\citet\specialcitet% -\let\cite\specialcite\color{trackchange}(Replaced: %\sout +\let\cite\specialcite\color{trackchange}\bf\relax(Replaced: %\sout {#1} }% {\color{black}replaced with:} -{\color{trackchange} #2)}% +{\color{trackchange}\bf\relax #2)}% \ifabstract\label{\the\refchangenumber}% \expandafter\gdef\csname changenum\the\refchangenumber\endcsname{Replaced: {\let\cite\specialcite% \let\citep\specialcitep% \let\citet\specialcitet% -\color{trackchange}\sout{#1}} {\color{black} replaced with:} -{\color{trackchange}#2},\global\silenttrue}% +\color{trackchange}\bf\relax\sout{#1}} {\color{black} replaced with:} +{\color{trackchange}\bf\relax#2},\global\silenttrue}% \else \expandafter\gdef\csname changenum\the\refchangenumber\endcsname{Replaced: {\ifbib\let\sout\relax\fi\let\bibitem\specialbibitem \let\citep\specialcitep% \let\citet\specialcitet% -\let\cite\specialcite\color{trackchange}\sout{#1} +\let\cite\specialcite\color{trackchange}\bf\relax\sout{#1} } {\color{black} replaced with:} -{\let\bibitem\specialbibitem\color{trackchange}#2}, \global\silentfalse}\fi% +{\let\bibitem\specialbibitem\color{trackchange}\bf\relax#2}, \global\silentfalse}\fi% \else#2\fi} \def\explain{\@ifnextchar[{\xexplain}{\yexplain}} -\def\xexplain[#1]#2{\iftrack\ {\it\color{explain} [Explanation of change: +\def\xexplain[#1]#2{\iftrack\ {\bfseries\itshape\color{explain} [Explanation of change: #2 (#1)]\ }\fi} -\def\yexplain#1{\iftrack\ {\it\color{explain} [Explanation of change: +\def\yexplain#1{\iftrack\ {\bfseries\itshape\color{explain} [Explanation of change: #1]\ }\fi} \newcount\listchangenum @@ -6002,7 +6177,7 @@ on page %% package. Making \caption[] be the default, to prevent sending caption %% text to listoftables or listoffigures, which we are not going to use %% anyway. This change enables track changes commands to work in captions. - +\def\xtable{table} \def\caption{\numlinesfalse \ifx\@captype\@undefined \@latex@error {\noexpand \caption outside float}\@ehd @@ -6014,7 +6189,6 @@ on page \expandafter\@firstofone\fi {\@dblarg {\Hy@tempa \@captype}}[]} - \def\@caption#1[#2]#3{{\small\rm\expandafter \ifx \csname if@capstart\expandafter \endcsname \csname iftrue\endcsname \global \let \@currentHref \hc@currentHref \else \hyper@makecurrent {\@captype }\fi \@ifundefined {NR@gettitle}{\def \@currentlabelname{\thesection\relax #2}} @@ -6027,10 +6201,11 @@ on page \else \@makecaption {\bf\csname fnum@#1\endcsname }{\ignorespaces \ifHy@nesting \expandafter \hyper@@anchor \expandafter {\@currentHref }{#3}\else \Hy@raisedlink {\expandafter \hyper@@anchor \expandafter -{\@currentHref }{\relax }}{#3}\fi }\fi \par \endgroup}} - +{\@currentHref }{\relax }}{#3}\fi }\fi \par +\endgroup}} -\newcommand\tablebreak{\\[-11pt]\noalign{\break} } +%% changed, March 23, 2019, took out \\ at end of definition: +\newcommand\tablebreak{\\[-11pt]\noalign{\break}} %% As suggested by Greg Schwarz, August Meunch, Feb 11 @@ -6049,19 +6224,28 @@ on page %% are supplied with \author[0000-2345-3333-0023]{author name} \def\lookforbracket{\ifx\next[\let\go\xauthor \else\let\go\yauthor\fi\go} - -\def\author{\futurelet\next\lookforbracket} + +\newcount\entriesinthiscollab +\newcount\allentries +\newif\ifseesmessage +\def\author{\global\advance\entriesinthiscollab by 1 +\global\advance\allentries by 1\relax\futurelet\next\lookforbracket} \def\new@author@def#1#2{% \move@AU\move@AF\move@AUAF \let\@AF@join\@author@join - \def\@author{{\href{http://orcid.org/#1}{#2}}{}}% + \def\@author{{\href{http://orcid.org/#1}{#2% +\openin1 Orcid-ID.png \ifeof1 +%% message for authors?? +%\typeout{^^J^^J ! Missing File: Orcid-ID.png; needed for Orcid Author icon ! +%^^J} +\else% +\hskip2pt\includegraphics[width=9pt]{Orcid-ID.png}\fi}}{}}% }% \def\orciderrormessage{ \typeout{^^J^^J [\firstarg]\space Invalid ORCID Identifier!^^J^^J The ID -should consist of -four sets of four digits,^^J separated with -, ie, +should consist of four sets of four digits,^^J separated with -, ie, 0000-0012-3245-1234 or ^^J 0000-0012-3245-123X ^^J^^J @@ -6239,14 +6423,21 @@ needed. It will not do anything.^^J Please use \ifnum\nine>\largestAffilNum \global\largestAffilNum=\nine\fi\fi } -\newcount\countauthors - - -\gdef\newcomma@space{\hskip-3pt\textsuperscript{,}}% +%\gdef\newcomma@space{\hskip-3pt\textsuperscript{,}}% \def\doEtAl{\rm et al.\gdef\doEtAl{\relax}} +%% ===================== +\newif\iffirsttime +\firsttimetrue +\newcount\totalentries +\newcount\docollabnum +\newcount\tempauthornumber +\newcount\countauthors +\newif\ifdothis +\def\doAnd{} +\newcount\testnum -\def\doauthor#1#2#3{% +\def\olddoauthor#1#2#3{% \iflongauthor\vskip6pt\fi \global\advance\countauthors by 1 \ifnum\countauthors>\AuthorCollaborationLimit @@ -6274,6 +6465,255 @@ needed. It will not do anything.^^J Please use \@listand\fi }% +\def\doauthor#1#2#3{% +\iflongauthor\vskip6pt\fi +%%% +\ifanonymous + \iffirsttime + \global\firsttimefalse + Anonymous author(s) + \fi +\else %% ends at end of this def +%%% +\ifnum\docollabnum< 1 +\global\AuthorCollaborationLimit\expandafter\csname +currCollabLimit0\endcsname +%% this won't change until after collaboration name at end +\fi %% end ifnum\docollabnum +%% +%%%%%%%%%%%%%%%% +\global\advance\totalentries by 1 +\global\advance\countauthors by 1 +%%% +\ifallauthors\global\AuthorCollaborationLimit=9999 \fi +%%% +% for testing +% [author number=\the\countauthors/ auth collab limit +% =\the\AuthorCollaborationLimit] +% +\gdef\xone{#1} +\ifnum\countauthors < \AuthorCollaborationLimit +\gdef\docomma{,}\else\gdef\docomma{}\fi +%%% +\ifnum\countauthors = \AuthorCollaborationLimit +\ifnum\AuthorCollaborationLimit=1\else +\gdef\doAnd{And }\fi +\ifnum\tempauthornumber= 1 +\gdef\doAnd{ } \fi\fi +%% +{\tempauthorminusone=\AuthorCollaborationLimit +\advance\tempauthorminusone by -1 +\ifnum\countauthors=\tempauthorminusone +\gdef\doAnd{And } +\gdef\docomma{}\fi}% +%%% +\global\dothisfalse +%% if num countauthors is less than or equal to \AuthorCollaborationLimit, print name +\ifnum\countauthors< \AuthorCollaborationLimit +%%% +\ifx\xone\empty\else +\global\dothistrue +%\expandafter\gdef\csname +%dothisaffil-\the\countauthors\the\docollab\endcsname{dothisone} + \ignorespaces\leavevmode\hbox{#1\unskip\docomma}% nice, keeps name from breaking across lines +\fi +\fi +%% +\ifnum\countauthors= \AuthorCollaborationLimit +%%% +\ifx\xone\empty\else +\global\dothistrue + \ignorespaces\leavevmode\hbox{\doAnd #1\unskip\docomma}% nice, keeps name from breaking across lines +\fi +\fi +%% ++++ +%% +\ifsuppressAffiliations\else +\ifx\xone\empty\else + \begingroup +\ifnum\countauthors>\AuthorCollaborationLimit\else + #3% all affil numbers +\ifx\@affilID@temp\empty %% number following author +\else% +\setbox0=\hbox{\expandafter\lookfornumbers\@affilID@temp{}{}{}{}{}{}{}{}{}}% +\fi\fi +%% #2= \altaffiliation{} or \email{} or +%% possibly anything other than author, affiliation, or collaboration + \@if@empty{#2}{\endgroup{}{}} +{\ifnum\countauthors>\AuthorCollaborationLimit\endgroup{}{}%% <<< bug fix, added \endgroup{}{} +\else +\endgroup{\comma@space}{}\frontmatter@footnote{#2}\fi}% +\fi%% end test of empty +\fi%% end test of suppressAffiliations +%%%%%%%%%%%%%%%%%%%%%%%% +%%% Collaboration name is always used if available: +\expandafter\ifx\csname currCollabName\the\totalentries\endcsname\relax\else +%%% +%%% +%%% +%% changed locally: +{\advance\docollabnum 1 +\advance\countauthors-1 +%%% +%%% We need to test to see if more than one author in collaboration +%%% and if the number of authors is greater than the \AuthorCollaborationLimit. +%%% If both of these are true, than use `et al.' , otherwise do not: +\expandafter\ifx\csname +CollabTotalAuthors\the\docollabnum\endcsname\relax +\else +\expandafter\ifnum\csname +CollabTotalAuthors\the\docollabnum\endcsname +< 2 %%%%% Don't use et al if there is only one author +\else +\expandafter\ifnum\csname CollabTotalAuthors\the\docollabnum\endcsname +>\AuthorCollaborationLimit +\ifnum\AuthorCollaborationLimit=0\else +\vskip3pt +{\rm et al.} \vskip-3pt +\fi\fi\fi\fi +}%% end local change to docollabnum +%%%% +\expandafter\ifx\csname +currCollabName\the\totalentries\endcsname\empty +\vskip-3pt +\else +\vskip6pt +\expandafter\csname currCollabName\the\totalentries\endcsname\vskip8pt +\affiliation{testing} +\fi +%%%%%%%% +\global\countauthors=0 +%%% +%%% +\global\advance\docollabnum by 1 +%% Set up counters for next time through this loop: +{\advance\docollabnum by1 + \expandafter\ifx\csname + specificCollabLimit\the\docollabnum\endcsname\relax + \else + \global\AuthorCollaborationLimit=\csname + specificCollabLimit\the\docollabnum\endcsname + \fi +\expandafter\ifx\csname +CollabTotalAuthors\the\docollabnum\endcsname\relax +\else +\global\tempauthornumber=\csname +CollabTotalAuthors\the\docollabnum\endcsname +\fi +} +\fi %% ends test to see if it is time to use collaboration name +\fi %% ends ifanonymous +}% + + +%%%% ++++==== +\newcount\tempauthorminusone +%% +++ +\def\doAllauthors#1#2#3{% +\global\suppressAffiliationsfalse +\iflongauthor\vskip6pt\fi +%%% +\ifanonymous + \iffirsttime + \global\firsttimefalse + Anonymous author(s) + \fi +\else %% ends at end of this def +%%% +\ifnum\docollabnum< 1 +%% these won't change until after collaboration name at end +\global\AuthorCollaborationLimit\expandafter\csname currCollabLimit0\endcsname +\global\tempauthornumber=\csname CollabTotalAuthors1\endcsname +\fi%% end ifnum\docollabnum +%% +%%%%%%%%%%%%%%%% +\global\advance\totalentries by 1 +\global\advance\countauthors by 1 +%%% +\ifallauthors\global\AuthorCollaborationLimit=9999 \fi +%%% +% for testing +%[author number=\the\countauthors/ temp author +%=\the\tempauthornumber] +\def\one{#1} +{\tempauthorminusone=\tempauthornumber +\advance\tempauthorminusone by -1 +\ifnum\countauthors < \tempauthornumber +\gdef\xdocomma{,}% +\else\gdef\xdocomma{}\fi% +%%% +\ifnum\countauthors = \tempauthornumber +\gdef\xdoAnd{And}\gdef\xdocomma{}% +\else\gdef\xdoAnd{}\fi% +\ifnum\tempauthornumber= 1 +\gdef\xdoAnd{}\gdef\xdocomma{}\fi% +\ifnum\countauthors=\tempauthorminusone +\gdef\xdocomma{}\fi% +} +%%% +%% if num countauthors is less than or equal to \AuthorCollaborationLimit, print name +\ifnum\countauthors< \AuthorCollaborationLimit +%%% +\ifx\one\empty\else + \ignorespaces\leavevmode\hbox{\unskip\xdoAnd\ #1\unskip\xdocomma}% nice, keeps name from breaking across lines +\fi\fi% +%% +\ifnum\countauthors= \AuthorCollaborationLimit +%%% +\ifx\one\empty\else +\ignorespaces\leavevmode\hbox{\unskip\xdoAnd\ #1\unskip\xdocomma}% nice, keeps name from breaking across lines +\fi% +\fi% +%% +\ifx\one\empty\else + \begingroup +\ifnum\countauthors>\AuthorCollaborationLimit\else + #3% all affil numbers +\ifx\@affilID@temp\empty +\else% +\setbox0=\hbox{\expandafter\lookfornumbers\@affilID@temp{}{}{}{}{}{}{}{}{}}% +\fi\fi +%% #2= \altaffiliation{} or \email{} or +%% possibly anything other than author, affiliation, or collaboration + \@if@empty{#2}{\endgroup{}{}} +{\ifnum\countauthors>\AuthorCollaborationLimit\endgroup{}{}%% <<< bug fix, added \endgroup{}{} +\else +\endgroup{\comma@space}{}\frontmatter@footnote{#2}\fi}% +\fi%% end test of empty +%%%%%%%%%%%%%%%%%%%%%%%% +%%% Collaboration name is always used if available: +\expandafter\ifx\csname currCollabName\the\totalentries\endcsname\relax\else +%%% +%% No et al in allauthors, because all authors are listed! +%% +\expandafter\ifx\csname +currCollabName\the\totalentries\endcsname\empty +\else +\vskip6pt +\expandafter\csname currCollabName\the\totalentries\endcsname\vskip6pt +\fi +\global\countauthors=0 +%%% +%%% +\global\advance\docollabnum by 1 +%% Set up counters for next time through this loop: +{\advance\docollabnum by1 + \expandafter\ifx\csname + specificCollabLimit\the\docollabnum\endcsname\relax + \else + \global\AuthorCollaborationLimit=\csname + specificCollabLimit\the\docollabnum\endcsname + \fi +% +\expandafter\ifx\csname +CollabTotalAuthors\the\docollabnum\endcsname\relax +\else +\global\tempauthornumber=\csname +CollabTotalAuthors\the\docollabnum\endcsname +\fi} +\fi %% ends test to see if it is time to use collaboration name +\fi %% ends ifanonymous +}% %%% %% set \affil to match \affiliation found in revtex, since authors are accustomed to using \affil{} @@ -6282,8 +6722,10 @@ needed. It will not do anything.^^J Please use \newif\iffirstaffil \firstaffiltrue -%% +\newcount\affilnum +%% +++! \def\@affil@script#1#2#3#4{% +\ifsuppressAffiliations\else \iffirstaffil % Oct 2017 \vskip2pt @@ -6294,13 +6736,14 @@ needed. It will not do anything.^^J Please use \frontmatter@affiliationfont \@ifnum{\c@affil<\affil@cutoff}{}{% \def\one{#1} +%% +%% \ifnum\one<\largestAffilNum %% this makes the numbers \def\@thefnmark{#1}\@makefnmark\fi \ifnum\one=\largestAffilNum \def\@thefnmark{#1}\@makefnmark\fi }% -% this makes the text \ifnum\one<\largestAffilNum \ignorespaces#3% \fi @@ -6311,7 +6754,9 @@ needed. It will not do anything.^^J Please use \par \endgroup }% -}% +\fi}% + + \newif\ifnobreakafterkeywords \def\NoNewPageAfterKeywords{\global\nobreakafterkeywordstrue} @@ -6355,6 +6800,7 @@ needed. It will not do anything.^^J Please use \fi }% + \let\maketitle\frontmatter@maketitle \def\secondtitleblock@produce{% @@ -6375,20 +6821,6 @@ needed. It will not do anything.^^J Please use \endgroup }% - -\def\allauthors{%% this conditional keeps \allauthors from turning on -%% unless \AuthorCollaborationLimit is used: -\ifnumlines\nolinenumbers\fi -\onecolumngrid -\clearpage -\AuthorCollaborationLimit=10000 -%\largestAffilNum=10000 <<== not needed -{\vskip6pt\vskip1sp\centerline{\large\bf All Authors and -Affiliations\vrule depth 18pt width0pt}\nobreak -\maketitle -}} -\let\AllAuthors\allauthors - %% no club or widow lines \widowpenalty=10000 \clubpenalty\widowpenalty @@ -6413,37 +6845,106 @@ Affiliations\vrule depth 18pt width0pt}\nobreak \def\figurename{Figure} \def\tablename{Table} \def\fnum@figure{{\bf\figurename~\thefigure}} -\def\fnum@table{{\bf\tablename~\thetable}} +\def\fnum@table{{\bf\tablename~\ifappletter\thesection\fi\thetable}} + \def\tempfootmark#1{} \newcount\c@affilcount - \renewcommand*\altaffiliation[2][]{% - \@AF@join{#1#2\ifmodern\baselineskip=14pt\fi + +\renewcommand*\altaffiliation[2][]{% +\@AF@join{#1#2\ifmodern\baselineskip=14pt\fi +\if@two@col\hsize=.5\textwidth +\advance\hsize by -18pt +\fi}% }% - }% -\def\correspondingauthor#1{{ +\def\correspondingauthor#1{{\ifanonymous +\else \renewcommand\thefootnote{\hskip-12pt} \footnote{Corresponding author: #1\ifmodern\vrule depth 5pt -width 0pt\relax\fi}}} +width 0pt\relax\fi}\fi}} \let\saveemail\email -\def\email#1{{\let\ltx@footmark\tempfootmark +\def\email#1{\ifanonymous +\else{\let\ltx@footmark\tempfootmark \saveemail{}} {\renewcommand\thefootnote{\hskip-12.1pt} \footnote{\href{mailto: #1}{#1}\ifmodern\vrule depth 7pt width -0pt\relax\else\ifmanu\vskip-4pt\else\vrule depth 7pt width 0pt\fi\fi}}} +0pt\relax\else\ifmanu\vskip-4pt\else\vrule depth 7pt width +0pt\fi\fi}}\fi} -\def\nocollaboration{% -\collaboration{\vbox to 0pt{\vss ---\vskip2pt}} +\def\nocollaboration#1{% +\collaboration{#1}{\vbox to +0pt{\vss\centerline{---}\vskip2pt}} } +%% May 19 +%% \AuthorsAndCollaboration changed to \FullCollaborationID +%% June 6 \FullCollaborationID changed to \xcollaboration{}{} +%% june 7 \collaboration changed to \xcollaboration; fullcollaborationid changed to \collaboration + +%% here just in case we need it in the future... +\def\xcollaboration#1#2{ +\global\advance\allentries by 1 +\expandafter\def\csname +currCollabLimit\the\allentries\endcsname{#1} +\@author@def{\@booleantrue +\collaboration@sw}{#2} +} + +\let\savelistand\@listand +\newcount\numauthors +\newcount\collabnum +\newbox\collabnamebox +\newif\iffirstcollab +\global\firstcollabtrue + +\newif\ifcollaborationon +\def\collaboration#1#2{\global\collaborationontrue +\global\advance\collabnum by 1 +\iffirstcollab\global\firstcollabfalse +\expandafter\xdef\csname currCollabLimit0\endcsname{#1} +\fi +%% make this def so that we can use it when we want in doauthor: +\expandafter\gdef\csname specificCollabLimit\the\collabnum\endcsname{#1} +%% This allows us access the number of authors per collaboration: +\expandafter\xdef\csname +CollabTotalAuthors\the\collabnum\endcsname{\the\entriesinthiscollab} +\global\entriesinthiscollab=0 +%% +\global\advance\allentries by 1 +%% +%% we should have only one of these with this number; this used to say when +%% use specificCollabLimit: +\expandafter\gdef\csname currCollabLimit\the\allentries\endcsname{#1} +%% we should have only one of these with this number +\expandafter\gdef\csname +currCollabName\the\allentries\endcsname{%\ifnum#1>0 +%\sc And the\vskip4pt\fi +#2} +%% +\let\doEtAl\relax +\@author@def{\@booleanfalse +\collaboration@sw}{} +} + + +\def\and{ +\centerline{\vbox {\vrule height 12pt width0pt and\vskip2pt}} +} + +%\def\andthe{% +%\collaboration{\vbox {\vrule height 12pt width0pt and +%the\vskip2pt}}\vskip4pt +%} + %% gets rid of () around collaboration \def\@collaboration@present#1#2#3#4{% \par \begingroup +\vskip3pt \iflongauthor\vskip-4pt\ifmodern\vskip-6pt\fi\fi \frontmatter@collaboration@above \@affilID@def{}% @@ -6458,11 +6959,12 @@ width 0pt\relax\fi}}} \iflongauthor \else\vskip8pt\fi \set@listcomma@list#1% +\vskip1pt %% was \vskip9pt }% %%% These lines were commented out until a fix could be applied that -%%% addresses the underlying issues. The problme is that on Linux systems +%%% addresses the underlying issues. The problem is that on Linux systems %%% you can not write a "hidden" .bib file. There is no issue with this %%% on Mac OS X nor Windows. %%% get rid of \jobname Notes being sent to .aux file: @@ -6502,6 +7004,7 @@ width 0pt\relax\fi}}} \, \unskip\unskip \par \endgroup +%% \begingroup \frontmatter@above@affiliation@script \let\AFF@opr \@affil@script @@ -6519,6 +7022,7 @@ width 0pt\relax\fi}}} \newif\iffirstaffil \firstaffiltrue +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% These commands were in aastex earlier; I redefined. \def\tighten{\global\tightentrue\normalsize} @@ -6573,10 +7077,205 @@ width 0pt\relax\fi}}} \def\mdash{---} +\newif\ifcenterwidetable +%% these two definitions are the same, but it might +%% be convenient to have both +\def\centerwidetable{\global\centerwidetabletrue} + + +%% this doesn't seem to be documented, assume we don't need it: +%\def\centernarrowtable{\global\centerwidetablefalse} + +%% default, center within width of text on both sides + \def\LT@LR@c{\LTleft=0pt plus1fill + \LTright\LTleft}% + +\def\widetable{\def\LT@LR@c{\LTleft=0pt minus1fill + \let\LTright\LTleft}} + +\newif\ifreturntotwocol + + +%%%%%%%%% +%% to help with graceful linebreaks in two column text: + \tolerance 9999% +%% sloppy defines emergencystretch to be 3 em, this is a bit +%% more conservative: + \emergencystretch 1em + \hfuzz .5\p@ + +%%%%%%%%% +%% Nominal Conversion Constants + +%% \boldmath inside the \hbox ?? +\def\nomSolarEffTemp{\leavevmode\hbox{\boldmath$\mathcal{T}^{\rm N}_{\mathrm{eff}\odot}$}} +\def\nomTerrEqRadius{\leavevmode\hbox{\boldmath$\mathcal{R}^{\rm N}_{E\mathrm e}$}} +\def\nomTerrPolarRadius{\leavevmode\hbox{\boldmath$\mathcal{R}^{\rm N}_{E\mathrm p}$}} +\def\nomJovianEqRadius{\leavevmode\hbox{\boldmath$\mathcal{R}^{\rm +N}_{J\mathrm e}$}} + \def\nomJovianPolarRadius{\leavevmode\hbox{\boldmath$\mathcal{R}^{\rm + N}_{J\mathrm p}$}} + \def\nomTerrMass{\leavevmode\hbox{\boldmath$(\mathcal{GM})^{\rm N}_{\mathrm E}$}} + \def\nomJovianMass{\leavevmode\hbox{\boldmath$(\mathcal{GM})^{\rm N}_{\mathrm J}$}} + \def\Qnom{\leavevmode\hbox{\boldmath$\mathcal{Q}^{\rm N}_{\odot}$}} +\let\Qn\Qnom + +%% Generic commands that can be given an argument: +\def\nom#1{\leavevmode\hbox{\boldmath$\mathcal{#1}^{\rm N}_{\odot}$}} +\def\Eenom#1{\leavevmode\hbox{\boldmath$\mathcal{#1}^{\rm N}_{Ee}$}} +\def\Epnom#1{\leavevmode\hbox{\boldmath$\mathcal{#1}^{\rm N}_{Ep}$}} +\def\Jenom#1{\leavevmode\hbox{\boldmath$\mathcal{#1}^{\rm N}_{Je}$}} +\def\Jpnom#1{\leavevmode\hbox{\boldmath$\mathcal{#1}^{\rm N}_{Jp}$}} + +%%%%%%%%%%%%%%%% +%% Ability to have tables, equations, figures in appendix start from 1, and use appendix section letter. + +\newif\ifappletter +\def\apptablenumbers{\global\applettertrue +\setcounter{table}{0} +\setcounter{figure}{0} +\setcounter{equation}{0} +\def\thetable{\thesection\the\c@table}% +\def\fnum@table{{\bf\tablename~\thetable}}% +\def\thefigure{\thesection\the\c@figure}% +\def\fnum@figure{{\bf\figurename~\thefigure}}% +}% + +%%% easier to remember than \apptablenumbers +\let\restartappendixnumbering\apptablenumbers + +\def\resetapptablenumbers{\global\c@table=0 +\global\c@figure=0 +\global\c@equation=0 +\def\thetable{\thesection\the\c@table} +\def\fnum@table{{\bf\tablename~\thetable}}% +\def\thefigure{\thesection\the\c@figure} +\def\fnum@figure{{\bf\figurename~\thefigure}}% +} + +%% aastex63 +\newif\ifallauthors +\def\allauthors{\global\allauthorstrue +\let\doauthor\doAllauthors +\ifanonymous +\vskip6pt\vskip1sp\centerline{\large\bf All Authors and +Affiliations\vrule depth 18pt width0pt}\nobreak +\centerline{Anonymous author(s)} +\else +\ifnumlines\nolinenumbers\fi +\onecolumngrid +\clearpage +{\vskip6pt\vskip1sp\centerline{\large\bf All Authors and +Affiliations\vrule depth 18pt width0pt}\nobreak +\global\docollabnum=0 +\global\totalentries=0 +\global\countauthors=0 +\maketitle +}\fi} + +%% AASTeX62 +\def\oldallauthors{%% this conditional keeps \allauthors from turning on +%% unless \AuthorCollaborationLimit is used: +\ifnumlines\nolinenumbers\fi +\onecolumngrid +\clearpage +\AuthorCollaborationLimit=10000 +%\largestAffilNum=10000 <<== not needed +{\vskip6pt\vskip1sp\centerline{\large\bf All Authors and +Affiliations\vrule depth 18pt width0pt}\nobreak +\maketitle +}} +\let\AllAuthors\allauthors + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% New interactive command: + +\def\xlc{timeseries} +\def\xjs{js} +\def\xanimation{animation} + +\newif\ifcorrectentries +\def\interactive#1#2{\global\correctentriesfalse\def\checkone{#1} +\ifx\checkone\xlc\correctentriestrue\fi +\ifx\checkone\xjs\correctentriestrue\fi +\ifx\checkone\xanimation \correctentriestrue\fi +\ifcorrectentries +\else\hrule height1pt\vskip12pt\bf ERROR: Your choices for the first argument for +{\tt\string\interactive} are timeseries, js, or animation.\\[6pt] Please choose one +of these terms.\vskip12pt \fi +%%% +\def\checktwo{#2} +\ifx\checktwo\empty \vskip12pt \bf ERROR: The command {\tt\string\interactive} needs +two arguments, with the second argument for the graphics file or files +needed.\vskip12pt\hrule height1pt \else\correctentriestrue\fi +\setbox0=\vbox\bgroup} + +\def\endinteractive{\egroup +\ifcorrectentries\highlightfigure{\vskip-6pt\vbox{\unvbox0} +\vskip-12pt}\fi} + +%%%% For cases in which footnotes are called in full width environment +%% but are used in two cols. This keeps them from overwriting the +%% second column: + +\let\savefootnote\footnote +\def\onecolfootnote#1{\savefootnote{\hsize=.5\textwidth\advance\hsize +by-18pt\relax#1}} + +\def\onecolumnfootnotes{\let\footnote\onecolfootnote} + +\newdimen\movetableright + +\newif\ifsuppressAffiliations +\def\suppressAffiliations{\global\suppressAffiliationstrue} + \endinput + %% Change Log +============================ +June 8, 2019 +Changed \author and \collaboration macros. +Collaboration now takes two arguments: +#1= number of authors to be listed before the +name of the collaboration; #2 = name of the collaboration + +\nocollaboration{} has one argument, +#1= the number of authors above it that we want to print on the title page. + +June 6, 2019 + +\acknowledgments does not use \begin{}...\end{} form, +now just \acknowledgments command. Acknowledgments text +ends with \par, so if author wants more than one paragraph +in acknowledgment he/she should surround text with curly +bracket: + +\acknowledgments +text... + +or + +\acknowledgments +{text... + +more text...} + +------ + + +============================ +June 3, 2019 +\let\footnote\onecolfootnote on page where references start, but +before footnotes are entered, +will allow footnotes to break in the right place (one column's width). + +============================ +May 15, 2019 +\centerwidetable is now \movetableover at Greg's suggestion. + ============================ Nov 27, 2017 @@ -6835,8 +7534,3 @@ with additions. - - - - - diff --git a/sample/CSS081007-eps-converted-to.pdf b/sample/HV_Cet.pdf similarity index 100% rename from sample/CSS081007-eps-converted-to.pdf rename to sample/HV_Cet.pdf diff --git a/sample/KT_Eri-eps-converted-to.pdf b/sample/KT_Eri.pdf similarity index 100% rename from sample/KT_Eri-eps-converted-to.pdf rename to sample/KT_Eri.pdf diff --git a/sample/LMC_2009-eps-converted-to.pdf b/sample/LMC_2009.pdf similarity index 100% rename from sample/LMC_2009-eps-converted-to.pdf rename to sample/LMC_2009.pdf diff --git a/sample/RS_Oph-eps-converted-to.pdf b/sample/RS_Oph.pdf similarity index 100% rename from sample/RS_Oph-eps-converted-to.pdf rename to sample/RS_Oph.pdf diff --git a/sample/U_Sco-eps-converted-to.pdf b/sample/U_Sco.pdf similarity index 100% rename from sample/U_Sco-eps-converted-to.pdf rename to sample/U_Sco.pdf diff --git a/sample/V2491_Cyg-eps-converted-to.pdf b/sample/V2491_Cyg.pdf similarity index 100% rename from sample/V2491_Cyg-eps-converted-to.pdf rename to sample/V2491_Cyg.pdf diff --git a/sample/cost-eps-converted-to.pdf b/sample/cost.pdf similarity index 100% rename from sample/cost-eps-converted-to.pdf rename to sample/cost.pdf diff --git a/sample/f4.pdf b/sample/f4.pdf new file mode 100644 index 0000000..1990661 Binary files /dev/null and b/sample/f4.pdf differ diff --git a/sample/f5.pdf b/sample/f5.pdf new file mode 100644 index 0000000..f03984e Binary files /dev/null and b/sample/f5.pdf differ diff --git a/sample/interactive.tar.gz b/sample/interactive.tar.gz new file mode 100644 index 0000000..2888db9 Binary files /dev/null and b/sample/interactive.tar.gz differ diff --git a/sample/orcid-ID.png b/sample/orcid-ID.png new file mode 100644 index 0000000..996817c Binary files /dev/null and b/sample/orcid-ID.png differ diff --git a/sample/sample62.pdf b/sample/sample62.pdf deleted file mode 100644 index 1f7f2e0..0000000 Binary files a/sample/sample62.pdf and /dev/null differ diff --git a/sample/sample63.bib b/sample/sample63.bib new file mode 100644 index 0000000..0402ac9 --- /dev/null +++ b/sample/sample63.bib @@ -0,0 +1,211 @@ +@ARTICLE{2013A&A...558A..33A, + author = {{Astropy Collaboration} and {Robitaille}, Thomas P. and + {Tollerud}, Erik J. and {Greenfield}, Perry and {Droettboom}, Michael and + {Bray}, Erik and {Aldcroft}, Tom and {Davis}, Matt and + {Ginsburg}, Adam and {Price-Whelan}, Adrian M. and + {Kerzendorf}, Wolfgang E. and {Conley}, Alexander and {Crighton}, Neil and + {Barbary}, Kyle and {Muna}, Demitri and {Ferguson}, Henry and + {Grollier}, Fr{\'e}d{\'e}ric and {Parikh}, Madhura M. and + {Nair}, Prasanth H. and {Unther}, Hans M. and {Deil}, Christoph and + {Woillez}, Julien and {Conseil}, Simon and {Kramer}, Roban and + {Turner}, James E.~H. and {Singer}, Leo and {Fox}, Ryan and + {Weaver}, Benjamin A. and {Zabalza}, Victor and {Edwards}, Zachary I. and + {Azalee Bostroem}, K. and {Burke}, D.~J. and {Casey}, Andrew R. and + {Crawford}, Steven M. and {Dencheva}, Nadia and {Ely}, Justin and + {Jenness}, Tim and {Labrie}, Kathleen and {Lim}, Pey Lian and + {Pierfederici}, Francesco and {Pontzen}, Andrew and {Ptak}, Andy and + {Refsdal}, Brian and {Servillat}, Mathieu and {Streicher}, Ole}, + title = "{Astropy: A community Python package for astronomy}", + journal = {\aap}, + keywords = {methods: data analysis, methods: miscellaneous, virtual observatory tools, Astrophysics - Instrumentation and Methods for Astrophysics}, + year = "2013", + month = "Oct", + volume = {558}, + eid = {A33}, + pages = {A33}, + doi = {10.1051/0004-6361/201322068}, +archivePrefix = {arXiv}, + eprint = {1307.6212}, + primaryClass = {astro-ph.IM}, + adsurl = {https://ui.adsabs.harvard.edu/abs/2013A&A...558A..33A}, + adsnote = {Provided by the SAO/NASA Astrophysics Data System} +} + +@ARTICLE{1996A&AS..117..393B, + author = {{Bertin}, E. and {Arnouts}, S.}, + title = "{SExtractor: Software for source extraction.}", + journal = {\aaps}, + keywords = {METHODS: DATA ANALYSIS, TECHNIQUES: IMAGE PROCESSING, GALAXIES: PHOTOMETRY}, + year = "1996", + month = "Jun", + volume = {117}, + pages = {393-404}, + doi = {10.1051/aas:1996164}, + adsurl = {https://ui.adsabs.harvard.edu/abs/1996A&AS..117..393B}, + adsnote = {Provided by the SAO/NASA Astrophysics Data System} +} + +@ARTICLE{2018AJ....156...82C, + author = {{Cloutier}, Ryan and {Doyon}, Ren{\'e} and {Bouchy}, Francois and + {H{\'e}brard}, Guillaume}, + title = "{Quantifying the Observational Effort Required for the Radial Velocity Characterization of TESS Planets}", + journal = {\aj}, + keywords = {methods: analytical, planets and satellites: detection, planets and satellites: fundamental parameters, techniques: radial velocities, Astrophysics - Earth and Planetary Astrophysics}, + year = "2018", + month = "Aug", + volume = {156}, + number = {2}, + eid = {82}, + pages = {82}, + doi = {10.3847/1538-3881/aacea9}, +archivePrefix = {arXiv}, + eprint = {1807.01263}, + primaryClass = {astro-ph.EP}, + adsurl = {https://ui.adsabs.harvard.edu/abs/2018AJ....156...82C}, + adsnote = {Provided by the SAO/NASA Astrophysics Data System} +} + +@ARTICLE{2015ApJ...805...23C, + author = {{Corrales}, Lia}, + title = "{X-Ray Scattering Echoes and Ghost Halos from the Intergalactic Medium: Relation to the Nature of AGN Variability}", + journal = {\apj}, + keywords = {accretion, accretion disks, dust, extinction, quasars: general, intergalactic medium, X-rays: ISM, Astrophysics - High Energy Astrophysical Phenomena, Astrophysics - Astrophysics of Galaxies}, + year = "2015", + month = "May", + volume = {805}, + number = {1}, + eid = {23}, + pages = {23}, + doi = {10.1088/0004-637X/805/1/23}, +archivePrefix = {arXiv}, + eprint = {1503.01475}, + primaryClass = {astro-ph.HE}, + adsurl = {https://ui.adsabs.harvard.edu/abs/2015ApJ...805...23C}, + adsnote = {Provided by the SAO/NASA Astrophysics Data System} +} + +@ARTICLE{2013RMxAA..49..137F, + author = {{Ferland}, G.~J. and {Porter}, R.~L. and {van Hoof}, P.~A.~M. and + {Williams}, R.~J.~R. and {Abel}, N.~P. and {Lykins}, M.~L. and + {Shaw}, G. and {Henney}, W.~J. and {Stancil}, P.~C.}, + title = "{The 2013 Release of Cloudy}", + journal = {\rmxaa}, + keywords = {atomic processes, galaxies: active, methods: numerical, molecular processes, radiation mechanisms: general, Astrophysics - Galaxy Astrophysics, Astrophysics - Cosmology and Extragalactic Astrophysics, Astrophysics - Instrumentation and Methods for Astrophysics}, + year = "2013", + month = "Apr", + volume = {49}, + pages = {137-163}, +archivePrefix = {arXiv}, + eprint = {1302.4485}, + primaryClass = {astro-ph.GA}, + adsurl = {https://ui.adsabs.harvard.edu/abs/2013RMxAA..49..137F}, + adsnote = {Provided by the SAO/NASA Astrophysics Data System} +} + +@INPROCEEDINGS{1989BAAS...21..780H, + author = {{Hanisch}, R.~J. and {Biemesderfer}, C.~D.}, + title = "{T$_{E}$X and LAT$_{E}$X Macro Definition Files for Astronomical Publications}", + booktitle = {\baas}, + year = "1989", + month = "Mar", + pages = {780}, + adsurl = {https://ui.adsabs.harvard.edu/abs/1989BAAS...21..780H}, + adsnote = {Provided by the SAO/NASA Astrophysics Data System} +} + +@BOOK{lamport94, + author = {{Lamport}, L.}, + title = "{LaTeX: A Document Preparation System}", + publisher = {Addison-Wesley Professional}, + year = "1994", + edition = {2}, + isbn = {0201529831} +} + +@ARTICLE{2018ApJ...868L..33L, + author = {{Li}, Leping and {Zhang}, Jun and {Peter}, Hardi and + {Chitta}, Lakshmi Pradeep and {Su}, Jiangtao and {Song}, Hongqiang and + {Xia}, Chun and {Hou}, Yijun}, + title = "{Quasi-periodic Fast Propagating Magnetoacoustic Waves during the Magnetic Reconnection Between Solar Coronal Loops}", + journal = {\apj}, + keywords = {magnetic reconnection, plasmas, Sun: corona, Sun: UV radiation, waves, Astrophysics - Solar and Stellar Astrophysics}, + year = "2018", + month = "Dec", + volume = {868}, + number = {2}, + eid = {L33}, + pages = {L33}, + doi = {10.3847/2041-8213/aaf167}, +archivePrefix = {arXiv}, + eprint = {1811.08553}, + primaryClass = {astro-ph.SR}, + adsurl = {https://ui.adsabs.harvard.edu/abs/2018ApJ...868L..33L}, + adsnote = {Provided by the SAO/NASA Astrophysics Data System} +} + +@ARTICLE{2016AJ....152...41P, + author = {{Pr{\v{s}}a}, Andrej and {Harmanec}, Petr and {Torres}, Guillermo and + {Mamajek}, Eric and {Asplund}, Martin and {Capitaine}, Nicole and + {Christensen-Dalsgaard}, J{\o}rgen and {Depagne}, {\'E}ric and + {Haberreiter}, Margit and {Hekker}, Saskia}, + title = "{Nominal Values for Selected Solar and Planetary Quantities: IAU 2015 Resolution B3}", + journal = {\aj}, + keywords = {planets and satellites: fundamental parameters, standards, stars: fundamental parameters, stars: general, Sun: fundamental parameters, Astrophysics - Solar and Stellar Astrophysics, Astrophysics - Earth and Planetary Astrophysics, Astrophysics - Instrumentation and Methods for Astrophysics}, + year = "2016", + month = "Aug", + volume = {152}, + number = {2}, + eid = {41}, + pages = {41}, + doi = {10.3847/0004-6256/152/2/41}, +archivePrefix = {arXiv}, + eprint = {1605.09788}, + primaryClass = {astro-ph.SR}, + adsurl = {https://ui.adsabs.harvard.edu/abs/2016AJ....152...41P}, + adsnote = {Provided by the SAO/NASA Astrophysics Data System} +} + +@ARTICLE{2011ApJS..197...31S, + author = {{Schwarz}, Greg J. and {Ness}, Jan-Uwe and {Osborne}, J.~P. and + {Page}, K.~L. and {Evans}, P.~A. and {Beardmore}, A.~P. and + {Walter}, Frederick M. and {Helton}, L. Andrew and + {Woodward}, Charles E. and {Bode}, Mike and {Starrfield}, Sumner and + {Drake}, Jeremy J.}, + title = "{Swift X-Ray Observations of Classical Novae. II. The Super Soft Source Sample}", + journal = {\apjs}, + keywords = {novae, cataclysmic variables, ultraviolet: stars, X-rays: stars, Astrophysics - Solar and Stellar Astrophysics, Astrophysics - High Energy Astrophysical Phenomena}, + year = "2011", + month = "Dec", + volume = {197}, + number = {2}, + eid = {31}, + pages = {31}, + doi = {10.1088/0067-0049/197/2/31}, +archivePrefix = {arXiv}, + eprint = {1110.6224}, + primaryClass = {astro-ph.SR}, + adsurl = {https://ui.adsabs.harvard.edu/abs/2011ApJS..197...31S}, + adsnote = {Provided by the SAO/NASA Astrophysics Data System} +} + +@ARTICLE{2014ApJ...793..127V, + author = {{Vogt}, Fr{\'e}d{\'e}ric P.~A. and {Dopita}, Michael A. and + {Kewley}, Lisa J. and {Sutherland}, Ralph S. and + {Scharw{\"a}chter}, Julia and {Basurah}, Hassan M. and {Ali}, Alaa and + {Amer}, Morsi A.}, + title = "{Galaxy Emission Line Classification Using Three-dimensional Line Ratio Diagrams}", + journal = {\apj}, + keywords = {galaxies: abundances, galaxies: general, galaxies: Seyfert, galaxies: starburst, H II regions, ISM: lines and bands, Astrophysics - Astrophysics of Galaxies}, + year = "2014", + month = "Oct", + volume = {793}, + number = {2}, + eid = {127}, + pages = {127}, + doi = {10.1088/0004-637X/793/2/127}, +archivePrefix = {arXiv}, + eprint = {1406.5186}, + primaryClass = {astro-ph.GA}, + adsurl = {https://ui.adsabs.harvard.edu/abs/2014ApJ...793..127V}, + adsnote = {Provided by the SAO/NASA Astrophysics Data System} +} diff --git a/sample/sample63.pdf b/sample/sample63.pdf new file mode 100644 index 0000000..bb31630 Binary files /dev/null and b/sample/sample63.pdf differ diff --git a/sample/sample62.tex b/sample/sample63.tex similarity index 73% rename from sample/sample62.tex rename to sample/sample63.tex index a735527..a81a0ce 100644 --- a/sample/sample62.tex +++ b/sample/sample63.tex @@ -1,10 +1,10 @@ + +%% Beginning of file 'sample63.tex' %% -%% Beginning of file 'sample62.tex' -%% -%% Modified 2018 January +%% Modified 2019 June %% %% This is a sample manuscript marked up using the -%% AASTeX v6.2 LaTeX 2e macros. +%% AASTeX v6.3 LaTeX 2e macros. %% %% AASTeX is now based on Alexey Vikhlinin's emulateapj.cls %% (Copyright 2000-2015). See the classfile for details. @@ -17,19 +17,19 @@ %% The first piece of markup in an AASTeX v6.x document is the \documentclass %% command. LaTeX will ignore any data that comes before this command. The %% documentclass can take an optional argument to modify the output style. -%% The command below calls the preprint style which will produce a tightly +%% The command below calls the preprint style which will produce a tightly %% typeset, one-column, single-spaced document. It is the default and thus %% does not need to be explicitly stated. %% %% -%% using aastex version 6.2 -\documentclass{aastex62} +%% using aastex version 6.3 +\documentclass{aastex63} %% The default is a single spaced, 10 point font, single spaced article. %% There are 5 other style options available via an optional argument. They -%% can be envoked like this: +%% can be invoked like this: %% -%% \documentclass[argument]{aastex62} +%% \documentclass[arguments]{aastex63} %% %% where the layout options are: %% @@ -48,35 +48,42 @@ %% %% Note that you can submit to the AAS Journals in any of these 6 styles. %% -%% There are other optional arguments one can envoke to allow other stylistic +%% There are other optional arguments one can invoke to allow other stylistic %% actions. The available options are: %% -%% astrosymb : Loads Astrosymb font and define \astrocommands. -%% tighten : Makes baselineskip slightly smaller, only works with -%% the twocolumn substyle. -%% times : uses times font instead of the default -%% linenumbers : turn on lineno package. -%% trackchanges : required to see the revision mark up and print its output -%% longauthor : Do not use the more compressed footnote style (default) for -%% the author/collaboration/affiliations. Instead print all -%% affiliation information after each name. Creates a much -%% long author list but may be desirable for short author papers +%% astrosymb : Loads Astrosymb font and define \astrocommands. +%% tighten : Makes baselineskip slightly smaller, only works with +%% the twocolumn substyle. +%% times : uses times font instead of the default +%% linenumbers : turn on lineno package. +%% trackchanges : required to see the revision mark up and print its output +%% longauthor : Do not use the more compressed footnote style (default) for +%% the author/collaboration/affiliations. Instead print all +%% affiliation information after each name. Creates a much +%% longer author list but may be desirable for short +%% author papers. +%% twocolappendix : make 2 column appendix. +%% anonymous : Do not show the authors, affiliations and acknowledgments +%% for dual anonymous review. %% %% these can be used in any combination, e.g. %% -%% \documentclass[twocolumn,linenumbers,trackchanges]{aastex62} +%% \documentclass[twocolumn,linenumbers,trackchanges]{aastex63} %% %% AASTeX v6.* now includes \hyperref support. While we have built in specific %% defaults into the classfile you can manually override them with the %% \hypersetup command. For example, %% -%%\hypersetup{linkcolor=red,citecolor=green,filecolor=cyan,urlcolor=magenta} +%% \hypersetup{linkcolor=red,citecolor=green,filecolor=cyan,urlcolor=magenta} %% %% will change the color of the internal links to red, the links to the %% bibliography to green, the file links to cyan, and the external links to %% magenta. Additional information on \hyperref options can be found here: %% https://www.tug.org/applications/hyperref/manual.html#x1-40003 %% +%% Note that in v6.3 "bookmarks" has been changed to "true" in hyperref +%% to improve the accessibility of the compiled pdf file. +%% %% If you want to create your own macros, you can do so %% using \newcommand. Your macros should appear before %% the \begin{document} command. @@ -86,21 +93,37 @@ \newcommand\latex{La\TeX} %% Reintroduced the \received and \accepted commands from AASTeX v5.2 -\received{January 1, 2018} -\revised{January 7, 2018} +\received{June 1, 2019} +\revised{January 10, 2019} \accepted{\today} %% Command to document which AAS Journal the manuscript was submitted to. -%% Adds "Submitted to " the arguement. -\submitjournal{ApJ} - -%% Mark up commands to limit the number of authors on the front page. -%% Note that in AASTeX v6.2 a \collaboration call (see below) counts as -%% an author in this case. +%% Adds "Submitted to " the argument. +\submitjournal{AJ} + +%% For manuscript that include authors in collaborations, AASTeX v6.3 +%% builds on the \collaboration command to allow greater freedom to +%% keep the traditional author+affiliation information but only show +%% subsets. The \collaboration command now must appear AFTER the group +%% of authors in the collaboration and it takes TWO arguments. The last +%% is still the collaboration identifier. The text given in this +%% argument is what will be shown in the manuscript. The first argument +%% is the number of author above the \collaboration command to show with +%% the collaboration text. If there are authors that are not part of any +%% collaboration the \nocollaboration command is used. This command takes +%% one argument which is also the number of authors above to show. A +%% dashed line is shown to indicate no collaboration. This example manuscript +%% shows how these commands work to display specific set of authors +%% on the front page. +%% +%% For manuscript without any need to use \collaboration the +%% \AuthorCollaborationLimit command from v6.2 can still be used to +%% show a subset of authors. % -%\AuthorCollaborationLimit=3 +%\AuthorCollaborationLimit=2 % -%% Will only show Schwarz, Muench and "the AAS Journals Data Scientist -%% collaboration" on the front page of this example manuscript. +%% will only show Schwarz & Muench on the front page of the manuscript +%% (assuming the \collaboration and \nocollaboration commands are +%% commented out). %% %% Note that all of the author will be shown in the published article. %% This feature is meant to be used prior to acceptance to make the @@ -128,10 +151,10 @@ %% %% You can add a light gray and diagonal water-mark to the first page %% with this command: -% \watermark{text} +%% \watermark{text} %% where "text", e.g. DRAFT, is the text to appear. If the text is %% long you can control the water-mark size with: -% \setwatermarkfontsize{dimension} +%% \setwatermarkfontsize{dimension} %% where dimension is any recognized LaTeX dimension, e.g. pt, in, etc. %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -141,27 +164,30 @@ \begin{document} -\title{An Example Article using \aastex v6.2\footnote{Released on January, 8th, 2018}} +\title{Template \aastex Article with Examples: +v6.3\footnote{Released on June, 10th, 2019}} %% LaTeX will automatically break titles if they run longer than %% one line. However, you may use \\ to force a line break if -%% you desire. In v6.2 you can include a footnote in the title. +%% you desire. In v6.3 you can include a footnote in the title. %% A significant change from earlier AASTEX versions is in the structure for -%% calling author and affilations. The change was necessary to implement -%% autoindexing of affilations which prior was a manual process that could +%% calling author and affiliations. The change was necessary to implement +%% auto-indexing of affiliations which prior was a manual process that could %% easily be tedious in large author manuscripts. %% %% The \author command is the same as before except it now takes an optional -%% arguement which is the 16 digit ORCID. The syntax is: +%% argument which is the 16 digit ORCID. The syntax is: %% \author[xxxx-xxxx-xxxx-xxxx]{Author Name} %% %% This will hyperlink the author name to the author's ORCID page. Note that %% during compilation, LaTeX will do some limited checking of the format of -%% the ID to make sure it is valid. +%% the ID to make sure it is valid. If the "orcid-ID.png" image file is +%% present or in the LaTeX pathway, the OrcID icon will appear next to +%% the authors name. %% %% Use \affiliation for affiliation information. The old \affil is now aliased -%% to \affiliation. AASTeX v6.2 will automatically index these in the header. +%% to \affiliation. AASTeX v6.3 will automatically index these in the header. %% When a duplicate is found its index will be the same as its previous entry. %% %% Note that \altaffilmark and \altaffiltext have been removed and thus @@ -178,7 +204,7 @@ %% %% Use \email to set provide email addresses. Each \email will appear on its %% own line so you can put multiple email address in one \email call. A new -%% \correspondingauthor command is available in V6.2 to identify the +%% \correspondingauthor command is available in V6.3 to identify the %% corresponding author of the manuscript. It is the author's responsibility %% to make sure this name is also in the author list. %% @@ -194,41 +220,44 @@ \email{greg.schwarz@aas.org, gus.muench@aas.org} \author[0000-0002-0786-7307]{Greg J. Schwarz} -\affil{American Astronomical Society \\ -2000 Florida Ave., NW, Suite 300 \\ -Washington, DC 20009-1231, USA} +\affiliation{American Astronomical Society \\ +1667 K Street NW, Suite 800 \\ +Washington, DC 20006, USA} \author{August Muench} \affiliation{American Astronomical Society \\ -2000 Florida Ave., NW, Suite 300 \\ -Washington, DC 20009-1231, USA} -\collaboration{(AAS Journals Data Scientists collaboration)} +1667 K Street NW, Suite 800 \\ +Washington, DC 20006, USA} + +\collaboration{1}{(AAS Journals Data Scientists collaboration)} \author{Butler Burton} -\affiliation{National Radio Astronomy Observatory} +\affiliation{Leiden University} \affiliation{AAS Journals Associate Editor-in-Chief} -\nocollaboration +\nocollaboration{1} \author{Amy Hendrickson} -\altaffiliation{Creator of AASTeX v6.2} +\altaffiliation{AASTeX v6+ programmer} \affiliation{TeXnology Inc.} -\collaboration{(LaTeX collaboration)} + +\collaboration{1}{(LaTeX collaboration)} \author{Julie Steffen} \affiliation{AAS Director of Publishing} \affiliation{American Astronomical Society \\ -2000 Florida Ave., NW, Suite 300 \\ -Washington, DC 20009-1231, USA} +1667 K Street NW, Suite 800 \\ +Washington, DC 20006, USA} -\author{Jeff Lewandowski} -\affiliation{IOP Senior Publisher for the AAS Journals} +\author{Scott Chernoff} \affiliation{IOP Publishing, Washington, DC 20005} +\nocollaboration{2} + %% Note that the \and command from previous versions of AASTeX is now %% depreciated in this version as it is no longer necessary. AASTeX %% automatically takes care of all commas and "and"s between authors names. -%% AASTeX 6.2 has the new \collaboration and \nocollaboration commands to +%% AASTeX 6.3 has the new \collaboration and \nocollaboration commands to %% provide the collaboration status of a group of authors. These commands %% can be used either before or after the list of corresponding authors. The %% argument for \collaboration is the collaboration identifier. Authors are @@ -242,7 +271,7 @@ This example manuscript is intended to serve as a tutorial and template for authors to use when writing their own AAS Journal articles. The manuscript includes a history of \aastex\ and documents the new features in the -previous versions as well as the new features in version 6.2. This +previous versions as well as the new features in version 6.3. This manuscript includes many figure and table examples to illustrate these new features. Information on features not explicitly mentioned in the article can be viewed in the manuscript comments or more extensive online @@ -254,7 +283,7 @@ have a 250 word limit for the abstract\footnote{Note that manuscripts submitted to the new Research Notes of the American Astronomical Society (RNAAS) do \textbf{not} have abstracts.}. If you exceed this length the -Editorial office will ask you to shorten it. +Editorial office will ask you to shorten it. This abstract has 180 words. \end{abstract} @@ -317,7 +346,7 @@ \section{Introduction} \label{sec:intro} Even though author publication charges are no longer based on print pages \footnote{see Section \ref{sec:pubcharge} in the Appendix for more details about how current article costs are calculated.} the emulateapj class file -has proven to be extremely popular with AAS Journal authors. An informal +has proven to be extremely popular with AAS Journal authors. An analysis of submitted \latex\ manuscripts in 2015 revealed that $\sim$65\% either called emulateapj or have a commented emulateapj classfile call indicating it was used at some stage of the manuscript construction. @@ -328,57 +357,60 @@ \section{Introduction} \label{sec:intro} an important roll in the decision to drop the old base code and adopt and modify emulateapj for \aastex\ v6.+ instead. The change brings \aastex\ inline with what the majority of authors are already using while still -delivering new and improved features. \aastex\ v6.0 through v6.2 were written -by Amy Hendrickson and released in January 2016 (v6.0), October 2016 (v6.1), -and January 2018 (v6.2), respectively. Some of the new features in v6.0 -included: - -\begin{enumerate} -\item improved citations for third party data repositories and software, -\item easier construction of matrix figures consisting of multiple +delivering new and improved features. \aastex\ v6.0 through v6.3 were +written by Amy Hendrickson. The release dates were January 2016 (v6.0), +October 2016 (v6.1), January 2018 (v6.2), and June 2019 (v6.3), +respectively. + +The new features in the recent releases includes: + +\begin{itemize} + \item{v6.0} + \begin{enumerate} + \item line numbering and watermarking, + \item improved citations for third party data repositories and software, + \item easier construction of matrix figures consisting of multiple encapsulated postscript (EPS) or portable document format (PDF) files, -\item figure set mark up for large collections of similar figures, -\item color mark up to easily enable/disable revised text highlighting, -\item improved url support, and -\item numerous table options such as the ability to hide columns, column -decimal alignment, automatic column math mode and numbering, plus splitting of -wide tables. -\end{enumerate} - -The features in v6.1 were: - -\begin{enumerate} -\item ORCID support for preprints, -\item improved author, affiliation and collaboration mark up, -\item reintroduced the old AASTeX v5.2 {\tt\string\received}, - {\tt\string\revised}, {\tt\string\accepted}, and - {\tt\string\published} commands plus - added the new {\tt\string\submitjournal} command to document - which AAS Journal the manuscript was submitted to, plus -\item new typeset style options. -\end{enumerate} - -The new features in v6.2 are: - -\begin{enumerate} -\item A new RNAAS style option for Research Note manuscripts, -\item Titles no longer put in all caps, -\item No page skip between the title page and article body, -\item re-introduce RevTeX's widetext environment for long lines in - two column style formats, and -\item upgrade to the {\tt\string\doi} command. -\end{enumerate} + \item figure set mark up for large collections of similar figures, + \item color mark up to easily enable/disable revised text highlighting, + \item improved url support, and + \item numerous table options such as the ability to hide columns, column decimal alignment, automatic column math mode and numbering, plus splitting of wide tables (see Section \ref{subsec:tables} for details). + \end{enumerate} + \item{v6.1} + \begin{enumerate} + \item ORCID support for preprints, + \item improved author, affiliation and collaboration mark up, + \item reintroduced the old AASTeX v5.2 {\tt\string\received}, {\tt\string\revised}, {\tt\string\accepted}, and {\tt\string\published} commands plus added the new {\tt\string\submitjournal} command to document which AAS Journal the manuscript was submitted to, plus + \item new typeset style options including {\tt\string modern}. + \end{enumerate} + \item{v6.2} + \begin{enumerate} + \item A new RNAAS style option for Research Note manuscripts, + \item Titles no longer put in all caps, + \item No page skip between the title page and article body, + \item re-introduce RevTeX's widetext environment for long lines in two column style formats, and + \item upgrade to the {\tt\string\doi} command. + \end{enumerate} + \item{v6.3} + \begin{enumerate} + \item New {\tt\string interactive} environment to highlight interactive figures (see Section \ref{animation}), + \item Improved collaboration commands, + \item New {\tt\string anonymous} style to keep the authors, affiliations and acknowledgments from showing in the compiled pdf for dual anonymous review, and + \item Adoptions of IAU approved syntax for nominal units, see Section \ref{nominal}. + \end{enumerate} +\end{itemize} The rest of this article provides information and examples on how to create -your own AAS Journal manuscript with v6.2. Special emphasis is placed on +your own AAS Journal manuscript with v6.3. Special emphasis is placed on how to use the full potential of \aastex\ v6+. The next section describes the different manuscript styles available and how they differ from past -releases. Section \ref{sec:floats} describes how tables and figures are -placed in a \latex\ document. Specific examples of tables, Section +releases. Section \ref{sec:floats} describes table and figure placement. +Specific examples of tables, Section \ref{subsec:tables}, and figures, Section \ref{subsec:figures}, are also -provided. Section \ref{sec:displaymath} discusses how to display math and +provided. A special emphasis is placed on interactive figures. +Section \ref{sec:displaymath} discusses how to display math and incorporate equations in a manuscript while Section \ref{sec:highlight} -discuss how to use the new revision mark up. The last section, +discuss how to use different ways to highlight revisions. The last section, \ref{sec:cite}, shows how recognize software and external data as first class references in the manuscript bibliography. An appendix is included to show how to construct one and provide some information on how article @@ -388,7 +420,7 @@ \section{Introduction} \label{sec:intro} \section{Manuscript styles} \label{sec:style} -The default style in \aastex\ v6.2 is a tight single column style, e.g. 10 +The default style in \aastex\ v6.3 is a tight single column style, e.g. 10 point font, single spaced. The single column style is very useful for article with wide equations. It is also the easiest to style to work with since figures and tables, see Section \ref{sec:floats}, will span the @@ -397,7 +429,7 @@ \section{Manuscript styles} \label{sec:style} To invoke a two column style similar to the what is produced in the published PDF copy use \\ -\noindent {\tt\string\documentclass[twocolumn]\{aastex62\}}. \\ +\noindent {\tt\string\documentclass[twocolumn]\{aastex63\}}. \\ \noindent Note that in the two column style figures and tables will only span one column unless specifically ordered across both with the ``*'' flag, @@ -424,9 +456,16 @@ \section{Manuscript styles} \label{sec:style} words per line to improve reader retention. It also looks better on devices with smaller displays such as smart phones. -For a Research Note use the {\tt\string RNAAS} option which will produce a +For a Research Note use the {\tt\string RNAAS} option. This will produce a manuscript with no abstract and in the {\tt\string modern} style. +The {\tt\string anonymous} option will prevent the author and affiliations +from being shown in the compiled pdf copy. This option allows the author +to keep this critical information in the latex file but prevent the reviewer +from seeing it during peer review if dual anonymous review is requested. +Likewise, acknowledgments can also be hidden if placed after the +{\tt\string\acknowledgments} command. + \section{Floats} \label{sec:floats} Floats are non-text items that generally can not be split over a page. @@ -452,52 +491,11 @@ \section{Floats} \label{sec:floats} Note that authors of Research Notes are only allowed one float, either one table or one figure. -\startlongtable -\begin{deluxetable}{c|cc} -\tablecaption{ApJ costs from 1991 to 2013\tablenotemark{a} \label{tab:table}} -\tablehead{ -\colhead{Year} & \colhead{Subscription} & \colhead{Publication} \\ -\colhead{} & \colhead{cost} & \colhead{charges\tablenotemark{b}}\\ -\colhead{} & \colhead{(\$)} & \colhead{(\$/page)} -} -\colnumbers -\startdata -1991 & 600 & 100 \\ -1992 & 650 & 105 \\ -1993 & 550 & 103 \\ -1994 & 450 & 110 \\ -1995 & 410 & 112 \\ -1996 & 400 & 114 \\ -1997 & 525 & 115 \\ -1998 & 590 & 116 \\ -1999 & 575 & 115 \\ -2000 & 450 & 103 \\ -2001 & 490 & 90 \\ -2002 & 500 & 88 \\ -2003 & 450 & 90 \\ -2004 & 460 & 88 \\ -2005 & 440 & 79 \\ -2006 & 350 & 77 \\ -2007 & 325 & 70 \\ -2008 & 320 & 65 \\ -2009 & 190 & 68 \\ -2010 & 280 & 70 \\ -2011 & 275 & 68 \\ -2012 & 150 & 56 \\ -2013 & 140 & 55 \\ -\enddata -\tablenotetext{a}{Adjusted for inflation} -\tablenotetext{b}{Accounts for the change from page charges to digital quanta in April, 2011} -\tablecomments{Note that {\tt \string \colnumbers} does not work with the -vertical line alignment token. If you want vertical lines in the headers you -can not use this command at this time.} -\end{deluxetable} - For authors that do want to take the time to optimize the locations of their floats there are some techniques that can be used. The simplest solution is to placing a float earlier in the text to get the position -right but this option will break down if the manuscript is altered, see -Table \ref{tab:table}. A better method is to force \latex\ to place a +right but this option will break down if the manuscript is altered. +A better method is to force \latex\ to place a float in a general area with the use of the optional {\tt\string [placement specifier]} parameter for figures and tables. This parameter goes after {\tt\string \begin\{figure\}}, {\tt\string \begin\{table\}}, and @@ -518,42 +516,12 @@ \section{Floats} \label{sec:floats} {\tt\string\end\{table\}} is it a true float and the rules and suggestions above apply. -In AASTeX v6.2 all deluxetables are float tables and thus if they are +In AASTeX v6.3 all deluxetables are float tables and thus if they are longer than a page will spill off the bottom. Long deluxetables should begin with the {\tt\string\startlongtable} command. This initiates a longtable environment. Authors might have to use {\tt\string\clearpage} to isolate a long table or optimally place it within the surrounding text. -\begin{deluxetable*}{ccCrlc}[b!] -\tablecaption{Column math mode in an observation log \label{tab:mathmode}} -\tablecolumns{6} -\tablenum{2} -\tablewidth{0pt} -\tablehead{ -\colhead{UT start time\tablenotemark{a}} & -\colhead{MJD start time\tablenotemark{a}} & -\colhead{Seeing} & \colhead{Filter} & \colhead{Inst.} \\ -\colhead{(YYYY-mm-dd)} & \colhead{(d)} & -\colhead{(arcsec)} & \colhead{} & \colhead{} -} -\startdata -2012-03-26 & 56012.997 & \sim 0.\arcsec5 & H$\alpha$ & NOT \\ -2012-03-27 & 56013.944 & 1.\arcsec5 & grism & SMARTS \\ -2012-03-28 & 56014.984 & \nodata & F814M & HST \\ -2012-03-30 & 56016.978 & 1.\arcsec5\pm0.25 & B\&C & Bok \\ -\enddata -\tablenotetext{a}{At exposure start.} -\tablecomments{The ``C'' command column identifier in the 3 column turns on -math mode for that specific column. One could do the same for the next -column so that dollar signs would not be needed for H$\alpha$ -but then all the other text would also be in math mode and thus typeset -in Latin Modern math and you will need to put it back to Roman by hand. -Note that if you do change this column to math mode the dollar signs already -present will not cause a problem. Table \ref{tab:mathmode} is published -in its entirety in the machine readable format. A portion is -shown here for guidance regarding its form and content.} -\end{deluxetable*} - \subsection{Tables} \label{subsec:tables} Tables can be constructed with \latex's standard table environment or the @@ -561,21 +529,19 @@ \subsection{Tables} \label{subsec:tables} tables better but has a larger overhead due to the greater amount of defined mark up used set up and manipulate the table structure. The choice of which to use is up to the author. Examples of both environments are -used in this manuscript. Table \ref{tab:table} is a simple deluxetable -example that gives the approximate changes in the subscription costs and -author publication charges from 1991 to 2013. +used in this manuscript. Tables longer than 200 data lines and complex tables should only have a short example table with the full data set available in the machine readable format. The machine readable table will be available in the HTML version of the article with just a short example in the PDF. Authors are -required to indicate to the reader where the data can be obtained in the -table comments. Suggested text is given in the comments of Table -\ref{tab:mathmode}. Authors are encouraged to create their own machine +required to indicate in the table comments that the data in machine +readable format in the full article. +Authors are encouraged to create their own machine readable tables using the online tool at \url{http://authortools.aas.org/MRT/upload.html}. -\aastex\ v6 introduces five new table features that are designed to make +\aastex\ v6 introduced five new table features that were designed to make table construction easier and the resulting display better for AAS Journal authors. The items are: @@ -587,10 +553,9 @@ \subsection{Tables} \label{subsec:tables} \item Splitting wide tables into two or three parts. \end{enumerate} -Each of these new features are illustrated in following Table examples. -All five features work with the regular \latex\ tabular environment and in -\aastex's deluxetable environment. The examples in this manuscript also -show where the two process differ. +Full details on how to create each type are given in the following +sections. Additional details are available in the AASTeX +guidelines at \url{http://journals.aas.org/authors/aastex.html} \subsubsection{Column math mode} @@ -600,8 +565,7 @@ \subsubsection{Column math mode} \underline{r}ight justification. If these values are capitalized, e.g. ``C'', ``L'', or ``R'', then that specific column will automatically be in math mode meaning that \$s are not required. Note that having embedded dollar -signs in the table does not affect the output. The third and forth columns -of Table \ref{tab:mathmode} shows how this math mode works. +signs in the table does not affect the output. \subsubsection{Decimal alignment} @@ -628,38 +592,7 @@ \subsubsection{Decimal alignment} {\tt\string\twocolhead\{\}} command in deluxetable. Since \latex\ is splitting these columns into two it is important to get the table width right so that they appear joined on the page. You may have to run the -\latex\ compiler twice to get it right. Table \ref{tab:decimal} -illustrates how decimal alignment works in the tabular environment with a -$\pm$ symbol embedded between the last two columns. - -%% Note that the \setcounter and \renewcommand are needed here because -%% this example is using a mix of deluxetable and tabular. Here the -%% deluxetable counters are set with \tablenum but the situation is a bit -%% more complex for tabular. Use the first command to set the Table number -%% to ONE LESS than it should be. The next command will auto increment it -%% to the desired number. -\setcounter{table}{2} -\begin{table}[h!] -\renewcommand{\thetable}{\arabic{table}} -\centering -\caption{Decimal alignment made easy} \label{tab:decimal} -\begin{tabular}{cD@{$\pm$}D} -\tablewidth{0pt} -\hline -\hline -Column & \multicolumn2c{Value} & \multicolumn2c{Uncertainty}\\ -\hline -\decimals -A & 1234 & 100.0 \\ -B & 123.4 & 10.1 \\ -C & 12.34 & 1.01 \\ -D & 1.234 & 0.101 \\ -E & .1234 & 0.01001 \\ -F & 1.0 & . \\ -\hline -\multicolumn{5}{c}{NOTE. - Two decimal aligned columns} -\end{tabular} -\end{table} +\latex\ compiler twice to get it right. \subsubsection{Automatic column header numbering} \label{subsubsec:autonumber} @@ -671,13 +604,11 @@ \subsubsection{Automatic column header numbering} \label{subsubsec:autonumber} the last line of specified table header rows. In deluxetable this command has to come before {\tt\string\startdata}. {\tt\string\colnumbers} will not increment for columns hidden by the ``h'' command, see Section -\ref{subsubsec:hide}. Table \ref{tab:table} uses this command to -automatically generate column index numbers. +\ref{subsubsec:hide}. Note that when using decimal alignment in a table the command {\tt\string\decimalcolnumbers} must be used instead of -{\tt\string\colnumbers} and {\tt\string\decimals}. Table \ref{tab:messier} -illustrates this specific functionality. +{\tt\string\colnumbers} and {\tt\string\decimals}. \subsubsection{Hiding columns} \label{subsubsec:hide} @@ -712,7 +643,7 @@ \subsubsection{Hiding columns} \label{subsubsec:hide} table was inserted before it. \begin{deluxetable*}{cchlDlc} -\tablenum{4} +\tablenum{1} \tablecaption{Fun facts about the first 10 messier objects\label{tab:messier}} \tablewidth{0pt} \tablehead{ @@ -749,26 +680,21 @@ \subsubsection{Splitting a table into multiple horizontal components} print page. The old way around this limitation was to rotate into landscape mode and use the smallest available table font sizes, e.g. {\tt\string\tablewidth}, to get the table to fit. -Unfortunately, this was not alway enough but now along with the hide column +Unfortunately, this was not always enough but now along with the hide column option outlined in Section \ref{subsubsec:hide} there is a new way to break a table into two or three components so that it flows down a page by invoking a new table type, splittabular or splitdeluxetable. Within these tables a new ``B'' column separator is introduced. Much like the vertical -bar option, ``$\vert$'', that produces a vertical table lines, e.g. Table -\ref{tab:table}, the new ``B'' separator indicates where to \underline{B}reak +bar option, ``$\vert$'', that produces a vertical table lines +the new ``B'' separator indicates where to \underline{B}reak a table. Up to two ``B''s may be included. -Table 5 % \ref{tab:deluxesplit} this freaks it out when it is used! +Table 2 % \ref{tab:deluxesplit} this freaks it out when it is used! shows how to split a wide deluxetable into three parts with the {\tt\string\splitdeluxetable} command. The {\tt\string\colnumbers} option is on to show how the automatic column numbering carries through the second table component, see Section \ref{subsubsec:autonumber}. -The last example, Table \ref{tab:tablesplit}, shows how to split the same -table but with a regular \latex\ tabular call and into two parts. Decimal -alignment is included in the third column and the ``Component'' column is -hidden to illustrate the new features working together. - \begin{splitdeluxetable*}{lccccBcccccBcccc} \tabletypesize{\scriptsize} \tablewidth{0pt} @@ -806,75 +732,40 @@ \subsubsection{Splitting a table into multiple horizontal components} look at the new \aastex\ instructions.} \end{splitdeluxetable*} -%\clearpage - -\setcounter{table}{5} -\begin{table*}[h!] -\renewcommand{\thetable}{\arabic{table}} -\caption{Measurements of Emission Lines: one break\label{tab:tablesplit}} -\begin{splittabular}{lhDccccBccccccc} -%\multicolumn{5}{c}{Table 6} \\ -%\multicolumn{5}{c}{Measurements of Emission Lines} \\ -\hline -\hline -Model & Component & \multicolumn2c{Shift} & FWHM & -\multicolumn{10}{c}{Flux} \\ - & & \multicolumn2c{($\rm km~s^{-1}$)} & {($\rm km~s^{-1}$)} & -\multicolumn{10}{c}{($\rm 10^{-17}~erg~s^{-1}~cm^{-2}$)} \\ -\cline{5-15} - & & & & & {Ly$\alpha$} & {N\,{\footnotesize V}} & -{Si\,{\footnotesize IV}} & {C\,{\footnotesize IV}} & -{Mg\,{\footnotesize II}} & {H$\gamma$} & {H$\beta$} -& {H$\alpha$} & {He\,{\footnotesize I}} & {Pa$\gamma$} \\ -%\hline -\decimalcolnumbers - & BELs& -97.13 & 9117$\pm 38$& 1033$\pm 33$&$< 35$&$< 166$& 637$\pm 31$& 1951$\pm 26$& 991$\pm 30$& 3502$\pm 42$& 20285$\pm 80$& 2025$\pm 116$& 1289$\pm 107$\\ -Model 1 & IELs& -4049.123 & 1974$\pm 22$& 2495$\pm 30$&$< 42$&$< 109$& 995$\pm 186$& 83$\pm 30$& 75$\pm 23$& 130$\pm 25$& 357$\pm 94$& 194$\pm 64$& 36$\pm 23$\\ - & NELs& . & 641$\pm 4$& 449$\pm 23$&$< 6$&$< 9$& -- & 275$\pm 18$& 150$\pm 11$& 313$\pm 12$& 958$\pm 43$& 318$\pm 34$& 151$\pm 17$\\ -\hline - & BELs& -85 & 8991$\pm 41$& 988$\pm 29$&$< 24$&$< 173$& 623$\pm 28$& 1945$\pm 29$& 989$\pm 27$& 3498$\pm 37$& 20288$\pm 73$& 2047$\pm 143$& 1376$\pm 167$\\ -Model 2 & IELs& -51000 & 2025$\pm 26$& 2494$\pm 32$&$< 37$&$< 124$& 1005$\pm 190$& 72$\pm 28$& 72$\pm 21$& 113$\pm 18$& 271$\pm 85$& 205$\pm 72$& 34$\pm 21$\\ - & NELs& 52 & 637$\pm 10$& 477$\pm 17$&$< 4$&$< 8$& -- & 278$\pm 17$& 153$\pm 10$& 317$\pm 15$& 969$\pm 40$& 325$\pm 37$& 147$\pm 22$\\ -\hline -\end{splittabular} -\end{table*} - \subsection{Figures\label{subsec:figures}} %% The "ht!" tells LaTeX to put the figure "here" first, at the "top" next %% and to override the normal way of calculating a float position \begin{figure}[ht!] -\plotone{cost-eps-converted-to.pdf} -\caption{The subscription and author publication costs from 1991 to 2013. -The data comes from Table \ref{tab:table}.\label{fig:general}} +\plotone{cost.pdf} +\caption{The subscription (squares) and author publication (asterisks) +costs from 1991 to 2013. Subscription cost are on the left Y axis while +the author costs are on the right Y axis. All numbers in US dollars and +adjusted for inflation. The author charges also account for the change +from page charges to digital quanta in April 2011. \label{fig:general}} \end{figure} Authors can include a wide number of different graphics with their articles -in encapsulated postscript (EPS) or portable document format (PDF). These -range from general figures all authors are familiar with to new enhanced -graphics that can only be fully experienced in HTML. The later include -animations, figure sets and interactive figures. This portion of the -article provides examples for setting up all these graphics in with the -latest version of \aastex. +but encapsulated postscript (EPS) or portable document format (PDF) are +encouraged. These range from general figures all authors are familiar with +to new enhanced graphics that can only be fully experienced in HTML. The +later include figure sets, animations and interactive figures. All +enhanced graphics require a static two dimensional representation in the +manuscript to serve as the example for the reader. All figures should +include detailed and descriptive captions. These captions are absolutely +critical for readers for whom the enhanced figure is inaccessible either +due to a disability or offline access. This portion of the article +provides examples for setting up all these types in with the latest version +of \aastex. \subsection{General figures\label{subsec:general}} -\aastex\ has a {\tt\string\plotone} command to display a figure -consisting of one EPS/PDF file. Figure \ref{fig:general} is an example -which uses the data from Table \ref{tab:table}. For a general figure +\aastex\ has a {\tt\string\plotone} command to display a figure consisting +of one EPS/PDF file. Figure \ref{fig:general} is an example which shows +the approximate changes in the subscription costs and author publication +charges from 1991 to 2013 in the AAS Journals. For a general figure consisting of two EPS/PDF files the {\tt\string\plottwo} command can be -used to position the two image files side by side. Figure \ref{fig:f2} -shows the Swift/XRT X-ray light curves of two recurrent novae. The data -from Figures \ref{fig:f2} through \ref{fig:fig4} are taken from Table 2 of -\citet{2011ApJS..197...31S}. - -\begin{figure} -\plottwo{RS_Oph-eps-converted-to.pdf}{U_Sco-eps-converted-to.pdf} -\caption{Swift/XRT X-ray light curves of RS Oph and U Sco which represent -the two canonical recurrent types, a long period system with a red giant -secondary and a short period system with a dwarf/sub-dwarf secondary, -respectively.\label{fig:f2}} -\end{figure} +used to position the two image files side by side. Both {\tt\string\plotone} and {\tt\string\plottwo} take a {\tt\string\caption} and an optional {\tt\string\figurenum} command to @@ -891,7 +782,7 @@ \subsection{General figures\label{subsec:general}} \subsection{Grid figures} -Including more than two EPS/PDF files in a single figure call can be tricky +Including more than two EPS/PDF files in a single figure call can be tricky to easily format. To make the process easier for authors \aastex\ v6 offers {\tt\string\gridline} which allows any number of individual EPS/PDF file calls within a single figure. Each file cited in a {\tt\string\gridline} @@ -916,28 +807,48 @@ \subsection{Grid figures} {\tt\string\gridline} option. \begin{figure*} -\gridline{\fig{V2491_Cyg-eps-converted-to.pdf}{0.3\textwidth}{(a)} - \fig{CSS081007-eps-converted-to.pdf}{0.3\textwidth}{(b)} - \fig{LMC_2009-eps-converted-to.pdf}{0.3\textwidth}{(c)} +\gridline{\fig{V2491_Cyg.pdf}{0.3\textwidth}{(a)} + \fig{HV_Cet.pdf}{0.3\textwidth}{(b)} + \fig{LMC_2009.pdf}{0.3\textwidth}{(c)} } -\gridline{\fig{RS_Oph-eps-converted-to.pdf}{0.3\textwidth}{(d)} - \fig{U_Sco-eps-converted-to.pdf}{0.3\textwidth}{(e)} +\gridline{\fig{RS_Oph.pdf}{0.3\textwidth}{(d)} + \fig{U_Sco.pdf}{0.3\textwidth}{(e)} } -\gridline{\fig{KT_Eri-eps-converted-to.pdf}{0.3\textwidth}{(f)}} +\gridline{\fig{KT_Eri.pdf}{0.3\textwidth}{(f)}} \caption{Inverted pyramid figure of six individual files. The nova are -(a) V2491 Cyg, (b) HV Cet, (c) LMC 2009, (d) RS Oph, (e) U Sco, and -(f) KT Eri.\label{fig:pyramid}} +(a) V2491 Cyg, (b) HV Cet, (c) LMC 2009, (d) RS Oph, (e) U Sco, and (f) +KT Eri. These individual figures are taken from \citet{2011ApJS..197...31S}. +\label{fig:pyramid}} \end{figure*} -\subsection{Figure sets} - -A large collection of similar style figures should be grouped together as a -figure set. The derived PDF article will only shows an example figure -while the enhanced content is available in the figure set in the electronic -edition. The advantage of a figure set gives the reader the ability to -easily sort through the figure collection to find individual component -figures. All of the figure set components, along with their html framework, -are also available for download in a .tar.gz package. +\subsection{Enhanced graphics} + +Enhanced graphics have an example figure to serve as an example for the +reader and the full graphical item available in the published HTML article. +This includes Figure sets, animations, and interactive figures. The +Astronomy Image Explorer (\url{http://www.astroexplorer.org/}) provides +access to all the figures published in the AAS Journals since they offered +an electronic version which was in the mid 1990s. You can filter image +searches by specific terms, year, journal, or type. The type filter is +particularly useful for finding all published enhanced graphics. As of +June 2019 there are over 3000 videos, 1000 figure sets, and 65 interactive +figures. The next sections describe how to include these types of graphics +in your own manuscripts. + +\subsubsection{Figure sets} + +The grid commands given above works great for a limited set of individual +figure files but what do you do if you have many 10s or 100s or even 1000s of +individual figure files? Figure sets represents a virtual flip book of a +large group of similar style figures. The derived PDF article will only +shows an example figure while the enhanced content is available in the +figure set in the HTML edition. The advantage of a figure set gives the +reader the ability to easily sort through a large collection to find +individual component figures. The advantage to the author is that grouping +similar figures into a figure set can result in significant cost savings in +terms of reduced publication charges, see Appendix B. All of the figure set +components, along with their html framework, are also available to the reader +for download in a single .tar.gz package. Special \latex\ mark up is required to create a figure set. Prior to \aastex\ v6 the underlying mark up commands had to be inserted by hand @@ -952,110 +863,159 @@ \subsection{Figure sets} \figsetgrpstart \figsetgrpnum{1.1} \figsetgrptitle{KT Eri} -\figsetplot{KT_Eri-eps-converted-to.pdf} +\figsetplot{KT_Eri.pdf} \figsetgrpnote{The Swift/XRT X-ray light curve for the first year after -outburst.} +outburst of KT Eri.} \figsetgrpend \figsetgrpstart \figsetgrpnum{1.2} \figsetgrptitle{RS Oph} -\figsetplot{RS_Oph-eps-converted-to.pdf} +\figsetplot{RS_Oph.pdf} \figsetgrpnote{The Swift/XRT X-ray light curve for the first year after -outburst.} +outburst of RS Oph.} \figsetgrpend \figsetgrpstart \figsetgrpnum{1.3} \figsetgrptitle{U Sco} -\figsetplot{U_Sco-eps-converted-to.pdf} +\figsetplot{U_Sco.pdf} \figsetgrpnote{The Swift/XRT X-ray light curve for the first year after -outburst.} +outburst of U Sco.} \figsetgrpend \figsetgrpstart \figsetgrpnum{1.4} \figsetgrptitle{V2491 Cyg} -\figsetplot{V2491_Cyg-eps-converted-to.pdf} +\figsetplot{V2491_Cyg.pdf} \figsetgrpnote{The Swift/XRT X-ray light curve for the first year after -outburst.} +outburst of V2491 Cyg.} \figsetgrpend \figsetgrpstart \figsetgrpnum{1.5} \figsetgrptitle{Nova LMC 2009} -\figsetplot{LMC_2009-eps-converted-to.pdf} +\figsetplot{LMC_2009.pdf} \figsetgrpnote{The Swift/XRT X-ray light curve for the first year after -outburst.} +outburst of nova LMC 2009.} \figsetgrpend \figsetgrpstart \figsetgrpnum{1.6} \figsetgrptitle{HV Cet} -\figsetplot{CSS081007-eps-converted-to.pdf} -\figsetgrpnote{The Swift/XRT X-ray light curve for the first year after -outburst.} -\figsetgrpend - -\figsetgrpstart -\figsetgrpnum{1.7} -\figsetgrptitle{V2672 Oph} -\figsetplot{V2672_Oph-eps-converted-to.pdf} +\figsetplot{HV_Cet.pdf} \figsetgrpnote{The Swift/XRT X-ray light curve for the first year after -outburst.} -\figsetgrpend - -\figsetgrpstart -\figsetgrpnum{1.8} -\figsetgrptitle{V407 Cyg} -\figsetplot{V407_Cyg-eps-converted-to.pdf} -\figsetgrpnote{The Swift/XRT X-ray light curve for the first year after -outburst.} +outburst of HV Cet.} \figsetgrpend \figsetend \begin{figure} -\plotone{KT_Eri-eps-converted-to.pdf} +\plotone{KT_Eri.pdf} \caption{The Swift/XRT X-ray light curve for the first year after outburst of the suspected recurrent nova KT Eri. At a maximum count rate of 328 ct/s, KT Eri was the brightest nova in X-rays observed to date. All -the component figures are available in the Figure Set. \label{fig:fig4}} +the component figures (6) are available in the Figure Set. Note that +these components that are {\bf not} shown in the compiled pdf. The figure +set consists of the same figures as shown in Figure \ref{fig:pyramid}. +The example figure shown for figure sets can be one component or many. +\label{fig:fig4}} \end{figure} Authors are encouraged to use an online tool at \url{http://authortools.aas.org/FIGSETS/make-figset.html} to generate their own specific figure set mark up to incorporate into their \latex\ articles. -\subsection{Animations} +\subsubsection{Animations \label{animation}} -Authors may include animations in their articles. A single still frame from -the animation should be included as a regular figure to serve as an example. -The associated figure caption should indicate to the reader exactly what the -animation shows and that the animation is available online. +Authors may, and are in fact encouraged, to include animations in their +manuscripts. The video will stream inline with the published article and +also be available for download. When writing the manuscript, a stand alone +figure is necessary to serve as an example for the reader. Ideally, this +is a single still frame from the animation but in some case the animation +may only represent a small portion of the example figure, say one many +panels as shown in Figure \ref{fig:video}. Regardless, it is very +important that the author provide descriptive text in the figure caption +including start and stop times and the video duration. Authors should +review the AAS animation guidelines in the graphics guide at +\url{https://journals.aas.org/graphics-guide/#animations}. \begin{figure} -\plotone{video3-eps-converted-to.pdf} -\caption{Example image from the animation which is available in the electronic -edition.} +\begin{interactive}{animation}{movie.mp4} +\plotone{f4.pdf} +\end{interactive} +\caption{Figure 1 from \citet{2018ApJ...868L..33L}. AIA 171\AA (a,b), +AIA 131\AA (c), and AIA 304\AA images are shown. The red rectangle +in (a) shows the field of view of the other panels. An animation of +panels (b-d) is available. It covers 8 hours of observing beginning +at 01:00 UT on 2012 January 19. The video duration is 20 seconds. +\label{fig:video}} \end{figure} -\subsection{Interactive figures} +Animations and interactive figures (Section \ref{sec:interactive}) should +use the {\tt\string\begin{interactive}} environment in the figure call. This +environment +places a blue border around the figure to indicate that the figure is +enhanced in the published HTML article. The +command also serves to alert the publisher what files are used to generate +the dynamic HTML content. {\tt\string\interactive} takes two arguments. The +first details the type and currently only three are allowed. The types are +{\tt\string js} for generic javascript interactive figures, +{\tt\string animation} for inline videos, and +{\tt\string timeseries} for interactive light curves produced +by astropy \citet{2013A&A...558A..33A}\footnote{To be release in the +summer of 2019}. If these types are not provide the compiler will issue an +error and quit. The second argument is the file that produces the enhanced +feature in the HTML article. + +\subsubsection{Interactive figures \label{sec:interactive}} Interactive figures give the reader the ability to manipulate the information contained in an image which can add clarity or help further the -author's narrative. These figures consist of two parts, the figure file in -a specific format and a javascript and html frame work that provides the -interactive control. An example of an interactive figure is a 3D model. +author's narrative. These figures consist of two parts, a static +representative figure for the manuscript and the dynamic javascript plus +HTML framework that allows for interactive control. + +An example of an interactive figure is a 3D model. The underlying figure is a X3D file while x3dom.js is the javascript driver that displays it. An author created interface is added via a html wrapper. The first 3D model published by the AAS Journals using this technique was -\citet{2014ApJ...793..127V}. Authors should consult the online tutorials -for more information on how to construct their own interactive figures. +\citet{2014ApJ...793..127V}. + +Figure \ref{fig:interactive} provides an interactive example which can be +run locally to demonstrate how a simple javascript plus html interface +allows a reader to switch between figures. The necessary files for this +particular interactive figure are in the {\tt\string interactive.tar.gz} +file included with this package. Unpack the file and point the browser to +the local html file. In this case, the javascript that runs the interactive +buttons is embedded in the html file but it could just as easily be calls +to external javascript libraries. Ideally, the javascript should be +included with the submitted package of interactive files to minimize +external dependencies within the published article. -As with animations authors should include a non-interactive regular figure -to use as an example. The example figure should also indicate to the reader -that the enhanced figure is interactive and can be accessed online. +\begin{figure} +\begin{interactive}{js}{interactive.tar.gz} +\plotone{f5.pdf} +\end{interactive} +\caption{Figure 4 from \citet{2018AJ....156...82C}. \emph{Upper panel}: the +cumulative median observing time to measure the $3\sigma$ RV masses of TESS +planets as a function of host star spectral type and up to $10^3$ hours. +The \emph{dashed blue curves} represent the results from the optical +spectrograph whereas the \emph{solid red curves} represent the near-IR +spectrograph. \emph{Lower panel}: the time derivative of the cumulative +observing time curves used to indicate the RV planet detection efficiency. +The \emph{horizontal dashed line} highlights the value of the detection +efficiency at 20 hours per detection. Note that unlike the lower panels, +the upper panels do not share a common ordinate due to the differing number +of planet detections around stars in each spectral type bin. The +interactive version has two buttons that allows one to turn the optical and +NIR layers. \label{fig:interactive}} +\end{figure} + +Authors should consult the online tutorials at +\url{https://journals.aas.org/graphics-guide/#interactive_figures} +for more information on what is currently supported and links to +tutorials and examples. \section{Displaying mathematics} \label{sec:displaymath} @@ -1149,7 +1109,7 @@ \section{Revision tracking and color highlighting} \label{sec:highlight} the article by adding the {\tt\string\listofchanges} just before the {\tt\string\end\{document\}} call. The page number for each change will be provided. If the {\tt\string linenumbers} option is also included in the -documentcall call then not only will all the lines in the article be +documentclass call then not only will all the lines in the article be numbered for handy reference but the summary list will also include the line number for each change. @@ -1209,9 +1169,6 @@ \section{Software and third party data repository citations} \label{sec:cite} code the ``@misc'' type correctly. The most recent aasjournal.bst file, available with \aastex\ v6, will output bibtex ``@misc'' type properly. -%% If you wish to include an acknowledgments section in your paper, -%% separate it off from the body of the text using the \acknowledgments -%% command. \acknowledgments We thank all the people that have made this AASTeX what it is today. This @@ -1239,7 +1196,7 @@ \section{Software and third party data repository citations} \label{sec:cite} %% Similar to \facility{}, there is the optional \software command to allow %% authors a place to specify which programs were used during the creation of -%% the manusscript. Authors should list each code and include either a +%% the manuscript. Authors should list each code and include either a %% citation or url to the code inside ()s when available. \software{astropy \citep{2013A&A...558A..33A}, @@ -1282,12 +1239,16 @@ \section{Author publication charges} \label{sec:pubcharge} digital ``quanta''. A single quantum is 350 words, one figure, one table, and one enhanced digital item. For the latter this includes machine readable tables, figure sets, animations, and interactive figures. The current cost -is \$27 per word quantum and \$30 for all other quantum type. +for the different quanta types is available at +\url{https://journals.aas.org/article-charges-and-copyright/#author_publication_charges}. +Authors may use the ApJL length calculator to get a {\tt rough} estimate of +the number of word and float quanta in their manuscript. The calculator +is located at \url{https://authortools.aas.org/ApJL/betacountwords.html}. \section{Rotating tables} \label{sec:rotate} The process of rotating tables into landscape mode is slightly different in -\aastex v6.2. Instead of the {\tt\string\rotate} command, a new environment +\aastex v6.3. Instead of the {\tt\string\rotate} command, a new environment has been created to handle this task. To place a single page table in a landscape mode start the table portion with {\tt\string\begin\{rotatetable\}} and end with @@ -1297,7 +1258,10 @@ \section{Rotating tables} \label{sec:rotate} both rotation and long table printing are required. In these cases start with {\tt\string\begin\{longrotatetable\}} and end with {\tt\string\end\{longrotatetable\}}. Table \ref{chartable} is an -example of a multi-page, rotated table. +example of a multi-page, rotated table. The {\tt\string\movetabledown} +command can be used to help center extremely wide, landscape tables. The +command {\tt\string\movetabledown=1in} will move any rotated table down 1 +inch. \begin{longrotatetable} \begin{deluxetable*}{lllrrrrrrll} @@ -1382,48 +1346,82 @@ \section{Rotating tables} \label{sec:rotate} \end{deluxetable*} \end{longrotatetable} -A handy "cheat sheat" that provides the necessary LaTeX to produce 17 +A handy "cheat sheet" that provides the necessary LaTeX to produce 17 different types of tables is available at \url{http://journals.aas.org/authors/aastex/aasguide.html#table_cheat_sheet}. -%% The reference list follows the main body and any appendices. -%% Use LaTeX's thebibliography environment to mark up your reference list. -%% Note \begin{thebibliography} is followed by an empty set of -%% curly braces. If you forget this, LaTeX will generate the error -%% "Perhaps a missing \item?". +\section{IAU recommendations for nominal units \label{nominal}} + +The IAU 2015 resolution B3 defines nominal solar and planetary values by +establishing conversions between solar and planetary values and SI units. +The rational and specifications are given in \citet{2016AJ....152...41P}. +The recommended nominal conversion constants for LaTeX have been +incorporate into v6.3 to help authors follow the IAU resolution. + +The general commands take this form: + +\vskip12pt +\begin{center} +\begin{tabular}{@{\vrule height 14pt depth 6pt width0pt}lll} +Command&Example&Results\\ +\verb+\nom{}+&\verb+\nom{Q}+&\nom{Q}\\ +\verb+\Eenom{}+&\verb+\Eenom{Q}+&\Eenom{Q}\\ +\verb+\Epnom{}+&\verb+\Epnom{Q}+&\Epnom{Q}\\ +\verb+\Jenom{}+&\verb+\Jenom{Q}+&\Jenom{Q}\\ +\verb+\Jpnom{}+&\verb+\Jpnom{Q}+&\Jpnom{Q}\\ +\end{tabular} +\end{center} +\vskip12pt + +which can be used for any units the author requires. Examples of +the most common uses would be: + +\vskip12pt +\begin{tabular}{@{\vrule height 14pt depth 6pt width 0pt}llllp{3in}} +1.&\verb+\nom{(GM)}+& \nom{(GM)} &=& nominal solar mass parameter\\ +2.&\verb+\nom{R}+&\nom{R} &=& nominal solar radius\\ +3.&\verb+\nom{S}+& \nom{S}&=& nominal total solar irradiance\\ +4.&\verb+\nom{L}+& \nom{L} &=&nominal solar luminosity\\ +\end{tabular} +\vskip12pt + +AASTeX v6.3 also contains specific commands for other commonly used +units. These are: + +\vskip24pt +\begin{tabular}{@{\vrule height 14pt depth 6pt width 0pt}llllp{3in}} +1.&\verb+\nomSolarEffTemp+& \nomSolarEffTemp&=& nominal solar effective temperature\\ +2.&\verb+\nomTerrEqRadius+&\nomTerrEqRadius &=& nominal terrestrial +equatorial radius\\ +&\verb+\nomTerrPolarRadius+ &\nomTerrPolarRadius &=& nominal +terrestrial polar radius\\ +&\verb+\nomTerrEqRadius+&\nomTerrEqRadius&& should be used if equatorial +vs.~polar radius is not explicitly specified.\\ +3.&\verb+\nomJovianEqRadius+&\nomJovianEqRadius&=& nominal one-bar equatorial radii of +Jupiter\\ +&\verb+\nomJovianPolarRadius+&\nomJovianPolarRadius &=& nominal polar radii of Jupiter\\ +&\verb+\nomJovianEqRadius+&\nomJovianEqRadius&& should be used if Jovian equatorial +vs.~polar radius is not explicitly specified.\\ +4.&\verb+\nomTerrMass+ &\nomTerrMass &=& nominal terrestrial mass +parameter\\ +&\verb+\nomJovianMass+ &\nomJovianMass &=& nominal Jovian mass parameter\\ +\end{tabular} +\vskip12pt + +All of these commands work equally well in text and math mode. + +%% For this sample we use BibTeX plus aasjournals.bst to generate the +%% the bibliography. The sample63.bib file was populated from ADS. To +%% get the citations to show in the compiled file do the following: %% -%% thebibliography produces citations in the text using \bibitem-\cite -%% cross-referencing. Each reference is preceded by a -%% \bibitem command that defines in curly braces the KEY that corresponds -%% to the KEY in the \cite commands (see the first section above). -%% Make sure that you provide a unique KEY for every \bibitem or else the -%% paper will not LaTeX. The square brackets should contain -%% the citation text that LaTeX will insert in -%% place of the \cite commands. - -%% We have used macros to produce journal name abbreviations. -%% \aastex provides a number of these for the more frequently-cited journals. -%% See the Author Guide for a list of them. - -%% Note that the style of the \bibitem labels (in []) is slightly -%% different from previous examples. The natbib system solves a host -%% of citation expression problems, but it is necessary to clearly -%% delimit the year from the author name used in the citation. -%% See the natbib documentation for more details and options. - -\begin{thebibliography}{} - -\bibitem[Astropy Collaboration et al.(2013)]{2013A&A...558A..33A} Astropy Collaboration, Robitaille, T.~P., Tollerud, E.~J., et al.\ 2013, \aap, 558, A33 -\bibitem[Bertin \& Arnouts(1996)]{1996A&AS..117..393B} Bertin, E., \& Arnouts, S.\ 1996, \aaps, 117, 393 -\bibitem[Corrales(2015)]{2015ApJ...805...23C} Corrales, L.\ 2015, \apj, 805, 23 -\bibitem[Ferland et al.(2013)]{2013RMxAA..49..137F} Ferland, G.~J., Porter, R.~L., van Hoof, P.~A.~M., et al.\ 2013, \rmxaa, 49, 137 -\bibitem[Hanisch \& Biemesderfer(1989)]{1989BAAS...21..780H} Hanisch, R.~J., \& Biemesderfer, C.~D.\ 1989, \baas, 21, 780 -\bibitem[Lamport(1994)]{lamport94} Lamport, L. 1994, LaTeX: A Document Preparation System, 2nd Edition (Boston, Addison-Wesley Professional) -\bibitem[Schwarz et al.(2011)]{2011ApJS..197...31S} Schwarz, G.~J., Ness, J.-U., Osborne, J.~P., et al.\ 2011, \apjs, 197, 31 -\bibitem[Vogt et al.(2014)]{2014ApJ...793..127V} Vogt, F.~P.~A., Dopita, M.~A., Kewley, L.~J., et al.\ 2014, \apj, 793, 127 - -\end{thebibliography} - -%% This command is needed to show the entire author+affilation list when +%% pdflatex sample63.tex +%% bibtext sample63 +%% pdflatex sample63.tex +%% pdflatex sample63.tex + +\bibliography{sample63}{} +\bibliographystyle{aasjournal} + +%% This command is needed to show the entire author+affiliation list when %% the collaboration and author truncation commands are used. It has to %% go at the end of the manuscript. %\allauthors @@ -1434,4 +1432,4 @@ \section{Rotating tables} \label{sec:rotate} \end{document} -% End of file `sample62.tex'. +% End of file `sample63.tex'. diff --git a/sample/video3-eps-converted-to.pdf b/sample/video3-eps-converted-to.pdf deleted file mode 100644 index 6339c1e..0000000 Binary files a/sample/video3-eps-converted-to.pdf and /dev/null differ