apa update (22nov08)

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

8 files changed, 93 insertions, 44 deletions

diff --git a/Master/texmf-dist/doc/latex/apa/endfloat.cfg b/Master/texmf-dist/doc/latex/apa/APAendfloat.cfg
index 8584249f13b..8584249f13b 100644
--- a/Master/texmf-dist/doc/latex/apa/endfloat.cfg
+++ b/Master/texmf-dist/doc/latex/apa/APAendfloat.cfg
diff --git a/Master/texmf-dist/doc/latex/apa/CHANGELOG.txt b/Master/texmf-dist/doc/latex/apa/CHANGELOG.txt
index 7da05c6c795..79490496ed0 100644
--- a/Master/texmf-dist/doc/latex/apa/CHANGELOG.txt
+++ b/Master/texmf-dist/doc/latex/apa/CHANGELOG.txt
@@ -1,5 +1,5 @@
 
-Alteration log for apa.cls (v1.3.2, January 2006)
+Alteration log for apa.cls (v1.3.3, August 2008)
 
 1.00 --> 1.01
 July 5, 1996:    \r@headl now defaults to \r@headr in [doc] (used to complain)
@@ -288,6 +288,26 @@ January 10, 2006: Tried \@topnum=\z@ and \@botnum=\@ne so that tables do not app
                  first page in doc mode (the acknowledgements is the "one" float allowed on
                  the title page, if defined).
 
+1.3.2 --> 1.3.3
+August 28, 2008: Added curly braces around the argument of \MakeUppercase in the definitions
+                 of \levelone (all 3 modes), as suggested by Nicholas Daly, who noticed that the
+                 top level ("Level 5" of APA manual section 3.31, p. 113ff) was not set in
+                 uppercase. Apparently this bug can be traced to changing Young Ryu's original
+                 \uppercase to \MakeUppercase (and possibly changes to the behavior of the
+                 latter through the evolution of LaTeX).
+
+                 Renamed endfloat.cfg to APAendfloat.cfg so that it can be included in the 
+                 distributions (putting endfloat.cfg under tex/latex/apa would result it its
+                 use with endfloat regardless of document class). apa.cls users are instructed
+                 to copy this file to their working document directory and rename locally
+                 to endfloat.cfg
+
+November 13, 2008: Fixed a bug in the definition of levelfive that caused the paragraph 
+                 following the sectioning command to begin on the next line of the document 
+                 if a blank line intervened between the sectioning command and the paragraph
+                 text. (The hskip should have been inside the heading argument and not floating
+                 at the end of levelfive into @startsection.) Thanks to Nicholas Daly who
+                 pointed out the problem.
 
 %%%%%%%%%%%%%%%%
 
diff --git a/Master/texmf-dist/doc/latex/apa/LICENCE b/Master/texmf-dist/doc/latex/apa/LICENCE
index 44f68a0b040..0cd49a2e809 100644
--- a/Master/texmf-dist/doc/latex/apa/LICENCE
+++ b/Master/texmf-dist/doc/latex/apa/LICENCE
@@ -2,12 +2,18 @@
 %% LICENCING TERMS
 %%
 %% apa.cls 
-%% version 1.3.2 
-%% January 2006
+%% version 1.3.3 
+%% August 2008
 %% by Athanassios Protopapas 
 %% protopap@ilsp.gr
 %%
 %% This package may be distributed under the terms of the LaTeX Project Public
 %% License, as described in lppl.txt in the base LaTeX distribution.  Either
 %% version 1.0 or, at your option, any later version.
+%%
+%% The term "package" above applies to all files accompanying apa.cls, that is:
+%% README, apa.cls, CHANGELOG.txt, apacls.txt, apacls.html, apaenum.txt, 
+%% examples.txt, apaexample.txt, examplebib.bib, APAendfloat.cfg, and language-
+%% specific definitions in .apa files (e.g., english.apa, greek.apa, dutch.apa).
+%% All may distributed undern the LPPL.
 
diff --git a/Master/texmf-dist/doc/latex/apa/README b/Master/texmf-dist/doc/latex/apa/README
index f6b5014d0f3..744307cd450 100644
--- a/Master/texmf-dist/doc/latex/apa/README
+++ b/Master/texmf-dist/doc/latex/apa/README
@@ -1,5 +1,5 @@
 
-apa.cls LaTeX2e document class; version 1.3.2 of January 2006
+apa.cls LaTeX2e document class; version 1.3.3 of NOvember 2008
 
 apa.cls is a LaTeX2e class file that makes your document conform to
 the American Psychological Association (APA) Publication Manual (Fifth 
@@ -34,7 +34,7 @@ apa.cls, or with anything else for that matter.
 
 Athanassios Protopapas
 protopap@ilsp.gr
-January 2006
+November 2008
 
 ======================
 
@@ -50,8 +50,11 @@ 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
+APAendfloat.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)
 
