From bf2bcea3e4a92bd40d01c8d4e5e310a0e6112970 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 24 Nov 2008 00:48:05 +0000 Subject: apa update (22nov08) git-svn-id: svn://tug.org/texlive/trunk@11402 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/apa/APAendfloat.cfg | 86 +++++++++++++++++++++++++ Master/texmf-dist/doc/latex/apa/CHANGELOG.txt | 22 ++++++- Master/texmf-dist/doc/latex/apa/LICENCE | 10 ++- Master/texmf-dist/doc/latex/apa/README | 9 ++- Master/texmf-dist/doc/latex/apa/apacls.html | 56 +++++++++------- Master/texmf-dist/doc/latex/apa/apacls.txt | 14 ++-- Master/texmf-dist/doc/latex/apa/endfloat.cfg | 86 ------------------------- Master/texmf-dist/doc/latex/apa/examples.txt | 4 +- 8 files changed, 166 insertions(+), 121 deletions(-) create mode 100644 Master/texmf-dist/doc/latex/apa/APAendfloat.cfg delete mode 100644 Master/texmf-dist/doc/latex/apa/endfloat.cfg (limited to 'Master/texmf-dist/doc/latex/apa') diff --git a/Master/texmf-dist/doc/latex/apa/APAendfloat.cfg b/Master/texmf-dist/doc/latex/apa/APAendfloat.cfg new file mode 100644 index 00000000000..8584249f13b --- /dev/null +++ b/Master/texmf-dist/doc/latex/apa/APAendfloat.cfg @@ -0,0 +1,86 @@ +%% +%% This is file `endfloat.cfg', +%% modifed from the original supplied with the endfloat package +%% to handle both sideways floats and longtable +%% +%% Athanassios Protopapas +%% July 2005 +%% +%% Original authors: James Darrell McCauley , +%% Jeff Goldberg +%% Original version: Version 2.4i +%% +\RequirePackage{rotating} +\let\efsaved@sidewaysfigure\sidewaysfigure +\let\efsaved@sidewaystable\sidewaystable +\let\efsaved@longtable\longtable +\AtBeginTables{\let\sidewaystable=\efsaved@sidewaystable\relax} +\AtBeginTables{\let\longtable=\efsaved@longtable\relax} +\AtBeginFigures{\let\sidewaysfigure=\efsaved@sidewaysfigure\relax} +\def\sidewaystable{\efloat@condopen{ttt} + \efloat@iwrite{ttt}{\string\begin{sidewaystable}}% + \if@domarkers + \addtocounter{posttbl}{1} + \tableplace + \fi + \def\@currenvir{efloat@float}% + \begingroup + \let\do\ef@makeinnocent \dospecials + \ef@makeinnocent\^^L% and whatever other special cases + \endlinechar`\^^M \catcode`\^^M=12 \ef@xsidetable} +{\catcode`\^^M=12 \endlinechar=-1 % + \gdef\ef@xsidetable#1^^M{\def\test{#1} + \ifx\test\ef@endsidetabletest + \efloat@foundend{ttt}{sidewaystable} + \else + \efloat@iwrite{ttt}{#1}% + \let\next\ef@xsidetable + \fi \next} +} +\def\sidewaysfigure{\efloat@condopen{fff} + \efloat@iwrite{fff}{\string\begin{sidewaysfigure}}% + \if@domarkers + \addtocounter{postfig}{1} + \figureplace + \fi + \def\@currenvir{efloat@float}% + \begingroup + \let\do\ef@makeinnocent \dospecials + \ef@makeinnocent\^^L% and whatever other special cases + \endlinechar`\^^M \catcode`\^^M=12 \ef@xsidefigure} +{\catcode`\^^M=12 \endlinechar=-1 % + \gdef\ef@xsidefigure#1^^M{\def\test{#1} + \ifx\test\ef@endsidefiguretest + \efloat@foundend{fff}{sidewaysfigure} + \else + \efloat@iwrite{fff}{#1}% + \let\next\ef@xsidefigure + \fi \next} +} +\def\longtable{\efloat@condopen{ttt} + \efloat@iwrite{ttt}{\string\begin{longtable}}% + \if@domarkers + \addtocounter{posttbl}{1} + \tableplace + \fi + \def\@currenvir{efloat@float}% + \begingroup + \let\do\ef@makeinnocent \dospecials + \ef@makeinnocent\^^L% and whatever other special cases + \endlinechar`\^^M \catcode`\^^M=12 \ef@xlongtable} +{\catcode`\^^M=12 \endlinechar=-1 % + \gdef\ef@xlongtable#1^^M{\def\test{#1} + \ifx\test\ef@endlongtabletest + \efloat@foundend{ttt}{longtable} + \else + \efloat@iwrite{ttt}{#1}% + \let\next\ef@xlongtable + \fi \next} +} +{\escapechar=-1% + \xdef\ef@endsidefiguretest{\string\\end\string\{sidewaysfigure\string\}}% + \xdef\ef@endsidetabletest{\string\\end\string\{sidewaystable\string\}} + \xdef\ef@endlongtabletest{\string\\end\string\{longtable\string\}}}% +\endinput +%% +%% End of file `endfloat.cfg'. diff --git a/Master/texmf-dist/doc/latex/apa/CHANGELOG.txt b/Master/texmf-dist/doc/latex/apa/CHANGELOG.txt index 7da05c6c795..79490496ed0 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.2, January 2006) +Alteration log for apa.cls (v1.3.3, August 2008) 1.00 --> 1.01 July 5, 1996: \r@headl now defaults to \r@headr in [doc] (used to complain) @@ -288,6 +288,26 @@ January 10, 2006: Tried \@topnum=\z@ and \@botnum=\@ne so that tables do not app first page in doc mode (the acknowledgements is the "one" float allowed on the title page, if defined). +1.3.2 --> 1.3.3 +August 28, 2008: Added curly braces around the argument of \MakeUppercase in the definitions + of \levelone (all 3 modes), as suggested by Nicholas Daly, who noticed that the + top level ("Level 5" of APA manual section 3.31, p. 113ff) was not set in + uppercase. Apparently this bug can be traced to changing Young Ryu's original + \uppercase to \MakeUppercase (and possibly changes to the behavior of the + latter through the evolution of LaTeX). + + Renamed endfloat.cfg to APAendfloat.cfg so that it can be included in the + distributions (putting endfloat.cfg under tex/latex/apa would result it its + use with endfloat regardless of document class). apa.cls users are instructed + to copy this file to their working document directory and rename locally + to endfloat.cfg + +November 13, 2008: Fixed a bug in the definition of levelfive that caused the paragraph + following the sectioning command to begin on the next line of the document + if a blank line intervened between the sectioning command and the paragraph + text. (The hskip should have been inside the heading argument and not floating + at the end of levelfive into @startsection.) Thanks to Nicholas Daly who + pointed out the problem. %%%%%%%%%%%%%%%% diff --git a/Master/texmf-dist/doc/latex/apa/LICENCE b/Master/texmf-dist/doc/latex/apa/LICENCE index 44f68a0b040..0cd49a2e809 100644 --- a/Master/texmf-dist/doc/latex/apa/LICENCE +++ b/Master/texmf-dist/doc/latex/apa/LICENCE @@ -2,12 +2,18 @@ %% LICENCING TERMS %% %% apa.cls -%% version 1.3.2 -%% January 2006 +%% version 1.3.3 +%% August 2008 %% by Athanassios Protopapas %% protopap@ilsp.gr %% %% This package may be distributed under the terms of the LaTeX Project Public %% License, as described in lppl.txt in the base LaTeX distribution. Either %% version 1.0 or, at your option, any later version. +%% +%% The term "package" above applies to all files accompanying apa.cls, that is: +%% README, apa.cls, CHANGELOG.txt, apacls.txt, apacls.html, apaenum.txt, +%% examples.txt, apaexample.txt, examplebib.bib, APAendfloat.cfg, and language- +%% specific definitions in .apa files (e.g., english.apa, greek.apa, dutch.apa). +%% All may distributed undern the LPPL. diff --git a/Master/texmf-dist/doc/latex/apa/README b/Master/texmf-dist/doc/latex/apa/README index f6b5014d0f3..744307cd450 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.2 of January 2006 +apa.cls LaTeX2e document class; version 1.3.3 of NOvember 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 -January 2006 +November 2008 ====================== @@ -50,8 +50,11 @@ apaenum.txt Instructions for using APA list environments examples.txt Guide with examples of correct apa.cls macro usage apaexample.tex Sample APA-style manuscript using apa.cls examplebib.bib Sample bibliography file accompanying apaexample.tex -endfloat.cfg Configuration file to make endfloat aware of longtable +APAendfloat.cfg Configuration file to make endfloat aware of longtable and sideways table floating environments *.apa Language-specific definitions of special APA-style 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 diff --git a/Master/texmf-dist/doc/latex/apa/apacls.html b/Master/texmf-dist/doc/latex/apa/apacls.html index b435a0e66a4..fdd71707723 100644 --- a/Master/texmf-dist/doc/latex/apa/apacls.html +++ b/Master/texmf-dist/doc/latex/apa/apacls.html @@ -47,15 +47,29 @@ LaTeX fashion) and it also allows both for manuscript look and journal look with a simple option to the class-loading command.

