2003 -> 2004

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

diff --git a/lily/instrument-name-engraver.cc b/lily/instrument-name-engraver.cc
index ed8ff27d7bd8b697aec28d03a749e113bcd82e08..34e49abedeac77395e7b0c442c5b62f3336f150b 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--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -19,25 +19,23 @@
 
 class Instrument_name_engraver : public Engraver
 {
-  Item *text_;
-  Grob *delim_ ;
   
-  void create_text ();
 public:
   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;
 }
 
 
@@ -59,35 +57,30 @@ Instrument_name_engraver::stop_translation_timestep ()
     }
 }
 
+
 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");
-      /*
-       UGH.
-      */
-      if (txt == SCM_EOL)
-       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_grob_property ("text") != txt)
+    text_->set_grob_property ("text", txt);
+  announce_grob (text_, SCM_EOL);
+  }
 
 void
 Instrument_name_engraver::acknowledge_grob (Grob_info i)
@@ -142,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_grob_property ("text") != txt)
+    text_->set_grob_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 */       "");