* configure.in: Test for and accept lmodern if EC fonts not found.

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

diff --git a/lily/rest-engraver.cc b/lily/rest-engraver.cc
index a660dfda44912bc197b8ad0cb2e8238bb4d156d0..e3f379c0767d6111a814028ea21f35a6d0aebb57 100644 (file)
--- a/lily/rest-engraver.cc
+++ b/lily/rest-engraver.cc
@@ -5,14 +5,13 @@
 
   (c) 1997--2004 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_;
@@ -25,7 +24,7 @@ protected:
   virtual void process_music ();
 
 public:
-  TRANSLATOR_DECLARATIONS(Rest_engraver);
+  TRANSLATOR_DECLARATIONS (Rest_engraver);
 };
 
 
@@ -48,16 +47,8 @@ Rest_engraver::start_translation_timestep ()
 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
@@ -65,26 +56,26 @@ Rest_engraver::process_music ()
 {
   if (rest_req_ && !rest_) 
     {
-      rest_ = make_item ("Rest");
+      rest_ = make_item ("Rest", rest_req_->self_scm ());
 
-      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",
-                                 gh_int2scm (durlog));
+      rest_->set_property ("duration-log",
+                                 scm_int2num (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_ = make_item ("Dots");
+         dot_ = make_item ("Dots", SCM_EOL);
 
          Rhythmic_head::set_dots (rest_, dot_);
          dot_->set_parent (rest_, Y_AXIS);
-         dot_->set_grob_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_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
@@ -93,14 +84,13 @@ Rest_engraver::process_music ()
       if (p)
        {
          int pos= p->steps ();
-         SCM c0 = get_property ("centralCPosition");
-         if (gh_number_p (c0))
-           pos += gh_scm2int (c0);
+         SCM c0 = get_property ("middleCPosition");
+         if (scm_is_number (c0))
+           pos += scm_to_int (c0);
          
-         rest_->set_grob_property ("staff-position", gh_int2scm (pos));
+         rest_->set_property ("staff-position", scm_int2num (pos));
        }
       
-      announce_grob(rest_, rest_req_->self_scm());
     }
 }
 
@@ -115,10 +105,10 @@ Rest_engraver::try_music (Music *m)
   return false;
 }
 
-ENTER_DESCRIPTION(Rest_engraver,
+ENTER_DESCRIPTION (Rest_engraver,
 /* descr */       "",
 /* creats*/       "Rest Dots",
 /* accepts */     "rest-event",
 /* acks  */      "",
-/* reads */       "centralCPosition",
+/* reads */       "middleCPosition",
 /* write */       "");