The grand \paper -> \layout, \bookpaper -> \paper renaming.

[lilypond.git] / lily / grob-pq-engraver.cc

diff --git a/lily/grob-pq-engraver.cc b/lily/grob-pq-engraver.cc
index ec2035303b4d6e63bcf61827e249bf8b2d1774e8..e3917c375854a57422f2ecf674f7e21701e67926 100644 (file)
--- a/lily/grob-pq-engraver.cc
+++ b/lily/grob-pq-engraver.cc
@@ -30,15 +30,15 @@ Grob_pq_engraver::Grob_pq_engraver ()
 void
 Grob_pq_engraver::initialize ()
 {
-  daddy_context_->set_property ("busyGrobs", SCM_EOL); 
+  context ()->set_property ("busyGrobs", SCM_EOL); 
 }
 
 LY_DEFINE (ly_grob_pq_less_p, "ly:grob-pq-less?",
          2, 0 ,0, (SCM a, SCM b), 
          "Compare 2 grob priority queue entries. Internal")
 {
-  if (Moment::compare (*unsmob_moment (ly_car (a)),
-                      *unsmob_moment (ly_car (b))) < 0)
+  if (Moment::compare (*unsmob_moment (scm_car (a)),
+                      *unsmob_moment (scm_car (b))) < 0)
     return SCM_BOOL_T;
   else
     return SCM_BOOL_F;
@@ -71,7 +71,7 @@ Grob_pq_engraver::acknowledge_grob (Grob_info gi)
 
       SCM busy= get_property ("busyGrobs");
       busy = scm_merge_x (lst, busy, ly_grob_pq_less_p_proc);
-      daddy_context_->set_property ("busyGrobs", busy);
+      context ()->set_property ("busyGrobs", busy);
     }
 }
 
@@ -82,13 +82,13 @@ Grob_pq_engraver::stop_translation_timestep ()
   Moment now = now_mom ();
   SCM start_busy = get_property ("busyGrobs");
   SCM busy = start_busy;
-  while (ly_pair_p (busy) && *unsmob_moment (ly_caar (busy)) == now)
+  while (scm_is_pair (busy) && *unsmob_moment (scm_caar (busy)) == now)
     {
-      busy = ly_cdr (busy);
+      busy = scm_cdr (busy);
     }
 
   if (start_busy != busy)
-    daddy_context_->set_property ("busyGrobs", busy);
+    context ()->set_property ("busyGrobs", busy);
 }
 
 void
@@ -98,17 +98,17 @@ Grob_pq_engraver::start_translation_timestep ()
 
   SCM start_busy = get_property ("busyGrobs");
   SCM busy = start_busy;
-  while (ly_pair_p (busy) && *unsmob_moment (ly_caar (busy)) < now)
+  while (scm_is_pair (busy) && *unsmob_moment (scm_caar (busy)) < now)
     {
       /*
        The grob-pq-engraver is not water tight, and stuff like
        tupletSpannerDuration confuses it.
        */
-      busy = ly_cdr (busy);
+      busy = scm_cdr (busy);
     }
 
   if (start_busy != busy)
-    daddy_context_->set_property ("busyGrobs", busy);
+    context ()->set_property ("busyGrobs", busy);
 }