* mf/feta-bolletjes.mf (overdone_heads): cleanup triangle

[lilypond.git] / lily / forbid-break-engraver.cc

diff --git a/lily/forbid-break-engraver.cc b/lily/forbid-break-engraver.cc
index 492a35e4f79f560a2c4abaed2583ebd9a6fed405..2407e81613e0bfd7c4d6398024ad9f58af774a98 100644 (file)
--- a/lily/forbid-break-engraver.cc
+++ b/lily/forbid-break-engraver.cc
@@ -1,5 +1,4 @@
 #include "rhythmic-head.hh"
-#include "engraver.hh"
 #include "grob.hh"
 #include "score-engraver.hh"
 
@@ -21,18 +20,18 @@ Forbid_line_break_engraver::start_translation_timestep ()
   SCM busy = get_property ("busyGrobs");
 
   Moment now = now_mom ();
-  while (ly_pair_p (busy) && unsmob_moment (ly_caar (busy))->main_part_ == now.main_part_)
-    busy = ly_cdr (busy);
+  while (scm_is_pair (busy) && unsmob_moment (scm_caar (busy))->main_part_ == now.main_part_)
+    busy = scm_cdr (busy);
 
   
-  while (ly_pair_p (busy))
+  while (scm_is_pair (busy))
     {
-      Grob *g = unsmob_grob (ly_cdar (busy));
+      Grob *g = unsmob_grob (scm_cdar (busy));
       if (Rhythmic_head::has_interface (g))
        {
          get_score_engraver ()->forbid_breaks ();
        }
-      busy = ly_cdr (busy);
+      busy = scm_cdr (busy);
     }
 }