X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frest-engraver.cc;h=e6e7ecb7dea588df79f98712c2d07f4bff58a3fc;hb=d4ce4ffb6c483324393e6427a53db24a73bc60e2;hp=828c235245343560efbe26ea4cc0a4f648c89f0f;hpb=545092a25d8ca41dc90b87482474b3719f7130a9;p=lilypond.git

diff --git a/lily/rest-engraver.cc b/lily/rest-engraver.cc
index 828c235245..e6e7ecb7de 100644
--- a/lily/rest-engraver.cc
+++ b/lily/rest-engraver.cc
@@ -3,28 +3,30 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
 
+#include "dots.hh"
 #include "duration.hh"
 #include "item.hh"
-#include "staff-symbol-referencer.hh"
-#include "dots.hh"
+#include "pitch.hh"
 #include "rhythmic-head.hh"
-#include "music.hh"
+#include "staff-symbol-referencer.hh"
+#include "stream-event.hh"
+
+#include "translator.icc"
 
 class Rest_engraver : public Engraver
 {
-  Music *rest_event_;
+  Stream_event *rest_event_;
   Item *dot_;
   Grob *rest_;
 protected:
-  virtual bool try_music (Music *);
   void start_translation_timestep ();
   void process_music ();
-
+  DECLARE_TRANSLATOR_LISTENER (rest);
 public:
   TRANSLATOR_DECLARATIONS (Rest_engraver);
 };
@@ -53,29 +55,8 @@ Rest_engraver::process_music ()
   if (rest_event_ && !rest_)
     {
       rest_ = make_item ("Rest", rest_event_->self_scm ());
-
-      int durlog = unsmob_duration (rest_event_->get_property ("duration"))->duration_log ();
-
-      rest_->set_property ("duration-log",
-			   scm_from_int (durlog));
-
-      int dots = unsmob_duration (rest_event_->get_property ("duration"))->dot_count ();
-
-      if (dots)
-	{
-	  dot_ = make_item ("Dots", SCM_EOL);
-
-	  Rhythmic_head::set_dots (rest_, dot_);
-	  dot_->set_parent (rest_, Y_AXIS);
-	  dot_->set_property ("dot-count", scm_from_int (dots));
-	}
-
       Pitch *p = unsmob_pitch (rest_event_->get_property ("pitch"));
 
-      /*
-	This is ridiculous -- rests don't have pitch, but we act as if
-	our nose is bleeding.
-      */
       if (p)
 	{
 	  int pos = p->steps ();
@@ -88,22 +69,15 @@ Rest_engraver::process_music ()
     }
 }
 
-bool
-Rest_engraver::try_music (Music *m)
+IMPLEMENT_TRANSLATOR_LISTENER (Rest_engraver, rest);
+void
+Rest_engraver::listen_rest (Stream_event *ev)
 {
-  if (m->is_mus_type ("rest-event"))
-    {
-      rest_event_ = m;
-      return true;
-    }
-  return false;
+  ASSIGN_EVENT_ONCE (rest_event_, ev);
 }
 
-#include "translator.icc"
-
 ADD_TRANSLATOR (Rest_engraver,
 		/* doc */ "",
-		/* create */ "Rest Dots",
-		/* accept */ "rest-event",
+		/* create */ "Rest ",
 		/* read */ "middleCPosition",
 		/* write */ "");