(overdone_heads): typos.

[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 4c176aacf2491b94e59c24fa8a611622c9d67f1f..feebdceb0fa26a9d514e1857af12e59e283e5591 100644 (file)
--- a/lily/lyric-combine-music-iterator.cc
+++ b/lily/lyric-combine-music-iterator.cc
@@ -19,11 +19,11 @@ class Lyric_combine_music_iterator : public Music_iterator
 public:
   Lyric_combine_music_iterator ();
   Lyric_combine_music_iterator (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;
 
@@ -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;
 }
@@ -88,12 +88,12 @@ Lyric_combine_music_iterator::ok () const
 }
 
 void
-Lyric_combine_music_iterator::derived_mark()const
+Lyric_combine_music_iterator::derived_mark ()const
 {
   if (music_iter_)
-    scm_gc_mark (music_iter_->self_scm());
+    scm_gc_mark (music_iter_->self_scm ());
   if (lyric_iter_)
-    scm_gc_mark (lyric_iter_->self_scm());
+    scm_gc_mark (lyric_iter_->self_scm ());
 }
 
 void
@@ -127,11 +127,11 @@ Lyric_combine_music_iterator::get_busy_status () const
   Context * tr = music_iter_->get_outlet ();
 
   SCM grobs = tr->get_property ("busyGrobs");
-  Moment now = tr->now_mom();
-  for (; gh_pair_p (grobs); grobs = gh_cdr (grobs))
+  Moment now = tr->now_mom ();
+  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));
 
       
       /*
@@ -177,9 +177,9 @@ void
 Lyric_combine_music_iterator::do_quit ()
 {
   if (music_iter_)
-    music_iter_->quit();
+    music_iter_->quit ();
   if (lyric_iter_)
-    lyric_iter_->quit();
+    lyric_iter_->quit ();
 }
 
 Music_iterator*