* lily/ledger-line-spanner.cc (print): swap linear_combination

[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 0278c0eaf2153ff8e7970103657e5e35d7098cf5..dd2f487bdb42cdd0601e018f211bf99f5088c497 100644 (file)
--- a/lily/new-lyric-combine-music-iterator.cc
+++ b/lily/new-lyric-combine-music-iterator.cc
@@ -1,11 +1,10 @@
-/*   
-new-lyric-combine-iterator.cc --  implement New_lyric_combine_music_iterator
-
-source file of the GNU LilyPond music typesetter
-
-(c) 2004 Han-Wen Nienhuys <hanwen@xs4all.nl>
-
- */
+/*
+  new-lyric-combine-iterator.cc -- implement New_lyric_combine_music_iterator
+  
+  source file of the GNU LilyPond music typesetter
+  
+  (c) 2004 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
 #include "context.hh"
 #include "lyric-combine-music.hh"
@@ -19,11 +18,11 @@ 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;
@@ -34,9 +33,12 @@ private:
   bool start_new_syllable () ;
   void find_voice ();
 
+  bool music_found_;
   bool made_association_;
   Context * lyrics_context_;
   Context * music_context_;
+  SCM lyricsto_voice_name_;
+  
   Music_iterator * lyric_iter_;
 };
 
@@ -49,6 +51,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 +115,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 ());
@@ -137,14 +140,17 @@ New_lyric_combine_music_iterator::derived_substitute (Context *f, Context *t)
 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));
 
+  lyricsto_voice_name_ = get_music ()->get_property ("associated-context");
+
+  
   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
@@ -156,25 +162,33 @@ New_lyric_combine_music_iterator::construct_children ()
 void
 New_lyric_combine_music_iterator::find_voice ()
 {
-  if (!music_context_)
+  SCM voice_name = lyricsto_voice_name_;
+  SCM running = lyrics_context_ ? lyrics_context_->get_property ("associatedVoice") : SCM_EOL;
+
+  if (scm_is_string (running))
+    voice_name = running;
+
+  if (scm_is_string (voice_name)
+      && (!music_context_ || ly_scm2string (voice_name) != music_context_->id_string ()))    
     {
-      SCM voice_name = get_music ()->get_mus_property ("associated-context");
-  
-      if (gh_string_p (voice_name))
-       {
-         Context *t = get_outlet ();
-         while (t && t->daddy_context_)
-           t = t->daddy_context_;
-
-         String name = ly_scm2string (voice_name);
-         Context *voice = find_context_below (t, "Voice", name);
-         if (!voice)
-           get_music ()->origin ()->warning (_f ("cannot find Voice: %s\n",
-                                                 name.to_str0 ())); 
-         else
-           music_context_ = voice;
-           
-       }
+      /*
+       (spaghettini).
+       
+       Need to set associatedVoiceContext again
+       */
+      if (music_context_)
+       made_association_ = false;
+      
+      Context *t = get_outlet ();
+      while (t && t->get_parent_context ())
+       t = t->get_parent_context ();
+
+      String name = ly_scm2string (voice_name);
+      Context *voice = find_context_below (t, ly_symbol2scm ("Voice"), name);
+
+      
+      if (voice)
+       music_context_ = voice;
     }
 
   if (lyrics_context_ && music_context_)
@@ -195,7 +209,7 @@ New_lyric_combine_music_iterator::process (Moment )
   if (!music_context_)
     return ;
   
-  if (!music_context_->daddy_context_)
+  if (!music_context_->get_parent_context ())
     {
       /*
        The melody has died.
@@ -212,14 +226,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 (scm_is_string (voice_name))
+       name = ly_scm2string (voice_name);
+
+      get_music ()->origin ()->warning (_f ("cannot find Voice `%s'",
+                                           name.to_str0 ()) + "\n");
+    }
+
   if (lyric_iter_)
-    lyric_iter_->quit();
+    lyric_iter_->quit ();
 }