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

diff --git a/lib/layouts/scrclass.inc b/lib/layouts/scrclass.inc
index 902340283d..5a36872870 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 53
+Format 60
 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
@@ -117,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
 
@@ -127,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
 
@@ -137,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
 
@@ -269,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 {
@@ -289,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 {