X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrace-music.cc;h=b6ae587881241c4e6b4bc12e7413a343aca2a7e6;hb=df7667c81afced0f9d6422b5cbaaf49fd5b3ae1f;hp=a17842339c16c20dacddea893b6242f19bb07c73;hpb=1161a2b71bc32575ea9878a8631221edb8c03279;p=lilypond.git

diff --git a/lily/grace-music.cc b/lily/grace-music.cc
index a17842339c..b6ae587881 100644
--- a/lily/grace-music.cc
+++ b/lily/grace-music.cc
@@ -1,30 +1,26 @@
-/*   
-  grace-music.cc --  implement Grace_music
-  
+/*
+  grace-music.cc -- implement Grace_music
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
 
-#include "grace-music.hh"
-#include "grace-iterator.hh"
+  (c) 1999--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+*/
 
-void
-Grace_music::compress (Moment)
-{
-  
-}
+#include "music.hh"
+#include "music-wrapper.hh"
 
-Moment
-Grace_music::length_mom () const
+class Grace_music
 {
-  return 0;
-}
+public:
+  DECLARE_SCHEME_CALLBACK (start_callback, (SCM));
+};
 
-Grace_music::Grace_music (SCM p)
-  : Music_wrapper (p)
+MAKE_SCHEME_CALLBACK (Grace_music, start_callback, 1);
+SCM
+Grace_music::start_callback (SCM m)
 {
-  set_mus_property ("iterator-ctor",
-		    Grace_iterator::constructor_cxx_function);
+  Moment *l = unsmob_moment (Music_wrapper::length_callback (m));
+  Moment gl;
+  gl.grace_part_ = -(l->main_part_ + l->grace_part_);
+  return gl.smobbed_copy ();
 }