apa update (long ago)

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

16 files changed, 1407 insertions, 269 deletions

diff --git a/Master/texmf-dist/source/latex/apa/CHANGELOG b/Master/texmf-dist/doc/latex/apa/CHANGELOG.txt
index bb0576c9a40..7da05c6c795 100644
--- a/Master/texmf-dist/source/latex/apa/CHANGELOG
+++ b/Master/texmf-dist/doc/latex/apa/CHANGELOG.txt
@@ -1,5 +1,5 @@
 
-Alteration log for apa.cls (v1.3.0, August 2002)
+Alteration log for apa.cls (v1.3.2, January 2006)
 
 1.00 --> 1.01
 July 5, 1996:    \r@headl now defaults to \r@headr in [doc] (used to complain)
@@ -212,10 +212,86 @@ August 21, 2002: Set parsep to 0em for biblist in man mode because some editor c
 
 August 30, 2002: Fix version to 1.3.0 and upload to CTAN
 
+1.3.0 --> 1.3.1
+September 24, 2004: Load babel from within apa.cls because it must precede apacite
+                    (apacite fixes problems due to incompatibility)
+
+July 23, 2005:   Remove bibliography adjustments now handled by apacite; 
+                 Call apacite with [bibnewpage] option in man mode
+
+                 Removed Greek language definitions, to be handled by apacite
+
+                 Added definitions to support distinction in citation form between 
+                 regular text (requiring "and") and table captions (requiring "&")
+
+July 25, 2005:   Combined longtable & sideways floats into a single endfloat.cfg
+
+July 26, 2005:   Set txfonts as default typeface for jou mode, if available, after Erik
+                 Meijer's suggestion; added notxfonts option in case this is undesirable
+
+                 Added xkeyval support for specifying babel language options;
+                 added special babelmain option to specify the main document language
+
+                 Reactivated Greek language definitions for strings defined and used
+                 exclusively by apa.cls (Running head, Author note, Figure captions,
+                 Footnotes)
+
+                 Removed code long ago commented out, to clean up the file a bit
+
+1.3.1 --> 1.3.2
+December 28, 2005: Removed xkeyval and special babel options, because Erik Meijer pointed
+                   out that any additional options are automatically passed on to babel
+                   without the need for any special action, so one may call apa.cls with
+                   \documentclass[man,fignum,babel,greek,english]{apa}, for example, and
+                   this loads babel with [greek,english] options, as desired (same order)
+
+                 Added \iint and related definitions that prevent txfonts (loaded by
+                 apa.cls automatically) to clash with amsmath (if loaded by the user).
+                 The problem was noticed and solved by Erik Meijer, who contributed the 
+                 solution code.
+
+                 Incorporated improved definition of apavector, as provided by Erik Meijer,
+                 which uses package bm and redefines (upright) Greek letters so that most
+                 vector cases are handled appropriately (displayed in bold; or with tilde 
+                 at the same distance)
+
+December 30, 2005: Switched to external language strings with the same system as apacite
+                   Defined english.apa and greek.apa containing the 4 necessary macros
+
+                 Sent out as beta version (1.3.2b) for some external testing
+
+January 2, 2006: Fixed warning about missing language definitions (thanks to Erik Meijer)
+                 Added dutch.apa supplied by Erik Meijer
+
+                 Erik Meijer noticed that tables (tabular environments) in doc mode weren't
+                 centered and did not follow the proper citation form (& instead of "and")
+                 A special apatabular-style macro was created to fix both problems
+
+January 3, 2006: Tried \@topnum and \@botnum definitions to keep tables from ugly front-page
+                 placement in doc mode (noted by Erik Meijer). Decided against it because it
+                 messes with placement of acknowledgements on first page.  Since it is unlikely
+                 that a manuscript will reference table on the first page, in the rare case 
+                 when it happens the author will have to move it manually later in the text.
+
+                 Added separate tabular/endtabular redefinitions for the doc mode, activated
+                 through \maketitle after document beginning, to ensure table centering.
+                 Might interfere with array.sty if loaded.
+
+January 5, 2006: Added \fiveauthors and \fiveaffiliations, contributed by Aaaron Geller,
+                 including corresponding changes to \maketitle for each of the three modes;
+                 Completed tests for consistent number of author/affiliation definitions
+
+                 Added \sixauthors and \sixaffiliations, including corresponding changes 
+                 to \maketitle and tests for consistent definitions
+
+January 10, 2006: Tried \@topnum=\z@ and \@botnum=\@ne so that tables do not appear on the
+                 first page in doc mode (the acknowledgements is the "one" float allowed on
+                 the title page, if defined).
+
+
 %%%%%%%%%%%%%%%%
 
-TO DO FOR v2.0:  Bring apacite up to date, preferably using natbib
-                 Is continuation note at page end required with long tables? (5.21/p. 301)
+TO DO FOR v2.0:  Is continuation note at page end required with long tables? (5.21/p. 301)
                  Stop messing with captions and use a standard package (caption2, ccaption)
                  Stop messing with endfloat and use loflot or something for the captions page
                  Use fancyhdr for all headings in all modes (instead of markboth/markright)
@@ -230,3 +306,9 @@ TO DO FOR v2.0:  Bring apacite up to date, preferably using natbib
                  Add contact information command and field for first page (man mode only)
 
 PROBLEMS:        flushend.sty seems to mess up the last column if there is a float in it.
+
+                 array.sty redefines tabular/endtabular and so it is not compatible with the
+                 \apatabular definitions.
+
+                 There may not be enough space on the title page for notes in case of more
+                 than four author-affiliation pairs -- need smarter layout setup
diff --git a/Master/texmf-dist/source/latex/apa/LICENCE b/Master/texmf-dist/doc/latex/apa/LICENCE
index 4e93b2cd714..44f68a0b040 100644
--- a/Master/texmf-dist/source/latex/apa/LICENCE
+++ b/Master/texmf-dist/doc/latex/apa/LICENCE
@@ -2,8 +2,8 @@
 %% LICENCING TERMS
 %%
 %% apa.cls 
-%% version 1.3.0 
-%% August 2002 
+%% version 1.3.2 
+%% January 2006
 %% by Athanassios Protopapas 
 %% protopap@ilsp.gr
 %%
diff --git a/Master/texmf-dist/doc/latex/apa/README b/Master/texmf-dist/doc/latex/apa/README
index e629e11b5bd..f6b5014d0f3 100644
--- a/Master/texmf-dist/doc/latex/apa/README
+++ b/Master/texmf-dist/doc/latex/apa/README
@@ -1,24 +1,57 @@
 
+apa.cls LaTeX2e document class; version 1.3.2 of January 2006
+
 apa.cls is a LaTeX2e class file that makes your document conform to
-the APA Publication Manual (Fifth Edition, 2001) specifications for
-manuscripts or to the APA journal look found in journals like the
-Journal of Experimental Psychology etc. In addition, it provides a
-regular LaTeX-like output with a few enhancements and APA-motivated
-changes.
+the American Psychological Association (APA) Publication Manual (Fifth 
+Edition, 2001) specifications for manuscripts or to the APA journal 
+look found in journals like the Journal of Experimental Psychology. 
+In addition, it provides a regular LaTeX-like output with a few 
+enhancements and APA-motivated changes.
 
-This is a document *class* which uses (and modifies) some packages to
+This is a document *class* which uses (and modifies) other packages to
 achieve strictly defined formatting results and also uses the apacite
 package (sty & bst) for citations and references.  If you only want 
-APA-like citation for other kinds of documents (e.g., a thesis) use 
-apacite.sty with an appropriate class.
+APA-like citation for other kinds of documents use apacite.sty with 
+an appropriate class.  In particular, apa.cls is *NOT* appropriate for 
+your thesis; don't even consider using it for that purpose.
 
 In order to use this document class you need some packages that may
 not be present in your LaTeX distribution.  Please read apacls.txt
 carefully to understand what you need to install and what is possible
 with apa.cls, then read examples.txt carefully to understand how to
-use apa.cls (macros and instructions).  
+use apa.cls (macros and instructions).  Check out apaexample.tex, a 
+minimal example file that produces actual manuscript-like output.
+
+apa.cls is not in any way connected to, endorsed by, or probably known 
+at all at the American Psychological Association.  APA does not even 
+accept manuscript submissions in LaTeX source.  The author of apa.cls
+has made every effort to achieve typesetting results conforming to 
+the APA manual, because he uses it for his manuscripts.  However, he 
+is not responsible if the editor does not approve of a manuscript 
+typeset with apa.cls, if your computer blows up while processing your 
+manuscript with apa.cls, or for anything else that may go wrong with
+apa.cls, or with anything else for that matter.
 
 Athanassios Protopapas
 protopap@ilsp.gr
-August 2002
+January 2006
+
+======================
+
+List of files in distribution:
+
+README           This file
+LICENCE          apa.cls terms of distribution and use
+apa.cls          The APA-style document class
+CHANGELOG.txt    A text file documenting apa.cls updates
+apacls.txt       Instructions for using apa.cls (plain text)
+apacls.html      Description of apa.cls and usage instructions (HTML)
+apaenum.txt      Instructions for using APA list environments
+examples.txt     Guide with examples of correct apa.cls macro usage
+apaexample.tex   Sample APA-style manuscript using apa.cls
+examplebib.bib   Sample bibliography file accompanying apaexample.tex
+endfloat.cfg     Configuration file to make endfloat aware of longtable
+                 and sideways table floating environments
+*.apa            Language-specific definitions of special APA-style 
+                 strings (section headings)
 
