X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrace-music.cc;h=3445eab175ea4ecce02b89c296ba7ac0d74f089e;hb=905473989ebcecca6922afcf6161c5c24a8e0282;hp=e2928ad6ec4d61834e542ec48e7a7a1e13a7c1cc;hpb=cda8fc1780778b760905c8832f7e984161218f20;p=lilypond.git

diff --git a/lily/grace-music.cc b/lily/grace-music.cc
index e2928ad6ec..3445eab175 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--2009 Han-Wen Nienhuys <hanwen@xs4all.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 (Music *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 ();
 }