lilypond-1.5.16

diff --git a/lily/lyric-combine-music.cc b/lily/lyric-combine-music.cc
index de706373bdeae3ab35c30d8961e814e90842ec3c..b7b6196418fef18b52ec9b9be5770a24350eb6b3 100644 (file)
--- a/lily/lyric-combine-music.cc
+++ b/lily/lyric-combine-music.cc
@@ -46,16 +46,28 @@ Lyric_combine_music::compress (Moment m)
   music_l ()->compress (m);
 }
 
+
+
 Music*
 Lyric_combine_music::music_l () const
 {
-  return unsmob_music (get_mus_property ("music"));
+  SCM l = get_mus_property ("elements");
+  if (!gh_pair_p (l))
+    return 0;
+  return unsmob_music (gh_car (l));
 }
 
+
 Music*
 Lyric_combine_music::lyrics_l () const
 {
-  return unsmob_music (get_mus_property ("lyrics"));
+  SCM l = get_mus_property ("elements");
+  if (!gh_pair_p (l))
+    return 0;
+  l = gh_cdr (l);
+  if (!gh_pair_p (l))
+    return 0;
+  return unsmob_music (gh_car (l));
 }
 
 Lyric_combine_music::Lyric_combine_music ()

diff --git a/lily/part-combine-music.cc b/lily/part-combine-music.cc
index 316d4a117b9fa78679d3d58b31c9444add6a4959..11ccc59f85f88ea0cc821a2bc57213b07fa91caa 100644 (file)
--- a/lily/part-combine-music.cc
+++ b/lily/part-combine-music.cc
@@ -50,13 +50,23 @@ Part_combine_music::compress (Moment m)
 Music*
 Part_combine_music::first_l () const
 {
-  return unsmob_music (get_mus_property ("one"));
+  SCM l = get_mus_property ("elements");
+  if (!gh_pair_p (l))
+    return 0;
+  return unsmob_music (gh_car (l));
 }
 
+
 Music*
 Part_combine_music::second_l () const
 {
-  return unsmob_music (get_mus_property ("two"));
+  SCM l = get_mus_property ("elements");
+  if (!gh_pair_p (l))
+    return 0;
+  l = gh_cdr (l);
+  if (!gh_pair_p (l))
+    return 0;
+  return unsmob_music (gh_car (l));
 }
 
 

diff --git a/scripts/midi2ly.py b/scripts/midi2ly.py
index ec72a6a07a61c5b1a00f737dd2c8229decc22f42..0c3b42ae05c923a92e6f0b34a1184f1d9df544c7 100644 (file)
--- a/scripts/midi2ly.py
+++ b/scripts/midi2ly.py
@@ -289,6 +289,7 @@ def convert_midi (f):
        str = open (f).read ()
        midi_dump = midi.parse (str)
 
+
        tracks = []
        for t in midi_dump[1]:
                tracks.append (split_track (t))