apa6 (11jan13)

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

10 files changed, 37 insertions, 25 deletions

diff --git a/Master/texmf-dist/tex/latex/apa6/apa6.cls b/Master/texmf-dist/tex/latex/apa6/apa6.cls
index d8c087b7c04..fc6a90c4117 100644
--- a/Master/texmf-dist/tex/latex/apa6/apa6.cls
+++ b/Master/texmf-dist/tex/latex/apa6/apa6.cls
@@ -10,7 +10,7 @@
 %% apa6 - A LaTeX class for formatting documents in compliance with the
 %% American Psychological Association's Publication Manual, 6th edition
 %% 
-%% Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2013 by Brian D. Beitzel <brian at beitzel.com>
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License (LPPL), either
@@ -27,7 +27,7 @@
 %% 
 %% ----------------------------------------------------------------------
 %% 
-\ProvidesClass{apa6}[2012/12/29 v2.11 APA formatting (6th edition)]
+\ProvidesClass{apa6}[2013/01/10 v2.12 APA formatting (6th edition)]
 \NeedsTeXFormat{LaTeX2e}
 
 \DeclareOption{man}{%
@@ -1425,6 +1425,13 @@
   \fancyhead[RO]{\stiny{\@ccoppy}\vspace{-0.15\baselineskip}\\
                  \stiny{\@copnum}}
   \fancyfoot[CO]{\small\rm\thepage}
+  % the following are needed if the starting page number is changed to
+  % an even number:
+  \fancyhead[LE]{\stiny{\@journal}\vspace{-0.15\baselineskip}\\
+                 \stiny{\@vvolume}}
+  \fancyhead[RE]{\stiny{\@ccoppy}\vspace{-0.15\baselineskip}\\
+                 \stiny{\@copnum}}
+  \fancyfoot[CE]{\small\rm\thepage}
   \renewcommand{\headrulewidth}{0pt}
   \renewcommand{\footrulewidth}{0pt}
   \thispagestyle{fancy}
@@ -1468,10 +1475,15 @@
 
 \setcounter{secnumdepth}{0}
 
-\def\ps@myheadings{\let\@mkboth\@gobbletwo
-\def\@oddhead{\hbox{}\rightmark \hfil
-\large\rm\thepage}\def\@oddfoot{}\def\@evenhead{\large\rm \thepage\hfil\leftmark\hbox
-{}}\def\@evenfoot{}\def\sectionmark##1{}\def\subsectionmark##1{}}
+\def\ps@myheadings{%
+  \let\@mkboth\@gobbletwo
+  \def\@oddhead{\hbox{}\rightmark \hfil\rm\thepage}
+  \def\@oddfoot{}
+  \def\@evenhead{\rm\thepage\hfil\leftmark\hbox{}}
+  \def\@evenfoot{}
+  \def\sectionmark##1{}
+  \def\subsectionmark##1{}
+}
 \pagestyle{myheadings}
 
 
@@ -1743,7 +1755,7 @@
 
 
 %% 
-%% Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2013 by Brian D. Beitzel <brian at beitzel.com>
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License (LPPL), either
diff --git a/Master/texmf-dist/tex/latex/apa6/config/APAamerican.txt b/Master/texmf-dist/tex/latex/apa6/config/APAamerican.txt
index 442480724ea..6c2172ba6ee 100644
--- a/Master/texmf-dist/tex/latex/apa6/config/APAamerican.txt
+++ b/Master/texmf-dist/tex/latex/apa6/config/APAamerican.txt
@@ -10,7 +10,7 @@
 %% apa6 - A LaTeX class for formatting documents in compliance with the
 %% American Psychological Association's Publication Manual, 6th edition
 %% 
-%% Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2013 by Brian D. Beitzel <brian at beitzel.com>
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License (LPPL), either
@@ -35,7 +35,7 @@
 \renewcommand{\notesname}{Footnotes}
 
 %% 
-%% Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2013 by Brian D. Beitzel <brian at beitzel.com>
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License (LPPL), either
diff --git a/Master/texmf-dist/tex/latex/apa6/config/APAbritish.txt b/Master/texmf-dist/tex/latex/apa6/config/APAbritish.txt
index 08570e6396b..faf9193b0ee 100644
--- a/Master/texmf-dist/tex/latex/apa6/config/APAbritish.txt
+++ b/Master/texmf-dist/tex/latex/apa6/config/APAbritish.txt
@@ -10,7 +10,7 @@
 %% apa6 - A LaTeX class for formatting documents in compliance with the
 %% American Psychological Association's Publication Manual, 6th edition
 %% 
-%% Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2013 by Brian D. Beitzel <brian at beitzel.com>
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License (LPPL), either
@@ -35,7 +35,7 @@
 \renewcommand{\notesname}{Footnotes}
 
 %% 
-%% Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2013 by Brian D. Beitzel <brian at beitzel.com>
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License (LPPL), either
diff --git a/Master/texmf-dist/tex/latex/apa6/config/APAczech.txt b/Master/texmf-dist/tex/latex/apa6/config/APAczech.txt
index c4a28bf7c81..4d9d6fb62a9 100644
--- a/Master/texmf-dist/tex/latex/apa6/config/APAczech.txt
+++ b/Master/texmf-dist/tex/latex/apa6/config/APAczech.txt
@@ -10,7 +10,7 @@
 %% apa6 - A LaTeX class for formatting documents in compliance with the
 %% American Psychological Association's Publication Manual, 6th edition
 %% 
-%% Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2013 by Brian D. Beitzel <brian at beitzel.com>
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License (LPPL), either
@@ -35,7 +35,7 @@
 \renewcommand{\notesname}{Poznámky}% Footnotes
 
 %% 
-%% Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2013 by Brian D. Beitzel <brian at beitzel.com>
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License (LPPL), either
diff --git a/Master/texmf-dist/tex/latex/apa6/config/APAdutch.txt b/Master/texmf-dist/tex/latex/apa6/config/APAdutch.txt
index 832645ec073..5a5a9587eaf 100644
--- a/Master/texmf-dist/tex/latex/apa6/config/APAdutch.txt
+++ b/Master/texmf-dist/tex/latex/apa6/config/APAdutch.txt
@@ -10,7 +10,7 @@
 %% apa6 - A LaTeX class for formatting documents in compliance with the
 %% American Psychological Association's Publication Manual, 6th edition
 %% 
-%% Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2013 by Brian D. Beitzel <brian at beitzel.com>
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License (LPPL), either
@@ -35,7 +35,7 @@
 \renewcommand{\notesname}{Voetnoten}% Footnotes
 
 %% 
-%% Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2013 by Brian D. Beitzel <brian at beitzel.com>
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License (LPPL), either
diff --git a/Master/texmf-dist/tex/latex/apa6/config/APAendfloat.cfg b/Master/texmf-dist/tex/latex/apa6/config/APAendfloat.cfg
index 8f9a875934b..f7783c49a8f 100644
--- a/Master/texmf-dist/tex/latex/apa6/config/APAendfloat.cfg
+++ b/Master/texmf-dist/tex/latex/apa6/config/APAendfloat.cfg
@@ -10,7 +10,7 @@
 %% apa6 - A LaTeX class for formatting documents in compliance with the
 %% American Psychological Association's Publication Manual, 6th edition
 %% 
-%% Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2013 by Brian D. Beitzel <brian at beitzel.com>
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License (LPPL), either
@@ -99,7 +99,7 @@
  \xdef\ef@endsidetabletest{\string\\end\string\{sidewaystable\string\}}
  \xdef\ef@endlongtabletest{\string\\end\string\{longtable\string\}}}%
 %% 
-%% Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2013 by Brian D. Beitzel <brian at beitzel.com>
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License (LPPL), either
diff --git a/Master/texmf-dist/tex/latex/apa6/config/APAenglish.txt b/Master/texmf-dist/tex/latex/apa6/config/APAenglish.txt
index c1f9ce46124..58cd1c8a14d 100644
--- a/Master/texmf-dist/tex/latex/apa6/config/APAenglish.txt
+++ b/Master/texmf-dist/tex/latex/apa6/config/APAenglish.txt
@@ -10,7 +10,7 @@
 %% apa6 - A LaTeX class for formatting documents in compliance with the
 %% American Psychological Association's Publication Manual, 6th edition
 %% 
-%% Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2013 by Brian D. Beitzel <brian at beitzel.com>
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License (LPPL), either
@@ -35,7 +35,7 @@
 \renewcommand{\notesname}{Footnotes}
 
 %% 
-%% Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2013 by Brian D. Beitzel <brian at beitzel.com>
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License (LPPL), either
diff --git a/Master/texmf-dist/tex/latex/apa6/config/APAgerman.txt b/Master/texmf-dist/tex/latex/apa6/config/APAgerman.txt
index a4b28de4527..b69935d8532 100644
--- a/Master/texmf-dist/tex/latex/apa6/config/APAgerman.txt
+++ b/Master/texmf-dist/tex/latex/apa6/config/APAgerman.txt
@@ -10,7 +10,7 @@
 %% apa6 - A LaTeX class for formatting documents in compliance with the
 %% American Psychological Association's Publication Manual, 6th edition
 %% 
-%% Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2013 by Brian D. Beitzel <brian at beitzel.com>
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License (LPPL), either
@@ -35,7 +35,7 @@
 \renewcommand{\notesname}{Fußnoten}% Footnotes
 
 %% 
-%% Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2013 by Brian D. Beitzel <brian at beitzel.com>
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License (LPPL), either
diff --git a/Master/texmf-dist/tex/latex/apa6/config/APAgreek.txt b/Master/texmf-dist/tex/latex/apa6/config/APAgreek.txt
index ab8abead045..84d9f9e0a6d 100644
--- a/Master/texmf-dist/tex/latex/apa6/config/APAgreek.txt
+++ b/Master/texmf-dist/tex/latex/apa6/config/APAgreek.txt
@@ -10,7 +10,7 @@
 %% apa6 - A LaTeX class for formatting documents in compliance with the
 %% American Psychological Association's Publication Manual, 6th edition
 %% 
-%% Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2013 by Brian D. Beitzel <brian at beitzel.com>
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License (LPPL), either
@@ -35,7 +35,7 @@
 \renewcommand{\notesname}{Uposhmei'wseis}% Footnotes
 
 %% 
-%% Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2013 by Brian D. Beitzel <brian at beitzel.com>
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License (LPPL), either
diff --git a/Master/texmf-dist/tex/latex/apa6/config/APAngerman.txt b/Master/texmf-dist/tex/latex/apa6/config/APAngerman.txt
index 4349d02b3b9..19b442dfb09 100644
--- a/Master/texmf-dist/tex/latex/apa6/config/APAngerman.txt
+++ b/Master/texmf-dist/tex/latex/apa6/config/APAngerman.txt
@@ -10,7 +10,7 @@
 %% apa6 - A LaTeX class for formatting documents in compliance with the
 %% American Psychological Association's Publication Manual, 6th edition
 %% 
-%% Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2013 by Brian D. Beitzel <brian at beitzel.com>
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License (LPPL), either
@@ -35,7 +35,7 @@
 \renewcommand{\notesname}{Fußnoten}% Footnotes
 
 %% 
-%% Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2013 by Brian D. Beitzel <brian at beitzel.com>
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License (LPPL), either