diff --git a/Master/texmf-dist/doc/latex/apa/apacls.html b/Master/texmf-dist/doc/latex/apa/apacls.html
new file mode 100644
index 00000000000..b435a0e66a4
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/apa/apacls.html
@@ -0,0 +1,659 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<HTML lang="en">
+
+<HEAD>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<TITLE>apa.cls</TITLE>
+</HEAD>
+
+<BODY>
+
+<H1><A NAME="top"><TT>apa.cls</TT></A></H1>
+
+<H2><A NAME="contents">Contents</A></H2>
+
+<UL>
+<LI><A HREF="#intro">Introduction</A>
+<LI><A HREF="#authver">Author and version</A>
+<LI><A HREF="#maint">Maintainance and request for help</A>
+<LI><A HREF="#acks">Acknowledgments</A>
+<LI><A HREF="#sysreq">System requirements</A>
+<LI><A HREF="#instr">Instructions for using <TT>apa.cls</TT></A>
+<UL type="none">
+ <LI><A HREF="#titlhead">Title and headers</A>
+ <LI><A HREF="#sect">Sectioning</A>
+ <LI><A HREF="#enumser">Enumeration and seriation</A>
+ <LI><A HREF="#floats">Figures and tables</A>
+ <LI><A HREF="#condcomp">Conditional compilation</A>
+ <LI><A HREF="#fonts">Fonts</A>
+ <LI><A HREF="#bibcit">Bibliography and citations</A>
+ <LI><A HREF="#append">Appendices</A>
+ <LI><A HREF="#babel">Non-English documents</A>
+</UL>
+<LI><A HREF="#comlist">List of <TT>apa.cls</TT> commands</A>
+<LI><A HREF="#optlist">List of options to <TT>apa.cls</TT></A>
+<LI><A HREF="#problems">Possible problems</TT></A>
+</UL>
+
+<H2><A NAME="intro">Introduction</A></H2>
+
+<TT>apa.cls</TT> is a document class for typesetting manuscripts with LaTeX 
+according to the rules of the 5th edition (2001) of the 
+<A HREF="http://www.apastyle.org/">Publication Manual</A> of the 
+<A HREF="http://www.apa.org/">American Psychological Association</A>.   
+It simplifies writing of the manuscript, taking 
+care of appearance and leaving only the content to the author (in true 
+LaTeX fashion) and it also allows both for manuscript look and journal
+look with a simple option to the class-loading command. <P>
+
+<I>Note:</I>
+<TT>apa.cls</TT> is not in any way connected to, endorsed by, or even 
+ probably known at all at the American Psychological Association.<P>
+
+An <A HREF="pdf/Protopapas_1998_Eutupon1.pdf">article</A> (in Greek) about <TT>apa.cls</TT> 
+can be found in the first issue of 
+<A HREF="http://obelix.ee.duth.gr/eft/english/eutupon.html">Eutupon</A>, the 
+magazine of the 
+<A HREF="http://obelix.ee.duth.gr/eft/english/index.html">Greek Tex Friends Group</A>.
+An English article is in preparation to appear some time in 2006.
+
+<H3>Manuscript look (man mode)</H3>
+In man mode, <TT>apa.cls</TT> typesets a title page, abstract page, text body, then
+references, appendices, author notes, footnotes, tables, figure captions, and
+figures. All text is double spaced. The title page contains
+the (centered) title, author name, affiliation, short title, and the
+running head (automatically capitalized).  A note may be inserted in
+place of each table and figure in the text.
+The title is printed as a heading at the beginning of the text. <TT>\leftheader</TT> 
+is ignored while the contents of <TT>\note</TT> are printed under the author
+names and affiliations, typically the date of submission. The &ldquo;Author
+Notes&rdquo; page contains the contents of <TT>\acknowledgements</TT>.  A footnote
+page is produced if there is at least one footnote in the text.
+
+<H3>Printed journal look (jou mode)</H3>
+In jou mode, <TT>apa.cls</TT> typesets the text in double-sided, double column format, with
+an appropriately centered title, author names, affiliations, note,
+and abstract.  The contents of acknowledgements are printed as
+footnotes in a box at the lower left corner of the first page.
+Journal-like headers can also be produced on the first page.
+Dimensions and overall &ldquo;look&rdquo; are modeled after 
+<A HREF="http://www.apa.org/journals/xhp.html">JEP:HPP</A>.  The purpose
+of this format is to produce readable and reasonably condensed output
+for double-sided printing and distribution.
+
+<H3>Regular LaTeX look (doc mode)</H3>
+In doc mode, <TT>apa.cls</TT> typesets the text in single-sided, 
+single-column format, with
+an appropriately centered title, author names, affiliations, note,
+and abstract on the first page. The contents of acknowledgements are
+printed at the bottom of the first page. Section headings and
+enumeration follow the APA guidelines and floats (figures and tables)
+are inserted in the text where they are defined, as in regular LaTeX
+articles.
+The purpose of this format is to provide hardcopies during the
+development of articles that are later going to be submitted (using
+the manuscript format) and distrubuted (using the journal
+format). The advantage over using a regular article class is that all
+the extra definitions are supported and no changes need thus be made
+to the text other than the format parameter.
+
+<H2><A NAME="authver">Author and version</A></H2>
+
+<TT>apa.cls</TT> is written and maintained by 
+<A HREF="mailto:protopap@ilsp.gr">Athanassios Protopapas</A>, who currently works at the 
+<A HREF="http://www.ilsp.gr">Institute for Language &amp; Speech Processing</A> in Athens, Greece.
+The current version is 1.3.2, released on January 31st, 2006.  It can found
+on <A HREF="http://www.ctan.org/tex-archive/macros/latex/contrib/other/apa/">CTAN</A>, 
+the LaTeX <A HREF="http://www.ctan.org/tex-archive/help/Catalogue/entries/apa.html">Catalogue</A>, 
+or it may be <A HREF="dl/apa.tar.gz">downloaded from here</A>.  There are no more recent 
+&ldquo;working&rdquo; versions at this time.
+<P>
+<TT>apa.cls</TT> is distributed under the terms of the 
+<A HREF="http://www.ctan.org/tex-archive/macros/latex/base/lppl.txt">LaTeX Project Public License</A> 
+(lppl). In short, this means that the software is copyright but you are granted 
+&ldquo;a license which gives you, the &lsquo;user&rsquo; of the software, 
+legal permission to copy, distribute, and/or modify the software. 
+However, if you modify the software and then distribute it (even just 
+locally) you must change the name of the software to avoid confusion&rdquo; 
+(quoted from <A HREF="http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html">
+The TeX Catalogue License Definitions</A>). 
+<P>
+The history of <TT>apa.cls</TT> revisions can be found in the <A HREF="dl/apa/CHANGELOG.txt"><TT>CHANGELOG</TT></A> file.
+
+
+<H2><A NAME="maint">Maintainance and request for help</A></H2>
+
+There is still a lot of work to be done before <TT>apa.cls</TT> can be considered 
+sufficiently complete.  Unfortunately I don't have much time to devote to 
+it any more, so updates are few and far between.  I am quite ready to hand over the honor
+of maintaining <TT>apa.cls</TT> to someone fresh and willing. If you think <TT>apa.cls</TT> is
+worth some of your time and you would like to contribute to it, be sure 
+to <A HREF="mailto:protopap@ilsp.gr">let me know</A>.  Alternatively,
+feel free to work on one of the following topics (or something else you think is
+missing or in need of improvement) and send me the result:
+<UL>
+<LI>Stop messing with captions and use a standard package such as <TT>caption2</TT> or <TT>ccaption</TT> for all cases
+<LI>Stop messing with <TT>endfloat</TT> and use <TT>loflot</TT> or other appropriate package for the captions page
+<LI>Use <TT>fancyhdr</TT> for all headings in all modes
+<LI>Set entire appendix in smaller font size (including headings)
+<LI>Follow manual guidelines for table "Note" vs. probabilities (3.70/p. 170)
+<LI>Turn wide tables sideways automatically
+<LI>Clean up the font act &mdash; remove <TT>rm</TT>/<TT>hrm</TT>/<TT>hsl</TT> etc.
+<LI>Use the <TT>geometry</TT> package to set margins taking into account paper size (letter, A4)
+<LI>Add contact information command and field for first page (man mode only)
+<LI>Confirm need for continuation note at page end required with long tables (5.21/p. 301) and modify accordingly.
+</UL>
+<P>
+Although this is a purely &ldquo;free time&rdquo; project for me, in general 
+I have tried to be responsive about requests related to <TT>apa.cls</TT> and 
+especially when bugs or other problems are involved.  Please do not hesitate
+to <A HREF="mailto:protopap@ilsp.gr">contact me</A> if you encounter 
+difficulties or unexpected (or unacceptable) behavior when using <TT>apa.cls</TT>. 
+However, I do ask that you make sure you have searched 
+<A HREF="dl/apa/apacls.txt"><TT>apacls.txt</TT></A> and 
+<A HREF="dl/apa/examples.txt"><TT>examples.txt</TT></A> 
+and failed to find an answer to your problem in there before
+you send that e-mail message.
+<P>
+<TT>apa.cls</TT> has a well defined scope and purpose, and I'm already too busy for it. 
+Please don't request modifications or features that are not related to the
+stated purpose (which is to create manuscripts suitable for submission to APA journals
+and to typeset these same manuscripts in true journal look).  For example, if you
+want the figures in the manuscript text but the rest as in man mode, then you're
+on your own as to how you might modify <TT>apa.cls</TT> (or not) to achieve that. 
+In particular, <B>if you want to write your thesis, <TT>apa.cls</TT> is not for you</B>.  
+Please do not write to me asking for help with this; your message will be ignored.
+Use <TT>apacite</TT> for APA-style citations and write your own typesetting code or 
+search for a thesis class suitable for your University.
+
+
+<H2><A NAME="acks">Acknowledgments</A></H2>
+
+<TT>apa.cls</TT> was created a long time ago out of stylefile mutations based on 
+<A HREF="http://www.ctan.org/tex-archive/macros/latex209/contrib/theapa/"><TT>theapa</TT></A> 
+style by Young U. Ryu.  Some of Young Ryu's code still survives in the current
+version, in particular the sectioning and seriation/enumeration commands.
+Many people have contributed to the development of <TT>apa.cls</TT> through bug reports, 
+suggestions and requests for features and improvements, and even some actual code!  
+The name of every contributor is mentioned in the <A HREF="dl/apa/CHANGELOG.txt"><TT>CHANGELOG</TT></A> and
+I am grateful to them all.  
+
+
+<H2><A NAME="sysreq">System requirements</A></H2>
+
+Other than a running LaTeX2e installation and the 
+<A HREF="http://www.ctan.org/tex-archive/help/Catalogue/entries/apacite.html"><TT>apacite</TT></A> 
+package for APA style citations (<TT>sty</TT> and <TT>bst</TT>), there isn't much you need in order
+to use <TT>apa.cls</TT>.  Required packages for man mode are 
+<A HREF="http://www.ctan.org/tex-archive/help/Catalogue/entries/endfloat.html"><TT>endfloat</TT></A> and 
+<A HREF="http://www.ctan.org/tex-archive/help/Catalogue/entries/endnotes.html"><TT>endnotes</TT></A>.  
+For jou mode there are no required packages, but 
+<A HREF="http://www.ctan.org/tex-archive/help/Catalogue/entries/fancyhdr.html"><TT>fancyhdr</TT></A>, 
+<A HREF="http://www.ctan.org/tex-archive/help/Catalogue/entries/ftnright.html"><TT>ftnright</TT></A>, 
+<A HREF="http://www.ctan.org/tex-archive/help/Catalogue/entries/txfonts.html"><TT>txfonts</TT></A> (or 
+<A HREF="http://www.ctan.org/tex-archive/help/Catalogue/entries/pslatex.html"><TT>pslatex</TT></A>, or 
+<A HREF="http://www.ctan.org/tex-archive/help/Catalogue/entries/times.html"><TT>times</TT></A> and 
+<A HREF="http://www.ctan.org/tex-archive/help/Catalogue/entries/mathptm.html"><TT>mathptm</TT></A>), and 
+<A HREF="http://www.ctan.org/tex-archive/help/Catalogue/entries/flushend.html"><TT>flushend</TT></A> are nice to have 
+(after all, you want your article to really look like published, don't you?).
+
+
+<H2><A NAME="instr">Instructions for using <TT>apa.cls</TT></A></H2>
+
+<TT>apa.cls</TT> is distributed with two files you must read carefully before trying to use it, 
+<A HREF="dl/apa/apacls.txt"><TT>apacls.txt</TT></A> and 
+<A HREF="dl/apa/examples.txt"><TT>examples.txt</TT></A>.  An online version of those instructions follows. You may also examine <A HREF="dl/apa/apaexample.tex"><TT>apaexample.tex</TT></A> (and the accompanying bibliography file <A HREF="dl/apa/examplebib.bib"><TT>examplebib.bib</TT></A>), which contains a minimal complete sample &ldquo;article&rdquo; that can be processed using <TT>apa.cls</TT> to produce an APA-style manuscript.
+<P>
+To use <TT>apa.cls</TT>, include one of the following at the top of your document preamble:<P>
+<TT>
+\documentclass[jou]{apa}<BR>
+\documentclass[man]{apa}<BR>
+\documentclass[doc]{apa}<BR>
+</TT>
+<P>
+You should not load the <TT>article</TT> class because it is automatically called by <TT>apa.cls</TT>.
+You should also <STRONG>not</STRONG> load any of the required or optional packages mentioned above
+using the command <TT>\usepackage</TT> because they are automatically loaded by 
+<TT>apa.cls</TT> in the appropriate order.
+
+
+<H3><A NAME="titlhead">Title and header information</A></H3>
+
+In the preamble of your document, define the basic manuscript information:<P>
+<TT>
+\author{First Author and Second Author}<BR>
+\affiliation{Department of Both Authors\\ University}<BR>
+</TT>
+<P>
+If there is only one author or more than one author but all in the same department, use
+the <TT>\author</TT> command as in the above example, with all names in its argument; and use the <TT>\affiliation</TT> command for the department. 
+If there are people from two different departments, use the <TT>\twoauthors</TT>
+and <TT>\twoaffiliations</TT> commands to group them appropriately:<P>
+<TT>
+\twoauthors{First Author(s)}{Second Author(s)}<BR>
+\twoaffiliations{Affiliation of 1st Author(s)}{Affiliation of 2nd Author(s)}<BR>
+</TT>
+<P>
+For three affiliations use <TT>\threeauthors</TT> and <TT>\threeaffiliations</TT>, 
+and for four affiliations there's <TT>\fourauthors</TT> and <TT>\fouraffiliations</TT>. Five and six affiliations (and corresponding authors or author groups) are similarly supported (<TT>\fiveauthors</TT> and so on).  If there
+are more than six departments involved you're out of luck with <TT>apa.cls</TT> and I doubt they would fit on the title page anyways.
+<P>
+In addition to authors and their affiliations, you should also define the following:<P>
+<TT>
+\abstract{Text of your abstract...}<BR>
+\acknowledgements{Author notes, acknowledgements, contact information...}<BR>
+\rightheader{Running head for journal look}<BR>
+\shorttitle{Short title for manuscript header}<BR>
+\leftheader{Left head for journal look}<BR>
+</TT>
+<P>
+These fields are not technically necessary for the document to pass through LaTeX, though they
+are obligatory for any real APA-style manuscript. If you don't define a right header 
+or short title, they default to the title; if you don't define a left header, it 
+defaults to the author name(s).<P>
+
+You may also define a note if you want:<P>
+<TT>
+\note{Date of current draft; or status; or additional address information...}<BR>
+</TT>
+<P>
+If you really want your document to have the journal look, you should also define
+the fields for the first page header, which in the journals hold
+reference and copyright information.  In <TT>apa.cls</TT> there are:<P>
+<TT>
+\journal{Journal name}<BR>
+\volume{Volume, number, pages}<BR>
+\ccoppy{Copyright notice}<BR>
+\copnum{Serial number or other reference}<BR>
+</TT>
+<P>
+The content of these definitions is ignored in man mode (manuscript look), 
+of course.
+<P>
+After these definitions in the preamble, you begin your manuscript in the
+regular LaTeX way and invoke the command to make the title page:<P>
+<TT>
+\begin{document}<BR>
+\maketitle<BR>
+</TT>
+<P>
+Do not leave a blank line between these two commands.  Also, do 
+<STRONG>not</STRONG> leave a blank line between <TT>\maketitle</TT> 
+and the beginning of your (introduction) text, either.  This is 
+important for the correct typesetting of the first manuscript page.
+
+
+<H3><A NAME="sect">Sectioning</A></H3>
+
+The default sectioning for <TT>apa.cls</TT> maps the standard LaTeX sectioning
+commands <TT>\section</TT>, <TT>\subsection</TT>, and <TT>\subsubsection</TT> to
+the three-level heading definitions of the APA manual.  See 
+<A HREF="dl/apa/examples.txt"><TT>examples.txt</TT></A> for usage examples.<P>
+
+If you need 
+more or fewer heading levels, you can use the command <TT>\headinglevels{four}</TT> 
+(or any number between one and five&mdash;spelled out&mdash;instead of four) 
+and then use <TT>\paragraph</TT> and <TT>\subparagraph</TT> for the lower-level 
+sectioning.  
+
+Actually, if you need fewer than three levels you don't really need to do anything
+other than use only <TT>\section</TT> and <TT>\subsection</TT>, but if you do 
+invoke the <TT>\headinglevels</TT> command, then the appearance of the manuscript
+will strictly conform to the APA guidelines for the fewer levels.
+<P>
+<I>Note:</I> Don't bother to <TT>\label</TT> your sections; since they are not 
+numbered according to APA style, they cannot be referenced elsewhere in the document
+using <TT>\ref</TT>, so there is no point in labeling them.
+
+
+<H3><A NAME="enumser">Enumeration and seriation</A></H3>
+
+See file <A HREF="dl/apa/apaenum.txt"><TT>apaenum.txt</TT></A> in the 
+<TT>apa.cls</TT> distribution.  Enumeration and seriation are taken without
+modification from Young U. Ryu's code.  In short, there are three kinds
+of environments, called <TT>seriate</TT>, <TT>enumerate</TT>, and 
+<TT>itemize</TT>. They are used in the same way the standard LaTeX environments
+<TT>enumerate</TT> and <TT>itemize</TT> are used, but produce output according 
+to the APA style.  The <TT>seriate</TT>
+environment is used for inline enumeration, when you want to say, for example 
+(a) one thing, (b) another thing, and (c) maybe a third thing, all in APA style.
+
+
+<H3><A NAME="floats">Float placement, loading, and content</A></H3>
+
+Floats, that is, figures and tables, are used in the regular LaTeX way, 
+through the <TT>figure</TT> and <TT>table</TT> environments, respectively.
+You can use the <TT>t</TT> and <TT>b</TT> options for selectively putting 
+a float at the top or bottom of a page.  Always include <TT>p</TT> after 
+<TT>t</TT> or <TT>b</TT> so that you won't risk
+running out of space if a float is too big.  The <TT>h</TT> option for
+in-text figures is not recommended because it's not used in APA journals.  
+<P>
+Remember to use <TT>\label</TT> for floats <STRONG>after</STRONG> the caption 
+(and not inside it!)
+
+<H4>Images</H4>
+I assume that in figures we most often want to include an image for some graph
+or other kind of picture which is stored in a separate image file of
+the right kind (<TT>eps</TT> if we use <TT>latex</TT> with <TT>dvips</TT>, 
+<TT>pdf</TT> if we use <TT>pdflatex</TT> or <TT>latex</TT> with <TT>dvipdfm</TT>).
+<P>
+An image can be included in any way you like, but <TT>apa.cls</TT> provides
+a way to deal automatically with fitting encapsulated postscript (EPS)
+files without worrying about dimensions or mode.  Just use the command 
+<TT>\fitfigure</TT> instead of <TT>\includegraphics</TT>.
+For example, if you want to include a graph from file <TT>graph1.eps</TT>, the 
+simplest (and recommended) way is:<P>
+<TT>
+\begin{figure}[tp]<BR>
+\fitfigure{graph1}<BR>
+\caption{This is the caption of the figure.}<BR>
+\label{fig:fig1}<BR>
+\end{figure}<BR>
+</TT><P>
+You may include the image file extension (<TT>.eps</TT> in this case) 
+in the <TT>\fitfigure</TT> or <TT>\includegraphics</TT> command, 
+but if you omit it (as in the example), then if you happen to use <TT>pdflatex</TT> it
+will automatically load the corresponding <TT>.pdf</TT> graphic file (assuming
+you have made one with <TT>eps2pdf</TT>), while <TT>dvips</TT> will load the
+<TT>.eps</TT> file.  In short, you don't need the extension, and leaving it out
+may make your life easier.
+<P>
+In case of a bitmap eps (as opposed to a graph or line drawing), you
+probably don't want it scaled in man mode, for best reproduction, so
+use <TT>\fitbitmap</TT> instead.
+<P>
+<I>Note:</I> If you want to include images in your manuscript, don't forget the command
+<TT>\usepackage{graphicx}</TT> in your preamble!  You should 
+<STRONG>not</STRONG> use
+<TT>epsfig</TT> or <TT>graphics</TT> instead of <TT>graphicx</TT>.
+
+<H4>Tables</H4>
+
+Tables are stretched to occupy the corresponding text width and are placed with 
+appropriate typefaces etc., but it is your responsibility to format the 
+tabular environments  
+in accordance with the APA guidelines (e.g., no vertical lines, and so on).
+You should always <STRONG>precede</STRONG> the actual table body with its 
+caption (i.e., use <TT>\caption</TT> before <TT>\begin{tabular}</TT>) 
+or the results won't be conforming to the APA requirements for tables. <P>
+<P>
+To match the APA-journal look you can use <TT>\thickline</TT> (instead of 
+<TT>\hline</TT>) for the top separator (right after starting the <TT>tabular</TT>
+environment).
+<P>
+Because a paragraph break is inserted in manuscript mode (optionally with an 
+&ldquo;insert table/figure&rdquo; note), don't define tables in the middle of a
+paragraph.
+
+<H4>Wide (two-column) tables and figures</H4>
+When an image or table is too wide for a single column, use a double-column
+float, noted with an asterisk after the float environment designation (see
+the LaTeX book). For a wide (two-column) figure, use <TT>\begin{figure*}</TT> 
+and <TT>\end{figure*}</TT>, instead of beginning and ending <TT>{figure}</TT>.
+For a two-column table, similary, begin and end a <TT>table*</TT> environment. 
+<P>
+When using double column figures, it looks better in <TT>jou</TT> mode 
+if you use <TT>\centeredcaption</TT> instead of caption, with the first parameter 
+about equal to the width of the float (table or figure). This makes no difference in
+<TT>man</TT> mode.
+<P>
+If your table is too wide to fit upright on a manuscript page, load the <TT>rotating</TT> 
+package and use a <TT>sidewaystable</TT> environment (instead of <TT>table</TT>). You 
+need the special configuration file 
+<A HREF="dl/apa/endfloat.cfg"><TT>endfloat.cfg</TT></A>, supplied with <TT>apa.cls</TT>, 
+for this to work. 
+
+<H4>Long tables</H4>
+
+By popular demand, 
+<A HREF="http://www.ctan.org/tex-archive/help/Catalogue/entries/longtable.html"><TT>longtable</TT></A> now (sort of) works with
+<TT>apa.cls</TT>.  You must <STRONG>not</STRONG> load the <TT>longtable</TT> 
+package yourself, due to precedence requirements for proper endfloat 
+function and cross-definitions. Instead, pass the <TT>longtable</TT> 
+option to <TT>apa.cls</TT>.  See the 
+<A HREF="http://www.cmis.csiro.au/Graham.Williams/TeX/docs/longtable.pdf"><TT>longtable</TT> documentation</A> or 
+the <A HREF="http://www.awprofessional.com/catalog/product.asp?product_id={32316FC4-94F5-4616-815D-F8691C44BC2B}">LaTeX Companion</A> for instructions on using <TT>longtable</TT>.
+<P>
+Since <TT>longtable</TT> only works in single-column documents it can only be
+used with <TT>man</TT> mode.  Unfortunately the conditional compilation 
+(<TT>ifapamode</TT>) commands won't work
+to keep a single table body and apply a mode-specific (<TT>table</TT> or
+<TT>longtable</TT>) environment because of illegal cross-nesting with
+environment begin/end.  In fact the table environment won't even work
+inside in <TT>ifapamode</TT> argument, which makes it impossible to have a
+single file that can be processed for both <TT>man</TT> and <TT>jou</TT>.  This defeats
+ the purpose of <TT>apa.cls</TT>, so only resort to <TT>longtable</TT> if you absolutely
+ have to.  
+You will need the supplied <A HREF="dl/apa/endfloat.cfg"><TT>endfloat.cfg</TT></A> to use it.
+
+<H4>Notes in tables</H4>
+There is a simple way to include notes in
+tables such as, for example, to indicate levels of significance.  The
+command <TT>\tabfnm{X}</TT> inside a table cell (tabular environment) produces
+the note mark.  Use <TT>\tabfnt{X}{Note text}</TT> immediately before or after
+<TT>\end{tabular}</TT> inside the table environment to produce the note text.
+ See <A HREF="dl/apa/examples.txt"><TT>examples.txt</TT></A>.  It is not possible
+to number the notes automatically, but since it is frequently necessary to refer
+to the same note repeatedly within a table (e.g., for a level of significance), 
+automatic numbering would create more problems than it would solve.
+
+
+<H3><A NAME="condcomp">Conditional compilation</A></H3>
+
+You can have some text appear differently in each mode, or only appear
+in some mode(s).  You can also modify the appearance of tables,
+figures, or equations between modes of compilation.  Here's an
+unexciting example:<P>
+<TT>
+\ifapamodeman{This is printed in man mode only}{This is not man mode}
+</TT><P>
+You can also use the three-way switch:<P>
+<TT>The current mode is \ifapamode{man}{jou}{doc}</TT>
+
+
+<H3><A NAME="fonts">Document typefaces</A></H3>
+
+The journal format (<TT>jou</TT> mode) uses Times Roman by default (it does look like
+published after all).  If you don't have <TT>txfonts.sty</TT> or <TT>pslatex.sty</TT> or <TT>times.sty</TT>, or
+if you just prefer computer modern fonts, add <TT>notimes</TT> after the <TT>jou</TT> option
+in the class line: <TT>\documentclass[jou,notimes]{apa}</TT> (<TT>notimes</TT> has no
+effect in modes other than <TT>jou</TT> and may be left in when switching).<P>
+
+The manuscript format (<TT>man</TT> mode) uses Computer Modern by default but can use
+Helvetica or typewriter look by using the options <TT>helv</TT> or <TT>tt</TT>,
+respectively. I find the result with either of these much more
+&ldquo;manuscript&rdquo;-like looking, especially using <TT>tt</TT>
+(<TT>\documentclass[man,tt]{apa}</TT>), but that's a matter of taste.  
+These options have no effect in modes other than <TT>man</TT> 
+and may be left in when switching.<P>
+
+In the document format (<TT>doc</TT> mode), Computer Modern are used be default
+and should probably be used all the time since, after all, this is supposed to
+be the most &ldquo;regular&rdquo; LaTeX-like format.
+
+
+<H3><A NAME="bibcit">Bibliography and citations</A></H3>
+
+
+<TT>apa.cls</TT> uses the 
+<A HREF="http://www.ctan.org/tex-archive/biblio/bibtex/contrib/apacite/"><TT>apacite</TT></A> 
+package by Erik Meijer for citations because it offers the complete coverage and excellent conformance
+to APA guidelines.  Moreover, <TT>apacite</TT> has been recently updated (in 2005) and now
+handles electronic sources as well as non-English language forms.
+<P>
+You should count on using <TT>bibTeX</TT> with the corresponding 
+<A HREF="http://www.ctan.org/tex-archive/biblio/bibtex/contrib/apacite/apacite.bst"><TT>apacite.bst</TT></A> 
+style file for your bibliography.  Citation commands include the standard <TT>bibtex</TT> 
+options such as <TT>\cite</TT> but there are substantial extensions to cover other needs
+such as contracted <I>vs.</I> full author lists, author name only or year only for complex
+constructions, text preceding or following reference list in parentheses etc.  
+For instructions on using the various citation forms and output examples get 
+<A HREF="http://www.ctan.org/tex-archive/biblio/bibtex/contrib/apacite/apacite.tex"><TT>apacite.tex</TT></A>,
+<A HREF="http://www.ctan.org/tex-archive/biblio/bibtex/contrib/apacite/testAPA.tex"><TT>testAPA.tex</TT></A>, and 
+<A HREF="http://www.ctan.org/tex-archive/biblio/bibtex/contrib/apacite/readme.apa"><TT>readme.apa</TT></A> 
+from the CTAN mirror near you.  
+<P>
+At the end of your document, before any appendices, issue the <TT>\bibliography</TT>
+command with the file names of the relevant <TT>bib</TT> files (standard <TT>bibtex</TT> usage).  Do not use a 
+<TT>\bibliographystyle</TT> command, because <TT>apacite</TT> 
+is selected and loaded automatically (however, for backwards compatibility, 
+any existing <TT>\bibliographystyle</TT> command is nicely ignored with a warning).
+
+
+<H3><A NAME="append">Appendices</A></H3>
+
+
+The appendix part comes last, that is, after the references section.
+Consistent with standard LaTeX usage, the command <TT>\appendix</TT> is used once, 
+at the point where your (first) appendix starts, to signal the change from
+regular matter to appendix matter.  From that point on, regular sectioning
+commands refer to appendix sections.  In particular, each use of the <TT>\section</TT> 
+command starts a new appendix.  Use, for example<P>
+<TT>
+\section{Appendix Title}<BR>
+</TT><P>
+to start an appendix (even if there is only one).  Each appendix has its title,
+while numbering (&ldquo;Appendix A,&rdquo; &ldquo;Appendix B&rdquo; etc.) is
+taken care of automatically in case there are more than one appendices.
+<P>
+You are free to
+use figures and tables in the usual way in the appendix(es).  <TT>apa.cls</TT> 
+will number them correctly and include them in the table and figure lists where they
+belong.  
+<P>
+You may use
+cross-references to appendixes, because they are numbered, if there
+are more than one.  A command such as <TT>\label{app:xxx}</TT> after the appendix
+<TT>\section</TT> sets the label.  Then you may refer to this appendix with <P>
+<TT>Appendix~\ref{app:xxx}</TT><P>
+from anywhere in your manuscript.
+
+
+<H3><A NAME="babel">Non-English documents</A></H3>
+
+As of 2005, <TT>apa.cls</TT> and <TT>apacite</TT> can handle non-English documents with <TT>babel</TT>.  Because there are potential conflicts between <TT>apacite</TT> and <TT>babel</TT>, you may not load <TT>babel</TT> from your document, but must pass it as an option to <TT>apa.cls</TT>, so that it can be loaded in the appropriate order and handled correctly. Desired languages are listed as additional options to <TT>apa.cls</TT>, and will be passed on to <TT>babel</TT> automatically when loaded. Remember that the main language of your document is the one listed <I>last</I>. For example, if your article is written in Dutch, use
+<PRE>
+\documentclass[man,babel,english,dutch]{apa}
+</PRE>
+If, however, your article is in English but you need support for Greek, for example to cite certain passages using <TT>\textgreek</TT>, then use
+<PRE>
+\documentclass[man,babel,greek,english]{apa}
+</PRE>
+instead.
+<P>
+<TT>apa.cls</TT> produces certain strings in the manuscript, mostly as titles to obligatory sections (pages): &ldquo;Running head,&rdquo; &ldquo;Author note,&rdquo; &ldquo;Figure captions,&rdquo; and &ldquo;Footnotes&rdquo; (other strings, such as &ldquo;Abstract,&rdquo; &ldquo;References,&rdquo; and the float labels &ldquo;Table&rdquo; and &ldquo;Figure&rdquo; are handled by <TT>babel</TT> and/or <TT>apacite</TT>).  These strings are defined in external files, so new ones can easily be added. These files are named with the language name (as known by <TT>babel</TT>) and the extension <TT>.apa</TT> (for example, <TT>greek.apa</TT>).  If the definitions for your languages are not supplied with <TT>apa.cls</TT>, copy <TT>english.apa</TT> with the new file name for your language, and edit the macro definitions inside the new file to display the correct strings in the new language.  Send me the new file so it can be included with future distributions of <TT>apa.cls</TT>.
+
+<H3><A NAME="misc">Miscellaneous</A></H3>
+
+
+If you use vectors, the command \apavector{X} will make your life easier.
+<P>
+If you need to use additional options for <TT>article.cls</TT>, list them as <TT>apa.cls</TT> options and they will be automatically passed along to
+<TT>article.cls</TT>.
+
+
+<H2><A NAME="comlist">List of <TT>apa.cls</TT> commands</A></H2>
+
+In the following alphabetical list of commands you can see the number
+and kind of parameters needed for the use of each one:<P>
+<PRE>
+ \abstract{Abstract text}                    
+ \acknowledgements{Author notes etc.}   
+ \affiliation{Department\\ University}  
+   \twoaffiliations{Affiliation of 1st Author(s)}{Affil. of 2nd Author(s)}
+   \threeaffiliations{...}{...}{...}
+   \fouraffiliations{...}{...}{...}{...}
+   \fiveaffiliations{...}{...}{...}{...}{...}
+   \sixaffiliations{...}{...}{...}{...}{...}{...}
+ \apamatrix{M}
+ \apavector{A}
+ \appendix
+ \author{Author Name(s)}                
+   \twoauthors{First Author(s)}{Second Author(s)}
+   \threeauthors{...}{...}{...}
+   \fourauthors{...}{...}{...}{...}
+   \fiveauthors{...}{...}{...}{...}{...}
+   \sixauthors{...}{...}{...}{...}{...}{...}
+ \ccoppy{Copyright notice}
+ \centeredcaption{width}{caption-text}
+ \copnum{Serial number}
+ \fitbitmap[optional-height]{eps-filename}
+ \fitfigure[optional-height]{eps-filename}
+ \ifapamode{man-code}{jou-code}{doc-code}
+ \ifapamodeman{man-mode-code}{doc-or-jou-code}
+ \ifapamodejou{jou-mode-code}{doc-or-man-code}
+ \ifapamodedoc{doc-mode-code}{man-or-jou-code}
+ \leftheader{Author name list}
+ \journal{Journal name}
+ \maketitle
+ \note{Draft/submission date, etc.}
+ \rightheader{Running head}
+ \shorttitle{Short title}
+ \tabfnm{a}
+ \tabfnt{a}{Note text}
+ \thickline
+ \title{Title}                          
+ \volume{Volume, number, pages}
+</PRE>
+
+
+<H2><A NAME="optlist">List of options to <TT>apa.cls</TT></A></H2>
+
+<DL>
+<DT><TT>babel</TT>
+  <DD>Loads <TT>babel</TT> to support hyphenation and features for languages other
+             than English.  Desired languages should be listed as additional options
+             after <TT>babel</TT>. 
+<DT><TT>fignum</TT> 
+  <DD>Effective in <TT>man</TT> mode, adds figure numbering to the figure pages.
+             Makes it easier to refer to figures and I recommend it for the
+             reviewers' copies, but for the original figures you need to have
+             them printed without this and write the number with pencil on the back.
+<DT><TT>floatmark</TT>
+  <DD>Effective in <TT>man</TT> mode, inserts placeholders for floats in text
+             (&ldquo;Insert Figure X about here&rdquo; &ndash; no longer required by APA)
+<DT><TT>helv</TT>
+  <DD>Effective in <TT>man</TT> mode, uses Helvetica as the base typeface
+<DT><TT>longtable</TT>
+  <DD>Only usable in <TT>man</TT> mode, loads <TT>longtable.sty</TT> if 
+    you <EM>really</EM> must use long tables in your manuscript.  
+<DT><TT>nobf</TT>
+  <DD>Effective in <TT>man</TT> mode, turns off boldface in section headers for strict 
+      conformance to APA style.
+<DT><TT>nosf</TT> 
+  <DD>Effective in <TT>man</TT> mode, neutralizes the <TT>\helvetica</TT> command. <EM>This is
+      only included for backwards compatibility and should not be used any more since
+      the <TT>\helvetica</TT> command is not supported now.</EM>
+<DT><TT>notab</TT>
+  <DD>Effective in <TT>jou</TT> mode, cancels the automatic stretching of tabular
+             environments to the width of their enclosing float.
+<DT><TT>notimes</TT>
+  <DD>Effective in <TT>jou</TT> mode, cancels loading <TT>pslatex</TT> (or <TT>times</TT>) and 
+             uses computer modern fonts.
+<DT><TT>notxfonts</TT>
+  <DD>Effective in <TT>jou</TT> mode, ignores search for <TT>txfonts</TT> and tries to load
+             <TT>pslatex</TT> (or <TT>times</TT>) in order to typeset with Times Roman.
+<DT><TT>tt</TT>
+  <DD>Effective in <TT>man</TT> mode, uses a typewriter base typeface
+</DL>
+
+<I>Note:</I> Options may be left in the <TT>\documentclass</TT> line when compiling
+any mode, since they are quietly ignored when they are not effective.<P>
+
+
+<H2><A NAME="problems">Possible problems</A></H2>
+
+
+If you follow the instructions you shouldn't really have any problems.
+In terms of restrictions, you should keep in mind that only up to six
+affiliations (for article author(s)) are supported, and that there is no 
+provision for A4 paper dimensions (but see 
+<A HREF="dl/apa/examples.txt"><TT>examples.txt</TT></A> for a workaround).<P>
+
+<CENTER><I>Last updated on January 10<SUP>th</SUP>, 2006<BR>by 
+<A HREF="mailto:protopap@ilsp.gr">Athanassios Protopapas</I></CENTER>
+
+</BODY>
+
+</HTML>
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/apa/apacls.txt b/Master/texmf-dist/doc/latex/apa/apacls.txt
index c05f8ae7b00..83cae21ff64 100644
--- a/Master/texmf-dist/doc/latex/apa/apacls.txt
+++ b/Master/texmf-dist/doc/latex/apa/apacls.txt
@@ -1,7 +1,7 @@
 This is file apacls.txt, which contains instructions for using the
 APA LaTeX2e class file apa.cls 
 
- Athanassios Protopapas  *******  Version 1.3.0 August 2002
+ Athanassios Protopapas  *******  Version 1.3.2 January 2006
 
 
 Introduction
@@ -14,6 +14,11 @@ Introduction
  changes.  The headings and enumeration/seriation code is taken from
  theapa.sty by Young U. Ryu.
 
+Note
+
+ apa.cls is not in any way connected to, endorsed by, or even 
+ probably known at all at the American Psychological Association.  
+
 
 Description
 
@@ -43,7 +48,7 @@ Description
  Journal-like headers can also be produced on the first page.
  Dimensions and overall "look" are modeled after JEP:HPP.  The purpose
  of this mode is to produce readable and reasonably condensed output
- for double-sided xeroxing and distribution.
+ for double-sided printing and distribution.
 
  c) Document mode (doc)
 
