Merge branch 'master' of git.lyx.org:lyx

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

diff --git a/lib/layouts/g-brief2.layout b/lib/layouts/g-brief2.layout
index 94f325e754dba6eecf34aafdf922ddc93ccb206a..f46a8e2e026303b606a88e2df91a279461c2a973 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 41
+Input stdfloats.inc
+Input stdcounters.inc
+Input stdinsets.inc
 
 # General textclass parameters
-Format 4
 Columns                        1
 Sides                  1
 PageStyle              Empty
@@ -58,7 +59,7 @@ Style Name
   Margin               Static
   LatexType            Command
   LatexName            Name
-  LeftMargin           TelephoneRowA:xx
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
@@ -75,9 +76,10 @@ End
 
 # Name und Spruch in der Fusszeile
 Style NameRowA
-  Margin               Dynamic
+  Margin               Static
   LatexType            Command
   LatexName            NameZeileA
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   TopSep               1.5
   KeepEmpty            1
@@ -94,9 +96,10 @@ Style NameRowA
 End
 
 Style NameRowB
-  Margin               Dynamic
+  Margin               Static
   LatexType            Command
   LatexName            NameZeileB
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
@@ -112,9 +115,10 @@ Style NameRowB
 End
 
 Style NameRowC
-  Margin               Dynamic
+  Margin               Static
   LatexType            Command
   LatexName            NameZeileC
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
@@ -130,9 +134,10 @@ Style NameRowC
 End
 
 Style NameRowD
-  Margin               Dynamic
+  Margin               Static
   LatexType            Command
   LatexName            NameZeileD
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
@@ -148,9 +153,10 @@ Style NameRowD
 End
 
 Style NameRowE
-  Margin               Dynamic
+  Margin               Static
   LatexType            Command
   LatexName            NameZeileE
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
@@ -166,9 +172,10 @@ Style NameRowE
 End
 
 Style NameRowF
-  Margin               Dynamic
+  Margin               Static
   LatexType            Command
   LatexName            NameZeileF
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
@@ -184,9 +191,10 @@ Style NameRowF
 End
 
 Style NameRowG
-  Margin               Dynamic
+  Margin               Static
   LatexType            Command
   LatexName            NameZeileG
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
@@ -202,17 +210,18 @@ Style NameRowG
 End
 
 
-Style AdressRowA
-  Margin               Dynamic
+Style AddressRowA
+  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 +230,17 @@ Style AdressRowA
   EndFont
 End
 
-Style AdressRowB
-  Margin               Dynamic
+Style AddressRowB
+  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 +249,17 @@ Style AdressRowB
   EndFont
 End
 
-Style AdressRowC
-  Margin               Dynamic
+Style AddressRowC
+  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 +268,17 @@ Style AdressRowC
   EndFont
 End
 
-Style AdressRowD
-  Margin               Dynamic
+Style AddressRowD
+  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 +287,17 @@ Style AdressRowD
   EndFont
 End
 
-Style AdressRowE
-  Margin               Dynamic
+Style AddressRowE
+  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 +306,17 @@ Style AdressRowE
   EndFont
 End
 
-Style AdressRowF
-  Margin               Dynamic
+Style AddressRowF
+  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 +326,10 @@ Style AdressRowF
 End
 
 Style TelephoneRowA
-  Margin               Dynamic
+  Margin               Static
   LatexType            Command
   LatexName            TelefonZeileA
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   TopSep               1
   LabelSep             xx
   KeepEmpty            1
@@ -331,9 +346,10 @@ Style TelephoneRowA
 End
 
 Style TelephoneRowB
-  Margin               Dynamic
+  Margin               Static
   LatexType            Command
   LatexName            TelefonZeileB
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
@@ -349,9 +365,10 @@ Style TelephoneRowB
 End
 
 Style TelephoneRowC
-  Margin               Dynamic
+  Margin               Static
   LatexType            Command
   LatexName            TelefonZeileC
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
@@ -367,9 +384,10 @@ Style TelephoneRowC
 End
 
 Style TelephoneRowD
-  Margin               Dynamic
+  Margin               Static
   LatexType            Command
   LatexName            TelefonZeileD
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
@@ -385,9 +403,10 @@ Style TelephoneRowD
 End
 
 Style TelephoneRowE
-  Margin               Dynamic
+  Margin               Static
   LatexType            Command
   LatexName            TelefonZeileE
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
@@ -403,9 +422,10 @@ Style TelephoneRowE
 End
 
 Style TelephoneRowF
-  Margin               Dynamic
+  Margin               Static
   LatexType            Command
   LatexName            TelefonZeileF
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
@@ -421,9 +441,10 @@ Style TelephoneRowF
 End
 
 Style InternetRowA
-  Margin               Dynamic
+  Margin               Static
   LatexType            Command
   LatexName            InternetZeileA
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   TopSep               1
   LabelSep             xx
   KeepEmpty            1
@@ -440,9 +461,10 @@ Style InternetRowA
 End
 
 Style InternetRowB
-  Margin               Dynamic
+  Margin               Static
   LatexType            Command
   LatexName            InternetZeileB
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
@@ -456,10 +478,12 @@ Style InternetRowB
     Color       Green
   EndFont
 End
+
 Style InternetRowC
-  Margin               Dynamic
+  Margin               Static
   LatexType            Command
   LatexName            InternetZeileC
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
@@ -473,10 +497,12 @@ Style InternetRowC
     Color       Green
   EndFont
 End
+
 Style InternetRowD
