X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Fdinbrief.layout;h=4c616b5d1609a0fd4611c5d8e3128cdb0b156789;hb=9c97021623b6db5239715eb543d65a5e779084b6;hp=d3908e49c5746364dda3d0c524924ca955a219fc;hpb=082bdf47c9b92f41142498b12f0b90d1f59bc80d;p=lyx.git

diff --git a/lib/layouts/dinbrief.layout b/lib/layouts/dinbrief.layout
index d3908e49c5..4c616b5d16 100644
--- a/lib/layouts/dinbrief.layout
+++ b/lib/layouts/dinbrief.layout
@@ -1,10 +1,12 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass{letter (DIN-Brief, German)}
+#  \DeclareLaTeXClass{DIN-Brief}
+#  \DeclareCategory{Letters}
 # German DIN-Brief textclass definition file.
 # Author : Juergen Vigna <jug@sad.it>
 # Modified by: Carsten Kaemmerer <kammerer@ips.cs.tu-bs.de>
-# Modified by: Guenter Milde <g.milde@users.berlios.de>
+# Modified by: Guenter Milde <milde@lyx.org>
 #    Dummy Style DinBrief for common layout features (removed at eof)
+#    Dummy Style Addresses for common address features (removed at eof)
 #    Generic style names (there are german translations for most names)
 #    Additional Styles and twiddeled layout
 #    Many "ObsoletedBy" to ease conversion from g-brief, scrletter,
@@ -12,7 +14,7 @@
 # Modified by: Juergen Spitzmueller <spitz@lyx.org>
 #    use English strings, localization is done by gettext!
 
-Format 21
+Format 80
 
 Input letter.layout
 
@@ -26,6 +28,7 @@ EndPreamble
 # the LeftMargin is set to the probably longest string
 # (no typo! the umlaut is delibarately omitted)
 Style DinBrief
+	Category        Letter
 	LatexType	Command
 	Margin		Static
 	LeftMargin	"Rucksende-Adresse:"
@@ -41,11 +44,16 @@ Style DinBrief
 	EndFont
 End
 
+Style Addresses
+	CopyStyle	DinBrief
+	Category        "Postal Data"
+End
+
 # Open a new letter
 # in dinbrief, this is an environment spanning the whole letter
 # (see scrlettr2 for an alternative lyx-implementation)
 Style Send_To_Address
-	CopyStyle	DinBrief
+	CopyStyle	Addresses
 	LabelString	"Address:"
 	KeepEmpty	1
 	BottomSep	0.1
@@ -59,7 +67,7 @@ End
 
 # backaddress in letter head
 Style My_Address
-	CopyStyle	DinBrief
+	CopyStyle	Addresses
 	LabelString	"Sender Address:"
 	LatexName	address
 	KeepEmpty	1
@@ -69,7 +77,7 @@ End
 
 # backaddress in address window
 Style "Return address"
-	CopyStyle	DinBrief
+	CopyStyle	Addresses
 	LabelString	"Backaddress:"
 	LatexName	backaddress
 	TextFont
@@ -79,14 +87,14 @@ End
 
 # Printed above the address (e.g., Air Mail, Registered Mail)
 Style "Postal comment"
-	CopyStyle	DinBrief
+	CopyStyle	Addresses
 	LabelString	"Postal Remark:"
 	LatexName	postremark
 End
 
 # Printed right next to Receiver (e.g., Urgent, Confidential)
 Style Handling
-	CopyStyle	DinBrief
+	CopyStyle	Addresses
 	LabelString	"Handling:"
 	LatexName	handling
 End
@@ -111,6 +119,7 @@ End
 
 Style Signature
 	CopyStyle	DinBrief
+	Category        Closings
 	LabelString	"Signature:"
 	LatexName	signature
 End
@@ -174,7 +183,7 @@ End
 
 Style Opening
 	CopyStyle	DinBrief
-	LabelType	Top_Environment
+	LabelType	Above
 	LeftMargin	""
 	LabelString	"Opening:"
 	LatexName	opening
@@ -190,14 +199,19 @@ End
 
 Style Closing
 	CopyStyle	Opening
+	Category        Closings
 	LabelString	"Closing:"
 	LatexName	closing
-	OptionalArgs	1
+	Argument 1
+		LabelString   "Signature|S"
+		Tooltip       "Here you can insert a signature scan"
+	EndArgument
 	KeepEmpty	1
 End
 
 Style encl
 	CopyStyle	Opening
+	Category        Closings
 	LabelString	"encl:"
 	LatexName	encl
 	TopSep		0.4
@@ -380,6 +394,7 @@ Style Verteiler
 	ObsoletedBy	cc
 End
 
-# Remove auxiliary style
+# Remove auxiliary styles
 NoStyle			DinBrief
+NoStyle			Addresses