From e00ea5b1556452ef59e0c4c2175bc09831680873 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 28 May 2008 14:04:33 +0000 Subject: apa update (long ago) git-svn-id: svn://tug.org/texlive/trunk@8384 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/apa/apa.cls | 483 +++++++++++++++++++++----------- 1 file changed, 326 insertions(+), 157 deletions(-) (limited to 'Master/texmf-dist/tex/latex/apa/apa.cls') diff --git a/Master/texmf-dist/tex/latex/apa/apa.cls b/Master/texmf-dist/tex/latex/apa/apa.cls index 8c8d74cbf46..32fadf75f44 100644 --- a/Master/texmf-dist/tex/latex/apa/apa.cls +++ b/Master/texmf-dist/tex/latex/apa/apa.cls @@ -1,9 +1,9 @@ % -% apa.cls version 1.3.0 +% apa.cls version 1.3.2 % % NOTE CHANGE IN VERSION NUMBERING : 1.21--1.28 should have been 1.2.1--1.2.8 % -% Athanassios Protopapas, August 2002 +% Athanassios Protopapas, January 2006 % protopap@ilsp.gr % % This package may be distributed under the terms of the LaTeX Project Public @@ -18,7 +18,7 @@ %%%%%%%%%%%%%%%%% \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{apa}[2002/08/30 American Psychological Association format v1.3.0] +\ProvidesClass{apa}[2006/01/31 American Psychological Association format v1.3.2] \DeclareOption{man}{% \def\def@man{\@manmode} @@ -32,10 +32,18 @@ \def\def@doc{\@docmode} } +\DeclareOption{babel}{% +\def\def@babel{\@babel} +} + \DeclareOption{notimes}{% \@ifundefined{def@jou}{}{\def\def@notimes{\@notimes}} } +\DeclareOption{notxfonts}{% -- thp 2005/07/23 +\@ifundefined{def@jou}{}{\def\def@notxfonts{\@notxfonts}} +} + \DeclareOption{nosf}{% \@ifundefined{def@man}{}{\def\def@nosf{\@nosf}} } @@ -49,7 +57,6 @@ } \DeclareOption{longtable}{% -%\@ifundefined{def@man}{}{\def\long@table{\relax}} \def\long@table{\relax} } @@ -67,7 +74,6 @@ \DeclareOption*{% \PassOptionsToClass{\CurrentOption}{article}% -%\ClassWarning{apa}{Supported options are: man, jou, doc, notimes, nosf, fignum, notab, nobf} } \ProcessOptions @@ -85,7 +91,6 @@ \@ifundefined{def@man}{}{% \LoadClass[11pt]{article} -% \RequirePackage{ulem}[1995/12/17] %% not any more, since APA manual 5th ed % % endnotes and endfloat loaded later % longtable must be loaded before endfloat @@ -96,9 +101,12 @@ % 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{\columnwidth}{% + \LT@mcol\LT@cols c{\hbox to\z@{\hss\parbox{\linewidth}{% \vskip 10pt% - #1{#2}\par\emph{#3}% + #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 @@ -119,14 +127,46 @@ % % For jou mode, load times (and related math fonts) if available +% First try txfonts because they are supposed to have better math definitions % \@ifundefined{def@jou}{}{% \LoadClass[twoside]{article} \@ifundefined{def@notimes}{% - \IfFileExists{pslatex.sty}{\RequirePackage{pslatex}}{ - \RequirePackage{times} - \IfFileExists{mathptm.sty}{\RequirePackage{mathptm}}{}}}{} -} + \newif\iftxfonts % -- thp 2005/07/23 + \txfontsfalse % added checks for txfonts because they may be undesirable + % for example, there are no Greek txfonts but there are times + \IfFileExists{txfonts.sty}{\@ifundefined{def@notxfonts}{\txfontstrue}{}}{} + \iftxfonts% + \RequirePackage{txfonts}% + \typeout{apa.cls: Using txfonts}% Changed from Warning -- thp 2005/12/28 + %%% + % According to Erik Meijer, txfonts causes problems if amsmath is loaded later + % (i.e., via \usepackage by the user); instead of providing yet another option + % to load amsmath by apa.cls, we adopt Erik's suggestion to undefine temporarily + % the offending macros -- thp 2005/12/28 + \let\tempiint\iint\let\iint\undefined + \let\tempiiint\iiint\let\iiint\undefined + \let\tempiiiint\iiiint\let\iiiint\undefined + \let\tempidotsint\idotsint\let\idotsint\undefined + \let\tempopenbox\openbox\let\openbox\undefined + \AtBeginDocument{% + \let\iint\tempiint\let\tempiint\undefined + \let\iiint\tempiiint\let\tempiiint\undefined + \let\iiiint\tempiiiint\let\tempiiiint\undefined + \let\idotsint\tempidotsint\let\tempidotsint\undefined + \let\openbox\tempopenbox\let\tempopenbox\undefined + } + %%% end of taking care of txfonts problems + \else% + % if txfonts are not available/desirable, try pslatextimes/mathptm + \IfFileExists{pslatex.sty} + {\RequirePackage{pslatex}} + % if pslatex is not available, try times/mathptm + {\RequirePackage{times} + \IfFileExists{mathptm.sty}{\RequirePackage{mathptm}}{}}% + \fi% txfonts not available/desirable + }{}% def@notimes +}% def@jou \@ifundefined{def@doc}{}{% \LoadClass[11pt]{article} @@ -134,47 +174,44 @@ %========= Language portability parameters =========== -\def\GreekDefs{% - \def\rheadname{Up'ertitlos:} - \def\acksname{Shmei'wseis tou suggraf'ea} - \def\figurecaptionsname{Lez'antes sqhm'atwn} - \def\notesname{Uposhmei'wseis} -% -% Bibliography definitions for Greek - \renewcommand{\BBC}{\textgreek{;} } - \renewcommand{\BBAA}{\textgreek{kai}} - \renewcommand{\BOthers}{\textgreek{k.\nobreakspace syn.}} +% Language-specific definition of strings is handled externally -- thp 2005/12/30 +% Based on handling of the same issue in apacite.sty + +% First define the default English macros in case no external file is present or needed +\def\rheadname{Running head:} +\def\acksname{Author Note} +\def\figurecaptionsname{Figure Captions} +\def\notesname{Footnotes} + +\AtBeginDocument{% so that we know what language is active in babel + +% \typeout{\string\languagename\space is\space\languagename} +% \@ifundefined{iflanguage}% this is defined by babel, so it means babel is loaded + % Unfortunately, because babel is built into the format + % in modern distributions, \iflanguage is defined and + % \languagename contains whichever language happens to be + % last in the definition list, whether or not the babel + % package is loaded by the current document + + \@ifundefined{def@babel}% this is defined only if the user requested loading babel + {\def\@apa@langfile{english.apa}} + {\def\@apa@langfile{\languagename.apa}} + \InputIfFileExists{\@apa@langfile}{}{% + \ClassWarningNoLine{apa}{Language definition file \@apa@langfile\space not found} + }% } -\AtBeginDocument{% so that we know already what language is active in babel - \def\refname{\bibname} % This is defined as 'References' in apacite.sty - % and should change appropriately in babel for other languages - \def\rheadname{Running head:} - \def\acksname{Author Note} - \def\figurecaptionsname{Figure Captions} - \def\notesname{Footnotes} - \@ifundefined{iflanguage}{}% then we are not using babel! - {\edef\str@grk{greek}\ifx\languagename\str@grk\GreekDefs\fi} -} +%========== Load babel if required =================== + +\@ifundefined{def@babel}{}{% -- thp 2005/07/23 + \RequirePackage{babel} % -- thp 2005/07/23, removed options 2005/12/28 +} + +%========== Load new apacite ========================= -%========== Alterations to apacite =================== - -\RequirePackage{apacite} - -\def\thebibliography#1{% - \bibnewpage - \@ifundefined{chapter}% - {\section*{\refname}% - \@mkboth{\MakeUppercase{\refname}}{\MakeUppercase{\refname}} - \addcontentsline{toc}{section}{\refname}}% - {\chapter*{\bibname}% - \@mkboth{\MakeUppercase{\bibname}}{\MakeUppercase{\bibname}} - \addcontentsline{toc}{chapter}{\bibname}} - \bibsize - \list - {\relax}{\bib@indent} - \sloppy\clubpenalty4000\widowpenalty4000 - \sfcode`\.=1000\relax} +\@ifundefined{def@man}{% -- thp 2005/07/23 + \RequirePackage{apacite}[2005/06/08]} + {\RequirePackage[bibnewpage]{apacite}[2005/06/08]} %========== APA Section heading & seriation, from theapa.sty @@ -183,18 +220,6 @@ % \def\apa@startsection#1#2#3{\@startsection{}{}{#1}{#2}{#3}{\relax}*} -% -% \b@level@LEVEL-NO@skip -% Skip before heading: If >= 0, the following par is NOT indented. -% If < 0, it is indented. -% \b@level@LEVEL-NO@skip = vertical skip -% -% \e@level@LEVEL-NO@skip -% Skip after heading: If > 0, the following par starts in a new line; -% \e@level@LEVEL-NO@skip = vertical skip -% If <= 0, it starts just after the heading; -% \e@level@LEVEL-NO@skip = horizontal skip -% \newskip\b@level@one@skip \b@level@one@skip=2.5ex plus 1ex minus .2ex \newskip\e@level@one@skip \e@level@one@skip=1.5ex plus .6ex minus .1ex \newskip\b@level@two@skip \b@level@two@skip=2.5ex plus 1ex minus .2ex @@ -345,18 +370,6 @@ \let\subparagraph=\levelfive% } -% -% APA Seriations: ONE level of seriation only. -% \begin{seriate} \item ... \end{seriate} -% within a paragraph or sentence -% \begin{APAenumerate} \item ... \end{APAenumerate} -% at the start of each paragraph in a series -% with enumeration -% \begin{APAitemize} \item ... \end{APAitemize} -% at the start of each paragraph in a series -% without enumeration -% - % Refer to LaTeX book to modify, if you want, spaces before and after of % \begin{...} ... \end{...} or spaces between \item-s. \newcounter{APAenum} @@ -408,6 +421,12 @@ \let\threeauthors=\onetwoauthors \long\def\fourauthors#1#2#3#4{\long\def\@authorOne{#1}\long\def\@authorTwo{#2}% \long\def\@authorThree{#3}\long\def\@authorFour{#4}\long\def\@author{#1}} +\long\def\fiveauthors#1#2#3#4#5{\long\def\@authorOne{#1}\long\def\@authorTwo{#2}%%%% + \long\def\@authorThree{#3}\long\def\@authorFour{#4}\long\def\@authorFive{#5}% %% + \long\def\@author{#1}} %% 2006/01/05 -- added as contributed by Aaron Geller %% +\long\def\sixauthors#1#2#3#4#5#6{\long\def\@authorOne{#1}% %% thp 2006/01/05 + \long\def\@authorTwo{#2}\long\def\@authorThree{#3}\long\def\@authorFour{#4}%% thp 2006/01/05 + \long\def\@authorFive{#5}\long\def\@authorSix{#6}\long\def\@author{#1}} %% thp 2006/01/05 \long\def\affiliation#1{\long\def\@affil{#1}} \long\def\twoaffiliations#1#2{\long\def\@affilOne{#1}\long\def\@affilTwo{#2}% \long\def\@affil{#1}} @@ -418,6 +437,12 @@ \let\threeaffiliations=\onetwoaffiliations \long\def\fouraffiliations#1#2#3#4{\long\def\@affilOne{#1}\long\def\@affilTwo{#2}% \long\def\@affilThree{#3}\long\def\@affilFour{#4}\long\def\@affil{#1}} +\long\def\fiveaffiliations#1#2#3#4#5{\long\def\@affilOne{#1}\long\def\@affilTwo{#2}%% + \long\def\@affilThree{#3}\long\def\@affilFour{#4}\long\def\@affilFive{#5}% %% + \long\def\@affil{#1}} %% 2006/01/05 -- added as contributed by Aaron Geller %% +\long\def\sixaffiliations#1#2#3#4#5#6{\long\def\@affilOne{#1}% %% thp 2006/01/05 + \long\def\@affilTwo{#2}\long\def\@affilThree{#3}\long\def\@affilFour{#4}%% thp 2006/01/05 + \long\def\@affilFive{#5}\long\def\@affilSix{#6}\long\def\@affil{#1}} %% thp 2006/01/05 \long\def\note#1{\long\def\@note{#1}} \long\def\abstract#1{\long\def\@abstract{#1}} \long\def\acknowledgements#1{\long\def\@acks{#1}} @@ -436,18 +461,26 @@ \ClassWarningNoLine{apa}{Affiliation not defined}\def\@affil{Affiliation}}{} \@ifundefined{@abstract}{% \ClassWarningNoLine{apa}{Abstract not defined}}{} - \@ifundefined{@authorFour}{% - \@ifundefined{@authorThree}{% - \@ifundefined{@authorTwo}{% - }{\@ifundefined{@affilTwo}{\@error@toomanyauthors}{}} - }{\@ifundefined{@affilThree}{\@error@toomanyauthors}{}} - }{\@ifundefined{@affilFour}{\@error@toomanyauthors}{}} - \@ifundefined{@affilFour}{% - \@ifundefined{@affilThree}{% - \@ifundefined{@affilTwo}{% - }{\@ifundefined{@authorTwo}{\@error@toomanyaffils}{}} - }{\@ifundefined{@authorThree}{\@error@toomanyaffils}{}} - }{\@ifundefined{@authorFour}{\@error@toomanyaffils}{}} + \@ifundefined{@authorSix}{% % -- thp 2006/01/05 + \@ifundefined{@authorFive}{% % -- thp 2006/01/05 + \@ifundefined{@authorFour}{% + \@ifundefined{@authorThree}{% + \@ifundefined{@authorTwo}{% + }{\@ifundefined{@affilTwo}{\@error@toomanyauthors}{}} + }{\@ifundefined{@affilThree}{\@error@toomanyauthors}{}} + }{\@ifundefined{@affilFour}{\@error@toomanyauthors}{}} + }{\@ifundefined{@affilFive}{\@error@toomanyauthors}{}} % -- thp 2006/01/05 + }{\@ifundefined{@affilSix}{\@error@toomanyauthors}{}} % -- thp 2006/01/05 + \@ifundefined{@affilSix}{% % -- thp 2006/01/05 + \@ifundefined{@affilFive}{% % -- thp 2006/01/05 + \@ifundefined{@affilFour}{% + \@ifundefined{@affilThree}{% + \@ifundefined{@affilTwo}{% + }{\@ifundefined{@authorTwo}{\@error@toomanyaffils}{}} + }{\@ifundefined{@authorThree}{\@error@toomanyaffils}{}} + }{\@ifundefined{@authorFour}{\@error@toomanyaffils}{}} + }{\@ifundefined{@authorFive}{\@error@toomanyaffils}{}} % -- thp 2006/01/05 + }{\@ifundefined{@authorSix}{\@error@toomanyaffils}{}} % -- thp 2006/01/05 } %==== Conditional compilation macros depending on mode ==== @@ -526,6 +559,9 @@ %==== Miscellaneous definitions +\let\normal@BBAB\BBAB % -- thp 2005/07/23 +\let\table@BBAB\BBAA % -- thp 2005/07/23 + \setlength{\doublerulesep}{\arrayrulewidth} \newcommand\thickline{\hline\hline} \renewcommand\footnoterule{% @@ -534,14 +570,21 @@ \hrule height0.125pt width.5in \kern2.6\p@} -\let\old@tabular=\tabular -\def\apatabular#1{\def\@halignto{to\linewidth}\@tabular{@{\extracolsep{\fill}}#1}} - -%\let\old@endtabular=\endtabular -%\newlength{\@tabwd} -%\def\endtabular{\global\setlength{\@tabwd}{\z@}\old@endtabular\par\framebox[\@tabwd][c]{test}} -%\def\tab@footnotes{\relax} -%\def\endtabular{\tab@footnotes\old@endtabular} %% \relax causes extra line!! thp 15/3 +\let\old@tabular\tabular +\def\apatabular#1{\def\@halignto{to\linewidth}% + \let\BBAB\table@BBAB% -- thp 2005/07/23 + \@tabular{@{\extracolsep{\fill}}#1}} +\def\apa@doc@tabular{%% thp 2006/01/02 + \let\BBAB\table@BBAB%% Erik Meijer noticed that in doc mode tables weren't centered + \hfill\old@tabular} %% and that the in-table citation form was incorrect +%% +\let\orig@endtabular\endtabular % -- thp 2005/07/23 +\def\endtabular{% + \let\BBAB\normal@BBAB% -- thp 2005/07/23 + \orig@endtabular\ifapamodedoc{\hfill}{}}% 2006/01/02 \hfill for centering in doc mode +\def\apa@doc@endtabular{%% thp 2006/01/03 + \let\BBAB\normal@BBAB% %% separate redefinition of tabular/endtabular for doc mode + \orig@endtabular\hfill}%% to ensure centering, especially in case array.sty is loaded % Define footnote mark commands for tables that won't mess up vertical alignment \def\@tab@fn#1{\ensuremath{^{\mbox{{\scriptsize #1}}}}} @@ -549,13 +592,55 @@ \def\tabfnt#1#2{\par\raggedright\@tab@fn{#1}#2} % Provide a command to display vector symbols appropriately in each mode, thp 10/00 -\def\apavector#1{\ifapamodeman -{\raisebox{-1.0ex}{\ensuremath{\stackrel{\mbox{#1}}{\scriptscriptstyle\sim}}}} -{\ensuremath{\bf #1}}} - -% Circumvent the bug that shows up when the first accented character occurs -% inside a citation field -- something about apacite, OT1,and recent LaTeX/old babel... -\newbox\@dummy@box\sbox\@dummy@box{\'{\i}} +% Use improved definition of apavector provided by Erik Meijer -- 2005/12/28 +\def\apavector#1{{\ensuremath + \uprightlowercasegreek + \ifapamodeman + {\apasmash{\mathop{\kern\z@\mathrm{#1}}\limits_{\scriptscriptstyle\sim}}}% + {\if@bm@loaded\bm{\mathrm{#1}}\else\mathbf{#1}\fi% in case bm is not available + }% +}} +% and here are the necessary definitions & packages, as instructed by Erik Meijer +\newcommand{\apasmash}{% + \def\finsm@sh{\dp\z@\z@ \box\z@}% + \expandafter\mathpalette\expandafter\mathsm@sh +}% +\newif\if@bm@loaded\@bm@loadedfalse +\IfFileExists{bm.sty}{\RequirePackage{bm}\@bm@loadedtrue}{}% if not, apavector will fail +\newcommand{\uprightlowercasegreek}{% + \@ifundefined{alphaup}{}{% + \def\alpha {\alphaup }% + \def\beta {\betaup }% + \def\gamma {\gammaup }% + \def\delta {\deltaup }% + \def\epsilon {\epsilonup }% + \def\varepsilon{\varepsilonup}% + \def\zeta {\zetaup }% + \def\eta {\etaup }% + \def\theta {\thetaup }% + \def\vartheta {\varthetaup }% + \def\iota {\iotaup }% + \def\kappa {\kappaup }% + \def\lambda {\lambdaup }% + \def\mu {\muup }% + \def\nu {\nuup }% + \def\xi {\xiup }% + \def\pi {\piup }% + \def\varpi {\varpiup }% + \def\rho {\rhoup }% + \def\varrho {\varrhoup }% + \def\sigma {\sigmaup }% + \def\varsigma {\varsigmaup }% + \def\tau {\tauup }% + \def\upsilon {\upsilonup }% + \def\phi {\phiup }% + \def\varphi {\varphiup }% + \def\chi {\chiup }% + \def\psi {\psiup }% + \def\omega {\omegaup }% + }% +} +\let\apamatrix\apavector %==== Appendix macros added by Michael Erickson 2000/07/11, revised by thp 2000/07/18 @@ -576,7 +661,7 @@ \appendixtrue \apaappfig \apaapptab - \ifapamodejou{}{\clearpage} +% \ifapamodejou{}{\clearpage} %% commented out -- thp 2005/07/23 \let\old@apa@section=\leveltwo % This will not work right with five levels in appendix. % Should go into \section, not \leveltwo but would also require % changes to section* and section[ (see \def\section above) @@ -600,9 +685,9 @@ \setcounter{table}{0}% % %\small% the appendix should be set in smaller type in jou, including headers! }% -% \addtocounter{appendix}{1}% +% \addtocounter{appendix}{1}% \refstepcounter{appendix}% 2002/07/20 this takes care of references too - \ifnum\c@appendix>1 \immediate\write\@auxout{\global\string\oneappendixfalse}\fi% + \ifnum\c@appendix>1\immediate\write\@auxout{\global\string\oneappendixfalse}\fi% \old@apa@section{% \old@tabular[t]{@{}p{\app@t@width}@{}}% tabular may have been redefined \centering{% @@ -659,7 +744,6 @@ \def\enoteformat{\rightskip\z@ \leftskip\z@ \raggedright\fussy\hyphenpenalty 10000 \parindent=0.4in \leavevmode\llap{\hbox{$^{\mbox{\small\@ifundefined{hrm}{}{\sf}\@theenmark}}$}}} -%\def\notesname{Footnotes} % moved to language portability section \AtEndDocument{% \ifappendix% set section back to no numbering after appendix \appendixfalse\let\leveltwo=\old@apa@section% @@ -755,7 +839,11 @@ \if@figlist \@ifundefined{@figure@written}{}{% \figurecaptionsformat - {\normalsize\@ifundefined{hrm}{}{\sf}\listoffigures} + {\normalsize\@ifundefined{hrm}{}{\sf}% + \let\BBAB\table@BBAB% -- thp 2005/07/23 + \listoffigures% + \let\BBAB\normal@BBAB% -- thp 2005/07/23 + } \clearpage } \fi @@ -785,9 +873,14 @@ \section*{\tablesection} \suppressfloats[t] \fi -% \markboth{\MakeUppercase{\tablesection}}{\MakeUppercase{\tablesection}}% bj \def\baselinestretch{\@@spacing} - \processtables@hook \@ifundefined{hrm}{}{\sf}\tiny\normalsize\@input{\jobname.ttt} + \processtables@hook \@ifundefined{hrm}{}{\sf}% + \tiny\normalsize% +% We need to deal with citation alterations here because otherwise we either +% lose the definition through the .ttt diversion or we miss the table* + \let\BBAB\table@BBAB% -- thp 2005/07/23 + \@input{\jobname.ttt}% + \let\BBAB\normal@BBAB% -- thp 2005/07/23 \fi} %========= Maketitle, margins, lengths, etc. ========== @@ -829,6 +922,36 @@ \@authorThree \\ \@affilThree \vspace{0.25in} \\ }{ + \@ifundefined{@authorFive}{ %% 2006/01/05 added as contributed by Aaron Geller + \@authorOne \\ + + \@affilOne \vspace{0.2in} \\ + \@authorTwo \\ + + \@affilTwo \vspace{0.2in} \\ + \@authorThree \\ + + \@affilThree \vspace{0.2in} \\ + \@authorFour \\ + + \@affilFour \vspace{0.25in} \\ }{ %% 2006/01/05 beginning of Aaron Geller contribution + \@ifundefined{@authorSix}{ %% -- thp 2006/01/05 + \@authorOne \\ + + \@affilOne \vspace{0.2in} \\ + \@authorTwo \\ + + \@affilTwo \vspace{0.2in} \\ + \@authorThree \\ + + \@affilThree \vspace{0.2in} \\ + \@authorFour \\ + + \@affilFour \vspace{0.2in} \\ %% thp corrected distance to non-final value of 0.2in + \@authorFive \\ + + \@affilFive \vspace{0.25in} \\ }{%% 2006/01/05 end of Aaaron Geller contribution +%% --- thp 2006/01/05 beginning of six-author display \@authorOne \\ \@affilOne \vspace{0.2in} \\ @@ -840,8 +963,14 @@ \@affilThree \vspace{0.2in} \\ \@authorFour \\ - \@affilFour \vspace{0.25in} \\ }}} + \@affilFour \vspace{0.2in} \\ + \@authorFive \\ + \@affilFive \vspace{0.2in} \\ + \@authorSix \\ + + \@affilSix \vspace{0.25in} \\ }}}}} +%% --- thp 2006/01/05 end of six-author display \@ifundefined{@note} {\vspace*{\baselineskip} } {\@note} @@ -866,7 +995,6 @@ \ThreeLevelHeading \def\baselinestretch{\@@spacing} -%\def\refname{References} \setlength{\footnotesep}{0.5cm} \setlength{\topmargin}{0in} \setlength{\oddsidemargin}{0.25in} @@ -890,11 +1018,13 @@ \newcommand{\footmark}[1]{${}^{\mbox{\normalsize #1}}$} \long\def\@makecaption#1#2{% + \let\BBAB\table@BBAB % thp 2005/07/23 \vskip10pt% \setbox\@tempboxa\hbox{\parbox{\columnwidth}{#1\cap@line{\cap@style #2}}}% \ifdim\wd\@tempboxa>\hsize\parbox{\columnwidth}{#1\cap@line{\cap@style #2}}\par% \else\hbox to\hsize{\box\@tempboxa\hfil}\par% \fi% + \let\BBAB\normal@BBAB % thp 2005/07/23 \vskip\baselineskip} \long\def\@caption#1[#2]#3{\par\addcontentsline{\csname @@ -937,29 +1067,8 @@ \ClassWarning{apa}{ignored \string\helvetica\space (use helv option)} }}{\def\helvetica{\relax}} -\def\timesroman{% - \RequirePackage{times} - \InputIfFileExists{mathptm.sty}{}{} - \doublehyphendemerits5000 - \hfuzz0pt - \tolerance=9999 - \pretolerance=-1 % Always look for hyphens - \emergencystretch=25pt - \hbadness=30000 - \hyphenpenalty=100 % since average badness will be high! -} - -\bibleftmargin=\parindent -\def\bibnewpage{\newpage} -\def\bibsize{} -\def\bib@indent{\labelsep=0em - \itemsep=0em -% \parsep=0em %% thp 21-Aug-2002 -- some editor complained!! - \leftmargin=\bibleftmargin - \itemindent=-\bibleftmargin} - \def\newblock{\hskip .11em plus .33em minus .07em}\fussy - %==== Appendix definitions added by Michael Erickson 2000/07/11 + \efloat@condopen{fff} \efloat@iwrite{fff}{\string\apaappfig} \efloat@iwrite{fff}{\string\setcounter{appendix}{0}} @@ -967,7 +1076,8 @@ \efloat@iwrite{ttt}{\string\apaapptab} \efloat@iwrite{ttt}{\string\setcounter{appendix}{0}} -} +}% end of man mode (manuscript format) + %%%%%%%%%%%%%%%%%% % % @@ -1091,10 +1201,25 @@ \put@two@authaffil{\@authorOne}{\@affilOne}{\@authorTwo}{\@affilTwo}\vspace{-0.15in}\\ \put@one@authaffil{\@authorThree}{\@affilThree} }}{ + \@ifundefined{@authorFive}{ % 2006/01/05 as contributed by Aaron Geller % four authors-affiliations \put@two@authaffil{\@authorOne}{\@affilOne}{\@authorTwo}{\@affilTwo}\vspace{-0.15in}\\ \put@two@authaffil{\@authorThree}{\@affilThree}{\@authorFour}{\@affilFour} - }}} + }{ % 2006/01/05 beginning of Aaron Geller contribution + \@ifundefined{@authorSix}{ % -- thp 2006/01/05 +% five authors-affiliations + \put@two@authaffil{\@authorOne}{\@affilOne}{\@authorTwo}{\@affilTwo}\vspace{-0.15in}\\ + \put@two@authaffil{\@authorThree}{\@affilThree}{\@authorFour}{\@affilFour}% + \vspace{-0.15in}\\ % thp added negative vertical space + \put@one@authaffil{\@authorFive}{\@affilFive} + }{ % 2006/01/05 end of Aaron Geller contribution +% six authors-affiliations +%% --- thp 2006/01/05 beginning of six-author display + \put@two@authaffil{\@authorOne}{\@affilOne}{\@authorTwo}{\@affilTwo}\vspace{-0.15in}\\ + \put@two@authaffil{\@authorThree}{\@affilThree}{\@authorFour}{\@affilFour}\vspace{-0.15in}\\ + \put@two@authaffil{\@authorFive}{\@affilFive}{\@authorSix}{\@affilSix} +%% --- thp 2006/01/05 end of six-author display + }}}}} \@ifundefined{@note} {\vspace{0.07in}} {\vspace{0.07in}\\ {\large\@note\vspace{0.07in}}} @@ -1125,7 +1250,7 @@ {} {\begin{figure}[b] \parbox{\columnwidth}{\setlength{\parindent}{0.18in} - \noindent \makebox[\columnwidth]{\vrule height0.125pt width\columnwidth}\vspace*{0.05in}\par + \noindent\makebox[\columnwidth]{\vrule height0.125pt width\columnwidth}\vspace*{0.05in}\par {\footnotesize\hspace{-0.04in}\@acks\par}} \end{figure}} \markboth{\hfill\r@headl\hfill}{\hfill\r@headr\hfill} @@ -1162,6 +1287,7 @@ \pagestyle{myheadings} \long\def\@makecaption#1#2{% + \let\BBAB\table@BBAB % thp 2005/07/23 \vskip\abovecaptionskip \sbox\@tempboxa{#1 #2}% \ifdim \wd\@tempboxa >\hsize @@ -1170,9 +1296,11 @@ \global \@minipagefalse \hb@xt@\hsize{\hfil\box\@tempboxa\hfil}% \fi + \let\BBAB\normal@BBAB % thp 2005/07/23 \vskip\belowcaptionskip} \long\def\@makeccaption#1#2#3{ + \let\BBAB\table@BBAB % thp 2005/07/23 \vskip\abovecaptionskip \setbox\@tempboxa\hbox{#1 #2} \ifdim \wd\@tempboxa > \hsize @@ -1184,6 +1312,7 @@ \hbox to\hsize{\hfil\mbox{#1 #2}\hfil} \fi \fi + \let\BBAB\normal@BBAB % thp 2005/07/23 \vskip\belowcaptionskip} \long\def\@caption#1[#2]#3{\par\addcontentsline{\csname @@ -1232,7 +1361,6 @@ \let\footnotesize=\small \def\helvetica{\relax} -\def\timesroman{\relax} \doublehyphendemerits5000 \hfuzz0pt @@ -1241,16 +1369,14 @@ \emergencystretch=25pt \hbadness=30000 \hyphenpenalty=100 -\bibleftmargin=1.2em -\def\bibnewpage{} -\def\bibsize{\footnotesize} -\def\bib@indent{\labelsep=0em - \itemsep=0em - \leftmargin=\bibleftmargin - \itemindent=-\bibleftmargin} - \def\newblock{\hskip .11em plus .33em minus .07em}\sloppy -} +% Removed some bibliography redefinitions as per the instructions of Erik Meijer +\bibleftmargin=1.2em % left these in because the default is too big +\bibindent=-\bibleftmargin % and this is apparently not refefined each time +\renewcommand{\bibliographytypesize}{\footnotesize} + +}% end of jou mode (journal format) + %%%%%%%%%%%%%%%%%% % % @@ -1287,6 +1413,10 @@ %========== End of code from theapa.sty =============== \def\maketitle{ + \global\@topnum\z@ % to prevent tables before the title %% Erik Meijer, 2006/01/03 + \@ifundefined{@acks}{% if there acknowledgements they make up a "float" on the 1st page + \global\@botnum\z@}{% to prevent tables on the first page %% Erik Meijer, 2006/01/03 + \global\@botnum\@ne}% to prevent tables below the footnote -- thp 2006/01/10 \check@author \@ifundefined{r@headr}{\typeout{Using title for running head} \def\r@headr{\protect\MakeUppercase{\@title}} @@ -1333,6 +1463,7 @@ {\Large \@authorThree}\\ \@affilThree \vspace{0.1in} \\ }{ + \@ifundefined{@authorFive}{ %% 2006/01/05 added as contributed by Aaron Geller % four authors-affiliations {\Large \@authorOne} \\ @@ -1345,7 +1476,47 @@ \@affilThree \vspace{0.1in} \\ {\Large \@authorFour}\\ - \@affilFour \vspace{0.1in} \\ }}} + \@affilFour \vspace{0.1in} \\ }{ %%% 2006/01/05 beginning of Aaron Geller contribution + \@ifundefined{@authorSix}{ %% -- thp 2006/01/05 +% five authors-affiliations + {\Large \@authorOne} \\ + + \@affilOne \vspace{0.1in} \\ + {\Large \@authorTwo}\\ + + \@affilTwo \vspace{0.1in} \\ + {\Large \@authorThree}\\ + + \@affilThree \vspace{0.1in} \\ + {\Large \@authorFour}\\ + + \@affilFour \vspace{0.1in} \\ + {\Large \@authorFive}\\ + + \@affilFive \vspace{0.1in} \\ }{ %%% 2006/01/05 end of Aaron Geller contribution +% six authors-affiliations +%% --- thp 2006/01/05 beginning of six-author display + {\Large \@authorOne} \\ + + \@affilOne \vspace{0.1in} \\ + {\Large \@authorTwo}\\ + + \@affilTwo \vspace{0.1in} \\ + {\Large \@authorThree}\\ + + \@affilThree \vspace{0.1in} \\ + {\Large \@authorFour}\\ + + \@affilFour \vspace{0.1in} \\ + {\Large \@authorFive}\\ + + \@affilFive \vspace{0.1in} \\ + {\Large \@authorSix}\\ + + \@affilSix \vspace{0.1in} \\ } +%% --- thp 2006/01/05 end of six-author display +}}}} +% \@ifundefined{@note} {\vspace*{\baselineskip} } {\@note\vspace{0.2in}} @@ -1371,6 +1542,8 @@ }} \end{figure}} \markboth{\hfill \r@headl \hfill}{\hfill \r@headr \hfill} + \let\tabular\apa@doc@tabular% -- thp 2006/01/02 + \let\endtabular\apa@doc@endtabular% -- thp 2006/01/03 \noindent } @@ -1397,15 +1570,17 @@ \def\dbltextfloatsep{0.8\textfloatsep} \def\helvetica{\relax} -\def\timesroman{\relax} +%\def\timesroman{\relax}% Commented out all \timesroman -- thp 2005/07/23 \def\centeredcaption#1{\caption} \long\def\@makecaption#1#2{ + \let\BBAB\table@BBAB% thp 2005/07/23 \vskip 10pt \setbox\@tempboxa\hbox{#1 #2} \ifdim \wd\@tempboxa >\hsize #1 #2\par \else \hbox to\hsize{\hfil\box\@tempboxa\hfil} \fi + \let\BBAB\normal@BBAB% thp 2005/07/23 \vskip 4pt} \long\def\@caption#1[#2]#3{\par\addcontentsline{\csname @@ -1419,23 +1594,18 @@ to\hsize{\hfil\box\@tempboxa\hfil} \def\fnum@figure{\small {\em\figurename\ {\thefigure}}.\hspace{0.07in}} \long\def\fnum@table{\small\tablename\ {\thetable}:} -\bibleftmargin=2em -\def\bibnewpage{} -\def\bibsize{\small} -\def\bib@indent{\labelsep=0em - \leftmargin=\bibleftmargin - \itemindent=-\bibleftmargin} - \def\newblock{\hskip .11em plus .33em minus .07em}\sloppy +% Removed defs as per the instructions of Erik Meijer -- thp 2005/07/23 +\renewcommand{\bibliographytypesize}{\small} -} +}% end of doc mode (regular LaTeX format) %---------- end of mode specific definitions ----------- + %======================================================= % Some final definitions for all modes %======================================================= -%\long\def\ignore#1{\relax} \let\ignore\@gobble \let\oneLevelHeading=\OneLevelHeading \let\twoLevelHeading=\TwoLevelHeading @@ -1445,7 +1615,6 @@ to\hsize{\hfil\box\@tempboxa\hfil} \def\HeadingLevels#1{\csname #1LevelHeading\endcsname} % fixed Jan 5 99 \def\headinglevels#1{\csname #1LevelHeading\endcsname} % fixed Jan 5 99 \bibliographystyle{apacite} -%\def\bibliographystyle#1{\relax} % % Thanks to Donald Arsenau for the right way to ignore \bibliographystyle % -- cgit v1.2.3