* scripts/lilypond-book.py (Lilypond_snippet.is_outdated): require

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

diff --git a/lily/instrument-name-engraver.cc b/lily/instrument-name-engraver.cc
index 1b94c20a4f508e98bcb75e20caf6e9942fa78345..9793e8dae3f1a31c8540b5666d334bed65349246 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--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -14,37 +14,35 @@
 #include "side-position-interface.hh"
 #include "align-interface.hh"
 #include "axis-group-interface.hh"
-#include "translator-group.hh"
+#include "context.hh"
 #include "text-item.hh"
 
 class Instrument_name_engraver : public Engraver
 {
-  Item *text_;
-  Grob *delim_ ;
   
-  void create_text ();
 public:
-  TRANSLATOR_DECLARATIONS(Instrument_name_engraver);
+  TRANSLATOR_DECLARATIONS (Instrument_name_engraver);
 
+protected:
+  Grob *text_;
+
+  virtual void create_text ();
   virtual void initialize ();
   virtual void acknowledge_grob (Grob_info);
   virtual void stop_translation_timestep ();
   virtual void process_music ();
 };
 
-
-
 Instrument_name_engraver::Instrument_name_engraver ()
 {
   text_ = 0;
-  delim_ =0;
 }
 
 
 void
 Instrument_name_engraver::initialize ()
 {
-  daddy_trans_->set_property ("instrumentSupport", SCM_EOL); 
+  daddy_context_->set_property ("instrumentSupport", SCM_EOL); 
 }
 
 void
@@ -52,47 +50,44 @@ Instrument_name_engraver::stop_translation_timestep ()
 {
   if (text_)
     {
-      text_->set_grob_property ("side-support-elements",
+      text_->set_property ("side-support-elements",
                                get_property ("instrumentSupport"));
       typeset_grob (text_);
       text_ = 0;
     }
 }
 
+
 void
 Instrument_name_engraver::create_text ()
 {
-   if (!text_)
-    {
-      SCM txt = get_property ("instrument");
+  if (text_)
+    return ;
   
-      if (now_mom () > Moment (0))
-       txt = get_property ("instr");
-      
-      if (!new_markup_p (txt))
-       return ; 
-          
-      text_ = new Item (get_property ("InstrumentName"));
-      
-      if (text_->get_grob_property ("text") != txt)
-       text_->set_grob_property ("text", txt);
+  SCM txt = get_property ("instrument");
+  
+  if (now_mom () > Moment (0))
+    txt = get_property ("instr");
+  /*
+    UGH.
+  */
+  if (txt == SCM_EOL)
+    return ;
 
-      if (new_markup_p (txt))
-       text_->set_grob_property ("molecule-callback", new_markup_brewer());
-      
-      if (delim_)
-        text_->set_parent (delim_, Y_AXIS);
+  
+  text_ = make_item ("InstrumentName");
       
-      announce_grob (text_, SCM_EOL);
-    }
-}
+  if (text_->get_property ("text") != txt)
+    text_->set_property ("text", txt);
+  announce_grob (text_, SCM_EOL);
+  }
 
 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_)
@@ -110,13 +105,13 @@ Instrument_name_engraver::acknowledge_grob (Grob_info i)
   */
   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"));
 
-      daddy_trans_->set_property ("instrumentSupport", nl);
+      daddy_context_->set_property ("instrumentSupport", nl);
     }
 }
 
@@ -128,10 +123,10 @@ Instrument_name_engraver::process_music ()
     a name to be attached to lyrics or chords. 
    */
   if (gh_string_p (get_property ("whichBar")))
-    create_text();
+    create_text ();
 }
 
-ENTER_DESCRIPTION(Instrument_name_engraver,
+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. ",
@@ -140,3 +135,55 @@ ENTER_DESCRIPTION(Instrument_name_engraver,
 /* 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);
+  virtual void create_text ();
+};
+
+
+Vocal_name_engraver::Vocal_name_engraver ()
+{
+}
+
+
+void
+Vocal_name_engraver::create_text ()
+{
+  if (text_)
+    return ;
+  
+  SCM txt = get_property ("vocalName");
+  
+  if (now_mom () > Moment (0))
+    txt = get_property ("vocNam");
+
+  /*
+    UGH.
+  */
+  if (txt == SCM_EOL)
+    return ;
+  
+  text_ = make_item ("VocalName");
+      
+  if (text_->get_property ("text") != txt)
+    text_->set_property ("text", txt);
+  announce_grob (text_, SCM_EOL);
+}
+
+
+
+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 */       "");