X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcustos-engraver.cc;h=928fde107eb70d5e065067ad9095cbb42a3e7435;hb=c05008764f5b4cf61e975e8f57bfe02be237d2ce;hp=f96daf267dd4803da601df381a2de6380fcc8cf1;hpb=28976d28a04cfb9abe97af7214d7dce11f732604;p=lilypond.git

diff --git a/lily/custos-engraver.cc b/lily/custos-engraver.cc
index f96daf267d..928fde107e 100644
--- a/lily/custos-engraver.cc
+++ b/lily/custos-engraver.cc
@@ -51,10 +51,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 +93,7 @@ Custos_engraver::acknowledge_grob (Grob_info info)
 void
 Custos_engraver::process_acknowledged_grobs ()
 {
-  if (is_string (get_property ("whichBar")))
+  if (scm_is_string (get_property ("whichBar")))
     custos_permitted = true;
   
   if (custos_permitted)
@@ -108,8 +104,8 @@ Custos_engraver::process_acknowledged_grobs ()
 
 	  int p = pitches_[i].steps ();
 	  SCM c0 = get_property ("middleCPosition");
-	  if (is_number (c0))
-	    p += ly_scm2int (c0);
+	  if (scm_is_number (c0))
+	    p += scm_to_int (c0);
 
 	  
 	  c->set_property ("staff-position",
@@ -124,9 +120,9 @@ Custos_engraver::process_acknowledged_grobs ()
 Item* 
 Custos_engraver::create_custos ()
 {
-  Item* custos = make_item ("Custos");
+  Item* custos = make_item ("Custos", SCM_EOL);
+  
   
-  announce_grob (custos, SCM_EOL);
   custodes_.push (custos);
   
   return custos;
@@ -138,7 +134,6 @@ Custos_engraver::finalize ()
   for (int i = custodes_.size (); i--;)
     {
       custodes_[i]->suicide ();
-      typeset_grob (custodes_[i]);
     }
   custodes_.clear ();
 }