2003 -> 2004

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

diff --git a/lily/grace-iterator.cc b/lily/grace-iterator.cc
index 3be0038ddebefae4c1bd600fe422ad5a4d648200..9f394c6176fea4b08356aba4993a70715242b0d8 100644 (file)
--- a/lily/grace-iterator.cc
+++ b/lily/grace-iterator.cc
@@ -1,54 +1,37 @@
 /*   
-  grace-iterator.cc --  implement Grace_iterator
+  grace-music.cc --  implement Grace_music
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 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 "warn.hh"
-
-Grace_iterator::~Grace_iterator () 
-{
-  //  child_iter_p_ = 0;
-}
 
-void
-Grace_iterator::construct_children () 
-{
-  Translator_group * t = report_to_l ()->find_create_translator_l ("Grace", ""); // umgh.
 
-  if (t)
-    set_translator (t);
-  Music_wrapper_iterator::construct_children ();
-}
+#include "global-translator.hh"
+#include "warn.hh"
 
 void
-Grace_iterator::process (Moment)
+Grace_iterator::process (Moment m)
 {
-  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")); 
-    }
+  Moment main ;
+  main.main_part_ = - start_mom_.grace_part_ + m.grace_part_;
+  Music_wrapper_iterator::process (main);
 }
 
 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);
+IMPLEMENT_CTOR_CALLBACK (Grace_iterator);