(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 c3fc90d65b3bef59ea92db29d60d4e26c0101de1..feebdceb0fa26a9d514e1857af12e59e283e5591 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 (; is_pair (melisma_properties);
-       melisma_properties = ly_cdr (melisma_properties))
-    busy = busy || to_boolean (tr->internal_get_property (ly_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;
 }
@@ -128,10 +128,10 @@ Lyric_combine_music_iterator::get_busy_status () const
 
   SCM grobs = tr->get_property ("busyGrobs");
   Moment now = tr->now_mom ();
-  for (; is_pair (grobs); grobs = ly_cdr (grobs))
+  for (; scm_is_pair (grobs); grobs = scm_cdr (grobs))
     {
-      SCM grob = ly_cdar (grobs);
-      Moment end  =*unsmob_moment (ly_caar (grobs));
+      SCM grob = scm_cdar (grobs);
+      Moment end  =*unsmob_moment (scm_caar (grobs));
 
       
       /*