/*
multi_measure_rest-engraver.cc -- implement Multi_measure_rest_engraver
- (c) 1998--2005 Jan Nieuwenhuizen <janneke@gnu.org>
- Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1998--2009 Jan Nieuwenhuizen <janneke@gnu.org>
+ Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "multi-measure-rest.hh"
#include "paper-column.hh"
-#include "engraver-group-engraver.hh"
+#include "engraver-group.hh"
#include "side-position-interface.hh"
#include "staff-symbol-referencer.hh"
+#include "stream-event.hh"
#include "moment.hh"
+#include "spanner.hh"
+
+#include "translator.icc"
/**
The name says it all: make multi measure rests
TRANSLATOR_DECLARATIONS (Multi_measure_rest_engraver);
protected:
- virtual bool try_music (Music *);
void process_music ();
void stop_translation_timestep ();
void start_translation_timestep ();
virtual void finalize ();
+ DECLARE_TRANSLATOR_LISTENER (multi_measure_rest);
+ DECLARE_TRANSLATOR_LISTENER (multi_measure_text);
private:
- Music *rest_ev_;
- Link_array<Music> text_events_;
+ Stream_event *rest_ev_;
+ vector<Stream_event*> text_events_;
int start_measure_;
Rational last_main_moment_;
Moment stop_moment_;
Spanner *last_rest_;
Spanner *mmrest_;
- Link_array<Spanner> numbers_;
- Link_array<Spanner> last_numbers_;
+ vector<Spanner*> numbers_;
+ vector<Spanner*> last_numbers_;
};
Multi_measure_rest_engraver::Multi_measure_rest_engraver ()
/*
For the start of a score.
- */
+ */
bar_seen_ = true;
start_measure_ = 0;
mmrest_ = 0;
rest_ev_ = 0;
}
-bool
-Multi_measure_rest_engraver::try_music (Music *event)
+IMPLEMENT_TRANSLATOR_LISTENER (Multi_measure_rest_engraver, multi_measure_rest);
+void
+Multi_measure_rest_engraver::listen_multi_measure_rest (Stream_event *ev)
{
- if (event->is_mus_type ("multi-measure-rest-event"))
- {
- rest_ev_ = event;
- stop_moment_ = now_mom () + rest_ev_->get_length ();
+ /* FIXME: Should use ASSIGN_EVENT_ONCE. Can't do that yet because of
+ the kill-mm-rests hack in part-combine-iterator. */
+ rest_ev_ = ev;
+ stop_moment_ = now_mom () + get_event_length (rest_ev_, now_mom ());
+ /*
+ if (ASSIGN_EVENT_ONCE (rest_ev_, ev))
+ stop_moment_ = now_mom () + get_event_length (rest_ev_);
+ */
+}
- return true;
- }
- else if (event->is_mus_type ("multi-measure-text-event"))
- {
- text_events_.push (event);
- return true;
- }
- return false;
+IMPLEMENT_TRANSLATOR_LISTENER (Multi_measure_rest_engraver, multi_measure_text);
+void
+Multi_measure_rest_engraver::listen_multi_measure_text (Stream_event *ev)
+{
+ text_events_.push_back (ev);
}
void
Spanner *sp
= make_spanner ("MultiMeasureRestNumber", rest_ev_->self_scm ());
- numbers_.push (sp);
+ numbers_.push_back (sp);
if (text_events_.size ())
{
- for (int i = 0; i < text_events_.size (); i++)
+ for (vsize i = 0; i < text_events_.size (); i++)
{
-
- Music *e = text_events_[i];
+ Stream_event *e = text_events_[i];
Spanner *sp
= make_spanner ("MultiMeasureRestText", e->self_scm ());
SCM t = e->get_property ("text");
if (is_direction (dir))
sp->set_property ("direction", dir);
- numbers_.push (sp);
+ numbers_.push_back (sp);
}
/*
do
{
Grob *last = 0;
- for (int i = 0; i < numbers_.size (); i++)
+ for (vsize i = 0; i < numbers_.size (); i++)
{
if (scm_from_int (d) == numbers_[i]->get_property ("direction"))
{
while (flip (&d) != DOWN);
}
- for (int i = 0; i < numbers_.size (); i++)
+ for (vsize i = 0; i < numbers_.size (); i++)
{
Side_position_interface::add_support (numbers_[i], mmrest_);
numbers_[i]->set_parent (mmrest_, Y_AXIS);
}
start_measure_
- = scm_to_int (get_property ("currentBarNumber"));
+ = scm_to_int (get_property ("internalBarNumber"));
}
bar_seen_ = bar_seen_ || scm_is_string (get_property ("whichBar"));
Multi_measure_rest_engraver::stop_translation_timestep ()
{
/* We cannot do this earlier, as breakableSeparationItem is not yet
- there. */
+ there.
+
+ Actually, we no longer use breakableSeparationItem -- should this be moved?
+ -- jneem */
if (bar_seen_)
{
- Grob *cmc = unsmob_grob (get_property ("breakableSeparationItem"));
- if (!cmc)
- cmc = unsmob_grob (get_property ("currentCommandColumn"));
+ Grob *cmc = unsmob_grob (get_property ("currentCommandColumn"));
/* Ugh, this is a kludge - need this for multi-measure-rest-grace.ly */
last_command_item_ = dynamic_cast<Item *> (cmc);
if (last_rest_)
{
add_bound_item (last_rest_, last_command_item_);
- for (int i = 0; i < last_numbers_.size (); i++)
+ for (vsize i = 0; i < last_numbers_.size (); i++)
add_bound_item (last_numbers_[i], last_command_item_);
}
if (mmrest_)
{
add_bound_item (mmrest_, last_command_item_);
- for (int i = 0; i < numbers_.size (); i++)
+ for (vsize i = 0; i < numbers_.size (); i++)
add_bound_item (numbers_[i], last_command_item_);
last_command_item_ = 0;
Multi_measure_rest_engraver::start_translation_timestep ()
{
if (now_mom ().main_part_ >= stop_moment_.main_part_)
- {
- rest_ev_ = 0;
- }
+ rest_ev_ = 0;
Moment mp (robust_scm2moment (get_property ("measurePosition"), Moment (0)));
last_rest_ = mmrest_;
last_numbers_ = numbers_;
- int cur = scm_to_int (get_property ("currentBarNumber"));
+ int cur = scm_to_int (get_property ("internalBarNumber"));
int num = cur - start_measure_;
/*
SCM sml = get_property ("measureLength");
Rational ml = (unsmob_moment (sml)) ? unsmob_moment (sml)->main_part_ : Rational (1);
if (ml >= Rational (2))
- {
- last_rest_->set_property ("use-breve-rest", SCM_BOOL_T);
- }
+ last_rest_->set_property ("use-breve-rest", SCM_BOOL_T);
mmrest_ = 0;
numbers_.clear ();
{
}
-#include "translator.icc"
-
ADD_TRANSLATOR (Multi_measure_rest_engraver,
- /* doc */
- "Engraves multi-measure rests that are produced with @code{R}. Reads "
- "measurePosition and currentBarNumber to determine what number to print "
- "over the MultiMeasureRest. Reads measureLength to determine if it "
- "should use a whole rest or a breve rest to represent 1 measure ",
- /* create */ "MultiMeasureRest MultiMeasureRestNumber MultiMeasureRestText",
- /* accept */ "multi-measure-rest-event multi-measure-text-event",
- /* read */ "currentBarNumber restNumberThreshold breakableSeparationItem currentCommandColumn measurePosition measureLength",
- /* write */ "");
+ /* doc */
+ "Engrave multi-measure rests that are produced with"
+ " @samp{R}. It reads @code{measurePosition} and"
+ " @code{internalBarNumber} to determine what number to print"
+ " over the @ref{MultiMeasureRest}. Reads @code{measureLength}"
+ " to determine whether it should use a whole rest or a breve"
+ " rest to represent one measure.",
+
+ /* create */
+ "MultiMeasureRest "
+ "MultiMeasureRestNumber "
+ "MultiMeasureRestText ",
+
+ /* read */
+ "internalBarNumber "
+ "restNumberThreshold "
+ "breakableSeparationItem "
+ "currentCommandColumn "
+ "measurePosition "
+ "measureLength ",
+
+ /* write */
+ ""
+ );