X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fphrasing-slur-engraver.cc;h=4805960042b8317e1f45ba9ed86ab8598a5cba3b;hb=b0c79ceb092e54f20a2d745144db266b2fa3c828;hp=10b767d615e17bf332b1e6fe7161a51d4177e9c6;hpb=2b695bcbe3d6a5fddd58eb03189d3272112421d9;p=lilypond.git diff --git a/lily/phrasing-slur-engraver.cc b/lily/phrasing-slur-engraver.cc index 10b767d615..4805960042 100644 --- a/lily/phrasing-slur-engraver.cc +++ b/lily/phrasing-slur-engraver.cc @@ -1,9 +1,20 @@ /* - phrasing-slur-engraver.cc -- implement Phrasing_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--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" @@ -19,30 +30,30 @@ #include "translator.icc" -/* - 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 - ending of a phrase. - -*/ - /* NOTE NOTE NOTE - This is largely similar to Slur_engraver. Check if fixes apply there too. + This is largely similar to 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 + ending of a phrase. +*/ class Phrasing_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_; protected: - void acknowledge_extra_object (Grob_info); + DECLARE_TRANSLATOR_LISTENER (phrasing_slur); DECLARE_ACKNOWLEDGER (accidental); DECLARE_ACKNOWLEDGER (fingering); DECLARE_ACKNOWLEDGER (note_column); @@ -50,33 +61,33 @@ protected: DECLARE_ACKNOWLEDGER (script); DECLARE_ACKNOWLEDGER (text_script); DECLARE_ACKNOWLEDGER (tie); - DECLARE_TRANSLATOR_LISTENER (phrasing_slur); + 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 (Phrasing_slur_engraver); }; Phrasing_slur_engraver::Phrasing_slur_engraver () { - events_[START] = events_[STOP] = 0; } IMPLEMENT_TRANSLATOR_LISTENER (Phrasing_slur_engraver, phrasing_slur); void Phrasing_slur_engraver::listen_phrasing_slur (Stream_event *ev) { - /* - Let's not start more than one slur per moment. - */ Direction d = to_dir (ev->get_property ("span-direction")); if (d == START) - ASSIGN_EVENT_ONCE (events_[START], ev); - else if (d == STOP && !slurs_.empty ()) - ASSIGN_EVENT_ONCE (events_[STOP], ev); + start_events_.push_back (ev); + else if (d == STOP) + stop_events_.push_back (ev); + else ev->origin ()->warning (_f ("direction of %s invalid: %d", + "phrasing-slur-event", int (d))); } void @@ -108,7 +119,7 @@ Phrasing_slur_engraver::acknowledge_fingering (Grob_info info) } void -Phrasing_slur_engraver::acknowledge_text_script (Grob_info info) +Phrasing_slur_engraver::acknowledge_tuplet_number (Grob_info info) { acknowledge_extra_object (info); } @@ -120,6 +131,12 @@ Phrasing_slur_engraver::acknowledge_script (Grob_info info) acknowledge_extra_object (info); } +void +Phrasing_slur_engraver::acknowledge_text_script (Grob_info info) +{ + acknowledge_extra_object (info); +} + void Phrasing_slur_engraver::acknowledge_tie (Grob_info info) { @@ -135,29 +152,57 @@ Phrasing_slur_engraver::acknowledge_slur (Grob_info info) void Phrasing_slur_engraver::finalize () { - if (slurs_.size ()) - slurs_[0]->warning (_ ("unterminated phrasing slur")); + for (vsize i = 0; i < slurs_.size (); i++) + { + slurs_[i]->warning (_ ("unterminated phrasing slur")); + slurs_[i]->suicide (); + } } void Phrasing_slur_engraver::process_music () { - if (events_[STOP]) + for (vsize i = 0; i < stop_events_.size (); i++) { - 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 phrasing slur")); } - if (events_[START] && slurs_.empty ()) + for (vsize i = 0; i < start_events_.size (); i++) { - Stream_event *ev = events_[START]; - - Grob *slur = make_spanner ("PhrasingSlur", events_[START]->self_scm ()); - Direction updown = to_dir (ev->get_property ("direction")); - if (updown) - set_grob_direction (slur, updown); - - 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 i = 0; i < slurs_.size (); i++) + have_slur = have_slur || (id == robust_scm2string (slurs_[i]->get_property ("spanner-id"), "")); + + if (have_slur) + ev->origin ()->warning (_ ("already have phrasing slur")); + else + { + Grob *slur = make_spanner ("PhrasingSlur", 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); + } } } @@ -165,7 +210,8 @@ void Phrasing_slur_engraver::stop_translation_timestep () { end_slurs_.clear (); - events_[START] = events_[STOP] = 0; + start_events_.clear (); + stop_events_.clear (); } ADD_ACKNOWLEDGER (Phrasing_slur_engraver, accidental); @@ -175,9 +221,18 @@ ADD_ACKNOWLEDGER (Phrasing_slur_engraver, slur); ADD_ACKNOWLEDGER (Phrasing_slur_engraver, script); ADD_ACKNOWLEDGER (Phrasing_slur_engraver, text_script); ADD_ACKNOWLEDGER (Phrasing_slur_engraver, tie); +ADD_ACKNOWLEDGER (Phrasing_slur_engraver, tuplet_number); ADD_TRANSLATOR (Phrasing_slur_engraver, - /* doc */ "Print phrasing slurs. Similar to @ref{Slur_engraver}", - /* create */ "PhrasingSlur", - /* read */ "", - /* write */ ""); + /* doc */ + "Print phrasing slurs. Similar to @ref{Slur_engraver}.", + + /* create */ + "PhrasingSlur ", + + /* read */ + "", + + /* write */ + "" + );