fix typos.

[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 6b73ba7e68e17f5a17085d6be45ff7de653e25cc..dd2f487bdb42cdd0601e018f211bf99f5088c497 100644 (file)
--- a/lily/new-lyric-combine-music-iterator.cc
+++ b/lily/new-lyric-combine-music-iterator.cc
@@ -1,10 +1,9 @@
-/*   
-     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"
@@ -166,10 +165,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 ()))    
     {
       /*
@@ -240,10 +239,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");
     }