]> git.donarmstrong.com Git - lilypond.git/blobdiff - lily/new-lyric-combine-music-iterator.cc
(get_indexed_char): scale metrics by
[lilypond.git] / lily / new-lyric-combine-music-iterator.cc
index 690e828b987161dbc95f721939702edceb76c892..81ecd8172f7010bf91766cd4ca2089ff443fb0d3 100644 (file)
@@ -52,8 +52,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;
 
   /*
@@ -129,7 +129,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; 
@@ -223,7 +223,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;