X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftie-engraver.cc;h=edaba06c7c0720e1dcc35321acf9010cee298226;hb=dcca081b1904b4db09658657631d919f280c06d2;hp=123d6aad4f63de6f273f47cd4d00c35136622a6e;hpb=2909349bdbefbf880fa9c8c47ba2eddf9f9855ca;p=lilypond.git diff --git a/lily/tie-engraver.cc b/lily/tie-engraver.cc index 123d6aad4f..edaba06c7c 100644 --- a/lily/tie-engraver.cc +++ b/lily/tie-engraver.cc @@ -1,9 +1,20 @@ /* - tie-engraver.cc -- implement Tie_engraver + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 1998--2011 Han-Wen Nienhuys - (c) 1998--2007 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 "engraver.hh" @@ -23,7 +34,7 @@ #include "translator.icc" /** - Manufacture ties. Acknowledge noteheads, and put them into a + Manufacture ties. Acknowledge note heads, and put them into a priority queue. If we have a TieEvent, connect the notes that finish just at this time, and note that start at this time. @@ -38,13 +49,18 @@ struct Head_event_tuple SCM tie_definition_; Stream_event *tie_stream_event_; Stream_event *tie_event_; - + // Indicate whether a tie from the same moment has been processed successfully + // This is needed for tied chords, e.g. ~ g, because otherwise the c + // and e will trigger a warning for an unterminated tie! + bool tie_from_chord_created; + Head_event_tuple () { head_ = 0; tie_definition_ = SCM_EOL; tie_event_ = 0; tie_stream_event_ = 0; + tie_from_chord_created = false; } }; @@ -65,6 +81,8 @@ protected: DECLARE_TRANSLATOR_LISTENER (tie); void process_music (); void typeset_tie (Grob *); + void report_unterminated_tie (Head_event_tuple const &); + bool has_autosplit_end (Stream_event *event); public: TRANSLATOR_DECLARATIONS (Tie_engraver); }; @@ -90,6 +108,27 @@ Tie_engraver::listen_tie (Stream_event *ev) ASSIGN_EVENT_ONCE (event_, ev); } +void Tie_engraver::report_unterminated_tie (Head_event_tuple const &tie_start) +{ + // If tie_from_chord_created is set, we have another note at the same + // moment that created a tie, so this is not necessarily an unterminated + // tie. Happens e.g. for ~ g + if (!tie_start.tie_from_chord_created) + tie_start.head_->warning (_("unterminated tie")); +} + +/* + Determines whether the end of an event was created by + a split in Completion_heads_engraver or by user input. +*/ +bool +Tie_engraver::has_autosplit_end (Stream_event *event) +{ + if (event) + return to_boolean (event->get_property ("autosplit-end")); + return false; +} + void Tie_engraver::process_music () { @@ -119,16 +158,21 @@ Tie_engraver::acknowledge_note_head (Grob_info i) */ if (!right_ev || !left_ev) continue; - - if (ly_is_equal (right_ev->get_property ("pitch"), - left_ev->get_property ("pitch"))) + + /* + Make a tie only if pitches are equal or if event end was not generated by + Completion_heads_engraver. + */ + if (ly_is_equal (right_ev->get_property ("pitch"), left_ev->get_property ("pitch")) + && (!Tie_engraver::has_autosplit_end (left_ev))) { Grob *p = new Spanner (heads_to_tie_[i].tie_definition_); + Moment end = heads_to_tie_[i].end_moment_; SCM cause = heads_to_tie_[i].tie_event_ ? heads_to_tie_[i].tie_event_->self_scm () : heads_to_tie_[i].tie_stream_event_->self_scm (); - + announce_grob (p, cause); Tie::set_head (p, LEFT, th); Tie::set_head (p, RIGHT, h); @@ -137,11 +181,23 @@ Tie_engraver::acknowledge_note_head (Grob_info i) if (is_direction (unsmob_stream_event (cause)->get_property ("direction"))) { Direction d = to_dir (unsmob_stream_event (cause)->get_property ("direction")); - p->set_property ("direction", scm_from_int (d)); + p->set_property ("direction", scm_from_int (d)); } - + ties_.push_back (p); heads_to_tie_.erase (heads_to_tie_.begin () + i); + + /* + Prevent all other tied notes ending at the same moment (assume + implicitly the notes have also started at the same moment!) + from triggering an "unterminated tie" warning. Needed e.g. for + ~ g + */ + for (vsize j = heads_to_tie_.size (); j--;) + { + if (heads_to_tie_[j].end_moment_ == end) + heads_to_tie_[j].tie_from_chord_created = true; + } } } @@ -156,18 +212,21 @@ Tie_engraver::acknowledge_note_head (Grob_info i) void Tie_engraver::start_translation_timestep () { - context ()->set_property ("tieMelismaBusy", - ly_bool2scm (heads_to_tie_.size ())); - if (heads_to_tie_.size () && !to_boolean (get_property ("tieWaitForNote"))) { Moment now = now_mom (); for (vsize i = heads_to_tie_.size (); i--; ) { if (now > heads_to_tie_[i].end_moment_) - heads_to_tie_.erase (heads_to_tie_.begin () + i); + { + report_unterminated_tie (heads_to_tie_[i]); + heads_to_tie_.erase (heads_to_tie_.begin () + i); + } } } + + context ()->set_property ("tieMelismaBusy", + ly_bool2scm (heads_to_tie_.size ())); } void @@ -177,7 +236,12 @@ Tie_engraver::stop_translation_timestep () if (ties_.size ()) { if (!wait) - heads_to_tie_.clear (); + { + vector::iterator it = heads_to_tie_.begin (); + for (; it < heads_to_tie_.end (); it++) + report_unterminated_tie (*it); + heads_to_tie_.clear (); + } for (vsize i = 0; i < ties_.size (); i++) typeset_tie (ties_[i]); @@ -187,7 +251,13 @@ Tie_engraver::stop_translation_timestep () } vector new_heads_to_tie; - + + /* + Whether tie event has been processed and can be deleted or should + be kept for later portions of a split note. + */ + bool event_processed = false; + for (vsize i = 0; i < now_heads_.size (); i++) { Grob *head = now_heads_[i]; @@ -196,11 +266,14 @@ Tie_engraver::stop_translation_timestep () if (!left_ev) { - // may happen for ambituses + // may happen for ambitus continue; } - - + + // We only want real notes to cause ties, not e.g. pitched trills + if (!left_ev->in_event_class ("note-event")) + continue; + SCM left_articulations = left_ev->get_property ("articulations"); Stream_event *tie_event = 0; @@ -212,13 +285,16 @@ Tie_engraver::stop_translation_timestep () Stream_event *ev = unsmob_stream_event (scm_car (s)); if (!ev) continue; - + if (ev->in_event_class ("tie-event")) tie_event = ev; } - - if (left_ev && (tie_event || tie_stream_event)) + + if (left_ev && (tie_event || tie_stream_event) + && (!Tie_engraver::has_autosplit_end (left_ev))) { + event_processed = true; + Head_event_tuple event_tup; SCM start_definition @@ -239,19 +315,30 @@ Tie_engraver::stop_translation_timestep () end += get_event_length (left_ev); } event_tup.end_moment_ = end; - + new_heads_to_tie.push_back (event_tup); } } if (!wait && new_heads_to_tie.size ()) - heads_to_tie_.clear (); + { + vector::iterator it=heads_to_tie_.begin (); + for (; it < heads_to_tie_.end (); it++) + report_unterminated_tie (*it); + heads_to_tie_.clear (); + } // hmmm, how to do with copy () ? for (vsize i = 0; i < new_heads_to_tie.size (); i++) heads_to_tie_.push_back (new_heads_to_tie[i]); - - event_ = 0; + + /* + Discard event only if it has been processed with at least one + appropriate note. + */ + if (event_processed) + event_ = 0; + now_heads_.clear (); }