@@ -59,32 +64,32 @@ Description
  development of articles that are later going to be submitted (using
  the manuscript format) and distrubuted (using the journal
  format). The advantage over using a regular article class is that all
- the extra definitions are supported and no changes need thus be made
+ the extra definitions related to APA style are supported (or simply
+ ignored without producing errors), so no changes need to be made
  to the text other than the format parameter.
 
 
-Known bugs and restrictions:
+Known restrictions:
 
- - Up to four affiliations (for article author(s)) are supported.
- - There seems to be an incompatibility between apacite and babel.
-    Since apacite is necessary, you may not be able to use babel.
+ - Up to six affiliations (for article author(s)) are supported.
  - No provision for A4 paper.  See examples for a workaround.
 
 
 Other necessary files:
 
- For all modes you need apacite.sty and apacite.bst.
+ For all modes you need apacite.sty and apacite.bst. Download the
+  most recent version (June 2005 or later) for full compatibility.
 
  For manuscript mode, you need endnotes.sty and endfloat.sty 
 
- For journal mode, you need, optionally, pslatex.sty (or times.sty and
-  mathptm.sty), ftnright.sty, fancyhdr.sty (for first page headers),
-  and flushend.sty
+ For journal mode, optional packages include txfonts (or pslatex,
+  or times.sty and mathptm.sty), ftnright.sty, fancyhdr.sty (for 
+  first page headers), and flushend.sty
 
 
 To use this class, include one of the following
 
