X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Fapa.layout;h=a3443ae34c7376e363b4def14318102d3f9aa6f1;hb=b4f97b61cf0b257e31bcf512668ad458523d7f5a;hp=f4902741d83682af94781fe5e4c2c077dea932ba;hpb=4c0fafb715871bcc26207b64fe4e725fcaedd7c5;p=lyx.git

diff --git a/lib/layouts/apa.layout b/lib/layouts/apa.layout
index f4902741d8..a3443ae34c 100644
--- a/lib/layouts/apa.layout
+++ b/lib/layouts/apa.layout
@@ -1,7 +1,8 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass[apa,apacite.sty]{APA style}
+#  \DeclareLaTeXClass[apa,apacite.sty,endfloat.sty,endnotes.sty,flushend.sty,txfonts.sty]{article (APA)}
 # Author: Randy Gobbel <gobbel@andrew.cmu.edu>
 
+Format 35
 Columns                 1
 Sides                   1
 PageStyle               Headers
@@ -43,6 +44,7 @@ Style Title
 	  Size                Huge
 	EndFont
 	Align                 Center
+	HTMLTitle             true
 End
 
 
@@ -55,14 +57,13 @@ Style RightHeader
 	  Shape               SmallCaps
 	EndFont
 	Labeltype             Static
-	LabelString           "Right header: "
+	LabelString           "Right header:"
 	Labelsep              M
 	LabelFont
 	  Series              Bold
 	  Size                Small
 	EndFont
 	Align                 Right
-	AlignPossible         Right
 End
 
 
@@ -79,7 +80,7 @@ Style Abstract
 	Align                 Block
 	AlignPossible         Block, Left, Right, Center
 	Labeltype             Static
-	LabelString           "Abstract: "
+	LabelString           "Abstract:"
 	Labelsep              M
 	LabelFont
 	  Series              Bold
@@ -96,7 +97,7 @@ Style ShortTitle
 	AlignPossible         Left, Right, Center
 	Margin                Dynamic
 	Labeltype             Static
-	LabelString           "Short title: "
+	LabelString           "Short title:"
 	Labelsep              M
 	Font
 	  Shape               SmallCaps
@@ -158,7 +159,7 @@ Style Affiliation
 	Align                 Left
 	AlignPossible         Block, Left, Right, Center
 	LabelType             Static
-	LabelString           "Affiliation: "
+	LabelString           "Affiliation:"
 	Labelsep              M
 	LabelFont
 	  Series              Bold
@@ -218,9 +219,29 @@ Style Note
 End
 
 
-Style Acknowledgments
-	LatexName             acknowledgments
+Style Acknowledgements
+	LatexName             acknowledgements
 	LatexType             Command
+	Font
+	  Size                Small
+	EndFont
+	Margin                Dynamic
+	LeftMargin            MMN
+	RightMargin           MMN
+	Align                 Block
+	AlignPossible         Block, Left, Right, Center
+	Labeltype             Static
+	LabelString           "Acknowledgements:"
+	Labelsep              M
+	LabelFont
+	  Series              Bold
+	  Size                Small
+	EndFont
+End
+
+
+Style Acknowledgments
+	ObsoletedBy           Acknowledgements
 End
 
 
@@ -235,10 +256,22 @@ End
 Input stdlayouts.inc
 
 Style CenteredCaption
-	CopyStyle             Caption
+	Margin                First_Dynamic
+	LatexType             Command
+	LatexName             caption
+	NeedProtect           1
+	LabelSep              xx
+	ParSkip               0.4
+	TopSep                0.5
+	Align                 Center
+	LabelType             Sensitive
+	LabelString           "Senseless!"
+	OptionalArgs          1
+	LabelFont
+	  Series              Bold
+	EndFont
 	LatexName             centeredcaption
 	Align                 Center
-	AlignPossible         Center
 End
 
 
@@ -256,18 +289,74 @@ End
 
 Input stdsections.inc
 Input stdstarsections.inc
+Input stdinsets.inc
 
 Input stdfloats.inc
 Input stdcounters.inc
 
 NoStyle Part
-NoStyle Section
-NoStyle Subsection
-NoStyle Subsubsection
+NoCounter part
+NoStyle Part*
 NoStyle Chapter
-NoStyle Paragraph
-NoStyle Subparagraph
+NoCounter chapter
 NoStyle Chapter*
+NoStyle Section*
+NoStyle Subsection*
+NoStyle Subsubsection*
+NoStyle Paragraph*
+NoStyle Subparagraph*
+
+
+Style Section
+	LabelType             No_Label
+	Align                 Center
+	Font
+	  Series              Bold
+	  Size                Huge
+	EndFont
+		TocLevel 1
+End
+
+
+Style Subsection
+	LabelType             No_Label
+	Font
+	  Series              Bold
+	  Size                Larger
+	EndFont
+		TocLevel 2
+End
+
+
+Style Subsubsection
+	LabelType             No_Label
+	Font
+	  Series              Bold
+	  Size                Large
+	EndFont
+		TocLevel 3
+End
+
+
+Style Paragraph
+	LabelType             No_Label
+	Font
+	  Series              Bold
+	  Size                Normal
+	EndFont
+		TocLevel 4
+End
+
+
+Style Subparagraph
+	LabelType             No_Label
+	Font
+	  Series              Bold
+	  Size                Normal
+	  Shape               Italic
+	EndFont
+		TocLevel 5
+End
 
 
 Style Itemize
@@ -283,8 +372,8 @@ Style Itemize
 	ParSep                0.3
 	Align                 Block
 	AlignPossible         Block, Left
-	LabelType             Static
-	LabelString           *
+	LabelType             Itemize
+	LabelString           "*"
 End
 
 
@@ -303,6 +392,7 @@ Style Enumerate
 	Align                 Block
 	AlignPossible         Block, Left
 	LabelType             Enumerate
+	RefPrefix             enu
 End
 
 
@@ -320,6 +410,10 @@ Style Seriate
 	ParSep                0.0
 	Align                 Block
 	AlignPossible         Block, Left
-	LabelType             Counter_EnumII
+	LabelType             Counter
+	LabelCounter          enumii
+	LabelString           "(\alph{enumii})"
+	LabelStringAppendix   "(\alph{enumii})"
+	RefPrefix             ser
 End