From 8746480cea3a8470f1f5456d6e2ae8abcd2e7891 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 24 Dec 2008 01:12:21 +0000 Subject: apa update (22dec08) git-svn-id: svn://tug.org/texlive/trunk@11701 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/apa/CHANGELOG.txt | 7 +++- Master/texmf-dist/doc/latex/apa/README | 7 ++-- Master/texmf-dist/doc/latex/apa/apacls.html | 27 ++++++++------ Master/texmf-dist/doc/latex/apa/apacls.txt | 23 ++++++++---- Master/texmf-dist/tex/latex/apa/apa.cls | 51 +++++++++++++++++---------- 5 files changed, 75 insertions(+), 40 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/apa/CHANGELOG.txt b/Master/texmf-dist/doc/latex/apa/CHANGELOG.txt index 79490496ed0..745599afe02 100644 --- a/Master/texmf-dist/doc/latex/apa/CHANGELOG.txt +++ b/Master/texmf-dist/doc/latex/apa/CHANGELOG.txt @@ -1,5 +1,5 @@ -Alteration log for apa.cls (v1.3.3, August 2008) +Alteration log for apa.cls (v1.3.4, December 2008) 1.00 --> 1.01 July 5, 1996: \r@headl now defaults to \r@headr in [doc] (used to complain) @@ -309,6 +309,11 @@ November 13, 2008: Fixed a bug in the definition of levelfive that caused the pa at the end of levelfive into @startsection.) Thanks to Nicholas Daly who pointed out the problem. +1.3.2 --> 1.3.4 +December 3rd, 2008: Philip Kime added a "noapacite" option to avoid loading apacite and + also to avoid changing any bibliography macros so that the class can be used + with biblatex and the "bibaltex-apa" style. + %%%%%%%%%%%%%%%% TO DO FOR v2.0: Is continuation note at page end required with long tables? (5.21/p. 301) diff --git a/Master/texmf-dist/doc/latex/apa/README b/Master/texmf-dist/doc/latex/apa/README index 744307cd450..716588d3f19 100644 --- a/Master/texmf-dist/doc/latex/apa/README +++ b/Master/texmf-dist/doc/latex/apa/README @@ -1,5 +1,5 @@ -apa.cls LaTeX2e document class; version 1.3.3 of NOvember 2008 +apa.cls LaTeX2e document class; version 1.3.4 of December, 2008 apa.cls is a LaTeX2e class file that makes your document conform to the American Psychological Association (APA) Publication Manual (Fifth @@ -34,7 +34,7 @@ apa.cls, or with anything else for that matter. Athanassios Protopapas protopap@ilsp.gr -November 2008 +December 2008 ====================== @@ -56,5 +56,4 @@ APAendfloat.cfg Configuration file to make endfloat aware of longtable strings (section headings) Distribution maintainers: Please include *.apa and APAendfloat.cfg - -configuration files with the apa.cls distribution under tex/latex/apa \ No newline at end of file +configuration files with the apa.cls distribution under tex/latex/apa diff --git a/Master/texmf-dist/doc/latex/apa/apacls.html b/Master/texmf-dist/doc/latex/apa/apacls.html index fdd71707723..30ba1172139 100644 --- a/Master/texmf-dist/doc/latex/apa/apacls.html +++ b/Master/texmf-dist/doc/latex/apa/apacls.html @@ -116,7 +116,7 @@ to the text other than the format parameter. apa.cls is written and maintained by Athanassios Protopapas, who currently works at the Institute for Language & Speech Processing in Athens, Greece. -The current version is 1.3.3, released on November 13rd, 2008. It can found +The current version is 1.3.4, released on December 9th, 2008. It can found on CTAN, the LaTeX Catalogue, or it may be downloaded from here. There are no more recent @@ -483,13 +483,12 @@ be the most “regular” LaTeX-like format.

Bibliography and citations

- -apa.cls uses the +By default, apa.cls uses the apacite -package by Erik Meijer for citations because it offers the complete coverage and excellent conformance -to APA guidelines. Moreover, apacite has been recently updated (in 2005) and now -handles electronic sources as well as non-English language forms. -

