raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

more changes

Browse Source
This commit is contained in:
Tim Bentley 2011-04-16 12:36:20 +01:00
parent 501235a695
commit 24ec1abb56
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openlp/core/lib/renderer.py
View File

@ -399,7 +399,7 @@ class Renderer(object):
if line_count > 1: if line_count > 1:
if html_text.endswith(u'<br>'): if html_text.endswith(u'<br>'):
html_text = html_text[:len(html_text)-4] html_text = html_text[:len(html_text)-4]
formatted.append(html_text) formatted.append(html_text + line_end)
line = previous_line line = previous_line
line_count = 1 line_count = 1
html_text = u'' html_text = u''
@ -419,7 +419,7 @@ class Renderer(object):
if self.web_frame.contentsSize().height() > self.page_height: if self.web_frame.contentsSize().height() > self.page_height:
if html_text.endswith(u'<br>'): if html_text.endswith(u'<br>'):
html_text = html_text[:len(html_text)-4] html_text = html_text[:len(html_text)-4]
formatted.append(html_text) formatted.append(html_text + line_break)
html_text = u'' html_text = u''
styled_text = u'' styled_text = u''
html_text += word html_text += word

8
openlp/plugins/bibles/lib/mediaitem.py
View File

@ -799,9 +799,9 @@ class BibleMediaItem(MediaManagerItem):
else: else:
verse_text = unicode(verse) verse_text = unicode(verse)
if self.settings.display_style == DisplayStyle.Round: if self.settings.display_style == DisplayStyle.Round:
return u'[---]{su}(%s){/su}' % verse_text return u'{su}(%s){/su}' % verse_text
if self.settings.display_style == DisplayStyle.Curly: if self.settings.display_style == DisplayStyle.Curly:
return u'[---]{su}{%s}{/su}' % verse_text return u'{su}{%s}{/su}' % verse_text
if self.settings.display_style == DisplayStyle.Square: if self.settings.display_style == DisplayStyle.Square:
return u'[---]{su}[%s]{/su}' % verse_text return u'{su}[%s]{/su}' % verse_text
return u'[---]{su}%s{/su}' % verse_text return u'{su}%s{/su}' % verse_text