- \documentclass[jou]{apa}  for the two-column output (Times-Roman default)
+ \documentclass[jou]{apa}  for the two-column output (txfonts default)
  \documentclass[man}{apa}  for the manuscript (double-spaced) output
  \documentclass[doc]{apa}  for regular document (in computer modern)
    
@@ -100,10 +105,11 @@ To use this class, include one of the following
  is ignored and a warning is issued).
 
  The journal format uses Times Roman by default (it does look like
- published after all); if you don't have pslatex.sty or times.sty, or
- if you just prefer computer modern, add notimes after the jou option
- in the class line: \documentclass[jou,notimes]{apa} (notimes has no
- effect in modes other than jou and may be left in when switching)
+ published after all); if you don't have txfonts or pslatex or 
+ times.sty, or if you just prefer computer modern, add notxfonts 
+ after the jou option in the class line: 
+ \documentclass[jou,notxfonts]{apa} 
+ (this has no effect in modes other than jou and may be left in)
 
  Manuscript format uses Computer Modern by default but can use
  Helvetica or typewriter look by using the options helv or tt,
@@ -121,10 +127,14 @@ The following commands are defined and should/may be used:
    or \twoauthors{First Author(s)}{Second Author(s)}
    or \threeauthors{John and Jim}{Mary and Sue}{Nick}
    or \fourauthors{Helen}{Dick}{Tracy and Larry}{James Bond}
+   or \fiveauthors{...}{...}{...}{...}{...}
+   or \sixauthors{...}{...}{...}{...}{...}{...}
  \affiliation{Department\\ University}  
    or \twoaffiliations{Affiliation of 1st Author(s)}{Affil. of 2nd Author(s)}
    or \threeaffiliations{U of A}{U of B}{U of C}
    or \fouraffiliations{My Company}{Your Department}{Heaven}{Earth}
+   or \fiveaffiliations{...}{...}{...}{...}{...}
+   or \sixaffiliations{...}{...}{...}{...}{...}{...}
 
  \maketitle                                    % right after \begin{document}
 
@@ -138,7 +148,7 @@ The following commands are defined and should/may be used:
 
  3. Optional, possibly helpful 
 
- \note{Draft/submission date, etc.}	       % To add notes on first page
+ \note{Draft/submission date, etc.}	           % To add notes on first page
  \thickline                                    % Use in tables for the top line
  \centeredcaption{width}{caption-text}         % Used with double-column figures 
                                                %  to create centered captions
@@ -154,7 +164,7 @@ The following commands are defined and should/may be used:
  \ifapamode{man-code}{jou-code}{doc-code}      % Do different things depending on
  \ifapamodeman{man-mode-code}{doc-or-jou-code} %  mode---you shouldn't have to use
  \ifapamodejou{jou-mode-code}{doc-or-man-code} %  any of these but they're here if
- \ifapamodedoc{doc-mode-code}{man-or-jou-code} %  you want them.  Parameters can
+ \ifapamodedoc{doc-mode-code}{man-or-jou-code} %  you want them.  Arguments can
                                                %  be left empty to do nothing
 
  \journal{Journal name or other note}          % Top left header on page one in
@@ -163,29 +173,34 @@ The following commands are defined and should/may be used:
  \ccoppy{Copyright notice etc.}                % Top right header in jou/doc p. 1
  \copnum{Your hovercraft is full of eels}      % Top right, under content of \ccoppy
 
- \tabfnm{a}				       % Put a note mark inside a table cell
+ \tabfnm{a}				             % Put a note mark inside a table cell
  \tabfnt{a}{Note text}			       % Put the mark and text for a table note
  \apavector{A}				       % Format a symbol as vector by APA rules
- \appendix				       % Standard LaTeX usage, starts off
-					       %  appendix section(s)
+ \appendix				             % Standard LaTeX usage, starts off
+					             %  appendix section(s)
 
 
 The following options are available:
 
  These options must be combined with one of jou, man, doc.
 
- notimes  : Effective in jou mode, cancels loading pslatex (or times) and 
-             uses computer modern fonts.
+ notxfonts: Effective in jou mode, prevents txfonts from loading, in case
+             pslatex (or times) is preferable for some reason
+ notimes  : Effective in jou mode, cancels loading txfonts or pslatex or 
+             times and uses computer modern fonts.
  nosf     : Effective in man mode, neutralizes the \helvetica command.
  fignum   : Effective in man mode, adds figure numbering to the figure pages.
              Makes it easier to refer to figures and I recommend it for the
-             reviewers' copies, but for the original figures you need to have
-             them printed without this and write the number with pencil on the back.
+             reviewers' copies, but for the original figures you may have
+             to print them without this and write the number on the back.
  notab    : Effective in jou mode, cancels the automatic stretching of tabular
              environments to the width of their enclosing float.
  nobf     : Effective in man mode, turns off boldface in section headers
- helv	  : Effective in man mode, uses Helvetica as the base typeface
- tt	  : Effective in man mode, uses a typewriter base typeface
+ helv	    : Effective in man mode, uses Helvetica as the base typeface
+ tt	    : Effective in man mode, uses a typewriter base typeface
+ babel    : Effective every mode, loads babel to support languages other than
+             English. List the desired languages as additional options to 
+             apa.cls after babel. The last language listed is the main one. 
  longtable: Only usable in man mode, loads longtable.sty if you *really* must
              use long tables in your manuscript.  See special note below
  floatmark: Effective in man mode, inserts placeholders for floats in text
@@ -197,8 +212,8 @@ Notes on usage:
  the \author command with all names and the \affiliation command. If
  there are people from two different departments, use the \twoauthors
  and \twoaffiliations commands to group them appropriately.  For three
- affiliations use \threeauthors and \threeaffiliations, and guess what
- for four.
+ affiliations use \threeauthors and \threeaffiliations, and so on for
+ four, five, or six affiliations (and corresponding author groups).
 
  Default sectioning maps \section, \subsection, and \subsubsection to
  the three-level heading definitions of the APA manual.  If you need
@@ -266,6 +281,9 @@ Notes on usage:
  the purpose of apa.cls, so only resort to longtable if you absolutely
  have to.  You will need the supplied endfloat.cfg to use it.
 
+ Sideways tables: Use the rotating package and \sidewaystable. You will
+ need the supplied endfloat.cfg in your document directory for it to work.
+
 
 Feedback:
 
@@ -275,10 +293,12 @@ Feedback:
 
 Example of usage:
 
- See file examples.txt... 
+ See examples.txt and apaexample.tex
  PLEASE, read file examples.txt, it will probably solve your problems.
 
+ Online information: http://www.ilsp.gr/homepages/protopapas/apacls.html
+
 
-Thanassi Protopapas
-August 30, 2002
+Athanassios Protopapas
+January 5, 2005
 
