From 577c7321ffec12c4895d30415bfbcda1f22f8952 Mon Sep 17 00:00:00 2001
From: Samuel Mehrbrodt <s.mehrbrodt@gmail.com>
Date: Tue, 8 Apr 2014 20:52:05 +0200
Subject: [PATCH] Add new type for 'Words and Music'

---
 openlp/plugins/songs/forms/editsongform.py |  1 +
 openlp/plugins/songs/lib/db.py             |  4 ++++
 openlp/plugins/songs/lib/xml.py            | 10 ++++++++--
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/openlp/plugins/songs/forms/editsongform.py b/openlp/plugins/songs/forms/editsongform.py
index d27f43343..4d6e1addb 100644
--- a/openlp/plugins/songs/forms/editsongform.py
+++ b/openlp/plugins/songs/forms/editsongform.py
@@ -308,6 +308,7 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog, RegistryProperties):
         # Don't iterate over the dictionary to give them this specific order
         self.author_types_combo_box.addItem(AuthorType.Types[AuthorType.Words], AuthorType.Words)
         self.author_types_combo_box.addItem(AuthorType.Types[AuthorType.Music], AuthorType.Music)
+        self.author_types_combo_box.addItem(AuthorType.Types[AuthorType.WordsAndMusic], AuthorType.WordsAndMusic)
         self.author_types_combo_box.addItem(AuthorType.Types[AuthorType.Translation], AuthorType.Translation)
 
     def load_topics(self):
diff --git a/openlp/plugins/songs/lib/db.py b/openlp/plugins/songs/lib/db.py
index 59592a7e0..fa53bccc8 100644
--- a/openlp/plugins/songs/lib/db.py
+++ b/openlp/plugins/songs/lib/db.py
@@ -66,13 +66,17 @@ class AuthorType(object):
     """
     Enumeration for Author types.
     They are defined by OpenLyrics: http://openlyrics.info/dataformat.html#authors
+
+    The 'words+music' type is not an official type, but is provided for convenience.
     """
     Words = 'words'
     Music = 'music'
+    WordsAndMusic = 'words+music'
     Translation = 'translation'
     Types = {
         Words: translate('OpenLP.Ui', 'Words'),
         Music: translate('OpenLP.Ui', 'Music'),
+        WordsAndMusic: translate('OpenLP.Ui', 'Words and Music'),
         Translation: translate('OpenLP.Ui', 'Translation')
     }
 
diff --git a/openlp/plugins/songs/lib/xml.py b/openlp/plugins/songs/lib/xml.py
index 7e41008bd..64c9aaf05 100644
--- a/openlp/plugins/songs/lib/xml.py
+++ b/openlp/plugins/songs/lib/xml.py
@@ -71,7 +71,7 @@ from lxml import etree, objectify
 from openlp.core.common import translate
 from openlp.core.lib import FormattingTags
 from openlp.plugins.songs.lib import VerseType, clean_song
-from openlp.plugins.songs.lib.db import Author, AuthorSong, Book, Song, Topic
+from openlp.plugins.songs.lib.db import Author, AuthorSong, AuthorType, Book, Song, Topic
 from openlp.core.utils import get_application_version
 
 log = logging.getLogger(__name__)
@@ -274,7 +274,13 @@ class OpenLyrics(object):
             for author_song in song.authors_songs:
                 element = self._add_text_to_element('author', authors, author_song.author.display_name)
                 if author_song.author_type:
-                    element.set('type', author_song.author_type)
+                    # Handle the special case 'words+music': Need to create two separate authors for that
+                    if author_song.author_type == AuthorType.WordsAndMusic:
+                        element.set('type', AuthorType.Words)
+                        element = self._add_text_to_element('author', authors, author_song.author.display_name)
+                        element.set('type', AuthorType.Music)
+                    else:
+                        element.set('type', author_song.author_type)
         book = self.manager.get_object_filtered(Book, Book.id == song.song_book_id)
         if book is not None:
             book = book.name