summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-06-26 22:53:03 +0000
committerKarl Berry <karl@freefriends.org>2013-06-26 22:53:03 +0000
commit75b22f44dee84203dad336787614dcb7203ad426 (patch)
tree3c841a2e69fa03acfbbf0ea1c2739c4177a3d7a8
parent1d343ed6417b6271160ed148f3fd6a00e07104ce (diff)
apa6 (26jun13)
git-svn-id: svn://tug.org/texlive/trunk@30957 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/apa6/README2
-rw-r--r--Master/texmf-dist/doc/latex/apa6/apa6.pdfbin592187 -> 593273 bytes
-rw-r--r--Master/texmf-dist/doc/latex/apa6/pseudoTeX/TeX2WordForapa6.bas15
-rw-r--r--Master/texmf-dist/source/latex/apa6/apa6.dtx50
-rw-r--r--Master/texmf-dist/tex/latex/apa6/apa6.cls10
5 files changed, 57 insertions, 20 deletions
diff --git a/Master/texmf-dist/doc/latex/apa6/README b/Master/texmf-dist/doc/latex/apa6/README
index c2f15405114..adc96d1ca89 100644
--- a/Master/texmf-dist/doc/latex/apa6/README
+++ b/Master/texmf-dist/doc/latex/apa6/README
@@ -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
index 9c77c1bcc00..961dce30740 100644
--- a/Master/texmf-dist/doc/latex/apa6/apa6.pdf
+++ b/Master/texmf-dist/doc/latex/apa6/apa6.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/apa6/pseudoTeX/TeX2WordForapa6.bas b/Master/texmf-dist/doc/latex/apa6/pseudoTeX/TeX2WordForapa6.bas
index 23f0ec8df94..bc7e0829f81 100644
--- a/Master/texmf-dist/doc/latex/apa6/pseudoTeX/TeX2WordForapa6.bas
+++ b/Master/texmf-dist/doc/latex/apa6/pseudoTeX/TeX2WordForapa6.bas
@@ -174,6 +174,21 @@ Sub FormatTex2WordDocument()
End With
Selection.Find.Execute Replace:=wdReplaceAll
+ ' remove extra spaces at the end of paragraphs
+ With Selection.Find
+ .Text = " ^p"
+ .Replacement.Text = "^p"
+ .Forward = True
+ .Wrap = wdFindContinue
+ .Format = False
+ .MatchCase = False
+ .MatchWholeWord = False
+ .MatchWildcards = False
+ .MatchSoundsLike = False
+ .MatchAllWordForms = False
+ End With
+ Selection.Find.Execute Replace:=wdReplaceAll
+
' delete the instructions
Selection.HomeKey Unit:=wdStory
diff --git a/Master/texmf-dist/source/latex/apa6/apa6.dtx b/Master/texmf-dist/source/latex/apa6/apa6.dtx
index bfa0dd58ed3..c5c7046e47e 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}[2013/01/10 v2.12 APA formatting (6th edition)]
+%<class>\ProvidesClass{apa6}[2013/06/26 v2.13 APA formatting (6th edition)]
% %
%<*internal> %
-\def\apaSixVersionDate{2013/01/10}
-\def\apaSixVersionNumber{2.12}
+\def\apaSixVersionDate{2013/06/26}
+\def\apaSixVersionNumber{2.13}
% %
% %
% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -276,6 +276,12 @@ and the derived files apa6.ins,
% \changes{v2.12}{2013/01/09}{Fixed `jou' mode to handle a starting
% page other than 1}
%
+% \changes{v2.13}{2013/06/26}{Fixed bug for `natbib' bibliography heading}
+%
+% \changes{v2.13}{2013/06/26}{Disabled overwriting of the `enumerate'
+% and `itemize' environments by `APAenumerate' and `APAitemize'; now
+% the `enumerate' and `itemize' environments are passed to standard
+% \LaTeX\ and will nest properly.}
%
% \begin{abstract}
% The \textit{Publication Manual} of the American Psychological
@@ -491,8 +497,9 @@ and the derived files apa6.ins,
% \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.
+% Please note that sections cannot be |\ref|'d since APA style does
+% not use numbered sections. So |\label| commands are unnecessary
+% unless you wish to use |\refname|.
%
% \subsection{Enumeration}
% \label{sec:enumeration}
@@ -541,6 +548,10 @@ and the derived files apa6.ins,
% |continue continue|\par
% |Blah blah blah|\par
%
+% \vspace{0.6em}
+% In addition to the above, all standard \LaTeX\ enumeration
+% environments are available (e.g., |enumerate| and |itemize|).
+%
% \subsection{Other Macros}
% \label{sec:othermacros}
% \begin{itemize}
@@ -694,7 +705,7 @@ and the derived files apa6.ins,
%
% \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|
+% must be deleted or re-written before \LaTeX-ing with the |mask|
% option---otherwise, you will see the to-be-masked entries showing up
% in the bibliography.
%
@@ -1808,8 +1819,8 @@ and the derived files apa6.ins,
{\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
-\AtBeginDocument{\def\bibsection{\mspart{References}}}% BDB -- this is for apacite + natbib
+\AtBeginDocument{\def\st@rtbibsection{\mspart{\refname}}}% BDB -- this is for apacite
+\AtBeginDocument{\def\bibsection{\mspart{\refname}}}% BDB -- this is for apacite + natbib
\newcommand{\mspart}{{\ifapamodeman{\clearpage}{}}\@startsection {section}{1}{\z@}%
{\b@level@one@skip}{\e@level@one@skip}%
{\centering\normalfont\normalsize}}
@@ -1874,10 +1885,10 @@ and the derived files apa6.ins,
\def\makelabel##1{\hss\llap{##1}}}}
\let\endAPAitemize=\endlist
-\let\enumerate=\APAenumerate
-\let\endenumerate=\endAPAenumerate
-\let\itemize=\APAitemize
-\let\enditemize=\endAPAitemize
+% \let\enumerate=\APAenumerate
+% \let\endenumerate=\endAPAenumerate
+% \let\itemize=\APAitemize
+% \let\enditemize=\endAPAitemize
%=============================================================
%
@@ -4262,6 +4273,21 @@ Sub FormatTex2WordDocument()
End With
Selection.Find.Execute Replace:=wdReplaceAll
+ ' remove extra spaces at the end of paragraphs
+ With Selection.Find
+ .Text = " ^p"
+ .Replacement.Text = "^p"
+ .Forward = True
+ .Wrap = wdFindContinue
+ .Format = False
+ .MatchCase = False
+ .MatchWholeWord = False
+ .MatchWildcards = False
+ .MatchSoundsLike = False
+ .MatchAllWordForms = False
+ End With
+ Selection.Find.Execute Replace:=wdReplaceAll
+
' delete the instructions
Selection.HomeKey Unit:=wdStory
diff --git a/Master/texmf-dist/tex/latex/apa6/apa6.cls b/Master/texmf-dist/tex/latex/apa6/apa6.cls
index fc6a90c4117..35c2c0e31fe 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}[2013/01/10 v2.12 APA formatting (6th edition)]
+\ProvidesClass{apa6}[2013/06/26 v2.13 APA formatting (6th edition)]
\NeedsTeXFormat{LaTeX2e}
\DeclareOption{man}{%
@@ -674,8 +674,8 @@
{-\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
+\AtBeginDocument{\def\st@rtbibsection{\mspart{\refname}}}% BDB -- this is for apacite
+\AtBeginDocument{\def\bibsection{\mspart{\refname}}}% BDB -- this is for apacite + natbib
\newcommand{\mspart}{{\ifapamodeman{\clearpage}{}}\@startsection {section}{1}{\z@}%
{\b@level@one@skip}{\e@level@one@skip}%
{\centering\normalfont\normalsize}}
@@ -728,10 +728,6 @@
\def\makelabel##1{\hss\llap{##1}}}}
\let\endAPAitemize=\endlist
-\let\enumerate=\APAenumerate
-\let\endenumerate=\endAPAenumerate
-\let\itemize=\APAitemize
-\let\enditemize=\endAPAitemize