Cleanup bv-dependent variables in InsetCollapsable

[lyx.git] / lib / layouts / scrclass.inc

diff --git a/lib/layouts/scrclass.inc b/lib/layouts/scrclass.inc
index 3aa001ebd4f76ae719d111bfcfa84473bf0000f4..5a3687287045c1846b2fa32c7b5e21efe76dfd3b 100644 (file)
--- a/lib/layouts/scrclass.inc
+++ b/lib/layouts/scrclass.inc
@@ -8,13 +8,14 @@
 # Labeling is now used also in non-KOMA classes
 
 
-Format 41
+Format 60
 SecNumDepth             2
 TocDepth                2
 DefaultStyle            Standard
 Provides                subscript 1
 
 Style Standard
+       Category              MainText
        LatexName             dummy
        ParIndent             MM
        ParSkip               0.4
@@ -33,6 +34,14 @@ Input stdlists.inc
 Input stdcounters.inc
 Input stdfloats.inc
 
+
+# Adapt enumii counter display to KOMA default
+Counter enumii
+       Within               enumi
+       LabelString          "\alph{enumii})"
+End
+
+
 Style Description
        LabelFont
          Family              Sans
@@ -40,6 +49,7 @@ Style Description
 End
 
 Style Labeling
+       Category              List
        LatexName             labeling
        # overwrite the preamble code definition
        Preamble
@@ -52,57 +62,59 @@ Style Part
        Font
          Family              Sans
        EndFont
-       TocLevel 0
 End
 
 
 Style Chapter
+       LabelType             Static
+       LabelSep              xxx
+       Margin                Dynamic
+       Align                 Left
        Font
          Family              Sans
          Size                Largest
        EndFont
-       TocLevel 0
 End
 
 
 Style Section
+       Align                 Left
        Font
          Family              Sans
        EndFont
-       TocLevel 1
 End
 
 
 Style Subsection
+       Align                 Left
        Font
          Family              Sans
        EndFont
-       TocLevel 2
 End
 
 
 Style Subsubsection
+       Align                 Left
        Font
          Family              Sans
        EndFont
-       TocLevel 3
 End
 
 
 Style Paragraph
+       Align                 Left
        Font
          Family              Sans
        EndFont
-       TocLevel 4
 End
 
 
 Style Subparagraph
+       Align                 Left
        LeftMargin            ""
        Font
          Family              Sans
        EndFont
-       TocLevel 5
 End
 
 Input stdstarsections.inc
@@ -113,6 +125,7 @@ Style Addpart
        Argument 1
                LabelString   "Short Title|S"
                Tooltip       "The part as it appears in the table of contents/running headers"
+               InsertCotext  1
        EndArgument
 End
 
@@ -123,6 +136,7 @@ Style Addchap
        Argument 1
                LabelString   "Short Title|S"
                Tooltip       "The chapter as it appears in the table of contents/running headers"
+               InsertCotext  1
        EndArgument
 End
 
@@ -133,6 +147,7 @@ Style Addsec
        Argument 1
                LabelString   "Short Title|S"
                Tooltip       "The section as it appears in the table of contents/running headers"
+               InsertCotext  1
        EndArgument
 End
 
@@ -150,7 +165,7 @@ End
 
 
 Style Minisec
-       Category              Section
+       Category              Sectioning
        LatexType             Command
        LatexName             minisec
        NeedProtect           1
@@ -260,49 +275,50 @@ End
 
 Input stdlayouts.inc
 
-Style Captionabove
-       Category              Captions
-       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:Above
+       LabelString          above
+       LaTeXType            command
+       LatexName            captionabove
+       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            captionabove
+       HTMLStyle
+               div.float-caption {
+                       text-align: center;
+                       border: 2px solid black;
+                       padding: 1ex;
+                       margin: 1ex;
+               }
+       EndHTMLStyle
+       HTMLAttr "class='float-caption float-caption-above'"
 End
 
 
-Style Captionbelow
-       Category              Captions
-       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:Below
+       LabelString          below
+       LaTeXType            command
+       LatexName            captionbelow
+       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            captionbelow
+       HTMLStyle
+               div.float-caption {
+                       text-align: center;
+                       border: 2px solid black;
+                       padding: 1ex;
+                       margin: 1ex;
+               }
+       EndHTMLStyle
+       HTMLAttr "class='float-caption float-caption-below'"
 End