* lily/accidental-placement.cc (position_accidentals): bugfix in

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

diff --git a/lily/rest-engraver.cc b/lily/rest-engraver.cc
index a9af0ccd93bc875abcfb2bf34572d84ff49b3abe..b87a913cb1ff96f023419f90754fc01241e81388 100644 (file)
--- a/lily/rest-engraver.cc
+++ b/lily/rest-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 #include "item.hh"
 #include "staff-symbol-referencer.hh"
@@ -25,7 +25,7 @@ protected:
   virtual void process_music ();
 
 public:
-  TRANSLATOR_DECLARATIONS(Rest_engraver);
+  TRANSLATOR_DECLARATIONS (Rest_engraver);
 };
 
 
@@ -65,26 +65,26 @@ Rest_engraver::process_music ()
 {
   if (rest_req_ && !rest_) 
     {
-      rest_ = new Item (get_property ("Rest"));
+      rest_ = make_item ("Rest");
 
-      int durlog  = unsmob_duration (rest_req_->get_mus_property ("duration"))-> duration_log ();
+      int durlog  = unsmob_duration (rest_req_->get_property ("duration"))-> duration_log ();
       
-      rest_->set_grob_property ("duration-log",
+      rest_->set_property ("duration-log",
                                  gh_int2scm (durlog));
 
-      int dots =unsmob_duration (rest_req_->get_mus_property ("duration"))->dot_count ();
+      int dots =unsmob_duration (rest_req_->get_property ("duration"))->dot_count ();
       
       if (dots)
        {
-         dot_ = new Item (get_property ("Dots"));
+         dot_ = make_item ("Dots");
 
          Rhythmic_head::set_dots (rest_, dot_);
          dot_->set_parent (rest_, Y_AXIS);
-         dot_->set_grob_property ("dot-count", gh_int2scm (dots));
+         dot_->set_property ("dot-count", gh_int2scm (dots));
          announce_grob (dot_, SCM_EOL);
        }
 
-      Pitch *p = unsmob_pitch (rest_req_->get_mus_property ("pitch"));
+      Pitch *p = unsmob_pitch (rest_req_->get_property ("pitch"));
 
       /*
        This is ridiculous -- rests don't have pitch, but we act as if
@@ -97,10 +97,10 @@ Rest_engraver::process_music ()
          if (gh_number_p (c0))
            pos += gh_scm2int (c0);
          
-         rest_->set_grob_property ("staff-position", gh_int2scm (pos));
+         rest_->set_property ("staff-position", gh_int2scm (pos));
        }
       
-      announce_grob(rest_, rest_req_->self_scm());
+      announce_grob (rest_, rest_req_->self_scm ());
     }
 }
 
@@ -115,7 +115,7 @@ Rest_engraver::try_music (Music *m)
   return false;
 }
 
-ENTER_DESCRIPTION(Rest_engraver,
+ENTER_DESCRIPTION (Rest_engraver,
 /* descr */       "",
 /* creats*/       "Rest Dots",
 /* accepts */     "rest-event",