Fix several layout related problems revealed by -dbg tclass.

[lyx.git] / lib / layouts / g-brief2.layout

diff --git a/lib/layouts/g-brief2.layout b/lib/layouts/g-brief2.layout
index 58ad73551f6050e9e67b821eb4ce5b33971ac759..5f4835797df37d492ae4bfabcf039d7ee83b6467 100644 (file)
--- a/lib/layouts/g-brief2.layout
+++ b/lib/layouts/g-brief2.layout
@@ -1,22 +1,20 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass[g-brief2]{letter (g-brief2)}
+#  \DeclareLaTeXClass[g-brief2,europs.sty]{letter (g-brief2)}
 # Letter textclass definition file.
-
 # Author : Felix Kurth <lyx@fkurth.de> based on work from
 #          Thomas Hartkens <thomas@hartkens.de>
 
 # Input general definitions
-# Input stdletter.inc
-
-
-
+Format 31
+Input stdfloats.inc
+Input stdcounters.inc
+Input stdinsets.inc
 
 # General textclass parameters
-Format 3
 Columns                        1
 Sides                  1
 PageStyle              Empty
-DefaultStyle   Letter
+DefaultStyle           Standard
 
 # This is just to show how to declare the default font.
 # The defaults are exactly those shown here.
@@ -28,13 +26,20 @@ DefaultFont
   Color                        None
 EndFont
 
-
+# Standard style definition
+Style Standard
+  LatexName            dummy
+  ParIndent            MM
+  ParSkip              0.4
+  AlignPossible                Block, Left, Right, Center
+END
 
 # Brieftext style definition
 Style Letter
   Margin               Static
   LatexType            Environment
   LatexName            g-brief
+  TopSep               1
   ParSkip              0.4
   KeepEmpty            1
   Align                Block
@@ -48,16 +53,12 @@ Style Letter
   EndFont
 End
 
-
-
-
-
 # Name und Titel des Absenders
 Style Name
   Margin               Static
   LatexType            Command
   LatexName            Name
-  LeftMargin           TelephoneRowA:xx
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
@@ -68,7 +69,7 @@ Style Name
   LabelFont
     Series             Bold
     Shape              Italic
-    Color       Blue
+    Color              Blue
   EndFont
 End
 
@@ -77,9 +78,9 @@ Style NameRowA
   Margin               Static
   LatexType            Command
   LatexName            NameZeileA
-  LeftMargin           TelephoneRowA:xx
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
-  TopSep        1.5
+  TopSep               1.5
   KeepEmpty            1
   Align                Block
   AlignPossible        Block, Left
@@ -97,7 +98,7 @@ Style NameRowB
   Margin               Static
   LatexType            Command
   LatexName            NameZeileB
-  LeftMargin           TelephoneRowA:xx
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
@@ -116,7 +117,7 @@ Style NameRowC
   Margin               Static
   LatexType            Command
   LatexName            NameZeileC
-  LeftMargin           TelephoneRowA:xx
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
@@ -135,7 +136,7 @@ Style NameRowD
   Margin               Static
   LatexType            Command
   LatexName            NameZeileD
-  LeftMargin           TelephoneRowA:xx
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
@@ -154,7 +155,7 @@ Style NameRowE
   Margin               Static
   LatexType            Command
   LatexName            NameZeileE
-  LeftMargin           TelephoneRowA:xx
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
@@ -173,7 +174,7 @@ Style NameRowF
   Margin               Static
   LatexType            Command
   LatexName            NameZeileF
-  LeftMargin           TelephoneRowA:xx
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
@@ -192,7 +193,7 @@ Style NameRowG
   Margin               Static
   LatexType            Command
   LatexName            NameZeileG
-  LeftMargin           TelephoneRowA:xx
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
@@ -208,32 +209,12 @@ Style NameRowG
 End
 
 
-# Unterschrift des Absenders
-Style Signature
-  Margin               Static
-  LatexType            Command
-  LatexName            Unterschrift
-  LeftMargin           TelephoneRowA:xx
-  LabelSep             xx
-  KeepEmpty            1
-  Align                Block
-  AlignPossible        Block, Left
-  LabelType            Static
-  LabelString          "Signature:"
-  # label font definition
-  LabelFont
-    Series             Bold
-    Shape              Italic
-    Color               Blue
-  EndFont
-End
-
 Style AddressRowA
   Margin               Static
   LatexType            Command
   LatexName            AdressZeileA
