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 1a9bd7da1f2a1cfe5053af60c01c9f41b7cd946e..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 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
 #include "engraver.hh"
-#include "text-item.hh"
-#include "bar.hh"
+#include "item.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
 {
-  Text_item *text_;
-  System_start_delimiter * delim_ ;
-
+  Item *text_;
+  Grob *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 ();
+  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 ()
 {
@@ -38,14 +40,19 @@ Instrument_name_engraver::Instrument_name_engraver ()
 
 
 void
-Instrument_name_engraver::do_pre_move_processing ()
+Instrument_name_engraver::initialize ()
+{
+  daddy_trans_l_->set_property ("instrumentSupport", SCM_EOL); 
+}
+
+void
+Instrument_name_engraver::stop_translation_timestep ()
 {
   if (text_)
     {
-      text_->add_offset_callback (Side_position_interface::centered_on_parent,
-                                 Y_AXIS);
-
-      typeset_element (text_);
+      text_->set_grob_property ("side-support-elements",
+                               get_property ("instrumentSupport"));
+      typeset_grob (text_);
       text_ = 0;
     }
 }
@@ -53,44 +60,73 @@ Instrument_name_engraver::do_pre_move_processing ()
 void
 Instrument_name_engraver::create_text (SCM txt)
 {
-  if(!text_)
+  if (!text_)
     {
-      text_ = new Text_item (get_property ("basicInstrumentNameProperties"));
-      text_->set_elt_property ("text", txt);
-
-      /*
-       TODO: use more lispish names for break-align-symbols
-       */
+      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_element (Score_element_info (text_,0));
+        text_->set_parent (delim_, Y_AXIS);
+      
+      announce_grob (text_, SCM_EOL);
     }
 }
 
 void
-Instrument_name_engraver::acknowledge_element (Score_element_info i)
+Instrument_name_engraver::acknowledge_grob (Grob_info i)
 {
-  SCM s = get_property ("instrument");
+  if (Bar_line::has_interface (i.grob_l_))
+    {
+      SCM s = get_property ("instrument");
   
-  if (now_mom () > Moment (0))
-    s = get_property ("instr");
+      if (now_mom () > Moment (0))
+       s = get_property ("instr");
 
-  if (gh_string_p (s))
-    {
-      if (Bar* b= dynamic_cast<Bar*> (i.elem_l_))
-       {
-         create_text (s);
-       }
+      /*
+       FIXME: use markup_p () to check type.
+      */
+      if (gh_string_p (s) || gh_pair_p (s))
+       create_text (s);
     }
 
-  if (dynamic_cast <System_start_delimiter*> (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_ = dynamic_cast<System_start_delimiter*> (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 */       "");