(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 cb92159fecedfad2471cf6ceb6429179c4109d7c..91e447613a65013a19534c3488c467a245f156de 100644 (file)
--- a/lily/rest-engraver.cc
+++ b/lily/rest-engraver.cc
@@ -3,21 +3,20 @@
 
   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 "dots.hh"
 #include "rhythmic-head.hh"
 #include "engraver.hh"
 
-
 class Rest_engraver : public Engraver
 {
-  Rest_req *rest_req_l_;
-  Item * dot_p_;
-  Grob* rest_p_;
+  Music *rest_req_;
+  Item * dot_;
+  Grob* rest_;
 protected:
   virtual bool try_music (Music *);
   virtual void stop_translation_timestep ();
@@ -25,7 +24,7 @@ protected:
   virtual void process_music ();
 
 public:
-  TRANSLATOR_DECLARATIONS(Rest_engraver);
+  TRANSLATOR_DECLARATIONS (Rest_engraver);
 };
 
 
@@ -34,59 +33,49 @@ public:
  */
 Rest_engraver::Rest_engraver ()
 {
-  rest_req_l_ =0;
-  rest_p_ =0;
-  dot_p_ =0;
+  rest_req_ = 0;
+  rest_ = 0;
+  dot_ = 0;
 }
 
 void
 Rest_engraver::start_translation_timestep ()
 {
-  rest_req_l_ =0;
+  rest_req_ = 0;
 }
 
 void
 Rest_engraver::stop_translation_timestep ()
 {
-  if (rest_p_)
-    {
-      typeset_grob (rest_p_);
-      rest_p_ =0;
-    }
-  if (dot_p_)
-    {
-      typeset_grob (dot_p_);
-      dot_p_ =0;
-    }    
+  rest_ = 0;
+  dot_ = 0;
 }
 
 void
 Rest_engraver::process_music ()
 {
-  if (rest_req_l_ && !rest_p_) 
+  if (rest_req_ && !rest_) 
     {
-      rest_p_ = new Item (get_property ("Rest"));
-      Rhythmic_head::set_interface (rest_p_);
+      rest_ = make_item ("Rest", rest_req_->self_scm ());
 
+      int durlog  = unsmob_duration (rest_req_->get_property ("duration"))-> duration_log ();
       
-      int durlog  = unsmob_duration (rest_req_l_->get_mus_property ("duration"))-> duration_log ();
-      
-      rest_p_->set_grob_property ("duration-log",
-                                 gh_int2scm (durlog));
+      rest_->set_property ("duration-log",
+                                 scm_int2num (durlog));
 
-      int dots =unsmob_duration (rest_req_l_->get_mus_property ("duration"))->dot_count ();
+      int dots =unsmob_duration (rest_req_->get_property ("duration"))->dot_count ();
       
       if (dots)
        {
-         dot_p_ = new Item (get_property ("Dots"));
+         dot_ = make_item ("Dots", SCM_EOL);
 
-         Rhythmic_head::set_dots (rest_p_, dot_p_);
-         dot_p_->set_parent (rest_p_, Y_AXIS);
-         dot_p_->set_grob_property ("dot-count", gh_int2scm (dots));
-         announce_grob (dot_p_, 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_req_l_->get_mus_property ("pitch"));
+      Pitch *p = unsmob_pitch (rest_req_->get_property ("pitch"));
 
       /*
        This is ridiculous -- rests don't have pitch, but we act as if
@@ -95,33 +84,31 @@ Rest_engraver::process_music ()
       if (p)
        {
          int pos= p->steps ();
-         SCM c0 = get_property ("centralCPosition");
-         if (gh_number_p (c0))
-           pos += gh_scm2int (c0);
+         SCM c0 = get_property ("middleCPosition");
+         if (scm_is_number (c0))
+           pos += scm_to_int (c0);
          
-         rest_p_->set_grob_property ("staff-position", gh_int2scm (pos));
+         rest_->set_property ("staff-position", scm_int2num (pos));
        }
       
-      announce_grob(rest_p_, rest_req_l_->self_scm());
     }
 }
 
 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_l_ = r;
+      rest_req_ = m;
       return true;
-    }  
+    }
   return false;
 }
 
-
-
-ENTER_DESCRIPTION(Rest_engraver,
+ENTER_DESCRIPTION (Rest_engraver,
 /* descr */       "",
 /* creats*/       "Rest Dots",
-/* acks  */       "",
-/* reads */       "centralCPosition",
+/* accepts */     "rest-event",
+/* acks  */      "",
+/* reads */       "middleCPosition",
 /* write */       "");