Search thrugh all sections for possible voice contexts

Author: eoma

ly/musicxml/ly2xml_mediator.py

@@ -273,8 +273,10 @@ def check_lyrics(self, voice_id):
         if voice_section:
             voice_section.merge_lyrics(lyrics_section, voice_id)
         else:
-            # A potentially slow path
-            voice_section = self.score.find_section_for_voice(voice_id)
+            voice_section = self.score.find_section_for_voice(voice_id, self.sections)
+            if not voice_section:
+                # A potentially slow path, search the whole score
+                voice_section = self.score.find_section_for_voice(voice_id)
             if voice_section:
                 # Must explicitly only merge with notes with the same voice_id
                 voice_section.merge_lyrics(lyrics_section, voice_id)

ly/musicxml/xml_objs.py

@@ -274,16 +274,14 @@ def debug_group(g):
         for i in self.partlist:
             debug_group(i)
 
-    def find_section_for_voice(self, voice_context, parent = None):
-        partlist = self.partlist
-
-        if parent:
-            partlist = parent.partlist
+    def find_section_for_voice(self, voice_context, partlist = None):
+        if not partlist:
+            partlist = self.partlist
 
         for section in partlist[::-1]:
             # Iterate over sections in partlist, in reverser order (newest to oldest)
             if isinstance(section, ScorePartGroup):
-                section_candidate = self.find_section_for_voice(voice_context, section)
+                section_candidate = self.find_section_for_voice(voice_context, section.partlist)
                 if section_candidate:
                     return section_candidate
             elif isinstance(section, ScoreSection):