source file of the GNU LilyPond music typesetter
- (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
+#include "engraver.hh"
+
+#include "duration.hh"
#include "item.hh"
#include "staff-symbol-referencer.hh"
#include "dots.hh"
#include "rhythmic-head.hh"
-#include "engraver.hh"
+#include "music.hh"
class Rest_engraver : public Engraver
{
- Music *rest_req_;
+ Music *rest_event_;
Item *dot_;
Grob *rest_;
protected:
virtual bool try_music (Music *);
- virtual void stop_translation_timestep ();
- virtual void start_translation_timestep ();
- virtual void process_music ();
+ void start_translation_timestep ();
+ void process_music ();
public:
TRANSLATOR_DECLARATIONS (Rest_engraver);
*/
Rest_engraver::Rest_engraver ()
{
- rest_req_ = 0;
+ rest_event_ = 0;
rest_ = 0;
dot_ = 0;
}
void
Rest_engraver::start_translation_timestep ()
{
- rest_req_ = 0;
-}
-
-void
-Rest_engraver::stop_translation_timestep ()
-{
+ rest_event_ = 0;
rest_ = 0;
dot_ = 0;
}
void
Rest_engraver::process_music ()
{
- if (rest_req_ && !rest_)
+ if (rest_event_ && !rest_)
{
- rest_ = make_item ("Rest", rest_req_->self_scm ());
+ rest_ = make_item ("Rest", rest_event_->self_scm ());
- int durlog = unsmob_duration (rest_req_->get_property ("duration"))-> duration_log ();
+ int durlog = unsmob_duration (rest_event_->get_property ("duration"))->duration_log ();
rest_->set_property ("duration-log",
- scm_int2num (durlog));
+ scm_from_int (durlog));
- int dots = unsmob_duration (rest_req_->get_property ("duration"))->dot_count ();
+ int dots = unsmob_duration (rest_event_->get_property ("duration"))->dot_count ();
if (dots)
{
Rhythmic_head::set_dots (rest_, dot_);
dot_->set_parent (rest_, Y_AXIS);
- dot_->set_property ("dot-count", scm_int2num (dots));
-
+ dot_->set_property ("dot-count", scm_from_int (dots));
}
- Pitch *p = unsmob_pitch (rest_req_->get_property ("pitch"));
+ Pitch *p = unsmob_pitch (rest_event_->get_property ("pitch"));
/*
This is ridiculous -- rests don't have pitch, but we act as if
if (scm_is_number (c0))
pos += scm_to_int (c0);
- rest_->set_property ("staff-position", scm_int2num (pos));
+ rest_->set_property ("staff-position", scm_from_int (pos));
}
-
}
}
{
if (m->is_mus_type ("rest-event"))
{
- rest_req_ = m;
+ rest_event_ = m;
return true;
}
return false;
}
+#include "translator.icc"
+
ADD_TRANSLATOR (Rest_engraver,
- /* descr */ "",
- /* creats*/ "Rest Dots",
- /* accepts */ "rest-event",
- /* acks */ "",
- /* reads */ "middleCPosition",
+ /* doc */ "",
+ /* create */ "Rest Dots",
+ /* accept */ "rest-event",
+ /* read */ "middleCPosition",
/* write */ "");