emulateapj update, version November 10, 2009

git-svn-id: svn://tug.org/texlive/trunk@16099 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 551 insertions, 568 deletions

diff --git a/Master/texmf-dist/doc/latex/emulateapj/README b/Master/texmf-dist/doc/latex/emulateapj/README
index 5eda512f2d2..245978f4574 100644
--- a/Master/texmf-dist/doc/latex/emulateapj/README
+++ b/Master/texmf-dist/doc/latex/emulateapj/README
@@ -1,255 +1,63 @@
-This is emulateapj.cls, version August 13, 2006
-For the latest version check http://hea-www.harvard.edu/~alexey/emulateapj
-
-2/9/03: MAJOR CHANGE: This is a complete rewrite of emulateapj.  It adds
-the use of single-column floats (figures, tables and footnotes) in the
-two-column mode.  All standard LaTeX/AASTeX environments such as
-{figure}, {table}, {figure*}, {table*} and {deluxetable} (and
-{deluxetable*} added here) should work as expected. Enjoy. 
-
+This is emulateapj.cls, version November 10, 2009
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 `emulateapj' is a LaTeX2e class to emulate the Astrophysical Journal
 (ApJ) page layout. The page length of the resulting document is very
 close to that in ApJ when Times fonts are used instead of the LaTeX
-default CM fonts (see below).
+default CM fonts.
 
-If a manuscript is prepared for ApJ submission using the standard AAS
-(American Astronomical Society) LaTeX macros and the `aastex' style (see
-instructions for authors on the ApJ web site), the only thing required
-from the user should be to replace \documentclass{aastex} with
-\documentclass{emulateapj}, and perhaps resize figures as desired and
-replace {deluxetable} with {deluxetable*}
-(possible minor problems are described below).
+If a manuscript is prepared for ApJ submission using the standard
+American Astronomical Society LaTeX macros and the `aastex' style
+(see instructions for authors on the ApJ web site), the only thing
+required from the user should be to replace \documentclass{aastex}
+with \documentclass{emulateapj}, and perhaps resize figures as
+desired and replace {deluxetable} with {deluxetable*}. Possible minor
+problems are described below.
 
 emulateapj requires revtex4.cls. If you don't have it already, it can be
-downloaded from http://publish.aps.org/revtex4/ (it's a small package).
+downloaded from http://publish.aps.org/revtex4/ (it's a small package). 
 Other extrnal packages used are latexsym, graphicx, amssymb, longtable,
 epsf. They should already be present in the modern TeX distributions; if
-not, download them from www.ctan.org.
-
-To switch to the Times font, use the accompanying file apjfonts.sty (see
-the site above):
-\usepackage{apjfonts}. Alternatively, e.g., use the standard
-\usepackage{mathptmx}, the only difference is in math and Greek symbols.
-
-Alexey Vikhlinin <alexey@head-cfa.harvard.edu>
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-Release notes (02/09/03):
-
-1) This is a complete rewrite of emulateapj. The package is now
-based on revtex instead of aastex + multicol. Some inconsistencies with
-aastex may have been missed, so please don't hesitate to report them.
-
-2) The {deluxetable} environment is re-implemented (the problem with the
-the aastex's deluxetable is it does not float). There is also a new
-environment {deluxetable*} (absent in aastex) to set a floating table
-two-column wide. These were not thoroughly tested, so please report any
-problems. Known problems:
-  (a) \rotate doesn't work (too difficult to implement). Solution:
-      - load package lscape  (\usepackage{lscape} in the header)
-      - move table at the end of the paper after references
-      - \clearpage before the table
-      - \LongTables if the table will span more than 1 page (see next item)
-      - put the table inside the landscape environment and \clearpage
-        at the end: 
-        \clearpage
-        \LongTables % optionally
-        \begin{landscape}
-          \begin{deluxetable}
-          ....
-          \end{deluxetable}
-        \clearpage
-        \end{landscape}
-
-3) Multi-page tables cannot be set properly inside the main text; you
-need to move the table to the end of the paper (after the references) and
-issue the command \LongTables before it.
-
-4) By default, deluxetables are typeset with \footnotesize. If you want
-to use a different size, use, e.g., \tabletypesize{\normalsize} _outside_
-the deluxetable environment. If you need to increase interline spacing
-in the tables, use \def\arraystretch{1.XXX} also _outside_ deluxetables.
-
-5) Option `onecolumn' (as in \documentclass[onecolumn]{emulateapj})
-sets the whole paper (except the reference section) in one column
-as done by the ApJ for papers with long equations.
-
-6) Options `apj' and `apjl' (\documentclass[apj]{emulateapj}) change the
-spacing of the references (the default is ApJL wide spacing), and
-also the spacing between figures and text (last check with printed
-Journal in 4/2005).
-
-7) By default, appendix subsections are not numbered:
-            APPENDIX
-     Derivation of Equations
-If you want them numbered (`A. Derivation of Equations'), use the option
-\documentclass[numberedappendix]{emulateapj}
- 
-It is recommended to use the {appendix} environment instead of the
-stand-alone \appendix command. Figure, table, and  equation counter are
-reset within the {appendix} to something like A1,A2,B1 etc. Table and
-figure counters are restored at the \end{appendix} because sometimes we
-want to place figures and tables belonging to the main matter at the end
-of the paper.
- 
-8) By default, the comment in the upper-left corner of the title page and
-under the abstract will say "Draft version \today". There are additional
-commands \journalinfo{} and \submitted{} (the latter is equivalent to the
-aastex \slugcomment{} which also works) to change those comments. Used
-alone, \submitted{} will act on both those places.
-
-9) The \title command sets the entire title, including math, in upper
-case. If this is undesirable, use \lowercase{} macro, e.g., 
-\title{UPPER CASE OK HERE \lowercase{$a+b=c$}}.
-
-10) On the last page where the references start, there may be problems
-with placement of footnotes. There is a command \lastpagefootnotes which
-can be issued somewhere before those footnotes. It will result in the
-remaining footnotes set together at the end of the text, properly
-adjusted.
-
-11) There may be problems with single-column figure placements on the
-last page; try moving the figure around or explicitly specifying the [t]
-placement.  There may also be minor column misalignments on
-complicated pages with footnotes, sections, etc.; these are too difficult
-to fix.
-
-12) Any footnotes in the paper title should be set as
-\title{Title\footnotemark[1]} \footnotetext[1]{text} (with foootnotetext
-outside the title), rather that simply a \footnote{}. 
-
-NOTE that if you use the footnote in the title, the footnote counter for
-the main text will be wrong. You need to reset it manually _after_ the
-first \section. For example, if the frontmatter footnotes (title +
-affiliations) stop at 3, you need \setcounter{footnote}{3}
-
-13) \label's within the deluxetable environments should go INSIDE the
-\tablecaption{...} command or after \tablehead
-
-14) ... if, however, you use \tablenum [not recommended], \label should
-    go IMMEDIATELY AFTER the \tablenum command
-
-15) Marc Audard reports that if the bibliography is exactly finishing the
-page, and the next page should be a table, latex is not working. If an
-empty character (\mbox{~}) is added after (or before) the bibliography,
-i.e., starting a new page, the problem disappears.
-
+not, download them from www.ctan.org. 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-Change Log
-
-2/14/3: fixed several bugs in deluxetable and footnotes inside the title.
-
-3/3/3:  Table caption is made in two lines. works only in {table} or
-{table*}, but not in {deluxetable}
-
-3/3/3:  Redefine p@subsection etc. for ApJ-style cross-references.
-
-3/16/3:  Define \tablerefs
-
-3/25/3:  Fix two-column references in the onecolumn mode (see 
-         \set@column@hsize{2})
-
-4/9/3:  Change the definition of \tablenotemark. It is less general but
-        works in the table caption. Also, put the body of deluxetable*
-        inside a minipage to fix table footnotes.
-
-5/14/3: Change section title font sizes. They are now different for 'apj'
-        and 'apjl' options
-
-7/8/3:  redefine NAT@sort@cites after loding revtex4 to prevent citations
-        from being sorted
-
-7/15/3: Fix \and in the author list
-
-7/17/3: Make \colhead to center column titles by default
-
-7/27/3: Redefile \@biblabel to remove the numbered list from thebibliography
-
-9/08/3: Further fixes to cutinhead: define @ptabularcr and use LT@cols
-
-10/08/3: Copy definitions for \anchor and \url from aastex.
-
-10/10/3: define \paragraph, \subparagraph. suppress section numbering
-         below \subsection. If you want subsubsections numbered, use 
-         \setcounter{secnumdepth}{3}
-         in the header
-
-11/13/3: add 'unsortedaddress' option to revtex4 to prevent groupin the
-authors by the institute
-
-11/26/3: define \def\blankaffiliation{~} after revtex4 to prevent \and's
-         from combining
-
-2/10/4: implement \tablewidth; works as documented in aastex;
-        change format for caption of deluxetables from Table 1. Title to
-                         Table 1.
-                          Title
-        Make table notes of the same width as the table.
-        Fix tabletypesize for table notes
-
-2/12/4: fix \tablewidth: \tablewidth{0pt} gives natural size (as does no
-        \tablewidth at all)
-        Remove dot after "Table 1."
-        Also change format to Table 1--- Continued
-
-2/19/4: implement \tablenum within deluxetable; abstract paragraphs
-        indented; 
-
-3/19/4: if no \tablehead is given, \startdata still prints out the caption
-
-4/2/4: remove a spurious space from the definition of \tablehead
-
-4/12/4: Due to popular demand, define \tablecomments and \tablerefs for
-        ordinary {table}s.
-
-6/6/4: Proper implementation of \sidehead in the deluxetable
-
-6/21/4: Fix issues with table heading which were introduced when I tried
-        to implement deluxetable's _without_ any heading.
-
-6/22/4: correct implementation of \tablenotetext in the \LongTable mode
-        (they previously generated plain footnotes at the end of the table)
-
-9/21/4: fix bug fix figure and table numbers in the appendicies
-
-10/8/4: add \object \facility \dataset from aastex
-
-11/26/4: Change floats-to-text distance to 5mm in ApJLetter style and
-         7mm in ApJ style (verified with Journal version in Dec 2004)
- 
-4/21/5: change \renewcommand{\dbltopfraction}{0.85}; add
-        \renewcommand{\dblfloatpagefraction}{0.85}
-        \setcounter{topnumber}{9}
-        \setcounter{bottomnumber}{9}
-        \setcounter{totalnumber}{20}
-        \setcounter{dbltopnumber}{9} 
-
-11/27/5: Add parameters to fine-tune spacing to deluxetables:
-        \abovedeluxetableskip   % = 0 by default
-        \belowdeluxetableskip   % = 0 
-
-        Use these to fiddle with the spacing, e.g.
-        \setlength{\abovetableskipamount}{-1\baselineskip}
-
-12/14/5: no more explicit setting of tabcolsep inside deluxetables (so
-         the user has control over this parameter)
-
+For the latest version check http://hea-www.harvard.edu/~alexey/emulateapj
 
-08/13/6: Collect altaffiltext into token and issue \altaffiliation
-          only once. This overcomes the problem with 2**n processing 
-          time for long affiliation lists.
+NOTE: ApJ has moved its publishing to IOP and they have slightly changed
+the formatting. To implement these changes, call emulateapj with the iop
+option, as in
+\usepackage[iop]{emulateapj}
+
+Other available options:
+
+[chicago] - (default) typeset as was done in the University of Chicago Press
+[twocolumn] - (default) two-column mode
+[onecolumn] - main text in one-column mode
+[apj]       - typeset as for main journal
+[apjl]      - (default) typeset as for ApJ Letters 
+[tighten]   - some adjustments to approximate grid typesetting
+[numberedappendix]   - number appendix sections as A, B, etc
+[appendixfloats]  - use separate numbering for floats within appendix
+
+NOTE 2: Starting from version 11/10/2009, emulateapj tries to load
+revtex4-1 if present on the system. This may cause small changes in
+typesetting for old documents. If you want full compatibility, please
+download the last version based on revtex4,
+http://hea-www.harvard.edu/~alexey/emulateapj/emulateapj-rtx4.cls
+and bundle it with your TeX source code
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-Copyright 2000-2006 Alexey Vikhlinin
+Copyright 2000-2009 Alexey Vikhlinin
 
 The first version of this package was written by Maxim Markevitch. 
 Pieces of AASTeX code are used for compatibility with aastex.cls.
 
-This program can be redistributed and/or modified under the terms
-of the LaTeX Project Public License available from CTAN archives in
-directory macros/latex/base/lppl.txt. This means you are free to use and
-distribute this package; however, if you modify anything, please change the
-file name and remove the authors email address.
+This program can be redistributed and/or modified under the terms of
+the LaTeX Project Public License available from CTAN archives in
+macros/latex/base/lppl.txt. This means you are free to use and
+distribute this package; however, if you modify anything, please
+change the file name and remove the author's email address.
 
 Alexey Vikhlinin <alexey@head.cfa.harvard.edu>
+
+
+%% For release notes and change log, read the bottom of emulateapj.cls
diff --git a/Master/texmf-dist/tex/latex/emulateapj/emulateapj.cls b/Master/texmf-dist/tex/latex/emulateapj/emulateapj.cls
index b9eb196d3fd..2c7210dd4de 100644
--- a/Master/texmf-dist/tex/latex/emulateapj/emulateapj.cls
+++ b/Master/texmf-dist/tex/latex/emulateapj/emulateapj.cls
@@ -1,274 +1,90 @@
-%% This is emulateapj.cls, version August 13, 2006
+%% This is emulateapj.cls, version November 10, 2009
 %% For the latest version check http://hea-www.harvard.edu/~alexey/emulateapj
 %%
-%% 2/9/03: MAJOR CHANGE: This is a complete rewrite of emulateapj.  It adds
-%% the use of single-column floats (figures, tables and footnotes) in the
-%% two-column mode.  All standard LaTeX/AASTeX environments such as
-%% {figure}, {table}, {figure*}, {table*} and {deluxetable} (and
-%% {deluxetable*} added here) should work as expected. Enjoy. 
+%% NOTE: ApJ has moved its publishing to IOP and they have slightly changed
+%% the formatting. To implement these changes, call emulateapj with the iop
+%% option, as in
+%% \usepackage[iop]{emulateapj}
 %%
+%% Other available options:
 %%
-%% `emulateapj' is a LaTeX2e class to emulate the Astrophysical Journal
-%% (ApJ) page layout. The page length of the resulting document is very
-%% close to that in ApJ when Times fonts are used instead of the LaTeX
-%% default CM fonts (see below).
-%% 
-%% If a manuscript is prepared for ApJ submission using the standard AAS
-%% (American Astronomical Society) LaTeX macros and the `aastex' style (see
-%% instructions for authors on the ApJ web site), the only thing required
-%% from the user should be to replace \documentclass{aastex} with
-%% \documentclass{emulateapj}, and perhaps resize figures as desired and
-%% replace {deluxetable} with {deluxetable*}
-%% (possible minor problems are described below).
-%%
-%% emulateapj requires revtex4.cls. If you don't have it already, it can be
-%% downloaded from http://publish.aps.org/revtex4/ (it's a small package).
-%% Other extrnal packages used are latexsym, graphicx, amssymb, longtable,
-%% epsf. They should already be present in the modern TeX distributions; if
-%% not, download them from www.ctan.org.
+%% [chicago] - (default) typeset as was done in the University of Chicago Press
+%% [twocolumn] - (default) two-column mode
+%% [onecolumn] - main text in one-column mode
+%% [apj]       - typeset as for main journal
+%% [apjl]      - (default) typeset as for ApJ Letters 
+%% [tighten]   - some adjustments to approximate grid typesetting
+%% [numberedappendix]   - number appendix sections as A, B, etc
+%% [appendixfloats]  - use separate numbering for floats within appendix
 %%
-%% To switch to the Times font, use the accompanying file apjfonts.sty (see
-%% the site above):
-%% \usepackage{apjfonts}. Alternatively, e.g., use the standard
-%% \usepackage{mathptmx}, the only difference is in math and Greek symbols.
-%% 
-%% Alexey Vikhlinin <alexey@head-cfa.harvard.edu>
+%% NOTE 2: Starting from version 11/10/2009, emulateapj tries to load
+%% revtex4-1 if present on the system. This may cause small changes in
+%% typesetting for old documents. If you want full compatibility, please
+%% download the last version based on revtex4,
+%% http://hea-www.harvard.edu/~alexey/emulateapj/emulateapj-rtx4.cls
+%% and bundle it with your TeX source code
 %%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Release notes (02/09/03):
-%% 
-%% 1) This is a complete rewrite of emulateapj. The package is now
-%% based on revtex instead of aastex + multicol. Some inconsistencies with
-%% aastex may have been missed, so please don't hesitate to report them.
-%%
-%% 2) The {deluxetable} environment is re-implemented (the problem with the
-%% the aastex's deluxetable is it does not float). There is also a new
-%% environment {deluxetable*} (absent in aastex) to set a floating table
-%% two-column wide. These were not thoroughly tested, so please report any
-%% problems. Known problems:
-%%   (a) \rotate doesn't work (too difficult to implement). Solution:
-%%       - load package lscape  (\usepackage{lscape} in the header)
-%%       - move table at the end of the paper after references
-%%       - \clearpage before the table
-%%       - \LongTables if the table will span more than 1 page (see next item)
-%%       - put the table inside the landscape environment and \clearpage
-%%         at the end: 
-%%         \clearpage
-%%         \LongTables % optionally
-%%         \begin{landscape}
-%%           \begin{deluxetable}
-%%           ....
-%%           \end{deluxetable}
-%%         \clearpage
-%%         \end{landscape}
-%%
-%% 3) Multi-page tables cannot be set properly inside the main text; you
-%% need to move the table to the end of the paper (after the references) and
-%% issue the command \LongTables before it.
-%% 
-%% 4) By default, deluxetables are typeset with \footnotesize. If you want
-%% to use a different size, use, e.g., \tabletypesize{\normalsize} _outside_
-%% the deluxetable environment. If you need to increase interline spacing
-%% in the tables, use \def\arraystretch{1.XXX} also _outside_ deluxetables.
-%% 
-%% 5) Option `onecolumn' (as in \documentclass[onecolumn]{emulateapj})
-%% sets the whole paper (except the reference section) in one column
-%% as done by the ApJ for papers with long equations.
-%% 
-%% 6) Options `apj' and `apjl' (\documentclass[apj]{emulateapj}) change the
-%% spacing of the references (the default is ApJL wide spacing), and
-%% also the spacing between figures and text (last check with printed
-%% Journal in 4/2005).
-%%
-%% 7) By default, appendix subsections are not numbered:
-%%             APPENDIX
-%%      Derivation of Equations
-%% If you want them numbered (`A. Derivation of Equations'), use the option
-%% \documentclass[numberedappendix]{emulateapj}
-%%  
-%% It is recommended to use the {appendix} environment instead of the
-%% stand-alone \appendix command. Figure, table, and  equation counter are
-%% reset within the {appendix} to something like A1,A2,B1 etc. Table and
-%% figure counters are restored at the \end{appendix} because sometimes we
-%% want to place figures and tables belonging to the main matter at the end
-%% of the paper.
-%%  
-%% 8) By default, the comment in the upper-left corner of the title page and
-%% under the abstract will say "Draft version \today". There are additional
-%% commands \journalinfo{} and \submitted{} (the latter is equivalent to the
-%% aastex \slugcomment{} which also works) to change those comments. Used
-%% alone, \submitted{} will act on both those places.
-%% 
-%% 9) The \title command sets the entire title, including math, in upper
-%% case. If this is undesirable, use \lowercase{} macro, e.g., 
-%% \title{UPPER CASE OK HERE \lowercase{$a+b=c$}}.
-%%
-%% 10) On the last page where the references start, there may be problems
-%% with placement of footnotes. There is a command \lastpagefootnotes which
-%% can be issued somewhere before those footnotes. It will result in the
-%% remaining footnotes set together at the end of the text, properly
-%% adjusted.
-%% 
-%% 11) There may be problems with single-column figure placements on the
-%% last page; try moving the figure around or explicitly specifying the [t]
-%% placement.  There may also be minor column misalignments on
-%% complicated pages with footnotes, sections, etc.; these are too difficult
-%% to fix.
-%%
-%% 12) Any footnotes in the paper title should be set as
-%% \title{Title\footnotemark[1]} \footnotetext[1]{text} (with foootnotetext
-%% outside the title), rather that simply a \footnote{}. 
+%% Copyright 2000-2009 Alexey Vikhlinin
 %%
-%% NOTE that if you use the footnote in the title, the footnote counter for
-%% the main text will be wrong. You need to reset it manually _after_ the
-%% first \section. For example, if the frontmatter footnotes (title +
-%% affiliations) stop at 3, you need \setcounter{footnote}{3}
-%%
-%% 13) \label's within the deluxetable environments should go INSIDE the
-%% \tablecaption{...} command or after \tablehead
+%% The first version of this package was written by Maxim Markevitch. 
+%% Pieces of AASTeX code are used for compatibility with aastex.cls.
 %%
-%% 14) ... if, however, you use \tablenum [not recommended], \label should
-%%     go IMMEDIATELY AFTER the \tablenum command
-%%
-%% 15) Marc Audard reports that if the bibliography is exactly finishing the
-%% page, and the next page should be a table, latex is not working. If an
-%% empty character (\mbox{~}) is added after (or before) the bibliography,
-%% i.e., starting a new page, the problem disappears.
+%% This program can be redistributed and/or modified under the terms of
+%% the LaTeX Project Public License available from CTAN archives in
+%% macros/latex/base/lppl.txt. This means you are free to use and
+%% distribute this package; however, if you modify anything, please
+%% change the file name and remove the author's email address.
 %%
+%% Alexey Vikhlinin <alexey@head.cfa.harvard.edu>
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Change Log
-%% 
-%% 2/14/3: fixed several bugs in deluxetable and footnotes inside the title.
-%%
-%% 3/3/3:  Table caption is made in two lines. works only in {table} or
-%% {table*}, but not in {deluxetable}
-%%
-%% 3/3/3:  Redefine p@subsection etc. for ApJ-style cross-references.
-%%
-%% 3/16/3:  Define \tablerefs
-%%
-%% 3/25/3:  Fix two-column references in the onecolumn mode (see 
-%%          \set@column@hsize{2})
 %%
-%% 4/9/3:  Change the definition of \tablenotemark. It is less general but
-%%         works in the table caption. Also, put the body of deluxetable*
-%%         inside a minipage to fix table footnotes.
-%%
-%% 5/14/3: Change section title font sizes. They are now different for 'apj'
-%%         and 'apjl' options
-%%
-%% 7/8/3:  redefine NAT@sort@cites after loding revtex4 to prevent citations
-%%         from being sorted
-%%
-%% 7/15/3: Fix \and in the author list
-%%
-%% 7/17/3: Make \colhead to center column titles by default
+%% `emulateapj' is a LaTeX2e class to emulate the Astrophysical Journal
+%% (ApJ) page layout. The page length of the resulting document is very
+%% close to that in ApJ when Times fonts are used instead of the LaTeX
+%% default CM fonts.
 %% 
-%% 7/27/3: Redefile \@biblabel to remove the numbered list from thebibliography
-%%
-%% 9/08/3: Further fixes to cutinhead: define @ptabularcr and use LT@cols
-%%
-%% 10/08/3: Copy definitions for \anchor and \url from aastex.
-%%
-%% 10/10/3: define \paragraph, \subparagraph. suppress section numbering
-%%          below \subsection. If you want subsubsections numbered, use 
-%%          \setcounter{secnumdepth}{3}
-%%          in the header
-%%
-%% 11/13/3: add 'unsortedaddress' option to revtex4 to prevent groupin the
-%% authors by the institute
-%%
-%% 11/26/3: define \def\blankaffiliation{~} after revtex4 to prevent \and's
-%%          from combining
-%%
-%% 2/10/4: implement \tablewidth; works as documented in aastex;
-%%         change format for caption of deluxetables from Table 1. Title to
-%%                          Table 1.
-%%                           Title
-%%         Make table notes of the same width as the table.
-%%         Fix tabletypesize for table notes
-%%
-%% 2/12/4: fix \tablewidth: \tablewidth{0pt} gives natural size (as does no
-%%         \tablewidth at all)
-%%         Remove dot after "Table 1."
-%%         Also change format to Table 1--- Continued
-%%
-%% 2/19/4: implement \tablenum within deluxetable; abstract paragraphs
-%%         indented; 
-%%
-%% 3/19/4: if no \tablehead is given, \startdata still prints out the caption
-%%
-%% 4/2/4: remove a spurious space from the definition of \tablehead
-%%
-%% 4/12/4: Due to popular demand, define \tablecomments and \tablerefs for
-%%         ordinary {table}s.
-%%
-%% 6/6/4: Proper implementation of \sidehead in the deluxetable
-%%
-%% 6/21/4: Fix issues with table heading which were introduced when I tried
-%%         to implement deluxetable's _without_ any heading.
-%%
-%% 6/22/4: correct implementation of \tablenotetext in the \LongTable mode
-%%         (they previously generated plain footnotes at the end of the table)
-%%
-%% 9/21/4: fix bug fix figure and table numbers in the appendicies
-%%
-%% 10/8/4: add \object \facility \dataset from aastex
-%%
-%% 11/26/4: Change floats-to-text distance to 5mm in ApJLetter style and
-%%          7mm in ApJ style (verified with Journal version in Dec 2004)
-%%  
-%% 4/21/5: change \renewcommand{\dbltopfraction}{0.85}; add
-%%         \renewcommand{\dblfloatpagefraction}{0.85}
-%%         \setcounter{topnumber}{9}
-%%         \setcounter{bottomnumber}{9}
-%%         \setcounter{totalnumber}{20}
-%%         \setcounter{dbltopnumber}{9} 
-%%
-%% 11/27/5: Add parameters to fine-tune spacing to deluxetables:
-%%         \abovedeluxetableskip   % = 0 by default
-%%         \belowdeluxetableskip   % = 0 
-%%
-%%         Use these to fiddle with the spacing, e.g.
-%%         \setlength{\abovetableskipamount}{-1\baselineskip}
-%%
-%% 12/14/5: no more explicit setting of tabcolsep inside deluxetables (so
-%%          the user has control over this parameter)
-%%
-%% 05/04/6: redefine \tableline as \hrule; otherwise it weirdly interact
-%%          with my implementation of deluxetable
-%%
-%% 08/13/6: Collect altaffiltext into token and issue \altaffiliation
-%%          only once. This overcomes the problem with 2**n processing 
-%%          time for long affiliation lists.
+%% If a manuscript is prepared for ApJ submission using the standard
+%% American Astronomical Society LaTeX macros and the `aastex' style
+%% (see instructions for authors on the ApJ web site), the only thing
+%% required from the user should be to replace \documentclass{aastex}
+%% with \documentclass{emulateapj}, and perhaps resize figures as
+%% desired and replace {deluxetable} with {deluxetable*}. Possible minor
+%% problems are described below.
 %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Copyright 2000-2006 Alexey Vikhlinin
+%% emulateapj requires revtex4.cls. If you don't have it already, it can be
+%% downloaded from http://publish.aps.org/revtex4/ (it's a small package). 
+%% Other extrnal packages used are latexsym, graphicx, amssymb, longtable,
+%% epsf. They should already be present in the modern TeX distributions; if
+%% not, download them from www.ctan.org. 
 %%
-%% The first version of this package was written by Maxim Markevitch. 
-%% Pieces of AASTeX code are used for compatibility with aastex.cls.
 %%
-%% This program can be redistributed and/or modified under the terms
-%% of the LaTeX Project Public License available from CTAN archives in
-%% directory macros/latex/base/lppl.txt. This means you are free to use and
-%% distribute this package; however, if you modify anything, please change the
-%% file name and remove the authors email address.
+%% For release notes and change log, see at bottom
 %%
-%% Alexey Vikhlinin <alexey@head.cfa.harvard.edu>
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\def\emulapj@ver{08/13/06}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\def\emulapj@ver{11/10/09}
 
 
 \ProvidesClass{emulateapj}
 
+\newif\if@revtex@four@one@
+\IfFileExists{revtex4-1.cls}{
+\@revtex@four@one@true
+\def\@revtex@cls{revtex4-1}
+}{
+\@revtex@four@one@false
+\def\@revtex@cls{revtex4}
+}
+
 \newif\if@two@col
 \DeclareOption{twocolumn}{\@two@coltrue}
 \DeclareOption{onecolumn}{\@two@colfalse}
 
+\newif\if@chicago
+\DeclareOption{chicago}{\@chicagotrue}
+\DeclareOption{iop}{\@chicagofalse}
+
 \newlength{\bibbaselineskip}\setlength{\bibbaselineskip}{3.075mm}
-\DeclareOption{numberedappendix}{
-  \def\AppendixApjSectionMarkInTitle#1{#1.\ }
-}
 \newif\if@apj@letter
 \DeclareOption{apj}{
   \setlength{\bibbaselineskip}{2.7mm}
@@ -285,11 +101,22 @@
   \@apj@lettertrue
 }
 
+\DeclareOption{tighten}{
+% lineskiplimits to facilitate grid typesetting
+  \lineskiplimit=-2mm
+}
+
 \def\AppendixApjSectionMarkInTitle#1{\relax}
 \DeclareOption{numberedappendix}{
   \def\AppendixApjSectionMarkInTitle#1{#1.\ }
 }
 
+\newif\if@number@appendix@floats\@number@appendix@floatsfalse
+\DeclareOption{appendixfloats}{
+  \@number@appendix@floatstrue
+}
+
+
 \def\center@table@notes{%
   \def\@spew@tblnotes{%
         \centerline{\begin{minipage}{\pt@width}\spew@tblnotes\end{minipage}}%
@@ -300,25 +127,37 @@
   \def\@spew@tblnotes{\spew@tblnotes}%
 }
 
- 
+
 \left@just@table@notes
 
-\ExecuteOptions{apjl,twocolumn}
+\ExecuteOptions{apjl,twocolumn,chicago}
 
 \ProcessOptions
 
 \let\@startsection@from@latex=\@startsection
 
 \if@two@col
-  \LoadClass[twocolumn,nofootinbib,showkeys,twoside,floatfix,unsortedaddress]{revtex4}
+  \LoadClass[twocolumn,nofootinbib,showkeys,twoside,floatfix,unsortedaddress,flushbottom]{\@revtex@cls}
 \else
-  \LoadClass[nofootinbib,showkeys,twoside,floatfix,unsortedaddress]{revtex4}
+  \LoadClass[nofootinbib,showkeys,twoside,floatfix,unsortedaddress,flushbottom]{\@revtex@cls}
 \fi
 \def\blankaffiliation{~}%
 
-% Restore natbib package without sorting.
+\if@chicago
+ \def\@eapj@cap@font{\scshape}
+ \def\@eapj@figname{Fig.}
+ \def\@eapj@tabname{TABLE}
+\else
+ \def\@eapj@cap@font{\bfseries}
+ \def\@eapj@figname{Figure}
+ \def\@eapj@tabname{Table}
+\fi
+
+% Restore natbib package without sorting. 
 \def\NAT@sort{0}
-\def\NAT@sort@cites#1{\edef\NAT@cite@list{#1}}
+\def\NAT@cmprs{0}
+% only redefine sort@cites for natbib versions < 2009
+\@ifundefined{NAT@sort@cites@}{\def\NAT@sort@cites#1{\edef\NAT@cite@list{#1}}}%
 
 \RequirePackage{latexsym}% 
 \RequirePackage{graphicx}% 
@@ -330,9 +169,12 @@
 
 
 \let\@startsection=\@startsection@from@latex
-\def\baselinestretch{1.02}
+\def\baselinestretch{1.0}
 \AtBeginDocument{\def\arraystretch{1.0}}
 
+\if@revtex@four@one@
+\def\raggedcolumn@sw#1#2{#2}  % implement flushbottom as it was in revtex4
+\fi
 
 \RequirePackage{epsf,graphicx}
 
@@ -340,9 +182,9 @@
 %%%%%%%% aastex's definition of type sizes
 \renewcommand\normalsize{%
    \@setfontsize\normalsize\@xpt{10.56}
-   \abovedisplayskip 2.2mm \@plus2\p@ \@minus5\p@
+   \abovedisplayskip 2.2mm \@plus2\p@ \@minus1\p@
    \abovedisplayshortskip \z@ \@plus3\p@
-   \belowdisplayshortskip 6\p@ \@plus3\p@ \@minus3\p@
+   \belowdisplayshortskip 2.2mm \@plus2\p@ \@minus1\p@
    \belowdisplayskip \abovedisplayskip
    \let\@listi\@listI}
 \normalsize
@@ -430,7 +272,7 @@
 \IfUnDef{BeforeBeg#1}\else\csname BeforeBeg#1\endcsname\fi%
 \IfUnDef{AfterBeg#1}% This is done to skip the command for environments
                      % which can take arguments, like multicols; YOU MUST NOT
-                     % USE \AfterBegin{...}{...} for such environments!
+                     % USE \AfterBegin{...}{...} for such environments! 
         \let\SaveBegEnd=\BeginEnvironment%
 \else
         % Start this environment
@@ -460,7 +302,7 @@
 %  *            PAGE LAYOUT               *
 %  ****************************************
 
-% Page size, spacing parameters, etc.
+% Page size, spacing parameters, etc. 
 
 \textwidth=7.1in
 \columnsep=0.3125in
@@ -479,9 +321,13 @@
 
 %% AV,MM, to have 64 lines per column, with textheight 25cm:
 \textheight=64\baselineskip
-%\textheight=\baselinestretch\textheight
+\textheight=\baselinestretch\textheight
 \ifdim\textheight>25.2cm\textheight=25.0cm\fi
 
+\topskip\baselineskip
+\maxdepth\baselineskip
+
+
 \let\tighten=\relax
 \let\tightenlines=\tighten
 \let\singlespace=\relax
@@ -574,15 +420,20 @@
   \@affiliation{\hspace*{2mm}#1}%
 }%
 \let\affil=\affiliation
-\def\altaffilmark#1{\textsuperscript{#1}}
+
+\def\affil@mark#1{\textsuperscript{#1}}
+\def\affile@mark@pad{0.2em}
+
+\def\altaffilmark#1{\affil@mark{#1}}
 
 % Fight poor revtex algorithm for altaffiliation:
 \def\@alt@affil@kill@next@symbol#1{\relax}
 \newtoks\alt@affil@toks \alt@affil@toks{\@alt@affil@kill@next@symbol}
 \newtoks\alt@affil@toks@count \alt@affil@toks@count{}
 
+
 \def\altaffiltext#1#2{%
-\global\alt@affil@toks\expandafter{\the\alt@affil@toks\\\hspace*{3mm}\textsuperscript{#1}\hspace*{0.7mm}#2}%
+\global\alt@affil@toks\expandafter{\the\alt@affil@toks\\\hspace*{3mm}\affil@mark{#1}\hspace*{\affile@mark@pad}#2}%
 \global\alt@affil@toks@count\expandafter{\the\alt@affil@toks@count\stepcounter{front@matter@foot@note}}%
 }
 \let\@author@finish@revtex=\@author@finish
@@ -624,7 +475,7 @@
  \everypar{\rightskip=0.5in\leftskip=\rightskip}\par
 }%
 
-% Redefine the LaTeX \and command for this style.
+% Redefine the LaTeX \and command for this style. 
 \def\and{\author{\vspace*{-0.2in}and\vspace*{-0.558cm}}\noaffiliation}
 \def\@listand{\@ifnum{\@tempcnta=\tw@}{\andname\space}{}}%
 
@@ -677,21 +528,36 @@
 
 % Footnotes on the last page: user issues \lastpagefootnotes. It catches all
 % footnotes and issues them before \begin{refernces} or
-% \begin{\thebibliography} at the end of right column.
-\newcounter{lastfootnote} \setcounter{lastfootnote}{0}
-\long\gdef\lastfootnote{\mbox{}}
+% \begin{\thebibliography} or \begin{appendix}, whichever comes first,
+% at the end of right column.  
+\newcounter{lastfootnote}
 \let\orig@footnote=\footnote
-\long\def\lastpagefootnotes{
+%
+\def\spit@out@footnotes@{\addtocounter{footnote}{-\c@lastfootnote}\vspace*{-\baselineskip}\vspace*{\skip\footins}\bgroup\footnotesize\lastfootnote\par\egroup\let\footnote=\orig@footnote}
+%
+\let\spit@out@footnotes\relax
+%
+\long\def\lastpagefootnotes{%
+\raggedbottom% Have to use flushbottom with revtex4-1 but it eats away
+             % last page footnotes
+\setcounter{lastfootnote}{0}
+\long\gdef\lastfootnote{\mbox{}}
+\let\spit@out@footnotes\spit@out@footnotes@
 \long\def\footnote##1{\refstepcounter{lastfootnote}\footnotemark\g@addto@macro\lastfootnote{\\[\footnotesep]\refstepcounter{footnote}\mbox{}\hspace*{3mm}\textsuperscript{\thefootnote}~##1}}
-\BeforeBegin{references}{\addtocounter{footnote}{-\c@lastfootnote}\vspace*{-\baselineskip}\vspace*{\skip\footins}\bgroup\footnotesize\lastfootnote\par\egroup}
-\BeforeBegin{thebibliography}{\addtocounter{footnote}{-\c@lastfootnote}\vspace*{-\baselineskip}\vspace*{\skip\footins}\bgroup\footnotesize\lastfootnote\par\egroup}
+\BeforeBegin{appendix}{\spit@out@footnotes\let\spit@out@footnotes\relax}
+\BeforeBegin{references}{\spit@out@footnotes\let\spit@out@footnotes\relax}
+\BeforeBegin{thebibliography}{\spit@out@footnotes\let\spit@out@footnotes\relax}
+% in case \lastpagefootnotes were given inside \begin{appendix}\end{appendix},
+\BeforeEnd{appendix}{\spit@out@footnotes\let\spit@out@footnotes\relax}
+\AfterEnd{appendix}{\let\footnote=\orig@footnote}
 \AfterEnd{references}{\let\footnote=\orig@footnote}
 \AfterEnd{thebibliography}{\let\footnote=\orig@footnote}
 }
 \let\lastpagefootnote=\lastpagefootnotes
 
+\if@revtex@four@one@\else
 % this command is copied from the original revtex, but adds space above
-% footnote (if any) above the references.
+% footnote (if any) above the references. 
 \@namedef{balance@2}{%
  \expandafter\balance@two\csname col@1\endcsname\@outputbox
  % Avoid a bug by preventing a restore when leaving this group
@@ -706,7 +572,7 @@
   }%
  }%
 }%
-
+\fi
 
 \skip\footins 4.5mm plus 1mm minus 1mm
 \footnotesep 0pt
@@ -728,7 +594,7 @@
 
 \def\section{%
     \if@firstsection\@firstsectionfalse
-      \maketitle\setcounter{footnote}{\thefront@matter@foot@note}
+      \maketitle\setcounter{footnote}{\thefront@matter@foot@note}%
       \let\footnotetext=\old@foot@note@text
       \let\footnotemark=\old@foot@note@mark
     \fi
@@ -738,7 +604,7 @@
   {\normalsize\itshape \center}}
 
 \def\subsubsection{\@startsection{subsubsection}{3}{\z@}%
-  {2ex plus 1ex minus .2ex}{1ex plus .2ex}{\normalsize\it \center}}
+  {2ex plus 1ex minus .2ex}{1ex plus .2ex}{\small\itshape \center}}
 
 \def\paragraph{\@startsection{paragraph}{4}{\z@}%
   {1.5ex plus 1ex minus .2ex}{-0.5\parindent}{\small\it}}
@@ -793,7 +659,7 @@
       {\ifnum #2>\c@secnumdepth \else \protect \numberline {\csname
       the#1\endcsname }\fi #7}}\fi \@xsect {#5} \penalty \ApjSectionpenalty
 %-refstepcounter is now within a group. So \@currentlabel, which is normally
-%-set by \refstepcounter is hidden within a group. Need to set it manually.
+%-set by \refstepcounter is hidden within a group. Need to set it manually. 
 \protected@edef\@currentlabel{\csname p@#1\endcsname\csname the#1\endcsname}
 }
 
@@ -822,7 +688,7 @@
 \renewenvironment{appendix}[0]{
   \onecolumngrid
         \vskip 10pt plus 2pt minus 1pt
-        \noindent\mbox{}\hfill{\small APPENDIX}\hfill\mbox{}\par
+        \noindent\mbox{}\hfill{\apjsecfont APPENDIX}\hfill\mbox{}\par
         \nopagebreak\medskip\@nobreaktrue\def\ApjSectionpenalty{\@M}
         \@firstsectionfalse
           \setcounter{section}{0}
@@ -830,24 +696,29 @@
           \setcounter{equation}{0}
           \setcounter{remember@figure@num}{\c@figure}
           \setcounter{remember@table@num}{\c@table}
-          \setcounter{figure}{0}
-          \setcounter{table}{0}
 %  \def\fnum@figure{Figure \Alph{section}\thefigure:}
 %  \def\fnum@table{Table \Alph{section}\thetable:}
           \def\thesection{\Alph{section}}
           \def\theequation{\hbox{\Alph{section}\arabic{equation}}}
+
+          \if@number@appendix@floats
+          \setcounter{figure}{0}
+          \setcounter{table}{0}
           \def\thefigure{\thesection\@arabic\c@figure}
           \def\thetable{\thesection\@arabic\c@table}
+          \fi
 %
 % Do not use appendix numbers in the titles
           \def\ApjSectionMarkInTitle{\AppendixApjSectionMarkInTitle}
-          \def\section{\setcounter{equation}{0}\setcounter{figure}{0}\setcounter{table}{0}\@startsection {section}{1}{\z@} 
-            {10pt}{5pt}{\centering\scshape}}
+          \def\section{\setcounter{equation}{0}\if@number@appendix@floats\setcounter{figure}{0}\setcounter{table}{0}\fi\@startsection {section}{1}{\z@} 
+            {10pt}{5pt}{\centering\scshape\apjsecfont}}
 %
 %
           }{%
+            \if@number@appendix@floats
             \setcounter{figure}{\c@remember@figure@num}%
             \setcounter{table}{\c@remember@table@num}%
+            \fi
           }
 
 
@@ -859,7 +730,7 @@
 \renewenvironment{references}[0]{
   \onecolumngrid
   \par
-  \vspace*{10pt plus 3pt}
+  \vspace{10pt plus 3pt}
   \noindent \makebox[\textwidth][c]{\small\scshape REFERENCES}
   \par
   \vspace*{4pt plus 3pt}
@@ -869,7 +740,7 @@
   \footnotesize \baselineskip=\baselinestretch\bibbaselineskip plus 1pt
   minus 1pt \interlinepenalty \@M
   \hyphenpenalty=10000
-  \frenchspacing    % AV - to get right spacing after ``et al.''
+  \frenchspacing    % AV - to get right spacing after ``et al.'' 
   \def\refpar{\par\hangindent=1.2em\hangafter=1}}
 {
   \onecolumngrid
@@ -883,28 +754,33 @@
 
 \newdimen\bibindent
 \renewenvironment{thebibliography}[1]{
-  \onecolumngrid
-  \par
-  \vspace*{10pt plus 3pt}
-  \noindent \makebox[\textwidth][c]{\footnotesize REFERENCES}
-  \par
-  \vspace*{4pt plus 3pt}
-  \set@column@hsize{2}\twocolumngrid
-  \list{}%
-    {
-      \parindent=0pt \parskip=0pt \parsep=0pt % AV
-      \bibindent=0pt                          %
-      \def\baselinestretch{1.0}
-      \footnotesize \baselineskip=\bibbaselineskip \interlinepenalty \@M  % AV
-      \frenchspacing    % AV - to get right spacing after ``et al.''
-      \hyphenpenalty=10000
-      \itemindent=-1.0em                      %
-      \itemsep=0pt                            %
-      \listparindent=0pt                      %
-      \settowidth\labelwidth{0pt} %
-      \labelsep=0pt                           %
-      \leftmargin=1.0em
-      \advance\leftmargin\labelsep
+ \if@chicago \onecolumngrid \fi
+ \par
+ \raggedright
+ \vspace{10pt plus 3pt}
+ \if@chicago
+    \noindent \makebox[\textwidth][c]{\footnotesize REFERENCES}
+ \else
+    \centerline{\footnotesize REFERENCES}
+ \fi
+ \par
+ \vspace*{4pt plus 3pt}
+ \if@chicago\set@column@hsize{2} \twocolumngrid \fi
+ \list{}%
+   {
+     \parindent=0pt \parskip=0pt \parsep=0pt % AV
+     \bibindent=0pt                          %
+     \def\baselinestretch{1.0}
+     \footnotesize \baselineskip=\bibbaselineskip \interlinepenalty \@M  % AV
+     \frenchspacing    % AV - to get right spacing after ``et al.'' 
+     \hyphenpenalty=10000
+     \itemindent=-1.0em                      %
+     \itemsep=0pt                            %
+     \listparindent=0pt                      %
+     \settowidth\labelwidth{0pt} %
+     \labelsep=0pt                           %
+     \leftmargin=1.0em
+     \advance\leftmargin\labelsep
 %%%      \usecounter{enumiv}%
       \let\p@enumiv\@empty
       \renewcommand\theenumiv{\relax}}%
@@ -973,8 +849,8 @@
 \setlength{\belowcaptionskip}{0pt}
 \setlength{\abovecaptionskip}{5pt}
 
-\setlength{\textfloatsep}{-\baselineskip}
-\setlength{\dbltextfloatsep}{-\baselineskip}
+\setlength{\textfloatsep}{-\baselinestretch\baselineskip}
+\setlength{\dbltextfloatsep}{-\baselinestretch\baselineskip}
 \if@apj@letter
   \addtolength{\textfloatsep}{5mm plus 10mm minus 10mm}
   \addtolength{\dbltextfloatsep}{5mm plus 10mm minus 10mm}
@@ -1005,16 +881,19 @@
 }%
 
 \long\def\@makecaption#1#2{%
-  \noindent\begin{minipage}{0.9999\linewidth} %% \noindent is needed because
-    %% otherwise minipage + parindent does not fit into the line and spurious
-    %% vertical skip appear after caption
-    \if\csname ftype@\@captype\endcsname 2  
-    \vskip 2ex\noindent \centering\@table@type@size\scshape  #1\par #2\par\medskip
-    \else
-    \vskip \abovecaptionskip\footnotesize\noindent #1 #2\par\vskip \belowcaptionskip
-    \fi
-  \end{minipage}
-  }
+ \noindent\begin{minipage}{0.9999\linewidth} %% \noindent is needed because
+   %% otherwise minipage + parindent does not fit into the line and spurious
+   %% vertical skip appear after caption
+   \if\csname ftype@\@captype\endcsname 2 
+   \vskip 2ex\noindent \centering\@table@type@size{\@eapj@cap@font  #1}\par
+    \if@chicago\@eapj@cap@font\fi #2\par\medskip
+   \else
+   \vspace*{\abovecaptionskip}\noindent\footnotesize #1 #2\par\vskip \belowcaptionskip
+   \fi
+ \end{minipage}
+ }
+
+
 
 %%%%%%%%%%%% FIX \cutinhead
 \def\@ptabularcr{\\}
@@ -1051,14 +930,14 @@
 \def\@xfigcaption[#1]#2{{\def\@captype{figure}\caption{\footnotesize #2}}}
 
 \def\thefigure{\@arabic\c@figure}
-\def\fnum@figure{{\footnotesize\scshape ~~Fig.\space\thefigure.---}}
+\def\fnum@figure{{\footnotesize{\@eapj@cap@font\if@chicago~~\fi\mbox{\@eapj@figname~\thefigure.}\if@chicago---\else~\fi}}}
 
 \def\thetable{\@arabic\c@table}
 %%% Table captions without making a floating table
 \def\tabcaption{\@ifnextchar[{\@xtabcaption}{\@tabcaption}}
 \def\@tabcaption#1{{\def\@captype{table}\caption{#1}}}
 \def\@xtabcaption[#1]#2{{\def\@captype{table}\caption{#2}}}
-\def\fnum@table{\scshape TABLE~\thetable}
+\def\fnum@table{{\@eapj@cap@font \@eapj@tabname~\thetable}}
 % \let\fnum@ptable=\fnum@table
 % \def\fnum@ptablecont{{\centering{\scshape Table~\thetable}---{\itshape
 % Continued}}}% 
@@ -1143,6 +1022,18 @@
   \kern -0.1ex% 
  }% 
 }% 
+ 
+
+\newcommand\ion[2]{#1$\;${%
+\ifx\@currsize\normalsize\small \else
+\ifx\@currsize\small\footnotesize \else
+\ifx\@currsize\footnotesize\scriptsize \else
+\ifx\@currsize\scriptsize\tiny \else
+\ifx\@currsize\large\normalsize \else
+\ifx\@currsize\Large\large
+\fi\fi\fi\fi\fi\fi
+\rmfamily\@Roman{#2}}\relax}% 
+
 \renewcommand\case[2]{\mbox{$\frac{#1}{#2}$}}% 
 \renewcommand\slantfrac{\case}% 
 \newcommand\onehalf{\slantfrac{1}{2}}% 
@@ -1155,7 +1046,6 @@
 \newcommand\bv{\mbox{$B\!-\!V$}}%   % B-V 
 \renewcommand\vr{\mbox{$V\!-\!R$}}%   % V-R 
 \newcommand\ur{\mbox{$U\!-\!R$}}%   % U-R 
-\newcommand\ion[2]{#1$\;${\small\rmfamily\@Roman{#2}}\relax}% 
 \newcommand\nodata{ ~$\cdots$~ }% 
 \newcommand\diameter{\ooalign{\hfil/\hfil\crcr\mathhexbox20D}}% 
 \newcommand\degr{\arcdeg}% 
@@ -1300,6 +1190,7 @@
 
 % Implementation of deluxetables via the longtable package
 
+
 \newcounter{table@save}
 \def\save@label#1{
   \if@filesw\immediate\write\@auxout{%
@@ -1322,7 +1213,7 @@
 \let\tablefontsize=\tabletypesize % for compatibility with old documents
 
 \gdef\@tablecaption{}
-\def\tablecaption#1{\gdef\@tablecaption{#1}}
+\def\tablecaption#1{\gdef\@tablecaption{\if@chicago \@eapj@cap@font \fi #1}}
 
 \def\LT@endpbox{%
   \@finalstrut\@arstrutbox
@@ -1342,6 +1233,7 @@
 %     \fi
     \endgraf\vskip\baselineskip}%
   \hss}}}
+\let\LT@makecaption@rtx=\LT@makecaption % to fight redefinition in Revtex-4.1
 
 \global\let\tablenotemark\relax
 \global\def\tablenotemark#1{{\normalfont\textsuperscript{#1}}}
@@ -1444,12 +1336,26 @@
 \setlength{\belowdeluxetableskip}{0pt}
 \setlength{\tabcolsep}{5pt}
 
-\let\tableline=\hline % Revtex said: Command \tableline is obsolete; Use \colrule instead..
+\setlength\doublerulesep{1.5pt}
+\newdimen\lastrowheight
+\def\set@last@row@height{\setlength{\lastrowheight}{\ht\strutbox}\addtolength{\lastrowheight}{\dp\strutbox}\setlength{\lastrowheight}{-\arraystretch\lastrowheight}}
+
+\let\tableline=\hline % Revtex said: Command \tableline is obsolete; Use \colrule instead.. 
+
+\newtoks\DT@p@ftn 
+\global\def\tablenotetext@DT#1#2{
+%  \edef\@tempa{\the\DT@p@ftn\noexpand\footnotetext[#1]}
+  \edef\@tempa{\the\DT@p@ftn\noexpand\tablenotemark{#1}~}
+  \global\DT@p@ftn\expandafter{\@tempa{\@table@type@size#2}\par}}%
 
 
 \newenvironment{deluxetable}[1]{
+  \lineskiplimit=\z@ % restore default setting
+  \def\tablenotetext{\tablenotetext@DT}
   \gdef\tblnote@list{}
   \gdef\tblref@list{}
+  \DT@p@ftn{}%
+  \set@last@row@height\edef\lastrowheight@{\the\lastrowheight}
   \renewcommand\tablecomments[1]{\gdef\tblnote@list{\@tablecom{##1}}}% 
   \renewcommand\tablerefs[1]{\gdef\tblref@list{\@tableref{##1}}}% 
   \@table@not@headedtrue
@@ -1468,14 +1374,19 @@
         \restore@tablenum%
       \end{longtable}%
       \save@natural@width
-      \@spew@tblnotes\vspace*{\table@note@skip}\end{minipage}
+      \@spew@tblnotes\end{minipage}
     \vspace*{\belowdeluxetableskip}
   \end{table}
 }
 
+
 \newenvironment{deluxetable*}[1]{
+  \lineskiplimit=\z@ % restore default setting
+  \def\tablenotetext{\tablenotetext@DT}
   \gdef\tblnote@list{}
   \gdef\tblref@list{}
+  \DT@p@ftn{}%
+  \set@last@row@height\edef\lastrowheight@{\the\lastrowheight}
   \renewcommand\tablecomments[1]{\gdef\tblnote@list{\@tablecom{##1}}}% 
   \renewcommand\tablerefs[1]{\gdef\tblref@list{\@tableref{##1}}}% 
   \@table@not@headedtrue
@@ -1494,26 +1405,25 @@
       \restore@tablenum%
     \end{longtable*}%
     \save@natural@width
-    \@spew@tblnotes\vspace*{\table@note@skip}%
+    \@spew@tblnotes%
   \end{minipage}%
   \vspace*{\belowdeluxetableskip}
 \end{table*}}
-\def\enddata{\relax}
 
-\newtoks\DT@p@ftn
+\def\enddata{\\[\lastrowheight@]\vspace*{1.5mm}}
+
 
 \def\LongTables{
-  \global\def\tablenotetext##1##2{
-        \edef\@tempa{\the\DT@p@ftn\noexpand\footnotetext[##1]}
-        \global\DT@p@ftn\expandafter{\@tempa{\@table@type@size##2}}}%
   \renewcommand\tablecomments[1]{\gdef\tblnote@list{\@tablecom{##1}}}% 
   \renewcommand\tablerefs[1]{\gdef\tblref@list{\@tableref{##1}}}% 
   \renewenvironment{deluxetable}[1]{
+    \def\tablenotetext{\tablenotetext@DT}
     \global\DT@p@ftn{}%
     \def\nl{\\}
 %    \def\tabcolsep{5pt}
     \let\caption=\LT@caption
     \begin{longtable}{##1}
+      \set@last@row@height\global\edef\lastrowheight@{\the\lastrowheight}
         \@table@not@headedtrue
     }{\gdef\pt@width{\LTcapwidth}\restore@tablenum
     \end{longtable}%
@@ -1523,12 +1433,14 @@
     \end{minipage}
   }
   \renewenvironment{deluxetable*}[1]{
+    \def\tablenotetext{\tablenotetext@DT}
     \global\DT@p@ftn{}%
     \@table@not@headedtrue
     \def\nl{\\}
 %    \def\tabcolsep{5pt}
     \let\caption=\LT@caption
     \begin{longtable*}{##1}
+      \set@last@row@height\global\edef\lastrowheight@{\the\lastrowheight}
         \@table@not@headedtrue
     }{\gdef\pt@width{\LTcapwidth}%
       \restore@tablenum%
@@ -1573,22 +1485,24 @@
 \newcommand\tablecomments[1]{\@tablecom{#1}}% 
 \newcommand\tablerefs[1]{\@tableref{#1}}% 
 \def\@tablecom#1{% 
-  \vspace*{\table@note@skip}
- \par 
- {\parbox{\linewidth}{\hskip1em\rmfamily {\scshape Note}. --- #1}\par}% 
+ \vspace*{\table@note@skip}
+\par 
+{\parbox{\linewidth}{\hskip1em\rmfamily {\@eapj@cap@font Note}. --- #1}\par}% 
 }% 
 \def\@tableref#1{% 
-  \vspace*{\table@note@skip}
- \par 
- {\parbox{\linewidth}{\hskip1em\rmfamily {\scshape References}. --- #1}\par}% 
+ \vspace*{\table@note@skip}
+\par 
+{\parbox{\linewidth}{\hskip1em\rmfamily {\@eapj@cap@font References}. --- #1}\par}% 
 }% 
 \def\spew@tblnotes{% 
  \@ifx@empty\tblref@list{}{% 
-  \@tablenotes{\tblref@list}% 
+  \@tablenotes{\tblref@list}%
+  \vspace*{\table@note@skip}%
   \global\let\tblref@list\@empty 
  }% 
  \@ifx@empty\tblnote@list{}{% 
   \@tablenotes{\tblnote@list}% 
+  \vspace*{\table@note@skip}%
   \global\let\tblnote@list\@empty
  }
  \the\DT@p@ftn%
@@ -1599,4 +1513,265 @@
  {\@table@type@size#1}% 
 }% 
 
-
+\endinput
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Release notes (02/09/03):
+%% 
+%% 1) This is a complete rewrite of emulateapj. The package is now
+%% based on revtex instead of aastex + multicol.
+%%
+%% 2) The {deluxetable} environment is re-implemented (the problem with the
+%% the aastex's deluxetable is it does not float). There is also a new
+%% environment {deluxetable*} (absent in aastex) to set a floating table
+%% two-column wide. Known problems:
+%%   (a) \rotate doesn't work (too difficult to implement). Solution:
+%%       - load package lscape  (\usepackage{lscape} in the header)
+%%       - move table at the end of the paper after references
+%%       - \clearpage before the table
+%%       - \LongTables if the table will span more than 1 page (see next item)
+%%       - put the table inside the landscape environment and \clearpage
+%%         at the end: 
+%%         \clearpage
+%%         \LongTables % optionally
+%%         \begin{landscape}
+%%           \begin{deluxetable}
+%%           .... 
+%%           \end{deluxetable}
+%%         \clearpage
+%%         \end{landscape}
+%%
+%% 3) Multi-page tables cannot be set properly inside the main text; you
+%% need to move the table to the end of the paper (after the references) and
+%% issue the command \LongTables before it. 
+%% 
+%% 4) By default, deluxetables are typeset with \footnotesize. If you want
+%% to use a different size, use, e.g., \tabletypesize{\normalsize} _outside_
+%% the deluxetable environment. If you need to increase interline spacing
+%% in the tables, use \def\arraystretch{1.XXX} also _outside_ deluxetables. 
+%% 
+%% 5) Option `onecolumn' (as in \documentclass[onecolumn]{emulateapj})
+%% sets the whole paper (except the reference section) in one column
+%% as done by the ApJ for papers with long equations. 
+%% 
+%% 6) Options `apj' and `apjl' (\documentclass[apj]{emulateapj}) change the
+%% spacing of the references (the default is ApJL wide spacing), and
+%% also the spacing between figures and text (last check with printed
+%% Journal in 4/2005). 
+%%
+%% 7) By default, appendix subsections are not numbered:
+%%             APPENDIX
+%%      Derivation of Equations
+%% If you want them numbered (`A. Derivation of Equations'), use the option
+%% \documentclass[numberedappendix]{emulateapj}
+%%  
+%% It is recommended to use the {appendix} environment instead of the
+%% \appendix command. Equation (and optionally also table and figure)
+%% counters are reset within the {appendix} to something like A1,A2,B1
+%% etc. The counters are restored at \end{appendix} because sometimes we
+%% want to place figures and tables belonging to the main matter at the
+%% end of the paper.
+%%  
+%% 8) By default, the comment in the upper-left corner of the title page and
+%% under the abstract will say "Draft version \today". There are additional
+%% commands \journalinfo{} and \submitted{} (the latter is equivalent to the
+%% aastex \slugcomment{} which also works) to change those comments. Used
+%% alone, \submitted{} will act on both those places. 
+%% 
+%% 9) The \title command sets the entire title, including math, in upper
+%% case. If this is undesirable, use \lowercase{} macro, e.g., 
+%% \title{UPPER CASE OK HERE \lowercase{$a+b=c$}}. 
+%%
+%% 10) On the last page where the references or appendix start, there
+%% may be problems with placement of footnotes. There is a command
+%% \lastpagefoot notes which can be issued somewhere before those
+%% footnotes. It will result in the remaining footnotes set together at
+%% the end of the text, properly adjusted. 
+%% 
+%% 11) There may be problems with single-column figure placements on the
+%% last page; try moving the figure around or explicitly specifying the [t]
+%% placement.  There may also be minor column misalignments on
+%% complicated pages with footnotes, sections, etc.; these are too difficult
+%% to fix. 
+%%
+%% 12) Any footnotes in the paper title should be set as
+%% \title{Title\footnotemark[1]} \footnotetext[1]{text} (with foootnotetext
+%% outside the title), rather that simply a \footnote{}. 
+%%
+%% NOTE that if you use the footnote in the title, the footnote counter for
+%% the main text will be wrong. You need to reset it manually _after_ the
+%% first \section. For example, if the frontmatter footnotes (title +
+%% affiliations) stop at 3, you need \setcounter{footnote}{3}
+%%
+%% 13) \label's within the deluxetable environments should go INSIDE the
+%% \tablecaption{...} command or after \tablehead
+%%
+%% 14) ... if, however, you use \tablenum [not recommended], \label should
+%%     go IMMEDIATELY AFTER the \tablenum command
+%%
+%% 15) Marc Audard reports that if the bibliography is exactly finishing the
+%% page, and the next page should be a table, latex is not working. If an
+%% empty character (\mbox{~}) is added after (or before) the bibliography,
+%% i.e., starting a new page, the problem disappears. 
+%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Change Log
+%% 
+%% 2/14/3: fixed several bugs in deluxetable and footnotes inside the title. 
+%%
+%% 3/3/3:  Table caption is made in two lines. works only in {table} or
+%% {table*}, but not in {deluxetable}
+%%
+%% 3/3/3:  Redefine p@subsection etc. for ApJ-style cross-references. 
+%%
+%% 3/16/3:  Define \tablerefs
+%%
+%% 3/25/3:  Fix two-column references in the onecolumn mode (see 
+%%          \set@column@hsize{2})
+%%
+%% 4/9/3:  Change the definition of \tablenotemark. It is less general but
+%%         works in the table caption. Also, put the body of deluxetable*
+%%         inside a minipage to fix table footnotes. 
+%%
+%% 5/14/3: Change section title font sizes. They are now different for 'apj'
+%%         and 'apjl' options
+%%
+%% 7/8/3:  redefine NAT@sort@cites after loding revtex4 to prevent citations
+%%         from being sorted
+%%
+%% 7/15/3: Fix \and in the author list
+%%
+%% 7/17/3: Make \colhead to center column titles by default
+%% 
+%% 7/27/3: Redefile \@biblabel to remove the numbered list from thebibliography
+%%
+%% 9/08/3: Further fixes to cutinhead: define @ptabularcr and use LT@cols
+%%
+%% 10/08/3: Copy definitions for \anchor and \url from aastex. 
+%%
+%% 10/10/3: define \paragraph, \subparagraph. suppress section numbering
+%%          below \subsection. If you want subsubsections numbered, use 
+%%          \setcounter{secnumdepth}{3}
+%%          in the header
+%%
+%% 11/13/3: add 'unsortedaddress' option to revtex4 to prevent groupin the
+%% authors by the institute
+%%
+%% 11/26/3: define \def\blankaffiliation{~} after revtex4 to prevent \and's
+%%          from combining
+%%
+%% 2/10/4: implement \tablewidth; works as documented in aastex;
+%%         change format for caption of deluxetables from Table 1. Title to
+%%                          Table 1. 
+%%                           Title
+%%         Make table notes of the same width as the table. 
+%%         Fix tabletypesize for table notes
+%%
+%% 2/12/4: fix \tablewidth: \tablewidth{0pt} gives natural size (as does no
+%%         \tablewidth at all)
+%%         Remove dot after "Table 1." 
+%%         Also change format to Table 1--- Continued
+%%
+%% 2/19/4: implement \tablenum within deluxetable; abstract paragraphs
+%%         indented; 
+%%
+%% 3/19/4: if no \tablehead is given, \startdata still prints out the caption
+%%
+%% 4/2/4: remove a spurious space from the definition of \tablehead
+%%
+%% 4/12/4: Due to popular demand, define \tablecomments and \tablerefs for
+%%         ordinary {table}s. 
+%%
+%% 6/6/4: Proper implementation of \sidehead in the deluxetable
+%%
+%% 6/21/4: Fix issues with table heading which were introduced when I tried
+%%         to implement deluxetable's _without_ any heading. 
+%%
+%% 6/22/4: correct implementation of \tablenotetext in the \LongTable mode
+%%         (they previously generated plain footnotes at the end of the table)
+%%
+%% 9/21/4: fix bug fix figure and table numbers in the appendicies
+%%
+%% 10/8/4: add \object \facility \dataset from aastex
+%%
+%% 11/26/4: Change floats-to-text distance to 5mm in ApJLetter style and
+%%          7mm in ApJ style (verified with Journal version in Dec 2004)
+%%  
+%% 4/21/5: change \renewcommand{\dbltopfraction}{0.85}; add
+%%         \renewcommand{\dblfloatpagefraction}{0.85}
+%%         \setcounter{topnumber}{9}
+%%         \setcounter{bottomnumber}{9}
+%%         \setcounter{totalnumber}{20}
+%%         \setcounter{dbltopnumber}{9} 
+%%
+%% 11/27/5: Add parameters to fine-tune spacing to deluxetables:
+%%         \abovedeluxetableskip   % = 0 by default
+%%         \belowdeluxetableskip   % = 0 
+%%
+%%         Use these to fiddle with the spacing, e.g. 
+%%         \setlength{\abovetableskipamount}{-1\baselineskip}
+%%
+%% 12/14/5: no more explicit setting of tabcolsep inside deluxetables (so
+%%          the user has control over this parameter)
+%%
+%% 05/04/6: redefine \tableline as \hrule; otherwise it weirdly interact
+%%          with my implementation of deluxetable
+%%
+%% 08/13/6: Collect altaffiltext into token and issue \altaffiliation
+%%          only once. This overcomes the problem with 2**n processing 
+%%          time for long affiliation lists. 
+%%
+%% 08/29/6: fix a problem with alignment of last row in deluxetables
+%%
+%% 09/06/6: Change code of tablenotetext in all deluxetables (otherwise
+%%          the change introduced on 6/22/4 sometimes causes the notes to
+%%          disappear)
+%%
+%% 09/19/6: Correct propagation of the [apj] and [apjl] for subsection
+%%          formatting 
+%%
+%% 09/19/6: Appendix no longer changes the numbering for figure and
+%%          unless the [appendixfloats] option is selected
+%%
+%% 09/22/6  Fix a bug with last row in deluxetables after \LongTables
+%%
+%% 10/04/6  redefine tablenotetext again because hyperref incompatibly
+%%          changes the definition of \footnotetext
+%%
+%% 10/04/6  Fix spacing before thebilbiography and refereneces
+%%          (\vspace*->\vspace)
+%%
+%% 12/01/6  Add \par to the definition of \tablenotetext (to make sure
+%%          each note is in a separate block)
+%%
+%% 02/7/07  By popular demand, \tablenotetext is reintroduced in the 
+%%          regular {table} environments. BEWARE: the use of this 
+%%          feature makes your documents non-portable as \tablenotetext
+%%          is not a part of standard LaTeX
+%%
+%% 03/7/07  Misc. fixes to \lastpagefootnotes
+%%
+%% 04/21/07  introduce \affil@mark to facilitate integration with the
+%%           MinionPro package; slightly change the spacing in the
+%%           altaffiltext mark
+%%
+%% 03/31/08 new option [tighten] to facilitate grid typesetting (by
+%%          setting negative lineskiplimit etc). Correspondingly increase
+%%          v-spacing at \enddata in the tables
+%% 
+%% 04/15/08 improve table@note@skip (put it inside spew@tblnotes)
+%%
+%% 04/17/08 set baselinestretch to 1
+%%
+%% 04/20/08 Fix above and below display skips (too much of negative stretch
+%%          was possible)
+%%
+%% 12/19/08 Fix \ion to use relative sizes (not \small); thanks to Gabor
+%%          Worseck for pointing this out
+%%
+%% 12/19/08 Option for IOP formatting: \usepackage[iop,...]{emulateapj}
+%%
+%% 08/22/09 Fix NAT@sort coding for new release of bibtex
+%%
+%% 11/10/09 Switch to revtex4-1
+%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%