X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnew-lyric-combine-music-iterator.cc;h=0ee78d3be85ccc34b92adf1c4a6e31b4500d4f54;hb=e24df7c27635dc996c466295eacf2981bddccaf7;hp=6b73ba7e68e17f5a17085d6be45ff7de653e25cc;hpb=b89771d85b17aec6df268da6deaa435cd22be25c;p=lilypond.git

diff --git a/lily/new-lyric-combine-music-iterator.cc b/lily/new-lyric-combine-music-iterator.cc
index 6b73ba7e68..0ee78d3be8 100644
--- a/lily/new-lyric-combine-music-iterator.cc
+++ b/lily/new-lyric-combine-music-iterator.cc
@@ -1,19 +1,16 @@
-/*   
-     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--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "context.hh"
-#include "lyric-combine-music.hh"
 #include "event.hh"
 #include "grob.hh"
 #include "music-iterator.hh"
 
-
 class New_lyric_combine_music_iterator : public Music_iterator
 {
 public:
@@ -36,8 +33,8 @@ private:
 
   bool music_found_;
   bool made_association_;
-  Context * lyrics_context_;
-  Context * music_context_;
+  Context *lyrics_context_;
+  Context *music_context_;
   SCM lyricsto_voice_name_;
   
   Music_iterator * lyric_iter_;
@@ -54,8 +51,8 @@ New_lyric_combine_music_iterator::New_lyric_combine_music_iterator ()
 {
   music_found_ = false;
   made_association_ = false;
-  lyric_iter_ =0;
-  music_context_ =0;
+  lyric_iter_ = 0;
+  music_context_ = 0;
   lyrics_context_ = 0;
 
   /*
@@ -131,7 +128,7 @@ New_lyric_combine_music_iterator::derived_substitute (Context *f, Context *t)
 {
   if (lyric_iter_)
     lyric_iter_->substitute_outlet (f,t);
-  if (lyrics_context_ && lyrics_context_==f)
+  if (lyrics_context_ && lyrics_context_ == f)
     lyrics_context_ = t;
   if (music_context_ && music_context_ == f)
     music_context_ = t; 
@@ -166,10 +163,10 @@ New_lyric_combine_music_iterator::find_voice ()
   SCM voice_name = lyricsto_voice_name_;
   SCM running = lyrics_context_ ? lyrics_context_->get_property ("associatedVoice") : SCM_EOL;
 
-  if (ly_c_string_p (running))
+  if (scm_is_string (running))
     voice_name = running;
 
-  if (ly_c_string_p (voice_name)
+  if (scm_is_string (voice_name)
       && (!music_context_ || ly_scm2string (voice_name) != music_context_->id_string ()))    
     {
       /*
@@ -225,7 +222,7 @@ New_lyric_combine_music_iterator::process (Moment )
   if (music_context_
       && start_new_syllable () && lyric_iter_->ok ())
     {
-      Moment m= lyric_iter_->pending_moment ();
+      Moment m = lyric_iter_->pending_moment ();
       lyric_iter_->process (m);
 
       music_found_ = true; 
@@ -240,10 +237,10 @@ New_lyric_combine_music_iterator::do_quit ()
       SCM voice_name = get_music ()->get_property ("associated-context");
 
       String name;
-      if (ly_c_string_p (voice_name))
+      if (scm_is_string (voice_name))
 	name = ly_scm2string (voice_name);
 
-      get_music ()->origin ()->warning (_f ("Haven't found Voice `%s'.",
+      get_music ()->origin ()->warning (_f ("cannot find Voice `%s'",
 					    name.to_str0 ()) + "\n");
     }