apa6 1.12 (13dec11)

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

16 files changed, 15 insertions, 25 deletions

diff --git a/Master/texmf-dist/doc/latex/apa6/README.txt b/Master/texmf-dist/doc/latex/apa6/README.txt
index 86aa16b987f..177b96eb4cd 100644
--- a/Master/texmf-dist/doc/latex/apa6/README.txt
+++ b/Master/texmf-dist/doc/latex/apa6/README.txt
@@ -29,4 +29,3 @@ longer being maintained.  New features have also been added, such as
 suppressing references to one's own work to facilitate masked reviews
 of manuscripts by independent reviewers.  See the documentation for
 details.
-
diff --git a/Master/texmf-dist/doc/latex/apa6/apa6.pdf b/Master/texmf-dist/doc/latex/apa6/apa6.pdf
index ebc1d0b9606..63d6976f490 100644
--- a/Master/texmf-dist/doc/latex/apa6/apa6.pdf
+++ b/Master/texmf-dist/doc/latex/apa6/apa6.pdf
diff --git a/Master/texmf-dist/doc/latex/apa6/pseudoTeX/apa6.ptex b/Master/texmf-dist/doc/latex/apa6/pseudoTeX/apa6.ptex
index 68c25b21ab7..708a74fe79c 100644
--- a/Master/texmf-dist/doc/latex/apa6/pseudoTeX/apa6.ptex
+++ b/Master/texmf-dist/doc/latex/apa6/pseudoTeX/apa6.ptex
@@ -28,7 +28,6 @@
 %% ----------------------------------------------------------------------
 %% 
 
-
 %% pseudo {apa6}
 %% Copyright (C) 2001-2011 Chikrii Softlab.
 %% All rights reserved.
diff --git a/Master/texmf-dist/doc/latex/apa6/samples/bibliography.bib b/Master/texmf-dist/doc/latex/apa6/samples/bibliography.bib
index 24eba1147ae..7ee48be62cc 100644
--- a/Master/texmf-dist/doc/latex/apa6/samples/bibliography.bib
+++ b/Master/texmf-dist/doc/latex/apa6/samples/bibliography.bib
@@ -28,7 +28,6 @@
 %% ----------------------------------------------------------------------
 %% 
 
