X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frest-engraver.cc;h=e3f379c0767d6111a814028ea21f35a6d0aebb57;hb=c659cb200486c2f908703696a1b2873e78c8160a;hp=a8f601e9ee6d27ead0b1b967e827747fa1141249;hpb=34f168ae4ed3379964f4009e4a823a7114dcb71a;p=lilypond.git

diff --git a/lily/rest-engraver.cc b/lily/rest-engraver.cc
index a8f601e9ee..e3f379c076 100644
--- a/lily/rest-engraver.cc
+++ b/lily/rest-engraver.cc
@@ -3,79 +3,112 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#include "rest-engraver.hh"
-#include "musical-request.hh"
+#include "item.hh"
+#include "staff-symbol-referencer.hh"
 #include "dots.hh"
-#include "rest.hh"
+#include "rhythmic-head.hh"
+#include "engraver.hh"
+
+class Rest_engraver : public Engraver
+{
+  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 process_music ();
+
+public:
+  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_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_)
-    {
-      typeset_element (rest_p_);
-      rest_p_ =0;
-    }
-  if (dot_p_)
-    {
-      typeset_element (dot_p_);
-      dot_p_ =0;
-    }    
+  rest_ =0;
+  dot_ =0;
 }
 
 void
-Rest_engraver::do_process_requests ()
+Rest_engraver::process_music ()
 {
-  if (rest_req_l_ && !rest_p_) 
+  if (rest_req_ && !rest_) 
     {
-      rest_p_ = new Rest;
-      rest_p_->balltype_i_ = rest_req_l_->duration_.durlog_i_; 
-      rest_p_->dots_i_ = rest_req_l_->duration_.dots_i_;
-      if (rest_p_->dots_i_)
+      rest_ = make_item ("Rest", rest_req_->self_scm ());
+
+      int durlog  = unsmob_duration (rest_req_->get_property ("duration"))-> duration_log ();
+      
+      rest_->set_property ("duration-log",
+				  scm_int2num (durlog));
+
+      int dots =unsmob_duration (rest_req_->get_property ("duration"))->dot_count ();
+      
+      if (dots)
 	{
-	  dot_p_ = new Dots;
-	  rest_p_->dots_l_  =dot_p_;
-	  announce_element (Score_element_info (dot_p_,0));
+	  dot_ = make_item ("Dots", SCM_EOL);
+
+	  Rhythmic_head::set_dots (rest_, dot_);
+	  dot_->set_parent (rest_, Y_AXIS);
+	  dot_->set_property ("dot-count", scm_int2num (dots));
+	  
 	}
-      if (rest_p_->balltype_i_ >= 2) 
+
+      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)
 	{
-	  String reststyle = get_property ("restStyle", 0);
-	  if (reststyle.length_i ())
-	    rest_p_->set_elt_property (style_scm_sym,
-				       gh_str02scm (reststyle.ch_C()));
+	  int pos= p->steps ();
+	  SCM c0 = get_property ("middleCPosition");
+	  if (scm_is_number (c0))
+	    pos += scm_to_int (c0);
+	  
+	  rest_->set_property ("staff-position", scm_int2num (pos));
 	}
-      announce_element (Score_element_info (rest_p_, rest_req_l_));
+      
     }
 }
 
 bool
-Rest_engraver::do_try_music (Music *req)
+Rest_engraver::try_music (Music *m)
 {
-  if (Rest_req *r = dynamic_cast <Rest_req *> (req))
+  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 */       "");