*** empty log message ***

[lilypond.git] / lily / melisma-translator.cc

diff --git a/lily/melisma-translator.cc b/lily/melisma-translator.cc
index 1ac8032102cf3281122ee168f26f4606e632859c..d2bba0544ade14228ff3c7e54acc5539b138c710 100644 (file)
--- a/lily/melisma-translator.cc
+++ b/lily/melisma-translator.cc
@@ -3,26 +3,25 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
 /*
   duplicated in melisma-performer
  */
+
 #include "engraver.hh"
-#include "event.hh"
 #include "grob.hh"
 #include "context.hh"
 
-
 /**
    Signal existence of melismas.
  */
 class Melisma_translator : public Translator
 {
 public:
-  TRANSLATOR_DECLARATIONS(Melisma_translator);
+  TRANSLATOR_DECLARATIONS (Melisma_translator);
 protected:
   virtual bool try_music (Music *);
   virtual void process_music ();
@@ -36,7 +35,7 @@ Melisma_translator::try_music (Music *m)
 {
   if (m->is_mus_type ("melisma-playing-event"))
     {
-      return melisma_busy (daddy_context_);
+      return melisma_busy (context ());
     }
   else if (m->is_mus_type ("melisma-span-event"))
     {
@@ -55,9 +54,9 @@ Melisma_translator::process_music ()
       SCM sd = event_->get_property ("span-direction");
       Direction d = to_dir (sd);
       if (d == START)
-       daddy_context_->set_property ("melismaBusy", SCM_BOOL_T);
+       context ()->set_property ("melismaBusy", SCM_BOOL_T);
       else
-       daddy_context_->unset_property (ly_symbol2scm ("melismaBusy"));
+       context ()->unset_property (ly_symbol2scm ("melismaBusy"));
     }
       
 }
@@ -68,12 +67,12 @@ Melisma_translator::start_translation_timestep ()
   event_ = 0;
 }
   
-Melisma_translator::Melisma_translator()
+Melisma_translator::Melisma_translator ()
 {
   event_ = 0;
 }
 
-ENTER_DESCRIPTION(Melisma_translator,
+ADD_TRANSLATOR (Melisma_translator,
 /* descr */       "This translator collects melisma information about ties, beams, and user settings (@code{melismaBusy}, and signals it to the @code{\addlyrics} code.  ",
 /* creats*/       "",
 /* accepts */     "melisma-playing-event melisma-span-event",