From 74d2b2d25c7d43dd84dc16383b114bef0726855f Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Mon, 27 Jun 2011 13:44:57 +0200
Subject: [PATCH] replaced <br> by <br />

---
 openlp/core/lib/__init__.py    |  2 +-
 openlp/core/lib/renderer.py    | 16 ++++++++--------
 openlp/core/lib/serviceitem.py |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/openlp/core/lib/__init__.py b/openlp/core/lib/__init__.py
index 7fbd5243c..187226272 100644
--- a/openlp/core/lib/__init__.py
+++ b/openlp/core/lib/__init__.py
@@ -202,7 +202,7 @@ def clean_tags(text):
     """
     Remove Tags from text for display
     """
-    text = text.replace(u'<br>', u'\n')
+    text = text.replace(u'<br />', u'\n')
     text = text.replace(u'{br}', u'\n')
     text = text.replace(u'&nbsp;', u' ')
     for tag in DisplayTags.get_html_tags():
diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py
index 11653533c..3832cb75c 100644
--- a/openlp/core/lib/renderer.py
+++ b/openlp/core/lib/renderer.py
@@ -219,7 +219,7 @@ class Renderer(object):
         """
         log.debug(u'format slide')
         # Add line endings after each line of text used for bibles.
-        line_end = u'<br>'
+        line_end = u'<br />'
         if item.is_capable(ItemCapabilities.NoLineBreaks):
             line_end = u' '
         # Bibles
@@ -240,7 +240,7 @@ class Renderer(object):
                         pages.extend(self._paginate_slide(lines, line_end))
         new_pages = []
         for page in pages:
-            while page.endswith(u'<br>'):
+            while page.endswith(u'<br />'):
                 page = page[:-4]
             new_pages.append(page)
         return new_pages
@@ -326,13 +326,13 @@ class Renderer(object):
             The text to be fitted on the slide split into lines.
 
         ``line_end``
-            The text added after each line. Either ``u' '`` or ``u'<br>``.
+            The text added after each line. Either ``u' '`` or ``u'<br />``.
         """
         log.debug(u'_paginate_slide - Start')
         formatted = []
         previous_html = u''
         previous_raw = u''
-        separator = u'<br>'
+        separator = u'<br />'
         html_lines = map(expand_tags, lines)
         html = self.page_shell + separator.join(html_lines) + HTML_END
         self.web.setHtml(html)
@@ -357,7 +357,7 @@ class Renderer(object):
             The words to be fitted on the slide split into lines.
 
         ``line_end``
-            The text added after each line. Either ``u' '`` or ``u'<br>``. This
+            The text added after each line. Either ``u' '`` or ``u'<br />``. This
             is needed for bibles.
         """
         log.debug(u'_paginate_slide_words - Start')
@@ -434,12 +434,12 @@ class Renderer(object):
             using the binary chop. The elements can contain display tags.
 
         ``separator``
-            The separator for the elements. For lines this is ``u'<br>'`` and
+            The separator for the elements. For lines this is ``u'<br />'`` and
             for words this is ``u' '``.
 
         ``line_end``
             The text added after each "element line". Either ``u' '`` or
-            ``u'<br>``. This is needed for bibles.
+            ``u'<br />``. This is needed for bibles.
         """
         smallest_index = 0
         highest_index = len(html_list) - 1
@@ -459,7 +459,7 @@ class Renderer(object):
             # We found the number of words which will fit.
             if smallest_index == index or highest_index == index:
                 index = smallest_index
-                formatted.append(previous_raw.rstrip(u'<br>') +
+                formatted.append(previous_raw.rstrip(u'<br />') +
                     separator.join(raw_list[:index + 1]))
                 previous_html = u''
                 previous_raw = u''
diff --git a/openlp/core/lib/serviceitem.py b/openlp/core/lib/serviceitem.py
index 2ab09dbeb..e5a6c4033 100644
--- a/openlp/core/lib/serviceitem.py
+++ b/openlp/core/lib/serviceitem.py
@@ -174,7 +174,7 @@ class ServiceItem(object):
             for slide in self._raw_frames:
                 pages = self.renderer.format_slide(slide[u'raw_slide'], self)
                 for page in pages:
-                    page = page.replace(u'<br>', u'{br}')
+                    page = page.replace(u'<br />', u'{br}')
                     html = expand_tags(cgi.escape(page.rstrip()))
                     self._display_frames.append({
                         u'title': clean_tags(page),
@@ -194,7 +194,7 @@ class ServiceItem(object):
         if self.raw_footer is None:
             self.raw_footer = []
         self.foot_text = \
-            u'<br>'.join([footer for footer in self.raw_footer if footer])
+            u'<br />'.join([footer for footer in self.raw_footer if footer])
 
     def add_from_image(self, path, title):
         """