X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finstrument-name-engraver.cc;h=9290ef93e523bf984170e95d43839281d823ec01;hb=32426e733840b1d33afbf023639ca7e21a9f647e;hp=69f29134b7ce7baddf6d5407e219ccac3869a9b4;hpb=d8ddee6490dd1bb4965980d3e952a390493bfffd;p=lilypond.git

diff --git a/lily/instrument-name-engraver.cc b/lily/instrument-name-engraver.cc
index 69f29134b7..9290ef93e5 100644
--- a/lily/instrument-name-engraver.cc
+++ b/lily/instrument-name-engraver.cc
@@ -1,92 +1,165 @@
-/*   
-  new-staff-margin-engraver.cc --  implement Instrument_name_engraver
-  
+/*
+  instrument-name-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--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
 #include "engraver.hh"
-#include "item.hh"
-#include "bar.hh"
-#include "system-start-delimiter.hh"
+#include "spanner.hh"
+#include "pointer-group-interface.hh"
 #include "side-position-interface.hh"
+#include "axis-group-interface.hh"
 #include "align-interface.hh"
+#include "text-interface.hh"
+#include "system.hh"
+
+#include "translator.icc"
 
 class Instrument_name_engraver : public Engraver
 {
-  Item *text_;
-  Score_element * delim_ ;
-
-  void create_text (SCM s);
 public:
-  VIRTUAL_COPY_CONS(Translator);
-  Instrument_name_engraver ();
+  TRANSLATOR_DECLARATIONS (Instrument_name_engraver);
 
-  virtual void acknowledge_element (Score_element_info);
-  virtual void do_pre_move_processing ();
-};
+protected:
+  Spanner *text_spanner_;
 
-ADD_THIS_TRANSLATOR(Instrument_name_engraver);
+  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_ = 0;
-  delim_ =0;
-}
+  text_spanner_ = 0;
 
+  long_text_ = SCM_EOL;
+  short_text_ = SCM_EOL;
+}
 
 void
-Instrument_name_engraver::do_pre_move_processing ()
+Instrument_name_engraver::process_music ()
 {
-  if (text_)
-    {
-      typeset_element (text_);
-      text_ = 0;
-    }
+  consider_start_spanner ();
 }
 
 void
-Instrument_name_engraver::create_text (SCM txt)
+Instrument_name_engraver::consider_start_spanner ()
 {
-  if(!text_)
+  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)))
+    {
+      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_
+	  || short_text_ != short_text
+	  || long_text_ != long_text))
     {
-      text_ = new Item (get_property ("InstrumentName"));
-      text_->set_elt_property ("text", txt);
+      if (text_spanner_)
+	stop_spanner ();
 
-      if (delim_)
-	text_->set_parent (delim_, Y_AXIS);
+      
+      short_text_ = short_text;
+      long_text_ = long_text;
 
-      announce_element (text_,0);
+      start_spanner ();
     }
 }
 
 void
-Instrument_name_engraver::acknowledge_element (Score_element_info i)
+Instrument_name_engraver::start_spanner ()
 {
-  SCM s = get_property ("instrument");
-  
-  if (now_mom () > Moment (0))
-    s = get_property ("instr");
+  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_);
+
+  /*
+    UGH, should handle this in Score_engraver.
+  */
+  Grob *system = unsmob_grob (get_property ("rootSystem"));
+  if (system)
+    Axis_group_interface::add_element (system, text_spanner_);
+  else
+    text_spanner_->programming_error ("can't find root system");
+}
+
 
-  if (gh_string_p (s))
+void
+Instrument_name_engraver::acknowledge_axis_group (Grob_info info)
+{
+  if (dynamic_cast<Spanner *> (info.grob ())
+      && Axis_group_interface::has_axis (info.grob (), Y_AXIS)
+
+      /* ugh. */
+
+      && !info.grob ()->internal_has_interface (ly_symbol2scm ("dynamic-interface"))
+      && !info.grob ()->internal_has_interface (ly_symbol2scm ("piano-pedal-interface"))
+      && (!Align_interface::has_interface (info.grob ())))
     {
-      if (Bar::has_interface (i.elem_l_))
-	{
-	  create_text (s);
-	}
+      axis_groups_.push_back (info.grob ());
     }
+}
 
-  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_)
+void
+Instrument_name_engraver::finalize ()
+{
+  if (text_spanner_)
     {
-      delim_ = i.elem_l_;
+      stop_spanner ();
     }
 }
 
+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")));
+
+  Pointer_group_interface::set_ordered (text_spanner_, ly_symbol2scm ("elements"), false);
+
+  text_spanner_ = 0;
+}
+
+#include "translator.icc"
+
+ADD_ACKNOWLEDGER (Instrument_name_engraver, axis_group);
 
+ADD_TRANSLATOR (Instrument_name_engraver,
 
+		/* doc */
+		"Creates a system start text for instrument or vocal names.",
+		
+		/* create */
+		"InstrumentName ",
+		
+		/* read */
+		"currentCommandColumn "
+		"shortInstrumentName "
+		"instrumentName "
+		"shortVocalName "
+		"vocalName "
+		,
 
+		/* write */ "");