From e955c13e335a7a8784b649ca6f3304bda5ec9d3f Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 17 Jan 2012 00:00:23 +0000 Subject: apa6 (16jan12) git-svn-id: svn://tug.org/texlive/trunk@25124 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/apa6/apa6.cls | 67 +++++++++++-------------------- 1 file changed, 24 insertions(+), 43 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 2e0134f4d11..2894b6dae2a 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}[2011/12/12 v1.12 APA formatting (6th edition)] +\ProvidesClass{apa6}[2012/01/16 v1.13 APA formatting (6th edition)] \NeedsTeXFormat{LaTeX2e} \DeclareOption{man}{% @@ -94,6 +94,10 @@ \def\def@noextraspace{\@noextraspacemode} } +\DeclareOption{donotrepeattitle}{% + \def\def@donotrepeattitle{\@donotrepeattitlemode} +} + \DeclareOption{floatsintext}{% \def\def@floatsintext{\@floatsintext} } @@ -241,15 +245,6 @@ \@ifundefined{long@table}{}{% \RequirePackage{array} \RequirePackage{longtable} -\def\LT@makecaption#1#2#3{% - \LT@mcol\LT@cols c{\hbox to\z@{\hss\parbox{\linewidth}{% - \vskip 10pt% - #1{#2}% - \let\BBAB\table@BBAB% -- thp 2005/07/23 - \par\emph{#3}% - \let\BBAB\normal@BBAB% -- thp 2005/07/23 - \endgraf\vskip\baselineskip}% - \hss}}} }% END of loading longtable \@ifundefined{tt@family}{}{% \DeclareFontShape{OT1}{cmtt}{bx}{n}{ <-> cmssbx10 }{} % probably not the @@ -326,7 +321,7 @@ \def\endtablenotes{\par}% } }{% - \def\TPT@doparanotes{\par\vspace{-.5\baselineskip}% BDB + \def\TPT@doparanotes{\par\vspace{-.4\baselineskip}% BDB \prevdepth\z@ \TPT@hsize \TPTnoteSettings \raggedright @@ -1051,7 +1046,7 @@ \captionsetup[table]{position=above,skip=0pt,labelformat=tablelabel,labelsep=newline,textformat=tabletext} \captionsetup[figure]{position=below,skip=0pt,labelformat=figurelabel,labelsep=period} -\setlength{\belowcaptionskip}{15pt} +\setlength{\belowcaptionskip}{0pt} @@ -1166,18 +1161,6 @@ } -\long\def\ifapamodeman#1#2{\@ifundefined{def@man}{#2}{#1}} -\long\def\ifapamodejou#1#2{\@ifundefined{def@jou}{#2}{#1}} -\long\def\ifapamodedoc#1#2{\@ifundefined{def@doc}{#2}{#1}} -\long\def\ifapamode#1#2#3{% - \@ifundefined{def@man}{% - \@ifundefined{def@jou}{% - \@ifundefined{def@doc}{\ClassError{apa6}{Undefined mode state!}}{#3}% - }{#2}% - }{#1}% -} - - \newsavebox\gr@box \newlength\gr@boxwidth \newlength\gr@boxheight @@ -1329,6 +1312,9 @@ \newcommand{\@doublespacing}{\linespread{1.655}} \@doublespacing +\captionsetup[table]{skip=10pt} +\captionsetup[figure]{skip=10pt} + \def\rightheader#1{\def\r@headr{\protect\MakeUppercase{#1}}} \def\leftheader#1{\def\r@headl{#1}} \newcommand{\shorttitle}[1]{\def\@shorttitle{#1}} @@ -1465,7 +1451,7 @@ \fi} -\captionsetup{justification=RaggedRight} +\captionsetup{justification=raggedright} \def\maketitle{ @@ -1566,7 +1552,6 @@ \end{center} -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% added by BDB \@ifundefined{apaSix@maskauthoridentity}{ \@ifundefined{@acks} {} @@ -1581,30 +1566,26 @@ } }{% mask author identity -- show nothing in the author or author note space } -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \newpage %BDB\hyphenpenalty 10000 \fussy \@ifundefined{@abstract}{}{% - \section{\normalfont\normalsize\abstractname}% BDB - \noindent\@abstract\par% BDB - \@ifundefined{@keywords}{}{% - \setlength{\parindent}{0.4in}% BDB - \indent\textit{Keywords:} \@keywords% - }% - \newpage + \section{\normalfont\normalsize\abstractname}% BDB + \noindent\@abstract\par% BDB + \@ifundefined{@keywords}{}{% + \setlength{\parindent}{0.4in}% BDB + \indent\textit{Keywords:} \@keywords% + }% + \newpage } - \@ifundefined{DoNotRepeatTitle}{% BDB - \begin{center}% BDB - \normalfont{\@title}% BDB - \end{center}% BDB - }{} % BDB - \raggedright% BDB - \setlength{\parindent}{0.4in}% BDB - \indent - + \@ifundefined{def@donotrepeattitle}{ + \section{\protect\normalfont{\@title}} + }{}% + \raggedright% + \setlength{\parindent}{0.4in}% + \indent% } \thispagestyle{titlepage} -- cgit v1.2.3