X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frest-engraver.cc;h=12d1f84a2e727a7a00994334fb4199729b6ff1e1;hb=8574d4349026c4ac5a15a27c50e264bf548e29fb;hp=b59acf73f4d5bda1dd6a0e3b9c715a0695ee6378;hpb=c4c0ba811cd526f047de3f4d3c77abcc32a3e076;p=lilypond.git diff --git a/lily/rest-engraver.cc b/lily/rest-engraver.cc index b59acf73f4..12d1f84a2e 100644 --- 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 + (c) 1997--2009 Han-Wen Nienhuys */ #include "engraver.hh" @@ -11,6 +11,7 @@ #include "dots.hh" #include "duration.hh" #include "item.hh" +#include "pitch.hh" #include "rhythmic-head.hh" #include "staff-symbol-referencer.hh" #include "stream-event.hh" @@ -54,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 (); @@ -97,8 +77,15 @@ Rest_engraver::listen_rest (Stream_event *ev) } ADD_TRANSLATOR (Rest_engraver, - /* doc */ "", - /* create */ "Rest Dots", - /* accept */ "rest-event", - /* read */ "middleCPosition", - /* write */ ""); + /* doc */ + "Engrave rests.", + + /* create */ + "Rest ", + + /* read */ + "middleCPosition ", + + /* write */ + "" + );