apa update (22dec08)

git-svn-id: svn://tug.org/texlive/trunk@11701 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 33 insertions, 18 deletions

diff --git a/Master/texmf-dist/tex/latex/apa/apa.cls b/Master/texmf-dist/tex/latex/apa/apa.cls
index 1971bae2106..cbbbe08d69e 100644
--- a/Master/texmf-dist/tex/latex/apa/apa.cls
+++ b/Master/texmf-dist/tex/latex/apa/apa.cls
@@ -1,9 +1,9 @@
 %
-% apa.cls  version 1.3.3
+% apa.cls  version 1.3.4
 %
 % NOTE CHANGE IN VERSION NUMBERING : 1.21--1.28 should have been 1.2.1--1.2.8
 %
-% Athanassios Protopapas, November 2008
+% Athanassios Protopapas, December 2008
 % protopap@ilsp.gr
 %
 % This package may be distributed under the terms of the LaTeX Project Public
@@ -22,7 +22,7 @@
 %%%%%%%%%%%%%%%%%
 
 \NeedsTeXFormat{LaTeX2e} 
-\ProvidesClass{apa}[2008/11/13 American Psychological Association format v1.3.3]
+\ProvidesClass{apa}[2008/12/09 American Psychological Association format v1.3.4]
 
 \DeclareOption{man}{%
 \def\def@man{\@manmode}
@@ -76,12 +76,20 @@
 
 \DeclareOption{nobf}{\def\no@bf@title{\relax}}
 
+\DeclareOption{noapacite}{%         -- Philip Kime 2008/12/03
+\def\def@noapacite{\@noapacitemode}
+}
+
 \DeclareOption*{%
 \PassOptionsToClass{\CurrentOption}{article}%
 }
 
 \ProcessOptions
 
+\@ifundefined{def@noapacite}%       -- Philip Kime 2008/12/03
+  {\ClassWarningNoLine{apa}{Using BibTeX with apacite for citations and references}}%
+  {\ClassWarningNoLine{apa}{apacite not loaded -- User may load BibLaTeX}}
+
 \@ifundefined{def@man}{%
  \@ifundefined{def@jou}{%
   \@ifundefined{def@doc}{%
@@ -213,9 +221,10 @@
 
 %========== Load new apacite =========================
 
-\@ifundefined{def@man}{%                      -- thp 2005/07/23
- \RequirePackage{apacite}[2005/06/08]}
- {\RequirePackage[bibnewpage]{apacite}[2005/06/08]}
+\@ifundefined{def@noapacite}%       -- Philip Kime 2008/12/03
+  {\@ifundefined{def@man}{%         -- thp 2005/07/23
+   \RequirePackage{apacite}[2005/06/08]}
+   {\RequirePackage[bibnewpage]{apacite}[2005/06/08]}}{}
 
 %========== APA Section heading & seriation, from theapa.sty
 
@@ -1374,10 +1383,14 @@
 \hbadness=30000
 \hyphenpenalty=100
 
-% Removed some bibliography redefinitions as per the instructions of Erik Meijer 
-\bibleftmargin=1.2em        % left these in because the default is too big
-\bibindent=-\bibleftmargin  % and this is apparently not refefined each time
-\renewcommand{\bibliographytypesize}{\footnotesize}
+
+
+
+\@ifundefined{def@noapacite}{% -- Philip Kime 2008/12/03
+  % Removed some bibliography redefinitions as per the instructions of Erik Meijer 
+  \bibleftmargin=1.2em        % left these in because the default is too big
+  \bibindent=-\bibleftmargin  % and this is apparently not refefined each time
+  \renewcommand{\bibliographytypesize}{\footnotesize}}{}
 
 }% end of jou mode (journal format)
 
@@ -1598,8 +1611,9 @@ to\hsize{\hfil\box\@tempboxa\hfil}
 \def\fnum@figure{\small {\em\figurename\ {\thefigure}}.\hspace{0.07in}}
 \long\def\fnum@table{\small\tablename\ {\thetable}:}
 
-% Removed defs as per the instructions of Erik Meijer -- thp 2005/07/23
-\renewcommand{\bibliographytypesize}{\small}
+\@ifundefined{def@noapacite}{% -- Philip Kime 2008/12/03
+  % Removed defs as per the instructions of Erik Meijer -- thp 2005/07/23
+  \renewcommand{\bibliographytypesize}{\small}}{}
 
 }% end of doc mode (regular LaTeX format)
 
@@ -1618,9 +1632,10 @@ to\hsize{\hfil\box\@tempboxa\hfil}
 \let\fiveLevelHeading=\FiveLevelHeading
 \def\HeadingLevels#1{\csname #1LevelHeading\endcsname} % fixed Jan 5 99
 \def\headinglevels#1{\csname #1LevelHeading\endcsname} % fixed Jan 5 99
-\bibliographystyle{apacite}
-%
-% Thanks to Donald Arsenau for the right way to ignore \bibliographystyle
-%
-\def\bibliographystyle#1{\ClassWarning{apa}{\string\bibliographystyle
- \space command ignored}}
+
+\@ifundefined{def@noapacite}{% -- Philip Kime 2008/12/03
+  \bibliographystyle{apacite}
+  %
+  % Thanks to Donald Arsenau for the right way to ignore \bibliographystyle
+  %
+  \def\bibliographystyle#1{\ClassWarning{apa}{\string\bibliographystyle\space command ignored}}}{}