release: 1.5.1

[lilypond.git] / lily / grace-music.cc

diff --git a/lily/grace-music.cc b/lily/grace-music.cc
index d93d4829b30f902f2646fde2fa3820d3b7c76825..9e88f7b835cb21d35933b7e8c969f618c2643b90 100644 (file)
--- a/lily/grace-music.cc
+++ b/lily/grace-music.cc
@@ -3,25 +3,46 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
 #include "grace-music.hh"
+#include "grace-iterator.hh"
 
 void
-Grace_music::compress (Moment)
+Grace_music::compress (Moment m) 
 {
-  
+  Music_wrapper::compress (m); 
 }
 
 Moment
 Grace_music::length_mom () const
 {
-  return 0;
+  Moment l = Music_wrapper::length_mom ();
+  Moment gl;
+  gl.grace_mom_ = l.main_part_ + l.grace_mom_ ;
+  return gl;
+}
+
+
+Moment
+Grace_music::start_mom () const
+{
+  return Music::start_mom ();
 }
 
-Grace_music::Grace_music (Music *p)
+Grace_music::Grace_music ()
+{
+  set_mus_property ("iterator-ctor",
+                   Grace_iterator::constructor_cxx_function);
+}
+
+Grace_music::Grace_music (SCM p)
   : Music_wrapper (p)
 {
+  set_mus_property ("iterator-ctor",
+                   Grace_iterator::constructor_cxx_function);
 }
+
+ADD_MUSIC (Grace_music);