X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fcompletion-note-heads-engraver.cc;h=59b47ab5252a244e6c715cbbcc51ea8827fbed06;hb=3d5e7223a0ff02119c18f0be39873647bf686d3b;hp=a83c961727578ab5951a96d73e997ac83a369170;hpb=19bb2e8bc9c42b2ffe8dc680bab084597ce6bf64;p=lilypond.git diff --git a/lily/completion-note-heads-engraver.cc b/lily/completion-note-heads-engraver.cc index a83c961727..59b47ab525 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--2007 Han-Wen Nienhuys + Copyright (C) 1997--2011 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 @@ -14,6 +27,7 @@ using namespace std; #include "item.hh" #include "output-def.hh" #include "pitch.hh" +#include "pqueue.hh" #include "rhythmic-head.hh" #include "score-engraver.hh" #include "spanner.hh" @@ -27,6 +41,18 @@ using namespace std; /* TODO: make matching rest engraver. */ +struct Pending_tie +{ + Moment when_; + Stream_event* tie_event_; + Pending_tie() { tie_event_ = 0; } +}; + +int compare(Pending_tie const &a, Pending_tie const &b) +{ + return compare(a.when_, b.when_); +} + /* How does this work? @@ -47,15 +73,22 @@ class Completion_heads_engraver : public Engraver { vector notes_; vector prev_notes_; - vector ties_; + // Must remember notes for explicit ties. + vector tie_note_candidates_; + vector tie_note_candidate_events_; + vector ties_; + PQueue pending_ties_; vector note_events_; + Stream_event *current_tie_event_; Moment note_end_mom_; bool is_first_; Rational left_to_do_; Rational do_nothing_until_; + Rational factor_; + Moment next_barline_moment (); Item *make_note_head (Stream_event*); @@ -64,16 +97,19 @@ public: protected: virtual void initialize (); + void make_tie (Grob *, Grob *); void start_translation_timestep (); void process_music (); void stop_translation_timestep (); DECLARE_TRANSLATOR_LISTENER (note); + DECLARE_TRANSLATOR_LISTENER (tie); }; void Completion_heads_engraver::initialize () { is_first_ = false; + current_tie_event_ = 0; } IMPLEMENT_TRANSLATOR_LISTENER (Completion_heads_engraver, note); @@ -90,6 +126,14 @@ Completion_heads_engraver::listen_note (Stream_event *ev) do_nothing_until_ = Rational (0, 0); } +IMPLEMENT_TRANSLATOR_LISTENER (Completion_heads_engraver, tie); +void +Completion_heads_engraver::listen_tie (Stream_event *ev) +{ + is_first_ = true; + current_tie_event_ = ev; +} + /* The duration _until_ the next barline. */ @@ -128,6 +172,14 @@ Completion_heads_engraver::process_music () if (!is_first_ && !left_to_do_) return; + if (current_tie_event_) + { + Pending_tie pending; + pending.when_ = note_end_mom_; + pending.tie_event_ = current_tie_event_; + pending_ties_.insert (pending); + } + is_first_ = false; Moment now = now_mom (); @@ -137,22 +189,25 @@ Completion_heads_engraver::process_music () Duration note_dur; Duration *orig = 0; if (left_to_do_) - note_dur = Duration (left_to_do_, false); + { + /* + note that note_dur may be strictly less than left_to_do_ + (say, if left_to_do_ == 5/8) + */ + 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.main_part_ && nb < note_dur.get_length ()) - { - note_dur = Duration (nb.main_part_, false); + note_dur = Duration (nb.main_part_ / factor_, false).compressed (factor_); - do_nothing_until_ = now.main_part_ + note_dur.get_length (); - } - - if (orig) - left_to_do_ = orig->get_length (); + do_nothing_until_ = now.main_part_ + note_dur.get_length (); for (vsize i = 0; left_to_do_ && i < note_events_.size (); i++) { @@ -163,41 +218,60 @@ Completion_heads_engraver::process_music () event = event->clone (); SCM pits = note_events_[i]->get_property ("pitch"); + Duration appearance = note_dur; + if (factor_.denominator () == 1 && factor_ > Rational (1, 1)) + appearance = Duration (note_dur.get_length (), false); event->set_property ("pitch", pits); - event->set_property ("duration", note_dur.smobbed_copy ()); - event->set_property ("duration-log", scm_from_int (note_dur.duration_log ())); + event->set_property ("duration", appearance.smobbed_copy ()); + event->set_property ("length", Moment (appearance.get_length ()).smobbed_copy ()); + event->set_property ("duration-log", scm_from_int (appearance.duration_log ())); Item *note = make_note_head (event); if (need_clone) event->unprotect (); notes_.push_back (note); } - + + if (pending_ties_.size () + && pending_ties_.front().when_ == now_mom()) + { + for (vsize i = 0; i < tie_note_candidate_events_.size(); i++) + for (vsize j = 0; j < note_events_.size(); j++) + { + Pitch *p = unsmob_pitch (note_events_[j]->get_property ("pitch")); + Pitch *p_last + = unsmob_pitch (tie_note_candidate_events_[j]->get_property ("pitch")); + if (p && p_last && *p == *p_last) + make_tie (tie_note_candidates_[i], notes_[j]); + } + } + 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 (left_to_do_) - get_global_context ()->add_moment_to_process (now.main_part_ + 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 () { @@ -212,11 +286,21 @@ void Completion_heads_engraver::start_translation_timestep () { Moment now = now_mom (); + while (pending_ties_.size() && pending_ties_.front().when_ < now) + { + pending_ties_.delmin(); + } + current_tie_event_ = 0; 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 () @@ -240,5 +324,5 @@ ADD_TRANSLATOR (Completion_heads_engraver, "measureLength ", /* write */ - "" + "completionBusy " );