Fix bug #10273

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

diff --git a/lib/layouts/g-brief2.layout b/lib/layouts/g-brief2.layout
index 94f325e754dba6eecf34aafdf922ddc93ccb206a..41955a3a8aa5e3fc06f81ab197e364f0ed5fa7c3 100644 (file)
--- a/lib/layouts/g-brief2.layout
+++ b/lib/layouts/g-brief2.layout
@@ -1,16 +1,17 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass[g-brief2]{letter (g-brief2)}
+#  \DeclareLaTeXClass[g-brief2]{G-Brief (V. 2)}
+#  \DeclareCategory{Letters}
 # 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 60
+Input stdfloats.inc
+Input stdcounters.inc
+Input stdinsets.inc
 
 # General textclass parameters
-Format 4
 Columns                        1
 Sides                  1
 PageStyle              Empty
@@ -28,12 +29,37 @@ EndFont
 
 # Standard style definition
 Style Standard
+  Category              MainText
   LatexName            dummy
   ParIndent            MM
   ParSkip              0.4
   AlignPossible                Block, Left, Right, Center
 END
 
+# This is just to make the order of styles
+Style Address
+End
+Style PostalComment
+End
+Style Name
+End
+Style Reference
+End
+Style MyRef
+End
+Style YourRef
+End
+Style YourMail
+End
+Style Date
+End
+Style Opening
+End
+Style Letter
+End
+Style Closing
+End
+
 # Brieftext style definition
 Style Letter
   Margin               Static
@@ -44,7 +70,7 @@ Style Letter
   KeepEmpty            1
   Align                Block
   AlignPossible        Block, Left, Right, Center
-  LabelType            Top_Environment
+  LabelType            Above
   LabelString          "Letter:"
   LabelFont
     Series             Bold
@@ -58,7 +84,7 @@ Style Name
   Margin               Static
   LatexType            Command
   LatexName            Name
-  LeftMargin           TelephoneRowA:xx
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
@@ -75,9 +101,11 @@ End
 
 # Name und Spruch in der Fusszeile
 Style NameRowA
-  Margin               Dynamic
+  Category              Bottom
+  Margin               Static
   LatexType            Command
   LatexName            NameZeileA
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   TopSep               1.5
   KeepEmpty            1
@@ -94,9 +122,11 @@ Style NameRowA
 End
 
 Style NameRowB
-  Margin               Dynamic
+  Category              Bottom
+  Margin               Static
   LatexType            Command
   LatexName            NameZeileB
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
@@ -112,9 +142,11 @@ Style NameRowB
 End
 
 Style NameRowC
-  Margin               Dynamic
+  Category              Bottom
+  Margin               Static
   LatexType            Command
   LatexName            NameZeileC
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
@@ -130,9 +162,11 @@ Style NameRowC
 End
 
 Style NameRowD
-  Margin               Dynamic
+  Category              Bottom
+  Margin               Static
   LatexType            Command
   LatexName            NameZeileD
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
@@ -148,9 +182,11 @@ Style NameRowD
 End
 
 Style NameRowE
-  Margin               Dynamic
+  Category              Bottom
+  Margin               Static
   LatexType            Command
   LatexName            NameZeileE
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
@@ -166,9 +202,11 @@ Style NameRowE
 End
 
 Style NameRowF
-  Margin               Dynamic
+  Category              Bottom
+  Margin               Static
   LatexType            Command
   LatexName            NameZeileF
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
@@ -184,9 +222,11 @@ Style NameRowF
 End
 
 Style NameRowG
-  Margin               Dynamic
+  Category              Bottom
+  Margin               Static
   LatexType            Command
   LatexName            NameZeileG
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
@@ -202,17 +242,19 @@ Style NameRowG
 End
 
 
-Style AdressRowA
-  Margin               Dynamic
+Style AddressRowA
+  Category              Bottom
+  Margin               Static
   LatexType            Command
   LatexName            AdressZeileA
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   TopSep               1
   LabelSep             xx
   KeepEmpty            1
   Align                Block
   AlignPossible        Block, Left
   LabelType            Static
-  LabelString          "AdressRowA:"
+  LabelString          "AddressRowA:"
   # label font definition
   LabelFont
     Series             Bold
@@ -221,16 +263,18 @@ Style AdressRowA
   EndFont
 End
 
-Style AdressRowB
-  Margin               Dynamic
+Style AddressRowB
+  Category              Bottom
+  Margin               Static
   LatexType            Command
   LatexName            AdressZeileB
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
   AlignPossible        Block, Left
   LabelType            Static
-  LabelString          "AdressRowB:"
+  LabelString          "AddressRowB:"
   # label font definition
   LabelFont
     Series             Bold
@@ -239,16 +283,18 @@ Style AdressRowB
   EndFont
 End
 
-Style AdressRowC
-  Margin               Dynamic
+Style AddressRowC
+  Category              Bottom
+  Margin               Static
   LatexType            Command
   LatexName            AdressZeileC
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
   AlignPossible        Block, Left
   LabelType            Static
