- g-brief2 cleanups: Make Standard style the default as Letter style as default cause...

(since years now used by me successfully)
- new template for g-brief2

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17699 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/development/scons/scons_manifest.py b/development/scons/scons_manifest.py
index 29e6342812ccfde9bbc629df048907745fedfce9..7db423027b0b081aaa2e3932ade03d5d824bcd68 100644 (file)
--- a/development/scons/scons_manifest.py
+++ b/development/scons/scons_manifest.py
@@ -2273,6 +2273,7 @@ lib_templates_files = Split('''
     docbook_article.lyx
     elsart.lyx
     fr_beamer-conference-ornate-20min.lyx
+    g-brief2.lyx
     g-brief-de.lyx
     g-brief-en.lyx
     hollywood.lyx

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 84b84dc3cd164984b0eb3c45f0bf01f8a7d0bd3b..ab478b7c35df24001511cf7ec533d499c40c1219 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1000,6 +1000,7 @@ dist_templates_DATA = \
        templates/docbook_article.lyx \
        templates/elsart.lyx \
        templates/fr_beamer-conference-ornate-20min.lyx \
+       templates/g-brief2.lyx \
        templates/g-brief-de.lyx \
        templates/g-brief-en.lyx \
        templates/hollywood.lyx \

diff --git a/lib/layouts/g-brief2.layout b/lib/layouts/g-brief2.layout
index 58ad73551f6050e9e67b821eb4ce5b33971ac759..8b7c54af1a0b953425b9324d317b916d2d445d4e 100644 (file)
--- a/lib/layouts/g-brief2.layout
+++ b/lib/layouts/g-brief2.layout
@@ -9,14 +9,12 @@
 # Input stdletter.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,19 +26,26 @@ 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
   AlignPossible        Block, Left, Right, Center
   LabelType            Top_Environment
-  LabelString          "Letter:"
+  LabelString          Letter:
   LabelFont
     Series             Bold
     Shape              Italic
@@ -48,10 +53,6 @@ Style Letter
   EndFont
 End
 
-
-
-
-
 # Name und Titel des Absenders
 Style Name
   Margin               Static
@@ -63,7 +64,7 @@ Style Name
   Align                Block
   AlignPossible        Block, Left
   LabelType            Static
-  LabelString          "Name:"
+  LabelString          Name:
   # label font definition
   LabelFont
     Series             Bold
@@ -74,17 +75,16 @@ End
 
 # Name und Spruch in der Fusszeile
 Style NameRowA
-  Margin               Static
+  Margin               Dynamic
   LatexType            Command
   LatexName            NameZeileA
-  LeftMargin           TelephoneRowA:xx
   LabelSep             xx
-  TopSep        1.5
+  TopSep               1.5
   KeepEmpty            1
   Align                Block
   AlignPossible        Block, Left
   LabelType            Static
-  LabelString          "NameRowA:"
+  LabelString          NameRowA:
   # label font definition
   LabelFont
     Series             Bold
@@ -94,16 +94,15 @@ Style NameRowA
 End
 
 Style NameRowB
-  Margin               Static
+  Margin               Dynamic
   LatexType            Command
   LatexName            NameZeileB
-  LeftMargin           TelephoneRowA:xx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
   AlignPossible        Block, Left
   LabelType            Static
-  LabelString          "NameRowB:"
+  LabelString          NameRowB:
   # label font definition
   LabelFont
     Series             Bold
@@ -113,16 +112,15 @@ Style NameRowB
 End
 
 Style NameRowC
-  Margin               Static
+  Margin               Dynamic
   LatexType            Command
   LatexName            NameZeileC
-  LeftMargin           TelephoneRowA:xx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
   AlignPossible        Block, Left
   LabelType            Static
-  LabelString          "NameRowC:"
+  LabelString          NameRowC:
   # label font definition
   LabelFont
     Series             Bold
@@ -132,16 +130,15 @@ Style NameRowC
 End
 
 Style NameRowD
-  Margin               Static
+  Margin               Dynamic
   LatexType            Command
   LatexName            NameZeileD
-  LeftMargin           TelephoneRowA:xx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
   AlignPossible        Block, Left
   LabelType            Static
-  LabelString          "NameRowD:"
+  LabelString          NameRowD:
   # label font definition
   LabelFont
     Series             Bold
@@ -151,16 +148,15 @@ Style NameRowD
 End
 
 Style NameRowE
-  Margin               Static
+  Margin               Dynamic
   LatexType            Command
   LatexName            NameZeileE
-  LeftMargin           TelephoneRowA:xx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
   AlignPossible        Block, Left
   LabelType            Static
-  LabelString          "NameRowE:"
+  LabelString          NameRowE:
   # label font definition
   LabelFont
     Series             Bold
@@ -170,16 +166,15 @@ Style NameRowE
 End
 
 Style NameRowF
-  Margin               Static
+  Margin               Dynamic
   LatexType            Command
   LatexName            NameZeileF
-  LeftMargin           TelephoneRowA:xx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
   AlignPossible        Block, Left
   LabelType            Static
-  LabelString          "NameRowF:"
+  LabelString          NameRowF:
   # label font definition
   LabelFont
     Series             Bold
@@ -189,16 +184,15 @@ Style NameRowF
 End
 
 Style NameRowG
-  Margin               Static
+  Margin               Dynamic
   LatexType            Command
   LatexName            NameZeileG
-  LeftMargin           TelephoneRowA:xx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
   AlignPossible        Block, Left
   LabelType            Static
-  LabelString          "NameRowG:"
+  LabelString          NameRowG:
   # label font definition
   LabelFont
     Series             Bold
@@ -208,38 +202,17 @@ 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
+Style AdressRowA
+  Margin               Dynamic
   LatexType            Command
   LatexName            AdressZeileA
-  LeftMargin           TelephoneRowA:xx
-  TopSep        1.5
+  TopSep               1
   LabelSep             xx
   KeepEmpty            1
   Align                Block
   AlignPossible        Block, Left
   LabelType            Static
-  LabelString          "AddressRowA:"
+  LabelString          AdressRowA:
   # label font definition
   LabelFont
     Series             Bold
@@ -248,17 +221,16 @@ Style AddressRowA
   EndFont
 End
 
-Style AddressRowB
-  Margin               Static
+Style AdressRowB
+  Margin               Dynamic
   LatexType            Command
   LatexName            AdressZeileB
-  LeftMargin           TelephoneRowA:xx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
   AlignPossible        Block, Left
   LabelType            Static
-  LabelString          "AddressRowB:"
+  LabelString          AdressRowB:
   # label font definition
   LabelFont
     Series             Bold
@@ -267,17 +239,16 @@ Style AddressRowB
   EndFont
 End
 
-Style AddressRowC
-  Margin               Static
+Style AdressRowC
+  Margin               Dynamic
   LatexType            Command
   LatexName            AdressZeileC
-  LeftMargin           TelephoneRowA:xx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
   AlignPossible        Block, Left
   LabelType            Static
-  LabelString          "AddressRowC:"
+  LabelString          AdressRowC:
   # label font definition
   LabelFont
     Series             Bold
@@ -286,17 +257,16 @@ Style AddressRowC
   EndFont
 End
 
-Style AddressRowD
-  Margin               Static
+Style AdressRowD
+  Margin               Dynamic
   LatexType            Command
   LatexName            AdressZeileD
-  LeftMargin           TelephoneRowA:xx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
   AlignPossible        Block, Left
   LabelType            Static
-  LabelString          "AddressRowD:"
+  LabelString          AdressRowD:
   # label font definition
   LabelFont
     Series             Bold
@@ -305,17 +275,16 @@ Style AddressRowD
   EndFont
 End
 
-Style AddressRowE
-  Margin               Static
+Style AdressRowE
+  Margin               Dynamic
   LatexType            Command
   LatexName            AdressZeileE
-  LeftMargin           TelephoneRowA:xx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
   AlignPossible        Block, Left
   LabelType            Static
-  LabelString          "AddressRowE:"
+  LabelString          AdressRowE:
   # label font definition
   LabelFont
     Series             Bold
@@ -324,17 +293,16 @@ Style AddressRowE
   EndFont
 End
 
-Style AddressRowF
-  Margin               Static
+Style AdressRowF
+  Margin               Dynamic
   LatexType            Command
   LatexName            AdressZeileF
-  LeftMargin           TelephoneRowA:xx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
   AlignPossible        Block, Left
   LabelType            Static
-  LabelString          "AddressRowF:"
+  LabelString          AdressRowF:
   # label font definition
   LabelFont
     Series             Bold
@@ -344,17 +312,16 @@ Style AddressRowF
 End
 
 Style TelephoneRowA
-  Margin               Static
+  Margin               Dynamic
   LatexType            Command
   LatexName            TelefonZeileA
-  LeftMargin           TelephoneRowA:xx
-  TopSep        1.5
+  TopSep               1
   LabelSep             xx
   KeepEmpty            1
   Align                Block
   AlignPossible        Block, Left
   LabelType            Static
-  LabelString          "TelephoneRowA:"
+  LabelString          TelephoneRowA:
   # label font definition
   LabelFont
     Series             Bold
@@ -364,16 +331,15 @@ Style TelephoneRowA
 End
 
 Style TelephoneRowB
-  Margin               Static
+  Margin               Dynamic
   LatexType            Command
   LatexName            TelefonZeileB
-  LeftMargin           TelephoneRowA:xx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
   AlignPossible        Block, Left
   LabelType            Static
-  LabelString          "TelephoneRowB:"
+  LabelString          TelephoneRowB:
   # label font definition
   LabelFont
     Series             Bold
@@ -383,16 +349,15 @@ Style TelephoneRowB
 End
 
 Style TelephoneRowC
-  Margin               Static
+  Margin               Dynamic
   LatexType            Command
   LatexName            TelefonZeileC
-  LeftMargin           TelephoneRowA:xx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
   AlignPossible        Block, Left
   LabelType            Static
-  LabelString          "TelephoneRowC:"
+  LabelString          TelephoneRowC:
   # label font definition
   LabelFont
     Series             Bold
@@ -402,16 +367,15 @@ Style TelephoneRowC
 End
 
 Style TelephoneRowD
-  Margin               Static
+  Margin               Dynamic
   LatexType            Command
   LatexName            TelefonZeileD
-  LeftMargin           TelephoneRowA:xx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
   AlignPossible        Block, Left
   LabelType            Static
-  LabelString          "TelephoneRowD:"
+  LabelString          TelephoneRowD:
   # label font definition
   LabelFont
     Series             Bold
@@ -421,16 +385,15 @@ Style TelephoneRowD
 End
 
 Style TelephoneRowE
-  Margin               Static
+  Margin               Dynamic
   LatexType            Command
   LatexName            TelefonZeileE
-  LeftMargin           TelephoneRowA:xx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
   AlignPossible        Block, Left
   LabelType            Static
-  LabelString          "TelephoneRowE:"
+  LabelString          TelephoneRowE:
   # label font definition
   LabelFont
     Series             Bold
@@ -440,16 +403,15 @@ Style TelephoneRowE
 End
 
 Style TelephoneRowF
-  Margin               Static
+  Margin               Dynamic
   LatexType            Command
   LatexName            TelefonZeileF
-  LeftMargin           TelephoneRowA:xx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
   AlignPossible        Block, Left
   LabelType            Static
-  LabelString          "TelephoneRowF:"
+  LabelString          TelephoneRowF:
   # label font definition
   LabelFont
     Series             Bold
@@ -459,17 +421,16 @@ Style TelephoneRowF
 End
 
 Style InternetRowA
-  Margin               Static
+  Margin               Dynamic
   LatexType            Command
   LatexName            InternetZeileA
-  LeftMargin           TelephoneRowA:xx
-  TopSep        1.5
+  TopSep               1
   LabelSep             xx
   KeepEmpty            1
   Align                Block
   AlignPossible        Block, Left
   LabelType            Static
-  LabelString          "InternetRowA:"
+  LabelString          InternetRowA:
   # label font definition
   LabelFont
     Series             Bold
@@ -479,16 +440,15 @@ Style InternetRowA
 End
 
 Style InternetRowB
-  Margin               Static
+  Margin               Dynamic
   LatexType            Command
   LatexName            InternetZeileB
-  LeftMargin           TelephoneRowA:xx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
   AlignPossible        Block, Left
   LabelType            Static
-  LabelString          "InternetRowB:"
+  LabelString          InternetRowB:
   # label font definition
   LabelFont
     Series             Bold
@@ -496,18 +456,16 @@ Style InternetRowB
     Color       Green
   EndFont
 End
-
 Style InternetRowC
-  Margin               Static
+  Margin               Dynamic
   LatexType            Command
   LatexName            InternetZeileC
-  LeftMargin           TelephoneRowA:xx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
   AlignPossible        Block, Left
   LabelType            Static
-  LabelString          "InternetRowC:"
+  LabelString          InternetRowC:
   # label font definition
   LabelFont
     Series             Bold
@@ -515,18 +473,16 @@ Style InternetRowC
     Color       Green
   EndFont
 End
-
 Style InternetRowD
-  Margin               Static
+  Margin               Dynamic
   LatexType            Command
   LatexName            InternetZeileD
-  LeftMargin           TelephoneRowA:xx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
   AlignPossible        Block, Left
   LabelType            Static
-  LabelString          "InternetRowD:"
+  LabelString          InternetRowD:
   # label font definition
   LabelFont
     Series             Bold
@@ -534,18 +490,16 @@ Style InternetRowD
     Color       Green
   EndFont
 End
-
 Style InternetRowE
-  Margin               Static
+  Margin               Dynamic
   LatexType            Command
   LatexName            InternetZeileE
-  LeftMargin           TelephoneRowA:xx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
   AlignPossible        Block, Left
   LabelType            Static
-  LabelString          "InternetRowE:"
+  LabelString          InternetRowE:
   # label font definition
   LabelFont
     Series             Bold
@@ -553,18 +507,16 @@ Style InternetRowE
     Color       Green
   EndFont
 End
-
 Style InternetRowF
-  Margin               Static
+  Margin               Dynamic
   LatexType            Command
   LatexName            InternetZeileF
-  LeftMargin           TelephoneRowA:xx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
   AlignPossible        Block, Left
   LabelType            Static
-  LabelString          "InternetRowF:"
+  LabelString          InternetRowF:
   # label font definition
   LabelFont
     Series             Bold
@@ -574,17 +526,16 @@ Style InternetRowF
 End
 
 Style BankRowA
-  Margin               Static
+  Margin               Dynamic
   LatexType            Command
   LatexName            BankZeileA
-  LeftMargin           TelephoneRowA:xx
-  TopSep        1.5
+  TopSep               1
   LabelSep             xx
   KeepEmpty            1
   Align                Block
   AlignPossible        Block, Left
   LabelType            Static
-  LabelString          "BankRowA:"
+  LabelString          BankRowA:
   # label font definition
   LabelFont
     Series             Bold
@@ -594,16 +545,15 @@ Style BankRowA
 End
 
 Style BankRowB
-  Margin               Static
+  Margin               Dynamic
   LatexType            Command
   LatexName            BankZeileB
-  LeftMargin           TelephoneRowA:xx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
   AlignPossible        Block, Left
   LabelType            Static
-  LabelString          "BankRowB:"
+  LabelString          BankRowB:
   # label font definition
   LabelFont
     Series             Bold
@@ -613,16 +563,15 @@ Style BankRowB
 End
 
 Style BankRowC
-  Margin               Static
+  Margin               Dynamic
   LatexType            Command
   LatexName            BankZeileC
-  LeftMargin           TelephoneRowA:xx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
   AlignPossible        Block, Left
   LabelType            Static
-  LabelString          "BankRowC:"
+  LabelString          BankRowC:
   # label font definition
   LabelFont
     Series             Bold
@@ -632,16 +581,15 @@ Style BankRowC
 End
 
 Style BankRowD
-  Margin               Static
+  Margin               Dynamic
   LatexType            Command
   LatexName            BankZeileD
-  LeftMargin           TelephoneRowA:xx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
   AlignPossible        Block, Left
   LabelType            Static
-  LabelString          "BankRowD:"
+  LabelString          BankRowD:
   # label font definition
   LabelFont
     Series             Bold
@@ -651,16 +599,15 @@ Style BankRowD
 End
 
 Style BankRowE
-  Margin               Static
+  Margin               Dynamic
   LatexType            Command
   LatexName            BankZeileE
-  LeftMargin           TelephoneRowA:xx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
   AlignPossible        Block, Left
   LabelType            Static
-  LabelString          "BankRowE:"
+  LabelString          BankRowE:
   # label font definition
   LabelFont
     Series             Bold
@@ -670,16 +617,15 @@ Style BankRowE
 End
 
 Style BankRowF
-  Margin               Static
+  Margin               Dynamic
   LatexType            Command
   LatexName            BankZeileF
-  LeftMargin           TelephoneRowA:xx
   LabelSep             xx
   KeepEmpty            1
   Align                Block
   AlignPossible        Block, Left
   LabelType            Static
-  LabelString          "BankRowF:"
+  LabelString          BankRowF:
   # label font definition
   LabelFont
     Series             Bold
@@ -689,19 +635,18 @@ Style BankRowF
 End
 
 
-
 # RetourAdresse
 Style ReturnAddress
-  Margin               Static
+  Margin               Dynamic
   LatexType            Command
   LatexName            RetourAdresse
-  LeftMargin           TelephoneRowA:xx
+  TopSep               1.5
   LabelSep             xx
   KeepEmpty            1
   Align                Block
   AlignPossible        Block, Left
   LabelType            Static
-  LabelString          "ReturnAddress:"
+  LabelString          ReturnAddress:
   # label font definition
   LabelFont
     Series             Bold
@@ -710,19 +655,17 @@ Style ReturnAddress
   EndFont
 End
 
-
-# MeinZeichen
-Style MyRef
-  Margin               Static
+# Postvermerk
+Style PostalComment
+  Margin               Dynamic
   LatexType            Command
-  LatexName            MeinZeichen
-  LeftMargin           TelephoneRowA:xx
+  LatexName            Postvermerk
   LabelSep             xx
   KeepEmpty            1
   Align                Block
   AlignPossible        Block, Left
   LabelType            Static
-  LabelString          "MyRef:"
+  LabelString          PostalComment:
   # label font definition
   LabelFont
     Series             Bold
@@ -730,20 +673,20 @@ Style MyRef
     Color               Blue
   EndFont
 End
-
-# IhrZeichen
-Style YourRef
+   
+# Adresse
+Style Address
   Margin               Static
   LatexType            Command
-  LatexName            IhrZeichen
+  LatexName            Adresse
   LeftMargin           TelephoneRowA:xx
   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 +695,19 @@ Style YourRef
   EndFont
 End
 
-
-# IhrSchreiben
-Style YourMail
+# MeinZeichen
+Style MyRef
   Margin               Static
   LatexType            Command
-  LatexName            IhrSchreiben
+  LatexName            MeinZeichen
   LeftMargin           TelephoneRowA:xx
   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 +716,19 @@ Style YourMail
   EndFont
 End
 
-
-# Postvermerk
-Style PostalComment
+# IhrZeichen
+Style YourRef
   Margin               Static
   LatexType            Command
-  LatexName            Postvermerk
+  LatexName            IhrZeichen
   LeftMargin           TelephoneRowA:xx
   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 +738,18 @@ Style PostalComment
 End
 
 
-# Adresse
-Style Address
+# IhrSchreiben
+Style YourMail
   Margin               Static
   LatexType            Command
-  LatexName            Adresse
+  LatexName            IhrSchreiben
   LeftMargin           TelephoneRowA:xx
   LabelSep             xx
-  TopSep               1.5
   KeepEmpty            1
   Align                Block
   AlignPossible        Block, Left
   LabelType            Static
-  LabelString          "Address:"
+  LabelString          YourMail:
   # label font definition
   LabelFont
     Series             Bold
@@ -828,7 +770,7 @@ Style Date
   Align                Left
   AlignPossible        Block, Left
   LabelType            Static
-  LabelString          "Date:"
+  LabelString          Date:
   # label font definition
   LabelFont
     Series             Bold
@@ -844,13 +786,13 @@ Style Reference
   LatexName            Betreff
   LeftMargin           TelephoneRowA:xx
   LabelSep             xx
-  TopSep               1.5
+  TopSep               1
   ParSep               0.4
   KeepEmpty            1
   Align                Block
   AlignPossible        Block, Left
   LabelType            Static
-  LabelString          "Reference:"
+  LabelString          Reference:
   # label font definition
   LabelFont
     Series             Bold
@@ -868,13 +810,12 @@ Style Opening
   KeepEmpty            1
   LeftMargin           TelephoneRowA:xx
   LabelSep             xx
-  TopSep               1.5
+  TopSep               1
   ParSep               0.4
   Align                Block
   AlignPossible        Block, Left
   LabelType            Static
-  LabelString          "Opening:"
-
+  LabelString          Opening:
   # label font definition
   LabelFont
     Series             Bold
@@ -883,22 +824,44 @@ 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           xxxxxxxxxxxx::xx
   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           xxxxxxxxxxxx::xx
+  LabelSep             xx
+  KeepEmpty            1
+  Align                Block
+  AlignPossible        Block, Left
+  LabelType            Static
+  LabelString          Signature:
   # label font definition
   LabelFont
     Series             Bold
@@ -908,20 +871,19 @@ Style Encl.
 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           xxxxxxxxxxxx::xx
   LabelSep             xx
   ParSep               0.4
   Align                Block
   AlignPossible        Block, Left
   LabelType            Static
-  LabelString          "cc:"
-
+  LabelString          Encl.:
   # label font definition
   LabelFont
     Series             Bold
@@ -930,35 +892,26 @@ 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           xxxxxxxxxxxx::xx
   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
 
 
@@ -968,8 +921,6 @@ Input stdcounters.inc
 
 
 
-
-
 # Input lyxmacros.inc
 
 # Remove some unwanted styles.

diff --git a/lib/templates/g-brief2.lyx b/lib/templates/g-brief2.lyx
new file mode 100644 (file)
index 0000000..b06cfaa
--- /dev/null
+++ b/lib/templates/g-brief2.lyx
@@ -0,0 +1,277 @@
+#LyX 1.5.0svn created this file. For more info see http://www.lyx.org/
+\lyxformat 263
+\begin_document
+\begin_header
+\textclass g-brief2
+\begin_preamble
+\fenstermarken % prints address window marks
+\faltmarken % prints folding marks
+%\lochermarke % prints puncher marks 
+\trennlinien % prints striplines
+%\unserzeichen % prints "our ref" instead of "my ref"
+\end_preamble
+\language english
+\inputencoding auto
+\font_roman palatino
+\font_sans default
+\font_typewriter default
+\font_default_family default
+\font_sc false
+\font_osf false
+\font_sf_scale 100
+\font_tt_scale 100
+\graphics default
+\paperfontsize 12
+\spacing single
+\papersize default
+\use_geometry false
+\use_amsmath 1
+\use_esint 1
+\cite_engine basic
+\use_bibtopic false
+\paperorientation portrait
+\secnumdepth 4
+\tocdepth 4
+\paragraph_separation skip
+\defskip medskip
+\quotes_language english
+\papercolumns 1
+\papersides 1
+\paperpagestyle empty
+\tracking_changes false
+\output_changes false
+\author "usti" 
+\end_header
+
+\begin_body
+
+\begin_layout Standard
+\begin_inset Note Note
+status open
+
+\begin_layout Standard
+Note also the document preamble settings.
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Name
+Place for corporate-name or logo
+\end_layout
+
+\begin_layout NameRowA
+Bob Testman
+\end_layout
+
+\begin_layout NameRowB
+
+\end_layout
+
+\begin_layout NameRowC
+Exampletester
+\end_layout
+
+\begin_layout NameRowD
+
+\end_layout
+
+\begin_layout NameRowE
+
+\end_layout
+
+\begin_layout NameRowF
+
+\end_layout
+
+\begin_layout NameRowG
+
+\end_layout
+
+\begin_layout AdressRowA
+Example Corporation
+\end_layout
+
+\begin_layout AdressRowB
+
+\end_layout
+
+\begin_layout AdressRowC
+Institut for example design
+\end_layout
+
+\begin_layout AdressRowD
+Examplestreet 103
+\end_layout
+
+\begin_layout AdressRowE
+10001 Testburg
+\end_layout
+
+\begin_layout AdressRowF
+
+\end_layout
+
+\begin_layout TelephoneRowA
+Mobile: 0001/ 123 4569
+\end_layout
+
+\begin_layout TelephoneRowB
+Fax: 0001/ 123 4567
+\end_layout
+
+\begin_layout TelephoneRowC
+
+\end_layout
+
+\begin_layout TelephoneRowD
+
+\end_layout
+
+\begin_layout TelephoneRowE
+
+\end_layout
+
+\begin_layout InternetRowA
+http:/
+\begin_inset Formula $\!$
+\end_inset
+
+/www.exampletest.xz
+\end_layout
+
+\begin_layout InternetRowB
+testman@exampletest.xz
+\end_layout
+
+\begin_layout InternetRowC
+
+\end_layout
+
+\begin_layout InternetRowD
+
+\end_layout
+
+\begin_layout InternetRowE
+
+\end_layout
+
+\begin_layout InternetRowF
+
+\end_layout
+
+\begin_layout BankRowA
+
+\end_layout
+
+\begin_layout BankRowB
+
+\end_layout
+
+\begin_layout BankRowC
+
+\end_layout
+
+\begin_layout BankRowD
+
+\end_layout
+
+\begin_layout BankRowE
+
+\end_layout
+
+\begin_layout BankRowF
+
+\end_layout
+
+\begin_layout ReturnAddress
+Example Corp.
+ 
+\begin_inset Formula $\cdot$
+\end_inset
+
+ Examplestreet 103 
+\begin_inset Formula $\cdot$
+\end_inset
+
+ 10001 Testburg
+\end_layout
+
+\begin_layout PostalComment
+Airmail
+\end_layout
+
+\begin_layout Address
+
+\size large
+Cynthia Mustermann
+\newline
+Musterstraße
+\newline
+
+\newline
+01234 Musterstadt
+\newline
+Germany
+\end_layout
+
+\begin_layout MyRef
+my ref
+\end_layout
+
+\begin_layout YourRef
+your ref
+\end_layout
+
+\begin_layout YourMail
+01/ 01 2004
+\end_layout
+
+\begin_layout Date
+\begin_inset ERT
+status collapsed
+
+\begin_layout Standard
+
+
+\backslash
+today
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Reference
+Reference
+\end_layout
+
+\begin_layout Opening
+Ladies and gentlemen,
+\end_layout
+
+\begin_layout Closing
+regards
+\end_layout
+
+\begin_layout Signature
+Bob Testman
+\end_layout
+
+\begin_layout Encl.
+Encl.
+\end_layout
+
+\begin_layout cc
+cc
+\end_layout
+
+\begin_layout Letter
+this is the letter text.
+\end_layout
+
+\end_body
+\end_document