From: Reinhold Kainhofer <reinhold@kainhofer.com>
Date: Tue, 23 Oct 2007 21:39:06 +0000 (+0200)
Subject: MusicXML: Fix bug in lyrics and ties
X-Git-Tag: release/2.11.35-1~78
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=4e0a2b45ec7f5a01db189ddc008c2571610c5287;p=lilypond.git

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 5ffbeb98b5..f5f0b9cdf9 100644
--- 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>
         </pitch>
         <duration>1</duration>
+        <tie type="start"/>
         <voice>1</voice>
         <type>quarter</type>
         <stem>down</stem>
         <notations>
-          <slur number="1" type="start"/>
+          <tied type="start"/>
         </notations>
         <lyric number="1">
           <syllabic>middle</syllabic>
@@ -135,15 +136,16 @@
       </note>
       <note>
         <pitch>
-          <step>E</step>
+          <step>C</step>
           <octave>5</octave>
         </pitch>
         <duration>1</duration>
+        <tie type="stop"/>
         <voice>1</voice>
         <type>quarter</type>
         <stem>down</stem>
         <notations>
-          <slur number="1" type="stop"/>
+          <tied type="stop"/>
         </notations>
       </note>
       <note>
diff --git a/scripts/musicxml2ly.py b/scripts/musicxml2ly.py
index d8b184ef43..4441f5be68 100644
--- 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: