summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/apa6/apa6.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/source/latex/apa6/apa6.dtx')
-rw-r--r--Master/texmf-dist/source/latex/apa6/apa6.dtx137
1 files changed, 87 insertions, 50 deletions
diff --git a/Master/texmf-dist/source/latex/apa6/apa6.dtx b/Master/texmf-dist/source/latex/apa6/apa6.dtx
index a4968e54009..bfa0dd58ed3 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}[2012/12/29 v2.11 APA formatting (6th edition)]
+%<class>\ProvidesClass{apa6}[2013/01/10 v2.12 APA formatting (6th edition)]
% %
%<*internal> %
-\def\apaSixVersionDate{2012/12/29}
-\def\apaSixVersionNumber{2.11}
+\def\apaSixVersionDate{2013/01/10}
+\def\apaSixVersionNumber{2.12}
% %
% %
% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -20,7 +20,7 @@
apa6 - A LaTeX class for formatting documents in compliance with the
American Psychological Association's Publication Manual, 6th edition
-Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com>
+Copyright (C) 2011-2013 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
@@ -64,7 +64,7 @@ details.
apa6 - A LaTeX class for formatting documents in compliance with the
American Psychological Association's Publication Manual, 6th edition
-Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com>
+Copyright (C) 2011-2013 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
@@ -84,7 +84,7 @@ by, the American Psychological Association.
\endpreamble
\postamble
-Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com>
+Copyright (C) 2011-2013 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
@@ -273,6 +273,9 @@ and the derived files apa6.ins,
% \changes{v2.11}{2012/12/29}{Refined handling of `mask' option in the
% apa6.ptex file}
%
+% \changes{v2.12}{2013/01/09}{Fixed `jou' mode to handle a starting
+% page other than 1}
+%
%
% \begin{abstract}
% The \textit{Publication Manual} of the American Psychological
@@ -453,7 +456,10 @@ and the derived files apa6.ins,
% affiliation line
% \item \DescribeMacro{\journal}|\journal|\marg{journal-name}: Journal
% name or other note; typeset in the top left header of page 1
-% (|jou| and |doc| modes only)
+% (|jou| and |doc| modes only); to change the starting page to a
+% number other than 1, insert the following line immediately after
+% |\maketitle|:\\
+% |\setcounter{page}|\marg{custom-page-number}
% \item \DescribeMacro{\volume}|\volume|\marg{journal-volume}: Volume,
% number, pages; typeset in the top left header in |jou| and |doc|
% modes, underneath the content of |\journal|
@@ -538,17 +544,16 @@ and the derived files apa6.ins,
% \subsection{Other Macros}
% \label{sec:othermacros}
% \begin{itemize}
-% \item
-% \DescribeMacro{\centeredcaption}|\centeredcaption|\marg{width}\marg{caption-text}:
-% Used with double-column figures to create centered captions
-% narrower than |\textwidth|
% \item \DescribeMacro{\begin\{figure*\}} \DescribeMacro{\end\{figure*\}}
+% \DescribeMacro{\begin\{table*\}} \DescribeMacro{\end\{table*\}}
% When a figure is too wide for a single column (in |jou| mode), use
% |\begin{figure*}| and |\end{figure*}| instead of the non-starred
-% version. When using double-column figures (|jou| mode), it looks
-% better if you use |\centeredcaption| instead of |\caption|, with
-% the first parameter about equal to the width of the float (table
-% or figure).
+% version. The same applies with |\begin{table*}| and |\end{table*}|.
+% When using double-column tables or figures (|jou| mode), use the
+% |\centering| command; for example:\par
+% |\begin{table*}|\par\vspace{-.5em}
+% | \centering|\par\vspace{-.5em}
+% | \begin{threeparttable}|\par
% \item
% \DescribeMacro{\fitfigure}|\fitfigure|\oarg{height}\marg{eps-filename}:
% Automatically fit a postscript figure; use instead of
@@ -976,21 +981,31 @@ and the derived files apa6.ins,
% statistical prowess in analyzing these data is unmatched.
%
% \begin{table}[htbp]
-% \caption{A complex table}
-% \label{tab:ComplexTable}
-% \begin{tabular}{@{}lrrl@{}} \toprule
-% Distribution type & \multicolumn{2}{l}{Percentage of} & Total \\
-% & \multicolumn{2}{l}{targets with} & trials per \\
-% & \multicolumn{2}{l}{segment in} & participant \\
-% \cmidrule(r){2-3}
-% & Onset & Coda & \\
-% \midrule
-% Categorical -- onset & 100 & 0 & 196 \\
-% Probabilistic & 80 & 20 & 200 \\
-% & 60 & 40 & 160 \\
-% Categorical -- coda & 0 & 100 & 196 \\
-% \bottomrule
-% \end{tabular}
+% \vspace*{2em}
+% \begin{threeparttable}
+% \caption{A Complex Table}
+% \label{tab:ComplexTable}
+% \begin{tabular}{@{}lrrr@{}} \toprule
+% Distribution type & \multicolumn{2}{l}{Percentage of} & Total number \\
+% & \multicolumn{2}{l}{targets with} & of trials per \\
+% & \multicolumn{2}{l}{segment in} & participant \\ \cmidrule(r){2-3}
+% & Onset & Coda & \\ \midrule
+% Categorical -- onset\tabfnm{a} & 100 & 0 & 196 \\
+% Probabilistic & 80 & 20\tabfnm{*} & 200 \\
+% Categorical -- coda\tabfnm{b} & 0 & 100\tabfnm{*} & 196 \\ \midrule
+% \end{tabular}
+% \begin{tablenotes}[para,flushleft]
+% {\small
+% \textit{Note.} All data are approximate.
+%
+% \tabfnt{a}Categorical may be onset.
+% \tabfnt{b}Categorical may also be coda.
+%
+% \tabfnt{*}\textit{p} < .05.
+% \tabfnt{**}\textit{p} < .01.
+% }
+% \end{tablenotes}
+% \end{threeparttable}
% \end{table}
%
% \section{Discussion}
@@ -2804,6 +2819,13 @@ and the derived files apa6.ins,
\fancyhead[RO]{\stiny{\@ccoppy}\vspace{-0.15\baselineskip}\\
\stiny{\@copnum}}
\fancyfoot[CO]{\small\rm\thepage}
+ % the following are needed if the starting page number is changed to
+ % an even number:
+ \fancyhead[LE]{\stiny{\@journal}\vspace{-0.15\baselineskip}\\
+ \stiny{\@vvolume}}
+ \fancyhead[RE]{\stiny{\@ccoppy}\vspace{-0.15\baselineskip}\\
+ \stiny{\@copnum}}
+ \fancyfoot[CE]{\small\rm\thepage}
\renewcommand{\headrulewidth}{0pt}
\renewcommand{\footrulewidth}{0pt}
\thispagestyle{fancy}
@@ -2851,10 +2873,15 @@ and the derived files apa6.ins,
\setcounter{secnumdepth}{0}
-\def\ps@myheadings{\let\@mkboth\@gobbletwo
-\def\@oddhead{\hbox{}\rightmark \hfil
-\large\rm\thepage}\def\@oddfoot{}\def\@evenhead{\large\rm \thepage\hfil\leftmark\hbox
-{}}\def\@evenfoot{}\def\sectionmark##1{}\def\subsectionmark##1{}}
+\def\ps@myheadings{%
+ \let\@mkboth\@gobbletwo
+ \def\@oddhead{\hbox{}\rightmark \hfil\rm\thepage}
+ \def\@oddfoot{}
+ \def\@evenhead{\rm\thepage\hfil\leftmark\hbox{}}
+ \def\@evenfoot{}
+ \def\sectionmark##1{}
+ \def\subsectionmark##1{}
+}
\pagestyle{myheadings}
%\long\def\@makecaption#1#2{%
@@ -3495,21 +3522,31 @@ Table \ref{tab:ComplexTable} contains some sample data. Our
statistical prowess in analyzing these data is unmatched.
\begin{table}[htbp]
- \caption{A complex table}
- \label{tab:ComplexTable}
- \begin{tabular}{@{}lrrl@{}} \toprule
- Distribution type & \multicolumn{2}{l}{Percentage of} & Total \\
- & \multicolumn{2}{l}{targets with} & trials per \\
- & \multicolumn{2}{l}{segment in} & participant \\
- \cmidrule(r){2-3}
- & Onset & Coda & \\
- \midrule
- Categorical -- onset & 100 & 0 & 196 \\
- Probabilistic & 80 & 20 & 200 \\
- & 60 & 40 & 160 \\
- Categorical -- coda & 0 & 100 & 196 \\
- \bottomrule
- \end{tabular}
+ \vspace*{2em}
+ \begin{threeparttable}
+ \caption{A Complex Table}
+ \label{tab:ComplexTable}
+ \begin{tabular}{@{}lrrr@{}} \toprule
+ Distribution type & \multicolumn{2}{l}{Percentage of} & Total number \\
+ & \multicolumn{2}{l}{targets with} & of trials per \\
+ & \multicolumn{2}{l}{segment in} & participant \\ \cmidrule(r){2-3}
+ & Onset & Coda & \\ \midrule
+ Categorical -- onset\tabfnm{a} & 100 & 0 & 196 \\
+ Probabilistic & 80 & 20\tabfnm{*} & 200 \\
+ Categorical -- coda\tabfnm{b} & 0 & 100\tabfnm{*} & 196 \\ \midrule
+ \end{tabular}
+ \begin{tablenotes}[para,flushleft]
+ {\small
+ \textit{Note.} All data are approximate.
+
+ \tabfnt{a}Categorical may be onset.
+ \tabfnt{b}Categorical may also be coda.
+
+ \tabfnt{*}\textit{p} < .05.
+ \tabfnt{**}\textit{p} < .01.
+ }
+ \end{tablenotes}
+ \end{threeparttable}
\end{table}
\section{Discussion}
@@ -3606,7 +3643,7 @@ other sources \parencite{Shotton1989,Lassen2006}. \lipsum[3]
Table~\ref{tab:BasicTable} summarizes the data. \lipsum[15]
\begin{table}
- \caption{Sample basic table}
+ \caption{Sample Basic Table}
\label{tab:BasicTable}
\begin{tabular}{@{}llr@{}} \toprule
\multicolumn{2}{c}{Item} \\ \cmidrule(r){1-2}