diff options
author | Karl Berry <karl@freefriends.org> | 2012-02-16 00:09:27 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2012-02-16 00:09:27 +0000 |
commit | 4aade915cd5ed2b3776295400b2e6a0b3d33be65 (patch) | |
tree | 83911697461617daea06417cb729d0ab26c125c3 /Master/texmf-dist/tex/latex/apa6/apa6.cls | |
parent | b9fea4534c20a6dc688733f8759babf1aa2c181d (diff) |
apa6 (15feb12)
git-svn-id: svn://tug.org/texlive/trunk@25403 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/apa6/apa6.cls')
-rw-r--r-- | Master/texmf-dist/tex/latex/apa6/apa6.cls | 391 |
1 files changed, 14 insertions, 377 deletions
diff --git a/Master/texmf-dist/tex/latex/apa6/apa6.cls b/Master/texmf-dist/tex/latex/apa6/apa6.cls index 2894b6dae2a..b5e5ac27177 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 by Brian D. Beitzel <brian at beitzel.com> +%% Copyright (C) 2011, 2012 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/01/16 v1.13 APA formatting (6th edition)] +\ProvidesClass{apa6}[2012/02/15 v1.2 APA formatting (6th edition)] \NeedsTeXFormat{LaTeX2e} \DeclareOption{man}{% @@ -138,7 +138,7 @@ \@ifundefined{def@doc}{% \@ifundefined{def@jou}{% \def\def@jou{\@joumode} - \ClassWarningNoLine{apa6}{Using default mode (jou)} + \ClassInfo{apa6}{Using default mode (jou)} %\def\def@man{\@manmode} %\def\def@doc{\@docmode} }{} @@ -184,7 +184,7 @@ } }{} } - \ClassWarningNoLine{apa6}{No bibliography package was specified; defaulting to (but not loading) Biblatex} + \ClassInfo{apa6}{No bibliography package was specified; defaulting to (but not loading) Biblatex} }{% \def\def@biblatex{\@biblatexmode}% the selected bibliography package is Biblatex \RequirePackage[style=apa,sortcites=true,sorting=nyt]{biblatex} @@ -193,21 +193,21 @@ }{% \defbibheading{bibliography}{\section*{\newpage\normalfont\refname}}% } - \ClassWarningNoLine{apa6}{The selected bibliography package, biblatex, has been loaded} + \ClassInfo{apa6}{The selected bibliography package, biblatex, has been loaded} } }{% \def\def@natbib{\@natbibmode}% the selected bibliography package is natbib (with apacite) \@ifundefined{def@man}{% -- thp 2005/07/23 - \RequirePackage{apacite}[2005/06/08]} - {\RequirePackage[bibnewpage]{apacite}[2005/06/08]} - \ClassWarningNoLine{apa6}{The selected bibliography package, natbib, must be loaded in the preamble; apacite has been loaded} + \RequirePackage[natbibapa]{apacite}[2012/02/14} + {\RequirePackage[natbibapa,bibnewpage]{apacite}[2012/02/14]} + \ClassInfo{apa6}{The selected bibliography package, natbib, must be loaded in the preamble; apacite has been loaded} } }{% \def\def@apacite{\@apacitemode}% the selected bibliography package is apacite \@ifundefined{def@man}{% -- thp 2005/07/23 \RequirePackage{apacite}[2005/06/08]} {\RequirePackage[bibnewpage]{apacite}[2005/06/08]} - \ClassWarningNoLine{apa6}{The selected bibliography package, apacite, has been loaded} + \ClassInfo{apa6}{The selected bibliography package, apacite, has been loaded} } \@ifundefined{def@nolmodern}{% @@ -359,7 +359,7 @@ {\def\@apaSix@langfile{config/APAamerican.txt}} {\def\@apaSix@langfile{config/APA\languagename.txt}} \InputIfFileExists{\@apaSix@langfile}{}{% - \ClassWarningNoLine{apa6}{Language definition file \@apaSix@langfile\space not found} + \ClassInfo{apa6}{Language definition file \@apaSix@langfile\space not found} }% } @@ -368,370 +368,7 @@ \RequirePackage{babel} % -- thp 2005/07/23, removed options 2005/12/28 } - - -\@ifundefined{def@biblatex}{% BDB - - \@ifundefined{def@natbib}{% - \@ifundefined{def@apacite}{}{% - % we are using apacite (but not natbib) - - %%%%%%%%%%%% apacite commands %%%%%%%%%%%%%%%%% - %% - %% \cite<e.g.,>[p.~11]{vanDijk2001,Ross1987} => (e.g., van Dijk, 2001; Ross, 1987, p. 11) - %% \citeNP<e.g.,>[p.~11]{vanDijk2001,Ross1987} => e.g., van Dijk, 2001; Ross, 1987, p. 11 - %% \citeA<e.g.,>[p.~11]{vanDijk2001,Ross1987} => e.g., van Dijk (2001); Ross (1987, p. 11) - %% \citeauthor<e.g.,>[p.~11]{vanDijk2001,Ross1987} => e.g., van Dijk; Ross, p. 11 - %% \citeyear<e.g.,>[p.~11]{vanDijk2001,Ross1987} => (e.g., 2001; 1987, p. 11) - %% \citeyearNP<e.g.,>[p.~11]{vanDijk2001,Ross1987} => e.g., 2001; 1987, p. 11 - %% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - - \@ifundefined{apaSix@maskauthoridentity}% BDB - {% change masked references to unmasked - \providecommand\maskcite\cite - \providecommand\maskciteNP\citeNP - \providecommand\maskciteA\citeA - \providecommand\maskciteauthor\citeauthor - \providecommand\maskciteyear\citeyear - \providecommand\maskciteyearNP\citeyearNP - }{% mask references to author - - \RequirePackage{substr} % to allow counting of masked references - \newcounter{maskedRefs} - - % \maskcite - \newcommand\maskcite{\@ifnextchar<{\maskcite@@also}{\maskcite@@also[]}} - \newcommand\maskcite@@also{} - \def\maskcite@@also[#1]{\@ifnextchar<{\maskcite@@@also[#1]}{\maskcite@@@also[][#1]}} - - \def\maskcite@@@also% - [#1][#2]#3{% - \setcounter{maskedRefs}{0}% - \SubStringsToCounter{maskedRefs}{,}{#3}% - \addtocounter{maskedRefs}{1}% - \ifnum\value{maskedRefs} = 1% - \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citation removed for masked review})}% - \else% - \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citations removed for masked review})}% - \fi% - \apaSix@masked@refs% - } - - % \maskciteNP - \newcommand\maskciteNP{\@ifnextchar<{\maskciteNP@@also}{\maskciteNP@@also[]}} - \newcommand\maskciteNP@@also{} - \def\maskciteNP@@also[#1]{\@ifnextchar<{\maskciteNP@@@also[#1]}{\maskciteNP@@@also[][#1]}} - - \def\maskciteNP@@@also% - [#1][#2]#3{% - \setcounter{maskedRefs}{0}% - \SubStringsToCounter{maskedRefs}{,}{#3}% - \addtocounter{maskedRefs}{1}% - \ifnum\value{maskedRefs} = 1% - \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citation removed for masked review})}% - \else% - \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citations removed for masked review})}% - \fi% - \apaSix@masked@refs% - } - - % \maskciteA - \newcommand\maskciteA{\@ifnextchar<{\maskciteA@@also}{\maskciteA@@also[]}} - \newcommand\maskciteA@@also{} - \def\maskciteA@@also[#1]{\@ifnextchar<{\maskciteA@@@also[#1]}{\maskciteA@@@also[][#1]}} - - \def\maskciteA@@@also% - [#1][#2]#3{% - \setcounter{maskedRefs}{0}% - \SubStringsToCounter{maskedRefs}{,}{#3}% - \addtocounter{maskedRefs}{1}% - \ifnum\value{maskedRefs} = 1% - \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citation removed for masked review})}% - \else% - \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citations removed for masked review})}% - \fi% - \apaSix@masked@refs% - } - - % \maskciteauthor - \newcommand\maskciteauthor{\@ifnextchar<{\maskciteauthor@@also}{\maskciteauthor@@also[]}} - \newcommand\maskciteauthor@@also{} - \def\maskciteauthor@@also[#1]{\@ifnextchar<{\maskciteauthor@@@also[#1]}{\maskciteauthor@@@also[][#1]}} - - \def\maskciteauthor@@@also% - [#1][#2]#3{% - \setcounter{maskedRefs}{0}% - \SubStringsToCounter{maskedRefs}{,}{#3}% - \addtocounter{maskedRefs}{1}% - \ifnum\value{maskedRefs} = 1% - \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citation removed for masked review})}% - \else% - \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citations removed for masked review})}% - \fi% - \apaSix@masked@refs% - } - - % \maskciteyear - \newcommand\maskciteyear{\@ifnextchar<{\maskciteyear@@also}{\maskciteyear@@also[]}} - \newcommand\maskciteyear@@also{} - \def\maskciteyear@@also[#1]{\@ifnextchar<{\maskciteyear@@@also[#1]}{\maskciteyear@@@also[][#1]}} - - \def\maskciteyear@@@also% - [#1][#2]#3{% - \setcounter{maskedRefs}{0}% - \SubStringsToCounter{maskedRefs}{,}{#3}% - \addtocounter{maskedRefs}{1}% - \ifnum\value{maskedRefs} = 1% - \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citation removed for masked review})}% - \else% - \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citations removed for masked review})}% - \fi% - \apaSix@masked@refs% - } - - % \maskciteyearNP - \newcommand\maskciteyearNP{\@ifnextchar<{\maskciteyearNP@@also}{\maskciteyearNP@@also[]}} - \newcommand\maskciteyearNP@@also{} - \def\maskciteyearNP@@also[#1]{\@ifnextchar<{\maskciteyearNP@@@also[#1]}{\maskciteyearNP@@@also[][#1]}} - - \def\maskciteyearNP@@@also% - [#1][#2]#3{% - \setcounter{maskedRefs}{0}% - \SubStringsToCounter{maskedRefs}{,}{#3}% - \addtocounter{maskedRefs}{1}% - \ifnum\value{maskedRefs} = 1% - \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citation removed for masked review})}% - \else% - \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citations removed for masked review})}% - \fi% - \apaSix@masked@refs% - } - - } - - } - }{% - - % we are using apacite + natbib - - %%%%%%%%%%%% natbib commands %%%%%%%%%%%%%%%%%% - %% - %% \citep[e.g.,][p.~11]{vanDijk2001,Ross1987} => (e.g., van Dijk, 2001; Ross, 1987, p. 11) - %% \Citep[][p.~11]{vanDijk2001,Ross1987} => Van Dijk, 2001; Ross, 1987, p. 11) - %% \citealp[e.g.,][p.~11]{vanDijk2001,Ross1987} => e.g., van Dijk, 2001; Ross, 1987, p. 11 - %% \Citealp[][p.~11]{vanDijk2001,Ross1987} => Van Dijk, 2001; Ross, 1987, p. 11 - %% \citet[e.g.,][p.~11]{vanDijk2001,Ross1987} => e.g., van Dijk (2001); Ross (1987, p. 11) - %% \Citet[][p.~11]{vanDijk2001,Ross1987} => Van Dijk (2001); Ross (1987, p. 11) - %% \citeauthor[e.g.,][p.~11]{vanDijk2001,Ross1987} => e.g., van Dijk; Ross, p. 11 - %% \Citeauthor[e.g.,][p.~11]{vanDijk2001,Ross1987} => e.g., Van Dijk; Ross, p. 11 - %% \citeyearpar[e.g.,][p.~11]{vanDijk2001,Ross1987} => (e.g., 2001; 1987, p. 11) - %% \citeyear[e.g.,][p.~11]{vanDijk2001,Ross1987} => e.g., 2001; 1987, p. 11 - %% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - - \@ifundefined{apaSix@maskauthoridentity}% BDB - {% change masked references to unmasked - \providecommand\maskcitep\citep - \providecommand\maskCitep\Citep - \providecommand\maskcitealp\citealp - \providecommand\maskCitealp\Citealp - \providecommand\maskcitet\citet - \providecommand\maskCitet\Citet - \providecommand\maskciteauthor\citeauthor - \providecommand\maskCiteauthor\Citeauthor - \providecommand\maskciteyearpar\citeyearpar - \providecommand\maskciteyear\citeyear - }{% mask references to author - - \RequirePackage{substr} % to allow counting of masked references - \newcounter{maskedRefs} - - % \maskcitep - \newcommand\maskcitep{\@ifnextchar[{\maskcitep@@also}{\maskcitep@@also[]}} - \newcommand\maskcitep@@also{} - \def\maskcitep@@also[#1]{\@ifnextchar[{\maskcitep@@@also[#1]}{\maskcitep@@@also[][#1]}} - - \def\maskcitep@@@also% - [#1][#2]#3{% - \setcounter{maskedRefs}{0}% - \SubStringsToCounter{maskedRefs}{,}{#3}% - \addtocounter{maskedRefs}{1}% - \ifnum\value{maskedRefs} = 1% - \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citation removed for masked review})}% - \else% - \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citations removed for masked review})}% - \fi% - \apaSix@masked@refs% - } - - % \maskCitep - \newcommand\maskCitep{\@ifnextchar[{\maskCitep@@also}{\maskCitep@@also[]}} - \newcommand\maskCitep@@also{} - \def\maskCitep@@also[#1]{\@ifnextchar[{\maskCitep@@@also[#1]}{\maskCitep@@@also[][#1]}} - - \def\maskCitep@@@also% - [#1][#2]#3{% - \setcounter{maskedRefs}{0}% - \SubStringsToCounter{maskedRefs}{,}{#3}% - \addtocounter{maskedRefs}{1}% - \ifnum\value{maskedRefs} = 1% - \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citation removed for masked review})}% - \else% - \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citations removed for masked review})}% - \fi% - \apaSix@masked@refs% - } - - % \maskcitealp - \newcommand\maskcitealp{\@ifnextchar[{\maskcitealp@@also}{\maskcitealp@@also[]}} - \newcommand\maskcitealp@@also{} - \def\maskcitealp@@also[#1]{\@ifnextchar[{\maskcitealp@@@also[#1]}{\maskcitealp@@@also[][#1]}} - - \def\maskcitealp@@@also% - [#1][#2]#3{% - \setcounter{maskedRefs}{0}% - \SubStringsToCounter{maskedRefs}{,}{#3}% - \addtocounter{maskedRefs}{1}% - \ifnum\value{maskedRefs} = 1% - \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citation removed for masked review})}% - \else% - \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citations removed for masked review})}% - \fi% - \apaSix@masked@refs% - } - - % \maskCitealp - \newcommand\maskCitealp{\@ifnextchar[{\maskCitealp@@also}{\maskCitealp@@also[]}} - \newcommand\maskCitealp@@also{} - \def\maskCitealp@@also[#1]{\@ifnextchar[{\maskCitealp@@@also[#1]}{\maskCitealp@@@also[][#1]}} - - \def\maskCitealp@@@also% - [#1][#2]#3{% - \setcounter{maskedRefs}{0}% - \SubStringsToCounter{maskedRefs}{,}{#3}% - \addtocounter{maskedRefs}{1}% - \ifnum\value{maskedRefs} = 1% - \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citation removed for masked review})}% - \else% - \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citations removed for masked review})}% - \fi% - \apaSix@masked@refs% - } - - % \maskcitet - \newcommand\maskcitet{\@ifnextchar[{\maskcitet@@also}{\maskcitet@@also[]}} - \newcommand\maskcitet@@also{} - \def\maskcitet@@also[#1]{\@ifnextchar[{\maskcitet@@@also[#1]}{\maskcitet@@@also[][#1]}} - - \def\maskcitet@@@also% - [#1][#2]#3{% - \setcounter{maskedRefs}{0}% - \SubStringsToCounter{maskedRefs}{,}{#3}% - \addtocounter{maskedRefs}{1}% - \ifnum\value{maskedRefs} = 1% - \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citation removed for masked review})}% - \else% - \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citations removed for masked review})}% - \fi% - \apaSix@masked@refs% - } - - % \maskCitet - \newcommand\maskCitet{\@ifnextchar[{\maskCitet@@also}{\maskCitet@@also[]}} - \newcommand\maskCitet@@also{} - \def\maskCitet@@also[#1]{\@ifnextchar[{\maskCitet@@@also[#1]}{\maskCitet@@@also[][#1]}} - - \def\maskCitet@@@also% - [#1][#2]#3{% - \setcounter{maskedRefs}{0}% - \SubStringsToCounter{maskedRefs}{,}{#3}% - \addtocounter{maskedRefs}{1}% - \ifnum\value{maskedRefs} = 1% - \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citation removed for masked review})}% - \else% - \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citations removed for masked review})}% - \fi% - \apaSix@masked@refs% - } - - % \maskciteauthor - \newcommand\maskciteauthor{\@ifnextchar[{\maskciteauthor@@also}{\maskciteauthor@@also[]}} - \newcommand\maskciteauthor@@also{} - \def\maskciteauthor@@also[#1]{\@ifnextchar[{\maskciteauthor@@@also[#1]}{\maskciteauthor@@@also[][#1]}} - - \def\maskciteauthor@@@also% - [#1][#2]#3{% - \setcounter{maskedRefs}{0}% - \SubStringsToCounter{maskedRefs}{,}{#3}% - \addtocounter{maskedRefs}{1}% - \ifnum\value{maskedRefs} = 1% - \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citation removed for masked review})}% - \else% - \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citations removed for masked review})}% - \fi% - \apaSix@masked@refs% - } - - % \maskCiteauthor - \newcommand\maskCiteauthor{\@ifnextchar[{\maskCiteauthor@@also}{\maskCiteauthor@@also[]}} - \newcommand\maskCiteauthor@@also{} - \def\maskCiteauthor@@also[#1]{\@ifnextchar[{\maskCiteauthor@@@also[#1]}{\maskCiteauthor@@@also[][#1]}} - - \def\maskCiteauthor@@@also% - [#1][#2]#3{% - \setcounter{maskedRefs}{0}% - \SubStringsToCounter{maskedRefs}{,}{#3}% - \addtocounter{maskedRefs}{1}% - \ifnum\value{maskedRefs} = 1% - \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citation removed for masked review})}% - \else% - \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citations removed for masked review})}% - \fi% - \apaSix@masked@refs% - } - - % \maskciteyearpar - \newcommand\maskciteyearpar{\@ifnextchar[{\maskciteyearpar@@also}{\maskciteyearpar@@also[]}} - \newcommand\maskciteyearpar@@also{} - \def\maskciteyearpar@@also[#1]{\@ifnextchar[{\maskciteyearpar@@@also[#1]}{\maskciteyearpar@@@also[][#1]}} - - \def\maskciteyearpar@@@also% - [#1][#2]#3{% - \setcounter{maskedRefs}{0}% - \SubStringsToCounter{maskedRefs}{,}{#3}% - \addtocounter{maskedRefs}{1}% - \ifnum\value{maskedRefs} = 1% - \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citation removed for masked review})}% - \else% - \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citations removed for masked review})}% - \fi% - \apaSix@masked@refs% - } - - % \maskciteyear - \newcommand\maskciteyear{\@ifnextchar[{\maskciteyear@@also}{\maskciteyear@@also[]}} - \newcommand\maskciteyear@@also{} - \def\maskciteyear@@also[#1]{\@ifnextchar[{\maskciteyear@@@also[#1]}{\maskciteyear@@@also[][#1]}} - - \def\maskciteyear@@@also% - [#1][#2]#3{% - \setcounter{maskedRefs}{0}% - \SubStringsToCounter{maskedRefs}{,}{#3}% - \addtocounter{maskedRefs}{1}% - \ifnum\value{maskedRefs} = 1% - \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citation removed for masked review})}% - \else% - \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citations removed for masked review})}% - \fi% - \apaSix@masked@refs% - } - - } - - } - -}{% +\@ifundefined{def@biblatex}{}{% BDB % we are using biblatex @@ -1137,7 +774,7 @@ \@ifundefined{@abstract}{% \ClassWarningNoLine{apa6}{Abstract not defined}}{} \@ifundefined{@keywords}{% - \ClassWarningNoLine{apa6}{Keywords not defined}}{} + \ClassInfo{apa6}{Keywords not defined}}{} \@ifundefined{@authorSix}{% % -- thp 2006/01/05 \@ifundefined{@authorFive}{% % -- thp 2006/01/05 \@ifundefined{@authorFour}{% @@ -1585,7 +1222,6 @@ }{}% \raggedright% \setlength{\parindent}{0.4in}% - \indent% } \thispagestyle{titlepage} @@ -2086,7 +1722,7 @@ %% -%% Copyright (C) 2011 by Brian D. Beitzel <brian at beitzel.com> +%% Copyright (C) 2011, 2012 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 @@ -2111,6 +1747,7 @@ %% apa6.pdf, %% README.txt, %% APAamerican.txt, +%% APAbritish.txt, %% APAdutch.txt, %% APAenglish.txt, %% APAgerman.txt, |