stdletter.inc, letter.lyx: fix http://bugzilla.lyx.org/show_bug.cgi?id=5684

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

lib/layouts/stdletter.inc

@@ -92,49 +92,40 @@ End
 Style Closing
 	CopyStyle             Signature
 	LatexName             closing
-	LeftMargin            Signature:xx
 	LabelString           "Closing:"
 End
 
 
 Style cc
-	Margin                Static
-	LatexType             Command
+	CopyStyle             Signature
 	LatexName             cc
-	LeftMargin            cc:xx
-	LabelSep              xx
-	TopSep                0.4
-	BottomSep             0.4
-	ParSep                0.4
-	Align                 Block
-	AlignPossible         Block, Left
-	LabelType             Static
-	LeftMargin            Signature:xx
 	LabelString           "cc:"
+	LabelFont
+	  Series              Bold
+	  Shape               Italic
+	  Color               green
+	EndFont
 End
 
 
 Style encl
 	CopyStyle             cc
 	LatexName             encl
-	LeftMargin            Signature:xx
 	LabelString           "encl:"
 	Spacing               Other 1.5
 End
 
 
 Style Location
-	CopyStyle             encl
-	LatexName             location
-	LeftMargin            Signature:xx
+	CopyStyle             cc
+	LatexName             thispagestyle{firstpage}\location
 	LabelString           "Location:"
 End
 
 
 Style Telephone
-	CopyStyle             encl
-	LatexName             telephone
-	LeftMargin            Signature:xx
+	CopyStyle             cc
+	LatexName             thispagestyle{firstpage}\telephone
 	LabelString           "Telephone:"
 End
 

lib/templates/letter.lyx

@@ -1,9 +1,9 @@
-#LyX 1.6.0 created this file. For more info see http://www.lyx.org/
+#LyX 1.6.2svn created this file. For more info see http://www.lyx.org/
 \lyxformat 345
 \begin_document
 \begin_header
-\use_default_options false
 \textclass letter
+\use_default_options false
 \language english
 \inputencoding auto
 \font_roman default
@@ -14,8 +14,10 @@
 \font_osf false
 \font_sf_scale 100
 \font_tt_scale 100
+
 \graphics default
 \paperfontsize default
+\spacing single
 \use_hyperref false
 \papersize default
 \use_geometry false
@@ -35,6 +37,7 @@
 \tracking_changes false
 \output_changes false
 \author "" 
+\author "" 
 \end_header
 
 \begin_body
@@ -63,13 +66,26 @@
 <Send To Town>
 \end_layout
 
+\begin_layout Standard
+\begin_inset Note Note
+status open
+
+\begin_layout Plain Layout
+Red fields are mandatory, green ones optional.
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
 \begin_layout Signature
 <Your signature
 \begin_inset Note Note
 status collapsed
 
 \begin_layout Plain Layout
-This field MUST come before the "Opening" field!
+This field MUST be before the "Opening" field!
 \end_layout
 
 \end_inset
@@ -107,5 +123,13 @@ This field MUST come before the "Opening" field!
 <encl>
 \end_layout
 
+\begin_layout Telephone
+<number>
+\end_layout
+
+\begin_layout Location
+<location>
+\end_layout
+
 \end_body
 \end_document