Move the CSS for the TOC to its own InsetLayout.

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

diff --git a/lib/layouts/apa6.layout b/lib/layouts/apa6.layout
index f5e2a06174972b6ed60a7f89527577a697c39043..b42981a89cc5f023a88d53bcb19e14c547389010 100644 (file)
--- a/lib/layouts/apa6.layout
+++ b/lib/layouts/apa6.layout
@@ -1,8 +1,9 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass[apa6,apacite.sty,endfloat.sty,endnotes.sty,flushend.sty,txfonts.sty]{article (APA6)}
+#  \DeclareLaTeXClass[apa6,apacite.sty,endfloat.sty,endnotes.sty,flushend.sty,txfonts.sty]{American Psychological Association (APA), v. 6}
+#  \DeclareCategory{Articles}
 # Author: Jacob Bishop <bishop.jacob@gmail.com> based on the apa 
 # layout written by Randy Gobbel.
-Format 35
+Format 45
 Columns                 1
 Sides                   1
 PageStyle               Headers
@@ -19,6 +20,7 @@ EndPreamble
 
 
 Style Standard
+       Category              MainText
        LatexName             dummy
        LatexType             Paragraph
        Margin                Static
@@ -34,7 +36,7 @@ End
 
 
 Style Title
-    Category              FrontMatter
+       Category              FrontMatter
        LatexName             title
        LatexType             Command
        InTitle               1
@@ -47,7 +49,7 @@ End
 
 
 Style ShortTitle
-    Category              FrontMatter
+       Category              FrontMatter
        LatexName             shorttitle
        LatexType             Command
        InTitle               1
@@ -70,7 +72,7 @@ End
 
 
 Style Author
-    Category              FrontMatter
+       Category              FrontMatter
        LatexName             author
        LatexType             Command
        InTitle               1
@@ -86,7 +88,7 @@ End
 
 
 Style TwoAuthors
-    Category              FrontMatter
+       Category              FrontMatter
        LatexName             twoauthors
        LatexType             Command
        InTitle               1
@@ -94,7 +96,7 @@ End
 
 
 Style ThreeAuthors
-    Category              FrontMatter
+       Category              FrontMatter
        LatexName             threeauthors
        LatexType             Command
        InTitle               1
@@ -102,28 +104,28 @@ End
 
 
 Style FourAuthors
-    Category              FrontMatter
+       Category              FrontMatter
        LatexName             fourauthors
        LatexType             Command
        InTitle               1
 End
 
 Style FiveAuthors
-    Category              FrontMatter
+       Category              FrontMatter
        LatexName             fiveauthors
        LatexType             Command
        InTitle               1
 End
 
 Style SixAuthors
-    Category              FrontMatter
+       Category              FrontMatter
        LatexName             sixauthors
        LatexType             Command
        InTitle               1
 End
 
 Style LeftHeader
-    Category              FrontMatter
+       Category              FrontMatter
        LatexName             leftheader
        LatexType             Command
        InTitle               1
@@ -145,7 +147,7 @@ End
 
 
 Style Affiliation
-    Category              FrontMatter
+       Category              FrontMatter
        LatexName             affiliation
        LatexType             Command
        InTitle               1
@@ -166,35 +168,35 @@ Style Affiliation
 End
 
 Style TwoAffiliations
-    Category              FrontMatter
+       Category              FrontMatter
        LatexName             twoaffiliations
        LatexType             Command
        InTitle               1
 End
 
 Style ThreeAffiliations
-    Category              FrontMatter
+       Category              FrontMatter
        LatexName             threeaffiliations
        LatexType             Command
        InTitle               1
 End
 
 Style FourAffiliations
-    Category              FrontMatter
+       Category              FrontMatter
        LatexName             fouraffiliations
        LatexType             Command
        InTitle               1
 End
 
 Style FiveAffiliations
-    Category              FrontMatter
+       Category              FrontMatter
        LatexName             fiveaffiliations
        LatexType             Command
        InTitle               1
 End
 
 Style SixAffiliations
