X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fphrasing-slur-engraver.cc;h=6a1caedb01b124821534ccae8681049fc68510cd;hb=8f2ccb82d132978b8516a1fe4cfa6f79abac1fca;hp=dbcdba9a883564b167d19fe85f2b3eaf0fd89e30;hpb=45ff7830d129783c6531275ccdc3f99e6016dadf;p=lilypond.git diff --git a/lily/phrasing-slur-engraver.cc b/lily/phrasing-slur-engraver.cc index dbcdba9a88..6a1caedb01 100644 --- a/lily/phrasing-slur-engraver.cc +++ b/lily/phrasing-slur-engraver.cc @@ -1,196 +1,243 @@ /* - phrasing-slur-engraver.cc -- implement Phrasing_slur_engraver + This file is part of LilyPond, the GNU music typesetter. - (c) 1997--2002 Han-Wen Nienhuys + Copyright (C) 1997--2011 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 "event.hh" -#include "slur.hh" -#include "warn.hh" -#include "note-column.hh" -#include "translator-group.hh" #include "engraver.hh" + +#include "context.hh" +#include "directional-element-interface.hh" +#include "international.hh" +#include "note-column.hh" +#include "slur.hh" #include "spanner.hh" +#include "stream-event.hh" +#include "warn.hh" + +#include "translator.icc" /* - TODO: - - ALGRGRRGRG + 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) - Derive this from Slur_engraver. This code is completely duplicate. + */ + +/* + 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 { - Link_array eventses_; - Link_array new_phrasing_slur_evs_; - Link_array phrasing_slur_l_stack_; - Link_array end_phrasing_slurs_; - Moment last_start_; + vector start_events_; + vector stop_events_; + vector slurs_; + vector end_slurs_; + vector objects_to_acknowledge_; protected: - virtual bool try_music (Music*); - virtual void acknowledge_grob (Grob_info); - virtual void stop_translation_timestep (); - virtual void start_translation_timestep (); + DECLARE_TRANSLATOR_LISTENER (phrasing_slur); + DECLARE_ACKNOWLEDGER (inline_accidental); + DECLARE_ACKNOWLEDGER (fingering); + DECLARE_ACKNOWLEDGER (note_column); + 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 (); + void process_music (); + virtual void finalize (); - virtual void process_acknowledged_grobs (); public: - TRANSLATOR_DECLARATIONS(Phrasing_slur_engraver); - + TRANSLATOR_DECLARATIONS (Phrasing_slur_engraver); }; Phrasing_slur_engraver::Phrasing_slur_engraver () { - last_start_ = Moment (-1); } -bool -Phrasing_slur_engraver::try_music (Music *ev) +IMPLEMENT_TRANSLATOR_LISTENER (Phrasing_slur_engraver, phrasing_slur); +void +Phrasing_slur_engraver::listen_phrasing_slur (Stream_event *ev) { - if (ev->is_mus_type ("abort-event")) - { - for (int i = 0; i < phrasing_slur_l_stack_.size (); i++) - { - phrasing_slur_l_stack_[i]->suicide (); - } - phrasing_slur_l_stack_.clear (); - for (int i = 0; i < end_phrasing_slurs_.size (); i++) - { - end_phrasing_slurs_[i]->suicide (); - } - end_phrasing_slurs_.clear (); - eventses_.clear (); - new_phrasing_slur_evs_.clear (); - } - else if (ev->is_mus_type ("phrasing-slur-event")) - { - /* - Let's not start more than one phrasing slur per moment. - */ - - Direction d = to_dir (ev->get_mus_property ("span-direction")); - - if (d == START) - { - if (now_mom () > last_start_) - { - new_phrasing_slur_evs_.push (ev); - last_start_ = now_mom (); - return true; - } - } - else - { - new_phrasing_slur_evs_.push (ev); - 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 -Phrasing_slur_engraver::acknowledge_grob (Grob_info info) +Phrasing_slur_engraver::acknowledge_note_column (Grob_info info) { - if (Note_column::has_interface (info.grob_)) - { - Grob *e =info.grob_; - for (int i = 0; i < phrasing_slur_l_stack_.size (); i++) - Slur::add_column (phrasing_slur_l_stack_[i], e); - for (int i = 0; i < end_phrasing_slurs_.size (); i++) - Slur::add_column (end_phrasing_slurs_[i], e); - } + Grob *e = info.grob (); + for (vsize i = slurs_.size (); i--;) + Slur::add_column (slurs_[i], e); + for (vsize i = end_slurs_.size (); i--;) + Slur::add_column (end_slurs_[i], e); } void -Phrasing_slur_engraver::finalize () +Phrasing_slur_engraver::acknowledge_extra_object (Grob_info info) { - for (int i = 0; i < phrasing_slur_l_stack_.size (); i++) - { -#if 0 - typeset_grob (phrasing_slur_l_stack_[i]); -#else - /* - Let's not typeset unterminated stuff - */ - phrasing_slur_l_stack_[i]->suicide (); -#endif - } - phrasing_slur_l_stack_.clear (); + objects_to_acknowledge_.push_back (info); +} - for (int i=0; i < eventses_.size (); i++) - { - eventses_[i]->origin ()->warning (_ ("unterminated phrasing slur")); - } +void +Phrasing_slur_engraver::acknowledge_inline_accidental (Grob_info info) +{ + acknowledge_extra_object (info); +} + +void +Phrasing_slur_engraver::acknowledge_fingering (Grob_info info) +{ + acknowledge_extra_object (info); } void -Phrasing_slur_engraver::process_acknowledged_grobs () +Phrasing_slur_engraver::acknowledge_tuplet_number (Grob_info info) { - Link_array start_phrasing_slurs; - for (int i=0; i< new_phrasing_slur_evs_.size (); i++) + acknowledge_extra_object (info); +} + +void +Phrasing_slur_engraver::acknowledge_script (Grob_info info) +{ + if (!info.grob ()->internal_has_interface (ly_symbol2scm ("dynamic-interface"))) + 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) +{ + acknowledge_extra_object (info); +} + +void +Phrasing_slur_engraver::acknowledge_slur (Grob_info info) +{ + acknowledge_extra_object (info); +} + +void +Phrasing_slur_engraver::finalize () +{ + for (vsize i = 0; i < slurs_.size (); i++) { - Music* phrasing_slur_ev = new_phrasing_slur_evs_[i]; - // end phrasing slur: move the phrasing slur to other array - - Direction d = to_dir (phrasing_slur_ev->get_mus_property ("span-direction")); - - if (d == STOP) - { - if (phrasing_slur_l_stack_.empty ()) - phrasing_slur_ev->origin ()->warning (_f ("can't find start of phrasing slur")); - else - { - Grob* phrasing_slur = phrasing_slur_l_stack_.pop (); - end_phrasing_slurs_.push (phrasing_slur); - eventses_.pop (); - } - } - else if (d == START) - { - // push a new phrasing_slur onto stack. - // (use temp. array to wait for all phrasing_slur STOPs) - Grob* phrasing_slur = new Spanner (get_property ("PhrasingSlur")); - Slur::set_interface (phrasing_slur); // can't remove. - - - if (Direction updown = to_dir (phrasing_slur_ev->get_mus_property ("direction"))) - { - phrasing_slur->set_grob_property ("direction", gh_int2scm (updown)); - } - - start_phrasing_slurs.push (phrasing_slur); - eventses_.push (phrasing_slur_ev); - announce_grob(phrasing_slur, phrasing_slur_ev->self_scm()); - } + slurs_[i]->warning (_ ("unterminated phrasing slur")); + slurs_[i]->suicide (); } - for (int i=0; i < start_phrasing_slurs.size (); i++) - phrasing_slur_l_stack_.push (start_phrasing_slurs[i]); - new_phrasing_slur_evs_.clear (); } void -Phrasing_slur_engraver::stop_translation_timestep () +Phrasing_slur_engraver::process_music () { - for (int i = 0; i < end_phrasing_slurs_.size (); i++) + for (vsize i = 0; i < stop_events_.size (); i++) { - typeset_grob (end_phrasing_slurs_[i]); + 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")); + } + + for (vsize i = 0; 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 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); + } } - end_phrasing_slurs_.clear (); } void -Phrasing_slur_engraver::start_translation_timestep () +Phrasing_slur_engraver::stop_translation_timestep () { - new_phrasing_slur_evs_.clear (); + for (vsize i = 0; i < objects_to_acknowledge_.size (); i++) + Slur::auxiliary_acknowledge_extra_object (objects_to_acknowledge_[i], slurs_, end_slurs_); + + end_slurs_.clear (); + start_events_.clear (); + stop_events_.clear (); + objects_to_acknowledge_.clear (); } +ADD_ACKNOWLEDGER (Phrasing_slur_engraver, inline_accidental); +ADD_ACKNOWLEDGER (Phrasing_slur_engraver, fingering) +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 ", + /* read */ + "", -ENTER_DESCRIPTION(Phrasing_slur_engraver, -/* descr */ "Print phrasing slurs. Similar to @ref{Slur_engraver}", -/* creats*/ "PhrasingSlur", -/* accepts */ "phrasing-slur-event", -/* acks */ "note-column-interface", -/* reads */ "", -/* write */ ""); + /* write */ + "" + );