X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcompletion-note-heads-engraver.cc;h=8734b861c2a2d15eadb9b7367b508da6200619fa;hb=3c9cad29f6577ed42421656729636167f36e3941;hp=3e5056619d6345af1b157b75948d4bf866ba70c1;hpb=c4c0ba811cd526f047de3f4d3c77abcc32a3e076;p=lilypond.git diff --git a/lily/completion-note-heads-engraver.cc b/lily/completion-note-heads-engraver.cc index 3e5056619d..8734b861c2 100644 --- a/lily/completion-note-heads-engraver.cc +++ b/lily/completion-note-heads-engraver.cc @@ -1,7 +1,7 @@ /* completion-note-heads-engraver.cc -- Completion_heads_engraver - (c) 1997--2006 Han-Wen Nienhuys + (c) 1997--2007 Han-Wen Nienhuys */ #include @@ -12,7 +12,6 @@ using namespace std; #include "duration.hh" #include "global-context.hh" #include "item.hh" -#include "music.hh" #include "output-def.hh" #include "pitch.hh" #include "rhythmic-head.hh" @@ -50,9 +49,7 @@ class Completion_heads_engraver : public Engraver vector prev_notes_; vector ties_; - vector dots_; vector note_events_; - vector scratch_note_events_; Moment note_end_mom_; bool is_first_; @@ -60,7 +57,7 @@ class Completion_heads_engraver : public Engraver Rational do_nothing_until_; Moment next_barline_moment (); - Duration find_nearest_duration (Rational length); + Item *make_note_head (Stream_event*); public: TRANSLATOR_DECLARATIONS (Completion_heads_engraver); @@ -86,14 +83,8 @@ Completion_heads_engraver::listen_note (Stream_event *ev) note_events_.push_back (ev); is_first_ = true; - Moment musiclen = get_event_length (ev); Moment now = now_mom (); - - if (now_mom ().grace_part_) - { - musiclen.grace_part_ = musiclen.main_part_; - musiclen.main_part_ = Rational (0, 1); - } + Moment musiclen = get_event_length (ev, now); note_end_mom_ = max (note_end_mom_, (now + musiclen)); do_nothing_until_ = Rational (0, 0); @@ -107,46 +98,28 @@ Completion_heads_engraver::next_barline_moment () { Moment *e = unsmob_moment (get_property ("measurePosition")); Moment *l = unsmob_moment (get_property ("measureLength")); - if (!e || !l) + if (!e || !l || !to_boolean (get_property ("timing"))) { - programming_error ("no timing props set?"); - return Moment (1, 1); + return Moment (0, 0); } return (*l - *e); } -Duration -Completion_heads_engraver::find_nearest_duration (Rational length) +Item* +Completion_heads_engraver::make_note_head (Stream_event *ev) { - int log_limit = 6; - - Duration d (0, 0); - - /* - this could surely be done more efficient. Left to the reader as an - excercise. */ - while (d.get_length () > length && d.duration_log () < log_limit) - { - if (d.dot_count ()) - { - d = Duration (d.duration_log (), d.dot_count ()- 1); - continue; - } - else - d = Duration (d.duration_log () + 1, 2); - } + Item *note = make_item ("NoteHead", ev->self_scm ()); + Pitch *pit = unsmob_pitch (ev->get_property ("pitch")); - if (d.duration_log () >= log_limit) - { - // junk the dots. - d = Duration (d.duration_log (), 0); + int pos = pit->steps (); + SCM c0 = get_property ("middleCPosition"); + if (scm_is_number (c0)) + pos += scm_to_int (c0); - // scale up. - d = d.compressed (length / d.get_length ()); - } + note->set_property ("staff-position", scm_from_int (pos)); - return d; + return note; } void @@ -164,77 +137,41 @@ Completion_heads_engraver::process_music () Duration note_dur; Duration *orig = 0; if (left_to_do_) - note_dur = find_nearest_duration (left_to_do_); + note_dur = Duration (left_to_do_, false); else { orig = unsmob_duration (note_events_[0]->get_property ("duration")); note_dur = *orig; } Moment nb = next_barline_moment (); - if (nb < note_dur.get_length ()) + if (nb.main_part_ && nb < note_dur.get_length ()) { - note_dur = find_nearest_duration (nb.main_part_); + note_dur = Duration (nb.main_part_, false); - Moment next = now; - next.main_part_ += note_dur.get_length (); - - get_global_context ()->add_moment_to_process (next); - do_nothing_until_ = next.main_part_; + do_nothing_until_ = now.main_part_ + note_dur.get_length (); } if (orig) left_to_do_ = orig->get_length (); - if (orig && note_dur.get_length () != orig->get_length ()) - { - if (!scratch_note_events_.size ()) - for (vsize i = 0; i < note_events_.size (); i++) - { - Stream_event *m = note_events_[i]->clone (); - scratch_note_events_.push_back (m); - } - } - for (vsize i = 0; left_to_do_ && i < note_events_.size (); i++) { + bool need_clone = !orig || *orig != note_dur; Stream_event *event = note_events_[i]; - if (scratch_note_events_.size ()) - { - event = scratch_note_events_[i]; - SCM pits = note_events_[i]->get_property ("pitch"); - event->set_property ("pitch", pits); - } - - event->set_property ("duration", note_dur.smobbed_copy ()); - Item *note = make_item ("NoteHead", event->self_scm ()); - note->set_property ("duration-log", - scm_from_int (note_dur.duration_log ())); + if (need_clone) + event = event->clone (); - int dots = note_dur.dot_count (); - if (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 != scm_to_int (d->get_property ("dot-count"))) - d->set_property ("dot-count", scm_from_int (dots)); - - d->set_parent (note, Y_AXIS); - dots_.push_back (d); - } + SCM pits = note_events_[i]->get_property ("pitch"); - Pitch *pit = unsmob_pitch (event->get_property ("pitch")); - - int pos = pit->steps (); - SCM c0 = get_property ("middleCPosition"); - if (scm_is_number (c0)) - pos += scm_to_int (c0); + event->set_property ("pitch", pits); + event->set_property ("duration", note_dur.smobbed_copy ()); + event->set_property ("length", Moment (note_dur.get_length ()).smobbed_copy ()); + event->set_property ("duration-log", scm_from_int (note_dur.duration_log ())); - note->set_property ("staff-position", scm_from_int (pos)); + Item *note = make_note_head (event); + if (need_clone) + event->unprotect (); notes_.push_back (note); } @@ -251,7 +188,8 @@ Completion_heads_engraver::process_music () } 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()); /* don't do complicated arithmetic with grace notes. */ @@ -268,13 +206,6 @@ Completion_heads_engraver::stop_translation_timestep () if (notes_.size ()) prev_notes_ = notes_; notes_.clear (); - - dots_.clear (); - - for (vsize i = scratch_note_events_.size (); i--;) - scratch_note_events_[i]->unprotect (); - - scratch_note_events_.clear (); } void @@ -286,6 +217,8 @@ Completion_heads_engraver::start_translation_timestep () note_events_.clear (); prev_notes_.clear (); } + context ()->set_property ("completionBusy", + ly_bool2scm (note_events_.size ())); } Completion_heads_engraver::Completion_heads_engraver () @@ -293,10 +226,21 @@ Completion_heads_engraver::Completion_heads_engraver () } 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 Dots Tie", - /* accept */ "note-event", - /* read */ "middleCPosition measurePosition measureLength", - /* write */ ""); + /* 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 " + "Dots " + "Tie ", + + /* read */ + "middleCPosition " + "measurePosition " + "measureLength ", + + /* write */ + "completionBusy " + );