remove TEXMF from variables.

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

diff --git a/lily/instrument-name-engraver.cc b/lily/instrument-name-engraver.cc
index 5b2ab6b198e0b77b0db10a6f78caafaab666fb7b..2a20e73fce8531c4cb90bbd05ab0a4269532fded 100644 (file)
--- a/lily/instrument-name-engraver.cc
+++ b/lily/instrument-name-engraver.cc
@@ -1,14 +1,12 @@
-/*   
-  instrument-name-engraver.cc --  implement Instrument_name_engraver
-  
+/*
+  instrument-name-engraver.cc -- implement Instrument_name_engraver
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 2000--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 2000--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+*/
 
 #include "engraver.hh"
-#include "item.hh"
 #include "bar-line.hh"
 #include "system-start-delimiter.hh"
 #include "side-position-interface.hh"
@@ -19,9 +17,9 @@
 
 class Instrument_name_engraver : public Engraver
 {
-  
+
 public:
-  TRANSLATOR_DECLARATIONS(Instrument_name_engraver);
+  TRANSLATOR_DECLARATIONS (Instrument_name_engraver);
 
 protected:
   Grob *text_;
@@ -38,11 +36,10 @@ Instrument_name_engraver::Instrument_name_engraver ()
   text_ = 0;
 }
 
-
 void
 Instrument_name_engraver::initialize ()
 {
-  daddy_context_->set_property ("instrumentSupport", SCM_EOL); 
+  context ()->set_property ("instrumentSupport", SCM_EOL);
 }
 
 void
@@ -50,48 +47,48 @@ Instrument_name_engraver::stop_translation_timestep ()
 {
   if (text_)
     {
-      text_->set_grob_property ("side-support-elements",
-                               get_property ("instrumentSupport"));
-      typeset_grob (text_);
+      text_->set_property ("side-support-elements",
+                          get_property ("instrumentSupport"));
       text_ = 0;
     }
 }
 
-
 void
 Instrument_name_engraver::create_text ()
 {
   if (text_)
-    return ;
-  
+    return;
+
   SCM txt = get_property ("instrument");
-  
+
   if (now_mom () > Moment (0))
     txt = get_property ("instr");
   /*
     UGH.
   */
   if (txt == SCM_EOL)
-    return ;
+    return;
 
-  
-  text_ = make_item ("InstrumentName");
-      
-  if (text_->get_grob_property ("text") != txt)
-    text_->set_grob_property ("text", txt);
-  announce_grob (text_, SCM_EOL);
-  }
+  text_ = make_item ("InstrumentName", SCM_EOL);
+
+  if (text_->get_property ("text") != txt)
+    text_->set_property ("text", txt);
+}
 
 void
 Instrument_name_engraver::acknowledge_grob (Grob_info i)
 {
   if (Bar_line::has_interface (i.grob_))
     {
-      create_text();
+      create_text ();
     }
 
-  if (dynamic_cast<Spanner*> (i.grob_)
-      && i.grob_->internal_has_interface (ly_symbol2scm ("dynamic-interface")))
+  /*
+    Ugh - typechecking for pedal and dynamic sucks.
+  */
+  if (dynamic_cast<Spanner *> (i.grob_)
+      && (i.grob_->internal_has_interface (ly_symbol2scm ("dynamic-interface"))
+         || i.grob_->internal_has_interface (ly_symbol2scm ("piano-pedal-interface"))))
     return;
 
   /*
@@ -103,15 +100,15 @@ Instrument_name_engraver::acknowledge_grob (Grob_info i)
     We could also just use stavesFound, but lets keep this working
     without staffs as well.
   */
-  if (dynamic_cast<Spanner*> (i.grob_)
+  if (dynamic_cast<Spanner *> (i.grob_)
       && ((Axis_group_interface::has_interface (i.grob_)
-          && Axis_group_interface::axis_b (i.grob_, Y_AXIS)))
+          && Axis_group_interface::has_axis (i.grob_, Y_AXIS)))
       && !Align_interface::has_interface (i.grob_))
     {
-      SCM nl = gh_cons (i.grob_->self_scm (),
-                       get_property ("instrumentSupport"));
+      SCM nl = scm_cons (i.grob_->self_scm (),
+                        get_property ("instrumentSupport"));
 
-      daddy_context_->set_property ("instrumentSupport", nl);
+      context ()->set_property ("instrumentSupport", nl);
     }
 }
 
@@ -120,46 +117,43 @@ Instrument_name_engraver::process_music ()
 {
   /*
     Also create text if barlines in other groups. This allows
-    a name to be attached to lyrics or chords. 
-   */
-  if (gh_string_p (get_property ("whichBar")))
-    create_text();
+    a name to be attached to lyrics or chords.
+  */
+  if (scm_is_string (get_property ("whichBar")))
+    create_text ();
 }
 
-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",
-/* accepts */     "",
-/* acks  */      "bar-line-interface axis-group-interface",
-/* reads */       "instrument instr",
-/* write */       "");
+ADD_TRANSLATOR (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",
+               /* accepts */ "",
+               /* acks  */ "bar-line-interface axis-group-interface",
+               /* reads */ "instrument instr",
+               /* write */ "");
 
 /****************************************************************/
 
-
 class Vocal_name_engraver : public Instrument_name_engraver
 {
 public:
-  TRANSLATOR_DECLARATIONS(Vocal_name_engraver);
+  TRANSLATOR_DECLARATIONS (Vocal_name_engraver);
   virtual void create_text ();
 };
 
-
 Vocal_name_engraver::Vocal_name_engraver ()
 {
 }
 
-
 void
 Vocal_name_engraver::create_text ()
 {
   if (text_)
-    return ;
-  
+    return;
+
   SCM txt = get_property ("vocalName");
-  
+
   if (now_mom () > Moment (0))
     txt = get_property ("vocNam");
 
@@ -167,23 +161,20 @@ Vocal_name_engraver::create_text ()
     UGH.
   */
   if (txt == SCM_EOL)
-    return ;
-  
-  text_ = make_item ("VocalName");
-      
-  if (text_->get_grob_property ("text") != txt)
-    text_->set_grob_property ("text", txt);
-  announce_grob (text_, SCM_EOL);
-}
+    return;
 
+  text_ = make_item ("VocalName", SCM_EOL);
 
+  if (text_->get_property ("text") != txt)
+    text_->set_property ("text", txt);
+}
 
-ENTER_DESCRIPTION(Vocal_name_engraver,
-/* descr */       " Prints the name of the a lyric voice (specified by "
-" @code{Staff.vocalName} and @code{Staff.vocNam}) "
-"at the left of the staff. ",
-/* creats*/       "VocalName",
-/* accepts */     "",
-/* acks  */      "bar-line-interface axis-group-interface",
-/* reads */       "vocNam vocalName",
-/* write */       "");
+ADD_TRANSLATOR (Vocal_name_engraver,
+               /* descr */ " Prints the name of the a lyric voice (specified by "
+               " @code{Staff.vocalName} and @code{Staff.vocNam}) "
+               "at the left of the staff. ",
+               /* creats*/ "VocalName",
+               /* accepts */ "",
+               /* acks  */ "bar-line-interface axis-group-interface",
+               /* reads */ "vocNam vocalName",
+               /* write */ "");