X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Fscrlttr2.layout;h=c0e80faba76e08fc5037cf6e3f3756d7596135fe;hb=d748a0a6f16c996ff042e19ea463a018d37236be;hp=a955addb826034ceb244f3f71384ee1e6c05f74b;hpb=4c0fafb715871bcc26207b64fe4e725fcaedd7c5;p=lyx.git

diff --git a/lib/layouts/scrlttr2.layout b/lib/layouts/scrlttr2.layout
index a955addb82..c0e80faba7 100644
--- a/lib/layouts/scrlttr2.layout
+++ b/lib/layouts/scrlttr2.layout
@@ -1,8 +1,10 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass[scrlttr2]{letter (koma-script v.2)}
+#  \DeclareLaTeXClass{letter (KOMA-Script v.2)}
 # KOMA scrlettr2 textclass definition file.
 # Juergen Spitzmueller <j.spitzmueller@gmx.de>, 2003/2/17.
+# Uwe Stöhr <uwestoehr@web.de>, 2008/2/03.
 
+Format 30
 Style Standard
 	LatexName             dummy
 	ParSep                0.4
@@ -11,7 +13,8 @@ End
 
 Input stdlists.inc
 Input stdlayouts.inc
-
+Input stdcounters.inc
+Input stdinsets.inc
 
 Style Description
 	LabelFont
@@ -21,32 +24,30 @@ End
 
 
 Style Labeling
-	Margin                Manual
-	LatexType             List_Environment
+	CopyStyle             List
 	LatexName             labeling
-	NextNoindent          1
-	LabelSep              xxx
-	ParSkip               0.4
-	TopSep                0.7
-	BottomSep             0.7
-	ParSep                0.5
-	Align                 Block
-	AlignPossible         Block, Left
-	LabelType             Manual
-	LabelString           00.00.0000
+	# overwrite the preamble code definition
+	Preamble
+	EndPreamble
+End
+
+
+Style List
+	Obsoletedby           Labeling
 End
 
-NoStyle List
-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
@@ -55,11 +56,9 @@ Style Address
 	BottomSep             1.5
 	ParSep                1.5
 	Align                 Left
-	AlignPossible         Left
 	LabelType             Static
 	LabelString           "Address:"
-
-	LabelFont 
+	LabelFont
 	  Series              Bold
 	  Shape               Italic
 	  Size                Small
@@ -79,11 +78,9 @@ Style NextAddress
 	BottomSep             1.5
 	ParSep                1.5
 	Align                 Left
-	AlignPossible         Left
 	LabelType             Static
 	LabelString           "Next Address:"
-
-	LabelFont 
+	LabelFont
 	  Series              Bold
 	  Shape               Italic
 	  Size                Small
@@ -102,11 +99,9 @@ Style Opening
 	BottomSep             0.4
 	ParSep                0.4
 	Align                 Left
-	AlignPossible         Left
 	LabelType             Static
 	LabelString           "Opening:"
-	
-	LabelFont 
+	LabelFont
 	  Series              Bold
 	  Shape               Italic
 	  Color               Magenta
@@ -150,17 +145,16 @@ Style Name
 	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:"
 
-	LabelFont 
+	LabelFont
 	  Series              Bold
 	  Shape               Italic
 	  Color               Blue
@@ -277,6 +271,7 @@ Style Title
 	LatexName             setkomavar
 	LatexParam            {title}
 	LabelString           "Title:"
+	HTMLTitle             true
 End
 
 
@@ -294,7 +289,7 @@ Style Yourref
 	LatexParam            {yourref}
 	LabelString           "Your ref.:"
 
-	LabelFont 
+	LabelFont
 	  Family              Sans
 	  Series              Medium
 	  Shape               Up
@@ -334,3 +329,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