diff options
author | Karl Berry <karl@freefriends.org> | 2013-01-12 00:00:46 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2013-01-12 00:00:46 +0000 |
commit | 55bb654df2d5a76f479c4f654bb95c2612c96a38 (patch) | |
tree | 9008cdc2bdf8c2be686da1f9ce2c474212191e91 /Master | |
parent | 2328ae1b0bd32c4d2bbbef62db3ff39b44541cbe (diff) |
apa6 (11jan13)
git-svn-id: svn://tug.org/texlive/trunk@28802 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
19 files changed, 165 insertions, 106 deletions
diff --git a/Master/texmf-dist/doc/latex/apa6/README.txt b/Master/texmf-dist/doc/latex/apa6/README.txt index c2f15405114..adc96d1ca89 100644 --- a/Master/texmf-dist/doc/latex/apa6/README.txt +++ b/Master/texmf-dist/doc/latex/apa6/README.txt @@ -3,7 +3,7 @@ apa6 - A LaTeX class for formatting documents in compliance with the American Psychological Association's Publication Manual, 6th edition -Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com> +Copyright (C) 2011-2013 by Brian D. Beitzel <brian at beitzel.com> This work may be distributed and/or modified under the conditions of the LaTeX Project Public License (LPPL), either diff --git a/Master/texmf-dist/doc/latex/apa6/apa6.pdf b/Master/texmf-dist/doc/latex/apa6/apa6.pdf Binary files differindex 6b638e5311a..9c77c1bcc00 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/TeX2WordForapa6.bas b/Master/texmf-dist/doc/latex/apa6/pseudoTeX/TeX2WordForapa6.bas index ac5a9f74458..23f0ec8df94 100644 --- a/Master/texmf-dist/doc/latex/apa6/pseudoTeX/TeX2WordForapa6.bas +++ b/Master/texmf-dist/doc/latex/apa6/pseudoTeX/TeX2WordForapa6.bas @@ -10,7 +10,7 @@ %% apa6 - A LaTeX class for formatting documents in compliance with the %% American Psychological Association's Publication Manual, 6th edition %% -%% Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com> +%% Copyright (C) 2011-2013 by Brian D. Beitzel <brian at beitzel.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either @@ -345,7 +345,7 @@ Sub FormatAndMoveTex2WordFigures() End Sub %% -%% Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com> +%% Copyright (C) 2011-2013 by Brian D. Beitzel <brian at beitzel.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either diff --git a/Master/texmf-dist/doc/latex/apa6/pseudoTeX/apa6.ptex b/Master/texmf-dist/doc/latex/apa6/pseudoTeX/apa6.ptex index 76e14c73b52..403e2ac5662 100644 --- a/Master/texmf-dist/doc/latex/apa6/pseudoTeX/apa6.ptex +++ b/Master/texmf-dist/doc/latex/apa6/pseudoTeX/apa6.ptex @@ -10,7 +10,7 @@ %% apa6 - A LaTeX class for formatting documents in compliance with the %% American Psychological Association's Publication Manual, 6th edition %% -%% Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com> +%% Copyright (C) 2011-2013 by Brian D. Beitzel <brian at beitzel.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either @@ -375,7 +375,7 @@ %% -%% Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com> +%% Copyright (C) 2011-2013 by Brian D. Beitzel <brian at beitzel.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either diff --git a/Master/texmf-dist/doc/latex/apa6/samples/bibliography.bib b/Master/texmf-dist/doc/latex/apa6/samples/bibliography.bib index ebec4b5ffef..8c74d3bee1f 100644 --- a/Master/texmf-dist/doc/latex/apa6/samples/bibliography.bib +++ b/Master/texmf-dist/doc/latex/apa6/samples/bibliography.bib @@ -10,7 +10,7 @@ %% apa6 - A LaTeX class for formatting documents in compliance with the %% American Psychological Association's Publication Manual, 6th edition %% -%% Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com> +%% Copyright (C) 2011-2013 by Brian D. Beitzel <brian at beitzel.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either @@ -190,7 +190,7 @@ the design of multimedia instruction}, } %% -%% Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com> +%% Copyright (C) 2011-2013 by Brian D. Beitzel <brian at beitzel.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either diff --git a/Master/texmf-dist/doc/latex/apa6/samples/longsample.tex b/Master/texmf-dist/doc/latex/apa6/samples/longsample.tex index 985cf021002..18e2d9d1a24 100644 --- a/Master/texmf-dist/doc/latex/apa6/samples/longsample.tex +++ b/Master/texmf-dist/doc/latex/apa6/samples/longsample.tex @@ -10,7 +10,7 @@ %% apa6 - A LaTeX class for formatting documents in compliance with the %% American Psychological Association's Publication Manual, 6th edition %% -%% Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com> +%% Copyright (C) 2011-2013 by Brian D. Beitzel <brian at beitzel.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either @@ -104,7 +104,7 @@ other sources \parencite{Shotton1989,Lassen2006}. \lipsum[3] Table~\ref{tab:BasicTable} summarizes the data. \lipsum[15] \begin{table} - \caption{Sample basic table} + \caption{Sample Basic Table} \label{tab:BasicTable} \begin{tabular}{@{}llr@{}} \toprule \multicolumn{2}{c}{Item} \\ \cmidrule(r){1-2} @@ -185,7 +185,7 @@ The detailed results are shown in Table~\ref{tab:DeckedTable}. \lipsum[22] \end{document} %% -%% Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com> +%% Copyright (C) 2011-2013 by Brian D. Beitzel <brian at beitzel.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either diff --git a/Master/texmf-dist/doc/latex/apa6/samples/shortsample.tex b/Master/texmf-dist/doc/latex/apa6/samples/shortsample.tex index f2a34b2f5a8..2cbd3074d85 100644 --- a/Master/texmf-dist/doc/latex/apa6/samples/shortsample.tex +++ b/Master/texmf-dist/doc/latex/apa6/samples/shortsample.tex @@ -10,7 +10,7 @@ %% apa6 - A LaTeX class for formatting documents in compliance with the %% American Psychological Association's Publication Manual, 6th edition %% -%% Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com> +%% Copyright (C) 2011-2013 by Brian D. Beitzel <brian at beitzel.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either @@ -96,21 +96,31 @@ Table \ref{tab:ComplexTable} contains some sample data. Our statistical prowess in analyzing these data is unmatched. \begin{table}[htbp] - \caption{A complex table} - \label{tab:ComplexTable} - \begin{tabular}{@{}lrrl@{}} \toprule - Distribution type & \multicolumn{2}{l}{Percentage of} & Total \\ - & \multicolumn{2}{l}{targets with} & trials per \\ - & \multicolumn{2}{l}{segment in} & participant \\ - \cmidrule(r){2-3} - & Onset & Coda & \\ - \midrule - Categorical -- onset & 100 & 0 & 196 \\ - Probabilistic & 80 & 20 & 200 \\ - & 60 & 40 & 160 \\ - Categorical -- coda & 0 & 100 & 196 \\ - \bottomrule - \end{tabular} + \vspace*{2em} + \begin{threeparttable} + \caption{A Complex Table} + \label{tab:ComplexTable} + \begin{tabular}{@{}lrrr@{}} \toprule + Distribution type & \multicolumn{2}{l}{Percentage of} & Total number \\ + & \multicolumn{2}{l}{targets with} & of trials per \\ + & \multicolumn{2}{l}{segment in} & participant \\ \cmidrule(r){2-3} + & Onset & Coda & \\ \midrule + Categorical -- onset\tabfnm{a} & 100 & 0 & 196 \\ + Probabilistic & 80 & 20\tabfnm{*} & 200 \\ + Categorical -- coda\tabfnm{b} & 0 & 100\tabfnm{*} & 196 \\ \midrule + \end{tabular} + \begin{tablenotes}[para,flushleft] + {\small + \textit{Note.} All data are approximate. + + \tabfnt{a}Categorical may be onset. + \tabfnt{b}Categorical may also be coda. + + \tabfnt{*}\textit{p} < .05. + \tabfnt{**}\textit{p} < .01. + } + \end{tablenotes} + \end{threeparttable} \end{table} \section{Discussion} @@ -122,7 +132,7 @@ skill in interpreting the results for the masses. \end{document} %% -%% Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com> +%% Copyright (C) 2011-2013 by Brian D. Beitzel <brian at beitzel.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either diff --git a/Master/texmf-dist/source/latex/apa6/apa6.dtx b/Master/texmf-dist/source/latex/apa6/apa6.dtx index a4968e54009..bfa0dd58ed3 100644 --- a/Master/texmf-dist/source/latex/apa6/apa6.dtx +++ b/Master/texmf-dist/source/latex/apa6/apa6.dtx @@ -4,11 +4,11 @@ % % % CHANGE THESE VALUES WITH EACH NEW RELEASE: % % % -%<class>\ProvidesClass{apa6}[2012/12/29 v2.11 APA formatting (6th edition)] +%<class>\ProvidesClass{apa6}[2013/01/10 v2.12 APA formatting (6th edition)] % % %<*internal> % -\def\apaSixVersionDate{2012/12/29} -\def\apaSixVersionNumber{2.11} +\def\apaSixVersionDate{2013/01/10} +\def\apaSixVersionNumber{2.12} % % % % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -20,7 +20,7 @@ apa6 - A LaTeX class for formatting documents in compliance with the American Psychological Association's Publication Manual, 6th edition -Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com> +Copyright (C) 2011-2013 by Brian D. Beitzel <brian at beitzel.com> This work may be distributed and/or modified under the conditions of the LaTeX Project Public License (LPPL), either @@ -64,7 +64,7 @@ details. apa6 - A LaTeX class for formatting documents in compliance with the American Psychological Association's Publication Manual, 6th edition -Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com> +Copyright (C) 2011-2013 by Brian D. Beitzel <brian at beitzel.com> This work may be distributed and/or modified under the conditions of the LaTeX Project Public License (LPPL), either @@ -84,7 +84,7 @@ by, the American Psychological Association. \endpreamble \postamble -Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com> +Copyright (C) 2011-2013 by Brian D. Beitzel <brian at beitzel.com> This work may be distributed and/or modified under the conditions of the LaTeX Project Public License (LPPL), either @@ -273,6 +273,9 @@ and the derived files apa6.ins, % \changes{v2.11}{2012/12/29}{Refined handling of `mask' option in the % apa6.ptex file} % +% \changes{v2.12}{2013/01/09}{Fixed `jou' mode to handle a starting +% page other than 1} +% % % \begin{abstract} % The \textit{Publication Manual} of the American Psychological @@ -453,7 +456,10 @@ and the derived files apa6.ins, % affiliation line % \item \DescribeMacro{\journal}|\journal|\marg{journal-name}: Journal % name or other note; typeset in the top left header of page 1 -% (|jou| and |doc| modes only) +% (|jou| and |doc| modes only); to change the starting page to a +% number other than 1, insert the following line immediately after +% |\maketitle|:\\ +% |\setcounter{page}|\marg{custom-page-number} % \item \DescribeMacro{\volume}|\volume|\marg{journal-volume}: Volume, % number, pages; typeset in the top left header in |jou| and |doc| % modes, underneath the content of |\journal| @@ -538,17 +544,16 @@ and the derived files apa6.ins, % \subsection{Other Macros} % \label{sec:othermacros} % \begin{itemize} -% \item -% \DescribeMacro{\centeredcaption}|\centeredcaption|\marg{width}\marg{caption-text}: -% Used with double-column figures to create centered captions -% narrower than |\textwidth| % \item \DescribeMacro{\begin\{figure*\}} \DescribeMacro{\end\{figure*\}} +% \DescribeMacro{\begin\{table*\}} \DescribeMacro{\end\{table*\}} % When a figure is too wide for a single column (in |jou| mode), use % |\begin{figure*}| and |\end{figure*}| instead of the non-starred -% version. When using double-column figures (|jou| mode), it looks -% better if you use |\centeredcaption| instead of |\caption|, with -% the first parameter about equal to the width of the float (table -% or figure). +% version. The same applies with |\begin{table*}| and |\end{table*}|. +% When using double-column tables or figures (|jou| mode), use the +% |\centering| command; for example:\par +% |\begin{table*}|\par\vspace{-.5em} +% | \centering|\par\vspace{-.5em} +% | \begin{threeparttable}|\par % \item % \DescribeMacro{\fitfigure}|\fitfigure|\oarg{height}\marg{eps-filename}: % Automatically fit a postscript figure; use instead of @@ -976,21 +981,31 @@ and the derived files apa6.ins, % statistical prowess in analyzing these data is unmatched. % % \begin{table}[htbp] -% \caption{A complex table} -% \label{tab:ComplexTable} -% \begin{tabular}{@{}lrrl@{}} \toprule -% Distribution type & \multicolumn{2}{l}{Percentage of} & Total \\ -% & \multicolumn{2}{l}{targets with} & trials per \\ -% & \multicolumn{2}{l}{segment in} & participant \\ -% \cmidrule(r){2-3} -% & Onset & Coda & \\ -% \midrule -% Categorical -- onset & 100 & 0 & 196 \\ -% Probabilistic & 80 & 20 & 200 \\ -% & 60 & 40 & 160 \\ -% Categorical -- coda & 0 & 100 & 196 \\ -% \bottomrule -% \end{tabular} +% \vspace*{2em} +% \begin{threeparttable} +% \caption{A Complex Table} +% \label{tab:ComplexTable} +% \begin{tabular}{@{}lrrr@{}} \toprule +% Distribution type & \multicolumn{2}{l}{Percentage of} & Total number \\ +% & \multicolumn{2}{l}{targets with} & of trials per \\ +% & \multicolumn{2}{l}{segment in} & participant \\ \cmidrule(r){2-3} +% & Onset & Coda & \\ \midrule +% Categorical -- onset\tabfnm{a} & 100 & 0 & 196 \\ +% Probabilistic & 80 & 20\tabfnm{*} & 200 \\ +% Categorical -- coda\tabfnm{b} & 0 & 100\tabfnm{*} & 196 \\ \midrule +% \end{tabular} +% \begin{tablenotes}[para,flushleft] +% {\small +% \textit{Note.} All data are approximate. +% +% \tabfnt{a}Categorical may be onset. +% \tabfnt{b}Categorical may also be coda. +% +% \tabfnt{*}\textit{p} < .05. +% \tabfnt{**}\textit{p} < .01. +% } +% \end{tablenotes} +% \end{threeparttable} % \end{table} % % \section{Discussion} @@ -2804,6 +2819,13 @@ and the derived files apa6.ins, \fancyhead[RO]{\stiny{\@ccoppy}\vspace{-0.15\baselineskip}\\ \stiny{\@copnum}} \fancyfoot[CO]{\small\rm\thepage} + % the following are needed if the starting page number is changed to + % an even number: + \fancyhead[LE]{\stiny{\@journal}\vspace{-0.15\baselineskip}\\ + \stiny{\@vvolume}} + \fancyhead[RE]{\stiny{\@ccoppy}\vspace{-0.15\baselineskip}\\ + \stiny{\@copnum}} + \fancyfoot[CE]{\small\rm\thepage} \renewcommand{\headrulewidth}{0pt} \renewcommand{\footrulewidth}{0pt} \thispagestyle{fancy} @@ -2851,10 +2873,15 @@ and the derived files apa6.ins, \setcounter{secnumdepth}{0} -\def\ps@myheadings{\let\@mkboth\@gobbletwo -\def\@oddhead{\hbox{}\rightmark \hfil -\large\rm\thepage}\def\@oddfoot{}\def\@evenhead{\large\rm \thepage\hfil\leftmark\hbox -{}}\def\@evenfoot{}\def\sectionmark##1{}\def\subsectionmark##1{}} +\def\ps@myheadings{% + \let\@mkboth\@gobbletwo + \def\@oddhead{\hbox{}\rightmark \hfil\rm\thepage} + \def\@oddfoot{} + \def\@evenhead{\rm\thepage\hfil\leftmark\hbox{}} + \def\@evenfoot{} + \def\sectionmark##1{} + \def\subsectionmark##1{} +} \pagestyle{myheadings} %\long\def\@makecaption#1#2{% @@ -3495,21 +3522,31 @@ Table \ref{tab:ComplexTable} contains some sample data. Our statistical prowess in analyzing these data is unmatched. \begin{table}[htbp] - \caption{A complex table} - \label{tab:ComplexTable} - \begin{tabular}{@{}lrrl@{}} \toprule - Distribution type & \multicolumn{2}{l}{Percentage of} & Total \\ - & \multicolumn{2}{l}{targets with} & trials per \\ - & \multicolumn{2}{l}{segment in} & participant \\ - \cmidrule(r){2-3} - & Onset & Coda & \\ - \midrule - Categorical -- onset & 100 & 0 & 196 \\ - Probabilistic & 80 & 20 & 200 \\ - & 60 & 40 & 160 \\ - Categorical -- coda & 0 & 100 & 196 \\ - \bottomrule - \end{tabular} + \vspace*{2em} + \begin{threeparttable} + \caption{A Complex Table} + \label{tab:ComplexTable} + \begin{tabular}{@{}lrrr@{}} \toprule + Distribution type & \multicolumn{2}{l}{Percentage of} & Total number \\ + & \multicolumn{2}{l}{targets with} & of trials per \\ + & \multicolumn{2}{l}{segment in} & participant \\ \cmidrule(r){2-3} + & Onset & Coda & \\ \midrule + Categorical -- onset\tabfnm{a} & 100 & 0 & 196 \\ + Probabilistic & 80 & 20\tabfnm{*} & 200 \\ + Categorical -- coda\tabfnm{b} & 0 & 100\tabfnm{*} & 196 \\ \midrule + \end{tabular} + \begin{tablenotes}[para,flushleft] + {\small + \textit{Note.} All data are approximate. + + \tabfnt{a}Categorical may be onset. + \tabfnt{b}Categorical may also be coda. + + \tabfnt{*}\textit{p} < .05. + \tabfnt{**}\textit{p} < .01. + } + \end{tablenotes} + \end{threeparttable} \end{table} \section{Discussion} @@ -3606,7 +3643,7 @@ other sources \parencite{Shotton1989,Lassen2006}. \lipsum[3] Table~\ref{tab:BasicTable} summarizes the data. \lipsum[15] \begin{table} - \caption{Sample basic table} + \caption{Sample Basic Table} \label{tab:BasicTable} \begin{tabular}{@{}llr@{}} \toprule \multicolumn{2}{c}{Item} \\ \cmidrule(r){1-2} diff --git a/Master/texmf-dist/source/latex/apa6/apa6.ins b/Master/texmf-dist/source/latex/apa6/apa6.ins index c7ad0616ece..397dbd8d717 100644 --- a/Master/texmf-dist/source/latex/apa6/apa6.ins +++ b/Master/texmf-dist/source/latex/apa6/apa6.ins @@ -10,7 +10,7 @@ %% apa6 - A LaTeX class for formatting documents in compliance with the %% American Psychological Association's Publication Manual, 6th edition %% -%% Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com> +%% Copyright (C) 2011-2013 by Brian D. Beitzel <brian at beitzel.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either @@ -36,7 +36,7 @@ apa6 - A LaTeX class for formatting documents in compliance with the American Psychological Association's Publication Manual, 6th edition -Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com> +Copyright (C) 2011-2013 by Brian D. Beitzel <brian at beitzel.com> This work may be distributed and/or modified under the conditions of the LaTeX Project Public License (LPPL), either @@ -56,7 +56,7 @@ by, the American Psychological Association. \endpreamble \postamble -Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com> +Copyright (C) 2011-2013 by Brian D. Beitzel <brian at beitzel.com> This work may be distributed and/or modified under the conditions of the LaTeX Project Public License (LPPL), either @@ -125,7 +125,7 @@ and the derived files apa6.ins, } \endbatchfile %% -%% Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com> +%% Copyright (C) 2011-2013 by Brian D. Beitzel <brian at beitzel.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either diff --git a/Master/texmf-dist/tex/latex/apa6/apa6.cls b/Master/texmf-dist/tex/latex/apa6/apa6.cls index d8c087b7c04..fc6a90c4117 100644 --- a/Master/texmf-dist/tex/latex/apa6/apa6.cls +++ b/Master/texmf-dist/tex/latex/apa6/apa6.cls @@ -10,7 +10,7 @@ %% apa6 - A LaTeX class for formatting documents in compliance with the %% American Psychological Association's Publication Manual, 6th edition %% -%% Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com> +%% Copyright (C) 2011-2013 by Brian D. Beitzel <brian at beitzel.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either @@ -27,7 +27,7 @@ %% %% ---------------------------------------------------------------------- %% -\ProvidesClass{apa6}[2012/12/29 v2.11 APA formatting (6th edition)] +\ProvidesClass{apa6}[2013/01/10 v2.12 APA formatting (6th edition)] \NeedsTeXFormat{LaTeX2e} \DeclareOption{man}{% @@ -1425,6 +1425,13 @@ \fancyhead[RO]{\stiny{\@ccoppy}\vspace{-0.15\baselineskip}\\ \stiny{\@copnum}} \fancyfoot[CO]{\small\rm\thepage} + % the following are needed if the starting page number is changed to + % an even number: + \fancyhead[LE]{\stiny{\@journal}\vspace{-0.15\baselineskip}\\ + \stiny{\@vvolume}} + \fancyhead[RE]{\stiny{\@ccoppy}\vspace{-0.15\baselineskip}\\ + \stiny{\@copnum}} + \fancyfoot[CE]{\small\rm\thepage} \renewcommand{\headrulewidth}{0pt} \renewcommand{\footrulewidth}{0pt} \thispagestyle{fancy} @@ -1468,10 +1475,15 @@ \setcounter{secnumdepth}{0} -\def\ps@myheadings{\let\@mkboth\@gobbletwo -\def\@oddhead{\hbox{}\rightmark \hfil -\large\rm\thepage}\def\@oddfoot{}\def\@evenhead{\large\rm \thepage\hfil\leftmark\hbox -{}}\def\@evenfoot{}\def\sectionmark##1{}\def\subsectionmark##1{}} +\def\ps@myheadings{% + \let\@mkboth\@gobbletwo + \def\@oddhead{\hbox{}\rightmark \hfil\rm\thepage} + \def\@oddfoot{} + \def\@evenhead{\rm\thepage\hfil\leftmark\hbox{}} + \def\@evenfoot{} + \def\sectionmark##1{} + \def\subsectionmark##1{} +} \pagestyle{myheadings} @@ -1743,7 +1755,7 @@ %% -%% Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com> +%% Copyright (C) 2011-2013 by Brian D. Beitzel <brian at beitzel.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either diff --git a/Master/texmf-dist/tex/latex/apa6/config/APAamerican.txt b/Master/texmf-dist/tex/latex/apa6/config/APAamerican.txt index 442480724ea..6c2172ba6ee 100644 --- a/Master/texmf-dist/tex/latex/apa6/config/APAamerican.txt +++ b/Master/texmf-dist/tex/latex/apa6/config/APAamerican.txt @@ -10,7 +10,7 @@ %% apa6 - A LaTeX class for formatting documents in compliance with the %% American Psychological Association's Publication Manual, 6th edition %% -%% Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com> +%% Copyright (C) 2011-2013 by Brian D. Beitzel <brian at beitzel.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either @@ -35,7 +35,7 @@ \renewcommand{\notesname}{Footnotes} %% -%% Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com> +%% Copyright (C) 2011-2013 by Brian D. Beitzel <brian at beitzel.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either diff --git a/Master/texmf-dist/tex/latex/apa6/config/APAbritish.txt b/Master/texmf-dist/tex/latex/apa6/config/APAbritish.txt index 08570e6396b..faf9193b0ee 100644 --- a/Master/texmf-dist/tex/latex/apa6/config/APAbritish.txt +++ b/Master/texmf-dist/tex/latex/apa6/config/APAbritish.txt @@ -10,7 +10,7 @@ %% apa6 - A LaTeX class for formatting documents in compliance with the %% American Psychological Association's Publication Manual, 6th edition %% -%% Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com> +%% Copyright (C) 2011-2013 by Brian D. Beitzel <brian at beitzel.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either @@ -35,7 +35,7 @@ \renewcommand{\notesname}{Footnotes} %% -%% Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com> +%% Copyright (C) 2011-2013 by Brian D. Beitzel <brian at beitzel.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either diff --git a/Master/texmf-dist/tex/latex/apa6/config/APAczech.txt b/Master/texmf-dist/tex/latex/apa6/config/APAczech.txt index c4a28bf7c81..4d9d6fb62a9 100644 --- a/Master/texmf-dist/tex/latex/apa6/config/APAczech.txt +++ b/Master/texmf-dist/tex/latex/apa6/config/APAczech.txt @@ -10,7 +10,7 @@ %% apa6 - A LaTeX class for formatting documents in compliance with the %% American Psychological Association's Publication Manual, 6th edition %% -%% Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com> +%% Copyright (C) 2011-2013 by Brian D. Beitzel <brian at beitzel.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either @@ -35,7 +35,7 @@ \renewcommand{\notesname}{Poznámky}% Footnotes %% -%% Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com> +%% Copyright (C) 2011-2013 by Brian D. Beitzel <brian at beitzel.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either diff --git a/Master/texmf-dist/tex/latex/apa6/config/APAdutch.txt b/Master/texmf-dist/tex/latex/apa6/config/APAdutch.txt index 832645ec073..5a5a9587eaf 100644 --- a/Master/texmf-dist/tex/latex/apa6/config/APAdutch.txt +++ b/Master/texmf-dist/tex/latex/apa6/config/APAdutch.txt @@ -10,7 +10,7 @@ %% apa6 - A LaTeX class for formatting documents in compliance with the %% American Psychological Association's Publication Manual, 6th edition %% -%% Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com> +%% Copyright (C) 2011-2013 by Brian D. Beitzel <brian at beitzel.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either @@ -35,7 +35,7 @@ \renewcommand{\notesname}{Voetnoten}% Footnotes %% -%% Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com> +%% Copyright (C) 2011-2013 by Brian D. Beitzel <brian at beitzel.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either diff --git a/Master/texmf-dist/tex/latex/apa6/config/APAendfloat.cfg b/Master/texmf-dist/tex/latex/apa6/config/APAendfloat.cfg index 8f9a875934b..f7783c49a8f 100644 --- a/Master/texmf-dist/tex/latex/apa6/config/APAendfloat.cfg +++ b/Master/texmf-dist/tex/latex/apa6/config/APAendfloat.cfg @@ -10,7 +10,7 @@ %% apa6 - A LaTeX class for formatting documents in compliance with the %% American Psychological Association's Publication Manual, 6th edition %% -%% Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com> +%% Copyright (C) 2011-2013 by Brian D. Beitzel <brian at beitzel.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either @@ -99,7 +99,7 @@ \xdef\ef@endsidetabletest{\string\\end\string\{sidewaystable\string\}} \xdef\ef@endlongtabletest{\string\\end\string\{longtable\string\}}}% %% -%% Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com> +%% Copyright (C) 2011-2013 by Brian D. Beitzel <brian at beitzel.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either diff --git a/Master/texmf-dist/tex/latex/apa6/config/APAenglish.txt b/Master/texmf-dist/tex/latex/apa6/config/APAenglish.txt index c1f9ce46124..58cd1c8a14d 100644 --- a/Master/texmf-dist/tex/latex/apa6/config/APAenglish.txt +++ b/Master/texmf-dist/tex/latex/apa6/config/APAenglish.txt @@ -10,7 +10,7 @@ %% apa6 - A LaTeX class for formatting documents in compliance with the %% American Psychological Association's Publication Manual, 6th edition %% -%% Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com> +%% Copyright (C) 2011-2013 by Brian D. Beitzel <brian at beitzel.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either @@ -35,7 +35,7 @@ \renewcommand{\notesname}{Footnotes} %% -%% Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com> +%% Copyright (C) 2011-2013 by Brian D. Beitzel <brian at beitzel.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either diff --git a/Master/texmf-dist/tex/latex/apa6/config/APAgerman.txt b/Master/texmf-dist/tex/latex/apa6/config/APAgerman.txt index a4b28de4527..b69935d8532 100644 --- a/Master/texmf-dist/tex/latex/apa6/config/APAgerman.txt +++ b/Master/texmf-dist/tex/latex/apa6/config/APAgerman.txt @@ -10,7 +10,7 @@ %% apa6 - A LaTeX class for formatting documents in compliance with the %% American Psychological Association's Publication Manual, 6th edition %% -%% Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com> +%% Copyright (C) 2011-2013 by Brian D. Beitzel <brian at beitzel.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either @@ -35,7 +35,7 @@ \renewcommand{\notesname}{Fußnoten}% Footnotes %% -%% Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com> +%% Copyright (C) 2011-2013 by Brian D. Beitzel <brian at beitzel.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either diff --git a/Master/texmf-dist/tex/latex/apa6/config/APAgreek.txt b/Master/texmf-dist/tex/latex/apa6/config/APAgreek.txt index ab8abead045..84d9f9e0a6d 100644 --- a/Master/texmf-dist/tex/latex/apa6/config/APAgreek.txt +++ b/Master/texmf-dist/tex/latex/apa6/config/APAgreek.txt @@ -10,7 +10,7 @@ %% apa6 - A LaTeX class for formatting documents in compliance with the %% American Psychological Association's Publication Manual, 6th edition %% -%% Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com> +%% Copyright (C) 2011-2013 by Brian D. Beitzel <brian at beitzel.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either @@ -35,7 +35,7 @@ \renewcommand{\notesname}{Uposhmei'wseis}% Footnotes %% -%% Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com> +%% Copyright (C) 2011-2013 by Brian D. Beitzel <brian at beitzel.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either diff --git a/Master/texmf-dist/tex/latex/apa6/config/APAngerman.txt b/Master/texmf-dist/tex/latex/apa6/config/APAngerman.txt index 4349d02b3b9..19b442dfb09 100644 --- a/Master/texmf-dist/tex/latex/apa6/config/APAngerman.txt +++ b/Master/texmf-dist/tex/latex/apa6/config/APAngerman.txt @@ -10,7 +10,7 @@ %% apa6 - A LaTeX class for formatting documents in compliance with the %% American Psychological Association's Publication Manual, 6th edition %% -%% Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com> +%% Copyright (C) 2011-2013 by Brian D. Beitzel <brian at beitzel.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either @@ -35,7 +35,7 @@ \renewcommand{\notesname}{Fußnoten}% Footnotes %% -%% Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com> +%% Copyright (C) 2011-2013 by Brian D. Beitzel <brian at beitzel.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either |