diff options
Diffstat (limited to 'Master/texmf-dist/source')
| -rw-r--r-- | Master/texmf-dist/source/latex/apa6/apa6.dtx | 44 |
1 files changed, 27 insertions, 17 deletions
diff --git a/Master/texmf-dist/source/latex/apa6/apa6.dtx b/Master/texmf-dist/source/latex/apa6/apa6.dtx index 637aae3e855..c6daf7fcd65 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: % % % -%<class>\ProvidesClass{apa6}[2012/03/24 v1.27 APA formatting (6th edition)] +%<class>\ProvidesClass{apa6}[2012/04/04 v1.3 APA formatting (6th edition)] % % %<*internal> % -\def\apaSixVersionDate{2012/03/24} -\def\apaSixVersionNumber{1.27} +\def\apaSixVersionDate{2012/04/04} +\def\apaSixVersionNumber{1.3} % % % % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -250,6 +250,9 @@ and the derived files apa6.ins, % \changes{v1.25}{2012/02/23}{Fixed incompatibility with hyperref package} % \changes{v1.25}{2012/02/23}{Localized `Keywords' label (in config file)} % +% \changes{v1.27}{2012/03/24}{Added `APAczech.txt' configuration} +% +% \changes{v1.3}{2012/04/04}{Added `a4paper' option} % % % \begin{abstract} @@ -313,6 +316,8 @@ and the derived files apa6.ins, % font. % \item \DescribeMacro{12pt}|12pt|: Typesets the document in 12-point % font. +% \item \DescribeMacro{a4paper}|a4paper|: Specifies A4 paper size +% (letter is default). % \item \DescribeMacro{nolmodern}|nolmodern|: Suppresses loading of the % \textsf{lmodern} package. % \item \DescribeMacro{nofontenc}|nofontenc|: Suppresses loading of the @@ -562,14 +567,8 @@ and the derived files apa6.ins, % \begin{itemize} % \item There is a limit of six affiliations for authors (but an % unlimited number of authors across those six affiliations). -% \item No support for A4 paper. However, the following workaround -% (from the \textsf{apa} documentation)may work: % \end{itemize} % -% \indent |\ifapamodeman{\setlength{\textwidth}{5.76772in}%| -% -% \indent |\setlength{\textheight}{9.19291in}}{}| -% % \section{Development of \textsf{apa6}} % The base code for this class is the \textsf{apa} class, which in % turn was based upon other sources. In order to comply with 6th @@ -1025,9 +1024,9 @@ and the derived files apa6.ins, \@ifundefined{def@man}{}{\def\fig@num{\relax}} } -\DeclareOption{floatmark}{% - \@ifundefined{def@man}{}{\def\float@mark{\relax}} -} +% \DeclareOption{floatmark}{% +% \@ifundefined{def@man}{}{\def\float@mark{\relax}} +% } \DeclareOption{longtable}{% \def\long@table{\relax} @@ -1068,6 +1067,11 @@ and the derived files apa6.ins, \def\def@floatsintext{\@floatsintext} } +% allow A4 paper size +\DeclareOption{a4paper}{% + \def\def@aFourPaper{\@aFourPapermode} +} + \DeclareOption{apacite}{% BDB \def\def@apacite{\@apacitemode} } @@ -1304,8 +1308,12 @@ and the derived files apa6.ins, }% def@jou - -\RequirePackage[top=1in, bottom=1in, left=1in, right=1in]{geometry} % this sets the page margins +% choose a paper size and set 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 @@ -2188,9 +2196,11 @@ and the derived files apa6.ins, \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]} +% \@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] %\renewcommand{\figureplace}{% % \par\begin{center} |