summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-11-15 22:46:59 +0000
committerKarl Berry <karl@freefriends.org>2016-11-15 22:46:59 +0000
commit875085fac82bc16d4ecd70bea0b91a85b957bd3e (patch)
tree29b20ec52a5be678e5b37958d95d884d76a67bfb
parent9a85ca320191b3d06008f820b014995ad9dc7d6b (diff)
apa6 (15nov16)
git-svn-id: svn://tug.org/texlive/trunk@42516 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/apa6/apa6.pdfbin595555 -> 596278 bytes
-rw-r--r--Master/texmf-dist/source/latex/apa6/apa6.dtx32
-rw-r--r--Master/texmf-dist/tex/latex/apa6/apa6.cls16
3 files changed, 26 insertions, 22 deletions
diff --git a/Master/texmf-dist/doc/latex/apa6/apa6.pdf b/Master/texmf-dist/doc/latex/apa6/apa6.pdf
index 7cc02e37209..dd2a487a604 100644
--- a/Master/texmf-dist/doc/latex/apa6/apa6.pdf
+++ b/Master/texmf-dist/doc/latex/apa6/apa6.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/apa6/apa6.dtx b/Master/texmf-dist/source/latex/apa6/apa6.dtx
index 803f750900f..a25350edfbd 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}[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 @@ and the derived files apa6.ins,
% \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 @@ and the derived files apa6.ins,
{\b@level@two@skip}{\e@level@two@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}}
-
-% \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}}
+ {\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}}
% make the References section non-boldface
\AtBeginDocument{\def\st@rtbibsection{\mspart{\refname}}}% BDB -- this is for apacite
diff --git a/Master/texmf-dist/tex/latex/apa6/apa6.cls b/Master/texmf-dist/tex/latex/apa6/apa6.cls
index b04e2862f3f..6ff61c989cc 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}[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@level@two@skip}{\e@level@two@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@rtbibsection{\mspart{\refname}}}% BDB -- this is for apacite
\AtBeginDocument{\def\bibsection{\mspart{\refname}}}% BDB -- this is for apacite + natbib