source file of the GNU LilyPond music typesetter
- (c) 1998--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1998--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "tuplet-bracket.hh"
struct Tuplet_description
{
Music *music_;
- Rational stop_;
- Rational span_stop_;
- Rational length_;
- Spanner *spanner_;
+ Spanner *bracket_;
+ Spanner *number_;
Tuplet_description ()
{
music_ = 0;
- spanner_ = 0;
- }
- static int compare (Tuplet_description const &a, Tuplet_description const &b)
- {
- return ::compare (a.length_, b.length_);
+ bracket_ = 0;
+ number_ = 0;
}
};
-
-
class Tuplet_engraver : public Engraver
{
public:
TRANSLATOR_DECLARATIONS (Tuplet_engraver);
protected:
- Array<Tuplet_description> tuplets_;
-
+ vector<Tuplet_description> tuplets_;
+ vector<Tuplet_description> stopped_tuplets_;
+ vector<Spanner*> last_tuplets_;
DECLARE_ACKNOWLEDGER (note_column);
virtual bool try_music (Music *r);
+ virtual void finalize ();
void start_translation_timestep ();
void process_music ();
};
bool
Tuplet_engraver::try_music (Music *music)
{
- if (music->is_mus_type ("time-scaled-music"))
+ if (music->is_mus_type ("tuplet-spanner-event"))
{
- Music *el = unsmob_music (music->get_property ("element"));
- if (el && !el->is_mus_type ("event-chord"))
+ Direction dir = to_dir (music->get_property ("span-direction"));
+ if (dir == START)
{
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);
+ tuplets_.push_back (d);
+ }
+ if (dir == STOP)
+ {
+ stopped_tuplets_.push_back (tuplets_.back ());
+ tuplets_.pop_back ();
}
return true;
}
void
Tuplet_engraver::process_music ()
{
- if (!tuplets_.size ())
- return;
-
+ for (vsize i = 0; i < stopped_tuplets_.size (); i++)
+ {
+ bool full_length = to_boolean (get_property ("tupletFullLength"));
+ if (stopped_tuplets_[i].bracket_)
+ {
+ if (full_length)
+ {
+ Item *col = unsmob_item (get_property ("currentMusicalColumn"));
+
+ 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++)
+ for (vsize j = tuplets_.size (); j > 0; j--)
{
- if (tuplets_[i].spanner_)
+ /* i goes from size-1 downto 0, inclusively */
+ vsize i = j - 1;
+
+ if (tuplets_[i].bracket_)
continue;
- Spanner *spanner = make_spanner ("TupletBracket",
- tuplets_[i].music_->self_scm ());
- tuplets_[i].spanner_ = spanner;
+ tuplets_[i].bracket_ = make_spanner ("TupletBracket",
+ tuplets_[i].music_->self_scm ());
+ tuplets_[i].number_ = make_spanner ("TupletNumber",
+ tuplets_[i].music_->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 < tuplets_.size () - 1 && tuplets_[i + 1].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_);
- if (i > 0 && tuplets_[i-1].spanner_)
- Tuplet_bracket::add_tuplet_bracket (tuplets_[i].spanner_, tuplets_[i-1].spanner_);
- if (i < tuplets_.size()-1 && tuplets_[i+1].spanner_)
- Tuplet_bracket::add_tuplet_bracket (tuplets_[i+1].spanner_, tuplets_[i].spanner_);
SCM proc = get_property ("tupletNumberFormatFunction");
if (ly_is_procedure (proc))
{
SCM t = scm_apply_0 (proc, scm_list_1 (tuplets_[i].music_->self_scm ()));
- spanner->set_property ("text", t);
+ tuplets_[i].number_->set_property ("text", t);
}
}
}
void
-Tuplet_engraver::acknowledge_note_column (Grob_info i)
+Tuplet_engraver::acknowledge_note_column (Grob_info inf)
{
- for (int j = 0; j < tuplets_.size (); j++)
- if (tuplets_[j].spanner_)
- Tuplet_bracket::add_column (tuplets_[j].spanner_,
- dynamic_cast<Item *> (i.grob ()));
+ for (vsize j = 0; j < tuplets_.size (); j++)
+ if (tuplets_[j].bracket_)
+ {
+ Item *i = dynamic_cast<Item *> (inf.grob ());
+ Tuplet_bracket::add_column (tuplets_[j].bracket_, i);
+ add_bound_item (tuplets_[j].number_, i);
+ }
}
void
Tuplet_engraver::start_translation_timestep ()
{
- Moment now = now_mom ();
+ last_tuplets_.clear ();
+}
- for (int i = tuplets_.size (); i--;)
+void
+Tuplet_engraver::finalize ()
+{
+ if (to_boolean (get_property ("tupletFullLength")))
{
- Moment tsdmom = robust_scm2moment (get_property ("tupletSpannerDuration"), Moment (0));
-
- Rational tsd = tsdmom.main_part_;
-
- if (now.main_part_ >= tuplets_[i].span_stop_)
- {
- if (Spanner *sp = tuplets_[i].spanner_)
- {
- if (!sp->get_bound (RIGHT))
- sp->set_bound (RIGHT, sp->get_bound (LEFT));
-
- tuplets_[i].spanner_ = 0;
- }
-
- if (tsd)
- tuplets_[i].span_stop_ += tsd;
- }
-
- if (now.main_part_ >= tuplets_[i].stop_)
+ for (vsize i = 0; i < last_tuplets_.size (); i++)
{
- tuplets_.del (i);
+ Item *col = unsmob_item (get_property ("currentCommandColumn"));
+ last_tuplets_[i]->set_bound (RIGHT, col);
}
}
}
{
}
-ADD_ACKNOWLEDGER (Tuplet_engraver,note_column);
+ADD_ACKNOWLEDGER (Tuplet_engraver, note_column);
ADD_TRANSLATOR (Tuplet_engraver,
- /* descr */ "Catch Time_scaled_music and generate appropriate bracket ",
- /* creats*/ "TupletBracket",
- /* accepts */ "time-scaled-music",
- /* reads */ "tupletNumberFormatFunction tupletSpannerDuration",
+ /* doc */ "Catch TupletSpannerEvent and generate appropriate bracket ",
+ /* create */ "TupletBracket TupletNumber ",
+ /* accept */ "tuplet-spanner-event",
+ /* read */ "tupletNumberFormatFunction tupletSpannerDuration tupletFullLength ",
/* write */ "");
projects / lilypond.git / blobdiff