]> git.donarmstrong.com Git - lilypond.git/blobdiff - lily/instrument-name-engraver.cc
Fix some bugs in the dynamic engraver and PostScript backend
[lilypond.git] / lily / instrument-name-engraver.cc
index 11758a82c8e43c1ff93ee2bef972722ddf081359..a2bf75a777eb767b1dacf6890f59c7540a7317f6 100644 (file)
-/*   
-  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--2002 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 "align-interface.hh"
 #include "axis-group-interface.hh"
-#include "translator-group.hh"
+#include "align-interface.hh"
+#include "text-interface.hh"
+#include "system.hh"
+
+#include "translator.icc"
 
 class Instrument_name_engraver : public Engraver
 {
-  Item *text_;
-  Grob *delim_ ;
-  
-  void create_text (SCM s);
 public:
-  TRANSLATOR_DECLARATIONS(Instrument_name_engraver);
-
-  virtual void initialize ();
-  virtual void acknowledge_grob (Grob_info);
-  virtual void stop_translation_timestep ();
-};
+  TRANSLATOR_DECLARATIONS (Instrument_name_engraver);
 
+protected:
+  Spanner *text_spanner_;
 
+  virtual void finalize ();
+  DECLARE_ACKNOWLEDGER (axis_group);
+  void process_music ();
+};
 
 Instrument_name_engraver::Instrument_name_engraver ()
 {
-  text_ = 0;
-  delim_ =0;
-}
-
-
-void
-Instrument_name_engraver::initialize ()
-{
-  daddy_trans_l_->set_property ("instrumentSupport", SCM_EOL); 
+  text_spanner_ = 0;
 }
 
 void
-Instrument_name_engraver::stop_translation_timestep ()
+Instrument_name_engraver::process_music ()
 {
-  if (text_)
+  if (!text_spanner_)
     {
-      text_->set_grob_property ("side-support-elements",
-                               get_property ("instrumentSupport"));
-      typeset_grob (text_);
-      text_ = 0;
+      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");
+       }
+  
+      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);
+       }
     }
 }
 
 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 ("InstrumentName"));
-      
-      if (text_->get_grob_property ("text") != txt)
-       text_->set_grob_property ("text", txt);
-     
-      if (delim_)
-        text_->set_parent (delim_, Y_AXIS);
-      
-      announce_grob (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_grob (Grob_info i)
+Instrument_name_engraver::finalize ()
 {
-  if (Bar::has_interface (i.grob_l_))
+  if (text_spanner_)
     {
-      SCM s = get_property ("instrument");
-  
-      if (now_mom () > Moment (0))
-       s = get_property ("instr");
+      text_spanner_->set_bound (RIGHT,
+                               unsmob_grob (get_property ("currentCommandColumn")));
 
-      /*
-       FIXME: use markup_p () to check type.
-      */
-      if (gh_string_p (s) || gh_pair_p (s))
-       create_text (s);
-    }
+      Pointer_group_interface::set_ordered (text_spanner_, ly_symbol2scm ("elements"), false);
 
-  if (dynamic_cast<Spanner*> (i.grob_l_)
-      && i.grob_l_->has_interface (ly_symbol2scm ("dynamic-interface")))
-    return;
-
-  /*
-    Hang the instrument names on the staves, but not on the alignment
-    groups enclosing that staff. The alignment has no real location,
-    but is only a vehicle for the placement routine it contains, and
-    therefore the location of its refpoint won't be very useful.
-    
-  */
-  if (dynamic_cast<Spanner*> (i.grob_l_)
-      && ((Axis_group_interface::has_interface (i.grob_l_)
-          && Axis_group_interface::axis_b (i.grob_l_, Y_AXIS)))
-      && !Align_interface::has_interface (i.grob_l_))
-    {
-      SCM nl = gh_cons (i.grob_l_->self_scm (),
-                       get_property ("instrumentSupport"));
+      System *system = get_root_system (text_spanner_);
 
-      daddy_trans_l_->set_property ("instrumentSupport", nl);
+      /*
+       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");
     }
 }
 
+#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",
 
-ENTER_DESCRIPTION(Instrument_name_engraver,
-/* descr */       " Prints the name of the instrument (specified by
-@code{Staff.instrument} and @code{Staff.instr})
-at the left of the
-staff.",
-/* creats*/       "InstrumentName",
-/* acks  */       "bar-line-interface axis-group-interface",
-/* reads */       "instrument instr",
-/* write */       "");
+               /* write */ "");