(Paper_column): copy rank_. This fixes

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

diff --git a/lily/rest-engraver.cc b/lily/rest-engraver.cc
index 1e0782331c011e8f371a6d8dbd05945b2f35b8e4..91e447613a65013a19534c3488c467a245f156de 100644 (file)
--- 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 ();
       
       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"));
@@ -94,13 +85,12 @@ Rest_engraver::process_music ()
        {
          int pos= p->steps ();
          SCM c0 = get_property ("middleCPosition");
-         if (gh_number_p (c0))
-           pos += gh_scm2int (c0);
+         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 ());
     }
 }