X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Fscrlttr2.layout;h=2d652d1fbfd65e5d8e450eebc2e8b0e7ec99aff1;hb=a6e20d713816670662e5780004df8e22a7144d1c;hp=475ed5a00273a10ebc86a8df876f0eaac9ff6eea;hpb=d0aa20afcfc2a1ada9627005fb2216f67688895b;p=lyx.git

diff --git a/lib/layouts/scrlttr2.layout b/lib/layouts/scrlttr2.layout
index 475ed5a002..2d652d1fbf 100644
--- a/lib/layouts/scrlttr2.layout
+++ b/lib/layouts/scrlttr2.layout
@@ -5,7 +5,15 @@
 # Juergen Spitzmueller <spitz@lyx.org>, 2003/2/17.
 # Uwe Stöhr <uwestoehr@web.de>, 2008/2/03.
 
-Format 82
+# TODO: DocBook doesn't support several letters in the same file.
+# DocBook design note: there are several ways to implement sender data, this class does it in 
+# another way that the other letters. Usually, there is a large <address> tag with author 
+# information in <info>, but there is no possibility to include a URL in this case. 
+# Therefore, here, we use a <author> in <info>, having an <address>. <author> allows a URL
+# (<uri>) and an address. However, phone and fax numbers should be put in <address>, they 
+# are not allowed directly in <author>... The generated DocBook will not be valid due to this!
+
+Format 103
 Provides subscript 1
 
 Style Standard
@@ -14,6 +22,7 @@ Style Standard
 	ParSep                0.4
 	AlignPossible         Block, Left, Right, Center
 	ParIndent             MM
+	DocBookTag            para
 End
 
 Input stdlists.inc
@@ -67,12 +76,17 @@ Style Address
 	  Series              Bold
 	  Shape               Italic
 	  Size                Small
-	  Color               Blue
+	  Color               textlabel1
 	EndFont
+    DocBookTag         NONE
+    DocBookWrapperTag  address
+    DocBookWrapperMergeWithPrevious  true
+    DocBookInInfo      always
 End
 
 
 # Start new letter
+# Not supported by DocBook.
 Style NextAddress
 	LatexType             Command
 	LatexName             end{letter}\begin{letter}
@@ -89,7 +103,7 @@ Style NextAddress
 	  Series              Bold
 	  Shape               Italic
 	  Size                Small
-	  Color               Blue
+	  Color               textlabel1
 	EndFont
 End
 
@@ -110,8 +124,10 @@ Style Opening
 	LabelFont
 	  Series              Bold
 	  Shape               Italic
-	  Color               Magenta
+	  Color               textlabel3
 	EndFont
+	DocBookTag            para
+	DocBookAttr           role='opening'
 End
 
 
@@ -120,6 +136,8 @@ Style Closing
 	LatexType             Command
 	LatexName             closing
 	LabelString           "Closing:"
+	DocBookTag            para
+	DocBookAttr           role='closing'
 End
 
 
@@ -128,6 +146,8 @@ Style PS
 	LatexType             Command
 	LatexName             ps
 	LabelString           "Post Scriptum:"
+	DocBookTag            para
+	DocBookAttr           role='post-scriptum'
 End
 
 
@@ -136,6 +156,8 @@ Style CC
 	LatexType             Command
 	LatexName             cc
 	LabelString           "cc:"
+	DocBookTag            para
+	DocBookAttr           role='carbon-copy'
 End
 
 
@@ -143,6 +165,8 @@ Style Encl
 	CopyStyle             Opening
 	LatexName             encl
 	LabelString           "encl:"
+	DocBookTag            para
+	DocBookAttr           role='enclosed'
 End
 
 
@@ -164,8 +188,14 @@ Style Name
 	LabelFont
 	  Series              Bold
 	  Shape               Italic
-	  Color               Blue
+	  Color               textlabel1
 	EndFont
+	DocBookTag            personname
+	DocBookTagType        paragraph
+	DocBookWrapperTag     author
+	DocBookWrapperTagType paragraph
+	DocBookWrapperMergeWithPrevious true
+	DocBookInInfo         always     
 End
 
 
@@ -174,6 +204,9 @@ Style Signature
 	LatexName             setkomavar
 	LatexParam            {signature}
 	LabelString           "Signature:"
+	DocBookTag            para
+	DocBookWrapperTag     abstract
+	DocBookWrapperAttr    role='signature'
 End
 
 
@@ -182,6 +215,12 @@ Style SenderAddress
 	LatexName             setkomavar
 	LatexParam            {fromaddress}
 	LabelString           "Sender Address:"
+	DocBookTag            address
+	DocBookTagType        paragraph
+	DocBookWrapperTag     author
+	DocBookWrapperTagType paragraph
+	DocBookWrapperMergeWithPrevious true
+	DocBookInInfo         always    
 End
 
 