-  LeftMargin           TelephoneRowA:xx
-  TopSep        1.5
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
+  TopSep               1
   LabelSep             xx
   KeepEmpty            1
   Align                Block
@@ -252,7 +233,7 @@ Style AddressRowB
   Margin               Static
   LatexType            Command
   LatexName            AdressZeileB
-  LeftMargin           TelephoneRowA:xx
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
@@ -271,7 +252,7 @@ Style AddressRowC
   Margin               Static
   LatexType            Command
   LatexName            AdressZeileC
-  LeftMargin           TelephoneRowA:xx
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
@@ -290,7 +271,7 @@ Style AddressRowD
   Margin               Static
   LatexType            Command
   LatexName            AdressZeileD
-  LeftMargin           TelephoneRowA:xx
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
@@ -309,7 +290,7 @@ Style AddressRowE
   Margin               Static
   LatexType            Command
   LatexName            AdressZeileE
-  LeftMargin           TelephoneRowA:xx
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
@@ -328,7 +309,7 @@ Style AddressRowF
   Margin               Static
   LatexType            Command
   LatexName            AdressZeileF
-  LeftMargin           TelephoneRowA:xx
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
@@ -347,8 +328,8 @@ Style TelephoneRowA
   Margin               Static
   LatexType            Command
   LatexName            TelefonZeileA
-  LeftMargin           TelephoneRowA:xx
-  TopSep        1.5
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
+  TopSep               1
   LabelSep             xx
   KeepEmpty            1
   Align                Block
@@ -367,7 +348,7 @@ Style TelephoneRowB
   Margin               Static
   LatexType            Command
   LatexName            TelefonZeileB
-  LeftMargin           TelephoneRowA:xx
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
@@ -386,7 +367,7 @@ Style TelephoneRowC
   Margin               Static
   LatexType            Command
   LatexName            TelefonZeileC
-  LeftMargin           TelephoneRowA:xx
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
@@ -405,7 +386,7 @@ Style TelephoneRowD
   Margin               Static
   LatexType            Command
   LatexName            TelefonZeileD
-  LeftMargin           TelephoneRowA:xx
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
@@ -424,7 +405,7 @@ Style TelephoneRowE
   Margin               Static
   LatexType            Command
   LatexName            TelefonZeileE
-  LeftMargin           TelephoneRowA:xx
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
@@ -443,7 +424,7 @@ Style TelephoneRowF
   Margin               Static
   LatexType            Command
   LatexName            TelefonZeileF
-  LeftMargin           TelephoneRowA:xx
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
@@ -462,8 +443,8 @@ Style InternetRowA
   Margin               Static
   LatexType            Command
   LatexName            InternetZeileA
-  LeftMargin           TelephoneRowA:xx
-  TopSep        1.5
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
+  TopSep               1
   LabelSep             xx
   KeepEmpty            1
   Align                Block
@@ -482,7 +463,7 @@ Style InternetRowB
   Margin               Static
   LatexType            Command
   LatexName            InternetZeileB
-  LeftMargin           TelephoneRowA:xx
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
@@ -501,7 +482,7 @@ Style InternetRowC
   Margin               Static
   LatexType            Command
   LatexName            InternetZeileC
-  LeftMargin           TelephoneRowA:xx
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
@@ -520,7 +501,7 @@ Style InternetRowD
   Margin               Static
   LatexType            Command
   LatexName            InternetZeileD
-  LeftMargin           TelephoneRowA:xx
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
@@ -539,7 +520,7 @@ Style InternetRowE
   Margin               Static
   LatexType            Command
   LatexName            InternetZeileE
-  LeftMargin           TelephoneRowA:xx
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
@@ -558,7 +539,7 @@ Style InternetRowF
   Margin               Static
   LatexType            Command
   LatexName            InternetZeileF
-  LeftMargin           TelephoneRowA:xx
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
@@ -577,8 +558,8 @@ Style BankRowA
   Margin               Static
   LatexType            Command
   LatexName            BankZeileA
