Fix bug #11410.

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

diff --git a/lib/layouts/apa.layout b/lib/layouts/apa.layout
index f3be8246d34e2d6dd963d67efe54015371bd6fa4..57af913dce4162189b4a7c5bc38842b44b36a6ad 100644 (file)
--- a/lib/layouts/apa.layout
+++ b/lib/layouts/apa.layout
@@ -3,7 +3,7 @@
 #  \DeclareCategory{Articles}
 # Author: Randy Gobbel <gobbel@andrew.cmu.edu>
 
-Format 41
+Format 97
 Columns                 1
 Sides                   1
 PageStyle               Headers
@@ -23,6 +23,7 @@ EndPreamble
 
 
 Style Standard
+       Category              MainText
        LatexName             dummy
        LatexType             Paragraph
        Margin                Static
@@ -34,10 +35,12 @@ Style Standard
        Align                 Block
        AlignPossible         Block, Left, Right, Center
        LabelType             No_Label
+       DocBookTag            para
 End
 
 
 Style Title
+       Category              FrontMatter
        LatexName             title
        LatexType             Command
        InTitle               1
@@ -46,6 +49,9 @@ Style Title
        EndFont
        Align                 Center
        HTMLTitle             true
+       DocBookTag            title
+       DocBookTagType        paragraph
+       DocBookInInfo         maybe
 End
 
 
@@ -65,10 +71,15 @@ Style RightHeader
          Size                Small
        EndFont
        Align                 Right
+       DocBookTag            titleabbrev
+       DocBookAttr           role='right-header'
+       DocBookTagType        paragraph
+       DocBookInInfo         maybe
 End
 
 
 Style Abstract
+       Category              FrontMatter
        LatexName             abstract
        LatexType             Command
        InTitle               1
@@ -87,10 +98,16 @@ Style Abstract
          Series              Bold
          Size                Small
        EndFont
+       DocBookAbstract       true
+       DocBookInInfo         always
+       DocBookWrapperTag     abstract
+       DocBookWrapperMergeWithPrevious    true
+       DocBookTag            para
 End
 
 
 Style ShortTitle
+       Category              FrontMatter
        LatexName             shorttitle
        LatexType             Command
        InTitle               1
@@ -109,10 +126,18 @@ Style ShortTitle
          Size                Small
          Shape               Up
        EndFont
+       DocBookTag            titleabbrev
+       DocBookTagType        paragraph
+       DocBookInInfo         maybe
+       DocBookTag            titleabbrev
+       DocBookAttr           role='short-title'
+       DocBookTagType        paragraph
+       DocBookInInfo         maybe
 End
 
 
 Style Author
+       Category              FrontMatter
        LatexName             author
        LatexType             Command
        InTitle               1
@@ -124,10 +149,16 @@ Style Author
          Shape               Italic
          Size                Small
        EndFont
+       DocBookTag            personname
+       DocBookTagType        paragraph
+       DocBookWrapperTag     author
+       DocBookWrapperTagType inline
+       DocBookInInfo         always
 End
 
 
 Style TwoAuthors
+       Category              FrontMatter
        LatexName             twoauthors
        LatexType             Command
        InTitle               1
@@ -135,6 +166,7 @@ End
 
 
 Style ThreeAuthors
+       Category              FrontMatter
        LatexName             threeauthors
        LatexType             Command
        InTitle               1
@@ -142,6 +174,7 @@ End
 
 
 Style FourAuthors
+       Category              FrontMatter
        LatexName             fourauthors
        LatexType             Command
        InTitle               1
@@ -149,6 +182,7 @@ End
 
 
 Style Affiliation
+       Category              FrontMatter
        LatexName             affiliation
        LatexType             Command
        InTitle               1
@@ -166,10 +200,17 @@ Style Affiliation
          Series              Bold
          Size                Small
        EndFont
+       DocBookTag                        affiliation
+       DocBookWrapperTag                 author
+       DocBookWrapperMergeWithPrevious   true
+       DocBookItemTag                    orgname
+       DocBookItemTagType                paragraph
+       DocBookInInfo                     always
 End
 
 
 Style TwoAffiliations
+       Category              FrontMatter
        LatexName             twoaffiliations
        LatexType             Command
        InTitle               1
@@ -177,6 +218,7 @@ End
 
 
 Style ThreeAffiliations
+       Category              FrontMatter
        LatexName             threeaffiliations
        LatexType             Command
        InTitle               1
@@ -184,6 +226,7 @@ End
 
 
 Style FourAffiliations
+       Category              FrontMatter
        LatexName             fouraffiliations
        LatexType             Command
        InTitle               1
@@ -198,6 +241,7 @@ End
 
 
 Style Acknowledgements
