diff options
author | Karl Berry <karl@freefriends.org> | 2014-11-21 00:47:20 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2014-11-21 00:47:20 +0000 |
commit | 0b70c983e8bb41baa9fa707f5f115eed11ddf514 (patch) | |
tree | f749e2d0753646b19fd04390380d745c9db81938 /Master/texmf-dist/source | |
parent | 482524ad9e0c198448d651d2334f36e4da04e37d (diff) |
apa6 (20nov14)
git-svn-id: svn://tug.org/texlive/trunk@35631 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source')
-rw-r--r-- | Master/texmf-dist/source/latex/apa6/apa6.dtx | 81 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/apa6/apa6.ins | 8 |
2 files changed, 49 insertions, 40 deletions
diff --git a/Master/texmf-dist/source/latex/apa6/apa6.dtx b/Master/texmf-dist/source/latex/apa6/apa6.dtx index c5c7046e47e..b94fd6bc613 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/06/26 v2.13 APA formatting (6th edition)] +%<class>\ProvidesClass{apa6}[2014/11/20 v2.14 APA formatting (6th edition)] % % %<*internal> % -\def\apaSixVersionDate{2013/06/26} -\def\apaSixVersionNumber{2.13} +\def\apaSixVersionDate{2014/11/20} +\def\apaSixVersionNumber{2.14} % % % % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -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-2013 by Brian D. Beitzel <brian at beitzel.com> +Copyright (C) 2011-2014 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-2013 by Brian D. Beitzel <brian at beitzel.com> +Copyright (C) 2011-2014 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-2013 by Brian D. Beitzel <brian at beitzel.com> +Copyright (C) 2011-2014 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 @@ -283,6 +283,11 @@ and the derived files apa6.ins, % the `enumerate' and `itemize' environments are passed to standard % \LaTeX\ and will nest properly.} % +% \changes{v2.14}{2014/11/20}{Fixed compatiblity with `nameref' for +% appendices} +% \changes{v2.14}{2014/11/20}{Fixed bug specifying the headwidth for +% `doc' format} +% % \begin{abstract} % The \textit{Publication Manual} of the American Psychological % Association is widely used in the social sciences. The most @@ -806,32 +811,33 @@ and the derived files apa6.ins, % trial period is available), find its ``pseudoTeX'' folder (which % contains all the |.ptex| files automatically generated by TeX2Word), % and copy |apa6.ptex| into that folder. To convert your -% \textsf{apa6} \LaTeX\ document, start Microsoft Word and open your -% \textsf{apa6} document just as you would open any other document in -% Word. The conversion process will run automatically and a -% mostly-ready document will be produced. Formatting of the title -% page, abstract page, section headings, double-spacing, table and -% figure captions, boldfaced and italicized text are all handled by -% the converter. Instructions for finishing the conversion process -% will be displayed on the title page of the converted document. -% Mostly this involves moving floats (tables and figures) to their -% places toward the end of the manuscript, some table re-formatting, -% and editing of bibliographic information. If you wish to have this -% editing more automated, you can open Word's Visual Basic Editor and -% import the ``TeX2WordForapa6.bas'' file (from the ``pseudoTeX'' -% subfolder of the \textsf{apa6} installation) as a new module, delete -% the lines beginning with percent signs at the top and bottom of the -% module, then run its |FormatTex2WordDocument| macro. This will -% complete all of the above steps and configure the bibliographic -% information as temporary citations that EndNote can then interpret -% (see below for details). However, some minor editing is still -% necessary (e.g., table titles and footnotes are not moved). For -% more efficient use of this macro, create a new Word document, open -% the Visual Basic Editor (VBE) and import the ``TeX2WordForapa6.bas'' -% file as a new module (be sure to delete all lines beginning with two -% percent signs); close the VBE and save the document in your ``Word -% Startup'' folder. Then the |FormatTex2WordDocument| macro will be -% available from the Macros dialog in Word for all documents. +% \textsf{apa6} \LaTeX\ document, start Microsoft Word (it must be +% 32-bit) and open your \textsf{apa6} document just as you would open +% any other document in Word. The conversion process will run +% automatically and a mostly-ready document will be produced. +% Formatting of the title page, abstract page, section headings, +% double-spacing, table and figure captions, boldfaced and italicized +% text are all handled by the converter. Instructions for finishing +% the conversion process will be displayed on the title page of the +% converted document. Mostly this involves moving floats (tables and +% figures) to their places toward the end of the manuscript, some +% table re-formatting, and editing of bibliographic information. If +% you wish to have this editing more automated, you can open Word's +% Visual Basic Editor and import the ``TeX2WordForapa6.bas'' file +% (from the ``pseudoTeX'' subfolder of the \textsf{apa6} installation) +% as a new module, delete the lines beginning with percent signs at +% the top and bottom of the module, then run its +% |FormatTex2WordDocument| macro. This will complete all of the above +% steps and configure the bibliographic information as temporary +% citations that EndNote can then interpret (see below for details). +% However, some minor editing is still necessary (e.g., table titles +% and footnotes are not moved). For more efficient use of this macro, +% create a new Word document, open the Visual Basic Editor (VBE) and +% import the ``TeX2WordForapa6.bas'' file as a new module (be sure to +% delete all lines beginning with two percent signs); close the VBE +% and save the document in your ``Word Startup'' folder. Then the +% |FormatTex2WordDocument| macro will be available from the Macros +% dialog in Word for all documents. % % The major weakness of TeX2Word at the moment is a near-total lack of % support for bibliographic packages. Version 2.0 of \textsf{apa6} @@ -2161,6 +2167,9 @@ and the derived files apa6.ins, % \setlength{\app@t@width}{\columnwidth} % \addtolength{\app@t@width}{-8em}%% leveltwo is defined with leftskip=rightskip=4em plus 1fill \long\def\section##1{% + \makeatletter% + \def\@currentlabelname{##1}% + \makeatother% \ifapamodeman{% \clearpage \setcounter{postfig}{0} @@ -3021,10 +3030,6 @@ and the derived files apa6.ins, \fancyhf{} \renewcommand{\headrulewidth}{0pt} -% fix headwidth for even-numbered pages -% suggestion from http://tex.stackexchange.com/questions/42798/apa6-package-heading-line-exceeds-textwidth -\setlength{\headwidth}{\textwidth} - \fancypagestyle{otherpage}{% % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \lhead{\MakeUppercase{\@shorttitle}}% @@ -3194,6 +3199,10 @@ and the derived files apa6.ins, \setcounter{secnumdepth}{0} \flushbottom +% fix headwidth for even-numbered pages +% suggestion from http://tex.stackexchange.com/questions/42798/apa6-package-heading-line-exceeds-textwidth +\setlength{\headwidth}{\textwidth} + \setcounter{topnumber}{2} \def\topfraction{.7} \setcounter{bottomnumber}{2} diff --git a/Master/texmf-dist/source/latex/apa6/apa6.ins b/Master/texmf-dist/source/latex/apa6/apa6.ins index 397dbd8d717..d4ac3e85fb1 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-2013 by Brian D. Beitzel <brian at beitzel.com> +%% Copyright (C) 2011-2014 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-2013 by Brian D. Beitzel <brian at beitzel.com> +Copyright (C) 2011-2014 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-2013 by Brian D. Beitzel <brian at beitzel.com> +Copyright (C) 2011-2014 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-2013 by Brian D. Beitzel <brian at beitzel.com> +%% Copyright (C) 2011-2014 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 |