summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/latex/aastex/README53
-rw-r--r--Master/texmf-dist/doc/latex/aastex/aassymbols.pdfbin113610 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/aastex/aassymbols.tex579
-rw-r--r--Master/texmf-dist/doc/latex/aastex/natbib.tex96
-rw-r--r--Master/texmf-dist/doc/latex/aastex/sample631.bib (renamed from Master/texmf-dist/doc/latex/aastex/sample63.bib)19
-rw-r--r--Master/texmf-dist/doc/latex/aastex/sample631.pdf (renamed from Master/texmf-dist/doc/latex/aastex/sample63.pdf)bin1039571 -> 1049880 bytes
-rw-r--r--Master/texmf-dist/doc/latex/aastex/sample631.tex (renamed from Master/texmf-dist/doc/latex/aastex/sample63.tex)190
-rw-r--r--Master/texmf-dist/tex/latex/aastex/aastex631.cls (renamed from Master/texmf-dist/tex/latex/aastex/aastex63.cls)818
8 files changed, 684 insertions, 1071 deletions
diff --git a/Master/texmf-dist/doc/latex/aastex/README b/Master/texmf-dist/doc/latex/aastex/README
index 997ad0436b8..b622e3d6200 100644
--- a/Master/texmf-dist/doc/latex/aastex/README
+++ b/Master/texmf-dist/doc/latex/aastex/README
@@ -1,47 +1,27 @@
-%% Start of file README
-%% This README is part of the AASTEX 6.3 distribution.
-%% Copyright (C) 2019 American Astronomical Society
-%% This work may be distributed and/or modified under the
-%% conditions of the LATEX Project Public License, either version 1.3
-%% of this license or (at your option) any later version.
-%% The latest version of this license is in
-%% http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of LATEX
-%% version 2003/12/01 or later.
-%% This work has the LPPL maintenance status "maintained".
-%% The Current Maintainer of this work is the American Astronomical Society.
-%% %% This work consists of all files listed in the document README.
-
-Last updated August 7, 2019.
+Last updated March 1, 2021.
Thank you for your interest in the AASTEX package for manuscript preparation. This directory contains all the files in the distribution. They are described briefly below. Following the file descriptions are short installation instructions, the generic recipe for printing the user guide and sample, and information about contacting us regarding the distribution.
MANIFEST
-aastex63.cls The most recent AASTEX class file (V6.3)
+aastex631.cls The most recent AASTEX class file (V6.3.1)
aasjournal.bst BIBTEX .bst file optimized for AAS Journal publishing
-aassymbols.tex Tables of AASTEX and AMS symbols commands
-aassymbols.pdf PDF of the symbols tables
-
-natbib.tex Information regarding using natbib with AASTEX
-natbib.pdf PDF of the natbib article
-
-sample63.tex Sample paper with "typical" content and markup
-sample63.pdf Sample paper PDF file
-sample63.bib Sample paper BIBTEX .bib file
+sample631.tex Sample paper with "typical" content and markup
+sample631.pdf Sample paper PDF file
+sample631.bib Sample paper BIBTEX .bib file
-cost.pdf Figure 1 in sample63.tex
-V2491_Cyg.pdf Figure 2a in sample63.tex
-HV_Cet.pdf Figure 2b in sample63.tex
-LMC_2009.pdf Figure 2c in sample63.tex
-RS_Oph.pdf Figure 2d in sample63.tex
-U_Sco.pdf Figure 2e in sample63.tex
-KT_Eri.pdf Figures 2f and 3 in sample63.tex
-f4.pdf Figure 4 in sample63.tex
-f5.pdf Figure 5 in sample63.tex
+cost.pdf Figure 1 in sample631.tex
+V2491_Cyg.pdf Figure 2a in sample631.tex
+HV_Cet.pdf Figure 2b in sample631.tex
+LMC_2009.pdf Figure 2c in sample631.tex
+RS_Oph.pdf Figure 2d in sample631.tex
+U_Sco.pdf Figure 2e in sample631.tex
+KT_Eri.pdf Figures 2f and 3 in sample631.tex
+f4.pdf Figure 4 in sample631.tex
+f5.pdf Figure 5 in sample631.tex
-interactive.tar.gz A .tar.gz package containing all the interactive figure files associated with Figure 5 in sample63.tex
+interactive.tar.gz A .tar.gz package containing all the interactive figure files associated with Figure 5 in sample631.tex
orcid-ID.png PNG file use to produced the ORCID icon in \author
@@ -53,7 +33,7 @@ for additional installation notes or contact the help desk at aastex-help@aas.or
ADMINISTRATIVE DETAILS
-AASTEX was designed and written by Chris Biemesderfer in 1988. Substantial revisions were made by Lee Brotzman and Pierre Landau when the package was updated to v4.0. AASTEX was rewritten as a LATEX class by Arthur Ogawa for the v5.0 release. It was updated to v5.2 by SR Nova Private Ltd. Amy Hendrickson (TEXnology Inc.) wrote the v6.0 release which itself was primarily based on the emulateapj classfile created by Maxim Markevitch and Alexey Vikhlinin. Amy Hendrickson also created versions v6.1 - v6.3. Over the years the documentation has benefited from revisions by Jeannette Barnes, Sara Zimmerman, Greg Schwarz, Gus Meunch, Amy Henderickson, and Butler Burton.
+AASTEX was designed and written by Chris Biemesderfer in 1988. Substantial revisions were made by Lee Brotzman and Pierre Landau when the package was updated to v4.0. AASTEX was rewritten as a LATEX class by Arthur Ogawa for the v5.0 release. It was updated to v5.2 by SR Nova Private Ltd. Amy Hendrickson (TEXnology Inc.) wrote the v6.0 release which itself was primarily based on the emulateapj classfile created by Maxim Markevitch and Alexey Vikhlinin. Amy Hendrickson also created versions v6.1 - v6.3.1. Over the years the documentation has benefited from revisions by Jeannette Barnes, Sara Zimmerman, Greg Schwarz, Gus Meunch, Amy Henderickson, and Butler Burton.
Comments, suggestions, complaints, and pleas for help can be sent electronically to aastex-help@aas.org.
@@ -66,3 +46,4 @@ SZ, 22 Jun 2005 Rev.
GJS, 02 Mar 2016 Rev.
GJS, 08 Jan 2018 Rev.
GJS, 07 Aug 2019 Rev.
+GJS, 01 Mar 2021 Rev.
diff --git a/Master/texmf-dist/doc/latex/aastex/aassymbols.pdf b/Master/texmf-dist/doc/latex/aastex/aassymbols.pdf
deleted file mode 100644
index c449a0a7484..00000000000
--- a/Master/texmf-dist/doc/latex/aastex/aassymbols.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/aastex/aassymbols.tex b/Master/texmf-dist/doc/latex/aastex/aassymbols.tex
deleted file mode 100644
index f34fe67e69f..00000000000
--- a/Master/texmf-dist/doc/latex/aastex/aassymbols.tex
+++ /dev/null
@@ -1,579 +0,0 @@
-\documentclass[twocolumn]{aastex3}
-
-\newcommand\aastex{AAS\TeX}%
-
-\pagestyle{myheadings}
-\markright{\aastex, AMS math, and \LaTeX\ symbols}%
-
-\begin{document}
-
-\begin{table}
-\caption{Additional \aastex\ symbols}
-\begin{center}
-\tabcolsep5pt
-\begin{tabular}{@{}ll@{\hspace*{1em}}ll@{}}
-$\lesssim$ & \verb"\lesssim", \verb"\la" &
-$\gtrsim$ & \verb"\gtrsim", \verb"\ga" \\
-\micron & \verb"\micron" &
-\sbond & \verb"\sbond" \\
-\dbond & \verb"\dbond" &
-\tbond & \verb"\tbond" \\
-$\sun$ & \verb"\sun" &
-$\earth$ & \verb"\earth" \\
-\diameter & \verb"\diameter" &
-\\
-\arcdeg & \verb"\arcdeg", \verb"\degr" &
-\sq & \verb"\sq" \\
-\arcmin & \verb"\arcmin" &
-\arcsec & \verb"\arcsec" \\
-\fd & \verb"\fd" &
-\fh & \verb"\fh" \\
-\fm & \verb"\fm" &
-\fs & \verb"\fs" \\
-\fdg & \verb"\fdg" &
-\farcm & \verb"\farcm" \\
-\farcs & \verb"\farcs" &
-\fp & \verb"\fp" \\
-\onehalf & \verb"\onehalf" &
-\ubvr & \verb"\ubvr" \\
-\onethird & \verb"\onethird" &
-\ub & \verb"\ub" \\
-\twothirds & \verb"\twothirds" &
-\bv & \verb"\bv" \\
-\onequarter & \verb"\onequarter" &
-\vr & \verb"\vr" \\
-\threequarters & \verb"\threequarters" &
-\ur & \verb"\ur" \\
-\end{tabular}
-\end{center}
-\end{table}
-
-\begin{table}
-\caption{Text-mode accents}
-\begin{center}
-\begin{tabular}{*{2}{ll@{\hspace{4em}}}ll}
-\`{o} & \verb"\`{o}" & \={o} & \verb"\={o}" & \t{oo} & \verb"\t{oo}" \\
-\'{o} & \verb"\'{o}" & \.{o} & \verb"\.{o}" & \c{o} & \verb"\c{o}" \\
-\^{o} & \verb"\^{o}" & \u{o} & \verb"\u{o}" & \d{o} & \verb"\d{o}" \\
-\"{o} & \verb#\"{o}# & \v{o} & \verb"\v{o}" & \b{o} & \verb"\b{o}" \\
-\~{o} & \verb"\~{o}" & \H{o} & \verb"\H{o}" & & \\
-\end{tabular}
-\end{center}
-\end{table}
-
-\begin{table}
-\caption{National symbols}
-\begin{center}
-\begin{tabular}{*{2}{ll@{\hspace{4em}}}ll}
-\oe & \verb"\oe" & \aa & \verb"\aa" & \l & \verb"\l" \\
-\OE & \verb"\OE" & \AA & \verb"\AA" & \L & \verb"\L" \\
-\ae & \verb"\ae" & \o & \verb"\o" & \ss & \verb"\ss" \\
-\AE & \verb"\AE" & \O & \verb"\O" & & \\
-\end{tabular}
-\end{center}
-\end{table}
-
-\begin{table}
-\caption{Math-mode accents}
-\begin{center}
-\begin{tabular}{ll@{\hspace{4em}}ll}
-$\hat{a}$ & \verb"\hat{a}" & $\dot{a}$ & \verb"\dot{a}" \\
-$\check{a}$ & \verb"\check{a}" & $\ddot{a}$ & \verb"\ddot{a}" \\
-$\tilde{a}$ & \verb"\tilde{a}" & $\breve{a}$ & \verb"\breve{a}" \\
-$\acute{a}$ & \verb"\acute{a}" & $\bar{a}$ & \verb"\bar{a}" \\
-$\grave{a}$ & \verb"\grave{a}" & $\vec{a}$ & \verb"\vec{a}" \\
-\end{tabular}
-\end{center}
-\end{table}
-
-\begin{table}
-\caption{Greek and Hebrew letters (math mode)}
-\begin{center}
-\begin{tabular}{cl@{\hspace{3em}}cl}
-$\alpha$ & \verb"\alpha" & $\nu$ & \verb"\nu" \\
-$\beta$ & \verb"\beta" & $\xi$ & \verb"\xi" \\
-$\gamma$ & \verb"\gamma" & $o$ & \verb"o" \\
-$\delta$ & \verb"\delta" & $\pi$ & \verb"\pi" \\
-$\epsilon$ & \verb"\epsilon" & $\rho$ & \verb"\rho" \\
-$\zeta$ & \verb"\zeta" & $\sigma$ & \verb"\sigma" \\
-$\eta$ & \verb"\eta" & $\tau$ & \verb"\tau" \\
-$\theta$ & \verb"\theta" & $\upsilon$ & \verb"\upsilon" \\
-$\iota$ & \verb"\iota" & $\phi$ & \verb"\phi" \\
-$\kappa$ & \verb"\kappa" & $\chi$ & \verb"\chi" \\
-$\lambda$ & \verb"\lambda" & $\psi$ & \verb"\psi" \\
-$\mu$ & \verb"\mu" & $\omega$ & \verb"\omega" \\
-
-$\digamma$ & \verb"\digamma" &
-$\varkappa$ & \verb"\varkappa" \\
-$\varepsilon$ & \verb"\varepsilon" & $\varsigma$ & \verb"\varsigma" \\
-$\vartheta$ & \verb"\vartheta" & $\varphi$ & \verb"\varphi" \\
-$\varrho$ & \verb"\varrho" & & \\
-
-$\Gamma$ & \verb"\Gamma" & $\Sigma$ & \verb"\Sigma" \\
-$\Delta$ & \verb"\Delta" & $\Upsilon$ & \verb"\Upsilon" \\
-$\Theta$ & \verb"\Theta" & $\Phi$ & \verb"\Phi" \\
-$\Lambda$ & \verb"\Lambda" & $\Psi$ & \verb"\Psi" \\
-$\Xi$ & \verb"\Xi" & $\Omega$ & \verb"\Omega" \\
-$\Pi$ & \verb"\Pi" & & \\
-
-$\aleph$ & \verb"\aleph" &
-$\beth$ & \verb"\beth" \\
-$\gimel$ & \verb"\gimel" &
-$\daleth$ & \verb"\daleth" \\
-\end{tabular}
-\end{center}
-\end{table}
-
-\begin{table}
-\caption{Binary operators (math mode)}
-\begin{center}
-\begin{tabular}{cl@{\hspace{3em}}cl}
-$\pm$ & \verb"\pm" & $\cap$ & \verb"\cap" \\
-$\mp$ & \verb"\mp" & $\cup$ & \verb"\cup" \\
-$\setminus$ & \verb"\setminus" & $\uplus$ & \verb"\uplus" \\
-$\cdot$ & \verb"\cdot" & $\sqcap$ & \verb"\sqcap" \\
-$\times$ & \verb"\times" & $\sqcup$ & \verb"\sqcup" \\
-$\ast$ & \verb"\ast" & $\triangleleft$ & \verb"\triangleleft" \\
-$\star$ & \verb"\star" & $\triangleright$ & \verb"\triangleright" \\
-$\diamond$ & \verb"\diamond" & $\wr$ & \verb"\wr" \\
-$\circ$ & \verb"\circ" & $\bigcirc$ & \verb"\bigcirc" \\
-$\bullet$ & \verb"\bullet" & $\bigtriangleup$ & \verb"\bigtriangleup" \\
-$\div$ & \verb"\div" & $\bigtriangledown$ & \verb"\bigtriangledown" \\
-$\lhd$ & \verb"\lhd" & $\rhd$ & \verb"\rhd" \\%FIXME
-$\vee$ & \verb"\vee" & $\odot$ & \verb"\odot" \\
-$\wedge$ & \verb"\wedge" & $\dagger$ & \verb"\dagger" \\
-$\oplus$ & \verb"\oplus" & $\ddagger$ & \verb"\ddagger" \\
-$\ominus$ & \verb"\ominus" & $\amalg$ & \verb"\amalg" \\
-$\otimes$ & \verb"\otimes" & $\unlhd$ & \verb"\unlhd" \\
-$\oslash$ & \verb"\oslash" & $\unrhd$ & \verb"\unrhd"
-\end{tabular}
-\end{center}
-\end{table}
-
-\clearpage
-
-\begin{table}
-\caption{AMS binary operators (math mode)}
-\begin{center}
-\begin{tabular}{ll@{\hspace{2em}}ll}
-$\dotplus$ & \verb"\dotplus" &
-$\ltimes$ & \verb"\ltimes" \\
-$\smallsetminus$ & \verb"\smallsetminus" &
-$\rtimes$ & \verb"\rtimes" \\
-$\Cap$ & \verb"\Cap", \verb"\doublecap" &
-$\leftthreetimes$ & \verb"\leftthreetimes" \\
-$\Cup$ & \verb"\Cup", \verb"\doublecup" &
-$\rightthreetimes$ & \verb"\rightthreetimes" \\
-$\barwedge$ & \verb"\barwedge" &
-$\curlywedge$ & \verb"\curlywedge" \\
-$\veebar$ & \verb"\veebar" &
-$\curlyvee$ & \verb"\curlyvee" \\
-$\doublebarwedge$ & \verb"\doublebarwedge" &
-\\
-$\boxminus$ & \verb"\boxminus" &
-$\circleddash$ & \verb"\circleddash" \\
-$\boxtimes$ & \verb"\boxtimes" &
-$\circledast$ & \verb"\circledast" \\
-$\boxdot$ & \verb"\boxdot" &
-$\circledcirc$ & \verb"\circledcirc" \\
-$\boxplus$ & \verb"\boxplus" &
-$\centerdot$ & \verb"\centerdot" \\
-$\divideontimes$ & \verb"\divideontimes" &
-$\intercal$ & \verb"\intercal" \\
-\end{tabular}
-\end{center}
-\end{table}
-
-\begin{table}
-\caption{Miscellaneous symbols}
-\begin{center}
-\begin{tabular}{ll@{\hspace{4em}}ll}
-\dag & \verb"\dag" & \S & \verb"\S" \\
-\copyright & \verb"\copyright"& \ddag & \verb"\ddag"\\
- \P & \verb"\P" & \pounds & \verb"\pounds" \\
-\# & \verb"\#" & \$ & \verb"\$"\\
- \% & \verb"\%" & \& & \verb"\&" \\
- \_ & \verb"\_" & \{ & \verb"\{" \\
- \} & \verb"\}" & & \\
-\end{tabular}
-\end{center}
-\end{table}
-
-\begin{table}
-\caption{Miscellaneous symbols (math mode)}
-\begin{center}
-\begin{tabular}{cl@{\hspace{3em}}cl}
-$\aleph$ & \verb"\aleph" & $\prime$ & \verb"\prime" \\
-$\hbar$ & \verb"\hbar" & $\emptyset$ & \verb"\emptyset" \\
-$\imath$ & \verb"\imath" & $\nabla$ & \verb"\nabla" \\
-$\jmath$ & \verb"\jmath" & $\surd$ & \verb"\surd" \\
-$\ell$ & \verb"\ell" & $\top$ & \verb"\top" \\
-$\wp$ & \verb"\wp" & $\bot$ & \verb"\bot" \\
-$\Re$ & \verb"\Re" & $\|$ & \verb"\|" \\
-$\Im$ & \verb"\Im" & $\angle$ & \verb"\angle" \\
-$\partial$ & \verb"\partial" & $\triangle$ & \verb"\triangle" \\
-$\infty$ & \verb"\infty" & $\backslash$ & \verb"\backslash" \\
-$\Box$ & \verb"\Box" & $\Diamond$ & \verb"\Diamond" \\
-$\forall$ & \verb"\forall" & $\sharp$ & \verb"\sharp" \\
-$\exists$ & \verb"\exists" & $\clubsuit$ & \verb"\clubsuit" \\
-$\neg$ & \verb"\neg" & $\diamondsuit$ & \verb"\diamondsuit" \\
-$\flat$ & \verb"\flat" & $\heartsuit$ & \verb"\heartsuit" \\
-$\natural$ & \verb"\natural" & $\spadesuit$ & \verb"\spadesuit" \\
-$\mho$ & \verb"\mho" & &
-\end{tabular}
-\end{center}
-\end{table}
-
-\begin{table}
-\caption{AMS miscellaneous symbols (math mode)}
-\begin{center}
-\begin{tabular}{ll@{\hspace{2em}}ll}
-$\hbar$ & \verb"\hbar" &
-$\backprime$ & \verb"\backprime" \\
-$\hslash$ & \verb"\hslash" &
-$\varnothing$ & \verb"\varnothing" \\
-$\vartriangle$ & \verb"\vartriangle" &
-$\blacktriangle$ & \verb"\blacktriangle" \\
-$\triangledown$ & \verb"\triangledown" &
-$\blacktriangledown$ & \verb"\blacktriangledown" \\
-$\square$ & \verb"\square" &
-$\blacksquare$ & \verb"\blacksquare" \\
-$\lozenge$ & \verb"\lozenge" &
-$\blacklozenge$ & \verb"\blacklozenge" \\
-$\circledS$ & \verb"\circledS" &
-$\bigstar$ & \verb"\bigstar" \\
-$\angle$ & \verb"\angle" &
-$\sphericalangle$ & \verb"\sphericalangle" \\
-$\measuredangle$ & \verb"\measuredangle" &
-\\
-$\nexists$ & \verb"\nexists" &
-$\complement$ & \verb"\complement" \\
-$\mho$ & \verb"\mho" &
-$\eth$ & \verb"\eth" \\
-$\Finv$ & \verb"\Finv" &
-$\diagup$ & \verb"\diagup" \\
-$\Game$ & \verb"\Game" &
-$\diagdown$ & \verb"\diagdown" \\
-$\Bbbk$ & \verb"\Bbbk" &
-$\restriction$ & \verb"\restriction" \\
-\end{tabular}
-\end{center}
-\end{table}
-
-\begin{table}
-\tabcolsep1pt
-\caption{Arrows (math mode)}
-\begin{center}
-\begin{tabular}{clcl}
-$\leftarrow$ & \verb"\leftarrow" &
-$\longleftarrow$ & \verb"\longleftarrow" \\
-$\Leftarrow$ & \verb"\Leftarrow" &
-$\Longleftarrow$ & \verb"\Longleftarrow" \\
-$\rightarrow$ & \verb"\rightarrow" &
-$\longrightarrow$ & \verb"\longrightarrow" \\
-$\Rightarrow$ & \verb"\Rightarrow" &
-$\Longrightarrow$ & \verb"\Longrightarrow" \\
-$\leftrightarrow$ & \verb"\leftrightarrow" &
-$\longleftrightarrow$ & \verb"\longleftrightarrow" \\
-$\Leftrightarrow$ & \verb"\Leftrightarrow" &
-$\Longleftrightarrow$ & \verb"\Longleftrightarrow" \\
-$\mapsto$ & \verb"\mapsto" &
-$\longmapsto$ & \verb"\longmapsto" \\
-$\hookleftarrow$ & \verb"\hookleftarrow" &
-$\hookrightarrow$ & \verb"\hookrightarrow" \\
-$\leftharpoonup$ & \verb"\leftharpoonup" &
-$\rightharpoonup$ & \verb"\rightharpoonup" \\
-$\leftharpoondown$ & \verb"\leftharpoondown" &
-$\rightharpoondown$ & \verb"\rightharpoondown" \\
-$\rightleftharpoons$ & \verb"\rightleftharpoons" &
-$\leadsto$ & \verb"\leadsto" \\
-$\uparrow$ & \verb"\uparrow" &
-$\Updownarrow$ & \verb"\Updownarrow" \\
-$\Uparrow$ & \verb"\Uparrow" &
-$\nearrow$ & \verb"\nearrow" \\
-$\downarrow$ & \verb"\downarrow" &
-$\searrow$ & \verb"\searrow" \\
-$\Downarrow$ & \verb"\Downarrow" &
-$\swarrow$ & \verb"\swarrow" \\
-$\updownarrow$ & \verb"\updownarrow" &
-$\nwarrow$ & \verb"\nwarrow"
-\end{tabular}
-\end{center}
-\end{table}
-
-\begin{table}
-\tabcolsep1pt
-\caption{AMS arrows (math mode)}
-\begin{center}
-\begin{tabular}{llll}
-$\dashleftarrow$ & \verb"\dashleftarrow" &
-$\dashrightarrow$ & \verb"\dashrightarrow" \\
-$\leftleftarrows$ & \verb"\leftleftarrows" &
-$\rightrightarrows$ & \verb"\rightrightarrows" \\
-$\leftrightarrows$ & \verb"\leftrightarrows" &
-$\rightleftarrows$ & \verb"\rightleftarrows" \\
-$\Lleftarrow$ & \verb"\Lleftarrow" &
-$\Rrightarrow$ & \verb"\Rrightarrow" \\
-$\twoheadleftarrow$ & \verb"\twoheadleftarrow" &
-$\twoheadrightarrow$ & \verb"\twoheadrightarrow" \\
-$\leftarrowtail$ & \verb"\leftarrowtail" &
-$\rightarrowtail$ & \verb"\rightarrowtail" \\
-$\looparrowleft$ & \verb"\looparrowleft" &
-$\looparrowright$ & \verb"\looparrowright" \\
-$\leftrightharpoons$ & \verb"\leftrightharpoons" &
-$\rightleftharpoons$ & \verb"\rightleftharpoons" \\
-$\curvearrowleft$ & \verb"\curvearrowleft" &
-$\curvearrowright$ & \verb"\curvearrowright" \\
-$\circlearrowleft$ & \verb"\circlearrowleft" &
-$\circlearrowright$ & \verb"\circlearrowright" \\
-$\Lsh$ & \verb"\Lsh" &
-$\Rsh$ & \verb"\Rsh" \\
-$\upuparrows$ & \verb"\upuparrows" &
-$\downdownarrows$ & \verb"\downdownarrows" \\
-$\upharpoonleft$ & \verb"\upharpoonleft" &
-$\upharpoonright$ & \verb"\upharpoonright" \\
-$\downharpoonleft$ & \verb"\downharpoonleft" &
-$\downharpoonright$ & \verb"\downharpoonright" \\
-$\multimap$ & \verb"\multimap" &
-$\rightsquigarrow$ & \verb"\rightsquigarrow" \\
-$\leftrightsquigarrow$ & \verb"\leftrightsquigarrow" &
-\\
-$\nleftarrow$ & \verb"\nleftarrow" &
-$\nrightarrow$ & \verb"\nrightarrow" \\
-$\nLeftarrow$ & \verb"\nLeftarrow" &
-$\nRightarrow$ & \verb"\nRightarrow" \\
-$\nleftrightarrow$ & \verb"\nleftrightarrow" &
-$\nLeftrightarrow$ & \verb"\nLeftrightarrow" \\
-\end{tabular}
-\end{center}
-\end{table}
-
-\begin{table}
-\caption{Relations (math mode)}
-\begin{center}
-\begin{tabular}{cl@{\hspace{4em}}cl}
-
-$\leq$ & \verb"\leq" & $\geq$ & \verb"\geq" \\
-$\prec$ & \verb"\prec" & $\succ$ & \verb"\succ" \\
-$\preceq$ & \verb"\preceq" & $\succeq$ & \verb"\succeq" \\
-$\ll$ & \verb"\ll" & $\gg$ & \verb"\gg" \\
-$\subset$ & \verb"\subset" & $\supset$ & \verb"\supset" \\
-$\subseteq$ & \verb"\subseteq" & $\supseteq$ & \verb"\supseteq" \\
-$\sqsubset$ & \verb"\sqsubset" & $\sqsupset$ & \verb"\sqsupset" \\
-$\sqsubseteq$ & \verb"\sqsubseteq" & $\sqsupseteq$ & \verb"\sqsupseteq" \\
-$\in$ & \verb"\in" & $\ni$ & \verb"\ni" \\
-$\vdash$ & \verb"\vdash" & $\dashv$ & \verb"\dashv" \\
-$\smile$ & \verb"\smile" & $\mid$ & \verb"\mid" \\
-$\frown$ & \verb"\frown" & $\parallel$ & \verb"\parallel" \\
-$\neq$ & \verb"\neq" & $\perp$ & \verb"\perp" \\
-$\equiv$ & \verb"\equiv" & $\cong$ & \verb"\cong" \\
-$\sim$ & \verb"\sim" & $\bowtie$ & \verb"\bowtie" \\
-$\simeq$ & \verb"\simeq" & $\propto$ & \verb"\propto" \\
-$\asymp$ & \verb"\asymp" & $\models$ & \verb"\models" \\
-$\approx$ & \verb"\approx" & $\doteq$ & \verb"\doteq" \\
- & & $\Join$ & \verb"\Join"
-\end{tabular}
-\end{center}
-\end{table}
-
-\begin{table}
-\tabcolsep1pt
-\caption{AMS binary relations (math mode)}
-\begin{center}
-\begin{tabular}{ll@{\hspace{1em}}ll}
-$\leqq$ & \verb"\leqq" &
-$\geqq$ & \verb"\geqq" \\
-$\leqslant$ & \verb"\leqslant" &
-$\geqslant$ & \verb"\geqslant" \\
-$\eqslantless$ & \verb"\eqslantless" &
-$\eqslantgtr$ & \verb"\eqslantgtr" \\
-$\lesssim$ & \verb"\lesssim" &
-$\gtrsim$ & \verb"\gtrsim" \\
-$\lessapprox$ & \verb"\lessapprox" &
-$\gtrapprox$ & \verb"\gtrapprox" \\
-$\approxeq$ & \verb"\approxeq" &
-$\eqsim$ & \verb"\eqsim" \\
-$\lessdot$ & \verb"\lessdot" &
-$\gtrdot$ & \verb"\gtrdot" \\
-$\lll$ & \verb"\lll", \verb"\llless" &
-$\ggg$ & \verb"\ggg", \verb"\gggtr" \\
-$\lessgtr$ & \verb"\lessgtr" &
-$\gtrless$ & \verb"\gtrless" \\
-$\lesseqgtr$ & \verb"\lesseqgtr" &
-$\gtreqless$ & \verb"\gtreqless" \\
-$\lesseqqgtr$ & \verb"\lesseqqgtr" &
-$\gtreqqless$ & \verb"\gtreqqless" \\
-$\doteqdot$ & \verb"\doteqdot", \verb"\Doteq" &
-$\eqcirc$ & \verb"\eqcirc" \\
-$\risingdotseq$ & \verb"\risingdotseq" &
-$\circeq$ & \verb"\circeq" \\
-$\fallingdotseq$ & \verb"\fallingdotseq" &
-$\triangleq$ & \verb"\triangleq" \\
-$\backsim$ & \verb"\backsim" &
-$\thicksim$ & \verb"\thicksim" \\
-$\backsimeq$ & \verb"\backsimeq" &
-$\thickapprox$ & \verb"\thickapprox" \\
-$\subseteqq$ & \verb"\subseteqq" &
-$\supseteqq$ & \verb"\supseteqq" \\
-$\Subset$ & \verb"\Subset" &
-$\Supset$ & \verb"\Supset" \\
-$\sqsubset$ & \verb"\sqsubset" &
-$\sqsupset$ & \verb"\sqsupset" \\
-$\preccurlyeq$ & \verb"\preccurlyeq" &
-$\succcurlyeq$ & \verb"\succcurlyeq" \\
-$\curlyeqprec$ & \verb"\curlyeqprec" &
-$\curlyeqsucc$ & \verb"\curlyeqsucc" \\
-$\precsim$ & \verb"\precsim" &
-$\succsim$ & \verb"\succsim" \\
-$\precapprox$ & \verb"\precapprox" &
-$\succapprox$ & \verb"\succapprox" \\
-$\vartriangleleft$ & \verb"\vartriangleleft" &
-$\vartriangleright$ & \verb"\vartriangleright" \\
-$\trianglelefteq$ & \verb"\trianglelefteq" &
-$\trianglerighteq$ & \verb"\trianglerighteq" \\
-$\vDash$ & \verb"\vDash" &
-$\Vdash$ & \verb"\Vdash" \\
-$\Vvdash$ & \verb"\Vvdash" &
-\\
-$\smallsmile$ & \verb"\smallsmile" &
-$\shortmid$ & \verb"\shortmid" \\
-$\smallfrown$ & \verb"\smallfrown" &
-$\shortparallel$ & \verb"\shortparallel" \\
-$\bumpeq$ & \verb"\bumpeq" &
-$\between$ & \verb"\between" \\
-$\Bumpeq$ & \verb"\Bumpeq" &
-$\pitchfork$ & \verb"\pitchfork" \\
-$\varpropto$ & \verb"\varpropto" &
-$\backepsilon$ & \verb"\backepsilon" \\
-$\blacktriangleleft$ & \verb"\blacktriangleleft" &
-$\blacktriangleright$ & \verb"\blacktriangleright" \\
-$\therefore$ & \verb"\therefore" &
-$\because$ & \verb"\because" \\
-\end{tabular}
-\end{center}
-\end{table}
-
-\begin{table}
-\caption{AMS negated relations (math mode)}
-\begin{center}
-\begin{tabular}{ll@{\hspace{2em}}ll}
-$\nless$ & \verb"\nless" &
-$\ngtr$ & \verb"\ngtr" \\
-$\nleq$ & \verb"\nleq" &
-$\ngeq$ & \verb"\ngeq" \\
-$\nleqslant$ & \verb"\nleqslant" &
-$\ngeqslant$ & \verb"\ngeqslant" \\
-$\nleqq$ & \verb"\nleqq" &
-$\ngeqq$ & \verb"\ngeqq" \\
-$\lneq$ & \verb"\lneq" &
-$\gneq$ & \verb"\gneq" \\
-$\lneqq$ & \verb"\lneqq" &
-$\gneqq$ & \verb"\gneqq" \\
-$\lvertneqq$ & \verb"\lvertneqq" &
-$\gvertneqq$ & \verb"\gvertneqq" \\
-$\lnsim$ & \verb"\lnsim" &
-$\gnsim$ & \verb"\gnsim" \\
-$\lnapprox$ & \verb"\lnapprox" &
-$\gnapprox$ & \verb"\gnapprox" \\
-$\nprec$ & \verb"\nprec" &
-$\nsucc$ & \verb"\nsucc" \\
-$\npreceq$ & \verb"\npreceq" &
-$\nsucceq$ & \verb"\nsucceq" \\
-$\precneqq$ & \verb"\precneqq" &
-$\succneqq$ & \verb"\succneqq" \\
-$\precnsim$ & \verb"\precnsim" &
-$\succnsim$ & \verb"\succnsim" \\
-$\precnapprox$ & \verb"\precnapprox" &
-$\succnapprox$ & \verb"\succnapprox" \\
-$\nsim$ & \verb"\nsim" &
-$\ncong$ & \verb"\ncong" \\
-$\nshortmid$ & \verb"\nshortmid" &
-$\nshortparallel$ & \verb"\nshortparallel" \\
-$\nmid$ & \verb"\nmid" &
-$\nparallel$ & \verb"\nparallel" \\
-$\nvdash$ & \verb"\nvdash" &
-$\nvDash$ & \verb"\nvDash" \\
-$\nVdash$ & \verb"\nVdash" &
-$\nVDash$ & \verb"\nVDash" \\
-$\ntriangleleft$ & \verb"\ntriangleleft" &
-$\ntriangleright$ & \verb"\ntriangleright" \\
-$\ntrianglelefteq$ & \verb"\ntrianglelefteq" &
-$\ntrianglerighteq$ & \verb"\ntrianglerighteq" \\
-$\nsubseteq$ & \verb"\nsubseteq" &
-$\nsupseteq$ & \verb"\nsupseteq" \\
-$\nsubseteqq$ & \verb"\nsubseteqq" &
-$\nsupseteqq$ & \verb"\nsupseteqq" \\
-$\subsetneq$ & \verb"\subsetneq" &
-$\supsetneq$ & \verb"\supsetneq" \\
-$\varsubsetneq$ & \verb"\varsubsetneq" &
-$\varsupsetneq$ & \verb"\varsupsetneq" \\
-$\subsetneqq$ & \verb"\subsetneqq" &
-$\supsetneqq$ & \verb"\supsetneqq" \\
-$\varsubsetneqq$ & \verb"\varsubsetneqq" &
-$\varsupsetneqq$ & \verb"\varsupsetneqq" \\
-\end{tabular}
-\end{center}
-\end{table}
-
-\begin{table}
-\caption{Variable-sized symbols (math mode)}
-\begin{center}
-\begin{displaymath}
-\begin{array}{ccl@{\hspace{2em}}ccl}
-\sum & \displaystyle \sum & \hbox{\verb"\sum"} &
-\bigcap & \displaystyle \bigcap & \hbox{\verb"\bigcap"} \\
-\prod & \displaystyle \prod & \hbox{\verb"\prod"} &
-\bigcup & \displaystyle \bigcup & \hbox{\verb"\bigcup"} \\
-\coprod & \displaystyle \coprod & \hbox{\verb"\coprod"} &
-\bigsqcup & \displaystyle \bigsqcup & \hbox{\verb"\bigsqcup"} \\
-\int & \displaystyle \int & \hbox{\verb"\int"} &
-\bigvee & \displaystyle \bigvee & \hbox{\verb"\bigvee"} \\
-\oint & \displaystyle \oint & \hbox{\verb"\oint"} &
-\bigwedge & \displaystyle \bigwedge & \hbox{\verb"\bigwedge"} \\
-\bigodot & \displaystyle \bigodot & \hbox{\verb"\bigodot"} &
-\bigotimes & \displaystyle \bigotimes & \hbox{\verb"\bigotimes"} \\
-\bigoplus & \displaystyle \bigoplus & \hbox{\verb"\bigoplus"} &
-\biguplus & \displaystyle \biguplus & \hbox{\verb"\biguplus"} \\
-\end{array}
-\end{displaymath}
-\end{center}
-\end{table}
-
-\begin{table}
-\caption{Delimiters (math mode)}
-\begin{center}
-\begin{tabular}{lc@{\hspace{2em}}lc}
-$($ & \verb"(" & $)$ & \verb")" \\
-$[$ & \verb"[" & $]$ & \verb"]" \\
-$\{$ & \verb"\{" & $\}$ & \verb"\}" \\
-$\lfloor$ & \verb"\lfloor" & $\rfloor$ & \verb"\rfloor" \\
-$\lceil$ & \verb"\lceil" & $\rceil$ & \verb"\rceil" \\
-$\langle$ & \verb"\langle" & $\rangle$ & \verb"\rangle" \\
-$/$ & \verb"/" & $\backslash$ & \verb"\backslash" \\
-$\vert$ & \verb"\vert" & $\Vert$ & \verb"\Vert" \\
-$\uparrow$ & \verb"\uparrow" & $\Uparrow$ & \verb"\Uparrow" \\
-$\downarrow$ & \verb"\downarrow" & $\Downarrow$ & \verb"\Downarrow" \\
-$\updownarrow$ & \verb"\updownarrow" &
-$\Updownarrow$ & \verb"\Updownarrow" \\
-$\ulcorner$ & \verb"\ulcorner" &
-$\urcorner$ & \verb"\urcorner" \\
-$\llcorner$ & \verb"\llcorner" &
-$\lrcorner$ & \verb"\lrcorner" \\
-\end{tabular}
-\end{center}
-\end{table}
-
-\begin{table}
-\caption{Function names (math mode)}
-\begin{verbatim}
- \arccos \csc \ker \min
- \arcsin \deg \lg \Pr
- \arctan \det \lim \sec
- \arg \dim \liminf \sin
- \cos \exp \limsup \sinh
- \cosh \gcd \ln \sup
- \cot \hom \log \tan
- \coth \inf \max \tanh
-\end{verbatim}
-\end{table}
-\end{document}
diff --git a/Master/texmf-dist/doc/latex/aastex/natbib.tex b/Master/texmf-dist/doc/latex/aastex/natbib.tex
deleted file mode 100644
index af6bb7052e8..00000000000
--- a/Master/texmf-dist/doc/latex/aastex/natbib.tex
+++ /dev/null
@@ -1,96 +0,0 @@
-\documentclass[onecolumn]{aastex3}
-
-\newcommand\aastex{AAS\TeX}%
-
-\begin{document}
-
-\begin{center}
-Using {\tt\string natbib} with \aastex
-\end{center}
-
-\aastex\ uses Patrick Daly's {\tt\string natbib} package to manage
-citations. The {\tt\string natbib} package re-implements LaTeX's
-{\tt\string\cite} command, and offers greater flexibility for managing
-citations in the author-year form. {\tt\string natbib} is required with the
-\aastex\ package but fortunately {\tt\string natbib} is included in most
-modern distributions. Authors are encouraged to read the {\tt\string
-natbib} documentation for complete details on the package's capabilites.
-All examples in this document are adapted from the {\tt\string natbib}
-documentation.
-
-Authors must use the LaTeX's {\tt\string thebibliography} environment to
-use the {\tt\string natbib} extensions. Here is a bibliography with two
-entries marked up in the {\tt\string natbib} style:
-
-\begin{verbatim}
-\begin{thebibliography}{}
-\bibitem[James et al.(1991)]{jam91} James, H. ...
-\bibitem[Jones et al.(1990)Jones, Baker, and Williams]{jon90} Jones, J. ...
-\end{thebibliography}
-\end{verbatim}
-
-The square-bracketed argument contains the "author" portion of the citation
-followed by the year in parentheses. The parentheses are important, so do
-not leave them out. Note that in the second {\tt\string\bibitem}, the
-square-bracketed argument includes two author lists, a short version before
-the year and a long version after. Authors should use this form of the
-markup if they wish to use the * forms of the {\tt\string\cite} commands.
-(See the examples below.)
-
-The text in the curly-brace argument of the {\tt\string\bibitem} is the
-citation key and should be used as the argument in the corresponding cite
-commands in the text. The two basic text citation commands are
-{\tt\string\citet} and {\tt\string\citep}. ({\tt\string\citet} corresponds
-to the plain LaTeX {\tt\string\cite} command.) Use the two optional
-arguments to append text before or after the citationtext in the first set
-of square brackets will appear before the cite, text in the second set will
-appear after it. Use the asterisk (*) form of the cite commands to print
-the long version of the author lists for references that have been marked
-up in the manner of the "jon90" example.
-
-Here are some {\tt\string\citet} and {\tt\string\citep} examples taken from
-the {\tt\string natbib} package
-documentation\footnote{\url{http://www.ctan.org/pkg/natbib}}.
-
-\begin{tabular}{ll}
-\textbf{Command} & \textbf{Output} \\
-\verb|\citet{jon90}| & Jones et al. (1990) \\
-\verb|\citet[chap.~2]{jon90}| & Jones et al. (1990, chap.~2) \\
-\verb|\citep{jon90}| & (Jones et al., 1990) \\
-\verb|\citep[chap.~2]{jon90}| & (Jones et al., 1990, chap.~2) \\
-\verb|\citep[see][]{jon90}| & (see Jones et al., 1990) \\
-\verb|\citep[see][chap.~2]{jon90}| & (see Jones et al., 1990, chap.~2) \\
-\verb|\citet*{jon90}| & Jones, Baker, and Williams (1990) \\
-\verb|\citep*{jon90}| & (Jones, Baker, and Williams, 1990) \\
-\verb|\citet{jon90,jam91}| & Jones et al. (1990); James et al. (1991) \\
-\verb|\citep{jon90,jam91}| & (Jones et al., 1990; James et al. 1991) \\
-\verb|\citep{jon90,jon91}| & (Jones et al., 1990, 1991) \\
-\verb|\citep{jon90a,jon90b}| & (Jones et al., 1990a,b) \\
-\end{tabular}
-
-Alternatively, use {\tt\string\citealt} and {\tt\string\citealp} to produce
-a cite without parentheses:
-
-\begin{tabular}{ll}
-\textbf{Command} & \textbf{Output} \\
-\verb|\citealt{jon90}| & Jones et al. 1990 \\
-\verb|\citealt*\{jon90}| & Jones et al., 1990 \\
-\verb|\citealp*\{jon90}| & Jones, Baker, and Williams, 1990 \\
-\verb|\citealp{jon90,jam91}| & Jones et al., 1990; James et al., 1991 \\
-\verb|\citealp[pg.~32]{jon90}| & Jones et al., 1990, pg.~32 \\
-\end{tabular}
-
-\clearpage
-
-Finally, the {\tt\string\citeauthor} and {\tt\string\citeyear} commands can
-be used to print only the author or year portion of the citation:
-
-\begin{tabular}{ll}
-\textbf{Command} & \textbf{Output} \\
-\verb|\citeauthor{jon90}| & Jones et al. \\
-\verb|\citeauthor*{jon90}| & Jones, Baker, and Williams \\
-\verb|\citeyear{jon90}| & 1990 \\
-\verb|\citeyearpar{jon90}| & (1990) \\
-\end{tabular}
-
-\end{document}
diff --git a/Master/texmf-dist/doc/latex/aastex/sample63.bib b/Master/texmf-dist/doc/latex/aastex/sample631.bib
index 0402ac900d9..d86236b07f7 100644
--- a/Master/texmf-dist/doc/latex/aastex/sample63.bib
+++ b/Master/texmf-dist/doc/latex/aastex/sample631.bib
@@ -1,3 +1,22 @@
+@ARTICLE{2018AJ....156..123A,
+ author = {{Astropy Collaboration} and {Price-Whelan}, A.~M. and {Sip{\H{o}}cz}, B.~M. and {G{\"u}nther}, H.~M. and {Lim}, P.~L. and {Crawford}, S.~M. and {Conseil}, S. and {Shupe}, D.~L. and {Craig}, M.~W. and {Dencheva}, N. and {Ginsburg}, A. and {VanderPlas}, J.~T. and {Bradley}, L.~D. and {P{\'e}rez-Su{\'a}rez}, D. and {de Val-Borro}, M. and {Aldcroft}, T.~L. and {Cruz}, K.~L. and {Robitaille}, T.~P. and {Tollerud}, E.~J. and {Ardelean}, C. and {Babej}, T. and {Bach}, Y.~P. and {Bachetti}, M. and {Bakanov}, A.~V. and {Bamford}, S.~P. and {Barentsen}, G. and {Barmby}, P. and {Baumbach}, A. and {Berry}, K.~L. and {Biscani}, F. and {Boquien}, M. and {Bostroem}, K.~A. and {Bouma}, L.~G. and {Brammer}, G.~B. and {Bray}, E.~M. and {Breytenbach}, H. and {Buddelmeijer}, H. and {Burke}, D.~J. and {Calderone}, G. and {Cano Rodr{\'\i}guez}, J.~L. and {Cara}, M. and {Cardoso}, J.~V.~M. and {Cheedella}, S. and {Copin}, Y. and {Corrales}, L. and {Crichton}, D. and {D'Avella}, D. and {Deil}, C. and {Depagne}, {\'E}. and {Dietrich}, J.~P. and {Donath}, A. and {Droettboom}, M. and {Earl}, N. and {Erben}, T. and {Fabbro}, S. and {Ferreira}, L.~A. and {Finethy}, T. and {Fox}, R.~T. and {Garrison}, L.~H. and {Gibbons}, S.~L.~J. and {Goldstein}, D.~A. and {Gommers}, R. and {Greco}, J.~P. and {Greenfield}, P. and {Groener}, A.~M. and {Grollier}, F. and {Hagen}, A. and {Hirst}, P. and {Homeier}, D. and {Horton}, A.~J. and {Hosseinzadeh}, G. and {Hu}, L. and {Hunkeler}, J.~S. and {Ivezi{\'c}}, {\v{Z}}. and {Jain}, A. and {Jenness}, T. and {Kanarek}, G. and {Kendrew}, S. and {Kern}, N.~S. and {Kerzendorf}, W.~E. and {Khvalko}, A. and {King}, J. and {Kirkby}, D. and {Kulkarni}, A.~M. and {Kumar}, A. and {Lee}, A. and {Lenz}, D. and {Littlefair}, S.~P. and {Ma}, Z. and {Macleod}, D.~M. and {Mastropietro}, M. and {McCully}, C. and {Montagnac}, S. and {Morris}, B.~M. and {Mueller}, M. and {Mumford}, S.~J. and {Muna}, D. and {Murphy}, N.~A. and {Nelson}, S. and {Nguyen}, G.~H. and {Ninan}, J.~P. and {N{\"o}the}, M. and {Ogaz}, S. and {Oh}, S. and {Parejko}, J.~K. and {Parley}, N. and {Pascual}, S. and {Patil}, R. and {Patil}, A.~A. and {Plunkett}, A.~L. and {Prochaska}, J.~X. and {Rastogi}, T. and {Reddy Janga}, V. and {Sabater}, J. and {Sakurikar}, P. and {Seifert}, M. and {Sherbert}, L.~E. and {Sherwood-Taylor}, H. and {Shih}, A.~Y. and {Sick}, J. and {Silbiger}, M.~T. and {Singanamalla}, S. and {Singer}, L.~P. and {Sladen}, P.~H. and {Sooley}, K.~A. and {Sornarajah}, S. and {Streicher}, O. and {Teuben}, P. and {Thomas}, S.~W. and {Tremblay}, G.~R. and {Turner}, J.~E.~H. and {Terr{\'o}n}, V. and {van Kerkwijk}, M.~H. and {de la Vega}, A. and {Watkins}, L.~L. and {Weaver}, B.~A. and {Whitmore}, J.~B. and {Woillez}, J. and {Zabalza}, V. and {Astropy Contributors}},
+ title = "{The Astropy Project: Building an Open-science Project and Status of the v2.0 Core Package}",
+ journal = {\aj},
+ keywords = {methods: data analysis, methods: miscellaneous, methods: statistical, reference systems, Astrophysics - Instrumentation and Methods for Astrophysics},
+ year = 2018,
+ month = sep,
+ volume = {156},
+ number = {3},
+ eid = {123},
+ pages = {123},
+ doi = {10.3847/1538-3881/aabc4f},
+archivePrefix = {arXiv},
+ eprint = {1801.02634},
+ primaryClass = {astro-ph.IM},
+ adsurl = {https://ui.adsabs.harvard.edu/abs/2018AJ....156..123A},
+ adsnote = {Provided by the SAO/NASA Astrophysics Data System}
+}
+
@ARTICLE{2013A&A...558A..33A,
author = {{Astropy Collaboration} and {Robitaille}, Thomas P. and
{Tollerud}, Erik J. and {Greenfield}, Perry and {Droettboom}, Michael and
diff --git a/Master/texmf-dist/doc/latex/aastex/sample63.pdf b/Master/texmf-dist/doc/latex/aastex/sample631.pdf
index bb3163040de..a70bc04bcc8 100644
--- a/Master/texmf-dist/doc/latex/aastex/sample63.pdf
+++ b/Master/texmf-dist/doc/latex/aastex/sample631.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/aastex/sample63.tex b/Master/texmf-dist/doc/latex/aastex/sample631.tex
index a81a0cec3a7..2fe35107a8a 100644
--- a/Master/texmf-dist/doc/latex/aastex/sample63.tex
+++ b/Master/texmf-dist/doc/latex/aastex/sample631.tex
@@ -1,18 +1,22 @@
-
-%% Beginning of file 'sample63.tex'
+%% Beginning of file 'sample631.tex'
%%
-%% Modified 2019 June
+%% Modified 2021 March
%%
%% This is a sample manuscript marked up using the
-%% AASTeX v6.3 LaTeX 2e macros.
+%% AASTeX v6.31 LaTeX 2e macros.
%%
%% AASTeX is now based on Alexey Vikhlinin's emulateapj.cls
%% (Copyright 2000-2015). See the classfile for details.
-%% AASTeX requires revtex4-1.cls (http://publish.aps.org/revtex4/) and
-%% other external packages (latexsym, graphicx, amssymb, longtable, and epsf).
-%% All of these external packages should already be present in the modern TeX
-%% distributions. If not they can also be obtained at www.ctan.org.
+%% AASTeX requires revtex4-1.cls and other external packages such as
+%% latexsym, graphicx, amssymb, longtable, and epsf. Note that as of
+%% Oct 2020, APS now uses revtex4.2e for its journals but remember that
+%% AASTeX v6+ still uses v4.1. All of these external packages should
+%% already be present in the modern TeX distributions but not always.
+%% For example, revtex4.1 seems to be missing in the linux version of
+%% TexLive 2020. One should be able to get all packages from www.ctan.org.
+%% In particular, revtex v4.1 can be found at
+%% https://www.ctan.org/pkg/revtex4-1.
%% 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
@@ -21,15 +25,14 @@
%% typeset, one-column, single-spaced document. It is the default and thus
%% does not need to be explicitly stated.
%%
-%%
%% using aastex version 6.3
-\documentclass{aastex63}
+\documentclass[linenumbers]{aastex631}
%% 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 invoked like this:
%%
-%% \documentclass[arguments]{aastex63}
+%% \documentclass[arguments]{aastex631}
%%
%% where the layout options are:
%%
@@ -42,9 +45,10 @@
%% modern : a stylish, single text column, 12 point font, article with
%% wider left and right margins. This uses the Daniel
%% Foreman-Mackey and David Hogg design.
-%% RNAAS : Preferred style for Research Notes which are by design
-%% lacking an abstract and brief. DO NOT use \begin{abstract}
-%% and \end{abstract} with this style.
+%% RNAAS : Supresses an abstract. Originally for RNAAS manuscripts
+%% but now that abstracts are required this is obsolete for
+%% AAS Journals. Authors might need it for other reasons. DO NOT
+%% use \begin{abstract} and \end{abstract} with this style.
%%
%% Note that you can submit to the AAS Journals in any of these 6 styles.
%%
@@ -68,7 +72,7 @@
%%
%% these can be used in any combination, e.g.
%%
-%% \documentclass[twocolumn,linenumbers,trackchanges]{aastex63}
+%% \documentclass[twocolumn,linenumbers,trackchanges]{aastex631}
%%
%% AASTeX v6.* now includes \hyperref support. While we have built in specific
%% defaults into the classfile you can manually override them with the
@@ -93,14 +97,15 @@
\newcommand\latex{La\TeX}
%% Reintroduced the \received and \accepted commands from AASTeX v5.2
-\received{June 1, 2019}
-\revised{January 10, 2019}
-\accepted{\today}
+%\received{March 1, 2021}
+%\revised{April 1, 2021}
+%\accepted{\today}
+
%% Command to document which AAS Journal the manuscript was submitted to.
%% Adds "Submitted to " the argument.
-\submitjournal{AJ}
+%\submitjournal{PSJ}
-%% For manuscript that include authors in collaborations, AASTeX v6.3
+%% For manuscript that include authors in collaborations, AASTeX v6.31
%% 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
@@ -146,7 +151,7 @@
%%
%% If you wish, you may supply running head information, although
%% this information may be modified by the editorial offices.
-\shorttitle{Sample article}
+\shorttitle{AASTeX v6.31 Sample article}
\shortauthors{Schwarz et al.}
%%
%% You can add a light gray and diagonal water-mark to the first page
@@ -158,18 +163,18 @@
%% where dimension is any recognized LaTeX dimension, e.g. pt, in, etc.
%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
+\graphicspath{{./}{figures/}}
%% This is the end of the preamble. Indicate the beginning of the
%% manuscript itself with \begin{document}.
\begin{document}
\title{Template \aastex Article with Examples:
-v6.3\footnote{Released on June, 10th, 2019}}
+v6.31\footnote{Released on March, 1st, 2021}}
%% 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.3 you can include a footnote in the title.
+%% you desire. In v6.31 you can include a footnote in the title.
%% A significant change from earlier AASTEX versions is in the structure for
%% calling author and affiliations. The change was necessary to implement
@@ -187,7 +192,7 @@ v6.3\footnote{Released on June, 10th, 2019}}
%% the authors name.
%%
%% Use \affiliation for affiliation information. The old \affil is now aliased
-%% to \affiliation. AASTeX v6.3 will automatically index these in the header.
+%% to \affiliation. AASTeX v6.31 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
@@ -204,7 +209,7 @@ v6.3\footnote{Released on June, 10th, 2019}}
%%
%% 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.3 to identify the
+%% \correspondingauthor command is available in V6.31 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.
%%
@@ -216,8 +221,8 @@ v6.3\footnote{Released on June, 10th, 2019}}
%% automatically put the author and affiliation information from the manuscript
%% and save the corresponding author the trouble of entering it by hand.
-\correspondingauthor{August Muench}
-\email{greg.schwarz@aas.org, gus.muench@aas.org}
+%\correspondingauthor{August Muench}
+%\email{greg.schwarz@aas.org, gus.muench@aas.org}
\author[0000-0002-0786-7307]{Greg J. Schwarz}
\affiliation{American Astronomical Society \\
@@ -229,35 +234,30 @@ Washington, DC 20006, USA}
1667 K Street NW, Suite 800 \\
Washington, DC 20006, USA}
-\collaboration{1}{(AAS Journals Data Scientists collaboration)}
+\collaboration{6}{(AAS Journals Data Editors)}
\author{Butler Burton}
\affiliation{Leiden University}
\affiliation{AAS Journals Associate Editor-in-Chief}
-\nocollaboration{1}
\author{Amy Hendrickson}
\altaffiliation{AASTeX v6+ programmer}
\affiliation{TeXnology Inc.}
-\collaboration{1}{(LaTeX collaboration)}
-
\author{Julie Steffen}
\affiliation{AAS Director of Publishing}
\affiliation{American Astronomical Society \\
1667 K Street NW, Suite 800 \\
Washington, DC 20006, USA}
-\author{Scott Chernoff}
+\author{Magaret Donnelly}
\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.3 has the new \collaboration and \nocollaboration commands to
+%% AASTeX 6.31 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
@@ -271,7 +271,7 @@ Washington, DC 20006, USA}
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.3. This
+previous versions as well as the bug fixes in version 6.31. 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
@@ -279,19 +279,21 @@ documentation. Authors are welcome replace the text, tables, figures, and
bibliography with their own and submit the resulting manuscript to the AAS
Journals peer review system. The first lesson in the tutorial is to remind
authors that the AAS Journals, the Astrophysical Journal (ApJ), the
-Astrophysical Journal Letters (ApJL), and Astronomical Journal (AJ), all
-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. This abstract has 180 words.
+Astrophysical Journal Letters (ApJL), the Astronomical Journal (AJ), and
+the Planetary Science Journal (PSJ) all have a 250 word limit for the
+abstract\footnote{Abstracts for Research Notes of the American Astronomical
+Society (RNAAS) are limited to 150 words}. If you exceed this length the
+Editorial office will ask you to shorten it. This abstract has 182 words.
\end{abstract}
%% Keywords should appear after the \end{abstract} command.
-%% See the online documentation for the full list of available subject
-%% keywords and the rules for their use.
-\keywords{editorials, notices ---
-miscellaneous --- catalogs --- surveys}
+%% The AAS Journals now uses Unified Astronomy Thesaurus concepts:
+%% https://astrothesaurus.org
+%% You will be asked to selected these concepts during the submission process
+%% but this old "keyword" functionality is maintained in case authors want
+%% to include these concepts in their preprints.
+\keywords{Classical Novae (251) --- Ultraviolet astronomy(1736) --- History of astronomy(1868) --- Interdisciplinary astronomy(804)}
%% From the front matter, we move on to the body of the paper.
%% Sections are demarcated by \section and \subsection, respectively.
@@ -357,10 +359,10 @@ When planning the next \aastex\ release the popularity of emulateapj played
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.3 were
+delivering new and improved features. \aastex\ v6.0 through v6.31 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.
+October 2016 (v6.1), January 2018 (v6.2), June 2019 (v6.3), and March 2010
+(v6.31) respectively.
The new features in the recent releases includes:
@@ -398,10 +400,16 @@ encapsulated postscript (EPS) or portable document format (PDF) files,
\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}
+ \item{v6.31}
+ \begin{enumerate}
+ \item Fixes a bug in the {\tt\string anonymous} style for dual anonymous review.
+ \item Improves line numbering with the {\tt\string linenumbers} style around equations due to the amsmath and lineno package compatibility issues.
+ \item Depreciate the {\tt\string \\acknowledgment} command in favor of the {\tt\string acknowledgment} environment.
+ \end{enumerate}
\end{itemize}
The rest of this article provides information and examples on how to create
-your own AAS Journal manuscript with v6.3. Special emphasis is placed on
+your own AAS Journal manuscript with v6.31. 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 table and figure placement.
@@ -413,14 +421,13 @@ incorporate equations in a manuscript while Section \ref{sec:highlight}
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
-charges are calculated. Additional information is available both embedded
-in the comments of this \latex\ file and in the online documentation at
+for additional information readers might find useful.
+More documentation is embedded in the comments of this \latex\ file and in the online documentation at
\url{http://journals.aas.org/authors/aastex.html}.
\section{Manuscript styles} \label{sec:style}
-The default style in \aastex\ v6.3 is a tight single column style, e.g. 10
+The default style in \aastex\ v6.31 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
@@ -429,7 +436,7 @@ entire page, reducing the need for address float sizing.
To invoke a two column style similar to the what is produced in
the published PDF copy use \\
-\noindent {\tt\string\documentclass[twocolumn]\{aastex63\}}. \\
+\noindent {\tt\string\documentclass[twocolumn]\{aastex631\}}. \\
\noindent Note that in the two column style figures and tables will only
span one column unless specifically ordered across both with the ``*'' flag,
@@ -456,15 +463,15 @@ output that has wider left and right margins. It is designed to have fewer
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. 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.
+from seeing it during peer review if dual anonymous review (DAR) is requested.
+Likewise, acknowledgments can also be hidden if placed in the new
+{\tt\string\begin\{acknowledgments\}} ... {\tt\string\end\{acknowledgments\}}
+environment. The use of this option is highly recommended for PSJ submissions.
+Advice for anonymizing your manuscript for DAR is provided at
+\url{https://journals.aas.org/manuscript-preparation/#dar}.
\section{Floats} \label{sec:floats}
@@ -516,7 +523,7 @@ when a {\tt\string tabular} is surrounded by {\tt\string\begin\{table\}} ...
{\tt\string\end\{table\}} is it a true float and the rules and suggestions
above apply.
-In AASTeX v6.3 all deluxetables are float tables and thus if they are
+In AASTeX v6.31 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
@@ -770,7 +777,7 @@ 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
specify the figure number\footnote{It is better to not use
-{\tt\string\figurenum} and let LaTeX auto-increment all the figures. If you
+{\tt\string\figurenum} and let \latex\ auto-increment all the figures. If you
do use this command you need to mark all of them accordingly.}. Each is
based on the {\tt\string graphicx} package command,
{\tt\string\includegraphics}. Authors are welcome to use
@@ -831,7 +838,7 @@ 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
+March 2021 there are over 4000 videos, 1300 figure sets, and 100 interactive
figures. The next sections describe how to include these types of graphics
in your own manuscripts.
@@ -1020,7 +1027,7 @@ tutorials and examples.
\section{Displaying mathematics} \label{sec:displaymath}
The most common mathematical symbols and formulas are in the amsmath
-package. \aastex\ requires this package so there is no need to
+package. \aastex\ requires this package so there is no need to
specifically call for it in the document preamble. Most modern \latex\
distributions already contain this package. If you do not have this
package or the other required packages, revtex4-1, latexsym, graphicx,
@@ -1052,7 +1059,6 @@ for more than one line and end each line with a
command. Alignment points can be added with ampersands (\&). There should be
two ampersands per line. In the examples they are centered on the equal
symbol.
-
\begin{eqnarray}
\gamma^\mu & = &
\left(
@@ -1117,8 +1123,8 @@ The second method does not have the ability to highlight the specific
nature of the changes but does allow the author to document changes over
multiple revisions. The commands are {\tt\string\edit1\{<text>\}},
{\tt\string\edit2\{<text>\}} and {\tt\string\edit3\{<text>\}} and they
-produce {\tt\string<text>} that is highlighted in bold red, italic blue and
-underlined purple, respectively. Authors should use the first command to
+produce {\tt\string<text>} that is highlighted in bold, bold+italic and
+bold+underline, respectively. Authors should use the first command to
\edit1{indicated which text has been changed from the first revision.} The
second command is to highlight \edit2{new or modified text from a second
revision}. If a third revision is needed then the last command should be used
@@ -1169,8 +1175,12 @@ not have specific bibtex entries for these types of references so the
code the ``@misc'' type correctly. The most recent aasjournal.bst file,
available with \aastex\ v6, will output bibtex ``@misc'' type properly.
-\acknowledgments
-
+%% IMPORTANT! The old "\acknowledgment" command has be depreciated. It was
+%% not robust enough to handle our new dual anonymous review requirements and
+%% thus been replaced with the acknowledgment environment. If you try to
+%% compile with \acknowledgment you will get an error print to the screen
+%% and in the compiled pdf.
+\begin{acknowledgments}
We thank all the people that have made this AASTeX what it is today. This
includes but not limited to Bob Hanisch, Chris Biemesderfer, Lee Brotzman,
Pierre Landau, Arthur Ogawa, Maxim Markevitch, Alexey Vikhlinin and Amy
@@ -1179,6 +1189,7 @@ for the new "modern" style design. Considerable help was provided via bug
reports and hacks from numerous people including Patricio Cubillos, Alex
Drlica-Wagner, Sean Lake, Michele Bannister, Peter Williams, and Jonathan
Gagne.
+\end{acknowledgments}
%% To help institutions obtain information on the effectiveness of their
%% telescopes the AAS Journals has created a group of keywords for telescope
@@ -1199,9 +1210,9 @@ CTIO:1.5m,CXO}
%% 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},
+\software{astropy \citep{2013A&A...558A..33A,2018AJ....156..123A},
Cloudy \citep{2013RMxAA..49..137F},
- SExtractor \citep{1996A&AS..117..393B}
+ Source Extractor \citep{1996A&AS..117..393B}
}
%% Appendix material should be preceded with a single \appendix command.
@@ -1221,11 +1232,9 @@ Appendices can be broken into separate sections just like in the main text.
The only difference is that each appendix section is indexed by a letter
(A, B, C, etc.) instead of a number. Likewise numbered equations have
the section letter appended. Here is an equation as an example.
-
\begin{equation}
I = \frac{1}{1 + d_{1}^{P (1 + d_{2} )}}
\end{equation}
-
Appendix tables and figures should not be numbered like equations. Instead
they should continue the sequence from the main article body.
@@ -1248,7 +1257,7 @@ 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.3. Instead of the {\tt\string\rotate} command, a new environment
+\aastex v6.31. 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
@@ -1346,7 +1355,7 @@ V838 Her & 5 (197) & 2448340.5 (197) & 2 (198) & \nodata & 0.5$\pm0.1$ (198) & 2
\end{deluxetable*}
\end{longrotatetable}
-A handy "cheat sheet" 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}.
\section{IAU recommendations for nominal units \label{nominal}}
@@ -1354,8 +1363,8 @@ different types of tables is available at \url{http://journals.aas.org/authors/a
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 recommended nominal conversion constants for \latex\ have been
+incorporate into v6.31 to help authors follow the IAU resolution.
The general commands take this form:
@@ -1384,7 +1393,7 @@ the most common uses would be:
\end{tabular}
\vskip12pt
-AASTeX v6.3 also contains specific commands for other commonly used
+AASTeX v6.31 also contains specific commands for other commonly used
units. These are:
\vskip24pt
@@ -1409,16 +1418,25 @@ parameter\\
All of these commands work equally well in text and math mode.
+\section{Using Chinese, Japanese, and Korean characters}
+
+Authors have the option to include names in Chinese, Japanese, or Korean (CJK)
+characters in addition to the English name. The names will be displayed
+in parentheses after the English name. The way to do this in AASTeX is to
+use the CJK package available at \url{https://ctan.org/pkg/cjk?lang=en}.
+Further details on how to implement this and solutions for common problems,
+please go to \url{https://journals.aas.org/nonroman/}.
+
%% For this sample we use BibTeX plus aasjournals.bst to generate the
-%% the bibliography. The sample63.bib file was populated from ADS. To
+%% the bibliography. The sample631.bib file was populated from ADS. To
%% get the citations to show in the compiled file do the following:
%%
-%% pdflatex sample63.tex
-%% bibtext sample63
-%% pdflatex sample63.tex
-%% pdflatex sample63.tex
+%% pdflatex sample631.tex
+%% bibtext sample631
+%% pdflatex sample631.tex
+%% pdflatex sample631.tex
-\bibliography{sample63}{}
+\bibliography{sample631}{}
\bibliographystyle{aasjournal}
%% This command is needed to show the entire author+affiliation list when
@@ -1432,4 +1450,4 @@ All of these commands work equally well in text and math mode.
\end{document}
-% End of file `sample63.tex'.
+% End of file `sample631.tex'.
diff --git a/Master/texmf-dist/tex/latex/aastex/aastex63.cls b/Master/texmf-dist/tex/latex/aastex/aastex631.cls
index 6fdf46ab8e8..2aa0810635d 100644
--- a/Master/texmf-dist/tex/latex/aastex/aastex63.cls
+++ b/Master/texmf-dist/tex/latex/aastex/aastex631.cls
@@ -1,10 +1,11 @@
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% AASTEX63.cls %%
-%% July 8, 2019 (6:15pm) %%
-%% Copyright 2019 American Astronomical Society %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% AASTEX631.cls %%
+%% Jan 29f, 2021 %%
+%% %%
+%% Copyright 2021 American Astronomical Society %%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\def\currversion{6.3}
+\def\currversion{6.3.1f}
%%
%% These files are distributed
@@ -53,7 +54,7 @@
%%% The Current Maintainer of this work is Greg Schwarz <greg.schwarz@aas.org>
%%% This work consists of the file aastex.cls
-%%% copyright = "Copyright (C) 2016 American Astronomical Society
+%%% copyright = "Copyright (C) 2016--2020 American Astronomical Society
%%%
%%% This work may be distributed and/or modified under the
%%% conditions of the LaTeX Project Public License, either version 1.3
@@ -80,8 +81,9 @@
%%% abstract = "formatter for AAS journal submissions",
%%% }
-\ProvidesClass{aastex63}%%%
- [2019/06/03 Version 6.3/AAS markup document class]%
+
+\ProvidesClass{aastex631}%%%
+ [2020/12/20 Version 6.3.1d/AAS markup document class]%
{}
\ClassInfo{aastex}{%
^^J
@@ -103,6 +105,7 @@ track changes, new `modern' style and much more, by Amy Hendrickson,%
^^J
}%
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% aastex.cls version 2.0 is a based on emulateapj.cls, version January 23, 2015,
%% and an older version of aastex.cls, with many additional functionalities.
@@ -175,10 +178,10 @@ track changes, new `modern' style and much more, by Amy Hendrickson,%
-\DeclareOption{twocolumn}{\twocolstyletrue\@two@coltrue\twelvepointfalse}
+\DeclareOption{twocolumn}{\onecolstylefalse\twocolstyletrue\@two@coltrue\twelvepointfalse}
%% default style
-\DeclareOption{onecolumn}{\onecolstyletrue}
+\DeclareOption{onecolumn}{\onecolstyletrue\twocolstylefalse}
%% obsolete option
\DeclareOption{revtex4}{\typeout{=================^^J^^J!!! The revtex4 option no longer
@@ -198,9 +201,9 @@ track changes, new `modern' style and much more, by Amy Hendrickson,%
\def\astro#1{\leavevmode\hbox{\astro@font#1}}%
\def\load@astro@font{%
\iftwelvepoint
- \font\astro@font=Astrosym at 8pt
+ \font\astro@font=astrosym at 8pt
\else
- \font\astro@font=Astrosym at 7pt
+ \font\astro@font=astrosym at 7pt
\fi
}%
\AtBeginDocument{\load@astro@font}
@@ -256,6 +259,7 @@ access fonts for the \string\astro\space command
\newif\ifanonymous
\DeclareOption{anonymous}{\global\anonymoustrue}
+
%% End AH Options
\ExecuteOptions{onecolumn,onecolappendix,letteredappendix}%
@@ -621,15 +625,14 @@ revtex4-1.cls^^J^^J}\stop
%% running heads:
\def\lefthead#1{\gdef\@versohead{#1}} \lefthead{\relax}
-\def\righthead#1{\ifanonymous\gdef\@rectohead{\ \ Anonymous author(s)
-\hfill}\else\gdef\@rectohead{#1}\fi} \righthead{\relax}
+\def\righthead#1{\ifanonymous\gdef\@rectohead{Anonymous author(s)}\else\gdef\@rectohead{#1}\fi} \righthead{\relax}
\let\shorttitle\lefthead
\let\shortauthors\righthead
\def\ps@apjheads{\let\@mkboth\markboth
\def\@evenfoot{}
- \def\@evenhead{\lower9mm\hbox to\textwidth{
- \rm\thepage\hfil \rm\textsc{\@rectohead} \hfil}}}
+ \def\@evenhead{\lower9mm\hbox to\textwidth{%
+ \rm\thepage\hfill\textsc{\@rectohead}\hfill}}}
\def\@oddfoot{}
\def\@oddhead{\lower9mm\hbox to\textwidth{
\hfil\rm\textsc{\@versohead}\hfil \rm\thepage}}
@@ -654,7 +657,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 AASTeX63}
+{\footnotesize Typeset using \LaTeX\ {\bf RNAAS} style in AASTeX631}
\par\vspace*{-\baselineskip}\vspace*{0.625in}
\else
\vbox to 0pt{\vskip-48pt\normalsize\rptloopnum=0\loop
@@ -672,7 +675,7 @@ revtex4-1.cls^^J^^J}\stop
\raggedright
{\sc Draft version \today}\\[2pt]
{\footnotesize
-Typeset using \LaTeX\ {\bf modern} style in AASTeX63}
+Typeset using \LaTeX\ {\bf modern} style in AASTeX631}
\vskip48pt
}
\else
@@ -681,7 +684,7 @@ Typeset using \LaTeX\ {\bf modern} style in AASTeX63}
\vspace*{-\headsep}\vspace*{\headheight}
\footnotesize
\noindent{\sc Draft version \today}\\[2pt]
-{\footnotesize Typeset using \LaTeX\ {\bf preprint} style in AASTeX63}
+{\footnotesize Typeset using \LaTeX\ {\bf preprint} style in AASTeX631}
\par\vspace*{-\baselineskip}\vspace*{0.625in}
\else
%%
@@ -689,7 +692,8 @@ Typeset using \LaTeX\ {\bf modern} style in AASTeX63}
\vspace*{-\headsep}\vspace*{\headheight}
\footnotesize
{\footnotesize\textsc{\@journalinfo}}\par
-{\footnotesize Typeset using \LaTeX\ {\bf preprint2} style in AASTeX63}
+{\footnotesize Typeset using \LaTeX\ {\bf preprint2} style in
+AASTeX631}
\par\vspace*{-\baselineskip}\vspace*{0.625in}
\else
%%
@@ -697,7 +701,8 @@ Typeset using \LaTeX\ {\bf modern} style in AASTeX63}
\vspace*{-\headsep}\vspace*{\headheight}
\footnotesize
{\footnotesize\textsc{\@journalinfo}}\par
-{\footnotesize Typeset using \LaTeX\ {\bf twocolumn} style in AASTeX63}
+{\footnotesize Typeset using \LaTeX\ {\bf twocolumn} style in
+AASTeX631}
\par\vspace*{-\baselineskip}\vspace*{0.625in}
\else
\ifmanu
@@ -705,14 +710,14 @@ Typeset using \LaTeX\ {\bf modern} style in AASTeX63}
\footnotesize
\noindent\textsc{\@journalinfo}\\[-8pt]
{\footnotesize Typeset using \LaTeX\ {\bf manuscript} style in
-AASTeX63}
+AASTeX631}
\par\vspace*{-\baselineskip}\vspace*{0.625in}
\else
%% Default
\vspace*{-\headsep}\vspace*{\headheight}
\footnotesize
{\footnotesize\textsc{\@journalinfo}}\par
-{\footnotesize Typeset using \LaTeX\ default style in AASTeX63}%% default style
+{\footnotesize Typeset using \LaTeX\ default style in AASTeX631}%% default style
\par\vspace*{-\baselineskip}\vspace*{0.625in}
\fi\fi\fi\fi\fi
%%
@@ -728,7 +733,9 @@ AASTeX63}
\@title
%% October 2017, was +12pt
\@ifx{\@title@aux\@title@aux@cleared}{}{%
+\ifanonymous\else%% added may 20, 2020
\expandafter\frontmatter@footnote\expandafter{\@title@aux}%
+\fi
}%
\par
%% \class@warn{Unused short title ignored}%
@@ -752,9 +759,6 @@ 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}}
-
\def\tempfootnoteintitle#1{}
\long\def\ltx@foottext#1#2{%
@@ -766,6 +770,7 @@ footnote\the\fncount\endcsname{\if@two@col\hsize=.5\textwidth
\endgroup
}%
+
\def\kickoutfootnotes{\c@footnote=0\relax%
\loop\advance\endfncount by 1\relax%
\expandafter\ifx\csname footnote\the\endfncount\endcsname\relax%
@@ -779,7 +784,7 @@ footnote\the\fncount\endcsname{\if@two@col\hsize=.5\textwidth
\renewcommand\title[2][]{%
\def\@title{\setbox0=\vbox{\let\footnote\tempfootnote #2}%
{\let\footnote\tempfootnoteintitle%\uppercase
-{#2}}%% here???
+{#2}}%% right place for kickoutfootnotes below
\kickoutfootnotes
\ifdoublespace\vskip 3\baselineskip\fi
}%
@@ -953,6 +958,7 @@ footnote\the\fncount\endcsname{\if@two@col\hsize=.5\textwidth
\@ifx{\@empty\mini@notes}{}{\mini@notes\par}%
\addvspace\frontmatter@postabstractspace
\global\abstractfalse
+\vskip12pt
}%
\newif\ifbib
@@ -1069,11 +1075,14 @@ footnote\the\fncount\endcsname{\if@two@col\hsize=.5\textwidth
\newif\if@firstsection \@firstsectiontrue
+
\def\section{%
-\if@firstsection
+\ifanonymous\nocollaboration{0}\fi
+\if@firstsection
%% In case no collaboration is listed:
\ifcollaborationon\else\let\doauthor\olddoauthor
-\let\allauthors=\oldallauthors
+\ifanonymous \else
+\let\allauthors=\oldallauthors\fi
\fi
%\edef\currauthorlimit{\the\AuthorCollaborationLimit}
%\collaboration{\currauthorlimit}{}
@@ -1183,49 +1192,131 @@ the#1\endcsname}
\penalty \ApjSectionpenalty}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% changed to begin...end form, May 20,2020, AH
+%% Acknowledgments, use \begin{acknowledgments}...\end{acknowledgments}
+%% or \begin{acknowledgements}...\end{acknowledgements}
+
+{\catcode`#=12
+\gdef\hashmark{#}}
-%% begin...end form, not as good as \acknowledgments...\par
+\def\xacknowledgments{acknowledgments}
+\def\xacknowledgements{acknowledgements}
\newbox\ackbox
-\def\xacknowledgments{\vskip 5.8mm plus 1mm minus 1mm
-\vskip1sp
-\section*{Acknowledgments}
-\vskip4pt
+
+\def\acknowledgments{%
+\ifx\@currenvir\xacknowledgments\let\go\relax\else
+\let\go\stop
+\typeout{x^^J^^J^^J^^J^^J^^J^^J^^J
+ ===================^^J
+In AASTeX v6.3.1 the \string\acknowledgments\space command has been deprecated.^^J^^J
+Instead, please use the begin/end form:^^J^^J
+"\string\begin\string{acknowledgments\string}...\string\end\string{acknowledgments\string}"^^J^^J
+when using acknowledgments.^^J^^J See here:
+\url{https://journals.aas.org/aastexguide/\hashmark acknowledgments}
+^^J^^J
+ for more
+details.^^J
+ ===================^^J
+}%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Printed error
+\vskip12pt
+\hrule height 1pt
+\vskip12pt
+\noindent ERROR:
+In AASTeX v6.3.1 the {\tt\string\acknowledgments} command has been
+deprecated.\\
+Instead, please use the begin/end form:\\
+{\tt
+\string\begin\string{acknowledgments\string}...\string\end\string{acknowledgments\string}}\\
+when using acknowledgments. For more details, see:\\
+\url{https://journals.aas.org/aastexguide/\hashmark acknowledgments}
+%
+\fi\go
+%%
\global\setbox\ackbox=\vbox\bgroup
-}
+\expandafter\ifx\csname internallinenumbers\endcsname\relax\else
+\begin{internallinenumbers}
+\fi
+\vskip 5.8mm plus 1mm minus 1mm
+\vskip1sp
+%\section*{Acknowledgments}
+\noindent\ignorespaces}
-\def\xendacknowledgments{\egroup
+\def\endacknowledgments{
+\expandafter\ifx\csname internallinenumbers\endcsname\relax\else
+\end{internallinenumbers}
+\fi
+\egroup%% completes ackbox
\ifanonymous
-\centerline{(Acknowledgements anonymized for review)}
+\vskip 5.8mm plus 1mm minus 1mm
+\vskip1sp
+%\section*{Acknowledgments}
+\centerline{(Acknowledgments 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
+\vbox{\unvbox\ackbox}
+\fi\vskip6pt}
+
+%% alternate spelling
+\def\acknowledgements{%
+\ifx\@currenvir\xacknowledgements\let\go\relax\else
+\let\go\stop
+\typeout{x^^J^^J^^J^^J^^J^^J^^J^^J
+ ===================^^J
+In AASTeX v6.3.1 the \string\acknowledgements\space command has been deprecated.^^J^^J
+Please use the begin/end form:^^J^^J
+"\string\begin\string{acknowledgements\string}...\string\end\string{acknowledgements\string}"^^J^^J
+when using acknowledgements.^^J^^J See here:
+\href{https://journals.aas.org/aastexguide/\hashmark acknowledgments}
+{https://journals.aas.org/aastexguide/\hashmark acknowledgments}
+^^J^^J
+ for more
+details.^^J
+ ===================^^J
+}%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Printed error
+\vskip12pt
+\hrule height 1pt
+\vskip12pt
+\noindent ERROR:
+In AASTeX v6.3.1 the {\tt\string\acknowledgements} command has been
+deprecated.\\
+Instead, please use the begin/end form:\\
+{\tt
+\string\begin\string{acknowledgements\string}...\string\end\string{acknowledgements\string}}\\
+For more details, see:\\
+\url{https://journals.aas.org/aastexguide/\hashmark acknowledgments}
+%
+\fi\go
+%%
+\global\setbox\ackbox=\vbox\bgroup
+\expandafter\ifx\csname internallinenumbers\endcsname\relax\else
+\begin{internallinenumbers}
+\fi
+\vskip 5.8mm plus 1mm minus 1mm
\vskip1sp
-\vbox{
-\section*{Acknowledgments}
+%\section*{Acknowledgments}
+\noindent\ignorespaces}
+
+\def\endacknowledgements{
+\expandafter\ifx\csname internallinenumbers\endcsname\relax\else
+\end{internallinenumbers}
+\fi
+\egroup%% completes ackbox
\ifanonymous
+\vskip 5.8mm plus 1mm minus 1mm
+\vskip1sp
+%\section*{Acknowledgements}
\centerline{(Acknowledgements anonymized for review)}
\else
-\nobreak
-\vtop{#1}\fi}\vskip6pt}
+\vbox{\unvbox\ackbox}
+\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}
% ****************************************
@@ -1242,8 +1333,7 @@ the#1\endcsname}
% appendixfloats: Needed. ??
\newif\ifappendixon
-\def\appendix{
-\global\appendixontrue
+\def\appendix{\global\appendixontrue
\if@two@col
\onecolumngrid
\noindent\mbox{}\vrule height 24pt width0pt\hfill{\apjsecfont APPENDIX}\hfill\mbox{}\par
@@ -1305,7 +1395,12 @@ APPENDIX}\hfill\mbox{}\par
\noindent \makebox[\textwidth][c]{\small\scshape REFERENCES}
\par
\vspace*{4pt plus 3pt}
- \set@column@hsize{2}\twocolumngrid
+ \set@column@hsize{2}\twocolumngrid
+%% Jan29, 2021, added \ifonecolstyle, \ifpreprinttwo
+\ifnumlines
+\ifonecolstyle
+\ifpreprinttwo\else
+\advance\linenumbersep-12pt\fi\fi\fi
\parindent=0cm \parskip=0cm
\def\baselinestretch{1.0}
\footnotesize \baselineskip=\baselinestretch\bibbaselineskip plus 1pt
@@ -1335,6 +1430,11 @@ APPENDIX}\hfill\mbox{}\par
\hbox to\textwidth{\hss\normalsize REFERENCES\hss}
\vspace{6pt}\parskip=0pt
\twocolumngrid
+%% Jan29, 2021, added \ifonecolstyle
+\ifnumlines
+\ifonecolstyle
+\ifpreprinttwo\else
+\advance\linenumbersep-12pt\fi\fi\fi
\par
\raggedright
\small
@@ -1736,6 +1836,7 @@ APPENDIX}\hfill\mbox{}\par
\let\jnl@style=\rmfamily
\def\ref@jnl#1{{\jnl@style#1}}%
\newcommand\aj{\ref@jnl{AJ}}% % Astronomical Journal
+\newcommand\psj{\ref@jnl{PSJ}}% % Planetary Science Journal
\newcommand\araa{\ref@jnl{ARA\&A}}% % Annual Review of Astron and Astrophys
\renewcommand\apj{\ref@jnl{ApJ}}% % Astrophysical Journal
\newcommand\apjl{\ref@jnl{ApJL}} % Astrophysical Journal, Letters
@@ -2100,13 +2201,13 @@ width0pt\relax#1$}\ignorespaces}
%% In response to request from AAS
\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,
+ 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,
]{hyperref}
@@ -4667,6 +4768,7 @@ deluxetable*\endcsname{\deluxestartrue\bgroup\floattrue
\expandafter\def\csname enddeluxetable*\endcsname{\enddeluxetable
\egroup
+\null% added june 2020
\global\colnumbersonfalse
\global\deluxedecimalsfalse
\global\deluxestarfalse
@@ -4800,7 +4902,7 @@ to\hsize{\hss\vtop{\hsize=\wd0
\currtabletypesize
\setbox0=\hbox{\colnumbersonfalse
\begin{tabular}{#1}
-\pt@head
+\pt@head %%
##1\end{tabular}}% not here
\expandafter\ifx\csname @tablecaption\endcsname\empty\else
\noindent\hbox
@@ -4964,6 +5066,13 @@ continued \if@two@col\else on next page\fi}\\
%% march 2019
\ifreturntotwocol\global\returntotwocolfalse
\twocolumngrid\fi
+%% May 2020
+\ifappendixon
+\if@two@col@app
+\twocolumngrid
+\else
+\onecolumngrid\fi\fi
+\null
}%%
@@ -4990,6 +5099,8 @@ continued \if@two@col\else on next page\fi}\\
\twocolumngrid\hsize=\columnwidth\fi%% check this!!
\else
\end{table}\fi
+\null
+% added june 2020
\gdef\colnumbers{\saveplaincolnumbers}
\global\breaktabfalse
\global\deluxefalse
@@ -5000,7 +5111,8 @@ continued \if@two@col\else on next page\fi}\\
\global\movetableright=0pt
%\global\floatfalse
%\global\advance\c@table by -1\relax
-}%% check this!!
+%% check this!!
+}
%%@@@ ???
@@ -5344,7 +5456,7 @@ width 0pt\currtabletypesize{\bf References}---{#1}\vskip1sp}}
\let&\CheckNumberAndSwitch%
\gdef\pt@head{%
\hline\hline%
-\multicolumn1c{\tempcounter=0
+\multicolumn1c{\vrule height 12pt width0pt\relax\tempcounter=0
\expandafter\getDs\tabfullpreamble\relax
\global\colcount=0
\global\colheadcount=0}%
@@ -5359,7 +5471,7 @@ width 0pt\currtabletypesize{\bf References}---{#1}\vskip1sp}}
\ifmanu%
\iflongrotateon\noalign{\vskip-8pt}\else\noalign{\vskip-17pt}\fi%
\else%
- \ifmodern \iflongrotateon\else\noalign{\vskip-9pt}\fi%
+ \ifmodern\iflongrotateon\else\noalign{\vskip-9pt}\fi%
\else%
\fi%% end ifmodern
\fi%% end ifmanu
@@ -5389,7 +5501,7 @@ width 0pt\currtabletypesize{\bf References}---{#1}\vskip1sp}}
\def\zztablehead#1{\let&\CheckNumberAndSwitch%
\gdef\pt@head{%
%% this is needed:
-\multicolumn1c{\expandafter\getDs\tabfullpreamble\relax
+\multicolumn1c{\vrule height12pt width0pt\relax\expandafter\getDs\tabfullpreamble\relax
\global\tempcounter=0
\global\colcount=0
\global\colheadcount=0}\\
@@ -5702,18 +5814,20 @@ by 1\relax}\ignorespaces}%
\expandafter\def\csname editcolor2\endcsname{black}% was blue
\expandafter\def\csname editcolor3\endcsname{black}% was violet
+\let\newgo\relax
\newcount\colorcount
-\def\edit#1#2{{\colorcount=#1\relax%
-\ifturnoffedit\let\go\ignorespaces\else%
-\let\go\relax\fi%
-\ifturnoffedit
-\color{black}#2%
-\else
-\color{\csname editcolor\the\colorcount\endcsname}%
-\ifnum\colorcount=1{\ifturnoffone\color{black}#2\else\bf#2\fi}\else%
-\ifnum\colorcount=2{\ifturnofftwo\color{black}#2\else\it#2\fi}\else%
-\ifnum\colorcount=3{\ifturnoffthree\color{black}#2\else#2\fi}\fi\fi\fi\fi%
-}\go}
+
+\newcount\editnum
+\def\edit#1#2{\ifcase#1\or\ifturnoffone%
+\unskip%
+\else%
+\texorpdfstring{{\bf#2}}{#2}\fi\or%
+\ifturnofftwo%
+\unskip%
+\else\texorpdfstring{{\bfseries\itshape#2}}{#2}\fi%
+\or%
+\ifturnoffthree\unskip\else%
+\texorpdfstring{{\bfseries\underline{#2}}}{#2}\fi\fi}
\def\collaborationcomment#1#2{{\colorcount=#1
\ifturnoffedit\let\go\ignorespaces\else%
@@ -5728,9 +5842,9 @@ by 1\relax}\ignorespaces}%
\ifturnoffedit\let\go\ignorespaces\else%
\let\go\relax%
\color{\csname editcolor\the\colorcount\endcsname}
-\ifnum\colorcount=1{\ifturnoffone\else\bf (Author~note: #2)\ \fi}\else
-\ifnum\colorcount=2{\ifturnofftwo\else\it (Author~note: #2)\ \fi}\else
-\ifnum\colorcount=3{\ifturnoffthree\else (Author~note: #2)\ \fi}\fi\fi\fi\fi%
+\ifnum\colorcount=1{\ifturnoffone\else\bf (Author~note 1: #2)\ \fi}\else
+\ifnum\colorcount=2{\ifturnofftwo\else\it (Author~note 2: #2)\ \fi}\else
+\ifnum\colorcount=3{\ifturnoffthree\else (Author~note 3: #2)\ \fi}\fi\fi\fi\fi%
\go}}
@@ -5803,44 +5917,13 @@ to 20pt{\hfill}}\vskip12pt}%
\endgroup%
}%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Highlight Figure
-\definecolor{ltblue}{cmyk}{.5,.1,.1,0}
-
-\long\def\highlightfigure#1{\centerline{
-\fboxrule=4pt
-\fboxsep=12pt
-\fcolorbox{ltblue}{white}{\hbox to
-.93\textwidth{\hss$\vcenter{\advance\hsize -24pt #1}$\hss}}
-}}
-
-
-%%%%%%%%%%%%%
-%% Line numbering
-
-\ifnumlines
-\usepackage{lineno}
-
-\linenumbers*[1]
-\if@two@col
-\advance\linenumbersep -4pt
-\else
-\advance\linenumbersep 12pt
-\fi\fi
-
+% needed??
\gdef\specialbibitem#1[#2]#3#4{
{\tt\string\bibitem}[#2]{\tt\string{\string}}
#4}
-\let\savecite\cite
-\let\savecitep\citep
-\let\savecitet\citet
-\def\specialcite#1{\hbox{\savecite{#1}}}
-\def\specialcitep#1{\hbox{\savecitep{#1}}}
-\def\specialcitet#1{\hbox{\savecitet{#1}}}
-\let\saveref\ref
-\def\specialref#1{\hbox{\saveref{#1}}}
+
%%%%%%%%%%%%%%%%%%%%%%%%%
%% Track Changes
@@ -5870,7 +5953,7 @@ to 20pt{\hfill}}\vskip12pt}%
{\color{trackchange}\bf(Added: [#1] #2)}%%
\ifabstract\label{\the\refchangenumber}%
\expandafter\gdef\csname
-changenum\the\refchangenumber\endcsname{Added: [#1]
+changenum\the\refchangenumber\endcsname{\bf Added: [#1]
\textcolor{trackchange}\bf\relax{#2}\global\silenttrue}%
\else\expandafter\gdef\csname
changenum\the\refchangenumber\endcsname{\bf\relax Added: [#1]
@@ -5892,11 +5975,11 @@ changenum\the\refchangenumber\endcsname{\bf\relax Added: [#1]
\ifabstract%
\label{\the\refchangenumber}%
\expandafter\gdef\csname
-changenum\the\refchangenumber\endcsname{Added:
+changenum\the\refchangenumber\endcsname{\bf Added:
\textcolor{trackchange}\bf\relax{#1},
\global\silenttrue}\else
\expandafter\gdef\csname
-changenum\the\refchangenumber\endcsname{Added:
+changenum\the\refchangenumber\endcsname{\bf Added:
\textcolor{trackchange}{\bf\relax\let\bibitem\specialbibitem #1},%
\global\silentfalse}\fi%
\else#1\fi}
@@ -5917,26 +6000,18 @@ changenum\the\refchangenumber\endcsname{Added:
}%
{\color{trackchange}\bf%
\ifbib\let\sout\relax\fi%
-\let\citep\specialcitep%
-\let\citet\specialcitet%
-\let\ref\specialref\let\cite\specialcite (Deleted: [#1] \sout{#2})
+(Deleted: [#1] \sout{#2})
}%
\ifabstract\label{\the\refchangenumber}%
\expandafter\gdef\csname
changenum\the\refchangenumber\endcsname{Deleted: [#1]
{\color{trackchange}\bf%
-\let\citet\specialcitet%
-\let\citep\specialcitep%
-\let\cite\specialcite\sout{#2}}\global\silenttrue}%
+\sout{#2}}\global\silenttrue}%
\else
\expandafter\gdef\csname
changenum\the\refchangenumber\endcsname{Deleted: [#1]
{\color{trackchange}%
\let\bibitem\specialbibitem%
-\let\ref\specialref%
-\let\cite\specialcite%
-\let\citep\specialcitep%
-\let\citet\specialcitet%
\sout{#2}
}\global\silentfalse}\fi%
\fi}
@@ -5953,24 +6028,15 @@ changenum\the\refchangenumber\endcsname{Deleted: [#1]
%%
{\color{trackchange}\bf%
\ifbib\let\sout\relax\fi%
-\let\citep\specialcitep%
-\let\citet\specialcitet%
-\let\ref\specialref\let\cite\specialcite(Deleted: \sout{#1}
-)}%
+(Deleted: \sout{#1})}%
\ifabstract\label{\the\refchangenumber}%
\expandafter\gdef\csname changenum\the\refchangenumber\endcsname{Deleted:
-{\color{trackchange}\bf\let\ref\specialref%
-\let\citep\specialcitep%
-\let\citet\specialcitet%
-\let\cite\specialcite\sout{#1}}\global\silenttrue}%
+{\color{trackchange}\bf
+\sout{#1}}\global\silenttrue}%
\else
\expandafter\gdef\csname changenum\the\refchangenumber\endcsname{Deleted:
{\color{trackchange}\bf%
-\let\citep\specialcitep%
-\let\citet\specialcitet%
-\let\bibitem\specialbibitem%
-\let\ref\specialref%
-\let\cite\specialcite\sout{#1}}\global\silentfalse}\fi%
+\sout{#1}}\global\silentfalse}\fi%
\fi}
@@ -5984,29 +6050,21 @@ changenum\the\refchangenumber\endcsname{Deleted: [#1]
\ifnumlines\ifabstract\else\xdef\doit{\noexpand\linelabel{\the\refchangenumber}}\doit\fi\else%
\xdef\doit{\noexpand\label{\the\refchangenumber}}\doit\fi%
{\ifbib\let\sout\relax\fi
-\let\citep\specialcitep%
-\let\citet\specialcitet%
-\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}\bf\relax #3)}%
+\color{trackchange}\bf(Replaced: [#1] \sout{#2}}%
+{\color{black}replaced with:} {
+\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}\bf\relax\sout{#2}} {\color{black} replaced with:}
+{\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}\bf\relax\sout{#2}
+{\ifbib\let\sout\relax\fi
+\color{trackchange}\bf\relax\sout{#2}
} {\color{black} replaced with:}
-{\let\bibitem\specialbibitem\color{trackchange}\bf\relax#3}, \global\silentfalse}\fi%
+{\color{trackchange}\bf\relax#3}, \global\silentfalse}\fi%
\else#3\fi}
\long\def\yreplaced#1#2{%
@@ -6016,28 +6074,22 @@ changenum\the\refchangenumber\endcsname{Replaced: [#1]
\vskip14pt}%
\ifnumlines\ifabstract\else\xdef\doit{\noexpand\linelabel{\the\refchangenumber}}\doit\fi\else%
\xdef\doit{\noexpand\label{\the\refchangenumber}}\doit\fi%
-{\ifbib\let\sout\relax\fi\let\ref\specialref%
-\let\citep\specialcitep%
-\let\citet\specialcitet%
-\let\cite\specialcite\color{trackchange}\bf\relax(Replaced: %\sout
-{#1}
+{\ifbib\let\sout\relax\fi
+\color{trackchange}\bf\relax(Replaced:
+\sout{#1}
}%
{\color{black}replaced with:}
{\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}\bf\relax\sout{#1}} {\color{black} replaced with:}
+{\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}\bf\relax\sout{#1}
+{\ifbib\let\sout\relax\fi
+\color{trackchange}\bf\relax\sout{#1}
} {\color{black} replaced with:}
{\let\bibitem\specialbibitem\color{trackchange}\bf\relax#2}, \global\silentfalse}\fi%
\else#2\fi}
@@ -6050,6 +6102,7 @@ changenum\the\refchangenumber\endcsname{Replaced:
\def\yexplain#1{\iftrack\ {\bfseries\itshape\color{explain} [Explanation of change:
#1]\ }\fi}
+
\newcount\listchangenum
\def\listofchanges{
@@ -6087,9 +6140,11 @@ on page
\thispagestyle{empty}
}
+
\PassOptionsToPackage{normalem}{ulem}
\usepackage{ulem}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -6222,19 +6277,18 @@ on page
%%%%%%%%%%
%% macros to give hyperref link to authors when orcid numbers
%% are supplied with \author[0000-2345-3333-0023]{author name}
- \def\lookforbracket{\ifx\next[\let\go\xauthor
- \else\let\go\yauthor\fi\go}
+ \def\lookforbracket{\ifx\next[\let\go\xauthor\else\let\go\yauthor\fi\go}
\newcount\entriesinthiscollab
\newcount\allentries
\newif\ifseesmessage
-\def\author{\global\advance\entriesinthiscollab by 1
+\def\author{\global\advance\entriesinthiscollab by 1\relax%
\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 !
@@ -6243,7 +6297,7 @@ on page
\hskip2pt\includegraphics[width=9pt]{Orcid-ID.png}\fi}}{}}%
}%
-\def\orciderrormessage{
+\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,
0000-0012-3245-1234 or ^^J
@@ -6251,27 +6305,26 @@ should consist of four sets of four digits,^^J separated with -, ie,
^^J^^J
Please fix, or don't use square bracket argument with
\string\author[]\string{\string}
-^^J^^J}
+^^J^^J}%
}
%% Tests to see if author gave reasonable Orcid number;
%% if not, stops processing and gives error message.
\newif\ifbadOrcid
-\def\lookatOrcid #1-#2-#3-#4-{
-\def\one{#1}\def\two{#2}\def\three{#3}\def\four{#4}
-\ifx\one\empty
-\global\badOrcidtrue
-\else
-\ifx\two\empty
-\global\badOrcidtrue
-\else
-\ifx\three\empty
-\global\badOrcidtrue
-\else
-\ifx\four\empty
-\global\badOrcidtrue
-\fi\fi\fi\fi
-}
+\def\lookatOrcid #1-#2-#3-#4-{%
+\def\one{#1}\def\two{#2}\def\three{#3}\def\four{#4}%
+\ifx\one\empty%
+\global\badOrcidtrue%
+\else%
+\ifx\two\empty%
+\global\badOrcidtrue%
+\else%
+\ifx\three\empty%
+\global\badOrcidtrue%
+\else%
+\ifx\four\empty%
+\global\badOrcidtrue%
+\fi\fi\fi\fi}
\def\lookforDigits #1#2#3#4{
\def\xone{#1}\def\xtwo{#2}\def\xthree{#3}\def\xfour{#4}
@@ -6302,8 +6355,7 @@ Please fix, or don't use square bracket argument with
\else
\ifcat \xfour 1\else
\global\badOrcidtrue\fi
-\fi
-}
+\fi}
\def\FinallookforDigits #1#2#3#4{
\def\xone{#1}\def\xtwo{#2}\def\xthree{#3}\def\xfour{#4}
@@ -6335,27 +6387,26 @@ Please fix, or don't use square bracket argument with
\ifcat \xfour 1\else
\if\xfour X
\else
- \global\badOrcidtrue\fi
- \fi
-\fi
-}
+ \global\badOrcidtrue\fi%
+ \fi%
+\fi}
%% Last digit might be X
-\def\xauthor[#1]#2{\def\testone{#1-}\def\firstarg{#1}
+\def\xauthor[#1]#2{\def\testone{#1-}\def\firstarg{#1}%
\setbox0=\hbox{\expandafter\lookatOrcid\testone {}-{}-{}-{}-
-\expandafter\lookforDigits\one {}{}{}{}
-\expandafter\lookforDigits\two {}{}{}{}
-\expandafter\lookforDigits\three {}{}{}{}
-\expandafter\FinallookforDigits\four {}{}{}{}}
+\expandafter\lookforDigits\one {}{}{}{}%
+\expandafter\lookforDigits\two {}{}{}{}%
+\expandafter\lookforDigits\three {}{}{}{}%
+\expandafter\FinallookforDigits\four {}{}{}{}}%
%%
\ifbadOrcid\let\go\orciderrormessage
-\else\let\go\relax\fi\go
-\ifbadOrcid\let\go\stop\else\let\go\relax\fi\go
-\new@author@def{#1}{#2}}
+\else\let\go\relax\fi\go%
+\ifbadOrcid\let\go\stop\else\let\go\relax\fi\go%
+\new@author@def{#1}{#2}}%% oct 7, this doesn't seem to work
\def\yauthor{\@author@def{}}
@@ -6465,81 +6516,82 @@ needed. It will not do anything.^^J Please use
\@listand\fi
}%
+\newif\ifaddspace
\def\doauthor#1#2#3{%
-\iflongauthor\vskip6pt\fi
-%%%
-\ifanonymous
- \iffirsttime
- \global\firsttimefalse
- Anonymous author(s)
- \fi
-\else %% ends at end of this def
+\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
+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
+\global\advance\totalentries by 1\relax%
+\global\advance\countauthors by 1\relax%
%%%
-\ifallauthors\global\AuthorCollaborationLimit=9999 \fi
+\ifallauthors\global\AuthorCollaborationLimit=9999 \fi%
%%%
% for testing
% [author number=\the\countauthors/ auth collab limit
% =\the\AuthorCollaborationLimit]
%
-\gdef\xone{#1}
+\gdef\xone{#1}%
\ifnum\countauthors < \AuthorCollaborationLimit
-\gdef\docomma{,}\else\gdef\docomma{}\fi
+\global\addspacetrue
+\gdef\docomma{,}\else\gdef\docomma{}\fi% ok
%%%
\ifnum\countauthors = \AuthorCollaborationLimit
\ifnum\AuthorCollaborationLimit=1\else
-\gdef\doAnd{And }\fi
+\gdef\doAnd{And }\fi%
\ifnum\tempauthornumber= 1
-\gdef\doAnd{ } \fi\fi
+\gdef\doAnd{ } \fi\fi%
%%
{\tempauthorminusone=\AuthorCollaborationLimit
\advance\tempauthorminusone by -1
\ifnum\countauthors=\tempauthorminusone
-\gdef\doAnd{And }
+\gdef\doAnd{And }%
\gdef\docomma{}\fi}%
%%%
-\global\dothisfalse
+\global\dothisfalse%
%% if num countauthors is less than or equal to \AuthorCollaborationLimit, print name
\ifnum\countauthors< \AuthorCollaborationLimit
%%%
-\ifx\xone\empty\else
-\global\dothistrue
+\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
+\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
+ \ignorespaces\leavevmode\hbox{\doAnd #1\unskip\docomma}%nice, keeps name from breaking across lines
+\fi%
+\fi%
%% ++++
%%
-\ifsuppressAffiliations\else
-\ifx\xone\empty\else
- \begingroup
+\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
+\fi\fi%
%% #2= \altaffiliation{} or \email{} or
%% possibly anything other than author, affiliation, or collaboration
- \@if@empty{#2}{\endgroup{}{}}
+ \@if@empty{#2}{\endgroup{}{}}%
{\ifnum\countauthors>\AuthorCollaborationLimit\endgroup{}{}%% <<< bug fix, added \endgroup{}{}
\else
\endgroup{\comma@space}{}\frontmatter@footnote{#2}\fi}%
@@ -6566,11 +6618,11 @@ 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
+>\AuthorCollaborationLimit\relax%
\ifnum\AuthorCollaborationLimit=0\else
\vskip3pt
{\rm et al.} \vskip-3pt
-\fi\fi\fi\fi
+\fi\fi\fi\fi%
}%% end local change to docollabnum
%%%%
\expandafter\ifx\csname
@@ -6580,7 +6632,7 @@ currCollabName\the\totalentries\endcsname\empty
\vskip6pt
\expandafter\csname currCollabName\the\totalentries\endcsname\vskip8pt
\affiliation{testing}
-\fi
+\fi%
%%%%%%%%
\global\countauthors=0
%%%
@@ -6593,17 +6645,17 @@ currCollabName\the\totalentries\endcsname\empty
\else
\global\AuthorCollaborationLimit=\csname
specificCollabLimit\the\docollabnum\endcsname
- \fi
+ \fi%
\expandafter\ifx\csname
CollabTotalAuthors\the\docollabnum\endcsname\relax
\else
\global\tempauthornumber=\csname
CollabTotalAuthors\the\docollabnum\endcsname
-\fi
-}
+\fi}%
\fi %% ends test to see if it is time to use collaboration name
\fi %% ends ifanonymous
-}%
+\ifaddspace\ \fi\global\addspacefalse}% oct 7, 2020, allows multiple names to break over lines,
+ %but no extra space if \collaboration{1}
%%%% ++++====
@@ -6713,7 +6765,7 @@ 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{}
@@ -6763,7 +6815,9 @@ CollabTotalAuthors\the\docollabnum\endcsname
\NoNewPageAfterKeywords
\def\NewPageAfterKeywords{\global\nobreakafterkeywordsfalse}
+%%%+++!!!
\def\frontmatter@maketitle{%
+%% \@author@finish needs to be here:
\@author@finish
\if@firstsection% not appendix, in other words
\title@column\titleblock@produce
@@ -6851,15 +6905,15 @@ CollabTotalAuthors\the\docollabnum\endcsname
\def\tempfootmark#1{}
\newcount\c@affilcount
-
-
\renewcommand*\altaffiliation[2][]{%
-\@AF@join{#1#2\ifmodern\baselineskip=14pt\fi
+\@AF@join{\ifanonymous\else
+#1#2\ifmodern\baselineskip=14pt\fi
\if@two@col\hsize=.5\textwidth
\advance\hsize by -18pt
-\fi}%
+\fi\fi}%
}%
+
\def\correspondingauthor#1{{\ifanonymous
\else
\renewcommand\thefootnote{\hskip-12pt}
@@ -6926,9 +6980,9 @@ currCollabName\the\allentries\endcsname{%\ifnum#1>0
#2}
%%
\let\doEtAl\relax
+%% not here
\@author@def{\@booleanfalse
-\collaboration@sw}{}
-}
+\collaboration@sw}{}}
\def\and{
@@ -6980,7 +7034,10 @@ currCollabName\the\allentries\endcsname{%\ifnum#1>0
\def\bibliography#1{\bibliography@latex{#1}}%
+
%%%
+\newif\iffrontmatterfirsttime
+\global\frontmatterfirsttimetrue
\let\savecentercr\@centercr
\def\frontmatter@author@produce@script{%
\begingroup
@@ -7004,7 +7061,7 @@ currCollabName\the\allentries\endcsname{%\ifnum#1>0
\, \unskip\unskip
\par
\endgroup
-%%
+%% below
\begingroup
\frontmatter@above@affiliation@script
\let\AFF@opr \@affil@script
@@ -7012,7 +7069,11 @@ currCollabName\the\allentries\endcsname{%\ifnum#1>0
\def\@centercr{\vrule depth 3pt width0pt\vskip1sp}
\@AFF@list}
\let\@centercr\savecentercr
- \frontmatter@footnote@produce
+%% sept 14, 2020
+\iffrontmatterfirsttime
+\frontmatter@footnote@produce
+\global\frontmatterfirsttimefalse
+\fi
\par
\endgroup
\endgroup
@@ -7153,9 +7214,10 @@ N}_{J\mathrm e}$}}
\def\fnum@figure{{\bf\figurename~\thefigure}}%
}
-%% aastex63
+%% written for aastex63
\newif\ifallauthors
-\def\allauthors{\global\allauthorstrue
+\def\allauthors{
+\global\allauthorstrue
\let\doauthor\doAllauthors
\ifanonymous
\vskip6pt\vskip1sp\centerline{\large\bf All Authors and
@@ -7173,7 +7235,7 @@ Affiliations\vrule depth 18pt width0pt}\nobreak
\maketitle
}\fi}
-%% AASTeX62
+%% written for AASTeX62
\def\oldallauthors{%% this conditional keeps \allauthors from turning on
%% unless \AuthorCollaborationLimit is used:
\ifnumlines\nolinenumbers\fi
@@ -7188,32 +7250,61 @@ Affiliations\vrule depth 18pt width0pt}\nobreak
\let\AllAuthors\allauthors
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Highlight Figure
+\definecolor{ltblue}{cmyk}{.5,.1,.1,0}
+\newdimen\currwidth
+\long\def\highlightfigure#1{
+\bgroup
+\fboxrule=4pt
+\fboxsep=12pt
+\vskip6pt
+\global\currwidth=\hsize
+\global\advance\currwidth by -32pt
+\noindent\hbox to\currwidth{\fcolorbox{ltblue}{white}{%
+$\vcenter{\hbox to\currwidth{\hss#1\hss}}$}}
+\egroup}
+
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% New interactive command:
-\def\xlc{timeseries}
+\def\xlc{lc}
\def\xjs{js}
\def\xanimation{animation}
-
+\newbox\interactbox
\newif\ifcorrectentries
-\def\interactive#1#2{\global\correctentriesfalse\def\checkone{#1}
+
+
+\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}
+\ifx\checktwo\empty\global\correctentriesfalse\fi
+\ifcorrectentries
+\else\hrule height1pt\vskip12pt\bf ERROR:
+The command
+{\tt\string\begin\string{interactive\string}\string{\string}\string{\string}}
+needs two arguments. The
+first describes the interactive type and the only allowed choices are
+lc, js, or animation.\\
+The second argument is the movie file or package
+containing the interactive figure components. See\\
+\url{https://journals.aas.org/aastexguide/\hashmark interactivefig} for more
+details.
+\vskip12pt\hrule height1pt
+\fi \global\currwidth\hsize
+\global\advance\currwidth by -32pt
+%% we need to set \currwidth here because interactbox expands
+%% before highlightfigure
+\global\setbox\interactbox=\vbox\bgroup\hsize=\currwidth\relax\centering
+}
\def\endinteractive{\egroup
-\ifcorrectentries\highlightfigure{\vskip-6pt\vbox{\unvbox0}
-\vskip-12pt}\fi}
+\ifcorrectentries\highlightfigure{\copy\interactbox}\fi
+}
%%%% For cases in which footnotes are called in full width environment
%% but are used in two cols. This keeps them from overwriting the
@@ -7227,15 +7318,137 @@ by-18pt\relax#1}}
\newdimen\movetableright
+%% for anonymous option
\newif\ifsuppressAffiliations
\def\suppressAffiliations{\global\suppressAffiliationstrue}
+%% new definition to be used in trackchanges:
+\def\sout#1{\raise5pt\hbox{\underline{\vbox to
+0pt{\vskip-4pt\hbox{#1\vrule height 8.5pt depth 3.5pt width0pt}\vss}}}}
+
+%% changes for affiliations when anonymous option is used:
+\ifanonymous
+\suppressAffiliationstrue
+\gdef\affiliation#1{}%% may 20, 2020
+\def\xauthor[#1]#2{}
+\let\yauthor\@gobble
+\def\lookforbracket{\ifx\next[
+\let\go\xauthor\else\let\go\yauthor\fi\go}
+\def\author{\futurelet\next\lookforbracket}
+\fi
+
+
+%%%%%%%%%%%%%
+%% Line numbering
+
+
+\ifnumlines
+\usepackage[mathlines]{lineno}%% dec 20
+%%
+\linenumbers*[1]
+%%\linenumbersep default=10pt
+\if@two@col
+\advance\linenumbersep -6pt
+\else
+\advance\linenumbersep 12pt
+\fi
+\fi
+
+%% Use when line numbers are on, and after \usepackage{amsmath}.
+%% Will make line numbering work on math as it would without amsmath.
+\def\fixmathlinenumbering{
+\let\saveopensqbracket\[
+\def\[{\linenomath\saveopensqbracket}
+\let\saveequation\equation
+\let\saveendequation\endequation
+%%
+ \let\savealign\align
+ \let\saveendalign\endalign
+%%
+ \let\savealigned\aligned
+ \let\saveendaligned\endaligned
+%%
+\def\align{\linenomath\savealign}
+ \def\endalign{\saveendalign}
+ \def\aligned{\linenomath\savealigned}
+ \def\endaligned{\linenomath\saveendaligned}
+%%
+\def\equation{\linenomath\saveequation}
+\def\endequation{\linenomath\saveendequation}
+\usepackage[mathlines]{lineno}
+}
+
+\AtBeginDocument{\expandafter\ifx\csname
+@amsmath@err\endcsname\relax\else\fixmathlinenumbering\fi}
\endinput
+%% Change Log
+============================
+Jan 29, 2021
+added \ifonecolstyle to see if reference numberlines need to
+be closer to text
+
+Dec 20, 2020
+Line numbering solutions:
+
+Line numbering equations and \[ \] works fine.
+
+$$math $$ does not work, and should be replaced with \[ math \]
+
+If author has \usepackage{amsmath} the equations will not number;
+amsmath and lineno are incompatible.
+
+
+June 28
+For using \edit{}{} in section heads; new command,
+\simpleedit that will prevent errors in section heads
+and in bookmarks. \edit is set to be equal to \simpleedit{}{}
+in \section definition, so nothing needs to be done by user.
+\protect used in section head, as \protect\edit{}{}, is not
+necessary.
+
+June 27
+\null added to \end{deluxetable} and \csname enddeluxetable*\endcsname
+to force final page of multipage table to print.
+
+June 26
+Acknowledgments: remember to use
+\begin{acknowledgments}...\end{acknowledgments} form
+OR
+\begin{acknowledgements}...\end{acknowledgements}
+
+Now have an error message built in if someone uses
+just \acknowledgments or \acknowledgements
+
+
+June 4, 2020
+ Added \nocollaboration{0} to first
+ section head, if anonymous was true. This
+ allowed correct titlepage for anonymous
+ if any style option was used.
+
+Acknowledgments: remember to use
+\begin{acknowledgments}...\end{acknowledgments} form
+
+
%% Change Log
============================
+May 19, 2020
+Changed definition of \sout (strike out) so that
+it works with a variety of citations in
+argument of \deleted and \replaced without complaint.
+
+Made anonymous work with \longauthor, and without
+\collaboration or \nocollaboration.
+
+Changed \acknowledgements to
+\begin{acknowledgements}...\end{acknowledgements}
+(More error proof, and standard mark up)
+
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
June 8, 2019
Changed \author and \collaboration macros.
Collaboration now takes two arguments:
@@ -7534,3 +7747,60 @@ with additions.
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% New interactive command:
+
+\def\xlc{timeseries}
+\def\xjs{js}
+\def\xanimation{animation}
+\newbox\interactbox
+\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\global\correctentriestrue\fi
+\global\currwidth\hsize
+\global\advance\currwidth by -32pt
+%% we need to set \currwidth here because interactbox expands
+%% before highlightfigure
+\global\setbox\interactbox=\vbox\bgroup\hsize=\currwidth\centering}
+
+\def\xxinteractive#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
+\noindent ERROR:\\[6pt] Your choices for the first argument for
+{\tt\string\begin\string{\string\interactive\string}} are timeseries, js, or animation.\\[6pt] Please choose one
+of these terms.\vskip12pt \fi
+%%%
+\def\checktwo{#2}
+\ifx\checktwo\empty \vskip12pt \bf
+\noindent ERROR:\\[6pt]
+The second argument of %{\tt\string\begin\string{interactive\string}} is the file containing the
+interactive component. Please check your LaTeX to be sure it conforms.
+See %\href{https://journals.aas.org/aastexguide/interactivefig}{stuff}
+%{https://journals.aas.org/aastexguide/\#interactivefig}
+for more details.
+\vskip12pt\hrule height1pt \else\global\correctentriestrue\fi
+\global\currwidth\hsize
+\global\advance\currwidth by -32pt
+%% we need to set \currwidth here because interactbox expands
+%% before highlightfigure
+\global\setbox\interactbox=\vbox\bgroup\hsize=\currwidth\centering}
+
+\def\endinteractive{\egroup
+\ifcorrectentries\highlightfigure{\copy\interactbox}\fi}
+