Note: -apa.cls is not in any way connected to, endorsed by, or even - probably known at all at the American Psychological Association.

+apa.cls is not in any way connected to or endorsed by +the American Psychological Association.

An article (in Greek) about apa.cls can be found in the first issue of -Eutupon, the +Eutupon, the magazine of the -Greek Tex Friends Group. -An English article is in preparation to appear some time in 2006. +Greek Tex Friends Group. +A more recent +article in English is also availabe. + +

+Warning: +apa.cls has a well defined scope and purpose, and I'm already too busy for it. +Please don't request modifications or features that are not related to the +stated purpose (which is to create manuscripts suitable for submission to APA journals +and to typeset these same manuscripts in true journal look). For example, if you +want the figures in the manuscript text but the rest as in man mode, then you're +on your own as to how you might modify apa.cls (or not) to achieve that. +In particular, if you want to write your thesis, apa.cls is not for you. +Please do not write to me asking for help with this. Use apacite for APA-style +citations and write your own typesetting code or +search for a thesis class suitable for your University.

Manuscript look (man mode)

In man mode, apa.cls typesets a title page, abstract page, text body, then @@ -102,10 +116,10 @@ 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.2, released on January 31st, 2006. It can found +The current version is 1.3.3, released on November 13rd, 2008. It can found on CTAN, the LaTeX Catalogue, -or it may be downloaded from here. There are no more recent +or it may be downloaded from here. There are no more recent “working” versions at this time.