-  LeftMargin           TelephoneRowA:xx
-  TopSep        1.5
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
+  TopSep               1
   LabelSep             xx
   KeepEmpty            1
   Align                Block
@@ -597,7 +578,7 @@ Style BankRowB
   Margin               Static
   LatexType            Command
   LatexName            BankZeileB
-  LeftMargin           TelephoneRowA:xx
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
@@ -616,7 +597,7 @@ Style BankRowC
   Margin               Static
   LatexType            Command
   LatexName            BankZeileC
-  LeftMargin           TelephoneRowA:xx
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
@@ -635,7 +616,7 @@ Style BankRowD
   Margin               Static
   LatexType            Command
   LatexName            BankZeileD
-  LeftMargin           TelephoneRowA:xx
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
@@ -654,7 +635,7 @@ Style BankRowE
   Margin               Static
   LatexType            Command
   LatexName            BankZeileE
-  LeftMargin           TelephoneRowA:xx
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
@@ -673,7 +654,7 @@ Style BankRowF
   Margin               Static
   LatexType            Command
   LatexName            BankZeileF
-  LeftMargin           TelephoneRowA:xx
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
@@ -689,13 +670,13 @@ Style BankRowF
 End
 
 
-
 # RetourAdresse
 Style ReturnAddress
   Margin               Static
   LatexType            Command
   LatexName            RetourAdresse
-  LeftMargin           TelephoneRowA:xx
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
+  TopSep               1.5
   LabelSep             xx
   KeepEmpty            1
   Align                Block
@@ -710,19 +691,18 @@ Style ReturnAddress
   EndFont
 End
 
-
-# MeinZeichen
-Style MyRef
+# Postvermerk
+Style PostalComment
   Margin               Static
   LatexType            Command
-  LatexName            MeinZeichen
-  LeftMargin           TelephoneRowA:xx
+  LatexName            Postvermerk
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
   AlignPossible        Block, Left
   LabelType            Static
-  LabelString          "MyRef:"
+  LabelString          "PostalComment:"
   # label font definition
   LabelFont
     Series             Bold
@@ -731,19 +711,19 @@ Style MyRef
   EndFont
 End
 
-# IhrZeichen
-Style YourRef
+# Adresse
+Style Address
   Margin               Static
   LatexType            Command
-  LatexName            IhrZeichen
-  LeftMargin           TelephoneRowA:xx
+  LatexName            Adresse
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
-  KeepEmpty            1
+  TopSep               1
   KeepEmpty            1
   Align                Block
   AlignPossible        Block, Left
   LabelType            Static
-  LabelString          "YourRef:"
+  LabelString          "Address:"
   # label font definition
   LabelFont
     Series             Bold
@@ -752,19 +732,19 @@ Style YourRef
   EndFont
 End
 
-
-# IhrSchreiben
-Style YourMail
+# MeinZeichen
+Style MyRef
   Margin               Static
   LatexType            Command
-  LatexName            IhrSchreiben
-  LeftMargin           TelephoneRowA:xx
+  LatexName            MeinZeichen
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
+  TopSep               1
   KeepEmpty            1
   Align                Block
   AlignPossible        Block, Left
   LabelType            Static
-  LabelString          "YourMail:"
+  LabelString          "MyRef:"
   # label font definition
   LabelFont
     Series             Bold
@@ -773,19 +753,19 @@ Style YourMail
   EndFont
 End
 
-
-# Postvermerk
-Style PostalComment
+# IhrZeichen
+Style YourRef
   Margin               Static
   LatexType            Command
-  LatexName            Postvermerk
-  LeftMargin           TelephoneRowA:xx
+  LatexName            IhrZeichen
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
+  KeepEmpty            1
   Align                Block
   AlignPossible        Block, Left
   LabelType            Static
-  LabelString          "PostalComment:"
+  LabelString          "YourRef:"
   # label font definition
   LabelFont
     Series             Bold
@@ -795,19 +775,18 @@ Style PostalComment
 End
 
 
-# Adresse
-Style Address
+# IhrSchreiben
+Style YourMail
   Margin               Static
   LatexType            Command
-  LatexName            Adresse
-  LeftMargin           TelephoneRowA:xx
+  LatexName            IhrSchreiben
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
-  TopSep               1.5
   KeepEmpty            1
   Align                Block
   AlignPossible        Block, Left
   LabelType            Static