diff --git a/Master/texmf-dist/doc/latex/apa/apaexample.tex b/Master/texmf-dist/doc/latex/apa/apaexample.tex
new file mode 100644
index 00000000000..81638b4bfed
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/apa/apaexample.tex
@@ -0,0 +1,71 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%                                      %
+% Athanassios Protopapas, October 2005 %
+% Mini-example for using apa.cls       %
+%                                      %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\documentclass[man]{apa}
+
+\title{Example of an APA-style manuscript}
+\author{Athanassios Protopapas}
+\affiliation{Institute for Language \& Speech Processing\\ Athens, Greece}
+
+\abstract{This is an example of a minimal ``manuscript'' using the \LaTeX\ apa.cls document class to typeset manuscripts according to the Americal Psychological Association (APA) manual, fifth edition.}
+
+\acknowledgements{Written at the request of the Prac\TeX\ journal editors.
+
+Comments may be sent to the author at protopap@ilsp.gr.}
+
+\shorttitle{APA style manuscript}
+\rightheader{APA style manuscript}
+\leftheader{A.\ Protopapas}
+
+\begin{document}
+\maketitle                            
+Here goes the text of the article. Note that the content begins immediately after \texttt{maketitle} and there is no blank line between the title command and the article text. This first section of the article is typically the introduction and, according to APA style, should not bear a section heading.\footnote{That is, there is no ``Introduction'' section.} Subsequent sections, however, are titled according to the psychological conventions.
+
+\section{Experiment 1} 
+Manuscripts in APA style often contain descriptions of experiments.  The APA manual specifications for referring to experiments are to use a lowercase ``e'' when speaking generally, as in the previous phrase, but an uppercase ``E'' when mentioning a particular experiment (as in the following phrase), such as Experiment~1.
+
+\subsection{Method}
+The ``method'' is a subsection of the experimental presentation in which all the details of setting up and conducting the experiment are described.  There a number of more or less standard components to a method, shown below.
+\subsubsection{Participants}
+Psychological experiments are conducted with participants, usually humans. Note that these used to be called ``subjects'' but apparently APA now finds it inappropriate to refer to people with this term.  Here we mention how many participants there were, their ages and other information about them.
+\subsubsection{Apparatus}
+Sometimes it is necessary to give the apparatus a special section.
+\subsubsection{Stimuli}
+What the subjects saw, heard, or felt.
+\subsubsection{Procedure}
+What happened to the poor subjects.
+\subsection{Results}
+In this subsection, one shows numbers and statistical analyses.  Students are especially unlikely to read this section, but seasoned researchers often avoid it in the first reading, especially if the article is not of particular interest for their own research.
+\subsection{Discussion}
+If the results of the experiment mean anything, this is the place to talk about it. 
+
+\section{Experiment 2}
+Usually one experiment is not enough to convince anyone; you need additional control experiments to make your point.
+\subsection{Method}
+The method can be the same as for the previous experiment, since here we are simply interested in showing the structure of the manuscript.
+\subsection{Results \& Discussion}
+This is a good point to show an example of a table following APA conventions. Note that we don't use any vertical separators and that columns can be grouped with partial horizontal lines.  
+Also keep in mind that the caption must precede the table. The label is entirely optional, but useful for referring to the table in the text, for example this one would be Table~\ref{tab:tab1}.
+\begin{table}[tbp]
+\caption{Some numbers that could be experimental data.}
+\label{tab:tab1}
+\begin{tabular}{lcc}\hline
+          & \multicolumn{2}{c}{Factor 2} \\ \cline{2-3}
+Factor 1  & Condition A  & Condition B   \\ \hline
+First     & 586 (231)    & 649 (255)     \\
+          &    2.2       &    7.5        \\
+Second    & 590 (195)    & 623 (231)     \\
+          &    2.8       &    2.5        \\ \hline
+\end{tabular}
+\end{table}
+
+\section{General Discussion}
+In psychological articles there is usually some point to the whole experimental exercise, and in the end we get to discuss how important it all is.  Although literature is supposed to have been covered in the introduction, for this example we can illustrate the use of bibliographic citations in this final section \cite{art1}. The accompanying package ``apacite'' by Erik Meijer provides everything an APA-style writer needs for citations, such as in-text citations in which one can claim that \citeA{boo1} mentioned or failed to mention something.
+
+\bibliography{examplebib}
+
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/apa/endfloat.cfg b/Master/texmf-dist/doc/latex/apa/endfloat.cfg
new file mode 100644
index 00000000000..8584249f13b
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/apa/endfloat.cfg
@@ -0,0 +1,86 @@
+%%
+%% This is file `endfloat.cfg',
+%% modifed from the original supplied with the endfloat package
+%% to handle both sideways floats and longtable 
+%%
+%% Athanassios Protopapas <protopap@ilsp.gr>
+%% July 2005
+%% 
+%% Original authors: James Darrell McCauley <jdm5548@diamond.tamu.edu>,
+%% Jeff Goldberg <j.goldberg@cranfield.ac.uk>
+%% Original version: Version 2.4i <October 1995>
+%%
+\RequirePackage{rotating}
+\let\efsaved@sidewaysfigure\sidewaysfigure
+\let\efsaved@sidewaystable\sidewaystable
+\let\efsaved@longtable\longtable
+\AtBeginTables{\let\sidewaystable=\efsaved@sidewaystable\relax}
+\AtBeginTables{\let\longtable=\efsaved@longtable\relax}
+\AtBeginFigures{\let\sidewaysfigure=\efsaved@sidewaysfigure\relax}
+\def\sidewaystable{\efloat@condopen{ttt}
+    \efloat@iwrite{ttt}{\string\begin{sidewaystable}}%
+    \if@domarkers
+       \addtocounter{posttbl}{1}
+       \tableplace
+    \fi
+    \def\@currenvir{efloat@float}%
+    \begingroup
+    \let\do\ef@makeinnocent \dospecials
+    \ef@makeinnocent\^^L% and whatever other special cases
+    \endlinechar`\^^M \catcode`\^^M=12 \ef@xsidetable}
+{\catcode`\^^M=12 \endlinechar=-1 %
+ \gdef\ef@xsidetable#1^^M{\def\test{#1}
+      \ifx\test\ef@endsidetabletest
+          \efloat@foundend{ttt}{sidewaystable}
+      \else
+          \efloat@iwrite{ttt}{#1}%
+          \let\next\ef@xsidetable
+      \fi \next}
+}
+\def\sidewaysfigure{\efloat@condopen{fff}
+    \efloat@iwrite{fff}{\string\begin{sidewaysfigure}}%
+    \if@domarkers
+       \addtocounter{postfig}{1}
+       \figureplace
+    \fi
+    \def\@currenvir{efloat@float}%
+    \begingroup
+    \let\do\ef@makeinnocent \dospecials
+    \ef@makeinnocent\^^L% and whatever other special cases
+    \endlinechar`\^^M \catcode`\^^M=12 \ef@xsidefigure}
+{\catcode`\^^M=12 \endlinechar=-1 %
+ \gdef\ef@xsidefigure#1^^M{\def\test{#1}
+      \ifx\test\ef@endsidefiguretest
+          \efloat@foundend{fff}{sidewaysfigure}
+      \else
+          \efloat@iwrite{fff}{#1}%
+          \let\next\ef@xsidefigure
+      \fi \next}
+}
+\def\longtable{\efloat@condopen{ttt}
+    \efloat@iwrite{ttt}{\string\begin{longtable}}%
+    \if@domarkers
+       \addtocounter{posttbl}{1}
+       \tableplace
+    \fi
+    \def\@currenvir{efloat@float}%
+    \begingroup
+    \let\do\ef@makeinnocent \dospecials
+    \ef@makeinnocent\^^L% and whatever other special cases
+    \endlinechar`\^^M \catcode`\^^M=12 \ef@xlongtable}
+{\catcode`\^^M=12 \endlinechar=-1 %
+ \gdef\ef@xlongtable#1^^M{\def\test{#1}
+      \ifx\test\ef@endlongtabletest
+          \efloat@foundend{ttt}{longtable}
+      \else
+          \efloat@iwrite{ttt}{#1}%
+          \let\next\ef@xlongtable
+      \fi \next}
+}
+{\escapechar=-1%
+ \xdef\ef@endsidefiguretest{\string\\end\string\{sidewaysfigure\string\}}%
+ \xdef\ef@endsidetabletest{\string\\end\string\{sidewaystable\string\}}
+ \xdef\ef@endlongtabletest{\string\\end\string\{longtable\string\}}}%
+\endinput
+%%
+%% End of file `endfloat.cfg'.
diff --git a/Master/texmf-dist/doc/latex/apa/examplebib.bib b/Master/texmf-dist/doc/latex/apa/examplebib.bib
new file mode 100644
index 00000000000..9449a4044f0
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/apa/examplebib.bib
@@ -0,0 +1,14 @@
+@article{art1,
+author="First Last",
+title="A fictitious journal article",
+year=1900,
+journal="Journal of nothingness",
+volume=2,
+pages="1-2"}
+
+@book{boo1,
+author="Respectable Writer",
+title="A silly book",
+year=2000,
+publisher="PublishCo",
+address="Somewhere"}
diff --git a/Master/texmf-dist/doc/latex/apa/examples.txt b/Master/texmf-dist/doc/latex/apa/examples.txt
index d8600da334a..c6560368863 100644
--- a/Master/texmf-dist/doc/latex/apa/examples.txt
+++ b/Master/texmf-dist/doc/latex/apa/examples.txt
@@ -1,26 +1,40 @@
 %
-% Athanassios Protopapas, August 2002
-% Examples for using apa.cls v1.3.0
+% Athanassios Protopapas, January 2006
+% Examples for using apa.cls v1.3.2
 %
 % This file contains examples of using the commands defined in apa.cls
-% It is not recommended that you use this as a sample document because
-% of its very short length, which makes for very awkward formatting.
-% In fact this file will not compile because of the commands that
-% are embedded in the text (unescaped backslashes all over the place)
+% Do not use this file as a sample document! It is only meant to show
+% how to use the macros appropriately, and will not even pass through
+% LaTeX successfully, because of many commands that are embedded in 
+% the text (unescaped backslashes all over the place).
 % Just use the examples of the commands you need.
 %
+% See apaexample.tex if you want a file that will run through LaTeX and
+% produce sample output compatible with APA style.
+%
 % The class command goes at the top
 %
-\documentclass[fignum,jou]{apa}
+\documentclass[man]{apa}
 %
 % Change jou to man/doc for the other modes:
 %
-%\documentclass[fignum,man]{apa}
-%\documentclass[fignum,doc]{apa}
+%\documentclass[jou]{apa}
+%\documentclass[doc]{apa}
 %
 % Here's what I use:
 %\documentclass[nobf,fignum,tt,man]{apa}
 %
+%If you need support for languages other than English, use babel.
+% Do not load babel with \usepackage from your document, because it will
+% clash with apacite.  Pass the "babel" option to apa.cls to load along with
+% the language(s) you need.
+% If the main language of your document is different from English, 
+% then list it last in the options list. For example, if the paper is in Dutch:
+%\documentclass[man,babel,english,dutch]{apa} % text in Dutch; English available
+% If the main language of your document is English but you need support
+% for another language (e.g., for short passages in Greek using \textgreek):
+%\documentclass[man,babel,greek,english]{apa} % text in English; Greek available
+%
 % If you have postscript graphics to include, load the graphicx package
 %
 \usepackage{graphicx}
@@ -61,7 +75,7 @@
 % Optional journal-like looking headers 
 %
 \journal{Journal of nothing}\volume{First and Last Volume}
-\ccoppy{Copyright 2002 by Myself}\copnum{Some serial number}
+\ccoppy{Copyright 2006 by Myself}\copnum{Some serial number}
 %
 % End of definitions, begin document with title and then main text
 %
@@ -124,7 +138,7 @@ A figure can be included in any way you like, but this class provides
 a way to deal automatically with fitting encapsulated postscript (EPS)
 files without worrying about dimensions or mode.  Start your figure or
 figure* environment as usual (see the LaTeX book) and then instead of
-\epsfig or \includegraphics use the new command \fitfigure:
+\includegraphics use the new command \fitfigure.
 
 An example of a figure that loads a postscript file.  You can use the
 t and b options for selectively putting a figure at the top or bottom
@@ -132,7 +146,7 @@ of a page.  Always include p after t or b so that you won't risk
 running out of space if a figure is too big.  The h option for
 inserted figures is not recommended because it's not used in APA
 journals.  Don't forget \usepackage{graphicx} in your preamble! 
---- not epsfig, not graphics.
+(not epsfig, not graphics).
 
 \begin{figure}[tp]
 \fitfigure{fig1} %% You could use {fig1.eps} here but see note below
@@ -165,7 +179,7 @@ probably don't want it scaled in man mode, for best reproduction, so
 use \fitbitmap instead:
 
 \begin{figure}[tp]
-\fitbitmap{bm1.eps} %% .eps not necessary -- see note above
+\fitbitmap{bm1.eps} %% ".eps" not necessary -- see note above
 \caption{This is the caption of the figure.}
 \label{fig:fig2}
 \end{figure}
@@ -246,7 +260,7 @@ belong.  Isn't apa.cls wonderful?
 Just to show that another appendix is really just another section.
 Also, it's a good opportunity to show how longtable should be used.
 Remember, you must include the longtable option with the apa class if
-you need to use longtable.  Also, remember, it only works in man mode.
+you need to use longtable. Also, keep in mind, it only works in man mode.
 
 \begin{longtable}{lcc}
 \caption{One sample caption for the sample long table.}
diff --git a/Master/texmf-dist/source/latex/apa/endfloat.cfg b/Master/texmf-dist/source/latex/apa/endfloat.cfg
deleted file mode 100644
index 39c67896e30..00000000000
--- a/Master/texmf-dist/source/latex/apa/endfloat.cfg
+++ /dev/null
@@ -1,31 +0,0 @@
-%
-% endfloat configuration file for long tables, to be used with apa.cls
-% 
-
-\let\efsaved@longtable\longtable
-\AtBeginTables{\let\longtable=\efsaved@longtable\relax}
-
-\def\longtable{\efloat@condopen{ttt}
-    \efloat@iwrite{ttt}{\string\begin{longtable}}%
-    \if@domarkers
-       \addtocounter{posttbl}{1}
-       \tableplace
-    \fi
-    \def\@currenvir{efloat@float}%
-    \begingroup
-    \let\do\ef@makeinnocent \dospecials
-    \ef@makeinnocent\^^L% and whatever other special cases
-    \endlinechar`\^^M \catcode`\^^M=12 \ef@xlongtable}
-{\catcode`\^^M=12 \endlinechar=-1 %
- \gdef\ef@xlongtable#1^^M{\def\test{#1}
-      \ifx\test\ef@endlongtabletest
-          \efloat@foundend{ttt}{longtable}
-      \else
-          \efloat@iwrite{ttt}{#1}%
-          \let\next\ef@xlongtable
-      \fi \next}
-}
-
-{\escapechar=-1%
- \xdef\ef@endlongtabletest{\string\\end\string\{longtable\string\}}}%
-\endinput
diff --git a/Master/texmf-dist/tex/latex/apa/apa.cls b/Master/texmf-dist/tex/latex/apa/apa.cls
index 8c8d74cbf46..32fadf75f44 100644
--- a/Master/texmf-dist/tex/latex/apa/apa.cls
+++ b/Master/texmf-dist/tex/latex/apa/apa.cls
@@ -1,9 +1,9 @@
 %
-% apa.cls  version 1.3.0
+% apa.cls  version 1.3.2
 %
 % NOTE CHANGE IN VERSION NUMBERING : 1.21--1.28 should have been 1.2.1--1.2.8
 %
-% Athanassios Protopapas, August 2002
+% Athanassios Protopapas, January 2006
 % protopap@ilsp.gr
 %
 % This package may be distributed under the terms of the LaTeX Project Public
@@ -18,7 +18,7 @@
 %%%%%%%%%%%%%%%%%
 
 \NeedsTeXFormat{LaTeX2e} 
-\ProvidesClass{apa}[2002/08/30 American Psychological Association format v1.3.0]
+\ProvidesClass{apa}[2006/01/31 American Psychological Association format v1.3.2]
 
 \DeclareOption{man}{%
 \def\def@man{\@manmode}
@@ -32,10 +32,18 @@
 \def\def@doc{\@docmode}
 }
 
+\DeclareOption{babel}{%
+\def\def@babel{\@babel}
+}
+
 \DeclareOption{notimes}{%
 \@ifundefined{def@jou}{}{\def\def@notimes{\@notimes}}
 }
 
+\DeclareOption{notxfonts}{% -- thp 2005/07/23
+\@ifundefined{def@jou}{}{\def\def@notxfonts{\@notxfonts}}
+}
+
 \DeclareOption{nosf}{%
 \@ifundefined{def@man}{}{\def\def@nosf{\@nosf}}
 }
@@ -49,7 +57,6 @@
 }
 
 \DeclareOption{longtable}{%
-%\@ifundefined{def@man}{}{\def\long@table{\relax}}
 \def\long@table{\relax}
 }
 
@@ -67,7 +74,6 @@
 
 \DeclareOption*{%
 \PassOptionsToClass{\CurrentOption}{article}%
-%\ClassWarning{apa}{Supported options are: man, jou, doc, notimes, nosf, fignum, notab, nobf}
 }
 
 \ProcessOptions
