X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftie-engraver.cc;h=3ca2d2569acf74d4ba1dcc502dcf33df4f8af906;hb=05514c83a49dd3dfabd1fa7774c69c3038ecde6b;hp=c78b99286cabbf4db9e9179836606999aa270b66;hpb=9d4a5bbc9687aef811a60aabd9cb839412984e96;p=lilypond.git diff --git a/lily/tie-engraver.cc b/lily/tie-engraver.cc index c78b99286c..3ca2d2569a 100644 --- a/lily/tie-engraver.cc +++ b/lily/tie-engraver.cc @@ -1,27 +1,40 @@ /* - 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--2006 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" #include "context.hh" -#include "grob-pitch-tuple.hh" #include "international.hh" #include "item.hh" #include "note-head.hh" #include "protected-scm.hh" #include "spanner.hh" #include "staff-symbol-referencer.hh" +#include "stream-event.hh" #include "tie-column.hh" #include "tie.hh" #include "warn.hh" +#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. @@ -32,25 +45,31 @@ struct Head_event_tuple { Grob *head_; + Moment end_moment_; SCM tie_definition_; - Music *event_; + 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_event_tuple (Grob *h, Music *m, SCM def) - { - head_ = h; - event_ = m; - tie_definition_ = def; + head_ = 0; + tie_definition_ = SCM_EOL; + tie_event_ = 0; + tie_stream_event_ = 0; + tie_from_chord_created = false; } }; class Tie_engraver : public Engraver { - Music *event_; - Link_array__Grob_ now_heads_; - std::vector heads_to_tie_; - Link_array__Grob_ ties_; + Stream_event *event_; + vector now_heads_; + vector heads_to_tie_; + vector ties_; Spanner *tie_column_; @@ -59,9 +78,10 @@ protected: virtual void derived_mark () const; void start_translation_timestep (); DECLARE_ACKNOWLEDGER (note_head); - virtual bool try_music (Music *); + DECLARE_TRANSLATOR_LISTENER (tie); void process_music (); void typeset_tie (Grob *); + void report_unterminated_tie (Head_event_tuple const &); public: TRANSLATOR_DECLARATIONS (Tie_engraver); }; @@ -80,19 +100,31 @@ Tie_engraver::Tie_engraver () tie_column_ = 0; } -bool -Tie_engraver::try_music (Music *mus) +IMPLEMENT_TRANSLATOR_LISTENER (Tie_engraver, tie); +void +Tie_engraver::listen_tie (Stream_event *ev) { - if (mus->is_mus_type ("tie-event")) - event_ = mus; + ASSIGN_EVENT_ONCE (event_, ev); +} - return true; +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")); } void Tie_engraver::process_music () { - if (event_) + bool busy = event_; + for (vsize i = 0; !busy && i < heads_to_tie_.size (); i++) + busy |= (heads_to_tie_[i].tie_event_ + || heads_to_tie_[i].tie_stream_event_); + + if (busy) context ()->set_property ("tieMelismaBusy", SCM_BOOL_T); } @@ -100,28 +132,53 @@ void Tie_engraver::acknowledge_note_head (Grob_info i) { Grob *h = i.grob (); + now_heads_.push_back (h); for (vsize i = heads_to_tie_.size (); i--;) { Grob *th = heads_to_tie_[i].head_; - Music *right_mus = unsmob_music (h->get_property ("cause")); - Music *left_mus = unsmob_music (th->get_property ("cause")); + Stream_event *right_ev = unsmob_stream_event (h->get_property ("cause")); + Stream_event *left_ev = unsmob_stream_event (th->get_property ("cause")); /* maybe should check positions too. */ - if (right_mus && left_mus - && ly_is_equal (right_mus->get_property ("pitch"), - left_mus->get_property ("pitch"))) + if (!right_ev || !left_ev) + continue; + + if (ly_is_equal (right_ev->get_property ("pitch"), + left_ev->get_property ("pitch"))) { - Grob *p = new Spanner (heads_to_tie_[i].tie_definition_, - context ()->get_grob_key ("Tie")); - announce_grob (p, heads_to_tie_[i].event_->self_scm ()); + 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); + + 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)); + } + 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; + } } } @@ -138,38 +195,112 @@ 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_) + { + report_unterminated_tie (heads_to_tie_[i]); + heads_to_tie_.erase (heads_to_tie_.begin () + i); + } + } + } } void Tie_engraver::stop_translation_timestep () { + bool wait = to_boolean (get_property ("tieWaitForNote")); if (ties_.size ()) { - if (!to_boolean (get_property ("tieWaitForNote"))) - heads_to_tie_.clear (); + if (!wait) + { + 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]); + typeset_tie (ties_[i]); ties_.clear (); tie_column_ = 0; } - if (event_) + vector new_heads_to_tie; + + for (vsize i = 0; i < now_heads_.size (); i++) { - SCM start_definition - = updated_grob_properties (context (), ly_symbol2scm ("Tie")); - - if (!to_boolean (get_property ("tieWaitForNote"))) - heads_to_tie_.clear (); + Grob *head = now_heads_[i]; + Stream_event *left_ev + = unsmob_stream_event (head->get_property ("cause")); - for (vsize i = 0; i < now_heads_.size (); i++) + if (!left_ev) + { + // may happen for ambitus + continue; + } + + + SCM left_articulations = left_ev->get_property ("articulations"); + + Stream_event *tie_event = 0; + Stream_event *tie_stream_event = event_; + for (SCM s = left_articulations; + !tie_event && !tie_stream_event && scm_is_pair (s); + s = scm_cdr (s)) + { + 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)) { - heads_to_tie_.push_back (Head_event_tuple (now_heads_[i], event_, - start_definition)); + Head_event_tuple event_tup; + + SCM start_definition + = updated_grob_properties (context (), ly_symbol2scm ("Tie")); + + event_tup.head_ = head; + event_tup.tie_definition_ = start_definition; + event_tup.tie_event_ = tie_event; + event_tup.tie_stream_event_ = tie_stream_event; + + Moment end = now_mom (); + if (end.grace_part_) + { + end.grace_part_ += get_event_length (left_ev).main_part_; + } + else + { + 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 ()) + { + 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; now_heads_.clear (); } @@ -196,15 +327,18 @@ Tie_engraver::typeset_tie (Grob *her) sp->set_bound (RIGHT, new_head_drul[RIGHT]); } -#include "translator.icc" - ADD_ACKNOWLEDGER (Tie_engraver, note_head); ADD_TRANSLATOR (Tie_engraver, - /* doc */ "Generate ties between noteheads of equal pitch.", + /* doc */ + "Generate ties between note heads of equal pitch.", + /* create */ "Tie " - "TieColumn", + "TieColumn ", + + /* read */ + "tieWaitForNote ", - /* accept */ "tie-event", - /* read */ "tieWaitForNote", - /* write */ "tieMelismaBusy"); + /* write */ + "tieMelismaBusy " + );