latexfonts: more minor fixes

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

diff --git a/lib/layouts/apa.layout b/lib/layouts/apa.layout
index 74697c1030516fc9ce6f2c88247505d95cd9b448..e3ceb959d2e0ff10b5e6558614a4058f812f7da9 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 76
 Columns                 1
 Sides                   1
 PageStyle               Headers
@@ -23,6 +23,7 @@ EndPreamble
 
 
 Style Standard
+       Category              MainText
        LatexName             dummy
        LatexType             Paragraph
        Margin                Static
@@ -38,6 +39,7 @@ End
 
 
 Style Title
+       Category              FrontMatter
        LatexName             title
        LatexType             Command
        InTitle               1
@@ -69,6 +71,7 @@ End
 
 
 Style Abstract
+       Category              FrontMatter
        LatexName             abstract
        LatexType             Command
        InTitle               1
@@ -91,6 +94,7 @@ End
 
 
 Style ShortTitle
+       Category              FrontMatter
        LatexName             shorttitle
        LatexType             Command
        InTitle               1
@@ -113,6 +117,7 @@ End
 
 
 Style Author
+       Category              FrontMatter
        LatexName             author
        LatexType             Command
        InTitle               1
@@ -128,6 +133,7 @@ End
 
 
 Style TwoAuthors
+       Category              FrontMatter
        LatexName             twoauthors
        LatexType             Command
        InTitle               1
@@ -135,6 +141,7 @@ End
 
 
 Style ThreeAuthors
+       Category              FrontMatter
        LatexName             threeauthors
        LatexType             Command
        InTitle               1
@@ -142,6 +149,7 @@ End
 
 
 Style FourAuthors
+       Category              FrontMatter
        LatexName             fourauthors
        LatexType             Command
        InTitle               1
@@ -149,6 +157,7 @@ End
 
 
 Style Affiliation
+       Category              FrontMatter
        LatexName             affiliation
        LatexType             Command
        InTitle               1
@@ -170,6 +179,7 @@ End
 
 
 Style TwoAffiliations
+       Category              FrontMatter
        LatexName             twoaffiliations
        LatexType             Command
        InTitle               1
@@ -177,6 +187,7 @@ End
 
 
 Style ThreeAffiliations
+       Category              FrontMatter
        LatexName             threeaffiliations
        LatexType             Command
        InTitle               1
@@ -184,6 +195,7 @@ End
 
 
 Style FourAffiliations
+       Category              FrontMatter
        LatexName             fouraffiliations
        LatexType             Command
        InTitle               1
@@ -198,6 +210,7 @@ End
 
 
 Style Acknowledgements
+       Category              BackMatter
        LatexName             acknowledgements
        LatexType             Command
        Font
@@ -233,26 +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!"
+
+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 +309,7 @@ Style Section
          Series              Bold
          Size                Huge
        EndFont
-               TocLevel 1
+       TocLevel              1
 End
 
 
@@ -305,7 +319,7 @@ Style Subsection
          Series              Bold
          Size                Larger
        EndFont
-               TocLevel 2
+       TocLevel              2
 End
 
 
@@ -315,7 +329,7 @@ Style Subsubsection
          Series              Bold
          Size                Large
        EndFont
-               TocLevel 3
+       TocLevel              3
 End
 
 
@@ -325,7 +339,7 @@ Style Paragraph
          Series              Bold
          Size                Normal
        EndFont
-               TocLevel 4
+       TocLevel              4
 End
 
 
@@ -336,15 +350,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
@@ -358,14 +374,26 @@ Style Itemize
                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
 End
 
 
 Style Enumerate
+       Category              List
        Margin                Static
        LatexType             Item_Environment
        LatexName             APAenumerate
        NextNoIndent          1
+       ToggleIndent          Never
        LeftMargin            MMN
        LabelSep              xx
        ParSkip               0.0
@@ -381,10 +409,21 @@ Style Enumerate
                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
 End
 
 
 Style Seriate
+       Category              List
        Margin                Static
        LatexType             Item_Environment
        LatexName             seriate
@@ -398,10 +437,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