* lily/text-item.cc (text_to_molecule): new function

[lilypond.git] / lily / include / grace-iterator.hh

diff --git a/lily/include/grace-iterator.hh b/lily/include/grace-iterator.hh
index c253d078e826d0bcaebe6fa0a7d74047ec86fe78..f758bbd6f8bed460d7737523e004cfb80ebd3770 100644 (file)
--- a/lily/include/grace-iterator.hh
+++ b/lily/include/grace-iterator.hh
@@ -3,12 +3,12 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
-#ifndef GRACE_ITERATOR_HH
-#define GRACE_ITERATOR_HH
+#ifndef NEWGRACE_ITERATOR_HH
+#define NEWGRACE_ITERATOR_HH
 
 #include "music-wrapper-iterator.hh"
 
@@ -16,11 +16,9 @@ class Grace_iterator : public Music_wrapper_iterator
 {
 public:
   VIRTUAL_COPY_CONS (Music_iterator);
-  ~Grace_iterator ();
-  virtual void construct_children () ;
-  virtual void do_process_and_next (Moment);
-
-  Moment next_moment () const;
+  virtual void process (Moment);
+  DECLARE_SCHEME_CALLBACK(constructor, ());
+  Moment pending_moment () const;
 };