apa6 (16jan12)

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

3 files changed, 73 insertions, 92 deletions

diff --git a/Master/texmf-dist/doc/latex/apa6/apa6.pdf b/Master/texmf-dist/doc/latex/apa6/apa6.pdf
index 63d6976f490..277b54a39be 100644
--- a/Master/texmf-dist/doc/latex/apa6/apa6.pdf
+++ b/Master/texmf-dist/doc/latex/apa6/apa6.pdf
diff --git a/Master/texmf-dist/source/latex/apa6/apa6.dtx b/Master/texmf-dist/source/latex/apa6/apa6.dtx
index f6fd3d8c926..265c0f55608 100644
--- a/Master/texmf-dist/source/latex/apa6/apa6.dtx
+++ b/Master/texmf-dist/source/latex/apa6/apa6.dtx
@@ -4,11 +4,11 @@
 %                                                                           %
 %    CHANGE THESE VALUES WITH EACH NEW RELEASE:                             %
 %                                                                           %
-%<class>\ProvidesClass{apa6}[2011/12/12 v1.12 APA formatting (6th edition)]
+%<class>\ProvidesClass{apa6}[2012/01/16 v1.13 APA formatting (6th edition)]
 %                                                                           %
 %<*internal>                                                                %
-\def\apaSixVersionDate{2011/12/12}
-\def\apaSixVersionNumber{1.12}
+\def\apaSixVersionDate{2012/01/16}
+\def\apaSixVersionNumber{1.13}
 %                                                                           %
 %                                                                           %
 % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -218,7 +218,7 @@ and the derived files           apa6.ins,
 % \changes{v1.02}{2011/12/01}{More reliable font-size selection}
 % \changes{v1.02}{2011/12/01}{Corrected default mode to jou}
 %
-% \changes{v1.11}{2011/12/10}{New option 'noextraspace'}
+% \changes{v1.11}{2011/12/10}{New option `noextraspace'}
 % \changes{v1.11}{2011/12/10}{Added German language support}
 % \changes{v1.11}{2011/12/10}{Removed automated rotation of wide figures}
 % \changes{v1.11}{2011/12/10}{Load lmodern and fontenc by default}
@@ -229,6 +229,15 @@ and the derived files           apa6.ins,
 % first figure on the same page as the references (when no tables were
 % present)}
 %
+% \changes{v1.13}{2012/01/16}{Removed duplicate definitions of
+% ifapamodeXXX}
+% \changes{v1.13}{2012/01/16}{Removed redundant definition of
+% LT@makecaption}
+% \changes{v1.13}{2012/01/16}{Removed hyphenation of figure and table
+% captions in man mode}
+% \changes{v1.13}{2012/01/16}{Increased spacing on top and bottom of
+% tables (below caption and above table notes, if present)}
+%
 % \begin{abstract}
 %   The \textit{Publication Manual} of the American Psychological
 %   Association is widely used in the social sciences.  The most
@@ -1027,6 +1036,11 @@ and the derived files           apa6.ins,
   \def\def@noextraspace{\@noextraspacemode}
 }
 
+% suppress the title at the introduction (in case a different title is desired)
+\DeclareOption{donotrepeattitle}{%
+  \def\def@donotrepeattitle{\@donotrepeattitlemode}
+}
+
 % in order to have tables and figure inside the text, Guillaume Jourjon 19/10/10
 \DeclareOption{floatsintext}{%
   \def\def@floatsintext{\@floatsintext}
@@ -1197,16 +1211,16 @@ and the derived files           apa6.ins,
  \RequirePackage{longtable}
 %
 % longtable messes with captions too, we need to intervene to match style
-%
-\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}}}
+% NOTE: the caption package makes the following redundant
+%\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
 %
 % Switch font family for manuscript if required
@@ -1298,7 +1312,7 @@ and the derived files           apa6.ins,
      \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
@@ -2075,7 +2089,8 @@ and the derived files           apa6.ins,
 \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}
+% space between caption and surrounding document text
+\setlength{\belowcaptionskip}{0pt}
 
 
 %=============================================================
@@ -2206,19 +2221,6 @@ and the derived files           apa6.ins,
  }{\@ifundefined{@authorSix}{\@error@toomanyaffils}{}}         % -- thp 2006/01/05
 }
 
-%==== Conditional compilation macros depending on mode ====
-
-\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}%
-}
-
 %==== Automatic figure size and orientation determination ====
 
 \newsavebox\gr@box
@@ -2460,6 +2462,10 @@ and the derived files           apa6.ins,
 \newcommand{\@doublespacing}{\linespread{1.655}}
 \@doublespacing
 
+% allow a little more space between captions and floats in man mode
+\captionsetup[table]{skip=10pt}
+\captionsetup[figure]{skip=10pt}
+
 \def\rightheader#1{\def\r@headr{\protect\MakeUppercase{#1}}}
 \def\leftheader#1{\def\r@headl{#1}}
 %\def\shorttitle#1{\def\s@title{#1}}%\markright{\hfill #1 \thepage} %% no rm - thp 020227
@@ -2670,7 +2676,7 @@ and the derived files           apa6.ins,
 
 %========== Alterations to captions (BDB) ===================
 
-\captionsetup{justification=RaggedRight}
+\captionsetup{justification=raggedright}
 
 
 %========= Maketitle, margins, lengths, etc. ==========
@@ -2781,7 +2787,6 @@ and the derived files           apa6.ins,
 
   \end{center}
 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%  added by BDB
   \@ifundefined{apaSix@maskauthoridentity}{
       \@ifundefined{@acks}
        {}
@@ -2796,31 +2801,26 @@ and the derived files           apa6.ins,
        }
   }{%  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}{\section{\protect\normalfont{\@title}}}{}
-  \@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}
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}