X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finstrument-name-engraver.cc;h=5320dfd5f77bb8d7403624b0c7614bc1403cec14;hb=8347f6f06cd4c56d7a2d2ec482647afaaade1267;hp=010db52474e89e2f3ae45dba9d550541135bd7c0;hpb=c52973e438ce3490d688860bb71849a7b3c26fef;p=lilypond.git

diff --git a/lily/instrument-name-engraver.cc b/lily/instrument-name-engraver.cc
index 010db52474..5320dfd5f7 100644
--- a/lily/instrument-name-engraver.cc
+++ b/lily/instrument-name-engraver.cc
@@ -1,96 +1,106 @@
+/*
+  instrument-name-engraver.cc -- implement Instrument_name_engraver
 
-/*   
-  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--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 "translator.icc"
 
 class Instrument_name_engraver : public Engraver
 {
-  Item *text_;
-  System_start_delimiter * 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);
+  virtual void finalize ();
+  DECLARE_ACKNOWLEDGER (axis_group);
+  void process_music ();
+};
 
 Instrument_name_engraver::Instrument_name_engraver ()
 {
-  text_ = 0;
-  delim_ =0;
+  text_spanner_ = 0;
 }
 
-
 void
-Instrument_name_engraver::do_pre_move_processing ()
+Instrument_name_engraver::process_music ()
 {
-  if (text_)
+  if (!text_spanner_)
     {
-      text_->add_offset_callback (Side_position_interface::centered_on_parent,
-				  Y_AXIS);
+      SCM long_text = get_property ("instrument");
+      SCM short_text = get_property ("instr");
 
-      typeset_element (text_);
-      text_ = 0;
+      if (!(Text_interface::is_markup (long_text)
+	    || Text_interface::is_markup (short_text)))
+	{
+	  long_text = get_property ("vocalName");
+	  short_text = get_property ("vocNam");
+	}
+  
+      if (Text_interface::is_markup (long_text)
+	  || Text_interface::is_markup (short_text))
+	{
+	  text_spanner_ = make_spanner ("InstrumentName", SCM_EOL);
+	  text_spanner_->set_bound (LEFT,
+				    unsmob_grob (get_property ("currentCommandColumn")));
+	  text_spanner_->set_property ("text", short_text);
+	  text_spanner_->set_property ("long-text", long_text);
+	}
     }
 }
 
 void
-Instrument_name_engraver::create_text (SCM txt)
+Instrument_name_engraver::acknowledge_axis_group (Grob_info info)
 {
-  if(!text_)
+  if (text_spanner_ 
+      && dynamic_cast<Spanner *> (info.grob ())
+      && Axis_group_interface::has_axis (info.grob (), Y_AXIS)
+      && (!Align_interface::has_interface (info.grob ())))
     {
-      text_ = new Item (get_property ("basicInstrumentNameProperties"));
-      text_->set_elt_property ("text", txt);
-
-      /*
-	TODO: use more lispish names for break-align-symbols
-       */
-      if (delim_)
-	text_->set_parent (delim_, Y_AXIS);
-
-      announce_element (Score_element_info (text_,0));
+      Grob *staff = info.grob();
+      Pointer_group_interface::add_grob (text_spanner_, ly_symbol2scm ("elements"), staff);
+      Side_position_interface::add_support (text_spanner_, staff);
     }
 }
 
 void
-Instrument_name_engraver::acknowledge_element (Score_element_info i)
+Instrument_name_engraver::finalize ()
 {
-  SCM s = get_property ("instrument");
-  
-  if (now_mom () > Moment (0))
-    s = get_property ("instr");
-
-  if (gh_string_p (s))
+  if (text_spanner_)
     {
-      if (Bar* b= dynamic_cast<Bar*> (i.elem_l_))
-	{
-	  create_text (s);
-	}
-    }
-
-  if (dynamic_cast <System_start_delimiter*> (i.elem_l_)
-      && i.origin_trans_l_->daddy_trans_l_ == daddy_trans_l_)
-    {
-      delim_ = dynamic_cast<System_start_delimiter*> (i.elem_l_);
+      text_spanner_->set_bound (RIGHT,
+				unsmob_grob (get_property ("currentCommandColumn")));
     }
 }
 
+#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 ",
+		
+		/* accept */ "",
+		
+		/* read */
+		"vocNam vocalName instrument instr "
+		"currentCommandColumn",
 
+		/* write */ "");