#include "staff-symbol-referencer.hh"
#include "stream-event.hh"
#include "tie.hh"
+#include "tie-column.hh"
#include "warn.hh"
#include "translator.icc"
-/*
- TODO: make matching rest engraver.
-*/
-
/*
How does this work?
class Completion_heads_engraver : public Engraver
{
- vector<Item*> notes_;
- vector<Item*> prev_notes_;
+ vector<Item *> notes_;
+ vector<Item *> prev_notes_;
// Must remember notes for explicit ties.
- vector<Item*> tie_note_candidates_;
- vector<Stream_event*> tie_note_candidate_events_;
- vector<Grob*> ties_;
- vector<Stream_event*> note_events_;
+ vector<Item *> tie_note_candidates_;
+ vector<Stream_event *> tie_note_candidate_events_;
+ vector<Grob *> ties_;
+ vector<Stream_event *> note_events_;
+ Spanner *tie_column_;
Moment note_end_mom_;
bool is_first_;
Rational left_to_do_;
Rational factor_;
Moment next_barline_moment ();
- Item *make_note_head (Stream_event*);
+ Item *make_note_head (Stream_event *);
public:
TRANSLATOR_DECLARATIONS (Completion_heads_engraver);
Completion_heads_engraver::listen_note (Stream_event *ev)
{
note_events_.push_back (ev);
-
+
is_first_ = true;
Moment now = now_mom ();
Moment musiclen = get_event_length (ev, now);
}
/*
- The duration _until_ the next barline.
+ The duration _until_ the next bar line.
*/
Moment
Completion_heads_engraver::next_barline_moment ()
return (*l - *e);
}
-Item*
+Item *
Completion_heads_engraver::make_note_head (Stream_event *ev)
{
Item *note = make_item ("NoteHead", ev->self_scm ());
{
if (!is_first_ && !left_to_do_)
return;
-
+
is_first_ = false;
Moment now = now_mom ();
if (left_to_do_)
{
/*
- note that note_dur may be strictly less than left_to_do_
- (say, if left_to_do_ == 5/8)
+ note that note_dur may be strictly less than left_to_do_
+ (say, if left_to_do_ == 5/8)
*/
if (factor_.denominator () == 1 && factor_ > Rational (1, 1))
- note_dur = Duration (left_to_do_, false);
+ note_dur = Duration (left_to_do_, false);
else
- note_dur = Duration (left_to_do_ / factor_, false).compressed (factor_);
+ note_dur = Duration (left_to_do_ / factor_, false).compressed (factor_);
}
else
{
if (nb.main_part_ && nb < note_dur.get_length ())
{
if (factor_.denominator () == 1 && factor_ > Rational (1, 1))
- note_dur = Duration (nb.main_part_, false);
+ note_dur = Duration (nb.main_part_, false);
else
- note_dur = Duration (nb.main_part_ / factor_, false).compressed (factor_);
+ note_dur = Duration (nb.main_part_ / factor_, false).compressed (factor_);
}
do_nothing_until_ = now.main_part_ + note_dur.get_length ();
Stream_event *event = note_events_[i];
if (need_clone)
- event = event->clone ();
+ event = event->clone ();
SCM pits = note_events_[i]->get_property ("pitch");
event->set_property ("pitch", pits);
event->set_property ("duration-log", scm_from_int (note_dur.duration_log ()));
/*
- The Completion_heads_engraver splits an event into a group of consecutive events.
- For each event in the group, the property "autosplit-end" denotes whether the current event
- was truncated during splitting. Based on "autosplit-end", the Tie_engraver decides whether a
- tie event should be processed.
+ The Completion_heads_engraver splits an event into a group of consecutive events.
+ For each event in the group, the property "autosplit-end" denotes whether the current event
+ was truncated during splitting. Based on "autosplit-end", the Tie_engraver decides whether a
+ tie event should be processed.
*/
event->set_property ("autosplit-end",
- ly_bool2scm (left_to_do_ - note_dur.get_length () > Rational (0)));
+ ly_bool2scm (left_to_do_ - note_dur.get_length () > Rational (0)));
Item *note = make_note_head (event);
if (need_clone)
- event->unprotect ();
+ event->unprotect ();
notes_.push_back (note);
}
-
+
if (prev_notes_.size () == notes_.size ())
{
for (vsize i = 0; i < notes_.size (); i++)
- make_tie (prev_notes_[i], notes_[i]);
+ make_tie (prev_notes_[i], notes_[i]);
}
+ if (ties_.size () && !tie_column_)
+ tie_column_ = make_spanner ("TieColumn", ties_[0]->self_scm ());
+
+ if (tie_column_)
+ for (vsize i = ties_.size (); i--;)
+ Tie_column::add_tie (tie_column_, ties_[i]);
+
left_to_do_ -= note_dur.get_length ();
if (left_to_do_)
- get_global_context ()->add_moment_to_process (now.main_part_ + note_dur.get_length());
+ get_global_context ()->add_moment_to_process (now.main_part_ + note_dur.get_length ());
/*
don't do complicated arithmetic with grace notes.
*/
Tie::set_head (p, RIGHT, right);
ties_.push_back (p);
}
-
+
void
Completion_heads_engraver::stop_translation_timestep ()
{
ties_.clear ();
+ tie_column_ = 0;
if (notes_.size ())
prev_notes_ = notes_;
prev_notes_.clear ();
}
context ()->set_property ("completionBusy",
- ly_bool2scm (note_events_.size ()));
+ ly_bool2scm (note_events_.size ()));
}
Completion_heads_engraver::Completion_heads_engraver ()
{
+ tie_column_ = 0;
}
ADD_TRANSLATOR (Completion_heads_engraver,
- /* doc */
- "This engraver replaces @code{Note_heads_engraver}. It plays"
- " some trickery to break long notes and automatically tie them"
- " into the next measure."
- ,
- /* create */
- "NoteHead "
- "Tie "
- ,
- /* read */
- "middleCPosition "
- "measurePosition "
- "measureLength "
- ,
- /* write */
- "completionBusy "
- );
+ /* doc */
+ "This engraver replaces @code{Note_heads_engraver}. It plays"
+ " some trickery to break long notes and automatically tie them"
+ " into the next measure.",
+
+ /* create */
+ "NoteHead "
+ "Tie "
+ "TieColumn ",
+
+ /* read */
+ "measureLength "
+ "measurePosition "
+ "middleCPosition "
+ "timing ",
+
+ /* write */
+ "completionBusy "
+ );
projects / lilypond.git / blobdiff