openlp-core team mailing list archive

[Andreas Preikschat <andreaspreikschat@xxxxxxxxxx>]

Andreas Preikschat has proposed merging lp:~googol/openlp/bug-796528 into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~googol/openlp/bug-796528/+merge/73296

Hello,

- fixed formatting tags when slides where split due to a [---]
- changed variable name (as this name is already used and this would cause confusion)
-- 
https://code.launchpad.net/~googol/openlp/bug-796528/+merge/73296
Your team OpenLP Core is requested to review the proposed merge of lp:~googol/openlp/bug-796528 into lp:openlp.

=== modified file 'openlp/core/lib/renderer.py'
--- openlp/core/lib/renderer.py	2011-08-29 06:21:24 +0000
+++ openlp/core/lib/renderer.py	2011-08-29 21:01:26 +0000
@@ -255,12 +255,11 @@
                             # 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 = expand_tags(html_text)
-                            lines = lines.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
@@ -274,8 +273,7 @@
                             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 = []