patch::: 1.3.141.hwn3: Re: Sugar

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

diff --git a/lily/instrument-name-engraver.cc b/lily/instrument-name-engraver.cc
index e903781f7e113003a1d65573bb81144c6cb0df86..261cb2e0545d23b9a1db6b2c23786093f1bd0aae 100644 (file)
--- a/lily/instrument-name-engraver.cc
+++ b/lily/instrument-name-engraver.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -13,22 +13,24 @@
 #include "system-start-delimiter.hh"
 #include "side-position-interface.hh"
 #include "align-interface.hh"
+#include "axis-group-interface.hh"
+#include "translator-group.hh"
 
 class Instrument_name_engraver : public Engraver
 {
   Item *text_;
-  Grob * delim_ ;
-
+  Grob *delim_ ;
+  
   void create_text (SCM s);
 public:
-  VIRTUAL_COPY_CONS(Translator);
+  VIRTUAL_COPY_CONS (Translator);
   Instrument_name_engraver ();
-
+  virtual void initialize ();
   virtual void acknowledge_grob (Grob_info);
   virtual void stop_translation_timestep ();
 };
 
-ADD_THIS_TRANSLATOR(Instrument_name_engraver);
+ADD_THIS_TRANSLATOR (Instrument_name_engraver);
 
 Instrument_name_engraver::Instrument_name_engraver ()
 {
@@ -37,33 +39,34 @@ Instrument_name_engraver::Instrument_name_engraver ()
 }
 
 
+void
+Instrument_name_engraver::initialize ()
+{
+  daddy_trans_l_->set_property ("instrumentSupport", SCM_EOL); 
+}
+
 void
 Instrument_name_engraver::stop_translation_timestep ()
 {
   if (text_)
     {
+      text_->set_grob_property ("side-support-elements",
+                               get_property ("instrumentSupport"));
       typeset_grob (text_);
       text_ = 0;
     }
 }
 
-/*
-  FIXME: use different mechanics, and use a markup-p function?
- */
 void
 Instrument_name_engraver::create_text (SCM txt)
 {
-  if(!text_)
+  if (!text_)
     {
       text_ = new Item (get_property ("InstrumentName"));
-      if (txt != SCM_EOL)
-        {
-          text_->set_grob_property ("text", txt);
-        }
-      else if (text_->get_grob_property ("text") == SCM_EOL)
-        {
-          return;
-        }
+      
+      if (text_->get_grob_property ("text") != txt)
+       text_->set_grob_property ("text", txt);
+     
       if (delim_)
         text_->set_parent (delim_, Y_AXIS);
       
@@ -81,18 +84,28 @@ Instrument_name_engraver::acknowledge_grob (Grob_info i)
       if (now_mom () > Moment (0))
        s = get_property ("instr");
 
-      //      if (gh_string_p (s))
-      //       {
-         create_text (s);
-         //    }
+      /*
+       FIXME: use markup_p () to check type.
+      */
+      if (gh_string_p (s) || gh_pair_p (s))
+       create_text (s);
+         
     }
 
-  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_)
+  if (dynamic_cast<Spanner*> (i.elem_l_)
+      && i.elem_l_->has_interface (ly_symbol2scm ("dynamic-interface")))
+    return;
+  
+  if (dynamic_cast<Spanner*> (i.elem_l_)
+      && ((Axis_group_interface::has_interface (i.elem_l_)
+        && Axis_group_interface::axis_b (i.elem_l_, Y_AXIS))
+        || (Align_interface::has_interface (i.elem_l_)
+            && Align_interface::axis (i.elem_l_) == Y_AXIS)))
     {
-      delim_ = i.elem_l_;
+      SCM nl = gh_cons (i.elem_l_->self_scm (),
+                       get_property ("instrumentSupport"));
+
+      daddy_trans_l_->set_property ("instrumentSupport", nl);
     }
 }