X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Fapa.layout;h=20484a4ccd0d7540ba4a0461ad463b04e94b7852;hb=6c2a8df504b098d9af466552887073d3a19ae3b2;hp=05c2625a8e98df5c66d4012983a6112525487d15;hpb=3ccd0abf7e7857bb77cbf4d82326b9316514d3b2;p=lyx.git

diff --git a/lib/layouts/apa.layout b/lib/layouts/apa.layout
index 05c2625a8e..20484a4ccd 100644
--- 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,endfloat.sty,endnotes.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 34
+Format 63
 Columns                 1
 Sides                   1
 PageStyle               Headers
@@ -22,6 +23,7 @@ EndPreamble
 
 
 Style Standard
+	Category              MainText
 	LatexName             dummy
 	LatexType             Paragraph
 	Margin                Static
@@ -37,6 +39,7 @@ End
 
 
 Style Title
+	Category              FrontMatter
 	LatexName             title
 	LatexType             Command
 	InTitle               1
@@ -68,6 +71,7 @@ End
 
 
 Style Abstract
+	Category              FrontMatter
 	LatexName             abstract
 	LatexType             Command
 	InTitle               1
@@ -90,6 +94,7 @@ End
 
 
 Style ShortTitle
+	Category              FrontMatter
 	LatexName             shorttitle
 	LatexType             Command
 	InTitle               1
@@ -112,6 +117,7 @@ End
 
 
 Style Author
+	Category              FrontMatter
 	LatexName             author
 	LatexType             Command
 	InTitle               1
@@ -127,6 +133,7 @@ End
 
 
 Style TwoAuthors
+	Category              FrontMatter
 	LatexName             twoauthors
 	LatexType             Command
 	InTitle               1
@@ -134,6 +141,7 @@ End
 
 
 Style ThreeAuthors
+	Category              FrontMatter
 	LatexName             threeauthors
 	LatexType             Command
 	InTitle               1
@@ -141,6 +149,7 @@ End
 
 
 Style FourAuthors
+	Category              FrontMatter
 	LatexName             fourauthors
 	LatexType             Command
 	InTitle               1
@@ -148,6 +157,7 @@ End
 
 
 Style Affiliation
+	Category              FrontMatter
 	LatexName             affiliation
 	LatexType             Command
 	InTitle               1
@@ -169,6 +179,7 @@ End
 
 
 Style TwoAffiliations
+	Category              FrontMatter
 	LatexName             twoaffiliations
 	LatexType             Command
 	InTitle               1
@@ -176,6 +187,7 @@ End
 
 
 Style ThreeAffiliations
+	Category              FrontMatter
 	LatexName             threeaffiliations
 	LatexType             Command
 	InTitle               1
@@ -183,19 +195,13 @@ End
 
 
 Style FourAffiliations
+	Category              FrontMatter
 	LatexName             fouraffiliations
 	LatexType             Command
 	InTitle               1
 End
 
 
-Style Journal
-	LatexName             journal
-	LatexType             Command
-	InTitle               1
-End
-
-
 Style Copyright
 	LatexName             ccoppy
 	LatexType             Command
@@ -203,23 +209,8 @@ 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
+	Category              BackMatter
 	LatexName             acknowledgements
 	LatexType             Command
 	Font
@@ -255,23 +246,27 @@ End
 
 Input stdlayouts.inc
 
-Style CenteredCaption
-	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
+
+InsetLayout Caption:Centered
+	LabelString          standard
+	LaTeXType            command
+	LatexName            centeredcaption
+	NeedProtect          1
+	MultiPar             false
+	Argument 1
+		LabelString   "Short Title|S"
+		Tooltip       "The caption as it appears in the list of figures/tables"
+		InsertCotext  1
+	EndArgument
+	HTMLStyle
+		div.float-caption {
+			text-align: center;
+			border: 2px solid black;
+			padding: 1ex;
+			margin: 1ex;
+		}
+	EndHTMLStyle
+	HTMLAttr "class='float-caption float-caption-centered'"
 End
 
 
@@ -360,10 +355,12 @@ End
 
 
 Style Itemize
+	Category              List
 	Margin                Static
 	LatexType             Item_Environment
 	LatexName             APAitemize
 	NextNoIndent          1
+	ToggleIndent          Never
 	LeftMargin            MMN
 	LabelSep              xx
 	ItemSep               0.2
@@ -373,15 +370,20 @@ Style Itemize
 	Align                 Block
 	AlignPossible         Block, Left
 	LabelType             Itemize
-	LabelString           "*"
+	Argument item:1
+		LabelString   "Custom Item|s"
+		Tooltip       "A customized item string"
+	EndArgument
 End
 
 
 Style Enumerate
+	Category              List
 	Margin                Static
 	LatexType             Item_Environment
 	LatexName             APAenumerate
 	NextNoIndent          1
+	ToggleIndent          Never
 	LeftMargin            MMN
 	LabelSep              xx
 	ParSkip               0.0
@@ -393,10 +395,15 @@ Style Enumerate
 	AlignPossible         Block, Left
 	LabelType             Enumerate
 	RefPrefix             enu
+	Argument item:1
+		LabelString   "Custom Item|s"
+		Tooltip       "A customized item string"
+	EndArgument
 End
 
 
 Style Seriate
+	Category              List
 	Margin                Static
 	LatexType             Item_Environment
 	LatexName             seriate
@@ -410,7 +417,7 @@ Style Seriate
 	ParSep                0.0
 	Align                 Block
 	AlignPossible         Block, Left
-	LabelType             Counter
+	LabelType             Static
 	LabelCounter          enumii
 	LabelString           "(\alph{enumii})"
 	LabelStringAppendix   "(\alph{enumii})"