/*
multi_measure_rest-engraver.cc -- implement Multi_measure_rest_engraver
- (c) 1998--2003 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1998--2004 Jan Nieuwenhuizen <janneke@gnu.org>
Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
/**
The name says it all: make multi measure rests
-
*/
class Multi_measure_rest_engraver : public Engraver
{
public:
- TRANSLATOR_DECLARATIONS(Multi_measure_rest_engraver);
+ TRANSLATOR_DECLARATIONS (Multi_measure_rest_engraver);
protected:
virtual bool try_music (Music*);
Moment stop_moment_;
bool bar_seen_;
-
+ Item *last_command_item_ ;
Spanner *last_rest_;
Spanner *mmrest_;
Multi_measure_rest_engraver::Multi_measure_rest_engraver ()
{
+ last_command_item_ = 0;
bar_seen_ = false;
start_measure_ = 0;
mmrest_ = 0;
void
Multi_measure_rest_engraver::process_music ()
{
- if (rest_ev_ && !mmrest_)
+ if (rest_ev_ && !mmrest_
+ && stop_moment_ > now_mom ())
{
- mmrest_ = make_spanner ("MultiMeasureRest");
+ mmrest_ = make_spanner ("MultiMeasureRest", rest_ev_->self_scm ());
- if (text_events_.size())
+ if (text_events_.size ())
{
- for (int i = 0; i < text_events_.size(); i++)
+ for (int i = 0; i < text_events_.size (); i++)
{
- Spanner *sp
- = make_spanner ("MultiMeasureRestText");
Music* e = text_events_[i];
- SCM t = e->get_mus_property ("text");
- SCM dir = e->get_mus_property ("direction");
- sp->set_grob_property ("text",t);
+ Spanner *sp
+ = make_spanner ("MultiMeasureRestText", e->self_scm () );
+ SCM t = e->get_property ("text");
+ SCM dir = e->get_property ("direction");
+ sp->set_property ("text",t);
if (is_direction (dir))
- sp->set_grob_property ("direction",dir);
+ sp->set_property ("direction",dir);
numbers_.push (sp);
- announce_grob (sp, e->self_scm());
}
/*
Direction d = DOWN;
do {
Grob *last =0;
- for (int i=0; i <numbers_.size(); i++)
+ for (int i=0; i <numbers_.size (); i++)
{
- if (gh_int2scm (d) == numbers_[i]->get_grob_property ("direction"))
+ if (scm_int2num (d) == numbers_[i]->get_property ("direction"))
{
if (last)
Side_position_interface::add_support (numbers_[i], last);
else
{
Spanner *sp
- = make_spanner ("MultiMeasureRestNumber");
+ = make_spanner ("MultiMeasureRestNumber", rest_ev_->self_scm () );
numbers_.push (sp);
- announce_grob (sp, rest_ev_->self_scm());
}
- for (int i =0 ; i < numbers_.size(); i++)
+ for (int i =0 ; i < numbers_.size (); i++)
{
Side_position_interface::add_support (numbers_[i], mmrest_);
numbers_[i]->set_parent (mmrest_, Y_AXIS);
}
- announce_grob (mmrest_, rest_ev_->self_scm());
start_measure_
- = gh_scm2int (get_property ("currentBarNumber"));
+ = ly_scm2int (get_property ("currentBarNumber"));
}
- bar_seen_ = gh_string_p (get_property ("whichBar"));
+ bar_seen_ = ly_c_string_p (get_property ("whichBar"));
}
void
if (bar_seen_)
{
- Grob *cmc = unsmob_grob (get_property("breakableSeparationItem"));
+ Grob *cmc = unsmob_grob (get_property ("breakableSeparationItem"));
if (!cmc)
cmc = unsmob_grob (get_property ("currentCommandColumn"));
-
- Item *it = dynamic_cast<Item*> (cmc);
-
- if (mmrest_)
+
+ /*
+ Ugh, this is a kludge - need this for multi-measure-rest-grace.ly
+ */
+ last_command_item_ = dynamic_cast<Item*> (cmc);
+ }
+
+ if (last_command_item_ && (mmrest_ || last_rest_))
+ {
+
+ if (last_rest_)
{
- add_bound_item (mmrest_, it);
- for (int i = 0; i < numbers_.size(); i++)
- add_bound_item (numbers_[i], it);
+ add_bound_item (last_rest_, last_command_item_);
+ for (int i = 0; i < last_numbers_.size (); i++)
+ add_bound_item (last_numbers_[i], last_command_item_);
}
-
- if (last_rest_)
+
+ if (mmrest_)
{
- add_bound_item (last_rest_,it);
- for (int i = 0; i < last_numbers_.size(); i++)
- add_bound_item (last_numbers_[i], it);
- }
+ add_bound_item (mmrest_, last_command_item_);
+ for (int i = 0; i < numbers_.size (); i++)
+ add_bound_item (numbers_[i], last_command_item_);
+
+ last_command_item_ = 0;
+ }
}
&& mmrest_->get_bound (LEFT) && mmrest_->get_bound (RIGHT))
{
typeset_grob (mmrest_);
- for (int i = 0 ; i < numbers_.size(); i++)
+ for (int i = 0 ; i < numbers_.size (); i++)
{
typeset_grob (numbers_[i]);
}
}
}
last_rest_ = 0;
- last_numbers_.clear();
+ last_numbers_.clear ();
}
text_events_.clear ();
last_rest_ = mmrest_;
last_numbers_ = numbers_;
- int cur = gh_scm2int (get_property ("currentBarNumber"));
+ int cur = ly_scm2int (get_property ("currentBarNumber"));
int num = cur - start_measure_;
- last_rest_->set_grob_property ("measure-count", gh_int2scm (num));
+
+ /*
+ We can't plug a markup directly into the grob, since the
+ measure-count determines the formatting of the mmrest.
+ */
+ last_rest_->set_property ("measure-count", scm_int2num (num));
SCM sml = get_property ("measureLength");
Rational ml = (unsmob_moment (sml)) ? unsmob_moment (sml)->main_part_ : Rational (1);
if (ml >= Rational (2))
{
- last_rest_->set_grob_property ("use-breve-rest", SCM_BOOL_T);
+ last_rest_->set_property ("use-breve-rest", SCM_BOOL_T);
}
mmrest_ = 0;
numbers_.clear ();
- Grob * last = last_numbers_.size() ? last_numbers_[0] : 0;
- if (last && last->get_grob_property ("text") == SCM_EOL)
+ Grob * last = last_numbers_.size () ? last_numbers_[0] : 0;
+ if (last && last->get_property ("text") == SCM_EOL)
{
SCM thres = get_property ("restNumberThreshold");
int t = 1;
- if (gh_number_p (thres))
- t = gh_scm2int (thres);
+ if (ly_c_number_p (thres))
+ t = ly_scm2int (thres);
if (num <= t)
- last->suicide();
+ last->suicide ();
else
{
SCM text
- = scm_number_to_string (gh_int2scm (num), SCM_MAKINUM (10));
- last->set_grob_property ("text", text);
+ = scm_number_to_string (scm_int2num (num), SCM_MAKINUM (10));
+ last->set_property ("text", text);
}
}
}
}
-ENTER_DESCRIPTION(Multi_measure_rest_engraver,
+ENTER_DESCRIPTION (Multi_measure_rest_engraver,
/* descr */
"Engraves multi-measure rests that are produced with @code{R}. Reads "
"measurePosition and currentBarNumber to determine what number to print "
projects / lilypond.git / blobdiff