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

Try to fix a mediashout import issue by replacing the line tab char with 2 linebreaks.

Browse Source
This commit is contained in:
Tomas Groth 2016-09-18 17:28:55 +02:00
parent 3a3ca8d933
commit 4754d1eb8b
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openlp/plugins/songs/lib/importers/mediashout.py
View File

@ -101,7 +101,7 @@ class MediaShoutImport(SongImport):
self.song_book_name = song.SongID self.song_book_name = song.SongID
for verse in verses: for verse in verses:
tag = VERSE_TAGS[verse.Type] + str(verse.Number) if verse.Type < len(VERSE_TAGS) else 'O' tag = VERSE_TAGS[verse.Type] + str(verse.Number) if verse.Type < len(VERSE_TAGS) else 'O'
self.add_verse(verse.Text, tag) self.add_verse(self.tidy_text(verse.Text), tag)
for order in verse_order: for order in verse_order:
if order.Type < len(VERSE_TAGS): if order.Type < len(VERSE_TAGS):
self.verse_order_list.append(VERSE_TAGS[order.Type] + str(order.Number)) self.verse_order_list.append(VERSE_TAGS[order.Type] + str(order.Number))

1
openlp/plugins/songs/lib/importers/songimport.py
View File

@ -140,6 +140,7 @@ class SongImport(QtCore.QObject):
text = text.replace('\u2026', '...') text = text.replace('\u2026', '...')
text = text.replace('\u2013', '-') text = text.replace('\u2013', '-')
text = text.replace('\u2014', '-') text = text.replace('\u2014', '-')
text = text.replace('\x0b', '\n\n')
# Remove surplus blank lines, spaces, trailing/leading spaces # Remove surplus blank lines, spaces, trailing/leading spaces
text = re.sub(r'[ \t\v]+', ' ', text) text = re.sub(r'[ \t\v]+', ' ', text)
text = re.sub(r' ?(\r\n?|\n) ?', '\n', text) text = re.sub(r' ?(\r\n?|\n) ?', '\n', text)