-  LabelString          "Address:"
+  LabelString          "YourMail:"
   # label font definition
   LabelFont
     Series             Bold
@@ -822,7 +801,7 @@ Style Date
   Margin               Static
   LatexType            Command
   LatexName            Datum
-  LeftMargin           TelephoneRowA:xx
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Left
@@ -842,9 +821,9 @@ Style Reference
   Margin               Static
   LatexType            Command
   LatexName            Betreff
-  LeftMargin           TelephoneRowA:xx
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
-  TopSep               1.5
+  TopSep               1
   ParSep               0.4
   KeepEmpty            1
   Align                Block
@@ -866,15 +845,14 @@ Style Opening
   LatexType            Command
   LatexName            Anrede
   KeepEmpty            1
-  LeftMargin           TelephoneRowA:xx
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
-  TopSep               1.5
+  TopSep               1
   ParSep               0.4
   Align                Block
   AlignPossible        Block, Left
   LabelType            Static
   LabelString          "Opening:"
-
   # label font definition
   LabelFont
     Series             Bold
@@ -883,45 +861,65 @@ Style Opening
   EndFont
 End
 
-
-
-# Anlagen style definition
-Style Encl.
+# Gruss style definition
+Style Closing
   Margin               Static
   LatexType            Command
-  LatexName            Anlagen
-  KeepEmpty            1
-  LeftMargin           TelephoneRowA:xx
+  LatexName            LyxGruss
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   ParSep               0.4
+  KeepEmpty            1
   Align                Block
   AlignPossible        Block, Left
   LabelType            Static
-  LabelString          "Encl.:"
-
+  LabelString          "Closing:"
   # label font definition
   LabelFont
     Series             Bold
     Shape              Italic
     Color               Blue
   EndFont
+  #define the environment lyxGruss
+  Preamble
+  \newcommand{\LyxGruss}[1]
+    { \Gruss{#1}{0.5cm} }
+  EndPreamble
 End
 
+# Unterschrift des Absenders
+Style Signature
+  Margin               Static
+  LatexType            Command
+  LatexName            Unterschrift
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
+  LabelSep             xx
+  KeepEmpty            1
+  Align                Block
+  AlignPossible        Block, Left
+  LabelType            Static
+  LabelString          "Signature:"
+  # label font definition
+  LabelFont
+    Series             Bold
+    Shape              Italic
+    Color               Blue
+  EndFont
+End
 
-# Verteiler style definition
-Style cc
+# Anlagen style definition
+Style Encl.
   Margin               Static
   LatexType            Command
-  LatexName            Verteiler
+  LatexName            Anlagen
   KeepEmpty            1
-  LeftMargin           TelephoneRowA:xx
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   ParSep               0.4
   Align                Block
   AlignPossible        Block, Left
   LabelType            Static
-  LabelString          "cc:"
-
+  LabelString          "Encl.:"
   # label font definition
   LabelFont
     Series             Bold
@@ -930,45 +928,31 @@ Style cc
   EndFont
 End
 
-# Gruss style definition
-Style Closing
+# Verteiler style definition
+Style cc
   Margin               Static
   LatexType            Command
-  LatexName            LyxGruss
-  LeftMargin           TelephoneRowA:xx
+  LatexName            Verteiler
+  KeepEmpty            1
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
-  BottomSep            1.5
   ParSep               0.4
-  KeepEmpty            1
   Align                Block
   AlignPossible        Block, Left
   LabelType            Static
-  LabelString          "Closing:"
-
+  LabelString          "cc:"
   # label font definition
   LabelFont
     Series             Bold
     Shape              Italic
     Color               Blue
   EndFont
-
-  #define the environment lyxGruss
-  Preamble
-  \newcommand{\LyxGruss}[1]
-    { \Gruss{#1}{0.5cm} }
-  EndPreamble
-
-
 End
 
-
-
-Input stdfloats.inc
-Input stdcounters.inc
-
-
-
-
+Input stdlists.inc
+Input stdlayouts.inc
+NoStyle                        Verse
+NoStyle                        --Separator--
 
 # Input lyxmacros.inc