X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Fdinbrief.layout;h=d1ebc18c3b84dfeafc1fd71c36321b456aeb6220;hb=d6fecb4aa47899ea3fe02d1699e0ffc81f364910;hp=7d03dbb149416252da0dfc93157b9698a69f0907;hpb=2cb757c4c890ddf50f3f6dd8fc249d12f90261e7;p=lyx.git

diff --git a/lib/layouts/dinbrief.layout b/lib/layouts/dinbrief.layout
index 7d03dbb149..d1ebc18c3b 100644
--- a/lib/layouts/dinbrief.layout
+++ b/lib/layouts/dinbrief.layout
@@ -1,16 +1,20 @@
 #% 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>
 #    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,
 #    or letter (see also the update of the dinbrief.lyx template)
+# Modified by: Juergen Spitzmueller <spitz@lyx.org>
+#    use English strings, localization is done by gettext!
 
-Format 10
+Format 49
 
 Input letter.layout
 
@@ -20,10 +24,14 @@ Preamble
 	\newcommand{\areacode}{}
 EndPreamble
 
-Style DinBrief		# auxiliary style copied by other dinbrief styles
+# auxiliary style copied by other dinbrief styles
+# 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	"Unsere Zeichen"
+	LeftMargin	"Rucksende-Adresse:"
 	Align		Left
 	AlignPossible	Left
 	LabelType	Static
@@ -36,13 +44,18 @@ Style DinBrief		# auxiliary style copied by other dinbrief styles
 	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
-	LabelString	"Anschrift:"
-	KeepEmpty	1		# compulsory style
+	CopyStyle	Addresses
+	LabelString	"Address:"
+	KeepEmpty	1
 	BottomSep	0.1
 	LatexName	letter
 End
@@ -52,63 +65,69 @@ End
 
 # need to be placed before the Opening in the LyX document!
 
-Style My_Address	# backaddress in letter head
-	CopyStyle	DinBrief
-	LabelString	"Briefkopf:"
+# backaddress in letter head
+Style My_Address
+	CopyStyle	Addresses
+	LabelString	"Sender Address:"
 	LatexName	address
-	KeepEmpty	1		# compulsory style
+	KeepEmpty	1
 	BottomSep	0.5
 	AlignPossible	Block, Left, Right, Center
 End
 
-Style "Return address"	# backaddress in address window
-	CopyStyle	DinBrief
-	LabelString	"Absender:"
+# backaddress in address window
+Style "Return address"
+	CopyStyle	Addresses
+	LabelString	"Backaddress:"
 	LatexName	backaddress
 	TextFont
 	    Size	Small
 	EndFont
 End
 
-Style "Postal comment"	# vor der Emfängeranschrift (Einschreiben, Luftpost)
-	CopyStyle	DinBrief
-	LabelString	"Postvermerk:"
+# Printed above the address (e.g., Air Mail, Registered Mail)
+Style "Postal comment"
+	CopyStyle	Addresses
+	LabelString	"Postal Remark:"
 	LatexName	postremark
 End
 
-Style Handling		# rechts neben der Emf�ngeranschrift (Eilt, Pes�nlich)
-	CopyStyle	DinBrief
-	LabelString	"Zusatz:"
+# Printed right next to Receiver (e.g., Urgent, Confidential)
+Style Handling
+	CopyStyle	Addresses
+	LabelString	"Handling:"
 	LatexName	handling
 End
 
 Style YourRef
 	CopyStyle	DinBrief
-	LabelString	"Ihre Zeichen:" # "Ihre Zeichen/Ihre Nachricht vom"
+	LabelString	"Your ref.:"
 	LatexName	yourmail
 End
 
 Style MyRef
 	CopyStyle	DinBrief
-	LabelString	"Unsere Zeichen:"
+	LabelString	"Our ref.:"
 	LatexName	sign
 End
 
 Style Writer
 	CopyStyle	DinBrief
