2003 -> 2004

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

diff --git a/lily/rest-engraver.cc b/lily/rest-engraver.cc
index dc617ef3b750b00f202c72f031830b86d4162942..a660dfda44912bc197b8ad0cb2e8238bb4d156d0 100644 (file)
--- a/lily/rest-engraver.cc
+++ b/lily/rest-engraver.cc
@@ -3,11 +3,11 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 #include "item.hh"
 #include "staff-symbol-referencer.hh"
-#include "musical-request.hh"
+#include "event.hh"
 #include "dots.hh"
 #include "rhythmic-head.hh"
 #include "engraver.hh"
@@ -15,7 +15,7 @@
 
 class Rest_engraver : public Engraver
 {
-  Rest_req *rest_req_;
+  Music *rest_req_;
   Item * dot_;
   Grob* rest_;
 protected:
@@ -65,10 +65,8 @@ Rest_engraver::process_music ()
 {
   if (rest_req_ && !rest_) 
     {
-      rest_ = new Item (get_property ("Rest"));
+      rest_ = make_item ("Rest");
 
-
-      
       int durlog  = unsmob_duration (rest_req_->get_mus_property ("duration"))-> duration_log ();
       
       rest_->set_grob_property ("duration-log",
@@ -78,7 +76,7 @@ Rest_engraver::process_music ()
       
       if (dots)
        {
-         dot_ = new Item (get_property ("Dots"));
+         dot_ = make_item ("Dots");
 
          Rhythmic_head::set_dots (rest_, dot_);
          dot_->set_parent (rest_, Y_AXIS);
@@ -109,20 +107,18 @@ Rest_engraver::process_music ()
 bool
 Rest_engraver::try_music (Music *m)
 {
-  if (Rest_req *r = dynamic_cast <Rest_req *> (m))
+  if (m->is_mus_type ("rest-event"))
     {
-      rest_req_ = r;
+      rest_req_ = m;
       return true;
-    }  
+    }
   return false;
 }
 
-
-
 ENTER_DESCRIPTION(Rest_engraver,
 /* descr */       "",
 /* creats*/       "Rest Dots",
-/* accepts */     "general-music",
+/* accepts */     "rest-event",
 /* acks  */      "",
 /* reads */       "centralCPosition",
 /* write */       "");