X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Frest-engraver.cc;h=2a90b776ce7e5b8598493ec0979d1af8bb48c897;hb=1402d6d957bee7d47e0bddf4c57dd89912182b26;hp=f4f2e6efbe8b2085aa17284593aa0c1d6e9c28f5;hpb=9efbad2d9487a05b04423e7e9f062968e8f8eaf4;p=lilypond.git

diff --git a/lily/rest-engraver.cc b/lily/rest-engraver.cc
index f4f2e6efbe..2a90b776ce 100644
--- a/lily/rest-engraver.cc
+++ b/lily/rest-engraver.cc
@@ -1,74 +1,112 @@
 /*
-  rest-grav.cc -- implement Rest_engraver
+  rest-engraver.cc -- implement Rest_engraver
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#include "rest-engraver.hh"
-#include "musical-request.hh"
+#include "engraver.hh"
+
+#include "duration.hh"
+#include "item.hh"
+#include "staff-symbol-referencer.hh"
 #include "dots.hh"
-#include "rest.hh"
+#include "rhythmic-head.hh"
+#include "music.hh"
+
+
+class Rest_engraver : public Engraver
+{
+  Music *rest_event_;
+  Item *dot_;
+  Grob *rest_;
+protected:
+  virtual bool try_music (Music *);
+  PRECOMPUTED_VIRTUAL void start_translation_timestep ();
+  PRECOMPUTED_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_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 ()
-{
-  if (rest_p_)
-    {
-      typeset_element (rest_p_);
-      rest_p_ =0;
-    }
-  if (dot_p_)
-    {
-      typeset_element (dot_p_);
-      dot_p_ =0;
-    }    
-}
 
 void
-Rest_engraver::do_process_requests ()
+Rest_engraver::process_music ()
 {
-  if (rest_req_l_ && !rest_p_) 
+  if (rest_event_ && !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_event_->self_scm ());
+
+      int durlog = unsmob_duration (rest_event_->get_property ("duration"))->duration_log ();
+
+      rest_->set_property ("duration-log",
+			   scm_int2num (durlog));
+
+      int dots = unsmob_duration (rest_event_->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));
+	}
+
+      Pitch *p = unsmob_pitch (rest_event_->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 (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_request (Request *r)
+Rest_engraver::try_music (Music *m)
 {
-  Musical_req *m = dynamic_cast <Musical_req *> (r);
-  if (!m || !dynamic_cast <Rest_req *> (m))
-    return false;
-
-  rest_req_l_ = dynamic_cast <Rest_req *> (m);	// ugh
-  return true;
+  if (m->is_mus_type ("rest-event"))
+    {
+      rest_event_ = m;
+      return true;
+    }
+  return false;
 }
 
-IMPLEMENT_IS_TYPE_B1(Rest_engraver, Engraver);
-ADD_THIS_TRANSLATOR(Rest_engraver);
+#include "translator.icc"
+
+ADD_TRANSLATOR (Rest_engraver,
+		/* descr */ "",
+		/* creats*/ "Rest Dots",
+		/* accepts */ "rest-event",
+		/* acks  */ "",
+		/* reads */ "middleCPosition",
+		/* write */ "");