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

Add support for export and import of chords in openlyrics

Browse Source
This commit is contained in:
Tomas Groth 2016-06-27 23:16:49 +02:00
parent d92d46e06c
commit 138e2deb1f
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
openlp/plugins/songs/lib/openlyricsxml.py
View File

@ -323,7 +323,19 @@ class OpenLyrics(object):
# Do not add the break attribute to the last lines element. # Do not add the break attribute to the last lines element.
if index < len(optional_verses) - 1: if index < len(optional_verses) - 1:
lines_element.set('break', 'optional') lines_element.set('break', 'optional')
return self._extract_xml(song_xml).decode() xml_text = self._extract_xml(song_xml).decode()
return self._chordpro_to_openlyrics(xml_text)
def _chordpro_to_openlyrics(self, text):
"""
Convert chords from Chord Pro format to Open Lyrics format
:param text: the lyric with chords
:return: the lyrics with the converted chords
"""
# Process chords.
new_text = re.sub(r'\[(..?.?)\]', r'<chord name="\1"/>', text)
return new_text
def _get_missing_tags(self, text): def _get_missing_tags(self, text):
""" """
@ -611,9 +623,10 @@ class OpenLyrics(object):
# Append tail text at chord element. # Append tail text at chord element.
text += element.tail text += element.tail
return text return text
# Skip <chord> element - not yet supported. # Convert chords to ChordPro format which OpenLP uses internally
# TODO: Verify format() with template variables # TODO: Verify format() with template variables
elif element.tag == NSMAP % 'chord': elif element.tag == NSMAP % 'chord':
text += '[{chord}]'.format(chord=element.get('name'))
if element.tail: if element.tail:
# Append tail text at chord element. # Append tail text at chord element.
text += element.tail text += element.tail