-  LabelString          "AdressRowC:"
+  LabelString          "AddressRowC:"
   # label font definition
   LabelFont
     Series             Bold
@@ -257,16 +303,18 @@ Style AdressRowC
   EndFont
 End
 
-Style AdressRowD
-  Margin               Dynamic
+Style AddressRowD
+  Category              Bottom
+  Margin               Static
   LatexType            Command
   LatexName            AdressZeileD
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
   AlignPossible        Block, Left
   LabelType            Static
-  LabelString          "AdressRowD:"
+  LabelString          "AddressRowD:"
   # label font definition
   LabelFont
     Series             Bold
@@ -275,16 +323,18 @@ Style AdressRowD
   EndFont
 End
 
-Style AdressRowE
-  Margin               Dynamic
+Style AddressRowE
+  Category              Bottom
+  Margin               Static
   LatexType            Command
   LatexName            AdressZeileE
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
   AlignPossible        Block, Left
   LabelType            Static
-  LabelString          "AdressRowE:"
+  LabelString          "AddressRowE:"
   # label font definition
   LabelFont
     Series             Bold
@@ -293,16 +343,18 @@ Style AdressRowE
   EndFont
 End
 
-Style AdressRowF
-  Margin               Dynamic
+Style AddressRowF
+  Category              Bottom
+  Margin               Static
   LatexType            Command
   LatexName            AdressZeileF
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
   AlignPossible        Block, Left
   LabelType            Static
-  LabelString          "AdressRowF:"
+  LabelString          "AddressRowF:"
   # label font definition
   LabelFont
     Series             Bold
@@ -312,9 +364,11 @@ Style AdressRowF
 End
 
 Style TelephoneRowA
-  Margin               Dynamic
+  Category              Bottom
+  Margin               Static
   LatexType            Command
   LatexName            TelefonZeileA
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   TopSep               1
   LabelSep             xx
   KeepEmpty            1
@@ -331,9 +385,11 @@ Style TelephoneRowA
 End
 
 Style TelephoneRowB
-  Margin               Dynamic
+  Category              Bottom
+  Margin               Static
   LatexType            Command
   LatexName            TelefonZeileB
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
@@ -349,9 +405,11 @@ Style TelephoneRowB
 End
 
 Style TelephoneRowC
-  Margin               Dynamic
+  Category              Bottom
+  Margin               Static
   LatexType            Command
   LatexName            TelefonZeileC
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
@@ -367,9 +425,11 @@ Style TelephoneRowC
 End
 
 Style TelephoneRowD
-  Margin               Dynamic
+  Category              Bottom
+  Margin               Static
   LatexType            Command
   LatexName            TelefonZeileD
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
@@ -385,9 +445,11 @@ Style TelephoneRowD
 End
 
 Style TelephoneRowE
-  Margin               Dynamic
+  Category              Bottom
+  Margin               Static
   LatexType            Command
   LatexName            TelefonZeileE
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
@@ -403,9 +465,11 @@ Style TelephoneRowE
 End
 
 Style TelephoneRowF
-  Margin               Dynamic
+  Category              Bottom
+  Margin               Static
   LatexType            Command
   LatexName            TelefonZeileF
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
@@ -421,9 +485,11 @@ Style TelephoneRowF
 End
 
 Style InternetRowA
-  Margin               Dynamic
+  Category              Bottom
+  Margin               Static
   LatexType            Command
   LatexName            InternetZeileA
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   TopSep               1
   LabelSep             xx
   KeepEmpty            1
@@ -440,9 +506,11 @@ Style InternetRowA
 End
 
 Style InternetRowB
-  Margin               Dynamic
+  Category              Bottom
+  Margin               Static
   LatexType            Command
   LatexName            InternetZeileB
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
@@ -456,10 +524,13 @@ Style InternetRowB
     Color       Green
   EndFont
 End
+
 Style InternetRowC
-  Margin               Dynamic
+  Category              Bottom
+  Margin               Static
   LatexType            Command
   LatexName            InternetZeileC
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
@@ -473,10 +544,13 @@ Style InternetRowC
     Color       Green
   EndFont
 End
+
 Style InternetRowD
-  Margin               Dynamic
+  Category              Bottom
+  Margin               Static
   LatexType            Command
   LatexName            InternetZeileD
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
@@ -490,10 +564,13 @@ Style InternetRowD
     Color       Green
   EndFont
 End
+
 Style InternetRowE
-  Margin               Dynamic
+  Category              Bottom
+  Margin               Static
   LatexType            Command
   LatexName            InternetZeileE
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
@@ -507,10 +584,13 @@ Style InternetRowE
     Color       Green
   EndFont
 End
+
 Style InternetRowF
-  Margin               Dynamic
+  Category              Bottom
+  Margin               Static
   LatexType            Command
   LatexName            InternetZeileF
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
@@ -526,9 +606,11 @@ Style InternetRowF
 End
 
 Style BankRowA
-  Margin               Dynamic
+  Category              Bottom
+  Margin               Static
   LatexType            Command
   LatexName            BankZeileA
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   TopSep               1
   LabelSep             xx
   KeepEmpty            1
