X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fslur-engraver.cc;h=fde4d9447def65123f93532dc8421a8420e9a634;hb=e47e8dc419d5c9657a0ff357a3c32cd4d84a7fac;hp=bd1a90a07b2494507e77505fabcc10f8dceb1898;hpb=3f8a827aad721ed546b823e3f9f2605f61b90e20;p=lilypond.git diff --git a/lily/slur-engraver.cc b/lily/slur-engraver.cc index bd1a90a07b..fde4d9447d 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--2011 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 @@ -57,10 +57,11 @@ class Slur_engraver : public Engraver 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_ACKNOWLEDGER (tuplet_number); @@ -70,6 +71,7 @@ protected: void process_music (); virtual void finalize (); + virtual void derived_mark () const; public: TRANSLATOR_DECLARATIONS (Slur_engraver); @@ -79,6 +81,15 @@ Slur_engraver::Slur_engraver () { } +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); void Slur_engraver::listen_slur (Stream_event *ev) @@ -115,7 +126,13 @@ Slur_engraver::acknowledge_extra_object (Grob_info info) } void -Slur_engraver::acknowledge_accidental (Grob_info info) +Slur_engraver::acknowledge_inline_accidental (Grob_info info) +{ + acknowledge_extra_object (info); +} + +void +Slur_engraver::acknowledge_dots (Grob_info info) { acknowledge_extra_object (info); } @@ -159,6 +176,7 @@ Slur_engraver::finalize () slurs_[i]->warning (_ ("unterminated slur")); slurs_[i]->suicide (); } + slurs_.clear (); } void @@ -169,7 +187,7 @@ Slur_engraver::process_music () Stream_event *ev = stop_events_[i]; string id = robust_scm2string (ev->get_property ("spanner-id"), ""); - // Find the slur that is ended with this event (by checking the 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--;) { @@ -180,31 +198,80 @@ Slur_engraver::process_music () slurs_.erase (slurs_.begin () + j); } } - if (!ended) + 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")); } + vsize old_slurs = slurs_.size (); for (vsize i = start_events_.size (); i--;) { Stream_event *ev = start_events_[i]; string id = robust_scm2string (ev->get_property ("spanner-id"), ""); - bool have_slur = false; - // Check if we already have a slur with the same spanner-id. - // In that case, don't create a new slur, but print a warning - for (vsize j = 0; j < slurs_.size (); j++) - have_slur = have_slur || (id == robust_scm2string (slurs_[j]->get_property ("spanner-id"), "")); + Direction updown = to_dir (ev->get_property ("direction")); - if (have_slur) + bool completed; + for (vsize j = 0; !(completed = (j == slurs_.size ())); j++) { - // We already have a slur, so give a warning and completely ignore - // the new slur. - ev->origin ()->warning (_ ("already have slur")); - start_events_.erase (start_events_.begin () + i); + // 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. This is not entirely accurate: + // tweaks or context properties like those set with + // \slurUp can still override a neutral direction, so + // when encountering a slur event with "opposite" + // direction first, then one with neutral direction, we + // only let the "opposite" direction remain, while if + // the order is the other way round, a double slur + // results since the direction of the first slur is no + // longer attributable to a "neutral" slur event. A + // mixture of neutral and directed events is nothing + // that the partcombiner should crank out, and it would + // be decidedly strange for manual input. + + if (!updown) + break; + + // If the existing slur does not have a direction yet, + // give it ours + + Direction slur_dir = to_dir (slurs_[j]->get_property ("direction")); + + if (!slur_dir) + { + set_grob_direction (slurs_[j], updown); + break; + } + + // If the existing slur has the same direction as ours, drop ours + + if (slur_dir == updown) + break; + } } - else + // If the loop completed, our slur is new + if (completed) { Grob *slur = make_spanner ("Slur", ev->self_scm ()); - Direction updown = to_dir (ev->get_property ("direction")); slur->set_property ("spanner-id", ly_string2scm (id)); if (updown) set_grob_direction (slur, updown); @@ -253,11 +320,12 @@ Slur_engraver::stop_translation_timestep () 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, dots); ADD_ACKNOWLEDGER (Slur_engraver, tie); ADD_ACKNOWLEDGER (Slur_engraver, tuplet_number); ADD_TRANSLATOR (Slur_engraver,