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

diff --git a/lily/rest-engraver.cc b/lily/rest-engraver.cc
index 04f5f3c871..b87a913cb1 100644
--- a/lily/rest-engraver.cc
+++ b/lily/rest-engraver.cc
@@ -3,11 +3,11 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 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 "event.hh"
 #include "dots.hh"
 #include "rhythmic-head.hh"
 #include "engraver.hh"
@@ -15,18 +15,17 @@
 
 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 ();
   virtual void start_translation_timestep ();
-  virtual void create_grobs ();
+  virtual void process_music ();
 
 public:
-  
-  TRANSLATOR_DECLARATIONS(Rest_engraver);
+  TRANSLATOR_DECLARATIONS (Rest_engraver);
 };
 
 
@@ -35,78 +34,91 @@ 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_)
+  if (rest_)
     {
-      typeset_grob (rest_p_);
-      rest_p_ =0;
+      typeset_grob (rest_);
+      rest_ =0;
     }
-  if (dot_p_)
+  if (dot_)
     {
-      typeset_grob (dot_p_);
-      dot_p_ =0;
+      typeset_grob (dot_);
+      dot_ =0;
     }    
 }
 
 void
-Rest_engraver::create_grobs ()
+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_);
-      Staff_symbol_referencer::set_interface (rest_p_);
-      
-      int durlog  = unsmob_duration (rest_req_l_->get_mus_property ("duration"))-> duration_log ();
+      rest_ = make_item ("Rest");
+
+      int durlog  = unsmob_duration (rest_req_->get_property ("duration"))-> duration_log ();
       
-      rest_p_->set_grob_property ("duration-log",
+      rest_->set_property ("duration-log",
 				  gh_int2scm (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");
 
-	  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_,0);
+	  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);
 	}
 
-      announce_grob (rest_p_, rest_req_l_);
+      Pitch *p = unsmob_pitch (rest_req_->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 ();
+	  SCM c0 = get_property ("centralCPosition");
+	  if (gh_number_p (c0))
+	    pos += gh_scm2int (c0);
+	  
+	  rest_->set_property ("staff-position", gh_int2scm (pos));
+	}
+      
+      announce_grob (rest_, rest_req_->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 */       "",
+/* accepts */     "rest-event",
+/* acks  */      "",
+/* reads */       "centralCPosition",
 /* write */       "");