* lily/include/lily-guile.hh: compatibility glue for 1.6

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

diff --git a/lily/custos-engraver.cc b/lily/custos-engraver.cc
index 7b1a59da1d4dc44d393a61117bdebdd462c16da3..0538aef4527eee03547bdc714b889272fe0439d1 100644 (file)
--- 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 (gh_string_p (get_property ("whichBar")))
+  if (scm_is_string (get_property ("whichBar")))
     custos_permitted = true;
   
   if (custos_permitted)
@@ -108,12 +104,12 @@ Custos_engraver::process_acknowledged_grobs ()
 
          int p = pitches_[i].steps ();
          SCM c0 = get_property ("middleCPosition");
-         if (gh_number_p (c0))
-           p += gh_scm2int (c0);
+         if (ly_c_number_p (c0))
+           p += ly_scm2int (c0);
 
          
          c->set_property ("staff-position",
-                               gh_int2scm (p));
+                               scm_int2num (p));
          
        }
 
@@ -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 ();
 }