@@ -85,7 +91,6 @@
 
 \@ifundefined{def@man}{}{%
 \LoadClass[11pt]{article}
-% \RequirePackage{ulem}[1995/12/17] %% not any more, since APA manual 5th ed
 %
 % endnotes and endfloat loaded later
 % longtable must be loaded before endfloat
@@ -96,9 +101,12 @@
 % longtable messes with captions too, we need to intervene to match style
 %
 \def\LT@makecaption#1#2#3{%
-  \LT@mcol\LT@cols c{\hbox to\z@{\hss\parbox{\columnwidth}{%
+  \LT@mcol\LT@cols c{\hbox to\z@{\hss\parbox{\linewidth}{%
       \vskip 10pt%
-      #1{#2}\par\emph{#3}%
+      #1{#2}%
+      \let\BBAB\table@BBAB%   -- thp 2005/07/23
+      \par\emph{#3}%
+      \let\BBAB\normal@BBAB%  -- thp 2005/07/23
     \endgraf\vskip\baselineskip}%
   \hss}}}
 }% END of loading longtable
@@ -119,14 +127,46 @@
 
 %
 % For jou mode, load times (and related math fonts) if available
+% First try txfonts because they are supposed to have better math definitions
 %
 \@ifundefined{def@jou}{}{%
  \LoadClass[twoside]{article}
  \@ifundefined{def@notimes}{%
-  \IfFileExists{pslatex.sty}{\RequirePackage{pslatex}}{
-   \RequirePackage{times}
-   \IfFileExists{mathptm.sty}{\RequirePackage{mathptm}}{}}}{}
-}
+  \newif\iftxfonts          % -- thp 2005/07/23 
+  \txfontsfalse             % added checks for txfonts because they may be undesirable
+                            % for example, there are no Greek txfonts but there are times
+  \IfFileExists{txfonts.sty}{\@ifundefined{def@notxfonts}{\txfontstrue}{}}{}
+   \iftxfonts%
+    \RequirePackage{txfonts}%
+    \typeout{apa.cls: Using txfonts}% Changed from Warning -- thp 2005/12/28
+    %%%
+    % According to Erik Meijer, txfonts causes problems if amsmath is loaded later
+    % (i.e., via \usepackage by the user); instead of providing yet another option
+    % to load amsmath by apa.cls, we adopt Erik's suggestion to undefine temporarily
+    % the offending macros -- thp 2005/12/28
+    \let\tempiint\iint\let\iint\undefined
+    \let\tempiiint\iiint\let\iiint\undefined
+    \let\tempiiiint\iiiint\let\iiiint\undefined
+    \let\tempidotsint\idotsint\let\idotsint\undefined
+    \let\tempopenbox\openbox\let\openbox\undefined
+    \AtBeginDocument{%
+     \let\iint\tempiint\let\tempiint\undefined
+     \let\iiint\tempiiint\let\tempiiint\undefined
+     \let\iiiint\tempiiiint\let\tempiiiint\undefined
+     \let\idotsint\tempidotsint\let\tempidotsint\undefined
+     \let\openbox\tempopenbox\let\tempopenbox\undefined
+    }
+    %%% end of taking care of txfonts problems
+   \else%
+    % if txfonts are not available/desirable, try pslatextimes/mathptm
+    \IfFileExists{pslatex.sty}
+     {\RequirePackage{pslatex}}
+     % if pslatex is not available, try times/mathptm
+     {\RequirePackage{times}
+      \IfFileExists{mathptm.sty}{\RequirePackage{mathptm}}{}}%
+   \fi% txfonts not available/desirable
+ }{}% def@notimes
+}% def@jou
 
 \@ifundefined{def@doc}{}{%
 \LoadClass[11pt]{article}
@@ -134,47 +174,44 @@
 
 %========= Language portability parameters ===========
 
-\def\GreekDefs{%
- \def\rheadname{Up'ertitlos:}
- \def\acksname{Shmei'wseis tou suggraf'ea}
- \def\figurecaptionsname{Lez'antes sqhm'atwn}
- \def\notesname{Uposhmei'wseis}
-%
-% Bibliography definitions for Greek
- \renewcommand{\BBC}{\textgreek{;} }
- \renewcommand{\BBAA}{\textgreek{kai}}
- \renewcommand{\BOthers}{\textgreek{k.\nobreakspace syn.}}
+% Language-specific definition of strings is handled externally -- thp 2005/12/30
+% Based on handling of the same issue in apacite.sty
+
+% First define the default English macros in case no external file is present or needed
+\def\rheadname{Running head:}
+\def\acksname{Author Note}
+\def\figurecaptionsname{Figure Captions}
+\def\notesname{Footnotes}
+
+\AtBeginDocument{% so that we know what language is active in babel
+
+% \typeout{\string\languagename\space is\space\languagename}
+% \@ifundefined{iflanguage}% this is defined by babel, so it means babel is loaded
+                           % Unfortunately, because babel is built into the format
+                           % in modern distributions, \iflanguage is defined and 
+                           % \languagename contains whichever language happens to be
+                           % last in the definition list, whether or not the babel 
+                           % package is loaded by the current document 
+
+ \@ifundefined{def@babel}% this is defined only if the user requested loading babel
+  {\def\@apa@langfile{english.apa}}
+  {\def\@apa@langfile{\languagename.apa}}
+ \InputIfFileExists{\@apa@langfile}{}{%
+  \ClassWarningNoLine{apa}{Language definition file \@apa@langfile\space not found}
+ }%
 }
 
-\AtBeginDocument{% so that we know already what language is active in babel
- \def\refname{\bibname} % This is defined as 'References' in apacite.sty
-                        % and should change appropriately in babel for other languages
- \def\rheadname{Running head:}
- \def\acksname{Author Note}
- \def\figurecaptionsname{Figure Captions}
- \def\notesname{Footnotes}
- \@ifundefined{iflanguage}{}% then we are not using babel!
-  {\edef\str@grk{greek}\ifx\languagename\str@grk\GreekDefs\fi}
-}
+%========== Load babel if required ===================
+
+\@ifundefined{def@babel}{}{% -- thp 2005/07/23
+ \RequirePackage{babel}    % -- thp 2005/07/23, removed options 2005/12/28
+} 
+
+%========== Load new apacite =========================
 
-%========== Alterations to apacite ===================
-
-\RequirePackage{apacite}
-
-\def\thebibliography#1{%
-     \bibnewpage
-     \@ifundefined{chapter}%
-       {\section*{\refname}%
-        \@mkboth{\MakeUppercase{\refname}}{\MakeUppercase{\refname}}
-        \addcontentsline{toc}{section}{\refname}}%
-       {\chapter*{\bibname}%
-        \@mkboth{\MakeUppercase{\bibname}}{\MakeUppercase{\bibname}}
-        \addcontentsline{toc}{chapter}{\bibname}}
-     \bibsize
-     \list
-     {\relax}{\bib@indent}
-     \sloppy\clubpenalty4000\widowpenalty4000
-     \sfcode`\.=1000\relax}
+\@ifundefined{def@man}{%                      -- thp 2005/07/23
+ \RequirePackage{apacite}[2005/06/08]}
+ {\RequirePackage[bibnewpage]{apacite}[2005/06/08]}
 
 %========== APA Section heading & seriation, from theapa.sty
 
@@ -183,18 +220,6 @@
 %
 \def\apa@startsection#1#2#3{\@startsection{}{}{#1}{#2}{#3}{\relax}*}
 
-%
-% \b@level@LEVEL-NO@skip
-%       Skip before heading: If >= 0, the following par is NOT indented.
-%                            If < 0, it is indented.
-%                            \b@level@LEVEL-NO@skip = vertical skip
-%
-% \e@level@LEVEL-NO@skip
-%       Skip after heading: If > 0, the following par starts in a new line;
-%                               \e@level@LEVEL-NO@skip = vertical skip
-%                           If <= 0, it starts just after the heading;
-%                               \e@level@LEVEL-NO@skip = horizontal skip
-%
 \newskip\b@level@one@skip   \b@level@one@skip=2.5ex plus 1ex minus .2ex
 \newskip\e@level@one@skip   \e@level@one@skip=1.5ex plus .6ex minus .1ex
 \newskip\b@level@two@skip   \b@level@two@skip=2.5ex plus 1ex minus .2ex
@@ -345,18 +370,6 @@
     \let\subparagraph=\levelfive%
 }
 
-%
-% APA Seriations: ONE level of seriation only.
-%  \begin{seriate} \item ... \end{seriate}
-%           within a paragraph or sentence
-%  \begin{APAenumerate} \item ... \end{APAenumerate}
-%           at the start of each paragraph in a series
-%           with enumeration
-%  \begin{APAitemize} \item ... \end{APAitemize}
-%           at the start of each paragraph in a series
-%           without enumeration
-%
-
 % Refer to LaTeX book to modify, if you want, spaces before and after of
 %  \begin{...} ... \end{...} or spaces between \item-s.
 \newcounter{APAenum}
@@ -408,6 +421,12 @@
 \let\threeauthors=\onetwoauthors
 \long\def\fourauthors#1#2#3#4{\long\def\@authorOne{#1}\long\def\@authorTwo{#2}%
  \long\def\@authorThree{#3}\long\def\@authorFour{#4}\long\def\@author{#1}}
+\long\def\fiveauthors#1#2#3#4#5{\long\def\@authorOne{#1}\long\def\@authorTwo{#2}%%%%
+ \long\def\@authorThree{#3}\long\def\@authorFour{#4}\long\def\@authorFive{#5}%    %%
+ \long\def\@author{#1}} %%     2006/01/05 -- added as contributed by Aaron Geller %%
+\long\def\sixauthors#1#2#3#4#5#6{\long\def\@authorOne{#1}%                  %% thp 2006/01/05
+ \long\def\@authorTwo{#2}\long\def\@authorThree{#3}\long\def\@authorFour{#4}%% thp 2006/01/05
+ \long\def\@authorFive{#5}\long\def\@authorSix{#6}\long\def\@author{#1}}    %% thp 2006/01/05 
 \long\def\affiliation#1{\long\def\@affil{#1}}
 \long\def\twoaffiliations#1#2{\long\def\@affilOne{#1}\long\def\@affilTwo{#2}%
 \long\def\@affil{#1}}
@@ -418,6 +437,12 @@
 \let\threeaffiliations=\onetwoaffiliations
 \long\def\fouraffiliations#1#2#3#4{\long\def\@affilOne{#1}\long\def\@affilTwo{#2}%
  \long\def\@affilThree{#3}\long\def\@affilFour{#4}\long\def\@affil{#1}}
+\long\def\fiveaffiliations#1#2#3#4#5{\long\def\@affilOne{#1}\long\def\@affilTwo{#2}%%
+ \long\def\@affilThree{#3}\long\def\@affilFour{#4}\long\def\@affilFive{#5}%        %%
+ \long\def\@affil{#1}} %%     2006/01/05 -- added as contributed by Aaron Geller   %%
+\long\def\sixaffiliations#1#2#3#4#5#6{\long\def\@affilOne{#1}%           %% thp 2006/01/05
+ \long\def\@affilTwo{#2}\long\def\@affilThree{#3}\long\def\@affilFour{#4}%% thp 2006/01/05
+ \long\def\@affilFive{#5}\long\def\@affilSix{#6}\long\def\@affil{#1}}    %% thp 2006/01/05
 \long\def\note#1{\long\def\@note{#1}}
 \long\def\abstract#1{\long\def\@abstract{#1}}
 \long\def\acknowledgements#1{\long\def\@acks{#1}}
@@ -436,18 +461,26 @@
   \ClassWarningNoLine{apa}{Affiliation not defined}\def\@affil{Affiliation}}{}
  \@ifundefined{@abstract}{%
   \ClassWarningNoLine{apa}{Abstract not defined}}{}
- \@ifundefined{@authorFour}{%
-  \@ifundefined{@authorThree}{%
-   \@ifundefined{@authorTwo}{%
-   }{\@ifundefined{@affilTwo}{\@error@toomanyauthors}{}}
-  }{\@ifundefined{@affilThree}{\@error@toomanyauthors}{}}
- }{\@ifundefined{@affilFour}{\@error@toomanyauthors}{}}
- \@ifundefined{@affilFour}{%
-  \@ifundefined{@affilThree}{%
-   \@ifundefined{@affilTwo}{%
-   }{\@ifundefined{@authorTwo}{\@error@toomanyaffils}{}}
-  }{\@ifundefined{@authorThree}{\@error@toomanyaffils}{}}
- }{\@ifundefined{@authorFour}{\@error@toomanyaffils}{}}
+ \@ifundefined{@authorSix}{%                                   % -- thp 2006/01/05
+  \@ifundefined{@authorFive}{%                                 % -- thp 2006/01/05
+   \@ifundefined{@authorFour}{%
+    \@ifundefined{@authorThree}{%
+     \@ifundefined{@authorTwo}{%
+     }{\@ifundefined{@affilTwo}{\@error@toomanyauthors}{}}
+    }{\@ifundefined{@affilThree}{\@error@toomanyauthors}{}}
+   }{\@ifundefined{@affilFour}{\@error@toomanyauthors}{}}
+  }{\@ifundefined{@affilFive}{\@error@toomanyauthors}{}}       % -- thp 2006/01/05
+ }{\@ifundefined{@affilSix}{\@error@toomanyauthors}{}}         % -- thp 2006/01/05
+ \@ifundefined{@affilSix}{%                                    % -- thp 2006/01/05
+  \@ifundefined{@affilFive}{%                                  % -- thp 2006/01/05
+   \@ifundefined{@affilFour}{%
+    \@ifundefined{@affilThree}{%
+     \@ifundefined{@affilTwo}{%
+     }{\@ifundefined{@authorTwo}{\@error@toomanyaffils}{}}
+    }{\@ifundefined{@authorThree}{\@error@toomanyaffils}{}}
+   }{\@ifundefined{@authorFour}{\@error@toomanyaffils}{}}
+  }{\@ifundefined{@authorFive}{\@error@toomanyaffils}{}}       % -- thp 2006/01/05
+ }{\@ifundefined{@authorSix}{\@error@toomanyaffils}{}}         % -- thp 2006/01/05
 }
 
 %==== Conditional compilation macros depending on mode ====
@@ -526,6 +559,9 @@
 
 %==== Miscellaneous definitions
 
+\let\normal@BBAB\BBAB                        % -- thp 2005/07/23
+\let\table@BBAB\BBAA                         % -- thp 2005/07/23
+
 \setlength{\doublerulesep}{\arrayrulewidth}
 \newcommand\thickline{\hline\hline}
 \renewcommand\footnoterule{%
@@ -534,14 +570,21 @@
   \hrule height0.125pt width.5in
   \kern2.6\p@}
 
-\let\old@tabular=\tabular
-\def\apatabular#1{\def\@halignto{to\linewidth}\@tabular{@{\extracolsep{\fill}}#1}}
-
-%\let\old@endtabular=\endtabular
-%\newlength{\@tabwd}
-%\def\endtabular{\global\setlength{\@tabwd}{\z@}\old@endtabular\par\framebox[\@tabwd][c]{test}}
-%\def\tab@footnotes{\relax}
-%\def\endtabular{\tab@footnotes\old@endtabular} %% \relax causes extra line!! thp 15/3
+\let\old@tabular\tabular
+\def\apatabular#1{\def\@halignto{to\linewidth}%
+ \let\BBAB\table@BBAB%                         -- thp 2005/07/23
+ \@tabular{@{\extracolsep{\fill}}#1}}
+\def\apa@doc@tabular{%% thp 2006/01/02
+ \let\BBAB\table@BBAB%% Erik Meijer noticed that in doc mode tables weren't centered
+ \hfill\old@tabular} %% and that the in-table citation form was incorrect 
+%%
+\let\orig@endtabular\endtabular              % -- thp 2005/07/23
+\def\endtabular{%
+ \let\BBAB\normal@BBAB%                        -- thp 2005/07/23
+ \orig@endtabular\ifapamodedoc{\hfill}{}}% 2006/01/02 \hfill for centering in doc mode
+\def\apa@doc@endtabular{%% thp 2006/01/03
+ \let\BBAB\normal@BBAB% %% separate redefinition of tabular/endtabular for doc mode
+ \orig@endtabular\hfill}%% to ensure centering, especially in case array.sty is loaded
 
 % Define footnote mark commands for tables that won't mess up vertical alignment
 \def\@tab@fn#1{\ensuremath{^{\mbox{{\scriptsize #1}}}}}
@@ -549,13 +592,55 @@
 \def\tabfnt#1#2{\par\raggedright\@tab@fn{#1}#2}
 
 % Provide a command to display vector symbols appropriately in each mode, thp 10/00
-\def\apavector#1{\ifapamodeman
-{\raisebox{-1.0ex}{\ensuremath{\stackrel{\mbox{#1}}{\scriptscriptstyle\sim}}}}
-{\ensuremath{\bf #1}}}
-
-% Circumvent the bug that shows up when the first accented character occurs 
-% inside a citation field -- something about apacite, OT1,and recent LaTeX/old babel...
-\newbox\@dummy@box\sbox\@dummy@box{\'{\i}}
+% Use improved definition of apavector provided by Erik Meijer -- 2005/12/28
+\def\apavector#1{{\ensuremath
+  \uprightlowercasegreek
+  \ifapamodeman
+  {\apasmash{\mathop{\kern\z@\mathrm{#1}}\limits_{\scriptscriptstyle\sim}}}%
+  {\if@bm@loaded\bm{\mathrm{#1}}\else\mathbf{#1}\fi% in case bm is not available
+  }%
+}}
+% and here are the necessary definitions & packages, as instructed by Erik Meijer
+\newcommand{\apasmash}{%
+  \def\finsm@sh{\dp\z@\z@ \box\z@}%
+  \expandafter\mathpalette\expandafter\mathsm@sh
+}%
+\newif\if@bm@loaded\@bm@loadedfalse
+\IfFileExists{bm.sty}{\RequirePackage{bm}\@bm@loadedtrue}{}% if not, apavector will fail
+\newcommand{\uprightlowercasegreek}{%
+  \@ifundefined{alphaup}{}{%
+    \def\alpha     {\alphaup     }%
+    \def\beta      {\betaup      }%
+    \def\gamma     {\gammaup     }%
+    \def\delta     {\deltaup     }%
+    \def\epsilon   {\epsilonup   }%
+    \def\varepsilon{\varepsilonup}%
+    \def\zeta      {\zetaup      }%
+    \def\eta       {\etaup       }%
+    \def\theta     {\thetaup     }%
+    \def\vartheta  {\varthetaup  }%
+    \def\iota      {\iotaup      }%
+    \def\kappa     {\kappaup     }%
+    \def\lambda    {\lambdaup    }%
+    \def\mu        {\muup        }%
+    \def\nu        {\nuup        }%
+    \def\xi        {\xiup        }%
+    \def\pi        {\piup        }%
+    \def\varpi     {\varpiup     }%
+    \def\rho       {\rhoup       }%
+    \def\varrho    {\varrhoup    }%
+    \def\sigma     {\sigmaup     }%
+    \def\varsigma  {\varsigmaup  }%
+    \def\tau       {\tauup       }%
+    \def\upsilon   {\upsilonup   }%
+    \def\phi       {\phiup       }%
+    \def\varphi    {\varphiup    }%
+    \def\chi       {\chiup       }%
+    \def\psi       {\psiup       }%
+    \def\omega     {\omegaup     }%
+  }%
+}
+\let\apamatrix\apavector
 
 %==== Appendix macros added by Michael Erickson 2000/07/11, revised by thp 2000/07/18
 
@@ -576,7 +661,7 @@
   \appendixtrue
   \apaappfig                      
   \apaapptab                      
-  \ifapamodejou{}{\clearpage}
+%  \ifapamodejou{}{\clearpage} %% commented out -- thp 2005/07/23
   \let\old@apa@section=\leveltwo % This will not work right with five levels in appendix.
                                  % Should go into \section, not \leveltwo but would also require
                                  % changes to section* and section[ (see \def\section above)
@@ -600,9 +685,9 @@
                     \setcounter{table}{0}%
 %                    %\small% the appendix should be set in smaller type in jou, including headers!
                    }%
-%                   \addtocounter{appendix}{1}%
+%                  \addtocounter{appendix}{1}%
                    \refstepcounter{appendix}% 2002/07/20 this takes care of references too
-                   \ifnum\c@appendix>1 \immediate\write\@auxout{\global\string\oneappendixfalse}\fi%
+                   \ifnum\c@appendix>1\immediate\write\@auxout{\global\string\oneappendixfalse}\fi%
                    \old@apa@section{%
                       \old@tabular[t]{@{}p{\app@t@width}@{}}% tabular may have been redefined
                          \centering{%
@@ -659,7 +744,6 @@
 \def\enoteformat{\rightskip\z@ \leftskip\z@
      \raggedright\fussy\hyphenpenalty 10000 \parindent=0.4in 
      \leavevmode\llap{\hbox{$^{\mbox{\small\@ifundefined{hrm}{}{\sf}\@theenmark}}$}}}
-%\def\notesname{Footnotes} % moved to language portability section
 \AtEndDocument{%
  \ifappendix% set section back to no numbering after appendix
   \appendixfalse\let\leveltwo=\old@apa@section%
@@ -755,7 +839,11 @@
   \if@figlist
    \@ifundefined{@figure@written}{}{%
     \figurecaptionsformat
-    {\normalsize\@ifundefined{hrm}{}{\sf}\listoffigures}          
+    {\normalsize\@ifundefined{hrm}{}{\sf}%
+     \let\BBAB\table@BBAB% -- thp 2005/07/23
+     \listoffigures%
+     \let\BBAB\normal@BBAB% -- thp 2005/07/23
+    }          
     \clearpage
    }                             
   \fi
@@ -785,9 +873,14 @@
       \section*{\tablesection}                                 
       \suppressfloats[t]                                       
   \fi
-% \markboth{\MakeUppercase{\tablesection}}{\MakeUppercase{\tablesection}}% bj
   \def\baselinestretch{\@@spacing}
-  \processtables@hook \@ifundefined{hrm}{}{\sf}\tiny\normalsize\@input{\jobname.ttt}
+  \processtables@hook \@ifundefined{hrm}{}{\sf}%
+  \tiny\normalsize%
+% We need to deal with citation alterations here because otherwise we either
+% lose the definition through the .ttt diversion or we miss the table*
+  \let\BBAB\table@BBAB%  -- thp 2005/07/23
+  \@input{\jobname.ttt}%
+  \let\BBAB\normal@BBAB% -- thp 2005/07/23
  \fi}
 
 %========= Maketitle, margins, lengths, etc. ==========
@@ -829,6 +922,36 @@
   \@authorThree \\
 
   \@affilThree \vspace{0.25in} \\ }{
+  \@ifundefined{@authorFive}{       %% 2006/01/05 added as contributed by Aaron Geller
+  \@authorOne \\
+
+  \@affilOne \vspace{0.2in} \\
+  \@authorTwo \\
+
+  \@affilTwo \vspace{0.2in} \\
+  \@authorThree \\
+
+  \@affilThree \vspace{0.2in} \\ 
+  \@authorFour \\
+
+  \@affilFour \vspace{0.25in} \\ }{ %% 2006/01/05 beginning of Aaron Geller contribution
+  \@ifundefined{@authorSix}{ %% -- thp 2006/01/05
+  \@authorOne \\
+
+  \@affilOne \vspace{0.2in} \\
+  \@authorTwo \\
+
+  \@affilTwo \vspace{0.2in} \\
+  \@authorThree \\
+
+  \@affilThree \vspace{0.2in} \\ 
+  \@authorFour \\
+
+  \@affilFour \vspace{0.2in} \\ %% thp corrected distance to non-final value of 0.2in
+  \@authorFive \\
+
+  \@affilFive \vspace{0.25in} \\ }{%% 2006/01/05 end of Aaaron Geller contribution
+%% --- thp 2006/01/05 beginning of six-author display
   \@authorOne \\
 
   \@affilOne \vspace{0.2in} \\
@@ -840,8 +963,14 @@
   \@affilThree \vspace{0.2in} \\ 
   \@authorFour \\
 
-  \@affilFour \vspace{0.25in} \\ }}}
+  \@affilFour \vspace{0.2in} \\
+  \@authorFive \\
 
+  \@affilFive \vspace{0.2in} \\
+  \@authorSix \\
+
+  \@affilSix \vspace{0.25in} \\ }}}}}
+%% --- thp 2006/01/05 end of six-author display
   \@ifundefined{@note}
    {\vspace*{\baselineskip} }
    {\@note}
@@ -866,7 +995,6 @@
 
 \ThreeLevelHeading
 \def\baselinestretch{\@@spacing}
-%\def\refname{References}
 \setlength{\footnotesep}{0.5cm}
 \setlength{\topmargin}{0in}
 \setlength{\oddsidemargin}{0.25in}
@@ -890,11 +1018,13 @@
 \newcommand{\footmark}[1]{${}^{\mbox{\normalsize #1}}$}
 
 \long\def\@makecaption#1#2{%
+ \let\BBAB\table@BBAB % thp 2005/07/23
  \vskip10pt%
  \setbox\@tempboxa\hbox{\parbox{\columnwidth}{#1\cap@line{\cap@style #2}}}%
  \ifdim\wd\@tempboxa>\hsize\parbox{\columnwidth}{#1\cap@line{\cap@style #2}}\par%
  \else\hbox to\hsize{\box\@tempboxa\hfil}\par%
  \fi%
+ \let\BBAB\normal@BBAB % thp 2005/07/23
  \vskip\baselineskip}
 
 \long\def\@caption#1[#2]#3{\par\addcontentsline{\csname
@@ -937,29 +1067,8 @@
 \ClassWarning{apa}{ignored \string\helvetica\space (use helv option)}
 }}{\def\helvetica{\relax}}
 
-\def\timesroman{%
- \RequirePackage{times}
- \InputIfFileExists{mathptm.sty}{}{}
- \doublehyphendemerits5000
- \hfuzz0pt
- \tolerance=9999
- \pretolerance=-1 % Always look for hyphens
- \emergencystretch=25pt
- \hbadness=30000
- \hyphenpenalty=100 % since average badness will be high!
-}
-
-\bibleftmargin=\parindent
-\def\bibnewpage{\newpage}
-\def\bibsize{}
-\def\bib@indent{\labelsep=0em
-		\itemsep=0em 
-%                \parsep=0em %% thp 21-Aug-2002 -- some editor complained!!
-                \leftmargin=\bibleftmargin
-                \itemindent=-\bibleftmargin}
-                \def\newblock{\hskip .11em plus .33em minus .07em}\fussy
-
 %==== Appendix definitions added by Michael Erickson 2000/07/11
+
 \efloat@condopen{fff}
 \efloat@iwrite{fff}{\string\apaappfig}
 \efloat@iwrite{fff}{\string\setcounter{appendix}{0}}
@@ -967,7 +1076,8 @@
 \efloat@iwrite{ttt}{\string\apaapptab}
 \efloat@iwrite{ttt}{\string\setcounter{appendix}{0}}
 
-}
+}% end of man mode (manuscript format)
+
 
 %%%%%%%%%%%%%%%%%%
 %                %
@@ -1091,10 +1201,25 @@
   \put@two@authaffil{\@authorOne}{\@affilOne}{\@authorTwo}{\@affilTwo}\vspace{-0.15in}\\
   \put@one@authaffil{\@authorThree}{\@affilThree}
   }}{
+  \@ifundefined{@authorFive}{ % 2006/01/05 as contributed by Aaron Geller
 % four authors-affiliations
   \put@two@authaffil{\@authorOne}{\@affilOne}{\@authorTwo}{\@affilTwo}\vspace{-0.15in}\\
   \put@two@authaffil{\@authorThree}{\@affilThree}{\@authorFour}{\@affilFour}
-  }}}
+  }{                          % 2006/01/05 beginning of Aaron Geller contribution
+  \@ifundefined{@authorSix}{ % -- thp 2006/01/05
+% five authors-affiliations
+  \put@two@authaffil{\@authorOne}{\@affilOne}{\@authorTwo}{\@affilTwo}\vspace{-0.15in}\\
+  \put@two@authaffil{\@authorThree}{\@affilThree}{\@authorFour}{\@affilFour}%
+  \vspace{-0.15in}\\ % thp added negative vertical space
+  \put@one@authaffil{\@authorFive}{\@affilFive}
+  }{                          % 2006/01/05 end of Aaron Geller contribution
+% six authors-affiliations
+%% --- thp 2006/01/05 beginning of six-author display
+  \put@two@authaffil{\@authorOne}{\@affilOne}{\@authorTwo}{\@affilTwo}\vspace{-0.15in}\\
+  \put@two@authaffil{\@authorThree}{\@affilThree}{\@authorFour}{\@affilFour}\vspace{-0.15in}\\
+  \put@two@authaffil{\@authorFive}{\@affilFive}{\@authorSix}{\@affilSix}
+%% --- thp 2006/01/05 end of six-author display
+  }}}}}
   \@ifundefined{@note}
    {\vspace{0.07in}}
    {\vspace{0.07in}\\ {\large\@note\vspace{0.07in}}}
@@ -1125,7 +1250,7 @@
   {}
   {\begin{figure}[b]
    \parbox{\columnwidth}{\setlength{\parindent}{0.18in}
-   \noindent \makebox[\columnwidth]{\vrule height0.125pt width\columnwidth}\vspace*{0.05in}\par
+   \noindent\makebox[\columnwidth]{\vrule height0.125pt width\columnwidth}\vspace*{0.05in}\par
    {\footnotesize\hspace{-0.04in}\@acks\par}}
    \end{figure}}
  \markboth{\hfill\r@headl\hfill}{\hfill\r@headr\hfill}
@@ -1162,6 +1287,7 @@
 \pagestyle{myheadings}
 
 \long\def\@makecaption#1#2{%
+  \let\BBAB\table@BBAB % thp 2005/07/23
   \vskip\abovecaptionskip
   \sbox\@tempboxa{#1 #2}%
   \ifdim \wd\@tempboxa >\hsize
@@ -1170,9 +1296,11 @@
     \global \@minipagefalse
     \hb@xt@\hsize{\hfil\box\@tempboxa\hfil}%
   \fi
+  \let\BBAB\normal@BBAB % thp 2005/07/23
   \vskip\belowcaptionskip}
 
 \long\def\@makeccaption#1#2#3{
+ \let\BBAB\table@BBAB % thp 2005/07/23
  \vskip\abovecaptionskip
  \setbox\@tempboxa\hbox{#1 #2}
  \ifdim \wd\@tempboxa > \hsize 
@@ -1184,6 +1312,7 @@
       \hbox to\hsize{\hfil\mbox{#1 #2}\hfil} 
     \fi
  \fi 
+ \let\BBAB\normal@BBAB % thp 2005/07/23
  \vskip\belowcaptionskip}
 
 \long\def\@caption#1[#2]#3{\par\addcontentsline{\csname
@@ -1232,7 +1361,6 @@
 \let\footnotesize=\small
 
 \def\helvetica{\relax}
-\def\timesroman{\relax}
 
 \doublehyphendemerits5000
 \hfuzz0pt
@@ -1241,16 +1369,14 @@
 \emergencystretch=25pt
 \hbadness=30000
 \hyphenpenalty=100
-\bibleftmargin=1.2em
-\def\bibnewpage{}
-\def\bibsize{\footnotesize}
-\def\bib@indent{\labelsep=0em
-                \itemsep=0em
-                \leftmargin=\bibleftmargin
-                \itemindent=-\bibleftmargin}
-                \def\newblock{\hskip .11em plus .33em minus .07em}\sloppy
 
-}
+% Removed some bibliography redefinitions as per the instructions of Erik Meijer 
+\bibleftmargin=1.2em        % left these in because the default is too big
+\bibindent=-\bibleftmargin  % and this is apparently not refefined each time
+\renewcommand{\bibliographytypesize}{\footnotesize}
+
+}% end of jou mode (journal format)
+
 
 %%%%%%%%%%%%%%%%%%
 %                %
@@ -1287,6 +1413,10 @@
 %========== End of code from theapa.sty ===============
 
 \def\maketitle{
+ \global\@topnum\z@  % to prevent tables before the title   %% Erik Meijer, 2006/01/03 
+ \@ifundefined{@acks}{% if there acknowledgements they make up a "float" on the 1st page
+ \global\@botnum\z@}{% to prevent tables on the first page  %% Erik Meijer, 2006/01/03 
+ \global\@botnum\@ne}% to prevent tables below the footnote -- thp 2006/01/10 
  \check@author
  \@ifundefined{r@headr}{\typeout{Using title for running head} 
                         \def\r@headr{\protect\MakeUppercase{\@title}}
@@ -1333,6 +1463,7 @@
   {\Large \@authorThree}\\
 
   \@affilThree \vspace{0.1in} \\ }{
+  \@ifundefined{@authorFive}{ %% 2006/01/05 added as contributed by Aaron Geller
 % four authors-affiliations
   {\Large \@authorOne} \\
 
@@ -1345,7 +1476,47 @@
   \@affilThree \vspace{0.1in} \\ 
   {\Large \@authorFour}\\
 
-  \@affilFour \vspace{0.1in} \\ }}}
+  \@affilFour \vspace{0.1in} \\ }{  %%% 2006/01/05 beginning of Aaron Geller contribution
+  \@ifundefined{@authorSix}{ %% -- thp 2006/01/05
+% five authors-affiliations
+  {\Large \@authorOne} \\
+
+  \@affilOne \vspace{0.1in} \\
+  {\Large \@authorTwo}\\
+
+  \@affilTwo \vspace{0.1in} \\ 
+  {\Large \@authorThree}\\
+
+  \@affilThree \vspace{0.1in} \\ 
+  {\Large \@authorFour}\\
+
+  \@affilFour \vspace{0.1in} \\
+  {\Large \@authorFive}\\
+
+  \@affilFive \vspace{0.1in} \\ }{  %%% 2006/01/05 end of Aaron Geller contribution
+% six authors-affiliations
+%% --- thp 2006/01/05 beginning of six-author display
+  {\Large \@authorOne} \\
+
+  \@affilOne \vspace{0.1in} \\
+  {\Large \@authorTwo}\\
+
+  \@affilTwo \vspace{0.1in} \\ 
+  {\Large \@authorThree}\\
+
+  \@affilThree \vspace{0.1in} \\ 
+  {\Large \@authorFour}\\
+
+  \@affilFour \vspace{0.1in} \\
+  {\Large \@authorFive}\\
+
+  \@affilFive \vspace{0.1in} \\
+  {\Large \@authorSix}\\
+
+  \@affilSix \vspace{0.1in} \\ }
+%% --- thp 2006/01/05 end of six-author display
+}}}}
+%
   \@ifundefined{@note}
    {\vspace*{\baselineskip} }
    {\@note\vspace{0.2in}}
@@ -1371,6 +1542,8 @@
    }}
    \end{figure}}
  \markboth{\hfill \r@headl \hfill}{\hfill \r@headr \hfill}
+ \let\tabular\apa@doc@tabular% -- thp 2006/01/02
+ \let\endtabular\apa@doc@endtabular% -- thp 2006/01/03
  \noindent
 }
 
@@ -1397,15 +1570,17 @@
 \def\dbltextfloatsep{0.8\textfloatsep}
 
 \def\helvetica{\relax}
-\def\timesroman{\relax}
+%\def\timesroman{\relax}%    Commented out all \timesroman -- thp 2005/07/23
 \def\centeredcaption#1{\caption}
 
 \long\def\@makecaption#1#2{
+ \let\BBAB\table@BBAB% thp 2005/07/23
  \vskip 10pt 
  \setbox\@tempboxa\hbox{#1 #2}
  \ifdim \wd\@tempboxa >\hsize #1 #2\par \else \hbox
 to\hsize{\hfil\box\@tempboxa\hfil} 
  \fi 
+ \let\BBAB\normal@BBAB% thp 2005/07/23
  \vskip 4pt}
 
 \long\def\@caption#1[#2]#3{\par\addcontentsline{\csname
@@ -1419,23 +1594,18 @@ to\hsize{\hfil\box\@tempboxa\hfil}
 \def\fnum@figure{\small {\em\figurename\ {\thefigure}}.\hspace{0.07in}}
 \long\def\fnum@table{\small\tablename\ {\thetable}:}
 
-\bibleftmargin=2em
-\def\bibnewpage{}
-\def\bibsize{\small}
-\def\bib@indent{\labelsep=0em
-                \leftmargin=\bibleftmargin
-                \itemindent=-\bibleftmargin}
-                \def\newblock{\hskip .11em plus .33em minus .07em}\sloppy
+% Removed defs as per the instructions of Erik Meijer -- thp 2005/07/23
+\renewcommand{\bibliographytypesize}{\small}
 
-}
+}% end of doc mode (regular LaTeX format)
 
 %---------- end of mode specific definitions -----------
 
+
 %=======================================================
 %       Some final definitions for all modes
 %=======================================================
 
-%\long\def\ignore#1{\relax}
 \let\ignore\@gobble
 \let\oneLevelHeading=\OneLevelHeading
 \let\twoLevelHeading=\TwoLevelHeading
@@ -1445,7 +1615,6 @@ to\hsize{\hfil\box\@tempboxa\hfil}
 \def\HeadingLevels#1{\csname #1LevelHeading\endcsname} % fixed Jan 5 99
 \def\headinglevels#1{\csname #1LevelHeading\endcsname} % fixed Jan 5 99
 \bibliographystyle{apacite}
-%\def\bibliographystyle#1{\relax}
 %
 % Thanks to Donald Arsenau for the right way to ignore \bibliographystyle
 %
diff --git a/Master/texmf-dist/tex/latex/apa/dutch.apa b/Master/texmf-dist/tex/latex/apa/dutch.apa
new file mode 100644
index 00000000000..96e7062153a
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/apa/dutch.apa
@@ -0,0 +1,6 @@
+\ProvidesFile{dutch.apa}[2006/01/01]
+
+\renewcommand{\rheadname}{Kopregel:}% Running head:
+\renewcommand{\acksname}{Auteursnoot}% Author Note
+\renewcommand{\figurecaptionsname}{Figuurbijschriften}% Figure Captions
+\renewcommand{\notesname}{Voetnoten}% Footnotes
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/apa/english.apa b/Master/texmf-dist/tex/latex/apa/english.apa
new file mode 100644
index 00000000000..94135448b0f
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/apa/english.apa
@@ -0,0 +1,7 @@
+\ProvidesFile{english.apa}[2006/01/01]
+
+\renewcommand{\rheadname}{Running head:}
+\renewcommand{\acksname}{Author Note}
+\renewcommand{\figurecaptionsname}{Figure Captions}
+\renewcommand{\notesname}{Footnotes}
+
diff --git a/Master/texmf-dist/tex/latex/apa/greek.apa b/Master/texmf-dist/tex/latex/apa/greek.apa
new file mode 100644
index 00000000000..7f205e9823f
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/apa/greek.apa
@@ -0,0 +1,6 @@
+\ProvidesFile{greek.apa}[2006/01/01]
+
+\renewcommand{\rheadname}{Up'ertitlos:}
+\renewcommand{\acksname}{Shmei'wseis tou suggraf'ea}
+\renewcommand{\figurecaptionsname}{Lez'antes sqhm'atwn}
+\renewcommand{\notesname}{Uposhmei'wseis}
diff --git a/Master/tlpkg/bin/ctan2tds b/Master/tlpkg/bin/ctan2tds
index 1a6321397d9..52ed987806b 100755
--- a/Master/tlpkg/bin/ctan2tds
+++ b/Master/tlpkg/bin/ctan2tds
@@ -805,10 +805,11 @@ $standardtex='\.cfg|\.sty|\.clo|\.ldf|\.cls|\.def|\.fd$|\.cmap';
 %specialtex= (
  'FAQ-en',	'NULL',
  'abbr',	'\.tex',
- 'abstyles',	"apreambl.tex",  # not a4c.sty
- 'ae',		'\.fd$|\.sty',
- 'apacite',	"\.apc|$standardtex",
- 'arabtex',	"\.tex|$standardtex",
+ 'abstyles',	'apreambl.tex',	# not a4c.sty
+ 'ae',		'\.fd$|\.sty', 
+ 'apa',		'\.apa|\.cls',	# not endfloat.cfg
+ 'apacite',	'\.apc|' . $standardtex.
+ 'arabtex',	'\.tex|' . $standardtex,
  'babelbib',	'\.bdf|\.sty',
  'bardiag',	'\.bar|\.sty|\.cfg',
  'barr',	'diagxy.tex',
@@ -820,7 +821,7 @@ $standardtex='\.cfg|\.sty|\.clo|\.ldf|\.cls|\.def|\.fd$|\.cmap';
  'calxxxx',	'cal.*\.tex',
  'captcont',	'\.sty|[^c]\.cfg',	# omit ltxdoc.cfg, would be system-wide
  'carlisle',	'\.sty|\.ltx',
- 'chemstyle',	"\.jdf|$standardtex",
+ 'chemstyle',	'\.jdf|' . $standardtex,
  'cirth',	'num\.tex',
  'clock',	'\.sty|clock\.tex',
  'cmap',	'\.sty',
@@ -832,7 +833,7 @@ $standardtex='\.cfg|\.sty|\.clo|\.ldf|\.cls|\.def|\.fd$|\.cmap';
  'cyrillic',	'\.tex|\.sty|\.fd$|\.def',
  'dialogl',	'\.sty|listouti\.tex',
  'din1505',     'NULL', # no tex files, only natbib.cfg, would be system-wide
- 'disser',	"\.rtx|$standardtex",
+ 'disser',	'\.rtx|' . $standardtex,
  'dlfltxb',	'\.sty', # no sample.cfg
  'ean',		'ean[0-9]*\.tex',
  'easy',	'easy.*\.sty',		# no mydoc.sty
@@ -843,18 +844,18 @@ $standardtex='\.cfg|\.sty|\.clo|\.ldf|\.cls|\.def|\.fd$|\.cmap';
  'epslatex-fr',	'NULL',
  'esint-type1',	'esint.tex',
  'europecv',	'EuropeFlag|europasslogo|\.cls|\.def',
- 'expl3',	"\.ltx|$standardtex",
+ 'expl3',	'\.ltx|' . $standardtex,
  'fltpoint',	'\.sty|\.tex',
  'fontch',	'\.tex',
  'footnpag',	'footnpag\.sty',
- 'frankenstein',"\.(sto|stq)|$standardtex",
+ 'frankenstein','\.(sto|stq)|' . $standardtex,
  'genmisc',	'\.sty|\.tex',
  'geometry',	'\.sty|\.clo|\.ldf|\.cls|\.def|\.fd$', # not cfg
  'ginpenc',	'\.gie|\.sty',
  'hfoldsty',	'\.sty|\.fd|\.cpa',
  'hyper',	'\.sty|\.hyp',
  'hyplain',	'(hyrules|hy.*plain|hylang)\..*',
- 'ibygrk',	"iby4extr.tex|ibycus4.tex|ibycusps.tex|pssetiby.tex|setiby4.tex|tlgsqq.tex|version4.tex|$standardtex",
+ 'ibygrk',	'iby4extr.tex|ibycus4.tex|ibycusps.tex|pssetiby.tex|setiby4.tex|tlgsqq.tex|version4.tex|' . $standardtex,
  'insbox',	'insbox.tex',
  'interactiveworkbook',	'NULL', # done in POSTinteractiveworkbook
  'iso10303',	'a.*tex|b.*tex|e.*tex|stp.*tex|\.sty|\.4ht',
@@ -866,15 +867,15 @@ $standardtex='\.cfg|\.sty|\.clo|\.ldf|\.cls|\.def|\.fd$|\.cmap';
  'kuvio',	'\.tex|\.sty',
  'lettre',	'\.ins|\.cls',
  'manjutex',	'\.sty|\.clo|\.ldf|\.cls|\.def|\.fd$|manju.tex',
- 'mathdots',	"mathdots\.tex|$standardtex",
+ 'mathdots',	'mathdots\.tex|' . $standardtex,
  'metatex',	'metatex.tex',
  'mff',		'\.sty|mf[^f].*\.tex',
  'mfpic',	'mfpic.tex|mfpic.sty|mfppatch.tex',
  'misc',	'\.sty|\.ltx|\.cls',
  'mkpattern',	'mkpatter.tex',
  'mpman-ru',	'NULL',		# doc package
- 'msg',		"$standardtex|-msg\.tex",
- 'nag',		"$standardtex|\.cfg|\.nag",
+ 'msg',		"-msg\.tex" . $standardtex,
+ 'nag',		'\.nag|' . $standardtex,
  'nddiss',	'\.sty|\.clo|\.ldf|\.cls|\.def|\.fd$',
  'ntheorem',	'\.sty|\.std',
  'ofs',		'^ofs\.tex|ofsdef\.tex|ofs-.*\.tex|\.sty|a.*\.tex|.*fn\.tex',
@@ -887,7 +888,7 @@ $standardtex='\.cfg|\.sty|\.clo|\.ldf|\.cls|\.def|\.fd$|\.cmap';
  'pictex',	'\.sty|\.tex',
  'plgraph',	'\.tex',
  'plnfss',	'\.tex|\.pfd',
- 'powerdot',	"\.ps|$standardtex",
+ 'powerdot',	'\.ps|' . $standardtex,
  'ppchtex',	'm.*tex|m.*sty',
  'prosper',	'\.ps|\.eps|\.sty|\.cls',
  'pstricks',	'pst-*\.tex',
@@ -895,14 +896,14 @@ $standardtex='\.cfg|\.sty|\.clo|\.ldf|\.cls|\.def|\.fd$|\.cmap';
  'pst-geo',	'pst-map.*\.tex|pst-map.*\.sty',
  'pst-infixplot', 'infix-RPN\.tex|pst-infixplot\.tex',
  'qobitree',	'qobitree.tex',
- 'r_und_s',	".*.tex|.*.sty",
+ 'r_und_s',	'\.tex|\.sty',
  'realcalc',	'realcalc.tex',
  'revtex',	'\.sty|\.cls|\.rtx',
  'rlepsf',	'rlepsf.tex',
  'seminar',	'\.bug|\.bg2|\.cls|\.sty|2up.tex',
  'shapepar',	'\.sty',  # not def
  'showexpl',	'\.sty|\.clo|\.ldf|\.cls|\.def|\.fd$',  # not cfg
- 'splitindex',	"splitindex\.tex|$standardtex",
+ 'splitindex',	'splitindex\.tex|' . $standardtex,
  'spotcolor',	'spotcolor*.tex',
  'startex',	'\.tex',
  'subfig',	'\.sty|[^c]\.cfg',  # omit ltxdoc.cfg, would be system-wide
@@ -910,11 +911,11 @@ $standardtex='\.cfg|\.sty|\.clo|\.ldf|\.cls|\.def|\.fd$|\.cmap';
  'syntax',	'syntax\.tex',
  'taylor',	'diagrams.tex',
  'texsis',	'\.txs|TXS.*tex|texsis.tex',
- 'ticket',	"\.tdf|$standardtex",
+ 'ticket',	'\.tdf|' . $standardtex,
  'tools',	'\.cfg|\.sty|\.clo|\.cls|\.def|\.fd$|.?\.tex|^\.tex$',
- 'translator',	"\.dict|translator-language-mappings.tex|$standardtex",
- 'tugboat-plain',"$standardtex|\.cmn",
- 'variations',	"^variations\.tex|$standardtex",
+ 'translator',	'\.dict|translator-language-mappings.tex|' . $standardtex,
+ 'tugboat-plain','\.cmn|' . $standardtex,
+ 'variations',	'^variations\.tex|' . $standardtex,
  'vhistory',	'\.sty', # not hyperref.cfg
  'wasy2',	'wasyfont\.tex',
  'wordcount',	'\.tex',
@@ -1038,6 +1039,7 @@ $standardbib='\.bib$'; # $ so we don't find README.bibtex in IEEEtran
 %specialbib= (
  'aguplus',	'NULL',
  'amsrefs',	'ams.*bib', # not jr.bib
+ 'apa',		'NULL',
  'babelbib',	'NULL',
  'classicthesis','NULL',
  'dlfltxb',	'NULL', # don't install doc.
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index afdfd703cfa..9dc48915f9f 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -25,7 +25,7 @@ my @WorkingTLP = qw(
           active-conf addlines adrconv ae aguplus aichej AkkTeX akletter
           algorithm2e algorithmicx algorithms alnumsec altfont ametsoc ams
           amsaddr amslatex-primer amsldoc-it amsmath amsrefs
-          amsthdoc-it animate ANUfinalexam anyfontsize apacite appendix apl
+          amsthdoc-it animate ANUfinalexam anyfontsize apa apacite appendix apl
           arabi arabtex arabxetex archaic arcs arev
           armenian arphic arrayjob arydshln Asana-Math ascii assignment astro
           attachfile aurical authoraftertitle authorindex auto-pst-pdf automata