*** empty log message ***

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

diff --git a/lily/instrument-name-engraver.cc b/lily/instrument-name-engraver.cc
index 74f0754cd1d2e693de85506e13e680f2cb5673c4..1debf00a12e07ca74a0a9ee3b5f53056eee7f140 100644 (file)
--- a/lily/instrument-name-engraver.cc
+++ b/lily/instrument-name-engraver.cc
@@ -3,25 +3,24 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2004 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"
 #include "align-interface.hh"
 #include "axis-group-interface.hh"
-#include "translator-group.hh"
+#include "context.hh"
 #include "text-item.hh"
 
 class Instrument_name_engraver : public Engraver
 {
   
 public:
-  TRANSLATOR_DECLARATIONS(Instrument_name_engraver);
+  TRANSLATOR_DECLARATIONS (Instrument_name_engraver);
 
 protected:
   Grob *text_;
@@ -42,7 +41,7 @@ Instrument_name_engraver::Instrument_name_engraver ()
 void
 Instrument_name_engraver::initialize ()
 {
-  daddy_trans_->set_property ("instrumentSupport", SCM_EOL); 
+  context ()->set_property ("instrumentSupport", SCM_EOL); 
 }
 
 void
@@ -50,9 +49,8 @@ Instrument_name_engraver::stop_translation_timestep ()
 {
   if (text_)
     {
-      text_->set_grob_property ("side-support-elements",
-                               get_property ("instrumentSupport"));
-      typeset_grob (text_);
+      text_->set_property ("side-support-elements",
+                          get_property ("instrumentSupport"));
       text_ = 0;
     }
 }
@@ -75,11 +73,11 @@ Instrument_name_engraver::create_text ()
     return ;
 
   
-  text_ = make_item ("InstrumentName");
+  text_ = make_item ("InstrumentName", SCM_EOL);
       
-  if (text_->get_grob_property ("text") != txt)
-    text_->set_grob_property ("text", txt);
-  announce_grob (text_, SCM_EOL);
+  if (text_->get_property ("text") != txt)
+    text_->set_property ("text", txt);
+  
   }
 
 void
@@ -87,7 +85,7 @@ Instrument_name_engraver::acknowledge_grob (Grob_info i)
 {
   if (Bar_line::has_interface (i.grob_))
     {
-      create_text();
+      create_text ();
     }
 
   if (dynamic_cast<Spanner*> (i.grob_)
@@ -105,13 +103,13 @@ Instrument_name_engraver::acknowledge_grob (Grob_info i)
   */
   if (dynamic_cast<Spanner*> (i.grob_)
       && ((Axis_group_interface::has_interface (i.grob_)
-          && Axis_group_interface::axis_b (i.grob_, Y_AXIS)))
+          && Axis_group_interface::has_axis (i.grob_, Y_AXIS)))
       && !Align_interface::has_interface (i.grob_))
     {
-      SCM nl = gh_cons (i.grob_->self_scm (),
+      SCM nl = scm_cons (i.grob_->self_scm (),
                        get_property ("instrumentSupport"));
 
-      daddy_trans_->set_property ("instrumentSupport", nl);
+      context ()->set_property ("instrumentSupport", nl);
     }
 }
 
@@ -122,11 +120,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 (gh_string_p (get_property ("whichBar")))
-    create_text();
+  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. ",
@@ -142,7 +140,7 @@ ENTER_DESCRIPTION(Instrument_name_engraver,
 class Vocal_name_engraver : public Instrument_name_engraver
 {
 public:
-  TRANSLATOR_DECLARATIONS(Vocal_name_engraver);
+  TRANSLATOR_DECLARATIONS (Vocal_name_engraver);
   virtual void create_text ();
 };
 
@@ -169,16 +167,16 @@ Vocal_name_engraver::create_text ()
   if (txt == SCM_EOL)
     return ;
   
-  text_ = make_item ("VocalName");
+  text_ = make_item ("VocalName", SCM_EOL);
       
-  if (text_->get_grob_property ("text") != txt)
-    text_->set_grob_property ("text", txt);
-  announce_grob (text_, SCM_EOL);
+  if (text_->get_property ("text") != txt)
+    text_->set_property ("text", txt);
+  
 }
 
 
 
-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. ",