* lily/include/music.hh (class Music): replace Music::start_mom()

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

diff --git a/lily/grace-iterator.cc b/lily/grace-iterator.cc
index 1b5053fa922bc53f58ef85c179dc4a8e66399e42..e9e6259acbffefe6b83462dd41c077af8b2fde00 100644 (file)
--- a/lily/grace-iterator.cc
+++ b/lily/grace-iterator.cc
@@ -3,44 +3,30 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2002 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"
-
-
-#include "global-translator.hh"
+#include "global-context.hh"
 #include "warn.hh"
 
-
-Grace_iterator::~Grace_iterator () 
-{
-  //  child_iter_p_ = 0;
-}
-
-
 void
 Grace_iterator::process (Moment m)
 {
-  Moment main ;
+  Moment main;
   main.main_part_ = - start_mom_.grace_part_ + m.grace_part_;
   Music_wrapper_iterator::process (main);
-}
 
-void
-Grace_iterator::construct_children ()
-{
-  Music_wrapper_iterator::construct_children ();
+  /* We can safely do this, since \grace should always be inside
+     sequential.  */
+  descend_to_child (child_iter_->get_outlet ());
 }
 
-
-
 Moment
 Grace_iterator::pending_moment () const
 {
-  Moment cp =Music_wrapper_iterator::pending_moment();
+  Moment cp = Music_wrapper_iterator::pending_moment ();
 
   Moment pending;
   pending.grace_part_ =  start_mom_.grace_part_ + cp.main_part_;