release: 1.3.94

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

diff --git a/lily/instrument-name-engraver.cc b/lily/instrument-name-engraver.cc
index 910a8f8ef5531286bbf1d8f6eef95d0a5cecb87f..131c67ad3bcd97d1fe3825e1e521825d68e5f83d 100644 (file)
--- a/lily/instrument-name-engraver.cc
+++ b/lily/instrument-name-engraver.cc
@@ -17,7 +17,7 @@
 class Instrument_name_engraver : public Engraver
 {
   Item *text_;
-  System_start_delimiter * delim_ ;
+  Spanner * delim_ ;
 
   void create_text (SCM s);
 public:
@@ -42,9 +42,6 @@ Instrument_name_engraver::do_pre_move_processing ()
 {
   if (text_)
     {
-      text_->add_offset_callback (Side_position::centered_on_parent,
-                                 Y_AXIS);
-
       typeset_element (text_);
       text_ = 0;
     }
@@ -55,7 +52,7 @@ Instrument_name_engraver::create_text (SCM txt)
 {
   if(!text_)
     {
-      text_ = new Item (get_property ("basicInstrumentNameProperties"));
+      text_ = new Item (get_property ("InstrumentName"));
       text_->set_elt_property ("text", txt);
 
       /*
@@ -64,7 +61,7 @@ Instrument_name_engraver::create_text (SCM txt)
       if (delim_)
        text_->set_parent (delim_, Y_AXIS);
 
-      announce_element (Score_element_info (text_,0));
+      announce_element (text_,0);
     }
 }
 
@@ -84,10 +81,10 @@ Instrument_name_engraver::acknowledge_element (Score_element_info i)
        }
     }
 
-  if (dynamic_cast <System_start_delimiter*> (i.elem_l_)
+  if (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_ = dynamic_cast<Spanner*> (i.elem_l_);
     }
 }