test

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

diff --git a/lily/instrument-name-engraver.cc b/lily/instrument-name-engraver.cc
index 261cb2e0545d23b9a1db6b2c23786093f1bd0aae..0a72163b1fe956ea3d71cba0dcbe2a9e3fb7cdb9 100644 (file)
--- a/lily/instrument-name-engraver.cc
+++ b/lily/instrument-name-engraver.cc
@@ -1,15 +1,15 @@
 /*   
-  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"
@@ -23,14 +23,14 @@ class Instrument_name_engraver : public Engraver
   
   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 ()
 {
@@ -42,7 +42,7 @@ Instrument_name_engraver::Instrument_name_engraver ()
 void
 Instrument_name_engraver::initialize ()
 {
-  daddy_trans_l_->set_property ("instrumentSupport", SCM_EOL); 
+  daddy_trans_->set_property ("instrumentSupport", SCM_EOL); 
 }
 
 void
@@ -70,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_))
     {
       SCM s = get_property ("instrument");
   
@@ -85,30 +85,48 @@ Instrument_name_engraver::acknowledge_grob (Grob_info i)
        s = get_property ("instr");
 
       /*
-       FIXME: use markup_p () to check type.
+       FIXME: use get_markup () to check type.
       */
       if (gh_string_p (s) || gh_pair_p (s))
        create_text (s);
-         
     }
 
-  if (dynamic_cast<Spanner*> (i.elem_l_)
-      && i.elem_l_->has_interface (ly_symbol2scm ("dynamic-interface")))
+  if (dynamic_cast<Spanner*> (i.grob_)
+      && i.grob_->internal_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)))
+
+  /*
+    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 stavesFound, but lets keep this working
+    without staffs as well.
+
+  */
+  if (dynamic_cast<Spanner*> (i.grob_)
+      && ((Axis_group_interface::has_interface (i.grob_)
+          && Axis_group_interface::axis_b (i.grob_, Y_AXIS)))
+      && !Align_interface::has_interface (i.grob_))
     {
-      SCM nl = gh_cons (i.elem_l_->self_scm (),
+      SCM nl = gh_cons (i.grob_->self_scm (),
                        get_property ("instrumentSupport"));
 
-      daddy_trans_l_->set_property ("instrumentSupport", nl);
+      daddy_trans_->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 */       "");