forked from openlp/openlp
- fixed formatting tags when slides where split due to a virtual split
- changed variable name bzr-revno: 1733
This commit is contained in:
commit
8c6b365684
@ -255,12 +255,11 @@ class Renderer(object):
|
|||||||
# we have to render the first virtual slide.
|
# we have to render the first virtual slide.
|
||||||
text_contains_break = u'[---]' in text
|
text_contains_break = u'[---]' in text
|
||||||
if text_contains_break:
|
if text_contains_break:
|
||||||
html_text, text = text.split(u'\n[---]\n', 1)
|
text_to_render, text = text.split(u'\n[---]\n', 1)
|
||||||
else:
|
else:
|
||||||
html_text = text
|
text_to_render = text
|
||||||
text = u''
|
text = u''
|
||||||
lines = expand_tags(html_text)
|
lines = text_to_render.strip(u'\n').split(u'\n')
|
||||||
lines = lines.strip(u'\n').split(u'\n')
|
|
||||||
slides = self._paginate_slide(lines, line_end)
|
slides = self._paginate_slide(lines, line_end)
|
||||||
if len(slides) > 1 and text:
|
if len(slides) > 1 and text:
|
||||||
# Add all slides apart from the last one the
|
# Add all slides apart from the last one the
|
||||||
@ -274,8 +273,7 @@ class Renderer(object):
|
|||||||
else:
|
else:
|
||||||
pages.extend(slides)
|
pages.extend(slides)
|
||||||
if u'[---]' not in text:
|
if u'[---]' not in text:
|
||||||
lines = expand_tags(text)
|
lines = text.strip(u'\n').split(u'\n')
|
||||||
lines = lines.strip(u'\n').split(u'\n')
|
|
||||||
pages.extend(self._paginate_slide(lines, line_end))
|
pages.extend(self._paginate_slide(lines, line_end))
|
||||||
break
|
break
|
||||||
new_pages = []
|
new_pages = []
|
||||||
|
Loading…
Reference in New Issue
Block a user