MusicXML: Fix figured bass without duration

Duration for figured bass is optional. If not given, take the duration
of the following note. This was broken and caused musicxml2ly to crash
(and I didn't notice because a test case was missing)

Signed-off-by: Reinhold Kainhofer <reinhold@kainhofer.com>

diff --git a/input/regression/musicxml/18a-FiguredBass.xml b/input/regression/musicxml/18a-FiguredBass.xml
index c6f1d7da46c6f1d88199926c3d9dded9ee17dd4a..b0a43eb94b74835f870bfb4ef628459ea1c259db 100644 (file)
--- a/input/regression/musicxml/18a-FiguredBass.xml
+++ b/input/regression/musicxml/18a-FiguredBass.xml
@@ -66,7 +66,6 @@
       </note>
       <figured-bass parentheses="yes">
         <figure><figure-number>6</figure-number></figure>
-        <duration>2</duration>
       </figured-bass>
       <note>
         <pitch><step>G</step><octave>4</octave></pitch>
@@ -77,6 +76,7 @@
       <figured-bass>
         <figure><figure-number>5</figure-number><suffix>slash</suffix></figure>
         <figure><prefix>flat</prefix><figure-number>127</figure-number><suffix>slash</suffix></figure>
+        <duration>8</duration>
       </figured-bass>
       <note>
         <pitch><step>G</step><octave>4</octave></pitch>

diff --git a/scripts/musicxml2ly.py b/scripts/musicxml2ly.py
index 22f78523754131cca185450ff076ce901ae72d35..98371b44f2c84e4d0d73275f644ec89c11053b1b 100644 (file)
--- a/scripts/musicxml2ly.py
+++ b/scripts/musicxml2ly.py
@@ -1842,6 +1842,8 @@ def musicxml_voice_to_lily_voice (voice):
                 dur = fb.real_duration
                 if not dur:
                     dur = ev_chord.get_length ()
+                if not fb.duration:
+                    fb.duration = ev_chord.get_duration ()
                 figured_bass_builder.add_music (fb, dur)
             pending_figured_bass = []