X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fphrasing-slur-engraver.cc;h=a3b10d027a158472ef1309b3bfb66aa7c00c5d0b;hb=c20bed72fb602fabf67087649df283f1978a9d94;hp=9509bae468b2575de1f5c2db300a4da3feb36580;hpb=e24df7c27635dc996c466295eacf2981bddccaf7;p=lilypond.git diff --git a/lily/phrasing-slur-engraver.cc b/lily/phrasing-slur-engraver.cc index 9509bae468..a3b10d027a 100644 --- a/lily/phrasing-slur-engraver.cc +++ b/lily/phrasing-slur-engraver.cc @@ -1,36 +1,75 @@ /* - phrasing-slur-engraver.cc -- implement Phrasing_slur_engraver + This file is part of LilyPond, the GNU music typesetter. - (c) 1997--2005 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 + 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" + #include "context.hh" #include "directional-element-interface.hh" -#include "engraver.hh" -#include "slur.hh" +#include "international.hh" #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_; + vector objects_to_acknowledge_; protected: - virtual bool try_music (Music*); - virtual void acknowledge_grob (Grob_info); - virtual void stop_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 (dots); + 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_music (); public: TRANSLATOR_DECLARATIONS (Phrasing_slur_engraver); @@ -38,118 +77,175 @@ public: 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) +{ + 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_note_column (Grob_info info) { - 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_.is_empty ()) - return false; - - events_[STOP] = m; - return true; - } - } - return false; + 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::acknowledge_extra_object (Grob_info info) +{ + objects_to_acknowledge_.push_back (info); +} void -Phrasing_slur_engraver::acknowledge_grob (Grob_info info) +Phrasing_slur_engraver::acknowledge_inline_accidental (Grob_info info) { - Grob *e = info.grob_; - if (Note_column::has_interface (info.grob_)) - { - for (int i = slurs_.size (); i--; ) - Slur::add_column (slurs_[i], e); - for (int i = end_slurs_.size (); i-- ; ) - Slur::add_column (end_slurs_[i], e); - } - else - { - /* - ugh. cut & paste from slur-engraver.cc - */ - SCM inside = e->get_property ("inside-slur"); - if (Tie::has_interface (e) - || Slur::has_interface (e) - || to_boolean (inside)) - { - for (int i = slurs_.size (); i--; ) - Slur::add_extra_encompass (slurs_[i], e); - for (int i = end_slurs_.size (); i--; ) - Slur::add_extra_encompass (end_slurs_[i], e); - } - else if (inside == SCM_BOOL_F) - { - Grob *slur = slurs_.size()?slurs_[0] : 0; - slur = (end_slurs_.size () && !slur) - ? end_slurs_[0] : slur; - - if (slur) - { - e->add_offset_callback (Slur::outside_slur_callback_proc, Y_AXIS); - e->set_property ("slur", slur->self_scm()); - } - } - } + acknowledge_extra_object (info); +} + +void +Phrasing_slur_engraver::acknowledge_dots (Grob_info info) +{ + acknowledge_extra_object (info); +} + +void +Phrasing_slur_engraver::acknowledge_fingering (Grob_info info) +{ + acknowledge_extra_object (info); +} + +void +Phrasing_slur_engraver::acknowledge_tuplet_number (Grob_info info) +{ + 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 () { - 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_.is_empty ()) - { - 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 (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); + } } } void Phrasing_slur_engraver::stop_translation_timestep () { + 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 (); - events_[START] = events_[STOP] = 0; + 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, dots); +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, -/* descr */ "Print phrasing slurs. Similar to @ref{Slur_engraver}", -/* creats*/ "PhrasingSlur", -/* accepts */ "phrasing-slur-event", -/* acks */ "note-column-interface tie-interface fingering-interface script-interface slur-interface", -/* reads */ "", -/* write */ ""); + /* doc */ + "Print phrasing slurs. Similar to @ref{Slur_engraver}.", + + /* create */ + "PhrasingSlur ", + + /* read */ + "", + + /* write */ + "" + );