X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frest-engraver.cc;h=6426973f8ccc2f1529b41ad4d7c889e4c366b5ea;hb=08da6e274ea516076699e8e9bbdd48e5919cb526;hp=40cba4eb9102d4d3a7a1559b87518d887d76fa62;hpb=ce9845392e4e22ae9c5f6ec1da914eb301f1892c;p=lilypond.git

diff --git a/lily/rest-engraver.cc b/lily/rest-engraver.cc
index 40cba4eb91..6426973f8c 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--2000 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_;
-  Score_element* rest_p_;
+  Music *rest_req_;
+  Item * dot_;
+  Grob* rest_;
 protected:
-  virtual bool do_try_music (Music *);
-  virtual void do_pre_move_processing ();
-  virtual void do_post_move_processing ();
-  virtual void do_process_music ();
+  virtual bool try_music (Music *);
+  virtual void stop_translation_timestep ();
+  virtual void start_translation_timestep ();
+  virtual void process_music ();
+
 public:
-  
-  VIRTUAL_COPY_CONS(Translator);
-  Rest_engraver ();
+  TRANSLATOR_DECLARATIONS (Rest_engraver);
 };
 
 
@@ -35,72 +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::do_post_move_processing ()
+Rest_engraver::start_translation_timestep ()
 {
-  rest_req_l_ =0;
+  rest_req_ =0;
 }
 
 void
-Rest_engraver::do_pre_move_processing ()
+Rest_engraver::stop_translation_timestep ()
 {
-  if (rest_p_)
+  if (rest_)
     {
-      typeset_element (rest_p_);
-      rest_p_ =0;
+      typeset_grob (rest_);
+      rest_ =0;
     }
-  if (dot_p_)
+  if (dot_)
     {
-      typeset_element (dot_p_);
-      dot_p_ =0;
+      typeset_grob (dot_);
+      dot_ =0;
     }    
 }
 
 void
-Rest_engraver::do_process_music ()
+Rest_engraver::process_music ()
 {
-  if (rest_req_l_ && !rest_p_) 
+  if (rest_req_ && !rest_) 
     {
-      rest_p_ = new Item (get_property ("basicRestProperties"));
-      Rhythmic_head::set_interface (rest_p_);
-      Staff_symbol_referencer::set_interface (rest_p_);
+      rest_ = make_item ("Rest");
 
+      int durlog  = unsmob_duration (rest_req_->get_property ("duration"))-> duration_log ();
       
-      rest_p_->set_elt_property ("duration-log",
-				 gh_int2scm (rest_req_l_->duration_.durlog_i_)); 
+      rest_->set_property ("duration-log",
+				  scm_int2num (durlog));
+
+      int dots =unsmob_duration (rest_req_->get_property ("duration"))->dot_count ();
       
-      if (rest_req_l_->duration_.dots_i_)
+      if (dots)
 	{
-	  dot_p_ = new Item (get_property ("basicDotsProperties"));
-
-	  Staff_symbol_referencer::set_interface (dot_p_);
-	  Rhythmic_head::set_dots (rest_p_, dot_p_);
-	  dot_p_->set_parent (rest_p_, Y_AXIS);
-	  dot_p_->add_offset_callback (Dots::quantised_position_callback, Y_AXIS);
-	  dot_p_->set_elt_property ("dot-count",
-				    gh_int2scm (rest_req_l_->duration_.dots_i_));
-	  announce_element (dot_p_,0);
+	  dot_ = make_item ("Dots");
+
+	  Rhythmic_head::set_dots (rest_, dot_);
+	  dot_->set_parent (rest_, Y_AXIS);
+	  dot_->set_property ("dot-count", scm_int2num (dots));
+	  announce_grob (dot_, SCM_EOL);
 	}
 
-      announce_element (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 ("middleCPosition");
+	  if (ly_c_number_p (c0))
+	    pos += ly_scm2int (c0);
+	  
+	  rest_->set_property ("staff-position", scm_int2num (pos));
+	}
+      
+      announce_grob (rest_, rest_req_->self_scm ());
     }
 }
 
 bool
-Rest_engraver::do_try_music (Music *m)
+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;
 }
 
-
-ADD_THIS_TRANSLATOR(Rest_engraver);
+ENTER_DESCRIPTION (Rest_engraver,
+/* descr */       "",
+/* creats*/       "Rest Dots",
+/* accepts */     "rest-event",
+/* acks  */      "",
+/* reads */       "middleCPosition",
+/* write */       "");