+Distribution maintainers: Please include *.apa and APAendfloat.cfg 
+
+configuration files with the apa.cls distribution under tex/latex/apa
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/apa/apacls.html b/Master/texmf-dist/doc/latex/apa/apacls.html
index b435a0e66a4..fdd71707723 100644
--- a/Master/texmf-dist/doc/latex/apa/apacls.html
+++ b/Master/texmf-dist/doc/latex/apa/apacls.html
@@ -47,15 +47,29 @@ 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>
+<TT>apa.cls</TT> is not in any way connected to or endorsed by 
+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 
+<A HREF="http://www.eutypon.gr/eutypon/index.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.
+<A HREF="http://www.eutypon.gr/eft/index.html">Greek Tex Friends Group</A>.
+A more recent  
+<A HREF="pdf/Protopapas_2007_Eutypon.pdf">article in English</A> is also availabe.
+
+<P>
+<I><B>Warning:</B><A NAME="warning">
+<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. Use <TT>apacite</TT> for APA-style 
+citations and write your own typesetting code or 
+search for a thesis class suitable for your University.</I>
 
 <H3>Manuscript look (man mode)</H3>
 In man mode, <TT>apa.cls</TT> typesets a title page, abstract page, text body, then
@@ -102,10 +116,10 @@ to the text other than the format parameter.
 <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
+The current version is 1.3.3, released on November 13rd, 2008.  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 
+or it may be <A HREF="dl/apacls.zip">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 
@@ -146,25 +160,15 @@ missing or in need of improvement) and send me the result:
 <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
+especially when bugs or other problems are involved.  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 
+difficulties or unexpected (or unacceptable) behavior when using <TT>apa.cls</TT>
+to prepare manuscripts for submission, after 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.
+and failed to find an answer to your problem.   <I>Don't even think about writing
+to me about using <TT>apa.cls</TT> for any purpose other than preparing an APA style 
+manuscript for submission to a journal.</I>
 
 
 <H2><A NAME="acks">Acknowledgments</A></H2>
@@ -426,6 +430,10 @@ single file that can be processed for both <TT>man</TT> and <TT>jou</TT>.  This
  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.
+<P>
+A simpler, less clean solution for long tables (not using any specialized package) is   
+shown on page 47 of an <A HREF="pdf/Protopapas_2007_Eutypon.pdf">article</A> about <tt>apa.cls</tt>.
+
 
 <H4>Notes in tables</H4>
 There is a simple way to include notes in
@@ -651,7 +659,7 @@ 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 
+<CENTER><I>Last updated on November 21<SUP>st</SUP>, 2008<BR>by 
 <A HREF="mailto:protopap@ilsp.gr">Athanassios Protopapas</I></CENTER>
 
 </BODY>
diff --git a/Master/texmf-dist/doc/latex/apa/apacls.txt b/Master/texmf-dist/doc/latex/apa/apacls.txt
index 83cae21ff64..acbdb0d7656 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.2 January 2006
+ Athanassios Protopapas  *******  Version 1.3.3 August 2008
 
 
 Introduction
@@ -279,10 +279,16 @@ Notes on usage:
  inside in ifapamode argument, which makes it impossible to have a
  single file that can be processed for both man and jou.  This defeats
  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.
+ have to.  You will need the special APAendfloat.cfg file supplied with 
+ apa.cls in order to use longtable, so that endfloat will recognize
+ (and postpone) long tables as tables.  Copy this file to the working
+ folder with your APA style document, not any central LaTeX location,
+ to avoid influencing endfloat's behavior with other classes. Rename
+ it locally to endfloat.cfg so that it will be processed by endfloat.
 
  Sideways tables: Use the rotating package and \sidewaystable. You will
- need the supplied endfloat.cfg in your document directory for it to work.
+ need the supplied APAendfloat.cfg (renamed endfloat.cfg) in your
+ document directory for it to work.
 
 
 Feedback:
@@ -300,5 +306,5 @@ Example of usage:
 
 
 Athanassios Protopapas
-January 5, 2005
+August 17, 2008
 
diff --git a/Master/texmf-dist/doc/latex/apa/examples.txt b/Master/texmf-dist/doc/latex/apa/examples.txt
index c6560368863..a9566e228f3 100644
--- a/Master/texmf-dist/doc/latex/apa/examples.txt
+++ b/Master/texmf-dist/doc/latex/apa/examples.txt
@@ -260,7 +260,9 @@ 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, keep in mind, it only works in man mode.
+you need to use longtable, and copy the special endfloat.cfg supplied
+with apa.cls to the working document directory. 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/tex/latex/apa/apa.cls b/Master/texmf-dist/tex/latex/apa/apa.cls
index 32fadf75f44..1971bae2106 100644
--- a/Master/texmf-dist/tex/latex/apa/apa.cls
+++ b/Master/texmf-dist/tex/latex/apa/apa.cls
@@ -1,15 +1,19 @@
 %
-% apa.cls  version 1.3.2
+% apa.cls  version 1.3.3
 %
 % NOTE CHANGE IN VERSION NUMBERING : 1.21--1.28 should have been 1.2.1--1.2.8
 %
