Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/rest-engraver.cc b/lily/rest-engraver.cc
index 23ff6e776bef31628581a19dec2c6de147d8f62d..7dffbeb9dd3a9c8f12e4353642e208a5c3116306 100644 (file)
--- a/lily/rest-engraver.cc
+++ b/lily/rest-engraver.cc
@@ -1,112 +1,109 @@
 /*
-  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--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
+
+#include "engraver.hh"
+
+#include "duration.hh"
 #include "item.hh"
 #include "staff-symbol-referencer.hh"
-#include "musical-request.hh"
 #include "dots.hh"
 #include "rhythmic-head.hh"
-#include "engraver.hh"
-
+#include "music.hh"
 
 class Rest_engraver : public Engraver
 {
-  Rest_req *rest_req_l_;
-  Item * dot_p_;
-  Score_element* rest_p_;
+  Music *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 ();
+  virtual bool try_music (Music *);
+  void start_translation_timestep ();
+  void process_music ();
+
 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 ());
 
-void
-Rest_engraver::do_process_music ()
-{
-  if (rest_req_l_ && !rest_p_) 
-    {
-      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_)
+      int durlog = unsmob_duration (rest_event_->get_property ("duration"))->duration_log ();
+
+      rest_->set_property ("duration-log",
+                          scm_from_int (durlog));
+
+      int dots = unsmob_duration (rest_event_->get_property ("duration"))->dot_count ();
+
+      if (dots)
        {
-         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);
+         dot_ = make_item ("Dots", SCM_EOL);
+
+         Rhythmic_head::set_dots (rest_, dot_);
+         dot_->set_parent (rest_, Y_AXIS);
+         dot_->set_property ("dot-count", scm_from_int (dots));
        }
 
-      announce_element (rest_p_, rest_req_l_);
+      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_from_int (pos));
+       }
     }
 }
 
 bool
-Rest_engraver::do_try_music (Music *m)
+Rest_engraver::try_music (Music *m)
 {
-  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 (m->is_mus_type ("rest-event"))
     {
-      if (rest_req_l_)
-       r->duration_arr_.push (rest_req_l_->duration_); // GUH UGH UGHUGH.
+      rest_event_ = m;
       return true;
     }
   return false;
 }
 
+#include "translator.icc"
 
-ADD_THIS_TRANSLATOR(Rest_engraver);
+ADD_TRANSLATOR (Rest_engraver,
+               /* doc */ "",
+               /* create */ "Rest Dots",
+               /* accept */ "rest-event",
+               /* read */ "middleCPosition",
+               /* write */ "");