X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Fscrclass.inc;h=289297fcafba75aa2b34778df54f454587900044;hb=7cb50d70086faafb22a7dd8ca779278a0f9310e9;hp=6ac8c9089051c9479ce30c032f7fc33d1fa8e6a2;hpb=3e20a73288496a05a062057360ffa8fc7b8b9e17;p=lyx.git

diff --git a/lib/layouts/scrclass.inc b/lib/layouts/scrclass.inc
index 6ac8c90890..289297fcaf 100644
--- a/lib/layouts/scrclass.inc
+++ b/lib/layouts/scrclass.inc
@@ -4,16 +4,24 @@
 # Update for Koma Script Release >=2.8q
 # Juergen Spitzmueller <spitz@lyx.org>, 2003/2/08.
 # Mapped List to Labeling
-# Guenter Milde <milde users.berlios.de>, 2009-02-02
+# Guenter Milde <milde@lyx.org>, 2009-02-02
 # Labeling is now used also in non-KOMA classes
 
 
-Format 44
+Format 81
 SecNumDepth             2
 TocDepth                2
 DefaultStyle            Standard
+PageSize                a4
 Provides                subscript 1
 
+ClassOptions
+	FontSize             9|10|11|12|13|14|15|16|17|18|19|20
+	FontSizeFormat       fontsize=$$s
+	PageSize             a0|a1|a2|a3|a4|a5|a6|b0|b1|b2|b3|b4|b5|b6|c0|c1|c2|c3|c4|c5|c6|executive|legal|letter
+	PageSizeFormat       paper=$$s
+End
+
 Style Standard
 	Category              MainText
 	LatexName             dummy
@@ -34,6 +42,15 @@ Input stdlists.inc
 Input stdcounters.inc
 Input stdfloats.inc
 
+
+# Adapt enumii counter display to KOMA default
+Counter enumii
+	GuiName "Numbered List (Level 2)"
+	Within               enumi
+	LabelString          "\alph{enumii})"
+End
+
+
 Style Description
 	LabelFont
 	  Family              Sans
@@ -54,7 +71,6 @@ Style Part
 	Font
 	  Family              Sans
 	EndFont
-	TocLevel 0
 End
 
 
@@ -67,7 +83,6 @@ Style Chapter
 	  Family              Sans
 	  Size                Largest
 	EndFont
-	TocLevel 0
 End
 
 
@@ -76,7 +91,6 @@ Style Section
 	Font
 	  Family              Sans
 	EndFont
-	TocLevel 1
 End
 
 
@@ -85,7 +99,6 @@ Style Subsection
 	Font
 	  Family              Sans
 	EndFont
-	TocLevel 2
 End
 
 
@@ -94,7 +107,6 @@ Style Subsubsection
 	Font
 	  Family              Sans
 	EndFont
-	TocLevel 3
 End
 
 
@@ -103,7 +115,6 @@ Style Paragraph
 	Font
 	  Family              Sans
 	EndFont
-	TocLevel 4
 End
 
 
@@ -113,7 +124,6 @@ Style Subparagraph
 	Font
 	  Family              Sans
 	EndFont
-	TocLevel 5
 End
 
 Input stdstarsections.inc
@@ -124,6 +134,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
 
@@ -134,6 +145,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
 
@@ -144,6 +156,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
 
@@ -257,9 +270,7 @@ End
 Input stdstruct.inc
 
 Style Abstract
-	LabelFont
-	  Family              Sans
-	EndFont
+	LabelType             No_Label
 End
 
 
@@ -276,9 +287,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 {
@@ -296,9 +310,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 {