X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fphrasing-slur-engraver.cc;h=479be1df22cdf87e9d02e47c18d5c72cc0733dcf;hb=2280391948b1e5879606cc8494f1fc1787386c8c;hp=6395cfb11568ee2c2a230efb2ffffa804ce8739e;hpb=09213819f91a17bb6e4f391c589550d440916410;p=lilypond.git diff --git a/lily/phrasing-slur-engraver.cc b/lily/phrasing-slur-engraver.cc index 6395cfb115..479be1df22 100644 --- a/lily/phrasing-slur-engraver.cc +++ b/lily/phrasing-slur-engraver.cc @@ -1,196 +1,100 @@ /* - 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--2015 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 "slur-proto-engraver.hh" #include "spanner.hh" +#include "stream-event.hh" +#include "warn.hh" -/* - TODO: - - ALGRGRRGRG +#include "translator.icc" - Derive this from Slur_engraver. This code is completely duplicate. - */ -class Phrasing_slur_engraver : public Engraver +class Phrasing_slur_engraver : public Slur_proto_engraver { - Link_array eventses_; - Link_array new_phrasing_slur_evs_; - Link_array phrasing_slur_l_stack_; - Link_array end_phrasing_slurs_; - Moment last_start_; - protected: - virtual bool try_music (Music*); - virtual void acknowledge_grob (Grob_info); - virtual void stop_translation_timestep (); - virtual void start_translation_timestep (); - virtual void finalize (); - virtual void process_acknowledged_grobs (); + DECLARE_TRANSLATOR_LISTENER (phrasing_slur); + DECLARE_TRANSLATOR_LISTENER (note); + DECLARE_ACKNOWLEDGER (slur); public: - TRANSLATOR_DECLARATIONS(Phrasing_slur_engraver); - + SCM event_symbol (); + TRANSLATOR_DECLARATIONS (Phrasing_slur_engraver); }; -Phrasing_slur_engraver::Phrasing_slur_engraver () -{ - last_start_ = Moment (-1); -} - -bool -Phrasing_slur_engraver::try_music (Music *ev) +Phrasing_slur_engraver::Phrasing_slur_engraver () : + Slur_proto_engraver (0, "PhrasingSlur", "phrasing slur", "phrasing-slur-event") { - 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; } -void -Phrasing_slur_engraver::acknowledge_grob (Grob_info info) +SCM +Phrasing_slur_engraver::event_symbol () { - 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); - } + // Need a string constant for memoization + return ly_symbol2scm ("phrasing-slur-event"); } +IMPLEMENT_TRANSLATOR_LISTENER (Phrasing_slur_engraver, phrasing_slur); void -Phrasing_slur_engraver::finalize () +Phrasing_slur_engraver::listen_phrasing_slur (Stream_event *ev) { - 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 (); - - for (int i=0; i < eventses_.size (); i++) - { - eventses_[i]->origin ()->warning (_ ("unterminated phrasing slur")); - } + Slur_proto_engraver::listen_slur (ev); } +IMPLEMENT_TRANSLATOR_LISTENER (Phrasing_slur_engraver, note); void -Phrasing_slur_engraver::process_acknowledged_grobs () +Phrasing_slur_engraver::listen_note (Stream_event *ev) { - 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_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()); - } - } - for (int i=0; i < start_phrasing_slurs.size (); i++) - phrasing_slur_l_stack_.push (start_phrasing_slurs[i]); - new_phrasing_slur_evs_.clear (); + Slur_proto_engraver::listen_note (ev); } void -Phrasing_slur_engraver::stop_translation_timestep () +Phrasing_slur_engraver::acknowledge_slur (Grob_info info) { - for (int i = 0; i < end_phrasing_slurs_.size (); i++) - { - typeset_grob (end_phrasing_slurs_[i]); - } - end_phrasing_slurs_.clear (); + acknowledge_extra_object (info); } -void -Phrasing_slur_engraver::start_translation_timestep () -{ - new_phrasing_slur_evs_.clear (); -} - - - -ENTER_DESCRIPTION(Phrasing_slur_engraver, -/* descr */ "Print phrasing slurs. Similar to Slur_engraver", -/* creats*/ "PhrasingSlur", -/* accepts */ "phrasing-slur-event", -/* acks */ "note-column-interface", -/* reads */ "", -/* write */ ""); +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_END_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 */ + "" + );