@@ -545,9 +627,11 @@ Style BankRowA
 End
 
 Style BankRowB
-  Margin               Dynamic
+  Category              Bottom
+  Margin               Static
   LatexType            Command
   LatexName            BankZeileB
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
@@ -563,9 +647,11 @@ Style BankRowB
 End
 
 Style BankRowC
-  Margin               Dynamic
+  Category              Bottom
+  Margin               Static
   LatexType            Command
   LatexName            BankZeileC
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
@@ -581,9 +667,11 @@ Style BankRowC
 End
 
 Style BankRowD
-  Margin               Dynamic
+  Category              Bottom
+  Margin               Static
   LatexType            Command
   LatexName            BankZeileD
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
@@ -599,9 +687,11 @@ Style BankRowD
 End
 
 Style BankRowE
-  Margin               Dynamic
+  Category              Bottom
+  Margin               Static
   LatexType            Command
   LatexName            BankZeileE
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
@@ -617,9 +707,11 @@ Style BankRowE
 End
 
 Style BankRowF
-  Margin               Dynamic
+  Category              Bottom
+  Margin               Static
   LatexType            Command
   LatexName            BankZeileF
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
@@ -637,9 +729,11 @@ End
 
 # RetourAdresse
 Style ReturnAddress
-  Margin               Dynamic
+  Category              "Postal Data"
+  Margin               Static
   LatexType            Command
   LatexName            RetourAdresse
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   TopSep               1.5
   LabelSep             xx
   KeepEmpty            1
@@ -657,9 +751,12 @@ End
 
 # Postvermerk
 Style PostalComment
-  Margin               Dynamic
+  CopyStyle             PostalComment
+  Category              "Postal Data"
+  Margin               Static
   LatexType            Command
   LatexName            Postvermerk
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
@@ -673,13 +770,15 @@ Style PostalComment
     Color               Blue
   EndFont
 End
-   
+
 # Adresse
 Style Address
+  CopyStyle             Address
+  Category              "Postal Data"
   Margin               Static
   LatexType            Command
   LatexName            Adresse
-  LeftMargin           TelephoneRowA:xx
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   TopSep               1
   KeepEmpty            1
@@ -700,7 +799,7 @@ Style MyRef
   Margin               Static
   LatexType            Command
   LatexName            MeinZeichen
-  LeftMargin           TelephoneRowA:xx
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   TopSep               1
   KeepEmpty            1
@@ -721,7 +820,7 @@ Style YourRef
   Margin               Static
   LatexType            Command
   LatexName            IhrZeichen
-  LeftMargin           TelephoneRowA:xx
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   KeepEmpty            1
@@ -743,7 +842,7 @@ Style YourMail
   Margin               Static
   LatexType            Command
   LatexName            IhrSchreiben
-  LeftMargin           TelephoneRowA:xx
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
@@ -764,7 +863,7 @@ Style Date
   Margin               Static
   LatexType            Command
   LatexName            Datum
-  LeftMargin           TelephoneRowA:xx
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Left
@@ -784,7 +883,7 @@ Style Reference
   Margin               Static
   LatexType            Command
   LatexName            Betreff
-  LeftMargin           TelephoneRowA:xx
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   TopSep               1
   ParSep               0.4
@@ -808,7 +907,7 @@ Style Opening
   LatexType            Command
   LatexName            Anrede
   KeepEmpty            1
-  LeftMargin           TelephoneRowA:xx
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   TopSep               1
   ParSep               0.4
@@ -826,10 +925,11 @@ End
 
 # Gruss style definition
 Style Closing
+  Category              Closings
   Margin               Static
   LatexType            Command
   LatexName            LyxGruss
-  LeftMargin           xxxxxxxxxxxx::xx
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   ParSep               0.4
   KeepEmpty            1
@@ -852,10 +952,11 @@ End
 
 # Unterschrift des Absenders
 Style Signature
+  Category              Closings
   Margin               Static
   LatexType            Command
   LatexName            Unterschrift
-  LeftMargin           xxxxxxxxxxxx::xx
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
@@ -870,14 +971,14 @@ Style Signature
   EndFont
 End
 
-
 # Anlagen style definition
 Style Encl.
+  Category              Closings
   Margin               Static
   LatexType            Command
   LatexName            Anlagen
   KeepEmpty            1
-  LeftMargin           xxxxxxxxxxxx::xx
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   ParSep               0.4
   Align                Block
@@ -892,14 +993,14 @@ Style Encl.
   EndFont
 End
 
-
 # Verteiler style definition
 Style cc
+  Category              Closings
   Margin               Static
   LatexType            Command
   LatexName            Verteiler
   KeepEmpty            1
-  LeftMargin           xxxxxxxxxxxx::xx
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   ParSep               0.4
   Align                Block
@@ -914,12 +1015,9 @@ Style cc
   EndFont
 End
 
-
-
-Input stdfloats.inc
-Input stdcounters.inc
-
-
+Input stdlists.inc
+Input stdlayouts.inc
+NoStyle                        Verse
 
 # Input lyxmacros.inc