DocBook: new logic to handle the new lines, only used in output_docbook for now.

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

diff --git a/lib/layouts/stdletter.inc b/lib/layouts/stdletter.inc
index aaa54648ec7ea6623f0591ef57edde00df8d4ef1..933327e77185d8957bee5e2fdd4dc44d9247d08e 100644 (file)
--- 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 82
 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
-
-# Standard style definition
+
 Style Standard
+       Category              MainText
        Margin                Static
        LatexType             Paragraph
        LatexName             dummy
@@ -29,8 +21,9 @@ Style Standard
        LabelType             No_Label
 End
 
-# My Address style
+
 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
 
-# Send_To_Address style definition
+
 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
@@ -55,13 +48,14 @@ Style Send_To_Address
        LabelType             No_Label
 End
 
-# Opening style definition
+
 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,22 +63,21 @@ Style Opening
        Align                 Block
        AlignPossible         Block, Left
        LabelType             Static
-       LabelString           Opening:
-
-       # label font definition
-       LabelFont 
+       LabelString           "Opening:"
+       LabelFont
          Series              Bold
          Shape               Italic
          Color               red
        EndFont
 End
 
-# Signature style definition
+
 Style Signature
+       Category              Closings
        Margin                Static
        LatexType             Command
        LatexName             signature
-       LeftMargin            Signature::xx
+       LeftMargin            Signature:xx
        LabelSep              xx
        TopSep                0.4
        BottomSep             0.4
@@ -92,103 +85,51 @@ Style Signature
        Align                 Block
        AlignPossible         Block, Left
        LabelType             Static
-       LabelString           Signature:
-
-       # label font definition
-       LabelFont 
+       LabelString           "Signature:"
+       LabelFont
          Series              Bold
          Shape               Italic
          Color               red
        EndFont
 End
 
-# Closing style definition
+
 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:
+       LabelString           "Closing:"
+End
+
 
-       # label font definition
-       LabelFont 
+Style cc
+       CopyStyle             Signature
+       LatexName             cc
+       LabelString           "cc:"
+       LabelFont
          Series              Bold
          Shape               Italic
-         Color               red
+         Color               green
        EndFont
 End
 
-# cc style definition
-Style cc
-       Margin                Static
-       LatexType             Command
-       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:
-End
 
-# encl style definition
 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
 
-# Telephone style definition
+
 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
 
-# Telephone style definition
+
 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
-