X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fslur-engraver.cc;h=49f92ab0ed5a96b04e5bd5331fb1b49cf12f4e35;hb=e57aa43dcba4cf876790c1ac8f2ee8ff42522f4b;hp=010a55f57bc9df8c7702e31dc541912071276e22;hpb=b7a0cffbf9d1069860368f289a5b50e9d1d90ba8;p=lilypond.git diff --git a/lily/slur-engraver.cc b/lily/slur-engraver.cc index 010a55f57b..49f92ab0ed 100644 --- a/lily/slur-engraver.cc +++ b/lily/slur-engraver.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1997--2009 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 @@ -30,7 +30,6 @@ #include "translator.icc" - /* NOTE NOTE NOTE @@ -38,7 +37,7 @@ apply there too. (on principle, engravers don't use inheritance for code sharing) - + */ /* @@ -48,21 +47,23 @@ */ class Slur_engraver : public Engraver { - Drul_array events_; - Stream_event *running_slur_start_; - vector slurs_; - vector end_slurs_; + vector start_events_; + vector stop_events_; + vector slurs_; + vector end_slurs_; + vector objects_to_acknowledge_; void set_melisma (bool); protected: DECLARE_TRANSLATOR_LISTENER (slur); - DECLARE_ACKNOWLEDGER (accidental); + DECLARE_ACKNOWLEDGER (inline_accidental); DECLARE_ACKNOWLEDGER (fingering); DECLARE_ACKNOWLEDGER (note_column); DECLARE_ACKNOWLEDGER (script); + DECLARE_ACKNOWLEDGER (dots); DECLARE_ACKNOWLEDGER (text_script); - DECLARE_ACKNOWLEDGER (tie); + DECLARE_END_ACKNOWLEDGER (tie); DECLARE_ACKNOWLEDGER (tuplet_number); void acknowledge_extra_object (Grob_info); @@ -70,7 +71,7 @@ protected: void process_music (); virtual void finalize (); - + virtual void derived_mark () const; public: TRANSLATOR_DECLARATIONS (Slur_engraver); @@ -78,7 +79,15 @@ public: Slur_engraver::Slur_engraver () { - events_[START] = events_[STOP] = 0; +} + +void +Slur_engraver::derived_mark () const +{ + for (vsize i = start_events_.size (); i--;) + scm_gc_mark (start_events_[i]->self_scm ()); + for (vsize i = stop_events_.size (); i--;) + scm_gc_mark (stop_events_[i]->self_scm ()); } IMPLEMENT_TRANSLATOR_LISTENER (Slur_engraver, slur); @@ -87,11 +96,11 @@ Slur_engraver::listen_slur (Stream_event *ev) { Direction d = to_dir (ev->get_property ("span-direction")); if (d == START) - ASSIGN_EVENT_ONCE (events_[START], ev); + start_events_.push_back (ev); else if (d == STOP) - ASSIGN_EVENT_ONCE (events_[STOP], ev); + stop_events_.push_back (ev); else ev->origin ()->warning (_f ("direction of %s invalid: %d", - "slur-event", int (d))); + "slur-event", int (d))); } void @@ -113,11 +122,17 @@ Slur_engraver::acknowledge_note_column (Grob_info info) void Slur_engraver::acknowledge_extra_object (Grob_info info) { - Slur::auxiliary_acknowledge_extra_object (info, slurs_, end_slurs_); + objects_to_acknowledge_.push_back (info); +} + +void +Slur_engraver::acknowledge_inline_accidental (Grob_info info) +{ + acknowledge_extra_object (info); } void -Slur_engraver::acknowledge_accidental (Grob_info info) +Slur_engraver::acknowledge_dots (Grob_info info) { acknowledge_extra_object (info); } @@ -134,7 +149,6 @@ Slur_engraver::acknowledge_tuplet_number (Grob_info info) acknowledge_extra_object (info); } - void Slur_engraver::acknowledge_script (Grob_info info) { @@ -149,7 +163,7 @@ Slur_engraver::acknowledge_text_script (Grob_info info) } void -Slur_engraver::acknowledge_tie (Grob_info info) +Slur_engraver::acknowledge_end_tie (Grob_info info) { acknowledge_extra_object (info); } @@ -157,47 +171,119 @@ Slur_engraver::acknowledge_tie (Grob_info info) void Slur_engraver::finalize () { - if (slurs_.size ()) + for (vsize i = 0; i < slurs_.size (); i++) { - slurs_[0]->warning (_ ("unterminated slur")); - for (vsize i = 0; i < slurs_.size (); i++) - slurs_[i]->suicide (); + slurs_[i]->warning (_ ("unterminated slur")); + slurs_[i]->suicide (); } + slurs_.clear (); } void Slur_engraver::process_music () { - if (events_[STOP]) + for (vsize i = 0; i < stop_events_.size (); i++) { - if (slurs_.size () == 0) - events_[STOP]->origin ()->warning (_ ("cannot end slur")); - - - end_slurs_ = slurs_; - slurs_.clear (); + Stream_event *ev = stop_events_[i]; + string id = robust_scm2string (ev->get_property ("spanner-id"), ""); + + // Find the slurs that are ended with this event (by checking the spanner-id) + bool ended = false; + for (vsize j = slurs_.size (); j--;) + { + if (id == robust_scm2string (slurs_[j]->get_property ("spanner-id"), "")) + { + ended = true; + end_slurs_.push_back (slurs_[j]); + slurs_.erase (slurs_.begin () + j); + } + } + if (ended) + { + // Ignore redundant stop events for this id + for (vsize j = stop_events_.size (); --j > i;) + { + if (id == robust_scm2string (stop_events_[j]->get_property ("spanner-id"), "")) + stop_events_.erase (stop_events_.begin () + j); + } + } + else + ev->origin ()->warning (_ ("cannot end slur")); } - if (events_[START] && slurs_.empty ()) + vsize old_slurs = slurs_.size (); + for (vsize i = start_events_.size (); i--;) { - Stream_event *ev = events_[START]; - - bool double_slurs = to_boolean (get_property ("doubleSlurs")); - - Grob *slur = make_spanner ("Slur", events_[START]->self_scm ()); + Stream_event *ev = start_events_[i]; + string id = robust_scm2string (ev->get_property ("spanner-id"), ""); Direction updown = to_dir (ev->get_property ("direction")); - if (updown && !double_slurs) - set_grob_direction (slur, updown); - - slurs_.push_back (slur); - - if (double_slurs) - { - set_grob_direction (slur, DOWN); - slur = make_spanner ("Slur", events_[START]->self_scm ()); - set_grob_direction (slur, UP); - slurs_.push_back (slur); - } + + bool completed; + for (vsize j = slurs_.size (); !(completed = (j-- == 0));) + { + // Check if we already have a slur with the same spanner-id. + if (id == robust_scm2string (slurs_[j]->get_property ("spanner-id"), "")) + { + if (j < old_slurs) + { + // We already have an old slur, so give a warning + // and completely ignore the new slur. + ev->origin ()->warning (_ ("already have slur")); + start_events_.erase (start_events_.begin () + i); + break; + } + + // If this slur event has no direction, it will not + // contribute anything new to the existing slur(s), so + // we can ignore it. + + if (!updown) + break; + + Stream_event *c = unsmob_stream_event (slurs_[j]->get_property ("cause")); + + if (!c) + { + slurs_[j]->programming_error ("slur without a cause"); + continue; + } + + Direction slur_dir = to_dir (c->get_property ("direction")); + + // If the existing slur does not have a direction yet, + // we'd rather take the new one. + + if (!slur_dir) + { + slurs_[j]->suicide (); + slurs_.erase (slurs_.begin () + j); + continue; + } + + // If the existing slur has the same direction as ours, drop ours + + if (slur_dir == updown) + break; + } + } + // If the loop completed, our slur is new + if (completed) + { + Grob *slur = make_spanner ("Slur", ev->self_scm ()); + slur->set_property ("spanner-id", ly_string2scm (id)); + if (updown) + set_grob_direction (slur, updown); + slurs_.push_back (slur); + + if (to_boolean (get_property ("doubleSlurs"))) + { + set_grob_direction (slur, DOWN); + slur = make_spanner ("Slur", ev->self_scm ()); + slur->set_property ("spanner-id", ly_string2scm (id)); + set_grob_direction (slur, UP); + slurs_.push_back (slur); + } + } } set_melisma (slurs_.size ()); } @@ -208,43 +294,49 @@ Slur_engraver::stop_translation_timestep () if (Grob *g = unsmob_grob (get_property ("currentCommandColumn"))) { for (vsize i = 0; i < end_slurs_.size (); i++) - Slur::add_extra_encompass (end_slurs_[i], g); + Slur::add_extra_encompass (end_slurs_[i], g); - if (!events_[START]) - for (vsize i = 0; i < slurs_.size (); i++) - Slur::add_extra_encompass (slurs_[i], g); + if (!start_events_.size ()) + for (vsize i = 0; i < slurs_.size (); i++) + Slur::add_extra_encompass (slurs_[i], g); } - - + for (vsize i = 0; i < end_slurs_.size (); i++) { - Spanner * s = dynamic_cast (end_slurs_[i]); + Spanner *s = dynamic_cast (end_slurs_[i]); if (!s->get_bound (RIGHT)) - s->set_bound (RIGHT, unsmob_grob (get_property ("currentMusicalColumn"))); + s->set_bound (RIGHT, unsmob_grob (get_property ("currentMusicalColumn"))); announce_end_grob (s, SCM_EOL); } + + for (vsize i = 0; i < objects_to_acknowledge_.size (); i++) + Slur::auxiliary_acknowledge_extra_object (objects_to_acknowledge_[i], slurs_, end_slurs_); + + objects_to_acknowledge_.clear (); end_slurs_.clear (); - events_[START] = events_[STOP] = 0; + start_events_.clear (); + stop_events_.clear (); } -ADD_ACKNOWLEDGER (Slur_engraver, accidental); +ADD_ACKNOWLEDGER (Slur_engraver, inline_accidental); ADD_ACKNOWLEDGER (Slur_engraver, fingering); ADD_ACKNOWLEDGER (Slur_engraver, note_column); ADD_ACKNOWLEDGER (Slur_engraver, script); ADD_ACKNOWLEDGER (Slur_engraver, text_script); -ADD_ACKNOWLEDGER (Slur_engraver, tie); +ADD_ACKNOWLEDGER (Slur_engraver, dots); +ADD_END_ACKNOWLEDGER (Slur_engraver, tie); ADD_ACKNOWLEDGER (Slur_engraver, tuplet_number); ADD_TRANSLATOR (Slur_engraver, - /* doc */ - "Build slur grobs from slur events.", + /* doc */ + "Build slur grobs from slur events.", - /* create */ - "Slur ", + /* create */ + "Slur ", - /* read */ - "slurMelismaBusy " - "doubleSlurs ", + /* read */ + "slurMelismaBusy " + "doubleSlurs ", - /* write */ - "" - ); + /* write */ + "" + );