release: 1.3.139

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

diff --git a/lily/grace-iterator.cc b/lily/grace-iterator.cc
index f93e13e942990681a7a6d6d987de3bfa5654bc43..18a7a62bf6c776e235faa1eeabd5bee881cae30d 100644 (file)
--- a/lily/grace-iterator.cc
+++ b/lily/grace-iterator.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -11,6 +11,11 @@
 #include "global-translator.hh"
 #include "warn.hh"
 
+Grace_iterator::~Grace_iterator () 
+{
+  //  child_iter_p_ = 0;
+}
+
 void
 Grace_iterator::construct_children () 
 {
@@ -22,9 +27,9 @@ Grace_iterator::construct_children ()
 }
 
 void
-Grace_iterator::do_process_and_next (Moment m)
+Grace_iterator::process (Moment)
 {
-  Global_translator * t = dynamic_cast<Global_translator*>(report_to_l ());
+  Global_translator * t = dynamic_cast<Global_translator*> (report_to_l ());
   if (t)
     {
       t->start ();
@@ -35,13 +40,15 @@ Grace_iterator::do_process_and_next (Moment m)
     }
   else
     {
-      warning (_("No Grace context available!")); 
+      warning (_ ("no Grace context available")); 
     }
-  Music_iterator::do_process_and_next (m);
 }
 
 Moment
-Grace_iterator::next_moment ()  const
+Grace_iterator::pending_moment () const
 {
   return 0;
 }
+
+
+IMPLEMENT_CTOR_CALLBACK (Grace_iterator);