X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcompletion-note-heads-engraver.cc;h=64705a4abde14cfb18f5f5a6b0dd302a22e316cf;hb=3fa8dfbe7c4d70010f5182f3c684f241762d9ec9;hp=3e5056619d6345af1b157b75948d4bf866ba70c1;hpb=cc676c5aadd45985251b5d60fa23eed1ed98f6e6;p=lilypond.git diff --git a/lily/completion-note-heads-engraver.cc b/lily/completion-note-heads-engraver.cc index 3e5056619d..64705a4abd 100644 --- a/lily/completion-note-heads-engraver.cc +++ b/lily/completion-note-heads-engraver.cc @@ -1,7 +1,20 @@ /* - completion-note-heads-engraver.cc -- Completion_heads_engraver + This file is part of LilyPond, the GNU music typesetter. - (c) 1997--2006 Han-Wen Nienhuys + Copyright (C) 1997--2012 Han-Wen Nienhuys + + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . */ #include @@ -12,7 +25,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" @@ -21,14 +33,11 @@ using namespace std; #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? @@ -46,27 +55,29 @@ using namespace std; class Completion_heads_engraver : public Engraver { - vector notes_; - vector prev_notes_; - vector ties_; - - vector dots_; - vector note_events_; - vector scratch_note_events_; - + vector notes_; + vector prev_notes_; + // Must remember notes for explicit ties. + vector tie_note_candidates_; + vector tie_note_candidate_events_; + vector ties_; + vector note_events_; + Spanner *tie_column_; Moment note_end_mom_; bool is_first_; Rational left_to_do_; Rational do_nothing_until_; + Rational factor_; Moment next_barline_moment (); - Duration find_nearest_duration (Rational length); + Item *make_note_head (Stream_event *); public: TRANSLATOR_DECLARATIONS (Completion_heads_engraver); protected: virtual void initialize (); + void make_tie (Grob *, Grob *); void start_translation_timestep (); void process_music (); void stop_translation_timestep (); @@ -84,69 +95,45 @@ void 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); } /* - The duration _until_ the next barline. + The duration _until_ the next bar line. */ Moment 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; + Item *note = make_item ("NoteHead", ev->self_scm ()); + Pitch *pit = unsmob_pitch (ev->get_property ("pitch")); - Duration d (0, 0); + int pos = pit->steps (); + SCM c0 = get_property ("middleCPosition"); + if (scm_is_number (c0)) + pos += scm_to_int (c0); - /* - 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); - } - - if (d.duration_log () >= log_limit) - { - // junk the dots. - d = Duration (d.duration_log (), 0); - - // scale up. - d = d.compressed (length / d.get_length ()); - } + note->set_property ("staff-position", scm_from_int (pos)); - return d; + return note; } void @@ -164,117 +151,104 @@ Completion_heads_engraver::process_music () Duration note_dur; Duration *orig = 0; if (left_to_do_) - note_dur = find_nearest_duration (left_to_do_); + { + /* + 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); + else + note_dur = Duration (left_to_do_ / factor_, false).compressed (factor_); + } else { orig = unsmob_duration (note_events_[0]->get_property ("duration")); note_dur = *orig; + factor_ = note_dur.factor (); + left_to_do_ = orig->get_length (); } 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_); - - Moment next = now; - next.main_part_ += note_dur.get_length (); - - get_global_context ()->add_moment_to_process (next); - do_nothing_until_ = next.main_part_; + if (factor_.denominator () == 1 && factor_ > Rational (1, 1)) + note_dur = Duration (nb.main_part_, false); + else + note_dur = Duration (nb.main_part_ / factor_, false).compressed (factor_); } - 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); - } - } + do_nothing_until_ = now.main_part_ + note_dur.get_length (); 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 ())); - int dots = note_dur.dot_count (); - if (dots) - { - Item *d = make_item ("Dots", SCM_EOL); - Rhythmic_head::set_dots (note, d); + if (need_clone) + event = event->clone (); - /* - 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); - } - - 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); - - note->set_property ("staff-position", scm_from_int (pos)); + SCM pits = note_events_[i]->get_property ("pitch"); + 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 ())); + + /* + 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))); + + Item *note = make_note_head (event); + if (need_clone) + event->unprotect (); notes_.push_back (note); } if (prev_notes_.size () == notes_.size ()) { for (vsize i = 0; i < notes_.size (); i++) - { - Grob *p = make_spanner ("Tie", SCM_EOL); - Tie::set_head (p, LEFT, prev_notes_[i]); - Tie::set_head (p, RIGHT, notes_[i]); - - ties_.push_back (p); - } + make_tie (prev_notes_[i], notes_[i]); } - left_to_do_ -= note_dur.get_length (); + 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 ()); /* don't do complicated arithmetic with grace notes. */ - if (orig - && now_mom ().grace_part_) + if (orig && now_mom ().grace_part_) left_to_do_ = Rational (0, 0); } +void +Completion_heads_engraver::make_tie (Grob *left, Grob *right) +{ + Grob *p = make_spanner ("Tie", SCM_EOL); + Tie::set_head (p, LEFT, left); + 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_; notes_.clear (); - - dots_.clear (); - - for (vsize i = scratch_note_events_.size (); i--;) - scratch_note_events_[i]->unprotect (); - - scratch_note_events_.clear (); } void @@ -283,20 +257,38 @@ Completion_heads_engraver::start_translation_timestep () Moment now = now_mom (); if (note_end_mom_.main_part_ <= now.main_part_) { + tie_note_candidate_events_ = note_events_; + tie_note_candidates_ = prev_notes_; + note_events_.clear (); prev_notes_.clear (); } + context ()->set_property ("completionBusy", + 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 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 " + "Tie " + "TieColumn ", + + /* read */ + "measureLength " + "measurePosition " + "middleCPosition " + "timing ", + + /* write */ + "completionBusy " + );