-	LabelString	"Sachbearbeiter:"
+	LabelString	"Writer:"
 	LatexName	writer
 End
 
 Style Signature
 	CopyStyle	DinBrief
-	LabelString	"Unterschrift:"
+	Category        Closings
+	LabelString	"Signature:"
 	LatexName	signature
 End
 
-Style Bottomtext	# contact info at the bottom of the first page
+# contact info at the bottom of the first page
+Style Bottomtext
 	CopyStyle	DinBrief
-	LabelString	"Fußzeile(n):"
+	LabelString	"Bottom text:"
 	LatexName	bottomtext
 	AlignPossible	Block, Left, Right, Center
 End
@@ -118,20 +137,20 @@ End
 
 Style "Area code"
 	CopyStyle	DinBrief
-	LabelString	"Vorwahl:"
+	LabelString	"Area Code:"
 	LatexName	"renewcommand{\areacode}"
 End
 
 Style Telephone
 	CopyStyle	DinBrief
-	LabelString	"Telefon:"
+	LabelString	"Telephone:"
 	LatexName	phone
 	LatexParam	{\areacode}
 End
 
 Style Location
 	CopyStyle	DinBrief
-	LabelString	"Ort:"
+	LabelString	"Location:"
 	LatexName	place
 	Margin		Right_Address_Box
 	TopSep		0.1
@@ -141,13 +160,14 @@ End
 
 Style Date
 	CopyStyle	Location
-	LabelString	"Datum:"
+	LabelString	"Date:"
 	LatexName	date
 End
 
-Style Subject		# dinbrief does not emphasize the subject line
+# dinbrief does not emphasize the subject line
+Style Subject
 	CopyStyle	DinBrief
-	LabelString	"Betreff:"
+	LabelString	"Subject:"
 	LatexName	subject
 	TopSep		0.4
 	BottomSep	0.4
@@ -163,11 +183,11 @@ End
 
 Style Opening
 	CopyStyle	DinBrief
-	LabelType	Top_Environment
+	LabelType	Above
 	LeftMargin	""
-	LabelString	"Anrede:"
+	LabelString	"Opening:"
 	LatexName	opening
-	KeepEmpty	1		# compulsory style
+	KeepEmpty	1
 	TopSep		1.5
 	BottomSep	1
 End
@@ -179,15 +199,20 @@ End
 
 Style Closing
 	CopyStyle	Opening
-	LabelString	"Gruß:"
+	Category        Closings
+	LabelString	"Closing:"
 	LatexName	closing
-	OptionalArgs	1
-	KeepEmpty	1		# compulsory style
+	Argument 1
+		LabelString   "Signature|S"
+		Tooltip       "Here you can insert a signature scan"
+	EndArgument
+	KeepEmpty	1
 End
 
 Style encl
 	CopyStyle	Opening
-	LabelString	"Anlage(n):"
+	Category        Closings
+	LabelString	"encl:"
 	LatexName	encl
 	TopSep		0.4
 	BottomSep	0.4
@@ -202,13 +227,13 @@ End
 
 Style cc
 	CopyStyle	encl
-	LabelString	"Verteiler:"
+	LabelString	"cc:"
 	LatexName	cc
 End
 
 Style PS
 	CopyStyle	encl
-	LabelString	"PS:"
+	LabelString	"Post Scriptum:"
 	LatexName	ps
 	Align		Block
 	AlignPossible	Block, Left
@@ -220,92 +245,113 @@ End
 
 # ease conversion from g-brief, scrletter, or letter
 
-Style SenderAddress	# scrletter
+# scrletter
+Style SenderAddress
 	ObsoletedBy	My_Address
 End
 
-Style Backaddress	# scrletter
+# scrletter
+Style Backaddress
 	ObsoletedBy	"Return address"
 End
 
-Style RetourAdresse	# g-brief-de
+# g-brief-de
+Style RetourAdresse
 	ObsoletedBy	"Return address"
 End
 