apa.cls is distributed under the terms of the @@ -146,25 +160,15 @@ missing or in need of improvement) and send me the result:

Although this is a purely “free time” project for me, in general I have tried to be responsive about requests related to apa.cls and -especially when bugs or other problems are involved. Please do not hesitate +especially when bugs or other problems are involved. Do not hesitate to contact me if you encounter -difficulties or unexpected (or unacceptable) behavior when using apa.cls. -However, I do ask that you make sure you have searched +difficulties or unexpected (or unacceptable) behavior when using apa.cls +to prepare manuscripts for submission, after you have searched apacls.txt and examples.txt -and failed to find an answer to your problem in there before -you send that e-mail message. -

-apa.cls has a well defined scope and purpose, and I'm already too busy for it. -Please don't request modifications or features that are not related to the -stated purpose (which is to create manuscripts suitable for submission to APA journals -and to typeset these same manuscripts in true journal look). For example, if you -want the figures in the manuscript text but the rest as in man mode, then you're -on your own as to how you might modify apa.cls (or not) to achieve that. -In particular, if you want to write your thesis, apa.cls is not for you. -Please do not write to me asking for help with this; your message will be ignored. -Use apacite for APA-style citations and write your own typesetting code or -search for a thesis class suitable for your University. +and failed to find an answer to your problem. Don't even think about writing +to me about using apa.cls for any purpose other than preparing an APA style +manuscript for submission to a journal.

Acknowledgments

@@ -426,6 +430,10 @@ single file that can be processed for both man and jou. This the purpose of apa.cls, so only resort to longtable if you absolutely have to. You will need the supplied endfloat.cfg to use it. +

+A simpler, less clean solution for long tables (not using any specialized package) is +shown on page 47 of an article about apa.cls. +

Notes in tables

