RJournal template and layout: move ERTs to layout

[lyx.git] / lib / layouts / stdletter.inc

diff --git a/lib/layouts/stdletter.inc b/lib/layouts/stdletter.inc
index 1d51df97066ab375ef1738c41ad41e1fedb2e692..ed2ce8729f6ea273d4c36a9c02b916571ba1a836 100644 (file)
--- a/lib/layouts/stdletter.inc
+++ b/lib/layouts/stdletter.inc
@@ -3,12 +3,14 @@
 # Heavily modifed and enhanced by several developers.
 
 
+Format 45
 Columns                 1
 Sides                   1
 PageStyle               Empty
 
 
 Style Standard
+       Category              MainText
        Margin                Static
        LatexType             Paragraph
        LatexName             dummy
@@ -21,6 +23,7 @@ End
 
 
 Style My_Address
+       Category              "Postal Data"
        Margin                Right_Address_Box
        LatexType             Command
        LatexName             address
@@ -28,11 +31,11 @@ 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
@@ -47,11 +50,12 @@ End
 
 
 Style Opening
+       Category              Letter
        Margin                Static
        LatexType             Command
        LatexName             opening
        KeepEmpty             1
-       LeftMargin            Signature::xx
+       LeftMargin            Signature:xx
        LabelSep              xx
        TopSep                0.4
        BottomSep             0.4
@@ -59,7 +63,7 @@ Style Opening
        Align                 Block
        AlignPossible         Block, Left
        LabelType             Static
-       LabelString           Opening:
+       LabelString           "Opening:"
        LabelFont
          Series              Bold
          Shape               Italic
@@ -69,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
@@ -80,7 +85,7 @@ Style Signature
        Align                 Block
        AlignPossible         Block, Left
        LabelType             Static
-       LabelString           Signature:
+       LabelString           "Signature:"
        LabelFont
          Series              Bold
          Shape               Italic
@@ -92,48 +97,39 @@ End
 Style Closing
        CopyStyle             Signature
        LatexName             closing
-       LeftMargin            Signature::xx
-       LabelString           Closing:
+       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
        CopyStyle             cc
        LatexName             encl
-       LeftMargin            encl:xx
-       LabelString           encl:
+       LabelString           "encl:"
        Spacing               Other 1.5
 End
 
 
 Style Location
-       CopyStyle             encl
-       LatexName             location
-       LeftMargin            Location:xx
-       LabelString           Location:
+       CopyStyle             cc
+       LatexName             thispagestyle{firstpage}\location
+       LabelString           "Location:"
 End
 
 
 Style Telephone
-       CopyStyle             encl
-       LatexName             telephone
-       LeftMargin            Telephone:xx
-       LabelString           Telephone:
+       CopyStyle             cc
+       LatexName             thispagestyle{firstpage}\telephone
+       LabelString           "Telephone:"
 End
-