* The grand 2005-2006 replace.

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

diff --git a/lily/instrument-name-engraver.cc b/lily/instrument-name-engraver.cc
index 34fcca0c2268c419aef40c123e799716e24119c4..288a68b5a73e88849ac97f11fa6fa399996001c6 100644 (file)
--- a/lily/instrument-name-engraver.cc
+++ b/lily/instrument-name-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
@@ -13,11 +13,14 @@
 #include "align-interface.hh"
 #include "axis-group-interface.hh"
 #include "context.hh"
-#include "text-item.hh"
+#include "text-interface.hh"
+#include "grob-array.hh"
+
+#include "translator.icc"
 
 class Instrument_name_engraver : public Engraver
 {
-
+  bool first_;
 public:
   TRANSLATOR_DECLARATIONS (Instrument_name_engraver);
 
@@ -26,14 +29,18 @@ protected:
 
   virtual void create_text ();
   virtual void initialize ();
-  virtual void acknowledge_grob (Grob_info);
-  virtual void stop_translation_timestep ();
-  virtual void process_music ();
+
+  DECLARE_ACKNOWLEDGER (bar_line);
+  DECLARE_ACKNOWLEDGER (axis_group);
+
+  void stop_translation_timestep ();
+  void process_music ();
 };
 
 Instrument_name_engraver::Instrument_name_engraver ()
 {
   text_ = 0;
+  first_ = true;
 }
 
 void
@@ -47,10 +54,12 @@ Instrument_name_engraver::stop_translation_timestep ()
 {
   if (text_)
     {
-      text_->set_property ("side-support-elements",
-                          get_property ("instrumentSupport"));
+      text_->set_object ("side-support-elements",
+                        grob_list_to_grob_array (get_property ("instrumentSupport")));
       text_ = 0;
     }
+
+  first_ = false;
 }
 
 void
@@ -76,19 +85,21 @@ Instrument_name_engraver::create_text ()
 }
 
 void
-Instrument_name_engraver::acknowledge_grob (Grob_info i)
+Instrument_name_engraver::acknowledge_bar_line (Grob_info info)
 {
-  if (Bar_line::has_interface (i.grob ()))
-    {
-      create_text ();
-    }
+  (void) info;
+  create_text ();
+}
 
+void
+Instrument_name_engraver::acknowledge_axis_group (Grob_info info)
+{
   /*
     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 ("piano-pedal-interface"))))
+  if (dynamic_cast<Spanner *> (info.grob ())
+      && (info.grob ()->internal_has_interface (ly_symbol2scm ("dynamic-interface"))
+         || info.grob ()->internal_has_interface (ly_symbol2scm ("piano-pedal-interface"))))
     return;
 
   /*
@@ -100,12 +111,12 @@ Instrument_name_engraver::acknowledge_grob (Grob_info i)
     We could also just use stavesFound, but lets keep this working
     without staffs as well.
   */
-  if (dynamic_cast<Spanner *> (i.grob ())
-      && ((Axis_group_interface::has_interface (i.grob ())
-          && Axis_group_interface::has_axis (i.grob (), Y_AXIS)))
-      && !Align_interface::has_interface (i.grob ()))
+  if (dynamic_cast<Spanner *> (info.grob ())
+      && ((Axis_group_interface::has_interface (info.grob ())
+          && Axis_group_interface::has_axis (info.grob (), Y_AXIS)))
+      && !Align_interface::has_interface (info.grob ()))
     {
-      SCM nl = scm_cons (i.grob ()->self_scm (),
+      SCM nl = scm_cons (info.grob ()->self_scm (),
                         get_property ("instrumentSupport"));
 
       context ()->set_property ("instrumentSupport", nl);
@@ -119,18 +130,23 @@ 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 (scm_is_string (get_property ("whichBar")))
+  if (scm_is_string (get_property ("whichBar"))
+      || first_)
     create_text ();
 }
 
+#include "translator.icc"
+
+ADD_ACKNOWLEDGER (Instrument_name_engraver, bar_line);
+ADD_ACKNOWLEDGER (Instrument_name_engraver, axis_group);
+
 ADD_TRANSLATOR (Instrument_name_engraver,
-               /* descr */ " Prints the name of the instrument (specified by "
+               /* doc */ " Prints the name of the instrument (specified by "
                " @code{Staff.instrument} and @code{Staff.instr}) "
                "at the left of the staff. ",
-               /* creats*/ "InstrumentName",
-               /* accepts */ "",
-               /* acks  */ "bar-line-interface axis-group-interface",
-               /* reads */ "instrument instr",
+               /* create */ "InstrumentName",
+               /* accept */ "",
+               /* read */ "instrument instr",
                /* write */ "");
 
 /****************************************************************/
@@ -169,12 +185,13 @@ Vocal_name_engraver::create_text ()
     text_->set_property ("text", txt);
 }
 
+ADD_ACKNOWLEDGER (Vocal_name_engraver, bar_line);
+ADD_ACKNOWLEDGER (Vocal_name_engraver, axis_group);
 ADD_TRANSLATOR (Vocal_name_engraver,
-               /* descr */ " Prints the name of the a lyric voice (specified by "
+               /* doc */ " Prints the name of the a lyric voice (specified by "
                " @code{Staff.vocalName} and @code{Staff.vocNam}) "
                "at the left of the staff. ",
-               /* creats*/ "VocalName",
-               /* accepts */ "",
-               /* acks  */ "bar-line-interface axis-group-interface",
-               /* reads */ "vocNam vocalName",
+               /* create */ "VocalName",
+               /* accept */ "",
+               /* read */ "vocNam vocalName",
                /* write */ "");