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

@@ -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

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

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