source file of the GNU LilyPond music typesetter
- (c) 1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
-
-#include "rest-engraver.hh"
+#include "item.hh"
+#include "staff-symbol-referencer.hh"
#include "musical-request.hh"
#include "dots.hh"
-#include "rest.hh"
+#include "rhythmic-head.hh"
+#include "engraver.hh"
+
+
+class Rest_engraver : public Engraver
+{
+ Rest_req *rest_req_;
+ Item * dot_;
+ Grob* rest_;
+protected:
+ virtual bool try_music (Music *);
+ virtual void stop_translation_timestep ();
+ virtual void start_translation_timestep ();
+ virtual void process_music ();
+
+public:
+ 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_req_ =0;
+ rest_ =0;
+ dot_ =0;
}
void
-Rest_engraver::do_post_move_processing ()
+Rest_engraver::start_translation_timestep ()
{
- rest_req_l_ =0;
+ rest_req_ =0;
}
void
-Rest_engraver::do_pre_move_processing ()
+Rest_engraver::stop_translation_timestep ()
{
- if (rest_p_)
+ if (rest_)
{
- typeset_element (rest_p_);
- rest_p_ =0;
+ typeset_grob (rest_);
+ rest_ =0;
}
- if (dot_p_)
+ if (dot_)
{
- typeset_element (dot_p_);
- dot_p_ =0;
+ typeset_grob (dot_);
+ dot_ =0;
}
}
void
-Rest_engraver::do_process_requests ()
+Rest_engraver::process_music ()
{
- if (rest_req_l_ && !rest_p_)
+ if (rest_req_ && !rest_)
{
- rest_p_ = new Rest;
- rest_p_->balltype_i_ = rest_req_l_->duration_.durlog_i_;
+ rest_ = new Item (get_property ("Rest"));
- if (rest_req_l_->duration_.dots_i_)
+
+
+ int durlog = unsmob_duration (rest_req_->get_mus_property ("duration"))-> duration_log ();
+
+ rest_->set_grob_property ("duration-log",
+ gh_int2scm (durlog));
+
+ int dots =unsmob_duration (rest_req_->get_mus_property ("duration"))->dot_count ();
+
+ if (dots)
{
- dot_p_ = new Dots;
- rest_p_->dots_l_ =dot_p_;
- announce_element (Score_element_info (dot_p_,0));
+ dot_ = new Item (get_property ("Dots"));
+
+ 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);
}
- if (rest_p_->balltype_i_ >= 2)
+
+ Pitch *p = unsmob_pitch (rest_req_->get_mus_property ("pitch"));
+
+ /*
+ This is ridiculous -- rests don't have pitch, but we act as if
+ our nose is bleeding.
+ */
+ if (p)
{
- String reststyle = get_property ("restStyle", 0);
- if (reststyle.length_i ())
- rest_p_->set_elt_property (style_scm_sym,
- ly_ch_C_to_scm (reststyle.ch_C()));
+ int pos= p->steps ();
+ SCM c0 = get_property ("centralCPosition");
+ if (gh_number_p (c0))
+ pos += gh_scm2int (c0);
+
+ rest_->set_grob_property ("staff-position", gh_int2scm (pos));
}
- announce_element (Score_element_info (rest_p_, rest_req_l_));
+
+ announce_grob(rest_, rest_req_->self_scm());
}
}
bool
-Rest_engraver::do_try_music (Music *req)
+Rest_engraver::try_music (Music *m)
{
- if (Rest_req *r = dynamic_cast <Rest_req *> (req))
+ if (Rest_req *r = dynamic_cast <Rest_req *> (m))
{
- rest_req_l_ = r;
+ rest_req_ = r;
return true;
}
return false;
}
-ADD_THIS_TRANSLATOR(Rest_engraver);
+
+ENTER_DESCRIPTION(Rest_engraver,
+/* descr */ "",
+/* creats*/ "Rest Dots",
+/* acks */ "",
+/* reads */ "centralCPosition",
+/* write */ "");