From ccd0a46e2b337c51adcf63ae187b39ade2b86129 Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Mon, 29 Aug 2011 22:56:07 +0200 Subject: [PATCH 1/2] do not expand the tags --- openlp/core/lib/renderer.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py index 8c63facb8..e0a07a556 100644 --- a/openlp/core/lib/renderer.py +++ b/openlp/core/lib/renderer.py @@ -259,8 +259,7 @@ class Renderer(object): else: html_text = text text = u'' - lines = expand_tags(html_text) - lines = lines.strip(u'\n').split(u'\n') + lines = html_text.strip(u'\n').split(u'\n') slides = self._paginate_slide(lines, line_end) if len(slides) > 1 and text: # Add all slides apart from the last one the @@ -274,8 +273,7 @@ class Renderer(object): else: pages.extend(slides) if u'[---]' not in text: - lines = expand_tags(text) - lines = lines.strip(u'\n').split(u'\n') + lines = text.strip(u'\n').split(u'\n') pages.extend(self._paginate_slide(lines, line_end)) break new_pages = [] From 6c7527349d4fe5a3b3e388a2325a7074b3bde37f Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Mon, 29 Aug 2011 22:58:32 +0200 Subject: [PATCH 2/2] do not use the same name twice --- openlp/core/lib/renderer.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py index e0a07a556..3fff5cbe0 100644 --- a/openlp/core/lib/renderer.py +++ b/openlp/core/lib/renderer.py @@ -255,11 +255,11 @@ class Renderer(object): # we have to render the first virtual slide. text_contains_break = u'[---]' in text if text_contains_break: - html_text, text = text.split(u'\n[---]\n', 1) + text_to_render, text = text.split(u'\n[---]\n', 1) else: - html_text = text + text_to_render = text text = u'' - lines = html_text.strip(u'\n').split(u'\n') + lines = text_to_render.strip(u'\n').split(u'\n') slides = self._paginate_slide(lines, line_end) if len(slides) > 1 and text: # Add all slides apart from the last one the