lilypond-1.3.115

diff --git a/lily/auto-change-music.cc b/lily/auto-change-music.cc
index d98cd8ed29c29308a1593a65a91f7b81d42610ec..5af0524d964be0299d96e7465df6a35e5e26935d 100644 (file)
--- 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 4c6cbfb47a6e5c1ef56f00b9d5aa91782f921e91..8350fcb098825f94e29d6c7ef88b1d1092c3465a 100644 (file)
--- 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 e2928ad6ec4d61834e542ec48e7a7a1e13a7c1cc..a17842339c16c20dacddea893b6242f19bb07c73 100644 (file)
--- 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 f96a354fcb19a2729ce542ed4d83bd6b94c341aa..0451dd1fbaf9495c27514832bfe321c11234968e 100644 (file)
--- 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 0c293c8166598bbff5b7b5e6ee36b06e9d8b3019..719a37fffb3bec40634b552f1ad0803547cceedf 100644 (file)
--- 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 d28a8c5fe38bbd8eb3b2fb07f28259d61ed2cfeb..78b18b0cb2e69a0b1c1db989fda7143e546368e9 100644 (file)
--- 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 4f6546c40517c68d570090fb128509efcfcc7364..b5f274cad46c970d2e50cd1becfd41530e2ece04 100644 (file)
--- 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 a91dcb5644d5c9a0116d29eaf6fe6ba939edc929..51e37f80f591d7ca57092924c25bb8f9c93d26b0 100644 (file)
--- 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 5fd6206da358ab5120c9e7ee8d0cdf0083ad4b49..5ce5b1a8b9baeff18e7f72929cfe73471bfb2a41 100644 (file)
--- 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 801af5b8e9c3390d9afea8411b94218380656bd4..c6f7f50b9a0514a7eedbecdce969803ba5e375b1 100644 (file)
--- 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