release: 1.5.47

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

diff --git a/lily/rest-engraver.cc b/lily/rest-engraver.cc
index 72582135c2ada844919efd9b97046edd0781c3e0..2bb3506c49e3c27535d835ac44cf252434582395 100644 (file)
--- a/lily/rest-engraver.cc
+++ b/lily/rest-engraver.cc
@@ -22,10 +22,9 @@ protected:
   virtual bool try_music (Music *);
   virtual void stop_translation_timestep ();
   virtual void start_translation_timestep ();
-  virtual void create_grobs ();
+  virtual void process_music ();
 
 public:
-  
   TRANSLATOR_DECLARATIONS(Rest_engraver);
 };
 
@@ -62,13 +61,13 @@ Rest_engraver::stop_translation_timestep ()
 }
 
 void
-Rest_engraver::create_grobs ()
+Rest_engraver::process_music ()
 {
   if (rest_req_l_ && !rest_p_) 
     {
       rest_p_ = new Item (get_property ("Rest"));
-      Rhythmic_head::set_interface (rest_p_);
-      Staff_symbol_referencer::set_interface (rest_p_);
+
+
       
       int durlog  = unsmob_duration (rest_req_l_->get_mus_property ("duration"))-> duration_log ();
       
@@ -87,6 +86,22 @@ Rest_engraver::create_grobs ()
          announce_grob (dot_p_, SCM_EOL);
        }
 
+      Pitch *p = unsmob_pitch (rest_req_l_->get_mus_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 ("centralCPosition");
+         if (gh_number_p (c0))
+           pos += gh_scm2int (c0);
+         
+         rest_p_->set_grob_property ("staff-position", gh_int2scm (pos));
+       }
+      
       announce_grob(rest_p_, rest_req_l_->self_scm());
     }
 }
@@ -108,5 +123,5 @@ ENTER_DESCRIPTION(Rest_engraver,
 /* descr */       "",
 /* creats*/       "Rest Dots",
 /* acks  */       "",
-/* reads */       "",
+/* reads */       "centralCPosition",
 /* write */       "");