-Style Address		# dinbrief (gm old), g-brief-en, scrletter, ...
+# dinbrief (gm old), g-brief-en, scrletter, ...
+Style Address
 	ObsoletedBy	Send_To_Address
 End
 
-Style Adresse		# g-brief-de, g-brief2
+# g-brief-de, g-brief2
+Style Adresse
 	ObsoletedBy	Send_To_Address
 End
 
-Style Postvermerk	# g-brief-de
+# g-brief-de
+Style Postvermerk
 	ObsoletedBy	"Postal comment"
 End
 
-Style Zusatz		# g-brief-de
+# g-brief-de
+Style Zusatz
 	ObsoletedBy	Handling
 End
 
-Style IhrZeichen	# g-brief-de
+# g-brief-de
+Style IhrZeichen
 	ObsoletedBy	YourRef
 End
 
-# Ihr Schreiben vom ist in Dinbrief identisch mit Ihr Zeichen
+# These are identical in this class
 Style YourMail
 	ObsoletedBy	YourRef
 End
 
-Style IhrSchreiben	# g-brief-de
+# g-brief-de
+Style IhrSchreiben
 	ObsoletedBy	YourRef
 End
 
-Style MeinZeichen	# g-brief-de
+# g-brief-de
+Style MeinZeichen
 	ObsoletedBy	MyRef
 End
 
-Style Unterschrift	# g-brief-de
+# g-brief-de
+Style Unterschrift
 	ObsoletedBy	Signature
 End
 
-Style Phone		# dinbrief (gm old)
+# dinbrief (gm old)
+Style Phone
 	ObsoletedBy	Telephone
 End
 
-Style Telefon		# g-brief-de
+# g-brief-de
+Style Telefon
 	ObsoletedBy	Telephone
 End
 
-Style Place		# dinbrief (gm old)
+# dinbrief (gm old)
+Style Place
 	ObsoletedBy	Location
 End
 
-Style Stadt		# dinbrief v2
+# dinbrief v2
+Style Stadt
 	ObsoletedBy	Location
 End
 
-Style Town		# g-brief-en
+# g-brief-en
+Style Town
 	ObsoletedBy	Location
 End
 
-Style Ort		# g-brief-de
+# g-brief-de
+Style Ort
 	ObsoletedBy	Location
 End
 
-Style Datum		# g-brief-de
+# g-brief-de
+Style Datum
 	ObsoletedBy	Date
 End
 
-Style Reference		# g-brief-en, g-brief2
+# g-brief-en, g-brief2
+Style Reference
 	ObsoletedBy	Subject
 End
 
-Style Betreff		# g-brief-de
+# g-brief-de
+Style Betreff
 	ObsoletedBy	Subject
 End
 
-Style Anrede		# g-brief-de
+# g-brief-de
+Style Anrede
 	ObsoletedBy	Opening
 End
 
@@ -313,11 +359,14 @@ End
 Style Letter
 	ObsoletedBy	Standard
 End
-Style Brieftext		# g-brief-de
+
+# g-brief-de
+Style Brieftext
 	ObsoletedBy	Standard
 End
 
-Style Gruss		# g-brief-de
+# g-brief-de
+Style Gruss
 	ObsoletedBy	Closing
 End
 
@@ -325,21 +374,27 @@ Style ps
 	ObsoletedBy	PS
 End
 
-Style Encl.		# g-brief-en
+# g-brief-de
+Style Encl.
 	ObsoletedBy	encl
 End
 
-Style Anlagen		# g-brief-de
+# g-brief-de
+Style Anlagen
 	ObsoletedBy	encl
 End
 
-Style CC		# scrletter
+# scrletter
+Style CC
 	ObsoletedBy	cc
 End
-Style Verteiler		# g-brief-de
+
+# g-brief-de
+Style Verteiler
 	ObsoletedBy	cc
 End
 
-# Remove auxiliary style
+# Remove auxiliary styles
 NoStyle			DinBrief
+NoStyle			Addresses