apa6 (11dec11)

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

8 files changed, 48 insertions, 6 deletions

diff --git a/Master/texmf-dist/doc/latex/apa6/README.txt b/Master/texmf-dist/doc/latex/apa6/README.txt
new file mode 100644
index 00000000000..86aa16b987f
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/apa6/README.txt
@@ -0,0 +1,32 @@
+----------------------------------------------------------------------
+
+apa6 - A LaTeX class for formatting documents in compliance with the
+American Psychological Association's Publication Manual, 6th edition
+
+Copyright (C) 2011 by Brian D. Beitzel <brian at beitzel.com>
+
+This work may be distributed and/or modified under the
+conditions of the LaTeX Project Public License (LPPL), either
+version 1.3c of this license or (at your option) any later
+version.  The latest version of this license is in the file:
+
+http://www.latex-project.org/lppl.txt
+
+Users may freely modify these files without permission, as long as the
+copyright line and this statement are maintained intact.
+
+This work is not endorsed by, affiliated with, or probably even known
+by, the American Psychological Association.
+
+----------------------------------------------------------------------
+
+The Publication Manual of the American Psychological Association is
+widely used in the social sciences.  The most recent update, in 2009,
+altered the formatting guidelines and therefore rendered existing
+formatting solutions inadequate.  The apa6 class is an update of
+older code from the apa class (available from CTAN), which is no
+longer being maintained.  New features have also been added, such as
+suppressing references to one's own work to facilitate masked reviews
+of manuscripts by independent reviewers.  See the documentation for
+details.
+
diff --git a/Master/texmf-dist/doc/latex/apa6/apa6.pdf b/Master/texmf-dist/doc/latex/apa6/apa6.pdf
index a74865eeba9..ebc1d0b9606 100644
--- a/Master/texmf-dist/doc/latex/apa6/apa6.pdf
+++ b/Master/texmf-dist/doc/latex/apa6/apa6.pdf
diff --git a/Master/texmf-dist/doc/latex/apa6/pseudoTeX/apa6.ptex b/Master/texmf-dist/doc/latex/apa6/pseudoTeX/apa6.ptex
index 02872ddbcff..68c25b21ab7 100644
--- a/Master/texmf-dist/doc/latex/apa6/pseudoTeX/apa6.ptex
+++ b/Master/texmf-dist/doc/latex/apa6/pseudoTeX/apa6.ptex
@@ -28,6 +28,7 @@
 %% ----------------------------------------------------------------------
 %% 
 
+
 %% pseudo {apa6}
 %% Copyright (C) 2001-2011 Chikrii Softlab.
 %% All rights reserved.
@@ -249,6 +250,7 @@
 %% This work is not endorsed by, affiliated with, or probably even known
 %% by, the American Psychological Association.
 %% 
+%% 
 %% This work is "maintained" (as per LPPL maintenance status) by
 %% Brian D. Beitzel.
 %% 
@@ -260,6 +262,8 @@
 %%                                 APAamerican.txt,
 %%                                 APAdutch.txt,
 %%                                 APAenglish.txt,
+%%                                 APAgerman.txt,
+%%                                 APAngerman.txt,
 %%                                 APAgreek.txt,
 %%                                 APAendfloat.cfg,
 %%                                 apa6.ptex,
diff --git a/Master/texmf-dist/doc/latex/apa6/samples/bibliography.bib b/Master/texmf-dist/doc/latex/apa6/samples/bibliography.bib
index bdd5aaa68ac..24eba1147ae 100644
--- a/Master/texmf-dist/doc/latex/apa6/samples/bibliography.bib
+++ b/Master/texmf-dist/doc/latex/apa6/samples/bibliography.bib
@@ -28,6 +28,7 @@
 %% ----------------------------------------------------------------------
 %% 
 
+
 @ARTICLE{Borst2011a,
   author = {Borst, Gr\'{e}goire and Kosslyn, Stephen M. and Kievit, Rogier A. and  Thompson, William L.},
   title = {A fictitious entry to demonstrate complicated bibliographies},
@@ -191,6 +192,7 @@ the design of multimedia instruction},
 %% This work is not endorsed by, affiliated with, or probably even known
 %% by, the American Psychological Association.
 %% 
+%% 
 %% This work is "maintained" (as per LPPL maintenance status) by
 %% Brian D. Beitzel.
 %% 
@@ -202,6 +204,8 @@ the design of multimedia instruction},
 %%                                 APAamerican.txt,
 %%                                 APAdutch.txt,
 %%                                 APAenglish.txt,
