* lily/include/main.hh: rename format to backend.

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

diff --git a/lily/lyric-combine-music-iterator.cc b/lily/lyric-combine-music-iterator.cc
index 74c076670bdc9282660bd40edf7554fde6fce306..c1076cd792534a3d4da7522b546302df3dd45c19 100644 (file)
--- a/lily/lyric-combine-music-iterator.cc
+++ b/lily/lyric-combine-music-iterator.cc
@@ -45,9 +45,9 @@ melisma_busy (Context* tr)
   SCM melisma_properties = tr->get_property ("melismaBusyProperties");
   bool busy = false;
 
-  for (; gh_pair_p (melisma_properties);
-       melisma_properties = gh_cdr (melisma_properties))
-    busy = busy || to_boolean (tr->internal_get_property (gh_car (melisma_properties)));
+  for (; scm_is_pair (melisma_properties);
+       melisma_properties = scm_cdr (melisma_properties))
+    busy = busy || to_boolean (tr->internal_get_property (scm_car (melisma_properties)));
 
   return busy;
 }
@@ -62,8 +62,8 @@ Music *melisma_playing_req;
 
 Lyric_combine_music_iterator::Lyric_combine_music_iterator ()
 {
-  music_iter_ =0;
-  lyric_iter_ =0;
+  music_iter_ = 0;
+  lyric_iter_ = 0;
 
   if (!busy_req)
     {
@@ -128,10 +128,10 @@ Lyric_combine_music_iterator::get_busy_status () const
 
   SCM grobs = tr->get_property ("busyGrobs");
   Moment now = tr->now_mom ();
-  for (; gh_pair_p (grobs); grobs = gh_cdr (grobs))
+  for (; scm_is_pair (grobs); grobs = scm_cdr (grobs))
     {
-      SCM grob = gh_cdar (grobs);
-      Moment end  =*unsmob_moment (gh_caar (grobs));
+      SCM grob = scm_cdar (grobs);
+      Moment end  =*unsmob_moment (scm_caar (grobs));
 
       
       /*
@@ -168,7 +168,7 @@ Lyric_combine_music_iterator::process (Moment m)
 
   if (get_busy_status () && !melisma_busy () && lyric_iter_->ok ())
     {
-      Moment m= lyric_iter_->pending_moment ();
+      Moment m = lyric_iter_->pending_moment ();
       lyric_iter_->process (m);
     }
 }