X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fphrasing-slur-engraver.cc;h=4a591c1caae931da06d3c54baa2e0405471d2cce;hb=9a63326816f586dd79d326776583697f95203330;hp=e3e289ce38371ab2e337d418a38bb0a79e80b11e;hpb=1855cf7137149c0bd27b5851fd9db498385591b3;p=lilypond.git diff --git a/lily/phrasing-slur-engraver.cc b/lily/phrasing-slur-engraver.cc index e3e289ce38..4a591c1caa 100644 --- a/lily/phrasing-slur-engraver.cc +++ b/lily/phrasing-slur-engraver.cc @@ -1,173 +1,210 @@ /* - phrasing-slur-engraver.cc -- implement Phrasing_slur_engraver + This file is part of LilyPond, the GNU music typesetter. - (c) 1997--2004 Han-Wen Nienhuys + Copyright (C) 1997--2010 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 "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 "note-column.hh" -#include "context.hh" -#include "engraver.hh" -#include "spanner.hh" +#include "translator.icc" /* - TODO: - - ALGRGRRGRG + 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. - Derive this from Slur_engraver. This code is completely duplicate. */ + +/* + 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) + + */ class Phrasing_slur_engraver : public Engraver { - Link_array eventses_; - Link_array new_phrasing_slur_evs_; - Link_array phrasing_slurs_; - Link_array end_phrasing_slurs_; - Moment last_start_; + Drul_array events_; + Stream_event *running_slur_start_; + vector slurs_; + vector end_slurs_; protected: - virtual bool try_music (Music*); - virtual void acknowledge_grob (Grob_info); - virtual void stop_translation_timestep (); - virtual void start_translation_timestep (); + void acknowledge_extra_object (Grob_info); + DECLARE_ACKNOWLEDGER (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); + DECLARE_TRANSLATOR_LISTENER (phrasing_slur); + + void stop_translation_timestep (); virtual void finalize (); - virtual void process_acknowledged_grobs (); + void process_music (); public: TRANSLATOR_DECLARATIONS (Phrasing_slur_engraver); - }; Phrasing_slur_engraver::Phrasing_slur_engraver () { - last_start_ = Moment (-1); + events_[START] = events_[STOP] = 0; } -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 ("phrasing-slur-event")) - { - /* - Let's not start more than one phrasing slur per moment. - */ - - Direction d = to_dir (ev->get_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; + /* + 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); } 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_slurs_.size (); i++) - Slur::add_column (phrasing_slurs_[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_slurs_.size (); i++) - { - /* - Let's not typeset unterminated stuff - */ - phrasing_slurs_[i]->suicide (); - } - phrasing_slurs_.clear (); + Slur::auxiliary_acknowledge_extra_object (info, slurs_, end_slurs_); +} - for (int i=0; i < eventses_.size (); i++) - { - eventses_[i]->origin ()->warning (_ ("unterminated phrasing slur")); - } +void +Phrasing_slur_engraver::acknowledge_accidental (Grob_info info) +{ + acknowledge_extra_object (info); } void -Phrasing_slur_engraver::process_acknowledged_grobs () +Phrasing_slur_engraver::acknowledge_fingering (Grob_info info) { - Link_array start_phrasing_slurs; - for (int i=0; i< new_phrasing_slur_evs_.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_property ("span-direction")); - - if (d == STOP) - { - if (phrasing_slurs_.is_empty ()) - phrasing_slur_ev->origin ()->warning (_f ("can't find start of phrasing slur")); - else - { - Grob* phrasing_slur = phrasing_slurs_.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 = make_spanner ("PhrasingSlur", phrasing_slur_ev->self_scm ()); - Slur::set_interface (phrasing_slur); // can't remove. - - - if (Direction updown = to_dir (phrasing_slur_ev->get_property ("direction"))) - { - phrasing_slur->set_property ("direction", scm_int2num (updown)); - } - - start_phrasing_slurs.push (phrasing_slur); - eventses_.push (phrasing_slur_ev); - } - } - for (int i=0; i < start_phrasing_slurs.size (); i++) - phrasing_slurs_.push (start_phrasing_slurs[i]); - new_phrasing_slur_evs_.clear (); + acknowledge_extra_object (info); } void -Phrasing_slur_engraver::stop_translation_timestep () +Phrasing_slur_engraver::acknowledge_text_script (Grob_info info) { - end_phrasing_slurs_.clear (); + acknowledge_extra_object (info); } void -Phrasing_slur_engraver::start_translation_timestep () +Phrasing_slur_engraver::acknowledge_script (Grob_info info) { - new_phrasing_slur_evs_.clear (); + if (!info.grob ()->internal_has_interface (ly_symbol2scm ("dynamic-interface"))) + acknowledge_extra_object (info); } +void +Phrasing_slur_engraver::acknowledge_tie (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_slur (Grob_info info) +{ + acknowledge_extra_object (info); +} + +void +Phrasing_slur_engraver::finalize () +{ + if (slurs_.size ()) + slurs_[0]->warning (_ ("unterminated phrasing slur")); +} + +void +Phrasing_slur_engraver::process_music () +{ + if (events_[STOP]) + { + end_slurs_ = slurs_; + slurs_.clear (); + } + + if (events_[START] && slurs_.empty ()) + { + 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); + } +} + +void +Phrasing_slur_engraver::stop_translation_timestep () +{ + end_slurs_.clear (); + events_[START] = events_[STOP] = 0; +} + +ADD_ACKNOWLEDGER (Phrasing_slur_engraver, 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 */ + "" + );