+package by Erik Meijer for citations which offers complete coverage and excellent conformance +to APA guidelines, including apacite handling of electronic sources +and non-English language forms. + You should count on using bibTeX with the corresponding apacite.bst style file for your bibliography. Citation commands include the standard bibtex @@ -507,7 +506,12 @@ command with the file names of the relevant bib files (standard bib \bibliographystyle command, because apacite is selected and loaded automatically (however, for backwards compatibility, any existing \bibliographystyle command is nicely ignored with a warning). - +

+BibLaTeX update: As of version 1.3.4, apa.cls can also be used with BibLaTeX (with the biblatex-apa style by Philip Kime). +Use the noapacite option to apa.cls to prevent it from +automatically loading apacite. You can then load biblatex as +usual and use the biblatex-apa package for citations and references. See +the biblatex documentation and biblatex-apa documentation.

Appendices

@@ -626,6 +630,9 @@ and kind of parameters needed for the use of each one:

longtable
Only usable in man mode, loads longtable.sty if you really must use long tables in your manuscript. +
noapacite +
Prevents loading of apacite to allow use of BibLaTeX with the biblatex-apa + style for citations and references. See the biblatex and biblatex-apa documentation.
nobf
Effective in man mode, turns off boldface in section headers for strict conformance to APA style. @@ -659,9 +666,9 @@ affiliations (for article author(s)) are supported, and that there is no provision for A4 paper dimensions (but see examples.txt for a workaround).

-

Last updated on November 21st, 2008
by +
Last updated on December 9th, 2008
by Athanassios Protopapas
- \ No newline at end of file + diff --git a/Master/texmf-dist/doc/latex/apa/apacls.txt b/Master/texmf-dist/doc/latex/apa/apacls.txt index acbdb0d7656..14ac4c86d96 100644 --- a/Master/texmf-dist/doc/latex/apa/apacls.txt +++ b/Master/texmf-dist/doc/latex/apa/apacls.txt @@ -1,7 +1,7 @@ This is file apacls.txt, which contains instructions for using the APA LaTeX2e class file apa.cls - Athanassios Protopapas ******* Version 1.3.3 August 2008 + Athanassios Protopapas ******* Version 1.3.4 December 2008 Introduction @@ -77,8 +77,11 @@ Known restrictions: Other necessary files: - For all modes you need apacite.sty and apacite.bst. Download the - most recent version (June 2005 or later) for full compatibility. + To use BibTeX (default), for all apa.cls document modes you need + apacite.sty and apacite.bst. Download the most recent version + (June 2005 or later) for full compatibility. + If you prefer to use BibLaTeX with the biblatex-apa style, you + need apa.cbx and apa.bbx. For manuscript mode, you need endnotes.sty and endfloat.sty @@ -198,13 +201,16 @@ The following options are available: nobf : Effective in man mode, turns off boldface in section headers helv : Effective in man mode, uses Helvetica as the base typeface tt : Effective in man mode, uses a typewriter base typeface - babel : Effective every mode, loads babel to support languages other than - English. List the desired languages as additional options to - apa.cls after babel. The last language listed is the main one. + babel : Effective in every mode, loads babel to support languages other + than English. List the desired languages as additional options + to apa.cls after babel. The last language listed is the main one. longtable: Only usable in man mode, loads longtable.sty if you *really* must use long tables in your manuscript. See special note below floatmark: Effective in man mode, inserts placeholders for floats in text ("Insert Figure X about here" -- no longer required by APA) + noapacite: Effective in every mode, prevents loading of apacite to allow + use of biblatex with the biblatex-apa style. + Notes on usage: @@ -243,9 +249,12 @@ Notes on usage: For instructions on using the various citation forms get apacite.tex, testAPA.tex, and readme.apa from the CTAN mirror near you. For - instruction on using APA enumeration and seriation read apaenum.txt + instructions on using APA enumeration and seriation read apaenum.txt in this distribution. + (BibLaTeX users: pass the "noapacite" option to apa.cls and then use + biblatex as usual, with the biblatex-apa style.) + If you need to use additional options for article.cls, use them with the apa.cls options and they will be automatically passed along to article.cls 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}}}{} -- cgit v1.2.3