2003 -> 2004

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

diff --git a/lily/melisma-engraver.cc b/lily/melisma-engraver.cc
index 4da8b4a5cfd323c4a6173c97526f75921c16eff9..6fa0653071faf5180e5d7ddca6b359a2d79183f8 100644 (file)
--- a/lily/melisma-engraver.cc
+++ b/lily/melisma-engraver.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -23,33 +23,13 @@ public:
 };
 
 
-/*
-  HUH ?
-
-  how's this supposed to work?
- */
 bool
-Melisma_engraver::try_music (Music *m) 
+Melisma_engraver::try_music (Music *) 
 {
-  SCM plain (get_property ("melismaBusy"));
-  SCM slur (get_property ("slurMelismaBusy"));
-  SCM tie (get_property ("tieMelismaBusy"));
-  SCM beam (get_property ("beamMelismaBusy"));
-      
-  if ((to_boolean (plain))
-      || (to_boolean (slur))
-      || (to_boolean (tie))
-      || (to_boolean (beam)))
-    {
-
-      daddy_trans_->set_property ("melismaEngraverBusy",SCM_BOOL_T);
-      return true;
-    }
-  else
-    {
-      daddy_trans_->set_property ("melismaEngraverBusy",SCM_BOOL_F);
-      return false;
-    }
+  /*
+    This can only be melisma-playing-event.
+   */
+  return melisma_busy (this);
 }
 
 Melisma_engraver::Melisma_engraver()
@@ -57,9 +37,9 @@ Melisma_engraver::Melisma_engraver()
 }
 
 ENTER_DESCRIPTION(Melisma_engraver,
-/* descr */       "",
+/* descr */       "This engraver collects melisma information about ties, beams, and user settings (@code{melismaBusy}, and signals it to the @code{\addlyrics} code.  ",
 /* creats*/       "",
 /* accepts */     "melisma-playing-event",
 /* acks  */      "",
-/* reads */       "melismaBusy slurMelismaBusy tieMelismaBusy beamMelismaBusy",
+/* reads */       "melismaBusy melismaBusyProperties slurMelismaBusy tieMelismaBusy beamMelismaBusy",
 /* write */       "");