There is a simple way to include notes in @@ -651,7 +659,7 @@ 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 January 10th, 2006
by +
Last updated on November 21st, 2008
by Athanassios Protopapas
diff --git a/Master/texmf-dist/doc/latex/apa/apacls.txt b/Master/texmf-dist/doc/latex/apa/apacls.txt index 83cae21ff64..acbdb0d7656 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.2 January 2006 + Athanassios Protopapas ******* Version 1.3.3 August 2008 Introduction @@ -279,10 +279,16 @@ Notes on usage: inside in ifapamode argument, which makes it impossible to have a single file that can be processed for both man and jou. This defeats the purpose of apa.cls, so only resort to longtable if you absolutely - have to. You will need the supplied endfloat.cfg to use it. + have to. You will need the special APAendfloat.cfg file supplied with + apa.cls in order to use longtable, so that endfloat will recognize + (and postpone) long tables as tables. Copy this file to the working + folder with your APA style document, not any central LaTeX location, + to avoid influencing endfloat's behavior with other classes. Rename + it locally to endfloat.cfg so that it will be processed by endfloat. Sideways tables: Use the rotating package and \sidewaystable. You will - need the supplied endfloat.cfg in your document directory for it to work. + need the supplied APAendfloat.cfg (renamed endfloat.cfg) in your + document directory for it to work. Feedback: @@ -300,5 +306,5 @@ Example of usage: Athanassios Protopapas -January 5, 2005 +August 17, 2008 diff --git a/Master/texmf-dist/doc/latex/apa/endfloat.cfg b/Master/texmf-dist/doc/latex/apa/endfloat.cfg deleted file mode 100644 index 8584249f13b..00000000000 --- a/Master/texmf-dist/doc/latex/apa/endfloat.cfg +++ /dev/null @@ -1,86 +0,0 @@ -%% -%% This is file `endfloat.cfg', -%% modifed from the original supplied with the endfloat package -%% to handle both sideways floats and longtable -%% -%% Athanassios Protopapas -%% July 2005 -%% -%% Original authors: James Darrell McCauley , -%% Jeff Goldberg -%% Original version: Version 2.4i -%% -\RequirePackage{rotating} -\let\efsaved@sidewaysfigure\sidewaysfigure -\let\efsaved@sidewaystable\sidewaystable -\let\efsaved@longtable\longtable -\AtBeginTables{\let\sidewaystable=\efsaved@sidewaystable\relax} -\AtBeginTables{\let\longtable=\efsaved@longtable\relax} -\AtBeginFigures{\let\sidewaysfigure=\efsaved@sidewaysfigure\relax} -\def\sidewaystable{\efloat@condopen{ttt} - \efloat@iwrite{ttt}{\string\begin{sidewaystable}}% - \if@domarkers - \addtocounter{posttbl}{1} - \tableplace - \fi - \def\@currenvir{efloat@float}% - \begingroup - \let\do\ef@makeinnocent \dospecials - \ef@makeinnocent\^^L% and whatever other special cases - \endlinechar`\^^M \catcode`\^^M=12 \ef@xsidetable} -{\catcode`\^^M=12 \endlinechar=-1 % - \gdef\ef@xsidetable#1^^M{\def\test{#1} - \ifx\test\ef@endsidetabletest - \efloat@foundend{ttt}{sidewaystable} - \else - \efloat@iwrite{ttt}{#1}% - \let\next\ef@xsidetable - \fi \next} -} -\def\sidewaysfigure{\efloat@condopen{fff} - \efloat@iwrite{fff}{\string\begin{sidewaysfigure}}% - \if@domarkers - \addtocounter{postfig}{1} - \figureplace - \fi - \def\@currenvir{efloat@float}% - \begingroup - \let\do\ef@makeinnocent \dospecials - \ef@makeinnocent\^^L% and whatever other special cases - \endlinechar`\^^M \catcode`\^^M=12 \ef@xsidefigure} -{\catcode`\^^M=12 \endlinechar=-1 % - \gdef\ef@xsidefigure#1^^M{\def\test{#1} - \ifx\test\ef@endsidefiguretest - \efloat@foundend{fff}{sidewaysfigure} - \else - \efloat@iwrite{fff}{#1}% - \let\next\ef@xsidefigure - \fi \next} -} -\def\longtable{\efloat@condopen{ttt} - \efloat@iwrite{ttt}{\string\begin{longtable}}% - \if@domarkers - \addtocounter{posttbl}{1} - \tableplace - \fi - \def\@currenvir{efloat@float}% - \begingroup - \let\do\ef@makeinnocent \dospecials - \ef@makeinnocent\^^L% and whatever other special cases - \endlinechar`\^^M \catcode`\^^M=12 \ef@xlongtable} -{\catcode`\^^M=12 \endlinechar=-1 % - \gdef\ef@xlongtable#1^^M{\def\test{#1} - \ifx\test\ef@endlongtabletest - \efloat@foundend{ttt}{longtable} - \else - \efloat@iwrite{ttt}{#1}% - \let\next\ef@xlongtable - \fi \next} -} -{\escapechar=-1% - \xdef\ef@endsidefiguretest{\string\\end\string\{sidewaysfigure\string\}}% - \xdef\ef@endsidetabletest{\string\\end\string\{sidewaystable\string\}} - \xdef\ef@endlongtabletest{\string\\end\string\{longtable\string\}}}% -\endinput -%% -%% End of file `endfloat.cfg'. diff --git a/Master/texmf-dist/doc/latex/apa/examples.txt b/Master/texmf-dist/doc/latex/apa/examples.txt index c6560368863..a9566e228f3 100644 --- a/Master/texmf-dist/doc/latex/apa/examples.txt +++ b/Master/texmf-dist/doc/latex/apa/examples.txt @@ -260,7 +260,9 @@ belong. Isn't apa.cls wonderful? Just to show that another appendix is really just another section. Also, it's a good opportunity to show how longtable should be used. Remember, you must include the longtable option with the apa class if -you need to use longtable. Also, keep in mind, it only works in man mode. +you need to use longtable, and copy the special endfloat.cfg supplied +with apa.cls to the working document directory. Also, keep in mind, +it only works in man mode. \begin{longtable}{lcc} \caption{One sample caption for the sample long table.} -- cgit v1.2.3