From 7889a228107074772fa1418891af9ef322510d15 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@hush.com>
Date: Sat, 27 Nov 2010 22:12:52 +0100
Subject: [PATCH] fixed <p> tag, replaced the <u> tag and another fix

---
 openlp/core/lib/__init__.py                  | 4 ++--
 openlp/plugins/songs/lib/songbeamerimport.py | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/openlp/core/lib/__init__.py b/openlp/core/lib/__init__.py
index eb7213c16..a90a4c194 100644
--- a/openlp/core/lib/__init__.py
+++ b/openlp/core/lib/__init__.py
@@ -81,8 +81,8 @@ html_expands.append({u'desc': u'Italics', u'start tag': u'{it}',
     u'start html': u'<em>', u'end tag': u'{/it}', u'end html': u'</em>',
     u'protected': True})
 html_expands.append({u'desc': u'Underline', u'start tag': u'{u}',
-    u'start html': u'<u>', u'end tag': u'{/u}', u'end html': u'</u>',
-    u'protected': True})
+    u'start html': u'<span style="text-decoration: underline;">',
+    u'end tag': u'{/u}', u'end html': u'</span>', u'protected': True})
 
 def translate(context, text, comment=None):
     """
diff --git a/openlp/plugins/songs/lib/songbeamerimport.py b/openlp/plugins/songs/lib/songbeamerimport.py
index eca92aa79..a743faafc 100644
--- a/openlp/plugins/songs/lib/songbeamerimport.py
+++ b/openlp/plugins/songs/lib/songbeamerimport.py
@@ -146,7 +146,7 @@ class SongBeamerImport(SongImport):
             (u'<br>', u'{st}'),
             (u'</br>', u'{st}'),
             (u'</ br>', u'{st}'),
-            (u'<p>', u'{/p}'),
+            (u'<p>', u'{p}'),
             (u'</p>', u'{/p}'),
             (u'<super>', u'{su}'),
             (u'</super>', u'{/su}'),
@@ -156,7 +156,7 @@ class SongBeamerImport(SongImport):
             (u'</wordwrap>', u'')
             ]
         for pair in tag_pairs:
-            self.current_verse.replace(pair[0], pair[1])
+            self.current_verse = self.current_verse.replace(pair[0], pair[1])
         # TODO: check for unsupported tags (see wiki) and remove them as well.
 
     def parse_tags(self, line):