-  Margin               Dynamic
+  Margin               Static
   LatexType            Command
   LatexName            InternetZeileD
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
@@ -490,10 +516,12 @@ Style InternetRowD
     Color       Green
   EndFont
 End
+
 Style InternetRowE
-  Margin               Dynamic
+  Margin               Static
   LatexType            Command
   LatexName            InternetZeileE
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
@@ -507,10 +535,12 @@ Style InternetRowE
     Color       Green
   EndFont
 End
+
 Style InternetRowF
-  Margin               Dynamic
+  Margin               Static
   LatexType            Command
   LatexName            InternetZeileF
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
@@ -526,9 +556,10 @@ Style InternetRowF
 End
 
 Style BankRowA
-  Margin               Dynamic
+  Margin               Static
   LatexType            Command
   LatexName            BankZeileA
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   TopSep               1
   LabelSep             xx
   KeepEmpty            1
@@ -545,9 +576,10 @@ Style BankRowA
 End
 
 Style BankRowB
-  Margin               Dynamic
+  Margin               Static
   LatexType            Command
   LatexName            BankZeileB
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
@@ -563,9 +595,10 @@ Style BankRowB
 End
 
 Style BankRowC
-  Margin               Dynamic
+  Margin               Static
   LatexType            Command
   LatexName            BankZeileC
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
@@ -581,9 +614,10 @@ Style BankRowC
 End
 
 Style BankRowD
-  Margin               Dynamic
+  Margin               Static
   LatexType            Command
   LatexName            BankZeileD
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
@@ -599,9 +633,10 @@ Style BankRowD
 End
 
 Style BankRowE
-  Margin               Dynamic
+  Margin               Static
   LatexType            Command
   LatexName            BankZeileE
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
@@ -617,9 +652,10 @@ Style BankRowE
 End
 
 Style BankRowF
-  Margin               Dynamic
+  Margin               Static
   LatexType            Command
   LatexName            BankZeileF
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
@@ -637,9 +673,10 @@ End
 
 # RetourAdresse
 Style ReturnAddress
-  Margin               Dynamic
+  Margin               Static
   LatexType            Command
   LatexName            RetourAdresse
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   TopSep               1.5
   LabelSep             xx
   KeepEmpty            1
@@ -657,9 +694,10 @@ End
 
 # Postvermerk
 Style PostalComment
-  Margin               Dynamic
+  Margin               Static
   LatexType            Command
   LatexName            Postvermerk
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
@@ -673,13 +711,13 @@ Style PostalComment
     Color               Blue
   EndFont
 End
-   
+
 # Adresse
 Style Address
   Margin               Static
   LatexType            Command
   LatexName            Adresse
-  LeftMargin           TelephoneRowA:xx
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   TopSep               1
   KeepEmpty            1
@@ -700,7 +738,7 @@ Style MyRef
   Margin               Static
   LatexType            Command
   LatexName            MeinZeichen
-  LeftMargin           TelephoneRowA:xx
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   TopSep               1
   KeepEmpty            1
@@ -721,7 +759,7 @@ Style YourRef
   Margin               Static
   LatexType            Command
   LatexName            IhrZeichen
-  LeftMargin           TelephoneRowA:xx
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   KeepEmpty            1
@@ -743,7 +781,7 @@ Style YourMail
   Margin               Static
   LatexType            Command
   LatexName            IhrSchreiben
-  LeftMargin           TelephoneRowA:xx
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
@@ -764,7 +802,7 @@ Style Date
   Margin               Static
   LatexType            Command
   LatexName            Datum
-  LeftMargin           TelephoneRowA:xx
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Left
@@ -784,7 +822,7 @@ Style Reference
   Margin               Static
   LatexType            Command
   LatexName            Betreff
-  LeftMargin           TelephoneRowA:xx
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   TopSep               1
   ParSep               0.4
@@ -808,7 +846,7 @@ Style Opening
   LatexType            Command
   LatexName            Anrede
   KeepEmpty            1
-  LeftMargin           TelephoneRowA:xx
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   TopSep               1
   ParSep               0.4
@@ -829,7 +867,7 @@ Style Closing
   Margin               Static
   LatexType            Command
   LatexName            LyxGruss
-  LeftMargin           xxxxxxxxxxxx::xx
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   ParSep               0.4
   KeepEmpty            1
@@ -855,7 +893,7 @@ Style Signature
   Margin               Static
   LatexType            Command
   LatexName            Unterschrift
-  LeftMargin           xxxxxxxxxxxx::xx
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
@@ -870,14 +908,13 @@ Style Signature
   EndFont
 End
 
-
 # Anlagen style definition
 Style Encl.
   Margin               Static
   LatexType            Command
   LatexName            Anlagen
   KeepEmpty            1
-  LeftMargin           xxxxxxxxxxxx::xx
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   ParSep               0.4
   Align                Block
@@ -892,14 +929,13 @@ Style Encl.
   EndFont
 End
 
-
 # Verteiler style definition
 Style cc
   Margin               Static
   LatexType            Command
   LatexName            Verteiler
   KeepEmpty            1
-  LeftMargin           xxxxxxxxxxxx::xx
+  LeftMargin           xxxxxxxxxxxxxxxxxxxx
   LabelSep             xx
   ParSep               0.4
   Align                Block
@@ -914,12 +950,10 @@ Style cc
   EndFont
 End
 
-
-
-Input stdfloats.inc
-Input stdcounters.inc
-
-
+Input stdlists.inc
+Input stdlayouts.inc
+NoStyle                        Verse
+NoStyle                        --Separator--
 
 # Input lyxmacros.inc