From d8e0ea362bb8dee87ba71324fe57f2b41d30c317 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Uwe=20St=C3=B6hr?= <uwestoehr@lyx.org>
Date: Tue, 3 Jul 2012 20:43:49 +0200
Subject: [PATCH] branch: fix for APA layout

- apa.layout: the commands \volume, \copnum and \notes are only allowed in the preamble; fixes bug #8187

- APA.lyx: the template missed the \note command
---
 lib/layouts/apa.layout | 23 -----------------------
 lib/templates/apa.lyx  |  2 ++
 status.20x             |  3 +++
 3 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/lib/layouts/apa.layout b/lib/layouts/apa.layout
index 5785fb9095..852956567c 100644
--- a/lib/layouts/apa.layout
+++ b/lib/layouts/apa.layout
@@ -189,13 +189,6 @@ Style FourAffiliations
 End
 
 
-Style Journal
-	LatexName             journal
-	LatexType             Command
-	InTitle               1
-End
-
-
 Style Copyright
 	LatexName             ccoppy
 	LatexType             Command
@@ -203,22 +196,6 @@ Style Copyright
 End
 
 
-Style CopNum
-	LatexName             copnum
-	LatexType             Command
-	InTitle               1
-End
-
-
-Style Note
-	LatexName             note
-	LatexType             Command
-	Font
-	  Size                Small
-	EndFont
-End
-
-
 Style Acknowledgements
 	LatexName             acknowledgements
 	LatexType             Command
diff --git a/lib/templates/apa.lyx b/lib/templates/apa.lyx
index 3c5954cfc5..bad5986fc7 100644
--- a/lib/templates/apa.lyx
+++ b/lib/templates/apa.lyx
@@ -22,6 +22,8 @@
 
 %% The usual ...
 \acknowledgements{Author notes, acknowledgements, contact information go here \ldots}
+
+\note{This is a note}
 \end_preamble
 \options jou
 \use_default_options false
diff --git a/status.20x b/status.20x
index 6b8df8b6f2..248312c2ee 100644
--- a/status.20x
+++ b/status.20x
@@ -72,6 +72,9 @@ What's new
 - Fix bug that Elsevier docments became uncompilable when using refstlye for
   cross-references.
 
+- Fixed the layout file for scientific articles published by the American
+  Psychological Association (APA) (bug 8187). 
+
 
 * USER INTERFACE
 
-- 
2.39.5