summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex
diff options
context:
space:
mode:
authorManuel Pégourié-Gonnard <mpg@elzevir.fr>2011-08-02 19:33:48 +0000
committerManuel Pégourié-Gonnard <mpg@elzevir.fr>2011-08-02 19:33:48 +0000
commitc3f47c95240cee16ee832b0424a5eaea71d3fff0 (patch)
treea035902f4d86779f139c375b44cac424f592d739 /Master/texmf-dist/tex/latex
parent9da978a0f7f3a7a4a43656242ba48b3c209b9a26 (diff)
apa6e 2011/03/03 v0.3
git-svn-id: svn://tug.org/texlive/trunk@23350 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-rw-r--r--Master/texmf-dist/tex/latex/apa6e/apa6e.cls53
1 files changed, 38 insertions, 15 deletions
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
%%