X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frest-engraver.cc;h=e6e7ecb7dea588df79f98712c2d07f4bff58a3fc;hb=4230b3adcca30a48c151840f89568345d0836c7d;hp=84d193dbc874940446b547e2f5f2d0f1214f5704;hpb=f2c2c5c43858f323e4708f83fd97e0f38017c275;p=lilypond.git

diff --git a/lily/rest-engraver.cc b/lily/rest-engraver.cc
index 84d193dbc8..e6e7ecb7de 100644
--- a/lily/rest-engraver.cc
+++ b/lily/rest-engraver.cc
@@ -3,29 +3,30 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.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 *);
-  PRECOMPUTED_VIRTUAL void start_translation_timestep ();
-  PRECOMPUTED_VIRTUAL void process_music ();
-
+  void start_translation_timestep ();
+  void process_music ();
+  DECLARE_TRANSLATOR_LISTENER (rest);
 public:
   TRANSLATOR_DECLARATIONS (Rest_engraver);
 };
@@ -48,36 +49,14 @@ Rest_engraver::start_translation_timestep ()
   dot_ = 0;
 }
 
-
 void
 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_int2num (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_int2num (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 ();
@@ -85,27 +64,20 @@ Rest_engraver::process_music ()
 	  if (scm_is_number (c0))
 	    pos += scm_to_int (c0);
 
-	  rest_->set_property ("staff-position", scm_int2num (pos));
+	  rest_->set_property ("staff-position", scm_from_int (pos));
 	}
     }
 }
 
-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,
-		/* descr */ "",
-		/* creats*/ "Rest Dots",
-		/* accepts */ "rest-event",
-		/* reads */ "middleCPosition",
+		/* doc */ "",
+		/* create */ "Rest ",
+		/* read */ "middleCPosition",
 		/* write */ "");