-/*
- plet-engraver.cc -- implement Tuplet_engraver
-
- source file of the GNU LilyPond music typesetter
-
- (c) 1998--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-
- */
+/*
+ tuplet-engraver.cc -- implement Tuplet_engraver
+ source file of the GNU LilyPond music typesetter
+ (c) 1998--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
#include "tuplet-bracket.hh"
#include "note-column.hh"
-#include "time-scaled-music.hh"
#include "beam.hh"
-#include "music-list.hh"
#include "engraver.hh"
#include "spanner.hh"
+#include "translator.icc"
+
+struct Tuplet_description
+{
+ Music *music_;
+ Spanner *bracket_;
+ Spanner *number_;
+ Tuplet_description ()
+ {
+ music_ = 0;
+ bracket_ = 0;
+ number_ = 0;
+ }
+};
+
class Tuplet_engraver : public Engraver
{
public:
TRANSLATOR_DECLARATIONS (Tuplet_engraver);
protected:
- Link_array<Music> time_scaled_musics_;
- /// when does the scaled music stop? Array order is synced with time_scaled_musics_
- Array<Rational> stop_moments_;
- /// when does the current spanner stop? Array order is synced with time_scaled_musics_
- Array<Rational> span_stop_moments_;
-
- /// The spanners. Array order is synced with time_scaled_musics_
- Link_array<Spanner> started_spanners_;
-
+ 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 ();
- virtual void acknowledge_grob (Grob_info);
- virtual bool try_music (Music*r);
- virtual void start_translation_timestep ();
- virtual void process_acknowledged_grobs ();
+ void start_translation_timestep ();
+ void process_music ();
};
bool
-Tuplet_engraver::try_music (Music *c)
+Tuplet_engraver::try_music (Music *music)
{
- if (c->is_mus_type ("time-scaled-music"))
+ if (music->is_mus_type ("tuplet-spanner-event"))
{
- Music *el = unsmob_music (c->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;
+ tuplets_.push_back (d);
+ }
+ if (dir == STOP)
{
- time_scaled_musics_.push (c);
- Rational m = now_mom ().main_part_ + c->get_length ().main_part_;
- stop_moments_.push (m);
-
- SCM s = get_property ("tupletSpannerDuration");
- if (unsmob_moment (s))
- m = m <? (now_mom () + *unsmob_moment (s)).main_part_;
-
- span_stop_moments_.push (m);
+ stopped_tuplets_.push_back (tuplets_.back ());
+ tuplets_.pop_back ();
}
return true;
}
}
void
-Tuplet_engraver::process_acknowledged_grobs ()
+Tuplet_engraver::process_music ()
{
- for (int i= 0; i < time_scaled_musics_.size (); i++)
+ for (vsize i = 0; i < stopped_tuplets_.size (); i++)
{
- if (i < started_spanners_.size () && started_spanners_[i])
- continue;
+ 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 ();
- Spanner* glep = make_spanner ("TupletBracket", time_scaled_musics_ [i]->self_scm ());
+ for (vsize j = tuplets_.size (); j > 0; j--)
+ {
+ /* i goes from size-1 downto 0, inclusively */
+ vsize i = j - 1;
- if (i >= started_spanners_.size ())
- started_spanners_.push (glep);
- else
- started_spanners_[i] = glep;
+ if (tuplets_[i].bracket_)
+ continue;
+
+ 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_);
+
SCM proc = get_property ("tupletNumberFormatFunction");
- if (ly_c_procedure_p (proc))
+ if (ly_is_procedure (proc))
{
- SCM t = scm_apply_0 (proc, scm_list_n (time_scaled_musics_[i]->self_scm (), SCM_UNDEFINED));
- glep->set_property ("text", t);
+ 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_grob (Grob_info i)
+Tuplet_engraver::acknowledge_note_column (Grob_info inf)
{
- if (Note_column::has_interface (i.grob_))
- {
- for (int j =0; j <started_spanners_.size (); j++)
- if (started_spanners_[j])
- Tuplet_bracket::add_column (started_spanners_[j], 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 ();
-
- Moment tsd;
- SCM s = get_property ("tupletSpannerDuration");
- if (unsmob_moment (s))
- tsd = unsmob_moment (s)->main_part_;
+ last_tuplets_.clear ();
+}
- for (int i= started_spanners_.size (); i--;)
+void
+Tuplet_engraver::finalize ()
+{
+ if (to_boolean (get_property ("tupletFullLength")))
{
- if (now.main_part_ >= span_stop_moments_[i])
- {
- if (Spanner *sp = started_spanners_[i])
- {
- if (!sp->get_bound (RIGHT))
- sp->set_bound (RIGHT, sp->get_bound (LEFT));
-
- typeset_grob (sp);
-
- started_spanners_[i] =0;
- }
-
- if (tsd.to_bool ())
- span_stop_moments_[i] += tsd.main_part_;
- }
-
- if (now.main_part_ >= stop_moments_[i])
+ for (vsize i = 0; i < last_tuplets_.size (); i++)
{
- started_spanners_.del (i);
- stop_moments_.del (i);
- span_stop_moments_.del (i);
- time_scaled_musics_.del (i);
+ Item *col = unsmob_item (get_property ("currentCommandColumn"));
+ last_tuplets_[i]->set_bound (RIGHT, col);
}
}
}
-void
-Tuplet_engraver::finalize ()
+Tuplet_engraver::Tuplet_engraver ()
{
- for (int i=0; i < started_spanners_.size (); i++)
- {
- if (started_spanners_[i])
- typeset_grob (started_spanners_[i]);
- }
}
-
-
-Tuplet_engraver::Tuplet_engraver (){}
-
-ENTER_DESCRIPTION (Tuplet_engraver,
-/* descr */ "Catch Time_scaled_music and generate appropriate bracket ",
-/* creats*/ "TupletBracket",
-/* accepts */ "time-scaled-music",
-/* acks */ "note-column-interface",
-/* reads */ "tupletNumberFormatFunction tupletSpannerDuration",
-/* write */ "");
+ADD_ACKNOWLEDGER (Tuplet_engraver, note_column);
+ADD_TRANSLATOR (Tuplet_engraver,
+ /* doc */ "Catch TupletSpannerEvent and generate appropriate bracket ",
+ /* create */ "TupletBracket TupletNumber ",
+ /* accept */ "tuplet-spanner-event",
+ /* read */ "tupletNumberFormatFunction tupletSpannerDuration tupletFullLength ",
+ /* write */ "");
projects / lilypond.git / blobdiff