2003 -> 2004

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

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