apa6e 2011/03/03 v0.3

git-svn-id: svn://tug.org/texlive/trunk@23350 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 116 insertions, 38 deletions

diff --git a/Master/texmf-dist/doc/latex/apa6e/apa6e.pdf b/Master/texmf-dist/doc/latex/apa6e/apa6e.pdf
index a7a710ac165..9af0a3a7249 100644
--- a/Master/texmf-dist/doc/latex/apa6e/apa6e.pdf
+++ b/Master/texmf-dist/doc/latex/apa6e/apa6e.pdf
diff --git a/Master/texmf-dist/source/latex/apa6e/apa6e.dtx b/Master/texmf-dist/source/latex/apa6e/apa6e.dtx
index 7b33bed60e8..5485e69e2d3 100644
--- a/Master/texmf-dist/source/latex/apa6e/apa6e.dtx
+++ b/Master/texmf-dist/source/latex/apa6e/apa6e.dtx
@@ -36,7 +36,7 @@
 %<class>\NeedsTeXFormat{LaTeX2e}
 %<class>\ProvidesClass{apa6e}
 %<*class>
-    [2011/03/01 v0.2 APA 6e manuscript formatting]
+    [2011/03/03 v0.3 APA 6e manuscript formatting]
 %</class>
 %
 %<*driver>
@@ -68,8 +68,18 @@
 %   Right brace   \}     Tilde         \~}
 %
 %
-% \changes{v0.1}{2011/02/12}{Initial version}
-% \changes{v0.2}{2011/03/01}{Added support for appendices}
+%   \changes{v0.1}{2011/02/12}{Initial version}
+%
+%   \changes{v0.2}{2011/03/01}{Added support for appendices}
+%
+%   \changes{v0.3}{2011/07/02}{Added \texttt{floatmarkers}
+%   option. Increased |\headheight| to make \textsc{fancyhdr}
+%   happy. Made it possible to refer to appendices by
+%   label. Implemented the rule that if there is only a single
+%   appendix, it is simply called ``Appendix'', not ``Appendix
+%   A''. Fixed a bug where floats were sometimes labeled as being in
+%   an appendix (like ``Figure A1'') even when they weren't (thanks to
+%   J.~Olson and Alex Sommerfeldt for the report and fix).}
 %
 % \GetFileInfo{apa6e.dtx}
 %
@@ -142,7 +152,7 @@
 %
 % \subsection{Class options}
 %
-% This class supports two options.
+% This class supports several options.
 %
 % \subsubsection{\texttt{leavefloats}}
 % When reading drafts, I find the APA manuscript format quite
@@ -155,6 +165,13 @@
 % this also inserts a large note on the front page to remind you that
 % you are looking at a draft with illegitimate formatting.
 %
