doc fixes, rune pats

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

diff --git a/lily/instrument-name-engraver.cc b/lily/instrument-name-engraver.cc
index 852ef176d35a4a0b4d963b95cbb5d4c39a9e7b84..4bb036166b0c8c1b79dea32aa5a9cbd67215c2bb 100644 (file)
--- a/lily/instrument-name-engraver.cc
+++ b/lily/instrument-name-engraver.cc
@@ -1,34 +1,36 @@
 /*   
-  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--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
 #include "engraver.hh"
 #include "item.hh"
-#include "bar.hh"
+#include "bar-line.hh"
 #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);
-  Instrument_name_engraver ();
+  TRANSLATOR_DECLARATIONS(Instrument_name_engraver);
 
+  virtual void initialize ();
   virtual void acknowledge_grob (Grob_info);
   virtual void stop_translation_timestep ();
 };
 
-ADD_THIS_TRANSLATOR(Instrument_name_engraver);
+
 
 Instrument_name_engraver::Instrument_name_engraver ()
 {
@@ -37,11 +39,19 @@ 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;
     }
@@ -50,7 +60,7 @@ Instrument_name_engraver::stop_translation_timestep ()
 void
 Instrument_name_engraver::create_text (SCM txt)
 {
-  if(!text_)
+  if (!text_)
     {
       text_ = new Item (get_property ("InstrumentName"));
       
@@ -60,14 +70,14 @@ Instrument_name_engraver::create_text (SCM txt)
       if (delim_)
         text_->set_parent (delim_, Y_AXIS);
       
-      announce_grob (text_,0);
+      announce_grob (text_, SCM_EOL);
     }
 }
 
 void
 Instrument_name_engraver::acknowledge_grob (Grob_info i)
 {
-  if (Bar::has_interface (i.elem_l_))
+  if (Bar_line::has_interface (i.grob_l_))
     {
       SCM s = get_property ("instrument");
   
@@ -79,18 +89,44 @@ Instrument_name_engraver::acknowledge_grob (Grob_info i)
       */
       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.grob_l_)
+      && i.grob_l_->internal_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.
+    
+
+    We could also just use staffsFound, but lets keep this working
+    without staffs as well.
+
+  */
+  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_))
     {
-      delim_ = i.elem_l_;
+      SCM nl = gh_cons (i.grob_l_->self_scm (),
+                       get_property ("instrumentSupport"));
+
+      daddy_trans_l_->set_property ("instrumentSupport", nl);
     }
 }
 
 
 
 
+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 */       "");