X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frest-engraver.cc;h=68ec862843dd52cf23e91084aea7e7b2fb01862f;hb=c4cee934afe7b39189dfb4f7b528503da6129233;hp=aef1e884bb1163753dda1c64c89f8cbf0dd248a4;hpb=07d4d05df6479d58c3c5152c07d7c86b94ee98b4;p=lilypond.git

diff --git a/lily/rest-engraver.cc b/lily/rest-engraver.cc
index aef1e884bb..68ec862843 100644
--- a/lily/rest-engraver.cc
+++ b/lily/rest-engraver.cc
@@ -1,81 +1,84 @@
 /*
-  rest-grav.cc -- implement Rest_engraver
+  rest-engraver.cc -- implement Rest_engraver
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-#include "rest-engraver.hh"
-#include "musical-request.hh"
+#include "engraver.hh"
+
 #include "dots.hh"
-#include "rest.hh"
+#include "duration.hh"
+#include "item.hh"
+#include "pitch.hh"
+#include "rhythmic-head.hh"
+#include "staff-symbol-referencer.hh"
+#include "stream-event.hh"
+
+#include "translator.icc"
+
+class Rest_engraver : public Engraver
+{
+  Stream_event *rest_event_;
+  Item *dot_;
+  Grob *rest_;
+protected:
+  void start_translation_timestep ();
+  void process_music ();
+  DECLARE_TRANSLATOR_LISTENER (rest);
+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_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_requests ()
-{
-  if (rest_req_l_ && !rest_p_) 
-    {
-      rest_p_ = new Rest;
-      rest_p_->balltype_i_ = rest_req_l_->duration_.durlog_i_; 
-
-      if (rest_req_l_->duration_.dots_i_)
-	{
-	  dot_p_ = new Dots;
-	  rest_p_->dots_l_  =dot_p_;
-	  announce_element (Score_element_info (dot_p_,0));
-	}
-      if (rest_p_->balltype_i_ >= 2) 
+      if (p)
 	{
-	  String reststyle = get_property ("restStyle", 0);
-	  if (reststyle.length_i ())
-	    rest_p_->set_elt_property (style_scm_sym,
-				       ly_ch_C_to_scm (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_from_int (pos));
 	}
-      announce_element (Score_element_info (rest_p_, rest_req_l_));
     }
 }
 
-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_THIS_TRANSLATOR(Rest_engraver);
+ADD_TRANSLATOR (Rest_engraver,
+		/* doc */ "",
+		/* create */ "Rest ",
+		/* accept */ "rest-event",
+		/* read */ "middleCPosition",
+		/* write */ "");