From 0b70c983e8bb41baa9fa707f5f115eed11ddf514 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 21 Nov 2014 00:47:20 +0000 Subject: apa6 (20nov14) git-svn-id: svn://tug.org/texlive/trunk@35631 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/apa6/apa6.cls | 13 ++++++++----- Master/texmf-dist/tex/latex/apa6/config/APAamerican.txt | 4 ++-- Master/texmf-dist/tex/latex/apa6/config/APAbritish.txt | 4 ++-- Master/texmf-dist/tex/latex/apa6/config/APAczech.txt | 4 ++-- Master/texmf-dist/tex/latex/apa6/config/APAdutch.txt | 4 ++-- Master/texmf-dist/tex/latex/apa6/config/APAendfloat.cfg | 4 ++-- Master/texmf-dist/tex/latex/apa6/config/APAenglish.txt | 4 ++-- Master/texmf-dist/tex/latex/apa6/config/APAgerman.txt | 4 ++-- Master/texmf-dist/tex/latex/apa6/config/APAgreek.txt | 4 ++-- Master/texmf-dist/tex/latex/apa6/config/APAngerman.txt | 4 ++-- 10 files changed, 26 insertions(+), 23 deletions(-) (limited to 'Master/texmf-dist/tex/latex/apa6') diff --git a/Master/texmf-dist/tex/latex/apa6/apa6.cls b/Master/texmf-dist/tex/latex/apa6/apa6.cls index 35c2c0e31fe..d906fbc772b 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-2013 by Brian D. Beitzel +%% Copyright (C) 2011-2014 by Brian D. Beitzel %% %% 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}[2013/06/26 v2.13 APA formatting (6th edition)] +\ProvidesClass{apa6}[2014/11/20 v2.14 APA formatting (6th edition)] \NeedsTeXFormat{LaTeX2e} \DeclareOption{man}{% @@ -927,6 +927,9 @@ % changes to section* and section[ (see \def\section above) % Who uses five level heading appendices anyway? \long\def\section##1{% + \makeatletter% + \def\@currentlabelname{##1}% + \makeatother% \ifapamodeman{% \clearpage \setcounter{postfig}{0} @@ -1538,8 +1541,6 @@ \fancyhf{} \renewcommand{\headrulewidth}{0pt} -\setlength{\headwidth}{\textwidth} - \fancypagestyle{otherpage}{% \lhead{\MakeUppercase{\@shorttitle}}% \rhead{\thepage}% @@ -1704,6 +1705,8 @@ \setcounter{secnumdepth}{0} \flushbottom +\setlength{\headwidth}{\textwidth} + \setcounter{topnumber}{2} \def\topfraction{.7} \setcounter{bottomnumber}{2} @@ -1751,7 +1754,7 @@ %% -%% Copyright (C) 2011-2013 by Brian D. Beitzel +%% Copyright (C) 2011-2014 by Brian D. Beitzel %% %% 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 6c2172ba6ee..6946d7017e7 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-2013 by Brian D. Beitzel +%% Copyright (C) 2011-2014 by Brian D. Beitzel %% %% 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-2013 by Brian D. Beitzel +%% Copyright (C) 2011-2014 by Brian D. Beitzel %% %% 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 faf9193b0ee..74bf8ff8c02 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-2013 by Brian D. Beitzel +%% Copyright (C) 2011-2014 by Brian D. Beitzel %% %% 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-2013 by Brian D. Beitzel +%% Copyright (C) 2011-2014 by Brian D. Beitzel %% %% 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 4d9d6fb62a9..c99b36648ce 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-2013 by Brian D. Beitzel +%% Copyright (C) 2011-2014 by Brian D. Beitzel %% %% 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-2013 by Brian D. Beitzel +%% Copyright (C) 2011-2014 by Brian D. Beitzel %% %% 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 5a5a9587eaf..6214e5d34b7 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-2013 by Brian D. Beitzel +%% Copyright (C) 2011-2014 by Brian D. Beitzel %% %% 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-2013 by Brian D. Beitzel +%% Copyright (C) 2011-2014 by Brian D. Beitzel %% %% 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 f7783c49a8f..0bf55eede93 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-2013 by Brian D. Beitzel +%% Copyright (C) 2011-2014 by Brian D. Beitzel %% %% 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-2013 by Brian D. Beitzel +%% Copyright (C) 2011-2014 by Brian D. Beitzel %% %% 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 58cd1c8a14d..8275eb85288 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-2013 by Brian D. Beitzel +%% Copyright (C) 2011-2014 by Brian D. Beitzel %% %% 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-2013 by Brian D. Beitzel +%% Copyright (C) 2011-2014 by Brian D. Beitzel %% %% 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 b69935d8532..e5e829aff72 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-2013 by Brian D. Beitzel +%% Copyright (C) 2011-2014 by Brian D. Beitzel %% %% 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-2013 by Brian D. Beitzel +%% Copyright (C) 2011-2014 by Brian D. Beitzel %% %% 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 84d9f9e0a6d..136957cd3d8 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-2013 by Brian D. Beitzel +%% Copyright (C) 2011-2014 by Brian D. Beitzel %% %% 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-2013 by Brian D. Beitzel +%% Copyright (C) 2011-2014 by Brian D. Beitzel %% %% 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 19b442dfb09..9908d82e0c5 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-2013 by Brian D. Beitzel +%% Copyright (C) 2011-2014 by Brian D. Beitzel %% %% 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-2013 by Brian D. Beitzel +%% Copyright (C) 2011-2014 by Brian D. Beitzel %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either -- cgit v1.2.3