* scm/define-stencil-commands.scm (Module): new file. Register all

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

diff --git a/lily/melisma-translator.cc b/lily/melisma-translator.cc
index 1b01c2d82d67a7e80a7a3fe7dcb98ed69394148d..3c24d3c7713287fe5a794477c8033e0de537d3fd 100644 (file)
--- a/lily/melisma-translator.cc
+++ b/lily/melisma-translator.cc
@@ -1,24 +1,18 @@
-/*   
-  melisma-engraver.cc --  implement Melisma_engraver
-  
+/*
+  melisma-engraver.cc -- implement Melisma_engraver
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
 
-/*
-  duplicated in melisma-performer
- */
+  (c) 1999--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+*/
+
 #include "engraver.hh"
-#include "event.hh"
 #include "grob.hh"
 #include "context.hh"
 
-
 /**
    Signal existence of melismas.
- */
+*/
 class Melisma_translator : public Translator
 {
 public:
@@ -27,16 +21,15 @@ protected:
   virtual bool try_music (Music *);
   virtual void process_music ();
   virtual void start_translation_timestep ();
-  Music * event_;
+  Music *event_;
 };
 
-
 bool
-Melisma_translator::try_music (Music *m) 
+Melisma_translator::try_music (Music *m)
 {
   if (m->is_mus_type ("melisma-playing-event"))
     {
-      return melisma_busy (get_parent_context ());
+      return melisma_busy (context ());
     }
   else if (m->is_mus_type ("melisma-span-event"))
     {
@@ -55,11 +48,10 @@ Melisma_translator::process_music ()
       SCM sd = event_->get_property ("span-direction");
       Direction d = to_dir (sd);
       if (d == START)
-       get_parent_context ()->set_property ("melismaBusy", SCM_BOOL_T);
+       context ()->set_property ("melismaBusy", SCM_BOOL_T);
       else
-       get_parent_context ()->unset_property (ly_symbol2scm ("melismaBusy"));
+       context ()->unset_property (ly_symbol2scm ("melismaBusy"));
     }
-      
 }
 
 void
@@ -67,16 +59,16 @@ Melisma_translator::start_translation_timestep ()
 {
   event_ = 0;
 }
-  
+
 Melisma_translator::Melisma_translator ()
 {
   event_ = 0;
 }
 
-ENTER_DESCRIPTION (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",
-/* acks  */      "",
-/* reads */       "melismaBusy melismaBusyProperties slurMelismaBusy tieMelismaBusy beamMelismaBusy",
-/* write */       "");
+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",
+               /* acks  */ "",
+               /* reads */ "melismaBusy melismaBusyProperties slurMelismaBusy tieMelismaBusy beamMelismaBusy",
+               /* write */ "");