X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frest-engraver.cc;h=69eb1150fbf6c3c48d9838d9413c6f7f64471cae;hb=14d74ac262744d16fc753ee41042d32860d58633;hp=b87a913cb1ff96f023419f90754fc01241e81388;hpb=304b5f3aa7eee7b0ff8d4ba7526a1410735f6e74;p=lilypond.git

diff --git a/lily/rest-engraver.cc b/lily/rest-engraver.cc
index b87a913cb1..69eb1150fb 100644
--- a/lily/rest-engraver.cc
+++ b/lily/rest-engraver.cc
@@ -5,14 +5,13 @@
 
   (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
+
 #include "item.hh"
 #include "staff-symbol-referencer.hh"
-#include "event.hh"
 #include "dots.hh"
 #include "rhythmic-head.hh"
 #include "engraver.hh"
 
-
 class Rest_engraver : public Engraver
 {
   Music *rest_req_;
@@ -34,30 +33,22 @@ public:
  */
 Rest_engraver::Rest_engraver ()
 {
-  rest_req_ =0;
-  rest_ =0;
-  dot_ =0;
+  rest_req_ = 0;
+  rest_ = 0;
+  dot_ = 0;
 }
 
 void
 Rest_engraver::start_translation_timestep ()
 {
-  rest_req_ =0;
+  rest_req_ = 0;
 }
 
 void
 Rest_engraver::stop_translation_timestep ()
 {
-  if (rest_)
-    {
-      typeset_grob (rest_);
-      rest_ =0;
-    }
-  if (dot_)
-    {
-      typeset_grob (dot_);
-      dot_ =0;
-    }    
+  rest_ = 0;
+  dot_ = 0;
 }
 
 void
@@ -65,23 +56,23 @@ Rest_engraver::process_music ()
 {
   if (rest_req_ && !rest_) 
     {
-      rest_ = make_item ("Rest");
+      rest_ = make_item ("Rest", rest_req_->self_scm ());
 
       int durlog  = unsmob_duration (rest_req_->get_property ("duration"))-> duration_log ();
       
       rest_->set_property ("duration-log",
-				  gh_int2scm (durlog));
+				  scm_int2num (durlog));
 
-      int dots =unsmob_duration (rest_req_->get_property ("duration"))->dot_count ();
+      int dots = unsmob_duration (rest_req_->get_property ("duration"))->dot_count ();
       
       if (dots)
 	{
-	  dot_ = make_item ("Dots");
+	  dot_ = make_item ("Dots", SCM_EOL);
 
 	  Rhythmic_head::set_dots (rest_, dot_);
 	  dot_->set_parent (rest_, Y_AXIS);
-	  dot_->set_property ("dot-count", gh_int2scm (dots));
-	  announce_grob (dot_, SCM_EOL);
+	  dot_->set_property ("dot-count", scm_int2num (dots));
+	  
 	}
 
       Pitch *p = unsmob_pitch (rest_req_->get_property ("pitch"));
@@ -92,15 +83,14 @@ Rest_engraver::process_music ()
        */
       if (p)
 	{
-	  int pos= p->steps ();
-	  SCM c0 = get_property ("centralCPosition");
-	  if (gh_number_p (c0))
-	    pos += gh_scm2int (c0);
+	  int pos = p->steps ();
+	  SCM c0 = get_property ("middleCPosition");
+	  if (scm_is_number (c0))
+	    pos += scm_to_int (c0);
 	  
-	  rest_->set_property ("staff-position", gh_int2scm (pos));
+	  rest_->set_property ("staff-position", scm_int2num (pos));
 	}
       
-      announce_grob (rest_, rest_req_->self_scm ());
     }
 }
 
@@ -115,10 +105,10 @@ Rest_engraver::try_music (Music *m)
   return false;
 }
 
-ENTER_DESCRIPTION (Rest_engraver,
+ADD_TRANSLATOR (Rest_engraver,
 /* descr */       "",
 /* creats*/       "Rest Dots",
 /* accepts */     "rest-event",
 /* acks  */      "",
-/* reads */       "centralCPosition",
+/* reads */       "middleCPosition",
 /* write */       "");