X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcompletion-note-heads-engraver.cc;h=9d17deaf624be77df9401b216922100a1c3e9af4;hb=93b5b6bf5495d930fccd442dc402897f7f07b2de;hp=2188dedb816152d8a66c552b0cc637df40f20fbc;hpb=6b9bfd374643d1eed1ea158777d796c57a2bcd3a;p=lilypond.git diff --git a/lily/completion-note-heads-engraver.cc b/lily/completion-note-heads-engraver.cc index 2188dedb81..9d17deaf62 100644 --- a/lily/completion-note-heads-engraver.cc +++ b/lily/completion-note-heads-engraver.cc @@ -1,47 +1,56 @@ /* - head-grav.cc -- part of GNU LilyPond + completion-note-heads-engraver.cc -- Completion_heads_engraver - (c) 1997--2002 Han-Wen Nienhuys + (c) 1997--2005 Han-Wen Nienhuys */ -#include +#include #include "rhythmic-head.hh" -#include "paper-def.hh" -#include "musical-request.hh" +#include "output-def.hh" +#include "event.hh" #include "dots.hh" #include "dot-column.hh" #include "staff-symbol-referencer.hh" #include "item.hh" #include "score-engraver.hh" #include "warn.hh" +#include "spanner.hh" +#include "tie.hh" +#include "global-context.hh" + +/* +TODO: make matching rest engraver. +*/ /* How does this work? When we catch the note, we predict the end of the note. We keep the - requests living until we reach the predicted end-time. + events living until we reach the predicted end-time. - Every time process_music() is called and there are note requests, we + Every time process_music () is called and there are note events, we figure out how long the note to typeset should be. It should be no longer than what's specified, than what is left to do and it should not cross barlines. We copy the reqs into scratch note reqs, to make sure that we get all durations exactly right. - */ +*/ class Completion_heads_engraver : public Engraver { Link_array notes_; + Link_array prev_notes_; + Link_array ties_; Link_array dots_; Link_array note_reqs_; Link_array scratch_note_reqs_; Moment note_end_mom_; - bool first_b_; + bool is_first_; Rational left_to_do_; Rational do_nothing_until_; @@ -49,7 +58,7 @@ class Completion_heads_engraver : public Engraver Duration find_nearest_duration (Rational length); public: - TRANSLATOR_DECLARATIONS(Completion_heads_engraver); + TRANSLATOR_DECLARATIONS (Completion_heads_engraver); protected: virtual void initialize (); @@ -62,33 +71,33 @@ protected: void Completion_heads_engraver::initialize () { - first_b_ = false; + is_first_ = false; } bool Completion_heads_engraver::try_music (Music *m) { - if (Note_req * n =dynamic_cast (m)) + if (m->is_mus_type ("note-event")) { - note_reqs_.push (n); + note_reqs_.push (m); - first_b_ = true; - Moment musiclen = m->length_mom (); - Moment now = now_mom(); + is_first_ = true; + Moment musiclen = m->get_length (); + Moment now = now_mom (); if (now_mom ().grace_part_) { musiclen.grace_part_ = musiclen.main_part_ ; - musiclen.main_part_ = Rational (0,1); + musiclen.main_part_ = Rational (0, 1); } note_end_mom_ = note_end_mom_ >? (now + musiclen); - do_nothing_until_ = Rational (0,0); + do_nothing_until_ = Rational (0, 0); return true; } - else if (dynamic_cast (m)) + else if (m->is_mus_type ("busy-playing-event")) { - return note_reqs_.size (); + return note_reqs_.size() && is_first_; } return false; @@ -106,7 +115,7 @@ Completion_heads_engraver::next_barline_moment ( ) if (!e || !l) { programming_error ("No timing props set?"); - return Moment (1,1); + return Moment (1, 1); } return (*l - *e); @@ -115,14 +124,14 @@ Completion_heads_engraver::next_barline_moment ( ) Duration Completion_heads_engraver::find_nearest_duration (Rational length) { - int log_limit= 6; + int log_limit = 6; - Duration d(0,0); + Duration d (0, 0); /* this could surely be done more efficient. Left to the reader as an excercise. */ - while (d.length_mom () > length && d.duration_log () < log_limit) + while (d.get_length () > length && d.duration_log () < log_limit) { if (d.dot_count ()) { @@ -141,7 +150,7 @@ Completion_heads_engraver::find_nearest_duration (Rational length) d = Duration (d.duration_log (), 0); // scale up. - d = d.compressed (length / d.length_mom ()); + d = d.compressed (length / d.get_length ()); } return d; @@ -150,10 +159,10 @@ Completion_heads_engraver::find_nearest_duration (Rational length) void Completion_heads_engraver::process_music () { - if (!first_b_ && !left_to_do_) + if (!is_first_ && !left_to_do_) return ; - first_b_ = false; + is_first_ = false; Moment now = now_mom (); if (do_nothing_until_ > now.main_part_) @@ -167,26 +176,27 @@ Completion_heads_engraver::process_music () } else { - orig = unsmob_duration (note_reqs_[0]->get_mus_property ("duration")); + orig = unsmob_duration (note_reqs_[0]->get_property ("duration")); note_dur = *orig; } Moment nb = next_barline_moment (); - if (nb < note_dur.length_mom ()) + if (nb < note_dur.get_length ()) { note_dur = find_nearest_duration (nb.main_part_); Moment next = now; - next.main_part_ += note_dur.length_mom (); - top_engraver ()->add_moment_to_process (next); + next.main_part_ += note_dur.get_length (); + + get_global_context ()->add_moment_to_process (next); do_nothing_until_ = next.main_part_; } if (orig) { - left_to_do_ = orig->length_mom (); + left_to_do_ = orig->get_length (); } - if (orig && note_dur.length_mom() != orig->length_mom()) + if (orig && note_dur.get_length () != orig->get_length ()) { if (!scratch_note_reqs_.size ()) for (int i = 0; i < note_reqs_.size (); i++) @@ -200,88 +210,93 @@ Completion_heads_engraver::process_music () for (int i = 0; left_to_do_ && i < note_reqs_.size (); i++) { - Item *note = new Item (get_property ("NoteHead")); - Music * req = note_reqs_[i]; - if (scratch_note_reqs_.size()) + if (scratch_note_reqs_.size ()) { req = scratch_note_reqs_[i]; - SCM pits = note_reqs_[i]->get_mus_property ("pitch"); - req->set_mus_property ("pitch",pits); + SCM pits = note_reqs_[i]->get_property ("pitch"); + req->set_property ("pitch", pits); } - req->set_mus_property ("duration", note_dur.smobbed_copy ()); - note->set_grob_property ("duration-log", - gh_int2scm (note_dur.duration_log ())); + req->set_property ("duration", note_dur.smobbed_copy ()); + + Item *note = make_item ("NoteHead", req->self_scm ()); + note->set_property ("duration-log", + scm_int2num (note_dur.duration_log ())); - int dots= note_dur.dot_count (); + int dots = note_dur.dot_count (); if (dots) { - Item * d = new Item (get_property ("Dots")); + Item * d = make_item ("Dots", SCM_EOL); Rhythmic_head::set_dots (note, d); /* measly attempt to save an eeny-weenie bit of memory. */ - if (dots != gh_scm2int (d->get_grob_property ("dot-count"))) - d->set_grob_property ("dot-count", gh_int2scm (dots)); + if (dots != scm_to_int (d->get_property ("dot-count"))) + d->set_property ("dot-count", scm_int2num (dots)); d->set_parent (note, Y_AXIS); - announce_grob (d, SCM_EOL); dots_.push (d); } - Pitch *pit =unsmob_pitch (req->get_mus_property ("pitch")); + Pitch *pit = unsmob_pitch (req->get_property ("pitch")); int pos = pit->steps (); - SCM c0 = get_property ("centralCPosition"); - if (gh_number_p (c0)) - pos += gh_scm2int (c0); + SCM c0 = get_property ("middleCPosition"); + if (scm_is_number (c0)) + pos += scm_to_int (c0); - note->set_grob_property ("staff-position", gh_int2scm (pos)); - announce_grob (note,req->self_scm ()); + note->set_property ("staff-position", scm_int2num (pos)); notes_.push (note); } + + if (prev_notes_.size () == notes_.size ()) + { + for (int i = 0; i < notes_.size (); i++) + { + Grob * p = make_spanner ("Tie", SCM_EOL); + Tie::set_interface (p); // cannot remove yet! + + Tie::set_head (p, LEFT, prev_notes_[i]); + Tie::set_head (p, RIGHT, notes_[i]); + + ties_.push (p); + + } + } - left_to_do_ -= note_dur.length_mom (); - + left_to_do_ -= note_dur.get_length (); /* don't do complicated arithmetic with grace notes. */ if (orig - && now_mom().grace_part_ ) + && now_mom ().grace_part_ ) { - left_to_do_ = Rational (0,0); + left_to_do_ = Rational (0, 0); } - } void Completion_heads_engraver::stop_translation_timestep () { - for (int i=0; i < notes_.size (); i++) - { - typeset_grob (notes_[i]); - } + ties_.clear (); + + if (notes_.size ()) + prev_notes_ = notes_; notes_.clear (); - for (int i=0; i < dots_.size (); i++) - { - typeset_grob (dots_[i]); - } dots_.clear (); - for (int i = scratch_note_reqs_.size(); i--;) + for (int i = scratch_note_reqs_.size (); i--;) { scm_gc_unprotect_object (scratch_note_reqs_[i]->self_scm () ); - } - scratch_note_reqs_.clear(); + + scratch_note_reqs_.clear (); } -Tie_req * tie_req = 0; - void Completion_heads_engraver::start_translation_timestep () { @@ -289,31 +304,20 @@ Completion_heads_engraver::start_translation_timestep () if (note_end_mom_.main_part_ <= now.main_part_) { note_reqs_.clear (); - } - - if (left_to_do_) - { - if (!tie_req) - tie_req = new Tie_req; - - bool succ = daddy_trans_->try_music (tie_req); - if (!succ) - { - programming_error ("Completion_heads_engraver: no-one to make tie."); - } + prev_notes_.clear (); } } -Completion_heads_engraver::Completion_heads_engraver() +Completion_heads_engraver::Completion_heads_engraver () { } -ENTER_DESCRIPTION(Completion_heads_engraver, -/* descr */ "This engraver replaces -@code{Note_heads_engraver}. It plays some trickery to -break long notes and automatically tie them into the next measure.", -/* creats*/ "NoteHead Dots", -/* accepts */ "general-music", +ADD_TRANSLATOR (Completion_heads_engraver, +/* descr */ "This engraver replaces " +"@code{Note_heads_engraver}. It plays some trickery to " +"break long notes and automatically tie them into the next measure.", +/* creats*/ "NoteHead Dots Tie", +/* accepts */ "busy-playing-event note-event", /* acks */ "", -/* reads */ "centralCPosition measurePosition measureLength", +/* reads */ "middleCPosition measurePosition measureLength", /* write */ "");