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 690f994663d6e8183f806c04312a471c5d5b9398..7dffbeb9dd3a9c8f12e4353642e208a5c3116306 100644 (file)
--- a/lily/rest-engraver.cc
+++ b/lily/rest-engraver.cc
@@ -3,37 +3,38 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 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 "dots.hh"
 #include "rhythmic-head.hh"
-#include "engraver.hh"
+#include "music.hh"
 
 class Rest_engraver : public Engraver
 {
-  Music *rest_req_;
-  Item * dot_;
-  Grob* rest_;
+  Music *rest_event_;
+  Item *dot_;
+  Grob *rest_;
 protected:
   virtual bool try_music (Music *);
-  virtual void stop_translation_timestep ();
-  virtual void start_translation_timestep ();
-  virtual void process_music ();
+  void start_translation_timestep ();
+  void process_music ();
 
 public:
   TRANSLATOR_DECLARATIONS (Rest_engraver);
 };
 
-
 /*
   Should merge with Note_head_engraver
- */
+*/
 Rest_engraver::Rest_engraver ()
 {
-  rest_req_ = 0;
+  rest_event_ = 0;
   rest_ = 0;
   dot_ = 0;
 }
@@ -41,12 +42,7 @@ Rest_engraver::Rest_engraver ()
 void
 Rest_engraver::start_translation_timestep ()
 {
-  rest_req_ = 0;
-}
-
-void
-Rest_engraver::stop_translation_timestep ()
-{
+  rest_event_ = 0;
   rest_ = 0;
   dot_ = 0;
 }
@@ -54,43 +50,41 @@ Rest_engraver::stop_translation_timestep ()
 void
 Rest_engraver::process_music ()
 {
-  if (rest_req_ && !rest_) 
+  if (rest_event_ && !rest_)
     {
-      rest_ = make_item ("Rest", rest_req_->self_scm ());
+      rest_ = make_item ("Rest", rest_event_->self_scm ());
+
+      int durlog = unsmob_duration (rest_event_->get_property ("duration"))->duration_log ();
 
-      int durlog  = unsmob_duration (rest_req_->get_property ("duration"))-> duration_log ();
-      
       rest_->set_property ("duration-log",
-                                 scm_int2num (durlog));
+                          scm_from_int (durlog));
+
+      int dots = unsmob_duration (rest_event_->get_property ("duration"))->dot_count ();
 
-      int dots = unsmob_duration (rest_req_->get_property ("duration"))->dot_count ();
-      
       if (dots)
        {
          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));
-         
+         dot_->set_property ("dot-count", scm_from_int (dots));
        }
 
-      Pitch *p = unsmob_pitch (rest_req_->get_property ("pitch"));
+      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));
+
+         rest_->set_property ("staff-position", scm_from_int (pos));
        }
-      
     }
 }
 
@@ -99,16 +93,17 @@ Rest_engraver::try_music (Music *m)
 {
   if (m->is_mus_type ("rest-event"))
     {
-      rest_req_ = m;
+      rest_event_ = m;
       return true;
     }
   return false;
 }
 
+#include "translator.icc"
+
 ADD_TRANSLATOR (Rest_engraver,
-/* descr */       "",
-/* creats*/       "Rest Dots",
-/* accepts */     "rest-event",
-/* acks  */      "",
-/* reads */       "middleCPosition",
-/* write */       "");
+               /* doc */ "",
+               /* create */ "Rest Dots",
+               /* accept */ "rest-event",
+               /* read */ "middleCPosition",
+               /* write */ "");