Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/melisma-translator.cc b/lily/melisma-translator.cc
index 3c24d3c7713287fe5a794477c8033e0de537d3fd..74b0e10d5e496ef41c9fd4632ccd426b07cb98d7 100644 (file)
--- a/lily/melisma-translator.cc
+++ b/lily/melisma-translator.cc
@@ -3,12 +3,13 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
 #include "grob.hh"
 #include "context.hh"
+#include "translator.icc"
 
 /**
    Signal existence of melismas.
@@ -19,8 +20,8 @@ public:
   TRANSLATOR_DECLARATIONS (Melisma_translator);
 protected:
   virtual bool try_music (Music *);
-  virtual void process_music ();
-  virtual void start_translation_timestep ();
+  void process_music ();
+  void start_translation_timestep ();
   Music *event_;
 };
 
@@ -28,9 +29,7 @@ bool
 Melisma_translator::try_music (Music *m)
 {
   if (m->is_mus_type ("melisma-playing-event"))
-    {
-      return melisma_busy (context ());
-    }
+    return melisma_busy (context ());
   else if (m->is_mus_type ("melisma-span-event"))
     {
       event_ = m;
@@ -66,9 +65,8 @@ Melisma_translator::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",
-               /* acks  */ "",
-               /* reads */ "melismaBusy melismaBusyProperties slurMelismaBusy tieMelismaBusy beamMelismaBusy",
+               /* doc */ "This translator collects melisma information about ties, beams, and user settings (@code{melismaBusy}, and signals it to the @code{\addlyrics} code.  ",
+               /* create */ "",
+               /* accept */ "melisma-playing-event melisma-span-event",
+               /* read */ "melismaBusy melismaBusyProperties slurMelismaBusy tieMelismaBusy beamMelismaBusy",
                /* write */ "");