From: fred <fred>
Date: Wed, 27 Mar 2002 00:34:16 +0000 (+0000)
Subject: lilypond-1.3.115
X-Git-Tag: release/1.5.59~1058
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=0ce08882cccf9db9601b8cc30d80b01426b6862a;p=lilypond.git

lilypond-1.3.115
---

diff --git a/lily/auto-change-music.cc b/lily/auto-change-music.cc
index d98cd8ed29..5af0524d96 100644
--- a/lily/auto-change-music.cc
+++ b/lily/auto-change-music.cc
@@ -10,7 +10,7 @@
 #include "auto-change-music.hh"
 #include "auto-change-iterator.hh"
 
-Auto_change_music::Auto_change_music (Music * m)
+Auto_change_music::Auto_change_music (SCM m)
   : Music_wrapper (m)
 {
   set_mus_property ("iterator-ctor", Auto_change_iterator::constructor_cxx_function);
diff --git a/lily/context-specced-music.cc b/lily/context-specced-music.cc
index 4c6cbfb47a..8350fcb098 100644
--- a/lily/context-specced-music.cc
+++ b/lily/context-specced-music.cc
@@ -7,7 +7,7 @@
   
  */
 #include "context-specced-music.hh"
-Context_specced_music::Context_specced_music(Music *m)
+Context_specced_music::Context_specced_music(SCM m)
   : Music_wrapper  (m)
 {
   set_mus_property ("type",
diff --git a/lily/grace-music.cc b/lily/grace-music.cc
index e2928ad6ec..a17842339c 100644
--- a/lily/grace-music.cc
+++ b/lily/grace-music.cc
@@ -22,7 +22,7 @@ Grace_music::length_mom () const
   return 0;
 }
 
-Grace_music::Grace_music (Music *p)
+Grace_music::Grace_music (SCM p)
   : Music_wrapper (p)
 {
   set_mus_property ("iterator-ctor",
diff --git a/lily/include/auto-change-music.hh b/lily/include/auto-change-music.hh
index f96a354fcb..0451dd1fba 100644
--- a/lily/include/auto-change-music.hh
+++ b/lily/include/auto-change-music.hh
@@ -16,7 +16,7 @@
 class Auto_change_music : public Music_wrapper
 {
 public:
-  Auto_change_music (Music *);
+  Auto_change_music (SCM);
 
 };
 
diff --git a/lily/include/context-specced-music.hh b/lily/include/context-specced-music.hh
index 0c293c8166..719a37fffb 100644
--- a/lily/include/context-specced-music.hh
+++ b/lily/include/context-specced-music.hh
@@ -15,7 +15,7 @@
 class Context_specced_music : public Music_wrapper
 {
 public:  
-  Context_specced_music (Music*);
+  Context_specced_music (SCM);
   VIRTUAL_COPY_CONS(Music);
 };
 #endif /* CONTEXT_SPECCED_MUSIC_HH */
diff --git a/lily/include/lyric-combine-music.hh b/lily/include/lyric-combine-music.hh
index d28a8c5fe3..78b18b0cb2 100644
--- a/lily/include/lyric-combine-music.hh
+++ b/lily/include/lyric-combine-music.hh
@@ -18,7 +18,7 @@ public:
   Music * music_l () const;
   Music * lyrics_l () const;
   
-  Lyric_combine_music (Music*, Music*);
+  Lyric_combine_music (SCM);
   virtual void transpose (Pitch);
 
   VIRTUAL_COPY_CONS(Music);
diff --git a/lily/include/music-wrapper.hh b/lily/include/music-wrapper.hh
index 4f6546c405..b5f274cad4 100644
--- a/lily/include/music-wrapper.hh
+++ b/lily/include/music-wrapper.hh
@@ -22,7 +22,7 @@
 class Music_wrapper : public Music
 {
 public:
-  Music_wrapper (Music*);
+  Music_wrapper (SCM);
   Music * element () const;
   virtual void transpose (Pitch);
 
diff --git a/lily/lyric-combine-music.cc b/lily/lyric-combine-music.cc
index a91dcb5644..51e37f80f5 100644
--- a/lily/lyric-combine-music.cc
+++ b/lily/lyric-combine-music.cc
@@ -11,11 +11,9 @@
 #include "lyric-combine-music-iterator.hh"
 #include "pitch.hh"
 
-Lyric_combine_music::Lyric_combine_music (Music * m, Music * l)
+Lyric_combine_music::Lyric_combine_music (SCM l)
+  : Music (l)
 {
-  set_mus_property ("music", m->self_scm ());
-  set_mus_property ("lyrics", l->self_scm ());  
-
   set_mus_property ("iterator-ctor",
 		    Lyric_combine_music_iterator::constructor_cxx_function);
 }
diff --git a/lily/music-sequence.cc b/lily/music-sequence.cc
index 5fd6206da3..5ce5b1a8b9 100644
--- a/lily/music-sequence.cc
+++ b/lily/music-sequence.cc
@@ -51,9 +51,9 @@ Music_sequence::append_music (Music *m)
   scm_unprotect_object (m->self_scm ());
 }
 
-Music_sequence::Music_sequence(SCM h)
+Music_sequence::Music_sequence(SCM l)
+  : Music (l)
 {
-  set_mus_property ("elements", h);
 }
 
 void
diff --git a/lily/music-wrapper.cc b/lily/music-wrapper.cc
index 801af5b8e9..c6f7f50b9a 100644
--- a/lily/music-wrapper.cc
+++ b/lily/music-wrapper.cc
@@ -21,10 +21,9 @@ Music_wrapper::transpose (Pitch p)
 }
 
 
-Music_wrapper::Music_wrapper(Music*p)
+Music_wrapper::Music_wrapper(SCM l)
+  : Music (l)
 {
-  set_mus_property ("element", p->self_scm ());
-  scm_unprotect_object (p->self_scm ());
 }
 
 Moment