X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Fscrclass.inc;h=312e9ccabac9e5c813504a544bbc5993a1d86ff5;hb=47886ebbb1c72a103b3ed68ae8b7313b96a149bf;hp=76eb79c7b1fa49d4d3144c1b9f3589f362b3bc61;hpb=3e5513948219b0d51b511b8d6f54e4a72a01b954;p=lyx.git

diff --git a/lib/layouts/scrclass.inc b/lib/layouts/scrclass.inc
index 76eb79c7b1..312e9ccaba 100644
--- a/lib/layouts/scrclass.inc
+++ b/lib/layouts/scrclass.inc
@@ -8,7 +8,7 @@
 # Labeling is now used also in non-KOMA classes
 
 
-Format 44
+Format 54
 SecNumDepth             2
 TocDepth                2
 DefaultStyle            Standard
@@ -34,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
@@ -54,7 +62,6 @@ Style Part
 	Font
 	  Family              Sans
 	EndFont
-	TocLevel 0
 End
 
 
@@ -62,52 +69,52 @@ 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
@@ -118,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
 
@@ -128,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
 
@@ -138,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
 
@@ -270,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 {
@@ -290,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 {