summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/apa6
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-04-04 22:43:42 +0000
committerKarl Berry <karl@freefriends.org>2012-04-04 22:43:42 +0000
commitdac7712aa58920cb78197661794b377b9a8a68f5 (patch)
tree7acf2bf929b1c40a6e71dc1076361f70a3bebc40 /Master/texmf-dist/tex/latex/apa6
parent5f3950815dfad0d88a06e78f9137feba0ae4b298 (diff)
apa6 (4apr12)
git-svn-id: svn://tug.org/texlive/trunk@25852 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/apa6')
-rw-r--r--Master/texmf-dist/tex/latex/apa6/apa6.cls20
1 files changed, 12 insertions, 8 deletions
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]{}