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

More changes

This commit is contained in:
Tim Bentley 2011-04-08 16:35:33 +01:00
parent 6445964646
commit 34348c8465
1 changed files with 96 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -214,9 +214,10 @@ class Renderer(object):
``line_break`` ``line_break``
Add line endings after each line of text used for bibles. Add line endings after each line of text used for bibles.
""" """
print [text]
log.debug(u'format slide') log.debug(u'format slide')
# clean up line endings # clean up line endings
lines = self._lines(text) lines = self._lines_split(text)
pages = self._paginate_slide(lines, line_break, self.force_page) pages = self._paginate_slide(lines, line_break, self.force_page)
if len(pages) > 1: if len(pages) > 1:
# Songs and Custom # Songs and Custom
@ -377,11 +378,17 @@ class Renderer(object):
line_count = 0 line_count = 0
force_current = False force_current = False
lines = self._lines(text, u'[---]') lines = self._lines(text, u'[---]')
previous_line = u''
# Loop through the lines # Loop through the lines
for line in lines: for line in lines:
line_added = False
while not line_added:
line_added = True
line_count += 1 line_count += 1
styled_line = expand_tags(line) styled_line = expand_tags(line)
styled_line = line_end + styled_line styled_line = line_end + styled_line
previous_line = line
previous_styled = styled_line
styled_text += styled_line styled_text += styled_line
html = self.page_shell + styled_text + HTML_END html = self.page_shell + styled_text + HTML_END
self.web.setHtml(html) self.web.setHtml(html)
@ -390,53 +397,80 @@ class Renderer(object):
if self.web_frame.contentsSize().height() > self.page_height: if self.web_frame.contentsSize().height() > self.page_height:
# we have more than 1 verse on the slide # we have more than 1 verse on the slide
print "A", line_count print "A", line_count
print "AA", [previous_line]
print "AAA", [styled_text]
if line_count > 1: if line_count > 1:
if html_text.endswith(u'<br>'): if html_text.endswith(u'<br>'):
html_text = html_text[:len(html_text)-4] html_text = html_text[:len(html_text)-4]
formatted.append(html_text) formatted.append(html_text)
force_current = True line_added = False
print "##### > 1" line = previous_line
print [html_text] line_count = 0
html_text = u'' html_text = u''
# only one block on page so lets make it words. print "c", [html_text]
if line_count == 1 or force_current: if line_count == 1:
print "##### = 1" words = self._words_split(line)
print [line]
force_current = False
styled_text = u''
words = self._words(line)
styled_text = u''
for word in words: for word in words:
styled_line = expand_tags(word) styled_word = expand_tags(word)
styled_text += styled_line styled_line = styled_word
#previous_line = line
#previous_styled = styled_line
styled_text += styled_word
html = self.page_shell + styled_text + HTML_END html = self.page_shell + styled_text + HTML_END
self.web.setHtml(html) self.web.setHtml(html)
# Text too long so go to next page # Text too long so go to next page
print "B", self.web_frame.contentsSize().height() , self.page_height print self.web_frame.contentsSize().height() , self.page_height, [line]
if self.web_frame.contentsSize().height() > self.page_height: if self.web_frame.contentsSize().height() > self.page_height:
if html_text.endswith(u'<br>'): if html_text.endswith(u'<br>'):
html_text = html_text[:len(html_text)-4] html_text = html_text[:len(html_text)-4]
print "c", [html_text]
formatted.append(html_text) formatted.append(html_text)
html_text = u'' html_text = u''
styled_text = styled_line
html_text += word html_text += word
line_count = 0 pass
print "##### > 1"
print [html_text]
# only one block on page so lets make it words.
# if line_count == 1 or force_current:
# print "##### = 1"
# print [line]
# print [styled_text]
# print [previous_line]
# force_current = False
# #styled_text = u''
# words = self._words(previous_line)
# styled_text = u''
# for word in words:
# styled_line = expand_tags(word)
# styled_text += styled_line
# html = self.page_shell + styled_text + HTML_END
# self.web.setHtml(html)
# # Text too long so go to next page
# print "B", self.web_frame.contentsSize().height() , self.page_height
# if self.web_frame.contentsSize().height() > self.page_height:
# if html_text.endswith(u'<br>'):
# html_text = html_text[:len(html_text)-4]
# print "c", [html_text]
# formatted.append(html_text)
# html_text = u''
#
# styled_text = styled_line
# html_text += word
#line_count = 0
styled_text = styled_line styled_text = styled_line
html_text += line + line_end html_text += line + line_end
previous_line = line
if html_text.endswith(u'<br>'): if html_text.endswith(u'<br>'):
html_text = html_text[:len(html_text)-4] html_text = html_text[:len(html_text)-4]
formatted.append(html_text) formatted.append(html_text)
log.debug(u'format_slide - End') log.debug(u'format_slide - End')
return formatted return formatted
def _lines(self, words, split=u'\n[---]\n'): def _lines(self, words, split=u'n[---]n'):
""" """
Split the slide up by physical line Split the slide up by physical line
""" """
# this parse we do not want to use this so remove it # this parse we do not want to use this so remove it
words = words.replace(split, u'') #words = words.replace(split, u'')
verses_text = words.split(u'\n') verses_text = words.split(u'\n')
text = [] text = []
for verse in verses_text: for verse in verses_text:
@ -445,11 +479,11 @@ class Renderer(object):
text.append(line) text.append(line)
return text return text
def _words(self, words): def _words_split(self, words):
""" """
Split the slide up by word so can wrap better Split the slide up by word so can wrap better
""" """
# this parse we are wordy # this parse we are to be wordy
words = words.replace(u'\n', u' ') words = words.replace(u'\n', u' ')
verses_text = words.split(u' ') verses_text = words.split(u' ')
text = [] text = []
@ -458,3 +492,17 @@ class Renderer(object):
for line in lines: for line in lines:
text.append(line + u' ') text.append(line + u' ')
return text return text
def _lines_split(self, text):
"""
Split the slide up by physical line
"""
# this parse we do not want to use this so remove it
lines = text.split(u'\n')
real_lines = []
for line in lines:
line = line.replace(u' [---]', u'[---]')
sub_lines = line.split(u'\n')
for sub_line in sub_lines:
real_lines.append(sub_line)
return real_lines