-
 @ARTICLE{Borst2011a,
   author = {Borst, Gr\'{e}goire and Kosslyn, Stephen M. and Kievit, Rogier A. and  Thompson, William L.},
   title = {A fictitious entry to demonstrate complicated bibliographies},
diff --git a/Master/texmf-dist/doc/latex/apa6/samples/longsample.tex b/Master/texmf-dist/doc/latex/apa6/samples/longsample.tex
index 0fd6bd9a543..834b23d9d09 100644
--- a/Master/texmf-dist/doc/latex/apa6/samples/longsample.tex
+++ b/Master/texmf-dist/doc/latex/apa6/samples/longsample.tex
@@ -27,7 +27,6 @@
 %% 
 %% ----------------------------------------------------------------------
 %% 
-
 \documentclass[man]{apa6}
 
 \usepackage{lipsum}
diff --git a/Master/texmf-dist/doc/latex/apa6/samples/shortsample.tex b/Master/texmf-dist/doc/latex/apa6/samples/shortsample.tex
index 1bb9eb2f0bf..66447831b7f 100644
--- a/Master/texmf-dist/doc/latex/apa6/samples/shortsample.tex
+++ b/Master/texmf-dist/doc/latex/apa6/samples/shortsample.tex
@@ -27,7 +27,6 @@
 %% 
 %% ----------------------------------------------------------------------
 %% 
-
 \documentclass[jou]{apa6}
 
 \usepackage[american]{babel}
diff --git a/Master/texmf-dist/source/latex/apa6/apa6.dtx b/Master/texmf-dist/source/latex/apa6/apa6.dtx
index 38c1618538a..f6fd3d8c926 100644
--- a/Master/texmf-dist/source/latex/apa6/apa6.dtx
+++ b/Master/texmf-dist/source/latex/apa6/apa6.dtx
@@ -4,11 +4,11 @@
 %                                                                           %
 %    CHANGE THESE VALUES WITH EACH NEW RELEASE:                             %
 %                                                                           %
-%<class>\ProvidesClass{apa6}[2011/12/10 v1.11 APA formatting (6th edition)]
+%<class>\ProvidesClass{apa6}[2011/12/12 v1.12 APA formatting (6th edition)]
 %                                                                           %
 %<*internal>                                                                %
-\def\apaSixVersionDate{2011/12/10}
-\def\apaSixVersionNumber{1.11}
+\def\apaSixVersionDate{2011/12/12}
+\def\apaSixVersionNumber{1.12}
 %                                                                           %
 %                                                                           %
 % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -218,13 +218,16 @@ and the derived files           apa6.ins,
 % \changes{v1.02}{2011/12/01}{More reliable font-size selection}
 % \changes{v1.02}{2011/12/01}{Corrected default mode to jou}
 %
-% \changes{v1.03}{2011/12/10}{New option 'noextraspace'}
-% \changes{v1.03}{2011/12/10}{Added German language support}
-% \changes{v1.03}{2011/12/10}{Removed automated rotation of wide figures}
-% \changes{v1.03}{2011/12/10}{Load lmodern and fontenc by default}
-% \changes{v1.03}{2011/12/10}{Allow whitespace after subsubsection
+% \changes{v1.11}{2011/12/10}{New option 'noextraspace'}
+% \changes{v1.11}{2011/12/10}{Added German language support}
+% \changes{v1.11}{2011/12/10}{Removed automated rotation of wide figures}
+% \changes{v1.11}{2011/12/10}{Load lmodern and fontenc by default}
+% \changes{v1.11}{2011/12/10}{Allow whitespace after subsubsection
 % (and lower) sectioning commands}
-
+%
+% \changes{v1.12}{2011/12/12}{Fixed bug that erroneously displayed the
+% first figure on the same page as the references (when no tables were
+% present)}
 %
 % \begin{abstract}
 %   The \textit{Publication Manual} of the American Psychological
@@ -2613,7 +2616,7 @@ and the derived files           apa6.ins,
 \def\processfigures{%
  \expandafter\ifnum \csname @ef@fffopen\endcsname>0
   \immediate\closeout\efloat@postfff \ef@setct{fff}{0}
-%  \clearpage
+  \clearpage
   \if@figlist
    \@ifundefined{@figure@written}{}{%
 %    \figurecaptionsformat
diff --git a/Master/texmf-dist/source/latex/apa6/apa6.ins b/Master/texmf-dist/source/latex/apa6/apa6.ins
index 8e6d257e4e7..8a3f0a5bba9 100644
--- a/Master/texmf-dist/source/latex/apa6/apa6.ins
+++ b/Master/texmf-dist/source/latex/apa6/apa6.ins
@@ -118,7 +118,6 @@ and the derived files           apa6.ins,
   \file{./pseudoTeX/apa6.ptex}{\from{\jobname.dtx}{ptex}}
 }
 \endbatchfile
-
 %% 
 %% Copyright (C) 2011 by Brian D. Beitzel <brian at beitzel.com>
 %% 
diff --git a/Master/texmf-dist/tex/latex/apa6/apa6.cls b/Master/texmf-dist/tex/latex/apa6/apa6.cls
index bbeec32175a..2e0134f4d11 100644
--- a/Master/texmf-dist/tex/latex/apa6/apa6.cls
+++ b/Master/texmf-dist/tex/latex/apa6/apa6.cls
@@ -27,10 +27,9 @@
 %% 
 %% ----------------------------------------------------------------------
 %% 
-\ProvidesClass{apa6}[2011/12/10 v1.11 APA formatting (6th edition)]
+\ProvidesClass{apa6}[2011/12/12 v1.12 APA formatting (6th edition)]
 \NeedsTeXFormat{LaTeX2e}
 
-
 \DeclareOption{man}{%
   \def\def@man{\@manmode}
 }
@@ -1430,6 +1429,7 @@
 \def\processfigures{%
  \expandafter\ifnum \csname @ef@fffopen\endcsname>0
   \immediate\closeout\efloat@postfff \ef@setct{fff}{0}
+  \clearpage
   \if@figlist
    \@ifundefined{@figure@written}{}{%
     {\normalsize\@ifundefined{hrm}{}{\sf}%
diff --git a/Master/texmf-dist/tex/latex/apa6/config/APAamerican.txt b/Master/texmf-dist/tex/latex/apa6/config/APAamerican.txt
index 13a2d968ffe..ce84af37902 100644
--- a/Master/texmf-dist/tex/latex/apa6/config/APAamerican.txt
+++ b/Master/texmf-dist/tex/latex/apa6/config/APAamerican.txt
@@ -27,7 +27,6 @@
 %% 
 %% ----------------------------------------------------------------------
 %% 
-
 \ProvidesFile{APAamerican.txt}[2011/12/10 v1.11 apa6 configuration for American English]
 
 \renewcommand{\rheadname}{Running head}
diff --git a/Master/texmf-dist/tex/latex/apa6/config/APAdutch.txt b/Master/texmf-dist/tex/latex/apa6/config/APAdutch.txt
index b5c064516ef..7e2f108ca8e 100644
--- a/Master/texmf-dist/tex/latex/apa6/config/APAdutch.txt
+++ b/Master/texmf-dist/tex/latex/apa6/config/APAdutch.txt
@@ -27,7 +27,6 @@
 %% 
 %% ----------------------------------------------------------------------
 %% 
-
 \ProvidesFile{APAdutch.txt}[2011/12/10 v1.11 apa6 configuration for Dutch]
 
 \renewcommand{\rheadname}{Kopregel}% Running head
diff --git a/Master/texmf-dist/tex/latex/apa6/config/APAendfloat.cfg b/Master/texmf-dist/tex/latex/apa6/config/APAendfloat.cfg
index 0e6d55d61fa..478709ba5da 100644
--- a/Master/texmf-dist/tex/latex/apa6/config/APAendfloat.cfg
+++ b/Master/texmf-dist/tex/latex/apa6/config/APAendfloat.cfg
@@ -27,7 +27,6 @@
 %% 
 %% ----------------------------------------------------------------------
 %% 
-
 %%
 %% This is file `endfloat.cfg',
 %% modifed from the original supplied with the endfloat package
diff --git a/Master/texmf-dist/tex/latex/apa6/config/APAenglish.txt b/Master/texmf-dist/tex/latex/apa6/config/APAenglish.txt
index 908e3950b00..1cc9df8929a 100644
--- a/Master/texmf-dist/tex/latex/apa6/config/APAenglish.txt
+++ b/Master/texmf-dist/tex/latex/apa6/config/APAenglish.txt
@@ -27,7 +27,6 @@
 %% 
 %% ----------------------------------------------------------------------
 %% 
-
 \ProvidesFile{APAenglish.txt}[2011/12/10 v1.11 apa6 configuration for non-American English]
 
 \renewcommand{\rheadname}{Running head}
diff --git a/Master/texmf-dist/tex/latex/apa6/config/APAgerman.txt b/Master/texmf-dist/tex/latex/apa6/config/APAgerman.txt
index 150600b8e2d..6970e5d62fc 100644
--- a/Master/texmf-dist/tex/latex/apa6/config/APAgerman.txt
+++ b/Master/texmf-dist/tex/latex/apa6/config/APAgerman.txt
@@ -27,7 +27,6 @@
 %% 
 %% ----------------------------------------------------------------------
 %% 
-
 \ProvidesFile{APAgerman.txt}[2011/12/10 v1.11 apa6 configuration for German]
 
 \renewcommand{\rheadname}{Kolumnentitel}% Running head
diff --git a/Master/texmf-dist/tex/latex/apa6/config/APAgreek.txt b/Master/texmf-dist/tex/latex/apa6/config/APAgreek.txt
index 3e2562b9beb..2ae0b48f43d 100644
--- a/Master/texmf-dist/tex/latex/apa6/config/APAgreek.txt
+++ b/Master/texmf-dist/tex/latex/apa6/config/APAgreek.txt
@@ -27,7 +27,6 @@
 %% 
 %% ----------------------------------------------------------------------
 %% 
-
 \ProvidesFile{APAgreek.txt}[2011/12/10 v1.11 apa6 configuration for Greek]
 
 \renewcommand{\rheadname}{Up'ertitlos}% Running head
diff --git a/Master/texmf-dist/tex/latex/apa6/config/APAngerman.txt b/Master/texmf-dist/tex/latex/apa6/config/APAngerman.txt
index 66d2d897ded..b3a1dbb1ab8 100644
--- a/Master/texmf-dist/tex/latex/apa6/config/APAngerman.txt
+++ b/Master/texmf-dist/tex/latex/apa6/config/APAngerman.txt
@@ -27,7 +27,6 @@
 %% 
 %% ----------------------------------------------------------------------
 %% 
-
 \ProvidesFile{APAgerman.txt}[2011/12/10 v1.11 apa6 configuration for "new" German]
 
 \renewcommand{\rheadname}{Kolumnentitel}% Running head