diff options
author | Karl Berry <karl@freefriends.org> | 2013-06-26 22:53:03 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2013-06-26 22:53:03 +0000 |
commit | 75b22f44dee84203dad336787614dcb7203ad426 (patch) | |
tree | 3c841a2e69fa03acfbbf0ea1c2739c4177a3d7a8 /Master/texmf-dist/source/latex/apa6 | |
parent | 1d343ed6417b6271160ed148f3fd6a00e07104ce (diff) |
apa6 (26jun13)
git-svn-id: svn://tug.org/texlive/trunk@30957 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/apa6')
-rw-r--r-- | Master/texmf-dist/source/latex/apa6/apa6.dtx | 50 |
1 files changed, 38 insertions, 12 deletions
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 |