X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrace-iterator.cc;h=3c0e8bb3b44fbb4adfff21659675ce08794f9c37;hb=9e6f16dddf9e21b29eed1717efe4bac6c20774ba;hp=c2459b310ec0975c6ab03e11bc30c2a9645355b7;hpb=d8368ce94bf128266f7019c470ea6a208194fac2;p=lilypond.git

diff --git a/lily/grace-iterator.cc b/lily/grace-iterator.cc
index c2459b310e..3c0e8bb3b4 100644
--- a/lily/grace-iterator.cc
+++ b/lily/grace-iterator.cc
@@ -1,52 +1,36 @@
-/*   
-  grace-iterator.cc --  implement Grace_iterator
-  
+/*
+  grace-music.cc -- implement Grace_music
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 1999--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
 #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::construct_children () 
+Grace_iterator::process (Moment m)
 {
-  Translator_group * t = report_to_l ()->find_create_translator_l ("Grace", ""); // umgh.
+  Moment main;
+  main.main_part_ = -start_mom_.grace_part_ + m.grace_part_;
+  Music_wrapper_iterator::process (main);
 
-  if (t)
-    set_translator (t);
-  Music_wrapper_iterator::construct_children ();
-}
-
-void
-Grace_iterator::process (Moment)
-{
-  Global_translator * t = dynamic_cast<Global_translator*>(report_to_l ());
-  if (t)
-    {
-      t->start ();
-      t->run_iterator_on_me (child_iter_p_);
-      delete child_iter_p_;
-      child_iter_p_ = 0;
-      t->finish ();
-    }
-  else
-    {
-      warning (_("no Grace context available")); 
-    }
+  /* 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
 {
-  return 0;
+  Moment cp = Music_wrapper_iterator::pending_moment ();
+
+  Moment pending;
+  pending.grace_part_ = start_mom_.grace_part_ + cp.main_part_;
+
+  return pending;
 }
 
+IMPLEMENT_CTOR_CALLBACK (Grace_iterator);