* lily/score.cc (Score): unprotect copy of Output_def. Plugs

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

diff --git a/lily/rest-engraver.cc b/lily/rest-engraver.cc
index 1e0782331c011e8f371a6d8dbd05945b2f35b8e4..009d16f768d0db136ee71c409100cd541ec846cd 100644 (file)
--- a/lily/rest-engraver.cc
+++ b/lily/rest-engraver.cc
@@ -1,23 +1,22 @@
 /*
-  rest-grav.cc -- implement Rest_engraver
+  rest-engraver.cc -- implement Rest_engraver
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
+
 #include "item.hh"
 #include "staff-symbol-referencer.hh"
-#include "event.hh"
 #include "dots.hh"
 #include "rhythmic-head.hh"
 #include "engraver.hh"
 
-
 class Rest_engraver : public Engraver
 {
   Music *rest_req_;
-  Item * dot_;
-  Grob* rest_;
+  Item *dot_;
+  Grob *rest_;
 protected:
   virtual bool try_music (Music *);
   virtual void stop_translation_timestep ();
@@ -28,60 +27,50 @@ public:
   TRANSLATOR_DECLARATIONS (Rest_engraver);
 };
 
-
 /*
   Should merge with Note_head_engraver
- */
+*/
 Rest_engraver::Rest_engraver ()
 {
-  rest_req_ =0;
-  rest_ =0;
-  dot_ =0;
+  rest_req_ = 0;
+  rest_ = 0;
+  dot_ = 0;
 }
 
 void
 Rest_engraver::start_translation_timestep ()
 {
-  rest_req_ =0;
+  rest_req_ = 0;
 }
 
 void
 Rest_engraver::stop_translation_timestep ()
 {
-  if (rest_)
-    {
-      typeset_grob (rest_);
-      rest_ =0;
-    }
-  if (dot_)
-    {
-      typeset_grob (dot_);
-      dot_ =0;
-    }    
+  rest_ = 0;
+  dot_ = 0;
 }
 
 void
 Rest_engraver::process_music ()
 {
-  if (rest_req_ && !rest_) 
+  if (rest_req_ && !rest_)
     {
-      rest_ = make_item ("Rest");
+      rest_ = make_item ("Rest", rest_req_->self_scm ());
+
+      int durlog = unsmob_duration (rest_req_->get_property ("duration"))->duration_log ();
 
-      int durlog  = unsmob_duration (rest_req_->get_property ("duration"))-> duration_log ();
-      
       rest_->set_property ("duration-log",
-                                 gh_int2scm (durlog));
+                          scm_int2num (durlog));
+
+      int dots = unsmob_duration (rest_req_->get_property ("duration"))->dot_count ();
 
-      int dots =unsmob_duration (rest_req_->get_property ("duration"))->dot_count ();
-      
       if (dots)
        {
-         dot_ = make_item ("Dots");
+         dot_ = make_item ("Dots", SCM_EOL);
 
          Rhythmic_head::set_dots (rest_, dot_);
          dot_->set_parent (rest_, Y_AXIS);
-         dot_->set_property ("dot-count", gh_int2scm (dots));
-         announce_grob (dot_, SCM_EOL);
+         dot_->set_property ("dot-count", scm_int2num (dots));
        }
 
       Pitch *p = unsmob_pitch (rest_req_->get_property ("pitch"));
@@ -89,18 +78,16 @@ Rest_engraver::process_music ()
       /*
        This is ridiculous -- rests don't have pitch, but we act as if
        our nose is bleeding.
-       */
+      */
       if (p)
        {
-         int pos= p->steps ();
+         int pos = p->steps ();
          SCM c0 = get_property ("middleCPosition");
-         if (gh_number_p (c0))
-           pos += gh_scm2int (c0);
-         
-         rest_->set_property ("staff-position", gh_int2scm (pos));
+         if (scm_is_number (c0))
+           pos += scm_to_int (c0);
+
+         rest_->set_property ("staff-position", scm_int2num (pos));
        }
-      
-      announce_grob (rest_, rest_req_->self_scm ());
     }
 }
 
@@ -115,10 +102,10 @@ Rest_engraver::try_music (Music *m)
   return false;
 }
 
-ENTER_DESCRIPTION (Rest_engraver,
-/* descr */       "",
-/* creats*/       "Rest Dots",
-/* accepts */     "rest-event",
-/* acks  */      "",
-/* reads */       "middleCPosition",
-/* write */       "");
+ADD_TRANSLATOR (Rest_engraver,
+               /* descr */ "",
+               /* creats*/ "Rest Dots",
+               /* accepts */ "rest-event",
+               /* acks  */ "",
+               /* reads */ "middleCPosition",
+               /* write */ "");