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

diff --git a/lib/layouts/scrclass.inc b/lib/layouts/scrclass.inc
index 85e722ec7e..312e9ccaba 100644
--- a/lib/layouts/scrclass.inc
+++ b/lib/layouts/scrclass.inc
@@ -2,19 +2,20 @@
 # Base definitions for the KOMA script layouts.
 # Bernd Rellermeyer <100.41728@germanynet.de>, 1998/7/23.
 # Update for Koma Script Release >=2.8q
-# Juergen Spitzmueller <j.spitzmueller@gmx.de>, 2003/2/08.
+# Juergen Spitzmueller <spitz@lyx.org>, 2003/2/08.
 # Mapped List to Labeling
 # Guenter Milde <milde users.berlios.de>, 2009-02-02
 # Labeling is now used also in non-KOMA classes
 
 
-Format 40
+Format 54
 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
@@ -111,9 +123,9 @@ Style Addpart
 	CopyStyle             Part*
 	LatexName             addpart
 	Argument 1
-		LabelString   "Short Title"
-		Shortcut      S
+		LabelString   "Short Title|S"
 		Tooltip       "The part as it appears in the table of contents/running headers"
+		InsertCotext  1
 	EndArgument
 End
 
@@ -122,9 +134,9 @@ Style Addchap
 	CopyStyle             Chapter*
 	LatexName             addchap
 	Argument 1
-		LabelString   "Short Title"
-		Shortcut      S
+		LabelString   "Short Title|S"
 		Tooltip       "The chapter as it appears in the table of contents/running headers"
+		InsertCotext  1
 	EndArgument
 End
 
@@ -133,9 +145,9 @@ Style Addsec
 	CopyStyle             Section*
 	LatexName             addsec
 	Argument 1
-		LabelString   "Short Title"
-		Shortcut      S
+		LabelString   "Short Title|S"
 		Tooltip       "The section as it appears in the table of contents/running headers"
+		InsertCotext  1
 	EndArgument
 End
 
@@ -153,7 +165,7 @@ End
 
 
 Style Minisec
-	Category              Section
+	Category              Sectioning
 	LatexType             Command
 	LatexName             minisec
 	NeedProtect           1
@@ -263,51 +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"
-		Shortcut      S
+		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"
-		Shortcut      S
+		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