+% \subsubsection{\texttt{floatmarkers}}
+% Some people like to leave little markers in the text that say
+% ``Figure 3 about here'' and so on. As far as I can tell, this
+% is actually not part of APA 6e style, but if you want to do it
+% anyway, then this option is here for you:
+% |\documentclass{floatmarkers}{apa6e}|.
+%
 % \subsubsection{\texttt{endnotes}}
 % APA style allows footnotes to either be formatted as footnotes
 % directly in the text, or placed at the end in a `Footnotes'
@@ -162,7 +179,7 @@
 % for some reason, then enable this option:
 % |\documentclass[endnotes]{apa6e}|.
 %
-% Of course, if you want both, then you can accomplish that in the
+% Of course, if you want multiple, then you can accomplish that in the
 % usual way: |\documentclass[leavefloats,endnotes]{apa6e}|.
 %
 % \subsection{Known limitations}
@@ -215,6 +232,7 @@
 %    \begin{macrocode}
 \DeclareOption{endnotes}{\def\apaSIXe@endnotes\relax}
 \DeclareOption{leavefloats}{\def\apaSIXe@leavefloats\relax}
+\DeclareOption{floatmarkers}{\def\apaSIXe@floatmarkers\relax}
 %    \end{macrocode}
 % All unrecognized options are passed through to \textsf{article}.
 %    \begin{macrocode}
@@ -229,9 +247,10 @@
 \RequirePackage{times}
 \RequirePackage{mathptmx}
 %    \end{macrocode}
-% Set margins and justification.
+% Set margins and justification. If |\headheight| is less than 15 pt,
+% \textsc{fancyhdr} will complain.
 %    \begin{macrocode}
-\RequirePackage[margin=1in]{geometry}
+\RequirePackage[margin=1in,headheight=15pt]{geometry}
 \RequirePackage[document]{ragged2e}
 %    \end{macrocode}
 % APA 6e says that indents should be ``5--7 spaces, or 1/2
@@ -279,9 +298,9 @@
 \vfill%
 \ifdefined%
   \apaSIXe@leavefloats%
-  {\large\textbf{Note! Figures and tables are currently mixed in with
-      text for easy reading; remember to remove the \textsf{leavefloats}
-      option before submission.}\vfill}%
+  {\large\textbf{\textit{A helpful reminder, courtesy \texttt{apa6e.cls}:} Figures and tables are currently mixed in with
+      your text for easier reading. Don't forget to remove the
+      \texttt{leavefloats} option before you submit!}\vfill}%
 \fi
 Author Note\par\RaggedRight\@authornote%
 \mspart{Abstract}%
@@ -418,14 +437,30 @@ Author Note\par\RaggedRight\@authornote%
 % processing the floats. This is done by defining
 % |\apaSIXe@appendixfloats@setup| appropriately in the two cases,
 % below.
+%
+% The other slightly messy bit is that if there is only one appendix,
+% it is called ``Appendix'', but if there is more than one, then the
+% first is called ``Appendix A''. So we need to keep track of how many
+% appendices the document contains. We do this using a nasty |\label|
+% hack to get the necessary information into the \texttt{.aux} file.
 %    \begin{macrocode}
-\renewcommand{\appendix}{\setcounter{section}{0}%
-    \renewcommand{\section}[1]{\addtocounter{section}{1}%
-        \apaSIXe@appendixfloats@setup{\Alph{section}}%
-        \mspart{Appendix \Alph{section}}}}
-\newcommand{\apaSIXe@appendixfloats@go}[1]{%
+\RequirePackage{ifthen}
+\renewcommand{\appendix}{\setcounter{section}{0}
+    \renewcommand{\section}[1]{\addtocounter{section}{1}
+        \ifthenelse{\equal{\value{section}}{2}}
+            {\label{apaSIXe@has@multiple@appendices}}
+            {}
+        \apaSIXe@appendixfloats@setup{\Alph{section}}
+        \def\@currentlabel{\Alph{section}}
+        \ifdefined\r@apaSIXe@has@multiple@appendices
+          \mspart{Appendix \Alph{section}}
+        \else
+          \mspart{Appendix}
+        \fi}}
+\newcommand{\apaSIXe@appendixfloats@figureson}[1]{%
     \setcounter{figure}{0}%
-    \renewcommand{\thefigure}{#1\arabic{figure}}%
+    \renewcommand{\thefigure}{#1\arabic{figure}}}
+\newcommand{\apaSIXe@appendixfloats@tableson}[1]{%
     \setcounter{table}{0}%
     \renewcommand{\thetable}{#1\arabic{table}}}
 %    \end{macrocode}
@@ -450,20 +485,40 @@ Author Note\par\RaggedRight\@authornote%
 % footnotes.
 %
 % If \textsc{endfloat} is in use, then we have to arrange for
-% |\apaSIXe@appendixfloats@go| to be called partly through the floats
-% being processed. We accomplish this by writing out a call to it to
-% the \texttt{fff} and \texttt{ttt} files that it uses.
+% |\apaSIXe@appendixfloats@figureson| and
+% |\apaSIXe@appendixfloats@tableson| to be called partly through the
+% floats being processed. We accomplish this by writing out a calls to
+% them in the \texttt{fff} and \texttt{ttt} files that
+% \textsc{endfloat} uses. (Note that it's important to have two
+% different commands --- we used to have just one, but then whichever
+% file was loaded first turned on the appendix mode half-way through,
+% and then appendix mode was in effect for \textit{all} of the other
+% file.) If \texttt{floatmarkers} option is in effect, then we also
+% need to make sure that the markers for floats in the appendix use
+% the right numbers --- and these use different counters.
 %    \begin{macrocode}
 \ifdefined\apaSIXe@leavefloats
-    \newcommand{\apaSIXe@appendixfloats@setup}[1]{\apaSIXe@appendixfloats@go{#1}}
+    \newcommand{\apaSIXe@appendixfloats@setup}[1]{%
+      \apaSIXe@appendixfloats@tableson{#1}%
+      \apaSIXe@appendixfloats@figureson{#1}%
+    }
 \else
-    \RequirePackage[nolists,noheads,nomarkers,tablesfirst]{endfloat}
+    \ifdefined\apaSIXe@floatmarkers
+        \relax
+    \else
+        \PassOptionsToPackage{nomarkers}{endfloat}
+    \fi
+    \RequirePackage[nolists,noheads,tablesfirst]{endfloat}
     \AtBeginDelayedFloats{\@doublespacing}
     \newcommand{\apaSIXe@appendixfloats@setup}[1]{%
+        \setcounter{postfig}{0}%
+        \renewcommand{\thepostfig}{#1\arabic{postfig}}%
+        \setcounter{posttbl}{0}%
+        \renewcommand{\theposttbl}{#1\arabic{posttbl}}%
         \efloat@iwrite{fff}{%
-            \string\makeatletter\string\apaSIXe@appendixfloats@go{#1}\string\makeatother}%
+            \string\makeatletter\string\apaSIXe@appendixfloats@figureson{#1}\string\makeatother}%
         \efloat@iwrite{ttt}{%
-            \string\makeatletter\string\apaSIXe@appendixfloats@go{#1}\string\makeatother}}
+            \string\makeatletter\string\apaSIXe@appendixfloats@tableson{#1}\string\makeatother}}
 \fi
 %    \end{macrocode}
 % 
diff --git a/Master/texmf-dist/tex/latex/apa6e/apa6e.cls b/Master/texmf-dist/tex/latex/apa6e/apa6e.cls
index 602edeee6cb..07fb17267ca 100644
--- a/Master/texmf-dist/tex/latex/apa6e/apa6e.cls
+++ b/Master/texmf-dist/tex/latex/apa6e/apa6e.cls
@@ -36,9 +36,10 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{apa6e}
-    [2011/03/01 v0.2 APA 6e manuscript formatting]
+    [2011/03/03 v0.3 APA 6e manuscript formatting]
 \DeclareOption{endnotes}{\def\apaSIXe@endnotes\relax}
 \DeclareOption{leavefloats}{\def\apaSIXe@leavefloats\relax}
+\DeclareOption{floatmarkers}{\def\apaSIXe@floatmarkers\relax}
 \DeclareOption*{%
 \PassOptionsToClass{\CurrentOption}{article}%
 }
@@ -46,7 +47,7 @@
 \LoadClass[12pt]{article}
 \RequirePackage{times}
 \RequirePackage{mathptmx}
-\RequirePackage[margin=1in]{geometry}
+\RequirePackage[margin=1in,headheight=15pt]{geometry}
 \RequirePackage[document]{ragged2e}
 \setlength{\RaggedRightParindent}{0.5in}
 \newcommand{\@doublespacing}{\linespread{1.655}}
@@ -71,9 +72,9 @@
 \vfill%
 \ifdefined%
   \apaSIXe@leavefloats%
-  {\large\textbf{Note! Figures and tables are currently mixed in with
-      text for easy reading; remember to remove the \textsf{leavefloats}
-      option before submission.}\vfill}%
+  {\large\textbf{\textit{A helpful reminder, courtesy \texttt{apa6e.cls}:} Figures and tables are currently mixed in with
+      your text for easier reading. Don't forget to remove the
+      \texttt{leavefloats} option before you submit!}\vfill}%
 \fi
 Author Note\par\RaggedRight\@authornote%
 \mspart{Abstract}%
@@ -117,13 +118,23 @@ Author Note\par\RaggedRight\@authornote%
     {-0.2\baselineskip \@plus -0.2ex \@minus -0.2ex}%
     {0.2\baselineskip \@plus .2ex}%
     {\Centering\normalfont\normalsize}}
-\renewcommand{\appendix}{\setcounter{section}{0}%
-    \renewcommand{\section}[1]{\addtocounter{section}{1}%
-        \apaSIXe@appendixfloats@setup{\Alph{section}}%
-        \mspart{Appendix \Alph{section}}}}
-\newcommand{\apaSIXe@appendixfloats@go}[1]{%
+\RequirePackage{ifthen}
+\renewcommand{\appendix}{\setcounter{section}{0}
+    \renewcommand{\section}[1]{\addtocounter{section}{1}
+        \ifthenelse{\equal{\value{section}}{2}}
+            {\label{apaSIXe@has@multiple@appendices}}
+            {}
+        \apaSIXe@appendixfloats@setup{\Alph{section}}
+        \def\@currentlabel{\Alph{section}}
+        \ifdefined\r@apaSIXe@has@multiple@appendices
+          \mspart{Appendix \Alph{section}}
+        \else
+          \mspart{Appendix}
+        \fi}}
+\newcommand{\apaSIXe@appendixfloats@figureson}[1]{%
     \setcounter{figure}{0}%
-    \renewcommand{\thefigure}{#1\arabic{figure}}%
+    \renewcommand{\thefigure}{#1\arabic{figure}}}
+\newcommand{\apaSIXe@appendixfloats@tableson}[1]{%
     \setcounter{table}{0}%
     \renewcommand{\thetable}{#1\arabic{table}}}
 \ifdefined\apaSIXe@endnotes
@@ -134,15 +145,27 @@ Author Note\par\RaggedRight\@authornote%
     \AtEndDocument{\ifdefined \apaSIXe@hasendnotes \theendnotes \fi}
 \fi
 \ifdefined\apaSIXe@leavefloats
-    \newcommand{\apaSIXe@appendixfloats@setup}[1]{\apaSIXe@appendixfloats@go{#1}}
+    \newcommand{\apaSIXe@appendixfloats@setup}[1]{%
+      \apaSIXe@appendixfloats@tableson{#1}%
+      \apaSIXe@appendixfloats@figureson{#1}%
+    }
 \else
-    \RequirePackage[nolists,noheads,nomarkers,tablesfirst]{endfloat}
+    \ifdefined\apaSIXe@floatmarkers
+        \relax
+    \else
+        \PassOptionsToPackage{nomarkers}{endfloat}
+    \fi
+    \RequirePackage[nolists,noheads,tablesfirst]{endfloat}
     \AtBeginDelayedFloats{\@doublespacing}
     \newcommand{\apaSIXe@appendixfloats@setup}[1]{%
+        \setcounter{postfig}{0}%
+        \renewcommand{\thepostfig}{#1\arabic{postfig}}%
+        \setcounter{posttbl}{0}%
+        \renewcommand{\theposttbl}{#1\arabic{posttbl}}%
         \efloat@iwrite{fff}{%
-            \string\makeatletter\string\apaSIXe@appendixfloats@go{#1}\string\makeatother}%
+            \string\makeatletter\string\apaSIXe@appendixfloats@figureson{#1}\string\makeatother}%
         \efloat@iwrite{ttt}{%
-            \string\makeatletter\string\apaSIXe@appendixfloats@go{#1}\string\makeatother}}
+            \string\makeatletter\string\apaSIXe@appendixfloats@tableson{#1}\string\makeatother}}
 \fi
 \endinput
 %%