@@ -190,6 +229,13 @@ Style Telephone
 	LatexName             setkomavar
 	LatexParam            {fromphone}
 	LabelString           "Sender Phone:"
+	# TODO: to be valid DocBook, this should be in the address.
+	DocBookTag            phone
+	DocBookTagType        paragraph
+	DocBookWrapperTag     author
+	DocBookWrapperTagType paragraph
+	DocBookWrapperMergeWithPrevious true
+	DocBookInInfo         always    
 End
 
 
@@ -198,6 +244,13 @@ Style Fax
 	LatexName             setkomavar
 	LatexParam            {fromfax}
 	LabelString           "Sender Fax:"
+	# TODO: to be valid DocBook, this should be in the address.
+	DocBookTag            fax
+	DocBookTagType        paragraph
+	DocBookWrapperTag     author
+	DocBookWrapperTagType paragraph
+	DocBookWrapperMergeWithPrevious true
+	DocBookInInfo         always    
 End
 
 
@@ -206,6 +259,12 @@ Style E-Mail
 	LatexName             setkomavar
 	LatexParam            {fromemail}
 	LabelString           "Sender E-Mail:"
+	DocBookTag            email
+	DocBookTagType        paragraph
+	DocBookWrapperTag     author
+	DocBookWrapperTagType paragraph
+	DocBookWrapperMergeWithPrevious true
+	DocBookInInfo         always
 End
 
 
@@ -214,6 +273,12 @@ Style URL
 	LatexName             setkomavar
 	LatexParam            {fromurl}
 	LabelString           "Sender URL:"
+	DocBookTag            uri
+	DocBookTagType        paragraph
+	DocBookWrapperTag     author
+	DocBookWrapperTagType paragraph
+	DocBookWrapperMergeWithPrevious true
+	DocBookInInfo         always
 End
 
 
@@ -222,6 +287,13 @@ Style Bank
 	LatexName             setkomavar
 	LatexParam            {frombank}
 	LabelString           "Bank:"
+	DocBookTag            personblurb
+	DocBookAttr           role='bank'
+	DocBookTagType        paragraph
+	DocBookWrapperTag     author
+	DocBookWrapperTagType paragraph
+	DocBookWrapperMergeWithPrevious true
+	DocBookInInfo         always
 End
 
 
@@ -238,6 +310,12 @@ Style Place
 	LatexName             setkomavar
 	LatexParam            {place}
 	LabelString           "Place:"
+	DocBookTag            country
+	DocBookTagType        paragraph
+	DocBookWrapperTag     address
+	DocBookWrapperTagType paragraph
+	DocBookWrapperMergeWithPrevious true
+	DocBookInInfo         always
 End
 
 
@@ -246,6 +324,11 @@ Style Date
 	LatexName             setkomavar
 	LatexParam            {date}
 	LabelString           "Date:"
+	DocBookTag            date
+	DocBookTagType        paragraph
+	DocBookWrapperTag     NONE
+	DocBookInInfo         always
+    DocBookNoFontInside   true
 End
 
 
@@ -254,6 +337,11 @@ Style Backaddress
 	LatexName             setkomavar
 	LatexParam            {backaddress}
 	LabelString           "Backaddress:"
+	DocBookTag            NONE
+	DocBookWrapperTag     address
+	DocBookWrapperTagType paragraph
+	DocBookWrapperMergeWithPrevious true
+	DocBookInInfo         always
 End
 
 
@@ -262,6 +350,7 @@ Style Specialmail
 	LatexName             setkomavar
 	LatexParam            {specialmail}
 	LabelString           "Specialmail:"
+	# TODO: not implemented for DocBook, what is the meaning of this?
 End
 
 
@@ -270,6 +359,7 @@ Style Location
 	LatexName             setkomavar
 	LatexParam            {location}
 	LabelString           "Location:"
+	# TODO: not implemented for DocBook, what is the meaning of this?
 End
 
 
@@ -279,6 +369,11 @@ Style Title
 	LatexParam            {title}
 	LabelString           "Title:"
 	HTMLTitle             true
+	DocBookTag            title
+	DocBookAttr           role='title' # As opposed to subject.
+	DocBookTagType        paragraph
+	DocBookWrapperTag     NONE
+	DocBookInInfo         maybe
 End
 
 
@@ -287,6 +382,11 @@ Style Subject
 	LatexName             setkomavar
 	LatexParam            {subject}
 	LabelString           "Subject:"
+	DocBookTag            title
+	DocBookAttr           role='title'
+	DocBookTagType        paragraph
+	DocBookWrapperTag     NONE
+	DocBookInInfo         maybe
 End
 
 
@@ -354,6 +454,6 @@ Style EndLetter
 	LabelString           "End of letter"
 	LabelFont
 	  Series              Bold
-	  Color               Green
+	  Color               textlabel2
 	EndFont
 End