X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Fstdletter.inc;h=fa1a63c419cc28d3ce07481581d4f53812d504b6;hb=a830e51c8ae7d3ab0da4694a7c1d3499db66878f;hp=99fdc5db87386e5732d800958b49615748e9cef5;hpb=28f4beaefac5839f6ba7fae615d46a6ba107486d;p=lyx.git

diff --git a/lib/layouts/stdletter.inc b/lib/layouts/stdletter.inc
index 99fdc5db87..fa1a63c419 100644
--- a/lib/layouts/stdletter.inc
+++ b/lib/layouts/stdletter.inc
@@ -1,24 +1,16 @@
-# Letter textclass definition file. 
+# Letter textclass definition file.
 # Author : Matthias Ettrich <ettrich@informatik.uni-tuebingen.de>
 # Heavily modifed and enhanced by several developers.
 
-# General textclass parameters
+
+Format 54
 Columns                 1
 Sides                   1
 PageStyle               Empty
 
-# This is just to show how to declare the default font.
-# The defaults are exactly those shown here.
-DefaultFont
-	Family                Roman
-	Series                Medium
-	Shape                 Up
-	Size                  Normal
-	Color                 None
-EndFont
-
 
 Style Standard
+	Category              MainText
 	Margin                Static
 	LatexType             Paragraph
 	LatexName             dummy
@@ -31,6 +23,7 @@ End
 
 
 Style My_Address
+	Category              "Postal Data"
 	Margin                Right_Address_Box
 	LatexType             Command
 	LatexName             address
@@ -38,15 +31,15 @@ Style My_Address
 	BottomSep             1.5
 	ParSep                1.5
 	Align                 Left
-	AlignPossible         Left
 End
 
 
 Style Send_To_Address
+	Category              "Postal Data"
 	Margin                Static
 	LatexType             Command
 	LatexName             letter
-	KeepEmpty             1  
+	KeepEmpty             1
 	ParSkip               0.4
 	BottomSep             1.5
 	ParSep                1.5
@@ -57,11 +50,12 @@ End
 
 
 Style Opening
+	Category              Letter
 	Margin                Static
 	LatexType             Command
 	LatexName             opening
-	KeepEmpty             1  
-	LeftMargin            Signature::xx
+	KeepEmpty             1
+	LeftMargin            Signature:xx
 	LabelSep              xx
 	TopSep                0.4
 	BottomSep             0.4
@@ -69,9 +63,8 @@ Style Opening
 	Align                 Block
 	AlignPossible         Block, Left
 	LabelType             Static
-	LabelString           Opening:
-
-	LabelFont 
+	LabelString           "Opening:"
+	LabelFont
 	  Series              Bold
 	  Shape               Italic
 	  Color               red
@@ -80,10 +73,11 @@ End
 
 
 Style Signature
+	Category              Closings
 	Margin                Static
 	LatexType             Command
 	LatexName             signature
-	LeftMargin            Signature::xx
+	LeftMargin            Signature:xx
 	LabelSep              xx
 	TopSep                0.4
 	BottomSep             0.4
@@ -91,9 +85,8 @@ Style Signature
 	Align                 Block
 	AlignPossible         Block, Left
 	LabelType             Static
-	LabelString           Signature:
-
-	LabelFont 
+	LabelString           "Signature:"
+	LabelFont
 	  Series              Bold
 	  Shape               Italic
 	  Color               red
@@ -102,89 +95,41 @@ End
 
 
 Style Closing
-	Margin                Static
-	LatexType             Command
+	CopyStyle             Signature
 	LatexName             closing
-	LeftMargin            Signature::xx
-	LabelSep              xx
-	TopSep                0.4
-	BottomSep             0.4
-	ParSep                0.4
-	Align                 Block
-	AlignPossible         Block, Left
-	LabelType             Static
-	LabelString           Closing:
-
-	LabelFont 
-	  Series              Bold
-	  Shape               Italic
-	  Color               red
-	EndFont
+	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
-	LabelString           cc:
+	LabelString           "cc:"
+	LabelFont
+	  Series              Bold
+	  Shape               Italic
+	  Color               green
+	EndFont
 End
 
 
 Style encl
-	Margin                Static
-	LatexType             Command
+	CopyStyle             cc
 	LatexName             encl
-	LeftMargin            encl:xx
-	LabelSep              xx
-	TopSep                0.4
-	BottomSep             0.4
-	ParSep                0.4
-	Align                 Block
-	AlignPossible         Block, Left
-	LabelType             Static
-	LabelString           encl:
+	LabelString           "encl:"
 	Spacing               Other 1.5
 End
 
 
 Style Location
-	Margin                Static
-	LatexType             Command
-	LatexName             location
-	LeftMargin            Location:xx
-	LabelSep              xx
-	TopSep                0.4
-	BottomSep             0.4
-	ParSep                0.4
-	Align                 Block
-	AlignPossible         Block, Left
-	LabelType             Static
-	LabelString           Location:
-	Spacing               Other 1.5
+	CopyStyle             cc
+	LatexName             thispagestyle{firstpage}\location
+	LabelString           "Location:"
 End
 
 
 Style Telephone
-	Margin                Static
-	LatexType             Command
-	LatexName             telephone
-	LeftMargin            Telephone:xx
-	LabelSep              xx
-	TopSep                0.4
-	BottomSep             0.4
-	ParSep                0.4
-	Align                 Block
-	AlignPossible         Block, Left
-	LabelType             Static
-	LabelString           Telephone:
-	Spacing               Other 1.5
+	CopyStyle             cc
+	LatexName             thispagestyle{firstpage}\telephone
+	LabelString           "Telephone:"
 End