Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

better handling of end-of-line for text notes; use [br] like we do in 2.2.x instead of [p]

Browse Source 
svn: r10659
This commit is contained in:
Stéphane Charette 2008-05-04 07:05:42 +00:00
parent 17f183266a
commit b7aac9c7f0
1 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/plugins/NarrativeWeb.py
View File

@ -521,7 +521,7 @@ class BasePage:
if format: if format:
text = u"<pre>%s</pre>" % text text = u"<pre>%s</pre>" % text
else: 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\t<p>%s</p>\n' % text)
of.write('\t</div>\n\n') of.write('\t</div>\n\n')
@ -1415,12 +1415,9 @@ class IntroductionPage(BasePage):
note_obj = db.get_note_from_gramps_id(note_id) note_obj = db.get_note_from_gramps_id(note_id)
text = note_obj.get() text = note_obj.get()
if note_obj.get_format(): if note_obj.get_format():
of.write('\t<pre>\n%s\n' % text) of.write(u'\t<pre>%s</pre>\n' % text)
of.write('\t</pre>\n')
else: else:
of.write('\t<p>') of.write(u'<br />'.join(text.split("\n")))
of.write(u'</p>\n\t<p>'.join(text.split("\n")))
of.write('</p>\n')
self.display_footer(of) self.display_footer(of)
self.report.close_file(of) self.report.close_file(of)
@ -1443,12 +1440,9 @@ class HomePage(BasePage):
note_obj = db.get_note_from_gramps_id(note_id) note_obj = db.get_note_from_gramps_id(note_id)
text = note_obj.get() text = note_obj.get()
if note_obj.get_format(): if note_obj.get_format():
of.write('\t<pre>\n%s\n' % text) of.write(u'\t<pre>%s</pre>' % text)
of.write('\t</pre>\n')
else: else:
of.write('\t<p>') of.write(u'<br />'.join(text.split("\n")))
of.write(u'</p>\n\t<p>'.join(text.split("\n")))
of.write('</p>\n')
self.display_footer(of) self.display_footer(of)
self.report.close_file(of) self.report.close_file(of)
@ -2256,8 +2250,7 @@ class IndividualPage(BasePage):
if format: if format:
of.write(u"<pre>%s</pre>" % text ) of.write(u"<pre>%s</pre>" % text )
else: else:
# TODO. Verify that </p> is correct here. of.write(u"<br />".join(text.split("\n")))
of.write(u"</p>\n\t\t\t\t\t<p>".join(text.split("\n")))
of.write('</p>\n') of.write('</p>\n')
of.write('\t\t\t\t</td>\n') of.write('\t\t\t\t</td>\n')
of.write('\t\t\t</tr>\n') of.write('\t\t\t</tr>\n')
@ -2350,9 +2343,7 @@ class IndividualPage(BasePage):
if format: if format:
text += u"<pre>%s</pre>" % note_text text += u"<pre>%s</pre>" % note_text
else: else:
text += u"<p>"
text += u"<br />".join(note_text.split("\n")) text += u"<br />".join(note_text.split("\n"))
text += u"</p>"
return text return text
def get_citation_links(self, source_ref_list): def get_citation_links(self, source_ref_list):