summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-02-24 23:44:45 +0000
committerKarl Berry <karl@freefriends.org>2012-02-24 23:44:45 +0000
commit63adbb64d2b9021aad1f190588588f3d47dfe8a2 (patch)
tree4e4a77262438d2a3a054cad0c3b43d69101e8981 /Master/texmf-dist/tex/latex
parent7a1271291291156b4704674a3b5bcd814fcc0c5e (diff)
apa6 1.25 (24feb12)
git-svn-id: svn://tug.org/texlive/trunk@25497 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-rw-r--r--Master/texmf-dist/tex/latex/apa6/apa6.cls27
-rw-r--r--Master/texmf-dist/tex/latex/apa6/config/APAamerican.txt4
-rw-r--r--Master/texmf-dist/tex/latex/apa6/config/APAbritish.txt4
-rw-r--r--Master/texmf-dist/tex/latex/apa6/config/APAdutch.txt4
-rw-r--r--Master/texmf-dist/tex/latex/apa6/config/APAendfloat.cfg1
-rw-r--r--Master/texmf-dist/tex/latex/apa6/config/APAenglish.txt4
-rw-r--r--Master/texmf-dist/tex/latex/apa6/config/APAgerman.txt4
-rw-r--r--Master/texmf-dist/tex/latex/apa6/config/APAgreek.txt4
-rw-r--r--Master/texmf-dist/tex/latex/apa6/config/APAngerman.txt4
9 files changed, 32 insertions, 24 deletions
diff --git a/Master/texmf-dist/tex/latex/apa6/apa6.cls b/Master/texmf-dist/tex/latex/apa6/apa6.cls
index b5e5ac27177..77c6c36c39b 100644
--- a/Master/texmf-dist/tex/latex/apa6/apa6.cls
+++ b/Master/texmf-dist/tex/latex/apa6/apa6.cls
@@ -27,7 +27,7 @@
%%
%% ----------------------------------------------------------------------
%%
-\ProvidesClass{apa6}[2012/02/15 v1.2 APA formatting (6th edition)]
+\ProvidesClass{apa6}[2012/02/23 v1.25 APA formatting (6th edition)]
\NeedsTeXFormat{LaTeX2e}
\DeclareOption{man}{%
@@ -345,6 +345,7 @@
\def\rheadname{Running head}
\def\acksname{Author Note}
+\def\keywordname{Keywords}
\def\notesname{Footnotes}
\AtBeginDocument{% so that we know what language is active in babel
@@ -639,20 +640,29 @@
\setcounter{secnumdepth}{0}
+
\renewcommand{\section}{\@startsection {section}{1}{\z@}%
{\b@level@one@skip}{\e@level@one@skip}%
{\centering\normalfont\normalsize\bfseries}}
+
\renewcommand{\subsection}{\@startsection{subsection}{2}{\z@}%
{\b@level@two@skip}{\e@level@two@skip}%
{\normalfont\normalsize\bfseries}}
-\renewcommand{\subsubsection}[1]{\@startsection{subsubsection}{3}{1em}%
+
+
+\newcommand*{\addperi}[1]{#1.}
+
+\renewcommand{\subsubsection}{\@startsection{subsubsection}{3}{\parindent}%
{0\baselineskip \@plus 0.2ex \@minus 0.2ex}%
- {-\z@\relax}%
- {\normalfont\normalsize\bfseries\hspace{\parindent}{#1}\textbf{.}}{\relax}}
-\renewcommand{\paragraph}[1]{\@startsection{paragraph}{4}{1em}%
+ {-1em}%
+ {\normalfont\normalsize\bfseries\addperi}}
+
+
+\renewcommand{\paragraph}{\@startsection{paragraph}{4}{\parindent}%
{0\baselineskip \@plus 0.2ex \@minus 0.2ex}%
- {-\z@\relax}%
- {\normalfont\normalsize\bfseries\itshape\hspace{\parindent}{#1}\textbf{\textit{.}}}{\relax}}
+ {-1em}%
+ {\normalfont\normalsize\bfseries\itshape\addperi}}
+
\renewcommand{\subparagraph}[1]{\@startsection{subparagraph}{5}{1em}%
{0\baselineskip \@plus 0.2ex \@minus 0.2ex}%
{-\z@\relax}%
@@ -1212,7 +1222,7 @@
\noindent\@abstract\par% BDB
\@ifundefined{@keywords}{}{%
\setlength{\parindent}{0.4in}% BDB
- \indent\textit{Keywords:} \@keywords%
+ \indent\textit{\keywordname:} \@keywords%
}%
\newpage
}
@@ -1737,7 +1747,6 @@
%% This work is not endorsed by, affiliated with, or probably even known
%% by, the American Psychological Association.
%%
-%%
%% This work is "maintained" (as per LPPL maintenance status) by
%% Brian D. Beitzel.
%%
diff --git a/Master/texmf-dist/tex/latex/apa6/config/APAamerican.txt b/Master/texmf-dist/tex/latex/apa6/config/APAamerican.txt
index 9304555f843..947147ebfdc 100644
--- a/Master/texmf-dist/tex/latex/apa6/config/APAamerican.txt
+++ b/Master/texmf-dist/tex/latex/apa6/config/APAamerican.txt
@@ -27,10 +27,11 @@
%%
%% ----------------------------------------------------------------------
%%
-\ProvidesFile{APAamerican.txt}[2011/12/10 v1.11 apa6 configuration for American English]
+\ProvidesFile{APAamerican.txt}[2012/02/23 v1.25 apa6 configuration for American English]
\renewcommand{\rheadname}{Running head}
\renewcommand{\acksname}{Author Note}
+\renewcommand{\keywordname}{Keywords}
\renewcommand{\notesname}{Footnotes}
%%
@@ -49,7 +50,6 @@
%% This work is not endorsed by, affiliated with, or probably even known
%% by, the American Psychological Association.
%%
-%%
%% This work is "maintained" (as per LPPL maintenance status) by
%% Brian D. Beitzel.
%%
diff --git a/Master/texmf-dist/tex/latex/apa6/config/APAbritish.txt b/Master/texmf-dist/tex/latex/apa6/config/APAbritish.txt
index d9b955e824b..639461ecf4b 100644
--- a/Master/texmf-dist/tex/latex/apa6/config/APAbritish.txt
+++ b/Master/texmf-dist/tex/latex/apa6/config/APAbritish.txt
@@ -27,10 +27,11 @@
%%
%% ----------------------------------------------------------------------
%%
-\ProvidesFile{APAbritish.txt}[2011/12/10 v1.11 apa6 configuration for British English]
+\ProvidesFile{APAbritish.txt}[2012/02/23 v1.25 apa6 configuration for British English]
\renewcommand{\rheadname}{Running head}
\renewcommand{\acksname}{Author Note}
+\renewcommand{\keywordname}{Keywords}
\renewcommand{\notesname}{Footnotes}
%%
@@ -49,7 +50,6 @@
%% This work is not endorsed by, affiliated with, or probably even known
%% by, the American Psychological Association.
%%
-%%
%% This work is "maintained" (as per LPPL maintenance status) by
%% Brian D. Beitzel.
%%
diff --git a/Master/texmf-dist/tex/latex/apa6/config/APAdutch.txt b/Master/texmf-dist/tex/latex/apa6/config/APAdutch.txt
index ae4649e8322..6678121c7b0 100644
--- a/Master/texmf-dist/tex/latex/apa6/config/APAdutch.txt
+++ b/Master/texmf-dist/tex/latex/apa6/config/APAdutch.txt
@@ -27,10 +27,11 @@
%%
%% ----------------------------------------------------------------------
%%
-\ProvidesFile{APAdutch.txt}[2011/12/10 v1.11 apa6 configuration for Dutch]
+\ProvidesFile{APAdutch.txt}[2012/02/23 v1.25 apa6 configuration for Dutch]
\renewcommand{\rheadname}{Kopregel}% Running head
\renewcommand{\acksname}{Auteursnoot}% Author Note
+\renewcommand{\keywordname}{Trefwoorden}% Keywords
\renewcommand{\notesname}{Voetnoten}% Footnotes
%%
@@ -49,7 +50,6 @@
%% This work is not endorsed by, affiliated with, or probably even known
%% by, the American Psychological Association.
%%
-%%
%% This work is "maintained" (as per LPPL maintenance status) by
%% Brian D. Beitzel.
%%
diff --git a/Master/texmf-dist/tex/latex/apa6/config/APAendfloat.cfg b/Master/texmf-dist/tex/latex/apa6/config/APAendfloat.cfg
index 728b65769d6..ca479ccf0b7 100644
--- a/Master/texmf-dist/tex/latex/apa6/config/APAendfloat.cfg
+++ b/Master/texmf-dist/tex/latex/apa6/config/APAendfloat.cfg
@@ -114,7 +114,6 @@
%% This work is not endorsed by, affiliated with, or probably even known
%% by, the American Psychological Association.
%%
-%%
%% This work is "maintained" (as per LPPL maintenance status) by
%% Brian D. Beitzel.
%%
diff --git a/Master/texmf-dist/tex/latex/apa6/config/APAenglish.txt b/Master/texmf-dist/tex/latex/apa6/config/APAenglish.txt
index 635612c3f62..184f6013ae1 100644
--- a/Master/texmf-dist/tex/latex/apa6/config/APAenglish.txt
+++ b/Master/texmf-dist/tex/latex/apa6/config/APAenglish.txt
@@ -27,10 +27,11 @@
%%
%% ----------------------------------------------------------------------
%%
-\ProvidesFile{APAenglish.txt}[2011/12/10 v1.11 apa6 configuration for non-American English]
+\ProvidesFile{APAenglish.txt}[2012/02/23 v1.25 apa6 configuration for non-American English]
\renewcommand{\rheadname}{Running head}
\renewcommand{\acksname}{Author Note}
+\renewcommand{\keywordname}{Keywords}
\renewcommand{\notesname}{Footnotes}
%%
@@ -49,7 +50,6 @@
%% This work is not endorsed by, affiliated with, or probably even known
%% by, the American Psychological Association.
%%
-%%
%% This work is "maintained" (as per LPPL maintenance status) by
%% Brian D. Beitzel.
%%
diff --git a/Master/texmf-dist/tex/latex/apa6/config/APAgerman.txt b/Master/texmf-dist/tex/latex/apa6/config/APAgerman.txt
index b8fb8b402ef..2e5325c9b17 100644
--- a/Master/texmf-dist/tex/latex/apa6/config/APAgerman.txt
+++ b/Master/texmf-dist/tex/latex/apa6/config/APAgerman.txt
@@ -27,10 +27,11 @@
%%
%% ----------------------------------------------------------------------
%%
-\ProvidesFile{APAgerman.txt}[2011/12/10 v1.11 apa6 configuration for German]
+\ProvidesFile{APAgerman.txt}[2012/02/23 v1.25 apa6 configuration for German]
\renewcommand{\rheadname}{Kolumnentitel}% Running head
\renewcommand{\acksname}{Autorenhinweis}% Author Note
+\renewcommand{\keywordname}{Schl\"usselw\"orter}% Keywords
\renewcommand{\notesname}{Fußnoten}% Footnotes
%%
@@ -49,7 +50,6 @@
%% This work is not endorsed by, affiliated with, or probably even known
%% by, the American Psychological Association.
%%
-%%
%% This work is "maintained" (as per LPPL maintenance status) by
%% Brian D. Beitzel.
%%
diff --git a/Master/texmf-dist/tex/latex/apa6/config/APAgreek.txt b/Master/texmf-dist/tex/latex/apa6/config/APAgreek.txt
index 041e99c698a..83c9a7cdfa3 100644
--- a/Master/texmf-dist/tex/latex/apa6/config/APAgreek.txt
+++ b/Master/texmf-dist/tex/latex/apa6/config/APAgreek.txt
@@ -27,10 +27,11 @@
%%
%% ----------------------------------------------------------------------
%%
-\ProvidesFile{APAgreek.txt}[2011/12/10 v1.11 apa6 configuration for Greek]
+\ProvidesFile{APAgreek.txt}[2012/02/23 v1.25 apa6 configuration for Greek]
\renewcommand{\rheadname}{Up'ertitlos}% Running head
\renewcommand{\acksname}{Shmei'wseis tou suggraf'ea}% Author Note
+\renewcommand{\keywordname}{L'exeis kleidi'a}% Keywords
\renewcommand{\notesname}{Uposhmei'wseis}% Footnotes
%%
@@ -49,7 +50,6 @@
%% This work is not endorsed by, affiliated with, or probably even known
%% by, the American Psychological Association.
%%
-%%
%% This work is "maintained" (as per LPPL maintenance status) by
%% Brian D. Beitzel.
%%
diff --git a/Master/texmf-dist/tex/latex/apa6/config/APAngerman.txt b/Master/texmf-dist/tex/latex/apa6/config/APAngerman.txt
index a205155de2b..9d2e3b93f7d 100644
--- a/Master/texmf-dist/tex/latex/apa6/config/APAngerman.txt
+++ b/Master/texmf-dist/tex/latex/apa6/config/APAngerman.txt
@@ -27,10 +27,11 @@
%%
%% ----------------------------------------------------------------------
%%
-\ProvidesFile{APAgerman.txt}[2011/12/10 v1.11 apa6 configuration for "new" German]
+\ProvidesFile{APAgerman.txt}[2012/02/23 v1.25 apa6 configuration for "new" German]
\renewcommand{\rheadname}{Kolumnentitel}% Running head
\renewcommand{\acksname}{Autorenhinweis}% Author Note
+\renewcommand{\keywordname}{Schl\"usselw\"orter}% Keywords
\renewcommand{\notesname}{Fußnoten}% Footnotes
%%
@@ -49,7 +50,6 @@
%% This work is not endorsed by, affiliated with, or probably even known
%% by, the American Psychological Association.
%%
-%%
%% This work is "maintained" (as per LPPL maintenance status) by
%% Brian D. Beitzel.
%%