X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fphrasing-slur-engraver.cc;h=839554f7e9af9a1d7f3c174503e4bad58e34a73c;hb=d1db9b1d6ebb1014429974f22162b44bf9a03533;hp=b8eed4092d72692b705b112f543d50ef45a1e23c;hpb=64313890b232c731d432e5b096f30bffc3f3756d;p=lilypond.git diff --git a/lily/phrasing-slur-engraver.cc b/lily/phrasing-slur-engraver.cc index b8eed4092d..839554f7e9 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--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,72 +25,72 @@ #include "note-column.hh" #include "slur.hh" #include "spanner.hh" -#include "tie.hh" +#include "stream-event.hh" #include "warn.hh" +#include "translator.icc" + + +/* + NOTE NOTE NOTE + + 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_; - Music *running_slur_start_; - Link_array slurs_; - Link_array end_slurs_; + vector start_events_; + vector stop_events_; + vector slurs_; + vector end_slurs_; protected: - virtual bool try_music (Music *); - - void acknowledge_extra_object (Grob_info); + DECLARE_TRANSLATOR_LISTENER (phrasing_slur); DECLARE_ACKNOWLEDGER (accidental); - DECLARE_ACKNOWLEDGER (dynamic_line_spanner); DECLARE_ACKNOWLEDGER (fingering); DECLARE_ACKNOWLEDGER (note_column); - DECLARE_ACKNOWLEDGER (script); DECLARE_ACKNOWLEDGER (slur); + 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 (Phrasing_slur_engraver); }; Phrasing_slur_engraver::Phrasing_slur_engraver () { - events_[START] = events_[STOP] = 0; } -bool -Phrasing_slur_engraver::try_music (Music *m) +IMPLEMENT_TRANSLATOR_LISTENER (Phrasing_slur_engraver, phrasing_slur); +void +Phrasing_slur_engraver::listen_phrasing_slur (Stream_event *ev) { - if (m->is_mus_type ("phrasing-slur-event")) - { - /* - Let's not start more than one slur per moment. - */ - Direction d = to_dir (m->get_property ("span-direction")); - if (d == START) - { - events_[START] = m; - return true; - } - else if (d == STOP) - { - if (slurs_.empty ()) - return false; - - 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", + "phrasing-slur-event", int (d))); } void @@ -92,33 +103,10 @@ Phrasing_slur_engraver::acknowledge_note_column (Grob_info info) Slur::add_column (end_slurs_[i], e); } -/* FIXME: cut + paste job from Slur:: */ void Phrasing_slur_engraver::acknowledge_extra_object (Grob_info info) { - Grob *e = info.grob (); - SCM avoid = e->get_property ("avoid-slur"); - if (Tie::has_interface (e) - || avoid == ly_symbol2scm ("inside")) - { - for (vsize i = slurs_.size (); i--;) - Slur::add_extra_encompass (slurs_[i], e); - for (vsize i = end_slurs_.size (); i--;) - Slur::add_extra_encompass (end_slurs_[i], e); - } - else if (avoid == ly_symbol2scm ("outside") - || avoid == ly_symbol2scm ("around")) - { - Grob *slur = slurs_.size () ? slurs_[0] : 0; - slur = (end_slurs_.size () && !slur) - ? end_slurs_[0] : slur; - - if (slur) - { - chain_offset_callback (e, Slur::outside_slur_callback_proc, Y_AXIS); - e->set_object ("slur", slur->self_scm ()); - } - } + Slur::auxiliary_acknowledge_extra_object (info, slurs_, end_slurs_); } void @@ -128,13 +116,13 @@ Phrasing_slur_engraver::acknowledge_accidental (Grob_info info) } void -Phrasing_slur_engraver::acknowledge_dynamic_line_spanner (Grob_info info) +Phrasing_slur_engraver::acknowledge_fingering (Grob_info info) { acknowledge_extra_object (info); } void -Phrasing_slur_engraver::acknowledge_fingering (Grob_info info) +Phrasing_slur_engraver::acknowledge_tuplet_number (Grob_info info) { acknowledge_extra_object (info); } @@ -142,7 +130,8 @@ Phrasing_slur_engraver::acknowledge_fingering (Grob_info info) void Phrasing_slur_engraver::acknowledge_script (Grob_info info) { - acknowledge_extra_object (info); + if (!info.grob ()->internal_has_interface (ly_symbol2scm ("dynamic-interface"))) + acknowledge_extra_object (info); } void @@ -166,29 +155,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++) { - Music *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); + } } } @@ -196,23 +213,29 @@ void Phrasing_slur_engraver::stop_translation_timestep () { end_slurs_.clear (); - events_[START] = events_[STOP] = 0; + start_events_.clear (); + stop_events_.clear (); } -#include "translator.icc" - ADD_ACKNOWLEDGER (Phrasing_slur_engraver, accidental); -ADD_ACKNOWLEDGER (Phrasing_slur_engraver, dynamic_line_spanner); ADD_ACKNOWLEDGER (Phrasing_slur_engraver, fingering) - ADD_ACKNOWLEDGER (Phrasing_slur_engraver, note_column); -ADD_ACKNOWLEDGER (Phrasing_slur_engraver, script); +ADD_ACKNOWLEDGER (Phrasing_slur_engraver, note_column); 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", - /* accept */ "phrasing-slur-event", - /* read */ "", - /* write */ ""); + /* doc */ + "Print phrasing slurs. Similar to @ref{Slur_engraver}.", + + /* create */ + "PhrasingSlur ", + + /* read */ + "", + + /* write */ + "" + );