From dac7712aa58920cb78197661794b377b9a8a68f5 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 4 Apr 2012 22:43:42 +0000 Subject: apa6 (4apr12) git-svn-id: svn://tug.org/texlive/trunk@25852 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/apa6/apa6.cls | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'Master/texmf-dist/tex/latex/apa6/apa6.cls') diff --git a/Master/texmf-dist/tex/latex/apa6/apa6.cls b/Master/texmf-dist/tex/latex/apa6/apa6.cls index 1bf9f200803..cceb84ebbb2 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}[2012/03/24 v1.27 APA formatting (6th edition)] +\ProvidesClass{apa6}[2012/04/04 v1.3 APA formatting (6th edition)] \NeedsTeXFormat{LaTeX2e} \DeclareOption{man}{% @@ -62,9 +62,6 @@ \@ifundefined{def@man}{}{\def\fig@num{\relax}} } -\DeclareOption{floatmark}{% - \@ifundefined{def@man}{}{\def\float@mark{\relax}} -} \DeclareOption{longtable}{% \def\long@table{\relax} @@ -102,6 +99,10 @@ \def\def@floatsintext{\@floatsintext} } +\DeclareOption{a4paper}{% + \def\def@aFourPaper{\@aFourPapermode} +} + \DeclareOption{apacite}{% BDB \def\def@apacite{\@apacitemode} } @@ -294,7 +295,11 @@ }{}% def@notimes }% def@jou -\RequirePackage[top=1in, bottom=1in, left=1in, right=1in]{geometry} % this sets the page margins +\@ifundefined{def@aFourPaper}{ + \RequirePackage[top=1in, bottom=1in, left=1in, right=1in]{geometry} +}{ + \RequirePackage[top=1in, bottom=1in, left=1in, right=1in,a4paper]{geometry} +} \RequirePackage{graphicx} % this is for including graphics @@ -992,9 +997,8 @@ \let\@noendfloattab\table% BDB \let\@noendfloatfig\figure% BDB -\@ifundefined{float@mark}{% Figure and table in-text markers are no longer required - \RequirePackage[notablist,figlist,notabhead,nofighead,tablesfirst,nomarkers]{endfloat}[1995/10/11]}{% - \RequirePackage[notablist,figlist,notabhead,nofighead,tablesfirst]{endfloat}[1995/10/11]} + +\RequirePackage[notablist,figlist,notabhead,nofighead,tablesfirst,nomarkers]{endfloat}[1995/10/11] \def\@gobbleuntilnext[#1]{} -- cgit v1.2.3