*** empty log message ***

[lilypond.git] / lily / custos-engraver.cc

diff --git a/lily/custos-engraver.cc b/lily/custos-engraver.cc
index 09d0ec9aa6e558a0991a2c41b6f2caf517b75cf9..e5566dfa4112c0262258773bb3c8e18b1116d1d5 100644 (file)
--- a/lily/custos-engraver.cc
+++ b/lily/custos-engraver.cc
@@ -13,7 +13,6 @@
 #include "note-head.hh"
 #include "staff-symbol-referencer.hh"
 #include "warn.hh"
-#include "event.hh"
 
 /*
  * This class implements an engraver for custos symbols.
@@ -51,10 +50,6 @@ Custos_engraver::stop_translation_timestep ()
   /*
     delay typeset until we're at the next moment, so we can silence custodes at the end of the piece.
    */
-  for (int i = custodes_.size (); i--;)
-    {
-      typeset_grob (custodes_[i]);
-    }
   pitches_.clear ();
 
   custos_permitted = false;
@@ -97,7 +92,7 @@ Custos_engraver::acknowledge_grob (Grob_info info)
 void
 Custos_engraver::process_acknowledged_grobs ()
 {
-  if (ly_c_string_p (get_property ("whichBar")))
+  if (scm_is_string (get_property ("whichBar")))
     custos_permitted = true;
   
   if (custos_permitted)
@@ -108,8 +103,8 @@ Custos_engraver::process_acknowledged_grobs ()
 
          int p = pitches_[i].steps ();
          SCM c0 = get_property ("middleCPosition");
-         if (ly_c_number_p (c0))
-           p += ly_scm2int (c0);
+         if (scm_is_number (c0))
+           p += scm_to_int (c0);
 
          
          c->set_property ("staff-position",
@@ -138,14 +133,13 @@ Custos_engraver::finalize ()
   for (int i = custodes_.size (); i--;)
     {
       custodes_[i]->suicide ();
-      typeset_grob (custodes_[i]);
     }
   custodes_.clear ();
 }
 
 
 
-ENTER_DESCRIPTION (Custos_engraver,
+ADD_TRANSLATOR (Custos_engraver,
 /* descr */       "",
 /* creats*/       "Custos",
 /* accepts */     "",