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

diff --git a/lib/layouts/apa.layout b/lib/layouts/apa.layout
index 5785fb909535ff8fd33adf34f2462245542c52ee..852956567cfd43accd8d48135b7b12ea3a44bc93 100644 (file)
--- 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 3c5954cfc525fb656ffbb2baf116bc43cf592425..bad5986fc7b4dbcd7c0e30df2cd95865d3960d15 100644 (file)
--- 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 6b8df8b6f2f7ed9d9bb0419c83ebdaa19329b8d5..248312c2ee29417d7927e2cfc9c2b8505206e649 100644 (file)
--- 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