From 68238f3c513c0289282d449ca6ed57a97812771d Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Sun, 29 May 2011 08:25:31 +0200
Subject: [PATCH 1/3] r1590


From 22ad88d3ee36c284e67d0d9dd35729bd4a9606e4 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Sun, 29 May 2011 08:26:14 +0200
Subject: [PATCH 2/3] fix for bug #789618

Fixes: https://launchpad.net/bugs/789618
---
 openlp/core/ui/printserviceform.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/openlp/core/ui/printserviceform.py b/openlp/core/ui/printserviceform.py
index 09ae8857f..b1147731b 100644
--- a/openlp/core/ui/printserviceform.py
+++ b/openlp/core/ui/printserviceform.py
@@ -56,7 +56,9 @@ http://doc.trolltech.com/4.7/richtext-html-subset.html#css-properties
    font-size:large;
 }
 
-.itemText {}
+.itemText {
+   margin-top:10px;
+}
 
 .itemFooter {
    font-size:8px;
@@ -85,7 +87,7 @@ http://doc.trolltech.com/4.7/richtext-html-subset.html#css-properties
 .imageList {}
 
 .customNotes {
-   margin-top: 10px;
+   margin-top:10px;
 }
 
 .customNotesTitle {
@@ -212,11 +214,11 @@ class PrintServiceForm(QtGui.QDialog, Ui_PrintServiceDialog):
                 verse_def = None
                 for slide in item.get_frames():
                     if not verse_def or verse_def != slide[u'verseTag']:
-                        p = self._addElement(u'div', parent=div,
+                        text_div = self._addElement(u'div', parent=div,
                             classId=u'itemText')
                     else:
-                        self._addElement(u'br', parent=p)
-                    self._addElement(u'p', slide[u'html'], p)
+                        self._addElement(u'br', parent=text_div)
+                    self._addElement(u'span', slide[u'html'], text_div)
                     verse_def = slide[u'verseTag']
                 # Break the page before the div element.
                 if index != 0 and self.pageBreakAfterText.isChecked():

From 0a2d97021cf97e04336fd271d33b0f2002ef70fc Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Mon, 30 May 2011 07:03:46 +0200
Subject: [PATCH 3/3] added spaces

---
 openlp/core/ui/printserviceform.py | 36 +++++++++++++++---------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/openlp/core/ui/printserviceform.py b/openlp/core/ui/printserviceform.py
index b1147731b..ccd1eb18c 100644
--- a/openlp/core/ui/printserviceform.py
+++ b/openlp/core/ui/printserviceform.py
@@ -42,44 +42,44 @@ http://doc.trolltech.com/4.7/richtext-html-subset.html#css-properties
 */
 
 .serviceTitle {
-   font-weight:600;
-   font-size:x-large;
-   color:black;
+   font-weight: 600;
+   font-size: x-large;
+   color: black;
 }
 
 .item {
-   color:black;
+   color: black;
 }
 
 .itemTitle {
-   font-weight:600;
-   font-size:large;
+   font-weight: 600;
+   font-size: large;
 }
 
 .itemText {
-   margin-top:10px;
+   margin-top: 10px;
 }
 
 .itemFooter {
-   font-size:8px;
+   font-size: 8px;
 }
 
 .itemNotes {}
 
 .itemNotesTitle {
-   font-weight:bold;
-   font-size:12px;
+   font-weight: bold;
+   font-size: 12px;
 }
 
 .itemNotesText {
-   font-size:11px;
+   font-size: 11px;
 }
 
 .media {}
 
 .mediaTitle {
-    font-weight:bold;
-    font-size:11px;
+    font-weight: bold;
+    font-size: 11px;
 }
 
 .mediaText {}
@@ -87,20 +87,20 @@ http://doc.trolltech.com/4.7/richtext-html-subset.html#css-properties
 .imageList {}
 
 .customNotes {
-   margin-top:10px;
+   margin-top: 10px;
 }
 
 .customNotesTitle {
-   font-weight:bold;
-   font-size:11px;
+   font-weight: bold;
+   font-size: 11px;
 }
 
 .customNotesText {
-   font-size:11px;
+   font-size: 11px;
 }
 
 .newPage {
-    page-break-before:always;
+    page-break-before: always;
 }
 """