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 68ec862843dd52cf23e91084aea7e7b2fb01862f..7dffbeb9dd3a9c8f12e4353642e208a5c3116306 100644 (file)
--- a/lily/rest-engraver.cc
+++ b/lily/rest-engraver.cc
@@ -8,25 +8,23 @@
 
 #include "engraver.hh"
 
-#include "dots.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"
+#include "dots.hh"
+#include "rhythmic-head.hh"
+#include "music.hh"
 
 class Rest_engraver : public Engraver
 {
-  Stream_event *rest_event_;
+  Music *rest_event_;
   Item *dot_;
   Grob *rest_;
 protected:
+  virtual bool try_music (Music *);
   void start_translation_timestep ();
   void process_music ();
-  DECLARE_TRANSLATOR_LISTENER (rest);
+
 public:
   TRANSLATOR_DECLARATIONS (Rest_engraver);
 };
@@ -55,8 +53,29 @@ Rest_engraver::process_music ()
   if (rest_event_ && !rest_)
     {
       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_from_int (durlog));
+
+      int dots = unsmob_duration (rest_event_->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_from_int (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 ();
@@ -69,16 +88,22 @@ Rest_engraver::process_music ()
     }
 }
 
-IMPLEMENT_TRANSLATOR_LISTENER (Rest_engraver, rest);
-void
-Rest_engraver::listen_rest (Stream_event *ev)
+bool
+Rest_engraver::try_music (Music *m)
 {
-  ASSIGN_EVENT_ONCE (rest_event_, ev);
+  if (m->is_mus_type ("rest-event"))
+    {
+      rest_event_ = m;
+      return true;
+    }
+  return false;
 }
 
+#include "translator.icc"
+
 ADD_TRANSLATOR (Rest_engraver,
                /* doc */ "",
-               /* create */ "Rest ",
+               /* create */ "Rest Dots",
                /* accept */ "rest-event",
                /* read */ "middleCPosition",
                /* write */ "");