-    Category              FrontMatter
+       Category              FrontMatter
        LatexName             sixaffiliations
        LatexType             Command
        InTitle               1
@@ -202,7 +204,7 @@ End
 
 
 Style Note
-    Category              FrontMatter
+       Category              FrontMatter
        LatexName             note
        LatexType             Command
        InTitle               1
@@ -224,7 +226,7 @@ End
 
 
 Style Abstract
-    Category              FrontMatter
+       Category              FrontMatter
        LatexName             abstract
        LatexType             Command
        InTitle               1
@@ -246,7 +248,7 @@ Style Abstract
 End
 
 Style Keywords
-    Category              FrontMatter
+       Category              FrontMatter
        LatexName             keywords
        LatexType             Command
        InTitle               1
@@ -270,7 +272,7 @@ Style Keywords
 End
 
 Style AuthorNote
-    Category              FrontMatter
+       Category              FrontMatter
        LatexName             authornote
        LatexType             Command
        InTitle               1
@@ -303,35 +305,35 @@ End
 
 
 Style Journal
-    Category              Preamble
+       Category              Preamble
        LatexName             journal
        LatexType             Command
-    InPreamble            1
+       InPreamble            1
 End
 
 
 Style Copyright
-    Category              Preamble
+       Category              Preamble
        LatexName             ccoppy
        LatexType             Command
-    InPreamble            1
+       InPreamble            1
        Align                 Right
 End
 
 
 Style CopNum
-    Category              Preamble
+       Category              Preamble
        LatexName             copnum
        LatexType             Command
-    InPreamble            1
+       InPreamble            1
        Align                 Right
 End
 
 Style Volume
-    Category              Preamble
+       Category              Preamble
        LatexName             volume
        LatexType             Command
-    InPreamble            1
+       InPreamble            1
 End
 
 Style ThickLine
@@ -344,23 +346,24 @@ 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
+       Argument 1
+               LabelString   "Short Title|S"
+               Tooltip       "The caption as it appears in the list of figures/tables"
+       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
 
 
@@ -403,7 +406,7 @@ Style Section
          Series              Bold
          Size                Huge
        EndFont
-               TocLevel 1
+       TocLevel              1
 End
 
 
@@ -413,7 +416,7 @@ Style Subsection
          Series              Bold
          Size                Larger
        EndFont
-               TocLevel 2
+       TocLevel              2
 End
 
 
@@ -423,7 +426,7 @@ Style Subsubsection
          Series              Bold
          Size                Large
        EndFont
-               TocLevel 3
+       TocLevel              3
 End
 
 
@@ -433,7 +436,7 @@ Style Paragraph
          Series              Bold
          Size                Normal
        EndFont
-               TocLevel 4
+       TocLevel              4
 End
 
 
@@ -444,12 +447,12 @@ Style Subparagraph
          Size                Normal
          Shape               Italic
        EndFont
-               TocLevel 5
+       TocLevel              5
 End
 
 
 Style Itemize
-    Category              List
+       Category              List
        Margin                Static
        LatexType             Item_Environment
        LatexName             APAitemize
@@ -464,11 +467,15 @@ Style Itemize
        AlignPossible         Block, Left
        LabelType             Itemize
        LabelString           "*"
+       Argument item:1
+               LabelString   "Custom Item|s"
+               Tooltip       "A customized item string"
+       EndArgument
 End
 
 
 Style Enumerate
-    Category              List
+       Category              List
        Margin                Static
        LatexType             Item_Environment
        LatexName             APAenumerate
@@ -484,11 +491,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
+       Category              List
        Margin                Static
        LatexType             Item_Environment
        LatexName             seriate
@@ -502,10 +513,9 @@ Style Seriate
        ParSep                0.0
        Align                 Block
        AlignPossible         Block, Left
-       LabelType             Counter
+       LabelType             Static
        LabelCounter          enumii
        LabelString           "(\alph{enumii})"
        LabelStringAppendix   "(\alph{enumii})"
        RefPrefix             ser
 End
-