(c) 1998--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
-#include "tuplet-bracket.hh"
-#include "note-column.hh"
#include "beam.hh"
#include "engraver.hh"
+#include "international.hh"
+#include "note-column.hh"
#include "spanner.hh"
+#include "stream-event.hh"
+#include "tuplet-bracket.hh"
+#include "warn.hh"
+#include "item.hh"
#include "translator.icc"
struct Tuplet_description
{
- Music *music_;
- Rational stop_;
- Rational span_stop_;
- Rational length_;
+ Stream_event *event_;
Spanner *bracket_;
Spanner *number_;
+
+ bool full_length_;
+ bool full_length_note_;
+
Tuplet_description ()
{
- music_ = 0;
+ event_ = 0;
+ full_length_note_ = false;
+ full_length_ = false;
bracket_ = 0;
number_ = 0;
}
- static int compare (Tuplet_description const &a, Tuplet_description const &b)
- {
- return ::compare (a.length_, b.length_);
- }
};
class Tuplet_engraver : public Engraver
TRANSLATOR_DECLARATIONS (Tuplet_engraver);
protected:
- Array<Tuplet_description> tuplets_;
- Link_array<Spanner> last_tuplets_;
+ vector<Tuplet_description> tuplets_;
+ vector<Tuplet_description> new_tuplets_;
+ vector<Tuplet_description> stopped_tuplets_;
+ vector<Spanner*> last_tuplets_;
+
DECLARE_ACKNOWLEDGER (note_column);
- virtual bool try_music (Music *r);
+ DECLARE_TRANSLATOR_LISTENER (tuplet_span);
virtual void finalize ();
void start_translation_timestep ();
void process_music ();
};
-bool
-Tuplet_engraver::try_music (Music *music)
+IMPLEMENT_TRANSLATOR_LISTENER (Tuplet_engraver, tuplet_span);
+void
+Tuplet_engraver::listen_tuplet_span (Stream_event *ev)
{
- if (music->is_mus_type ("time-scaled-music"))
+ Direction dir = to_dir (ev->get_property ("span-direction"));
+ if (dir == START)
{
- Music *el = unsmob_music (music->get_property ("element"));
- if (el && !el->is_mus_type ("event-chord"))
- {
- Tuplet_description d;
- d.music_ = music;
- d.length_ = music->get_length ().main_part_;
- d.stop_ = now_mom ().main_part_ + d.length_;
- d.span_stop_ = d.stop_;
-
- SCM s = get_property ("tupletSpannerDuration");
- if (unsmob_moment (s))
- d.span_stop_ = min (d.span_stop_, (now_mom () + *unsmob_moment (s)).main_part_);
-
- tuplets_.push (d);
- }
- return true;
+ Tuplet_description d;
+ d.event_ = ev;
+ new_tuplets_.push_back (d);
}
- return false;
+ else if (dir == STOP && tuplets_.size ())
+ {
+ stopped_tuplets_.push_back (tuplets_.back ());
+ tuplets_.pop_back ();
+ }
+ else
+ programming_error (_f ("direction of %s invalid: %d",
+ "tuplet-span-event", int (dir)));
}
void
Tuplet_engraver::process_music ()
{
- if (!tuplets_.size ())
- return;
+ for (vsize i = 0; i < stopped_tuplets_.size (); i++)
+ {
+ if (stopped_tuplets_[i].bracket_)
+ {
+ if (stopped_tuplets_[i].full_length_)
+ {
+ Item *col =
+ unsmob_item (stopped_tuplets_[i].full_length_note_
+ ? get_property ("currentMusicalColumn")
+ : get_property ("currentCommandColumn"));
+
+ stopped_tuplets_[i].bracket_->set_bound (RIGHT, col);
+ stopped_tuplets_[i].number_->set_bound (RIGHT, col);
+ }
+ else if (!stopped_tuplets_[i].bracket_->get_bound (RIGHT))
+ {
+ stopped_tuplets_[i].bracket_->set_bound (RIGHT,
+ stopped_tuplets_[i].bracket_->get_bound (LEFT));
+ stopped_tuplets_[i].number_->set_bound (RIGHT,
+ stopped_tuplets_[i].bracket_->get_bound (LEFT));
+ }
+ // todo: scrap last_tuplets_, use stopped_tuplets_ only.
+ // clear stopped_tuplets_ at start_translation_timestep
+ last_tuplets_.push_back (tuplets_[i].bracket_);
+ last_tuplets_.push_back (tuplets_[i].number_);
+ }
+ }
+ stopped_tuplets_.clear ();
- tuplets_.sort (&Tuplet_description::compare);
- for (int i = 0; i < tuplets_.size (); i++)
+ concat (tuplets_, new_tuplets_);
+ new_tuplets_.clear ();
+ for (vsize j = tuplets_.size (); j > 0; j--)
{
+ /* i goes from size-1 downto 0, inclusively */
+ vsize i = j - 1;
+
+
if (tuplets_[i].bracket_)
continue;
+ tuplets_[i].full_length_ = to_boolean (get_property ("tupletFullLength"));
+ tuplets_[i].full_length_note_
+ = to_boolean (get_property ("tupletFullLengthNote"));
+
tuplets_[i].bracket_ = make_spanner ("TupletBracket",
- tuplets_[i].music_->self_scm ());
+ tuplets_[i].event_->self_scm ());
tuplets_[i].number_ = make_spanner ("TupletNumber",
- tuplets_[i].music_->self_scm ());
+ tuplets_[i].event_->self_scm ());
tuplets_[i].number_->set_object ("bracket", tuplets_[i].bracket_->self_scm ());
tuplets_[i].bracket_->set_object ("tuplet-number", tuplets_[i].number_->self_scm ());
- if (i > 0 && tuplets_[i - 1].bracket_)
- Tuplet_bracket::add_tuplet_bracket (tuplets_[i].bracket_, tuplets_[i - 1].bracket_);
-
if (i < tuplets_.size () - 1 && tuplets_[i + 1].bracket_)
- Tuplet_bracket::add_tuplet_bracket (tuplets_[i + 1].bracket_, tuplets_[i].bracket_);
+ Tuplet_bracket::add_tuplet_bracket (tuplets_[i].bracket_, tuplets_[i + 1].bracket_);
+
+ if (i > 0 && tuplets_[i - 1].bracket_)
+ Tuplet_bracket::add_tuplet_bracket (tuplets_[i - 1].bracket_, tuplets_[i].bracket_);
- SCM proc = get_property ("tupletNumberFormatFunction");
- if (ly_is_procedure (proc))
- {
- SCM t = scm_apply_0 (proc, scm_list_1 (tuplets_[i].music_->self_scm ()));
- tuplets_[i].number_->set_property ("text", t);
- }
}
}
void
Tuplet_engraver::acknowledge_note_column (Grob_info inf)
{
- for (int j = 0; j < tuplets_.size (); j++)
+ for (vsize j = 0; j < tuplets_.size (); j++)
if (tuplets_[j].bracket_)
{
Item *i = dynamic_cast<Item *> (inf.grob ());
void
Tuplet_engraver::start_translation_timestep ()
{
- Moment now = now_mom ();
-
last_tuplets_.clear ();
- if (tuplets_.is_empty ())
- return;
-
- Moment tsdmom = robust_scm2moment (get_property ("tupletSpannerDuration"), Moment (0));
- bool full_length = to_boolean (get_property ("tupletFullLength"));
-
- for (int i = tuplets_.size (); i--;)
- {
- Rational tsd = tsdmom.main_part_;
-
- if (now.main_part_ >= tuplets_[i].span_stop_)
- {
- if (tuplets_[i].bracket_)
- {
- if (full_length)
- {
- Item *col = unsmob_item (get_property ("currentMusicalColumn"));
-
- tuplets_[i].bracket_->set_bound (RIGHT, col);
- tuplets_[i].number_->set_bound (RIGHT, col);
- }
- else if (!tuplets_[i].bracket_->get_bound (RIGHT))
- {
- tuplets_[i].bracket_->set_bound (RIGHT,
- tuplets_[i].bracket_->get_bound (LEFT));
- tuplets_[i].number_->set_bound (RIGHT,
- tuplets_[i].bracket_->get_bound (LEFT));
- }
- last_tuplets_.push (tuplets_[i].bracket_);
- last_tuplets_.push (tuplets_[i].number_);
-
- tuplets_[i].bracket_ = 0;
- tuplets_[i].number_ = 0;
- }
-
- if (tsd)
- tuplets_[i].span_stop_ += tsd;
- }
-
- if (now.main_part_ >= tuplets_[i].stop_)
- tuplets_.del (i);
- }
}
void
Tuplet_engraver::finalize ()
{
if (to_boolean (get_property ("tupletFullLength")))
- {
- for (int i = 0; i < last_tuplets_.size (); i++)
- {
- Item *col = unsmob_item (get_property ("currentCommandColumn"));
- last_tuplets_[i]->set_bound (RIGHT, col);
- }
- }
+ for (vsize i = 0; i < last_tuplets_.size (); i++)
+ {
+ Item *col = unsmob_item (get_property ("currentCommandColumn"));
+ last_tuplets_[i]->set_bound (RIGHT, col);
+ }
}
Tuplet_engraver::Tuplet_engraver ()
ADD_ACKNOWLEDGER (Tuplet_engraver, note_column);
ADD_TRANSLATOR (Tuplet_engraver,
- /* doc */ "Catch Time_scaled_music and generate appropriate bracket ",
- /* create */ "TupletBracket TupletNumber",
- /* accept */ "time-scaled-music",
- /* read */ "tupletNumberFormatFunction tupletSpannerDuration tupletFullLength",
+ /* doc */ "Catch TupletSpannerEvent and generate appropriate bracket ",
+ /* create */
+ "TupletBracket "
+ "TupletNumber ",
+ /* read */
+ "tupletFullLength "
+ "tupletFullLengthNote ",
/* write */ "");