]> git.donarmstrong.com Git - lilypond.git/blobdiff - lily/instrument-name-engraver.cc
* The grand 2005-2006 replace.
[lilypond.git] / lily / instrument-name-engraver.cc
index 74f0754cd1d2e693de85506e13e680f2cb5673c4..288a68b5a73e88849ac97f11fa6fa399996001c6 100644 (file)
@@ -1,48 +1,52 @@
-/*   
-  instrument-name-engraver.cc --  implement Instrument_name_engraver
-  
+/*
+  instrument-name-engraver.cc -- implement Instrument_name_engraver
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 2000--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 2000--2006 Han-Wen Nienhuys <hanwen@xs4all.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 "text-item.hh"
+#include "context.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);
+  TRANSLATOR_DECLARATIONS (Instrument_name_engraver);
 
 protected:
   Grob *text_;
 
   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
 Instrument_name_engraver::initialize ()
 {
-  daddy_trans_->set_property ("instrumentSupport", SCM_EOL); 
+  context ()->set_property ("instrumentSupport", SCM_EOL);
 }
 
 void
@@ -50,48 +54,52 @@ Instrument_name_engraver::stop_translation_timestep ()
 {
   if (text_)
     {
-      text_->set_grob_property ("side-support-elements",
-                               get_property ("instrumentSupport"));
-      typeset_grob (text_);
+      text_->set_object ("side-support-elements",
+                        grob_list_to_grob_array (get_property ("instrumentSupport")));
       text_ = 0;
     }
-}
 
+  first_ = false;
+}
 
 void
 Instrument_name_engraver::create_text ()
 {
   if (text_)
-    return ;
-  
+    return;
+
   SCM txt = get_property ("instrument");
-  
+
   if (now_mom () > Moment (0))
     txt = get_property ("instr");
   /*
     UGH.
   */
   if (txt == SCM_EOL)
-    return ;
+    return;
+
+  text_ = make_item ("InstrumentName", SCM_EOL);
 
-  
-  text_ = make_item ("InstrumentName");
-      
-  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
-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 ();
+}
 
-  if (dynamic_cast<Spanner*> (i.grob_)
-      && i.grob_->internal_has_interface (ly_symbol2scm ("dynamic-interface")))
+void
+Instrument_name_engraver::acknowledge_axis_group (Grob_info info)
+{
+  /*
+    Ugh - typechecking for pedal and dynamic sucks.
+  */
+  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;
 
   /*
@@ -103,15 +111,15 @@ 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::axis_b (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 = gh_cons (i.grob_->self_scm (),
-                       get_property ("instrumentSupport"));
+      SCM nl = scm_cons (info.grob ()->self_scm (),
+                        get_property ("instrumentSupport"));
 
-      daddy_trans_->set_property ("instrumentSupport", nl);
+      context ()->set_property ("instrumentSupport", nl);
     }
 }
 
@@ -120,46 +128,48 @@ 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();
+    a name to be attached to lyrics or chords.
+  */
+  if (scm_is_string (get_property ("whichBar"))
+      || first_)
+    create_text ();
 }
 
-ENTER_DESCRIPTION(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. ",
-/* creats*/       "InstrumentName",
-/* accepts */     "",
-/* acks  */      "bar-line-interface axis-group-interface",
-/* reads */       "instrument instr",
-/* write */       "");
+#include "translator.icc"
 
-/****************************************************************/
+ADD_ACKNOWLEDGER (Instrument_name_engraver, bar_line);
+ADD_ACKNOWLEDGER (Instrument_name_engraver, axis_group);
 
+ADD_TRANSLATOR (Instrument_name_engraver,
+               /* doc */ " Prints the name of the instrument (specified by "
+               " @code{Staff.instrument} and @code{Staff.instr}) "
+               "at the left of the staff. ",
+               /* create */ "InstrumentName",
+               /* accept */ "",
+               /* read */ "instrument instr",
+               /* write */ "");
+
+/****************************************************************/
 
 class Vocal_name_engraver : public Instrument_name_engraver
 {
 public:
-  TRANSLATOR_DECLARATIONS(Vocal_name_engraver);
+  TRANSLATOR_DECLARATIONS (Vocal_name_engraver);
   virtual void create_text ();
 };
 
-
 Vocal_name_engraver::Vocal_name_engraver ()
 {
 }
 
-
 void
 Vocal_name_engraver::create_text ()
 {
   if (text_)
-    return ;
-  
+    return;
+
   SCM txt = get_property ("vocalName");
-  
+
   if (now_mom () > Moment (0))
     txt = get_property ("vocNam");
 
@@ -167,23 +177,21 @@ Vocal_name_engraver::create_text ()
     UGH.
   */
   if (txt == SCM_EOL)
-    return ;
-  
-  text_ = make_item ("VocalName");
-      
-  if (text_->get_grob_property ("text") != txt)
-    text_->set_grob_property ("text", txt);
-  announce_grob (text_, SCM_EOL);
-}
+    return;
 
+  text_ = make_item ("VocalName", SCM_EOL);
 
+  if (text_->get_property ("text") != txt)
+    text_->set_property ("text", txt);
+}
 
-ENTER_DESCRIPTION(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. ",
-/* creats*/       "VocalName",
-/* accepts */     "",
-/* acks  */      "bar-line-interface axis-group-interface",
-/* reads */       "vocNam vocalName",
-/* write */       "");
+ADD_ACKNOWLEDGER (Vocal_name_engraver, bar_line);
+ADD_ACKNOWLEDGER (Vocal_name_engraver, axis_group);
+ADD_TRANSLATOR (Vocal_name_engraver,
+               /* doc */ " Prints the name of the a lyric voice (specified by "
+               " @code{Staff.vocalName} and @code{Staff.vocNam}) "
+               "at the left of the staff. ",
+               /* create */ "VocalName",
+               /* accept */ "",
+               /* read */ "vocNam vocalName",
+               /* write */ "");