Merge commit 'b5cba4f'

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

diff --git a/lily/rest-engraver.cc b/lily/rest-engraver.cc
index 95a8d10126e2c5cd2296e5d774d59363b7337f0c..e6e7ecb7dea588df79f98712c2d07f4bff58a3fc 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--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
@@ -55,29 +55,8 @@ 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 ();
@@ -99,7 +78,6 @@ Rest_engraver::listen_rest (Stream_event *ev)
 
 ADD_TRANSLATOR (Rest_engraver,
                /* doc */ "",
-               /* create */ "Rest Dots",
-               /* accept */ "rest-event",
+               /* create */ "Rest ",
                /* read */ "middleCPosition",
                /* write */ "");