patch::: 1.3.86.jcn2

[lilypond.git] / lily / rest-engraver.cc

diff --git a/lily/rest-engraver.cc b/lily/rest-engraver.cc
index 1e5aa7eed2f66b2e25922e7eaf0a63769118637f..23ff6e776bef31628581a19dec2c6de147d8f62d 100644 (file)
--- a/lily/rest-engraver.cc
+++ b/lily/rest-engraver.cc
@@ -3,13 +3,33 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
-
-#include "rest-engraver.hh"
+#include "item.hh"
+#include "staff-symbol-referencer.hh"
 #include "musical-request.hh"
 #include "dots.hh"
-#include "rest.hh"
+#include "rhythmic-head.hh"
+#include "engraver.hh"
+
+
+class Rest_engraver : public Engraver
+{
+  Rest_req *rest_req_l_;
+  Item * dot_p_;
+  Score_element* rest_p_;
+protected:
+  virtual bool do_try_music (Music *);
+  virtual void do_pre_move_processing ();
+  virtual void do_post_move_processing ();
+  virtual void do_process_music ();
+public:
+  
+  VIRTUAL_COPY_CONS(Translator);
+  Rest_engraver ();
+};
+
+
 /*
   Should merge with Note_head_engraver
  */
@@ -42,38 +62,49 @@ Rest_engraver::do_pre_move_processing ()
 }
 
 void
-Rest_engraver::do_process_requests ()
+Rest_engraver::do_process_music ()
 {
   if (rest_req_l_ && !rest_p_) 
     {
-      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_)
-       {
-         dot_p_ = new Dots;
-         rest_p_->dots_l_  =dot_p_;
-         announce_element (Score_element_info (dot_p_,0));
-       }
-      if (rest_p_->balltype_i_ >= 2) 
+      rest_p_ = new Item (get_property ("basicRestProperties"));
+      Rhythmic_head::set_interface (rest_p_);
+      Staff_symbol_referencer::set_interface (rest_p_);
+
+      
+      rest_p_->set_elt_property ("duration-log",
+                                gh_int2scm (rest_req_l_->duration_.durlog_i_)); 
+      
+      if (rest_req_l_->duration_.dots_i_)
        {
-         String reststyle = get_property ("restStyle", 0);
-         if (reststyle.length_i ())
-           rest_p_->set_elt_property (style_scm_sym,
-                                        gh_str02scm (reststyle.ch_C()));
+         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);
        }
-      announce_element (Score_element_info (rest_p_, rest_req_l_));
+
+      announce_element (rest_p_, rest_req_l_);
     }
 }
 
 bool
-Rest_engraver::do_try_music (Music *req)
+Rest_engraver::do_try_music (Music *m)
 {
-  if (Rest_req *r = dynamic_cast <Rest_req *> (req))
+  if (Rest_req *r = dynamic_cast <Rest_req *> (m))
     {
       rest_req_l_ = r;
       return true;
     }  
+  else if (Rhythm_interrogate_req *r = dynamic_cast<Rhythm_interrogate_req*> (m))
+    {
+      if (rest_req_l_)
+       r->duration_arr_.push (rest_req_l_->duration_); // GUH UGH UGHUGH.
+      return true;
+    }
   return false;
 }