X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Fstdletter.inc;h=ed2ce8729f6ea273d4c36a9c02b916571ba1a836;hb=4beba4e8f87ca218473448caf10563b99faf7b21;hp=b6cf7e44be504a252cf91007fc8d3e8e8cba9452;hpb=9e5eebc14cd06f58000a4bd1903f157b65a3ab19;p=lyx.git

diff --git a/lib/layouts/stdletter.inc b/lib/layouts/stdletter.inc
index b6cf7e44be..ed2ce8729f 100644
--- a/lib/layouts/stdletter.inc
+++ b/lib/layouts/stdletter.inc
@@ -3,13 +3,14 @@
 # Heavily modifed and enhanced by several developers.
 
 
-Format 6
+Format 45
 Columns                 1
 Sides                   1
 PageStyle               Empty
 
 
 Style Standard
+	Category              MainText
 	Margin                Static
 	LatexType             Paragraph
 	LatexName             dummy
@@ -22,6 +23,7 @@ End
 
 
 Style My_Address
+	Category              "Postal Data"
 	Margin                Right_Address_Box
 	LatexType             Command
 	LatexName             address
@@ -33,6 +35,7 @@ End
 
 
 Style Send_To_Address
+	Category              "Postal Data"
 	Margin                Static
 	LatexType             Command
 	LatexName             letter
@@ -47,6 +50,7 @@ End
 
 
 Style Opening
+	Category              Letter
 	Margin                Static
 	LatexType             Command
 	LatexName             opening
@@ -69,6 +73,7 @@ End
 
 
 Style Signature
+	Category              Closings
 	Margin                Static
 	LatexType             Command
 	LatexName             signature
@@ -92,49 +97,39 @@ End
 Style Closing
 	CopyStyle             Signature
 	LatexName             closing
-	LeftMargin            Signature:xx
 	LabelString           "Closing:"
 End
 
 
 Style cc
-	Margin                Static
-	LatexType             Command
+	CopyStyle             Signature
 	LatexName             cc
-	LeftMargin            cc:xx
-	LabelSep              xx
-	TopSep                0.4
-	BottomSep             0.4
-	ParSep                0.4
-	Align                 Block
-	AlignPossible         Block, Left
-	LabelType             Static
-	LeftMargin            Signature:xx
 	LabelString           "cc:"
+	LabelFont
+	  Series              Bold
+	  Shape               Italic
+	  Color               green
+	EndFont
 End
 
 
 Style encl
 	CopyStyle             cc
 	LatexName             encl
-	LeftMargin            Signature:xx
 	LabelString           "encl:"
 	Spacing               Other 1.5
 End
 
 
 Style Location
-	CopyStyle             encl
-	LatexName             location
-	LeftMargin            Signature:xx
+	CopyStyle             cc
+	LatexName             thispagestyle{firstpage}\location
 	LabelString           "Location:"
 End
 
 
 Style Telephone
-	CopyStyle             encl
-	LatexName             telephone
-	LeftMargin            Signature:xx
+	CopyStyle             cc
+	LatexName             thispagestyle{firstpage}\telephone
 	LabelString           "Telephone:"
 End
-