release: 1.3.131

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

diff --git a/lily/instrument-name-engraver.cc b/lily/instrument-name-engraver.cc
index 910a8f8ef5531286bbf1d8f6eef95d0a5cecb87f..852ef176d35a4a0b4d963b95cbb5d4c39a9e7b84 100644 (file)
--- a/lily/instrument-name-engraver.cc
+++ b/lily/instrument-name-engraver.cc
@@ -1,10 +1,9 @@
-
 /*   
   new-staff-margin-engraver.cc --  implement Instrument_name_engraver
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -13,19 +12,20 @@
 #include "bar.hh"
 #include "system-start-delimiter.hh"
 #include "side-position-interface.hh"
+#include "align-interface.hh"
 
 class Instrument_name_engraver : public Engraver
 {
   Item *text_;
-  System_start_delimiter * delim_ ;
+  Grob * delim_ ;
 
   void create_text (SCM s);
 public:
   VIRTUAL_COPY_CONS(Translator);
   Instrument_name_engraver ();
 
-  virtual void acknowledge_element (Score_element_info);
-  virtual void do_pre_move_processing ();
+  virtual void acknowledge_grob (Grob_info);
+  virtual void stop_translation_timestep ();
 };
 
 ADD_THIS_TRANSLATOR(Instrument_name_engraver);
@@ -38,14 +38,11 @@ Instrument_name_engraver::Instrument_name_engraver ()
 
 
 void
-Instrument_name_engraver::do_pre_move_processing ()
+Instrument_name_engraver::stop_translation_timestep ()
 {
   if (text_)
     {
-      text_->add_offset_callback (Side_position::centered_on_parent,
-                                 Y_AXIS);
-
-      typeset_element (text_);
+      typeset_grob (text_);
       text_ = 0;
     }
 }
@@ -55,39 +52,42 @@ Instrument_name_engraver::create_text (SCM txt)
 {
   if(!text_)
     {
-      text_ = new Item (get_property ("basicInstrumentNameProperties"));
-      text_->set_elt_property ("text", txt);
-
-      /*
-       TODO: use more lispish names for break-align-symbols
-       */
+      text_ = new Item (get_property ("InstrumentName"));
+      
+      if (text_->get_grob_property ("text") != txt)
+       text_->set_grob_property ("text", txt);
+     
       if (delim_)
-       text_->set_parent (delim_, Y_AXIS);
-
-      announce_element (Score_element_info (text_,0));
+        text_->set_parent (delim_, Y_AXIS);
+      
+      announce_grob (text_,0);
     }
 }
 
 void
-Instrument_name_engraver::acknowledge_element (Score_element_info i)
+Instrument_name_engraver::acknowledge_grob (Grob_info i)
 {
-  SCM s = get_property ("instrument");
+  if (Bar::has_interface (i.elem_l_))
+    {
+      SCM s = get_property ("instrument");
   
-  if (now_mom () > Moment (0))
-    s = get_property ("instr");
+      if (now_mom () > Moment (0))
+       s = get_property ("instr");
 
-  if (gh_string_p (s))
-    {
-      if (Bar::has_interface (i.elem_l_))
-       {
-         create_text (s);
-       }
+      /*
+       FIXME: use markup_p () to check type.
+      */
+      if (gh_string_p (s) || gh_pair_p (s))
+       create_text (s);
+         
     }
 
-  if (dynamic_cast <System_start_delimiter*> (i.elem_l_)
+  if (Align_interface::has_interface (i.elem_l_)
+      && Align_interface::axis  (i.elem_l_) == Y_AXIS      
+      //System_start_delimiter::has_interface (i.elem_l_)
       && i.origin_trans_l_->daddy_trans_l_ == daddy_trans_l_)
     {
-      delim_ = dynamic_cast<System_start_delimiter*> (i.elem_l_);
+      delim_ = i.elem_l_;
     }
 }