+%%                                 APAgerman.txt,
+%%                                 APAngerman.txt,
 %%                                 APAgreek.txt,
 %%                                 APAendfloat.cfg,
 %%                                 apa6.ptex,
diff --git a/Master/texmf-dist/doc/latex/apa6/samples/longsample.pdf b/Master/texmf-dist/doc/latex/apa6/samples/longsample.pdf
deleted file mode 100644
index f2c3786f2e5..00000000000
--- a/Master/texmf-dist/doc/latex/apa6/samples/longsample.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/apa6/samples/longsample.tex b/Master/texmf-dist/doc/latex/apa6/samples/longsample.tex
index 39b478b777b..0fd6bd9a543 100644
--- a/Master/texmf-dist/doc/latex/apa6/samples/longsample.tex
+++ b/Master/texmf-dist/doc/latex/apa6/samples/longsample.tex
@@ -27,6 +27,7 @@
 %% 
 %% ----------------------------------------------------------------------
 %% 
+
 \documentclass[man]{apa6}
 
 \usepackage{lipsum}
@@ -38,9 +39,6 @@
 \DeclareLanguageMapping{american}{american-apa}
 \addbibresource{bibliography.bib}
 
-\usepackage[T1]{fontenc}
-\usepackage{lmodern}
-
 \title{Sample APA-Style Document Using the \textsf{apa6} Package}
 \shorttitle{Sample Document}
 
@@ -203,6 +201,7 @@ The detailed results are shown in Table~\ref{tab:DeckedTable}. \lipsum[22]
 %% This work is not endorsed by, affiliated with, or probably even known
 %% by, the American Psychological Association.
 %% 
+%% 
 %% This work is "maintained" (as per LPPL maintenance status) by
 %% Brian D. Beitzel.
 %% 
@@ -214,6 +213,8 @@ The detailed results are shown in Table~\ref{tab:DeckedTable}. \lipsum[22]
 %%                                 APAamerican.txt,
 %%                                 APAdutch.txt,
 %%                                 APAenglish.txt,
+%%                                 APAgerman.txt,
+%%                                 APAngerman.txt,
 %%                                 APAgreek.txt,
 %%                                 APAendfloat.cfg,
 %%                                 apa6.ptex,
diff --git a/Master/texmf-dist/doc/latex/apa6/samples/shortsample.pdf b/Master/texmf-dist/doc/latex/apa6/samples/shortsample.pdf
deleted file mode 100644
index 38a4950b331..00000000000
--- a/Master/texmf-dist/doc/latex/apa6/samples/shortsample.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/apa6/samples/shortsample.tex b/Master/texmf-dist/doc/latex/apa6/samples/shortsample.tex
index 358867990c2..1bb9eb2f0bf 100644
--- a/Master/texmf-dist/doc/latex/apa6/samples/shortsample.tex
+++ b/Master/texmf-dist/doc/latex/apa6/samples/shortsample.tex
@@ -27,6 +27,7 @@
 %% 
 %% ----------------------------------------------------------------------
 %% 
+
 \documentclass[jou]{apa6}
 
 \usepackage[american]{babel}
@@ -36,9 +37,6 @@
 \DeclareLanguageMapping{american}{american-apa}
 \addbibresource{bibliography.bib}
 
-\usepackage[T1]{fontenc}
-\usepackage{lmodern}
-
 \title{Sample APA-Style Document Using the \textsf{apa6} Package}
 
 \author{Brian D. Beitzel}
@@ -140,6 +138,7 @@ skill in interpreting the results for the masses.
 %% This work is not endorsed by, affiliated with, or probably even known
 %% by, the American Psychological Association.
 %% 
+%% 
 %% This work is "maintained" (as per LPPL maintenance status) by
 %% Brian D. Beitzel.
 %% 
@@ -151,6 +150,8 @@ skill in interpreting the results for the masses.
 %%                                 APAamerican.txt,
 %%                                 APAdutch.txt,
 %%                                 APAenglish.txt,
+%%                                 APAgerman.txt,
+%%                                 APAngerman.txt,
 %%                                 APAgreek.txt,
 %%                                 APAendfloat.cfg,
 %%                                 apa6.ptex,