diff options
| author | Karl Berry <karl@freefriends.org> | 2011-12-02 23:38:59 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2011-12-02 23:38:59 +0000 |
| commit | b7e22d5720b65bafa6dba2f4282093cca3f26c00 (patch) | |
| tree | e096f7e4fcb90d74538a599fd722f353f3c95bbe /Master/texmf-dist/tex/latex | |
| parent | 67a387806bdc03e8435afd1dcf8848030fe70c03 (diff) | |
apa6 (2dec11)
git-svn-id: svn://tug.org/texlive/trunk@24723 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
| -rw-r--r-- | Master/texmf-dist/tex/latex/apa6/apa6.cls | 44 |
1 files changed, 31 insertions, 13 deletions
diff --git a/Master/texmf-dist/tex/latex/apa6/apa6.cls b/Master/texmf-dist/tex/latex/apa6/apa6.cls index f93b34e060b..6cfa6ac6587 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}[2011/11/28 v1.01 APA formatting (6th edition)] +\ProvidesClass{apa6}[2011/12/01 v1.02 APA formatting (6th edition)] \NeedsTeXFormat{LaTeX2e} \DeclareOption{man}{% @@ -109,32 +109,50 @@ \DeclareOption{mask}{\def\apaSix@maskauthoridentity{\relax}} % BDB +\newcommand\apaSix@ptsize{} +\newcommand\apaSix@noptsize{} +\DeclareOption{10pt}{\renewcommand\apaSix@ptsize{10pt}} +\DeclareOption{11pt}{\renewcommand\apaSix@ptsize{11pt}} +\DeclareOption{12pt}{\renewcommand\apaSix@ptsize{12pt}} + \DeclareOption*{\PassOptionsToClass{\CurrentOption}{article}} \ProcessOptions\relax \@ifundefined{def@man}{% + \@ifundefined{def@doc}{% + \@ifundefined{def@jou}{% + \def\def@jou{\@joumode} + \ClassWarningNoLine{apa6}{Using default mode (jou)} + }{} + }{} +}{} + +\@ifundefined{def@man}{% \@ifundefined{def@jou}{% \@ifundefined{def@doc}{% }{% doc - \LoadClass[11pt]{article} + \ifx\apaSix@ptsize\apaSix@noptsize + \LoadClass[11pt,twoside]{article} % default for doc is 11pt + \else + \LoadClass[\apaSix@ptsize]{article} + \fi } }{% jou - \LoadClass[11pt,twoside]{article} + \ifx\apaSix@ptsize\apaSix@noptsize + \LoadClass[10pt,twoside]{article} % default for jou is 10pt + \else + \LoadClass[\apaSix@ptsize,twoside]{article} + \fi } }{% man - \LoadClass[12pt]{article} + \ifx\apaSix@ptsize\apaSix@noptsize + \LoadClass[12pt,twoside]{article} % default for man is 12pt + \else + \LoadClass[\apaSix@ptsize]{article} + \fi } -\@ifundefined{def@man}{% - \@ifundefined{def@doc}{% - \@ifundefined{def@jou}{% - \def\def@doc{\@joumode} - \ClassWarningNoLine{apa6}{Using default mode (jou)} - }{} - }{} -}{} - \@ifundefined{def@apacite}{% \@ifundefined{def@natbib}{% \@ifundefined{def@biblatex}{% |