X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Fscrlttr2.layout;h=0e1183f5fecc3128e5a50c28f411d1823546c11b;hb=a3036539b27ddde4af7bb706dbad061e13ae046e;hp=87b13bae06fc8aec840b98308ca299b22832fa36;hpb=9f2c2656401f000cfe45faf995b5cdc65ccea449;p=lyx.git

diff --git a/lib/layouts/scrlttr2.layout b/lib/layouts/scrlttr2.layout
index 87b13bae06..0e1183f5fe 100644
--- a/lib/layouts/scrlttr2.layout
+++ b/lib/layouts/scrlttr2.layout
@@ -1,10 +1,15 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass[scrlttr2]{letter (koma-script v.2)}
+#  \DeclareLaTeXClass{KOMA-Script Letter (V. 2)}
+#  \DeclareCategory{Letters}
 # KOMA scrlettr2 textclass definition file.
-# Juergen Spitzmueller <j.spitzmueller@gmx.de>, 2003/2/17.
+# Juergen Spitzmueller <spitz@lyx.org>, 2003/2/17.
+# Uwe Stöhr <uwestoehr@web.de>, 2008/2/03.
+
+Format 43
+Provides subscript 1
 
-Format 2
 Style Standard
+	Category              MainText
 	LatexName             dummy
 	ParSep                0.4
 	AlignPossible         Block, Left, Right, Center
@@ -13,7 +18,7 @@ End
 Input stdlists.inc
 Input stdlayouts.inc
 Input stdcounters.inc
-
+Input stdinsets.inc
 
 Style Description
 	LabelFont
@@ -30,20 +35,23 @@ Style Labeling
 	EndPreamble
 End
 
+
 Style List
 	Obsoletedby           Labeling
 End
 
-NoStyle Caption
+
+Preamble
+	\newif\ifletterclosed
+EndPreamble
 
 
 Style Address
 	LatexType             Command
 	LatexName             begin
 	LatexParam            {letter}
-	#Ugly hack!
 	Preamble
-	\AtEndDocument{\end{letter}}
+		\AtEndDocument{\ifletterclosed\else\end{letter}\fi}
 	EndPreamble
 	KeepEmpty             1
 	LeftMargin            xxxxxxxxxxxx::xx
@@ -52,10 +60,8 @@ Style Address
 	BottomSep             1.5
 	ParSep                1.5
 	Align                 Left
-	AlignPossible         Left
 	LabelType             Static
 	LabelString           "Address:"
-
 	LabelFont
 	  Series              Bold
 	  Shape               Italic
@@ -76,10 +82,8 @@ Style NextAddress
 	BottomSep             1.5
 	ParSep                1.5
 	Align                 Left
-	AlignPossible         Left
 	LabelType             Static
 	LabelString           "Next Address:"
-
 	LabelFont
 	  Series              Bold
 	  Shape               Italic
@@ -90,6 +94,7 @@ End
 
 
 Style Opening
+	Category              Letter
 	LatexType             Command
 	LatexName             opening
 	KeepEmpty             0
@@ -99,10 +104,8 @@ Style Opening
 	BottomSep             0.4
 	ParSep                0.4
 	Align                 Left
-	AlignPossible         Left
 	LabelType             Static
 	LabelString           "Opening:"
-
 	LabelFont
 	  Series              Bold
 	  Shape               Italic
@@ -143,17 +146,17 @@ End
 
 
 Style Name
+	Category              Letter
 	LatexType             Command
 	LatexName             setkomavar
 	LatexParam            {fromname}
 	KeepEmpty             1
-	LeftMargin            xxxxxxxxxxxx::xx
+	LeftMargin            xxxxxxxxxxxxxxxxx::xx
 	LabelSep              xx
 	TopSep                0.4
 	BottomSep             0.4
 	ParSep                0.4
 	Align                 Left
-	AlignPossible         Left
 	LabelType             Static
 	LabelString           "Sender Name:"
 
@@ -274,6 +277,7 @@ Style Title
 	LatexName             setkomavar
 	LatexParam            {title}
 	LabelString           "Title:"
+	HTMLTitle             true
 End
 
 
@@ -331,3 +335,24 @@ Style Invoice
 	LatexParam            {invoice}
 	LabelString           "Invoice no.:"
 End
+
+
+Style EndLetter
+	Margin                Dynamic
+	LatexType             Command
+	LatexName             end{letter}
+	Preamble
+		\letterclosedtrue
+	EndPreamble
+	KeepEmpty             1
+	TopSep                1
+	ParSkip               0.4
+	Align                 Block
+	LabelSep              xx
+	LabelType             Static
+	LabelString           "End of letter"
+	LabelFont
+	  Series              Bold
+	  Color               Green
+	EndFont
+End