openlp-core team mailing list archive

[Tim Bentley <tim.bentley@xxxxxxxxx>]

Tim Bentley has proposed merging lp:~trb143/openlp/bugfixes1 into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  #637547 Editing a song in a loaded service file crashes
  https://bugs.launchpad.net/bugs/637547
  #637886 Replacing live video background with nothing live causes crash
  https://bugs.launchpad.net/bugs/637886
  #642778 enchant.DictNotFoundError: Dictionary for language 'ja_JP' could not be found
  https://bugs.launchpad.net/bugs/642778
  #649999 Extra line is being added to end of Verses and Choruses
  https://bugs.launchpad.net/bugs/649999


Remove trailing blank line
-- 
https://code.launchpad.net/~trb143/openlp/bugfixes1/+merge/36900
Your team OpenLP Core is requested to review the proposed merge of lp:~trb143/openlp/bugfixes1 into lp:openlp.

=== modified file 'openlp/core/lib/renderer.py'
--- openlp/core/lib/renderer.py	2010-09-21 17:24:01 +0000
+++ openlp/core/lib/renderer.py	2010-09-28 17:49:41 +0000
@@ -161,8 +161,9 @@
         html_text = u''
         styled_text = u''
         for line in text:
-            styled_line = expand_tags(line) + line_end
-            styled_text += styled_line
+            styled_line = expand_tags(line)
+            if styled_text:
+                styled_text += line_end + styled_line
             html = self.page_shell + styled_text + u'</div></body></html>'
             self.web.setHtml(html)
             # Text too long so go to next page
@@ -171,6 +172,8 @@
                 html_text = u''
                 styled_text = styled_line
             html_text += line + line_end
+        if line_break:
+            html_text = html_text[:len(html_text)-4]
         formatted.append(html_text)
         log.debug(u'format_slide - End')
         return formatted