texlive[42516] Master/texmf-dist: apa6 (15nov16)

[commits+karl at tug.org]

Revision: 42516
          http://tug.org/svn/texlive?view=revision&revision=42516
Author:   karl
Date:     2016-11-15 23:46:59 +0100 (Tue, 15 Nov 2016)
Log Message:
-----------
apa6 (15nov16)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/latex/apa6/apa6.pdf
    trunk/Master/texmf-dist/source/latex/apa6/apa6.dtx
    trunk/Master/texmf-dist/tex/latex/apa6/apa6.cls

Modified: trunk/Master/texmf-dist/doc/latex/apa6/apa6.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/source/latex/apa6/apa6.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/apa6/apa6.dtx	2016-11-15 22:46:47 UTC (rev 42515)
+++ trunk/Master/texmf-dist/source/latex/apa6/apa6.dtx	2016-11-15 22:46:59 UTC (rev 42516)
@@ -4,11 +4,11 @@
 %                                                                           %
 %    CHANGE THESE VALUES WITH EACH NEW RELEASE:                             %
 %                                                                           %
-%<class>\ProvidesClass{apa6}[2016/10/31 v2.23 APA formatting (6th edition)]
+%<class>\ProvidesClass{apa6}[2016/11/15 v2.30 APA formatting (6th edition)]
 %                                                                           %
 %<*internal>                                                                %
-\def\apaSixVersionDate{2016/10/31}
-\def\apaSixVersionNumber{2.23}
+\def\apaSixVersionDate{2016/11/15}
+\def\apaSixVersionNumber{2.30}
 %                                                                           %
 %                                                                           %
 % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -302,6 +302,9 @@
 % \changes{v2.23}{2016/10/31}{Bug fix for rotated tables in `man'
 % mode}
 %
+% \changes{v2.30}{2016/11/15}{Suppress trailing period for section
+% headings ending with a question mark}
+%
 % \begin{abstract}
 %   The \textit{Publication Manual} of the American Psychological
 %   Association is widely used in the social sciences.  The most
@@ -1817,32 +1820,29 @@
     {\b at level@two at skip}{\e at level@two at skip}%
     {\normalfont\normalsize\bfseries}}
 
-% \renewcommand{\subsubsection}[1]{\@startsection{subsubsection}{3}{1em}%
-%     {0\baselineskip \@plus 0.2ex \@minus 0.2ex}%
-%     {-\z@\relax}%
-%     {\normalfont\normalsize\bfseries\hspace{\parindent}{#1}\textbf{.}}{\relax}}
 
-\newcommand*{\addperi}[1]{#1.}
+\newcommand*{\typesectitle}[1]{#1\addperi}
 
+\newcommand*{\addperi}{%
+  \relax\ifhmode%
+    \ifnum\spacefactor>\@m \else.\fi%
+  \fi%
+}
+
 \renewcommand{\subsubsection}{\@startsection{subsubsection}{3}{\parindent}%
     {0\baselineskip \@plus 0.2ex \@minus 0.2ex}%
     {-1em}%
-    {\normalfont\normalsize\bfseries\addperi}}
+    {\normalfont\normalsize\bfseries\typesectitle}}
 
-% \renewcommand{\paragraph}[1]{\@startsection{paragraph}{4}{1em}%
-%     {0\baselineskip \@plus 0.2ex \@minus 0.2ex}%
-%     {-\z@\relax}%
-%     {\normalfont\normalsize\bfseries\itshape\hspace{\parindent}{#1}\textbf{\textit{.}}}{\relax}}
-
 \renewcommand{\paragraph}{\@startsection{paragraph}{4}{\parindent}%
     {0\baselineskip \@plus 0.2ex \@minus 0.2ex}%
     {-1em}%
-    {\normalfont\normalsize\bfseries\itshape\addperi}}
+    {\normalfont\normalsize\bfseries\itshape\typesectitle}}
 
 \renewcommand{\subparagraph}[1]{\@startsection{subparagraph}{5}{1em}%
     {0\baselineskip \@plus 0.2ex \@minus 0.2ex}%
     {-\z@\relax}%
-    {\normalfont\normalsize\itshape\hspace{\parindent}{#1}\textit{.}}{\relax}}
+    {\normalfont\normalsize\itshape\hspace{\parindent}{#1}\textit{\addperi}}{\relax}}
 
 % make the References section non-boldface
 \AtBeginDocument{\def\st at rtbibsection{\mspart{\refname}}}%  BDB -- this is for apacite

Modified: trunk/Master/texmf-dist/tex/latex/apa6/apa6.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/apa6/apa6.cls	2016-11-15 22:46:47 UTC (rev 42515)
+++ trunk/Master/texmf-dist/tex/latex/apa6/apa6.cls	2016-11-15 22:46:59 UTC (rev 42516)
@@ -27,7 +27,7 @@
 %% 
 %% ----------------------------------------------------------------------
 %% 
-\ProvidesClass{apa6}[2016/10/31 v2.23 APA formatting (6th edition)]
+\ProvidesClass{apa6}[2016/11/15 v2.30 APA formatting (6th edition)]
 \NeedsTeXFormat{LaTeX2e}
 
 \DeclareOption{man}{%
@@ -655,24 +655,28 @@
     {\b at level@two at skip}{\e at level@two at skip}%
     {\normalfont\normalsize\bfseries}}
 
+\newcommand*{\typesectitle}[1]{#1\addperi}
 
-\newcommand*{\addperi}[1]{#1.}
+\newcommand*{\addperi}{%
+  \relax\ifhmode%
+    \ifnum\spacefactor>\@m \else.\fi%
+  \fi%
+}
 
 \renewcommand{\subsubsection}{\@startsection{subsubsection}{3}{\parindent}%
     {0\baselineskip \@plus 0.2ex \@minus 0.2ex}%
     {-1em}%
-    {\normalfont\normalsize\bfseries\addperi}}
+    {\normalfont\normalsize\bfseries\typesectitle}}
 
-
 \renewcommand{\paragraph}{\@startsection{paragraph}{4}{\parindent}%
     {0\baselineskip \@plus 0.2ex \@minus 0.2ex}%
     {-1em}%
-    {\normalfont\normalsize\bfseries\itshape\addperi}}
+    {\normalfont\normalsize\bfseries\itshape\typesectitle}}
 
 \renewcommand{\subparagraph}[1]{\@startsection{subparagraph}{5}{1em}%
     {0\baselineskip \@plus 0.2ex \@minus 0.2ex}%
     {-\z@\relax}%
-    {\normalfont\normalsize\itshape\hspace{\parindent}{#1}\textit{.}}{\relax}}
+    {\normalfont\normalsize\itshape\hspace{\parindent}{#1}\textit{\addperi}}{\relax}}
 
 \AtBeginDocument{\def\st at rtbibsection{\mspart{\refname}}}%  BDB -- this is for apacite
 \AtBeginDocument{\def\bibsection{\mspart{\refname}}}%  BDB -- this is for apacite + natbib