-% Athanassios Protopapas, January 2006
+% Athanassios Protopapas, November 2008
 % protopap@ilsp.gr
 %
 % This package may be distributed under the terms of the LaTeX Project Public
 % License, as described in lppl.txt in the base LaTeX distribution.  Either
 % version 1.0 or, at your option, any later version.
 %
+% The term "package", in the above license statement, applies to all files
+% included with apa.cls (language files, examples, configuration,
+% instructions etc.) -- they may be all distributed under LPPL.
+%
 % Use with LaTeX2e, \documentclass[man|jou|doc]{apa}
 % Default mode is doc. Conforms to the APA manual 5th ed.
 %
@@ -18,7 +22,7 @@
 %%%%%%%%%%%%%%%%%
 
 \NeedsTeXFormat{LaTeX2e} 
-\ProvidesClass{apa}[2006/01/31 American Psychological Association format v1.3.2]
+\ProvidesClass{apa}[2008/11/13 American Psychological Association format v1.3.3]
 
 \DeclareOption{man}{%
 \def\def@man{\@manmode}
@@ -714,7 +718,7 @@
 \def\levelone#1{\apa@startsection%
     {\z@}{\b@level@one@skip}{\e@level@one@skip}%
     {\leftskip4em plus 1fill\rightskip\leftskip\parindent\z@\relax%
-     \MakeUppercase\expandafter{#1}}}    % <- \bf
+     \MakeUppercase{\expandafter{#1}}}}    % <- \bf % thp 17Aug08
 \def\leveltwo#1{\apa@startsection%
     {\z@}{\b@level@two@skip}{\e@level@two@skip}%
     {\leftskip4em plus 1fill\rightskip\leftskip\parindent\z@\relax%
@@ -726,7 +730,7 @@
 \def\levelfour#1{\apa@startsection%
     {\z@}{\b@level@four@skip}{\e@level@four@skip}{{\em #1}}}
 \def\levelfive#1{\apa@startsection%
-    {\parindent}{\b@level@five@skip}{\e@level@five@skip}{{\em #1}.}\hskip .5em plus 1pt minus .5pt}
+    {\parindent}{\b@level@five@skip}{\e@level@five@skip}{{\em #1}. \hskip .5em plus 1pt minus .5pt}} %% added space and moved skip inside -- thp 081113
 
 %========== End of code from theapa.sty ===============
 
@@ -1092,7 +1096,7 @@
 \def\levelone#1{\apa@startsection%
     {\z@}{\b@level@one@skip}{\e@level@one@skip}%
     {\leftskip4em plus 1fill\rightskip\leftskip\parindent\z@\relax%
-     \MakeUppercase\expandafter{\large #1}}}    % <- \bf
+     \MakeUppercase{\expandafter{\large #1}}}}    % <- \bf  % thp 17Aug08
 \def\leveltwo#1{\apa@startsection%
     {\z@}{\b@level@two@skip}{\e@level@two@skip}%
     {\leftskip4em plus 1fill\rightskip\leftskip\parindent\z@\relax%
@@ -1104,7 +1108,7 @@
 \def\levelfour#1{\apa@startsection%
     {\z@}{\b@level@four@skip}{\e@level@four@skip}{\large{\em #1}}}
 \def\levelfive#1{\apa@startsection%
-    {\parindent}{\b@level@five@skip}{\e@level@five@skip}{{\em #1}.}\hskip .5em plus 1pt minus .5pt}
+    {\parindent}{\b@level@five@skip}{\e@level@five@skip}{{\em #1}. \hskip .5em plus 1pt minus .5pt}} %% added space and moved skip inside -- thp 081113
 
 %========== End of code from theapa.sty ===============
 
@@ -1391,7 +1395,7 @@
 \def\levelone#1{\apa@startsection%
     {\z@}{\b@level@one@skip}{\e@level@one@skip}%
     {\leftskip4em plus 1fill\rightskip\leftskip\parindent\z@\relax%
-     \MakeUppercase\expandafter{\large #1}}}    % <- \bf
+     \MakeUppercase{\expandafter{\large #1}}}}    % <- \bf  % thp 17Aug08
 \def\leveltwo#1{\apa@startsection%
     {\z@}{\b@level@two@skip}{\e@level@two@skip}%
     {\leftskip4em plus 1fill\rightskip\leftskip\parindent\z@\relax%
@@ -1403,7 +1407,7 @@
 \def\levelfour#1{\apa@startsection%
     {\z@}{\b@level@four@skip}{\e@level@four@skip}{{\em #1}}}
 \def\levelfive#1{\apa@startsection%
-    {\parindent}{\b@level@five@skip}{\e@level@five@skip}{{\em #1}.}\hskip .5em plus 1pt minus .5pt}
+    {\parindent}{\b@level@five@skip}{\e@level@five@skip}{{\em #1}. \hskip .5em plus 1pt minus .5pt}} %% added space and moved skip inside -- thp 081113
 
 \def\rightheader#1{\def\r@headr{\protect\MakeUppercase{\protect\small #1}}}
 \def\leftheader#1{\def\r@headl{\protect\MakeUppercase{\protect\small #1}}}