From faf672a38f282efa452625b59606edc7bab7ee42 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 31 Dec 2012 00:35:56 +0000 Subject: apa6 (30dec12) git-svn-id: svn://tug.org/texlive/trunk@28666 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/apa6/apa6.pdf | Bin 587449 -> 587949 bytes .../texmf-dist/doc/latex/apa6/pseudoTeX/apa6.ptex | 14 ++++++- Master/texmf-dist/source/latex/apa6/apa6.dtx | 45 +++++++++++++-------- Master/texmf-dist/tex/latex/apa6/apa6.cls | 2 +- 4 files changed, 42 insertions(+), 19 deletions(-) diff --git a/Master/texmf-dist/doc/latex/apa6/apa6.pdf b/Master/texmf-dist/doc/latex/apa6/apa6.pdf index e87389331cd..6b638e5311a 100644 Binary files a/Master/texmf-dist/doc/latex/apa6/apa6.pdf and b/Master/texmf-dist/doc/latex/apa6/apa6.pdf differ diff --git a/Master/texmf-dist/doc/latex/apa6/pseudoTeX/apa6.ptex b/Master/texmf-dist/doc/latex/apa6/pseudoTeX/apa6.ptex index 3329178e4d4..76e14c73b52 100644 --- a/Master/texmf-dist/doc/latex/apa6/pseudoTeX/apa6.ptex +++ b/Master/texmf-dist/doc/latex/apa6/pseudoTeX/apa6.ptex @@ -321,6 +321,7 @@ \end{enumerate}% \item Delete these instructions!% \end{enumerate}}% +\@ifundefined{apaSix@maskauthoridentity}{% {\par\centering\entity@paragraph@first=0{\newline}\par}% {\centering\entity@paragraph@first=0% {\@title}\newline% @@ -339,14 +340,23 @@ \@ifundefined{\@authornote}{}{% {\entity@paragraph@first=720\@authornote}% } +}{% +{\par\centering\entity@paragraph@first=0{\newline}\par}% +{\centering\entity@paragraph@first=0% +{\@title}\newline% + \newline{\@note}% +\par% +}% + {\entity@paragraph@first=720\par} +}% \newpage% {\centering\entity@paragraph@first=0{Abstract\par\par}}% {\entity@paragraph@first=0\@abstract\par}% {\entity@paragraph@first=720{\it Keywords:} \@keywords}% \newpage% {\entity@paragraph@new\begingroup\entity@paragraph@just=3\entity@paragraph@first=0\relax% -{\@title}% -\par\endgroup% + {\@title}% + \par\endgroup% }% \entity@paragraph@first=720% \endgroup} diff --git a/Master/texmf-dist/source/latex/apa6/apa6.dtx b/Master/texmf-dist/source/latex/apa6/apa6.dtx index ec8e7717822..a4968e54009 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: % % % -%\ProvidesClass{apa6}[2012/12/21 v2.10 APA formatting (6th edition)] +%\ProvidesClass{apa6}[2012/12/29 v2.11 APA formatting (6th edition)] % % %<*internal> % -\def\apaSixVersionDate{2012/12/21} -\def\apaSixVersionNumber{2.10} +\def\apaSixVersionDate{2012/12/29} +\def\apaSixVersionNumber{2.11} % % % % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -265,10 +265,13 @@ and the derived files apa6.ins, % \changes{v2.05}{2012/10/26}{Resolved the EndNote @@author-year % specification causing no files to be found} % -% \changes{v2.10}{2012/12/20}{Package `biber' now required when using +% \changes{v2.10}{2012/12/21}{Package `biber' now required when using % biblatex} % -% \changes{v2.10}{2012/12/20}{apa6.ptex file now honors `mask' option} +% \changes{v2.10}{2012/12/21}{apa6.ptex file now honors `mask' option} +% +% \changes{v2.11}{2012/12/29}{Refined handling of `mask' option in the +% apa6.ptex file} % % % \begin{abstract} @@ -4009,12 +4012,13 @@ The detailed results are shown in Table~\ref{tab:DeckedTable}. \lipsum[22] \end{enumerate}% \item Delete these instructions!% \end{enumerate}}% -{\par\centering\entity@paragraph@first=0{\newline}\par}% +\@ifundefined{apaSix@maskauthoridentity}{% + {\par\centering\entity@paragraph@first=0{\newline}\par}% {\centering\entity@paragraph@first=0% {\@title}\newline% {\@author}\newline% {\@affiliation}% - \newline{\@note}% + \newline{\@note}% \par% {% \@ifundefined{\@authornote}{}{% @@ -4027,16 +4031,25 @@ The detailed results are shown in Table~\ref{tab:DeckedTable}. \lipsum[22] \@ifundefined{\@authornote}{}{% {\entity@paragraph@first=720\@authornote}% } - \newpage% - {\centering\entity@paragraph@first=0{Abstract\par\par}}% - {\entity@paragraph@first=0\@abstract\par}% - {\entity@paragraph@first=720{\it Keywords:} \@keywords}% - \newpage% - {\entity@paragraph@new\begingroup\entity@paragraph@just=3\entity@paragraph@first=0\relax% - {\@title}% - \par\endgroup% +}{% + {\par\centering\entity@paragraph@first=0{\newline}\par}% + {\centering\entity@paragraph@first=0% + {\@title}\newline% + \newline{\@note}% + \par% }% - \entity@paragraph@first=720% + {\entity@paragraph@first=720\par} +}% +\newpage% +{\centering\entity@paragraph@first=0{Abstract\par\par}}% +{\entity@paragraph@first=0\@abstract\par}% +{\entity@paragraph@first=720{\it Keywords:} \@keywords}% +\newpage% +{\entity@paragraph@new\begingroup\entity@paragraph@just=3\entity@paragraph@first=0\relax% + {\@title}% + \par\endgroup% +}% +\entity@paragraph@first=720% \endgroup} \entity@paragraph@just=1 diff --git a/Master/texmf-dist/tex/latex/apa6/apa6.cls b/Master/texmf-dist/tex/latex/apa6/apa6.cls index 3242842d92e..d8c087b7c04 100644 --- a/Master/texmf-dist/tex/latex/apa6/apa6.cls +++ b/Master/texmf-dist/tex/latex/apa6/apa6.cls @@ -27,7 +27,7 @@ %% %% ---------------------------------------------------------------------- %% -\ProvidesClass{apa6}[2012/12/21 v2.10 APA formatting (6th edition)] +\ProvidesClass{apa6}[2012/12/29 v2.11 APA formatting (6th edition)] \NeedsTeXFormat{LaTeX2e} \DeclareOption{man}{% -- cgit v1.2.3