raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

append text to the last slide (if more than one)

Browse Source
This commit is contained in:
Andreas Preikschat 2011-08-28 19:46:52 +02:00
parent bc1f2d2977
commit fc71905735
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
openlp/core/lib/renderer.py
View File

@ -252,14 +252,26 @@ class Renderer(object):
else: else:
# The first virtual slide does not fit, which means # The first virtual slide does not fit, which means
# we have to render the first virtual slide. # we have to render the first virtual slide.
if u'[---]' in text: text_contains_break = u'[---]' in text
if text_contains_break:
html_text, text = text.split(u'\n[---]\n', 1) html_text, text = text.split(u'\n[---]\n', 1)
else: else:
html_text = text html_text = text
text = u'' text = u''
lines = expand_tags(html_text) lines = expand_tags(html_text)
lines = lines.strip(u'\n').split(u'\n') lines = lines.strip(u'\n').split(u'\n')
pages.extend(self._paginate_slide(lines, line_end)) slides = self._paginate_slide(lines, line_end)
if len(slides) > 1 and text:
# Add all slides apart from the last one the
# list.
pages.extend(slides[:-1])
if text_contains_break:
text = slides[-1] + u'\n[---]\n' + text
else:
text = slides[-1] + u'\n'+ text
text = text.replace(u'<br>', u'\n')
else:
pages.extend(slides)
if u'[---]' not in text: if u'[---]' not in text:
lines = expand_tags(text) lines = expand_tags(text)
lines = lines.strip(u'\n').split(u'\n') lines = lines.strip(u'\n').split(u'\n')