* scripts/lilypond-book.py (Lilypond_snippet.is_outdated): require

[lilypond.git] / lily / lyric-combine-music-iterator.cc

diff --git a/lily/lyric-combine-music-iterator.cc b/lily/lyric-combine-music-iterator.cc
index f0abc783c3f16cb113bc8fcbaee4544c76fc84a9..74c076670bdc9282660bd40edf7554fde6fce306 100644 (file)
--- a/lily/lyric-combine-music-iterator.cc
+++ b/lily/lyric-combine-music-iterator.cc
@@ -3,11 +3,11 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
-#include "translator-group.hh"
+#include "context.hh"
 #include "lyric-combine-music.hh"
 #include "event.hh"
 #include "note-head.hh"
@@ -19,17 +19,17 @@ class Lyric_combine_music_iterator : public Music_iterator
 public:
   Lyric_combine_music_iterator ();
   Lyric_combine_music_iterator (Lyric_combine_music_iterator const&src);
-  DECLARE_SCHEME_CALLBACK(constructor, ());
+  DECLARE_SCHEME_CALLBACK (constructor, ());
 protected:
   virtual void construct_children ();
   virtual Moment pending_moment () const;
-  virtual void do_quit(); 
+  virtual void do_quit (); 
   virtual void process (Moment);
   virtual Music_iterator *try_music_in_children (Music *) const;
 
   virtual bool ok () const;
   virtual void derived_mark () const;
-  virtual void derived_substitute (Translator_group*,Translator_group*) ;
+  virtual void derived_substitute (Context *,Context *) ;
 private:
   bool get_busy_status ()const ;
   bool melisma_busy (); 
@@ -40,7 +40,7 @@ private:
 
 
 bool
-melisma_busy (Translator* tr)
+melisma_busy (Context* tr)
 {
   SCM melisma_properties = tr->get_property ("melismaBusyProperties");
   bool busy = false;
@@ -88,16 +88,16 @@ Lyric_combine_music_iterator::ok () const
 }
 
 void
-Lyric_combine_music_iterator::derived_mark()const
+Lyric_combine_music_iterator::derived_mark ()const
 {
   if (music_iter_)
-    scm_gc_mark (music_iter_->self_scm());
+    scm_gc_mark (music_iter_->self_scm ());
   if (lyric_iter_)
-    scm_gc_mark (lyric_iter_->self_scm());
+    scm_gc_mark (lyric_iter_->self_scm ());
 }
 
 void
-Lyric_combine_music_iterator::derived_substitute (Translator_group*f,Translator_group* t)
+Lyric_combine_music_iterator::derived_substitute (Context *f,Context * t)
 {
   if (music_iter_)
     music_iter_->substitute_outlet (f,t);
@@ -124,10 +124,10 @@ Lyric_combine_music_iterator::get_busy_status () const
   if (try_music (busy_req))
     return true;
   
-  Translator_group * tr = music_iter_->get_outlet ();
+  Context * tr = music_iter_->get_outlet ();
 
   SCM grobs = tr->get_property ("busyGrobs");
-  Moment now = tr->now_mom();
+  Moment now = tr->now_mom ();
   for (; gh_pair_p (grobs); grobs = gh_cdr (grobs))
     {
       SCM grob = gh_cdar (grobs);
@@ -177,9 +177,9 @@ void
 Lyric_combine_music_iterator::do_quit ()
 {
   if (music_iter_)
-    music_iter_->quit();
+    music_iter_->quit ();
   if (lyric_iter_)
-    lyric_iter_->quit();
+    lyric_iter_->quit ();
 }
 
 Music_iterator*