From b7e22d5720b65bafa6dba2f4282093cca3f26c00 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 2 Dec 2011 23:38:59 +0000 Subject: apa6 (2dec11) git-svn-id: svn://tug.org/texlive/trunk@24723 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/source/latex/apa6/apa6.dtx | 57 +++++++++++++++++++--------- 1 file changed, 39 insertions(+), 18 deletions(-) (limited to 'Master/texmf-dist/source/latex/apa6') diff --git a/Master/texmf-dist/source/latex/apa6/apa6.dtx b/Master/texmf-dist/source/latex/apa6/apa6.dtx index ed6b2f7be67..e1fe978f456 100644 --- a/Master/texmf-dist/source/latex/apa6/apa6.dtx +++ b/Master/texmf-dist/source/latex/apa6/apa6.dtx @@ -4,11 +4,11 @@ % % % CHANGE THESE VALUES WITH EACH NEW RELEASE: % % % -%\ProvidesClass{apa6}[2011/11/28 v1.01 APA formatting (6th edition)] +%\ProvidesClass{apa6}[2011/12/01 v1.02 APA formatting (6th edition)] % % %<*internal> % -\def\apaSixVersionDate{2011/11/28} -\def\apaSixVersionNumber{1.01} +\def\apaSixVersionDate{2011/12/01} +\def\apaSixVersionNumber{1.02} % % % % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -211,6 +211,9 @@ and the derived files apa6.ins, % \changes{v1.01}{2011/11/28}{Minor changes in `apa6.ptex' to % accommodate the \cs{note} command.} % +% \changes{v1.02}{2011/12/01}{More reliable font-size selection} +% \changes{v1.02}{2011/12/01}{Corrected default mode to jou} +% % \begin{abstract} % The \textit{Publication Manual} of the American Psychological % Association is widely used in the social sciences. The most @@ -1017,37 +1020,55 @@ and the derived files apa6.ins, \DeclareOption{mask}{\def\apaSix@maskauthoridentity{\relax}} % BDB +% declare the font-size commands +\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 +% make jou the default if no other options have been specified +\@ifundefined{def@man}{% + \@ifundefined{def@doc}{% + \@ifundefined{def@jou}{% + \def\def@jou{\@joumode} + \ClassWarningNoLine{apa6}{Using default mode (jou)} + }{} + }{} +}{} + % pass the default font-size to the article class \@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 } - -% make jou the default if no other options have been specified -\@ifundefined{def@man}{% - \@ifundefined{def@doc}{% - \@ifundefined{def@jou}{% - \def\def@doc{\@joumode} - \ClassWarningNoLine{apa6}{Using default mode (jou)} - }{} - }{} -}{} - - % determine the bibliography package, and load it if selected through the appropriate \documentclass option \@ifundefined{def@apacite}{% \@ifundefined{def@natbib}{% -- cgit v1.2.3