The branch, 2.0.x, has been updated.

- Log -----------------------------------------------------------------

commit d8e0ea362bb8dee87ba71324fe57f2b41d30c317
Author: Uwe Stöhr <uwesto...@lyx.org>
Date:   Tue Jul 3 20:43:49 2012 +0200

    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 5785fb9..8529565 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 3c5954c..bad5986 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 6b8df8b..248312c 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
 

-----------------------------------------------------------------------

Summary of changes:
 lib/layouts/apa.layout |   23 -----------------------
 lib/templates/apa.lyx  |    2 ++
 status.20x             |    3 +++
 3 files changed, 5 insertions(+), 23 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

Reply via email to