diff options
| author | Karl Berry <karl@freefriends.org> | 2011-12-11 22:44:56 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2011-12-11 22:44:56 +0000 |
| commit | e0fc802c8d83f41a6ab68f208e2253412159b8a7 (patch) | |
| tree | ef41456100470077c8a19fa8517d68bde7a6d422 | |
| parent | 7539f2b2489595315242e441cd91abb7cba8ae75 (diff) | |
apa6 (11dec11)
git-svn-id: svn://tug.org/texlive/trunk@24827 c570f23f-e606-0410-a88d-b1316a301751
19 files changed, 740 insertions, 456 deletions
diff --git a/Master/texmf-dist/doc/latex/apa6/README.txt b/Master/texmf-dist/doc/latex/apa6/README.txt new file mode 100644 index 00000000000..86aa16b987f --- /dev/null +++ b/Master/texmf-dist/doc/latex/apa6/README.txt @@ -0,0 +1,32 @@ +---------------------------------------------------------------------- + +apa6 - A LaTeX class for formatting documents in compliance with the +American Psychological Association's Publication Manual, 6th edition + +Copyright (C) 2011 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 +version 1.3c of this license or (at your option) any later +version. The latest version of this license is in the file: + +http://www.latex-project.org/lppl.txt + +Users may freely modify these files without permission, as long as the +copyright line and this statement are maintained intact. + +This work is not endorsed by, affiliated with, or probably even known +by, the American Psychological Association. + +---------------------------------------------------------------------- + +The Publication Manual of the American Psychological Association is +widely used in the social sciences. The most recent update, in 2009, +altered the formatting guidelines and therefore rendered existing +formatting solutions inadequate. The apa6 class is an update of +older code from the apa class (available from CTAN), which is no +longer being maintained. New features have also been added, such as +suppressing references to one's own work to facilitate masked reviews +of manuscripts by independent reviewers. See the documentation for +details. + diff --git a/Master/texmf-dist/doc/latex/apa6/apa6.pdf b/Master/texmf-dist/doc/latex/apa6/apa6.pdf Binary files differindex a74865eeba9..ebc1d0b9606 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/doc/latex/apa6/pseudoTeX/apa6.ptex b/Master/texmf-dist/doc/latex/apa6/pseudoTeX/apa6.ptex index 02872ddbcff..68c25b21ab7 100644 --- a/Master/texmf-dist/doc/latex/apa6/pseudoTeX/apa6.ptex +++ b/Master/texmf-dist/doc/latex/apa6/pseudoTeX/apa6.ptex @@ -28,6 +28,7 @@ %% ---------------------------------------------------------------------- %% + %% pseudo {apa6} %% Copyright (C) 2001-2011 Chikrii Softlab. %% All rights reserved. @@ -249,6 +250,7 @@ %% This work is not endorsed by, affiliated with, or probably even known %% by, the American Psychological Association. %% +%% %% This work is "maintained" (as per LPPL maintenance status) by %% Brian D. Beitzel. %% @@ -260,6 +262,8 @@ %% APAamerican.txt, %% APAdutch.txt, %% APAenglish.txt, +%% APAgerman.txt, +%% APAngerman.txt, %% APAgreek.txt, %% APAendfloat.cfg, %% apa6.ptex, diff --git a/Master/texmf-dist/doc/latex/apa6/samples/bibliography.bib b/Master/texmf-dist/doc/latex/apa6/samples/bibliography.bib index bdd5aaa68ac..24eba1147ae 100644 --- a/Master/texmf-dist/doc/latex/apa6/samples/bibliography.bib +++ b/Master/texmf-dist/doc/latex/apa6/samples/bibliography.bib @@ -28,6 +28,7 @@ %% ---------------------------------------------------------------------- %% + @ARTICLE{Borst2011a, author = {Borst, Gr\'{e}goire and Kosslyn, Stephen M. and Kievit, Rogier A. and Thompson, William L.}, title = {A fictitious entry to demonstrate complicated bibliographies}, @@ -191,6 +192,7 @@ the design of multimedia instruction}, %% This work is not endorsed by, affiliated with, or probably even known %% by, the American Psychological Association. %% +%% %% This work is "maintained" (as per LPPL maintenance status) by %% Brian D. Beitzel. %% @@ -202,6 +204,8 @@ the design of multimedia instruction}, %% APAamerican.txt, %% APAdutch.txt, %% APAenglish.txt, +%% APAgerman.txt, +%% APAngerman.txt, %% APAgreek.txt, %% APAendfloat.cfg, %% apa6.ptex, diff --git a/Master/texmf-dist/doc/latex/apa6/samples/longsample.pdf b/Master/texmf-dist/doc/latex/apa6/samples/longsample.pdf Binary files differdeleted file mode 100644 index f2c3786f2e5..00000000000 --- a/Master/texmf-dist/doc/latex/apa6/samples/longsample.pdf +++ /dev/null diff --git a/Master/texmf-dist/doc/latex/apa6/samples/longsample.tex b/Master/texmf-dist/doc/latex/apa6/samples/longsample.tex index 39b478b777b..0fd6bd9a543 100644 --- a/Master/texmf-dist/doc/latex/apa6/samples/longsample.tex +++ b/Master/texmf-dist/doc/latex/apa6/samples/longsample.tex @@ -27,6 +27,7 @@ %% %% ---------------------------------------------------------------------- %% + \documentclass[man]{apa6} \usepackage{lipsum} @@ -38,9 +39,6 @@ \DeclareLanguageMapping{american}{american-apa} \addbibresource{bibliography.bib} -\usepackage[T1]{fontenc} -\usepackage{lmodern} - \title{Sample APA-Style Document Using the \textsf{apa6} Package} \shorttitle{Sample Document} @@ -203,6 +201,7 @@ The detailed results are shown in Table~\ref{tab:DeckedTable}. \lipsum[22] %% This work is not endorsed by, affiliated with, or probably even known %% by, the American Psychological Association. %% +%% %% This work is "maintained" (as per LPPL maintenance status) by %% Brian D. Beitzel. %% @@ -214,6 +213,8 @@ The detailed results are shown in Table~\ref{tab:DeckedTable}. \lipsum[22] %% APAamerican.txt, %% APAdutch.txt, %% APAenglish.txt, +%% APAgerman.txt, +%% APAngerman.txt, %% APAgreek.txt, %% APAendfloat.cfg, %% apa6.ptex, diff --git a/Master/texmf-dist/doc/latex/apa6/samples/shortsample.pdf b/Master/texmf-dist/doc/latex/apa6/samples/shortsample.pdf Binary files differdeleted file mode 100644 index 38a4950b331..00000000000 --- a/Master/texmf-dist/doc/latex/apa6/samples/shortsample.pdf +++ /dev/null diff --git a/Master/texmf-dist/doc/latex/apa6/samples/shortsample.tex b/Master/texmf-dist/doc/latex/apa6/samples/shortsample.tex index 358867990c2..1bb9eb2f0bf 100644 --- a/Master/texmf-dist/doc/latex/apa6/samples/shortsample.tex +++ b/Master/texmf-dist/doc/latex/apa6/samples/shortsample.tex @@ -27,6 +27,7 @@ %% %% ---------------------------------------------------------------------- %% + \documentclass[jou]{apa6} \usepackage[american]{babel} @@ -36,9 +37,6 @@ \DeclareLanguageMapping{american}{american-apa} \addbibresource{bibliography.bib} -\usepackage[T1]{fontenc} -\usepackage{lmodern} - \title{Sample APA-Style Document Using the \textsf{apa6} Package} \author{Brian D. Beitzel} @@ -140,6 +138,7 @@ skill in interpreting the results for the masses. %% This work is not endorsed by, affiliated with, or probably even known %% by, the American Psychological Association. %% +%% %% This work is "maintained" (as per LPPL maintenance status) by %% Brian D. Beitzel. %% @@ -151,6 +150,8 @@ skill in interpreting the results for the masses. %% APAamerican.txt, %% APAdutch.txt, %% APAenglish.txt, +%% APAgerman.txt, +%% APAngerman.txt, %% APAgreek.txt, %% APAendfloat.cfg, %% apa6.ptex, diff --git a/Master/texmf-dist/source/latex/apa6/apa6.dtx b/Master/texmf-dist/source/latex/apa6/apa6.dtx index e1fe978f456..38c1618538a 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/01 v1.02 APA formatting (6th edition)] +%<class>\ProvidesClass{apa6}[2011/12/10 v1.11 APA formatting (6th edition)] % % %<*internal> % -\def\apaSixVersionDate{2011/12/01} -\def\apaSixVersionNumber{1.02} +\def\apaSixVersionDate{2011/12/10} +\def\apaSixVersionNumber{1.11} % % % % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -44,7 +44,7 @@ formatting solutions inadequate. The apa6 class is an update of older code from the apa class (available from CTAN), which is no longer being maintained. New features have also been added, such as suppressing references to one's own work to facilitate masked reviews -of manuscripts by independent reviewers. See the documentation for +of manuscripts by independent reviewers. See the documentation for details. %</readme> %<*internal> @@ -111,6 +111,8 @@ and the derived files apa6.ins, APAamerican.txt, APAdutch.txt, APAenglish.txt, + APAgerman.txt, + APAngerman.txt, APAgreek.txt, APAendfloat.cfg, apa6.ptex, @@ -129,6 +131,8 @@ and the derived files apa6.ins, \file{./config/APAamerican.txt}{\from{\jobname.dtx}{american}} \file{./config/APAdutch.txt}{\from{\jobname.dtx}{dutch}} \file{./config/APAenglish.txt}{\from{\jobname.dtx}{english}} + \file{./config/APAgerman.txt}{\from{\jobname.dtx}{german}} + \file{./config/APAngerman.txt}{\from{\jobname.dtx}{ngerman}} \file{./config/APAgreek.txt}{\from{\jobname.dtx}{greek}} \file{./config/APAendfloat.cfg}{\from{\jobname.dtx}{APAendfloat}} } @@ -177,7 +181,7 @@ and the derived files apa6.ins, \end{document} %</driver> % \fi -% +% %\DoNotIndex{\#,\$,\%,\&,\@,\\,\{,\},\^,\_,\~,\ } %\DoNotIndex{\@ne} %\DoNotIndex{\advance,\begingroup,\catcode,\closein} @@ -197,7 +201,7 @@ and the derived files apa6.ins, % Formatting documents in APA style (6th Edition)\\^^A % with the \textsf{apa6} \LaTeX\ class^^A % \thanks{This file describes version ^^A -% \apaSixVersionNumber, last revised \apaSixVersionDate.}^^A +% \apaSixVersionNumber, last revised \apaSixVersionDate.}^^A % } % \author{Brian D. Beitzel\thanks{E-mail: brian@beitzel.com}} % \date{Released \apaSixVersionDate} @@ -214,6 +218,14 @@ 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.03}{2011/12/10}{New option 'noextraspace'} +% \changes{v1.03}{2011/12/10}{Added German language support} +% \changes{v1.03}{2011/12/10}{Removed automated rotation of wide figures} +% \changes{v1.03}{2011/12/10}{Load lmodern and fontenc by default} +% \changes{v1.03}{2011/12/10}{Allow whitespace after subsubsection +% (and lower) sectioning commands} + +% % \begin{abstract} % The \textit{Publication Manual} of the American Psychological % Association is widely used in the social sciences. The most @@ -221,8 +233,8 @@ and the derived files apa6.ins, % therefore rendered existing formatting solutions inadequate. The % \textsf{apa6} class is an update of older code from the % \textsf{apa} class, which is no longer being maintained. New -% features have also been added, such as suppressing references to -% one's own work to facilitate masked reviews of manuscripts by +% features have also been added, such as suppressing references to +% one's own work to facilitate masked reviews of manuscripts by % independent reviewers. % \end{abstract} % @@ -266,19 +278,28 @@ and the derived files apa6.ins, % \item \DescribeMacro{doc}|doc|: Formats the document as a typical % \LaTeX\ document (one-sided, single-column, etc.) % \end{itemize} -% +% % \textbf{Other class options:} % \begin{itemize} -% \item \DescribeMacro{babel}|babel|: In all modes, loads -% \textsf{babel}; the desired language(s) are listed as options -% immediately following |babel|; the last language listed is the -% main one. % \item \DescribeMacro{10pt}|10pt|: Typesets the document in 10-point % font. -% \item \DescribeMacro{11pt}|11pt| Typesets the document in 11-point +% \item \DescribeMacro{11pt}|11pt|: Typesets the document in 11-point % font. -% \item \DescribeMacro{12pt}|12pt| Typesets the document in 12-point +% \item \DescribeMacro{12pt}|12pt|: Typesets the document in 12-point % font. +% \item \DescribeMacro{nolmodern}|nolmodern|: Suppresses loading of the +% \textsf{lmodern} package. +% \item \DescribeMacro{nofontenc}|nofontenc|: Suppresses loading of the +% \textsf{fontenc} package (which is needed for proper hyphenation +% of accented characters). +% \item \DescribeMacro{babel}|babel|: In all modes, loads +% \textsf{babel}; the desired language(s) are listed as options +% immediately following |babel|; the last language listed is the +% main one. +% \item \DescribeMacro{noextraspace}|noextraspace|: In |man| mode, +% removes some of the vertical space between certain elements (e.g., +% headers and text) in an attempt to more closely resemble true +% double-spacing (use at your own risk). % \item \DescribeMacro{floatsintext}|floatsintext|: In |man| mode, % integrates floats (tables and figures) within the body of the text % instead of postponing them until after the reference list. @@ -323,7 +344,7 @@ and the derived files apa6.ins, % \item \DescribeMacro{draftall}|draftall|: In all modes, places the % word ``DRAFT'' as a watermark across all pages. % \end{itemize} -% +% % Class options not handled by \textsf{apa6} (e.g., |draft|) will be % passed on to the \textsf{article} class. % @@ -338,7 +359,7 @@ and the derived files apa6.ins, % shortened version of the title (for page headers) % \item \DescribeMacro{\author}|\author|\marg{author(s)}: Author name(s) % \end{itemize} -% +% % For authors across multiple affiliations, follow these formats, % noting that authors must be matched in sequence with their % affiliations in the |\affiliation| command (hence multiple authors @@ -357,7 +378,7 @@ and the derived files apa6.ins, % \DescribeMacro{\affiliation}|\affiliation|\marg{affiliation(s)}: % Author affiliation(s) % \end{itemize} -% +% % For multiple affiliations, follow these formats:\par % |\twoaffiliations{Affil. of 1st Author(s)}{Affil. 2nd Author(s)}|\par % |\threeaffiliations{U of A}{U of B}{U of C}|\par @@ -373,7 +394,7 @@ and the derived files apa6.ins, % The Author Note, containing contact information, acknowledgements, % etc. % \end{itemize} -% +% % Optional; use if desired:\par % \begin{itemize} % \item \DescribeMacro{\note}|\note|\marg{note-text}: Notation of @@ -392,7 +413,7 @@ and the derived files apa6.ins, % Any additional text needed; typeset in the top right header in % |jou| and |doc| modes, underneath the content of |\ccoppy| % \end{itemize} -% +% % \subsection{Maketitle} % The \DescribeMacro{\maketitle}|\maketitle| command formats the % document title, page headers, author list, author affiliations, @@ -412,7 +433,7 @@ and the derived files apa6.ins, % \item \DescribeMacro{\paragraph}|\paragraph|\marg{title} % \item \DescribeMacro{\subparagraph}|\subparagraph|\marg{title} % \end{itemize} -% +% % Don't bother to |\label| your sections because they cannot be % |\ref|'d since APA style does not use numbered sections. % @@ -462,7 +483,7 @@ and the derived files apa6.ins, % | o second item ... ... ...|\par % |continue continue|\par % |Blah blah blah|\par -% +% % \subsection{Other Macros} % \label{sec:othermacros} % \begin{itemize} @@ -503,7 +524,7 @@ and the derived files apa6.ins, % \item \DescribeMacro{\section}|\section|\marg{appendix-title}: % Begins each appendix % \end{itemize} -% +% % Because appendices are numbered (with letters!) you may establish a % label for each appendix (e.g., |\label{app:xxx}|); when there is % more than one appendix, use |Appendix~\ref{app:xxx}| within the main @@ -521,7 +542,7 @@ and the derived files apa6.ins, % \indent |\ifapamodeman{\setlength{\textwidth}{5.76772in}%| % % \indent |\setlength{\textheight}{9.19291in}}{}| -% +% % \section{Development of \textsf{apa6}} % The base code for this class is the \textsf{apa} class, which in % turn was based upon other sources. In order to comply with 6th @@ -586,7 +607,7 @@ and the derived files apa6.ins, % \begin{table}[htbp] % \caption{Supported masking commands} % \label{tab:CitationCommandsTable} -% \begin{tabular}{@{}llll@{}} \toprule +% \begin{tabular}{@{}llll@{}} \toprule % Unmasked Result & \multicolumn{3}{c}{Masking Commands} \\ \cmidrule(r){2-4} % & \textsf{apacite} & \textsf{natbib} & \textsf{biblatex} \\ \midrule % (van Dijk, 2001) & |\maskcite| & |\maskcitep| & |\maskparencite| \\ @@ -611,7 +632,7 @@ and the derived files apa6.ins, % citations are supported with both \textsf{biblatex} and % \textsf{natbib}; however, they are not supported with the % \textsf{apacite} package. -% +% % To mask citations that have been prepended with |mask| (and the % corresponding bibliography entries), the name of the bibliography % package must also be passed in as an option on the |\documentclass| @@ -619,23 +640,23 @@ and the derived files apa6.ins, % |\documentclass[jou,biblatex,mask]{apa6}|. (But as explained later, % the |biblatex| option is the default and is therefore not required, % even with the |mask| option.) -% +% % \textbf{Be warned}, however, that if you have previously generated % .bbl, etc., files without the |mask| option applied, those files % must be deleted before \LaTeX-ing with the |mask| % option---otherwise, you will see the to-be-masked entries showing up % in the bibliography. -% +% % Masked citations are replaced with the text, \textit{(2 citations % removed for masked review)} (in the case of two masked citations). % The corresponding entries in the References section are also % suppressed. -% +% % There is no need to revise the masked citations when removing the % |mask| option for final production. The citations that were % previously masked will not be masked in the absence of the |mask| % option. -% +% % \subsection{Repositioned Floats} % When revising and proofreading a manuscript, it is most helpful to % have the tables and figures readily available (rather than turning @@ -666,11 +687,12 @@ and the derived files apa6.ins, % \subsection{Flexible Bibliographies} % The \textsf{apa6} class supports three bibliography packages: % \textsf{biblatex}, \textsf{apacite}, and \textsf{natbib}. -% -% \subsubsection{\textsf{biblatex}} +% +% \subsubsection{\textsf{biblatex}} % \label{sec:biblatexinfo} % The \DescribeMacro{biblatex}|biblatex| option directs \textsf{apa6} -% to load the \textsf{biblatex} package; however, the +% to load the \textsf{biblatex} package with the following options: +% style=apa,sortcites=true,sorting=nyt; however, the % |\DeclareLanguageMapping| and |\addbibresource| commands will need % to be specified by the user within the document preamble. In the % absence of bibliographic options, \textsf{apa6} will mask references @@ -678,15 +700,15 @@ and the derived files apa6.ins, % In other words, the only reason to use the |biblatex| option is to % have \textsf{apa6} automatically load the \textsf{biblatex} package. % -% \subsubsection{\textsf{apacite}} +% \subsubsection{\textsf{apacite}} % \label{sec:apaciteinfo} % The \textsf{apacite} package is loaded if the % \DescribeMacro{apacite}|apacite| option is specified. This option % also informs \textsf{apa6} to mask references using \textsf{apacite} % commands if the |mask| option is specified. \textbf{The % \textsf{apacite} package is \textit{not} loaded by default.} -% -% \subsubsection{\textsf{natbib}} +% +% \subsubsection{\textsf{natbib}} % \label{sec:natbibinfo} % Specifying the \DescribeMacro{natbib}|natbib| option implicitly % loads \textsf{apacite} and directs \textsf{apa6} to mask references @@ -694,7 +716,7 @@ and the derived files apa6.ins, % Because of how the \textsf{natbib} package is written, it must be % loaded explicitly in the document preamble with % |\usepackage[sort,longnamesfirst]{natbib}|. -% +% % \subsection{Keywords} % Many journals (including APA journals) request authors to provide % keywords for their manuscripts to facilitate electronic indexing. @@ -746,7 +768,7 @@ and the derived files apa6.ins, % packages are not already installed, producing the first % \textsf{apa6} document could take a few minutes while these packages % are downloaded and installed. -% +% % \begin{itemize} % \item \textsf{apacite}: bibliography package; used only if the % |apacite| or |natbib| option has been specified @@ -773,6 +795,9 @@ and the derived files apa6.ins, % \item \textsf{longtable}: formats tables that exceed one page in % length; loaded only if the |longtable| option is specified. Also % loads the \textsf{array} package. +% \item \textsf{lmodern}: needed for proper default text size for +% draft watermark, so used on all documents; may be suppressed from +% loading with option |nolmodern|. % \item \textsf{substr}: counts masked references; used only if the % |mask| option is specified % \item \textsf{threeparttable}: produces nicely formatted table notes @@ -787,93 +812,90 @@ and the derived files apa6.ins, % \section{Examples} % % Sample documents are included with this class; look in the -% ``samples'' subfolder of your installation. The source and output for -% |shortsample.tex| are reproduced on the following pages for quick +% ``samples'' subfolder of your installation. The source and output for +% |shortsample.tex| are reproduced on the following pages for quick % reference. % % \newpage -% +% % \subsection{shortsample.tex} % % \begin{verbatim} % \documentclass[jou]{apa6} -% +% % \usepackage[american]{babel} -% +% % \usepackage{csquotes} -% \usepackage[style=apa,sorting=nyt]{biblatex} +% \usepackage[style=apa,sortcites=true,sorting=nyt]{biblatex} % \DeclareLanguageMapping{american}{american-apa} % \addbibresource{bibliography.bib} -% -% \usepackage[T1]{fontenc} -% \usepackage{lmodern} -% +% % \title{Sample APA-Style Document Using the \textsf{apa6} Package} -% +% % \author{Brian D. Beitzel} % \affiliation{SUNY Oneonta} -% +% % \leftheader{Beitzel} % % \abstract{This demonstration paper uses the \textsf{apa6} \LaTeX\ % class to format the document in compliance with the 6th Edition of % the American Psychological Assocation's \textit{Publication Manual.} % The references are managed using \textsf{biblatex}.} -% +% % \keywords{APA style, demonstration} -% +% % \begin{document} % \maketitle % We begin with \textcite{Shotton1989}. We can also cite this work in % parenthesis, like this: \parencite{Shotton1989}. -% +% % A three-author paper \parencite[e.g.,][]{Lassen2006} lists all % three authors for the first citation, then only the first author % on all subsequent citations \parencite{Lassen2006}. -% +% % Note the use of five heading levels throughout this demonstration % Method section. -% +% % \section{Method} % \subsection{Participants} % We had a lot of people in this study. -% +% % \subsection{Materials} % Several materials were used for this project. Some of them were % already created for prior research. -% +% % \subsubsection{Paper-and-Pencil Instrument} % We used an instrument that we found to be highly successful. -% +% % \paragraph{Reliability} % The reliability of this instrument is extraordinary. -% +% % \paragraph{Validity} % We now discuss the validity of our instrument. -% +% % \subparagraph{Face validity} The face validity is exceptionally % strong. Everyone should be impressed. -% +% % \subparagraph{Construct validity} Also very strong. -% +% % \subsection{Design} % This section describes the study's design. -% +% % \subsection{Procedure} % The procedure was fairly straightforward, yet required % attention to detail. -% +% % \section{Results} % 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 +% \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 \\ +% & \multicolumn{2}{l}{segment in} & participant \\ % \cmidrule(r){2-3} % & Onset & Coda & \\ % \midrule @@ -884,13 +906,13 @@ and the derived files apa6.ins, % \bottomrule % \end{tabular} % \end{table} -% +% % \section{Discussion} % This is a lengthy and erudite discussion. It demonstrates amazing % skill in interpreting the results for the masses. -% +% % \printbibliography -% +% % \end{document} % \end{verbatim} % @@ -899,7 +921,7 @@ and the derived files apa6.ins, % {\includegraphics[scale=0.8, trim = 1in 1.5in 1in 0.8in]{samples/shortsample.pdf}}% % {PRINTED DOCUMENT WILL BE DISPLAYED HERE \newpage} % -% +% % \StopEventually{^^A % \PrintChanges % \PrintIndex @@ -908,7 +930,7 @@ and the derived files apa6.ins, % \begin{macrocode} %<*class> % \end{macrocode} -% +% %\begin{macro}{apa6.cls} % \begin{macrocode} % % Below is the license statement from the apa class, upon which this @@ -989,9 +1011,18 @@ and the derived files apa6.ins, \DeclareOption{nobf}{\def\no@bf@title{\relax}} -%\DeclareOption{noapacite}{% -- Philip Kime 2008/12/03 -% \def\def@noapacite{\@noapacitemode} -%} +\DeclareOption{nolmodern}{% + \def\def@nolmodern{\@nolmodernmode} +} + +\DeclareOption{nofontenc}{% + \def\def@nofontenc{\@nofontencmode} +} + +% remove extra space around headings, etc., in man mode +\DeclareOption{noextraspace}{% + \def\def@noextraspace{\@noextraspacemode} +} % in order to have tables and figure inside the text, Guillaume Jourjon 19/10/10 \DeclareOption{floatsintext}{% @@ -1038,6 +1069,8 @@ and the derived files apa6.ins, \@ifundefined{def@jou}{% \def\def@jou{\@joumode} \ClassWarningNoLine{apa6}{Using default mode (jou)} + %\def\def@man{\@manmode} + %\def\def@doc{\@docmode} }{} }{} }{} @@ -1110,6 +1143,15 @@ and the derived files apa6.ins, \ClassWarningNoLine{apa6}{The selected bibliography package, apacite, has been loaded} } +% load the lmodern package (needed for proper watermark font size) +\@ifundefined{def@nolmodern}{% + \RequirePackage{lmodern} +}{} + +% load the fontenc package (needed for proper hyphenation of accented characters) +\@ifundefined{def@nofontenc}{% + \RequirePackage[T1]{fontenc} +}{} % place a watermark on any pages indicated \@ifundefined{def@draftall}{% @@ -1185,7 +1227,7 @@ and the derived files apa6.ins, % \@ifundefined{def@jou}{}{% \@ifundefined{def@notimes}{% - \newif\iftxfonts % -- thp 2005/07/23 + \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}{}}{} @@ -1245,7 +1287,7 @@ and the derived files apa6.ins, \advance\hsize 10em % \hsize is scratch register, based on real hsize \penalty -45 \hskip\z@\@plus\hsize \penalty-19 \hskip .15\hsize \penalty 9999 \hskip-.15\hsize - \hskip .01\hsize\@plus-\hsize\@minus.01\hsize + \hskip .01\hsize\@plus-\hsize\@minus.01\hsize \hskip 1em\@plus .3em \endgroup\fi \tnote{##1}\,\ignorespaces}% @@ -1264,7 +1306,7 @@ and the derived files apa6.ins, \advance\hsize 10em % \hsize is scratch register, based on real hsize \penalty -45 \hskip\z@\@plus\hsize \penalty-19 \hskip .15\hsize \penalty 9999 \hskip-.15\hsize - \hskip .01\hsize\@plus-\hsize\@minus.01\hsize + \hskip .01\hsize\@plus-\hsize\@minus.01\hsize \hskip 1em\@plus .3em \endgroup\fi \tnote{##1}\,\ignorespaces}% @@ -1279,7 +1321,7 @@ and the derived files apa6.ins, % Based on handling of the same issue in apacite.sty % First define the default American English macros in case no external file is present or needed -\def\rheadname{Running head:} +\def\rheadname{Running head} \def\acksname{Author Note} \def\notesname{Footnotes} @@ -1288,10 +1330,10 @@ and the derived files apa6.ins, % \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 + % 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 + % 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\@apaSix@langfile{config/APAamerican.txt}} @@ -1305,7 +1347,7 @@ and the derived files apa6.ins, \@ifundefined{def@babel}{}{% -- thp 2005/07/23 \RequirePackage{babel} % -- thp 2005/07/23, removed options 2005/12/28 -} +} %========== Load new apacite ========================= @@ -1713,15 +1755,15 @@ and the derived files apa6.ins, \providecommand\maskfootcite\footcite \providecommand\maskfootcitetext\footcitetext }{% mask references to author - + \RequirePackage{substr} % to allow counting of masked references \newcounter{maskedRefs} - + % \maskcite \newcommand\maskcite{\@ifnextchar[{\maskcite@@also}{\maskcite@@also[]}} \newcommand\maskcite@@also{} \def\maskcite@@also[#1]{\@ifnextchar[{\maskcite@@@also[#1]}{\maskcite@@@also[][#1]}} - + \def\maskcite@@@also% [#1][#2]#3{% \setcounter{maskedRefs}{0}% @@ -1732,14 +1774,14 @@ and the derived files apa6.ins, \else% \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citations removed for masked review})}% \fi% - \apaSix@masked@refs% + \apaSix@masked@refs% } - + % \maskCite \newcommand\maskCite{\@ifnextchar[{\maskCite@@also}{\maskCite@@also[]}} \newcommand\maskCite@@also{} \def\maskCite@@also[#1]{\@ifnextchar[{\maskCite@@@also[#1]}{\maskCite@@@also[][#1]}} - + \def\maskCite@@@also% [#1][#2]#3{% \setcounter{maskedRefs}{0}% @@ -1750,14 +1792,14 @@ and the derived files apa6.ins, \else% \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citations removed for masked review})}% \fi% - \apaSix@masked@refs% + \apaSix@masked@refs% } - + % \maskparencite \newcommand\maskparencite{\@ifnextchar[{\maskparencite@@also}{\maskparencite@@also[]}} \newcommand\maskparencite@@also{} \def\maskparencite@@also[#1]{\@ifnextchar[{\maskparencite@@@also[#1]}{\maskparencite@@@also[][#1]}} - + \def\maskparencite@@@also% [#1][#2]#3{% \setcounter{maskedRefs}{0}% @@ -1768,14 +1810,14 @@ and the derived files apa6.ins, \else% \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citations removed for masked review})}% \fi% - \apaSix@masked@refs% + \apaSix@masked@refs% } - + % \maskParencite \newcommand\maskParencite{\@ifnextchar[{\maskParencite@@also}{\maskParencite@@also[]}} \newcommand\maskParencite@@also{} \def\maskParencite@@also[#1]{\@ifnextchar[{\maskParencite@@@also[#1]}{\maskParencite@@@also[][#1]}} - + \def\maskParencite@@@also% [#1][#2]#3{% \setcounter{maskedRefs}{0}% @@ -1786,14 +1828,14 @@ and the derived files apa6.ins, \else% \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citations removed for masked review})}% \fi% - \apaSix@masked@refs% + \apaSix@masked@refs% } - + % \maskciteauthor \newcommand\maskciteauthor{\@ifnextchar[{\maskciteauthor@@also}{\maskciteauthor@@also[]}} \newcommand\maskciteauthor@@also{} \def\maskciteauthor@@also[#1]{\@ifnextchar[{\maskciteauthor@@@also[#1]}{\maskciteauthor@@@also[][#1]}} - + \def\maskciteauthor@@@also% [#1][#2]#3{% \setcounter{maskedRefs}{0}% @@ -1804,14 +1846,14 @@ and the derived files apa6.ins, \else% \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citations removed for masked review})}% \fi% - \apaSix@masked@refs% + \apaSix@masked@refs% } - + % \maskCiteauthor \newcommand\maskCiteauthor{\@ifnextchar[{\maskCiteauthor@@also}{\maskCiteauthor@@also[]}} \newcommand\maskCiteauthor@@also{} \def\maskCiteauthor@@also[#1]{\@ifnextchar[{\maskCiteauthor@@@also[#1]}{\maskCiteauthor@@@also[][#1]}} - + \def\maskCiteauthor@@@also% [#1][#2]#3{% \setcounter{maskedRefs}{0}% @@ -1822,14 +1864,14 @@ and the derived files apa6.ins, \else% \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citations removed for masked review})}% \fi% - \apaSix@masked@refs% + \apaSix@masked@refs% } - + % \maskciteyear \newcommand\maskciteyear{\@ifnextchar[{\maskciteyear@@also}{\maskciteyear@@also[]}} \newcommand\maskciteyear@@also{} \def\maskciteyear@@also[#1]{\@ifnextchar[{\maskciteyear@@@also[#1]}{\maskciteyear@@@also[][#1]}} - + \def\maskciteyear@@@also% [#1][#2]#3{% \setcounter{maskedRefs}{0}% @@ -1840,14 +1882,14 @@ and the derived files apa6.ins, \else% \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citations removed for masked review})}% \fi% - \apaSix@masked@refs% + \apaSix@masked@refs% } - + % \maskfootcite \newcommand\maskfootcite{\@ifnextchar[{\maskfootcite@@also}{\maskfootcite@@also[]}} \newcommand\maskfootcite@@also{} \def\maskfootcite@@also[#1]{\@ifnextchar[{\maskfootcite@@@also[#1]}{\maskfootcite@@@also[][#1]}} - + \def\maskfootcite@@@also% [#1][#2]#3{% \setcounter{maskedRefs}{0}% @@ -1858,14 +1900,14 @@ and the derived files apa6.ins, \else% \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citations removed for masked review})}% \fi% - \apaSix@masked@refs% + \apaSix@masked@refs% } - + % \maskfootcitetext \newcommand\maskfootcitetext{\@ifnextchar[{\maskfootcitetext@@also}{\maskfootcitetext@@also[]}} \newcommand\maskfootcitetext@@also{} \def\maskfootcitetext@@also[#1]{\@ifnextchar[{\maskfootcitetext@@@also[#1]}{\maskfootcitetext@@@also[][#1]}} - + \def\maskfootcitetext@@@also% [#1][#2]#3{% \setcounter{maskedRefs}{0}% @@ -1876,14 +1918,14 @@ and the derived files apa6.ins, \else% \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citations removed for masked review})}% \fi% - \apaSix@masked@refs% + \apaSix@masked@refs% } - + % \masktextcite \newcommand\masktextcite{\@ifnextchar[{\masktextcite@@also}{\masktextcite@@also[]}} \newcommand\masktextcite@@also{} \def\masktextcite@@also[#1]{\@ifnextchar[{\masktextcite@@@also[#1]}{\masktextcite@@@also[][#1]}} - + \def\masktextcite@@@also% [#1][#2]#3{% \setcounter{maskedRefs}{0}% @@ -1894,14 +1936,14 @@ and the derived files apa6.ins, \else% \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citations removed for masked review})}% \fi% - \apaSix@masked@refs% + \apaSix@masked@refs% } - + % \maskTextcite \newcommand\maskTextcite{\@ifnextchar[{\maskTextcite@@also}{\maskTextcite@@also[]}} \newcommand\maskTextcite@@also{} \def\maskTextcite@@also[#1]{\@ifnextchar[{\maskTextcite@@@also[#1]}{\maskTextcite@@@also[][#1]}} - + \def\maskTextcite@@@also% [#1][#2]#3{% \setcounter{maskedRefs}{0}% @@ -1912,16 +1954,16 @@ and the derived files apa6.ins, \else% \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citations removed for masked review})}% \fi% - \apaSix@masked@refs% + \apaSix@masked@refs% } - + } } -%========== APA Section spacing, from theapa.sty +%========== APA Section spacing \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 @@ -1934,31 +1976,42 @@ and the derived files apa6.ins, \newskip\b@level@five@skip \b@level@five@skip=1.8ex plus .8ex minus .2ex \newskip\e@level@five@skip \e@level@five@skip=0ex -%============================================================= -% -% End of code from theapa.sty -% -%============================================================= +\ifapamodeman{% + \@ifundefined{def@noextraspace}{}{% + % redefine the vertical section spacing + \b@level@one@skip=0.2\baselineskip \@plus 0.2ex \@minus 0.2ex + \e@level@one@skip=0.2\baselineskip \@plus .2ex + \b@level@two@skip=0.2\baselineskip \@plus 0.2ex \@minus 0.2ex + \e@level@two@skip=0.2\baselineskip \@plus 0.2ex + \b@level@three@skip=0\baselineskip \@plus 0.2ex \@minus 0.2ex + \e@level@three@skip=-\z@ + \b@level@four@skip=0\baselineskip \@plus 0.2ex \@minus 0.2ex + \e@level@four@skip=-\z@ + \b@level@five@skip=0\baselineskip \@plus 0.2ex \@minus 0.2ex + \e@level@five@skip=0ex + } +}{} -%========== APA Section heading & seriation, from class apa6e + +%========== APA Section heading & seriation, adapted from class apa6e % % Below is the license statement from the apa6e class, from which a % % small bit of code was used (with permission from Nathaniel Smith) % % Copyright (C) 2011 by Nathaniel J. Smith <njs@pobox.com> -% % +% % % % Redistribution and use in source and binary forms, with or without % % modification, are permitted provided that the following conditions are % % met: -% % +% % % % 1. Redistributions of source code must retain the above copyright % % notice, this list of conditions and the following disclaimer. -% % +% % % % 2. Redistributions in binary form must reproduce the above % % copyright notice, this list of conditions and the following % % disclaimer in the documentation and/or other materials provided % % with the distribution. -% % +% % % % THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS % % ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT % % LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR @@ -1970,7 +2023,7 @@ and the derived files apa6.ins, % % THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT % % (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE % % OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -% % +% % \setcounter{secnumdepth}{0} \renewcommand{\section}{\@startsection {section}{1}{\z@}% @@ -1979,18 +2032,18 @@ and the derived files apa6.ins, \renewcommand{\subsection}{\@startsection{subsection}{2}{\z@}% {\b@level@two@skip}{\e@level@two@skip}% {\normalfont\normalsize\bfseries}} -\renewcommand{\subsubsection}[1]{\@startsection{subsubsection}{3}{\parindent}% +\renewcommand{\subsubsection}[1]{\@startsection{subsubsection}{3}{1em}% {0\baselineskip \@plus 0.2ex \@minus 0.2ex}% - {-\z@}% - {\normalfont\normalsize\bfseries}{#1}\textbf{.}\hspace{0.2em}} -\renewcommand{\paragraph}[1]{\@startsection{paragraph}{4}{\parindent}% + {-\z@\relax}% + {\normalfont\normalsize\bfseries\hspace{\parindent}{#1}\textbf{.}}{\relax}} +\renewcommand{\paragraph}[1]{\@startsection{paragraph}{4}{1em}% {0\baselineskip \@plus 0.2ex \@minus 0.2ex}% - {-\z@}% - {\normalfont\normalsize\bfseries\itshape}{#1}\textbf{\textit{.}}\hspace{0.2em}} -\renewcommand{\subparagraph}[1]{\@startsection{subparagraph}{5}{\parindent}% + {-\z@\relax}% + {\normalfont\normalsize\bfseries\itshape\hspace{\parindent}{#1}\textbf{\textit{.}}}{\relax}} +\renewcommand{\subparagraph}[1]{\@startsection{subparagraph}{5}{1em}% {0\baselineskip \@plus 0.2ex \@minus 0.2ex}% - {-\z@}% - {\normalfont\normalsize\itshape}{#1}\textit{.}\hspace{0.2em}} + {-\z@\relax}% + {\normalfont\normalsize\itshape\hspace{\parindent}{#1}\textit{.}}{\relax}} % make the References section non-boldface \AtBeginDocument{\def\st@rtbibsection{\mspart{References}}}% BDB -- this is for apacite @@ -2087,7 +2140,7 @@ and the derived files apa6.ins, \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\@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}} @@ -2170,58 +2223,60 @@ and the derived files apa6.ins, \newlength\gr@boxheight \newcommand{\fitfigure}[2][0.5]{% -\ifapamodeman -{% man -\sbox\gr@box{\includegraphics[width=\linewidth]{#2}} -\settowidth{\gr@boxwidth}{\usebox\gr@box} -\settoheight{\gr@boxheight}{\usebox\gr@box} -\ifdim\gr@boxheight>\gr@boxwidth{% display upright (h) - \ifdim\gr@boxheight>\textheight% - \centerline{\vspace{\fill}\includegraphics[height=\textheight]{#2}\vspace{\fill}}% - \else% - \usebox\gr@box% - \fi} -\else{% display rotated - \sbox\gr@box{\includegraphics[angle=90,width=\linewidth]{#2}} - \settoheight{\gr@boxheight}{\usebox\gr@box} - \ifdim\gr@boxheight>\textheight% - \centerline{\vspace{\fill}\includegraphics[angle=90,height=\textheight]{#2}\vspace{\fill}}% - \else% - \usebox\gr@box% - \fi}% -\fi} -{% jou, doc +%\ifapamodeman +%{% man +%\sbox\gr@box{\includegraphics[width=\linewidth]{#2}} +%\settowidth{\gr@boxwidth}{\usebox\gr@box} +%\settoheight{\gr@boxheight}{\usebox\gr@box} +%\ifdim\gr@boxheight>\gr@boxwidth{% display upright (h) +% \ifdim\gr@boxheight>\textheight% +% \centerline{\vspace{\fill}\includegraphics[height=\textheight]{#2}\vspace{\fill}}% +% \else% +% \usebox\gr@box% +% \fi} +%\else{% display rotated +% \sbox\gr@box{\includegraphics[angle=90,width=\linewidth]{#2}} +% \settoheight{\gr@boxheight}{\usebox\gr@box} +% \ifdim\gr@boxheight>\textheight% +% \centerline{\vspace{\fill}\includegraphics[angle=90,height=\textheight]{#2}\vspace{\fill}}% +% \else% +% \usebox\gr@box% +% \fi}% +%\fi +%}{% jou, doc \sbox\gr@box{\includegraphics[width=\linewidth]{#2}} \settoheight{\gr@boxheight}{\usebox\gr@box} \ifdim\gr@boxheight>\textheight% \centerline{\includegraphics[height=#1\textheight]{#2}}% need to leave space for caption \else% \usebox\gr@box% -\fi} +\fi +%} } \newcommand{\fitbitmap}[2][0.5]{ % like fitfigure but no scaling in man mode for best quality -\ifapamodeman -{% man -\sbox\gr@box{\includegraphics{#2}} -\settowidth{\gr@boxwidth}{\usebox\gr@box} -\settoheight{\gr@boxheight}{\usebox\gr@box} -\ifdim\gr@boxwidth>\textwidth% display rotated - \centerline{\vspace{\fill}\includegraphics[angle=90]{#2}\vspace{\fill}}% - \ifdim\gr@boxheight>\textwidth\ClassWarning{apa6}{Figure #2 too high!}\fi% display rotated - \ifdim\gr@boxwidth>\textheight\ClassWarning{apa6}{Figure #2 too wide!}\fi% display rotated -\else% display upright - \centerline{\vspace{\fill}\includegraphics{#2}\vspace{\fill}}% - \ifdim\gr@boxheight>\textheight\ClassWarning{apa6}{Figure #2 too high!}\fi% display rotated -\fi} -{% jou, doc +%\ifapamodeman +%{% man +%\sbox\gr@box{\includegraphics{#2}} +%\settowidth{\gr@boxwidth}{\usebox\gr@box} +%\settoheight{\gr@boxheight}{\usebox\gr@box} +%\ifdim\gr@boxwidth>\textwidth% display rotated +% \centerline{\vspace{\fill}\includegraphics[angle=90]{#2}\vspace{\fill}}% +% \ifdim\gr@boxheight>\textwidth\ClassWarning{apa6}{Figure #2 too high!}\fi% display rotated +% \ifdim\gr@boxwidth>\textheight\ClassWarning{apa6}{Figure #2 too wide!}\fi% display rotated +%\else% display upright +% \centerline{\vspace{\fill}\includegraphics{#2}\vspace{\fill}}% +% \ifdim\gr@boxheight>\textheight\ClassWarning{apa6}{Figure #2 too high!}\fi% display rotated +%\fi} +%{% jou, doc \sbox\gr@box{\includegraphics[width=\linewidth]{#2}} \settoheight{\gr@boxheight}{\usebox\gr@box} \ifdim\gr@boxheight>\textheight% \centerline{\includegraphics[height=#1\textheight]{#2}}% need to leave space for caption \else% \centerline{\usebox\gr@box}% -\fi} +\fi +%} } %==== Miscellaneous definitions @@ -2245,7 +2300,7 @@ and the derived files apa6.ins, % \@tabular{@{\extracolsep{\fill}}#1}} %\def\apaSix@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 +% \hfill\old@tabular} %% and that the in-table citation form was incorrect %% \let\apaSix@doc@endtabular\endtabular %\let\orig@endtabular\endtabular % -- thp 2005/07/23 @@ -2316,25 +2371,25 @@ and the derived files apa6.ins, %==== Appendix macros added by Michael Erickson 2000/07/11, revised by thp 2000/07/18 \newcounter{appendix}\setcounter{appendix}{0} -\renewcommand{\theappendix}{\@Alph\c@appendix} +\renewcommand{\theappendix}{\@Alph\c@appendix} \def\apaSixappfig{% - \renewcommand\thefigure{\theappendix\@arabic\c@figure}% + \renewcommand\thefigure{\theappendix\@arabic\c@figure}% \ifapamodeman{\renewcommand\thepostfig{\theappendix\arabic{postfig}}}{}} \def\apaSixapptab{% \renewcommand\thetable{\theappendix\@arabic\c@table}% \ifapamodeman{\renewcommand\theposttbl{\theappendix\arabic{posttbl}}}{}} -\newif\ifoneappendix +\newif\ifoneappendix \oneappendixtrue % one appendix by default \newif\ifappendix \appendixfalse \def\appendix{% % - \ifapamodeman{\processdelayedfloats}{}% BDB -- output all tables and figures prior to the appendix + \ifapamodeman{\processdelayedfloats}{}% BDB -- output all tables and figures prior to the appendix % \appendixtrue - \apaSixappfig - \apaSixapptab + \apaSixappfig + \apaSixapptab % \ifapamodejou{}{\clearpage} %% commented out -- thp 2005/07/23 \let\old@apaSix@section=\section % This will not work right with five levels in appendix. % Should go into \section, not \leveltwo but would also require @@ -2415,7 +2470,7 @@ and the derived files apa6.ins, \renewcommand{\headrulewidth}{0pt} \fancypagestyle{titlepage}{% - \lhead{Running head: \MakeUppercase{\@shorttitle}}% + \lhead{\rheadname: \MakeUppercase{\@shorttitle}}% \rhead{\thepage}% } \fancypagestyle{otherpage}{% @@ -2436,7 +2491,7 @@ and the derived files apa6.ins, % %\def\@makeenmark{\hbox{$^{\mbox{\small\@ifundefined{hrm}{}{\sf}\@theenmark}}$}} %\def\enoteformat{\rightskip\z@ \leftskip\z@ -% \raggedright\fussy\hyphenpenalty 10000 \parindent=0.4in +% \raggedright\fussy\hyphenpenalty 10000 \parindent=0.4in % \leavevmode\llap{\hbox{$^{\mbox{\small\@ifundefined{hrm}{}{\sf}\@theenmark}}$}}} %\AtEndDocument{% % \ifappendix% set section back to no numbering after appendix @@ -2459,24 +2514,24 @@ and the derived files apa6.ins, \RequirePackage[notablist,figlist,notabhead,nofighead,tablesfirst,nomarkers]{endfloat}[1995/10/11]}{% \RequirePackage[notablist,figlist,notabhead,nofighead,tablesfirst]{endfloat}[1995/10/11]} -\renewcommand{\figureplace}{% - \par\begin{center} - \parbox{\textwidth} - {\begin{center} - \rule{2.1in}{0.005in}\\ - Insert \figurename~\thepostfig\ about here\\ - \rule{2.1in}{0.005in}\\ - \end{center}} - \end{center}\par} -\renewcommand{\tableplace}{% - \par\begin{center} - \parbox{\textwidth} - {\begin{center} - \rule{2.1in}{0.005in}\\ - Insert \tablename~\theposttbl\ about here\\ - \rule{2.1in}{0.005in}\\ - \end{center}} - \end{center}\par} +%\renewcommand{\figureplace}{% +% \par\begin{center} +% \parbox{\textwidth} +% {\begin{center} +% \rule{2.1in}{0.005in}\\ +% Insert \figurename~\thepostfig\ about here\\ +% \rule{2.1in}{0.005in}\\ +% \end{center}} +% \end{center}\par} +%\renewcommand{\tableplace}{% +% \par\begin{center} +% \parbox{\textwidth} +% {\begin{center} +% \rule{2.1in}{0.005in}\\ +% Insert \tablename~\theposttbl\ about here\\ +% \rule{2.1in}{0.005in}\\ +% \end{center}} +% \end{center}\par} \def\@gobbleuntilnext[#1]{} \let\eatarg\@gobbleuntilnext @@ -2491,14 +2546,14 @@ and the derived files apa6.ins, \else \efloat@condopen{fff} \efloat@iwrite{fff}{\string\begin{figure*}[hbt]}% - \global\def\@figure@written{\relax}% Set a flag that there is at least one figure -- thp 20010705 + \global\def\@figure@written{\relax}% Set a flag that there is at least one figure -- thp 20010705 %% should be a global declaration to be "visible" at end document \ifnextchar[{\gobbleuntilnext[}{} \efloat@iwrite{fff}{\string\ifnextchar[{\string\eatarg}{}} - \if@domarkers% - \addtocounter{postfig}{1}% % bj - \figureplace% % bj - \fi% +% \if@domarkers% +% \addtocounter{postfig}{1}% % bj +% \figureplace% % bj +% \fi% \def\@currenvir{efloat@float}% \begingroup% \let\do\ef@makeinnocent \dospecials% @@ -2508,7 +2563,7 @@ and the derived files apa6.ins, }% \def\table{% - \ifappendix + \ifappendix \vspace*{\intextsep} \def\fps@table{!hbt} \@noendfloattab @@ -2519,10 +2574,10 @@ and the derived files apa6.ins, \@ifundefined{hrm}{}{% \efloat@iwrite{ttt}{\string\sf}}% \efloat@iwrite{ttt}{\string\ifnextchar[{\string\eatarg}{}} % bj - \if@domarkers - \addtocounter{posttbl}{1} % bj - \tableplace % bj - \fi +% \if@domarkers +% \addtocounter{posttbl}{1} % bj +% \tableplace % bj +% \fi \def\@currenvir{efloat@float}% \begingroup \let\do\ef@makeinnocent \dospecials @@ -2545,7 +2600,7 @@ and the derived files apa6.ins, %%%%%%%%%%%%%%\long\def\numberline#1#2{\noindent{\em\figurename\ #1.\/} #2\vspace{0.5\baselineskip}\par} %%%%%%%%%%%%%%\long\def\@@caption{\refstepcounter\@captype \@dblarg{\@@@caption\@captype}} %%%%%%%%%%%%%%\long\def\@@@caption#1[#2]#3{\addcontentsline{\csname -%%%%%%%%%%%%%% ext@#1\endcsname}{#1}{\protect\numberline{\csname +%%%%%%%%%%%%%% ext@#1\endcsname}{#1}{\protect\numberline{\csname %%%%%%%%%%%%%% the#1\endcsname}{\ignorespaces #2}}} %\def\listoffigures{\section*{\figurecaptionsname}\@starttoc{lof}}% changed from 'Figure Captions' @@ -2558,7 +2613,7 @@ and the derived files apa6.ins, \def\processfigures{% \expandafter\ifnum \csname @ef@fffopen\endcsname>0 \immediate\closeout\efloat@postfff \ef@setct{fff}{0} -% \clearpage +% \clearpage \if@figlist \@ifundefined{@figure@written}{}{% % \figurecaptionsformat @@ -2566,13 +2621,13 @@ and the derived files apa6.ins, % \let\BBAB\table@BBAB% -- thp 2005/07/23 % \listoffigures% % \let\BBAB\normal@BBAB% -- thp 2005/07/23 - } + } % \clearpage - } + } \fi % \if@fighead -% \section*{\figuresection} -% \suppressfloats[t] +% \section*{\figuresection} +% \suppressfloats[t] % \fi \@ifundefined{fig@num}{% % \markboth{}{} @@ -2593,10 +2648,10 @@ and the derived files apa6.ins, \def\processtables{% \expandafter\ifnum \csname @ef@tttopen\endcsname>0 \immediate\closeout\efloat@postttt \ef@setct{ttt}{0} - \clearpage + \clearpage \if@tabhead - \section*{\tablesection} - \suppressfloats[t] + \section*{\tablesection} + \suppressfloats[t] \fi \def\baselinestretch{\@@spacing} \processtables@hook \@ifundefined{hrm}{}{\sf}% @@ -2633,84 +2688,91 @@ and the derived files apa6.ins, % \makebox[\linewidth][l]{\rheadname\hspace{0.1in}\MakeUppercase{\r@headr}}\\ %thp090298 \vspace*{1in} - \@title\vspace{0.25in}\\ + \@title% + \ifapamodeman{% + \@ifundefined{def@noextraspace}{% + \vspace{0.25in}\\ + }{} + }{% + \vspace{0.25in}\\ + } \@ifundefined{apaSix@maskauthoridentity}{% BDB \@ifundefined{@authorTwo}{ \@author \\ - + \@affil \vspace{0.25in} \\ }{ \@ifundefined{@authorThree}{ \@authorOne \\ - + \@affilOne \vspace{0.2in} \\ \@authorTwo \\ - + \@affilTwo \vspace{0.25in} \\ }{ \@ifundefined{@authorFour}{ \@authorOne \\ - + \@affilOne \vspace{0.2in} \\ \@authorTwo \\ - + \@affilTwo \vspace{0.2in} \\ \@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} \\ + + \@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} \\ + + \@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} \\ \@authorTwo \\ - + \@affilTwo \vspace{0.2in} \\ \@authorThree \\ - - \@affilThree \vspace{0.2in} \\ + + \@affilThree \vspace{0.2in} \\ \@authorFour \\ - + \@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} - + }{% mask author identity -- show nothing in the author or author note space } @@ -2723,7 +2785,7 @@ and the derived files apa6.ins, {% \vfill% \begin{center}% - Author Note% + \acksname% \end{center}% \protect\raggedright \setlength{\parindent}{0.4in} @@ -2795,7 +2857,7 @@ and the derived files apa6.ins, % \vskip\baselineskip} % %\long\def\@caption#1[#2]#3{\par\addcontentsline{\csname -% ext@#1\endcsname}{#1}{\protect\numberline{\csname +% ext@#1\endcsname}{#1}{\protect\numberline{\csname % the#1\endcsname}{\ignorespaces #2}}\begingroup % \@parboxrestore % \normalsize\@ifundefined{hrm}{}{\hrm} @@ -2825,7 +2887,7 @@ and the derived files apa6.ins, \fussy %\setlength{\parindent}{0.4in} -%\let\oldfootnote=\footnote % 3/10/00 +%\let\oldfootnote=\footnote % 3/10/00 %\let\footnote=\endnote %\def\footnotesize{\normalsize\rm} @@ -2855,7 +2917,7 @@ and the derived files apa6.ins, \@ifundefined{def@jou}{}{% -%========== balance last-page columns ================= +%========== balance last-page columns ================= \IfFileExists{flushend.sty}{\RequirePackage{flushend}}{} @@ -2976,7 +3038,7 @@ and the derived files apa6.ins, \@ifundefined{@note} {\vspace{0.07in}} {\vspace{0.07in}\\ {\large\@note\vspace{0.07in}}} - + }{% mask author identity -- show nothing in the author or author space \vspace{0.32in} } @@ -3076,20 +3138,20 @@ and the derived files apa6.ins, % \let\BBAB\table@BBAB % thp 2005/07/23 % \vskip\abovecaptionskip % \setbox\@tempboxa\hbox{#1 #2} -% \ifdim \wd\@tempboxa > \hsize -% \hbox to\hsize{\hfil\parbox[t]{#3}{#1 #2}\hfil} -% \else +% \ifdim \wd\@tempboxa > \hsize +% \hbox to\hsize{\hfil\parbox[t]{#3}{#1 #2}\hfil} +% \else % \ifdim \wd\@tempboxa > #3 % \hbox to\hsize{\hfil\parbox[t]{#3}{#1 #2}\hfil} % \else -% \hbox to\hsize{\hfil\mbox{#1 #2}\hfil} +% \hbox to\hsize{\hfil\mbox{#1 #2}\hfil} % \fi -% \fi +% \fi % \let\BBAB\normal@BBAB % thp 2005/07/23 % \vskip\belowcaptionskip} % %\long\def\@caption#1[#2]#3{\par\addcontentsline{\csname -% ext@#1\endcsname}{#1}{\protect\numberline{\csname +% ext@#1\endcsname}{#1}{\protect\numberline{\csname % the#1\endcsname}{\ignorespaces #2}}\begingroup % \@parboxrestore % \normalsize @@ -3098,7 +3160,7 @@ and the derived files apa6.ins, % \endgroup} % %\long\def\@ccaption#1[#2]#3#4{\def\@ccwidth{#3} \par\addcontentsline{\csname -% ext@#1\endcsname}{#1}{\protect\numberline{\csname +% ext@#1\endcsname}{#1}{\protect\numberline{\csname % the#1\endcsname}{\ignorespaces #2}}\begingroup % \@parboxrestore % \normalsize @@ -3146,12 +3208,12 @@ and the derived files apa6.ins, \@ifundefined{def@apacite}{}{% -- Philip Kime 2008/12/03 - % Removed some bibliography redefinitions as per the instructions of Erik Meijer + % 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}} \@ifundefined{def@natbib}{}{% -- Philip Kime 2008/12/03 - % Removed some bibliography redefinitions as per the instructions of Erik Meijer + % 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}} @@ -3159,7 +3221,7 @@ and the derived files apa6.ins, %\@ifundefined{def@noapacite}{% -- Philip Kime 2008/12/03 -% % Removed some bibliography redefinitions as per the instructions of Erik Meijer +% % 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}}{} @@ -3192,18 +3254,18 @@ and the derived files apa6.ins, \pagestyle{otherpage} \def\maketitle{ - \global\@topnum\z@ % to prevent tables before the title %% Erik Meijer, 2006/01/03 + \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 + \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} + \@ifundefined{r@headr}{\typeout{Using title for running head} \def\r@headr{\protect\MakeUppercase{\@title}} \markright{\rm \@title \protect\\ \thepage}}{} \@ifundefined{r@headl}{\let\r@headl\r@headr}{} \@ifundefined{s@title}{\let\s@title\r@headr}{} - \sloppy + \sloppy \setlength{\parindent}{0.4in} \begin{center} \@ifundefined{@journal}{}{% @@ -3216,84 +3278,84 @@ and the derived files apa6.ins, \vspace*{0.3in} {\LARGE \@title}\\ - + \vspace{0.3in} \@ifundefined{apaSix@maskauthoridentity}{% BDB \@ifundefined{@authorTwo}{ % one author-affiliation {\Large \@author} \\ - + \@affil \vspace{0.1in} \\ }{ \@ifundefined{@authorThree}{ % two authors-affiliations {\Large \@authorOne} \\ - + \@affilOne \vspace{0.1in} \\ {\Large \@authorTwo}\\ - + \@affilTwo \vspace{0.1in} \\ }{ \@ifundefined{@authorFour}{ % three authors-affiliations {\Large \@authorOne} \\ - + \@affilOne \vspace{0.1in} \\ {\Large \@authorTwo}\\ - - \@affilTwo \vspace{0.1in} \\ + + \@affilTwo \vspace{0.1in} \\ {\Large \@authorThree}\\ - + \@affilThree \vspace{0.1in} \\ }{ \@ifundefined{@authorFive}{ %% 2006/01/05 added as contributed by Aaron Geller % four authors-affiliations {\Large \@authorOne} \\ - + \@affilOne \vspace{0.1in} \\ {\Large \@authorTwo}\\ - - \@affilTwo \vspace{0.1in} \\ + + \@affilTwo \vspace{0.1in} \\ {\Large \@authorThree}\\ - - \@affilThree \vspace{0.1in} \\ + + \@affilThree \vspace{0.1in} \\ {\Large \@authorFour}\\ - + \@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} \\ + + \@affilTwo \vspace{0.1in} \\ {\Large \@authorThree}\\ - - \@affilThree \vspace{0.1in} \\ + + \@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} \\ + + \@affilTwo \vspace{0.1in} \\ {\Large \@authorThree}\\ - - \@affilThree \vspace{0.1in} \\ + + \@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 }}}} @@ -3325,11 +3387,11 @@ and the derived files apa6.ins, {\begin{figure}[b] \parbox{\textwidth}{ \setlength{\parindent}{0.2in} \noindent \makebox[\linewidth]{\vrule height0.125pt width\linewidth} - + \vspace*{0.05in} {\footnotesize \indent \@acks - + }} \end{figure}} @@ -3371,16 +3433,16 @@ and the derived files apa6.ins, % %\long\def\@makecaption#1#2{ % \let\BBAB\table@BBAB% thp 2005/07/23 -% \vskip 10pt +% \vskip 10pt % \setbox\@tempboxa\hbox{#1 #2} % \ifdim \wd\@tempboxa >\hsize #1 #2\par \else \hbox -%to\hsize{\hfil\box\@tempboxa\hfil} -% \fi +%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 -% ext@#1\endcsname}{#1}{\protect\numberline{\csname +% ext@#1\endcsname}{#1}{\protect\numberline{\csname % the#1\endcsname}{\ignorespaces #2}}\begingroup % \@parboxrestore % \normalsize @@ -3442,7 +3504,7 @@ and the derived files apa6.ins, % \end{macrocode} -%\end{macro} +%\end{macro} % % \begin{macrocode} %</class> @@ -3503,7 +3565,7 @@ and the derived files apa6.ins, } @ARTICLE{Gilbert2004, - author = {Gilbert, David and McClernon, Joseph and Rabinovich, Norka and Sugai, Chihiro + author = {Gilbert, David and McClernon, Joseph and Rabinovich, Norka and Sugai, Chihiro and Plath, Louisette and Asgaard, Greg and Zuo, Yantao and Huggenvik, Jodi and Botros, Nazeih}, title = {Effects of quitting smoking on {EEG} activation and attention last for more than 31 days and are more severe with stress, dependence, {DRD2 A1} allele, and depressive traits}, @@ -3538,7 +3600,7 @@ and the derived files apa6.ins, @ARTICLE{Lassen2006, author = {Lassen, Stephen R. and Steele, Michael M. and Sailor, Wayne}, - title = {The relationship of school-wide positive behavior support to academic achievement in + title = {The relationship of school-wide positive behavior support to academic achievement in an urban middle school}, journal = {Psychology in the Schools}, year = {2006}, @@ -3604,7 +3666,7 @@ and the derived files apa6.ins, %</bibliography> % \end{macrocode} -%\end{macro} +%\end{macro} % %\begin{macro}{shortsample.tex} % \begin{macrocode} @@ -3618,9 +3680,6 @@ and the derived files apa6.ins, \DeclareLanguageMapping{american}{american-apa} \addbibresource{bibliography.bib} -\usepackage[T1]{fontenc} -\usepackage{lmodern} - \title{Sample APA-Style Document Using the \textsf{apa6} Package} \author{Brian D. Beitzel} @@ -3683,10 +3742,10 @@ statistical prowess in analyzing these data is unmatched. \begin{table}[htbp] \caption{A complex table} \label{tab:ComplexTable} - \begin{tabular}{@{}lrrl@{}} \toprule + \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 \\ + & \multicolumn{2}{l}{segment in} & participant \\ \cmidrule(r){2-3} & Onset & Coda & \\ \midrule @@ -3708,7 +3767,7 @@ skill in interpreting the results for the masses. %</shortsample> % \end{macrocode} -%\end{macro} +%\end{macro} % %\begin{macro}{longsample.tex} % \begin{macrocode} @@ -3724,9 +3783,6 @@ skill in interpreting the results for the masses. \DeclareLanguageMapping{american}{american-apa} \addbibresource{bibliography.bib} -\usepackage[T1]{fontenc} -\usepackage{lmodern} - \title{Sample APA-Style Document Using the \textsf{apa6} Package} \shorttitle{Sample Document} @@ -3750,7 +3806,7 @@ skill in interpreting the results for the masses. \begin{document} \maketitle -\lipsum[2] +\lipsum[2] \Textcite{vonDavier2011} said this, too \parencite{vonDavier2011,Lassen2006}. Further evidence comes from @@ -3878,7 +3934,7 @@ The detailed results are shown in Table~\ref{tab:DeckedTable}. \lipsum[22] %</longsample> % \end{macrocode} -%\end{macro} +%\end{macro} % % % %%%%%%%%%%% PTEX FILE (for Tex2Word) %%%%%%%%%%%% @@ -3892,9 +3948,9 @@ The detailed results are shown in Table~\ref{tab:DeckedTable}. \lipsum[22] %% All rights reserved. %% http://www.chikrii.com %% mailto: support@chikrii.com -%% License: You are allowed to create your own translators based +%% License: You are allowed to create your own translators based %% on the contents of this file solely for use with TeX2Word. -%% Chikrii Softlab is not responsible for any damages caused by the +%% Chikrii Softlab is not responsible for any damages caused by the %% use of this file or derived works. %% %% Modified by Brian Beitzel for the 'apa6' class @@ -4021,10 +4077,10 @@ The detailed results are shown in Table~\ref{tab:DeckedTable}. \lipsum[22] \@sec@hook@paragraphlevel}} % {styleno}{justification}{space before}{space after}{attribs}{counter}{name} -% Consider first parameter as section level, second one is alignment (left, right, -% centered, justified... -- possible numbered values are listed in TeX2Word User -% Manual), then spacing before and after paragraph, then formatting (\bf goes for -% bold, \it for italics). Then goes name for counter and then name of that +% Consider first parameter as section level, second one is alignment (left, right, +% centered, justified... -- possible numbered values are listed in TeX2Word User +% Manual), then spacing before and after paragraph, then formatting (\bf goes for +% bold, \it for italics). Then goes name for counter and then name of that % paragraph style as it is seen in MS Word. \@secdef@nonum{1}{3}{0}{0}{\normalsize\rm\bf}{section}{Section} \@secdef@nonum{2}{1}{0}{0}{\normalsize\rm\bf}{subsection}{Subsection} @@ -4114,7 +4170,7 @@ The detailed results are shown in Table~\ref{tab:DeckedTable}. \lipsum[22] %</ptex> % \end{macrocode} -%\end{macro} +%\end{macro} % % % %%%%%%%%%%% CONFIGURATION FILES %%%%%%%%%%%% @@ -4122,56 +4178,82 @@ The detailed results are shown in Table~\ref{tab:DeckedTable}. \lipsum[22] %\begin{macro}{APAamerican.txt} % \begin{macrocode} %<*american> -\ProvidesFile{APAamerican.txt}[2011/10/08 v1.0 apa6 configuration for American English] +\ProvidesFile{APAamerican.txt}[2011/12/10 v1.11 apa6 configuration for American English] -\renewcommand{\rheadname}{Running head:} +\renewcommand{\rheadname}{Running head} \renewcommand{\acksname}{Author Note} \renewcommand{\notesname}{Footnotes} %</american> % \end{macrocode} -%\end{macro} +%\end{macro} % % %\begin{macro}{APAenglish.txt} % \begin{macrocode} %<*english> -\ProvidesFile{APAenglish.txt}[2011/10/08 v1.0 apa6 configuration for non-American English] +\ProvidesFile{APAenglish.txt}[2011/12/10 v1.11 apa6 configuration for non-American English] -\renewcommand{\rheadname}{Running head:} +\renewcommand{\rheadname}{Running head} \renewcommand{\acksname}{Author Note} \renewcommand{\notesname}{Footnotes} %</english> % \end{macrocode} -%\end{macro} +%\end{macro} % %\begin{macro}{APAdutch.txt} % \begin{macrocode} %<*dutch> -\ProvidesFile{APAdutch.txt}[2011/10/08 v1.0 apa6 configuration for Dutch] +\ProvidesFile{APAdutch.txt}[2011/12/10 v1.11 apa6 configuration for Dutch] -\renewcommand{\rheadname}{Kopregel:}% Running head: +\renewcommand{\rheadname}{Kopregel}% Running head \renewcommand{\acksname}{Auteursnoot}% Author Note \renewcommand{\notesname}{Voetnoten}% Footnotes %</dutch> % \end{macrocode} -%\end{macro} +%\end{macro} +% +%\begin{macro}{APAgerman.txt} +% \begin{macrocode} +%<*german> +\ProvidesFile{APAgerman.txt}[2011/12/10 v1.11 apa6 configuration for German] + +\renewcommand{\rheadname}{Kolumnentitel}% Running head +\renewcommand{\acksname}{Autorenhinweis}% Author Note +\renewcommand{\notesname}{Fußnoten}% Footnotes + +%</german> +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{APAngerman.txt} +% \begin{macrocode} +%<*ngerman> +\ProvidesFile{APAgerman.txt}[2011/12/10 v1.11 apa6 configuration for "new" German] + +\renewcommand{\rheadname}{Kolumnentitel}% Running head +\renewcommand{\acksname}{Autorenhinweis}% Author Note +\renewcommand{\notesname}{Fußnoten}% Footnotes + +%</ngerman> +% \end{macrocode} +%\end{macro} % %\begin{macro}{APAgreek.txt} % \begin{macrocode} %<*greek> -\ProvidesFile{APAgreek.txt}[2011/10/08 v1.0 apa6 configuration for Greek] +\ProvidesFile{APAgreek.txt}[2011/12/10 v1.11 apa6 configuration for Greek] -\renewcommand{\rheadname}{Up'ertitlos:}% Running head: +\renewcommand{\rheadname}{Up'ertitlos}% Running head \renewcommand{\acksname}{Shmei'wseis tou suggraf'ea}% Author Note \renewcommand{\notesname}{Uposhmei'wseis}% Footnotes %</greek> % \end{macrocode} -%\end{macro} +%\end{macro} % %\begin{macro}{APAendfloat.cfg} % \begin{macrocode} @@ -4179,11 +4261,11 @@ The detailed results are shown in Table~\ref{tab:DeckedTable}. \lipsum[22] %% %% This is file `endfloat.cfg', %% modifed from the original supplied with the endfloat package -%% to handle both sideways floats and longtable +%% to handle both sideways floats and longtable %% %% Athanassios Protopapas <protopap@ilsp.gr> %% July 2005 -%% +%% %% Original authors: James Darrell McCauley <jdm5548@diamond.tamu.edu>, %% Jeff Goldberg <j.goldberg@cranfield.ac.uk> %% Original version: Version 2.4i <October 1995> @@ -4197,10 +4279,10 @@ The detailed results are shown in Table~\ref{tab:DeckedTable}. \lipsum[22] \AtBeginFigures{\let\sidewaysfigure=\efsaved@sidewaysfigure\relax} \def\sidewaystable{\efloat@condopen{ttt} \efloat@iwrite{ttt}{\string\begin{sidewaystable}}% - \if@domarkers - \addtocounter{posttbl}{1} - \tableplace - \fi +% \if@domarkers +% \addtocounter{posttbl}{1} +% \tableplace +% \fi \def\@currenvir{efloat@float}% \begingroup \let\do\ef@makeinnocent \dospecials @@ -4217,10 +4299,10 @@ The detailed results are shown in Table~\ref{tab:DeckedTable}. \lipsum[22] } \def\sidewaysfigure{\efloat@condopen{fff} \efloat@iwrite{fff}{\string\begin{sidewaysfigure}}% - \if@domarkers - \addtocounter{postfig}{1} - \figureplace - \fi +% \if@domarkers +% \addtocounter{postfig}{1} +% \figureplace +% \fi \def\@currenvir{efloat@float}% \begingroup \let\do\ef@makeinnocent \dospecials @@ -4237,10 +4319,10 @@ The detailed results are shown in Table~\ref{tab:DeckedTable}. \lipsum[22] } \def\longtable{\efloat@condopen{ttt} \efloat@iwrite{ttt}{\string\begin{longtable}}% - \if@domarkers - \addtocounter{posttbl}{1} - \tableplace - \fi +% \if@domarkers +% \addtocounter{posttbl}{1} +% \tableplace +% \fi \def\@currenvir{efloat@float}% \begingroup \let\do\ef@makeinnocent \dospecials @@ -4263,7 +4345,7 @@ The detailed results are shown in Table~\ref{tab:DeckedTable}. \lipsum[22] %</APAendfloat> % \end{macrocode} -%\end{macro} +%\end{macro} % % %\Finale
\ No newline at end of file diff --git a/Master/texmf-dist/source/latex/apa6/apa6.ins b/Master/texmf-dist/source/latex/apa6/apa6.ins index 1f89db5f9cc..8e6d257e4e7 100644 --- a/Master/texmf-dist/source/latex/apa6/apa6.ins +++ b/Master/texmf-dist/source/latex/apa6/apa6.ins @@ -82,6 +82,8 @@ and the derived files apa6.ins, APAamerican.txt, APAdutch.txt, APAenglish.txt, + APAgerman.txt, + APAngerman.txt, APAgreek.txt, APAendfloat.cfg, apa6.ptex, @@ -100,6 +102,8 @@ and the derived files apa6.ins, \file{./config/APAamerican.txt}{\from{\jobname.dtx}{american}} \file{./config/APAdutch.txt}{\from{\jobname.dtx}{dutch}} \file{./config/APAenglish.txt}{\from{\jobname.dtx}{english}} + \file{./config/APAgerman.txt}{\from{\jobname.dtx}{german}} + \file{./config/APAngerman.txt}{\from{\jobname.dtx}{ngerman}} \file{./config/APAgreek.txt}{\from{\jobname.dtx}{greek}} \file{./config/APAendfloat.cfg}{\from{\jobname.dtx}{APAendfloat}} } @@ -114,6 +118,7 @@ and the derived files apa6.ins, \file{./pseudoTeX/apa6.ptex}{\from{\jobname.dtx}{ptex}} } \endbatchfile + %% %% Copyright (C) 2011 by Brian D. Beitzel <brian at beitzel.com> %% @@ -142,6 +147,8 @@ and the derived files apa6.ins, %% APAamerican.txt, %% APAdutch.txt, %% APAenglish.txt, +%% APAgerman.txt, +%% APAngerman.txt, %% APAgreek.txt, %% APAendfloat.cfg, %% apa6.ptex, diff --git a/Master/texmf-dist/tex/latex/apa6/apa6.cls b/Master/texmf-dist/tex/latex/apa6/apa6.cls index 6cfa6ac6587..bbeec32175a 100644 --- a/Master/texmf-dist/tex/latex/apa6/apa6.cls +++ b/Master/texmf-dist/tex/latex/apa6/apa6.cls @@ -27,9 +27,10 @@ %% %% ---------------------------------------------------------------------- %% -\ProvidesClass{apa6}[2011/12/01 v1.02 APA formatting (6th edition)] +\ProvidesClass{apa6}[2011/12/10 v1.11 APA formatting (6th edition)] \NeedsTeXFormat{LaTeX2e} + \DeclareOption{man}{% \def\def@man{\@manmode} } @@ -82,6 +83,17 @@ \DeclareOption{nobf}{\def\no@bf@title{\relax}} +\DeclareOption{nolmodern}{% + \def\def@nolmodern{\@nolmodernmode} +} + +\DeclareOption{nofontenc}{% + \def\def@nofontenc{\@nofontencmode} +} + +\DeclareOption{noextraspace}{% + \def\def@noextraspace{\@noextraspacemode} +} \DeclareOption{floatsintext}{% \def\def@floatsintext{\@floatsintext} @@ -124,6 +136,8 @@ \@ifundefined{def@jou}{% \def\def@jou{\@joumode} \ClassWarningNoLine{apa6}{Using default mode (jou)} + %\def\def@man{\@manmode} + %\def\def@doc{\@docmode} }{} }{} }{} @@ -193,6 +207,14 @@ \ClassWarningNoLine{apa6}{The selected bibliography package, apacite, has been loaded} } +\@ifundefined{def@nolmodern}{% + \RequirePackage{lmodern} +}{} + +\@ifundefined{def@nofontenc}{% + \RequirePackage[T1]{fontenc} +}{} + \@ifundefined{def@draftall}{% \@ifundefined{def@draftfirst}{}{% \RequirePackage[firstpage]{draftwatermark} @@ -327,7 +349,7 @@ -\def\rheadname{Running head:} +\def\rheadname{Running head} \def\acksname{Author Note} \def\notesname{Footnotes} @@ -967,6 +989,21 @@ \newskip\b@level@five@skip \b@level@five@skip=1.8ex plus .8ex minus .2ex \newskip\e@level@five@skip \e@level@five@skip=0ex +\ifapamodeman{% + \@ifundefined{def@noextraspace}{}{% + % redefine the vertical section spacing + \b@level@one@skip=0.2\baselineskip \@plus 0.2ex \@minus 0.2ex + \e@level@one@skip=0.2\baselineskip \@plus .2ex + \b@level@two@skip=0.2\baselineskip \@plus 0.2ex \@minus 0.2ex + \e@level@two@skip=0.2\baselineskip \@plus 0.2ex + \b@level@three@skip=0\baselineskip \@plus 0.2ex \@minus 0.2ex + \e@level@three@skip=-\z@ + \b@level@four@skip=0\baselineskip \@plus 0.2ex \@minus 0.2ex + \e@level@four@skip=-\z@ + \b@level@five@skip=0\baselineskip \@plus 0.2ex \@minus 0.2ex + \e@level@five@skip=0ex + } +}{} @@ -977,18 +1014,18 @@ \renewcommand{\subsection}{\@startsection{subsection}{2}{\z@}% {\b@level@two@skip}{\e@level@two@skip}% {\normalfont\normalsize\bfseries}} -\renewcommand{\subsubsection}[1]{\@startsection{subsubsection}{3}{\parindent}% +\renewcommand{\subsubsection}[1]{\@startsection{subsubsection}{3}{1em}% {0\baselineskip \@plus 0.2ex \@minus 0.2ex}% - {-\z@}% - {\normalfont\normalsize\bfseries}{#1}\textbf{.}\hspace{0.2em}} -\renewcommand{\paragraph}[1]{\@startsection{paragraph}{4}{\parindent}% + {-\z@\relax}% + {\normalfont\normalsize\bfseries\hspace{\parindent}{#1}\textbf{.}}{\relax}} +\renewcommand{\paragraph}[1]{\@startsection{paragraph}{4}{1em}% {0\baselineskip \@plus 0.2ex \@minus 0.2ex}% - {-\z@}% - {\normalfont\normalsize\bfseries\itshape}{#1}\textbf{\textit{.}}\hspace{0.2em}} -\renewcommand{\subparagraph}[1]{\@startsection{subparagraph}{5}{\parindent}% + {-\z@\relax}% + {\normalfont\normalsize\bfseries\itshape\hspace{\parindent}{#1}\textbf{\textit{.}}}{\relax}} +\renewcommand{\subparagraph}[1]{\@startsection{subparagraph}{5}{1em}% {0\baselineskip \@plus 0.2ex \@minus 0.2ex}% - {-\z@}% - {\normalfont\normalsize\itshape}{#1}\textit{.}\hspace{0.2em}} + {-\z@\relax}% + {\normalfont\normalsize\itshape\hspace{\parindent}{#1}\textit{.}}{\relax}} \AtBeginDocument{\def\st@rtbibsection{\mspart{References}}}% BDB -- this is for apacite \AtBeginDocument{\def\bibsection{\mspart{References}}}% BDB -- this is for apacite + natbib @@ -1147,58 +1184,23 @@ \newlength\gr@boxheight \newcommand{\fitfigure}[2][0.5]{% -\ifapamodeman -{% man -\sbox\gr@box{\includegraphics[width=\linewidth]{#2}} -\settowidth{\gr@boxwidth}{\usebox\gr@box} -\settoheight{\gr@boxheight}{\usebox\gr@box} -\ifdim\gr@boxheight>\gr@boxwidth{% display upright (h) - \ifdim\gr@boxheight>\textheight% - \centerline{\vspace{\fill}\includegraphics[height=\textheight]{#2}\vspace{\fill}}% - \else% - \usebox\gr@box% - \fi} -\else{% display rotated - \sbox\gr@box{\includegraphics[angle=90,width=\linewidth]{#2}} - \settoheight{\gr@boxheight}{\usebox\gr@box} - \ifdim\gr@boxheight>\textheight% - \centerline{\vspace{\fill}\includegraphics[angle=90,height=\textheight]{#2}\vspace{\fill}}% - \else% - \usebox\gr@box% - \fi}% -\fi} -{% jou, doc \sbox\gr@box{\includegraphics[width=\linewidth]{#2}} \settoheight{\gr@boxheight}{\usebox\gr@box} \ifdim\gr@boxheight>\textheight% \centerline{\includegraphics[height=#1\textheight]{#2}}% need to leave space for caption \else% \usebox\gr@box% -\fi} +\fi } \newcommand{\fitbitmap}[2][0.5]{ % like fitfigure but no scaling in man mode for best quality -\ifapamodeman -{% man -\sbox\gr@box{\includegraphics{#2}} -\settowidth{\gr@boxwidth}{\usebox\gr@box} -\settoheight{\gr@boxheight}{\usebox\gr@box} -\ifdim\gr@boxwidth>\textwidth% display rotated - \centerline{\vspace{\fill}\includegraphics[angle=90]{#2}\vspace{\fill}}% - \ifdim\gr@boxheight>\textwidth\ClassWarning{apa6}{Figure #2 too high!}\fi% display rotated - \ifdim\gr@boxwidth>\textheight\ClassWarning{apa6}{Figure #2 too wide!}\fi% display rotated -\else% display upright - \centerline{\vspace{\fill}\includegraphics{#2}\vspace{\fill}}% - \ifdim\gr@boxheight>\textheight\ClassWarning{apa6}{Figure #2 too high!}\fi% display rotated -\fi} -{% jou, doc \sbox\gr@box{\includegraphics[width=\linewidth]{#2}} \settoheight{\gr@boxheight}{\usebox\gr@box} \ifdim\gr@boxheight>\textheight% \centerline{\includegraphics[height=#1\textheight]{#2}}% need to leave space for caption \else% \centerline{\usebox\gr@box}% -\fi} +\fi } @@ -1340,7 +1342,7 @@ \renewcommand{\headrulewidth}{0pt} \fancypagestyle{titlepage}{% - \lhead{Running head: \MakeUppercase{\@shorttitle}}% + \lhead{\rheadname: \MakeUppercase{\@shorttitle}}% \rhead{\thepage}% } \fancypagestyle{otherpage}{% @@ -1361,24 +1363,6 @@ \RequirePackage[notablist,figlist,notabhead,nofighead,tablesfirst,nomarkers]{endfloat}[1995/10/11]}{% \RequirePackage[notablist,figlist,notabhead,nofighead,tablesfirst]{endfloat}[1995/10/11]} -\renewcommand{\figureplace}{% - \par\begin{center} - \parbox{\textwidth} - {\begin{center} - \rule{2.1in}{0.005in}\\ - Insert \figurename~\thepostfig\ about here\\ - \rule{2.1in}{0.005in}\\ - \end{center}} - \end{center}\par} -\renewcommand{\tableplace}{% - \par\begin{center} - \parbox{\textwidth} - {\begin{center} - \rule{2.1in}{0.005in}\\ - Insert \tablename~\theposttbl\ about here\\ - \rule{2.1in}{0.005in}\\ - \end{center}} - \end{center}\par} \def\@gobbleuntilnext[#1]{} \let\eatarg\@gobbleuntilnext @@ -1397,10 +1381,6 @@ %% should be a global declaration to be "visible" at end document \ifnextchar[{\gobbleuntilnext[}{} \efloat@iwrite{fff}{\string\ifnextchar[{\string\eatarg}{}} - \if@domarkers% - \addtocounter{postfig}{1}% % bj - \figureplace% % bj - \fi% \def\@currenvir{efloat@float}% \begingroup% \let\do\ef@makeinnocent \dospecials% @@ -1421,10 +1401,6 @@ \@ifundefined{hrm}{}{% \efloat@iwrite{ttt}{\string\sf}}% \efloat@iwrite{ttt}{\string\ifnextchar[{\string\eatarg}{}} % bj - \if@domarkers - \addtocounter{posttbl}{1} % bj - \tableplace % bj - \fi \def\@currenvir{efloat@float}% \begingroup \let\do\ef@makeinnocent \dospecials @@ -1500,7 +1476,14 @@ \vspace*{0.5in} \vspace*{1in} - \@title\vspace{0.25in}\\ + \@title% + \ifapamodeman{% + \@ifundefined{def@noextraspace}{% + \vspace{0.25in}\\ + }{} + }{% + \vspace{0.25in}\\ + } \@ifundefined{apaSix@maskauthoridentity}{% BDB @@ -1590,7 +1573,7 @@ {% \vfill% \begin{center}% - Author Note% + \acksname% \end{center}% \protect\raggedright \setlength{\parindent}{0.4in} @@ -2137,6 +2120,7 @@ %% This work is not endorsed by, affiliated with, or probably even known %% by, the American Psychological Association. %% +%% %% This work is "maintained" (as per LPPL maintenance status) by %% Brian D. Beitzel. %% @@ -2148,6 +2132,8 @@ %% APAamerican.txt, %% APAdutch.txt, %% APAenglish.txt, +%% APAgerman.txt, +%% APAngerman.txt, %% APAgreek.txt, %% APAendfloat.cfg, %% apa6.ptex, diff --git a/Master/texmf-dist/tex/latex/apa6/config/APAamerican.txt b/Master/texmf-dist/tex/latex/apa6/config/APAamerican.txt index 2364ca55970..13a2d968ffe 100644 --- a/Master/texmf-dist/tex/latex/apa6/config/APAamerican.txt +++ b/Master/texmf-dist/tex/latex/apa6/config/APAamerican.txt @@ -27,9 +27,10 @@ %% %% ---------------------------------------------------------------------- %% -\ProvidesFile{APAamerican.txt}[2011/10/08 v1.0 apa6 configuration for American English] -\renewcommand{\rheadname}{Running head:} +\ProvidesFile{APAamerican.txt}[2011/12/10 v1.11 apa6 configuration for American English] + +\renewcommand{\rheadname}{Running head} \renewcommand{\acksname}{Author Note} \renewcommand{\notesname}{Footnotes} @@ -49,6 +50,7 @@ %% This work is not endorsed by, affiliated with, or probably even known %% by, the American Psychological Association. %% +%% %% This work is "maintained" (as per LPPL maintenance status) by %% Brian D. Beitzel. %% @@ -60,6 +62,8 @@ %% APAamerican.txt, %% APAdutch.txt, %% APAenglish.txt, +%% APAgerman.txt, +%% APAngerman.txt, %% APAgreek.txt, %% APAendfloat.cfg, %% apa6.ptex, diff --git a/Master/texmf-dist/tex/latex/apa6/config/APAdutch.txt b/Master/texmf-dist/tex/latex/apa6/config/APAdutch.txt index 8bc34637079..b5c064516ef 100644 --- a/Master/texmf-dist/tex/latex/apa6/config/APAdutch.txt +++ b/Master/texmf-dist/tex/latex/apa6/config/APAdutch.txt @@ -27,9 +27,10 @@ %% %% ---------------------------------------------------------------------- %% -\ProvidesFile{APAdutch.txt}[2011/10/08 v1.0 apa6 configuration for Dutch] -\renewcommand{\rheadname}{Kopregel:}% Running head: +\ProvidesFile{APAdutch.txt}[2011/12/10 v1.11 apa6 configuration for Dutch] + +\renewcommand{\rheadname}{Kopregel}% Running head \renewcommand{\acksname}{Auteursnoot}% Author Note \renewcommand{\notesname}{Voetnoten}% Footnotes @@ -49,6 +50,7 @@ %% This work is not endorsed by, affiliated with, or probably even known %% by, the American Psychological Association. %% +%% %% This work is "maintained" (as per LPPL maintenance status) by %% Brian D. Beitzel. %% @@ -60,6 +62,8 @@ %% APAamerican.txt, %% APAdutch.txt, %% APAenglish.txt, +%% APAgerman.txt, +%% APAngerman.txt, %% APAgreek.txt, %% APAendfloat.cfg, %% apa6.ptex, diff --git a/Master/texmf-dist/tex/latex/apa6/config/APAendfloat.cfg b/Master/texmf-dist/tex/latex/apa6/config/APAendfloat.cfg index 733adfeb6fd..0e6d55d61fa 100644 --- a/Master/texmf-dist/tex/latex/apa6/config/APAendfloat.cfg +++ b/Master/texmf-dist/tex/latex/apa6/config/APAendfloat.cfg @@ -27,6 +27,7 @@ %% %% ---------------------------------------------------------------------- %% + %% %% This is file `endfloat.cfg', %% modifed from the original supplied with the endfloat package @@ -48,10 +49,6 @@ \AtBeginFigures{\let\sidewaysfigure=\efsaved@sidewaysfigure\relax} \def\sidewaystable{\efloat@condopen{ttt} \efloat@iwrite{ttt}{\string\begin{sidewaystable}}% - \if@domarkers - \addtocounter{posttbl}{1} - \tableplace - \fi \def\@currenvir{efloat@float}% \begingroup \let\do\ef@makeinnocent \dospecials @@ -68,10 +65,6 @@ } \def\sidewaysfigure{\efloat@condopen{fff} \efloat@iwrite{fff}{\string\begin{sidewaysfigure}}% - \if@domarkers - \addtocounter{postfig}{1} - \figureplace - \fi \def\@currenvir{efloat@float}% \begingroup \let\do\ef@makeinnocent \dospecials @@ -88,10 +81,6 @@ } \def\longtable{\efloat@condopen{ttt} \efloat@iwrite{ttt}{\string\begin{longtable}}% - \if@domarkers - \addtocounter{posttbl}{1} - \tableplace - \fi \def\@currenvir{efloat@float}% \begingroup \let\do\ef@makeinnocent \dospecials @@ -126,6 +115,7 @@ %% This work is not endorsed by, affiliated with, or probably even known %% by, the American Psychological Association. %% +%% %% This work is "maintained" (as per LPPL maintenance status) by %% Brian D. Beitzel. %% @@ -137,6 +127,8 @@ %% APAamerican.txt, %% APAdutch.txt, %% APAenglish.txt, +%% APAgerman.txt, +%% APAngerman.txt, %% APAgreek.txt, %% APAendfloat.cfg, %% apa6.ptex, diff --git a/Master/texmf-dist/tex/latex/apa6/config/APAenglish.txt b/Master/texmf-dist/tex/latex/apa6/config/APAenglish.txt index 71941d82584..908e3950b00 100644 --- a/Master/texmf-dist/tex/latex/apa6/config/APAenglish.txt +++ b/Master/texmf-dist/tex/latex/apa6/config/APAenglish.txt @@ -27,9 +27,10 @@ %% %% ---------------------------------------------------------------------- %% -\ProvidesFile{APAenglish.txt}[2011/10/08 v1.0 apa6 configuration for non-American English] -\renewcommand{\rheadname}{Running head:} +\ProvidesFile{APAenglish.txt}[2011/12/10 v1.11 apa6 configuration for non-American English] + +\renewcommand{\rheadname}{Running head} \renewcommand{\acksname}{Author Note} \renewcommand{\notesname}{Footnotes} @@ -49,6 +50,7 @@ %% This work is not endorsed by, affiliated with, or probably even known %% by, the American Psychological Association. %% +%% %% This work is "maintained" (as per LPPL maintenance status) by %% Brian D. Beitzel. %% @@ -60,6 +62,8 @@ %% APAamerican.txt, %% APAdutch.txt, %% APAenglish.txt, +%% APAgerman.txt, +%% APAngerman.txt, %% APAgreek.txt, %% APAendfloat.cfg, %% apa6.ptex, diff --git a/Master/texmf-dist/tex/latex/apa6/config/APAgerman.txt b/Master/texmf-dist/tex/latex/apa6/config/APAgerman.txt new file mode 100644 index 00000000000..150600b8e2d --- /dev/null +++ b/Master/texmf-dist/tex/latex/apa6/config/APAgerman.txt @@ -0,0 +1,76 @@ +%% +%% This is file `./config/APAgerman.txt', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% apa6.dtx (with options: `german') +%% ---------------------------------------------------------------------- +%% +%% apa6 - A LaTeX class for formatting documents in compliance with the +%% American Psychological Association's Publication Manual, 6th edition +%% +%% Copyright (C) 2011 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 +%% version 1.3c of this license or (at your option) any later +%% version. The latest version of this license is in the file: +%% +%% http://www.latex-project.org/lppl.txt +%% +%% Users may freely modify these files without permission, as long as the +%% copyright line and this statement are maintained intact. +%% +%% This work is not endorsed by, affiliated with, or probably even known +%% by, the American Psychological Association. +%% +%% ---------------------------------------------------------------------- +%% + +\ProvidesFile{APAgerman.txt}[2011/12/10 v1.11 apa6 configuration for German] + +\renewcommand{\rheadname}{Kolumnentitel}% Running head +\renewcommand{\acksname}{Autorenhinweis}% Author Note +\renewcommand{\notesname}{Fußnoten}% Footnotes + +%% +%% Copyright (C) 2011 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 +%% version 1.3c of this license or (at your option) any later +%% version. The latest version of this license is in the file: +%% +%% http://www.latex-project.org/lppl.txt +%% +%% Users may freely modify these files without permission, as long as the +%% copyright line and this statement are maintained intact. +%% +%% This work is not endorsed by, affiliated with, or probably even known +%% by, the American Psychological Association. +%% +%% +%% This work is "maintained" (as per LPPL maintenance status) by +%% Brian D. Beitzel. +%% +%% This work consists of the file apa6.dtx +%% and the derived files apa6.ins, +%% apa6.cls, +%% apa6.pdf, +%% README.txt, +%% APAamerican.txt, +%% APAdutch.txt, +%% APAenglish.txt, +%% APAgerman.txt, +%% APAngerman.txt, +%% APAgreek.txt, +%% APAendfloat.cfg, +%% apa6.ptex, +%% Figure1.pdf, +%% shortsample.tex, +%% longsample.tex, and +%% bibliography.bib. +%% +%% +%% End of file `./config/APAgerman.txt'. diff --git a/Master/texmf-dist/tex/latex/apa6/config/APAgreek.txt b/Master/texmf-dist/tex/latex/apa6/config/APAgreek.txt index e74e02cde27..3e2562b9beb 100644 --- a/Master/texmf-dist/tex/latex/apa6/config/APAgreek.txt +++ b/Master/texmf-dist/tex/latex/apa6/config/APAgreek.txt @@ -27,9 +27,10 @@ %% %% ---------------------------------------------------------------------- %% -\ProvidesFile{APAgreek.txt}[2011/10/08 v1.0 apa6 configuration for Greek] -\renewcommand{\rheadname}{Up'ertitlos:}% Running head: +\ProvidesFile{APAgreek.txt}[2011/12/10 v1.11 apa6 configuration for Greek] + +\renewcommand{\rheadname}{Up'ertitlos}% Running head \renewcommand{\acksname}{Shmei'wseis tou suggraf'ea}% Author Note \renewcommand{\notesname}{Uposhmei'wseis}% Footnotes @@ -49,6 +50,7 @@ %% This work is not endorsed by, affiliated with, or probably even known %% by, the American Psychological Association. %% +%% %% This work is "maintained" (as per LPPL maintenance status) by %% Brian D. Beitzel. %% @@ -60,6 +62,8 @@ %% APAamerican.txt, %% APAdutch.txt, %% APAenglish.txt, +%% APAgerman.txt, +%% APAngerman.txt, %% APAgreek.txt, %% APAendfloat.cfg, %% apa6.ptex, diff --git a/Master/texmf-dist/tex/latex/apa6/config/APAngerman.txt b/Master/texmf-dist/tex/latex/apa6/config/APAngerman.txt new file mode 100644 index 00000000000..66d2d897ded --- /dev/null +++ b/Master/texmf-dist/tex/latex/apa6/config/APAngerman.txt @@ -0,0 +1,76 @@ +%% +%% This is file `./config/APAngerman.txt', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% apa6.dtx (with options: `ngerman') +%% ---------------------------------------------------------------------- +%% +%% apa6 - A LaTeX class for formatting documents in compliance with the +%% American Psychological Association's Publication Manual, 6th edition +%% +%% Copyright (C) 2011 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 +%% version 1.3c of this license or (at your option) any later +%% version. The latest version of this license is in the file: +%% +%% http://www.latex-project.org/lppl.txt +%% +%% Users may freely modify these files without permission, as long as the +%% copyright line and this statement are maintained intact. +%% +%% This work is not endorsed by, affiliated with, or probably even known +%% by, the American Psychological Association. +%% +%% ---------------------------------------------------------------------- +%% + +\ProvidesFile{APAgerman.txt}[2011/12/10 v1.11 apa6 configuration for "new" German] + +\renewcommand{\rheadname}{Kolumnentitel}% Running head +\renewcommand{\acksname}{Autorenhinweis}% Author Note +\renewcommand{\notesname}{Fußnoten}% Footnotes + +%% +%% Copyright (C) 2011 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 +%% version 1.3c of this license or (at your option) any later +%% version. The latest version of this license is in the file: +%% +%% http://www.latex-project.org/lppl.txt +%% +%% Users may freely modify these files without permission, as long as the +%% copyright line and this statement are maintained intact. +%% +%% This work is not endorsed by, affiliated with, or probably even known +%% by, the American Psychological Association. +%% +%% +%% This work is "maintained" (as per LPPL maintenance status) by +%% Brian D. Beitzel. +%% +%% This work consists of the file apa6.dtx +%% and the derived files apa6.ins, +%% apa6.cls, +%% apa6.pdf, +%% README.txt, +%% APAamerican.txt, +%% APAdutch.txt, +%% APAenglish.txt, +%% APAgerman.txt, +%% APAngerman.txt, +%% APAgreek.txt, +%% APAendfloat.cfg, +%% apa6.ptex, +%% Figure1.pdf, +%% shortsample.tex, +%% longsample.tex, and +%% bibliography.bib. +%% +%% +%% End of file `./config/APAngerman.txt'. diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index fcc5fe95efe..272afa6e098 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -923,6 +923,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`); %prehook = ( + 'apa6' => '&PREHOOK_apa6', 'cals' => '&PREHOOK_cals', 'chess' => '&PREHOOK_chess', 'cm-super' => '&PREHOOK_cm_super', @@ -1696,6 +1697,7 @@ $standardsource='\.(c|drv|dtx|fea|fdd|ins|sfd)$|configure.*|install-sh'; # normal choices, and get the most general. %specialins = ( 'aastex', 'NULL', # everything is pregenerated + 'apa6', 'apa6.dtx', 'base', 'NULL', 'bbold', 'bbold.dtx', 'booktabs-de', 'NULL', # doc, no need to build @@ -4229,6 +4231,11 @@ sub MAKEpict2e { +sub PREHOOK_apa6 { + print "PREHOOK_$package - subdirectories needed for dtx\n"; + &SYSTEM ("mkdir config pseudoTeX"); +} + sub PREHOOK_cals { print "PREHOOK_$package - flatten only cals subdir\n"; &SYSTEM ("$MV cals/* ."); |