MusicXML: Fix bug in lyrics and ties

I forgot to reset the is_tied flag, so after a tie, no lyrics would be
printed out any more (the second note of a tie is in a melisma and does
not use any lyrics syllables in lilypond - Of course only if it is
really a tied note...).

diff --git a/input/regression/musicxml/06d-Lyrics-Melisma-Finale.xml b/input/regression/musicxml/06d-Lyrics-Melisma-Finale.xml
index 5ffbeb98b5e7a152e96e4d4b7f19ec1294bd0307..f5f0b9cdf9817fe302f0f769beb6d238a7f48ada 100644 (file)
--- a/input/regression/musicxml/06d-Lyrics-Melisma-Finale.xml
+++ b/input/regression/musicxml/06d-Lyrics-Melisma-Finale.xml
@@ -122,11 +122,12 @@
           <octave>5</octave>\r
         </pitch>\r
         <duration>1</duration>\r
+        <tie type="start"/>\r
         <voice>1</voice>\r
         <type>quarter</type>\r
         <stem>down</stem>\r
         <notations>\r
-          <slur number="1" type="start"/>\r
+          <tied type="start"/>\r
         </notations>\r
         <lyric number="1">\r
           <syllabic>middle</syllabic>\r
@@ -135,15 +136,16 @@
       </note>\r
       <note>\r
         <pitch>\r
-          <step>E</step>\r
+          <step>C</step>\r
           <octave>5</octave>\r
         </pitch>\r
         <duration>1</duration>\r
+        <tie type="stop"/>\r
         <voice>1</voice>\r
         <type>quarter</type>\r
         <stem>down</stem>\r
         <notations>\r
-          <slur number="1" type="stop"/>\r
+          <tied type="stop"/>\r
         </notations>\r
       </note>\r
       <note>\r

diff --git a/scripts/musicxml2ly.py b/scripts/musicxml2ly.py
index d8b184ef433e71c164df40d5ce7946a79867794e..4441f5be682ef9fc24340ea9ced05f945293f0b5 100644 (file)
--- a/scripts/musicxml2ly.py
+++ b/scripts/musicxml2ly.py
@@ -1063,6 +1063,8 @@ def musicxml_voice_to_lily_voice (voice):
             if mxl_tie and mxl_tie.type == 'start':
                 ev_chord.append (musicexp.TieEvent ())
                 is_tied = True
+            else:
+                is_tied = False
 
             fermatas = notations.get_named_children ('fermata')
             for a in fermatas: