From f6bc65df9009481d0422365fe0cfec4dae2728c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Charette?= <stephanecharette@gmail.com>
Date: Sun, 4 May 2008 06:54:26 +0000
Subject: [PATCH] better handling of end-of-line for text notes; use [br] like
 we do in 2.2.x instead of [p]

svn: r10658
---
 src/plugins/NarrativeWeb.py | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/src/plugins/NarrativeWeb.py b/src/plugins/NarrativeWeb.py
index 00bf23dd1..a5a2cfe2a 100644
--- a/src/plugins/NarrativeWeb.py
+++ b/src/plugins/NarrativeWeb.py
@@ -630,7 +630,7 @@ class BasePage:
                 if format:
                     text = u"<pre>%s</pre>" % text
                 else:
-                    text = u"</p>\n\t\t<p>".join(text.split("\n"))
+                    text = u"<br />".join(text.split("\n"))
                 of.write('\t\t<p>%s</p>\n' % text)
                 of.write('\t</div>\n\n')
 
@@ -1563,12 +1563,9 @@ class IntroductionPage(BasePage):
             note_obj = db.get_note_from_gramps_id(note_id)
             text = note_obj.get(markup=True)
             if note_obj.get_format():
-                of.write('\t<pre>\n%s\n' % text)
-                of.write('\t</pre>\n')
+                of.write(u'\t<pre>%s</pre>\n' % text)
             else:
-                of.write('\t<p>')
-                of.write(u'</p>\n\t<p>'.join(text.split("\n")))
-                of.write('</p>\n')
+                of.write(u'<br />'.join(text.split("\n")))
 
         self.display_footer(of,db)
         self.close_file(of)
@@ -1611,12 +1608,9 @@ class HomePage(BasePage):
             note_obj = db.get_note_from_gramps_id(note_id)
             text = note_obj.get(markup=True)
             if note_obj.get_format():
-                of.write('\t<pre>\n%s\n' % text)
-                of.write('\t</pre>\n')
+                of.write(u'\t<pre>%s</pre>' % text)
             else:
-                of.write('\t<p>')
-                of.write(u'</p>\n\t<p>'.join(text.split("\n")))
-                of.write('</p>\n')
+                of.write(u'<br />'.join(text.split("\n")))
 
         self.display_footer(of,db)
         self.close_file(of)
@@ -2455,7 +2449,7 @@ class IndividualPage(BasePage):
                     if format:
                         of.write(u"<pre>%s</pre>" % text )
                     else:
-                        of.write(u"</p>\n\t\t\t\t\t<p>".join(text.split("\n")))
+                        of.write(u"<br />".join(text.split("\n")))
                     of.write('</p>\n')
                     of.write('\t\t\t\t</td>\n')
                     of.write('\t\t\t</tr>\n')
@@ -2554,9 +2548,7 @@ class IndividualPage(BasePage):
                     if format:
                         text += u"<pre>%s</pre>" % note_text
                     else:
-                        text += u"<p>"
                         text += u"<br />".join(note_text.split("\n"))
-                        text += u"</p>"
         return text
 
     def get_citation_links(self, source_ref_list):