* stepmake/aclocal.m4 (STEPMAKE_KPATHSEA): Do not include

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

diff --git a/lily/grace-iterator.cc b/lily/grace-iterator.cc
index 6668b66f4e9908b48f6c15b7ad9183598129cb01..1482caafe23959e89024c67071c6954e7763204a 100644 (file)
--- a/lily/grace-iterator.cc
+++ b/lily/grace-iterator.cc
@@ -3,29 +3,30 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2005 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"
 
 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);
+
+  /* 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_;