+       Category              BackMatter
        LatexName             acknowledgements
        LatexType             Command
        Font
@@ -215,6 +259,9 @@ Style Acknowledgements
          Series              Bold
          Size                Small
        EndFont
+       DocBookTag            para
+       DocBookWrapperTag     acknowledgements
+       DocBookSection        true
 End
 
 
@@ -233,26 +280,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!"
+
+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
-       LabelFont
-         Series              Bold
-       EndFont
-       LatexName             centeredcaption
-       Align                 Center
+       HTMLStyle
+               div.float-caption {
+                       text-align: center;
+                       border: 2px solid black;
+                       padding: 1ex;
+                       margin: 1ex;
+               }
+       EndHTMLStyle
+       HTMLAttr "class='float-caption float-caption-centered'"
 End
 
 
@@ -295,7 +343,7 @@ Style Section
          Series              Bold
          Size                Huge
        EndFont
-               TocLevel 1
+       TocLevel              1
 End
 
 
@@ -305,7 +353,7 @@ Style Subsection
          Series              Bold
          Size                Larger
        EndFont
-               TocLevel 2
+       TocLevel              2
 End
 
 
@@ -315,7 +363,7 @@ Style Subsubsection
          Series              Bold
          Size                Large
        EndFont
-               TocLevel 3
+       TocLevel              3
 End
 
 
@@ -325,7 +373,7 @@ Style Paragraph
          Series              Bold
          Size                Normal
        EndFont
-               TocLevel 4
+       TocLevel              4
 End
 
 
@@ -336,15 +384,17 @@ Style Subparagraph
          Size                Normal
          Shape               Italic
        EndFont
-               TocLevel 5
+       TocLevel 5
 End
 
 
 Style Itemize
+       Category              List
        Margin                Static
        LatexType             Item_Environment
        LatexName             APAitemize
        NextNoIndent          1
+       ToggleIndent          Never
        LeftMargin            MMN
        LabelSep              xx
        ItemSep               0.2
@@ -354,14 +404,33 @@ Style Itemize
        Align                 Block
        AlignPossible         Block, Left
        LabelType             Itemize
+       Argument item:1
+               LabelString   "Custom Item|s"
+               Tooltip       "A customized item string"
+       EndArgument
+       Argument listpreamble:1
+               LabelString    "List preamble"
+               MenuString     "List Preamble"
+               Tooltip        "LaTeX code to be inserted before the first item"
+               PassThru       1
+               Font
+                       Family typewriter
+                       Color latex
+               EndFont
+       EndArgument
+       DocBookTag            itemizedlist
+       DocBookItemTag        listitem
+       DocBookItemInnerTag   para
 End
 
 
 Style Enumerate
+       Category              List
        Margin                Static
        LatexType             Item_Environment
        LatexName             APAenumerate
        NextNoIndent          1
+       ToggleIndent          Never
        LeftMargin            MMN
        LabelSep              xx
        ParSkip               0.0
@@ -373,10 +442,34 @@ Style Enumerate
        AlignPossible         Block, Left
        LabelType             Enumerate
        RefPrefix             enu
+       Argument item:1
+               LabelString   "Custom Item|s"
+               Tooltip       "A customized item string"
+       EndArgument
+       Argument listpreamble:1
+               LabelString    "List preamble"
+               MenuString     "List Preamble"
+               Tooltip        "LaTeX code to be inserted before the first item"
+               PassThru       1
+               Font
+                       Family typewriter
+                       Color latex
+               EndFont
+       EndArgument
+       DocBookTag            orderedlist
+       DocBookItemTag        listitem
+       DocBookItemInnerTag   para
+       HTMLStyle
+               ol.enumi   { list-style-type: decimal; }
+               ol.enumii  { list-style-type: lower-latin; }
+               ol.enumiii { list-style-type: lower-roman; }
+               ol.enumiv  { list-style-type: upper-latin; }
+       EndHTMLStyle
 End
 
 
 Style Seriate
+       Category              List
        Margin                Static
        LatexType             Item_Environment
        LatexName             seriate
@@ -390,10 +483,20 @@ Style Seriate
        ParSep                0.0
        Align                 Block
        AlignPossible         Block, Left
-       LabelType             Counter
+       LabelType             Static
        LabelCounter          enumii
        LabelString           "(\alph{enumii})"
        LabelStringAppendix   "(\alph{enumii})"
        RefPrefix             ser
+       Argument listpreamble:1
+               LabelString    "List preamble"
+               MenuString     "List Preamble"
+               Tooltip        "LaTeX code to be inserted before the first item"
+               PassThru       1
+               Font
+                       Family typewriter
+                       Color latex
+               EndFont
+       EndArgument
 End