X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Frest-engraver.cc;h=12d1f84a2e727a7a00994334fb4199729b6ff1e1;hb=42ecccb1b2e20346ae6a99c690e1a29fae006d4c;hp=ccc80a3f82de05f2f6fe3916280e4cb485cf3aae;hpb=40c8e12b8afa8e9c7e44cf6ea3b724295884091b;p=lilypond.git

diff --git a/lily/rest-engraver.cc b/lily/rest-engraver.cc
index ccc80a3f82..12d1f84a2e 100644
--- a/lily/rest-engraver.cc
+++ b/lily/rest-engraver.cc
@@ -1,105 +1,91 @@
 /*
-  rest-grav.cc -- implement Rest_engraver
+  rest-engraver.cc -- implement Rest_engraver
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
-#include "staff-symbol-referencer.hh"
-#include "musical-request.hh"
+
+#include "engraver.hh"
+
 #include "dots.hh"
+#include "duration.hh"
+#include "item.hh"
+#include "pitch.hh"
 #include "rhythmic-head.hh"
-#include "engraver.hh"
+#include "staff-symbol-referencer.hh"
+#include "stream-event.hh"
+
+#include "translator.icc"
 
 class Rest_engraver : public Engraver
 {
-  Rest_req *rest_req_l_;
-  Item * dot_p_;
-  Rhythmic_head * rest_p_;
+  Stream_event *rest_event_;
+  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 ();
+  void start_translation_timestep ();
+  void process_music ();
+  DECLARE_TRANSLATOR_LISTENER (rest);
 public:
-  
-  VIRTUAL_COPY_CONS(Translator);
-  Rest_engraver ();
+  TRANSLATOR_DECLARATIONS (Rest_engraver);
 };
 
-
 /*
   Should merge with Note_head_engraver
- */
+*/
 Rest_engraver::Rest_engraver ()
 {
-  rest_req_l_ =0;
-  rest_p_ =0;
-  dot_p_ =0;
+  rest_event_ = 0;
+  rest_ = 0;
+  dot_ = 0;
 }
 
 void
-Rest_engraver::do_post_move_processing ()
+Rest_engraver::start_translation_timestep ()
 {
-  rest_req_l_ =0;
+  rest_event_ = 0;
+  rest_ = 0;
+  dot_ = 0;
 }
 
 void
-Rest_engraver::do_pre_move_processing ()
+Rest_engraver::process_music ()
 {
-  if (rest_p_)
-    {
-      typeset_element (rest_p_);
-      rest_p_ =0;
-    }
-  if (dot_p_)
+  if (rest_event_ && !rest_)
     {
-      typeset_element (dot_p_);
-      dot_p_ =0;
-    }    
-}
+      rest_ = make_item ("Rest", rest_event_->self_scm ());
+      Pitch *p = unsmob_pitch (rest_event_->get_property ("pitch"));
 
-void
-Rest_engraver::do_process_music ()
-{
-  if (rest_req_l_ && !rest_p_) 
-    {
-      rest_p_ = new Rhythmic_head (get_property ("basicRestProperties"));
-      Staff_symbol_referencer_interface si (rest_p_);
-      si.set_interface ();
-      
-      rest_p_->set_elt_property ("duration-log",
-				 gh_int2scm (rest_req_l_->duration_.durlog_i_)); 
-      
-      if (rest_req_l_->duration_.dots_i_)
+      if (p)
 	{
-	  dot_p_ = new Item (get_property ("basicDotsProperties"));
-
-	  Staff_symbol_referencer_interface si (dot_p_);
-	  si.set_interface ();
-	  
-	  rest_p_->set_dots (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 (Score_element_info (dot_p_,0));
-	}
+	  int pos = p->steps ();
+	  SCM c0 = get_property ("middleCPosition");
+	  if (scm_is_number (c0))
+	    pos += scm_to_int (c0);
 
-      announce_element (Score_element_info (rest_p_, rest_req_l_));
+	  rest_->set_property ("staff-position", scm_from_int (pos));
+	}
     }
 }
 
-bool
-Rest_engraver::do_try_music (Music *req)
+IMPLEMENT_TRANSLATOR_LISTENER (Rest_engraver, rest);
+void
+Rest_engraver::listen_rest (Stream_event *ev)
 {
-  if (Rest_req *r = dynamic_cast <Rest_req *> (req))
-    {
-      rest_req_l_ = r;
-      return true;
-    }  
-  return false;
+  ASSIGN_EVENT_ONCE (rest_event_, ev);
 }
 
+ADD_TRANSLATOR (Rest_engraver,
+		/* doc */
+		"Engrave rests.",
+
+		/* create */
+		"Rest ",
+
+		/* read */
+		"middleCPosition ",
 
-ADD_THIS_TRANSLATOR(Rest_engraver);
+		/* write */
+		""
+		);