Updates.

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

diff --git a/lily/new-lyric-combine-music-iterator.cc b/lily/new-lyric-combine-music-iterator.cc
index 43660044adf729333cc7bf1f6dba195493ac996f..ff658fc8fac039adb3dd52f8bc472313e699429a 100644 (file)
--- a/lily/new-lyric-combine-music-iterator.cc
+++ b/lily/new-lyric-combine-music-iterator.cc
@@ -7,7 +7,7 @@ source file of the GNU LilyPond music typesetter
 
  */
 
-#include "translator-group.hh"
+#include "context.hh"
 #include "lyric-combine-music.hh"
 #include "event.hh"
 #include "grob.hh"
@@ -19,24 +19,25 @@ class New_lyric_combine_music_iterator : public Music_iterator
 public:
   New_lyric_combine_music_iterator ();
   New_lyric_combine_music_iterator (New_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 run_always ()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 start_new_syllable () ;
   void find_voice ();
 
+  bool music_found_;
   bool made_association_;
-  Translator_group * lyrics_context_;
-  Translator_group* music_context_;
+  Context * lyrics_context_;
+  Context * music_context_;
   Music_iterator * lyric_iter_;
 };
 
@@ -49,6 +50,7 @@ static Music *melisma_playing_ev;
 
 New_lyric_combine_music_iterator::New_lyric_combine_music_iterator ()
 {
+  music_found_ = false;
   made_association_ = false;
   lyric_iter_ =0;
   music_context_ =0;
@@ -112,7 +114,7 @@ New_lyric_combine_music_iterator::ok () const
 }
 
 void
-New_lyric_combine_music_iterator::derived_mark()const
+New_lyric_combine_music_iterator::derived_mark ()const
 {
   if (lyric_iter_)
     scm_gc_mark (lyric_iter_->self_scm ());
@@ -123,7 +125,7 @@ New_lyric_combine_music_iterator::derived_mark()const
 }
 
 void
-New_lyric_combine_music_iterator::derived_substitute (Translator_group*f, Translator_group*t)
+New_lyric_combine_music_iterator::derived_substitute (Context *f, Context *t)
 {
   if (lyric_iter_)
     lyric_iter_->substitute_outlet (f,t);
@@ -133,44 +135,18 @@ New_lyric_combine_music_iterator::derived_substitute (Translator_group*f, Transl
     music_context_ = t; 
 }
 
-/*
-  ID == "" means accept any ID.
- */
-Translator_group *
-find_context_below (Translator_group * where,
-                   String type, String id)
-{
-  if (where->is_alias (ly_symbol2scm (type.to_str0 ())))
-    {
-      if (id == "" || where->id_string_ == id)
-       return where;
-    }
-  
-  Translator_group * found = 0;
-  for (SCM s = where->trans_group_list_;
-       !found && gh_pair_p (s); s = gh_cdr (s))
-    {
-      Translator_group * tr = dynamic_cast<Translator_group*> (unsmob_translator (gh_car (s)));
-
-      found = find_context_below (tr, type, id);
-    }
-
-  return found; 
-}
-
-
 
 void
 New_lyric_combine_music_iterator::construct_children ()
 {
-  Music *m = unsmob_music (get_music ()->get_mus_property ("element"));
+  Music *m = unsmob_music (get_music ()->get_property ("element"));
   lyric_iter_ = unsmob_iterator (get_iterator (m));
 
   find_voice ();
   
   if (lyric_iter_)
     lyrics_context_ = find_context_below (lyric_iter_->get_outlet (),
-                                         "Lyrics", "");
+                                         ly_symbol2scm ("Lyrics"), "");
 
   /*
     We do not create a Lyrics context, because the user might
@@ -184,20 +160,17 @@ New_lyric_combine_music_iterator::find_voice ()
 {
   if (!music_context_)
     {
-      SCM voice_name = get_music ()->get_mus_property ("associated-context");
+      SCM voice_name = get_music ()->get_property ("associated-context");
   
-      if (gh_string_p (voice_name))
+      if (ly_c_string_p (voice_name))
        {
-         Translator_group *t = get_outlet ();
-         while (t && t->daddy_trans_)
-           t = t->daddy_trans_;
+         Context *t = get_outlet ();
+         while (t && t->get_parent_context ())
+           t = t->get_parent_context ();
 
          String name = ly_scm2string (voice_name);
-         Translator_group *voice = find_context_below (t, "Voice", name);
-         if (!voice)
-           get_music ()->origin ()->warning (_f ("cannot find Voice: %s\n",
-                                                 name.to_str0 ())); 
-         else
+         Context *voice = find_context_below (t, ly_symbol2scm ("Voice"), name);
+         if (voice)
            music_context_ = voice;
            
        }
@@ -221,7 +194,7 @@ New_lyric_combine_music_iterator::process (Moment )
   if (!music_context_)
     return ;
   
-  if (!music_context_->daddy_trans_)
+  if (!music_context_->get_parent_context ())
     {
       /*
        The melody has died.
@@ -238,14 +211,28 @@ New_lyric_combine_music_iterator::process (Moment )
     {
       Moment m= lyric_iter_->pending_moment ();
       lyric_iter_->process (m);
+
+      music_found_ = true; 
     }
 }
 
 void
 New_lyric_combine_music_iterator::do_quit ()
 {
+  if (!music_found_)
+    {
+      SCM voice_name = get_music ()->get_property ("associated-context");
+
+      String name;
+      if (ly_c_string_p (voice_name))
+       name = ly_scm2string (voice_name);
+
+      get_music ()->origin ()->warning (_f ("Haven't found Voice `%s'.",
+                                           name.to_str0 ()) + "\n");
+    }
+
   if (lyric_iter_)
-    lyric_iter_->quit();
+    lyric_iter_->quit ();
 }