* make/lilypond.fedora.spec.in (Requires): scrap kpathsea/tex

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

diff --git a/lily/instrument-name-engraver.cc b/lily/instrument-name-engraver.cc
index c859831f986a1da161c394cf35674507dc1ad228..8e1e84dc8e9f072227a12e7d90887b97c98052d8 100644 (file)
--- a/lily/instrument-name-engraver.cc
+++ b/lily/instrument-name-engraver.cc
@@ -3,12 +3,11 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
 #include "engraver.hh"
-#include "item.hh"
 #include "bar-line.hh"
 #include "system-start-delimiter.hh"
 #include "side-position-interface.hh"
@@ -38,11 +37,10 @@ Instrument_name_engraver::Instrument_name_engraver ()
   text_ = 0;
 }
 
-
 void
 Instrument_name_engraver::initialize ()
 {
-  daddy_context_->set_property ("instrumentSupport", SCM_EOL); 
+  context ()->set_property ("instrumentSupport", SCM_EOL); 
 }
 
 void
@@ -51,13 +49,11 @@ 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;
     }
 }
 
-
 void
 Instrument_name_engraver::create_text ()
 {
@@ -75,12 +71,12 @@ 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
 Instrument_name_engraver::acknowledge_grob (Grob_info i)
@@ -90,8 +86,13 @@ Instrument_name_engraver::acknowledge_grob (Grob_info i)
       create_text ();
     }
 
+  /*
+    Ugh - typechecking for pedal and dynamic sucks.
+   */
   if (dynamic_cast<Spanner*> (i.grob_)
-      && i.grob_->internal_has_interface (ly_symbol2scm ("dynamic-interface")))
+      && (i.grob_->internal_has_interface (ly_symbol2scm ("dynamic-interface"))
+         || i.grob_->internal_has_interface (ly_symbol2scm ("piano-pedal-interface")))
+         )
     return;
 
   /*
@@ -111,7 +112,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,11 +123,11 @@ 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 ();
 }
 
-ENTER_DESCRIPTION (Instrument_name_engraver,
+ADD_TRANSLATOR (Instrument_name_engraver,
 /* descr */       " Prints the name of the instrument (specified by "
 " @code{Staff.instrument} and @code{Staff.instr}) "
 "at the left of the staff. ",
@@ -169,16 +170,16 @@ 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);
+  
 }
 
 
 
-ENTER_DESCRIPTION (Vocal_name_engraver,
+ADD_TRANSLATOR (Vocal_name_engraver,
 /* descr */       " Prints the name of the a lyric voice (specified by "
 " @code{Staff.vocalName} and @code{Staff.vocNam}) "
 "at the left of the staff. ",