X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fslur-engraver.cc;h=96d22cd759c001f6eff7acb97c54f1ade52fe5a0;hb=5d6df4944b265eded25882104e3f7899d1bc21c5;hp=dca3a3dc90cca5d63abd5b52f4107490b9280958;hpb=ee0b60895ddb1a042cb989f5c9964bea520f1ca2;p=lilypond.git diff --git a/lily/slur-engraver.cc b/lily/slur-engraver.cc index dca3a3dc90..96d22cd759 100644 --- a/lily/slur-engraver.cc +++ b/lily/slur-engraver.cc @@ -1,9 +1,20 @@ /* - slur-engraver.cc -- implement Slur_engraver + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 1997--2011 Han-Wen Nienhuys - (c) 1997--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" @@ -14,8 +25,21 @@ #include "note-column.hh" #include "slur.hh" #include "spanner.hh" +#include "stream-event.hh" #include "warn.hh" +#include "translator.icc" + +/* + NOTE NOTE NOTE + + This is largely similar to Phrasing_slur_engraver. Check if fixes + apply there too. + + (on principle, engravers don't use inheritance for code sharing) + + */ + /* It is possible that a slur starts and ends on the same note. At least, it is for phrasing slurs: a note can be both beginning and @@ -23,56 +47,49 @@ */ class Slur_engraver : public Engraver { - Drul_array events_; - Music *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: - virtual bool try_music (Music *); - - DECLARE_ACKNOWLEDGER (accidental); - DECLARE_ACKNOWLEDGER (dynamic_line_spanner); + DECLARE_TRANSLATOR_LISTENER (slur); + DECLARE_ACKNOWLEDGER (inline_accidental); DECLARE_ACKNOWLEDGER (fingering); DECLARE_ACKNOWLEDGER (note_column); DECLARE_ACKNOWLEDGER (script); DECLARE_ACKNOWLEDGER (text_script); DECLARE_ACKNOWLEDGER (tie); DECLARE_ACKNOWLEDGER (tuplet_number); + void acknowledge_extra_object (Grob_info); void stop_translation_timestep (); - virtual void finalize (); void process_music (); + virtual void finalize (); + public: TRANSLATOR_DECLARATIONS (Slur_engraver); }; Slur_engraver::Slur_engraver () { - events_[START] = events_[STOP] = 0; } -bool -Slur_engraver::try_music (Music *m) +IMPLEMENT_TRANSLATOR_LISTENER (Slur_engraver, slur); +void +Slur_engraver::listen_slur (Stream_event *ev) { - if (m->is_mus_type ("slur-event")) - { - Direction d = to_dir (m->get_property ("span-direction")); - if (d == START) - { - events_[START] = m; - return true; - } - else if (d == STOP) - { - events_[STOP] = m; - return true; - } - } - return false; + Direction d = to_dir (ev->get_property ("span-direction")); + if (d == START) + start_events_.push_back (ev); + else if (d == STOP) + stop_events_.push_back (ev); + else ev->origin ()->warning (_f ("direction of %s invalid: %d", + "slur-event", int (d))); } void @@ -94,17 +111,11 @@ 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_); -} - -void -Slur_engraver::acknowledge_accidental (Grob_info info) -{ - acknowledge_extra_object (info); + objects_to_acknowledge_.push_back (info); } void -Slur_engraver::acknowledge_dynamic_line_spanner (Grob_info info) +Slur_engraver::acknowledge_inline_accidental (Grob_info info) { acknowledge_extra_object (info); } @@ -121,7 +132,6 @@ Slur_engraver::acknowledge_tuplet_number (Grob_info info) acknowledge_extra_object (info); } - void Slur_engraver::acknowledge_script (Grob_info info) { @@ -144,43 +154,71 @@ Slur_engraver::acknowledge_tie (Grob_info info) void Slur_engraver::finalize () { - if (slurs_.size ()) - slurs_[0]->warning (_ ("unterminated slur")); + for (vsize i = 0; i < slurs_.size (); i++) + { + slurs_[i]->warning (_ ("unterminated slur")); + slurs_[i]->suicide (); + } } 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 (_ ("can't end slur")); - - - end_slurs_ = slurs_; - slurs_.clear (); + 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) + 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) + ev->origin ()->warning (_ ("cannot end slur")); } - if (events_[START] && slurs_.empty ()) + for (vsize i = start_events_.size (); i--;) { - Music *ev = events_[START]; - - bool double_slurs = to_boolean (get_property ("doubleSlurs")); - - Grob *slur = make_spanner ("Slur", events_[START]->self_scm ()); - 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); - } + 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"), "")); + + if (have_slur) + { + // 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); + } + else + { + 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); + 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 ()); } @@ -188,16 +226,34 @@ Slur_engraver::process_music () void 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); + + 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++) - announce_end_grob (end_slurs_[i], SCM_EOL); + { + Spanner *s = dynamic_cast (end_slurs_[i]); + if (!s->get_bound (RIGHT)) + 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 (); } -#include "translator.icc" - -ADD_ACKNOWLEDGER (Slur_engraver, accidental); -ADD_ACKNOWLEDGER (Slur_engraver, dynamic_line_spanner); +ADD_ACKNOWLEDGER (Slur_engraver, inline_accidental); ADD_ACKNOWLEDGER (Slur_engraver, fingering); ADD_ACKNOWLEDGER (Slur_engraver, note_column); ADD_ACKNOWLEDGER (Slur_engraver, script); @@ -205,8 +261,16 @@ ADD_ACKNOWLEDGER (Slur_engraver, text_script); ADD_ACKNOWLEDGER (Slur_engraver, tie); ADD_ACKNOWLEDGER (Slur_engraver, tuplet_number); ADD_TRANSLATOR (Slur_engraver, - /* doc */ "Build slur grobs from slur events", - /* create */ "Slur", - /* accept */ "slur-event", - /* read */ "slurMelismaBusy doubleSlurs", - /* write */ ""); + /* doc */ + "Build slur grobs from slur events.", + + /* create */ + "Slur ", + + /* read */ + "slurMelismaBusy " + "doubleSlurs ", + + /* write */ + "" + );