* scm/page-layout.scm (ly:optimal-page-breaks): use new parameters

[lilypond.git] / lily / instrument-name-engraver.cc

diff --git a/lily/instrument-name-engraver.cc b/lily/instrument-name-engraver.cc
index c859831f986a1da161c394cf35674507dc1ad228..334da9dd59b39d0e692adce9328a9e5c50a5ed8f 100644 (file)
--- a/lily/instrument-name-engraver.cc
+++ b/lily/instrument-name-engraver.cc
@@ -42,7 +42,7 @@ Instrument_name_engraver::Instrument_name_engraver ()
 void
 Instrument_name_engraver::initialize ()
 {
-  daddy_context_->set_property ("instrumentSupport", SCM_EOL); 
+  context ()->set_property ("instrumentSupport", SCM_EOL); 
 }
 
 void
@@ -51,8 +51,7 @@ Instrument_name_engraver::stop_translation_timestep ()
   if (text_)
     {
       text_->set_property ("side-support-elements",
-                               get_property ("instrumentSupport"));
-      typeset_grob (text_);
+                          get_property ("instrumentSupport"));
       text_ = 0;
     }
 }
@@ -75,11 +74,11 @@ Instrument_name_engraver::create_text ()
     return ;
 
   
-  text_ = make_item ("InstrumentName");
+  text_ = make_item ("InstrumentName", SCM_EOL);
       
   if (text_->get_property ("text") != txt)
     text_->set_property ("text", txt);
-  announce_grob (text_, SCM_EOL);
+  
   }
 
 void
@@ -111,7 +110,7 @@ Instrument_name_engraver::acknowledge_grob (Grob_info i)
       SCM nl = scm_cons (i.grob_->self_scm (),
                        get_property ("instrumentSupport"));
 
-      daddy_context_->set_property ("instrumentSupport", nl);
+      context ()->set_property ("instrumentSupport", nl);
     }
 }
 
@@ -122,7 +121,7 @@ Instrument_name_engraver::process_music ()
     Also create text if barlines in other groups. This allows
     a name to be attached to lyrics or chords. 
    */
-  if (is_string (get_property ("whichBar")))
+  if (scm_is_string (get_property ("whichBar")))
     create_text ();
 }
 
@@ -169,11 +168,11 @@ Vocal_name_engraver::create_text ()
   if (txt == SCM_EOL)
     return ;
   
-  text_ = make_item ("VocalName");
+  text_ = make_item ("VocalName", SCM_EOL);
       
   if (text_->get_property ("text") != txt)
     text_->set_property ("text", txt);
-  announce_grob (text_, SCM_EOL);
+  
 }