Merge remote-tracking branch 'origin/master' into features/latexargs

[lyx.git] / lib / layouts / apa.layout

diff --git a/lib/layouts/apa.layout b/lib/layouts/apa.layout
index d81aa51e08b6aaff02a6a67b68a4ec6ae6fccfbb..76c24f53784374abec7dcb476884c04e7f6fa334 100644 (file)
--- a/lib/layouts/apa.layout
+++ b/lib/layouts/apa.layout
@@ -1,8 +1,9 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass[apa,apacite.sty]{article (APA)}
+#  \DeclareLaTeXClass[apa,apacite.sty,endfloat.sty,endnotes.sty,flushend.sty,txfonts.sty]{American Psychological Association (APA)}
+#  \DeclareCategory{Articles}
 # Author: Randy Gobbel <gobbel@andrew.cmu.edu>
 
-Format 22
+Format 40
 Columns                 1
 Sides                   1
 PageStyle               Headers
@@ -189,13 +190,6 @@ Style FourAffiliations
 End
 
 
-Style Journal
-       LatexName             journal
-       LatexType             Command
-       InTitle               1
-End
-
-
 Style Copyright
        LatexName             ccoppy
        LatexType             Command
@@ -203,22 +197,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
@@ -266,7 +244,11 @@ Style CenteredCaption
        Align                 Center
        LabelType             Sensitive
        LabelString           "Senseless!"
-       OptionalArgs          1
+       Argument 1
+               LabelString   "Short Title"
+               Shortcut      S
+               Tooltip       "The Caption as it appears in the List of Figures/Tables"
+       EndArgument
        LabelFont
          Series              Bold
        EndFont
@@ -295,8 +277,10 @@ Input stdfloats.inc
 Input stdcounters.inc
 
 NoStyle Part
+NoCounter part
 NoStyle Part*
 NoStyle Chapter
+NoCounter chapter
 NoStyle Chapter*
 NoStyle Section*
 NoStyle Subsection*
@@ -371,7 +355,6 @@ Style Itemize
        Align                 Block
        AlignPossible         Block, Left
        LabelType             Itemize
-       LabelString           "*"
 End
 
 
@@ -390,6 +373,7 @@ Style Enumerate
        Align                 Block
        AlignPossible         Block, Left
        LabelType             Enumerate
+       RefPrefix             enu
 End
 
 
@@ -411,5 +395,6 @@ Style Seriate
        LabelCounter          enumii
        LabelString           "(\alph{enumii})"
        LabelStringAppendix   "(\alph{enumii})"
+       RefPrefix             ser
 End