From 7a5dfce59d1fb8a6a7136f7ba3d1562d56d7f466 Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Wed, 27 Mar 2002 02:03:29 +0000
Subject: [PATCH] lilypond-1.5.16

---
 lily/lyric-combine-music.cc | 16 ++++++++++++++--
 lily/part-combine-music.cc  | 14 ++++++++++++--
 scripts/midi2ly.py          |  1 +
 3 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/lily/lyric-combine-music.cc b/lily/lyric-combine-music.cc
index de706373bd..b7b6196418 100644
--- 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 316d4a117b..11ccc59f85 100644
--- 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 ec72a6a07a..0c3b42ae05 100644
--- 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))
-- 
2.39.5