X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finstrument-name-engraver.cc;h=000058d629622eccb64834e6516d6d124a6a56bd;hb=f354ae4e1a6dab6ad4b1a98c2d732f542a05a02e;hp=5a196104794c80f419e32133c10fcd1862c65f5d;hpb=3512ac1f9e6ac4d96f0a486ba8f5968ccf0ce507;p=lilypond.git

diff --git a/lily/instrument-name-engraver.cc b/lily/instrument-name-engraver.cc
index 5a19610479..000058d629 100644
--- a/lily/instrument-name-engraver.cc
+++ b/lily/instrument-name-engraver.cc
@@ -25,54 +25,83 @@ public:
 protected:
   Spanner *text_spanner_;
 
+  SCM long_text_;
+  SCM short_text_;
+
+  vector<Grob*> axis_groups_;
+  
   virtual void finalize ();
   DECLARE_ACKNOWLEDGER (axis_group);
   void process_music ();
+  void start_spanner ();
+  void consider_start_spanner ();
+  void stop_spanner ();
 };
 
 Instrument_name_engraver::Instrument_name_engraver ()
 {
   text_spanner_ = 0;
+
+  long_text_ = SCM_EOL;
+  short_text_ = SCM_EOL;
 }
 
 void
 Instrument_name_engraver::process_music ()
 {
-  if (!text_spanner_)
+  consider_start_spanner ();
+}
+
+void
+Instrument_name_engraver::consider_start_spanner ()
+{
+  SCM long_text = get_property ("instrumentName");
+  SCM short_text = get_property ("shortInstrumentName");
+
+  if (!(Text_interface::is_markup (long_text)
+	|| Text_interface::is_markup (short_text)))
     {
-      SCM long_text = get_property ("instrument");
-      SCM short_text = get_property ("instr");
-
-      if (!(Text_interface::is_markup (long_text)
-	    || Text_interface::is_markup (short_text)))
-	{
-	  long_text = get_property ("vocalName");
-	  short_text = get_property ("vocNam");
-	}
+      long_text = get_property ("vocalName");
+      short_text = get_property ("shortVocalName");
+    }
   
-      if (Text_interface::is_markup (long_text)
-	  || Text_interface::is_markup (short_text))
-	{
-	  text_spanner_ = make_spanner ("InstrumentName", SCM_EOL);
-	  
-	  Grob *col = unsmob_grob (get_property ("currentCommandColumn"));
-	  text_spanner_->set_bound (LEFT, col);
-	  text_spanner_->set_property ("text", short_text);
-	  text_spanner_->set_property ("long-text", long_text);
-	}
+  if ((Text_interface::is_markup (long_text)
+       || Text_interface::is_markup (short_text))
+      && (!text_spanner_
+	  || short_text_ != short_text
+	  || long_text_ != long_text))
+    {
+      if (text_spanner_)
+	stop_spanner ();
+
+      
+      short_text_ = short_text;
+      long_text_ = long_text;
+
+      start_spanner ();
     }
 }
 
+void
+Instrument_name_engraver::start_spanner ()
+{
+  text_spanner_ = make_spanner ("InstrumentName", SCM_EOL);
+	  
+  Grob *col = unsmob_grob (get_property ("currentCommandColumn"));
+  text_spanner_->set_bound (LEFT, col);
+  text_spanner_->set_property ("text", short_text_);
+  text_spanner_->set_property ("long-text", long_text_);
+}
+
+
 void
 Instrument_name_engraver::acknowledge_axis_group (Grob_info info)
 {
-  if (text_spanner_ 
-      && dynamic_cast<Spanner *> (info.grob ())
+  if (dynamic_cast<Spanner *> (info.grob ())
       && Axis_group_interface::has_axis (info.grob (), Y_AXIS)
       && (!Align_interface::has_interface (info.grob ())))
     {
-      Grob *staff = info.grob();
-      Pointer_group_interface::add_grob (text_spanner_, ly_symbol2scm ("elements"), staff);
+      axis_groups_.push_back (info.grob ());
     }
 }
 
@@ -81,21 +110,32 @@ Instrument_name_engraver::finalize ()
 {
   if (text_spanner_)
     {
-      text_spanner_->set_bound (RIGHT,
-				unsmob_grob (get_property ("currentCommandColumn")));
+      stop_spanner ();
+    }
+}
 
-      Pointer_group_interface::set_ordered (text_spanner_, ly_symbol2scm ("elements"), false);
+void
+Instrument_name_engraver::stop_spanner ()
+{
+  for (vsize i = 0; i < axis_groups_.size (); i++)
+    Pointer_group_interface::add_grob (text_spanner_, ly_symbol2scm ("elements"), axis_groups_[i]);
+  
+  text_spanner_->set_bound (RIGHT,
+			    unsmob_grob (get_property ("currentCommandColumn")));
 
-      System *system = get_root_system (text_spanner_);
+  Pointer_group_interface::set_ordered (text_spanner_, ly_symbol2scm ("elements"), false);
 
-      /*
-	UGH, should handle this in Score_engraver.
-       */
-      if (system)
-	Axis_group_interface::add_element (system, text_spanner_);
-      else
-	text_spanner_->programming_error ("can't find root system");
-    }
+  System *system = get_root_system (text_spanner_);
+
+  /*
+    UGH, should handle this in Score_engraver.
+  */
+  if (system)
+    Axis_group_interface::add_element (system, text_spanner_);
+  else
+    text_spanner_->programming_error ("can't find root system");
+
+  text_spanner_ = 0;
 }
 
 #include "translator.icc"
@@ -115,9 +155,9 @@ ADD_TRANSLATOR (Instrument_name_engraver,
 		
 		/* read */
 		"currentCommandColumn "
-		"instr "
-		"instrument "
-		"vocNam "
+		"shortInstrumentName "
+		"instrumentName "
+		"shortVocalName "
 		"vocalName "
 		,