/*
- rest-grav.cc -- implement Rest_engraver
+ rest-engraver.cc -- implement Rest_engraver
source file of the GNU LilyPond music typesetter
- (c) 1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
+
+#include "engraver.hh"
+
+#include "duration.hh"
#include "item.hh"
#include "staff-symbol-referencer.hh"
-#include "musical-request.hh"
#include "dots.hh"
#include "rhythmic-head.hh"
-#include "engraver.hh"
-
+#include "music.hh"
class Rest_engraver : public Engraver
{
- Rest_req *rest_req_l_;
- Item * dot_p_;
- Grob* rest_p_;
+ 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);
+ TRANSLATOR_DECLARATIONS (Rest_engraver);
};
-
/*
Should merge with Note_head_engraver
- */
+*/
Rest_engraver::Rest_engraver ()
{
- rest_req_l_ =0;
- rest_p_ =0;
- dot_p_ =0;
+ rest_event_ = 0;
+ rest_ = 0;
+ dot_ = 0;
}
void
Rest_engraver::start_translation_timestep ()
{
- rest_req_l_ =0;
-}
-
-void
-Rest_engraver::stop_translation_timestep ()
-{
- if (rest_p_)
- {
- typeset_grob (rest_p_);
- rest_p_ =0;
- }
- if (dot_p_)
- {
- typeset_grob (dot_p_);
- dot_p_ =0;
- }
+ rest_event_ = 0;
+ rest_ = 0;
+ dot_ = 0;
}
void
Rest_engraver::process_music ()
{
- if (rest_req_l_ && !rest_p_)
+ if (rest_event_ && !rest_)
{
- rest_p_ = new Item (get_property ("Rest"));
+ rest_ = make_item ("Rest", rest_event_->self_scm ());
+ int durlog = unsmob_duration (rest_event_->get_property ("duration"))->duration_log ();
-
- int durlog = unsmob_duration (rest_req_l_->get_mus_property ("duration"))-> duration_log ();
-
- rest_p_->set_grob_property ("duration-log",
- gh_int2scm (durlog));
+ rest_->set_property ("duration-log",
+ scm_from_int (durlog));
+
+ int dots = unsmob_duration (rest_event_->get_property ("duration"))->dot_count ();
- int dots =unsmob_duration (rest_req_l_->get_mus_property ("duration"))->dot_count ();
-
if (dots)
{
- dot_p_ = new Item (get_property ("Dots"));
+ dot_ = make_item ("Dots", SCM_EOL);
- Rhythmic_head::set_dots (rest_p_, dot_p_);
- dot_p_->set_parent (rest_p_, Y_AXIS);
- dot_p_->set_grob_property ("dot-count", gh_int2scm (dots));
- announce_grob (dot_p_, 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_req_l_->get_mus_property ("pitch"));
+ 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 ();
- SCM c0 = get_property ("centralCPosition");
- if (gh_number_p (c0))
- pos += gh_scm2int (c0);
-
- rest_p_->set_grob_property ("staff-position", gh_int2scm (pos));
+ int pos = p->steps ();
+ SCM c0 = get_property ("middleCPosition");
+ if (scm_is_number (c0))
+ pos += scm_to_int (c0);
+
+ rest_->set_property ("staff-position", scm_from_int (pos));
}
-
- announce_grob(rest_p_, rest_req_l_->self_scm());
}
}
bool
Rest_engraver::try_music (Music *m)
{
- if (Rest_req *r = dynamic_cast <Rest_req *> (m))
+ if (m->is_mus_type ("rest-event"))
{
- rest_req_l_ = r;
+ rest_event_ = m;
return true;
- }
+ }
return false;
}
+#include "translator.icc"
-
-ENTER_DESCRIPTION(Rest_engraver,
-/* descr */ "",
-/* creats*/ "Rest Dots",
-/* acks */ "",
-/* reads */ "centralCPosition",
-/* write */ "");
+ADD_TRANSLATOR (Rest_engraver,
+ /* doc */ "",
+ /* create */ "Rest Dots",
+ /* accept */ "rest-event",
+ /* read */ "middleCPosition",
+ /* write */ "");