X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Fscrclass.inc;h=5a3687287045c1846b2fa32c7b5e21efe76dfd3b;hb=625e7609f0bb4087f0cd91ae3853beee6c6ba402;hp=0063748834fe9cb0e558e337fe78f321b361d898;hpb=c246076ed57e0ee80320477349d25330e9d24e64;p=lyx.git

diff --git a/lib/layouts/scrclass.inc b/lib/layouts/scrclass.inc
index 0063748834..5a36872870 100644
--- a/lib/layouts/scrclass.inc
+++ b/lib/layouts/scrclass.inc
@@ -8,13 +8,14 @@
 # Labeling is now used also in non-KOMA classes
 
 
-Format 42
+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
 
@@ -265,9 +280,12 @@ 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
 	HTMLStyle
 		div.float-caption {
@@ -277,6 +295,7 @@ InsetLayout Caption:Above
 			margin: 1ex;
 		}
 	EndHTMLStyle
+	HTMLAttr "class='float-caption float-caption-above'"
 End
 
 
@@ -284,9 +303,12 @@ 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
 	HTMLStyle
 		div.float-caption {
@@ -296,6 +318,7 @@ InsetLayout Caption:Below
 			margin: 1ex;
 		}
 	EndHTMLStyle
+	HTMLAttr "class='float-caption float-caption-below'"
 End