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

added comments

Browse Source
This commit is contained in:
Andreas Preikschat 2011-08-28 18:04:18 +02:00
parent 2364ea72c2
commit 2acd1ae2ad
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -232,17 +232,26 @@ class Renderer(object):
len(pages) > 1 and u'[---]' in text: len(pages) > 1 and u'[---]' in text:
pages = [] pages = []
while True: while True:
# Check if the first two potential virtual slides will fit
# (as a whole) on one slide.
html_text = expand_tags( html_text = expand_tags(
u'\n'.join(text.split(u'\n[---]\n', 2)[:-1])) u'\n'.join(text.split(u'\n[---]\n', 2)[:-1]))
html_text = html_text.replace(u'\n', u'<br>') html_text = html_text.replace(u'\n', u'<br>')
if self._text_fits_on_slide(html_text): if self._text_fits_on_slide(html_text):
# The first two virtual slides fit (as a whole) on one
# slide. Replace the occurrences of [---].
text = text.replace(u'\n[---]', u'', 2) text = text.replace(u'\n[---]', u'', 2)
else: else:
# The first two virtual slides did not fit as a whole.
# Check if the first virtual slide will fit.
html_text = expand_tags(text.split(u'\n[---]\n', 1)[1]) html_text = expand_tags(text.split(u'\n[---]\n', 1)[1])
html_text = html_text.replace(u'\n', u'<br>') html_text = html_text.replace(u'\n', u'<br>')
if self._text_fits_on_slide(html_text): if self._text_fits_on_slide(html_text):
# The first virtual slide fits, so remove it.
text = text.replace(u'\n[---]', u'', 1) text = text.replace(u'\n[---]', u'', 1)
else: else:
# The first virtual slide does not fit, which means
# we have to render the first virtual slide.
if u'[---]' in text: if u'[---]' in text:
html_text, text = text.split(u'\n[---]\n', 1) html_text, text = text.split(u'\n[---]\n', 1)
html_text = html_text.replace(u'\n', u'<br>') html_text = html_text.replace(u'\n', u'<br>')